diff --git a/src/app/(dashboard)/layout.tsx b/src/app/(dashboard)/layout.tsx index 1b0d6a2..2ddee16 100644 --- a/src/app/(dashboard)/layout.tsx +++ b/src/app/(dashboard)/layout.tsx @@ -28,11 +28,7 @@ export default async function DashboardLayout({ return ( - + {children} diff --git a/src/app/(dashboard)/loading.tsx b/src/app/(dashboard)/loading.tsx index 39bec81..500922a 100644 --- a/src/app/(dashboard)/loading.tsx +++ b/src/app/(dashboard)/loading.tsx @@ -11,14 +11,14 @@ export default function DashboardLoading() {
{Array.from({ length: 4 }).map((_, i) => ( -
+
))}
-
+
{Array.from({ length: 6 }).map((_, i) => ( diff --git a/src/components/alerts/AlertTable.tsx b/src/components/alerts/AlertTable.tsx index 1e7ef2d..912c11a 100644 --- a/src/components/alerts/AlertTable.tsx +++ b/src/components/alerts/AlertTable.tsx @@ -172,7 +172,7 @@ export function AlertTable({
{filtered.length === 0 ? ( -
+
No alerts found
) : ( @@ -181,7 +181,7 @@ export function AlertTable({
diff --git a/src/components/credentials/Webhooks.tsx b/src/components/credentials/Webhooks.tsx index fef6cc8..439b1fc 100644 --- a/src/components/credentials/Webhooks.tsx +++ b/src/components/credentials/Webhooks.tsx @@ -71,7 +71,7 @@ export function Webhooks({ initial, isAdmin }: Props) { } return ( -
+

Notification webhooks

diff --git a/src/components/dashboard/SetupChecklist.tsx b/src/components/dashboard/SetupChecklist.tsx index 66c9fde..f225a2b 100644 --- a/src/components/dashboard/SetupChecklist.tsx +++ b/src/components/dashboard/SetupChecklist.tsx @@ -71,7 +71,7 @@ export function SetupChecklist({
  • @@ -110,7 +110,7 @@ export function SetupChecklist({

    )} -
    +

    Thanks for trying DataShield.

    It is an open-source project built to make breach exposure visible and actionable. diff --git a/src/components/dashboard/WidgetLibrary.tsx b/src/components/dashboard/WidgetLibrary.tsx index aebe4ee..95f758b 100644 --- a/src/components/dashboard/WidgetLibrary.tsx +++ b/src/components/dashboard/WidgetLibrary.tsx @@ -152,7 +152,7 @@ export function WidgetLibrary({ "group overflow-hidden rounded-xl border transition-all duration-200", isEnabled ? "border-primary/40 shadow-sm hover:border-primary/60" - : "border-border hover:border-muted-foreground/40" + : "border-border/60 hover:border-muted-foreground/40" )} > {/* Preview */} diff --git a/src/components/employees/EmployeeTable.tsx b/src/components/employees/EmployeeTable.tsx index f65ed3e..29b7fc1 100644 --- a/src/components/employees/EmployeeTable.tsx +++ b/src/components/employees/EmployeeTable.tsx @@ -151,7 +151,7 @@ export function EmployeeTable({ data }: { data: EmployeeRow[] }) {

    {/* Table */} -
    +
    {table.getHeaderGroups().map((hg) => ( diff --git a/src/components/layout/DashboardShell.tsx b/src/components/layout/DashboardShell.tsx index 48b5818..2575235 100644 --- a/src/components/layout/DashboardShell.tsx +++ b/src/components/layout/DashboardShell.tsx @@ -3,19 +3,16 @@ import type { ReactNode } from "react" import { Sidebar } from "./Sidebar" import { Topbar } from "./Topbar" -import { SidebarProvider } from "./SidebarContext" interface DashboardShellProps { - companyName: string - userEmail: string openAlerts: number children: ReactNode } -function Shell({ companyName, userEmail, openAlerts, children }: DashboardShellProps) { +export function DashboardShell({ openAlerts, children }: DashboardShellProps) { return ( -
    - +
    +
    {children}
    @@ -23,11 +20,3 @@ function Shell({ companyName, userEmail, openAlerts, children }: DashboardShellP
    ) } - -export function DashboardShell(props: DashboardShellProps) { - return ( - - - - ) -} diff --git a/src/components/layout/Sidebar.tsx b/src/components/layout/Sidebar.tsx index a532684..0d2d36b 100644 --- a/src/components/layout/Sidebar.tsx +++ b/src/components/layout/Sidebar.tsx @@ -1,14 +1,10 @@ "use client" +import type { ReactNode } from "react" import Link from "next/link" import { usePathname } from "next/navigation" import { signOut } from "next-auth/react" -import { useEffect, useRef } from "react" import { cn } from "@/lib/utils" -import { useSidebar } from "./SidebarContext" - -// Auto-close the floating sidebar after this idle delay (no pointer over it). -const AUTO_CLOSE_MS = 4000 import { LayoutDashboard, Users, @@ -19,7 +15,7 @@ import { KeyRound, Send, LogOut, - PanelLeftClose, + ShieldCheck, } from "lucide-react" const navItems = [ @@ -33,115 +29,83 @@ const navItems = [ { href: "/notifications", label: "Notifications", icon: Send }, ] +// Layers (within the aside stacking context): labels z-10 sit UNDER the rail +// surface z-20, icons/pills z-30 sit ABOVE it. A label starts tucked behind the +// surface and slides right on hover, so it emerges from under the panel. +function RailLabel({ children }: { children: ReactNode }) { + return ( + + + {children} + + + ) +} + interface SidebarProps { - companyName: string - userEmail: string openAlerts: number } -export function Sidebar({ companyName, userEmail, openAlerts }: SidebarProps) { +export function Sidebar({ openAlerts }: SidebarProps) { const pathname = usePathname() - const { open, toggle, close } = useSidebar() - const timer = useRef | null>(null) - const asideRef = useRef(null) - - const clearTimer = () => { - if (timer.current) clearTimeout(timer.current) - timer.current = null - } - const startTimer = () => { - clearTimer() - timer.current = setTimeout(close, AUTO_CLOSE_MS) - } - - // Start the idle countdown whenever the sidebar opens; hovering pauses it. - useEffect(() => { - if (open) startTimer() - else clearTimer() - return clearTimer - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [open]) - - // Close when clicking anywhere outside the panel. - useEffect(() => { - if (!open) return - const handler = (e: MouseEvent) => { - if (!asideRef.current?.contains(e.target as Node)) close() - } - document.addEventListener("mousedown", handler) - return () => document.removeEventListener("mousedown", handler) - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [open]) return ( -