diff --git a/web/src/components/app-shell.tsx b/web/src/components/app-shell.tsx index 7777e06..abacf22 100644 --- a/web/src/components/app-shell.tsx +++ b/web/src/components/app-shell.tsx @@ -4,9 +4,8 @@ import { useState, useEffect, Suspense, createContext, useContext } from "react" import { usePathname, useSearchParams } from "next/navigation"; import Link from "next/link"; import { - ChevronRightIcon, + CircleIcon, LayoutGridIcon, - PlusIcon, UserIcon, UsersIcon, InboxIcon, @@ -55,22 +54,19 @@ function SidebarNavItem({ href={href} title={collapsed ? label : undefined} className={cn( - "group flex items-center px-2 py-1.5 rounded-md text-[13px] transition-all duration-150 mb-0.5", + "group flex items-center px-2.5 py-1.5 rounded-md text-[13px] transition-colors", collapsed ? "justify-center w-full" : "justify-between", active - ? "bg-sidebar-primary text-sidebar-primary-foreground font-semibold shadow-[inset_3px_0_0_color-mix(in_oklch,var(--sidebar-primary-foreground)_55%,transparent)]" - : "text-sidebar-foreground/70 hover:text-sidebar-foreground hover:bg-sidebar-accent font-normal" + ? "bg-sidebar-accent text-sidebar-foreground font-medium" + : "text-sidebar-foreground/55 hover:text-sidebar-foreground hover:bg-sidebar-accent/50 font-normal" )} > - - - {!collapsed && label} + + + {!collapsed && {label}} {!collapsed && count !== undefined && count > 0 && ( - + {count} )} @@ -93,11 +89,6 @@ function SidebarNav() { const [dashboards, setDashboards] = useState([]); const [currentUserId, setCurrentUserId] = useState(null); const [myTeamId, setMyTeamId] = useState(null); - const [expanded, setExpanded] = useState>({ - dashboards: true, - queues: true, - views: true, - }); const [newDashboardName, setNewDashboardName] = useState(""); const [addingDashboard, setAddingDashboard] = useState(false); @@ -220,21 +211,14 @@ function SidebarNav() { {dashboards.length > 0 && ( -
+
{!collapsed && ( - +
)} - {expanded.dashboards && dashboards.length > 0 && ( -
+ {dashboards.length > 0 && ( +