diff --git a/apps/client/app/components/app-breadcrumb.tsx b/apps/client/app/components/app-breadcrumb.tsx index 63b03c4..ca215dc 100644 --- a/apps/client/app/components/app-breadcrumb.tsx +++ b/apps/client/app/components/app-breadcrumb.tsx @@ -8,7 +8,6 @@ import { BreadcrumbSeparator, } from "~/components/ui/breadcrumb"; import { useBreadcrumbs } from "~/lib/breadcrumbs"; -import { cn } from "../lib/utils"; export function AppBreadcrumb() { const breadcrumbs = useBreadcrumbs(); @@ -17,17 +16,12 @@ export function AppBreadcrumb() { - {breadcrumbs.length === 1 && ( - - Ironmount - - )} {breadcrumbs.map((breadcrumb, index) => { const isLast = index === breadcrumbs.length - 1; return (
- + {isLast || breadcrumb.isCurrentPage ? ( {breadcrumb.label} ) : breadcrumb.href ? ( diff --git a/apps/client/app/components/app-sidebar.tsx b/apps/client/app/components/app-sidebar.tsx index dae9feb..989a72f 100644 --- a/apps/client/app/components/app-sidebar.tsx +++ b/apps/client/app/components/app-sidebar.tsx @@ -1,10 +1,11 @@ -import { Database, HardDrive } from "lucide-react"; -import { NavLink } from "react-router"; +import { Database, HardDrive, Mountain } from "lucide-react"; +import { Link, NavLink } from "react-router"; import { Sidebar, SidebarContent, SidebarGroup, SidebarGroupContent, + SidebarHeader, SidebarMenu, SidebarMenuButton, SidebarMenuItem, @@ -31,7 +32,19 @@ export function AppSidebar() { return ( -
+ + + + + Ironmount + + + diff --git a/apps/client/app/components/layout.tsx b/apps/client/app/components/layout.tsx index d757d0a..a1bd202 100644 --- a/apps/client/app/components/layout.tsx +++ b/apps/client/app/components/layout.tsx @@ -71,7 +71,7 @@ export default function Layout({ loaderData }: Route.ComponentProps) { )}
-
+
diff --git a/apps/client/app/routes.ts b/apps/client/app/routes.ts index e7e0458..fb586e3 100644 --- a/apps/client/app/routes.ts +++ b/apps/client/app/routes.ts @@ -4,6 +4,7 @@ export default [ route("onboarding", "./routes/onboarding.tsx"), route("login", "./routes/login.tsx"), layout("./components/layout.tsx", [ + route("/", "./routes/root.tsx"), route("volumes", "./routes/home.tsx"), route("volumes/:name", "./routes/details.tsx"), ]), diff --git a/apps/client/app/routes/root.tsx b/apps/client/app/routes/root.tsx new file mode 100644 index 0000000..31cf3bd --- /dev/null +++ b/apps/client/app/routes/root.tsx @@ -0,0 +1,5 @@ +import { redirect } from "react-router"; + +export const clientLoader = async () => { + return redirect("/volumes"); +};