santasri.pachhal/road-monitoring-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: resolve marge confict

Browse Source
This commit is contained in:
santasri.pachhal
2026-03-10 15:05:55 +05:30
parent dd13fa139e 22f3dec02c
commit 58794fc40e
4 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/layout.tsx
View File

@@ -40,7 +40,7 @@ export default function RootLayout({
children: React.ReactNode children: React.ReactNode
}>) { }>) {
return ( return (
<html lang="en"> <html lang="en" data-scroll-behavior="smooth">
<body className={`font-sans antialiased`} suppressHydrationWarning> <body className={`font-sans antialiased`} suppressHydrationWarning>
<TooltipProvider> <TooltipProvider>
{children} {children}

7
app/new-analysis/page.tsx
View File

@@ -1,12 +1,17 @@
"use client" "use client"
import { useRouter } from "next/navigation" import { useRouter } from "next/navigation"
import { ProjectSelectionSection } from "@/components/project-selection-section" import dynamic from "next/dynamic"
import { SidebarNavigation } from "@/components/sidebar-navigation" import { SidebarNavigation } from "@/components/sidebar-navigation"
import { type SessionContext, saveSession } from "@/lib/api" import { type SessionContext, saveSession } from "@/lib/api"
import { TrendingUp } from "lucide-react" import { TrendingUp } from "lucide-react"
import { PageHeader } from "@/components/page-header" import { PageHeader } from "@/components/page-header"
const ProjectSelectionSection = dynamic(
() => import("@/components/project-selection-section").then(mod => mod.ProjectSelectionSection),
{ ssr: false }
)
export default function NewAnalysisPage() { export default function NewAnalysisPage() {
const router = useRouter() const router = useRouter()

3
app/upload/page.tsx
View File

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

5
components/upload-section.tsx
View File

@@ -334,6 +334,11 @@ export function UploadSection({ onDetectionComplete, onDetectionTypeChange }: Up
<span>SAM 3</span> <span>SAM 3</span>
</div> </div>
</SelectItem> </SelectItem>
<SelectItem value="yoloe">
<div className="flex items-center gap-2">
<span>YOLOE</span>
</div>
</SelectItem>
</SelectContent> </SelectContent>
</Select> </Select>
</div> </div>