From 344f37719e4dcb626218911c3ab4a2c537b2faa1 Mon Sep 17 00:00:00 2001 From: "santasri.pachhal" Date: Wed, 18 Mar 2026 01:03:58 +0530 Subject: [PATCH] refactor: redesign table module --- src/app/(modules)/dashboard/page.tsx | 79 ++--- src/app/(modules)/layout.tsx | 20 +- src/app/(modules)/location/page.tsx | 120 +++++-- src/app/(modules)/package/page.tsx | 104 +++--- src/app/(modules)/project/page.tsx | 113 +++--- src/app/favicon.ico | Bin 0 -> 25931 bytes src/app/globals.css | 23 ++ src/app/layout.tsx | 2 + src/components/app-breadcrumb.tsx | 57 +++ src/components/app-sidebar.tsx | 1 - .../dashboard/detection-donut-chart.tsx | 285 ++++++++------- .../dashboard/location-bar-chart.tsx | 254 +++++--------- src/components/dashboard/stats-card.tsx | 2 +- src/components/data-table/Footer/index.tsx | 113 +++--- .../data-table/Header/SearchBar.tsx | 18 +- src/components/data-table/Header/index.tsx | 68 ++-- src/components/data-table/TableHeader.tsx | 51 +-- src/components/data-table/index.tsx | 327 +++++++++--------- src/components/page-header.tsx | 34 +- src/components/ui/badge.tsx | 32 +- src/components/ui/breadcrumb.tsx | 10 +- src/components/ui/popover.tsx | 57 ++- src/components/ui/scroll-area.tsx | 28 +- src/components/ui/table.tsx | 8 +- 24 files changed, 991 insertions(+), 815 deletions(-) create mode 100644 src/app/favicon.ico create mode 100644 src/components/app-breadcrumb.tsx diff --git a/src/app/(modules)/dashboard/page.tsx b/src/app/(modules)/dashboard/page.tsx index 55513dc..8971f56 100644 --- a/src/app/(modules)/dashboard/page.tsx +++ b/src/app/(modules)/dashboard/page.tsx @@ -1,7 +1,7 @@ "use client"; import { useState, useEffect } from "react"; -import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; +import { Card, CardContent, CardHeader, CardTitle, CardDescription, CardFooter } from "@/components/ui/card"; import { AlertCircle, Activity, @@ -11,6 +11,7 @@ import { Zap, PencilLine, CheckCircle2, + Settings2, } from "lucide-react"; import { StatsCard } from "@/components/dashboard/stats-card"; import { CompactProjectSelector } from "@/components/dashboard/compact-project-selector"; @@ -26,9 +27,9 @@ import { PopoverTrigger, } from "@/components/ui/popover"; import { Button } from "@/components/ui/button"; -import { Filter } from "lucide-react"; import { DashboardSkeleton } from "@/components/dashboard/dashboard-skeleton" import { PoweredBy } from "@/components/powered-by"; +import { toast } from "sonner"; const API_URL = process.env.NEXT_PUBLIC_API_URL; @@ -207,14 +208,12 @@ export default function DashboardPage() { totalRoadDamage: 0, locationData: [], }); - const [error, setError] = useState(null); // Load projects on mount useEffect(() => { const loadProjects = async () => { try { setIsLoading(true); - setError(null); const projectsData = await fetchProjects(); setProjects(projectsData); @@ -223,9 +222,9 @@ export default function DashboardPage() { } } catch (err) { console.error("Failed to load projects:", err); - setError( - "Failed to load projects. Please check if the backend is running.", - ); + toast.error("Failed to load projects", { + description: "Please check if the backend is running." + }); } finally { setTimeout(() => { setIsLoading(false); @@ -274,7 +273,6 @@ export default function DashboardPage() { const loadProjectSummary = async () => { try { setIsLoading(true); - setError(null); const response = await fetch( `${API_URL}/summary/projects/${selectedProjectId}`, @@ -294,7 +292,7 @@ export default function DashboardPage() { setProjectSummary(summary); } catch (err) { console.error("Failed to load project summary:", err); - setError("Failed to load project summary."); + toast.error("Failed to load project summary"); setProjectSummary(null); } finally { setTimeout(() => { @@ -422,10 +420,10 @@ export default function DashboardPage() { }, [projectSummary, selectedPackageId, selectedLocationId]); return ( -
+ <> {/* Main Content */} -
-
+
+
{/* Header */}

- + Filter Analysis

Refine your view by project, package, or location

