From d996fff0db769ca2fb3ab7f5d6e0adeae3c0ba15 Mon Sep 17 00:00:00 2001
From: Theis Gaedigk <theis.gaedigk@icloud.com>
Date: Wed, 27 May 2026 10:14:51 +0200
Subject: [PATCH] fixed sidebar navigation

---
 frontend/src/components/Sidebar.tsx | 43 +++++++++++++----------------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/frontend/src/components/Sidebar.tsx b/frontend/src/components/Sidebar.tsx
index dd1792b..30b7018 100644
--- a/frontend/src/components/Sidebar.tsx
+++ b/frontend/src/components/Sidebar.tsx
@@ -3,16 +3,18 @@ import { Button, Typography } from "@mui/joy";
 import InventoryIcon from "@mui/icons-material/Inventory";
 import AddBoxIcon from "@mui/icons-material/AddBox";
 import AccountBoxIcon from "@mui/icons-material/AccountBox";
-import { useNavigate } from "@tanstack/react-router";
-import { useState } from "react";
+import { useNavigate, useMatchRoute } from "@tanstack/react-router";
 
 export const Sidebar = () => {
   const { t } = useTranslation();
   const navigate = useNavigate();
-  const currentURL = window.location.href;
-  const [currentPage, setCurrentPage] = useState(
-    currentURL.substring(currentURL.lastIndexOf("/") + 1),
-  );
+  const matchRoute = useMatchRoute();
+
+  const btnClass =
+    "h-11 w-full justify-start! rounded-2xl px-4 text-left text-sm font-semibold text-slate-700 transition hover:bg-white/80 hover:text-[#0b6bcb] [&_.MuiButton-startDecorator]:mr-3! [&_.MuiButton-startDecorator]:ml-0!";
+
+  const variant = (to: string) =>
+    !!matchRoute({ to, fuzzy: false }) ? "soft" : "plain";
 
   return (
     <aside className="flex h-full min-h-screen w-full max-w-70 flex-col gap-8 border-r border-white/80 bg-linear-to-b from-[#f7fbff] via-[#f2f6fb] to-[#eef3f9] px-6 py-8 shadow-[0_20px_60px_rgba(11,107,203,0.08)]">
@@ -30,41 +32,34 @@ export const Sidebar = () => {
           {t("app-subtitle")}
         </Typography>
       </div>
+
       <div className="flex flex-1 flex-col gap-2">
         <Button
-          onClick={() => {
-            navigate({ to: "/app/inventory" });
-            setCurrentPage("inventory");
-          }}
-          variant={currentPage === "inventory" ? "soft" : "plain"}
+          onClick={() => navigate({ to: "/app/inventory" })}
+          variant={variant("/app/inventory")}
           startDecorator={<InventoryIcon />}
-          className="h-11 w-full justify-start! rounded-2xl px-4 text-left text-sm font-semibold text-slate-700 transition hover:bg-white/80 hover:text-[#0b6bcb] [&_.MuiButton-startDecorator]:mr-3! [&_.MuiButton-startDecorator]:ml-0!"
+          className={btnClass}
         >
           {t("inventory")}
         </Button>
         <Button
-          onClick={() => {
-            navigate({ to: "/app/add-product" });
-            setCurrentPage("add-product");
-          }}
-          variant={currentPage === "add-product" ? "soft" : "plain"}
+          onClick={() => navigate({ to: "/app/add-product" })}
+          variant={variant("/app/add-product")}
           startDecorator={<AddBoxIcon />}
-          className="h-11 w-full justify-start! rounded-2xl px-4 text-left text-sm font-semibold text-slate-700 transition hover:bg-white/80 hover:text-[#0b6bcb] [&_.MuiButton-startDecorator]:mr-3! [&_.MuiButton-startDecorator]:ml-0!"
+          className={btnClass}
         >
           {t("add")}
         </Button>
         <Button
-          onClick={() => {
-            navigate({ to: "/app/profile" });
-            setCurrentPage("profile");
-          }}
-          variant={currentPage === "profile" ? "soft" : "plain"}
+          onClick={() => navigate({ to: "/app/profile" })}
+          variant={variant("/app/profile")}
           startDecorator={<AccountBoxIcon />}
-          className="h-11 w-full justify-start! rounded-2xl px-4 text-left text-sm font-semibold text-slate-700 transition hover:bg-white/80 hover:text-[#0b6bcb] [&_.MuiButton-startDecorator]:mr-3! [&_.MuiButton-startDecorator]:ml-0!"
+          className={btnClass}
         >
           {t("profile")}
         </Button>
       </div>
+
       <div className="rounded-2xl border border-white/70 bg-white/80 px-4 py-3 text-xs font-semibold uppercase tracking-[0.2em] text-[#0b6bcb] shadow-[0_12px_30px_rgba(12,38,78,0.12)]">
         Stockhome
       </div>