Oliver/presenton
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor: Clean up imports and remove merge conflict markers in presentation generator components

Browse source
This commit is contained in:
sudipnext 2026-03-02 20:21:23 +05:45
parent 05ea7dea5b
commit 6b6dc29104
6 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
servers/nextjs/app/(presentation-generator)/outline/components/GenerateButton.tsx
View file

@ -4,10 +4,7 @@ import { trackEvent, MixpanelEvent } from "@/utils/mixpanel";
import { Button } from "@/components/ui/button";
import { LoadingState, Template } from "../types/index";
import { TemplateLayoutsWithSettings } from "@/app/presentation-templates/utils";
<<<<<<< feat/revamp_design
import { ChevronRight } from "lucide-react";
=======
>>>>>>> main
interface GenerateButtonProps {
loadingState: LoadingState;

3
servers/nextjs/app/(presentation-generator)/outline/components/OutlinePage.tsx
View file

@ -16,10 +16,7 @@ import { useOutlineManagement } from "../hooks/useOutlineManagement";
import { usePresentationGeneration } from "../hooks/usePresentationGeneration";
import TemplateSelection from "./TemplateSelection";
import { TemplateLayoutsWithSettings } from "@/app/presentation-templates/utils";
<<<<<<< feat/revamp_design
import { Separator } from "@/components/ui/separator";
=======
>>>>>>> main
const OutlinePage: React.FC = () => {
const { presentation_id, outlines } = useSelector(

4
servers/nextjs/app/(presentation-generator)/outline/hooks/usePresentationGeneration.ts
View file

@ -4,13 +4,9 @@ import { useRouter } from "next/navigation";
import { toast } from "sonner";
import { clearPresentationData } from "@/store/slices/presentationGeneration";
import { PresentationGenerationApi } from "../../services/api/presentation-generation";
<<<<<<< feat/revamp_design
import { LoadingState, TABS } from "../types/index";
=======
import { Template, LoadingState, TABS } from "../types/index";
import { MixpanelEvent, trackEvent } from "@/utils/mixpanel";
import { TemplateLayoutsWithSettings } from "@/app/presentation-templates/utils";
>>>>>>> main
import { getCustomTemplateDetails } from "@/app/hooks/useCustomTemplates";
import { TemplateLayoutsWithSettings } from "@/app/presentation-templates/utils";

4
servers/nextjs/app/(presentation-generator)/template-preview/page.tsx
View file

@ -5,12 +5,8 @@ import { Card } from "@/components/ui/card";
import { ExternalLink, Loader2, Plus } from "lucide-react";
import { templates } from "@/app/presentation-templates";
<<<<<<< feat/revamp_design
import { TemplateLayoutsWithSettings, TemplateWithData } from "@/app/presentation-templates/utils";
=======
import type { TemplateLayoutsWithSettings } from "@/app/presentation-templates/utils";
import { TemplateWithData } from "@/app/presentation-templates/utils";
>>>>>>> main
import {
useCustomTemplateSummaries,
useCustomTemplatePreview,

1
servers/nextjs/components/LLMSelection.tsx
View file

@ -12,6 +12,7 @@ import {
} from "@/utils/providerUtils";
import { LLMConfig } from "@/types/llm_config";
import ImageSelectionConfig from "./ImageSelectionConfig";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";

8
servers/nextjs/components/OpenAIConfig.tsx
View file

@ -33,10 +33,10 @@ export default function OpenAIConfig({
}: OpenAIConfigProps) {
const [openModelSelect, setOpenModelSelect] = useState(false);
const [availableModels, setAvailableModels] = useState<string[]>([]);
const [modelsLoading, setModelsLoading] = useState(false);
const [modelsChecked, setModelsChecked] = useState(false);
const [apiKey, setApiKey] = useState(openaiApiKey);
const isImageGenerationDisabled = llmConfig.DISABLE_IMAGE_GENERATION ?? false;
const [modelsLoading, setModelsLoading] = useState(false);
const [modelsChecked, setModelsChecked] = useState(false);
const [apiKey, setApiKey] = useState(openaiApiKey);
const isImageGenerationDisabled = llmConfig?.DISABLE_IMAGE_GENERATION ?? false;
const openaiUrl = "https://api.openai.com/v1";