@@ -467,14 +465,6 @@ export default function DashboardPage() {
- {/* Error Display */} - {error && ( -
- -

{error}

-
- )} - {isLoading && !projectSummary ? ( ) : ( @@ -522,18 +512,12 @@ export default function DashboardPage() { {/* Charts Row - Side by Side */}
{/* Left Chart - Detection Distribution */} - - - -
- -
- - Detection Distribution - - + + + Detection Distribution + Breakdown of all detected road conditions - + + +
+ Total detections: {stats.totalRoadDamage + stats.totalGoodSignboard} +
+ - {/* Right Chart - Location Bar Chart */} - - - -
- -
- Detections by Location - + {/* Right Chart - Detections by Location */} + + + Detections by Location + Frequency of road issues across different map segments - + ({ name: loc.name, @@ -562,11 +547,15 @@ export default function DashboardPage() { pothole: loc.pothole, road_crack: loc.road_crack, damaged_road_marking: loc.damaged_road_marking, - good_sign_board: loc.good_sign_board, total: loc.total, }))} /> + +
+ Analysis based on latest processed sequence +
+
@@ -585,6 +574,6 @@ export default function DashboardPage() {
-
+ ); } diff --git a/src/app/(modules)/layout.tsx b/src/app/(modules)/layout.tsx index ffa8540..e2d13cd 100644 --- a/src/app/(modules)/layout.tsx +++ b/src/app/(modules)/layout.tsx @@ -1,6 +1,8 @@ +import { BreadcrumbBasic } from "@/components/app-breadcrumb"; import { AppSidebar } from "@/components/app-sidebar"; import { ModeToggle } from "@/components/mode-toogle"; import { SidebarProvider, SidebarTrigger } from "@/components/ui/sidebar"; +import { Separator } from "@/components/ui/separator"; import React from "react"; const ModulesLayout = ({ @@ -11,15 +13,23 @@ const ModulesLayout = ({ return ( -
-
- - +
+
+ {/* Centering container wrapper */} +
+
+ + + + +
+
{children}
+
-
{children}
); }; + export default ModulesLayout; diff --git a/src/app/(modules)/location/page.tsx b/src/app/(modules)/location/page.tsx index b4a57c8..3b0df0f 100644 --- a/src/app/(modules)/location/page.tsx +++ b/src/app/(modules)/location/page.tsx @@ -27,6 +27,8 @@ import { } from "@/lib/api" import { ColumnDef } from "@tanstack/react-table" import { toast } from "sonner" +import { Badge } from "@/components/ui/badge" +import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover" export default function LocationPage() { const [locations, setLocations] = useState([]) @@ -168,7 +170,9 @@ export default function LocationPage() { end_lng: parseFloat(endLng), } await updateLocation(currentLocation.id, data) - toast.success("Location updated successfully!") + toast.success("Location Updated", { + description: `${segmentName} has been updated successfully at ${new Date().toLocaleTimeString()}`, + }) } else { const data: LocationCreate = { package_id: selectedPackageId, @@ -181,7 +185,9 @@ export default function LocationPage() { end_lng: parseFloat(endLng), } await createLocation(data) - toast.success("Location created successfully!") + toast.success("Location Created", { + description: `${segmentName} has been established successfully at ${new Date().toLocaleTimeString()}`, + }) } // Refresh locations list @@ -191,7 +197,11 @@ export default function LocationPage() { setIsModalOpen(false) resetForm() } catch (err) { - setError(err instanceof Error ? err.message : `Failed to ${isEditing ? 'update' : 'create'} location`) + const message = err instanceof Error ? err.message : `Failed to ${isEditing ? 'update' : 'create'} location` + setError(message) + toast.error("Operation Failed", { + description: message, + }) } finally { setIsSubmitting(false) } @@ -224,10 +234,15 @@ export default function LocationPage() { try { setIsLoading(true) await deleteLocation(location.id) - toast.success("Location deleted successfully!") + toast.success("Location Deleted", { + description: `${location.segment_name} has been removed from the system.`, + }) await loadLocations() } catch (err) { setError("Failed to delete location") + toast.error("Deletion Failed", { + description: "The location could not be removed. Please try again.", + }) } finally { setIsLoading(false) } @@ -262,6 +277,50 @@ export default function LocationPage() { return project?.name || "—" } }, + { + id: "project_state", + header: "Project State", + cell: ({ row }) => { + const location = row.original + const pkg = allPackages.find(p => p.id === location.package_id) + const project = projects.find(p => p.id === pkg?.project_id) + if (!project?.state) return — + + const states = project.state.split(',').map(s => s.trim()).filter(Boolean) + if (states.length === 0) return — + + const firstState = states[0] + const remainingStates = states.slice(1) + + return ( +
+ + {firstState} + + + {remainingStates.length > 0 && ( + + + + + +
+

Other States

+ {remainingStates.map((item, idx) => ( + + {item} + + ))} +
+ + + )} +
+ ) + } + }, { accessorKey: "chainage", header: "Chainage (km)", @@ -269,9 +328,10 @@ export default function LocationPage() { const location = row.original if (location.chainage_start_km !== null && location.chainage_end_km !== null) { return ( - + + {location.chainage_start_km} - {location.chainage_end_km} - + ) } return "—" @@ -281,44 +341,44 @@ export default function LocationPage() { accessorKey: "start_gps", header: "Start GPS", cell: ({ row }) => ( - + + {row.original.start_lat.toFixed(4)}, {row.original.start_lng.toFixed(4)} - + ) }, { accessorKey: "end_gps", header: "End GPS", cell: ({ row }) => ( - + + {row.original.end_lat.toFixed(4)}, {row.original.end_lng.toFixed(4)} - + ) }, ] return ( -
-
-
+ <> +
{/* Refined Header */}
{ setIsEditing(false); setIsModalOpen(true); }} + > + + Add New Location + + } />
- {/* Error Message */} - {error && !isModalOpen && ( -
-
- ! -
-

{error}

-
- )} {/* Data Table */}
@@ -326,10 +386,8 @@ export default function LocationPage() { title="Locations" data={locations} columns={columns} - onAddNew={() => { setIsEditing(false); setIsModalOpen(true); }} onEdit={handleEdit} onDelete={handleDelete} - addButtonText="Add New Location" isLoading={isLoading} pagination={{ skip, @@ -344,8 +402,7 @@ export default function LocationPage() {
-
-
+
{/* Modal Dialog */} { if (!open) { setIsModalOpen(false); resetForm(); } else { setIsModalOpen(true); } }}> @@ -365,15 +422,6 @@ export default function LocationPage() { - {/* Error Message in Modal */} - {error && ( -
-
- ! -
-

{error}

-
- )}
{!isEditing && ( @@ -607,6 +655,6 @@ export default function LocationPage() {
-
+ ) } diff --git a/src/app/(modules)/package/page.tsx b/src/app/(modules)/package/page.tsx index 7093f7e..0730eec 100644 --- a/src/app/(modules)/package/page.tsx +++ b/src/app/(modules)/package/page.tsx @@ -23,6 +23,8 @@ import { } from "@/lib/api" import { ColumnDef } from "@tanstack/react-table" import { toast } from "sonner" +import { Badge } from "@/components/ui/badge" +import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover" import { PoweredBy } from "@/components/powered-by" export default function PackagePage() { @@ -108,7 +110,9 @@ export default function PackagePage() { region: region.trim() || null, } await updatePackage(currentPackage.id, data) - toast.success("Package updated successfully!") + toast.success("Package Updated", { + description: `${name} has been updated successfully at ${new Date().toLocaleTimeString()}`, + }) } else { const data: PackageCreate = { project_id: selectedProjectId, @@ -116,7 +120,9 @@ export default function PackagePage() { region: region.trim() || null, } await createPackage(data) - toast.success("Package created successfully!") + toast.success("Package Created", { + description: `${name} has been established successfully at ${new Date().toLocaleTimeString()}`, + }) } // Refresh packages list @@ -126,7 +132,11 @@ export default function PackagePage() { setIsModalOpen(false) resetForm() } catch (err) { - setError(err instanceof Error ? err.message : `Failed to ${isEditing ? 'update' : 'create'} package`) + const message = err instanceof Error ? err.message : `Failed to ${isEditing ? 'update' : 'create'} package` + setError(message) + toast.error("Operation Failed", { + description: message, + }) } finally { setIsSubmitting(false) } @@ -147,10 +157,15 @@ export default function PackagePage() { try { setIsLoading(true) await deletePackage(pkg.id) - toast.success("Package deleted successfully!") + toast.success("Package Deleted", { + description: `${pkg.name} has been removed from the system.`, + }) await loadPackages() } catch (err) { setError("Failed to delete package") + toast.error("Deletion Failed", { + description: "The package could not be removed. Please try again.", + }) } finally { setIsLoading(false) } @@ -180,16 +195,38 @@ export default function PackagePage() { const pkg = row.original const project = projects.find(p => p.id === pkg.project_id) if (!project?.state) return — + + const states = project.state.split(',').map(s => s.trim()).filter(Boolean) + if (states.length === 0) return — + + const firstState = states[0] + const remainingStates = states.slice(1) + return ( -
- {project.state.split(',').map((item, idx) => ( - - {item.trim()} - - ))} +
+ + {firstState} + + + {remainingStates.length > 0 && ( + + + + + +
+

Other States

+ {remainingStates.map((item, idx) => ( + + {item} + + ))} +
+ + + )}
) } @@ -201,27 +238,26 @@ export default function PackagePage() { ] return ( -
-
-
+ <> + +
{/* Refined Header */}
{ setIsEditing(false); setIsModalOpen(true); }} + > + + Add New Package + + } />
- {/* Error Message */} - {error && !isModalOpen && ( -
-
- ! -
-

{error}

-
- )} {/* Data Table */}
@@ -229,10 +265,8 @@ export default function PackagePage() { title="Packages" data={packages} columns={columns} - onAddNew={() => { setIsEditing(false); setIsModalOpen(true); }} onEdit={handleEdit} onDelete={handleDelete} - addButtonText="Add New Package" isLoading={isLoading} pagination={{ skip, @@ -247,8 +281,7 @@ export default function PackagePage() {
-
-
+ {/* Modal Dialog */} { if (!open) { setIsModalOpen(false); resetForm(); } else { setIsModalOpen(true); } }}> @@ -269,15 +302,6 @@ export default function PackagePage() { - {/* Error Message in Modal */} - {error && ( -
-
- ! -
-

{error}

-
- )}
{/* Step 1: Select Project */} @@ -371,7 +395,7 @@ export default function PackagePage() {
-
+ ) } diff --git a/src/app/(modules)/project/page.tsx b/src/app/(modules)/project/page.tsx index 9d880c6..69a591a 100644 --- a/src/app/(modules)/project/page.tsx +++ b/src/app/(modules)/project/page.tsx @@ -12,6 +12,8 @@ import { PageHeader } from "@/components/page-header" import { createProject, fetchProjects, updateProject, deleteProject, type ProjectCreate, type Project, type ProjectUpdate } from "@/lib/api" import { ColumnDef } from "@tanstack/react-table" import { toast } from "sonner" +import { Badge } from "@/components/ui/badge" +import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover" import { PoweredBy } from "@/components/powered-by" export default function ProjectPage() { @@ -91,7 +93,9 @@ export default function ProjectPage() { end_lng: endLng ? parseFloat(endLng) : null, } await updateProject(currentProject.id, data) - toast.success("Project updated successfully!") + toast.success("Project Updated", { + description: `${name} has been updated successfully at ${new Date().toLocaleTimeString()}`, + }) } else { const data: ProjectCreate = { name: name.trim(), @@ -103,7 +107,9 @@ export default function ProjectPage() { end_lng: endLng ? parseFloat(endLng) : null, } await createProject(data) - toast.success("Project created successfully!") + toast.success("Project Created", { + description: `${name} has been established successfully at ${new Date().toLocaleTimeString()}`, + }) } // Refresh projects list @@ -113,7 +119,11 @@ export default function ProjectPage() { setIsModalOpen(false) resetForm() } catch (err) { - setError(err instanceof Error ? err.message : `Failed to ${isEditing ? 'update' : 'create'} project`) + const message = err instanceof Error ? err.message : `Failed to ${isEditing ? 'update' : 'create'} project` + setError(message) + toast.error("Operation Failed", { + description: message, + }) } finally { setIsSubmitting(false) } @@ -138,10 +148,15 @@ export default function ProjectPage() { try { setIsLoading(true) await deleteProject(project.id) - toast.success("Project deleted successfully!") + toast.success("Project Deleted", { + description: `${project.name} has been removed from the system.`, + }) await loadProjects() } catch (err) { setError("Failed to delete project") + toast.error("Deletion Failed", { + description: "The project could not be removed. Please try again or check your permissions.", + }) } finally { setIsLoading(false) } @@ -152,7 +167,7 @@ export default function ProjectPage() { accessorKey: "name", header: "Project Name", cell: ({ row }) => ( -
{row.original.name}
+
{row.original.name}
) }, { @@ -160,17 +175,45 @@ export default function ProjectPage() { header: "State", cell: ({ row }) => { const project = row.original - if (!project.state) return — + if (!project.state) return — + + const states = project.state.split(',').map(s => s.trim()).filter(Boolean) + if (states.length === 0) return — + + const firstState = states[0] + const remainingStates = states.slice(1) + return ( -
- {project.state.split(',').map((item, idx) => ( - - {item.trim()} - - ))} +
+ + {firstState} + + + {remainingStates.length > 0 && ( + + + + + +
+

Other States

+ {remainingStates.map((item, idx) => ( + + {item} + + ))} +
+ + + )}
) } @@ -182,27 +225,26 @@ export default function ProjectPage() { ] return ( -
-
-
+ <> + +
{/* Refined Header */}
{ setIsEditing(false); setIsModalOpen(true); }} + > + + Add New Project + + } />
- {/* Error Message */} - {error && !isModalOpen && ( -
-
- ! -
-

{error}

-
- )} {/* Data Table */}
@@ -210,10 +252,8 @@ export default function ProjectPage() { title="Projects" data={projects} columns={columns} - onAddNew={() => { setIsEditing(false); setIsModalOpen(true); }} onEdit={handleEdit} onDelete={handleDelete} - addButtonText="Add New Project" isLoading={isLoading} pagination={{ skip, @@ -228,8 +268,8 @@ export default function ProjectPage() {
-
-
+ + {/* Modal Dialog */} { if (!open) { setIsModalOpen(false); resetForm(); } else { setIsModalOpen(true); } }}> @@ -250,15 +290,6 @@ export default function ProjectPage() { - {/* Error Message in Modal */} - {error && ( -
-
- ! -
-

{error}

-
- )}
{/* Project Name */} @@ -409,6 +440,6 @@ export default function ProjectPage() {
-
+ ) } diff --git a/src/app/favicon.ico b/src/app/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..718d6fea4835ec2d246af9800eddb7ffb276240c GIT binary patch literal 25931 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 LrJugUA?W`A8`#=m literal 0 HcmV?d00001 diff --git a/src/app/globals.css b/src/app/globals.css index 6102594..eca3ba5 100644 --- a/src/app/globals.css +++ b/src/app/globals.css @@ -149,6 +149,29 @@ body { @apply bg-background text-foreground; } + + /* Modern Scrollbar Styles */ + ::-webkit-scrollbar { + width: 8px; /* Slightly wider for better accessibility */ + height: 8px; + } + + ::-webkit-scrollbar-track { + background: transparent; + } + + ::-webkit-scrollbar-thumb { + background-color: var(--muted-foreground); + border-radius: 20px; + border: 2px solid transparent; + background-clip: content-box; + opacity: 0.5; /* More visible default */ + } + /* Firefox Support */ + * { + /* scrollbar-width: ; */ + scrollbar-color: var(--muted-foreground) transparent; + } } diff --git a/src/app/layout.tsx b/src/app/layout.tsx index b08eb05..a6f1f17 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -2,6 +2,7 @@ import type { Metadata } from "next"; import { Geist, Geist_Mono } from "next/font/google"; import "./globals.css"; import { ThemeProvider } from "@/components/theme-provider"; +import { Toaster } from "@/components/ui/sonner" const geistSans = Geist({ variable: "--font-geist-sans", @@ -35,6 +36,7 @@ export default function RootLayout({ disableTransitionOnChange > {children} + diff --git a/src/components/app-breadcrumb.tsx b/src/components/app-breadcrumb.tsx new file mode 100644 index 0000000..bb6f54d --- /dev/null +++ b/src/components/app-breadcrumb.tsx @@ -0,0 +1,57 @@ +"use client"; + +import React from "react"; +import { usePathname } from "next/navigation"; +import { + Breadcrumb, + BreadcrumbItem, + BreadcrumbLink, + BreadcrumbList, + BreadcrumbPage, + BreadcrumbSeparator, +} from "@/components/ui/breadcrumb"; + +export function BreadcrumbBasic() { + const pathname = usePathname(); + const segments = pathname.split("/").filter((segment) => segment !== ""); + + // Helper to format segment (e.g., "new-analysis" -> "New Analysis") + const formatSegment = (segment: string) => { + return segment + .split("-") + .map((word) => word.charAt(0).toUpperCase() + word.slice(1)) + .join(" "); + }; + + return ( + + + + Home + + {segments.length > 0 && } + + {segments.map((segment, index) => { + const href = `/${segments.slice(0, index + 1).join("/")}`; + const isLast = index === segments.length - 1; + + // Skip segments that represent module groups or generic IDs if needed + // For now, mapping all segments + + return ( + + + {isLast ? ( + {formatSegment(segment)} + ) : ( + {formatSegment(segment)} + )} + + {!isLast && } + + ); + })} + + + ); +} diff --git a/src/components/app-sidebar.tsx b/src/components/app-sidebar.tsx index 3b0d9d7..4844c1a 100644 --- a/src/components/app-sidebar.tsx +++ b/src/components/app-sidebar.tsx @@ -78,7 +78,6 @@ export function AppSidebar({ ...props }: React.ComponentProps) { - Application {data.navMain.map((item) => ( diff --git a/src/components/dashboard/detection-donut-chart.tsx b/src/components/dashboard/detection-donut-chart.tsx index 53d54a6..30ae4a6 100644 --- a/src/components/dashboard/detection-donut-chart.tsx +++ b/src/components/dashboard/detection-donut-chart.tsx @@ -1,159 +1,156 @@ "use client" -import { PieChart, Pie, Cell, ResponsiveContainer, Legend, Tooltip } from "recharts" +import * as React from "react" import { Loader2 } from "lucide-react" +import { Label, Pie, PieChart } from "recharts" + +import { + ChartContainer, + ChartTooltip, + ChartTooltipContent, + type ChartConfig, +} from "@/components/ui/chart" interface DetectionDonutChartProps { - defectedSignboard: number - pothole: number - roadCrack: number - damagedRoadMarking: number - goodSignboard: number - isLoading?: boolean + defectedSignboard: number + pothole: number + roadCrack: number + damagedRoadMarking: number + goodSignboard: number + isLoading?: boolean } -const COLORS = { - defectedSignboard: "#3b82f6", // Blue - pothole: "#ef4444", // Red - roadCrack: "#f59e0b", // Amber/Orange - damagedRoadMarking: "#6366f1", // Indigo - goodSignboard: "#10b981" // Emerald -} +const chartConfig = { + pothole: { + label: "Potholes", + color: "var(--chart-1)", + }, + defectedSignboard: { + label: "Defected Signboards", + color: "var(--chart-2)", + }, + roadCrack: { + label: "Road Cracks", + color: "var(--chart-3)", + }, + damagedRoadMarking: { + label: "Damaged Markings", + color: "var(--chart-4)", + }, + goodSignboard: { + label: "Good Signboards", + color: "var(--chart-5)", + }, +} satisfies ChartConfig export function DetectionDonutChart({ - defectedSignboard, - pothole, - roadCrack, - damagedRoadMarking, - goodSignboard, - isLoading = false + defectedSignboard, + pothole, + roadCrack, + damagedRoadMarking, + goodSignboard, + isLoading = false, }: DetectionDonutChartProps) { - if (isLoading) { - return ( -
- -
- ) - } + const chartData = React.useMemo( + () => + [ + { type: "pothole", count: pothole, fill: "var(--color-pothole)" }, + { + type: "defectedSignboard", + count: defectedSignboard, + fill: "var(--color-defectedSignboard)", + }, + { type: "roadCrack", count: roadCrack, fill: "var(--color-roadCrack)" }, + { + type: "damagedRoadMarking", + count: damagedRoadMarking, + fill: "var(--color-damagedRoadMarking)", + }, + { + type: "goodSignboard", + count: goodSignboard, + fill: "var(--color-goodSignboard)", + }, + ].filter((item) => item.count > 0), + [ + pothole, + defectedSignboard, + roadCrack, + damagedRoadMarking, + goodSignboard, + ] + ) - const total = defectedSignboard + pothole + roadCrack + damagedRoadMarking + goodSignboard - - if (total === 0) { - return ( -
-

No detections found

-

Process videos to see data

-
- ) - } - - const data = [ - { name: "Defected Signboards", value: defectedSignboard, color: COLORS.defectedSignboard }, - { name: "Potholes", value: pothole, color: COLORS.pothole }, - { name: "Road Cracks", value: roadCrack, color: COLORS.roadCrack }, - { name: "Damaged Markings", value: damagedRoadMarking, color: COLORS.damagedRoadMarking }, - { name: "Good Signboards", value: goodSignboard, color: COLORS.goodSignboard } - ].filter(item => item.value > 0) + const totalDetections = React.useMemo(() => { + return chartData.reduce((acc, curr) => acc + curr.count, 0) + }, [chartData]) + if (isLoading) { return ( -
- - - - - - - - - - - - - - - - - - - - - - - - - - {data.map((entry, index) => { - const gradId = entry.name === "Potholes" ? "gradPothole" : - entry.name === "Defected Signboards" ? "gradDefectedSign" : - entry.name === "Road Cracks" ? "gradCrack" : - entry.name === "Damaged Markings" ? "gradMarking" : "gradGoodSign" - return ( - - ) - })} - - { - if (active && payload && payload.length) { - const data = payload[0] - return ( -
-

{data.name}

-

- Count: {data.value} -

-

- {((Number(data.value) / total) * 100).toFixed(1)}% of total -

-
- ) - } - return null - }} - /> - ( -
- {payload?.map((entry, index) => ( -
-
- - {entry.value}: {data[index].value} - -
- ))} -
- )} - /> - - - {/* Center label */} -
-
-

{total}

-

Total

-
-
-
+
+ +
) + } + + if (totalDetections === 0) { + return ( +
+

No detections found

+

Process videos to see data

+
+ ) + } + + return ( + + + } + /> + + + + + ) } + diff --git a/src/components/dashboard/location-bar-chart.tsx b/src/components/dashboard/location-bar-chart.tsx index d60fe70..ac5cddf 100644 --- a/src/components/dashboard/location-bar-chart.tsx +++ b/src/components/dashboard/location-bar-chart.tsx @@ -1,179 +1,105 @@ "use client" -import { BarChart, Bar, XAxis, YAxis, CartesianGrid, Tooltip, ResponsiveContainer, Legend } from "recharts" +import * as React from "react" +import { Bar, BarChart, CartesianGrid, XAxis, YAxis } from "recharts" import { Loader2 } from "lucide-react" +import { + ChartContainer, + ChartTooltip, + ChartTooltipContent, + type ChartConfig, +} from "@/components/ui/chart" + interface LocationData { - name: string - defected_sign_board: number - pothole: number - road_crack: number - damaged_road_marking: number - good_sign_board: number - total: number + name: string + defected_sign_board: number + pothole: number + road_crack: number + damaged_road_marking: number + total: number } interface LocationBarChartProps { - data: LocationData[] - isLoading?: boolean + data: LocationData[] + isLoading?: boolean } -const COLORS = { - defected_sign_board: "#60a5fa", // Lighter Blue - pothole: "#ff8a8a", // Lighter Red - road_crack: "#fbbf24", // Lighter Orange - damaged_road_marking: "#818cf8", // Lighter Indigo - good_sign_board: "#34d399" // Lighter Emerald -} +const chartConfig = { + pothole: { + label: "Potholes", + color: "var(--chart-1)", + }, + defected_sign_board: { + label: "Defected Signboards", + color: "var(--chart-2)", + }, + road_crack: { + label: "Road Cracks", + color: "var(--chart-3)", + }, + damaged_road_marking: { + label: "Damaged Markings", + color: "var(--chart-4)", + }, +} satisfies ChartConfig export function LocationBarChart({ data, isLoading = false }: LocationBarChartProps) { - if (isLoading) { - return ( -
- -
- ) - } - - if (data.length === 0) { - return ( -
-

No location data available

-

Process videos to see detections by location

-
- ) - } - + if (isLoading) { return ( -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - { - if (active && payload && payload.length) { - return ( -
-

{label}

- {payload.map((entry, index) => ( -
-
- {(entry.name as string).replace(/_/g, ' ')}: - {entry.value} -
- ))} -
- ) - } - return null - }} - /> - ( -
- {payload?.map((entry, index) => ( -
-
- - {(entry.value as string).replace(/_/g, ' ')} - -
- ))} -
- )} - /> - - - - - - - -
+
+ +
) + } + + if (data.length === 0) { + return ( +
+

No location data available

+

Process videos to see detections by location

+
+ ) + } + + // Filter out good signboards for a more "damage-focused" standard chart as per multiple bar example + const chartData = data.map(item => ({ + name: item.name, + pothole: item.pothole, + defected_sign_board: item.defected_sign_board, + road_crack: item.road_crack, + damaged_road_marking: item.damaged_road_marking, + })) + + return ( +
+ + + + value.length > 8 ? `${value.slice(0, 8)}...` : value} + fontSize={12} + /> + + } + /> + + + + + + +
+ ) } diff --git a/src/components/dashboard/stats-card.tsx b/src/components/dashboard/stats-card.tsx index f53859b..511b232 100644 --- a/src/components/dashboard/stats-card.tsx +++ b/src/components/dashboard/stats-card.tsx @@ -19,7 +19,7 @@ export function StatsCard({ isLoading = false }: StatsCardProps) { return ( - +

diff --git a/src/components/data-table/Footer/index.tsx b/src/components/data-table/Footer/index.tsx index d899470..256eb92 100644 --- a/src/components/data-table/Footer/index.tsx +++ b/src/components/data-table/Footer/index.tsx @@ -1,64 +1,69 @@ "use client"; import { Table } from "@tanstack/react-table"; import { - Select, - SelectContent, - SelectItem, - SelectTrigger, - SelectValue, + Select, + SelectContent, + SelectItem, + SelectTrigger, + SelectValue, } from "@/components/ui/select"; import { Button } from "@/components/ui/button"; import { ChevronLeft, ChevronRight } from "lucide-react"; export function TableFooter({ table }: { table: Table }) { - return ( -
-
-

Rows per page

- -
- -
- Page {table.getState().pagination.pageIndex + 1} of{" "} - {table.getPageCount() || 1} -
+ return ( +
+
+
+

Rows per page

+ +
+
-
- - -
-
- ); +
+
+ Page {table.getState().pagination.pageIndex + 1} + / + {table.getPageCount() || 1} +
+ +
+ + +
+
+
+ ); } diff --git a/src/components/data-table/Header/SearchBar.tsx b/src/components/data-table/Header/SearchBar.tsx index 6b5a6e2..fe96484 100644 --- a/src/components/data-table/Header/SearchBar.tsx +++ b/src/components/data-table/Header/SearchBar.tsx @@ -3,15 +3,15 @@ import { SearchIcon } from "lucide-react"; import { Input } from "@/components/ui/input"; const SearchBar = () => { - return ( -
- - -
- ); + return ( +
+ + +
+ ); }; export default SearchBar; diff --git a/src/components/data-table/Header/index.tsx b/src/components/data-table/Header/index.tsx index a235cad..46ab099 100644 --- a/src/components/data-table/Header/index.tsx +++ b/src/components/data-table/Header/index.tsx @@ -1,45 +1,47 @@ "use client"; +import React from "react"; import { Button } from "@/components/ui/button"; import SearchBar from "./SearchBar"; -import { PlusIcon } from "lucide-react"; +import { FolderPlus, Settings2, SlidersHorizontal } from "lucide-react"; +import { Badge } from "@/components/ui/badge"; interface TopHeaderProps { - title?: string; - itemCount?: number; - onAddNew?: () => void; - addButtonText?: string; + title?: string; + itemCount?: number; + onAddNew?: () => void; + addButtonText?: string; } const TopHeader = ({ title, itemCount, onAddNew, addButtonText = "Add New" }: TopHeaderProps) => { - return ( -
-
-
-

{title}

- {itemCount !== undefined && ( - - {itemCount} - - )} + return ( +
+ {/* Connected Summary Block */} +
+
+ Total {title || "Items"} : + {itemCount || 0} +
+
+ +
+ {/* Search Bar Hidden for now as per requirement */} + {/*
+ +
*/} + + {/* Add New Button moved to PageHeader */} + {/* {onAddNew && ( + + )} */} +
- - {onAddNew && ( - - )} -
- -
- -
-
- ); + ); }; export default TopHeader; diff --git a/src/components/data-table/TableHeader.tsx b/src/components/data-table/TableHeader.tsx index 51ba3ea..43b3d3b 100644 --- a/src/components/data-table/TableHeader.tsx +++ b/src/components/data-table/TableHeader.tsx @@ -1,33 +1,38 @@ "use client"; import { flexRender } from "@tanstack/react-table"; import { - TableHead, - TableHeader as ShadTableHeader, - TableRow, + TableHead, + TableHeader as ShadTableHeader, + TableRow, } from "@/components/ui/table"; import { Table } from "@tanstack/react-table"; +import { ChevronDown, ChevronsUpDown } from "lucide-react"; const TableHeader = ({ table }: { table: Table }) => { - return ( - - {table.getHeaderGroups().map((headerGroup) => ( - - {headerGroup.headers.map((header) => { - return ( - - {header.isPlaceholder - ? null - : flexRender( - header.column.columnDef.header, - header.getContext() - )} - - ); - })} - - ))} - - ); + return ( + + {table.getHeaderGroups().map((headerGroup) => ( + + {headerGroup.headers.map((header) => { + return ( + + {header.isPlaceholder + ? null + : ( +
+ {flexRender( + header.column.columnDef.header, + header.getContext() + )} +
+ )} + + ); + })} + + ))} + + ); }; export default TableHeader; diff --git a/src/components/data-table/index.tsx b/src/components/data-table/index.tsx index d86e67f..dbb0abf 100644 --- a/src/components/data-table/index.tsx +++ b/src/components/data-table/index.tsx @@ -1,20 +1,19 @@ "use client"; import React from "react"; import { - ColumnDef, - SortingState, - flexRender, - getCoreRowModel, - useReactTable, - getSortedRowModel, - getPaginationRowModel, + ColumnDef, + SortingState, + flexRender, + getCoreRowModel, + useReactTable, + getSortedRowModel, + getPaginationRowModel, } from "@tanstack/react-table"; import { Table, TableBody, TableCell, TableRow } from "@/components/ui/table"; import { Skeleton } from "@/components/ui/skeleton"; import { Button } from "@/components/ui/button"; -import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"; -import { Edit2, Trash2 } from "lucide-react"; +import { Edit3, MoreHorizontal, Trash2 } from "lucide-react"; import TopHeader from "./Header"; import TableHeader from "./TableHeader"; @@ -22,165 +21,169 @@ import { TableFooter } from "./Footer"; import { cn } from "@/lib/utils"; export interface DataTableProps { - columns: ColumnDef[]; - data: TData[]; - title?: string; - onAddNew?: () => void; - addButtonText?: string; - isLoading?: boolean; - onEdit?: (item: TData) => void; - onDelete?: (item: TData) => void; - pagination?: { - skip: number; - limit: number; - totalItems?: number; - onPageChange: (newSkip: number) => void; - onLimitChange: (newLimit: number) => void; - }; + columns: ColumnDef[]; + data: TData[]; + title?: string; + onAddNew?: () => void; + addButtonText?: string; + isLoading?: boolean; + onEdit?: (item: TData) => void; + onDelete?: (item: TData) => void; + pagination?: { + skip: number; + limit: number; + totalItems?: number; + onPageChange: (newSkip: number) => void; + onLimitChange: (newLimit: number) => void; + }; } export function DataTable({ - columns: initialColumns, - data, - title, - onAddNew, - addButtonText, - isLoading = false, - onEdit, - onDelete, - pagination, -}: DataTableProps) { - const [rowSelection, setRowSelection] = React.useState({}); - const [sorting, setSorting] = React.useState([]); - - const columns = React.useMemo(() => { - const cols = [...initialColumns]; - if (onEdit || onDelete) { - cols.push({ - id: "actions", - header: () =>
Actions
, - cell: ({ row }) => { - const item = row.original; - return ( -
- {onEdit && ( - - )} - {onDelete && ( - - )} -
- ); - }, - }); - } - return cols; - }, [initialColumns, onEdit, onDelete]); - - const table = useReactTable({ + columns: initialColumns, data, - columns, - getCoreRowModel: getCoreRowModel(), - onRowSelectionChange: setRowSelection, - onSortingChange: setSorting, - getSortedRowModel: getSortedRowModel(), - getPaginationRowModel: getPaginationRowModel(), - manualPagination: !!pagination, - pageCount: pagination?.totalItems ? Math.ceil(pagination.totalItems / pagination.limit) : -1, - state: { - rowSelection, - sorting, - pagination: pagination ? { - pageIndex: Math.floor(pagination.skip / pagination.limit), - pageSize: pagination.limit, - } : undefined, - }, - onPaginationChange: (updater) => { - if (typeof updater === 'function' && pagination) { - const newState = updater({ + title, + onAddNew, + addButtonText, + isLoading = false, + onEdit, + onDelete, + pagination, +}: DataTableProps) { + const [rowSelection, setRowSelection] = React.useState({}); + const [sorting, setSorting] = React.useState([]); + + const columns = React.useMemo(() => { + const cols: ColumnDef[] = [ + ...initialColumns, + ]; + + if (onEdit || onDelete) { + cols.push({ + id: "actions", + header: () =>
Action
, + cell: ({ row }) => { + const item = row.original; + return ( +
+ {onEdit && ( + + )} + {onDelete && ( + + )} +
+ ); + }, + }); + } + return cols; + }, [initialColumns, onEdit, onDelete]); + + const table = useReactTable({ + data, + columns, + getCoreRowModel: getCoreRowModel(), + onRowSelectionChange: setRowSelection, + onSortingChange: setSorting, + getSortedRowModel: getSortedRowModel(), + getPaginationRowModel: getPaginationRowModel(), + manualPagination: !!pagination, + pageCount: pagination?.totalItems ? Math.ceil(pagination.totalItems / pagination.limit) : -1, + state: { + rowSelection, + sorting, + pagination: pagination ? { pageIndex: Math.floor(pagination.skip / pagination.limit), pageSize: pagination.limit, - }); - pagination.onLimitChange(newState.pageSize); - pagination.onPageChange(newState.pageIndex * newState.pageSize); - } - }, - initialState: { - pagination: { - pageSize: 10, - pageIndex: 0, - }, - }, - }); + } : undefined, + }, + onPaginationChange: (updater) => { + if (typeof updater === 'function' && pagination) { + const newState = updater({ + pageIndex: Math.floor(pagination.skip / pagination.limit), + pageSize: pagination.limit, + }); + pagination.onLimitChange(newState.pageSize); + pagination.onPageChange(newState.pageIndex * newState.pageSize); + } + }, + }); - return ( -
- + return ( +
+
+ -
- - - - {isLoading ? ( - Array.from({ length: 5 }).map((_, idx) => ( - - {columns.map((_, colIdx) => ( - - - - ))} - - )) - ) : table.getRowModel().rows?.length ? ( - table.getRowModel().rows.map((row) => ( - - {row.getVisibleCells().map((cell) => ( - - {flexRender( - cell.column.columnDef.cell, - cell.getContext() - )} - - ))} - - )) - ) : ( - - - No results found. - - - )} - -
-
- - -
- ); +
+ + + + {isLoading ? ( + Array.from({ length: 5 }).map((_, idx) => ( + + {columns.map((_, colIdx) => ( + + + + ))} + + )) + ) : table.getRowModel().rows?.length ? ( + table.getRowModel().rows.map((row) => ( + + {row.getVisibleCells().map((cell) => ( + + {flexRender( + cell.column.columnDef.cell, + cell.getContext() + )} + + ))} + + )) + ) : ( + + +
+

No results found.

+

Try adjusting your filters or search terms.

+
+ + + )} + +
+
+ +
+
+ ); } diff --git a/src/components/page-header.tsx b/src/components/page-header.tsx index 7a82506..d9460c3 100644 --- a/src/components/page-header.tsx +++ b/src/components/page-header.tsx @@ -7,23 +7,31 @@ interface PageHeaderProps { description: string icon?: LucideIcon children?: React.ReactNode + actions?: React.ReactNode } -export function PageHeader({ title, description, icon: Icon, children }: PageHeaderProps) { +export function PageHeader({ title, description, icon: Icon, children, actions }: PageHeaderProps) { return ( -
-
- {Icon && } - {children} -
-
-

- {title} -

-

- {description} -

+
+
+ {/*
+ {Icon && } + {children} +
*/} +
+

+ {title} +

+

+ {description} +

+
+ {actions && ( +
+ {actions} +
+ )}
) } diff --git a/src/components/ui/badge.tsx b/src/components/ui/badge.tsx index fc4126b..6eb2a05 100644 --- a/src/components/ui/badge.tsx +++ b/src/components/ui/badge.tsx @@ -1,42 +1,44 @@ -import * as React from 'react' -import { Slot } from '@radix-ui/react-slot' -import { cva, type VariantProps } from 'class-variance-authority' +import * as React from "react" +import { cva, type VariantProps } from "class-variance-authority" +import { Slot } from "radix-ui" -import { cn } from '@/lib/utils' +import { cn } from "@/lib/utils" const badgeVariants = cva( - 'inline-flex items-center justify-center rounded-md border px-2 py-0.5 text-xs font-medium w-fit whitespace-nowrap shrink-0 [&>svg]:size-3 gap-1 [&>svg]:pointer-events-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive transition-[color,box-shadow] overflow-hidden', + "inline-flex w-fit shrink-0 items-center justify-center gap-1 overflow-hidden rounded-full border border-transparent px-2 py-0.5 text-xs font-medium whitespace-nowrap transition-[color,box-shadow] focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 [&>svg]:pointer-events-none [&>svg]:size-3", { variants: { variant: { - default: - 'border-transparent bg-primary text-primary-foreground [a&]:hover:bg-primary/90', + default: "bg-primary text-primary-foreground [a&]:hover:bg-primary/90", secondary: - 'border-transparent bg-secondary text-secondary-foreground [a&]:hover:bg-secondary/90', + "bg-secondary text-secondary-foreground [a&]:hover:bg-secondary/90", destructive: - 'border-transparent bg-destructive text-white [a&]:hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60', + "bg-destructive text-white focus-visible:ring-destructive/20 dark:bg-destructive/60 dark:focus-visible:ring-destructive/40 [a&]:hover:bg-destructive/90", outline: - 'text-foreground [a&]:hover:bg-accent [a&]:hover:text-accent-foreground', + "border-border text-foreground [a&]:hover:bg-accent [a&]:hover:text-accent-foreground", + ghost: "[a&]:hover:bg-accent [a&]:hover:text-accent-foreground", + link: "text-primary underline-offset-4 [a&]:hover:underline", }, }, defaultVariants: { - variant: 'default', + variant: "default", }, - }, + } ) function Badge({ className, - variant, + variant = "default", asChild = false, ...props -}: React.ComponentProps<'span'> & +}: React.ComponentProps<"span"> & VariantProps & { asChild?: boolean }) { - const Comp = asChild ? Slot : 'span' + const Comp = asChild ? Slot.Root : "span" return ( diff --git a/src/components/ui/breadcrumb.tsx b/src/components/ui/breadcrumb.tsx index eb88f32..f0fa16e 100644 --- a/src/components/ui/breadcrumb.tsx +++ b/src/components/ui/breadcrumb.tsx @@ -1,6 +1,6 @@ import * as React from "react" -import { Slot } from "@radix-ui/react-slot" import { ChevronRight, MoreHorizontal } from "lucide-react" +import { Slot } from "radix-ui" import { cn } from "@/lib/utils" @@ -13,7 +13,7 @@ function BreadcrumbList({ className, ...props }: React.ComponentProps<"ol">) {
    & { asChild?: boolean }) { - const Comp = asChild ? Slot : "a" + const Comp = asChild ? Slot.Root : "a" return ( ) @@ -56,7 +56,7 @@ function BreadcrumbPage({ className, ...props }: React.ComponentProps<"span">) { role="link" aria-disabled="true" aria-current="page" - className={cn("text-foreground font-normal", className)} + className={cn("font-normal text-foreground", className)} {...props} /> ) diff --git a/src/components/ui/popover.tsx b/src/components/ui/popover.tsx index 0a1a378..30058c4 100644 --- a/src/components/ui/popover.tsx +++ b/src/components/ui/popover.tsx @@ -1,9 +1,9 @@ -'use client' +"use client" -import * as React from 'react' -import * as PopoverPrimitive from '@radix-ui/react-popover' +import * as React from "react" +import { Popover as PopoverPrimitive } from "radix-ui" -import { cn } from '@/lib/utils' +import { cn } from "@/lib/utils" function Popover({ ...props @@ -19,7 +19,7 @@ function PopoverTrigger({ function PopoverContent({ className, - align = 'center', + align = "center", sideOffset = 4, ...props }: React.ComponentProps) { @@ -30,8 +30,8 @@ function PopoverContent({ align={align} sideOffset={sideOffset} className={cn( - 'bg-popover text-popover-foreground z-50 w-72 origin-(--radix-popover-content-transform-origin) rounded-md border p-4 shadow-md outline-hidden', - className, + "z-50 w-72 origin-(--radix-popover-content-transform-origin) rounded-md border bg-popover p-4 text-popover-foreground shadow-md outline-hidden data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95", + className )} {...props} /> @@ -45,4 +45,45 @@ function PopoverAnchor({ return } -export { Popover, PopoverTrigger, PopoverContent, PopoverAnchor } +function PopoverHeader({ className, ...props }: React.ComponentProps<"div">) { + return ( +
    + ) +} + +function PopoverTitle({ className, ...props }: React.ComponentProps<"h2">) { + return ( +
    + ) +} + +function PopoverDescription({ + className, + ...props +}: React.ComponentProps<"p">) { + return ( +

    + ) +} + +export { + Popover, + PopoverTrigger, + PopoverContent, + PopoverAnchor, + PopoverHeader, + PopoverTitle, + PopoverDescription, +} diff --git a/src/components/ui/scroll-area.tsx b/src/components/ui/scroll-area.tsx index db7e9c5..73c4eb1 100644 --- a/src/components/ui/scroll-area.tsx +++ b/src/components/ui/scroll-area.tsx @@ -1,9 +1,9 @@ -'use client' +"use client" -import * as React from 'react' -import * as ScrollAreaPrimitive from '@radix-ui/react-scroll-area' +import * as React from "react" +import { ScrollArea as ScrollAreaPrimitive } from "radix-ui" -import { cn } from '@/lib/utils' +import { cn } from "@/lib/utils" function ScrollArea({ className, @@ -13,12 +13,12 @@ function ScrollArea({ return ( {children} @@ -30,7 +30,7 @@ function ScrollArea({ function ScrollBar({ className, - orientation = 'vertical', + orientation = "vertical", ...props }: React.ComponentProps) { return ( @@ -38,18 +38,18 @@ function ScrollBar({ data-slot="scroll-area-scrollbar" orientation={orientation} className={cn( - 'flex touch-none p-px select-none', - orientation === 'vertical' && - 'h-full w-2.5 border-l border-l-transparent', - orientation === 'horizontal' && - 'h-2.5 flex-col border-t border-t-transparent', - className, + "flex touch-none p-px transition-colors select-none", + orientation === "vertical" && + "h-full w-2.5 border-l border-l-transparent", + orientation === "horizontal" && + "h-2.5 flex-col border-t border-t-transparent", + className )} {...props} > ) diff --git a/src/components/ui/table.tsx b/src/components/ui/table.tsx index e27f183..be6f349 100644 --- a/src/components/ui/table.tsx +++ b/src/components/ui/table.tsx @@ -4,11 +4,15 @@ import * as React from "react" import { cn } from "@/lib/utils" -function Table({ className, ...props }: React.ComponentProps<"table">) { +function Table({ + className, + containerClassName, + ...props +}: React.ComponentProps<"table"> & { containerClassName?: string }) { return (