refactor: update ui and make it modern

.gitignore

@@ -23,6 +23,7 @@ tsconfig.tsbuildinfo
 
 # Icon must end with two \r
 
+.claude
 
 # Thumbnails
 ._*

frontend/package.json

@@ -16,8 +16,8 @@
   "dependencies": {
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.1",
-    "@fontsource/inter": "^5.2.8",
-    "@mui/icons-material": "^9.0.1",
+    "@fontsource/ibm-plex-mono": "^5.3.0",
+    "@fontsource/ibm-plex-sans": "^5.3.0",
     "@mui/joy": "^5.0.0-beta.52",
     "@tailwindcss/vite": "^4.3.0",
     "@tanstack/react-form": "^1.32.0",

frontend/src/components/AmountStepper.tsx

@@ -0,0 +1,61 @@
+import { IconButton, Input } from "@mui/joy";
+import { Minus, Plus } from "lucide-react";
+
+interface AmountStepperProps {
+  value: number;
+  onChange: (value: number) => void;
+  onBlur?: () => void;
+  min?: number;
+}
+
+export const AmountStepper = ({
+  value,
+  onChange,
+  onBlur,
+  min = 0,
+}: AmountStepperProps) => {
+  const step = (delta: number) => onChange(Math.max(min, (value || 0) + delta));
+
+  return (
+    <div className="flex items-stretch overflow-hidden rounded-2xl border border-solid" style={{ borderColor: "var(--joy-palette-divider)" }}>
+      <IconButton
+        type="button"
+        variant="plain"
+        size="lg"
+        disabled={value <= min}
+        onClick={() => step(-1)}
+        className="transition-transform active:scale-90"
+        sx={{ borderRadius: 0 }}
+      >
+        <Minus size={16} />
+      </IconButton>
+      <Input
+        type="number"
+        value={value}
+        onChange={(e) => {
+          const nextValue = Number(e.target.value);
+          onChange(Number.isNaN(nextValue) ? min : Math.max(min, nextValue));
+        }}
+        onBlur={onBlur}
+        variant="plain"
+        size="lg"
+        slotProps={{ input: { className: "text-center font-semibold" } }}
+        sx={{
+          borderRadius: 0,
+          "--Input-focusedThickness": "0px",
+          bgcolor: "var(--joy-palette-background-surface)",
+        }}
+      />
+      <IconButton
+        type="button"
+        variant="plain"
+        size="lg"
+        onClick={() => step(1)}
+        className="transition-transform active:scale-90"
+        sx={{ borderRadius: 0 }}
+      >
+        <Plus size={16} />
+      </IconButton>
+    </div>
+  );
+};

frontend/src/components/LoginCard.tsx

@@ -5,12 +5,16 @@ import { signInUser } from "../utils/api/auth";
 import { useTranslation } from "react-i18next";
 import { useNavigate, useSearch } from "@tanstack/react-router";
 import { useEffect, useState } from "react";
+import { useColorScheme } from "@mui/joy/styles";
+import { Layers } from "lucide-react";
 import type { AlertInterface } from "../misc/interfaces";
+import { changeTranslation } from "../utils/uxFncs";
 import { MyAlert } from "./MyAlert.tsx";
 
 export const LoginCard = () => {
-  const { t } = useTranslation();
+  const { t, i18n } = useTranslation();
   const navigate = useNavigate();
+  const { mode, setMode } = useColorScheme();
   const search: { loggedOut?: boolean } = useSearch({ from: "/login" });
   const [alert, setAlert] = useState<AlertInterface>({
     isAlert: false,
@@ -72,37 +76,59 @@ export const LoginCard = () => {
   });
 
   return (
-    <div
-      className="flex min-h-screen w-full items-center justify-center px-6 py-10"
-      style={{
-        background:
-          "radial-gradient(1200px circle at 20% 10%, var(--joy-palette-primary-100) 0%, var(--joy-palette-background-body) 40%, var(--joy-palette-background-level1) 100%)",
-      }}
-    >
-      <div className="mx-auto flex w-full max-w-4xl items-center justify-center">
-        <div
-          className="w-full max-w-md rounded-3xl p-8 backdrop-blur"
-          style={{
-            border: "1px solid var(--joy-palette-divider)",
-            backgroundColor: "var(--joy-palette-background-surface)",
-            boxShadow:
-              "0 24px 60px color-mix(in srgb, var(--joy-palette-primary-800) 18%, transparent)",
-          }}
-        >
-          <div className="mb-8 space-y-2">
+    <div className="flex min-h-screen w-full flex-col lg:flex-row">
+      <div
+        className="hidden flex-col justify-between px-12 py-10 lg:flex lg:w-1/2"
+        style={{ backgroundColor: "#0e1116", color: "#e8ecf2" }}
+      >
+        <div className="flex items-center gap-2">
+          <span className="flex h-8 w-8 items-center justify-center rounded-lg" style={{ backgroundColor: "#5b8def" }}>
+            <Layers size={16} color="white" />
+          </span>
+          <span className="text-lg font-bold">{t("app-title")}</span>
+        </div>
+        <div className="max-w-md space-y-3">
+          <h2 className="text-3xl font-bold" style={{ letterSpacing: "-0.03em" }}>
+            {t("login-tagline-1")}
+          </h2>
+          <p className="text-sm" style={{ color: "#8590a0" }}>
+            {t("login-tagline-2")}
+          </p>
+        </div>
+        <p className="text-xs" style={{ color: "#8590a0" }}>
+          v0.9 MVP
+        </p>
+      </div>
+
+      <div
+        className="flex flex-1 items-center justify-center px-6 py-10"
+        style={{ backgroundColor: "var(--joy-palette-background-body)" }}
+      >
+        <div className="w-full max-w-md space-y-6">
+          <div className="flex items-center gap-2 lg:hidden">
+            <span
+              className="flex h-8 w-8 items-center justify-center rounded-lg"
+              style={{ backgroundColor: "var(--joy-palette-primary-solidBg)" }}
+            >
+              <Layers size={16} color="white" />
+            </span>
+            <span className="text-lg font-bold" style={{ color: "var(--joy-palette-text-primary)" }}>
+              {t("app-title")}
+            </span>
+          </div>
+
+          <div className="space-y-2">
             <p
               className="text-xs font-semibold uppercase tracking-[0.3em]"
               style={{ color: "var(--joy-palette-primary-solidBg)" }}
             >
-              Stockhome
+              {t("app-title")}
             </p>
-            <h1
-              className="text-3xl font-semibold"
-              style={{ color: "var(--joy-palette-text-primary)" }}
-            >
+            <h1 className="text-3xl font-bold" style={{ color: "var(--joy-palette-text-primary)" }}>
               {t("login")}
             </h1>
           </div>
+
           <form
             className="space-y-5"
             onSubmit={(e) => {
@@ -111,11 +137,7 @@ export const LoginCard = () => {
             }}
           >
             {alert.isAlert && (
-              <MyAlert
-                type={alert.type}
-                header={alert.header}
-                text={alert.text}
-              />
+              <MyAlert type={alert.type} header={alert.header} text={alert.text} />
             )}
             <form.Field name="username">
               {(field) => (
@@ -126,10 +148,6 @@ export const LoginCard = () => {
                   variant="outlined"
                   size="lg"
                   className="rounded-2xl"
-                  sx={{
-                    bgcolor: "var(--joy-palette-background-surface)",
-                    boxShadow: "0 10px 24px var(--joy-palette-divider)",
-                  }}
                 />
               )}
             </form.Field>
@@ -143,10 +161,6 @@ export const LoginCard = () => {
                   variant="outlined"
                   size="lg"
                   className="rounded-2xl"
-                  sx={{
-                    bgcolor: "var(--joy-palette-background-surface)",
-                    boxShadow: "0 10px 24px var(--joy-palette-divider)",
-                  }}
                 />
               )}
             </form.Field>
@@ -156,15 +170,28 @@ export const LoginCard = () => {
               size="lg"
               color="primary"
               variant="solid"
-              className="w-full rounded-2xl transition hover:-translate-y-0.5"
-              sx={{
-                boxShadow:
-                  "0 16px 36px color-mix(in srgb, var(--joy-palette-primary-solidBg) 35%, transparent)",
-              }}
+              className="btn-lift w-full rounded-2xl"
             >
               {t("login")}
             </Button>
           </form>
+
+          <div
+            className="flex items-center justify-center gap-3 text-sm"
+            style={{ color: "var(--joy-palette-text-tertiary)" }}
+          >
+            <button type="button" onClick={changeTranslation} className="hover:underline">
+              {i18n.language === "de" ? "English" : "Deutsch"}
+            </button>
+            <span>|</span>
+            <button
+              type="button"
+              onClick={() => setMode(mode === "dark" ? "light" : "dark")}
+              className="hover:underline"
+            >
+              {mode === "dark" ? t("theme-light") : t("theme-dark")}
+            </button>
+          </div>
         </div>
       </div>
     </div>

frontend/src/components/Mono.tsx

@@ -0,0 +1,16 @@
+import type { ReactNode } from "react";
+
+interface MonoProps {
+  children: ReactNode;
+  className?: string;
+}
+
+// Small helper for the numeric/date values the mockups render in IBM Plex Mono.
+export const Mono = ({ children, className = "" }: MonoProps) => (
+  <span
+    className={`tabular-nums ${className}`}
+    style={{ fontFamily: "var(--joy-fontFamily-code)" }}
+  >
+    {children}
+  </span>
+);

frontend/src/components/MyAlert.tsx

@@ -11,7 +11,7 @@ export const MyAlert = (props: MyAlertProps) => {
     <Alert
       variant="soft"
       color={props.type}
-      className="rounded-2xl drop-shadow-sm"
+      className="animate-fade-in rounded-2xl drop-shadow-sm"
     >
       {props.header}
       <br />

frontend/src/components/PageHeader.tsx

@@ -0,0 +1,24 @@
+import type { ReactNode } from "react";
+import { Typography } from "@mui/joy";
+
+interface PageHeaderProps {
+  title: string;
+  subtitle?: string;
+  actions?: ReactNode;
+}
+
+export const PageHeader = ({ title, subtitle, actions }: PageHeaderProps) => (
+  <div className="flex flex-wrap items-start justify-between gap-4">
+    <div className="space-y-1">
+      <Typography level="h2" sx={{ color: "var(--joy-palette-text-primary)" }}>
+        {title}
+      </Typography>
+      {subtitle && (
+        <Typography level="body-lg" sx={{ color: "var(--joy-palette-text-tertiary)" }}>
+          {subtitle}
+        </Typography>
+      )}
+    </div>
+    {actions && <div className="flex items-center gap-3">{actions}</div>}
+  </div>
+);

frontend/src/components/ProductStatusBar.tsx

@@ -0,0 +1,43 @@
+import { Chip } from "@mui/joy";
+import { useTranslation } from "react-i18next";
+import { getExpiryDays, type ProductStatus } from "../utils/productStatus";
+
+const accentColor: Record<ProductStatus, string> = {
+  expired: "var(--joy-palette-danger-solidBg)",
+  "expiring-soon": "var(--joy-palette-warning-solidBg)",
+  ok: "transparent",
+};
+
+// Colored left-edge bar used on Inventory rows/cards to flag expiry status.
+export const ProductStatusBar = ({ status }: { status: ProductStatus }) => (
+  <span
+    className="block h-full w-[3px] shrink-0 self-stretch rounded-full"
+    style={{ backgroundColor: accentColor[status] }}
+  />
+);
+
+const chipColor: Record<ProductStatus, "danger" | "warning" | "neutral"> = {
+  expired: "danger",
+  "expiring-soon": "warning",
+  ok: "neutral",
+};
+
+// "Expires in N days" / "Expired N days ago" chip used on product detail headers.
+export const ExpiryBadge = ({ expiryDate }: { expiryDate?: string | null }) => {
+  const { t } = useTranslation();
+  const expiry = getExpiryDays(expiryDate);
+  if (!expiry) {
+    return null;
+  }
+
+  const text =
+    expiry.status === "expired"
+      ? t("days-since-expired", { count: Math.abs(expiry.days) })
+      : t("expires-in-days-badge", { count: expiry.days });
+
+  return (
+    <Chip variant="soft" color={chipColor[expiry.status]} size="sm" className="rounded-full px-3">
+      {text}
+    </Chip>
+  );
+};

frontend/src/components/Sidebar.tsx

@@ -1,90 +1,77 @@
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
-import { Button, Typography } from "@mui/joy";
-import InventoryIcon from "@mui/icons-material/Inventory";
-import AddBoxIcon from "@mui/icons-material/AddBox";
-import StorageIcon from "@mui/icons-material/Storage";
-import SettingsIcon from "@mui/icons-material/Settings";
-import ExitToAppIcon from "@mui/icons-material/ExitToApp";
-import TranslateIcon from "@mui/icons-material/Translate";
-import Brightness4Icon from "@mui/icons-material/Brightness4";
-import MenuIcon from "@mui/icons-material/Menu";
-import CloseIcon from "@mui/icons-material/Close";
-import { useMatchRoute, useNavigate } from "@tanstack/react-router";
+import { Button, Chip, Typography } from "@mui/joy";
+import { Package, Plus, Layers, Settings, Menu, X, ChevronRight } from "lucide-react";
+import { useNavigate, useRouterState } from "@tanstack/react-router";
+import { useQuery } from "@tanstack/react-query";
 import Cookies from "js-cookie";
-import { changeTranslation } from "../utils/uxFncs";
-import { useColorScheme } from "@mui/joy/styles";
-import { useLogout } from "../hooks/useLogout.ts";
+import { getProducts } from "../utils/api/products.ts";
+import { getStorages } from "../utils/api/storages.ts";
 
 export const Sidebar = () => {
   const { t } = useTranslation();
   const navigate = useNavigate();
-  const { logout } = useLogout();
-  const matchRoute = useMatchRoute();
-  const { mode, setMode } = useColorScheme();
+  const pathname = useRouterState({ select: (state) => state.location.pathname });
   const [isOpen, setIsOpen] = useState(false);
 
-  const btnClass =
-    "h-11 w-full justify-start! rounded-2xl px-4 text-left text-sm font-semibold transition [&_.MuiButton-startDecorator]:mr-3! [&_.MuiButton-startDecorator]:ml-0!";
+  const { data: products } = useQuery({ queryKey: ["products"], queryFn: getProducts });
+  const { data: storages } = useQuery({ queryKey: ["storages"], queryFn: getStorages });
 
-  const variant = (to: string) =>
-    !!matchRoute({ to, fuzzy: false }) ? "soft" : "plain";
+  const btnClass =
+    "h-11 w-full justify-start! rounded-2xl px-4 text-left text-sm font-semibold transition-colors duration-150 [&_.MuiButton-startDecorator]:mr-3! [&_.MuiButton-startDecorator]:ml-0! [&_.MuiButton-endDecorator]:ml-auto!";
+
+  const isActive = (to: string) => pathname === to || pathname.startsWith(`${to}/`);
 
   const handleNavigate = (to: string) => {
     void navigate({ to });
     setIsOpen(false);
   };
 
+  const appName = Cookies.get("app-name") || t("app-title");
+  const initials = appName.slice(0, 2).toUpperCase();
+
+  const navItems = [
+    { to: "/app/inventory", label: t("inventory"), icon: <Package size={18} />, count: products?.length },
+    { to: "/app/add-product", label: t("add"), icon: <Plus size={18} /> },
+    { to: "/app/storages", label: t("storages"), icon: <Layers size={18} />, count: storages?.length },
+    { to: "/app/app-settings", label: t("settings"), icon: <Settings size={18} /> },
+  ];
+
   return (
     <aside
       className="flex w-full flex-col gap-6 px-4 py-5 sm:px-5 lg:h-full lg:min-h-screen lg:max-w-70 lg:border-b-0 lg:border-r lg:px-6 lg:py-8"
       style={{
         borderBottom: "1px solid var(--joy-palette-divider)",
         borderRightColor: "var(--joy-palette-divider)",
-        background:
-          "linear-gradient(to bottom, var(--joy-palette-primary-50), var(--joy-palette-background-level1), var(--joy-palette-background-level2))",
-        boxShadow:
-          "0 20px 60px color-mix(in srgb, var(--joy-palette-primary-solidBg) 8%, transparent)",
+        backgroundColor: "var(--joy-palette-background-surface)",
       }}
     >
       <div className="flex items-center justify-between gap-4">
-        <div className="space-y-2">
+        <div className="flex items-center gap-2">
+          <span
+            className="flex h-8 w-8 items-center justify-center rounded-lg"
+            style={{ backgroundColor: "var(--joy-palette-primary-solidBg)" }}
+          >
+            <Layers size={16} color="white" />
+          </span>
           <Typography
-            level="h2"
-            className="text-[22px] font-semibold"
-            sx={{ color: "var(--joy-palette-primary-solidBg)" }}
+            level="title-lg"
+            className="text-[17px] font-bold"
+            sx={{ color: "var(--joy-palette-text-primary)" }}
           >
             {t("app-title")}
           </Typography>
-          <Typography
-            level="body-lg"
-            className="text-sm font-medium"
-            sx={{ color: "var(--joy-palette-text-tertiary)" }}
-          >
-            {Cookies.get("app-name") ? Cookies.get("app-name") : ""}
-          </Typography>
         </div>
         <Button
           variant="soft"
+          color="neutral"
           size="sm"
           sx={{
             display: "inline-flex",
             "@media (min-width: 1024px)": { display: "none" },
-            "&:hover": {
-              backgroundColor: "var(--joy-palette-primary-900)",
-              color: "var(--joy-palette-primary-50)",
-            },
           }}
           onClick={() => setIsOpen((open) => !open)}
-          startDecorator={
-            <span
-              className={`inline-flex transition-transform duration-200 ease-out ${
-                isOpen ? "rotate-180" : "rotate-0"
-              }`}
-            >
-              {isOpen ? <CloseIcon /> : <MenuIcon />}
-            </span>
-          }
+          startDecorator={isOpen ? <X size={16} /> : <Menu size={16} />}
         >
           {isOpen ? t("close") : t("menu")}
         </Button>
@@ -97,112 +84,68 @@ export const Sidebar = () => {
             : "max-h-0 opacity-0 pointer-events-none"
         } lg:max-h-none lg:opacity-100 lg:pointer-events-auto`}
       >
-        <div className="flex flex-1 flex-col gap-2">
-          <Button
-            onClick={() => handleNavigate("/app/inventory")}
-            variant={variant("/app/inventory")}
-            startDecorator={<InventoryIcon />}
-            className={btnClass}
-            sx={{
-              color: "var(--joy-palette-text-secondary)",
-              "&:hover": {
-                bgcolor: "var(--joy-palette-background-surface)",
-                color: "var(--joy-palette-primary-solidBg)",
-              },
-            }}
-          >
-            {t("inventory")}
-          </Button>
-          <Button
-            onClick={() => handleNavigate("/app/add-product")}
-            variant={variant("/app/add-product")}
-            startDecorator={<AddBoxIcon />}
-            className={btnClass}
-            sx={{
-              color: "var(--joy-palette-text-secondary)",
-              "&:hover": {
-                bgcolor: "var(--joy-palette-background-surface)",
-                color: "var(--joy-palette-primary-solidBg)",
-              },
-            }}
-          >
-            {t("add")}
-          </Button>
-          <Button
-            onClick={() => handleNavigate("/app/storages")}
-            variant={variant("/app/storages")}
-            startDecorator={<StorageIcon />}
-            className={btnClass}
-            sx={{
-              color: "var(--joy-palette-text-secondary)",
-              "&:hover": {
-                bgcolor: "var(--joy-palette-background-surface)",
-                color: "var(--joy-palette-primary-solidBg)",
-              },
-            }}
-          >
-            {t("storages")}
-          </Button>
-          <Button
-            onClick={() => handleNavigate("/app/app-settings")}
-            variant={variant("/app/app-settings")}
-            startDecorator={<SettingsIcon />}
-            className={btnClass}
-            sx={{
-              color: "var(--joy-palette-text-secondary)",
-              "&:hover": {
-                bgcolor: "var(--joy-palette-background-surface)",
-                color: "var(--joy-palette-primary-solidBg)",
-              },
-            }}
-          >
-            {t("settings")}
-          </Button>
-          <Button
-            onClick={logout}
-            color="danger"
-            startDecorator={<ExitToAppIcon />}
-            className={btnClass}
-          >
-            {t("logout")}
-          </Button>
-          <Button
-            onClick={() => {
-              changeTranslation();
-              setIsOpen(false);
-            }}
-            color="neutral"
-            startDecorator={<TranslateIcon />}
-            className={btnClass}
-          >
-            {t("change-translation")}
-          </Button>
-          <Button
-            onClick={() => setMode(mode === "dark" ? "light" : "dark")}
-            color="neutral"
-            startDecorator={<Brightness4Icon />}
-            className={btnClass}
-          >
-            {mode === "dark" ? "Light Mode" : "Dark Mode"}
-          </Button>
+        <div className="flex flex-1 flex-col gap-1">
+          {navItems.map((item) => {
+            const active = isActive(item.to);
+            return (
+              <Button
+                key={item.to}
+                onClick={() => handleNavigate(item.to)}
+                variant={active ? "soft" : "plain"}
+                color="primary"
+                startDecorator={item.icon}
+                endDecorator={
+                  item.count !== undefined ? (
+                    <Chip size="sm" variant="soft" color={active ? "primary" : "neutral"}>
+                      {item.count}
+                    </Chip>
+                  ) : undefined
+                }
+                className={btnClass}
+                sx={{
+                  color: active
+                    ? "var(--joy-palette-primary-solidBg)"
+                    : "var(--joy-palette-text-secondary)",
+                  borderLeft: "3px solid",
+                  borderLeftColor: active ? "var(--joy-palette-primary-solidBg)" : "transparent",
+                  "&:hover": {
+                    bgcolor: active
+                      ? "var(--joy-palette-primary-softBg)"
+                      : "var(--joy-palette-background-level1)",
+                  },
+                }}
+              >
+                {item.label}
+              </Button>
+            );
+          })}
         </div>
 
-        <div
-          className="flex items-center gap-3 rounded-2xl px-4 py-3 text-xs font-semibold uppercase tracking-[0.2em]"
+        <button
+          type="button"
+          onClick={() => handleNavigate("/app/app-settings")}
+          className="flex items-center gap-3 rounded-2xl px-3 py-2.5 text-left transition"
           style={{
             border: "1px solid var(--joy-palette-divider)",
-            backgroundColor: "var(--joy-palette-background-surface)",
-            color: "var(--joy-palette-primary-solidBg)",
-            boxShadow: "0 12px 30px var(--joy-palette-divider)",
+            backgroundColor: "var(--joy-palette-background-level1)",
           }}
         >
-          <img
-            src="/favicon.png"
-            alt="Stockhome"
-            className="h-7 w-7 rounded-lg"
-          />
-          <span>Stockhome</span>
-        </div>
+          <span
+            className="flex h-8 w-8 shrink-0 items-center justify-center rounded-full text-xs font-bold"
+            style={{
+              backgroundColor: "var(--joy-palette-primary-softBg)",
+              color: "var(--joy-palette-primary-softColor)",
+            }}
+          >
+            {initials}
+          </span>
+          <div className="min-w-0 flex-1">
+            <Typography level="title-md" className="truncate" sx={{ color: "var(--joy-palette-text-primary)" }}>
+              {appName}
+            </Typography>
+          </div>
+          <ChevronRight size={16} color="var(--joy-palette-text-tertiary)" />
+        </button>
       </div>
     </aside>
   );

frontend/src/components/StatTiles.tsx

@@ -0,0 +1,53 @@
+import { Typography } from "@mui/joy";
+import { useTranslation } from "react-i18next";
+
+interface StatTilesProps {
+  expired: number;
+  expiringSoon: number;
+  lowStock: number;
+  unitsStored: number;
+}
+
+export const StatTiles = ({
+  expired,
+  expiringSoon,
+  lowStock,
+  unitsStored,
+}: StatTilesProps) => {
+  const { t } = useTranslation();
+
+  const tiles = [
+    { value: expired, label: t("stat-expired"), accent: "var(--joy-palette-danger-solidBg)" },
+    { value: expiringSoon, label: t("stat-expiring-soon"), accent: "var(--joy-palette-warning-solidBg)" },
+    { value: lowStock, label: t("stat-low-stock"), accent: "var(--joy-palette-neutral-500)" },
+    { value: unitsStored, label: t("stat-units-stored"), accent: "var(--joy-palette-primary-solidBg)" },
+  ];
+
+  return (
+    <div className="grid grid-cols-2 gap-4 lg:grid-cols-4">
+      {tiles.map((tile) => (
+        <div
+          key={tile.label}
+          className="flex items-center gap-3 rounded-2xl border border-solid px-4 py-4"
+          style={{
+            borderColor: "var(--joy-palette-divider)",
+            backgroundColor: "var(--joy-palette-background-surface)",
+          }}
+        >
+          <span
+            className="h-9 w-[3px] shrink-0 rounded-full"
+            style={{ backgroundColor: tile.accent }}
+          />
+          <div>
+            <Typography level="h2" sx={{ color: "var(--joy-palette-text-primary)" }}>
+              {tile.value}
+            </Typography>
+            <Typography level="body-sm" className="normal-case font-normal" sx={{ color: "var(--joy-palette-text-tertiary)" }}>
+              {tile.label}
+            </Typography>
+          </div>
+        </div>
+      ))}
+    </div>
+  );
+};

frontend/src/components/StorageRow.tsx

@@ -2,9 +2,11 @@ import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { deleteStorage, updateStorage } from "../utils/api/storages";
 import { useForm } from "@tanstack/react-form";
 import { useStore } from "@tanstack/react-store";
-import { Button, Input } from "@mui/joy";
+import { Button, IconButton, Input } from "@mui/joy";
+import { Trash2 } from "lucide-react";
 import type { Storage } from "../misc/interfaces";
 import { formatDate } from "../utils/uxFncs";
+import { Mono } from "./Mono.tsx";
 import { useTranslation } from "react-i18next";
 
 interface StorageRowProps {
@@ -93,36 +95,37 @@ export const StorageRow = ({ storage, onError }: StorageRowProps) => {
         className="px-6 py-5 text-sm"
         style={{ color: "var(--joy-palette-text-tertiary)" }}
       >
-        {formatDate(storage.created_at)}
+        <Mono>{formatDate(storage.created_at)}</Mono>
       </td>
       <td
         className="px-6 py-5 text-sm"
         style={{ color: "var(--joy-palette-text-tertiary)" }}
       >
-        {formatDate(storage.updated_at)}
+        <Mono>{formatDate(storage.updated_at)}</Mono>
       </td>
       <td className="px-6 py-5 text-right">
         <div className="flex flex-wrap justify-end gap-2">
-          <Button
-            color="primary"
-            onClick={form.handleSubmit}
-            disabled={
-              !isDirty || mutation.isPending || deleteMutation.isPending
-            }
-            size="sm"
-            className="rounded-xl"
-          >
-            {mutation.isPending ? "..." : t("save")}
-          </Button>
-          <Button
+          {isDirty && (
+            <Button
+              color="primary"
+              onClick={form.handleSubmit}
+              disabled={mutation.isPending || deleteMutation.isPending}
+              size="sm"
+              className="rounded-xl"
+            >
+              {mutation.isPending ? "..." : t("save")}
+            </Button>
+          )}
+          <IconButton
             color="danger"
+            variant="plain"
             onClick={() => deleteMutation.mutateAsync(storage.uuid)}
             disabled={mutation.isPending || deleteMutation.isPending}
             size="sm"
             className="rounded-xl"
           >
-            {deleteMutation.isPending ? "..." : t("delete")}
-          </Button>
+            <Trash2 size={16} />
+          </IconButton>
         </div>
       </td>
     </tr>

frontend/src/components/modals/AddStorageModal.tsx

@@ -52,13 +52,11 @@ export const AddStorageModal = (props: AddStorageModalProps) => {
     <>
       <Modal open={props.isOpen} onClose={() => props.setOpen(false)}>
         <ModalDialog
-          className="rounded-3xl p-6 backdrop-blur"
+          className="rounded-3xl p-6"
           sx={{
             border: "1px solid",
             borderColor: "divider",
             bgcolor: "background.surface",
-            boxShadow:
-              "0 30px 70px color-mix(in srgb, var(--joy-palette-primary-800) 20%, transparent)",
           }}
         >
           <DialogTitle sx={{ color: "var(--joy-palette-text-primary)" }}>
@@ -83,10 +81,6 @@ export const AddStorageModal = (props: AddStorageModalProps) => {
                     variant="outlined"
                     size="lg"
                     className="rounded-2xl"
-                    sx={{
-                      bgcolor: "var(--joy-palette-background-surface)",
-                      boxShadow: "0 10px 24px var(--joy-palette-divider)",
-                    }}
                   />
                 )}
               </form.Field>
@@ -99,10 +93,6 @@ export const AddStorageModal = (props: AddStorageModalProps) => {
                     variant="outlined"
                     size="lg"
                     className="rounded-2xl"
-                    sx={{
-                      bgcolor: "var(--joy-palette-background-surface)",
-                      boxShadow: "0 10px 24px var(--joy-palette-divider)",
-                    }}
                   />
                 )}
               </form.Field>
@@ -111,11 +101,7 @@ export const AddStorageModal = (props: AddStorageModalProps) => {
                 size="lg"
                 color="primary"
                 variant="solid"
-                className="rounded-2xl transition hover:-translate-y-0.5"
-                sx={{
-                  boxShadow:
-                    "0 16px 36px color-mix(in srgb, var(--joy-palette-primary-solidBg) 35%, transparent)",
-                }}
+                className="btn-lift rounded-2xl"
               >
                 {t("submit")}
               </Button>

frontend/src/components/modals/ChangePasswordModal.tsx

@@ -85,13 +85,11 @@ export const ChangePasswordModal = (props: ChangePasswordProps) => {
     <>
       <Modal open={props.isOpen} onClose={() => props.setOpen(false)}>
         <ModalDialog
-          className="rounded-3xl p-6 backdrop-blur"
+          className="rounded-3xl p-6"
           sx={{
             border: "1px solid",
             borderColor: "divider",
             bgcolor: "background.surface",
-            boxShadow:
-              "0 30px 70px color-mix(in srgb, var(--joy-palette-primary-800) 20%, transparent)",
           }}
         >
           <DialogTitle sx={{ color: "var(--joy-palette-text-primary)" }}>
@@ -114,10 +112,6 @@ export const ChangePasswordModal = (props: ChangePasswordProps) => {
                     variant="outlined"
                     size="lg"
                     className="rounded-2xl"
-                    sx={{
-                      bgcolor: "var(--joy-palette-background-surface)",
-                      boxShadow: "0 10px 24px var(--joy-palette-divider)",
-                    }}
                   />
                 )}
               </form.Field>
@@ -131,10 +125,6 @@ export const ChangePasswordModal = (props: ChangePasswordProps) => {
                     variant="outlined"
                     size="lg"
                     className="rounded-2xl"
-                    sx={{
-                      bgcolor: "var(--joy-palette-background-surface)",
-                      boxShadow: "0 10px 24px var(--joy-palette-divider)",
-                    }}
                   />
                 )}
               </form.Field>
@@ -148,10 +138,6 @@ export const ChangePasswordModal = (props: ChangePasswordProps) => {
                     variant="outlined"
                     size="lg"
                     className="rounded-2xl"
-                    sx={{
-                      bgcolor: "var(--joy-palette-background-surface)",
-                      boxShadow: "0 10px 24px var(--joy-palette-divider)",
-                    }}
                   />
                 )}
               </form.Field>
@@ -160,11 +146,7 @@ export const ChangePasswordModal = (props: ChangePasswordProps) => {
                 size="lg"
                 color="primary"
                 variant="solid"
-                className="rounded-2xl transition hover:-translate-y-0.5"
-                sx={{
-                  boxShadow:
-                    "0 16px 36px color-mix(in srgb, var(--joy-palette-primary-solidBg) 35%, transparent)",
-                }}
+                className="btn-lift rounded-2xl"
               >
                 {t("change")}
               </Button>

frontend/src/index.css

@@ -1 +1,54 @@
-@import "tailwindcss";
+@import "tailwindcss";
+
+@keyframes page-in {
+  from {
+    opacity: 0;
+    transform: translateY(4px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+@keyframes fade-in {
+  from {
+    opacity: 0;
+    transform: translateY(-4px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+.animate-page-in {
+  animation: page-in 220ms ease-out;
+}
+
+.animate-fade-in {
+  animation: fade-in 180ms ease-out;
+}
+
+.btn-lift {
+  transition:
+    transform 150ms ease,
+    box-shadow 150ms ease;
+}
+
+.btn-lift:hover {
+  transform: translateY(-1px);
+}
+
+.btn-lift:active {
+  transform: translateY(0);
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .animate-page-in,
+  .animate-fade-in,
+  .btn-lift {
+    animation: none !important;
+    transition: none !important;
+  }
+}

frontend/src/main.tsx

@@ -1,5 +1,10 @@
 import { StrictMode } from "react";
 import { createRoot } from "react-dom/client";
+import "@fontsource/ibm-plex-sans/400.css";
+import "@fontsource/ibm-plex-sans/500.css";
+import "@fontsource/ibm-plex-sans/600.css";
+import "@fontsource/ibm-plex-sans/700.css";
+import "@fontsource/ibm-plex-mono/500.css";
 import "./index.css";
 import "./utils/i18n";
 import App from "./App.tsx";

frontend/src/misc/interfaces.ts

@@ -59,6 +59,7 @@ export type ProductRow = {
   location: string;
   locationDetail: string;
   expiryDate: string;
+  expiryDateRaw: string | null;
   refillDate: string;
 };
 

frontend/src/pages/AddProduct.tsx

@@ -1,28 +1,23 @@
 import { useMutation, useQuery } from "@tanstack/react-query";
-import {
-  Box,
-  Button,
-  Chip,
-  Divider,
-  Input,
-  Option,
-  Select,
-  Typography,
-} from "@mui/joy";
+import { Button, Input, Option, Select, Typography } from "@mui/joy";
 import { useTranslation } from "react-i18next";
 import { useEffect, useState } from "react";
 import { useForm } from "@tanstack/react-form";
 import { createProduct } from "../utils/api/products";
 import { getStorages } from "../utils/api/storages";
-import type {
-  AlertInterface,
-  ProductFormValues,
-  Storage,
-} from "../misc/interfaces";
+import type { AlertInterface, ProductFormValues, Storage } from "../misc/interfaces";
 import type { ApiError } from "../utils/api/apiError";
 import Cookies from "js-cookie";
+import { AmountStepper } from "../components/AmountStepper.tsx";
+import { PageHeader } from "../components/PageHeader.tsx";
 import { MyAlert } from "../components/MyAlert.tsx";
 
+const cardSx = {
+  border: "1px solid",
+  borderColor: "divider",
+  bgcolor: "background.surface",
+} as const;
+
 export const AddProduct = () => {
   const { t } = useTranslation();
   const [alert, setAlert] = useState<AlertInterface>({
@@ -86,56 +81,23 @@ export const AddProduct = () => {
   });
 
   return (
-    <>
-      <div className="space-y-6">
-        <div className="flex flex-wrap items-center gap-3">
-          <div className="space-y-1">
-            <Typography
-              level="h2"
-              sx={{ color: "var(--joy-palette-text-primary)" }}
-            >
-              {t("add-product")}
-            </Typography>
-            <Typography
-              level="body-lg"
-              sx={{ color: "var(--joy-palette-text-tertiary)" }}
-            >
-              {t("add-product-subtitle")}
-            </Typography>
-          </div>
-          <Chip
-            variant="soft"
-            color="primary"
-            className="ml-auto rounded-full px-3"
-          >
-            {t("details")}
-          </Chip>
-        </div>
-      </div>
-      <Box
-        className="mt-6 rounded-3xl p-6 backdrop-blur"
-        sx={{
-          border: "1px solid",
-          borderColor: "divider",
-          bgcolor: "background.surface",
-          boxShadow:
-            "0 24px 60px color-mix(in srgb, var(--joy-palette-primary-800) 12%, transparent)",
+    <div className="space-y-6">
+      <PageHeader title={t("add-product")} subtitle={t("add-product-subtitle")} />
+
+      <form
+        onSubmit={(e) => {
+          e.preventDefault();
+          form.handleSubmit();
         }}
       >
-        <form
-          className="space-y-6"
-          onSubmit={(e) => {
-            e.preventDefault();
-            form.handleSubmit();
-          }}
-        >
-          <div className="grid gap-5 lg:grid-cols-[1.2fr_1fr]">
-            <div className="space-y-4">
+        <div className="grid gap-5 lg:grid-cols-2">
+          <div className="rounded-3xl p-6" style={cardSx}>
+            <Typography level="title-lg" sx={{ color: "var(--joy-palette-text-primary)" }}>
+              {t("product")}
+            </Typography>
+            <div className="mt-4 space-y-4">
               <div className="space-y-1">
-                <Typography
-                  level="title-md"
-                  sx={{ color: "var(--joy-palette-text-primary)" }}
-                >
+                <Typography level="title-md" sx={{ color: "var(--joy-palette-text-primary)" }}>
                   {t("product-name")}
                 </Typography>
                 <form.Field name="name">
@@ -143,75 +105,39 @@ export const AddProduct = () => {
                     <Input
                       type="text"
                       required
+                      placeholder={t("product-name-placeholder")}
                       value={field.state.value}
                       onChange={(e) => field.handleChange(e.target.value)}
                       onBlur={field.handleBlur}
                       size="lg"
                       variant="outlined"
                       className="rounded-2xl"
-                      sx={{
-                        bgcolor: "var(--joy-palette-background-surface)",
-                        boxShadow: "0 10px 24px var(--joy-palette-divider)",
-                      }}
                     />
                   )}
                 </form.Field>
               </div>
               <div className="space-y-1">
-                <Typography
-                  level="title-md"
-                  sx={{ color: "var(--joy-palette-text-primary)" }}
-                >
+                <Typography level="title-md" sx={{ color: "var(--joy-palette-text-primary)" }}>
                   {t("description")}
                 </Typography>
                 <form.Field name="description">
                   {(field) => (
                     <Input
                       type="text"
+                      placeholder={t("description-placeholder")}
                       value={field.state.value}
                       onChange={(e) => field.handleChange(e.target.value)}
                       onBlur={field.handleBlur}
                       size="lg"
                       variant="outlined"
                       className="rounded-2xl"
-                      sx={{
-                        bgcolor: "var(--joy-palette-background-surface)",
-                        boxShadow: "0 10px 24px var(--joy-palette-divider)",
-                      }}
                     />
                   )}
                 </form.Field>
               </div>
-              <div className="grid gap-4 md:grid-cols-2">
+              <div className="grid gap-4 sm:grid-cols-2">
                 <div className="space-y-1">
-                  <Typography
-                    level="title-md"
-                    sx={{ color: "var(--joy-palette-text-primary)" }}
-                  >
-                    {t("expiry-date")}
-                  </Typography>
-                  <form.Field name="expiry_date">
-                    {(field) => (
-                      <Input
-                        type="date"
-                        value={field.state.value}
-                        onChange={(e) => field.handleChange(e.target.value)}
-                        onBlur={field.handleBlur}
-                        size="lg"
-                        variant="outlined"
-                        className="rounded-2xl"
-                        sx={{
-                          bgcolor: "var(--joy-palette-background-surface)",
-                        }}
-                      />
-                    )}
-                  </form.Field>
-                </div>
-                <div className="space-y-1">
-                  <Typography
-                    level="title-md"
-                    sx={{ color: "var(--joy-palette-text-primary)" }}
-                  >
+                  <Typography level="title-md" sx={{ color: "var(--joy-palette-text-primary)" }}>
                     {t("bottling-date")}
                   </Typography>
                   <form.Field name="bottling_date">
@@ -224,162 +150,122 @@ export const AddProduct = () => {
                         size="lg"
                         variant="outlined"
                         className="rounded-2xl"
-                        sx={{
-                          bgcolor: "var(--joy-palette-background-surface)",
-                        }}
+                      />
+                    )}
+                  </form.Field>
+                </div>
+                <div className="space-y-1">
+                  <Typography level="title-md" sx={{ color: "var(--joy-palette-text-primary)" }}>
+                    {t("expiry-date")}
+                  </Typography>
+                  <form.Field name="expiry_date">
+                    {(field) => (
+                      <Input
+                        type="date"
+                        value={field.state.value}
+                        onChange={(e) => field.handleChange(e.target.value)}
+                        onBlur={field.handleBlur}
+                        size="lg"
+                        variant="outlined"
+                        className="rounded-2xl"
                       />
                     )}
                   </form.Field>
                 </div>
               </div>
             </div>
-            <div className="space-y-4">
-              <div
-                className="rounded-2xl p-5"
-                style={{
-                  border: "1px solid var(--joy-palette-divider)",
-                  background:
-                    "linear-gradient(to bottom right, var(--joy-palette-primary-50), var(--joy-palette-background-level1), var(--joy-palette-background-level2))",
-                  boxShadow: "0 16px 40px var(--joy-palette-divider)",
-                }}
-              >
-                <Typography
-                  level="title-md"
-                  sx={{ color: "var(--joy-palette-text-primary)" }}
-                >
-                  {t("inventory")}
+          </div>
+
+          <div className="rounded-3xl p-6" style={cardSx}>
+            <Typography level="title-lg" sx={{ color: "var(--joy-palette-text-primary)" }}>
+              {t("inventory")}
+            </Typography>
+            <div className="mt-4 space-y-4">
+              <div className="space-y-1">
+                <Typography level="title-md" sx={{ color: "var(--joy-palette-text-primary)" }}>
+                  {t("amount")}
                 </Typography>
-                <Divider className="my-3" />
-                <div className="grid gap-4">
-                  <div className="space-y-1">
-                    <Typography
-                      level="title-md"
-                      sx={{ color: "var(--joy-palette-text-primary)" }}
-                    >
-                      {t("amount")}
-                    </Typography>
-                    <form.Field name="amount">
-                      {(field) => (
-                        <Input
-                          type="number"
-                          color="neutral"
-                          id="amountInput"
-                          placeholder={t("amount")}
-                          value={field.state.value}
-                          variant="soft"
-                          size="lg"
-                          onChange={(e) => {
-                            const nextValue = Number(e.target.value);
-                            field.handleChange(
-                              Number.isNaN(nextValue) ? 0 : nextValue,
-                            );
-                          }}
-                          onBlur={field.handleBlur}
-                          className="rounded-2xl"
-                          sx={{
-                            bgcolor: "var(--joy-palette-background-surface)",
-                          }}
-                        />
-                      )}
-                    </form.Field>
-                  </div>
-                  <div className="space-y-1">
-                    <Typography
-                      level="title-md"
-                      sx={{ color: "var(--joy-palette-text-primary)" }}
-                    >
-                      {t("price")}
-                    </Typography>
-                    <form.Field name="price">
-                      {(field) => (
-                        <Input
-                          type="text"
-                          value={field.state.value}
-                          onChange={(e) => field.handleChange(e.target.value)}
-                          onBlur={field.handleBlur}
-                          size="lg"
-                          variant="outlined"
-                          className="rounded-2xl"
-                          sx={{
-                            bgcolor: "var(--joy-palette-background-surface)",
-                          }}
-                        />
-                      )}
-                    </form.Field>
-                    <Typography
-                      level="body-sm"
-                      sx={{ color: "var(--joy-palette-text-tertiary)" }}
-                    >
-                      {Cookies.get("currency")}
-                    </Typography>
-                  </div>
-                  <div className="space-y-1">
-                    <Typography
-                      level="title-md"
-                      sx={{ color: "var(--joy-palette-text-primary)" }}
-                    >
-                      {t("storage-place")}
-                    </Typography>
-                    <form.Field name="storage_location_uuid">
-                      {(field) => (
-                        <Select
-                          required
-                          value={field.state.value}
-                          onChange={(_event, value) =>
-                            field.handleChange(value ?? "")
-                          }
-                          size="lg"
-                          variant="outlined"
-                          className="rounded-2xl"
-                          sx={{
-                            bgcolor: "var(--joy-palette-background-surface)",
-                          }}
-                        >
-                          {storages?.map((storage) => (
-                            <Option key={storage.uuid} value={storage.uuid}>
-                              {storage.name}
-                            </Option>
-                          ))}
-                        </Select>
-                      )}
-                    </form.Field>
-                  </div>
-                </div>
+                <form.Field name="amount">
+                  {(field) => (
+                    <AmountStepper
+                      value={field.state.value}
+                      onChange={field.handleChange}
+                      onBlur={field.handleBlur}
+                    />
+                  )}
+                </form.Field>
               </div>
+              <div className="space-y-1">
+                <Typography level="title-md" sx={{ color: "var(--joy-palette-text-primary)" }}>
+                  {t("price")}
+                </Typography>
+                <form.Field name="price">
+                  {(field) => (
+                    <Input
+                      type="text"
+                      value={field.state.value}
+                      onChange={(e) => field.handleChange(e.target.value)}
+                      onBlur={field.handleBlur}
+                      size="lg"
+                      variant="outlined"
+                      className="rounded-2xl"
+                      endDecorator={
+                        <Typography level="body-sm" sx={{ color: "var(--joy-palette-text-tertiary)" }}>
+                          {Cookies.get("currency")}
+                        </Typography>
+                      }
+                    />
+                  )}
+                </form.Field>
+              </div>
+              <div className="space-y-1">
+                <Typography level="title-md" sx={{ color: "var(--joy-palette-text-primary)" }}>
+                  {t("storage-place")}
+                </Typography>
+                <form.Field name="storage_location_uuid">
+                  {(field) => (
+                    <Select
+                      required
+                      placeholder={t("choose-storage")}
+                      value={field.state.value}
+                      onChange={(_event, value) => field.handleChange(value ?? "")}
+                      size="lg"
+                      variant="outlined"
+                      className="rounded-2xl"
+                    >
+                      {storages?.map((storage) => (
+                        <Option key={storage.uuid} value={storage.uuid}>
+                          {storage.name}
+                        </Option>
+                      ))}
+                    </Select>
+                  )}
+                </form.Field>
+              </div>
+              <Typography level="body-sm" className="normal-case font-normal" sx={{ color: "var(--joy-palette-text-tertiary)" }}>
+                {t("amount-price-optional-hint")}
+              </Typography>
             </div>
           </div>
-          <div className="flex gap-3 items-center">
-            <Typography
-              level="body-sm"
-              sx={{ color: "var(--joy-palette-text-tertiary)" }}
-            >
-              {t("product-details")}
-            </Typography>
-            <div className="grow"></div>
-            <Button
-              type="submit"
-              loading={isPending}
-              size="lg"
-              color="primary"
-              variant="solid"
-              className="rounded-2xl transition hover:-translate-y-0.5"
-              sx={{
-                boxShadow:
-                  "0 16px 36px color-mix(in srgb, var(--joy-palette-primary-solidBg) 35%, transparent)",
-              }}
-            >
-              {t("save")}
+        </div>
+
+        <div className="mt-5 flex flex-wrap items-center justify-between gap-3">
+          <Typography level="body-sm" className="normal-case font-normal" sx={{ color: "var(--joy-palette-text-tertiary)" }}>
+            {t("all-fields-editable-later")}
+          </Typography>
+          <div className="flex gap-3">
+            <Button type="submit" loading={isPending} size="lg" color="primary" variant="solid" className="btn-lift rounded-2xl">
+              {t("save-product")}
             </Button>
           </div>
-          {alert.isAlert && (
-            <MyAlert
-              type={alert.type}
-              header={alert.header}
-              text={alert.text}
-            />
-          )}
-        </form>
-      </Box>
-    </>
+        </div>
+
+        {alert.isAlert && (
+          <div className="mt-4">
+            <MyAlert type={alert.type} header={alert.header} text={alert.text} />
+          </div>
+        )}
+      </form>
+    </div>
   );
 };

frontend/src/pages/Inventory.tsx

@@ -1,16 +1,53 @@
-import { ChangeEvent, MouseEvent, useEffect, useState } from "react";
-import { Avatar, Button, Checkbox, Chip, CircularProgress, Sheet, Table, Typography, } from "@mui/joy";
+import { ChangeEvent, Fragment, MouseEvent, useEffect, useMemo, useState } from "react";
+import { Button, Checkbox, Chip, CircularProgress, Input, Sheet, Table, Typography } from "@mui/joy";
 import { useNavigate } from "@tanstack/react-router";
 import { useTranslation } from "react-i18next";
-import AddIcon from "@mui/icons-material/Add";
+import { ChevronDown, Plus, Search, Trash2 } from "lucide-react";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { deleteSelectedProducts, getProducts } from "../utils/api/products";
 import { formatDate } from "../utils/uxFncs";
 import Cookies from "js-cookie";
 import type { AlertInterface, ProductRow } from "../misc/interfaces";
 import type { ApiError } from "../utils/api/apiError";
-import CategoryIcon from "@mui/icons-material/Category";
 import { MyAlert } from "../components/MyAlert.tsx";
+import { PageHeader } from "../components/PageHeader.tsx";
+import { StatTiles } from "../components/StatTiles.tsx";
+import { Mono } from "../components/Mono.tsx";
+import { ProductStatusBar } from "../components/ProductStatusBar.tsx";
+import { getExpiryDays, getProductStatus, isExpired, isExpiringSoon, isLowStock } from "../utils/productStatus";
+
+const relativeColor = {
+  expired: "var(--joy-palette-danger-solidBg)",
+  "expiring-soon": "var(--joy-palette-warning-solidBg)",
+  ok: "var(--joy-palette-text-tertiary)",
+} as const;
+
+// Small "in N days" / "Expired N days ago" line shown under a row's expiry date.
+const ExpiryRelative = ({ expiryDate }: { expiryDate: string | null }) => {
+  const { t } = useTranslation();
+  const expiry = getExpiryDays(expiryDate);
+  if (!expiry) {
+    return null;
+  }
+  const text =
+    expiry.status === "expired"
+      ? t("days-since-expired", { count: Math.abs(expiry.days) })
+      : t("days-until-expiry", { count: expiry.days });
+  return (
+    <Typography level="body-sm" className="normal-case font-normal" sx={{ color: relativeColor[expiry.status] }}>
+      {text}
+    </Typography>
+  );
+};
+
+type FilterKey = "all" | "expired" | "soon" | "low";
+
+const matchesFilter = (row: ProductRow, filter: FilterKey) => {
+  if (filter === "all") return true;
+  if (filter === "expired") return isExpired(row.expiryDateRaw);
+  if (filter === "soon") return isExpiringSoon(row.expiryDateRaw);
+  return isLowStock(Number(row.stockLabel));
+};
 
 export const InventoryPage = () => {
   const { t } = useTranslation();
@@ -22,6 +59,9 @@ export const InventoryPage = () => {
     header: "",
     text: "",
   });
+  const [search, setSearch] = useState("");
+  const [filter, setFilter] = useState<FilterKey>("all");
+  const [collapsedGroups, setCollapsedGroups] = useState<Set<string>>(new Set());
 
   const showError = (error: unknown) => {
     const errorCode = (error as { code?: string })?.code;
@@ -49,24 +89,77 @@ export const InventoryPage = () => {
     }
   }, [productsError, productsErrorObj]);
 
-  const rows: ProductRow[] = (productsData ?? []).map(
-    (product: any, index: number) => ({
-      id: String(product?.uuid ?? index),
-      uuid: String(product?.uuid ?? ""),
-      name: product?.name ?? t("product-name"),
-      description: product?.description ?? "",
-      imageUrl: product?.picture ?? undefined,
-      price: product?.price ? String(product.price) : "-",
-      stock: `${product?.amount ?? 0} ${t("pcs")}`,
-      stockLabel: String(product?.amount ?? 0),
-      stockStatus: (product?.amount ?? 0) > 0 ? "ok" : "missing",
-      location: product?.storage_location_name ?? "-",
-      locationDetail: "",
-      expiryDate: formatDate(product?.expiry_date),
-      refillDate: formatDate(product?.bottling_date),
-    }),
+  const rows: ProductRow[] = useMemo(
+    () =>
+      (productsData ?? []).map((product: any, index: number) => ({
+        id: String(product?.uuid ?? index),
+        uuid: String(product?.uuid ?? ""),
+        name: product?.name ?? t("product-name"),
+        description: product?.description ?? "",
+        imageUrl: product?.picture ?? undefined,
+        price: product?.price ? String(product.price) : "-",
+        stock: `${product?.amount ?? 0} ${t("pcs")}`,
+        stockLabel: String(product?.amount ?? 0),
+        stockStatus: (product?.amount ?? 0) > 0 ? "ok" : "missing",
+        location: product?.storage_location_name ?? "-",
+        locationDetail: "",
+        expiryDate: formatDate(product?.expiry_date),
+        expiryDateRaw: product?.expiry_date ?? null,
+        refillDate: formatDate(product?.bottling_date),
+      })),
+    [productsData, t],
   );
 
+  const stats = useMemo(
+    () => ({
+      expired: rows.filter((row) => isExpired(row.expiryDateRaw)).length,
+      expiringSoon: rows.filter((row) => isExpiringSoon(row.expiryDateRaw)).length,
+      lowStock: rows.filter((row) => isLowStock(Number(row.stockLabel))).length,
+      unitsStored: rows.reduce((sum, row) => sum + Number(row.stockLabel), 0),
+    }),
+    [rows],
+  );
+
+  const filteredRows = useMemo(() => {
+    const query = search.trim().toLowerCase();
+    return rows
+      .filter((row) => matchesFilter(row, filter))
+      .filter(
+        (row) =>
+          !query ||
+          row.name.toLowerCase().includes(query) ||
+          row.description.toLowerCase().includes(query),
+      );
+  }, [rows, search, filter]);
+
+  const groups = useMemo(() => {
+    const map = new Map<string, ProductRow[]>();
+    for (const row of filteredRows) {
+      const bucket = map.get(row.location) ?? [];
+      bucket.push(row);
+      map.set(row.location, bucket);
+    }
+    return Array.from(map.entries()).map(([name, groupRows]) => ({
+      name,
+      rows: groupRows,
+      units: groupRows.reduce((sum, row) => sum + Number(row.stockLabel), 0),
+    }));
+  }, [filteredRows]);
+
+  const storageCount = useMemo(() => new Set(rows.map((row) => row.location)).size, [rows]);
+
+  const toggleGroup = (name: string) => {
+    setCollapsedGroups((prev) => {
+      const next = new Set(prev);
+      if (next.has(name)) {
+        next.delete(name);
+      } else {
+        next.add(name);
+      }
+      return next;
+    });
+  };
+
   const [selected, setSelected] = useState<readonly string[]>([]);
 
   const { mutate: deleteSelection, isPending: isDeleting } = useMutation({
@@ -79,81 +172,104 @@ export const InventoryPage = () => {
   });
 
   const handleSelectAllClick = (event: ChangeEvent<HTMLInputElement>) => {
-    if (event.target.checked) {
-      setSelected(rows.map((row) => row.id));
-      return;
-    }
-    setSelected([]);
+    setSelected(event.target.checked ? filteredRows.map((row) => row.id) : []);
   };
 
   const handleClick = (_event: MouseEvent<unknown>, id: string) => {
-    const selectedIndex = selected.indexOf(id);
-    let newSelected: readonly string[] = [];
-    if (selectedIndex === -1) {
-      newSelected = newSelected.concat(selected, id);
-    } else if (selectedIndex === 0) {
-      newSelected = newSelected.concat(selected.slice(1));
-    } else if (selectedIndex === selected.length - 1) {
-      newSelected = newSelected.concat(selected.slice(0, -1));
-    } else if (selectedIndex > 0) {
-      newSelected = newSelected.concat(
-        selected.slice(0, selectedIndex),
-        selected.slice(selectedIndex + 1),
-      );
-    }
-    setSelected(newSelected);
+    setSelected((prev) =>
+      prev.includes(id) ? prev.filter((rowId) => rowId !== id) : [...prev, id],
+    );
   };
 
+  const filterTabs: { key: FilterKey; label: string; count: number; color: "neutral" | "danger" | "warning" }[] = [
+    { key: "all", label: t("filter-all"), count: rows.length, color: "neutral" },
+    { key: "expired", label: t("filter-expired"), count: stats.expired, color: "danger" },
+    { key: "soon", label: t("filter-soon"), count: stats.expiringSoon, color: "warning" },
+    { key: "low", label: t("filter-low"), count: stats.lowStock, color: "neutral" },
+  ];
+
   return (
-    <>
-      <Typography level="h2">{t("inventory")}</Typography>
-      <Typography level="body-lg">{t("inventory-subtitle")}</Typography>
-      <div className="mt-4 flex items-center gap-3">
-        <Button
-          startDecorator={<AddIcon />}
-          onClick={() => navigate({ to: "/app/add-product" })}
-          variant="solid"
-        >
-          {t("add")}
-        </Button>
-        {productsIsLoading && <CircularProgress size="sm" />}
+    <div className="space-y-6">
+      <PageHeader
+        title={t("inventory")}
+        subtitle={t("inventory-summary", { count: rows.length, storages: storageCount })}
+        actions={
+          <Button
+            startDecorator={<Plus size={16} />}
+            onClick={() => navigate({ to: "/app/add-product" })}
+            variant="solid"
+            className="btn-lift rounded-2xl"
+          >
+            {t("add")}
+          </Button>
+        }
+      />
+
+      {productsIsLoading && <CircularProgress size="sm" />}
+      {alert.isAlert && <MyAlert type={alert.type} header={alert.header} text={alert.text} />}
+
+      <StatTiles
+        expired={stats.expired}
+        expiringSoon={stats.expiringSoon}
+        lowStock={stats.lowStock}
+        unitsStored={stats.unitsStored}
+      />
+
+      <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
+        <Input
+          value={search}
+          onChange={(e) => setSearch(e.target.value)}
+          placeholder={t("search-products")}
+          startDecorator={<Search size={16} />}
+          size="lg"
+          variant="outlined"
+          className="rounded-2xl sm:max-w-xs"
+        />
+        <div className="flex flex-wrap gap-2">
+          {filterTabs.map((tab) => (
+            <Chip
+              key={tab.key}
+              variant={filter === tab.key ? "solid" : "soft"}
+              color={filter === tab.key ? "neutral" : tab.color}
+              onClick={() => setFilter(tab.key)}
+              className="cursor-pointer rounded-full px-3 transition-all duration-150 active:scale-95"
+            >
+              {tab.label} {tab.count}
+            </Chip>
+          ))}
+        </div>
       </div>
-      {alert.isAlert && (
-        <MyAlert type={alert.type} header={alert.header} text={alert.text} />
-      )}
 
       <Sheet
         variant="outlined"
-        className="mt-6 flex min-h-0 w-full max-w-full flex-col overflow-hidden rounded-2xl shadow-sm sm:h-[calc(100vh-260px)]"
-        sx={{
-          border: "1px solid",
-          borderColor: "divider",
-          bgcolor: "background.surface",
-        }}
+        className="flex min-h-0 w-full max-w-full flex-col overflow-hidden rounded-2xl"
+        sx={{ border: "1px solid", borderColor: "divider", bgcolor: "background.surface" }}
       >
-        <div
-          className="flex items-center justify-between px-6 py-4"
-          style={{
-            borderBottom: "1px solid var(--joy-palette-divider)",
-            color: "var(--joy-palette-text-secondary)",
-          }}
-        >
-          <Typography level="body-lg" fontWeight="bold">
-            {t("inventory")}
-          </Typography>
-          <Button
-            size="sm"
-            color="danger"
-            variant="solid"
-            disabled={selected.length === 0 || isDeleting}
-            onClick={() => deleteSelection([...selected])}
+        {selected.length > 0 && (
+          <div
+            className="flex items-center justify-between px-6 py-3"
+            style={{ borderBottom: "1px solid var(--joy-palette-divider)" }}
           >
-            Delete
-          </Button>
-        </div>
-        <div className="flex-1 overflow-auto">
+            <Typography level="body-sm" sx={{ color: "var(--joy-palette-text-secondary)" }}>
+              {selected.length} {t("selected")}
+            </Typography>
+            <Button
+              size="sm"
+              color="danger"
+              variant="solid"
+              startDecorator={<Trash2 size={14} />}
+              disabled={isDeleting}
+              onClick={() => deleteSelection([...selected])}
+              className="rounded-xl"
+            >
+              {t("delete")}
+            </Button>
+          </div>
+        )}
+
+        {/* Desktop: grouped table */}
+        <div className="hidden overflow-auto lg:block">
           <Table
-            aria-labelledby="tableTitle"
             stickyHeader
             stripe="odd"
             variant="plain"
@@ -162,57 +278,19 @@ export const InventoryPage = () => {
             sx={{
               tableLayout: "fixed",
               color: "var(--joy-palette-text-secondary)",
-              "--TableCell-headBackground":
-                "var(--joy-palette-background-level1)",
-              "& thead": {
-                position: "sticky",
-                top: 0,
-                zIndex: 3,
-                backgroundColor: "var(--joy-palette-background-level1)",
-              },
-              "& thead tr": {
-                backgroundColor: "var(--joy-palette-background-level1)",
-              },
+              "--TableCell-headBackground": "var(--joy-palette-background-level1)",
               "& thead th": {
-                zIndex: 2,
                 backgroundColor: "var(--joy-palette-background-level1)",
                 backgroundImage: "none",
                 color: "var(--joy-palette-text-secondary)",
               },
-              "& thead th:nth-child(1)": {
-                width: "44px",
-              },
-              "& thead th:nth-child(2)": {
-                width: "22%",
-                minWidth: "160px",
-              },
-              "& thead th:nth-child(3)": {
-                width: "9%",
-                minWidth: "70px",
-              },
-              "& thead th:nth-child(4)": {
-                width: "12%",
-                minWidth: "90px",
-              },
-              "& thead th:nth-child(5)": {
-                width: "17%",
-                minWidth: "120px",
-              },
-              "& thead th:nth-child(6)": {
-                width: "13%",
-                minWidth: "100px",
-              },
-              "& thead th:nth-child(7)": {
-                width: "13%",
-                minWidth: "100px",
-              },
-              "& thead th:nth-child(8)": {
-                width: "14%",
-                minWidth: "100px",
-              },
-              "& tr > *:nth-child(n+4)": { textAlign: "left" },
+              "& thead th:nth-child(1)": { width: "40px" },
+              "& thead th:nth-child(2)": { width: "26%" },
+              "& thead th:nth-child(6)": { width: "8%" },
+              "& tr > *:nth-child(n+3)": { textAlign: "left" },
               "& tbody tr": {
                 borderTop: "1px solid var(--joy-palette-divider)",
+                transition: "background-color 120ms ease",
               },
             }}
           >
@@ -220,134 +298,200 @@ export const InventoryPage = () => {
               <tr>
                 <th className="px-2 py-4">
                   <Checkbox
-                    checked={rows.length > 0 && selected.length === rows.length}
-                    indeterminate={
-                      selected.length > 0 && selected.length < rows.length
-                    }
+                    checked={filteredRows.length > 0 && selected.length === filteredRows.length}
+                    indeterminate={selected.length > 0 && selected.length < filteredRows.length}
                     onChange={handleSelectAllClick}
                     slotProps={{ input: { "aria-label": "select all" } }}
-                    sx={{ verticalAlign: "sub" }}
                   />
                 </th>
                 <th className="px-3 py-4">{t("product-name")}</th>
-                <th className="px-3 py-4">{t("price")}</th>
                 <th className="px-3 py-4">{t("stock")}</th>
-                <th className="px-3 py-4">{t("storage-place")}</th>
+                <th className="px-3 py-4">{t("price")}</th>
                 <th className="px-3 py-4">{t("expiry-date")}</th>
-                <th className="px-3 py-4">{t("bottling-date")}</th>
                 <th className="px-3 py-4 text-right">{t("actions")}</th>
               </tr>
             </thead>
             <tbody>
-              {rows.map((row, index) => {
-                const isItemSelected = selected.includes(row.id);
-                const labelId = `inventory-checkbox-${index}`;
+              {groups.map((group) => {
+                const isCollapsed = collapsedGroups.has(group.name);
                 return (
-                  <tr
-                    key={row.id}
-                    onClick={(event) => handleClick(event, row.id)}
-                    role="checkbox"
-                    aria-checked={isItemSelected}
-                    tabIndex={-1}
-                  >
-                    <th scope="row" className="px-2 py-5">
-                      <Checkbox
-                        checked={isItemSelected}
-                        slotProps={{ input: { "aria-labelledby": labelId } }}
-                        sx={{ verticalAlign: "top" }}
-                      />
-                    </th>
-                    <th
-                      id={labelId}
-                      scope="row"
-                      className="px-3 py-5 overflow-hidden"
-                    >
-                      <div className="flex min-w-0 items-center gap-3">
-                        <Avatar size="lg" variant="soft" className="shrink-0">
-                          <CategoryIcon />
-                        </Avatar>
-                        <div className="min-w-0">
-                          <Typography
-                            level="title-md"
-                            className="truncate"
-                            sx={{ color: "var(--joy-palette-text-primary)" }}
+                  <Fragment key={`group-${group.name}`}>
+                    <tr>
+                      <td colSpan={6} className="px-3 py-3" style={{ backgroundColor: "var(--joy-palette-background-level1)" }}>
+                        <button
+                          type="button"
+                          onClick={() => toggleGroup(group.name)}
+                          className="flex items-center gap-2 font-semibold"
+                          style={{ color: "var(--joy-palette-text-primary)" }}
+                        >
+                          <ChevronDown
+                            size={16}
+                            className={`shrink-0 transition-transform duration-200 ${isCollapsed ? "-rotate-90" : ""}`}
+                          />
+                          {group.name}
+                          <span className="font-normal" style={{ color: "var(--joy-palette-text-tertiary)" }}>
+                            {group.rows.length} {t("products")} &middot; {group.units} {t("units")}
+                          </span>
+                        </button>
+                      </td>
+                    </tr>
+                    {!isCollapsed &&
+                      group.rows.map((row) => {
+                        const isItemSelected = selected.includes(row.id);
+                        const status = getProductStatus(row.expiryDateRaw);
+                        return (
+                          <tr
+                            key={row.id}
+                            onClick={(event) => handleClick(event, row.id)}
+                            role="checkbox"
+                            aria-checked={isItemSelected}
                           >
-                            {row.name}
-                          </Typography>
-                          <Typography
-                            level="body-sm"
-                            className="truncate"
-                            sx={{ color: "var(--joy-palette-text-tertiary)" }}
-                          >
-                            {row.description}
-                          </Typography>
-                        </div>
-                      </div>
-                    </th>
-                    <td className="px-3 py-5 overflow-hidden">
-                      <Typography level="title-md" className="truncate">
-                        {row.price}
-                      </Typography>
-                      <Typography
-                        level="body-sm"
-                        className="truncate"
-                        sx={{ color: "var(--joy-palette-neutral-400)" }}
-                      >
-                        {Cookies.get("currency")}
-                      </Typography>
-                    </td>
-                    <td className="px-3 py-5 overflow-hidden">
-                      <Chip
-                        variant="soft"
-                        color="neutral"
-                        size="lg"
-                        className="max-w-full px-3"
-                      >
-                        <span className="truncate">{row.stock}</span>
-                      </Chip>
-                    </td>
-                    <td className="px-3 py-5 overflow-hidden">
-                      <Typography level="title-md" className="truncate">
-                        {row.location}
-                      </Typography>
-                      <Typography
-                        level="body-sm"
-                        className="truncate"
-                        sx={{ color: "var(--joy-palette-text-tertiary)" }}
-                      >
-                        {row.locationDetail}
-                      </Typography>
-                    </td>
-                    <td className="px-3 py-5 overflow-hidden">
-                      <Typography level="title-md" className="truncate">
-                        {row.expiryDate}
-                      </Typography>
-                    </td>
-                    <td className="px-3 py-5 overflow-hidden">
-                      <Typography level="title-md" className="truncate">
-                        {row.refillDate}
-                      </Typography>
-                    </td>
-                    <td className="px-3 py-5 text-right">
-                      <Button
-                        onClick={() =>
-                          navigate({
-                            to: `/app/view-product?product=${row.uuid}`,
-                          })
-                        }
-                        variant="outlined"
-                        size="sm"
-                      >
-                        {t("details")}
-                      </Button>
-                    </td>
-                  </tr>
+                            <td className="px-2 py-4">
+                              <Checkbox checked={isItemSelected} sx={{ verticalAlign: "top" }} />
+                            </td>
+                            <td className="px-3 py-4">
+                              <div className="flex min-w-0 items-stretch gap-3">
+                                <ProductStatusBar status={status} />
+                                <div className="min-w-0">
+                                  <Typography level="title-md" className="truncate" sx={{ color: "var(--joy-palette-text-primary)" }}>
+                                    {row.name}
+                                  </Typography>
+                                  <Typography level="body-sm" className="truncate normal-case font-normal" sx={{ color: "var(--joy-palette-text-tertiary)" }}>
+                                    {row.description}
+                                  </Typography>
+                                </div>
+                              </div>
+                            </td>
+                            <td className="px-3 py-4">
+                              <Typography
+                                level="title-md"
+                                sx={{
+                                  color: isLowStock(Number(row.stockLabel))
+                                    ? "var(--joy-palette-danger-solidBg)"
+                                    : "var(--joy-palette-text-primary)",
+                                }}
+                              >
+                                {row.stock}
+                              </Typography>
+                            </td>
+                            <td className="px-3 py-4">
+                              <Mono>
+                                <Typography level="body-sm" sx={{ color: "var(--joy-palette-text-tertiary)" }}>
+                                  {row.price === "-" ? "-" : `${row.price} ${Cookies.get("currency") ?? ""}`}
+                                </Typography>
+                              </Mono>
+                            </td>
+                            <td className="px-3 py-4">
+                              <Mono>
+                                <Typography level="title-md" className="truncate" sx={{ color: "var(--joy-palette-text-primary)" }}>
+                                  {row.expiryDate}
+                                </Typography>
+                              </Mono>
+                              <ExpiryRelative expiryDate={row.expiryDateRaw} />
+                            </td>
+                            <td className="px-3 py-4 text-right">
+                              <Button
+                                onClick={() => navigate({ to: `/app/view-product?product=${row.uuid}` })}
+                                variant="outlined"
+                                size="sm"
+                                className="rounded-xl"
+                              >
+                                {t("details")}
+                              </Button>
+                            </td>
+                          </tr>
+                        );
+                      })}
+                  </Fragment>
                 );
               })}
             </tbody>
           </Table>
         </div>
+
+        {/* Mobile: grouped card list */}
+        <div className="lg:hidden">
+          {groups.map((group) => {
+            const isCollapsed = collapsedGroups.has(group.name);
+            return (
+              <div key={group.name}>
+                <button
+                  type="button"
+                  onClick={() => toggleGroup(group.name)}
+                  className="flex w-full items-center gap-2 px-4 py-3 text-left font-semibold"
+                  style={{
+                    backgroundColor: "var(--joy-palette-background-level1)",
+                    color: "var(--joy-palette-text-primary)",
+                    borderTop: "1px solid var(--joy-palette-divider)",
+                  }}
+                >
+                  <ChevronDown
+                    size={16}
+                    className={`shrink-0 transition-transform duration-200 ${isCollapsed ? "-rotate-90" : ""}`}
+                  />
+                  {group.name}
+                  <span className="ml-auto font-normal" style={{ color: "var(--joy-palette-text-tertiary)" }}>
+                    {group.rows.length}
+                  </span>
+                </button>
+                <div
+                  className="grid transition-[grid-template-rows] duration-200 ease-out"
+                  style={{ gridTemplateRows: isCollapsed ? "0fr" : "1fr" }}
+                >
+                  <div className="overflow-hidden">
+                    {group.rows.map((row) => {
+                      const status = getProductStatus(row.expiryDateRaw);
+                      return (
+                        <button
+                          key={row.id}
+                          type="button"
+                          onClick={() => navigate({ to: `/app/view-product?product=${row.uuid}` })}
+                          className="flex w-full items-stretch gap-3 px-4 py-3 text-left"
+                          style={{ borderTop: "1px solid var(--joy-palette-divider)" }}
+                        >
+                          <ProductStatusBar status={status} />
+                          <div className="min-w-0 flex-1">
+                            <Typography level="title-md" className="truncate" sx={{ color: "var(--joy-palette-text-primary)" }}>
+                              {row.name}
+                            </Typography>
+                            <Mono>
+                              <Typography level="body-sm" className="normal-case" sx={{ color: "var(--joy-palette-text-tertiary)" }}>
+                                {row.expiryDate}
+                              </Typography>
+                            </Mono>
+                          </div>
+                          <Typography
+                            level="title-md"
+                            className="shrink-0"
+                            sx={{
+                              color: isLowStock(Number(row.stockLabel))
+                                ? "var(--joy-palette-danger-solidBg)"
+                                : "var(--joy-palette-text-primary)",
+                            }}
+                          >
+                            {row.stockLabel} <span className="text-sm font-normal">{t("pcs")}</span>
+                          </Typography>
+                        </button>
+                      );
+                    })}
+                  </div>
+                </div>
+              </div>
+            );
+          })}
+          <div className="p-4">
+            <Button
+              startDecorator={<Plus size={16} />}
+              onClick={() => navigate({ to: "/app/add-product" })}
+              variant="solid"
+              size="lg"
+              className="w-full rounded-2xl"
+            >
+              {t("add-product")}
+            </Button>
+          </div>
+        </div>
       </Sheet>
-    </>
+    </div>
   );
 };

frontend/src/pages/ProductQuickView.tsx

@@ -1,22 +1,27 @@
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { getStorages } from "../utils/api/storages.ts";
-import { Box, Button, Chip, CircularProgress, Divider, Input, Option, Select, Typography, } from "@mui/joy";
+import { Button, Chip, CircularProgress, Option, Select, Typography } from "@mui/joy";
 import { useTranslation } from "react-i18next";
 import { useEffect, useState } from "react";
 import { useForm } from "@tanstack/react-form";
+import { Link } from "@tanstack/react-router";
 import { getProductDetails, mutateProduct } from "../utils/api/products.ts";
 import { toInputDate } from "../utils/uxFncs";
-import type { AlertInterface, productDetailsInterface, ProductFormValues, Storage, } from "../misc/interfaces";
+import type {
+  AlertInterface,
+  productDetailsInterface,
+  ProductFormValues,
+  Storage,
+} from "../misc/interfaces";
 import type { ApiError } from "../utils/api/apiError";
-import Cookies from "js-cookie";
-import ElectricBoltIcon from "@mui/icons-material/ElectricBolt";
+import { AmountStepper } from "../components/AmountStepper.tsx";
+import { ExpiryBadge } from "../components/ProductStatusBar.tsx";
 import { MyAlert } from "../components/MyAlert.tsx";
 
 export const ProductQuickView = () => {
   const uuid = window.location.search.split("uuid=")[1];
   const { t } = useTranslation();
   const queryClient = useQueryClient();
-  const [success, setSuccess] = useState(false);
   const [alert, setAlert] = useState<AlertInterface>({
     isAlert: false,
     type: "neutral",
@@ -66,6 +71,8 @@ export const ProductQuickView = () => {
     }
   }, [storagesError, storagesErrorObj]);
 
+  // Only Amount/Expiry/Storage are shown here — name/description/bottling
+  // date/price stay in form state untouched and are sent back as-is on save.
   const form = useForm({
     defaultValues: {
       amount: 0,
@@ -86,15 +93,10 @@ export const ProductQuickView = () => {
   });
 
   const { mutate, isPending } = useMutation({
-    mutationFn: ({
-      values,
-      uuid,
-    }: {
-      values: ProductFormValues;
-      uuid: string;
-    }) => mutateProduct(values, uuid),
+    mutationFn: ({ values, uuid }: { values: ProductFormValues; uuid: string }) =>
+      mutateProduct(values, uuid),
     onSuccess: (_data, variables) => {
-      setSuccess(true);
+      setAlert({ isAlert: true, type: "success", header: t("success"), text: t("save") });
       queryClient.invalidateQueries({ queryKey: ["product", variables.uuid] });
     },
     onError: showError,
@@ -106,312 +108,127 @@ export const ProductQuickView = () => {
     }
 
     form.setFieldValue("amount", productDetails.amount ?? 0);
-    form.setFieldValue(
-      "bottling_date",
-      toInputDate(productDetails.bottling_date),
-    );
+    form.setFieldValue("bottling_date", toInputDate(productDetails.bottling_date));
     form.setFieldValue("description", productDetails.description ?? "");
     form.setFieldValue("expiry_date", toInputDate(productDetails.expiry_date));
     form.setFieldValue("name", productDetails.name ?? "");
     form.setFieldValue("price", productDetails.price ?? "");
-    form.setFieldValue(
-      "storage_location_uuid",
-      productDetails.storage_location_uuid ?? "",
-    );
+    form.setFieldValue("storage_location_uuid", productDetails.storage_location_uuid ?? "");
   }, [form, productDetails]);
 
   return (
-    <>
-      <div className="space-y-6">
-        <div className="flex flex-wrap items-center gap-3">
-          <div className="space-y-1">
-            <Typography
-              level="h2"
-              fontWeight="1000"
-              sx={{ color: "var(--joy-palette-text-primary)" }}
-            >
-              <ElectricBoltIcon color="primary" />
-              {t("product-details-quick")}
-              <ElectricBoltIcon color="primary" />
-            </Typography>
-          </div>
-          <Chip
-            variant="soft"
-            color="primary"
-            className="ml-auto rounded-full px-3"
-          >
-            {t("details")}
-          </Chip>
-        </div>
+    <div className="flex min-h-screen items-start justify-center px-4 py-10 sm:items-center" style={{ backgroundColor: "var(--joy-palette-background-body)" }}>
+      <div className="w-full max-w-md space-y-5">
+        <Chip variant="soft" color="warning" size="sm" className="rounded-full px-3 font-semibold">
+          {t("scanned-badge")}
+        </Chip>
+
         {productDetailsLoading && <CircularProgress size="sm" />}
-      </div>
-      {isSuccess && (
-        <Box
-          className="mt-6 rounded-3xl p-6 backdrop-blur"
-          sx={{
-            border: "1px solid",
-            borderColor: "divider",
-            bgcolor: "background.surface",
-            boxShadow:
-              "0 24px 60px color-mix(in srgb, var(--joy-palette-primary-800) 12%, transparent)",
-          }}
-        >
-          <form
-            className="space-y-6"
-            onSubmit={(e) => {
-              e.preventDefault();
-              form.handleSubmit();
-            }}
-          >
-            <div className="gap-5 lg:grid-cols-[1.2fr_1fr]">
-              <div className="space-y-4">
-                <div className="space-y-1">
-                  <Typography
-                    level="title-md"
-                    sx={{ color: "var(--joy-palette-text-primary)" }}
-                  >
-                    {t("product-name")}
-                  </Typography>
-                  <form.Field name="name">
-                    {(field) => (
-                      <Input
-                        type="text"
-                        value={field.state.value}
-                        onChange={(e) => field.handleChange(e.target.value)}
-                        onBlur={field.handleBlur}
-                        size="lg"
-                        variant="outlined"
-                        className="rounded-2xl"
-                        sx={{
-                          bgcolor: "var(--joy-palette-background-surface)",
-                          boxShadow: "0 10px 24px var(--joy-palette-divider)",
-                        }}
-                      />
-                    )}
-                  </form.Field>
-                </div>
-                <div className="space-y-1">
-                  <Typography
-                    level="title-md"
-                    sx={{ color: "var(--joy-palette-text-primary)" }}
-                  >
-                    {t("description")}
-                  </Typography>
-                  <form.Field name="description">
-                    {(field) => (
-                      <Input
-                        type="text"
-                        value={field.state.value}
-                        onChange={(e) => field.handleChange(e.target.value)}
-                        onBlur={field.handleBlur}
-                        size="lg"
-                        variant="outlined"
-                        className="rounded-2xl"
-                        sx={{
-                          bgcolor: "var(--joy-palette-background-surface)",
-                          boxShadow: "0 10px 24px var(--joy-palette-divider)",
-                        }}
-                      />
-                    )}
-                  </form.Field>
-                </div>
-                <div className="grid gap-4 md:grid-cols-2">
-                  <div className="space-y-1">
-                    <Typography
-                      level="title-md"
-                      sx={{ color: "var(--joy-palette-text-primary)" }}
-                    >
-                      {t("expiry-date")}
-                    </Typography>
-                    <form.Field name="expiry_date">
-                      {(field) => (
-                        <Input
-                          type="date"
-                          value={field.state.value}
-                          onChange={(e) => field.handleChange(e.target.value)}
-                          onBlur={field.handleBlur}
-                          size="lg"
-                          variant="outlined"
-                          className="rounded-2xl"
-                          sx={{
-                            bgcolor: "var(--joy-palette-background-surface)",
-                          }}
-                        />
-                      )}
-                    </form.Field>
-                  </div>
-                  <div className="space-y-1">
-                    <Typography
-                      level="title-md"
-                      sx={{ color: "var(--joy-palette-text-primary)" }}
-                    >
-                      {t("bottling-date")}
-                    </Typography>
-                    <form.Field name="bottling_date">
-                      {(field) => (
-                        <Input
-                          type="date"
-                          value={field.state.value}
-                          onChange={(e) => field.handleChange(e.target.value)}
-                          onBlur={field.handleBlur}
-                          size="lg"
-                          variant="outlined"
-                          className="rounded-2xl"
-                          sx={{
-                            bgcolor: "var(--joy-palette-background-surface)",
-                          }}
-                        />
-                      )}
-                    </form.Field>
-                  </div>
-                </div>
-              </div>
-              <div className="space-y-4">
-                <div
-                  className="rounded-2xl p-5"
-                  style={{
-                    border: "1px solid var(--joy-palette-divider)",
-                    background:
-                      "linear-gradient(to bottom right, var(--joy-palette-primary-50), var(--joy-palette-background-level1), var(--joy-palette-background-level2))",
-                    boxShadow: "0 16px 40px var(--joy-palette-divider)",
-                  }}
-                >
-                  <Typography
-                    level="title-lg"
-                    sx={{ color: "var(--joy-palette-text-primary)" }}
-                  >
-                    {t("inventory")}
-                  </Typography>
-                  <Divider className="my-3" />
-                  <div className="grid gap-4">
-                    <div className="space-y-1">
-                      <Typography
-                        level="title-md"
-                        sx={{ color: "var(--joy-palette-text-primary)" }}
-                      >
-                        {t("amount")}
-                      </Typography>
-                      <form.Field name="amount">
-                        {(field) => (
-                          <Input
-                            type="number"
-                            color="neutral"
-                            id="amountInput"
-                            placeholder={t("amount")}
-                            value={field.state.value}
-                            variant="soft"
-                            size="lg"
-                            onChange={(e) => {
-                              const nextValue = Number(e.target.value);
-                              field.handleChange(
-                                Number.isNaN(nextValue) ? 0 : nextValue,
-                              );
-                            }}
-                            onBlur={field.handleBlur}
-                            className="rounded-2xl"
-                            sx={{
-                              bgcolor: "var(--joy-palette-background-surface)",
-                            }}
-                          />
-                        )}
-                      </form.Field>
-                    </div>
-                    <div className="space-y-1">
-                      <Typography
-                        level="title-md"
-                        sx={{ color: "var(--joy-palette-text-primary)" }}
-                      >
-                        {t("price")}
-                      </Typography>
-                      <form.Field name="price">
-                        {(field) => (
-                          <Input
-                            type="text"
-                            value={field.state.value}
-                            onChange={(e) => field.handleChange(e.target.value)}
-                            onBlur={field.handleBlur}
-                            size="lg"
-                            variant="outlined"
-                            className="rounded-2xl"
-                            sx={{
-                              bgcolor: "var(--joy-palette-background-surface)",
-                            }}
-                          />
-                        )}
-                      </form.Field>
-                      <Typography
-                        level="body-sm"
-                        sx={{ color: "var(--joy-palette-text-tertiary)" }}
-                      >
-                        {Cookies.get("currency")}
-                      </Typography>
-                    </div>
-                    <div className="space-y-1">
-                      <Typography
-                        level="title-md"
-                        sx={{ color: "var(--joy-palette-text-primary)" }}
-                      >
-                        {t("storage-place")}
-                      </Typography>
-                      <form.Field name="storage_location_uuid">
-                        {(field) => (
-                          <Select
-                            value={field.state.value}
-                            onChange={(_event, value) =>
-                              field.handleChange(value ?? "")
-                            }
-                            size="lg"
-                            variant="outlined"
-                            className="rounded-2xl"
-                            sx={{
-                              bgcolor: "var(--joy-palette-background-surface)",
-                            }}
-                          >
-                            {storages?.map((storage) => (
-                              <Option key={storage.uuid} value={storage.uuid}>
-                                {storage.name}
-                              </Option>
-                            ))}
-                          </Select>
-                        )}
-                      </form.Field>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div className="flex flex-wrap items-center justify-between gap-3">
-              <Typography
-                level="body-sm"
-                sx={{ color: "var(--joy-palette-text-tertiary)" }}
-              >
-                {t("product-details")}
+
+        {isSuccess && (
+          <>
+            <div className="space-y-1">
+              <Typography level="h2" sx={{ color: "var(--joy-palette-text-primary)" }}>
+                {productDetails.name}
               </Typography>
-              <Button
-                type="submit"
-                loading={isPending}
-                size="lg"
-                color="primary"
-                variant="solid"
-                className="rounded-2xl transition hover:-translate-y-0.5"
-                sx={{
-                  boxShadow:
-                    "0 16px 36px color-mix(in srgb, var(--joy-palette-primary-solidBg) 35%, transparent)",
-                }}
+              <Typography level="body-lg" sx={{ color: "var(--joy-palette-text-tertiary)" }}>
+                {t("opened-from-jar-label")}
+              </Typography>
+              <ExpiryBadge expiryDate={productDetails.expiry_date} />
+            </div>
+
+            <form
+              className="space-y-5 rounded-3xl p-6"
+              style={{ border: "1px solid var(--joy-palette-divider)", backgroundColor: "var(--joy-palette-background-surface)" }}
+              onSubmit={(e) => {
+                e.preventDefault();
+                form.handleSubmit();
+              }}
+            >
+              <div className="space-y-1 text-center">
+                <Typography level="body-sm" sx={{ color: "var(--joy-palette-text-tertiary)" }}>
+                  {t("amount-in-storage")}
+                </Typography>
+                <form.Field name="amount">
+                  {(field) => (
+                    <AmountStepper
+                      value={field.state.value}
+                      onChange={field.handleChange}
+                      onBlur={field.handleBlur}
+                    />
+                  )}
+                </form.Field>
+                <Typography level="body-sm" className="normal-case font-normal" sx={{ color: "var(--joy-palette-text-tertiary)" }}>
+                  {t("set-to-zero-hint")}
+                </Typography>
+              </div>
+
+              <div
+                className="flex items-center justify-between rounded-2xl px-4 py-3"
+                style={{ border: "1px solid var(--joy-palette-divider)" }}
               >
+                <Typography level="title-md" sx={{ color: "var(--joy-palette-text-primary)" }}>
+                  {t("expiry-date")}
+                </Typography>
+                <form.Field name="expiry_date">
+                  {(field) => (
+                    <input
+                      type="date"
+                      value={field.state.value}
+                      onChange={(e) => field.handleChange(e.target.value)}
+                      onBlur={field.handleBlur}
+                      className="border-none bg-transparent text-right font-semibold outline-none"
+                      style={{ color: "var(--joy-palette-danger-solidBg)" }}
+                    />
+                  )}
+                </form.Field>
+              </div>
+
+              <div
+                className="flex items-center justify-between rounded-2xl px-4 py-3"
+                style={{ border: "1px solid var(--joy-palette-divider)" }}
+              >
+                <Typography level="title-md" sx={{ color: "var(--joy-palette-text-primary)" }}>
+                  {t("storage-place")}
+                </Typography>
+                <form.Field name="storage_location_uuid">
+                  {(field) => (
+                    <Select
+                      value={field.state.value}
+                      onChange={(_event, value) => field.handleChange(value ?? "")}
+                      variant="plain"
+                      size="sm"
+                    >
+                      {storages?.map((storage) => (
+                        <Option key={storage.uuid} value={storage.uuid}>
+                          {storage.name}
+                        </Option>
+                      ))}
+                    </Select>
+                  )}
+                </form.Field>
+              </div>
+
+              <Link
+                to="/app/view-product"
+                search={{ product: uuid }}
+                className="block text-center text-sm font-semibold hover:underline"
+                style={{ color: "var(--joy-palette-primary-solidBg)" }}
+              >
+                {t("open-full-details")}
+              </Link>
+
+              {alert.isAlert && (
+                <MyAlert type={alert.type} header={alert.header} text={alert.text} />
+              )}
+
+              <Button type="submit" loading={isPending} size="lg" color="primary" variant="solid" className="btn-lift w-full rounded-2xl">
                 {t("save")}
               </Button>
-            </div>
-            {alert.isAlert && (
-              <MyAlert
-                type={alert.type}
-                header={alert.header}
-                text={alert.text}
-              />
-            )}
-          </form>
-        </Box>
-      )}
-    </>
+            </form>
+          </>
+        )}
+      </div>
+    </div>
   );
 };

frontend/src/pages/Settings.tsx

@@ -1,4 +1,4 @@
-import { Button, Chip, CircularProgress, Divider, Input, Sheet, Typography, } from "@mui/joy";
+import { Button, CircularProgress, Divider, Input, Sheet, Typography } from "@mui/joy";
 import { useForm } from "@tanstack/react-form";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import Cookies from "js-cookie";
@@ -7,12 +7,25 @@ import type { AlertInterface, SettingsIntf } from "../misc/interfaces";
 import type { ApiError } from "../utils/api/apiError";
 import { fetchSettings, mutateSettings } from "../utils/api/settings";
 import { useEffect, useState } from "react";
+import { useColorScheme } from "@mui/joy/styles";
+import { ChevronRight } from "lucide-react";
 import { ChangePasswordModal } from "../components/modals/ChangePasswordModal";
 import { MyAlert } from "../components/MyAlert.tsx";
+import { PageHeader } from "../components/PageHeader.tsx";
+import { changeTranslation } from "../utils/uxFncs";
+import { useLogout } from "../hooks/useLogout.ts";
+
+const cardSx = {
+  border: "1px solid",
+  borderColor: "divider",
+  bgcolor: "background.surface",
+} as const;
 
 export const Settings = () => {
-  const { t } = useTranslation();
+  const { t, i18n } = useTranslation();
   const queryClient = useQueryClient();
+  const { mode, setMode } = useColorScheme();
+  const { logout } = useLogout();
   const [modal, setModal] = useState(false);
   const [alert, setAlert] = useState<AlertInterface>({
     isAlert: false,
@@ -85,177 +98,192 @@ export const Settings = () => {
     onError: showError,
   });
 
+  const segmentBtn = (active: boolean) => ({
+    className: "rounded-xl px-4",
+    variant: active ? ("solid" as const) : ("plain" as const),
+    color: active ? ("primary" as const) : ("neutral" as const),
+    sx: { color: active ? undefined : "var(--joy-palette-text-secondary)" },
+  });
+
   return (
     <>
       <ChangePasswordModal alert={setAlert} isOpen={modal} setOpen={setModal} />
       <div className="space-y-6">
-        <div className="flex flex-wrap items-center gap-3">
-          <div className="space-y-1">
-            <Typography
-              level="h2"
-              sx={{ color: "var(--joy-palette-text-primary)" }}
-            >
-              {t("settings")}
-            </Typography>
-            <Typography
-              level="body-lg"
-              sx={{ color: "var(--joy-palette-text-tertiary)" }}
-            >
-              {t("settings-sub")}
-            </Typography>
-          </div>
-          <Chip
-            variant="soft"
-            color="primary"
-            className="ml-auto rounded-full px-3"
-          >
-            {t("preferences")}
-          </Chip>
-        </div>
-      </div>
+        <PageHeader title={t("settings")} subtitle={t("settings-sub")} />
 
-      <Sheet
-        className="mt-6 rounded-3xl p-6 backdrop-blur"
-        sx={{
-          border: "1px solid",
-          borderColor: "divider",
-          bgcolor: "background.surface",
-          boxShadow:
-            "0 24px 60px rgba(var(--joy-palette-primary-900, 12 38 78) / 0.12)",
-        }}
-      >
         {alert.isAlert && (
           <MyAlert type={alert.type} header={alert.header} text={alert.text} />
         )}
+
         {settingsPending ? (
           <div className="flex items-center justify-center py-16">
             <CircularProgress size="lg" />
           </div>
         ) : (
-          <form
-            className="space-y-6"
-            onSubmit={(e) => {
-              e.preventDefault();
-              form.handleSubmit();
-            }}
-          >
-            <div className="grid gap-6 lg:grid-cols-[1.1fr\_0.9fr]">
-              <div className="space-y-5">
-                <div className="space-y-1">
-                  <Typography
-                    level="title-md"
-                    sx={{ color: "var(--joy-palette-text-primary)" }}
-                  >
-                    {t("app-name")}
-                  </Typography>
-                  <Typography
-                    level="body-sm"
-                    sx={{ color: "var(--joy-palette-text-tertiary)" }}
-                  >
-                    {t("app-name-sub")}
-                  </Typography>
-                  <form.Field name="app-name">
-                    {(field) => (
-                      <Input
-                        value={field.state.value}
-                        onChange={(e) => field.handleChange(e.target.value)}
-                        size="lg"
-                        variant="outlined"
-                        placeholder="Stockhome"
-                        className="rounded-2xl"
-                        sx={{
-                          bgcolor: "var(--joy-palette-background-surface)",
-                          boxShadow: "0 10px 24px var(--joy-palette-divider)",
-                        }}
-                      />
-                    )}
-                  </form.Field>
-                </div>
-                <div className="space-y-1">
-                  <Typography
-                    level="title-md"
-                    sx={{ color: "var(--joy-palette-text-primary)" }}
-                  >
-                    {t("currency")}
-                  </Typography>
-                  <Typography
-                    level="body-sm"
-                    sx={{ color: "var(--joy-palette-text-tertiary)" }}
-                  >
-                    {t("currency-sub")}
-                  </Typography>
-                  <form.Field name="currency">
-                    {(field) => (
-                      <Input
-                        value={field.state.value}
-                        onChange={(e) => field.handleChange(e.target.value)}
-                        size="lg"
-                        variant="outlined"
-                        placeholder="EUR"
-                        className="rounded-2xl"
-                        sx={{
-                          bgcolor: "var(--joy-palette-background-surface)",
-                          boxShadow: "0 10px 24px var(--joy-palette-divider)",
-                        }}
-                      />
-                    )}
-                  </form.Field>
-                </div>
-              </div>
-              <div
-                className="rounded-2xl p-5"
-                style={{
-                  border: "1px solid var(--joy-palette-divider)",
-                  background:
-                    "linear-gradient(to bottom right, var(--joy-palette-primary-50), var(--joy-palette-background-level1), var(--joy-palette-background-level2))",
-                  boxShadow: "0 16px 40px var(--joy-palette-divider)",
-                }}
-              >
-                <Typography
-                  level="title-lg"
-                  sx={{ color: "var(--joy-palette-text-primary)" }}
-                >
-                  {t("quick-tips")}
+          <div className="grid gap-6 lg:grid-cols-[1.1fr_0.9fr] lg:items-start">
+            <div className="space-y-6">
+              <Sheet className="rounded-3xl p-6" sx={cardSx}>
+                <Typography level="title-lg" sx={{ color: "var(--joy-palette-text-primary)" }}>
+                  {t("general")}
                 </Typography>
-                <Divider className="my-3" />
-                <div
-                  className="space-y-3 text-md"
-                  style={{ color: "var(--joy-palette-text-secondary)" }}
+                <Divider className="my-4" />
+                <form
+                  className="space-y-5"
+                  onSubmit={(e) => {
+                    e.preventDefault();
+                    form.handleSubmit();
+                  }}
                 >
-                  <p>{t("quick-tips-1")}</p>
-                  <p>{t("quick-tips-2")}</p>
+                  <div className="grid gap-5 sm:grid-cols-2">
+                    <div className="space-y-1">
+                      <Typography level="title-md" sx={{ color: "var(--joy-palette-text-primary)" }}>
+                        {t("app-name")}
+                      </Typography>
+                      <form.Field name="app-name">
+                        {(field) => (
+                          <Input
+                            value={field.state.value}
+                            onChange={(e) => field.handleChange(e.target.value)}
+                            size="lg"
+                            variant="outlined"
+                            placeholder="Stockhome"
+                            className="rounded-2xl"
+                          />
+                        )}
+                      </form.Field>
+                      <Typography level="body-sm" className="normal-case font-normal" sx={{ color: "var(--joy-palette-text-tertiary)" }}>
+                        {t("app-name-sub")}
+                      </Typography>
+                    </div>
+                    <div className="space-y-1">
+                      <Typography level="title-md" sx={{ color: "var(--joy-palette-text-primary)" }}>
+                        {t("currency")}
+                      </Typography>
+                      <form.Field name="currency">
+                        {(field) => (
+                          <Input
+                            value={field.state.value}
+                            onChange={(e) => field.handleChange(e.target.value)}
+                            size="lg"
+                            variant="outlined"
+                            placeholder="EUR"
+                            className="rounded-2xl"
+                          />
+                        )}
+                      </form.Field>
+                      <Typography level="body-sm" className="normal-case font-normal" sx={{ color: "var(--joy-palette-text-tertiary)" }}>
+                        {t("currency-sub")}
+                      </Typography>
+                    </div>
+                  </div>
+                  <div className="flex justify-end">
+                    <Button type="submit" size="lg" color="primary" className="btn-lift rounded-2xl">
+                      {t("save")}
+                    </Button>
+                  </div>
+                </form>
+              </Sheet>
+
+              <Sheet className="rounded-3xl p-6" sx={cardSx}>
+                <Typography level="title-lg" sx={{ color: "var(--joy-palette-text-primary)" }}>
+                  {t("appearance-language")}
+                </Typography>
+                <Divider className="my-4" />
+                <div className="space-y-5">
+                  <div className="space-y-2">
+                    <Typography level="title-md" sx={{ color: "var(--joy-palette-text-primary)" }}>
+                      {t("theme")}
+                    </Typography>
+                    <div className="inline-flex gap-1 rounded-2xl border border-solid p-1" style={{ borderColor: "var(--joy-palette-divider)" }}>
+                      <Button {...segmentBtn(mode === "light")} onClick={() => setMode("light")}>
+                        {t("theme-light")}
+                      </Button>
+                      <Button {...segmentBtn(mode === "dark")} onClick={() => setMode("dark")}>
+                        {t("theme-dark")}
+                      </Button>
+                      <Button {...segmentBtn(mode === "system")} onClick={() => setMode("system")}>
+                        {t("theme-system")}
+                      </Button>
+                    </div>
+                  </div>
+                  <div className="space-y-2">
+                    <Typography level="title-md" sx={{ color: "var(--joy-palette-text-primary)" }}>
+                      {t("language")}
+                    </Typography>
+                    <div className="inline-flex gap-1 rounded-2xl border border-solid p-1" style={{ borderColor: "var(--joy-palette-divider)" }}>
+                      <Button
+                        {...segmentBtn(i18n.language === "de")}
+                        onClick={() => i18n.language !== "de" && changeTranslation()}
+                      >
+                        Deutsch
+                      </Button>
+                      <Button
+                        {...segmentBtn(i18n.language === "en")}
+                        onClick={() => i18n.language !== "en" && changeTranslation()}
+                      >
+                        English
+                      </Button>
+                    </div>
+                  </div>
                 </div>
+              </Sheet>
+
+              <Sheet className="rounded-3xl p-6" sx={cardSx}>
+                <Typography level="title-lg" sx={{ color: "var(--joy-palette-text-primary)" }}>
+                  {t("account")}
+                </Typography>
+                <Divider className="my-4" />
+                <div className="space-y-4">
+                  <button
+                    type="button"
+                    onClick={() => setModal(true)}
+                    className="flex w-full items-center justify-between rounded-2xl px-1 py-1 text-left"
+                  >
+                    <div>
+                      <Typography level="title-md" sx={{ color: "var(--joy-palette-text-primary)" }}>
+                        {t("change-password")}
+                      </Typography>
+                    </div>
+                    <ChevronRight size={18} color="var(--joy-palette-text-tertiary)" />
+                  </button>
+                  <Divider />
+                  <div className="flex items-center justify-between">
+                    <div>
+                      <Typography level="title-md" sx={{ color: "var(--joy-palette-danger-solidBg)" }}>
+                        {t("sign-out")}
+                      </Typography>
+                      <Typography level="body-sm" className="normal-case font-normal" sx={{ color: "var(--joy-palette-text-tertiary)" }}>
+                        {t("sign-out-sub")}
+                      </Typography>
+                    </div>
+                    <Button color="danger" variant="outlined" className="rounded-2xl" onClick={logout}>
+                      {t("logout")}
+                    </Button>
+                  </div>
+                </div>
+              </Sheet>
+            </div>
+
+            <div
+              className="rounded-3xl p-6"
+              style={{
+                border: "1px solid var(--joy-palette-divider)",
+                background:
+                  "linear-gradient(to bottom right, var(--joy-palette-primary-50), var(--joy-palette-background-level1), var(--joy-palette-background-level2))",
+              }}
+            >
+              <Typography level="title-lg" sx={{ color: "var(--joy-palette-text-primary)" }}>
+                {t("quick-tips")}
+              </Typography>
+              <Divider className="my-3" />
+              <div className="space-y-3 text-md" style={{ color: "var(--joy-palette-text-secondary)" }}>
+                <p>{t("quick-tips-1")}</p>
+                <p>{t("quick-tips-2")}</p>
               </div>
             </div>
-            <div className="flex flex-wrap items-center justify-end gap-3">
-              <Button
-                type="submit"
-                size="lg"
-                color="primary"
-                className="rounded-2xl transition hover:-translate-y-0.5"
-                sx={{
-                  boxShadow:
-                    "0 16px 36px color-mix(in srgb, var(--joy-palette-primary-solidBg) 35%, transparent)",
-                }}
-              >
-                {t("save")}
-              </Button>
-              <Button
-                onClick={() => setModal(true)}
-                size="lg"
-                color="primary"
-                className="rounded-2xl transition hover:-translate-y-0.5"
-                sx={{
-                  boxShadow:
-                    "0 16px 36px color-mix(in srgb, var(--joy-palette-primary-solidBg) 35%, transparent)",
-                }}
-              >
-                {t("change-password")}
-              </Button>
-            </div>
-          </form>
+          </div>
         )}
-      </Sheet>
+      </div>
     </>
   );
 };

frontend/src/pages/Storages.tsx

@@ -1,5 +1,6 @@
 import { useQuery } from "@tanstack/react-query";
 import { getStorages } from "../utils/api/storages";
+import { getProducts } from "../utils/api/products";
 import { Button, CircularProgress, Sheet, Table, Typography } from "@mui/joy";
 import { useTranslation } from "react-i18next";
 import type { AlertInterface, Storage } from "../misc/interfaces";
@@ -7,8 +8,9 @@ import type { ApiError } from "../utils/api/apiError";
 import { StorageRow } from "../components/StorageRow";
 import { useEffect, useState } from "react";
 import { AddStorageModal } from "../components/modals/AddStorageModal";
-import AddIcon from "@mui/icons-material/Add";
+import { AlertTriangle, Plus } from "lucide-react";
 import { MyAlert } from "../components/MyAlert.tsx";
+import { PageHeader } from "../components/PageHeader.tsx";
 
 export const Storages = () => {
   const { t } = useTranslation();
@@ -40,6 +42,13 @@ export const Storages = () => {
     queryFn: () => getStorages(),
   });
 
+  // Already cached by the sidebar/inventory query — just reused here for the count.
+  const { data: products } = useQuery<{ amount?: number }[]>({
+    queryKey: ["products"],
+    queryFn: getProducts,
+  });
+  const itemsStored = (products ?? []).reduce((sum, product) => sum + (product?.amount ?? 0), 0);
+
   useEffect(() => {
     if (storagesError && storagesErrorObj) {
       showError(storagesErrorObj);
@@ -49,30 +58,29 @@ export const Storages = () => {
   return (
     <>
       <div className="flex flex-col gap-4">
-        <div className="min-w-65 space-y-2">
-          <Typography
-            level="h2"
-            sx={{ color: "var(--joy-palette-text-primary)" }}
-          >
-            {t("storages")}
-          </Typography>
-          <Typography
-            level="body-lg"
-            sx={{ color: "var(--joy-palette-text-tertiary)" }}
-          >
+        <PageHeader
+          title={t("storages")}
+          subtitle={t("storages-sub", { count: storages?.length ?? 0, items: itemsStored })}
+          actions={
+            <Button startDecorator={<Plus size={16} />} onClick={() => setModal(true)} variant="solid" className="btn-lift rounded-2xl">
+              {t("new-storage")}
+            </Button>
+          }
+        />
+        <AddStorageModal isOpen={modal} setOpen={setModal} />
+        <div
+          className="flex items-start gap-3 rounded-2xl border border-solid px-4 py-3"
+          style={{
+            borderColor: "var(--joy-palette-warning-softBg)",
+            backgroundColor: "var(--joy-palette-warning-softBg)",
+            color: "var(--joy-palette-warning-softColor)",
+          }}
+        >
+          <AlertTriangle size={18} className="mt-0.5 shrink-0" />
+          <Typography level="body-lg" sx={{ color: "inherit" }}>
             {t("storage-delete-info")}
           </Typography>
         </div>
-        <div className="flex items-center gap-3">
-          <Button
-            startDecorator={<AddIcon />}
-            onClick={() => setModal(true)}
-            variant="solid"
-            className="rounded-full px-5 py-2 text-base font-semibold shadow-sm"
-          >
-            {t("add")}
-          </Button>
-        </div>
         {alert.isAlert && (
           <MyAlert type={alert.type} header={alert.header} text={alert.text} />
         )}
@@ -80,105 +88,72 @@ export const Storages = () => {
 
       <Sheet
         variant="outlined"
-        className="mt-6 flex min-h-0 w-full max-w-full flex-col overflow-hidden rounded-2xl shadow-sm sm:h-[calc(100vh-260px)]"
+        className="mt-6 flex min-h-0 w-full max-w-full flex-col overflow-hidden rounded-2xl sm:h-[calc(100vh-300px)]"
         sx={{
           border: "1px solid",
           borderColor: "divider",
           bgcolor: "background.surface",
         }}
       >
-        <AddStorageModal isOpen={modal} setOpen={setModal} />
         {isLoading ? (
           <div className="flex items-center justify-center py-16">
             <CircularProgress size="lg" />
           </div>
         ) : (
-          <>
-            <div
-              className="flex items-center justify-between px-6 py-4"
-              style={{
-                borderBottom: "1px solid var(--joy-palette-divider)",
+          <div className="flex-1 overflow-auto">
+            <Table
+              stickyHeader
+              stripe="odd"
+              variant="plain"
+              hoverRow
+              className="w-full"
+              sx={{
+                tableLayout: "fixed",
                 color: "var(--joy-palette-text-secondary)",
+                "--TableCell-headBackground": "var(--joy-palette-background-level1)",
+                "& thead": {
+                  position: "sticky",
+                  top: 0,
+                  zIndex: 3,
+                  backgroundColor: "var(--joy-palette-background-level1)",
+                },
+                "& thead tr": {
+                  backgroundColor: "var(--joy-palette-background-level1)",
+                },
+                "& thead th": {
+                  zIndex: 2,
+                  backgroundColor: "var(--joy-palette-background-level1)",
+                  backgroundImage: "none",
+                  color: "var(--joy-palette-text-secondary)",
+                },
+                "& thead th:nth-child(1)": { width: "26%", minWidth: "140px" },
+                "& thead th:nth-child(2)": { width: "34%", minWidth: "160px" },
+                "& thead th:nth-child(3)": { width: "16%", minWidth: "110px" },
+                "& thead th:nth-child(4)": { width: "16%", minWidth: "110px" },
+                "& thead th:nth-child(5)": { width: "8%", minWidth: "90px" },
+                "& tr > *:nth-child(n+3)": { textAlign: "left" },
+                "& tbody tr": {
+                  borderTop: "1px solid var(--joy-palette-divider)",
+                  transition: "background-color 120ms ease",
+                },
               }}
             >
-              <Typography level="body-lg" fontWeight="bold">
-                {t("storages")}
-              </Typography>
-            </div>
-            <div className="flex-1 overflow-auto">
-              <Table
-                stickyHeader
-                stripe="odd"
-                variant="plain"
-                hoverRow
-                className="w-full"
-                sx={{
-                  tableLayout: "fixed",
-                  color: "var(--joy-palette-text-secondary)",
-                  "--TableCell-headBackground":
-                    "var(--joy-palette-background-level1)",
-                  "& thead": {
-                    position: "sticky",
-                    top: 0,
-                    zIndex: 3,
-                    backgroundColor: "var(--joy-palette-background-level1)",
-                  },
-                  "& thead tr": {
-                    backgroundColor: "var(--joy-palette-background-level1)",
-                  },
-                  "& thead th": {
-                    zIndex: 2,
-                    backgroundColor: "var(--joy-palette-background-level1)",
-                    backgroundImage: "none",
-                    color: "var(--joy-palette-text-secondary)",
-                  },
-                  "& thead th:nth-child(1)": {
-                    width: "26%",
-                    minWidth: "140px",
-                  },
-                  "& thead th:nth-child(2)": {
-                    width: "34%",
-                    minWidth: "160px",
-                  },
-                  "& thead th:nth-child(3)": {
-                    width: "16%",
-                    minWidth: "110px",
-                  },
-                  "& thead th:nth-child(4)": {
-                    width: "16%",
-                    minWidth: "110px",
-                  },
-                  "& thead th:nth-child(5)": {
-                    width: "8%",
-                    minWidth: "80px",
-                  },
-                  "& tr > *:nth-child(n+3)": { textAlign: "left" },
-                  "& tbody tr": {
-                    borderTop: "1px solid var(--joy-palette-divider)",
-                  },
-                }}
-              >
-                <thead>
-                  <tr>
-                    <th className="px-3 py-4">{t("storage-name")}</th>
-                    <th className="px-3 py-4">{t("description")}</th>
-                    <th className="px-3 py-4">{t("created-at")}</th>
-                    <th className="px-3 py-4">{t("updated-at")}</th>
-                    <th className="px-3 py-4 text-right"></th>
-                  </tr>
-                </thead>
-                <tbody>
-                  {storages?.map((storage: Storage) => (
-                    <StorageRow
-                      key={storage.uuid}
-                      storage={storage}
-                      onError={showError}
-                    />
-                  ))}
-                </tbody>
-              </Table>
-            </div>
-          </>
+              <thead>
+                <tr>
+                  <th className="px-3 py-4">{t("storage-name")}</th>
+                  <th className="px-3 py-4">{t("description")}</th>
+                  <th className="px-3 py-4">{t("created-at")}</th>
+                  <th className="px-3 py-4">{t("updated-at")}</th>
+                  <th className="px-3 py-4 text-right"></th>
+                </tr>
+              </thead>
+              <tbody>
+                {storages?.map((storage: Storage) => (
+                  <StorageRow key={storage.uuid} storage={storage} onError={showError} />
+                ))}
+              </tbody>
+            </Table>
+          </div>
         )}
       </Sheet>
     </>

frontend/src/pages/ViewProduct.tsx

@@ -1,18 +1,36 @@
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { getStorages } from "../utils/api/storages.ts";
-import { Box, Button, Chip, CircularProgress, Divider, Input, Option, Select, Typography, } from "@mui/joy";
+import { Button, CircularProgress, Input, Option, Select, Typography } from "@mui/joy";
 import { useTranslation } from "react-i18next";
 import { useEffect, useState } from "react";
 import { useForm } from "@tanstack/react-form";
-import { getProductDetails, mutateProduct } from "../utils/api/products.ts";
+import { useNavigate } from "@tanstack/react-router";
+import {
+  deleteSelectedProducts,
+  getProductDetails,
+  mutateProduct,
+} from "../utils/api/products.ts";
 import { toInputDate } from "../utils/uxFncs";
-import type { AlertInterface, productDetailsInterface, ProductFormValues, Storage, } from "../misc/interfaces";
+import type {
+  AlertInterface,
+  productDetailsInterface,
+  ProductFormValues,
+  Storage,
+} from "../misc/interfaces";
 import type { ApiError } from "../utils/api/apiError";
-import QrCodeIcon from "@mui/icons-material/QrCode";
+import { QrCode, Trash2 } from "lucide-react";
 import Cookies from "js-cookie";
 import QRCode from "qrcode";
+import { AmountStepper } from "../components/AmountStepper.tsx";
+import { ExpiryBadge } from "../components/ProductStatusBar.tsx";
 import { MyAlert } from "../components/MyAlert.tsx";
 
+const cardSx = {
+  border: "1px solid",
+  borderColor: "divider",
+  bgcolor: "background.surface",
+} as const;
+
 interface ViewProductProps {
   uuid: string;
 }
@@ -20,8 +38,8 @@ interface ViewProductProps {
 export const ViewProduct = (props: ViewProductProps) => {
   const uuid = props.uuid;
   const { t } = useTranslation();
+  const navigate = useNavigate();
   const queryClient = useQueryClient();
-  const [success, setSuccess] = useState(false);
   const [alert, setAlert] = useState<AlertInterface>({
     isAlert: false,
     type: "neutral",
@@ -91,48 +109,43 @@ export const ViewProduct = (props: ViewProductProps) => {
   });
 
   const { mutate, isPending } = useMutation({
-    mutationFn: ({
-      values,
-      uuid,
-    }: {
-      values: ProductFormValues;
-      uuid: string;
-    }) => mutateProduct(values, uuid),
+    mutationFn: ({ values, uuid }: { values: ProductFormValues; uuid: string }) =>
+      mutateProduct(values, uuid),
     onSuccess: (_data, variables) => {
-      setSuccess(true);
+      setAlert({ isAlert: true, type: "success", header: t("success"), text: t("save") });
       queryClient.invalidateQueries({ queryKey: ["product", variables.uuid] });
     },
     onError: showError,
   });
 
+  const { mutate: deleteProduct, isPending: isDeleting } = useMutation({
+    mutationFn: () => deleteSelectedProducts([uuid]),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ["products"] });
+      void navigate({ to: "/app/inventory" });
+    },
+    onError: showError,
+  });
+
   useEffect(() => {
     if (!productDetails) {
       return;
     }
 
     form.setFieldValue("amount", productDetails.amount ?? 0);
-    form.setFieldValue(
-      "bottling_date",
-      toInputDate(productDetails.bottling_date),
-    );
+    form.setFieldValue("bottling_date", toInputDate(productDetails.bottling_date));
     form.setFieldValue("description", productDetails.description ?? "");
     form.setFieldValue("expiry_date", toInputDate(productDetails.expiry_date));
     form.setFieldValue("name", productDetails.name ?? "");
     form.setFieldValue("price", productDetails.price ?? "");
-    form.setFieldValue(
-      "storage_location_uuid",
-      productDetails.storage_location_uuid ?? "",
-    );
+    form.setFieldValue("storage_location_uuid", productDetails.storage_location_uuid ?? "");
   }, [form, productDetails]);
 
   const downloadQRcode = async () => {
     const baseUrl: string = `${window.location.protocol}//${window.location.host}`;
     const url = `${baseUrl}/app/quick-view/product?uuid=${uuid}`;
 
-    const dataUrl = await QRCode.toDataURL(url, {
-      width: 300,
-      margin: 2,
-    });
+    const dataUrl = await QRCode.toDataURL(url, { width: 300, margin: 2 });
 
     const link = document.createElement("a");
     link.download = "qrcode.png";
@@ -141,52 +154,42 @@ export const ViewProduct = (props: ViewProductProps) => {
   };
 
   return (
-    <>
-      <div className="space-y-6">
-        <div className="flex flex-wrap items-center gap-3">
-          <div className="space-y-1">
-            <Typography
-              level="h2"
-              sx={{ color: "var(--joy-palette-text-primary)" }}
-            >
-              {t("product-details")}
-            </Typography>
-          </div>
-          <Chip
-            variant="soft"
-            color="primary"
-            className="ml-auto rounded-full px-3"
-          >
-            {t("details")}
-          </Chip>
-        </div>
-        {productDetailsLoading && <CircularProgress size="sm" />}
+    <div className="space-y-6">
+      <div className="flex flex-wrap items-center gap-3">
+        <Typography level="h2" sx={{ color: "var(--joy-palette-text-primary)" }}>
+          {isSuccess ? productDetails.name : t("product-details")}
+        </Typography>
+        {isSuccess && <ExpiryBadge expiryDate={productDetails.expiry_date} />}
+        <Button
+          startDecorator={<Trash2 size={16} />}
+          color="danger"
+          variant="outlined"
+          size="sm"
+          className="ml-auto rounded-2xl"
+          loading={isDeleting}
+          onClick={() => deleteProduct()}
+        >
+          {t("delete")}
+        </Button>
       </div>
+      {productDetailsLoading && <CircularProgress size="sm" />}
+
       {isSuccess && (
-        <Box
-          className="mt-6 rounded-3xl p-6 backdrop-blur"
-          sx={{
-            border: "1px solid",
-            borderColor: "divider",
-            bgcolor: "background.surface",
-            boxShadow:
-              "0 24px 60px color-mix(in srgb, var(--joy-palette-primary-800) 12%, transparent)",
+        <form
+          className="space-y-6"
+          onSubmit={(e) => {
+            e.preventDefault();
+            form.handleSubmit();
           }}
         >
-          <form
-            className="space-y-6"
-            onSubmit={(e) => {
-              e.preventDefault();
-              form.handleSubmit();
-            }}
-          >
-            <div className="grid gap-5 lg:grid-cols-[1.2fr_1fr]">
-              <div className="space-y-4">
+          <div className="grid gap-5 lg:grid-cols-2">
+            <div className="rounded-3xl p-6" style={cardSx}>
+              <Typography level="title-lg" sx={{ color: "var(--joy-palette-text-primary)" }}>
+                {t("product")}
+              </Typography>
+              <div className="mt-4 space-y-4">
                 <div className="space-y-1">
-                  <Typography
-                    level="title-md"
-                    sx={{ color: "var(--joy-palette-text-primary)" }}
-                  >
+                  <Typography level="title-md" sx={{ color: "var(--joy-palette-text-primary)" }}>
                     {t("product-name")}
                   </Typography>
                   <form.Field name="name">
@@ -199,19 +202,12 @@ export const ViewProduct = (props: ViewProductProps) => {
                         size="lg"
                         variant="outlined"
                         className="rounded-2xl"
-                        sx={{
-                          bgcolor: "var(--joy-palette-background-surface)",
-                          boxShadow: "0 10px 24px var(--joy-palette-divider)",
-                        }}
                       />
                     )}
                   </form.Field>
                 </div>
                 <div className="space-y-1">
-                  <Typography
-                    level="title-md"
-                    sx={{ color: "var(--joy-palette-text-primary)" }}
-                  >
+                  <Typography level="title-md" sx={{ color: "var(--joy-palette-text-primary)" }}>
                     {t("description")}
                   </Typography>
                   <form.Field name="description">
@@ -224,44 +220,13 @@ export const ViewProduct = (props: ViewProductProps) => {
                         size="lg"
                         variant="outlined"
                         className="rounded-2xl"
-                        sx={{
-                          bgcolor: "var(--joy-palette-background-surface)",
-                          boxShadow: "0 10px 24px var(--joy-palette-divider)",
-                        }}
                       />
                     )}
                   </form.Field>
                 </div>
-                <div className="grid gap-4 md:grid-cols-2">
+                <div className="grid gap-4 sm:grid-cols-2">
                   <div className="space-y-1">
-                    <Typography
-                      level="title-md"
-                      sx={{ color: "var(--joy-palette-text-primary)" }}
-                    >
-                      {t("expiry-date")}
-                    </Typography>
-                    <form.Field name="expiry_date">
-                      {(field) => (
-                        <Input
-                          type="date"
-                          value={field.state.value}
-                          onChange={(e) => field.handleChange(e.target.value)}
-                          onBlur={field.handleBlur}
-                          size="lg"
-                          variant="outlined"
-                          className="rounded-2xl"
-                          sx={{
-                            bgcolor: "var(--joy-palette-background-surface)",
-                          }}
-                        />
-                      )}
-                    </form.Field>
-                  </div>
-                  <div className="space-y-1">
-                    <Typography
-                      level="title-md"
-                      sx={{ color: "var(--joy-palette-text-primary)" }}
-                    >
+                    <Typography level="title-md" sx={{ color: "var(--joy-palette-text-primary)" }}>
                       {t("bottling-date")}
                     </Typography>
                     <form.Field name="bottling_date">
@@ -274,180 +239,137 @@ export const ViewProduct = (props: ViewProductProps) => {
                           size="lg"
                           variant="outlined"
                           className="rounded-2xl"
-                          sx={{
-                            bgcolor: "var(--joy-palette-background-surface)",
-                          }}
+                        />
+                      )}
+                    </form.Field>
+                  </div>
+                  <div className="space-y-1">
+                    <Typography level="title-md" sx={{ color: "var(--joy-palette-text-primary)" }}>
+                      {t("expiry-date")}
+                    </Typography>
+                    <form.Field name="expiry_date">
+                      {(field) => (
+                        <Input
+                          type="date"
+                          value={field.state.value}
+                          onChange={(e) => field.handleChange(e.target.value)}
+                          onBlur={field.handleBlur}
+                          size="lg"
+                          variant="outlined"
+                          className="rounded-2xl"
                         />
                       )}
                     </form.Field>
                   </div>
                 </div>
               </div>
-              <div className="space-y-4">
-                <div
-                  className="rounded-2xl p-5"
-                  style={{
-                    border: "1px solid var(--joy-palette-divider)",
-                    background:
-                      "linear-gradient(to bottom right, var(--joy-palette-primary-50), var(--joy-palette-background-level1), var(--joy-palette-background-level2))",
-                    boxShadow: "0 16px 40px var(--joy-palette-divider)",
-                  }}
-                >
-                  <Typography
-                    level="title-lg"
-                    sx={{ color: "var(--joy-palette-text-primary)" }}
-                  >
-                    {t("inventory")}
+            </div>
+
+            <div className="rounded-3xl p-6" style={cardSx}>
+              <Typography level="title-lg" sx={{ color: "var(--joy-palette-text-primary)" }}>
+                {t("inventory")}
+              </Typography>
+              <div className="mt-4 space-y-4">
+                <div className="space-y-1">
+                  <Typography level="title-md" sx={{ color: "var(--joy-palette-text-primary)" }}>
+                    {t("amount")}
                   </Typography>
-                  <Divider className="my-3" />
-                  <div className="grid gap-4">
-                    <div className="space-y-1">
-                      <Typography
-                        level="title-md"
-                        sx={{ color: "var(--joy-palette-text-primary)" }}
+                  <form.Field name="amount">
+                    {(field) => (
+                      <AmountStepper
+                        value={field.state.value}
+                        onChange={field.handleChange}
+                        onBlur={field.handleBlur}
+                      />
+                    )}
+                  </form.Field>
+                </div>
+                <div className="space-y-1">
+                  <Typography level="title-md" sx={{ color: "var(--joy-palette-text-primary)" }}>
+                    {t("price")}
+                  </Typography>
+                  <form.Field name="price">
+                    {(field) => (
+                      <Input
+                        type="text"
+                        value={field.state.value}
+                        onChange={(e) => field.handleChange(e.target.value)}
+                        onBlur={field.handleBlur}
+                        size="lg"
+                        variant="outlined"
+                        className="rounded-2xl"
+                        endDecorator={
+                          <Typography level="body-sm" sx={{ color: "var(--joy-palette-text-tertiary)" }}>
+                            {Cookies.get("currency")}
+                          </Typography>
+                        }
+                      />
+                    )}
+                  </form.Field>
+                </div>
+                <div className="space-y-1">
+                  <Typography level="title-md" sx={{ color: "var(--joy-palette-text-primary)" }}>
+                    {t("storage-place")}
+                  </Typography>
+                  <form.Field name="storage_location_uuid">
+                    {(field) => (
+                      <Select
+                        value={field.state.value}
+                        onChange={(_event, value) => field.handleChange(value ?? "")}
+                        size="lg"
+                        variant="outlined"
+                        className="rounded-2xl"
                       >
-                        {t("amount")}
-                      </Typography>
-                      <form.Field name="amount">
-                        {(field) => (
-                          <Input
-                            type="number"
-                            color="neutral"
-                            id="amountInput"
-                            placeholder={t("amount")}
-                            value={field.state.value}
-                            variant="soft"
-                            size="lg"
-                            onChange={(e) => {
-                              const nextValue = Number(e.target.value);
-                              field.handleChange(
-                                Number.isNaN(nextValue) ? 0 : nextValue,
-                              );
-                            }}
-                            onBlur={field.handleBlur}
-                            className="rounded-2xl"
-                            sx={{
-                              bgcolor: "var(--joy-palette-background-surface)",
-                            }}
-                          />
-                        )}
-                      </form.Field>
-                    </div>
-                    <div className="space-y-1">
-                      <Typography
-                        level="title-md"
-                        sx={{ color: "var(--joy-palette-text-primary)" }}
-                      >
-                        {t("price")}
-                      </Typography>
-                      <form.Field name="price">
-                        {(field) => (
-                          <Input
-                            type="text"
-                            value={field.state.value}
-                            onChange={(e) => field.handleChange(e.target.value)}
-                            onBlur={field.handleBlur}
-                            size="lg"
-                            variant="outlined"
-                            className="rounded-2xl"
-                            sx={{
-                              bgcolor: "var(--joy-palette-background-surface)",
-                            }}
-                          />
-                        )}
-                      </form.Field>
-                      <Typography
-                        level="body-sm"
-                        sx={{ color: "var(--joy-palette-text-tertiary)" }}
-                      >
-                        {Cookies.get("currency")}
-                      </Typography>
-                    </div>
-                    <div className="space-y-1">
-                      <Typography
-                        level="title-md"
-                        sx={{ color: "var(--joy-palette-text-primary)" }}
-                      >
-                        {t("storage-place")}
-                      </Typography>
-                      <form.Field name="storage_location_uuid">
-                        {(field) => (
-                          <Select
-                            value={field.state.value}
-                            onChange={(_event, value) =>
-                              field.handleChange(value ?? "")
-                            }
-                            size="lg"
-                            variant="outlined"
-                            className="rounded-2xl"
-                            sx={{
-                              bgcolor: "var(--joy-palette-background-surface)",
-                            }}
-                          >
-                            {storages?.map((storage) => (
-                              <Option key={storage.uuid} value={storage.uuid}>
-                                {storage.name}
-                              </Option>
-                            ))}
-                          </Select>
-                        )}
-                      </form.Field>
-                    </div>
-                  </div>
+                        {storages?.map((storage) => (
+                          <Option key={storage.uuid} value={storage.uuid}>
+                            {storage.name}
+                          </Option>
+                        ))}
+                      </Select>
+                    )}
+                  </form.Field>
+                </div>
+              </div>
+
+              <div
+                className="mt-4 flex items-center gap-3 rounded-2xl p-4"
+                style={{ backgroundColor: "var(--joy-palette-background-level1)" }}
+              >
+                <QrCode size={20} color="var(--joy-palette-text-tertiary)" className="shrink-0" />
+                <div className="min-w-0">
+                  <Typography level="title-md" sx={{ color: "var(--joy-palette-text-primary)" }}>
+                    {t("jar-label")}
+                  </Typography>
+                  <Typography level="body-sm" className="normal-case font-normal" sx={{ color: "var(--joy-palette-text-tertiary)" }}>
+                    {t("jar-label-hint")}
+                  </Typography>
                 </div>
               </div>
             </div>
-            <div>
-              <div className="flex gap-3 items-center">
-                <Typography
-                  level="body-sm"
-                  sx={{ color: "var(--joy-palette-text-tertiary)" }}
-                >
-                  {t("product-details")}
-                </Typography>
-                <div className="grow"></div>
-                <Button
-                  startDecorator={<QrCodeIcon />}
-                  loading={isPending}
-                  onClick={() => downloadQRcode()}
-                  size="lg"
-                  color="primary"
-                  variant="solid"
-                  className="rounded-2xl transition hover:-translate-y-0.5"
-                  sx={{
-                    boxShadow:
-                      "0 16px 36px color-mix(in srgb, var(--joy-palette-primary-solidBg) 35%, transparent)",
-                  }}
-                >
-                  {t("download-qr-code")}
-                </Button>
-                <Button
-                  type="submit"
-                  loading={isPending}
-                  size="lg"
-                  color="primary"
-                  variant="solid"
-                  className="rounded-2xl transition hover:-translate-y-0.5"
-                  sx={{
-                    boxShadow:
-                      "0 16px 36px color-mix(in srgb, var(--joy-palette-primary-solidBg) 35%, transparent)",
-                  }}
-                >
-                  {t("save")}
-                </Button>
-              </div>
-            </div>
+          </div>
 
-            {alert.isAlert && (
-              <MyAlert
-                type={alert.type}
-                header={alert.header}
-                text={alert.text}
-              />
-            )}
-          </form>
-        </Box>
+          <div className="flex flex-wrap items-center justify-end gap-3">
+            <Button
+              type="button"
+              startDecorator={<QrCode size={16} />}
+              onClick={() => downloadQRcode()}
+              size="lg"
+              variant="outlined"
+              color="neutral"
+              className="rounded-2xl"
+            >
+              {t("download-qr-code")}
+            </Button>
+            <Button type="submit" loading={isPending} size="lg" color="primary" variant="solid" className="btn-lift rounded-2xl">
+              {t("save")}
+            </Button>
+          </div>
+
+          {alert.isAlert && (
+            <MyAlert type={alert.type} header={alert.header} text={alert.text} />
+          )}
+        </form>
       )}
-    </>
+    </div>
   );
 };

frontend/src/routes/app/_hiddenLayout.tsx

@@ -1,4 +1,4 @@
-import { createFileRoute, Outlet } from "@tanstack/react-router";
+import { createFileRoute, Outlet, useRouterState } from "@tanstack/react-router";
 import { Sidebar } from "../../components/Sidebar";
 
 export const Route = createFileRoute("/app/_hiddenLayout")({
@@ -6,6 +6,8 @@ export const Route = createFileRoute("/app/_hiddenLayout")({
 });
 
 function AppLayout() {
+  const pathname = useRouterState({ select: (state) => state.location.pathname });
+
   return (
     <div
       className="flex min-h-screen w-full flex-col lg:flex-row"
@@ -13,7 +15,9 @@ function AppLayout() {
     >
       <Sidebar />
       <main className="flex-1 px-4 py-5 sm:px-6 lg:px-8 lg:py-6">
-        <Outlet />
+        <div key={pathname} className="animate-page-in">
+          <Outlet />
+        </div>
       </main>
     </div>
   );

frontend/src/theme.ts

@@ -1,6 +1,6 @@
 import { extendTheme } from "@mui/joy/styles";
 
-// I generated this theme with AI (Claude Opus 4.6)
+// Palette tokens sourced from the v0.9 design mockups (canvas/surface/ink/brand/etc.)
 
 export const theme = extendTheme({
   cssVarPrefix: "joy",
@@ -8,23 +8,23 @@ export const theme = extendTheme({
     light: {
       palette: {
         primary: {
-          50: "#eef7ff",
-          100: "#dcedff",
-          200: "#b3d9ff",
-          300: "#7fbdff",
-          400: "#469cf5",
-          500: "#0b6bcb",
-          600: "#0958a8",
-          700: "#08478a",
-          800: "#0a3a6e",
-          900: "#0c2f59",
-          solidBg: "#0b6bcb",
-          solidHoverBg: "#095aa7",
-          solidActiveBg: "#08478a",
-          outlinedBorder: "#7fbdff",
-          outlinedColor: "#08478a",
-          softBg: "#dcedff", // Color in sidebar for selected view
-          softColor: "#08478a",
+          50: "#eef3fe",
+          100: "#dbe6fc",
+          200: "#b0c8f8",
+          300: "#7fa3f0",
+          400: "#4c7de0",
+          500: "#2159c9",
+          600: "#1c48a3",
+          700: "#163a82",
+          800: "#122e68",
+          900: "#0e2453",
+          solidBg: "#2159c9",
+          solidHoverBg: "#1c48a3",
+          solidActiveBg: "#163a82",
+          outlinedBorder: "#7fa3f0",
+          outlinedColor: "#163a82",
+          softBg: "#eef3fe", // Color in sidebar for selected view
+          softColor: "#163a82",
         },
         success: {
           50: "#ecfdf5",
@@ -39,88 +39,100 @@ export const theme = extendTheme({
           900: "#0a423f",
           solidBg: "#0d9488",
           solidHoverBg: "#0b7c73",
+          outlinedBorder: "#a6f4dc",
+          outlinedColor: "#0b7c73",
           softBg: "#d1faee",
           softColor: "#0a655e",
         },
         warning: {
-          50: "#fffaeb",
-          100: "#fef0c7",
-          200: "#fedf89",
-          300: "#fdc74a",
-          400: "#fbaf24",
-          500: "#f59e0b",
-          600: "#d67e06",
-          700: "#b25f08",
-          800: "#8f4a0e",
-          900: "#763d10",
-          solidBg: "#f59e0b",
-          solidHoverBg: "#d67e06",
-          softBg: "#fef0c7",
-          softColor: "#8f4a0e",
+          50: "#fdf1e0",
+          100: "#fbe3c1",
+          200: "#f6c98a",
+          300: "#eeab54",
+          400: "#e2932c",
+          500: "#d98014",
+          600: "#b46810",
+          700: "#92530f",
+          800: "#734111",
+          900: "#5c350f",
+          solidBg: "#d98014",
+          solidHoverBg: "#b46810",
+          outlinedBorder: "#f6c98a",
+          outlinedColor: "#b46810",
+          softBg: "#fdf1e0",
+          softColor: "#734111",
         },
         danger: {
-          50: "#fff1f2",
-          100: "#ffe1e4",
-          200: "#ffc7cd",
-          300: "#ff9ba7",
-          400: "#fb6b7d",
-          500: "#e11d48",
-          600: "#be123c",
-          700: "#9b1038",
-          800: "#7f1230",
-          900: "#6a122b",
-          solidBg: "#e11d48",
-          solidHoverBg: "#be123c",
-          softBg: "#ffe1e4",
-          softColor: "#9b1038",
+          50: "#fbeae9",
+          100: "#f6d2cf",
+          200: "#eaa39c",
+          300: "#dc746a",
+          400: "#cd4f42",
+          500: "#c4342c",
+          600: "#a32a24",
+          700: "#84221f",
+          800: "#691c1b",
+          900: "#551818",
+          solidBg: "#c4342c",
+          solidHoverBg: "#a32a24",
+          outlinedBorder: "#eaa39c",
+          outlinedColor: "#a32a24",
+          softBg: "#fbeae9",
+          softColor: "#84221f",
         },
         neutral: {
-          50: "#f8fafc",
-          100: "#f1f5f9",
-          200: "#e2e8f0",
-          300: "#cbd5e1",
-          400: "#94a3b8",
-          500: "#64748b",
-          600: "#475569",
-          700: "#334155",
-          800: "#1e293b",
-          900: "#0f172a",
+          50: "#f6f7f9",
+          100: "#f2f4f6",
+          200: "#e4e7ec",
+          300: "#dfe3e8",
+          400: "#7b8494",
+          500: "#667283",
+          600: "#4a5364",
+          700: "#39414f",
+          800: "#232833",
+          900: "#10151f",
+          plainColor: "#4a5364",
+          outlinedColor: "#4a5364",
+          outlinedBorder: "#e4e7ec",
+          outlinedHoverBg: "#fbfcfd",
+          softColor: "#4a5364",
+          softBg: "#f2f4f6",
         },
         background: {
-          body: "#f7f9fc",
+          body: "#f6f7f9",
           surface: "#ffffff",
-          level1: "#f1f5f9",
-          level2: "#e2e8f0",
-          level3: "#cbd5e1",
+          level1: "#fbfcfd",
+          level2: "#f2f4f6",
+          level3: "#e4e7ec",
         },
         text: {
-          primary: "#0f172a",
-          secondary: "#475569",
-          tertiary: "#64748b",
+          primary: "#10151f",
+          secondary: "#4a5364",
+          tertiary: "#667283",
         },
-        divider: "rgba(15, 23, 42, 0.08)",
+        divider: "#e4e7ec",
       },
     },
     dark: {
       palette: {
         primary: {
-          50: "#0c2f59",
-          100: "#0a3a6e",
-          200: "#08478a",
-          300: "#0958a8",
-          400: "#0b6bcb",
-          500: "#3b8ce0",
-          600: "#6ba9ea",
-          700: "#9cc6f2",
-          800: "#c7defa",
-          900: "#eef7ff",
-          solidBg: "#3b8ce0",
-          solidHoverBg: "#6ba9ea",
-          solidActiveBg: "#0958a8",
-          outlinedBorder: "#0958a8",
-          outlinedColor: "#9cc6f2",
-          softBg: "rgba(59, 140, 224, 0.16)", // Color in sidebar for selected view
-          softColor: "#9cc6f2",
+          50: "#0e2453",
+          100: "#122e68",
+          200: "#163a82",
+          300: "#1c48a3",
+          400: "#2159c9",
+          500: "#5b8def",
+          600: "#82a8f2",
+          700: "#a9c3f6",
+          800: "#cddcfa",
+          900: "#eef3fe",
+          solidBg: "#5b8def",
+          solidHoverBg: "#82a8f2",
+          solidActiveBg: "#1c48a3",
+          outlinedBorder: "#1c48a3",
+          outlinedColor: "#a9c3f6",
+          softBg: "#16233d", // Color in sidebar for selected view
+          softColor: "#a9c3f6",
         },
         success: {
           50: "#0a423f",
@@ -135,72 +147,85 @@ export const theme = extendTheme({
           900: "#ecfdf5",
           solidBg: "#0d9488",
           solidHoverBg: "#2dc8b1",
+          outlinedBorder: "#0a655e",
+          outlinedColor: "#6ee7c9",
           softBg: "rgba(13, 148, 136, 0.18)",
           softColor: "#6ee7c9",
         },
         warning: {
-          50: "#763d10",
-          100: "#8f4a0e",
-          200: "#b25f08",
-          300: "#d67e06",
-          400: "#f59e0b",
-          500: "#fbaf24",
-          600: "#fdc74a",
-          700: "#fedf89",
-          800: "#fef0c7",
-          900: "#fffaeb",
-          solidBg: "#f59e0b",
-          solidHoverBg: "#fbaf24",
-          softBg: "rgba(245, 158, 11, 0.16)",
-          softColor: "#fdc74a",
+          50: "#5c350f",
+          100: "#734111",
+          200: "#92530f",
+          300: "#b46810",
+          400: "#d98014",
+          500: "#e3a054",
+          600: "#edbb82",
+          700: "#f4d3ac",
+          800: "#f9e6d3",
+          900: "#fdf1e0",
+          solidBg: "#e3a054",
+          solidHoverBg: "#edbb82",
+          outlinedBorder: "#92530f",
+          outlinedColor: "#edbb82",
+          softBg: "rgba(227, 160, 84, 0.16)",
+          softColor: "#f4d3ac",
         },
         danger: {
-          50: "#6a122b",
-          100: "#7f1230",
-          200: "#9b1038",
-          300: "#be123c",
-          400: "#e11d48",
-          500: "#f04463",
-          600: "#fb6b7d",
-          700: "#ff9ba7",
-          800: "#ffc7cd",
-          900: "#fff1f2",
-          solidBg: "#e11d48",
-          solidHoverBg: "#f04463",
-          softBg: "rgba(225, 29, 72, 0.18)",
-          softColor: "#fb6b7d",
+          50: "#551818",
+          100: "#691c1b",
+          200: "#84221f",
+          300: "#a32a24",
+          400: "#c4342c",
+          500: "#f07168",
+          600: "#f4948d",
+          700: "#f8b7b2",
+          800: "#fbd6d3",
+          900: "#fdeceb",
+          solidBg: "#f07168",
+          solidHoverBg: "#f4948d",
+          outlinedBorder: "#84221f",
+          outlinedColor: "#f4948d",
+          softBg: "rgba(240, 113, 104, 0.16)",
+          softColor: "#f8b7b2",
         },
         neutral: {
-          50: "#0b1220",
-          100: "#0f172a",
-          200: "#1e293b",
-          300: "#334155",
-          400: "#475569",
-          500: "#64748b",
-          600: "#94a3b8",
-          700: "#cbd5e1",
-          800: "#e2e8f0",
-          900: "#f1f5f9",
+          50: "#0e1116",
+          100: "#161b22",
+          200: "#1b212a",
+          300: "#20262f",
+          400: "#272e39",
+          500: "#8590a0",
+          600: "#aab4c2",
+          700: "#c7cfd9",
+          800: "#e8ecf2",
+          900: "#f6f8fa",
+          plainColor: "#aab4c2",
+          outlinedColor: "#aab4c2",
+          outlinedBorder: "#272e39",
+          outlinedHoverBg: "#1b212a",
+          softColor: "#aab4c2",
+          softBg: "#20262f",
         },
         background: {
-          body: "#0b1220",
-          surface: "#111a2e",
-          level1: "#16213a",
-          level2: "#1e293b",
-          level3: "#334155",
+          body: "#0e1116",
+          surface: "#161b22",
+          level1: "#1b212a",
+          level2: "#20262f",
+          level3: "#272e39",
         },
         text: {
-          primary: "#f1f5f9",
-          secondary: "#cbd5e1",
-          tertiary: "#94a3b8",
+          primary: "#e8ecf2",
+          secondary: "#aab4c2",
+          tertiary: "#8590a0",
         },
-        divider: "rgba(226, 232, 240, 0.08)",
+        divider: "#272e39",
       },
     },
   },
   fontFamily: {
-    body: "'Inter', 'Segoe UI', system-ui, sans-serif",
-    display: "'Inter', 'Segoe UI', system-ui, sans-serif",
+    body: "'IBM Plex Sans', 'Segoe UI', system-ui, sans-serif",
+    display: "'IBM Plex Sans', 'Segoe UI', system-ui, sans-serif",
+    code: "'IBM Plex Mono', ui-monospace, monospace",
   },
   radius: {
     xs: "6px",
@@ -209,6 +234,45 @@ export const theme = extendTheme({
     lg: "20px",
     xl: "28px",
   },
+  typography: {
+    h1: {
+      fontSize: "30px",
+      fontWeight: 700,
+      letterSpacing: "-0.03em",
+      lineHeight: 1.2,
+    },
+    h2: {
+      fontSize: "22px",
+      fontWeight: 700,
+      letterSpacing: "-0.02em",
+      lineHeight: 1.25,
+    },
+    "title-lg": {
+      fontSize: "15px",
+      fontWeight: 600,
+      lineHeight: 1.4,
+    },
+    "title-md": {
+      fontSize: "13px",
+      fontWeight: 600,
+      lineHeight: 1.4,
+    },
+    "body-lg": {
+      fontSize: "13.5px",
+      fontWeight: 400,
+      lineHeight: 1.5,
+    },
+    "body-md": {
+      fontSize: "13.5px",
+      fontWeight: 400,
+      lineHeight: 1.5,
+    },
+    "body-sm": {
+      fontSize: "11.5px",
+      fontWeight: 600,
+      lineHeight: 1.4,
+    },
+  },
   components: {
     JoyInput: {
       styleOverrides: {

frontend/src/utils/i18n/locales/de/de.json

@@ -86,5 +86,48 @@
   "EP005": "Das Produkt konnte nicht aktualisiert werden. Bitte versuchen Sie es erneut.",
   "EP006": "Das Produkt konnte nicht gelöscht werden. Bitte versuchen Sie es erneut.",
   "EP007": "Bitte geben Sie mindestens einen Produktnamen ein.",
-  "EP008": "Einige erforderliche Produktinformationen fehlen. Bitte überprüfen Sie Ihre Eingabe."
+  "EP008": "Einige erforderliche Produktinformationen fehlen. Bitte überprüfen Sie Ihre Eingabe.",
+  "stat-expired": "Abgelaufen",
+  "stat-expiring-soon": "Läuft in 90 Tagen ab",
+  "stat-low-stock": "Niedriger Bestand",
+  "stat-units-stored": "Gelagerte Einheiten",
+  "days-since-expired": "Vor {{count}} Tagen abgelaufen",
+  "days-until-expiry": "in {{count}} Tagen",
+  "expires-in-days-badge": "Läuft in {{count}} Tagen ab",
+  "general": "Allgemein",
+  "appearance-language": "Darstellung & Sprache",
+  "theme": "Design",
+  "theme-light": "Hell",
+  "theme-dark": "Dunkel",
+  "theme-system": "System",
+  "language": "Sprache",
+  "account": "Konto",
+  "sign-out": "Abmelden",
+  "sign-out-sub": "Beendet diese Sitzung auf diesem Gerät.",
+  "login-tagline-1": "Alles, was du verstaut hast, im Januar noch auffindbar.",
+  "login-tagline-2": "Gefrierfach, Vorrat, Keller. Eine Liste, ein Ablaufdatum pro Glas.",
+  "storages-sub": "{{count}} Orte, {{items}} Artikel gelagert.",
+  "new-storage": "Neuer Lagerort",
+  "product": "Produkt",
+  "product-name-placeholder": "z. B. Tomatensauce",
+  "description-placeholder": "Kurze Notiz zu dieser Charge",
+  "choose-storage": "Lagerort wählen",
+  "amount-price-optional-hint": "Menge und Preis sind optional. Der Lagerort bestimmt, wo der Artikel im Inventar erscheint.",
+  "all-fields-editable-later": "Alle Felder können später bearbeitet werden",
+  "save-product": "Produkt speichern",
+  "jar-label": "Glas-Etikett",
+  "jar-label-hint": "Ausdrucken und auf den Deckel kleben. Scannen öffnet die Schnellansicht.",
+  "scanned-badge": "Gescannt",
+  "opened-from-jar-label": "Über das Glas-Etikett geöffnet",
+  "amount-in-storage": "Menge im Lager",
+  "set-to-zero-hint": "Auf 0 setzen, um den Eintrag zu behalten, aber das Fach zu leeren.",
+  "open-full-details": "Vollständige Produktdetails öffnen",
+  "inventory-summary": "{{count}} Artikel in {{storages}} Lagerorten",
+  "search-products": "Produkte durchsuchen",
+  "filter-all": "Alle",
+  "filter-expired": "Abgelaufen",
+  "filter-soon": "Bald",
+  "filter-low": "Niedrig",
+  "products": "Produkte",
+  "units": "Einheiten"
 }

frontend/src/utils/i18n/locales/en/en.json

@@ -86,5 +86,48 @@
   "EP005": "The product could not be updated. Please try again.",
   "EP006": "The product could not be deleted. Please try again.",
   "EP007": "Please enter at least a product name.",
-  "EP008": "Some required product information is missing. Please check your input."
+  "EP008": "Some required product information is missing. Please check your input.",
+  "stat-expired": "Expired",
+  "stat-expiring-soon": "Expiring in 90 days",
+  "stat-low-stock": "Low stock",
+  "stat-units-stored": "Units stored",
+  "days-since-expired": "Expired {{count}} days ago",
+  "days-until-expiry": "in {{count}} days",
+  "expires-in-days-badge": "Expires in {{count}} days",
+  "general": "General",
+  "appearance-language": "Appearance & language",
+  "theme": "Theme",
+  "theme-light": "Light",
+  "theme-dark": "Dark",
+  "theme-system": "System",
+  "language": "Language",
+  "account": "Account",
+  "sign-out": "Sign out",
+  "sign-out-sub": "Ends this session on this device.",
+  "login-tagline-1": "Everything you put away, still findable in January.",
+  "login-tagline-2": "Freezer, pantry, cellar. One list, one expiry date per jar.",
+  "storages-sub": "{{count}} places, {{items}} items stored.",
+  "new-storage": "New storage",
+  "product": "Product",
+  "product-name-placeholder": "e.g. Tomato Sauce",
+  "description-placeholder": "Short note about this batch",
+  "choose-storage": "Choose a storage",
+  "amount-price-optional-hint": "Amount and price are optional. Storage place decides where the item shows up in the inventory list.",
+  "all-fields-editable-later": "All fields can be edited later",
+  "save-product": "Save product",
+  "jar-label": "Jar label",
+  "jar-label-hint": "Print and stick it on the lid. Scanning opens fast details.",
+  "scanned-badge": "Scanned",
+  "opened-from-jar-label": "Opened from the jar label",
+  "amount-in-storage": "Amount in storage",
+  "set-to-zero-hint": "Set to 0 to keep the record but empty the shelf.",
+  "open-full-details": "Open full product details",
+  "inventory-summary": "{{count}} items across {{storages}} storages",
+  "search-products": "Search products",
+  "filter-all": "All",
+  "filter-expired": "Expired",
+  "filter-soon": "Soon",
+  "filter-low": "Low",
+  "products": "products",
+  "units": "units"
 }

frontend/src/utils/productStatus.ts

@@ -0,0 +1,53 @@
+const EXPIRING_SOON_DAYS = 90;
+const LOW_STOCK_MAX = 2;
+
+const daysUntil = (value?: string | null) => {
+  if (!value) {
+    return null;
+  }
+  const date = new Date(value);
+  if (Number.isNaN(date.getTime())) {
+    return null;
+  }
+  const today = new Date();
+  today.setHours(0, 0, 0, 0);
+  date.setHours(0, 0, 0, 0);
+  return Math.round((date.getTime() - today.getTime()) / (1000 * 60 * 60 * 24));
+};
+
+export const isExpired = (expiryDate?: string | null) => {
+  const days = daysUntil(expiryDate);
+  return days !== null && days < 0;
+};
+
+export const isExpiringSoon = (expiryDate?: string | null) => {
+  const days = daysUntil(expiryDate);
+  return days !== null && days >= 0 && days <= EXPIRING_SOON_DAYS;
+};
+
+export const isLowStock = (amount: number) => amount > 0 && amount <= LOW_STOCK_MAX;
+
+export type ProductStatus = "expired" | "expiring-soon" | "ok";
+
+export const getProductStatus = (expiryDate?: string | null): ProductStatus => {
+  if (isExpired(expiryDate)) {
+    return "expired";
+  }
+  if (isExpiringSoon(expiryDate)) {
+    return "expiring-soon";
+  }
+  return "ok";
+};
+
+// Days remaining until expiry (negative = days since it expired), plus the
+// derived status. Components format this into copy via i18next (t()) so the
+// wording stays translatable.
+export const getExpiryDays = (
+  expiryDate?: string | null,
+): { days: number; status: ProductStatus } | null => {
+  const days = daysUntil(expiryDate);
+  if (days === null) {
+    return null;
+  }
+  return { days, status: getProductStatus(expiryDate) };
+};

package-lock.json

@@ -18,7 +18,8 @@
         "@types/cors": "^2.8.19",
         "@types/express": "^5.0.6",
         "concurrently": "^10.0.3",
-        "globals": "^17.7.0"
+        "globals": "^17.7.0",
+        "prettier": "^3.9.6"
       }
     },
     "backend": {
@@ -45,8 +46,8 @@
       "dependencies": {
         "@emotion/react": "^11.14.0",
         "@emotion/styled": "^11.14.1",
-        "@fontsource/inter": "^5.2.8",
-        "@mui/icons-material": "^9.0.1",
+        "@fontsource/ibm-plex-mono": "^5.3.0",
+        "@fontsource/ibm-plex-sans": "^5.3.0",
         "@mui/joy": "^5.0.0-beta.52",
         "@tailwindcss/vite": "^4.3.0",
         "@tanstack/react-form": "^1.32.0",
@@ -1103,10 +1104,19 @@
       "integrity": "sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==",
       "license": "MIT"
     },
-    "node_modules/@fontsource/inter": {
-      "version": "5.2.8",
-      "resolved": "https://registry.npmjs.org/@fontsource/inter/-/inter-5.2.8.tgz",
-      "integrity": "sha512-P6r5WnJoKiNVV+zvW2xM13gNdFhAEpQ9dQJHt3naLvfg+LkF2ldgSLiF4T41lf1SQCM9QmkqPTn4TH568IRagg==",
+    "node_modules/@fontsource/ibm-plex-mono": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/@fontsource/ibm-plex-mono/-/ibm-plex-mono-5.3.0.tgz",
+      "integrity": "sha512-eTgnZjZEGk1QtD3ZstF+Vclo2HLAni8YMy34/DxllwZvyz1lR/1RF/xTiAquOBO7MvqBx8D2Ig2WCPMVfdZu7Q==",
+      "license": "OFL-1.1",
+      "funding": {
+        "url": "https://github.com/sponsors/ayuhito"
+      }
+    },
+    "node_modules/@fontsource/ibm-plex-sans": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/@fontsource/ibm-plex-sans/-/ibm-plex-sans-5.3.0.tgz",
+      "integrity": "sha512-CbE4CbbEEZJX860XyUiRpsksXIQR8Rp2XDva2VO53NJox9tVNtusrysd2x5YkUEY3ErQ66W1IiiQL8/wihhw5w==",
       "license": "OFL-1.1",
       "funding": {
         "url": "https://github.com/sponsors/ayuhito"
@@ -1266,32 +1276,6 @@
         "url": "https://opencollective.com/mui-org"
       }
     },
-    "node_modules/@mui/icons-material": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-9.2.0.tgz",
-      "integrity": "sha512-VgBd3z7Qc3vd/thcNSMC03nHRh/U4DzMUd+1dRyJTbm/hGo7+N6N4GDuJZDNHa6LZhhwG6Cu1X3DNvrVv8sNag==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.29.2"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mui-org"
-      },
-      "peerDependencies": {
-        "@mui/material": "^9.2.0",
-        "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
-        "react": "^17.0.0 || ^18.0.0 || ^19.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@mui/joy": {
       "version": "5.0.0-beta.52",
       "resolved": "https://registry.npmjs.org/@mui/joy/-/joy-5.0.0-beta.52.tgz",
@@ -1333,220 +1317,6 @@
         }
       }
     },
-    "node_modules/@mui/material": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/@mui/material/-/material-9.2.0.tgz",
-      "integrity": "sha512-+YTRSgGKGrrRo2XJZXs7JRA6qHoHWvNtxyqxnrRJTBmIuLOUpxxh7m4G9lF4tWberxGFY+EqkkRPgJCl+fSMJg==",
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "@babel/runtime": "^7.29.2",
-        "@mui/core-downloads-tracker": "^9.2.0",
-        "@mui/system": "^9.2.0",
-        "@mui/types": "^9.1.1",
-        "@mui/utils": "^9.2.0",
-        "@popperjs/core": "^2.11.8",
-        "@types/react-transition-group": "^4.4.12",
-        "clsx": "^2.1.1",
-        "csstype": "^3.2.3",
-        "prop-types": "^15.8.1",
-        "react-is": "^19.2.6",
-        "react-transition-group": "^4.4.5"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mui-org"
-      },
-      "peerDependencies": {
-        "@emotion/react": "^11.5.0",
-        "@emotion/styled": "^11.3.0",
-        "@mui/material-pigment-css": "^9.2.0",
-        "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
-        "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
-        "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@emotion/react": {
-          "optional": true
-        },
-        "@emotion/styled": {
-          "optional": true
-        },
-        "@mui/material-pigment-css": {
-          "optional": true
-        },
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@mui/material/node_modules/@mui/core-downloads-tracker": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-9.2.0.tgz",
-      "integrity": "sha512-+XMav+ZaXkZKUFUgzjrfMEedfyJKxxviAske2q8N8CWDMeqZdDU2lWMkiUPiB388hGaDqhwvOAwkrsc/pUyp8g==",
-      "license": "MIT",
-      "peer": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mui-org"
-      }
-    },
-    "node_modules/@mui/material/node_modules/@mui/private-theming": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-9.2.0.tgz",
-      "integrity": "sha512-w9wpyDxGPGnAACPB2hKhCDmILJIAvQxrfjUbIAEa0AznX1rOjaz5N+yB1uuw8ixnJcpEh/tPbD9oEe19wcWPHw==",
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "@babel/runtime": "^7.29.2",
-        "@mui/utils": "^9.2.0",
-        "prop-types": "^15.8.1"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mui-org"
-      },
-      "peerDependencies": {
-        "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
-        "react": "^17.0.0 || ^18.0.0 || ^19.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@mui/material/node_modules/@mui/styled-engine": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-9.1.1.tgz",
-      "integrity": "sha512-neaYKdJfvEG54q8efHLJR7swpHG/gfSv9xGqW5iTSMsubD7yPCPFrhVBt284j1DOF3uZaaDJSHQL7gz6jGF21Q==",
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "@babel/runtime": "^7.29.2",
-        "@emotion/cache": "^11.14.0",
-        "@emotion/serialize": "^1.3.3",
-        "@emotion/sheet": "^1.4.0",
-        "csstype": "^3.2.3",
-        "prop-types": "^15.8.1"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mui-org"
-      },
-      "peerDependencies": {
-        "@emotion/react": "^11.4.1",
-        "@emotion/styled": "^11.3.0",
-        "react": "^17.0.0 || ^18.0.0 || ^19.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@emotion/react": {
-          "optional": true
-        },
-        "@emotion/styled": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@mui/material/node_modules/@mui/system": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/@mui/system/-/system-9.2.0.tgz",
-      "integrity": "sha512-YvUJwKoGVtbnOm2PyPi5TvX2d1rOA6sqSpEWVs4WmXNIaFTuYmNUaVdU2o1NKUEe31URnD3E8ZVUMcsLQXwcYg==",
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "@babel/runtime": "^7.29.2",
-        "@mui/private-theming": "^9.2.0",
-        "@mui/styled-engine": "^9.1.1",
-        "@mui/types": "^9.1.1",
-        "@mui/utils": "^9.2.0",
-        "clsx": "^2.1.1",
-        "csstype": "^3.2.3",
-        "prop-types": "^15.8.1"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mui-org"
-      },
-      "peerDependencies": {
-        "@emotion/react": "^11.5.0",
-        "@emotion/styled": "^11.3.0",
-        "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
-        "react": "^17.0.0 || ^18.0.0 || ^19.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@emotion/react": {
-          "optional": true
-        },
-        "@emotion/styled": {
-          "optional": true
-        },
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@mui/material/node_modules/@mui/types": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@mui/types/-/types-9.1.1.tgz",
-      "integrity": "sha512-Zjt7u8wNvDg40rPTGoL+TnfkpuSKjwubsNSFRH1KAVZLcaV4I3AFNHIFbvH7p4F3alEibSbdd90xAgn5Rnfndg==",
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "@babel/runtime": "^7.29.2"
-      },
-      "peerDependencies": {
-        "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@mui/material/node_modules/@mui/utils": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-9.2.0.tgz",
-      "integrity": "sha512-OsUH5zhlSOM4xmLl53+agug1M1UyWb4zxFxWQCqwKTKUeQPvTENtg3JhrroBD2qpCLKsX5W/DYGERJ4mBUbc8g==",
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "@babel/runtime": "^7.29.2",
-        "@mui/types": "^9.1.1",
-        "@types/prop-types": "^15.7.15",
-        "clsx": "^2.1.1",
-        "prop-types": "^15.8.1",
-        "react-is": "^19.2.6"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mui-org"
-      },
-      "peerDependencies": {
-        "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
-        "react": "^17.0.0 || ^18.0.0 || ^19.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@mui/private-theming": {
       "version": "5.17.1",
       "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.17.1.tgz",
@@ -2830,6 +2600,7 @@
       "version": "19.2.17",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.17.tgz",
       "integrity": "sha512-MXfmqaVPEVgkBT/aY0aGCkRWWtByiYQXo3xdQ8r5RzuFrPiRn8Gar2tQdXSUQ2GKV3bkXckek89V8wQBY2Q/Aw==",
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "csstype": "^3.2.2"
@@ -2845,16 +2616,6 @@
         "@types/react": "^19.2.0"
       }
     },
-    "node_modules/@types/react-transition-group": {
-      "version": "4.4.12",
-      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.12.tgz",
-      "integrity": "sha512-8TV6R3h2j7a91c+1DXdJi3Syo69zzIZbz7Lg5tORM5LEJG7X/E6a1V3drRyBRZq7/utz7A+c4OgYLiLcYGHG6w==",
-      "license": "MIT",
-      "peer": true,
-      "peerDependencies": {
-        "@types/react": "*"
-      }
-    },
     "node_modules/@types/send": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@types/send/-/send-1.2.1.tgz",
@@ -3510,16 +3271,16 @@
       }
     },
     "node_modules/brace-expansion": {
-      "version": "5.0.7",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.7.tgz",
-      "integrity": "sha512-7oFy703dxfY3/NLxC1fh2SUCQ0H9rmAY+5EpDVfXjUTTs+HEwR2nYaqLv+GWcTsumwxPfiz6CzCNkwXwBUwqCA==",
+      "version": "5.0.9",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.9.tgz",
+      "integrity": "sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^4.0.2"
       },
       "engines": {
-        "node": "18 || 20 || >=22"
+        "node": "20 || >=22"
       }
     },
     "node_modules/browserslist": {
@@ -3705,15 +3466,15 @@
       "license": "MIT"
     },
     "node_modules/concurrently": {
-      "version": "10.0.3",
-      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-10.0.3.tgz",
-      "integrity": "sha512-hc3LH4UaKWd/bbyDK/IGVa4RB6PtQ3CUYwtrkzqHn+wIG3Hr5fhpRlk0L/gCa8ZE1L/Ufj50Zho69cI5w8SQBA==",
+      "version": "10.0.5",
+      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-10.0.5.tgz",
+      "integrity": "sha512-JaP/CoftUrCcAFW/g//RbgEGwlelnEae6cfBLgH6ZdO6s8jPkn6p9SB9u6pdVxYXoiSnFqseOlHfrEfF82TVOg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "chalk": "5.6.2",
         "rxjs": "7.8.2",
-        "shell-quote": "1.8.4",
+        "shell-quote": "1.9.0",
         "supports-color": "10.2.2",
         "tree-kill": "1.2.2",
         "yargs": "18.0.0"
@@ -3921,17 +3682,6 @@
       "integrity": "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA==",
       "license": "MIT"
     },
-    "node_modules/dom-helpers": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
-      "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "@babel/runtime": "^7.8.7",
-        "csstype": "^3.0.2"
-      }
-    },
     "node_modules/dotenv": {
       "version": "17.4.2",
       "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.4.2.tgz",
@@ -4451,9 +4201,9 @@
       "license": "MIT"
     },
     "node_modules/filelist/node_modules/brace-expansion": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.2.tgz",
-      "integrity": "sha512-w5JZcKgdhDOgOwm8H+KgbosopHMuGcl6qbulwjtz3SM7I7P3yW1eAjzMPLrIE+NQ9vjgANKHWeMHnrT0OXW1oA==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.4.tgz",
+      "integrity": "sha512-hGfVzPxthbf3+2yjg/RBs60cB0FhqBS/zvdV/4wn4/BmN0bNMMHPc4V/BbFieqf1TKAGGAHnY4eSjajCl0f2Xg==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
@@ -5590,9 +5340,9 @@
       }
     },
     "node_modules/nanoid": {
-      "version": "3.3.15",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.15.tgz",
-      "integrity": "sha512-y7Wygv/7mEOvxTuEQDB8StXdMRBWf1kR/tlhAzBRUFkB2jfcLOAxO/SHmOO2zgz1pVgK29/kyupn059/bCHdjA==",
+      "version": "3.3.18",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.18.tgz",
+      "integrity": "sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==",
       "funding": [
         {
           "type": "github",
@@ -5949,9 +5699,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.16",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.16.tgz",
-      "integrity": "sha512-vuwillviilfKZsg0VGj5R/YwwcHx4SLsIOI/7K6mQkWx+l5cUHTjj5g0AasTBcyXsbfTgrwsUNmVUb5xVwyPwg==",
+      "version": "8.5.26",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.26.tgz",
+      "integrity": "sha512-u82N74LFzG8ca+dD8puPnplTXoGH4fTPpVGuIbt36G3qvNlkvfD0lEAZSxaly3KX8TS/L1A1gsCEmvKmBcVbkQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -5968,7 +5718,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.12",
+        "nanoid": "^3.3.17",
         "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
@@ -5987,9 +5737,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.9.4",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.4.tgz",
-      "integrity": "sha512-yWG/o/4oJfo036EKAfK6ACAoDOfHeRHx4tuxkfBZiauURiaSmYwlpOr5LQqKtIkRD2z1PLteme2WoxEnj4tHTg==",
+      "version": "3.9.6",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.6.tgz",
+      "integrity": "sha512-OpN0zzVdiaiAhxpuuj5efpIS4sY9j7bY6uR5mnj5yPzGkdkjNKSJeUThPb60Jw29QuAZgA4o+/iB49kFiaBX6g==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -6331,23 +6081,6 @@
       "integrity": "sha512-kZFnouyVv7eP/Phmrlo9FK+zcAdriZJvzxXHF1Sl1P377WSGe2G/JxVolhTrB/jeV47lKImhNUsijjHAAbcl/A==",
       "license": "MIT"
     },
-    "node_modules/react-transition-group": {
-      "version": "4.4.5",
-      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
-      "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
-      "license": "BSD-3-Clause",
-      "peer": true,
-      "dependencies": {
-        "@babel/runtime": "^7.5.5",
-        "dom-helpers": "^5.0.1",
-        "loose-envify": "^1.4.0",
-        "prop-types": "^15.6.2"
-      },
-      "peerDependencies": {
-        "react": ">=16.6.0",
-        "react-dom": ">=16.6.0"
-      }
-    },
     "node_modules/readdirp": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz",
@@ -6590,9 +6323,9 @@
       }
     },
     "node_modules/shell-quote": {
-      "version": "1.8.4",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.4.tgz",
-      "integrity": "sha512-VsC6n6vz1ihYYyZZwX7YZSF5l5x36ca17OC+a69h94YqB7X6XLwf+5MOgynYir2SLFUbl8gIYvBo8K8RoNQ6bQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.9.0.tgz",
+      "integrity": "sha512-Iov+JwFv/2HcTpcwNMKd8+IWNb8tboQJNQTkAY/LLVK7gGH9jy+LGkVqPxfekHl+yMmiqXszdGWXgkfml7hjqA==",
       "dev": true,
       "license": "MIT",
       "engines": {

package.json

@@ -35,6 +35,7 @@
     "@types/cors": "^2.8.19",
     "@types/express": "^5.0.6",
     "concurrently": "^10.0.3",
-    "globals": "^17.7.0"
+    "globals": "^17.7.0",
+    "prettier": "^3.9.6"
   }
 }