chore: resolve marge confict

2026-03-10 15:05:55 +05:30
parent dd13fa139e 22f3dec02c
commit 58794fc40e
4 changed files with 15 additions and 2 deletions
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -40,7 +40,7 @@ export default function RootLayout({
  children: React.ReactNode
 }>) {
  return (
-    <html lang="en">
+    <html lang="en" data-scroll-behavior="smooth">
      <body className={`font-sans antialiased`} suppressHydrationWarning>
        <TooltipProvider>
          {children}
--- a/app/new-analysis/page.tsx
+++ b/app/new-analysis/page.tsx
@@ -1,12 +1,17 @@
 "use client"

 import { useRouter } from "next/navigation"
-import { ProjectSelectionSection } from "@/components/project-selection-section"
+import dynamic from "next/dynamic"
 import { SidebarNavigation } from "@/components/sidebar-navigation"
 import { type SessionContext, saveSession } from "@/lib/api"
 import { TrendingUp } from "lucide-react"
 import { PageHeader } from "@/components/page-header"

+const ProjectSelectionSection = dynamic(
+    () => import("@/components/project-selection-section").then(mod => mod.ProjectSelectionSection),
+    { ssr: false }
+)
+
 export default function NewAnalysisPage() {
    const router = useRouter()

--- a/app/upload/page.tsx
+++ b/app/upload/page.tsx
@@ -316,6 +316,9 @@ export default function UploadPage() {
                                            <SelectItem value="sam3">
                                                <span className="font-medium">OpenAI SAM 3 Segmentation Model</span>
                                            </SelectItem>
+                                            <SelectItem value="yoloe">
+                                                <span className="font-medium">YOLOE Open-Vocabulary Detection</span>
+                                            </SelectItem>
                                        </SelectContent>
                                    </Select>
                                </div>