From 6b6dc29104f5b3361699a304b291df870c260a09 Mon Sep 17 00:00:00 2001 From: sudipnext Date: Mon, 2 Mar 2026 20:21:23 +0545 Subject: [PATCH] Refactor: Clean up imports and remove merge conflict markers in presentation generator components --- .../outline/components/GenerateButton.tsx | 3 --- .../outline/components/OutlinePage.tsx | 3 --- .../outline/hooks/usePresentationGeneration.ts | 4 ---- .../(presentation-generator)/template-preview/page.tsx | 4 ---- servers/nextjs/components/LLMSelection.tsx | 1 + servers/nextjs/components/OpenAIConfig.tsx | 8 ++++---- 6 files changed, 5 insertions(+), 18 deletions(-) diff --git a/servers/nextjs/app/(presentation-generator)/outline/components/GenerateButton.tsx b/servers/nextjs/app/(presentation-generator)/outline/components/GenerateButton.tsx index d6322fa1..a750df95 100644 --- a/servers/nextjs/app/(presentation-generator)/outline/components/GenerateButton.tsx +++ b/servers/nextjs/app/(presentation-generator)/outline/components/GenerateButton.tsx @@ -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; diff --git a/servers/nextjs/app/(presentation-generator)/outline/components/OutlinePage.tsx b/servers/nextjs/app/(presentation-generator)/outline/components/OutlinePage.tsx index fa850f58..ef7dcabe 100644 --- a/servers/nextjs/app/(presentation-generator)/outline/components/OutlinePage.tsx +++ b/servers/nextjs/app/(presentation-generator)/outline/components/OutlinePage.tsx @@ -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( diff --git a/servers/nextjs/app/(presentation-generator)/outline/hooks/usePresentationGeneration.ts b/servers/nextjs/app/(presentation-generator)/outline/hooks/usePresentationGeneration.ts index 3d06bb8b..a8da1be9 100644 --- a/servers/nextjs/app/(presentation-generator)/outline/hooks/usePresentationGeneration.ts +++ b/servers/nextjs/app/(presentation-generator)/outline/hooks/usePresentationGeneration.ts @@ -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"; diff --git a/servers/nextjs/app/(presentation-generator)/template-preview/page.tsx b/servers/nextjs/app/(presentation-generator)/template-preview/page.tsx index 3992319a..b947735b 100644 --- a/servers/nextjs/app/(presentation-generator)/template-preview/page.tsx +++ b/servers/nextjs/app/(presentation-generator)/template-preview/page.tsx @@ -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, diff --git a/servers/nextjs/components/LLMSelection.tsx b/servers/nextjs/components/LLMSelection.tsx index 82027490..3c383352 100644 --- a/servers/nextjs/components/LLMSelection.tsx +++ b/servers/nextjs/components/LLMSelection.tsx @@ -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"; diff --git a/servers/nextjs/components/OpenAIConfig.tsx b/servers/nextjs/components/OpenAIConfig.tsx index b21f31df..63043fee 100644 --- a/servers/nextjs/components/OpenAIConfig.tsx +++ b/servers/nextjs/components/OpenAIConfig.tsx @@ -33,10 +33,10 @@ export default function OpenAIConfig({ }: OpenAIConfigProps) { const [openModelSelect, setOpenModelSelect] = useState(false); const [availableModels, setAvailableModels] = useState([]); - 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";