From 167fdf4e36bcd37491085b38bf406dc7bb8f6303 Mon Sep 17 00:00:00 2001
From: Nikita <Matigulin2018@mail.ru>
Date: Mon, 31 Aug 2026 17:56:11 +0300
Subject: [PATCH 1/6] =?UTF-8?q?feat(storefront):=20404=20=D1=81=20=D1=84?=
 =?UTF-8?q?=D0=BE=D0=BD=D0=B0=D1=80=D1=91=D0=BC,=20=D0=BB=D0=B0=D0=B1?=
 =?UTF-8?q?=D0=B8=D1=80=D0=B8=D0=BD=D1=82=D0=BE=D0=BC=20=D0=B8=20=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=B8=D1=82=D0=BA=D0=BE=D0=B9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Потерянный URL получает экран «заблудился в лабиринте»: луч следует за курсором, визитка проявляется только в свете.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 maze/app/(storefront)/not-found.tsx           |   5 +
 maze/app/not-found.tsx                        |  46 +--
 maze/features/not-found-maze/index.ts         |   1 +
 maze/features/not-found-maze/lib/constants.ts |  15 +
 .../not-found-maze/ui/NotFoundMaze.tsx        | 145 ++++++++
 .../not-found-maze/ui/NotFoundVisitCard.tsx   | 137 +++++++
 .../ui/not-found-visit-card.module.css        | 115 ++++++
 maze/public/lost-maze.svg                     |  38 ++
 maze/public/maze-card-qr.svg                  |   1 +
 .../ui/image-spotlight/ImageSpotlight.tsx     | 342 ++++++++++++++++++
 maze/shared/ui/image-spotlight/index.ts       |   7 +
 maze/shared/ui/image-spotlight/lib/easing.ts  |  43 +++
 12 files changed, 872 insertions(+), 23 deletions(-)
 create mode 100644 maze/app/(storefront)/not-found.tsx
 create mode 100644 maze/features/not-found-maze/index.ts
 create mode 100644 maze/features/not-found-maze/lib/constants.ts
 create mode 100644 maze/features/not-found-maze/ui/NotFoundMaze.tsx
 create mode 100644 maze/features/not-found-maze/ui/NotFoundVisitCard.tsx
 create mode 100644 maze/features/not-found-maze/ui/not-found-visit-card.module.css
 create mode 100644 maze/public/lost-maze.svg
 create mode 100644 maze/public/maze-card-qr.svg
 create mode 100644 maze/shared/ui/image-spotlight/ImageSpotlight.tsx
 create mode 100644 maze/shared/ui/image-spotlight/index.ts
 create mode 100644 maze/shared/ui/image-spotlight/lib/easing.ts

diff --git a/maze/app/(storefront)/not-found.tsx b/maze/app/(storefront)/not-found.tsx
new file mode 100644
index 0000000..1cc5001
--- /dev/null
+++ b/maze/app/(storefront)/not-found.tsx
@@ -0,0 +1,5 @@
+import { NotFoundMaze } from "@/features/not-found-maze";
+
+export default function StorefrontNotFound() {
+  return <NotFoundMaze />;
+}
diff --git a/maze/app/not-found.tsx b/maze/app/not-found.tsx
index dc30856..dba3c31 100644
--- a/maze/app/not-found.tsx
+++ b/maze/app/not-found.tsx
@@ -1,28 +1,28 @@
-import Link from "next/link";
+import type { Metadata } from "next";
+import { Background } from "@/components/Background";
+import { Footer } from "@/components/Footer";
+import { Header } from "@/components/Header";
+import { ScrollToTop } from "@/components/ScrollToTop";
+import { StorefrontModals } from "@/components/StorefrontModals";
+import { NotFoundMaze } from "@/features/not-found-maze";
+import { SmoothScroll } from "@/shared/ui/smooth-scroll";
+
+export const metadata: Metadata = {
+  title: "404 — Страница не найдена",
+  robots: { index: false, follow: false },
+};
 
 export default function NotFound() {
   return (
-    <div className="container-x grid min-h-[70vh] place-items-center py-20 text-center">
-      <div>
-        <p className="font-display text-[clamp(5rem,20vw,12rem)] font-bold leading-none text-iri">
-          404
-        </p>
-        <h1 className="mt-2 font-display text-2xl font-bold">
-          Ты заблудился в лабиринте
-        </h1>
-        <p className="mx-auto mt-3 max-w-md text-muted">
-          Такой страницы нет. Но выход всегда рядом — вернись на главную или
-          загляни в каталог.
-        </p>
-        <div className="mt-8 flex flex-wrap justify-center gap-3">
-          <Link href="/" className="btn-primary">
-            На главную
-          </Link>
-          <Link href="/catalog" className="btn-ghost">
-            В каталог
-          </Link>
-        </div>
-      </div>
-    </div>
+    <SmoothScroll>
+      <Background />
+      <Header />
+      <main className="flex-1">
+        <NotFoundMaze />
+      </main>
+      <Footer />
+      <StorefrontModals />
+      <ScrollToTop />
+    </SmoothScroll>
   );
 }
diff --git a/maze/features/not-found-maze/index.ts b/maze/features/not-found-maze/index.ts
new file mode 100644
index 0000000..2606992
--- /dev/null
+++ b/maze/features/not-found-maze/index.ts
@@ -0,0 +1 @@
+export { NotFoundMaze } from "./ui/NotFoundMaze";
diff --git a/maze/features/not-found-maze/lib/constants.ts b/maze/features/not-found-maze/lib/constants.ts
new file mode 100644
index 0000000..dfa4006
--- /dev/null
+++ b/maze/features/not-found-maze/lib/constants.ts
@@ -0,0 +1,15 @@
+export const NOT_FOUND_COPY = {
+  code: "404",
+  title: "Ты заблудился в лабиринте",
+  titleBefore: "Ты заблудился",
+  titleVe: "в",
+  titleAfter: "лабиринте",
+  body: "Такой страницы нет. Веди курсор по тьме — выход всегда рядом.",
+  home: "На главную",
+  catalog: "В каталог",
+} as const;
+
+export const NOT_FOUND_ART = {
+  src: "/lost-maze.svg?v=4",
+  alt: "Лабиринт MAZE",
+} as const;
diff --git a/maze/features/not-found-maze/ui/NotFoundMaze.tsx b/maze/features/not-found-maze/ui/NotFoundMaze.tsx
new file mode 100644
index 0000000..e1b4281
--- /dev/null
+++ b/maze/features/not-found-maze/ui/NotFoundMaze.tsx
@@ -0,0 +1,145 @@
+"use client";
+
+import { useLayoutEffect, useRef, useState } from "react";
+import Link from "next/link";
+import { motion } from "motion/react";
+import { ArrowRight, Compass } from "lucide-react";
+import { FLUID_EASE } from "@/shared/lib/motion";
+import { ImageSpotlight } from "@/shared/ui/image-spotlight";
+import { SplitText } from "@/shared/ui/split-text";
+import { NOT_FOUND_ART, NOT_FOUND_COPY } from "../lib/constants";
+import { NotFoundVisitCard } from "./NotFoundVisitCard";
+
+function restFromLetter(
+  root: HTMLElement,
+  letter: HTMLElement,
+): { x: number; y: number } {
+  const rb = root.getBoundingClientRect();
+  const lb = letter.getBoundingClientRect();
+  const x = ((lb.left + lb.width / 2 - rb.left) / rb.width) * 100;
+  const y = ((lb.top + lb.height / 2 - rb.top) / rb.height) * 100;
+  return {
+    x: Math.min(100, Math.max(0, x)),
+    y: Math.min(100, Math.max(0, y)),
+  };
+}
+
+export function NotFoundMaze() {
+  const sectionRef = useRef<HTMLElement>(null);
+  const veRef = useRef<HTMLSpanElement>(null);
+  const [rest, setRest] = useState({ x: 54, y: 58 });
+
+  useLayoutEffect(() => {
+    const root = sectionRef.current;
+    const letter = veRef.current;
+    if (!root || !letter) return;
+
+    const measure = () => setRest(restFromLetter(root, letter));
+    measure();
+    const id = window.setTimeout(measure, 900);
+    void document.fonts?.ready.then(measure);
+    window.addEventListener("resize", measure);
+    return () => {
+      window.clearTimeout(id);
+      window.removeEventListener("resize", measure);
+    };
+  }, []);
+
+  const titleClass =
+    "text-[clamp(1.6rem,4.2vw,2.75rem)] tracking-tight";
+
+  return (
+    <section
+      ref={sectionRef}
+      className="relative min-h-[min(92vh,920px)] w-full overflow-hidden"
+    >
+      <div className="absolute inset-0">
+        <ImageSpotlight
+          image={NOT_FOUND_ART}
+          mode="onImage"
+          restX={rest.x}
+          restY={rest.y}
+          fit="cover"
+          focusY={42}
+          veilColor="#070b0a"
+          size={560}
+          visibility={4}
+          rounded={0}
+          pointerScope="window"
+          transition={{ duration: 0.4, ease: "easeInOut" }}
+        >
+          <div className="absolute bottom-5 right-5 max-sm:left-1/2 max-sm:right-auto max-sm:-translate-x-1/2">
+            <NotFoundVisitCard />
+          </div>
+        </ImageSpotlight>
+      </div>
+
+      <div className="container-x relative z-10 flex min-h-[min(92vh,920px)] flex-col items-center justify-center py-20 text-center pointer-events-none md:py-24">
+        <motion.p
+          initial={{ opacity: 0, y: 12 }}
+          animate={{ opacity: 1, y: 0 }}
+          transition={{ duration: 0.5, ease: FLUID_EASE }}
+          className="eyebrow"
+        >
+          Путь не найден
+        </motion.p>
+
+        <p
+          className="font-display text-[clamp(5rem,18vw,11rem)] font-bold leading-none text-iri"
+          aria-hidden
+        >
+          {NOT_FOUND_COPY.code}
+        </p>
+
+        <h1
+          className="mt-2 max-w-xl font-display font-bold leading-[1.12]"
+          aria-label={NOT_FOUND_COPY.title}
+        >
+          <span className={`block ${titleClass}`}>
+            <SplitText
+              text={NOT_FOUND_COPY.titleBefore}
+              mode="words"
+              delay={0.12}
+            />{" "}
+            <span ref={veRef} className="inline-block">
+              <SplitText text={NOT_FOUND_COPY.titleVe} mode="chars" delay={0.28} />
+            </span>{" "}
+            <SplitText
+              text={NOT_FOUND_COPY.titleAfter}
+              mode="words"
+              delay={0.34}
+            />
+          </span>
+        </h1>
+
+        <motion.p
+          initial={{ opacity: 0, y: 14 }}
+          animate={{ opacity: 1, y: 0 }}
+          transition={{ duration: 0.55, ease: FLUID_EASE, delay: 0.45 }}
+          className="mt-4 max-w-md text-base leading-relaxed text-muted sm:text-lg"
+        >
+          {NOT_FOUND_COPY.body}
+        </motion.p>
+
+        <motion.div
+          initial={{ opacity: 0, y: 18 }}
+          animate={{ opacity: 1, y: 0 }}
+          transition={{ duration: 0.6, ease: FLUID_EASE, delay: 0.65 }}
+          className="mt-10 flex flex-wrap justify-center gap-3 pointer-events-auto"
+        >
+          <Link href="/" className="btn-primary group">
+            {NOT_FOUND_COPY.home}
+            <ArrowRight
+              size={18}
+              className="transition-transform group-hover:translate-x-1"
+            />
+          </Link>
+          <Link href="/catalog" className="btn-ghost group">
+            <Compass size={17} className="text-accent" />
+            {NOT_FOUND_COPY.catalog}
+          </Link>
+        </motion.div>
+      </div>
+    </section>
+  );
+}
diff --git a/maze/features/not-found-maze/ui/NotFoundVisitCard.tsx b/maze/features/not-found-maze/ui/NotFoundVisitCard.tsx
new file mode 100644
index 0000000..d4b32f3
--- /dev/null
+++ b/maze/features/not-found-maze/ui/NotFoundVisitCard.tsx
@@ -0,0 +1,137 @@
+"use client";
+
+import { useCallback, useRef, useState } from "react";
+import { MapPin, Phone } from "lucide-react";
+import { useSiteData } from "@/components/site-data";
+import styles from "./not-found-visit-card.module.css";
+
+function phoneHref(phone: string) {
+  return `tel:${phone.replace(/[^\d+]/g, "")}`;
+}
+
+function mapHref(city: string, address: string, lat: number, lng: number) {
+  const query = encodeURIComponent(`${city}, ${address}`);
+  return `https://yandex.ru/maps/?ll=${lng}%2C${lat}&z=16&text=${query}`;
+}
+
+function streetLine(address: string) {
+  const trimmed = address.trim();
+  if (/^(ул\.|улица)\s/i.test(trimmed)) return trimmed;
+  return `ул. ${trimmed}`;
+}
+
+function metroLine(metro: string) {
+  const raw = metro.replace(/^метро\s+/i, "").trim();
+  return `(метро ${raw})`;
+}
+
+export function NotFoundVisitCard() {
+  const { store } = useSiteData();
+  const maps = mapHref(store.city, store.address, store.mapLat, store.mapLng);
+  const cardRef = useRef<HTMLDivElement>(null);
+  const [tilt, setTilt] = useState({ x: 0, y: 0 });
+
+  const onMove = useCallback((event: React.PointerEvent<HTMLDivElement>) => {
+    const el = cardRef.current;
+    if (!el) return;
+    if (window.matchMedia("(prefers-reduced-motion: reduce)").matches) return;
+    const bounds = el.getBoundingClientRect();
+    const px = (event.clientX - bounds.left) / bounds.width;
+    const py = (event.clientY - bounds.top) / bounds.height;
+    setTilt({ x: (0.5 - py) * 10, y: (px - 0.5) * 12 });
+  }, []);
+
+  const onLeave = useCallback(() => setTilt({ x: 0, y: 0 }), []);
+
+  return (
+    <div className={styles.shell}>
+      <article
+        ref={cardRef}
+        className={styles.card}
+        style={{
+          transform: `rotateX(${tilt.x}deg) rotateY(${tilt.y}deg)`,
+        }}
+        onPointerMove={onMove}
+        onPointerLeave={onLeave}
+      >
+        <div className={styles.face}>
+          <svg
+            className={styles.mark}
+            viewBox="12 8 24 28"
+            fill="none"
+            aria-hidden
+          >
+            <path
+              d="M23.65 33 H35 L23.65 9.5 L12.3 33 H16.85 L23.65 19.5 L30.45 33"
+              stroke="currentColor"
+              strokeWidth="3"
+              strokeLinejoin="round"
+              strokeLinecap="round"
+            />
+          </svg>
+          <div className={styles.glare} />
+
+          <div className="relative flex flex-1 items-center justify-center px-4 pt-4">
+            <a
+              href={maps}
+              target="_blank"
+              rel="noreferrer"
+              className="relative grid size-[5.6rem] place-items-center sm:size-[6.4rem]"
+              aria-label="Открыть магазин на карте"
+            >
+              {/* QR is a generated SVG; next/image is unnecessary here. */}
+              {/* eslint-disable-next-line @next/next/no-img-element */}
+              <img
+                src="/maze-card-qr.svg"
+                alt=""
+                className="size-full"
+                draggable={false}
+              />
+              <span className="absolute grid size-7 place-items-center rounded-sm bg-[#1a1210] sm:size-8">
+                <svg
+                  viewBox="12 8 24 28"
+                  className="size-5 text-accent sm:size-6"
+                  fill="none"
+                  aria-hidden
+                >
+                  <path
+                    d="M23.65 33 H35 L23.65 9.5 L12.3 33 H16.85 L23.65 19.5 L30.45 33"
+                    stroke="currentColor"
+                    strokeWidth="3"
+                    strokeLinejoin="round"
+                    strokeLinecap="round"
+                  />
+                </svg>
+              </span>
+            </a>
+          </div>
+
+          <div className="relative mt-auto flex items-end justify-between gap-3 px-3.5 pb-3 pt-1 text-left text-[10px] leading-snug tracking-wide text-accent sm:px-4 sm:pb-3.5 sm:text-[11px]">
+            <a
+              href={maps}
+              target="_blank"
+              rel="noreferrer"
+              className="flex min-h-11 min-w-0 items-start gap-1.5 hover:text-ink"
+            >
+              <MapPin size={13} className="mt-0.5 shrink-0" aria-hidden />
+              <span>
+                {store.city},
+                <br />
+                {streetLine(store.address)}
+                <br />
+                {metroLine(store.metro)}
+              </span>
+            </a>
+            <a
+              href={phoneHref(store.phone)}
+              className="flex min-h-11 shrink-0 items-center gap-1.5 hover:text-ink"
+            >
+              <Phone size={13} className="shrink-0" aria-hidden />
+              <span>{store.phone}</span>
+            </a>
+          </div>
+        </div>
+      </article>
+    </div>
+  );
+}
diff --git a/maze/features/not-found-maze/ui/not-found-visit-card.module.css b/maze/features/not-found-maze/ui/not-found-visit-card.module.css
new file mode 100644
index 0000000..0b638aa
--- /dev/null
+++ b/maze/features/not-found-maze/ui/not-found-visit-card.module.css
@@ -0,0 +1,115 @@
+.shell {
+  perspective: 720px;
+}
+
+.card {
+  position: relative;
+  display: flex;
+  width: 20.5rem;
+  height: 12.75rem;
+  overflow: hidden;
+  border-radius: 0.85rem;
+  background: #1a1210;
+  transform-style: preserve-3d;
+  transition: transform 0.35s var(--ease-fluid, cubic-bezier(0.22, 1, 0.36, 1)),
+    box-shadow 0.35s var(--ease-fluid, cubic-bezier(0.22, 1, 0.36, 1));
+  box-shadow:
+    0 18px 40px -18px rgba(0, 0, 0, 0.7),
+    0 0 0 1px rgba(201, 170, 120, 0.12);
+}
+
+.card:hover,
+.card:focus-within {
+  box-shadow:
+    0 22px 48px -16px rgba(0, 0, 0, 0.75),
+    0 0 28px -6px rgba(201, 170, 120, 0.45);
+}
+
+/* Uiverse rotating bar → bronze/bordo, not cyan/magenta */
+.card::before {
+  content: "";
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  width: 9rem;
+  height: 160%;
+  background-image: linear-gradient(
+    180deg,
+    #e0c48c,
+    #c9aa78 42%,
+    #5c3838 78%,
+    #c9aa78
+  );
+  animation: rot-edge 3.6s linear infinite;
+}
+
+.card::after {
+  content: "";
+  position: absolute;
+  inset: 2px;
+  z-index: 0;
+  border-radius: 0.72rem;
+  background: #1a1210;
+}
+
+.face {
+  position: relative;
+  z-index: 1;
+  display: flex;
+  height: 100%;
+  width: 100%;
+  flex-direction: column;
+  overflow: hidden;
+  border-radius: 0.72rem;
+  margin: 2px;
+}
+
+.mark {
+  position: absolute;
+  inset: auto -18% -42% auto;
+  width: 78%;
+  height: auto;
+  color: #c9aa78;
+  opacity: 0.07;
+  pointer-events: none;
+}
+
+.glare {
+  pointer-events: none;
+  position: absolute;
+  inset: 0;
+  background: linear-gradient(
+    115deg,
+    rgba(224, 196, 140, 0.14) 0%,
+    transparent 42%,
+    transparent 100%
+  );
+  opacity: 0.55;
+}
+
+@keyframes rot-edge {
+  from {
+    transform: translate(-50%, -50%) rotate(0deg);
+  }
+  to {
+    transform: translate(-50%, -50%) rotate(360deg);
+  }
+}
+
+@media (max-width: 639px) {
+  .card {
+    width: 17.5rem;
+    height: 11rem;
+  }
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .card::before {
+    animation: none;
+    transform: translate(-50%, -50%) rotate(28deg);
+  }
+
+  .card {
+    transition: none;
+  }
+}
diff --git a/maze/public/lost-maze.svg b/maze/public/lost-maze.svg
new file mode 100644
index 0000000..a08ca1f
--- /dev/null
+++ b/maze/public/lost-maze.svg
@@ -0,0 +1,38 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1200 900" preserveAspectRatio="xMidYMid slice" shape-rendering="geometricPrecision">
+  <defs>
+    <radialGradient id="fog" cx="50%" cy="42%" r="74%">
+      <stop offset="0%" stop-color="#1c2824"/>
+      <stop offset="42%" stop-color="#101714"/>
+      <stop offset="100%" stop-color="#050807"/>
+    </radialGradient>
+    <linearGradient id="bronze" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#e0c48c"/>
+      <stop offset="50%" stop-color="#c9aa78"/>
+      <stop offset="100%" stop-color="#8a7355"/>
+    </linearGradient>
+  </defs>
+  <rect width="1200" height="900" fill="url(#fog)"/>
+  <!-- Сдвиг, чтобы ни один вертикальный штрих не совпал с оптическим центром (цифры 404). -->
+  <g fill="none" stroke="url(#bronze)" stroke-linecap="square" stroke-linejoin="miter" transform="translate(22 0)">
+    <path stroke-width="2.2" opacity="0.45" d="M40 40h1120v820H40z"/>
+    <path stroke-width="3.4" opacity="0.95" d="
+      M548 70v70h220v90H328v-90h140V70
+      M160 140h180v120H160z
+      M860 140h180v90H860z
+      M160 320h90v200H160z
+      M950 290h90v160H950z
+      M250 320h180v70H380v130h220V250h140v210H520
+      M250 460h70v180H160v90h280v-90H320V460
+      M720 390h140v90H720z
+      M860 450h180v70H860v140h-90
+      M430 590h340v90H680v80H520v-80H430z
+      M160 730h280v40H160z
+      M760 730h280v40H760z
+      M648 680v150"/>
+    <rect x="300" y="200" width="600" height="500" rx="4" stroke-width="2.6" opacity="0.7"/>
+    <rect x="360" y="250" width="480" height="400" stroke-width="2.4" opacity="0.65"/>
+    <rect x="430" y="310" width="340" height="280" stroke-width="2.2" opacity="0.6"/>
+    <rect x="500" y="370" width="200" height="160" stroke-width="2" opacity="0.85"/>
+  </g>
+  <circle cx="670" cy="830" r="18" fill="none" stroke="#c9aa78" stroke-width="2.5" opacity="0.8"/>
+</svg>
diff --git a/maze/public/maze-card-qr.svg b/maze/public/maze-card-qr.svg
new file mode 100644
index 0000000..a4e947c
--- /dev/null
+++ b/maze/public/maze-card-qr.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 61 61" shape-rendering="crispEdges"><path fill="#1a1210" d="M0 0h61v61H0z"/><path stroke="#c9aa78" d="M4 4.5h7m2 0h1m1 0h1m1 0h1m2 0h3m2 0h1m1 0h1m1 0h6m1 0h1m2 0h2m1 0h5m3 0h7M4 5.5h1m5 0h1m2 0h1m1 0h1m2 0h1m2 0h3m6 0h3m4 0h3m2 0h1m3 0h2m2 0h1m5 0h1M4 6.5h1m1 0h3m1 0h1m1 0h2m1 0h1m3 0h1m1 0h4m2 0h1m1 0h3m4 0h4m2 0h2m1 0h1m1 0h1m2 0h1m1 0h3m1 0h1M4 7.5h1m1 0h3m1 0h1m1 0h1m1 0h3m1 0h8m2 0h1m3 0h4m2 0h1m1 0h1m5 0h1m1 0h1m1 0h1m1 0h3m1 0h1M4 8.5h1m1 0h3m1 0h1m1 0h2m1 0h2m4 0h1m1 0h2m1 0h7m2 0h3m1 0h1m6 0h1m3 0h1m1 0h3m1 0h1M4 9.5h1m5 0h1m1 0h3m2 0h1m2 0h1m1 0h2m1 0h2m1 0h1m3 0h6m2 0h1m1 0h2m1 0h2m3 0h1m5 0h1M4 10.5h7m1 0h1m1 0h1m1 0h1m1 0h1m1 0h1m1 0h1m1 0h1m1 0h1m1 0h1m1 0h1m1 0h1m1 0h1m1 0h1m1 0h1m1 0h1m1 0h1m1 0h1m1 0h1m1 0h1m1 0h7M12 11.5h2m3 0h5m2 0h2m2 0h1m3 0h1m6 0h2m1 0h1m1 0h1m3 0h1M4 12.5h1m1 0h5m3 0h1m2 0h3m3 0h1m2 0h9m2 0h1m5 0h4m3 0h5M6 13.5h1m1 0h2m3 0h1m1 0h1m2 0h1m1 0h2m1 0h1m2 0h2m3 0h2m1 0h1m2 0h2m1 0h2m1 0h5m1 0h1m1 0h1m2 0h1m1 0h1M7 14.5h1m1 0h3m2 0h1m1 0h2m1 0h1m2 0h2m3 0h2m4 0h1m3 0h1m1 0h5m6 0h1m1 0h2M6 15.5h3m4 0h2m2 0h2m1 0h1m1 0h2m1 0h1m1 0h1m3 0h3m1 0h2m1 0h1m2 0h1m2 0h1m1 0h1m4 0h2m2 0h1M4 16.5h3m2 0h2m7 0h2m5 0h2m3 0h3m3 0h1m2 0h1m1 0h1m3 0h2m1 0h2m1 0h1m2 0h3M4 17.5h2m3 0h1m1 0h4m1 0h1m2 0h1m4 0h1m7 0h2m2 0h1m5 0h1m3 0h1m2 0h1m1 0h1m1 0h1m1 0h1M4 18.5h1m1 0h2m1 0h3m1 0h3m1 0h2m1 0h2m5 0h3m1 0h1m2 0h3m1 0h1m2 0h2m2 0h1m1 0h1m1 0h2m1 0h1m1 0h1M4 19.5h5m2 0h4m1 0h1m2 0h1m5 0h1m3 0h2m2 0h1m5 0h1m2 0h1m1 0h4m1 0h3m1 0h1M7 20.5h1m1 0h2m2 0h4m1 0h8m2 0h4m2 0h1m2 0h2m2 0h1m4 0h3m4 0h1m1 0h1M5 21.5h1m1 0h3m2 0h1m2 0h2m1 0h1m2 0h1m1 0h1m1 0h1m2 0h1m1 0h1m1 0h3m2 0h2m6 0h1m4 0h1m5 0h1M6 22.5h1m1 0h6m2 0h3m1 0h1m4 0h1m3 0h1m1 0h1m3 0h2m1 0h2m1 0h2m4 0h1m4 0h1m1 0h2M4 23.5h2m2 0h2m2 0h1m3 0h5m2 0h2m3 0h1m3 0h1m1 0h1m2 0h1m3 0h1m3 0h1m1 0h2m3 0h2M4 24.5h1m1 0h1m2 0h4m6 0h1m3 0h1m1 0h1m4 0h2m1 0h1m2 0h1m2 0h2m5 0h4m1 0h2m2 0h1M5 25.5h2m1 0h1m2 0h2m3 0h1m4 0h3m3 0h2m1 0h1m2 0h1m1 0h1m3 0h1m2 0h2m3 0h1m1 0h1m3 0h4M10 26.5h4m1 0h3m2 0h2m3 0h1m1 0h3m1 0h1m1 0h4m1 0h2m1 0h1m3 0h4m1 0h1m2 0h1m1 0h2M6 27.5h1m5 0h2m1 0h2m1 0h1m1 0h2m3 0h2m1 0h3m3 0h3m3 0h6m1 0h3m1 0h1m3 0h1M4 28.5h1m3 0h5m5 0h1m1 0h1m6 0h6m4 0h1m2 0h1m1 0h1m3 0h1m1 0h5m1 0h2M8 29.5h1m3 0h2m1 0h1m1 0h5m3 0h1m2 0h1m3 0h5m1 0h2m1 0h1m3 0h2m1 0h1m3 0h2m2 0h1M4 30.5h1m3 0h1m1 0h1m1 0h1m1 0h3m2 0h2m1 0h3m1 0h1m1 0h1m1 0h1m1 0h1m1 0h4m1 0h5m2 0h3m1 0h1m1 0h1m2 0h1M5 31.5h4m3 0h2m2 0h1m4 0h2m1 0h2m2 0h1m3 0h2m3 0h1m3 0h1m4 0h3m3 0h2M4 32.5h1m3 0h6m1 0h2m2 0h1m2 0h2m2 0h1m1 0h7m3 0h1m1 0h1m2 0h12M6 33.5h1m4 0h1m1 0h1m2 0h4m2 0h1m1 0h5m2 0h1m2 0h6m3 0h4m1 0h2m2 0h5M6 34.5h1m2 0h2m1 0h3m1 0h1m10 0h1m6 0h1m2 0h2m1 0h3m1 0h1m4 0h2m1 0h1m1 0h1M6 35.5h1m1 0h2m2 0h6m1 0h1m1 0h4m2 0h3m4 0h1m2 0h1m1 0h1m3 0h4m4 0h2m2 0h1M4 36.5h5m1 0h4m1 0h2m1 0h2m1 0h1m2 0h3m1 0h1m3 0h4m1 0h2m1 0h1m7 0h4m1 0h2M4 37.5h1m1 0h2m1 0h1m2 0h1m4 0h2m1 0h1m1 0h1m2 0h2m1 0h2m4 0h1m1 0h1m2 0h2m1 0h2m2 0h2m1 0h4m1 0h2M4 38.5h2m2 0h5m1 0h1m2 0h2m1 0h2m1 0h1m1 0h1m3 0h3m1 0h2m2 0h2m8 0h1m1 0h1m2 0h1m1 0h1m1 0h1M4 39.5h1m2 0h3m5 0h2m2 0h10m1 0h2m1 0h1m2 0h2m4 0h3m2 0h1m1 0h2m1 0h1m1 0h3M4 40.5h1m2 0h1m1 0h2m1 0h3m5 0h5m2 0h2m5 0h2m1 0h1m2 0h1m1 0h1m2 0h1m2 0h1m2 0h4M4 41.5h1m3 0h2m5 0h3m1 0h1m1 0h1m2 0h2m1 0h1m1 0h4m1 0h2m1 0h1m1 0h5m3 0h1m1 0h2m3 0h2M6 42.5h1m3 0h4m2 0h2m1 0h2m2 0h1m2 0h1m2 0h3m1 0h1m1 0h3m1 0h2m1 0h1m2 0h4m2 0h1m1 0h1m1 0h2M6 43.5h1m2 0h1m1 0h4m1 0h2m1 0h1m2 0h1m2 0h3m4 0h2m1 0h1m1 0h1m3 0h4m1 0h2m2 0h1m2 0h2M6 44.5h1m1 0h1m1 0h1m1 0h1m1 0h1m1 0h4m2 0h1m3 0h1m2 0h5m1 0h1m1 0h1m2 0h2m2 0h1m8 0h1m2 0h1M4 45.5h4m1 0h1m1 0h3m5 0h1m2 0h1m2 0h1m1 0h3m2 0h1m2 0h2m2 0h3m1 0h5m1 0h2m1 0h2m2 0h1M4 46.5h2m1 0h5m1 0h4m1 0h1m1 0h2m2 0h3m3 0h1m1 0h1m2 0h2m1 0h8m1 0h1m2 0h2m3 0h2M5 47.5h2m6 0h1m2 0h1m2 0h1m1 0h1m3 0h7m1 0h1m2 0h1m6 0h1m3 0h1m1 0h6m1 0h1M7 48.5h1m2 0h1m2 0h1m2 0h3m1 0h2m1 0h1m2 0h1m1 0h5m5 0h1m3 0h1m1 0h3m1 0h5m1 0h3M12 49.5h4m1 0h7m4 0h1m3 0h1m2 0h3m3 0h1m4 0h3m3 0h2m2 0h1M4 50.5h7m4 0h2m2 0h1m1 0h1m2 0h2m2 0h1m1 0h1m1 0h2m3 0h1m2 0h3m2 0h1m1 0h2m1 0h1m1 0h1m2 0h1M4 51.5h1m5 0h1m1 0h1m1 0h1m4 0h4m1 0h1m2 0h2m3 0h1m3 0h1m2 0h5m1 0h1m1 0h2m3 0h2m2 0h1M4 52.5h1m1 0h3m1 0h1m1 0h1m1 0h1m1 0h2m1 0h3m1 0h3m1 0h8m1 0h2m2 0h2m1 0h1m3 0h9M4 53.5h1m1 0h3m1 0h1m1 0h1m1 0h2m5 0h1m1 0h2m4 0h1m4 0h1m2 0h2m1 0h1m2 0h7m1 0h2m1 0h1m1 0h1M4 54.5h1m1 0h3m1 0h1m1 0h3m2 0h5m3 0h3m1 0h1m2 0h1m4 0h4m1 0h2m3 0h1m2 0h2m1 0h1m1 0h1M4 55.5h1m5 0h1m3 0h1m1 0h1m1 0h1m1 0h1m1 0h2m1 0h5m1 0h1m1 0h1m1 0h1m2 0h1m1 0h1m3 0h3m1 0h1m6 0h1M4 56.5h7m1 0h3m1 0h1m2 0h3m1 0h1m2 0h1m5 0h1m2 0h6m8 0h2m2 0h2"/></svg>
diff --git a/maze/shared/ui/image-spotlight/ImageSpotlight.tsx b/maze/shared/ui/image-spotlight/ImageSpotlight.tsx
new file mode 100644
index 0000000..2be2d89
--- /dev/null
+++ b/maze/shared/ui/image-spotlight/ImageSpotlight.tsx
@@ -0,0 +1,342 @@
+"use client";
+
+import {
+  useEffect,
+  useRef,
+  type CSSProperties,
+  type ReactNode,
+} from "react";
+import { durationOf, makeEase } from "./lib/easing";
+
+export type SpotlightMode = "onImage" | "followCursor";
+export type SpotlightFit = "cover" | "contain";
+
+export type SpotlightImage = {
+  src: string;
+  srcSet?: string;
+  alt?: string;
+};
+
+export type SpotlightTransition = {
+  duration?: number;
+  ease?: string | [number, number, number, number];
+};
+
+type ImageSpotlightProps = {
+  image?: SpotlightImage | string;
+  mode?: SpotlightMode;
+  restX?: number;
+  restY?: number;
+  fit?: SpotlightFit;
+  focusY?: number;
+  veilColor?: string;
+  size?: number;
+  visibility?: number;
+  rounded?: number;
+  transition?: SpotlightTransition;
+  className?: string;
+  style?: CSSProperties;
+  /** Рисуется под шторой — проявляется тем же лучом, что и картинка. */
+  children?: ReactNode;
+  /** window — луч следует за курсором по всей странице, не только над корнем. */
+  pointerScope?: "root" | "window";
+};
+
+const FOLLOW = 40;
+
+const clampFocus = (value: number) =>
+  Math.min(100, Math.max(0, typeof value === "number" ? value : 50));
+
+function resolveImageSrc(image: unknown): string | undefined {
+  if (!image) return undefined;
+  if (typeof image === "string") return image.trim() || undefined;
+  return (image as SpotlightImage).src || undefined;
+}
+
+function maskFor(x: string, y: string, radius: number): string {
+  const core = Math.round(radius * 0.15);
+  const mid = Math.round(radius * 0.5);
+  const penumbra = Math.round(radius * 0.85);
+
+  return `radial-gradient(circle ${radius}px at ${x} ${y}, transparent 0px, transparent ${core}px, rgba(0, 0, 0, 0.15) ${mid}px, rgba(0, 0, 0, 0.65) ${penumbra}px, rgba(0, 0, 0, 0.96) ${radius}px)`;
+}
+
+function dustFor(x: string, y: string, radius: number): string {
+  const mid = Math.round(radius * 0.45);
+  return `radial-gradient(circle ${radius}px at ${x} ${y}, rgba(255, 249, 230, 0.045) 0px, rgba(201, 170, 120, 0.03) ${mid}px, transparent ${radius}px)`;
+}
+
+/**
+ * Originkit Image Spotlight: veil + radial mask follows the pointer.
+ */
+export function ImageSpotlight({
+  image,
+  mode = "followCursor",
+  restX = 50,
+  restY = 50,
+  fit = "cover",
+  focusY = 37,
+  veilColor = "#000000",
+  size = 150,
+  visibility = 15,
+  rounded = 0,
+  transition = { duration: 0.4, ease: "easeInOut" },
+  className,
+  style,
+  children,
+  pointerScope = "root",
+}: ImageSpotlightProps) {
+  const rootRef = useRef<HTMLDivElement | null>(null);
+  const veilRef = useRef<HTMLDivElement | null>(null);
+  const coverRef = useRef<HTMLDivElement | null>(null);
+  const glowRef = useRef<HTMLDivElement | null>(null);
+  const duration = durationOf(transition, 0.4);
+  const easeToken = Array.isArray(transition.ease)
+    ? transition.ease.join(",")
+    : (transition.ease ?? "easeInOut");
+
+  useEffect(() => {
+    const rootEl = rootRef.current;
+    const veilEl = veilRef.current;
+    if (!rootEl || !veilEl) return;
+    const root = rootEl;
+    const veil = veilEl;
+
+    const paintBeam = (x: string, y: string, radius: number) => {
+      if (radius < 0.5) {
+        veil.style.maskImage = "none";
+        veil.style.webkitMaskImage = "none";
+        const cover = coverRef.current;
+        if (cover) {
+          cover.style.maskImage = "none";
+          cover.style.webkitMaskImage = "none";
+        }
+        const glow = glowRef.current;
+        if (glow) glow.style.background = "none";
+        return;
+      }
+      const mask = maskFor(x, y, radius);
+      veil.style.maskImage = mask;
+      veil.style.webkitMaskImage = mask;
+      const cover = coverRef.current;
+      if (cover) {
+        cover.style.maskImage = mask;
+        cover.style.webkitMaskImage = mask;
+      }
+      const glow = glowRef.current;
+      if (glow) glow.style.background = dustFor(x, y, radius);
+    };
+
+    const reduce = window.matchMedia("(prefers-reduced-motion: reduce)").matches;
+    if (reduce) {
+      paintBeam(`${restX}%`, `${restY}%`, size);
+      return;
+    }
+
+    function restingPoint() {
+      return {
+        x: (root.clientWidth * restX) / 100,
+        y: (root.clientHeight * restY) / 100,
+      };
+    }
+
+    function toLocal(event: PointerEvent) {
+      const bounds = root.getBoundingClientRect();
+      const sx = bounds.width > 0 ? root.clientWidth / bounds.width : 1;
+      const sy = bounds.height > 0 ? root.clientHeight / bounds.height : 1;
+      return {
+        x: (event.clientX - bounds.left) * sx,
+        y: (event.clientY - bounds.top) * sy,
+      };
+    }
+
+    const ease = makeEase(transition.ease);
+    const durMs = Math.max(0.001, duration) * 1000;
+    const current = restingPoint();
+    const target = { ...current };
+    let presence = mode === "onImage" ? 1 : 0;
+    let animFrom = presence;
+    let animTo = presence;
+    let animStart = 0;
+    let hovering = false;
+    let raf = 0;
+    let last = 0;
+    let alive = true;
+    let prevTx = current.x;
+    let prevTy = current.y;
+    let speedBoost = 0;
+
+    function onMove(event: PointerEvent) {
+      const { x, y } = toLocal(event);
+      if (!hovering && presence < 0.01) {
+        current.x = x;
+        current.y = y;
+      }
+      hovering = true;
+      target.x = x;
+      target.y = y;
+    }
+
+    function onLeave(event: PointerEvent) {
+      if (pointerScope === "window") {
+        const next = event.relatedTarget;
+        if (next && next instanceof Node && document.documentElement.contains(next)) {
+          return;
+        }
+      }
+      hovering = false;
+      if (mode === "onImage") {
+        const rest = restingPoint();
+        target.x = rest.x;
+        target.y = rest.y;
+      } else {
+        const { x, y } = toLocal(event);
+        current.x = x;
+        current.y = y;
+        target.x = x;
+        target.y = y;
+      }
+    }
+
+    function frame(time: number) {
+      if (!alive) return;
+      const dt = last ? Math.min((time - last) / 1000, 0.05) : 1 / 60;
+      last = time;
+      const follow = 1 - Math.pow(1 - FOLLOW / 100, dt * 60);
+      current.x += (target.x - current.x) * follow;
+      current.y += (target.y - current.y) * follow;
+
+      const move = Math.hypot(target.x - prevTx, target.y - prevTy);
+      prevTx = target.x;
+      prevTy = target.y;
+      const pxPerSec = move / Math.max(dt, 1 / 120);
+      const wantBoost = Math.min(0.14, (pxPerSec / 2200) * 0.14);
+      speedBoost += (wantBoost - speedBoost) * Math.min(1, dt * 7);
+
+      const want = mode === "onImage" || hovering ? 1 : 0;
+      if (want !== animTo) {
+        animFrom = presence;
+        animTo = want;
+        animStart = time;
+      }
+      const p = Math.min(1, (time - animStart) / durMs);
+      presence = animFrom + (animTo - animFrom) * ease(p);
+
+      const radius = size * presence * (1 + speedBoost);
+      paintBeam(`${current.x}px`, `${current.y}px`, radius);
+      raf = requestAnimationFrame(frame);
+    }
+
+    let ro: ResizeObserver | null = null;
+    if (typeof ResizeObserver !== "undefined") {
+      ro = new ResizeObserver(() => {
+        if (hovering) return;
+        const rest = restingPoint();
+        target.x = rest.x;
+        target.y = rest.y;
+      });
+      ro.observe(root);
+    }
+
+    const moveTarget: EventTarget =
+      pointerScope === "window" ? window : root;
+    const leaveTarget: EventTarget =
+      pointerScope === "window" ? document.documentElement : root;
+    moveTarget.addEventListener("pointermove", onMove as EventListener);
+    leaveTarget.addEventListener("pointerleave", onLeave as EventListener);
+    raf = requestAnimationFrame(frame);
+
+    return () => {
+      alive = false;
+      cancelAnimationFrame(raf);
+      ro?.disconnect();
+      moveTarget.removeEventListener("pointermove", onMove as EventListener);
+      leaveTarget.removeEventListener("pointerleave", onLeave as EventListener);
+    };
+  }, [size, mode, restX, restY, duration, easeToken, pointerScope]);
+
+  const restingMask =
+    mode === "onImage" ? maskFor(`${restX}%`, `${restY}%`, size) : "none";
+  const src = resolveImageSrc(image);
+  const alt = typeof image === "object" ? (image.alt ?? "") : "";
+  const srcSet = typeof image === "object" ? image.srcSet : undefined;
+
+  return (
+    <div
+      ref={rootRef}
+      className={className}
+      style={{
+        ...style,
+        position: "relative",
+        overflow: "hidden",
+        width: "100%",
+        height: "100%",
+        boxSizing: "border-box",
+      }}
+    >
+      {src ? (
+        // Spotlight mask needs a plain img; next/image would wrap the layer.
+        // eslint-disable-next-line @next/next/no-img-element
+        <img
+          src={src}
+          srcSet={srcSet}
+          alt={alt}
+          draggable={false}
+          style={{
+            position: "absolute",
+            inset: 0,
+            width: "100%",
+            height: "100%",
+            objectFit: fit,
+            objectPosition:
+              fit === "cover" ? `center ${clampFocus(focusY)}%` : "center",
+            borderRadius: rounded,
+            userSelect: "none",
+          }}
+        />
+      ) : null}
+      <div
+        ref={veilRef}
+        style={{
+          position: "absolute",
+          inset: 0,
+          zIndex: 1,
+          background: veilColor,
+          opacity: 1 - visibility / 100,
+          borderRadius: rounded,
+          pointerEvents: "none",
+          maskImage: restingMask,
+          WebkitMaskImage: restingMask,
+        }}
+      />
+      {children}
+      {children ? (
+        <div
+          ref={coverRef}
+          style={{
+            position: "absolute",
+            inset: 0,
+            zIndex: 2,
+            background: veilColor,
+            borderRadius: rounded,
+            pointerEvents: "none",
+            maskImage: restingMask,
+            WebkitMaskImage: restingMask,
+          }}
+        />
+      ) : null}
+      <div
+        ref={glowRef}
+        aria-hidden
+        style={{
+          position: "absolute",
+          inset: 0,
+          zIndex: 3,
+          pointerEvents: "none",
+          background:
+            mode === "onImage" ? dustFor(`${restX}%`, `${restY}%`, size) : "none",
+        }}
+      />
+    </div>
+  );
+}
diff --git a/maze/shared/ui/image-spotlight/index.ts b/maze/shared/ui/image-spotlight/index.ts
new file mode 100644
index 0000000..6191590
--- /dev/null
+++ b/maze/shared/ui/image-spotlight/index.ts
@@ -0,0 +1,7 @@
+export {
+  ImageSpotlight,
+  type SpotlightFit,
+  type SpotlightImage,
+  type SpotlightMode,
+  type SpotlightTransition,
+} from "./ImageSpotlight";
diff --git a/maze/shared/ui/image-spotlight/lib/easing.ts b/maze/shared/ui/image-spotlight/lib/easing.ts
new file mode 100644
index 0000000..78f79ca
--- /dev/null
+++ b/maze/shared/ui/image-spotlight/lib/easing.ts
@@ -0,0 +1,43 @@
+const NAMED_EASES: Record<string, [number, number, number, number]> = {
+  linear: [0, 0, 1, 1],
+  easeIn: [0.42, 0, 1, 1],
+  easeOut: [0, 0, 0.58, 1],
+  easeInOut: [0.42, 0, 0.58, 1],
+};
+
+function cubicBezierEase(x1: number, y1: number, x2: number, y2: number) {
+  const cx = 3 * x1;
+  const bx = 3 * (x2 - x1) - cx;
+  const ax = 1 - cx - bx;
+  const cy = 3 * y1;
+  const by = 3 * (y2 - y1) - cy;
+  const ay = 1 - cy - by;
+  const sampleX = (t: number) => ((ax * t + bx) * t + cx) * t;
+  const sampleY = (t: number) => ((ay * t + by) * t + cy) * t;
+  const dX = (t: number) => (3 * ax * t + 2 * bx) * t + cx;
+  return (p: number) => {
+    let t = p;
+    for (let i = 0; i < 8; i++) {
+      const x = sampleX(t) - p;
+      const d = dX(t);
+      if (Math.abs(x) < 1e-4 || Math.abs(d) < 1e-6) break;
+      t -= x / d;
+    }
+    t = t < 0 ? 0 : t > 1 ? 1 : t;
+    return sampleY(t);
+  };
+}
+
+export function makeEase(ease: unknown) {
+  if (Array.isArray(ease) && ease.length === 4) {
+    const [x1, y1, x2, y2] = ease as [number, number, number, number];
+    return cubicBezierEase(x1, y1, x2, y2);
+  }
+  const named =
+    (typeof ease === "string" && NAMED_EASES[ease]) || NAMED_EASES.easeOut;
+  return cubicBezierEase(named[0], named[1], named[2], named[3]);
+}
+
+export function durationOf(transition: { duration?: number } | undefined, fallback: number) {
+  return typeof transition?.duration === "number" ? transition.duration : fallback;
+}

From 5678931dd3e8321b50a8577e8d87c80d008bd343 Mon Sep 17 00:00:00 2001
From: Nikita <Matigulin2018@mail.ru>
Date: Tue, 1 Sep 2026 21:53:14 +0300
Subject: [PATCH 2/6] =?UTF-8?q?feat(deploy):=20Docker-=D1=81=D1=82=D0=B5?=
 =?UTF-8?q?=D0=BA=20=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20maze=20=D0=B2=20Cl?=
 =?UTF-8?q?ient.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Собрать витрину и API в образы с nginx на входе; локальный Postgres без TLS через DATABASE_SSL.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .github/ISSUE_TEMPLATE/bug.yml                |   2 +-
 .github/ISSUE_TEMPLATE/task.yml               |   2 +-
 Client/.dockerignore                          |  16 +++
 {maze => Client}/.env.example                 |   0
 {maze => Client}/.gitignore                   |   0
 {maze => Client}/.node-version                |   0
 {maze => Client}/.npmrc                       |   0
 {maze => Client}/AGENTS.md                    |   0
 {maze => Client}/CLAUDE.md                    |   0
 Client/Dockerfile                             |  36 +++++++
 {maze => Client}/README.md                    |   0
 .../(staff)/admin/catalog/categories/page.tsx |   0
 .../admin/catalog/products/[id]/page.tsx      |   0
 .../admin/catalog/products/new/page.tsx       |   0
 .../(staff)/admin/catalog/products/page.tsx   |   0
 .../(staff)/admin/content/banners/page.tsx    |   0
 .../(staff)/admin/content/cms/[id]/page.tsx   |   0
 .../(staff)/admin/content/cms/new/page.tsx    |   0
 .../app/(staff)/admin/content/cms/page.tsx    |   0
 .../app/(staff)/admin/content/slides/page.tsx |   0
 {maze => Client}/app/(staff)/admin/layout.tsx |   0
 .../app/(staff)/admin/orders/[id]/page.tsx    |   0
 .../app/(staff)/admin/orders/page.tsx         |   0
 {maze => Client}/app/(staff)/admin/page.tsx   |   0
 .../admin/settings/editor-choice/page.tsx     |   0
 .../app/(staff)/admin/settings/site/page.tsx  |   0
 .../app/(staff)/admin/stock/page.tsx          |   0
 {maze => Client}/app/(staff)/layout.tsx       |   0
 .../app/(staff)/staff/login/page.tsx          |   0
 .../app/(storefront)/account/page.tsx         |   0
 .../app/(storefront)/cart/page.tsx            |   0
 .../app/(storefront)/catalog/page.tsx         |   0
 {maze => Client}/app/(storefront)/layout.tsx  |   0
 .../app/(storefront)/not-found.tsx            |   0
 {maze => Client}/app/(storefront)/page.tsx    |   0
 .../app/(storefront)/product/[slug]/page.tsx  |   0
 {maze => Client}/app/error.tsx                |   0
 {maze => Client}/app/favicon.ico              | Bin
 {maze => Client}/app/globals.css              |   0
 {maze => Client}/app/layout.tsx               |   0
 {maze => Client}/app/not-found.tsx            |   0
 {maze => Client}/components/AuthModal.tsx     |   0
 {maze => Client}/components/Background.tsx    |   0
 {maze => Client}/components/Field.tsx         |   0
 {maze => Client}/components/Footer.tsx        |   0
 {maze => Client}/components/Header.tsx        |   0
 {maze => Client}/components/Icon.tsx          |   0
 {maze => Client}/components/Logo.tsx          |   0
 {maze => Client}/components/MiniCart.tsx      |   0
 .../components/PhoneNationalField.tsx         |   0
 {maze => Client}/components/ProductCard.tsx   |   0
 {maze => Client}/components/ProductThumb.tsx  |   0
 {maze => Client}/components/Providers.tsx     |   0
 {maze => Client}/components/Reveal.tsx        |   0
 {maze => Client}/components/ScrollToTop.tsx   |   0
 .../components/SectionHeading.tsx             |   0
 .../components/StorefrontModals.tsx           |   0
 {maze => Client}/components/TradeInModal.tsx  |   0
 .../components/account/AccountClient.tsx      |   0
 .../components/admin/AdminCategoriesPage.tsx  |   0
 .../components/admin/AdminContentPages.tsx    |   0
 .../components/admin/AdminDashboard.tsx       |   0
 .../components/admin/AdminGuard.tsx           |   0
 .../components/admin/AdminInventoryPages.tsx  |   0
 .../components/admin/AdminOrdersPages.tsx     |   0
 .../components/admin/AdminProductsPages.tsx   |   0
 .../components/admin/AdminShell.tsx           |   0
 .../components/cart/CartClient.tsx            |   0
 .../components/catalog/CatalogClient.tsx      |   0
 .../components/home/CategoryGrid.tsx          |   0
 {maze => Client}/components/home/Features.tsx |   0
 {maze => Client}/components/home/Hero.tsx     |   0
 {maze => Client}/components/home/Marquee.tsx  |   0
 {maze => Client}/components/home/Promo.tsx    |   0
 .../components/home/Testimonials.tsx          |   0
 {maze => Client}/components/modals.tsx        |   0
 .../components/product/ProductDetail.tsx      |   0
 {maze => Client}/components/site-data.tsx     |   0
 .../components/staff/StaffAuthProvider.tsx    |   0
 {maze => Client}/components/store.tsx         |   0
 {maze => Client}/entities/order/index.ts      |   0
 .../entities/order/lib/order-status.ts        |   0
 {maze => Client}/entities/product/index.ts    |   0
 .../entities/user/api/auth-api.ts             |   0
 .../entities/user/api/auth-service.ts         |   0
 .../entities/user/api/profile-api.ts          |   0
 {maze => Client}/entities/user/index.ts       |   0
 {maze => Client}/entities/user/model/types.ts |   0
 {maze => Client}/eslint.config.mjs            |   0
 .../account-orders/api/user-orders-api.ts     |   0
 .../features/account-orders/index.ts          |   0
 .../account-orders/lib/format-order-date.ts   |   0
 .../account-orders/lib/group-orders.ts        |   0
 .../features/account-orders/lib/poll.ts       |   0
 .../account-orders/lib/refresh-event.ts       |   0
 .../account-orders/model/use-user-orders.ts   |   0
 .../account-orders/ui/AccountOrderCard.tsx    |   0
 .../account-orders/ui/AccountOrdersPanel.tsx  |   0
 .../account-orders/ui/OrderItemThumb.tsx      |   0
 .../account-orders/ui/OrderStatusBadge.tsx    |   0
 {maze => Client}/features/account/index.ts    |   0
 .../features/account/lib/birth-date.ts        |   0
 .../features/account/lib/tab-event.ts         |   0
 .../features/account/ui/AccountClient.tsx     |   0
 .../features/account/ui/AccountProfile.tsx    |   0
 .../admin-orders/api/order-actions.ts         |   0
 .../admin-orders/api/pending-orders-count.ts  |   0
 .../features/admin-orders/index.ts            |   0
 .../lib/last-visited-highlight.ts             |   0
 .../admin-orders/lib/last-worked-order.ts     |   0
 .../features/admin-orders/lib/order-status.ts |   0
 .../features/admin-orders/lib/poll.ts         |   0
 .../admin-orders/lib/refresh-event.ts         |   0
 .../model/pending-orders-count-provider.tsx   |   0
 .../admin-orders/ui/OrderNotesSection.tsx     |   0
 .../admin-orders/ui/OrderStatusText.tsx       |   0
 .../admin-orders/ui/OrdersCountBadge.tsx      |   0
 {maze => Client}/features/auth/index.ts       |   0
 .../auth/model/user-auth-provider.tsx         |   0
 .../features/auth/ui/AuthModal.tsx            |   0
 .../features/auth/ui/HeaderAuthActions.tsx    |   0
 .../features/auth/ui/LogoutButton.tsx         |   0
 .../features/auth/ui/LogoutConfirmModal.tsx   |   0
 .../features/auth/ui/MobileAuthActions.tsx    |   0
 .../features/auth/ui/OtpCodeInput.tsx         |   0
 .../features/cart/api/cart-api.ts             |   0
 {maze => Client}/features/cart/index.ts       |   0
 {maze => Client}/features/cart/lib/storage.ts |   0
 .../features/cart/model/cart-provider.tsx     |   0
 .../features/cart/model/pending-add.ts        |   0
 {maze => Client}/features/cart/model/types.ts |   0
 .../features/cart/ui/CartClient.tsx           |   0
 .../features/catalog-filters/index.ts         |   0
 .../catalog-filters/lib/range-track-fill.ts   |   0
 .../catalog-filters/lib/route-filters.ts      |   0
 .../features/catalog-filters/ui/CheckRow.tsx  |   0
 .../catalog-filters/ui/FilterGroup.tsx        |   0
 .../catalog-filters/ui/PriceFilter.tsx        |   0
 .../catalog-filters/ui/PriceRangeSlider.tsx   |   0
 .../features/catalog-search/index.ts          |   0
 .../features/catalog-search/lib/constants.ts  |   0
 .../catalog-search/lib/format-brand-hint.ts   |   0
 .../catalog-search/ui/CatalogSearchInput.tsx  |   0
 .../catalog-search/ui/RotatingBrandHint.tsx   |   0
 {maze => Client}/features/catalog/index.ts    |   0
 .../features/catalog/ui/CatalogClient.tsx     |   0
 .../features/checkout/api/checkout-api.ts     |   0
 {maze => Client}/features/checkout/index.ts   |   0
 {maze => Client}/features/home-hero/index.ts  |   0
 .../features/home-hero/lib/constants.ts       |   0
 .../home-hero/ui/HeroVideoBackground.tsx      |   0
 .../features/home-hero/ui/HomeHero.tsx        |   0
 .../features/not-found-maze/index.ts          |   0
 .../features/not-found-maze/lib/constants.ts  |   0
 .../not-found-maze/ui/NotFoundMaze.tsx        |   0
 .../not-found-maze/ui/NotFoundVisitCard.tsx   |   0
 .../ui/not-found-visit-card.module.css        |   0
 .../lib/account-orders-refresh.ts             |   0
 {maze => Client}/lib/account-tab.ts           |   0
 {maze => Client}/lib/admin/client.ts          |   0
 {maze => Client}/lib/admin/types.ts           |   0
 {maze => Client}/lib/admin/ui.tsx             |   0
 {maze => Client}/lib/admin/use-paged-list.ts  |   0
 {maze => Client}/lib/api.ts                   |   0
 {maze => Client}/lib/body-scroll-lock.ts      |   0
 {maze => Client}/lib/cart-client.ts           |   0
 {maze => Client}/lib/cart-types.ts            |   0
 {maze => Client}/lib/catalog-source.ts        |   0
 {maze => Client}/lib/checkout-client.ts       |   0
 {maze => Client}/lib/data.ts                  |   0
 {maze => Client}/lib/mappers/catalog.ts       |   0
 {maze => Client}/lib/media-url.ts             |   0
 {maze => Client}/lib/mocks.ts                 |   0
 {maze => Client}/lib/phone.ts                 |   0
 {maze => Client}/lib/product-label.ts         |   0
 {maze => Client}/lib/run-after-commit.ts      |   0
 {maze => Client}/lib/scroll.ts                |   0
 {maze => Client}/lib/site-source.ts           |   0
 {maze => Client}/lib/staff-auth.ts            |   0
 {maze => Client}/lib/stock.ts                 |   0
 {maze => Client}/lib/utils.ts                 |   0
 {maze => Client}/next.config.ts               |   1 +
 {maze => Client}/nixpacks.toml                |   0
 {maze => Client}/package-lock.json            |   4 +-
 {maze => Client}/package.json                 |   2 +-
 {maze => Client}/postcss.config.mjs           |   0
 {maze => Client}/public/file.svg              |   0
 {maze => Client}/public/globe.svg             |   0
 {maze => Client}/public/lost-maze.svg         |   0
 {maze => Client}/public/maze-card-qr.svg      |   0
 {maze => Client}/public/media/hero-bg.mp4     | Bin
 {maze => Client}/public/next.svg              |   0
 {maze => Client}/public/vercel.svg            |   0
 {maze => Client}/public/window.svg            |   0
 {maze => Client}/railway.toml                 |   4 +-
 {maze => Client}/scripts/dev.mjs              |   0
 .../shared/config/brand-colors.ts             |   0
 {maze => Client}/shared/lib/catalog-routes.ts |   0
 {maze => Client}/shared/lib/client-mounted.ts |   0
 {maze => Client}/shared/lib/motion.ts         |   0
 .../ui/image-spotlight/ImageSpotlight.tsx     |   0
 .../shared/ui/image-spotlight/index.ts        |   0
 .../shared/ui/image-spotlight/lib/easing.ts   |   0
 .../shared/ui/mobile-drawer/MobileDrawer.tsx  |   0
 .../shared/ui/mobile-drawer/index.ts          |   0
 .../route-scroll-reset/RouteScrollReset.tsx   |   0
 .../shared/ui/route-scroll-reset/index.ts     |   0
 .../shared/ui/smooth-scroll/SmoothScroll.tsx  |   0
 .../shared/ui/smooth-scroll/index.ts          |   0
 .../shared/ui/split-text/SplitText.tsx        |   0
 .../shared/ui/split-text/index.ts             |   0
 .../shared/ui/split-text/lib/split-text.ts    |   0
 {maze => Client}/tsconfig.json                |   0
 {maze => Client}/widgets/account-cabinet.tsx  |   0
 .../widgets/authenticated-cart-provider.tsx   |   0
 .../widgets/storefront-modals.tsx             |   0
 README.md                                     |   6 +-
 Server/.dockerignore                          |  16 +++
 Server/.env.example                           |   3 +
 Server/Dockerfile                             |  33 ++++++
 Server/docker-entrypoint.sh                   |   9 ++
 Server/sequelize-cli.cjs                      |  24 +++--
 Server/src/config/database.ts                 |   5 +
 deploy/nginx.conf                             |  49 +++++++++
 docker-compose.yml                            |  97 ++++++++++++++++++
 render.yaml                                   |   2 +-
 226 files changed, 292 insertions(+), 19 deletions(-)
 create mode 100644 Client/.dockerignore
 rename {maze => Client}/.env.example (100%)
 rename {maze => Client}/.gitignore (100%)
 rename {maze => Client}/.node-version (100%)
 rename {maze => Client}/.npmrc (100%)
 rename {maze => Client}/AGENTS.md (100%)
 rename {maze => Client}/CLAUDE.md (100%)
 create mode 100644 Client/Dockerfile
 rename {maze => Client}/README.md (100%)
 rename {maze => Client}/app/(staff)/admin/catalog/categories/page.tsx (100%)
 rename {maze => Client}/app/(staff)/admin/catalog/products/[id]/page.tsx (100%)
 rename {maze => Client}/app/(staff)/admin/catalog/products/new/page.tsx (100%)
 rename {maze => Client}/app/(staff)/admin/catalog/products/page.tsx (100%)
 rename {maze => Client}/app/(staff)/admin/content/banners/page.tsx (100%)
 rename {maze => Client}/app/(staff)/admin/content/cms/[id]/page.tsx (100%)
 rename {maze => Client}/app/(staff)/admin/content/cms/new/page.tsx (100%)
 rename {maze => Client}/app/(staff)/admin/content/cms/page.tsx (100%)
 rename {maze => Client}/app/(staff)/admin/content/slides/page.tsx (100%)
 rename {maze => Client}/app/(staff)/admin/layout.tsx (100%)
 rename {maze => Client}/app/(staff)/admin/orders/[id]/page.tsx (100%)
 rename {maze => Client}/app/(staff)/admin/orders/page.tsx (100%)
 rename {maze => Client}/app/(staff)/admin/page.tsx (100%)
 rename {maze => Client}/app/(staff)/admin/settings/editor-choice/page.tsx (100%)
 rename {maze => Client}/app/(staff)/admin/settings/site/page.tsx (100%)
 rename {maze => Client}/app/(staff)/admin/stock/page.tsx (100%)
 rename {maze => Client}/app/(staff)/layout.tsx (100%)
 rename {maze => Client}/app/(staff)/staff/login/page.tsx (100%)
 rename {maze => Client}/app/(storefront)/account/page.tsx (100%)
 rename {maze => Client}/app/(storefront)/cart/page.tsx (100%)
 rename {maze => Client}/app/(storefront)/catalog/page.tsx (100%)
 rename {maze => Client}/app/(storefront)/layout.tsx (100%)
 rename {maze => Client}/app/(storefront)/not-found.tsx (100%)
 rename {maze => Client}/app/(storefront)/page.tsx (100%)
 rename {maze => Client}/app/(storefront)/product/[slug]/page.tsx (100%)
 rename {maze => Client}/app/error.tsx (100%)
 rename {maze => Client}/app/favicon.ico (100%)
 rename {maze => Client}/app/globals.css (100%)
 rename {maze => Client}/app/layout.tsx (100%)
 rename {maze => Client}/app/not-found.tsx (100%)
 rename {maze => Client}/components/AuthModal.tsx (100%)
 rename {maze => Client}/components/Background.tsx (100%)
 rename {maze => Client}/components/Field.tsx (100%)
 rename {maze => Client}/components/Footer.tsx (100%)
 rename {maze => Client}/components/Header.tsx (100%)
 rename {maze => Client}/components/Icon.tsx (100%)
 rename {maze => Client}/components/Logo.tsx (100%)
 rename {maze => Client}/components/MiniCart.tsx (100%)
 rename {maze => Client}/components/PhoneNationalField.tsx (100%)
 rename {maze => Client}/components/ProductCard.tsx (100%)
 rename {maze => Client}/components/ProductThumb.tsx (100%)
 rename {maze => Client}/components/Providers.tsx (100%)
 rename {maze => Client}/components/Reveal.tsx (100%)
 rename {maze => Client}/components/ScrollToTop.tsx (100%)
 rename {maze => Client}/components/SectionHeading.tsx (100%)
 rename {maze => Client}/components/StorefrontModals.tsx (100%)
 rename {maze => Client}/components/TradeInModal.tsx (100%)
 rename {maze => Client}/components/account/AccountClient.tsx (100%)
 rename {maze => Client}/components/admin/AdminCategoriesPage.tsx (100%)
 rename {maze => Client}/components/admin/AdminContentPages.tsx (100%)
 rename {maze => Client}/components/admin/AdminDashboard.tsx (100%)
 rename {maze => Client}/components/admin/AdminGuard.tsx (100%)
 rename {maze => Client}/components/admin/AdminInventoryPages.tsx (100%)
 rename {maze => Client}/components/admin/AdminOrdersPages.tsx (100%)
 rename {maze => Client}/components/admin/AdminProductsPages.tsx (100%)
 rename {maze => Client}/components/admin/AdminShell.tsx (100%)
 rename {maze => Client}/components/cart/CartClient.tsx (100%)
 rename {maze => Client}/components/catalog/CatalogClient.tsx (100%)
 rename {maze => Client}/components/home/CategoryGrid.tsx (100%)
 rename {maze => Client}/components/home/Features.tsx (100%)
 rename {maze => Client}/components/home/Hero.tsx (100%)
 rename {maze => Client}/components/home/Marquee.tsx (100%)
 rename {maze => Client}/components/home/Promo.tsx (100%)
 rename {maze => Client}/components/home/Testimonials.tsx (100%)
 rename {maze => Client}/components/modals.tsx (100%)
 rename {maze => Client}/components/product/ProductDetail.tsx (100%)
 rename {maze => Client}/components/site-data.tsx (100%)
 rename {maze => Client}/components/staff/StaffAuthProvider.tsx (100%)
 rename {maze => Client}/components/store.tsx (100%)
 rename {maze => Client}/entities/order/index.ts (100%)
 rename {maze => Client}/entities/order/lib/order-status.ts (100%)
 rename {maze => Client}/entities/product/index.ts (100%)
 rename {maze => Client}/entities/user/api/auth-api.ts (100%)
 rename {maze => Client}/entities/user/api/auth-service.ts (100%)
 rename {maze => Client}/entities/user/api/profile-api.ts (100%)
 rename {maze => Client}/entities/user/index.ts (100%)
 rename {maze => Client}/entities/user/model/types.ts (100%)
 rename {maze => Client}/eslint.config.mjs (100%)
 rename {maze => Client}/features/account-orders/api/user-orders-api.ts (100%)
 rename {maze => Client}/features/account-orders/index.ts (100%)
 rename {maze => Client}/features/account-orders/lib/format-order-date.ts (100%)
 rename {maze => Client}/features/account-orders/lib/group-orders.ts (100%)
 rename {maze => Client}/features/account-orders/lib/poll.ts (100%)
 rename {maze => Client}/features/account-orders/lib/refresh-event.ts (100%)
 rename {maze => Client}/features/account-orders/model/use-user-orders.ts (100%)
 rename {maze => Client}/features/account-orders/ui/AccountOrderCard.tsx (100%)
 rename {maze => Client}/features/account-orders/ui/AccountOrdersPanel.tsx (100%)
 rename {maze => Client}/features/account-orders/ui/OrderItemThumb.tsx (100%)
 rename {maze => Client}/features/account-orders/ui/OrderStatusBadge.tsx (100%)
 rename {maze => Client}/features/account/index.ts (100%)
 rename {maze => Client}/features/account/lib/birth-date.ts (100%)
 rename {maze => Client}/features/account/lib/tab-event.ts (100%)
 rename {maze => Client}/features/account/ui/AccountClient.tsx (100%)
 rename {maze => Client}/features/account/ui/AccountProfile.tsx (100%)
 rename {maze => Client}/features/admin-orders/api/order-actions.ts (100%)
 rename {maze => Client}/features/admin-orders/api/pending-orders-count.ts (100%)
 rename {maze => Client}/features/admin-orders/index.ts (100%)
 rename {maze => Client}/features/admin-orders/lib/last-visited-highlight.ts (100%)
 rename {maze => Client}/features/admin-orders/lib/last-worked-order.ts (100%)
 rename {maze => Client}/features/admin-orders/lib/order-status.ts (100%)
 rename {maze => Client}/features/admin-orders/lib/poll.ts (100%)
 rename {maze => Client}/features/admin-orders/lib/refresh-event.ts (100%)
 rename {maze => Client}/features/admin-orders/model/pending-orders-count-provider.tsx (100%)
 rename {maze => Client}/features/admin-orders/ui/OrderNotesSection.tsx (100%)
 rename {maze => Client}/features/admin-orders/ui/OrderStatusText.tsx (100%)
 rename {maze => Client}/features/admin-orders/ui/OrdersCountBadge.tsx (100%)
 rename {maze => Client}/features/auth/index.ts (100%)
 rename {maze => Client}/features/auth/model/user-auth-provider.tsx (100%)
 rename {maze => Client}/features/auth/ui/AuthModal.tsx (100%)
 rename {maze => Client}/features/auth/ui/HeaderAuthActions.tsx (100%)
 rename {maze => Client}/features/auth/ui/LogoutButton.tsx (100%)
 rename {maze => Client}/features/auth/ui/LogoutConfirmModal.tsx (100%)
 rename {maze => Client}/features/auth/ui/MobileAuthActions.tsx (100%)
 rename {maze => Client}/features/auth/ui/OtpCodeInput.tsx (100%)
 rename {maze => Client}/features/cart/api/cart-api.ts (100%)
 rename {maze => Client}/features/cart/index.ts (100%)
 rename {maze => Client}/features/cart/lib/storage.ts (100%)
 rename {maze => Client}/features/cart/model/cart-provider.tsx (100%)
 rename {maze => Client}/features/cart/model/pending-add.ts (100%)
 rename {maze => Client}/features/cart/model/types.ts (100%)
 rename {maze => Client}/features/cart/ui/CartClient.tsx (100%)
 rename {maze => Client}/features/catalog-filters/index.ts (100%)
 rename {maze => Client}/features/catalog-filters/lib/range-track-fill.ts (100%)
 rename {maze => Client}/features/catalog-filters/lib/route-filters.ts (100%)
 rename {maze => Client}/features/catalog-filters/ui/CheckRow.tsx (100%)
 rename {maze => Client}/features/catalog-filters/ui/FilterGroup.tsx (100%)
 rename {maze => Client}/features/catalog-filters/ui/PriceFilter.tsx (100%)
 rename {maze => Client}/features/catalog-filters/ui/PriceRangeSlider.tsx (100%)
 rename {maze => Client}/features/catalog-search/index.ts (100%)
 rename {maze => Client}/features/catalog-search/lib/constants.ts (100%)
 rename {maze => Client}/features/catalog-search/lib/format-brand-hint.ts (100%)
 rename {maze => Client}/features/catalog-search/ui/CatalogSearchInput.tsx (100%)
 rename {maze => Client}/features/catalog-search/ui/RotatingBrandHint.tsx (100%)
 rename {maze => Client}/features/catalog/index.ts (100%)
 rename {maze => Client}/features/catalog/ui/CatalogClient.tsx (100%)
 rename {maze => Client}/features/checkout/api/checkout-api.ts (100%)
 rename {maze => Client}/features/checkout/index.ts (100%)
 rename {maze => Client}/features/home-hero/index.ts (100%)
 rename {maze => Client}/features/home-hero/lib/constants.ts (100%)
 rename {maze => Client}/features/home-hero/ui/HeroVideoBackground.tsx (100%)
 rename {maze => Client}/features/home-hero/ui/HomeHero.tsx (100%)
 rename {maze => Client}/features/not-found-maze/index.ts (100%)
 rename {maze => Client}/features/not-found-maze/lib/constants.ts (100%)
 rename {maze => Client}/features/not-found-maze/ui/NotFoundMaze.tsx (100%)
 rename {maze => Client}/features/not-found-maze/ui/NotFoundVisitCard.tsx (100%)
 rename {maze => Client}/features/not-found-maze/ui/not-found-visit-card.module.css (100%)
 rename {maze => Client}/lib/account-orders-refresh.ts (100%)
 rename {maze => Client}/lib/account-tab.ts (100%)
 rename {maze => Client}/lib/admin/client.ts (100%)
 rename {maze => Client}/lib/admin/types.ts (100%)
 rename {maze => Client}/lib/admin/ui.tsx (100%)
 rename {maze => Client}/lib/admin/use-paged-list.ts (100%)
 rename {maze => Client}/lib/api.ts (100%)
 rename {maze => Client}/lib/body-scroll-lock.ts (100%)
 rename {maze => Client}/lib/cart-client.ts (100%)
 rename {maze => Client}/lib/cart-types.ts (100%)
 rename {maze => Client}/lib/catalog-source.ts (100%)
 rename {maze => Client}/lib/checkout-client.ts (100%)
 rename {maze => Client}/lib/data.ts (100%)
 rename {maze => Client}/lib/mappers/catalog.ts (100%)
 rename {maze => Client}/lib/media-url.ts (100%)
 rename {maze => Client}/lib/mocks.ts (100%)
 rename {maze => Client}/lib/phone.ts (100%)
 rename {maze => Client}/lib/product-label.ts (100%)
 rename {maze => Client}/lib/run-after-commit.ts (100%)
 rename {maze => Client}/lib/scroll.ts (100%)
 rename {maze => Client}/lib/site-source.ts (100%)
 rename {maze => Client}/lib/staff-auth.ts (100%)
 rename {maze => Client}/lib/stock.ts (100%)
 rename {maze => Client}/lib/utils.ts (100%)
 rename {maze => Client}/next.config.ts (98%)
 rename {maze => Client}/nixpacks.toml (100%)
 rename {maze => Client}/package-lock.json (99%)
 rename {maze => Client}/package.json (97%)
 rename {maze => Client}/postcss.config.mjs (100%)
 rename {maze => Client}/public/file.svg (100%)
 rename {maze => Client}/public/globe.svg (100%)
 rename {maze => Client}/public/lost-maze.svg (100%)
 rename {maze => Client}/public/maze-card-qr.svg (100%)
 rename {maze => Client}/public/media/hero-bg.mp4 (100%)
 rename {maze => Client}/public/next.svg (100%)
 rename {maze => Client}/public/vercel.svg (100%)
 rename {maze => Client}/public/window.svg (100%)
 rename {maze => Client}/railway.toml (58%)
 rename {maze => Client}/scripts/dev.mjs (100%)
 rename {maze => Client}/shared/config/brand-colors.ts (100%)
 rename {maze => Client}/shared/lib/catalog-routes.ts (100%)
 rename {maze => Client}/shared/lib/client-mounted.ts (100%)
 rename {maze => Client}/shared/lib/motion.ts (100%)
 rename {maze => Client}/shared/ui/image-spotlight/ImageSpotlight.tsx (100%)
 rename {maze => Client}/shared/ui/image-spotlight/index.ts (100%)
 rename {maze => Client}/shared/ui/image-spotlight/lib/easing.ts (100%)
 rename {maze => Client}/shared/ui/mobile-drawer/MobileDrawer.tsx (100%)
 rename {maze => Client}/shared/ui/mobile-drawer/index.ts (100%)
 rename {maze => Client}/shared/ui/route-scroll-reset/RouteScrollReset.tsx (100%)
 rename {maze => Client}/shared/ui/route-scroll-reset/index.ts (100%)
 rename {maze => Client}/shared/ui/smooth-scroll/SmoothScroll.tsx (100%)
 rename {maze => Client}/shared/ui/smooth-scroll/index.ts (100%)
 rename {maze => Client}/shared/ui/split-text/SplitText.tsx (100%)
 rename {maze => Client}/shared/ui/split-text/index.ts (100%)
 rename {maze => Client}/shared/ui/split-text/lib/split-text.ts (100%)
 rename {maze => Client}/tsconfig.json (100%)
 rename {maze => Client}/widgets/account-cabinet.tsx (100%)
 rename {maze => Client}/widgets/authenticated-cart-provider.tsx (100%)
 rename {maze => Client}/widgets/storefront-modals.tsx (100%)
 create mode 100644 Server/.dockerignore
 create mode 100644 Server/Dockerfile
 create mode 100755 Server/docker-entrypoint.sh
 create mode 100644 deploy/nginx.conf
 create mode 100644 docker-compose.yml

diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index 7149fe9..4b60f1b 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -36,7 +36,7 @@ body:
     attributes:
       label: Шаги воспроизведения
       placeholder: |
-        1. Запустить Server и maze
+        1. Запустить Server и Client
         2. Открыть каталог
         3. Добавить товар в корзину
         4. Обновить страницу
diff --git a/.github/ISSUE_TEMPLATE/task.yml b/.github/ISSUE_TEMPLATE/task.yml
index 4186ad3..be85ae7 100644
--- a/.github/ISSUE_TEMPLATE/task.yml
+++ b/.github/ISSUE_TEMPLATE/task.yml
@@ -19,7 +19,7 @@ body:
     attributes:
       label: Область
       options:
-        - Фронт (maze)
+        - Фронт (Client)
         - Бэкенд (Server)
         - Инфра / DevOps
         - Документация
diff --git a/Client/.dockerignore b/Client/.dockerignore
new file mode 100644
index 0000000..8f1ef39
--- /dev/null
+++ b/Client/.dockerignore
@@ -0,0 +1,16 @@
+node_modules
+.next
+.git
+.gitignore
+Dockerfile
+.dockerignore
+*.md
+.env
+.env.*
+!.env.example
+npm-debug.log*
+coverage
+.DS_Store
+*.tsbuildinfo
+next-env.d.ts
+.vercel
diff --git a/maze/.env.example b/Client/.env.example
similarity index 100%
rename from maze/.env.example
rename to Client/.env.example
diff --git a/maze/.gitignore b/Client/.gitignore
similarity index 100%
rename from maze/.gitignore
rename to Client/.gitignore
diff --git a/maze/.node-version b/Client/.node-version
similarity index 100%
rename from maze/.node-version
rename to Client/.node-version
diff --git a/maze/.npmrc b/Client/.npmrc
similarity index 100%
rename from maze/.npmrc
rename to Client/.npmrc
diff --git a/maze/AGENTS.md b/Client/AGENTS.md
similarity index 100%
rename from maze/AGENTS.md
rename to Client/AGENTS.md
diff --git a/maze/CLAUDE.md b/Client/CLAUDE.md
similarity index 100%
rename from maze/CLAUDE.md
rename to Client/CLAUDE.md
diff --git a/Client/Dockerfile b/Client/Dockerfile
new file mode 100644
index 0000000..da2814f
--- /dev/null
+++ b/Client/Dockerfile
@@ -0,0 +1,36 @@
+# Next.js App Router (SSR) — не статический /dist под nginx.
+# Сборка: docker compose build client
+FROM node:22-alpine AS deps
+RUN apk add --no-cache libc6-compat
+WORKDIR /app
+COPY package.json package-lock.json ./
+RUN npm ci
+
+FROM node:22-alpine AS build
+RUN apk add --no-cache libc6-compat
+WORKDIR /app
+COPY --from=deps /app/node_modules ./node_modules
+COPY . .
+# Rewrites /api и /uploads в next.config.ts читаются на этапе build.
+ARG API_INTERNAL_URL=http://api:4000
+ENV API_INTERNAL_URL=$API_INTERNAL_URL
+ENV NEXT_TELEMETRY_DISABLED=1
+RUN npm run build
+
+FROM node:22-alpine AS runner
+WORKDIR /app
+ENV NODE_ENV=production
+ENV NEXT_TELEMETRY_DISABLED=1
+ENV HOSTNAME=0.0.0.0
+ENV PORT=3000
+
+RUN addgroup --system --gid 1001 nodejs \
+  && adduser --system --uid 1001 nextjs
+
+COPY --from=build /app/public ./public
+COPY --from=build --chown=nextjs:nodejs /app/.next/standalone ./
+COPY --from=build --chown=nextjs:nodejs /app/.next/static ./.next/static
+
+USER nextjs
+EXPOSE 3000
+CMD ["node", "server.js"]
diff --git a/maze/README.md b/Client/README.md
similarity index 100%
rename from maze/README.md
rename to Client/README.md
diff --git a/maze/app/(staff)/admin/catalog/categories/page.tsx b/Client/app/(staff)/admin/catalog/categories/page.tsx
similarity index 100%
rename from maze/app/(staff)/admin/catalog/categories/page.tsx
rename to Client/app/(staff)/admin/catalog/categories/page.tsx
diff --git a/maze/app/(staff)/admin/catalog/products/[id]/page.tsx b/Client/app/(staff)/admin/catalog/products/[id]/page.tsx
similarity index 100%
rename from maze/app/(staff)/admin/catalog/products/[id]/page.tsx
rename to Client/app/(staff)/admin/catalog/products/[id]/page.tsx
diff --git a/maze/app/(staff)/admin/catalog/products/new/page.tsx b/Client/app/(staff)/admin/catalog/products/new/page.tsx
similarity index 100%
rename from maze/app/(staff)/admin/catalog/products/new/page.tsx
rename to Client/app/(staff)/admin/catalog/products/new/page.tsx
diff --git a/maze/app/(staff)/admin/catalog/products/page.tsx b/Client/app/(staff)/admin/catalog/products/page.tsx
similarity index 100%
rename from maze/app/(staff)/admin/catalog/products/page.tsx
rename to Client/app/(staff)/admin/catalog/products/page.tsx
diff --git a/maze/app/(staff)/admin/content/banners/page.tsx b/Client/app/(staff)/admin/content/banners/page.tsx
similarity index 100%
rename from maze/app/(staff)/admin/content/banners/page.tsx
rename to Client/app/(staff)/admin/content/banners/page.tsx
diff --git a/maze/app/(staff)/admin/content/cms/[id]/page.tsx b/Client/app/(staff)/admin/content/cms/[id]/page.tsx
similarity index 100%
rename from maze/app/(staff)/admin/content/cms/[id]/page.tsx
rename to Client/app/(staff)/admin/content/cms/[id]/page.tsx
diff --git a/maze/app/(staff)/admin/content/cms/new/page.tsx b/Client/app/(staff)/admin/content/cms/new/page.tsx
similarity index 100%
rename from maze/app/(staff)/admin/content/cms/new/page.tsx
rename to Client/app/(staff)/admin/content/cms/new/page.tsx
diff --git a/maze/app/(staff)/admin/content/cms/page.tsx b/Client/app/(staff)/admin/content/cms/page.tsx
similarity index 100%
rename from maze/app/(staff)/admin/content/cms/page.tsx
rename to Client/app/(staff)/admin/content/cms/page.tsx
diff --git a/maze/app/(staff)/admin/content/slides/page.tsx b/Client/app/(staff)/admin/content/slides/page.tsx
similarity index 100%
rename from maze/app/(staff)/admin/content/slides/page.tsx
rename to Client/app/(staff)/admin/content/slides/page.tsx
diff --git a/maze/app/(staff)/admin/layout.tsx b/Client/app/(staff)/admin/layout.tsx
similarity index 100%
rename from maze/app/(staff)/admin/layout.tsx
rename to Client/app/(staff)/admin/layout.tsx
diff --git a/maze/app/(staff)/admin/orders/[id]/page.tsx b/Client/app/(staff)/admin/orders/[id]/page.tsx
similarity index 100%
rename from maze/app/(staff)/admin/orders/[id]/page.tsx
rename to Client/app/(staff)/admin/orders/[id]/page.tsx
diff --git a/maze/app/(staff)/admin/orders/page.tsx b/Client/app/(staff)/admin/orders/page.tsx
similarity index 100%
rename from maze/app/(staff)/admin/orders/page.tsx
rename to Client/app/(staff)/admin/orders/page.tsx
diff --git a/maze/app/(staff)/admin/page.tsx b/Client/app/(staff)/admin/page.tsx
similarity index 100%
rename from maze/app/(staff)/admin/page.tsx
rename to Client/app/(staff)/admin/page.tsx
diff --git a/maze/app/(staff)/admin/settings/editor-choice/page.tsx b/Client/app/(staff)/admin/settings/editor-choice/page.tsx
similarity index 100%
rename from maze/app/(staff)/admin/settings/editor-choice/page.tsx
rename to Client/app/(staff)/admin/settings/editor-choice/page.tsx
diff --git a/maze/app/(staff)/admin/settings/site/page.tsx b/Client/app/(staff)/admin/settings/site/page.tsx
similarity index 100%
rename from maze/app/(staff)/admin/settings/site/page.tsx
rename to Client/app/(staff)/admin/settings/site/page.tsx
diff --git a/maze/app/(staff)/admin/stock/page.tsx b/Client/app/(staff)/admin/stock/page.tsx
similarity index 100%
rename from maze/app/(staff)/admin/stock/page.tsx
rename to Client/app/(staff)/admin/stock/page.tsx
diff --git a/maze/app/(staff)/layout.tsx b/Client/app/(staff)/layout.tsx
similarity index 100%
rename from maze/app/(staff)/layout.tsx
rename to Client/app/(staff)/layout.tsx
diff --git a/maze/app/(staff)/staff/login/page.tsx b/Client/app/(staff)/staff/login/page.tsx
similarity index 100%
rename from maze/app/(staff)/staff/login/page.tsx
rename to Client/app/(staff)/staff/login/page.tsx
diff --git a/maze/app/(storefront)/account/page.tsx b/Client/app/(storefront)/account/page.tsx
similarity index 100%
rename from maze/app/(storefront)/account/page.tsx
rename to Client/app/(storefront)/account/page.tsx
diff --git a/maze/app/(storefront)/cart/page.tsx b/Client/app/(storefront)/cart/page.tsx
similarity index 100%
rename from maze/app/(storefront)/cart/page.tsx
rename to Client/app/(storefront)/cart/page.tsx
diff --git a/maze/app/(storefront)/catalog/page.tsx b/Client/app/(storefront)/catalog/page.tsx
similarity index 100%
rename from maze/app/(storefront)/catalog/page.tsx
rename to Client/app/(storefront)/catalog/page.tsx
diff --git a/maze/app/(storefront)/layout.tsx b/Client/app/(storefront)/layout.tsx
similarity index 100%
rename from maze/app/(storefront)/layout.tsx
rename to Client/app/(storefront)/layout.tsx
diff --git a/maze/app/(storefront)/not-found.tsx b/Client/app/(storefront)/not-found.tsx
similarity index 100%
rename from maze/app/(storefront)/not-found.tsx
rename to Client/app/(storefront)/not-found.tsx
diff --git a/maze/app/(storefront)/page.tsx b/Client/app/(storefront)/page.tsx
similarity index 100%
rename from maze/app/(storefront)/page.tsx
rename to Client/app/(storefront)/page.tsx
diff --git a/maze/app/(storefront)/product/[slug]/page.tsx b/Client/app/(storefront)/product/[slug]/page.tsx
similarity index 100%
rename from maze/app/(storefront)/product/[slug]/page.tsx
rename to Client/app/(storefront)/product/[slug]/page.tsx
diff --git a/maze/app/error.tsx b/Client/app/error.tsx
similarity index 100%
rename from maze/app/error.tsx
rename to Client/app/error.tsx
diff --git a/maze/app/favicon.ico b/Client/app/favicon.ico
similarity index 100%
rename from maze/app/favicon.ico
rename to Client/app/favicon.ico
diff --git a/maze/app/globals.css b/Client/app/globals.css
similarity index 100%
rename from maze/app/globals.css
rename to Client/app/globals.css
diff --git a/maze/app/layout.tsx b/Client/app/layout.tsx
similarity index 100%
rename from maze/app/layout.tsx
rename to Client/app/layout.tsx
diff --git a/maze/app/not-found.tsx b/Client/app/not-found.tsx
similarity index 100%
rename from maze/app/not-found.tsx
rename to Client/app/not-found.tsx
diff --git a/maze/components/AuthModal.tsx b/Client/components/AuthModal.tsx
similarity index 100%
rename from maze/components/AuthModal.tsx
rename to Client/components/AuthModal.tsx
diff --git a/maze/components/Background.tsx b/Client/components/Background.tsx
similarity index 100%
rename from maze/components/Background.tsx
rename to Client/components/Background.tsx
diff --git a/maze/components/Field.tsx b/Client/components/Field.tsx
similarity index 100%
rename from maze/components/Field.tsx
rename to Client/components/Field.tsx
diff --git a/maze/components/Footer.tsx b/Client/components/Footer.tsx
similarity index 100%
rename from maze/components/Footer.tsx
rename to Client/components/Footer.tsx
diff --git a/maze/components/Header.tsx b/Client/components/Header.tsx
similarity index 100%
rename from maze/components/Header.tsx
rename to Client/components/Header.tsx
diff --git a/maze/components/Icon.tsx b/Client/components/Icon.tsx
similarity index 100%
rename from maze/components/Icon.tsx
rename to Client/components/Icon.tsx
diff --git a/maze/components/Logo.tsx b/Client/components/Logo.tsx
similarity index 100%
rename from maze/components/Logo.tsx
rename to Client/components/Logo.tsx
diff --git a/maze/components/MiniCart.tsx b/Client/components/MiniCart.tsx
similarity index 100%
rename from maze/components/MiniCart.tsx
rename to Client/components/MiniCart.tsx
diff --git a/maze/components/PhoneNationalField.tsx b/Client/components/PhoneNationalField.tsx
similarity index 100%
rename from maze/components/PhoneNationalField.tsx
rename to Client/components/PhoneNationalField.tsx
diff --git a/maze/components/ProductCard.tsx b/Client/components/ProductCard.tsx
similarity index 100%
rename from maze/components/ProductCard.tsx
rename to Client/components/ProductCard.tsx
diff --git a/maze/components/ProductThumb.tsx b/Client/components/ProductThumb.tsx
similarity index 100%
rename from maze/components/ProductThumb.tsx
rename to Client/components/ProductThumb.tsx
diff --git a/maze/components/Providers.tsx b/Client/components/Providers.tsx
similarity index 100%
rename from maze/components/Providers.tsx
rename to Client/components/Providers.tsx
diff --git a/maze/components/Reveal.tsx b/Client/components/Reveal.tsx
similarity index 100%
rename from maze/components/Reveal.tsx
rename to Client/components/Reveal.tsx
diff --git a/maze/components/ScrollToTop.tsx b/Client/components/ScrollToTop.tsx
similarity index 100%
rename from maze/components/ScrollToTop.tsx
rename to Client/components/ScrollToTop.tsx
diff --git a/maze/components/SectionHeading.tsx b/Client/components/SectionHeading.tsx
similarity index 100%
rename from maze/components/SectionHeading.tsx
rename to Client/components/SectionHeading.tsx
diff --git a/maze/components/StorefrontModals.tsx b/Client/components/StorefrontModals.tsx
similarity index 100%
rename from maze/components/StorefrontModals.tsx
rename to Client/components/StorefrontModals.tsx
diff --git a/maze/components/TradeInModal.tsx b/Client/components/TradeInModal.tsx
similarity index 100%
rename from maze/components/TradeInModal.tsx
rename to Client/components/TradeInModal.tsx
diff --git a/maze/components/account/AccountClient.tsx b/Client/components/account/AccountClient.tsx
similarity index 100%
rename from maze/components/account/AccountClient.tsx
rename to Client/components/account/AccountClient.tsx
diff --git a/maze/components/admin/AdminCategoriesPage.tsx b/Client/components/admin/AdminCategoriesPage.tsx
similarity index 100%
rename from maze/components/admin/AdminCategoriesPage.tsx
rename to Client/components/admin/AdminCategoriesPage.tsx
diff --git a/maze/components/admin/AdminContentPages.tsx b/Client/components/admin/AdminContentPages.tsx
similarity index 100%
rename from maze/components/admin/AdminContentPages.tsx
rename to Client/components/admin/AdminContentPages.tsx
diff --git a/maze/components/admin/AdminDashboard.tsx b/Client/components/admin/AdminDashboard.tsx
similarity index 100%
rename from maze/components/admin/AdminDashboard.tsx
rename to Client/components/admin/AdminDashboard.tsx
diff --git a/maze/components/admin/AdminGuard.tsx b/Client/components/admin/AdminGuard.tsx
similarity index 100%
rename from maze/components/admin/AdminGuard.tsx
rename to Client/components/admin/AdminGuard.tsx
diff --git a/maze/components/admin/AdminInventoryPages.tsx b/Client/components/admin/AdminInventoryPages.tsx
similarity index 100%
rename from maze/components/admin/AdminInventoryPages.tsx
rename to Client/components/admin/AdminInventoryPages.tsx
diff --git a/maze/components/admin/AdminOrdersPages.tsx b/Client/components/admin/AdminOrdersPages.tsx
similarity index 100%
rename from maze/components/admin/AdminOrdersPages.tsx
rename to Client/components/admin/AdminOrdersPages.tsx
diff --git a/maze/components/admin/AdminProductsPages.tsx b/Client/components/admin/AdminProductsPages.tsx
similarity index 100%
rename from maze/components/admin/AdminProductsPages.tsx
rename to Client/components/admin/AdminProductsPages.tsx
diff --git a/maze/components/admin/AdminShell.tsx b/Client/components/admin/AdminShell.tsx
similarity index 100%
rename from maze/components/admin/AdminShell.tsx
rename to Client/components/admin/AdminShell.tsx
diff --git a/maze/components/cart/CartClient.tsx b/Client/components/cart/CartClient.tsx
similarity index 100%
rename from maze/components/cart/CartClient.tsx
rename to Client/components/cart/CartClient.tsx
diff --git a/maze/components/catalog/CatalogClient.tsx b/Client/components/catalog/CatalogClient.tsx
similarity index 100%
rename from maze/components/catalog/CatalogClient.tsx
rename to Client/components/catalog/CatalogClient.tsx
diff --git a/maze/components/home/CategoryGrid.tsx b/Client/components/home/CategoryGrid.tsx
similarity index 100%
rename from maze/components/home/CategoryGrid.tsx
rename to Client/components/home/CategoryGrid.tsx
diff --git a/maze/components/home/Features.tsx b/Client/components/home/Features.tsx
similarity index 100%
rename from maze/components/home/Features.tsx
rename to Client/components/home/Features.tsx
diff --git a/maze/components/home/Hero.tsx b/Client/components/home/Hero.tsx
similarity index 100%
rename from maze/components/home/Hero.tsx
rename to Client/components/home/Hero.tsx
diff --git a/maze/components/home/Marquee.tsx b/Client/components/home/Marquee.tsx
similarity index 100%
rename from maze/components/home/Marquee.tsx
rename to Client/components/home/Marquee.tsx
diff --git a/maze/components/home/Promo.tsx b/Client/components/home/Promo.tsx
similarity index 100%
rename from maze/components/home/Promo.tsx
rename to Client/components/home/Promo.tsx
diff --git a/maze/components/home/Testimonials.tsx b/Client/components/home/Testimonials.tsx
similarity index 100%
rename from maze/components/home/Testimonials.tsx
rename to Client/components/home/Testimonials.tsx
diff --git a/maze/components/modals.tsx b/Client/components/modals.tsx
similarity index 100%
rename from maze/components/modals.tsx
rename to Client/components/modals.tsx
diff --git a/maze/components/product/ProductDetail.tsx b/Client/components/product/ProductDetail.tsx
similarity index 100%
rename from maze/components/product/ProductDetail.tsx
rename to Client/components/product/ProductDetail.tsx
diff --git a/maze/components/site-data.tsx b/Client/components/site-data.tsx
similarity index 100%
rename from maze/components/site-data.tsx
rename to Client/components/site-data.tsx
diff --git a/maze/components/staff/StaffAuthProvider.tsx b/Client/components/staff/StaffAuthProvider.tsx
similarity index 100%
rename from maze/components/staff/StaffAuthProvider.tsx
rename to Client/components/staff/StaffAuthProvider.tsx
diff --git a/maze/components/store.tsx b/Client/components/store.tsx
similarity index 100%
rename from maze/components/store.tsx
rename to Client/components/store.tsx
diff --git a/maze/entities/order/index.ts b/Client/entities/order/index.ts
similarity index 100%
rename from maze/entities/order/index.ts
rename to Client/entities/order/index.ts
diff --git a/maze/entities/order/lib/order-status.ts b/Client/entities/order/lib/order-status.ts
similarity index 100%
rename from maze/entities/order/lib/order-status.ts
rename to Client/entities/order/lib/order-status.ts
diff --git a/maze/entities/product/index.ts b/Client/entities/product/index.ts
similarity index 100%
rename from maze/entities/product/index.ts
rename to Client/entities/product/index.ts
diff --git a/maze/entities/user/api/auth-api.ts b/Client/entities/user/api/auth-api.ts
similarity index 100%
rename from maze/entities/user/api/auth-api.ts
rename to Client/entities/user/api/auth-api.ts
diff --git a/maze/entities/user/api/auth-service.ts b/Client/entities/user/api/auth-service.ts
similarity index 100%
rename from maze/entities/user/api/auth-service.ts
rename to Client/entities/user/api/auth-service.ts
diff --git a/maze/entities/user/api/profile-api.ts b/Client/entities/user/api/profile-api.ts
similarity index 100%
rename from maze/entities/user/api/profile-api.ts
rename to Client/entities/user/api/profile-api.ts
diff --git a/maze/entities/user/index.ts b/Client/entities/user/index.ts
similarity index 100%
rename from maze/entities/user/index.ts
rename to Client/entities/user/index.ts
diff --git a/maze/entities/user/model/types.ts b/Client/entities/user/model/types.ts
similarity index 100%
rename from maze/entities/user/model/types.ts
rename to Client/entities/user/model/types.ts
diff --git a/maze/eslint.config.mjs b/Client/eslint.config.mjs
similarity index 100%
rename from maze/eslint.config.mjs
rename to Client/eslint.config.mjs
diff --git a/maze/features/account-orders/api/user-orders-api.ts b/Client/features/account-orders/api/user-orders-api.ts
similarity index 100%
rename from maze/features/account-orders/api/user-orders-api.ts
rename to Client/features/account-orders/api/user-orders-api.ts
diff --git a/maze/features/account-orders/index.ts b/Client/features/account-orders/index.ts
similarity index 100%
rename from maze/features/account-orders/index.ts
rename to Client/features/account-orders/index.ts
diff --git a/maze/features/account-orders/lib/format-order-date.ts b/Client/features/account-orders/lib/format-order-date.ts
similarity index 100%
rename from maze/features/account-orders/lib/format-order-date.ts
rename to Client/features/account-orders/lib/format-order-date.ts
diff --git a/maze/features/account-orders/lib/group-orders.ts b/Client/features/account-orders/lib/group-orders.ts
similarity index 100%
rename from maze/features/account-orders/lib/group-orders.ts
rename to Client/features/account-orders/lib/group-orders.ts
diff --git a/maze/features/account-orders/lib/poll.ts b/Client/features/account-orders/lib/poll.ts
similarity index 100%
rename from maze/features/account-orders/lib/poll.ts
rename to Client/features/account-orders/lib/poll.ts
diff --git a/maze/features/account-orders/lib/refresh-event.ts b/Client/features/account-orders/lib/refresh-event.ts
similarity index 100%
rename from maze/features/account-orders/lib/refresh-event.ts
rename to Client/features/account-orders/lib/refresh-event.ts
diff --git a/maze/features/account-orders/model/use-user-orders.ts b/Client/features/account-orders/model/use-user-orders.ts
similarity index 100%
rename from maze/features/account-orders/model/use-user-orders.ts
rename to Client/features/account-orders/model/use-user-orders.ts
diff --git a/maze/features/account-orders/ui/AccountOrderCard.tsx b/Client/features/account-orders/ui/AccountOrderCard.tsx
similarity index 100%
rename from maze/features/account-orders/ui/AccountOrderCard.tsx
rename to Client/features/account-orders/ui/AccountOrderCard.tsx
diff --git a/maze/features/account-orders/ui/AccountOrdersPanel.tsx b/Client/features/account-orders/ui/AccountOrdersPanel.tsx
similarity index 100%
rename from maze/features/account-orders/ui/AccountOrdersPanel.tsx
rename to Client/features/account-orders/ui/AccountOrdersPanel.tsx
diff --git a/maze/features/account-orders/ui/OrderItemThumb.tsx b/Client/features/account-orders/ui/OrderItemThumb.tsx
similarity index 100%
rename from maze/features/account-orders/ui/OrderItemThumb.tsx
rename to Client/features/account-orders/ui/OrderItemThumb.tsx
diff --git a/maze/features/account-orders/ui/OrderStatusBadge.tsx b/Client/features/account-orders/ui/OrderStatusBadge.tsx
similarity index 100%
rename from maze/features/account-orders/ui/OrderStatusBadge.tsx
rename to Client/features/account-orders/ui/OrderStatusBadge.tsx
diff --git a/maze/features/account/index.ts b/Client/features/account/index.ts
similarity index 100%
rename from maze/features/account/index.ts
rename to Client/features/account/index.ts
diff --git a/maze/features/account/lib/birth-date.ts b/Client/features/account/lib/birth-date.ts
similarity index 100%
rename from maze/features/account/lib/birth-date.ts
rename to Client/features/account/lib/birth-date.ts
diff --git a/maze/features/account/lib/tab-event.ts b/Client/features/account/lib/tab-event.ts
similarity index 100%
rename from maze/features/account/lib/tab-event.ts
rename to Client/features/account/lib/tab-event.ts
diff --git a/maze/features/account/ui/AccountClient.tsx b/Client/features/account/ui/AccountClient.tsx
similarity index 100%
rename from maze/features/account/ui/AccountClient.tsx
rename to Client/features/account/ui/AccountClient.tsx
diff --git a/maze/features/account/ui/AccountProfile.tsx b/Client/features/account/ui/AccountProfile.tsx
similarity index 100%
rename from maze/features/account/ui/AccountProfile.tsx
rename to Client/features/account/ui/AccountProfile.tsx
diff --git a/maze/features/admin-orders/api/order-actions.ts b/Client/features/admin-orders/api/order-actions.ts
similarity index 100%
rename from maze/features/admin-orders/api/order-actions.ts
rename to Client/features/admin-orders/api/order-actions.ts
diff --git a/maze/features/admin-orders/api/pending-orders-count.ts b/Client/features/admin-orders/api/pending-orders-count.ts
similarity index 100%
rename from maze/features/admin-orders/api/pending-orders-count.ts
rename to Client/features/admin-orders/api/pending-orders-count.ts
diff --git a/maze/features/admin-orders/index.ts b/Client/features/admin-orders/index.ts
similarity index 100%
rename from maze/features/admin-orders/index.ts
rename to Client/features/admin-orders/index.ts
diff --git a/maze/features/admin-orders/lib/last-visited-highlight.ts b/Client/features/admin-orders/lib/last-visited-highlight.ts
similarity index 100%
rename from maze/features/admin-orders/lib/last-visited-highlight.ts
rename to Client/features/admin-orders/lib/last-visited-highlight.ts
diff --git a/maze/features/admin-orders/lib/last-worked-order.ts b/Client/features/admin-orders/lib/last-worked-order.ts
similarity index 100%
rename from maze/features/admin-orders/lib/last-worked-order.ts
rename to Client/features/admin-orders/lib/last-worked-order.ts
diff --git a/maze/features/admin-orders/lib/order-status.ts b/Client/features/admin-orders/lib/order-status.ts
similarity index 100%
rename from maze/features/admin-orders/lib/order-status.ts
rename to Client/features/admin-orders/lib/order-status.ts
diff --git a/maze/features/admin-orders/lib/poll.ts b/Client/features/admin-orders/lib/poll.ts
similarity index 100%
rename from maze/features/admin-orders/lib/poll.ts
rename to Client/features/admin-orders/lib/poll.ts
diff --git a/maze/features/admin-orders/lib/refresh-event.ts b/Client/features/admin-orders/lib/refresh-event.ts
similarity index 100%
rename from maze/features/admin-orders/lib/refresh-event.ts
rename to Client/features/admin-orders/lib/refresh-event.ts
diff --git a/maze/features/admin-orders/model/pending-orders-count-provider.tsx b/Client/features/admin-orders/model/pending-orders-count-provider.tsx
similarity index 100%
rename from maze/features/admin-orders/model/pending-orders-count-provider.tsx
rename to Client/features/admin-orders/model/pending-orders-count-provider.tsx
diff --git a/maze/features/admin-orders/ui/OrderNotesSection.tsx b/Client/features/admin-orders/ui/OrderNotesSection.tsx
similarity index 100%
rename from maze/features/admin-orders/ui/OrderNotesSection.tsx
rename to Client/features/admin-orders/ui/OrderNotesSection.tsx
diff --git a/maze/features/admin-orders/ui/OrderStatusText.tsx b/Client/features/admin-orders/ui/OrderStatusText.tsx
similarity index 100%
rename from maze/features/admin-orders/ui/OrderStatusText.tsx
rename to Client/features/admin-orders/ui/OrderStatusText.tsx
diff --git a/maze/features/admin-orders/ui/OrdersCountBadge.tsx b/Client/features/admin-orders/ui/OrdersCountBadge.tsx
similarity index 100%
rename from maze/features/admin-orders/ui/OrdersCountBadge.tsx
rename to Client/features/admin-orders/ui/OrdersCountBadge.tsx
diff --git a/maze/features/auth/index.ts b/Client/features/auth/index.ts
similarity index 100%
rename from maze/features/auth/index.ts
rename to Client/features/auth/index.ts
diff --git a/maze/features/auth/model/user-auth-provider.tsx b/Client/features/auth/model/user-auth-provider.tsx
similarity index 100%
rename from maze/features/auth/model/user-auth-provider.tsx
rename to Client/features/auth/model/user-auth-provider.tsx
diff --git a/maze/features/auth/ui/AuthModal.tsx b/Client/features/auth/ui/AuthModal.tsx
similarity index 100%
rename from maze/features/auth/ui/AuthModal.tsx
rename to Client/features/auth/ui/AuthModal.tsx
diff --git a/maze/features/auth/ui/HeaderAuthActions.tsx b/Client/features/auth/ui/HeaderAuthActions.tsx
similarity index 100%
rename from maze/features/auth/ui/HeaderAuthActions.tsx
rename to Client/features/auth/ui/HeaderAuthActions.tsx
diff --git a/maze/features/auth/ui/LogoutButton.tsx b/Client/features/auth/ui/LogoutButton.tsx
similarity index 100%
rename from maze/features/auth/ui/LogoutButton.tsx
rename to Client/features/auth/ui/LogoutButton.tsx
diff --git a/maze/features/auth/ui/LogoutConfirmModal.tsx b/Client/features/auth/ui/LogoutConfirmModal.tsx
similarity index 100%
rename from maze/features/auth/ui/LogoutConfirmModal.tsx
rename to Client/features/auth/ui/LogoutConfirmModal.tsx
diff --git a/maze/features/auth/ui/MobileAuthActions.tsx b/Client/features/auth/ui/MobileAuthActions.tsx
similarity index 100%
rename from maze/features/auth/ui/MobileAuthActions.tsx
rename to Client/features/auth/ui/MobileAuthActions.tsx
diff --git a/maze/features/auth/ui/OtpCodeInput.tsx b/Client/features/auth/ui/OtpCodeInput.tsx
similarity index 100%
rename from maze/features/auth/ui/OtpCodeInput.tsx
rename to Client/features/auth/ui/OtpCodeInput.tsx
diff --git a/maze/features/cart/api/cart-api.ts b/Client/features/cart/api/cart-api.ts
similarity index 100%
rename from maze/features/cart/api/cart-api.ts
rename to Client/features/cart/api/cart-api.ts
diff --git a/maze/features/cart/index.ts b/Client/features/cart/index.ts
similarity index 100%
rename from maze/features/cart/index.ts
rename to Client/features/cart/index.ts
diff --git a/maze/features/cart/lib/storage.ts b/Client/features/cart/lib/storage.ts
similarity index 100%
rename from maze/features/cart/lib/storage.ts
rename to Client/features/cart/lib/storage.ts
diff --git a/maze/features/cart/model/cart-provider.tsx b/Client/features/cart/model/cart-provider.tsx
similarity index 100%
rename from maze/features/cart/model/cart-provider.tsx
rename to Client/features/cart/model/cart-provider.tsx
diff --git a/maze/features/cart/model/pending-add.ts b/Client/features/cart/model/pending-add.ts
similarity index 100%
rename from maze/features/cart/model/pending-add.ts
rename to Client/features/cart/model/pending-add.ts
diff --git a/maze/features/cart/model/types.ts b/Client/features/cart/model/types.ts
similarity index 100%
rename from maze/features/cart/model/types.ts
rename to Client/features/cart/model/types.ts
diff --git a/maze/features/cart/ui/CartClient.tsx b/Client/features/cart/ui/CartClient.tsx
similarity index 100%
rename from maze/features/cart/ui/CartClient.tsx
rename to Client/features/cart/ui/CartClient.tsx
diff --git a/maze/features/catalog-filters/index.ts b/Client/features/catalog-filters/index.ts
similarity index 100%
rename from maze/features/catalog-filters/index.ts
rename to Client/features/catalog-filters/index.ts
diff --git a/maze/features/catalog-filters/lib/range-track-fill.ts b/Client/features/catalog-filters/lib/range-track-fill.ts
similarity index 100%
rename from maze/features/catalog-filters/lib/range-track-fill.ts
rename to Client/features/catalog-filters/lib/range-track-fill.ts
diff --git a/maze/features/catalog-filters/lib/route-filters.ts b/Client/features/catalog-filters/lib/route-filters.ts
similarity index 100%
rename from maze/features/catalog-filters/lib/route-filters.ts
rename to Client/features/catalog-filters/lib/route-filters.ts
diff --git a/maze/features/catalog-filters/ui/CheckRow.tsx b/Client/features/catalog-filters/ui/CheckRow.tsx
similarity index 100%
rename from maze/features/catalog-filters/ui/CheckRow.tsx
rename to Client/features/catalog-filters/ui/CheckRow.tsx
diff --git a/maze/features/catalog-filters/ui/FilterGroup.tsx b/Client/features/catalog-filters/ui/FilterGroup.tsx
similarity index 100%
rename from maze/features/catalog-filters/ui/FilterGroup.tsx
rename to Client/features/catalog-filters/ui/FilterGroup.tsx
diff --git a/maze/features/catalog-filters/ui/PriceFilter.tsx b/Client/features/catalog-filters/ui/PriceFilter.tsx
similarity index 100%
rename from maze/features/catalog-filters/ui/PriceFilter.tsx
rename to Client/features/catalog-filters/ui/PriceFilter.tsx
diff --git a/maze/features/catalog-filters/ui/PriceRangeSlider.tsx b/Client/features/catalog-filters/ui/PriceRangeSlider.tsx
similarity index 100%
rename from maze/features/catalog-filters/ui/PriceRangeSlider.tsx
rename to Client/features/catalog-filters/ui/PriceRangeSlider.tsx
diff --git a/maze/features/catalog-search/index.ts b/Client/features/catalog-search/index.ts
similarity index 100%
rename from maze/features/catalog-search/index.ts
rename to Client/features/catalog-search/index.ts
diff --git a/maze/features/catalog-search/lib/constants.ts b/Client/features/catalog-search/lib/constants.ts
similarity index 100%
rename from maze/features/catalog-search/lib/constants.ts
rename to Client/features/catalog-search/lib/constants.ts
diff --git a/maze/features/catalog-search/lib/format-brand-hint.ts b/Client/features/catalog-search/lib/format-brand-hint.ts
similarity index 100%
rename from maze/features/catalog-search/lib/format-brand-hint.ts
rename to Client/features/catalog-search/lib/format-brand-hint.ts
diff --git a/maze/features/catalog-search/ui/CatalogSearchInput.tsx b/Client/features/catalog-search/ui/CatalogSearchInput.tsx
similarity index 100%
rename from maze/features/catalog-search/ui/CatalogSearchInput.tsx
rename to Client/features/catalog-search/ui/CatalogSearchInput.tsx
diff --git a/maze/features/catalog-search/ui/RotatingBrandHint.tsx b/Client/features/catalog-search/ui/RotatingBrandHint.tsx
similarity index 100%
rename from maze/features/catalog-search/ui/RotatingBrandHint.tsx
rename to Client/features/catalog-search/ui/RotatingBrandHint.tsx
diff --git a/maze/features/catalog/index.ts b/Client/features/catalog/index.ts
similarity index 100%
rename from maze/features/catalog/index.ts
rename to Client/features/catalog/index.ts
diff --git a/maze/features/catalog/ui/CatalogClient.tsx b/Client/features/catalog/ui/CatalogClient.tsx
similarity index 100%
rename from maze/features/catalog/ui/CatalogClient.tsx
rename to Client/features/catalog/ui/CatalogClient.tsx
diff --git a/maze/features/checkout/api/checkout-api.ts b/Client/features/checkout/api/checkout-api.ts
similarity index 100%
rename from maze/features/checkout/api/checkout-api.ts
rename to Client/features/checkout/api/checkout-api.ts
diff --git a/maze/features/checkout/index.ts b/Client/features/checkout/index.ts
similarity index 100%
rename from maze/features/checkout/index.ts
rename to Client/features/checkout/index.ts
diff --git a/maze/features/home-hero/index.ts b/Client/features/home-hero/index.ts
similarity index 100%
rename from maze/features/home-hero/index.ts
rename to Client/features/home-hero/index.ts
diff --git a/maze/features/home-hero/lib/constants.ts b/Client/features/home-hero/lib/constants.ts
similarity index 100%
rename from maze/features/home-hero/lib/constants.ts
rename to Client/features/home-hero/lib/constants.ts
diff --git a/maze/features/home-hero/ui/HeroVideoBackground.tsx b/Client/features/home-hero/ui/HeroVideoBackground.tsx
similarity index 100%
rename from maze/features/home-hero/ui/HeroVideoBackground.tsx
rename to Client/features/home-hero/ui/HeroVideoBackground.tsx
diff --git a/maze/features/home-hero/ui/HomeHero.tsx b/Client/features/home-hero/ui/HomeHero.tsx
similarity index 100%
rename from maze/features/home-hero/ui/HomeHero.tsx
rename to Client/features/home-hero/ui/HomeHero.tsx
diff --git a/maze/features/not-found-maze/index.ts b/Client/features/not-found-maze/index.ts
similarity index 100%
rename from maze/features/not-found-maze/index.ts
rename to Client/features/not-found-maze/index.ts
diff --git a/maze/features/not-found-maze/lib/constants.ts b/Client/features/not-found-maze/lib/constants.ts
similarity index 100%
rename from maze/features/not-found-maze/lib/constants.ts
rename to Client/features/not-found-maze/lib/constants.ts
diff --git a/maze/features/not-found-maze/ui/NotFoundMaze.tsx b/Client/features/not-found-maze/ui/NotFoundMaze.tsx
similarity index 100%
rename from maze/features/not-found-maze/ui/NotFoundMaze.tsx
rename to Client/features/not-found-maze/ui/NotFoundMaze.tsx
diff --git a/maze/features/not-found-maze/ui/NotFoundVisitCard.tsx b/Client/features/not-found-maze/ui/NotFoundVisitCard.tsx
similarity index 100%
rename from maze/features/not-found-maze/ui/NotFoundVisitCard.tsx
rename to Client/features/not-found-maze/ui/NotFoundVisitCard.tsx
diff --git a/maze/features/not-found-maze/ui/not-found-visit-card.module.css b/Client/features/not-found-maze/ui/not-found-visit-card.module.css
similarity index 100%
rename from maze/features/not-found-maze/ui/not-found-visit-card.module.css
rename to Client/features/not-found-maze/ui/not-found-visit-card.module.css
diff --git a/maze/lib/account-orders-refresh.ts b/Client/lib/account-orders-refresh.ts
similarity index 100%
rename from maze/lib/account-orders-refresh.ts
rename to Client/lib/account-orders-refresh.ts
diff --git a/maze/lib/account-tab.ts b/Client/lib/account-tab.ts
similarity index 100%
rename from maze/lib/account-tab.ts
rename to Client/lib/account-tab.ts
diff --git a/maze/lib/admin/client.ts b/Client/lib/admin/client.ts
similarity index 100%
rename from maze/lib/admin/client.ts
rename to Client/lib/admin/client.ts
diff --git a/maze/lib/admin/types.ts b/Client/lib/admin/types.ts
similarity index 100%
rename from maze/lib/admin/types.ts
rename to Client/lib/admin/types.ts
diff --git a/maze/lib/admin/ui.tsx b/Client/lib/admin/ui.tsx
similarity index 100%
rename from maze/lib/admin/ui.tsx
rename to Client/lib/admin/ui.tsx
diff --git a/maze/lib/admin/use-paged-list.ts b/Client/lib/admin/use-paged-list.ts
similarity index 100%
rename from maze/lib/admin/use-paged-list.ts
rename to Client/lib/admin/use-paged-list.ts
diff --git a/maze/lib/api.ts b/Client/lib/api.ts
similarity index 100%
rename from maze/lib/api.ts
rename to Client/lib/api.ts
diff --git a/maze/lib/body-scroll-lock.ts b/Client/lib/body-scroll-lock.ts
similarity index 100%
rename from maze/lib/body-scroll-lock.ts
rename to Client/lib/body-scroll-lock.ts
diff --git a/maze/lib/cart-client.ts b/Client/lib/cart-client.ts
similarity index 100%
rename from maze/lib/cart-client.ts
rename to Client/lib/cart-client.ts
diff --git a/maze/lib/cart-types.ts b/Client/lib/cart-types.ts
similarity index 100%
rename from maze/lib/cart-types.ts
rename to Client/lib/cart-types.ts
diff --git a/maze/lib/catalog-source.ts b/Client/lib/catalog-source.ts
similarity index 100%
rename from maze/lib/catalog-source.ts
rename to Client/lib/catalog-source.ts
diff --git a/maze/lib/checkout-client.ts b/Client/lib/checkout-client.ts
similarity index 100%
rename from maze/lib/checkout-client.ts
rename to Client/lib/checkout-client.ts
diff --git a/maze/lib/data.ts b/Client/lib/data.ts
similarity index 100%
rename from maze/lib/data.ts
rename to Client/lib/data.ts
diff --git a/maze/lib/mappers/catalog.ts b/Client/lib/mappers/catalog.ts
similarity index 100%
rename from maze/lib/mappers/catalog.ts
rename to Client/lib/mappers/catalog.ts
diff --git a/maze/lib/media-url.ts b/Client/lib/media-url.ts
similarity index 100%
rename from maze/lib/media-url.ts
rename to Client/lib/media-url.ts
diff --git a/maze/lib/mocks.ts b/Client/lib/mocks.ts
similarity index 100%
rename from maze/lib/mocks.ts
rename to Client/lib/mocks.ts
diff --git a/maze/lib/phone.ts b/Client/lib/phone.ts
similarity index 100%
rename from maze/lib/phone.ts
rename to Client/lib/phone.ts
diff --git a/maze/lib/product-label.ts b/Client/lib/product-label.ts
similarity index 100%
rename from maze/lib/product-label.ts
rename to Client/lib/product-label.ts
diff --git a/maze/lib/run-after-commit.ts b/Client/lib/run-after-commit.ts
similarity index 100%
rename from maze/lib/run-after-commit.ts
rename to Client/lib/run-after-commit.ts
diff --git a/maze/lib/scroll.ts b/Client/lib/scroll.ts
similarity index 100%
rename from maze/lib/scroll.ts
rename to Client/lib/scroll.ts
diff --git a/maze/lib/site-source.ts b/Client/lib/site-source.ts
similarity index 100%
rename from maze/lib/site-source.ts
rename to Client/lib/site-source.ts
diff --git a/maze/lib/staff-auth.ts b/Client/lib/staff-auth.ts
similarity index 100%
rename from maze/lib/staff-auth.ts
rename to Client/lib/staff-auth.ts
diff --git a/maze/lib/stock.ts b/Client/lib/stock.ts
similarity index 100%
rename from maze/lib/stock.ts
rename to Client/lib/stock.ts
diff --git a/maze/lib/utils.ts b/Client/lib/utils.ts
similarity index 100%
rename from maze/lib/utils.ts
rename to Client/lib/utils.ts
diff --git a/maze/next.config.ts b/Client/next.config.ts
similarity index 98%
rename from maze/next.config.ts
rename to Client/next.config.ts
index 6c9b912..16f04d4 100644
--- a/maze/next.config.ts
+++ b/Client/next.config.ts
@@ -10,6 +10,7 @@ const apiInternalUrl = (
 ).replace(/\/$/, "");
 
 const nextConfig: NextConfig = {
+  output: "standalone",
   // Доступ с телефона в той же Wi‑Fi (dev HMR)
   allowedDevOrigins: ["192.168.0.63"],
   images: {
diff --git a/maze/nixpacks.toml b/Client/nixpacks.toml
similarity index 100%
rename from maze/nixpacks.toml
rename to Client/nixpacks.toml
diff --git a/maze/package-lock.json b/Client/package-lock.json
similarity index 99%
rename from maze/package-lock.json
rename to Client/package-lock.json
index 23dfe2b..74b508d 100644
--- a/maze/package-lock.json
+++ b/Client/package-lock.json
@@ -1,11 +1,11 @@
 {
-  "name": "maze",
+  "name": "client",
   "version": "0.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "maze",
+      "name": "client",
       "version": "0.1.0",
       "dependencies": {
         "clsx": "^2.1.1",
diff --git a/maze/package.json b/Client/package.json
similarity index 97%
rename from maze/package.json
rename to Client/package.json
index 6ff26f7..bb5a294 100644
--- a/maze/package.json
+++ b/Client/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "maze",
+  "name": "client",
   "version": "0.1.0",
   "private": true,
   "engines": {
diff --git a/maze/postcss.config.mjs b/Client/postcss.config.mjs
similarity index 100%
rename from maze/postcss.config.mjs
rename to Client/postcss.config.mjs
diff --git a/maze/public/file.svg b/Client/public/file.svg
similarity index 100%
rename from maze/public/file.svg
rename to Client/public/file.svg
diff --git a/maze/public/globe.svg b/Client/public/globe.svg
similarity index 100%
rename from maze/public/globe.svg
rename to Client/public/globe.svg
diff --git a/maze/public/lost-maze.svg b/Client/public/lost-maze.svg
similarity index 100%
rename from maze/public/lost-maze.svg
rename to Client/public/lost-maze.svg
diff --git a/maze/public/maze-card-qr.svg b/Client/public/maze-card-qr.svg
similarity index 100%
rename from maze/public/maze-card-qr.svg
rename to Client/public/maze-card-qr.svg
diff --git a/maze/public/media/hero-bg.mp4 b/Client/public/media/hero-bg.mp4
similarity index 100%
rename from maze/public/media/hero-bg.mp4
rename to Client/public/media/hero-bg.mp4
diff --git a/maze/public/next.svg b/Client/public/next.svg
similarity index 100%
rename from maze/public/next.svg
rename to Client/public/next.svg
diff --git a/maze/public/vercel.svg b/Client/public/vercel.svg
similarity index 100%
rename from maze/public/vercel.svg
rename to Client/public/vercel.svg
diff --git a/maze/public/window.svg b/Client/public/window.svg
similarity index 100%
rename from maze/public/window.svg
rename to Client/public/window.svg
diff --git a/maze/railway.toml b/Client/railway.toml
similarity index 58%
rename from maze/railway.toml
rename to Client/railway.toml
index c8b8d3b..5cb8072 100644
--- a/maze/railway.toml
+++ b/Client/railway.toml
@@ -1,5 +1,5 @@
-# Root Directory for this service should be `maze` (set in Railway UI),
-# or deploy with: railway up ./maze --path-as-root
+# Root Directory for this service should be `Client` (set in Railway UI),
+# or deploy with: railway up ./Client --path-as-root
 
 [build]
 builder = "NIXPACKS"
diff --git a/maze/scripts/dev.mjs b/Client/scripts/dev.mjs
similarity index 100%
rename from maze/scripts/dev.mjs
rename to Client/scripts/dev.mjs
diff --git a/maze/shared/config/brand-colors.ts b/Client/shared/config/brand-colors.ts
similarity index 100%
rename from maze/shared/config/brand-colors.ts
rename to Client/shared/config/brand-colors.ts
diff --git a/maze/shared/lib/catalog-routes.ts b/Client/shared/lib/catalog-routes.ts
similarity index 100%
rename from maze/shared/lib/catalog-routes.ts
rename to Client/shared/lib/catalog-routes.ts
diff --git a/maze/shared/lib/client-mounted.ts b/Client/shared/lib/client-mounted.ts
similarity index 100%
rename from maze/shared/lib/client-mounted.ts
rename to Client/shared/lib/client-mounted.ts
diff --git a/maze/shared/lib/motion.ts b/Client/shared/lib/motion.ts
similarity index 100%
rename from maze/shared/lib/motion.ts
rename to Client/shared/lib/motion.ts
diff --git a/maze/shared/ui/image-spotlight/ImageSpotlight.tsx b/Client/shared/ui/image-spotlight/ImageSpotlight.tsx
similarity index 100%
rename from maze/shared/ui/image-spotlight/ImageSpotlight.tsx
rename to Client/shared/ui/image-spotlight/ImageSpotlight.tsx
diff --git a/maze/shared/ui/image-spotlight/index.ts b/Client/shared/ui/image-spotlight/index.ts
similarity index 100%
rename from maze/shared/ui/image-spotlight/index.ts
rename to Client/shared/ui/image-spotlight/index.ts
diff --git a/maze/shared/ui/image-spotlight/lib/easing.ts b/Client/shared/ui/image-spotlight/lib/easing.ts
similarity index 100%
rename from maze/shared/ui/image-spotlight/lib/easing.ts
rename to Client/shared/ui/image-spotlight/lib/easing.ts
diff --git a/maze/shared/ui/mobile-drawer/MobileDrawer.tsx b/Client/shared/ui/mobile-drawer/MobileDrawer.tsx
similarity index 100%
rename from maze/shared/ui/mobile-drawer/MobileDrawer.tsx
rename to Client/shared/ui/mobile-drawer/MobileDrawer.tsx
diff --git a/maze/shared/ui/mobile-drawer/index.ts b/Client/shared/ui/mobile-drawer/index.ts
similarity index 100%
rename from maze/shared/ui/mobile-drawer/index.ts
rename to Client/shared/ui/mobile-drawer/index.ts
diff --git a/maze/shared/ui/route-scroll-reset/RouteScrollReset.tsx b/Client/shared/ui/route-scroll-reset/RouteScrollReset.tsx
similarity index 100%
rename from maze/shared/ui/route-scroll-reset/RouteScrollReset.tsx
rename to Client/shared/ui/route-scroll-reset/RouteScrollReset.tsx
diff --git a/maze/shared/ui/route-scroll-reset/index.ts b/Client/shared/ui/route-scroll-reset/index.ts
similarity index 100%
rename from maze/shared/ui/route-scroll-reset/index.ts
rename to Client/shared/ui/route-scroll-reset/index.ts
diff --git a/maze/shared/ui/smooth-scroll/SmoothScroll.tsx b/Client/shared/ui/smooth-scroll/SmoothScroll.tsx
similarity index 100%
rename from maze/shared/ui/smooth-scroll/SmoothScroll.tsx
rename to Client/shared/ui/smooth-scroll/SmoothScroll.tsx
diff --git a/maze/shared/ui/smooth-scroll/index.ts b/Client/shared/ui/smooth-scroll/index.ts
similarity index 100%
rename from maze/shared/ui/smooth-scroll/index.ts
rename to Client/shared/ui/smooth-scroll/index.ts
diff --git a/maze/shared/ui/split-text/SplitText.tsx b/Client/shared/ui/split-text/SplitText.tsx
similarity index 100%
rename from maze/shared/ui/split-text/SplitText.tsx
rename to Client/shared/ui/split-text/SplitText.tsx
diff --git a/maze/shared/ui/split-text/index.ts b/Client/shared/ui/split-text/index.ts
similarity index 100%
rename from maze/shared/ui/split-text/index.ts
rename to Client/shared/ui/split-text/index.ts
diff --git a/maze/shared/ui/split-text/lib/split-text.ts b/Client/shared/ui/split-text/lib/split-text.ts
similarity index 100%
rename from maze/shared/ui/split-text/lib/split-text.ts
rename to Client/shared/ui/split-text/lib/split-text.ts
diff --git a/maze/tsconfig.json b/Client/tsconfig.json
similarity index 100%
rename from maze/tsconfig.json
rename to Client/tsconfig.json
diff --git a/maze/widgets/account-cabinet.tsx b/Client/widgets/account-cabinet.tsx
similarity index 100%
rename from maze/widgets/account-cabinet.tsx
rename to Client/widgets/account-cabinet.tsx
diff --git a/maze/widgets/authenticated-cart-provider.tsx b/Client/widgets/authenticated-cart-provider.tsx
similarity index 100%
rename from maze/widgets/authenticated-cart-provider.tsx
rename to Client/widgets/authenticated-cart-provider.tsx
diff --git a/maze/widgets/storefront-modals.tsx b/Client/widgets/storefront-modals.tsx
similarity index 100%
rename from maze/widgets/storefront-modals.tsx
rename to Client/widgets/storefront-modals.tsx
diff --git a/README.md b/README.md
index ee1fdb3..4c31175 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Next.js фронтенд + Fastify API в одном репозитории.
 
 | Часть | Папка |
 |-------|-------|
-| Сайт (Next.js) | `maze/` |
+| Сайт (Next.js) | `Client/` |
 | API (Fastify) | `Server/` |
 | Документация | `docs/` |
 
@@ -17,7 +17,7 @@ cd Server && npm install && npm run dev
 
 **Клиент:**
 ```bash
-cd maze && npm install && cp .env.example .env.local && npm run dev
+cd Client && npm install && cp .env.example .env.local && npm run dev
 ```
 
 - Сайт: http://localhost:3000
@@ -26,7 +26,7 @@ cd maze && npm install && cp .env.example .env.local && npm run dev
 ## Vercel (публичная ссылка)
 
 1. Import `matigulin/maze-ui` на vercel.com
-2. **Root Directory → `maze`**
+2. **Root Directory → `Client`**
 3. **Settings → Deployment Protection** → выключи **Vercel Authentication** для Production
 4. Deploy
 
diff --git a/Server/.dockerignore b/Server/.dockerignore
new file mode 100644
index 0000000..dac6bd8
--- /dev/null
+++ b/Server/.dockerignore
@@ -0,0 +1,16 @@
+node_modules
+dist
+uploads
+.git
+.gitignore
+Dockerfile
+.dockerignore
+docker-compose.yml
+*.md
+.env
+.env.*
+!.env.example
+npm-debug.log*
+coverage
+.DS_Store
+*.tsbuildinfo
diff --git a/Server/.env.example b/Server/.env.example
index 0d9ff6b..34f0c5d 100644
--- a/Server/.env.example
+++ b/Server/.env.example
@@ -16,6 +16,9 @@ JWT_REFRESH_SECRET=dev-refresh-secret-change-32chars!!
 # Railway: https://<web>.up.railway.app
 CORS_ORIGIN=http://localhost:3000
 
+# Postgres TLS. Пусто = SSL только в production. Docker Compose (локальный Postgres): false
+# DATABASE_SSL=false
+
 # Cookie (production custom domain only, e.g. .maze.ru). Leave empty on *.up.railway.app
 COOKIE_DOMAIN=
 
diff --git a/Server/Dockerfile b/Server/Dockerfile
new file mode 100644
index 0000000..ecde1c5
--- /dev/null
+++ b/Server/Dockerfile
@@ -0,0 +1,33 @@
+# Fastify API
+FROM node:22-alpine AS deps
+WORKDIR /app
+COPY package.json package-lock.json ./
+RUN npm ci
+
+FROM node:22-alpine AS build
+WORKDIR /app
+COPY --from=deps /app/node_modules ./node_modules
+COPY package.json package-lock.json tsconfig.json ./
+COPY src ./src
+RUN npm run build
+
+FROM node:22-alpine AS runner
+WORKDIR /app
+ENV NODE_ENV=production
+ENV HOST=0.0.0.0
+ENV PORT=4000
+RUN apk add --no-cache wget
+
+COPY package.json package-lock.json ./
+RUN npm ci --omit=dev && npm cache clean --force
+
+COPY --from=build /app/dist ./dist
+COPY .sequelizerc sequelize-cli.cjs ./
+COPY src/migrations ./src/migrations
+COPY src/seeders ./src/seeders
+COPY scripts ./scripts
+COPY docker-entrypoint.sh ./docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh && mkdir -p uploads
+
+EXPOSE 4000
+ENTRYPOINT ["./docker-entrypoint.sh"]
diff --git a/Server/docker-entrypoint.sh b/Server/docker-entrypoint.sh
new file mode 100755
index 0000000..1820afa
--- /dev/null
+++ b/Server/docker-entrypoint.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+if [ "${RUN_MIGRATIONS:-true}" = "true" ]; then
+  echo "Running database migrations..."
+  node ./node_modules/sequelize-cli/lib/sequelize db:migrate --env production
+fi
+
+exec node dist/server.js
diff --git a/Server/sequelize-cli.cjs b/Server/sequelize-cli.cjs
index dd1dce3..59018ef 100644
--- a/Server/sequelize-cli.cjs
+++ b/Server/sequelize-cli.cjs
@@ -1,13 +1,21 @@
 require('dotenv').config({ path: require('path').resolve(__dirname, '.env') });
 
-const productionSsl = {
-  dialectOptions: {
-    ssl: {
-      require: true,
-      rejectUnauthorized: false,
-    },
-  },
-};
+const sslOff = process.env.DATABASE_SSL === 'false' || process.env.DATABASE_SSL === '0';
+const sslOn = process.env.DATABASE_SSL === 'true' || process.env.DATABASE_SSL === '1';
+
+const productionSsl =
+  sslOff
+    ? {}
+    : sslOn || process.env.NODE_ENV === 'production'
+      ? {
+          dialectOptions: {
+            ssl: {
+              require: true,
+              rejectUnauthorized: false,
+            },
+          },
+        }
+      : {};
 
 module.exports = {
   development: {
diff --git a/Server/src/config/database.ts b/Server/src/config/database.ts
index 4cf9c58..f1f7c38 100644
--- a/Server/src/config/database.ts
+++ b/Server/src/config/database.ts
@@ -4,6 +4,11 @@ import { loadEnv } from './env.js';
 let sequelize: Sequelize | null = null;
 
 function postgresDialectOptions(nodeEnv: string) {
+  const flag = process.env.DATABASE_SSL;
+  if (flag === 'false' || flag === '0') return undefined;
+  if (flag === 'true' || flag === '1') {
+    return { ssl: { require: true, rejectUnauthorized: false } };
+  }
   // Railway / managed Postgres: TLS required; local docker/dev usually plain.
   if (nodeEnv !== 'production') return undefined;
   return {
diff --git a/deploy/nginx.conf b/deploy/nginx.conf
new file mode 100644
index 0000000..24a3b0d
--- /dev/null
+++ b/deploy/nginx.conf
@@ -0,0 +1,49 @@
+upstream client {
+  server client:3000;
+}
+
+upstream api {
+  server api:4000;
+}
+
+server {
+  listen 80;
+  server_name _;
+  client_max_body_size 10m;
+
+  location /api/ {
+    proxy_pass http://api;
+    proxy_http_version 1.1;
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+  }
+
+  location /uploads/ {
+    proxy_pass http://api;
+    proxy_http_version 1.1;
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+  }
+
+  location /health/ {
+    proxy_pass http://api;
+    proxy_http_version 1.1;
+    proxy_set_header Host $host;
+  }
+
+  location / {
+    proxy_pass http://client;
+    proxy_http_version 1.1;
+    proxy_set_header Host $host;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_read_timeout 60s;
+  }
+}
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..246986d
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,97 @@
+# Полный стек: Postgres, Redis, API, Next, nginx.
+# Запуск из корня репозитория: docker compose up --build
+# Локальная разработка без контейнеров приложений: cd Server && npm run infra:up
+services:
+  postgres:
+    image: postgres:16-alpine
+    container_name: maze-postgres
+    environment:
+      POSTGRES_USER: maze
+      POSTGRES_PASSWORD: maze
+      POSTGRES_DB: maze
+    ports:
+      - '5432:5432'
+    volumes:
+      - maze_pg_data:/var/lib/postgresql/data
+    healthcheck:
+      test: ['CMD-SHELL', 'pg_isready -U maze -d maze']
+      interval: 5s
+      timeout: 5s
+      retries: 10
+
+  redis:
+    image: redis:7-alpine
+    container_name: maze-redis
+    ports:
+      - '6379:6379'
+    healthcheck:
+      test: ['CMD', 'redis-cli', 'ping']
+      interval: 5s
+      timeout: 5s
+      retries: 10
+
+  api:
+    build:
+      context: ./Server
+    container_name: maze-api
+    environment:
+      NODE_ENV: production
+      HOST: 0.0.0.0
+      PORT: 4000
+      DATABASE_URL: postgres://maze:maze@postgres:5432/maze
+      DATABASE_SSL: 'false'
+      REDIS_URL: redis://redis:6379
+      JWT_SECRET: ${JWT_SECRET:-dev-jwt-secret-change-me-32chars!!}
+      JWT_REFRESH_SECRET: ${JWT_REFRESH_SECRET:-dev-refresh-secret-change-32chars!!}
+      CORS_ORIGIN: ${CORS_ORIGIN:-http://localhost,http://localhost:3000}
+      AUTH_DEV_OTP: ${AUTH_DEV_OTP:-true}
+      UPLOAD_DIR: /app/uploads
+      UPLOAD_PUBLIC_URL: ${UPLOAD_PUBLIC_URL:-/uploads}
+      RUN_MIGRATIONS: ${RUN_MIGRATIONS:-true}
+    ports:
+      - '4000:4000'
+    volumes:
+      - maze_uploads:/app/uploads
+    depends_on:
+      postgres:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    healthcheck:
+      test: ['CMD-SHELL', 'wget -qO- http://127.0.0.1:4000/health/live || exit 1']
+      interval: 10s
+      timeout: 5s
+      retries: 10
+      start_period: 20s
+
+  client:
+    build:
+      context: ./Client
+      args:
+        API_INTERNAL_URL: http://api:4000
+    container_name: maze-client
+    environment:
+      NODE_ENV: production
+      HOSTNAME: 0.0.0.0
+      PORT: 3000
+      API_INTERNAL_URL: http://api:4000
+    ports:
+      - '3000:3000'
+    depends_on:
+      api:
+        condition: service_healthy
+
+  nginx:
+    image: nginx:stable-alpine
+    container_name: maze-nginx
+    ports:
+      - '80:80'
+    volumes:
+      - ./deploy/nginx.conf:/etc/nginx/conf.d/default.conf:ro
+    depends_on:
+      - client
+      - api
+
+volumes:
+  maze_pg_data:
+  maze_uploads:
diff --git a/render.yaml b/render.yaml
index f1877ee..805d1b4 100644
--- a/render.yaml
+++ b/render.yaml
@@ -52,7 +52,7 @@ services:
     runtime: node
     region: frankfurt
     plan: free
-    rootDir: maze
+    rootDir: Client
     branch: dev
     buildCommand: NPM_CONFIG_PRODUCTION=false npm install && API_INTERNAL_URL=https://matigulin-maze-api.onrender.com npm run build
     startCommand: npx next start -H 0.0.0.0 -p $PORT

From 74e8443a249d4692ce21c4c5bde2b55fa44d493c Mon Sep 17 00:00:00 2001
From: Nikita <Matigulin2018@mail.ru>
Date: Fri, 4 Sep 2026 02:10:27 +0300
Subject: [PATCH 3/6] feat(storefront): cinematic forest theme with pumpkin
 accents.

Premium Yamaha-like storefront: teal surfaces, Pumpkin Spice CTAs/icons, smoother 120Hz Lenis scroll, and CardIcon in shared/ui.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 Client/app/(staff)/layout.tsx                 |   2 +-
 Client/app/(storefront)/layout.tsx            |   4 +-
 Client/app/(storefront)/page.tsx              |  34 +-
 Client/app/globals.css                        | 456 +++++++++---------
 Client/app/layout.tsx                         |  17 +-
 Client/app/not-found.tsx                      |   2 -
 Client/components/Background.tsx              |   4 +-
 Client/components/CardIcon.tsx                |   2 +
 Client/components/Field.tsx                   |   2 +-
 Client/components/Footer.tsx                  |  55 ++-
 Client/components/Header.tsx                  | 323 +++++++------
 Client/components/Logo.tsx                    |  26 +-
 Client/components/MiniCart.tsx                |   7 +-
 Client/components/ProductCard.tsx             |  79 ++-
 Client/components/ScrollToTop.tsx             |   3 +-
 Client/components/SectionHeading.tsx          |  78 ++-
 Client/components/admin/AdminShell.tsx        |   4 +-
 Client/components/home/CategoryGrid.tsx       |  61 +--
 Client/components/home/Features.tsx           |  20 +-
 Client/components/home/Promo.tsx              | 107 ++--
 Client/components/home/Testimonials.tsx       |  10 +-
 Client/components/modals.tsx                  |   6 +-
 Client/components/product/ProductDetail.tsx   |  45 +-
 Client/entities/order/lib/order-status.ts     |  10 +-
 .../lib/last-visited-highlight.ts             |  10 +-
 Client/features/auth/ui/HeaderAuthActions.tsx |   2 +-
 Client/features/catalog/ui/CatalogClient.tsx  |   4 +-
 Client/features/home-hero/lib/constants.ts    |  12 +-
 .../home-hero/ui/HeroVideoBackground.tsx      |  41 +-
 Client/features/home-hero/ui/HomeHero.tsx     | 103 ++--
 .../not-found-maze/ui/NotFoundMaze.tsx        |   2 +-
 .../not-found-maze/ui/NotFoundVisitCard.tsx   |   2 +-
 .../ui/not-found-visit-card.module.css        |  20 +-
 Client/lib/data.ts                            |   4 +-
 Client/lib/site-source.ts                     |   2 +-
 Client/shared/config/brand-colors.ts          |  53 +-
 Client/shared/ui/card-icon/CardIcon.tsx       |  30 ++
 Client/shared/ui/card-icon/index.ts           |   1 +
 .../shared/ui/mobile-drawer/MobileDrawer.tsx  |   4 +-
 .../shared/ui/smooth-scroll/SmoothScroll.tsx  |  26 +-
 40 files changed, 858 insertions(+), 815 deletions(-)
 create mode 100644 Client/components/CardIcon.tsx
 create mode 100644 Client/shared/ui/card-icon/CardIcon.tsx
 create mode 100644 Client/shared/ui/card-icon/index.ts

diff --git a/Client/app/(staff)/layout.tsx b/Client/app/(staff)/layout.tsx
index 1292a40..a4fd98c 100644
--- a/Client/app/(staff)/layout.tsx
+++ b/Client/app/(staff)/layout.tsx
@@ -13,7 +13,7 @@ export default function StaffLayout({
   return (
     <div
       data-staff-zone
-      className="staff-zone flex min-h-dvh flex-1 flex-col bg-[#07080f] text-ink"
+      className="staff-zone flex min-h-dvh flex-1 flex-col bg-[#080c0d] text-ink"
     >
       {children}
     </div>
diff --git a/Client/app/(storefront)/layout.tsx b/Client/app/(storefront)/layout.tsx
index 12433ec..145225e 100644
--- a/Client/app/(storefront)/layout.tsx
+++ b/Client/app/(storefront)/layout.tsx
@@ -1,5 +1,4 @@
 import { Suspense } from "react";
-import { Background } from "@/components/Background";
 import { Header } from "@/components/Header";
 import { Footer } from "@/components/Footer";
 import { StorefrontModals } from "@/components/StorefrontModals";
@@ -14,9 +13,8 @@ export default function StorefrontLayout({
 }) {
   return (
     <SmoothScroll>
-      <Background />
       <Header />
-      <main className="flex-1">{children}</main>
+      <main className="flex-1 pt-[4.75rem] sm:pt-[5.5rem] md:pt-[5.75rem]">{children}</main>
       <Footer />
       <StorefrontModals />
       <Suspense fallback={null}>
diff --git a/Client/app/(storefront)/page.tsx b/Client/app/(storefront)/page.tsx
index cafbc71..f407f3d 100644
--- a/Client/app/(storefront)/page.tsx
+++ b/Client/app/(storefront)/page.tsx
@@ -30,20 +30,20 @@ export default async function Home() {
     ]);
 
   return (
-    <div className="pb-8">
+    <div className="pb-20">
       <HomeHero />
 
-      <div className="my-6">
+      <div className="py-5">
         <Marquee brands={brands} />
       </div>
 
-      <section className="container-x mt-20">
+      <section id="features" className="mt-0 scroll-mt-28">
         <Features features={features} />
       </section>
 
-      <section className="container-x mt-24">
+      <section className="container-x mt-28">
         <SectionHeading
-          eyebrow="Каталог MAZE"
+          eyebrow="Directions"
           title="Выбери направление"
           subtitle="Оригинальная техника ведущих брендов — от смартфонов до звука и умного дома."
           href="/catalog"
@@ -52,36 +52,38 @@ export default async function Home() {
         <CategoryGrid categories={categories} />
       </section>
 
-      <section className="container-x mt-24">
+      <section className="container-x mt-28">
         <SectionHeading
-          eyebrow="Хиты продаж"
+          eyebrow="Editor’s choice"
           title="Выбор редакции"
           subtitle="Техника, которую забирают чаще всего."
           href="/catalog"
         />
-        <div className="grid w-full grid-cols-2 gap-2 sm:gap-4 lg:grid-cols-4 [grid-template-columns:minmax(0,1fr)_minmax(0,1fr)] lg:[grid-template-columns:repeat(4,minmax(0,1fr))]">
+        <div className="grid w-full grid-cols-2 gap-3 sm:gap-5 lg:grid-cols-4 [grid-template-columns:minmax(0,1fr)_minmax(0,1fr)] lg:[grid-template-columns:repeat(4,minmax(0,1fr))]">
           {hits.map((p, i) => (
-            <Reveal key={p.id} delay={(i % 4) * 0.06} className="min-w-0 max-w-full">
+            <Reveal key={p.id} delay={(i % 4) * 0.05} className="min-w-0 max-w-full">
               <ProductCard product={p} />
             </Reveal>
           ))}
         </div>
       </section>
 
-      <section className="container-x mt-24">
-        <Promo />
+      <section className="mt-28">
+        <div className="container-x">
+          <Promo />
+        </div>
       </section>
 
       {fresh.length > 0 && (
-        <section className="container-x mt-24">
+        <section className="container-x mt-28">
           <SectionHeading
-            eyebrow="Только приехали"
+            eyebrow="New arrivals"
             title="Новинки"
             href="/catalog"
           />
-          <div className="grid w-full grid-cols-2 gap-2 sm:gap-4 lg:grid-cols-4 [grid-template-columns:minmax(0,1fr)_minmax(0,1fr)] lg:[grid-template-columns:repeat(4,minmax(0,1fr))]">
+          <div className="grid w-full grid-cols-2 gap-3 sm:gap-5 lg:grid-cols-4 [grid-template-columns:minmax(0,1fr)_minmax(0,1fr)] lg:[grid-template-columns:repeat(4,minmax(0,1fr))]">
             {fresh.map((p, i) => (
-              <Reveal key={p.id} delay={(i % 4) * 0.06} className="min-w-0 max-w-full">
+              <Reveal key={p.id} delay={(i % 4) * 0.05} className="min-w-0 max-w-full">
                 <ProductCard product={p} />
               </Reveal>
             ))}
@@ -89,7 +91,7 @@ export default async function Home() {
         </section>
       )}
 
-      <section className="container-x mt-24">
+      <section id="reviews" className="container-x mt-28 scroll-mt-28">
         <Testimonials reviews={reviews} />
       </section>
     </div>
diff --git a/Client/app/globals.css b/Client/app/globals.css
index 87bbde0..560789f 100644
--- a/Client/app/globals.css
+++ b/Client/app/globals.css
@@ -1,37 +1,39 @@
 @import "tailwindcss";
 
 /* ============================================================
-   MAZE — brand palette (визитка: зелёный · бordo · бронза)
+   MAZE — forest + silver text + Pumpkin Spice accent
+   #0A1815 · #F0EDE6 · #E3792F
    ============================================================ */
 
 @theme {
-  /* — Surfaces — */
-  --color-bg: #1a2421;
-  --color-bg-2: #151d1a;
-  --color-panel: #1e2a26;
-  --color-panel-2: #243530;
-  --color-bg-warm: #2b1a1a;
+  /* — Surfaces —
+     bg = страница; panel = карточки чуть темнее (мягкий шаг, не почти-чёрный) */
+  --color-bg: #0e1d1a;
+  --color-bg-2: #0b1815;
+  --color-panel: #0a1613;
+  --color-panel-2: #101f1c;
+  --color-bg-warm: #091411;
 
   /* — Text — */
-  --color-ink: #e8dcc8;
-  --color-muted: #a89880;
-  --color-faint: #6b5f52;
-  --color-line: #2d3a35;
-
-  /* — Brand accent (бронза, чуть ярче) — */
-  --color-accent: #c9aa78;
-  --color-cyan: #c9aa78;
-  --color-blue: #9a8058;
-  --color-violet: #3d4a44;
-  --color-magenta: #5c3838;
-  --color-gold: #c9aa78;
-  --color-success: #6b9a7a;
-  --color-warning: #c4a060;
-  --color-danger: #b85c5c;
+  --color-ink: #f0ede6;
+  --color-muted: #9a9588;
+  --color-faint: #6b675c;
+  --color-line: #1f3330;
+
+  /* — Accent: Pumpkin Spice — */
+  --color-accent: #e3792f;
+  --color-cyan: #e3792f;
+  --color-blue: #9a9588;
+  --color-violet: #152623;
+  --color-magenta: #2a3f3b;
+  --color-gold: #e3792f;
+  --color-success: #7a9b8e;
+  --color-warning: #e3792f;
+  --color-danger: #c45c5c;
 
   /* — Fonts — */
-  --font-sans: var(--font-exo);
-  --font-display: var(--font-orbitron);
+  --font-sans: var(--font-outfit);
+  --font-display: var(--font-barlow);
 
   /* — Motion easing — */
   --ease-fluid: cubic-bezier(0.22, 1, 0.36, 1);
@@ -94,288 +96,327 @@
 /* ---------------- Base ---------------- */
 
 html {
-  scroll-behavior: smooth;
+  scroll-behavior: auto;
   -webkit-tap-highlight-color: transparent;
-  /* Убрать double-tap zoom; pinch режется viewport maximumScale */
   touch-action: manipulation;
-  overflow-x: clip;
-  max-width: 100%;
-}
-
-html.lenis,
-html.lenis body {
-  height: auto;
-}
-
-html.lenis.lenis-smooth {
-  scroll-behavior: auto !important;
 }
 
-.lenis.lenis-smooth [data-lenis-prevent] {
-  overscroll-behavior: contain;
+html,
+body {
+  max-width: 100%;
+  overflow-x: clip;
 }
 
 body {
-  background-color: var(--color-bg);
+  background-color: #0e1d1a;
   color: var(--color-ink);
   touch-action: manipulation;
-  /* contain: меньше конфликта с Telegram WebView / rubber-band при реверсе */
   overscroll-behavior-y: contain;
   overflow-x: clip;
   max-width: 100%;
-  /* Только зелёная гамма — лёгкая глубина без других оттенков */
-  background-image: linear-gradient(
-    180deg,
-    #1e2a26 0%,
-    #1a2421 45%,
-    #151d1a 100%
-  );
-  /* scroll на мобилке: fixed даёт дёрганья при резком вниз↔вверх */
+  background-image:
+    radial-gradient(
+      ellipse 110% 75% at 50% -5%,
+      #1a2f2c 0%,
+      transparent 55%
+    ),
+    linear-gradient(
+      180deg,
+      #132623 0%,
+      #0e1d1a 50%,
+      #0c1a17 100%
+    );
   background-attachment: scroll;
+  font-feature-settings: "ss01" on, "kern" on;
 }
 
 @media (hover: hover) and (pointer: fine) and (min-width: 769px) {
   body {
-    background-attachment: fixed;
     overscroll-behavior-y: none;
   }
 }
 
-/* Staff / admin: без зелёного градиента витрины (fixed bg просвечивал снизу) */
 html:has([data-staff-zone]),
 body:has([data-staff-zone]) {
-  background-color: #07080f;
+  background-color: #000000;
   background-image: none;
   background-attachment: scroll;
 }
 
 ::selection {
-  background: rgba(173, 148, 107, 0.35);
-  color: #fff;
+  background: rgba(227, 121, 47, 0.35);
+  color: #0a1815;
 }
 
 /* Custom scrollbar */
 * {
   scrollbar-width: thin;
-  scrollbar-color: #3d4a44 transparent;
+  scrollbar-color: #3d5250 transparent;
 }
 *::-webkit-scrollbar {
   width: 10px;
   height: 10px;
 }
 *::-webkit-scrollbar-thumb {
-  background: var(--color-accent);
+  background: var(--color-line);
   border-radius: 999px;
   border: 3px solid var(--color-bg);
 }
 
-/* Focus ring — visible for a11y (кнопки, ссылки; не поля ввода).
-   Не задаём border-radius здесь: иначе на карточках с rounded-3xl
-   при :focus-visible углы схлопываются в «квадратик» outline. */
 :focus-visible:not(input):not(textarea):not(select) {
   outline: 2px solid var(--color-accent);
   outline-offset: 2px;
 }
 
-/* Поля ввода — одна рамка через border на самом input / обёртке */
 input:focus-visible,
 textarea:focus-visible,
 select:focus-visible {
   outline: none;
 }
 
-/* Вложенный input в составном поле — рамка только на обёртке */
 .input-inset:focus,
 .input-inset:focus-visible {
   outline: none;
 }
 
-/* ---------------- Components / utilities ---------------- */
+/* Product showcase — крупный radius как у Yamaha tiles (~24–28px) */
+.card-beige,
+.product-showcase {
+  background: #0a1613 !important;
+  background-image: none !important;
+  border: none !important;
+  border-radius: 1.75rem !important;
+  box-shadow: none;
+}
 
 @layer components {
-  /* Frosted glass surface */
+  /* Иконки / «+» на карточках — Pumpkin Spice + тёмная обводка */
+  .card-icon {
+    display: grid;
+    place-items: center;
+    width: 2.75rem;
+    height: 2.75rem;
+    flex-shrink: 0;
+    border-radius: 9999px;
+    color: #0a1815;
+    background: #e3792f;
+    border: 1.5px solid #1a221f;
+    box-shadow: none;
+  }
+  .card-icon--sm {
+    width: 2.25rem;
+    height: 2.25rem;
+  }
+  .card-icon--lg {
+    width: 3.25rem;
+    height: 3.25rem;
+  }
+  .card-icon svg {
+    stroke-width: 1.75;
+    color: #0a1815;
+  }
+
   .glass {
-    background: rgba(255, 255, 255, 0.03);
-    backdrop-filter: blur(16px) saturate(120%);
-    -webkit-backdrop-filter: blur(16px) saturate(120%);
-    border: 1px solid rgba(173, 148, 107, 0.12);
+    background: #0a1613;
+    border: 1px solid rgba(255, 255, 255, 0.08);
+    border-radius: 1.75rem;
   }
   .glass-strong {
-    background: rgba(26, 36, 33, 0.78);
-    backdrop-filter: blur(22px) saturate(130%);
-    -webkit-backdrop-filter: blur(22px) saturate(130%);
-    border: 1px solid rgba(173, 148, 107, 0.14);
+    background: #0a1613;
+    border: 1px solid rgba(227, 121, 47, 0.22);
+    border-radius: 1.75rem;
   }
 
-  /*
-   * Sticky chrome: без сильного blur + без transition «всего».
-   * backdrop-filter поверх canvas-фона давал ~200ms+ paint при 0ms React.
-   */
-  .chrome-sticky {
-    background: rgba(21, 29, 26, 0.94);
-    border-bottom: 1px solid var(--color-line);
-    transition:
-      background-color 200ms ease,
-      border-color 200ms ease;
+  .nav-pill {
+    border-radius: 9999px;
+    background: #0b1815;
+    border: 1px solid rgba(255, 255, 255, 0.1);
+    box-shadow: 0 18px 50px -18px rgba(0, 0, 0, 0.8);
   }
-  @supports (
-    (-webkit-backdrop-filter: blur(1px)) or (backdrop-filter: blur(1px))
-  ) {
-    .chrome-sticky {
-      background: rgba(21, 29, 26, 0.82);
-      backdrop-filter: blur(10px) saturate(120%);
-      -webkit-backdrop-filter: blur(10px) saturate(120%);
-    }
+  .nav-pill-scrolled {
+    background: #0a1613;
+    border-color: rgba(255, 255, 255, 0.14);
+  }
+
+  .chrome-sticky {
+    background: #000000;
+    border-bottom: 1px solid rgba(255, 255, 255, 0.08);
   }
 
-  /* Mobile drawers — плотный непрозрачный фон */
   .drawer-scrim {
-    background: rgba(21, 29, 26, 0.92);
+    background: #000000;
   }
   .drawer-panel-right,
   .drawer-panel-left {
-    background-color: var(--color-panel);
+    background-color: var(--color-bg-2);
     isolation: isolate;
   }
   .drawer-panel-right {
     border-left: 1px solid var(--color-line);
-    box-shadow: -24px 0 64px -16px rgba(0, 0, 0, 0.72);
+    box-shadow: -28px 0 70px -12px rgba(0, 0, 0, 0.88);
   }
   .drawer-panel-left {
     border-right: 1px solid var(--color-line);
-    box-shadow: 24px 0 64px -16px rgba(0, 0, 0, 0.72);
+    box-shadow: 28px 0 70px -12px rgba(0, 0, 0, 0.88);
   }
 
-  /* Iridescent gradient text (animated sweep) */
   .text-iri {
-    background: linear-gradient(
-      100deg,
-      #c4a87a,
-      var(--color-accent),
-      #8a7355,
-      var(--color-accent),
-      #c4a87a
-    );
-    background-size: 200% auto;
-    -webkit-background-clip: text;
-    background-clip: text;
-    color: transparent;
-    animation: var(--animate-iri);
+    color: var(--color-ink);
+    background: none;
+    -webkit-background-clip: unset;
+    background-clip: unset;
+    animation: none;
+    filter: none;
   }
 
-  /* Iridescent border via double-background trick */
-  .iri-border {
-    border: 1px solid transparent;
-    background:
-      linear-gradient(var(--color-panel), var(--color-panel)) padding-box,
-      linear-gradient(120deg, var(--color-accent), #8a7355, #5c3838) border-box;
+  .text-premium {
+    color: var(--color-ink);
+    text-shadow: 0 12px 40px rgba(0, 0, 0, 0.45);
   }
-  /* Iridescent glowing ring for glass elements (uses ::before) */
-  .iri-ring {
-    position: relative;
-    isolation: isolate;
+
+  .iri-border {
+    border: 1px solid var(--color-line);
+    background: var(--color-panel);
   }
   .iri-ring::before {
-    content: "";
-    position: absolute;
-    inset: 0;
-    border-radius: inherit;
-    padding: 1px;
-    background: linear-gradient(
-      130deg,
-      rgba(173, 148, 107, 0.85),
-      rgba(138, 115, 85, 0.35) 40%,
-      rgba(92, 56, 56, 0.55)
-    );
-    -webkit-mask:
-      linear-gradient(#000 0 0) content-box,
-      linear-gradient(#000 0 0);
-    -webkit-mask-composite: xor;
-    mask-composite: exclude;
-    pointer-events: none;
+    display: none;
   }
 
-  /* Neon glows */
-  .glow-cyan {
-    box-shadow:
-      0 0 40px -8px rgba(173, 148, 107, 0.45),
-      0 0 0 1px rgba(173, 148, 107, 0.12) inset;
-  }
+  .glow-cyan,
   .glow-violet {
-    box-shadow: 0 0 48px -10px rgba(92, 56, 56, 0.4);
+    box-shadow: none;
   }
 
-  /* Primary CTA — бронзовая pill */
+  /* Yamaha: CTA — champagne gold outline */
   .btn-primary {
     display: inline-flex;
     align-items: center;
     justify-content: center;
-    gap: 0.5rem;
-    border-radius: 999px;
-    padding: 0.85rem 1.6rem;
+    gap: 0.55rem;
+    border-radius: 0.75rem;
+    padding: 0.85rem 1.75rem;
+    font-family: var(--font-sans);
+    font-size: 0.6875rem;
     font-weight: 600;
-    color: #1a1814;
-    background: linear-gradient(
-      120deg,
-      #dcc498,
-      var(--color-accent) 55%,
-      #9a8058
-    );
-    box-shadow:
-      0 8px 30px -8px rgba(201, 170, 120, 0.5),
-      0 1px 0 0 rgba(255, 255, 255, 0.25) inset;
+    letter-spacing: 0.2em;
+    text-transform: uppercase;
+    color: var(--color-accent);
+    background: transparent;
+    border: 1px solid var(--color-accent);
+    box-shadow: none;
     transition:
-      transform 0.25s var(--ease-fluid),
-      box-shadow 0.25s var(--ease-fluid),
-      filter 0.25s var(--ease-fluid);
+      background 0.3s var(--ease-fluid),
+      border-color 0.3s var(--ease-fluid),
+      color 0.3s var(--ease-fluid),
+      transform 0.3s var(--ease-fluid);
     cursor: pointer;
   }
   .btn-primary:hover {
-    transform: translateY(-2px);
-    box-shadow:
-      0 14px 40px -8px rgba(173, 148, 107, 0.55),
-      0 1px 0 0 rgba(255, 255, 255, 0.35) inset;
-    filter: saturate(1.1);
+    background: rgba(227, 121, 47, 0.12);
+    border-color: #f08a45;
+    color: #f08a45;
+    transform: translateY(-1px);
+    filter: none;
+    box-shadow: none;
   }
   .btn-primary:active {
     transform: translateY(0);
   }
 
-  /* Secondary — glass outline pill */
   .btn-ghost {
     display: inline-flex;
     align-items: center;
     justify-content: center;
-    gap: 0.5rem;
-    border-radius: 999px;
-    padding: 0.85rem 1.6rem;
+    gap: 0.55rem;
+    border-radius: 0.75rem;
+    padding: 0.85rem 1.75rem;
+    font-family: var(--font-sans);
+    font-size: 0.6875rem;
     font-weight: 600;
+    letter-spacing: 0.2em;
+    text-transform: uppercase;
     color: var(--color-ink);
-    background: rgba(255, 255, 255, 0.03);
-    border: 1px solid rgba(173, 148, 107, 0.28);
-    backdrop-filter: blur(8px);
+    background: transparent;
+    border: 1px solid rgba(240, 237, 230, 0.35);
+    box-shadow: none;
+    backdrop-filter: none;
     transition:
-      transform 0.25s var(--ease-fluid),
-      border-color 0.25s var(--ease-fluid),
-      background 0.25s var(--ease-fluid);
+      border-color 0.3s var(--ease-fluid),
+      background 0.3s var(--ease-fluid),
+      color 0.3s var(--ease-fluid),
+      transform 0.3s var(--ease-fluid);
     cursor: pointer;
   }
   .btn-ghost:hover {
-    transform: translateY(-2px);
-    border-color: rgba(173, 148, 107, 0.55);
-    background: rgba(173, 148, 107, 0.08);
+    border-color: var(--color-accent);
+    color: var(--color-accent);
+    background: rgba(227, 121, 47, 0.08);
+    transform: translateY(-1px);
+    box-shadow: none;
+  }
+
+  /* Заливка — gold fill где нужен сильный акцент */
+  .btn-solid {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    gap: 0.55rem;
+    border-radius: 0.75rem;
+    padding: 0.85rem 1.75rem;
+    font-family: var(--font-sans);
+    font-size: 0.6875rem;
+    font-weight: 600;
+    letter-spacing: 0.2em;
+    text-transform: uppercase;
+    color: #0a1815;
+    background: var(--color-accent);
+    border: 1px solid var(--color-accent);
+    cursor: pointer;
+    transition:
+      opacity 0.3s var(--ease-fluid),
+      transform 0.3s var(--ease-fluid);
+  }
+  .btn-solid:hover {
+    opacity: 0.92;
+    transform: translateY(-1px);
   }
 
-  /* Eyebrow label — mono-ish spaced caption */
   .eyebrow {
-    font-family: var(--font-display);
-    font-size: 0.72rem;
+    font-family: var(--font-sans);
+    font-size: 0.6875rem;
+    font-weight: 500;
     letter-spacing: 0.28em;
     text-transform: uppercase;
-    color: var(--color-accent);
+    color: var(--color-muted);
+  }
+
+  .nav-link {
+    position: relative;
+    font-size: 0.6875rem;
+    font-weight: 500;
+    letter-spacing: 0.22em;
+    text-transform: uppercase;
+    color: var(--color-muted);
+    transition: color 0.25s var(--ease-fluid);
+  }
+  .nav-link:hover {
+    color: var(--color-ink);
+  }
+  .nav-link-active {
+    color: var(--color-ink);
+    font-weight: 600;
+  }
+  .nav-link-active::after {
+    content: "";
+    position: absolute;
+    left: 0.75rem;
+    right: 0.75rem;
+    bottom: 0.35rem;
+    height: 2px;
+    background: var(--color-accent);
+    border-radius: 1px;
   }
 
-  /* Fades on marquee edges */
   .edge-fade {
     -webkit-mask-image: linear-gradient(
       90deg,
@@ -394,10 +435,9 @@ select:focus-visible {
   }
 }
 
-/* Section container helper — единый ограничитель витрины (≤1280px) */
 .container-x {
   width: 100%;
-  max-width: 80rem; /* 1280px */
+  max-width: 80rem;
   margin-inline: auto;
   padding-inline: 1.25rem;
   box-sizing: border-box;
@@ -418,38 +458,19 @@ select:focus-visible {
   }
 }
 
-/* Checkbox с фирменным акцентом */
-.maze-check {
-  width: 16px;
-  height: 16px;
-  accent-color: var(--color-cyan);
-  cursor: pointer;
-}
-
-/* Range slider: только thumb; заливку трека рисует PriceRangeSlider */
 .maze-range-input {
   --maze-range-thumb: 18px;
-  -webkit-appearance: none !important;
-  appearance: none !important;
-  width: 100%;
-  height: var(--maze-range-thumb);
-  margin: 0;
-  padding: 0;
+  -webkit-appearance: none;
+  appearance: none;
   background: transparent;
-  border: none;
-  outline: none;
+  height: var(--maze-range-thumb);
   cursor: pointer;
-  /* не давать Safari рисовать системный accent-track */
-  color: transparent;
-}
-.maze-range-input::-webkit-slider-container {
-  background: transparent;
 }
 .maze-range-input::-webkit-slider-runnable-track {
   -webkit-appearance: none;
   appearance: none;
-  height: 6px;
-  background: transparent;
+  height: 2px;
+  background: var(--color-line);
   border: none;
   box-shadow: none;
 }
@@ -458,16 +479,16 @@ select:focus-visible {
   appearance: none !important;
   width: var(--maze-range-thumb);
   height: var(--maze-range-thumb);
-  margin-top: calc((6px - var(--maze-range-thumb)) / 2);
+  margin-top: calc((2px - var(--maze-range-thumb)) / 2);
   border-radius: 50%;
-  background: #fff;
-  border: 3px solid var(--color-cyan);
-  box-shadow: 0 0 10px rgba(53, 228, 240, 0.55);
+  background: #e8eeec;
+  border: 2px solid var(--color-accent);
+  box-shadow: none;
   cursor: pointer;
 }
 .maze-range-input::-moz-range-track {
-  height: 6px;
-  background: transparent;
+  height: 2px;
+  background: var(--color-line);
   border: none;
 }
 .maze-range-input::-moz-range-progress {
@@ -477,14 +498,13 @@ select:focus-visible {
 .maze-range-input::-moz-range-thumb {
   width: var(--maze-range-thumb);
   height: var(--maze-range-thumb);
-  border: 3px solid var(--color-cyan);
+  border: 2px solid var(--color-accent);
   border-radius: 50%;
-  background: #fff;
-  box-shadow: 0 0 10px rgba(53, 228, 240, 0.55);
+  background: #e8eeec;
+  box-shadow: none;
   cursor: pointer;
 }
 
-/* ---------------- Reduced motion ---------------- */
 @media (prefers-reduced-motion: reduce) {
   html {
     scroll-behavior: auto;
diff --git a/Client/app/layout.tsx b/Client/app/layout.tsx
index 7c54a10..6fc20e5 100644
--- a/Client/app/layout.tsx
+++ b/Client/app/layout.tsx
@@ -1,19 +1,20 @@
 import type { Metadata, Viewport } from "next";
 import Script from "next/script";
-import { Exo_2, Orbitron } from "next/font/google";
+import { Manrope, Montserrat } from "next/font/google";
 import "./globals.css";
 import { Providers } from "@/components/Providers";
 import { fetchSiteChrome } from "@/lib/site-source";
 
-const exo = Exo_2({
-  variable: "--font-exo",
+const manrope = Manrope({
+  variable: "--font-outfit",
   subsets: ["latin", "cyrillic"],
   display: "swap",
 });
 
-const orbitron = Orbitron({
-  variable: "--font-orbitron",
-  subsets: ["latin"],
+const montserrat = Montserrat({
+  variable: "--font-barlow",
+  subsets: ["latin", "cyrillic"],
+  weight: ["400", "500", "600", "700"],
   display: "swap",
 });
 
@@ -42,9 +43,9 @@ export default async function RootLayout({
   return (
     <html
       lang="ru"
-      className={`${exo.variable} ${orbitron.variable} h-full antialiased`}
+      className={`${manrope.variable} ${montserrat.variable} h-full antialiased`}
     >
-      <body className="min-h-full flex max-w-full flex-col overflow-x-hidden bg-bg text-ink font-sans selection:bg-cyan/25 selection:text-white">
+      <body className="flex min-h-full max-w-full flex-col overflow-x-hidden bg-bg font-sans text-ink selection:bg-accent/30 selection:text-bg">
         {process.env.NODE_ENV === "development" && (
           <Script
             src="https://unpkg.com/react-scan/dist/auto.global.js"
diff --git a/Client/app/not-found.tsx b/Client/app/not-found.tsx
index dba3c31..d320bcb 100644
--- a/Client/app/not-found.tsx
+++ b/Client/app/not-found.tsx
@@ -1,5 +1,4 @@
 import type { Metadata } from "next";
-import { Background } from "@/components/Background";
 import { Footer } from "@/components/Footer";
 import { Header } from "@/components/Header";
 import { ScrollToTop } from "@/components/ScrollToTop";
@@ -15,7 +14,6 @@ export const metadata: Metadata = {
 export default function NotFound() {
   return (
     <SmoothScroll>
-      <Background />
       <Header />
       <main className="flex-1">
         <NotFoundMaze />
diff --git a/Client/components/Background.tsx b/Client/components/Background.tsx
index 70b975b..61b05cb 100644
--- a/Client/components/Background.tsx
+++ b/Client/components/Background.tsx
@@ -53,7 +53,7 @@ export function Background() {
       }));
     }
 
-    const GREEN_LINE = (alpha: number) => `rgba(36, 52, 46, ${alpha})`;
+    const GREEN_LINE = (alpha: number) => `rgba(255, 255, 255, ${alpha})`;
 
     function draw() {
       ctx!.clearRect(0, 0, w, h);
@@ -184,7 +184,7 @@ export function Background() {
 
   return (
     <div className="pointer-events-none fixed inset-0 -z-10 overflow-hidden">
-      <canvas ref={canvasRef} className="absolute inset-0 h-full w-full opacity-40" />
+      <canvas ref={canvasRef} className="absolute inset-0 h-full w-full opacity-25" />
     </div>
   );
 }
diff --git a/Client/components/CardIcon.tsx b/Client/components/CardIcon.tsx
new file mode 100644
index 0000000..b49f68d
--- /dev/null
+++ b/Client/components/CardIcon.tsx
@@ -0,0 +1,2 @@
+/** Re-export для legacy `@/components` — канон: `@/shared/ui/card-icon`. */
+export { CardIcon, type CardIconSize } from "@/shared/ui/card-icon";
diff --git a/Client/components/Field.tsx b/Client/components/Field.tsx
index 4ae42e8..f118c30 100644
--- a/Client/components/Field.tsx
+++ b/Client/components/Field.tsx
@@ -4,7 +4,7 @@ import { cn } from "@/lib/utils";
 import { type InputHTMLAttributes, type ReactNode, useId } from "react";
 
 export const fieldCls =
-  "w-full rounded-xl border border-line bg-bg-2/60 px-4 py-3 text-[15px] text-ink placeholder:text-faint outline-none transition-colors focus:border-accent/70 focus-visible:outline-none";
+  "w-full rounded-2xl border border-line bg-bg-2 px-4 py-3 text-[15px] text-ink placeholder:text-faint outline-none transition-colors focus:border-accent/70 focus-visible:outline-none";
 
 export function Field({
   label,
diff --git a/Client/components/Footer.tsx b/Client/components/Footer.tsx
index 531afb8..ed50f21 100644
--- a/Client/components/Footer.tsx
+++ b/Client/components/Footer.tsx
@@ -126,7 +126,7 @@ function LinkList({ links }: { links: FooterLink[] }) {
         <li key={l.href + l.label}>
           <Link
             href={l.href}
-            className="inline-flex min-h-11 items-center text-sm text-muted transition-colors hover:text-cyan md:min-h-0 md:py-0.5"
+            className="inline-flex min-h-11 items-center text-sm text-muted transition-colors hover:text-accent md:min-h-0 md:py-0.5"
           >
             {l.label}
           </Link>
@@ -152,15 +152,31 @@ export function Footer() {
   const hasEmail = Boolean(STORE.email);
 
   return (
-    <footer className="relative mt-24 border-t border-line">
-      <div className="container-x py-12 md:py-14">
+    <footer className="relative mt-28 overflow-hidden border-t border-line bg-bg-2">
+      <div
+        className="pointer-events-none absolute inset-x-0 bottom-0 select-none text-center font-display text-[clamp(4rem,18vw,12rem)] font-bold leading-none tracking-tighter text-white/[0.03]"
+        aria-hidden
+      >
+        MAZE
+      </div>
+      <div className="container-x relative py-16 md:py-20">
+        <div className="mb-14 flex flex-col gap-6 border-b border-line pb-12 md:flex-row md:items-end md:justify-between">
+          <div className="max-w-xl">
+            <p className="eyebrow mb-3">MAZE</p>
+            <h2 className="font-display text-[clamp(1.75rem,4vw,2.75rem)] font-semibold uppercase tracking-[0.04em] text-ink">
+              Найди свой путь в мире технологий
+            </h2>
+          </div>
+          <Link href="/catalog" className="btn-primary shrink-0">
+            Открыть каталог
+          </Link>
+        </div>
         {/* Primary: бренд + навигация + контакты */}
         <div className="grid min-w-0 gap-8 md:grid-cols-2 md:gap-10 lg:grid-cols-[1.4fr_1fr_1fr_1.2fr] lg:items-start">
           <div className="min-w-0 space-y-5">
             <Logo />
             <p className="max-w-xs text-sm leading-relaxed text-muted">
-              Найди свой путь в мире технологий. Оригинальная техника, трейд-ин
-              и рассрочка 0%.
+              Оригинальная техника, трейд-ин и рассрочка 0%.
             </p>
             <ul className="space-y-2">
               {TRUST.map((t) => (
@@ -168,20 +184,19 @@ export function Footer() {
                   key={t}
                   className="flex items-center gap-2 text-xs text-muted"
                 >
-                  <Check size={14} className="shrink-0 text-cyan" aria-hidden />
+                  <Check size={14} className="shrink-0 text-accent" aria-hidden />
                   {t}
                 </li>
               ))}
             </ul>
             {STORE.hours ? (
               <p className="flex items-center gap-2 text-xs text-faint">
-                <Clock size={14} className="shrink-0 text-cyan" aria-hidden />
+                <Clock size={14} className="shrink-0 text-accent" aria-hidden />
                 Работаем ежедневно · {STORE.hours}
               </p>
             ) : null}
 
-            {/* CTA */}
-            <div className="rounded-2xl border border-line bg-white/[0.02] p-4">
+            <div className="border border-line bg-panel p-5">
               <p className="font-display text-sm font-semibold text-ink">
                 Нужна помощь?
               </p>
@@ -221,9 +236,9 @@ export function Footer() {
               <li>
                 <a
                   href={tel}
-                  className="flex min-h-11 min-w-0 items-center gap-2.5 text-sm font-medium text-ink transition-colors hover:text-cyan md:min-h-0"
+                  className="flex min-h-11 min-w-0 items-center gap-2.5 text-sm font-medium text-ink transition-colors hover:text-accent md:min-h-0"
                 >
-                  <Phone size={15} className="shrink-0 text-cyan" />
+                  <Phone size={15} className="shrink-0 text-accent" />
                   <span className="min-w-0 break-words">
                     Позвонить · {STORE.phone}
                   </span>
@@ -233,9 +248,9 @@ export function Footer() {
                 <li>
                   <a
                     href={`mailto:${STORE.email}`}
-                    className="flex min-h-11 min-w-0 items-center gap-2.5 text-sm text-muted transition-colors hover:text-cyan md:min-h-0"
+                    className="flex min-h-11 min-w-0 items-center gap-2.5 text-sm text-muted transition-colors hover:text-accent md:min-h-0"
                   >
-                    <Mail size={15} className="shrink-0 text-cyan" />
+                    <Mail size={15} className="shrink-0 text-accent" />
                     <span className="min-w-0 break-all">
                       Написать · {STORE.email}
                     </span>
@@ -248,9 +263,9 @@ export function Footer() {
                     href={STORE.telegram}
                     target="_blank"
                     rel="noopener noreferrer"
-                    className="flex min-h-11 items-center gap-2.5 text-sm text-muted transition-colors hover:text-cyan md:min-h-0"
+                    className="flex min-h-11 items-center gap-2.5 text-sm text-muted transition-colors hover:text-accent md:min-h-0"
                   >
-                    <MessageCircle size={15} className="shrink-0 text-cyan" />
+                    <MessageCircle size={15} className="shrink-0 text-accent" />
                     Написать в Telegram
                   </a>
                 </li>
@@ -260,9 +275,9 @@ export function Footer() {
                   href={maps}
                   target="_blank"
                   rel="noopener noreferrer"
-                  className="flex min-h-11 items-start gap-2.5 text-sm text-muted transition-colors hover:text-cyan md:min-h-0"
+                  className="flex min-h-11 items-start gap-2.5 text-sm text-muted transition-colors hover:text-accent md:min-h-0"
                 >
-                  <MapPin size={15} className="mt-0.5 shrink-0 text-cyan" />
+                  <MapPin size={15} className="mt-0.5 shrink-0 text-accent" />
                   <span>
                     Открыть карту
                     <span className="mt-0.5 block text-xs text-faint">
@@ -278,7 +293,7 @@ export function Footer() {
               </li>
               {STORE.metro ? (
                 <li className="flex min-h-11 items-center gap-2.5 text-sm text-muted md:min-h-0">
-                  <Train size={15} className="shrink-0 text-cyan" />
+                  <Train size={15} className="shrink-0 text-accent" />
                   {STORE.metro}
                 </li>
               ) : null}
@@ -310,8 +325,8 @@ export function Footer() {
         ) : null}
 
         {/* Secondary: legal + copyright */}
-        <div className="mt-10 flex flex-col items-center gap-3 border-t border-line pt-8 text-center text-xs text-faint sm:flex-row sm:justify-between sm:text-left">
-          <p>© {new Date().getFullYear()} MAZE</p>
+        <div className="mt-10 flex flex-col items-center gap-3 pt-8 text-center text-xs text-faint sm:flex-row sm:justify-between sm:text-left">
+          <p>© MAZE</p>
           {LEGAL_LINKS.length > 0 ? (
             <ul className="flex flex-wrap items-center justify-center gap-x-4 gap-y-2">
               {LEGAL_LINKS.map((l) => (
diff --git a/Client/components/Header.tsx b/Client/components/Header.tsx
index 7926a09..e207d93 100644
--- a/Client/components/Header.tsx
+++ b/Client/components/Header.tsx
@@ -8,7 +8,6 @@ import {
   ChevronDown,
   Heart,
   Menu,
-  Phone,
   ShoppingCart,
   X,
 } from "lucide-react";
@@ -19,15 +18,30 @@ import { MobileDrawer } from "@/shared/ui/mobile-drawer";
 import { resetWindowScroll } from "@/lib/scroll";
 import { Logo } from "./Logo";
 import { Icon } from "./Icon";
+import { CardIcon } from "@/shared/ui/card-icon";
 import { useCart } from "./store";
 import { useSiteData } from "./site-data";
 import { cn } from "@/lib/utils";
 
+const NAV = [
+  {
+    href: "/catalog",
+    label: "Каталог",
+    match: (p: string) => p.startsWith("/catalog") || p.startsWith("/product"),
+  },
+  { href: "/#reviews", label: "Отзывы", match: () => false },
+  {
+    href: "/account",
+    label: "Кабинет",
+    match: (p: string) => p.startsWith("/account"),
+  },
+] as const;
+
 export function Header() {
   const router = useRouter();
   const pathname = usePathname();
   const { count, wishlist, setMiniOpen } = useCart();
-  const { categories, store: STORE, partnerBrands } = useSiteData();
+  const { categories, partnerBrands } = useSiteData();
   const [scrolled, setScrolled] = useState(false);
   const [catOpen, setCatOpen] = useState(false);
   const [mobileOpen, setMobileOpen] = useState(false);
@@ -36,7 +50,10 @@ export function Header() {
   const closeMobile = useCallback(() => setMobileOpen(false), []);
 
   useEffect(() => {
-    const onScroll = () => setScrolled(window.scrollY > 12);
+    const onScroll = () => {
+      const next = window.scrollY > 8;
+      setScrolled((prev) => (prev === next ? prev : next));
+    };
     onScroll();
     window.addEventListener("scroll", onScroll, { passive: true });
     return () => window.removeEventListener("scroll", onScroll);
@@ -53,132 +70,146 @@ export function Header() {
 
   function search(e: React.FormEvent) {
     e.preventDefault();
-    router.push(q.trim() ? `/catalog?q=${encodeURIComponent(q.trim())}` : "/catalog");
+    router.push(
+      q.trim() ? `/catalog?q=${encodeURIComponent(q.trim())}` : "/catalog",
+    );
     closeMobile();
   }
 
   return (
     <>
-      <header
-        className={cn(
-          "sticky top-0 z-50",
-          scrolled || mobileOpen
-            ? "chrome-sticky"
-            : "border-b border-transparent bg-transparent transition-[background-color,border-color] duration-200",
-        )}
-      >
-        <div className="container-x flex h-14 min-w-0 shrink-0 flex-nowrap items-center gap-1.5 sm:h-16 sm:gap-3 md:h-[4.5rem] md:gap-5">
-          <Logo compact="mobile" className="min-w-0 shrink" />
-
-          {/* Каталог dropdown */}
-          <div ref={catRef} className="relative hidden md:block">
+      <header className="pointer-events-none fixed inset-x-0 top-0 z-50">
+        <div className="pointer-events-auto px-3 pt-3 sm:px-4 sm:pt-4 md:px-6">
+          <div
+            className={cn(
+              "nav-pill mx-auto flex h-14 max-w-7xl min-w-0 flex-nowrap items-center gap-1.5 px-3 transition-[background-color,border-color] duration-300 sm:h-16 sm:gap-3 sm:px-5 md:h-[4.25rem] md:gap-5 md:px-6",
+              (scrolled || mobileOpen) && "nav-pill-scrolled",
+            )}
+          >
             <button
-              onClick={() => setCatOpen((v) => !v)}
-              className="flex items-center gap-1.5 rounded-full px-3 py-2 text-sm font-medium text-muted transition-colors hover:text-ink cursor-pointer"
-              aria-expanded={catOpen}
+              type="button"
+              onClick={() => setMobileOpen(true)}
+              aria-label="Открыть меню"
+              className="grid h-10 w-10 shrink-0 place-items-center rounded-full text-ink transition-colors hover:bg-panel hover:text-white md:hidden cursor-pointer"
             >
-              Каталог
-              <ChevronDown
-                size={15}
-                className={cn("transition-transform", catOpen && "rotate-180")}
-              />
+              <Menu size={20} strokeWidth={1.5} />
             </button>
-            <AnimatePresence>
-              {catOpen && (
-                <motion.div
-                  initial={{ opacity: 0, y: 8, scale: 0.98 }}
-                  animate={{ opacity: 1, y: 0, scale: 1 }}
-                  exit={{ opacity: 0, y: 8, scale: 0.98 }}
-                  transition={{ duration: 0.18 }}
-                  className="absolute left-0 top-full mt-2 grid w-[30rem] grid-cols-2 gap-1 rounded-2xl border border-line bg-[#0e1126] p-2 shadow-[0_18px_50px_-20px_rgba(0,0,0,0.75)]"
+
+            <div className="hidden items-center gap-1 md:flex">
+              <div ref={catRef} className="relative">
+                <button
+                  type="button"
+                  onClick={() => setCatOpen((v) => !v)}
+                  className={cn(
+                    "nav-link inline-flex items-center gap-1.5 px-3 py-2 cursor-pointer",
+                    catOpen && "nav-link-active",
+                  )}
+                  aria-expanded={catOpen}
                 >
-                  {categories.map((c) => (
-                    <Link
-                      key={c.slug}
-                      href={`/catalog?cat=${c.slug}`}
-                      onClick={() => setCatOpen(false)}
-                      className="group flex items-center gap-3 rounded-xl px-3 py-2.5 transition-colors hover:bg-white/5"
+                  Меню
+                  <ChevronDown
+                    size={14}
+                    className={cn(
+                      "transition-transform",
+                      catOpen && "rotate-180",
+                    )}
+                  />
+                </button>
+                <AnimatePresence>
+                  {catOpen && (
+                    <motion.div
+                      initial={{ opacity: 0, y: 8 }}
+                      animate={{ opacity: 1, y: 0 }}
+                      exit={{ opacity: 0, y: 8 }}
+                      transition={{ duration: 0.22 }}
+                      className="absolute left-0 top-full z-50 mt-3 grid w-[28rem] grid-cols-2 gap-0.5 rounded-2xl border border-line bg-bg-2 p-2 shadow-[0_24px_60px_-24px_rgba(0,0,0,0.85)]"
                     >
-                      <span
-                        className="grid h-9 w-9 place-items-center rounded-lg text-white"
-                        style={{
-                          background: `linear-gradient(135deg, ${c.tint[0]}, ${c.tint[1]})`,
-                        }}
-                      >
-                        <Icon name={c.icon} size={17} />
-                      </span>
-                      <span className="min-w-0">
-                        <span className="block truncate text-sm font-medium text-ink">
-                          {c.name}
-                        </span>
-                        <span className="text-xs text-faint">
-                          {c.count} товаров
-                        </span>
-                      </span>
-                    </Link>
-                  ))}
-                </motion.div>
-              )}
-            </AnimatePresence>
-          </div>
+                      {categories.map((c) => (
+                        <Link
+                          key={c.slug}
+                          href={`/catalog?cat=${c.slug}`}
+                          onClick={() => setCatOpen(false)}
+                          className="flex items-center gap-3 rounded-xl px-3 py-2.5 transition-colors hover:bg-panel"
+                        >
+                          <CardIcon size="sm">
+                            <Icon name={c.icon} size={15} strokeWidth={1.5} />
+                          </CardIcon>
+                          <span className="min-w-0">
+                            <span className="block truncate text-xs font-medium tracking-wide text-ink">
+                              {c.name}
+                            </span>
+                            <span className="text-[10px] uppercase tracking-wider text-faint">
+                              {c.count} моделей
+                            </span>
+                          </span>
+                        </Link>
+                      ))}
+                    </motion.div>
+                  )}
+                </AnimatePresence>
+              </div>
+            </div>
 
-          {/* Поиск */}
-          <form
-            onSubmit={search}
-            className="hidden flex-1 lg:block"
-          >
-            <CatalogSearchInput
-              value={q}
-              onChange={setQ}
-              brands={partnerBrands}
-            />
-          </form>
+            <Logo compact="mobile" className="min-w-0 shrink" />
 
-          <div className="ml-auto flex shrink-0 flex-nowrap items-center gap-0.5 sm:gap-1 md:gap-1.5">
-            <IconButton
-              label="Избранное"
-              badge={wishlist.length}
-              href="/account?tab=wishlist"
-              onClick={(e) => {
-                if (pathname === "/account") {
-                  e.preventDefault();
-                  window.dispatchEvent(
-                    new CustomEvent(ACCOUNT_TAB_EVENT, { detail: "wishlist" }),
-                  );
-                  router.replace("/account?tab=wishlist");
-                  resetWindowScroll();
-                }
-              }}
-            >
-              <Heart size={19} />
-            </IconButton>
-            <IconButton
-              label="Корзина"
-              badge={count}
-              onClick={() => setMiniOpen(true)}
-            >
-              <ShoppingCart size={19} />
-            </IconButton>
-            <div className="hidden md:block">
-              <HeaderAuthActions />
-            </div>
-            <a
-              href={`tel:${STORE.phone.replace(/[^+\d]/g, "")}`}
-              className="ml-1 hidden items-center gap-2 rounded-full border border-line px-3 py-2 text-sm text-muted transition-colors hover:border-cyan/50 hover:text-ink xl:flex"
-            >
-              <Phone size={15} className="text-cyan" />
-              {STORE.phone}
-            </a>
+            <form onSubmit={search} className="hidden min-w-0 flex-1 lg:block">
+              <CatalogSearchInput
+                value={q}
+                onChange={setQ}
+                brands={partnerBrands}
+                inputClassName="border-white/12 bg-black/20 focus:border-white/35 focus:bg-black/30"
+              />
+            </form>
 
-            <button
-              type="button"
-              onClick={() => setMobileOpen((v) => !v)}
-              aria-label={mobileOpen ? "Закрыть меню" : "Открыть меню"}
-              aria-expanded={mobileOpen}
-              className="grid h-9 w-9 shrink-0 place-items-center rounded-full text-muted hover:text-ink sm:h-10 sm:w-10 md:hidden cursor-pointer"
-            >
-              {mobileOpen ? <X size={20} /> : <Menu size={20} />}
-            </button>
+            <nav className="hidden items-center gap-1 xl:flex">
+              {NAV.map((item) => {
+                const active = item.match(pathname);
+                return (
+                  <Link
+                    key={item.href}
+                    href={item.href}
+                    className={cn(
+                      "nav-link px-3 py-2",
+                      active && "nav-link-active",
+                    )}
+                  >
+                    {item.label}
+                  </Link>
+                );
+              })}
+            </nav>
+
+            <div className="ml-auto flex shrink-0 items-center gap-0.5 sm:gap-1 lg:ml-0">
+              <IconButton
+                label="Избранное"
+                badge={wishlist.length}
+                href="/account?tab=wishlist"
+                onClick={(e) => {
+                  if (pathname === "/account") {
+                    e.preventDefault();
+                    window.dispatchEvent(
+                      new CustomEvent(ACCOUNT_TAB_EVENT, {
+                        detail: "wishlist",
+                      }),
+                    );
+                    router.replace("/account?tab=wishlist");
+                    resetWindowScroll();
+                  }
+                }}
+              >
+                <Heart size={18} strokeWidth={1.5} />
+              </IconButton>
+              <IconButton
+                label="Корзина"
+                badge={count}
+                onClick={() => setMiniOpen(true)}
+              >
+                <ShoppingCart size={18} strokeWidth={1.5} />
+              </IconButton>
+              <div className="hidden md:block">
+                <HeaderAuthActions />
+              </div>
+            </div>
           </div>
         </div>
       </header>
@@ -187,50 +218,59 @@ export function Header() {
         open={mobileOpen}
         onClose={closeMobile}
         rootClassName="md:hidden"
-        /* Ширина по самой длинной категории («Игровые приставки»), не на весь экран */
-        panelClassName="w-[min(100vw-2.75rem,18rem)] max-w-[18rem]"
+        panelClassName="w-[min(100vw-2.5rem,20rem)] max-w-[20rem] rounded-l-3xl"
       >
-        <div className="shrink-0 border-b border-line p-5">
+        <div className="shrink-0 border-b border-line px-5 py-5">
           <div className="flex items-center justify-between">
             <Logo compact />
             <button
               type="button"
               onClick={closeMobile}
               aria-label="Закрыть меню"
-              className="grid h-9 w-9 place-items-center rounded-full text-muted hover:text-ink cursor-pointer"
+              className="grid h-10 w-10 place-items-center rounded-full text-muted hover:bg-panel hover:text-ink cursor-pointer"
             >
-              <X size={18} />
+              <X size={18} strokeWidth={1.5} />
             </button>
           </div>
         </div>
-        <div className="flex-1 overflow-y-auto p-5 pt-4">
-          <div className="mb-4">
+        <div className="flex-1 overflow-y-auto px-5 py-5">
+          <div className="mb-6">
             <MobileAuthActions onNavigate={closeMobile} />
           </div>
-          <form onSubmit={search} className="mb-5">
+          <form onSubmit={search} className="mb-8">
             <CatalogSearchInput
               value={q}
               onChange={setQ}
               brands={partnerBrands}
+              inputClassName="rounded-full"
             />
           </form>
+          <p className="eyebrow mb-3">Навигация</p>
+          <nav className="mb-8 space-y-1">
+            {NAV.map((item) => (
+              <Link
+                key={item.href}
+                href={item.href}
+                onClick={closeMobile}
+                className="block rounded-xl border-b border-line/50 py-3 text-sm tracking-wide text-ink"
+              >
+                {item.label}
+              </Link>
+            ))}
+          </nav>
+          <p className="eyebrow mb-3">Категории</p>
           <nav className="space-y-1">
             {categories.map((c) => (
               <Link
                 key={c.slug}
                 href={`/catalog?cat=${c.slug}`}
                 onClick={closeMobile}
-                className="flex items-center gap-3 rounded-xl px-3 py-3 transition-colors hover:bg-white/5"
+                className="flex items-center gap-3 rounded-xl py-3 transition-colors hover:bg-panel hover:text-accent"
               >
-                <span
-                  className="grid h-8 w-8 shrink-0 place-items-center rounded-lg text-white"
-                  style={{
-                    background: `linear-gradient(135deg, ${c.tint[0]}, ${c.tint[1]})`,
-                  }}
-                >
-                  <Icon name={c.icon} size={15} />
-                </span>
-                <span className="whitespace-nowrap text-sm font-medium">
+                <CardIcon size="sm">
+                  <Icon name={c.icon} size={14} strokeWidth={1.5} />
+                </CardIcon>
+                <span className="text-sm font-medium tracking-wide">
                   {c.name}
                 </span>
               </Link>
@@ -252,16 +292,18 @@ function IconButton({
   children: React.ReactNode;
   label: string;
   badge?: number;
-  onClick?: (e: React.MouseEvent<HTMLAnchorElement | HTMLButtonElement>) => void;
+  onClick?: (
+    e: React.MouseEvent<HTMLAnchorElement | HTMLButtonElement>,
+  ) => void;
   href?: string;
 }) {
   const cls =
-    "relative grid h-9 w-9 shrink-0 place-items-center rounded-full text-muted transition-colors hover:bg-white/5 hover:text-ink sm:h-10 sm:w-10 cursor-pointer";
+    "relative grid h-10 w-10 shrink-0 place-items-center rounded-full text-muted transition-colors hover:bg-panel hover:text-ink cursor-pointer";
   const inner = (
     <>
       {children}
       {badge != null && badge > 0 && (
-        <span className="pointer-events-none absolute -right-0.5 -top-0.5 grid h-[18px] min-w-[18px] place-items-center rounded-full bg-gradient-to-br from-cyan to-blue px-1 text-[10px] font-bold text-[#04121a]">
+        <span className="pointer-events-none absolute right-0.5 top-0.5 grid h-4 min-w-4 place-items-center rounded-full bg-accent px-1 text-[9px] font-semibold tabular-nums text-bg">
           {badge}
         </span>
       )}
@@ -269,12 +311,7 @@ function IconButton({
   );
   if (href)
     return (
-      <Link
-        href={href}
-        aria-label={label}
-        className={cls}
-        onClick={onClick}
-      >
+      <Link href={href} aria-label={label} className={cls} onClick={onClick}>
         {inner}
       </Link>
     );
diff --git a/Client/components/Logo.tsx b/Client/components/Logo.tsx
index b9c1971..4ae41dc 100644
--- a/Client/components/Logo.tsx
+++ b/Client/components/Logo.tsx
@@ -10,7 +10,6 @@ export function Logo({
   compact = false,
 }: {
   className?: string;
-  /** true — всегда компактный; "mobile" — только до md */
   compact?: boolean | "mobile";
 }) {
   const pathname = usePathname();
@@ -35,32 +34,31 @@ export function Logo({
         xmlns="http://www.w3.org/2000/svg"
         className={cn(
           "w-auto",
-          compact === true && "h-8 max-w-[6.75rem]",
-          compact === "mobile" && "h-8 max-w-[6.75rem] md:h-9 md:max-w-none",
-          !compact && "h-9",
+          compact === true && "h-7 max-w-[6.5rem]",
+          compact === "mobile" && "h-7 max-w-[6.5rem] md:h-8 md:max-w-none",
+          !compact && "h-8",
         )}
         aria-hidden
       >
         <path
           d="M23.65 33 H35 L23.65 9.5 L12.3 33 H16.85 L23.65 19.5 L30.45 33"
-          stroke="#c9aa78"
-          strokeWidth="3"
+          stroke="#F0EDE6"
+          strokeWidth="2.5"
           strokeLinecap="round"
           strokeLinejoin="round"
         />
-
         <text
           x="48"
-          y="29"
-          fill="#c9aa78"
+          y="28"
+          fill="#F0EDE6"
           style={{
-            fontFamily: "var(--font-orbitron), sans-serif",
-            fontSize: 24,
-            fontWeight: 700,
-            letterSpacing: "0.28em",
+            fontFamily: "var(--font-barlow), sans-serif",
+            fontSize: 22,
+            fontWeight: 600,
+            letterSpacing: "0.32em",
           }}
         >
-          maze
+          MAZE
         </text>
       </svg>
     </Link>
diff --git a/Client/components/MiniCart.tsx b/Client/components/MiniCart.tsx
index d91209a..f8b3f03 100644
--- a/Client/components/MiniCart.tsx
+++ b/Client/components/MiniCart.tsx
@@ -2,6 +2,7 @@
 
 import Link from "next/link";
 import { Minus, Plus, ShoppingBag, Trash2, X } from "lucide-react";
+import { CardIcon } from "@/shared/ui/card-icon";
 import { useCart } from "./store";
 import { ProductThumb } from "./ProductThumb";
 import { formatPrice, plural, cn } from "@/lib/utils";
@@ -42,9 +43,9 @@ export function MiniCart() {
 
       {items.length === 0 ? (
         <div className="flex flex-1 flex-col items-center justify-center gap-4 p-8 text-center">
-          <div className="grid h-16 w-16 place-items-center rounded-2xl bg-white/5 text-muted">
-            <ShoppingBag size={26} />
-          </div>
+          <CardIcon size="lg">
+            <ShoppingBag size={26} strokeWidth={1.5} />
+          </CardIcon>
           <p className="text-muted">Корзина пуста</p>
           <Link
             href="/catalog"
diff --git a/Client/components/ProductCard.tsx b/Client/components/ProductCard.tsx
index 0136ed2..21cecfa 100644
--- a/Client/components/ProductCard.tsx
+++ b/Client/components/ProductCard.tsx
@@ -17,15 +17,8 @@ import { useCart } from "./store";
 import { cn, formatPrice } from "@/lib/utils";
 import { formatStockLabel } from "@/lib/stock";
 
-const BADGE_STYLE: Record<string, string> = {
-  NEW: "bg-cyan/15 text-cyan border-cyan/30",
-  HIT: "bg-violet/15 text-violet border-violet/30",
-  SALE: "bg-magenta/15 text-magenta border-magenta/30",
-};
-
 /**
- * Паттерн витрины (catalog / home / account / PDP).
- * Адаптив по ширине сетки (2 колонки), без сжатия типографики.
+ * Premium product showcase — cinematic, minimal chrome.
  */
 export function ProductCard({ product }: { product: Product }) {
   const reduce = useReducedMotion();
@@ -34,13 +27,13 @@ export function ProductCard({ product }: { product: Product }) {
 
   const mx = useMotionValue(0);
   const my = useMotionValue(0);
-  const rx = useSpring(useTransform(my, [-0.5, 0.5], [6, -6]), {
+  const rx = useSpring(useTransform(my, [-0.5, 0.5], [4, -4]), {
     stiffness: 200,
-    damping: 18,
+    damping: 20,
   });
-  const ry = useSpring(useTransform(mx, [-0.5, 0.5], [-6, 6]), {
+  const ry = useSpring(useTransform(mx, [-0.5, 0.5], [-4, 4]), {
     stiffness: 200,
-    damping: 18,
+    damping: 20,
   });
 
   useEffect(() => {
@@ -91,17 +84,14 @@ export function ProductCard({ product }: { product: Product }) {
     >
       <Link
         href={`/product/${product.slug}`}
-        className="glass flex h-full min-w-0 flex-col overflow-hidden rounded-2xl p-2 transition-[border-color,box-shadow] duration-300 hover:border-bg-warm/35 hover:shadow-[0_20px_60px_-24px_rgba(92,56,56,0.4)] sm:rounded-3xl sm:p-3"
+        className="product-showcase flex h-full min-w-0 flex-col overflow-hidden transition-transform duration-500"
       >
-        <div className="relative shrink-0">
-          <ProductThumb product={product} className="aspect-square w-full" />
-          {product.badge ? (
-            <span
-              className={cn(
-                "absolute left-2 top-2 max-w-[calc(100%-3.25rem)] truncate rounded-full border px-1.5 py-0.5 text-[10px] font-semibold backdrop-blur-md sm:left-3 sm:top-3 sm:max-w-none sm:px-2.5 sm:py-1 sm:text-[11px]",
-                BADGE_STYLE[product.badge],
-              )}
-            >
+        <div className="relative shrink-0 overflow-hidden">
+          <div className="transition-transform duration-500 ease-out group-hover:scale-[1.04]">
+            <ProductThumb product={product} className="aspect-[4/5] w-full sm:aspect-square" />
+          </div>
+          {product.badge || salePct != null ? (
+            <span className="absolute left-3 top-3 text-[10px] font-medium uppercase tracking-[0.18em] text-ink">
               {salePct != null ? `−${salePct}%` : product.badge}
             </span>
           ) : null}
@@ -112,42 +102,37 @@ export function ProductCard({ product }: { product: Product }) {
               e.preventDefault();
               toggleWishlist(product.id);
             }}
-            className="absolute right-2 top-2 grid h-8 w-8 place-items-center rounded-full bg-black/35 text-white backdrop-blur-md transition-colors hover:bg-black/50 cursor-pointer sm:right-3 sm:top-3 sm:h-9 sm:w-9"
+            className="absolute right-2 top-2 grid h-9 w-9 place-items-center rounded-full bg-bg-2 text-ink transition-colors hover:bg-panel cursor-pointer"
           >
             <Heart
               size={15}
-              className={cn(
-                "transition-colors sm:size-4",
-                wished && "fill-magenta text-magenta",
-              )}
+              strokeWidth={1.5}
+              className={cn(wished && "fill-ink text-ink")}
             />
           </button>
         </div>
 
-        <div className="flex min-w-0 flex-1 flex-col space-y-1.5 p-1.5 pt-3 sm:space-y-2 sm:p-2 sm:pt-4">
+        <div className="flex min-w-0 flex-1 flex-col gap-2 p-4 sm:p-5">
           <p
-            className="min-w-0 truncate text-[10px] leading-tight text-faint sm:text-xs"
+            className="truncate text-[10px] uppercase tracking-[0.2em] text-faint"
             title={meta}
           >
             {meta}
           </p>
-          <h3 className="line-clamp-2 min-h-[2.4rem] break-words text-[13px] font-medium leading-snug text-ink sm:min-h-[2.6rem] sm:text-sm">
+          <h3 className="line-clamp-2 min-h-[2.75rem] font-display text-base font-semibold uppercase leading-snug tracking-[0.04em] text-ink sm:text-lg">
             {product.name}
           </h3>
-          <div className="flex min-w-0 items-center gap-1.5 text-[11px] sm:gap-2 sm:text-xs">
-            <span className="inline-flex shrink-0 items-center gap-0.5 text-muted">
-              <Star
-                size={12}
-                className="shrink-0 fill-gold text-gold sm:size-[13px]"
-              />
-              <span className="text-ink">{product.rating.toFixed(1)}</span>
+          <div className="flex min-w-0 items-center gap-2 text-[11px] text-muted">
+            <span className="inline-flex items-center gap-1">
+              <Star size={11} className="fill-accent text-accent" />
+              {product.rating.toFixed(1)}
             </span>
+            <span className="text-line">|</span>
             <span
               className={cn(
                 "min-w-0 truncate",
-                (product.quantityAvailable ?? 0) > 0 ? "text-cyan" : "text-faint",
+                (product.quantityAvailable ?? 0) > 0 ? "text-muted" : "text-faint",
               )}
-              title={formatStockLabel(product.quantityAvailable)}
             >
               <span className="sm:hidden">
                 {formatStockCompact(product.quantityAvailable)}
@@ -158,13 +143,13 @@ export function ProductCard({ product }: { product: Product }) {
             </span>
           </div>
 
-          <div className="mt-auto flex min-w-0 items-end justify-between gap-2 pt-1">
-            <div className="min-w-0 flex-1 overflow-hidden">
-              <div className="font-display text-[15px] font-semibold leading-tight tabular-nums text-ink [overflow-wrap:anywhere] sm:text-lg">
+          <div className="mt-auto flex min-w-0 items-end justify-between gap-3 pt-4">
+            <div className="min-w-0">
+              <div className="font-display text-xl font-semibold tabular-nums tracking-tight text-ink sm:text-2xl">
                 {formatPrice(product.price)}
               </div>
               {product.oldPrice ? (
-                <div className="truncate text-[10px] text-faint line-through sm:text-xs">
+                <div className="text-xs text-faint line-through">
                   {formatPrice(product.oldPrice)}
                 </div>
               ) : null}
@@ -185,13 +170,13 @@ export function ProductCard({ product }: { product: Product }) {
                 void addItem(product);
               }}
               className={cn(
-                "grid h-9 w-9 shrink-0 place-items-center rounded-full transition-transform sm:h-10 sm:w-10",
+                "grid h-10 w-10 shrink-0 place-items-center rounded-full transition-all duration-300",
                 canAdd
-                  ? "cursor-pointer bg-gradient-to-br from-accent to-bg-warm text-[#1a1814] shadow-[0_8px_24px_-8px_rgba(92,56,56,0.55)] hover:scale-105 active:scale-95"
-                  : "cursor-not-allowed border border-line bg-white/[0.06] text-faint",
+                  ? "cursor-pointer border-[1.5px] border-[#1a221f] bg-accent text-bg opacity-95 hover:opacity-100 group-hover:opacity-100"
+                  : "cursor-not-allowed border border-line text-faint opacity-40",
               )}
             >
-              <Plus size={17} strokeWidth={2.5} className="sm:size-[18px]" />
+              <Plus size={16} strokeWidth={2.25} />
             </button>
           </div>
         </div>
diff --git a/Client/components/ScrollToTop.tsx b/Client/components/ScrollToTop.tsx
index dd7e1ad..b419477 100644
--- a/Client/components/ScrollToTop.tsx
+++ b/Client/components/ScrollToTop.tsx
@@ -24,7 +24,8 @@ export function ScrollToTop() {
       0;
 
     const update = () => {
-      setVisible(readY() > SHOW_AFTER_PX);
+      const next = readY() > SHOW_AFTER_PX;
+      setVisible((prev) => (prev === next ? prev : next));
     };
 
     update();
diff --git a/Client/components/SectionHeading.tsx b/Client/components/SectionHeading.tsx
index 797f4e8..8679942 100644
--- a/Client/components/SectionHeading.tsx
+++ b/Client/components/SectionHeading.tsx
@@ -3,7 +3,6 @@
 import Link from "next/link";
 import { motion } from "motion/react";
 import { ArrowRight } from "lucide-react";
-import { SplitText } from "@/shared/ui/split-text";
 import { FLUID_EASE } from "@/shared/lib/motion";
 
 export function SectionHeading({
@@ -20,51 +19,44 @@ export function SectionHeading({
   linkLabel?: string;
 }) {
   return (
-    <div className="mb-9 flex flex-wrap items-end justify-between gap-4">
-      <div>
-        <p className="eyebrow mb-2.5">
-          <SplitText text={eyebrow} mode="chars" trigger="inView" />
-        </p>
-        <h2 className="font-display text-3xl font-bold leading-[1.12] tracking-tight sm:text-4xl">
-          <SplitText
-            text={title}
-            mode="words"
-            trigger="inView"
-            delay={0.08}
-            wordGap="0.32em"
-          />
-        </h2>
-        {subtitle && (
-          <p className="mt-2 max-w-xl text-sm text-muted">
-            <SplitText
-              text={subtitle}
-              mode="words"
-              trigger="inView"
-              delay={0.22}
-              wordGap="0.3em"
-            />
-          </p>
-        )}
-      </div>
-      {href && (
-        <motion.div
+    <div className="mb-10 flex flex-wrap items-end justify-between gap-6 border-b border-line pb-8 md:mb-14">
+      <div className="max-w-2xl">
+        <motion.p
+          initial={{ opacity: 0, y: 8 }}
+          whileInView={{ opacity: 1, y: 0 }}
+          viewport={{ once: true }}
+          transition={{ duration: 0.4, ease: FLUID_EASE }}
+          className="eyebrow mb-3"
+        >
+          {eyebrow}
+        </motion.p>
+        <motion.h2
           initial={{ opacity: 0, y: 12 }}
           whileInView={{ opacity: 1, y: 0 }}
-          viewport={{ once: true, margin: "-10% 0px" }}
-          transition={{ duration: 0.6, ease: FLUID_EASE, delay: 0.15 }}
+          viewport={{ once: true }}
+          transition={{ duration: 0.5, ease: FLUID_EASE, delay: 0.05 }}
+          className="font-display text-[clamp(1.75rem,4vw,2.75rem)] font-semibold uppercase leading-[1.1] tracking-[0.04em] text-ink"
         >
-          <Link
-            href={href}
-            className="group flex items-center gap-1.5 text-sm font-medium text-accent transition-colors hover:text-ink"
-          >
-            {linkLabel}
-            <ArrowRight
-              size={16}
-              className="transition-transform group-hover:translate-x-1"
-            />
-          </Link>
-        </motion.div>
-      )}
+          {title}
+        </motion.h2>
+        {subtitle ? (
+          <p className="mt-3 max-w-lg text-sm leading-relaxed text-muted md:text-base">
+            {subtitle}
+          </p>
+        ) : null}
+      </div>
+      {href ? (
+        <Link
+          href={href}
+          className="group inline-flex items-center gap-2 text-[11px] font-medium uppercase tracking-[0.18em] text-muted transition-colors hover:text-ink"
+        >
+          {linkLabel}
+          <ArrowRight
+            size={14}
+            className="transition-transform group-hover:translate-x-0.5"
+          />
+        </Link>
+      ) : null}
     </div>
   );
 }
diff --git a/Client/components/admin/AdminShell.tsx b/Client/components/admin/AdminShell.tsx
index f02f4b7..871d83e 100644
--- a/Client/components/admin/AdminShell.tsx
+++ b/Client/components/admin/AdminShell.tsx
@@ -161,7 +161,7 @@ export function AdminShell({ children }: { children: ReactNode }) {
             className="absolute inset-0 bg-black/60 backdrop-blur-sm"
             onClick={() => setMenuOpen(false)}
           />
-          <aside className="absolute inset-y-0 left-0 flex w-[min(18rem,88vw)] flex-col border-r border-line bg-[#07080f] shadow-2xl">
+          <aside className="absolute inset-y-0 left-0 flex w-[min(18rem,88vw)] flex-col border-r border-line bg-[#080c0d] shadow-2xl">
             <div className="flex items-center justify-end border-b border-line px-3 py-2">
               <button
                 type="button"
@@ -178,7 +178,7 @@ export function AdminShell({ children }: { children: ReactNode }) {
       )}
 
       <div className="flex min-w-0 flex-1 flex-col">
-        <header className="sticky top-0 z-10 flex items-center gap-3 border-b border-line bg-[#07080f]/90 px-4 py-3 backdrop-blur md:px-6 md:py-4">
+        <header className="sticky top-0 z-10 flex items-center gap-3 border-b border-line bg-[#080c0d]/90 px-4 py-3 backdrop-blur md:px-6 md:py-4">
           <button
             type="button"
             aria-label="Открыть меню"
diff --git a/Client/components/home/CategoryGrid.tsx b/Client/components/home/CategoryGrid.tsx
index efb0dab..743253a 100644
--- a/Client/components/home/CategoryGrid.tsx
+++ b/Client/components/home/CategoryGrid.tsx
@@ -2,75 +2,48 @@ import Link from "next/link";
 import { ArrowUpRight } from "lucide-react";
 import { Reveal } from "@/components/Reveal";
 import { Icon } from "@/components/Icon";
+import { CardIcon } from "@/shared/ui/card-icon";
 import type { NavCategory } from "@/lib/site-source";
-import { CARD_HOVER_GLOW } from "@/shared/config/brand-colors";
 import { cn } from "@/lib/utils";
 
-/** Стрелка ~18px в углу с padding p-5 → центр ≈ 1.25rem + 9px от краёв. */
-const ARROW_CENTER = "calc(1.25rem + 9px)";
-const GLOW_SIZE = "22rem";
-const GLOW_RADIUS = "11rem";
-
 export function CategoryGrid({ categories }: { categories: NavCategory[] }) {
   return (
-    <div className="grid auto-rows-[8.5rem] grid-cols-2 gap-4 md:grid-cols-4">
+    <div className="grid auto-rows-[9rem] grid-cols-2 gap-3 md:grid-cols-4 md:auto-rows-[11rem] md:gap-4">
       {categories.map((c, i) => {
         const big = i === 0;
         return (
           <Reveal
             key={c.slug}
-            delay={i * 0.05}
+            delay={i * 0.04}
             className={cn(big && "col-span-2 row-span-2")}
           >
             <Link
               href={`/catalog?cat=${c.slug}`}
-              className="group relative flex h-full flex-col justify-between overflow-hidden rounded-3xl border border-line p-5 transition-[border-color,box-shadow] duration-300 hover:border-bg-warm/40 hover:shadow-[0_18px_48px_-30px_rgba(92,56,56,0.35)] focus-visible:border-bg-warm/50 focus-visible:outline-none"
-              style={{
-                background: `linear-gradient(140deg, ${c.tint[0]}22, ${c.tint[1]}14)`,
-              }}
+              className="group relative flex h-full flex-col justify-between overflow-hidden rounded-[1.75rem] bg-panel p-5 transition-colors duration-400 hover:bg-bg-warm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-[-2px] focus-visible:outline-accent sm:p-6"
             >
-              {/* Центр круга = центр стрелки → часть glow выходит за край карточки */}
-              <div
-                className="pointer-events-none absolute z-0 rounded-full opacity-0 transition-opacity duration-500 group-hover:opacity-100"
-                aria-hidden
-                style={{
-                  width: GLOW_SIZE,
-                  height: GLOW_SIZE,
-                  top: `calc(${ARROW_CENTER} - ${GLOW_RADIUS})`,
-                  right: `calc(${ARROW_CENTER} - ${GLOW_RADIUS})`,
-                  background: CARD_HOVER_GLOW,
-                }}
-              />
-
-              <div className="relative z-[1] flex items-start justify-between">
-                <span
-                  className={cn(
-                    "grid place-items-center rounded-2xl text-white shadow-lg",
-                    big ? "h-16 w-16" : "h-11 w-11",
-                  )}
-                  style={{
-                    background: `linear-gradient(135deg, ${c.tint[0]}, ${c.tint[1]})`,
-                  }}
-                >
-                  <Icon name={c.icon} size={big ? 30 : 20} />
-                </span>
+              <div className="flex items-start justify-between">
+                <CardIcon size={big ? "lg" : "md"}>
+                  <Icon name={c.icon} size={big ? 26 : 20} strokeWidth={1.5} />
+                </CardIcon>
                 <ArrowUpRight
-                  size={18}
-                  className="shrink-0 text-muted transition-[color,transform] duration-300 group-hover:-translate-y-0.5 group-hover:translate-x-0.5 group-hover:text-accent"
+                  size={16}
+                  strokeWidth={1.5}
+                  className="text-faint transition-[color,transform] duration-300 group-hover:-translate-y-0.5 group-hover:translate-x-0.5 group-hover:text-ink"
                   aria-hidden
                 />
               </div>
-
-              <div className="relative z-[1]">
+              <div>
                 <h3
                   className={cn(
-                    "font-display font-semibold text-ink",
-                    big ? "text-2xl" : "text-base",
+                    "font-display font-semibold uppercase tracking-[0.04em] text-ink",
+                    big ? "text-3xl" : "text-lg",
                   )}
                 >
                   {c.name}
                 </h3>
-                <p className="text-xs text-muted">{c.count} товаров</p>
+                <p className="mt-1 text-[10px] uppercase tracking-[0.18em] text-faint">
+                  {c.count} моделей
+                </p>
               </div>
             </Link>
           </Reveal>
diff --git a/Client/components/home/Features.tsx b/Client/components/home/Features.tsx
index eac683c..b988fda 100644
--- a/Client/components/home/Features.tsx
+++ b/Client/components/home/Features.tsx
@@ -1,24 +1,28 @@
 import { Reveal } from "@/components/Reveal";
 import { Icon } from "@/components/Icon";
+import { CardIcon } from "@/shared/ui/card-icon";
 import type { UiFeature } from "@/lib/site-source";
 
 export function Features({ features }: { features: UiFeature[] }) {
   return (
     <div className="container-x">
-      <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-4">
+      <div className="grid gap-3 sm:grid-cols-2 sm:gap-4 lg:grid-cols-4">
         {features.map((f, i) => (
-          <Reveal key={f.title} delay={i * 0.08}>
-            <div className="glass group h-full rounded-3xl p-6 transition-colors duration-300 hover:border-bg-warm/35">
-              <div className="mb-4 inline-grid h-12 w-12 place-items-center rounded-2xl bg-gradient-to-br from-accent/20 to-bg-warm/30 text-accent transition-transform duration-300 group-hover:scale-110">
+          <Reveal key={f.title} delay={i * 0.06}>
+            <div className="group h-full rounded-[1.75rem] bg-panel px-5 py-8 transition-colors duration-300 hover:bg-bg-warm sm:px-6">
+              <CardIcon className="mb-5">
                 {f.emoji ? (
-                  <span className="text-2xl" aria-hidden>
+                  <span className="text-xl leading-none" aria-hidden>
                     {f.emoji}
                   </span>
                 ) : (
-                  <Icon name={f.icon} size={22} />
+                  <Icon name={f.icon} size={22} strokeWidth={1.5} />
                 )}
-              </div>
-              <h3 className="mb-1.5 font-display text-base font-semibold text-ink">
+              </CardIcon>
+              <p className="mb-2 text-[10px] uppercase tracking-[0.22em] text-faint">
+                0{i + 1}
+              </p>
+              <h3 className="mb-2 font-display text-xl font-semibold uppercase tracking-[0.04em] text-ink">
                 {f.title}
               </h3>
               <p className="text-sm leading-relaxed text-muted">{f.text}</p>
diff --git a/Client/components/home/Promo.tsx b/Client/components/home/Promo.tsx
index 14d6774..aa16b60 100644
--- a/Client/components/home/Promo.tsx
+++ b/Client/components/home/Promo.tsx
@@ -3,83 +3,54 @@
 import Link from "next/link";
 import { ArrowRight, Repeat, CreditCard } from "lucide-react";
 import { Reveal } from "@/components/Reveal";
+import { CardIcon } from "@/shared/ui/card-icon";
 import { useModal } from "@/components/modals";
-import { CARD_HOVER_GLOW } from "@/shared/config/brand-colors";
-
-/** Цветное пятно в углу — один bordo-оттенок (shared/config). */
-function CornerGlow() {
-  const size = "26rem";
-  const radius = "13rem";
-  const corner = "0px";
-
-  return (
-    <div
-      className="pointer-events-none absolute z-0 rounded-full opacity-0 transition-[opacity,transform] duration-500 group-hover:scale-110 group-hover:opacity-100"
-      aria-hidden
-      style={{
-        width: size,
-        height: size,
-        top: `calc(${corner} - ${radius})`,
-        right: `calc(${corner} - ${radius})`,
-        background: CARD_HOVER_GLOW,
-      }}
-    />
-  );
-}
 
 export function Promo() {
   const { open } = useModal();
   return (
-    <div className="grid gap-5 md:grid-cols-2">
+    <div className="grid gap-4 md:grid-cols-2">
       <Reveal>
-        <div className="group relative h-full overflow-hidden rounded-3xl border border-line p-8 sm:p-10">
-          <div className="absolute inset-0 -z-10 bg-gradient-to-br from-panel to-bg-2" />
-          <CornerGlow />
-          <div className="relative z-[1]">
-            <Repeat className="mb-5 text-accent" size={28} />
-            <h3 className="font-display text-2xl font-bold sm:text-3xl">
-              Трейд-ин до 30%
-            </h3>
-            <p className="mt-2 max-w-sm text-sm text-muted">
-              Обменяй старый гаджет на новый. Оценим за пару минут — доплата станет
-              приятным сюрпризом.
-            </p>
-            <button
-              type="button"
-              onClick={() => open("tradein")}
-              className="btn-primary mt-7 group/btn"
-            >
-              Рассчитать оценку
-              <ArrowRight
-                size={18}
-                className="transition-transform group-hover/btn:translate-x-1"
-              />
-            </button>
-          </div>
+        <div className="relative h-full overflow-hidden rounded-[1.75rem] bg-panel px-8 py-12 sm:px-10 sm:py-14">
+          <p className="eyebrow mb-6">Trade-in</p>
+          <CardIcon className="mb-5">
+            <Repeat size={22} strokeWidth={1.5} />
+          </CardIcon>
+          <h3 className="font-display text-3xl font-semibold uppercase tracking-[0.04em] text-ink sm:text-4xl">
+            Трейд-ин до 30%
+          </h3>
+          <p className="mt-3 max-w-sm text-sm leading-relaxed text-muted">
+            Обменяй старый гаджет на новый. Оценка за пару минут — доплата станет
+            приятным сюрпризом.
+          </p>
+          <button
+            type="button"
+            onClick={() => open("tradein")}
+            className="btn-primary mt-8"
+          >
+            Рассчитать
+            <ArrowRight size={14} />
+          </button>
         </div>
       </Reveal>
 
-      <Reveal delay={0.1}>
-        <div className="group relative h-full overflow-hidden rounded-3xl border border-bg-warm/40 p-8 sm:p-10">
-          <div className="absolute inset-0 -z-10 bg-gradient-to-br from-bg-warm to-[#1f1414]" />
-          <CornerGlow />
-          <div className="relative z-[1]">
-            <CreditCard className="mb-5 text-accent" size={28} />
-            <h3 className="font-display text-2xl font-bold sm:text-3xl">
-              Рассрочка 0%
-            </h3>
-            <p className="mt-2 max-w-sm text-sm text-muted">
-              Забирай технику сейчас, плати частями. Без переплат, скрытых
-              комиссий и лишних документов.
-            </p>
-            <Link href="/catalog" className="btn-ghost mt-7 group/btn">
-              Выбрать технику
-              <ArrowRight
-                size={18}
-                className="text-accent transition-transform group-hover/btn:translate-x-1"
-              />
-            </Link>
-          </div>
+      <Reveal delay={0.08}>
+        <div className="relative h-full overflow-hidden rounded-[1.75rem] bg-panel px-8 py-12 sm:px-10 sm:py-14">
+          <p className="eyebrow mb-6">Finance</p>
+          <CardIcon className="mb-5">
+            <CreditCard size={22} strokeWidth={1.5} />
+          </CardIcon>
+          <h3 className="font-display text-3xl font-semibold uppercase tracking-[0.04em] text-ink sm:text-4xl">
+            Рассрочка 0%
+          </h3>
+          <p className="mt-3 max-w-sm text-sm leading-relaxed text-muted">
+            Забирай технику сейчас, плати частями. Без переплат и скрытых
+            комиссий.
+          </p>
+          <Link href="/catalog" className="btn-ghost mt-8">
+            Выбрать
+            <ArrowRight size={14} />
+          </Link>
         </div>
       </Reveal>
     </div>
diff --git a/Client/components/home/Testimonials.tsx b/Client/components/home/Testimonials.tsx
index db110af..0d883e3 100644
--- a/Client/components/home/Testimonials.tsx
+++ b/Client/components/home/Testimonials.tsx
@@ -29,10 +29,10 @@ export function Testimonials({ reviews }: { reviews: Review[] }) {
 
   return (
     <div className="grid items-stretch gap-6 lg:grid-cols-[0.85fr_1.15fr]">
-      <Reveal className="glass flex flex-col justify-between rounded-3xl p-8">
+      <Reveal className="flex flex-col justify-between rounded-[1.75rem] bg-panel p-8">
         <div>
           <p className="eyebrow mb-3">Отзывы</p>
-          <h2 className="font-display text-3xl font-bold tracking-tight sm:text-4xl">
+          <h2 className="font-display text-3xl font-semibold uppercase tracking-[0.04em] sm:text-4xl">
             Нам доверяют
           </h2>
           <p className="mt-3 max-w-sm text-sm leading-relaxed text-muted">
@@ -44,14 +44,14 @@ export function Testimonials({ reviews }: { reviews: Review[] }) {
           <button
             onClick={() => go(-1)}
             aria-label="Предыдущий отзыв"
-            className="grid h-10 w-10 place-items-center rounded-full border border-line text-muted transition-colors hover:border-bg-warm/50 hover:text-accent cursor-pointer"
+            className="grid h-10 w-10 place-items-center rounded-full border border-white/20 text-muted transition-colors hover:border-white/50 hover:text-ink cursor-pointer"
           >
             <ChevronLeft size={18} />
           </button>
           <button
             onClick={() => go(1)}
             aria-label="Следующий отзыв"
-            className="grid h-10 w-10 place-items-center rounded-full border border-line text-muted transition-colors hover:border-bg-warm/50 hover:text-accent cursor-pointer"
+            className="grid h-10 w-10 place-items-center rounded-full border border-white/20 text-muted transition-colors hover:border-white/50 hover:text-ink cursor-pointer"
           >
             <ChevronRight size={18} />
           </button>
@@ -77,7 +77,7 @@ export function Testimonials({ reviews }: { reviews: Review[] }) {
             animate={{ opacity: 1, x: 0 }}
             exit={{ opacity: 0, x: dir * -40 }}
             transition={{ duration: 0.35 }}
-            className="glass relative flex h-full min-h-[18rem] flex-col justify-between rounded-3xl p-8"
+            className="relative flex h-full min-h-[18rem] flex-col justify-between rounded-[1.75rem] bg-panel p-8"
           >
             <Quote
               size={32}
diff --git a/Client/components/modals.tsx b/Client/components/modals.tsx
index f9b83fc..e874bbe 100644
--- a/Client/components/modals.tsx
+++ b/Client/components/modals.tsx
@@ -166,7 +166,7 @@ export function Modal({
           transition={{ duration: 0.2 }}
         >
           <div
-            className="absolute inset-0 bg-black/60 backdrop-blur-md"
+            className="absolute inset-0 bg-[#0a1815]/75 backdrop-blur-md"
             onClick={onClose}
           />
           <motion.div
@@ -181,14 +181,14 @@ export function Modal({
             transition={{ duration: 0.32, ease: [0.22, 1, 0.36, 1] }}
           >
             <div className="mb-5 flex items-start justify-between gap-3">
-              <h2 className="font-display text-lg font-semibold tracking-wide">
+              <h2 className="font-display text-lg font-semibold tracking-wide text-ink">
                 {title}
               </h2>
               <button
                 type="button"
                 onClick={onClose}
                 aria-label="Закрыть"
-                className="grid h-10 w-10 shrink-0 place-items-center rounded-full text-muted transition-colors hover:bg-white/10 hover:text-ink cursor-pointer"
+                className="grid h-10 w-10 shrink-0 place-items-center rounded-full text-muted transition-colors hover:bg-panel hover:text-ink cursor-pointer"
               >
                 <X size={18} />
               </button>
diff --git a/Client/components/product/ProductDetail.tsx b/Client/components/product/ProductDetail.tsx
index 0525940..d281e2b 100644
--- a/Client/components/product/ProductDetail.tsx
+++ b/Client/components/product/ProductDetail.tsx
@@ -15,6 +15,7 @@ import {
 } from "lucide-react";
 import type { Product } from "@/lib/data";
 import { ProductThumb } from "@/components/ProductThumb";
+import { CardIcon } from "@/shared/ui/card-icon";
 import { useCart } from "@/components/store";
 import { formatPrice, cn } from "@/lib/utils";
 import { formatStockLabel } from "@/lib/stock";
@@ -116,7 +117,7 @@ export function ProductDetail({ product }: { product: Product }) {
               />
             )}
             {product.badge && (
-              <span className="absolute left-3 top-3 rounded-full border border-white/20 bg-black/30 px-2.5 py-1 text-[11px] font-semibold backdrop-blur-md sm:left-4 sm:top-4 sm:px-3 sm:text-xs">
+              <span className="absolute left-3 top-3 rounded-2xl border border-white/20 bg-black/30 px-2.5 py-1 text-[11px] font-semibold  sm:left-4 sm:top-4 sm:px-3 sm:text-xs">
                 {product.badge}
               </span>
             )}
@@ -129,7 +130,7 @@ export function ProductDetail({ product }: { product: Product }) {
                 onClick={() => setView(i)}
                 aria-label={`Вид ${i + 1}`}
                 className={cn(
-                  "overflow-hidden rounded-xl border-2 transition-colors cursor-pointer sm:rounded-2xl",
+                  "overflow-hidden rounded-2xl border-2 transition-colors cursor-pointer sm:rounded-2xl",
                   view === i ? "border-cyan" : "border-transparent",
                 )}
               >
@@ -163,7 +164,7 @@ export function ProductDetail({ product }: { product: Product }) {
             <span className="shrink-0">·</span>
             <span className="truncate">{product.category}</span>
           </div>
-          <h1 className="font-display text-[1.65rem] font-bold leading-tight sm:text-4xl">
+          <h1 className="font-display text-[1.65rem] font-semibold uppercase leading-tight tracking-[0.04em] sm:text-4xl">
             {product.name}
           </h1>
 
@@ -175,7 +176,7 @@ export function ProductDetail({ product }: { product: Product }) {
                   size={15}
                   className={cn(
                     k < Math.round(product.rating)
-                      ? "fill-gold text-gold"
+                      ? "fill-ink text-ink"
                       : "text-line",
                   )}
                 />
@@ -200,7 +201,7 @@ export function ProductDetail({ product }: { product: Product }) {
                 <span className="text-base text-faint line-through sm:text-lg">
                   {formatPrice(unitOldPrice)}
                 </span>
-                <span className="rounded-full bg-magenta/15 px-2 py-0.5 text-xs font-semibold text-magenta">
+                <span className="rounded-2xl bg-magenta/15 px-2 py-0.5 text-xs font-semibold text-magenta">
                   −{discount}%
                 </span>
               </span>
@@ -255,7 +256,7 @@ export function ProductDetail({ product }: { product: Product }) {
                     type="button"
                     onClick={() => setMemory(m)}
                     className={cn(
-                      "rounded-xl border px-3.5 py-2 text-sm transition-colors cursor-pointer sm:px-4",
+                      "rounded-2xl border px-3.5 py-2 text-sm transition-colors cursor-pointer sm:px-4",
                       memory === m
                         ? "border-cyan bg-cyan/10 text-ink"
                         : "border-line text-muted hover:border-white/25",
@@ -270,13 +271,13 @@ export function ProductDetail({ product }: { product: Product }) {
 
           {/* Desktop / tablet CTA */}
           <div className="mt-7 hidden items-center gap-3 sm:mt-8 lg:flex lg:flex-wrap">
-            <div className="flex items-center gap-1 rounded-full border border-line p-1">
+            <div className="flex items-center gap-1 rounded-2xl border border-line p-1">
               <button
                 type="button"
                 onClick={decQty}
                 aria-label="Меньше"
                 disabled={!canBuy || qty <= 1}
-                className="grid h-10 w-10 place-items-center rounded-full text-muted transition-colors hover:bg-white/5 hover:text-ink cursor-pointer disabled:cursor-not-allowed disabled:opacity-40"
+                className="grid h-10 w-10 place-items-center rounded-2xl text-muted transition-colors hover:bg-white/5 hover:text-ink cursor-pointer disabled:cursor-not-allowed disabled:opacity-40"
               >
                 <Minus size={16} />
               </button>
@@ -293,7 +294,7 @@ export function ProductDetail({ product }: { product: Product }) {
                     ? `На складе только ${maxQty} шт.`
                     : undefined
                 }
-                className="grid h-10 w-10 place-items-center rounded-full text-muted transition-colors hover:bg-white/5 hover:text-ink cursor-pointer disabled:cursor-not-allowed disabled:opacity-40"
+                className="grid h-10 w-10 place-items-center rounded-2xl text-muted transition-colors hover:bg-white/5 hover:text-ink cursor-pointer disabled:cursor-not-allowed disabled:opacity-40"
               >
                 <Plus size={16} />
               </button>
@@ -313,7 +314,7 @@ export function ProductDetail({ product }: { product: Product }) {
               onClick={() => toggleWishlist(product.id)}
               aria-label="В избранное"
               className={cn(
-                "grid h-[52px] w-[52px] place-items-center rounded-full border transition-colors cursor-pointer",
+                "grid h-[52px] w-[52px] place-items-center rounded-2xl border transition-colors cursor-pointer",
                 wished
                   ? "border-magenta/50 bg-magenta/10"
                   : "border-line hover:border-white/25",
@@ -334,9 +335,11 @@ export function ProductDetail({ product }: { product: Product }) {
             ].map(({ icon: I, t, s }) => (
               <div
                 key={t}
-                className="glass flex flex-col items-center gap-1 rounded-2xl px-1.5 py-3 text-center sm:px-2 sm:py-4"
+                className="bg-panel flex flex-col items-center gap-2 rounded-[1.75rem] px-1.5 py-3 text-center sm:px-2 sm:py-4"
               >
-                <I size={16} className="text-cyan sm:size-[18px]" />
+                <CardIcon size="sm">
+                  <I size={16} strokeWidth={1.5} />
+                </CardIcon>
                 <span className="text-[11px] font-medium leading-tight sm:text-sm">
                   {t}
                 </span>
@@ -355,10 +358,10 @@ export function ProductDetail({ product }: { product: Product }) {
         </h2>
         <div className="grid gap-3 sm:grid-cols-2 sm:gap-4 lg:grid-cols-4">
           {product.specs.map((s) => (
-            <div key={s.label} className="glass rounded-2xl p-4 sm:p-5">
-              <div className="mb-2 flex h-8 w-8 items-center justify-center rounded-lg bg-cyan/15 text-cyan">
-                <Check size={16} strokeWidth={2.5} />
-              </div>
+            <div key={s.label} className="bg-panel rounded-[1.75rem] p-4 sm:p-5">
+              <CardIcon size="sm" className="mb-2">
+                <Check size={16} strokeWidth={1.5} />
+              </CardIcon>
               <p className="text-[10px] uppercase tracking-wider text-faint sm:text-xs">
                 {s.label}
               </p>
@@ -371,15 +374,15 @@ export function ProductDetail({ product }: { product: Product }) {
       </div>
 
       {/* Sticky mobile buy bar */}
-      <div className="fixed inset-x-0 bottom-0 z-40 border-t border-line bg-[#07080f]/95 px-4 py-3 pb-[max(0.75rem,env(safe-area-inset-bottom))] backdrop-blur-xl lg:hidden">
+      <div className="fixed inset-x-0 bottom-0 z-40 border-t border-line bg-[#000000]/95 px-4 py-3 pb-[max(0.75rem,env(safe-area-inset-bottom))]  lg:hidden">
         <div className="mx-auto flex max-w-lg items-center gap-2">
-          <div className="flex shrink-0 items-center gap-0.5 rounded-full border border-line p-0.5">
+          <div className="flex shrink-0 items-center gap-0.5 rounded-2xl border border-line p-0.5">
             <button
               type="button"
               onClick={decQty}
               aria-label="Меньше"
               disabled={!canBuy || qty <= 1}
-              className="grid h-10 w-10 place-items-center rounded-full text-muted cursor-pointer disabled:cursor-not-allowed disabled:opacity-40"
+              className="grid h-10 w-10 place-items-center rounded-2xl text-muted cursor-pointer disabled:cursor-not-allowed disabled:opacity-40"
             >
               <Minus size={16} />
             </button>
@@ -391,7 +394,7 @@ export function ProductDetail({ product }: { product: Product }) {
               onClick={incQty}
               aria-label="Больше"
               disabled={!canBuy || qty >= maxQty}
-              className="grid h-10 w-10 place-items-center rounded-full text-muted cursor-pointer disabled:cursor-not-allowed disabled:opacity-40"
+              className="grid h-10 w-10 place-items-center rounded-2xl text-muted cursor-pointer disabled:cursor-not-allowed disabled:opacity-40"
             >
               <Plus size={16} />
             </button>
@@ -409,7 +412,7 @@ export function ProductDetail({ product }: { product: Product }) {
             onClick={() => toggleWishlist(product.id)}
             aria-label="В избранное"
             className={cn(
-              "grid h-12 w-12 shrink-0 place-items-center rounded-full border cursor-pointer",
+              "grid h-12 w-12 shrink-0 place-items-center rounded-2xl border cursor-pointer",
               wished
                 ? "border-magenta/50 bg-magenta/10"
                 : "border-line",
diff --git a/Client/entities/order/lib/order-status.ts b/Client/entities/order/lib/order-status.ts
index 0559c68..f65bac3 100644
--- a/Client/entities/order/lib/order-status.ts
+++ b/Client/entities/order/lib/order-status.ts
@@ -42,17 +42,17 @@ export function isNewOrderStatus(status: string): boolean {
 export function orderStatusColor(status: string): string | undefined {
   switch (status) {
     case "pending":
-      return "#6b9a7a";
+      return "#e6d5b8";
     case "confirmed":
     case "awaiting_payment":
     case "paid":
-      return "#ad946b";
+      return "#e3792f";
     case "shipping":
-      return "#c4a060";
+      return "#c2a373";
     case "delivered":
-      return "#a89880";
+      return "#8A9A96";
     case "cancelled":
-      return "#b85c5c";
+      return "#c45c5c";
     default:
       return undefined;
   }
diff --git a/Client/features/admin-orders/lib/last-visited-highlight.ts b/Client/features/admin-orders/lib/last-visited-highlight.ts
index 7e938d9..17a789f 100644
--- a/Client/features/admin-orders/lib/last-visited-highlight.ts
+++ b/Client/features/admin-orders/lib/last-visited-highlight.ts
@@ -1,11 +1,11 @@
-/** Подсветка недавно посещённого заказа — палитра логотипа MAZE (#211917 / #2c211f). */
+/** Подсветка недавно посещённого заказа. */
 
 export const lastVisitedOrderCardClass =
-  "border-[#4a3835] bg-[#2c211f] shadow-[0_0_0_1px_rgba(33,25,23,0.5)]";
+  "border-accent/40 bg-panel";
 
 export const lastVisitedOrderRowClass =
-  "bg-[#2c211f] outline outline-1 outline-[#4a3835]";
+  "bg-panel outline outline-1 outline-accent/35";
 
-export const lastVisitedOrderNumberClass = "text-[#d4c4b0]";
+export const lastVisitedOrderNumberClass = "text-ink";
 
-export const lastVisitedOrderBadgeClass = "text-[#a89880]";
+export const lastVisitedOrderBadgeClass = "text-accent";
diff --git a/Client/features/auth/ui/HeaderAuthActions.tsx b/Client/features/auth/ui/HeaderAuthActions.tsx
index aa949ef..21c6dbc 100644
--- a/Client/features/auth/ui/HeaderAuthActions.tsx
+++ b/Client/features/auth/ui/HeaderAuthActions.tsx
@@ -20,7 +20,7 @@ function AuthIconButton({
   className?: string;
 }) {
   const cls = cn(
-    "relative grid h-10 w-10 shrink-0 place-items-center rounded-full text-muted transition-colors hover:bg-white/5 hover:text-ink cursor-pointer",
+    "relative grid h-10 w-10 shrink-0 place-items-center rounded-full text-muted transition-colors hover:bg-panel hover:text-ink cursor-pointer",
     className,
   );
 
diff --git a/Client/features/catalog/ui/CatalogClient.tsx b/Client/features/catalog/ui/CatalogClient.tsx
index 73bfb32..b3c660c 100644
--- a/Client/features/catalog/ui/CatalogClient.tsx
+++ b/Client/features/catalog/ui/CatalogClient.tsx
@@ -195,7 +195,7 @@ export function CatalogClient({
   return (
     <div className="mx-auto grid w-full min-w-0 max-w-7xl gap-8 lg:grid-cols-[15rem_minmax(0,1fr)]">
       <aside className="hidden min-w-0 lg:block lg:w-[15rem] lg:shrink-0">
-        <div className="glass sticky top-24 flex max-h-[calc(100dvh-7rem)] flex-col overflow-hidden rounded-3xl">
+        <div className="border border-line bg-bg-2 sticky top-24 flex max-h-[calc(100dvh-7rem)] flex-col overflow-hidden rounded-2xl">
           {hasActiveFilters && (
             <div className="shrink-0 border-b border-line px-5 pb-4 pt-5">
               <ResetFiltersButton onClick={reset} />
@@ -284,7 +284,7 @@ export function CatalogClient({
             </AnimatePresence>
           </div>
         ) : (
-          <div className="glass grid place-items-center rounded-3xl py-20 text-center">
+          <div className="border border-line bg-panel grid place-items-center rounded-2xl py-20 text-center">
             <p className="text-lg font-medium">Ничего не найдено</p>
             <p className="mt-1 text-sm text-muted">
               Попробуйте изменить фильтры или сбросить их.
diff --git a/Client/features/home-hero/lib/constants.ts b/Client/features/home-hero/lib/constants.ts
index 59c9424..5213e38 100644
--- a/Client/features/home-hero/lib/constants.ts
+++ b/Client/features/home-hero/lib/constants.ts
@@ -4,10 +4,12 @@ export const HERO_VIDEO_SRC = "/media/hero-bg.mp4?v=18cut";
 export const HERO_COPY = {
   badge: "Более 12 000 клиентов нашли свой путь",
   title: "MAZE",
-  subtitle: "Найди свой путь в мире технологий",
-  stats: [
-    ["4.9", "на Яндекс.Маркете"],
-    ["3 года", "гарантия"],
-    ["0%", "рассрочка"],
+  subtitle: "Найди свой путь в мире",
+  subtitleAccent: "технологий",
+  quickLinks: [
+    { href: "/catalog", label: "Каталог" },
+    { href: "/#features", label: "Преимущества" },
+    { href: "/#reviews", label: "Отзывы" },
+    { href: "/account", label: "Кабинет" },
   ] as const,
 } as const;
diff --git a/Client/features/home-hero/ui/HeroVideoBackground.tsx b/Client/features/home-hero/ui/HeroVideoBackground.tsx
index 10e568c..411bfa3 100644
--- a/Client/features/home-hero/ui/HeroVideoBackground.tsx
+++ b/Client/features/home-hero/ui/HeroVideoBackground.tsx
@@ -5,9 +5,11 @@ import { HERO_VIDEO_SRC } from "../lib/constants";
 
 /**
  * Видеофон hero: object-cover + object-center — без растягивания пропорций.
+ * Пауза вне viewport — меньше нагрузка на GPU при скролле 120Hz.
  */
 export function HeroVideoBackground() {
   const videoRef = useRef<HTMLVideoElement>(null);
+  const rootRef = useRef<HTMLDivElement>(null);
   const [ready, setReady] = useState(false);
 
   useEffect(() => {
@@ -21,15 +23,36 @@ export function HeroVideoBackground() {
 
     if (video.readyState >= 2) {
       onReady();
-      return;
+    } else {
+      video.addEventListener("loadeddata", onReady);
     }
 
-    video.addEventListener("loadeddata", onReady);
     return () => video.removeEventListener("loadeddata", onReady);
   }, []);
 
+  useEffect(() => {
+    const root = rootRef.current;
+    const video = videoRef.current;
+    if (!root || !video) return;
+
+    const io = new IntersectionObserver(
+      ([entry]) => {
+        if (!entry) return;
+        if (entry.isIntersecting) {
+          void video.play().catch(() => {});
+        } else {
+          video.pause();
+        }
+      },
+      { rootMargin: "10% 0px", threshold: 0.05 },
+    );
+
+    io.observe(root);
+    return () => io.disconnect();
+  }, []);
+
   return (
-    <div className="pointer-events-none absolute inset-0 overflow-hidden">
+    <div ref={rootRef} className="pointer-events-none absolute inset-0 overflow-hidden">
       <video
         key={HERO_VIDEO_SRC}
         ref={videoRef}
@@ -40,21 +63,11 @@ export function HeroVideoBackground() {
         muted
         loop
         playsInline
-        preload="auto"
+        preload="metadata"
         aria-hidden
       >
         <source src={HERO_VIDEO_SRC} type="video/mp4" />
       </video>
-
-      {/* Зелёный тинт поверх видео */}
-      <div
-        className="absolute inset-0 bg-bg/65"
-        aria-hidden
-      />
-      <div
-        className="absolute inset-0 bg-gradient-to-b from-bg/40 via-transparent to-bg/80"
-        aria-hidden
-      />
     </div>
   );
 }
diff --git a/Client/features/home-hero/ui/HomeHero.tsx b/Client/features/home-hero/ui/HomeHero.tsx
index 178da6b..e2d190b 100644
--- a/Client/features/home-hero/ui/HomeHero.tsx
+++ b/Client/features/home-hero/ui/HomeHero.tsx
@@ -1,11 +1,10 @@
 "use client";
 
 import Link from "next/link";
-import { motion, useReducedMotion } from "motion/react";
+import { motion } from "motion/react";
 import { ArrowRight, Repeat } from "lucide-react";
 import { useModal } from "@/components/modals";
 import { FLUID_EASE } from "@/shared/lib/motion";
-import { SplitText } from "@/shared/ui/split-text";
 import { HERO_COPY } from "../lib/constants";
 import { HeroVideoBackground } from "./HeroVideoBackground";
 
@@ -13,72 +12,82 @@ export function HomeHero() {
   const { open } = useModal();
 
   return (
-    <section className="relative min-h-[min(92vh,920px)] w-full overflow-hidden">
+    <section className="relative -mt-[4.75rem] min-h-[min(100svh,920px)] w-full overflow-hidden sm:-mt-[5.5rem] md:-mt-[5.75rem]">
       <HeroVideoBackground />
+      <div
+        className="pointer-events-none absolute inset-0 bg-gradient-to-r from-black via-black/50 to-transparent"
+        aria-hidden
+      />
+      <div
+        className="pointer-events-none absolute inset-0 bg-gradient-to-t from-black via-transparent to-black/50"
+        aria-hidden
+      />
 
-      <div className="container-x relative z-10 flex min-h-[min(92vh,920px)] flex-col justify-center py-20 md:py-24">
-        <motion.div
-          initial={{ opacity: 0, y: 16 }}
+      <div className="container-x relative z-10 flex min-h-[min(100svh,920px)] flex-col justify-end pb-16 pt-28 sm:justify-center sm:pb-24 sm:pt-32 md:pb-28">
+        <motion.p
+          initial={{ opacity: 0, y: 12 }}
+          animate={{ opacity: 1, y: 0 }}
+          transition={{ duration: 0.5, ease: FLUID_EASE }}
+          className="eyebrow mb-6 max-w-md"
+        >
+          {HERO_COPY.badge}
+        </motion.p>
+
+        <motion.h1
+          initial={{ opacity: 0, y: 24 }}
           animate={{ opacity: 1, y: 0 }}
-          transition={{ duration: 0.6, ease: FLUID_EASE }}
-          className="mb-6 inline-flex w-fit items-center gap-2 rounded-full border border-line/80 bg-panel/40 px-3.5 py-1.5 backdrop-blur-sm"
+          transition={{ duration: 0.65, ease: FLUID_EASE, delay: 0.08 }}
+          className="max-w-4xl"
         >
-          <span className="relative flex h-2 w-2">
-            <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-accent opacity-60" />
-            <span className="relative inline-flex h-2 w-2 rounded-full bg-accent" />
+          <span className="block font-display text-[clamp(3.25rem,12vw,7rem)] font-semibold uppercase leading-[0.92] tracking-[0.04em] text-ink">
+            {HERO_COPY.title}
           </span>
-          <span className="text-xs tracking-wide text-muted">
-            {HERO_COPY.badge}
+          <span className="mt-6 block max-w-lg text-sm font-normal uppercase leading-relaxed tracking-[0.14em] text-muted sm:text-base">
+            {HERO_COPY.subtitle}{" "}
+            <span className="text-accent">{HERO_COPY.subtitleAccent}</span>
           </span>
-        </motion.div>
-
-        <h1 className="max-w-3xl font-display font-bold leading-[1.08]">
-          <SplitText
-            text={HERO_COPY.title}
-            mode="chars"
-            delay={0.06}
-            className="block text-[clamp(3.25rem,12vw,7.5rem)] tracking-[0.06em] text-accent"
-          />
-          <SplitText
-            text={HERO_COPY.subtitle}
-            mode="words"
-            delay={0.38}
-            className="mt-4 block font-sans text-lg font-normal leading-snug tracking-tight text-ink/90 sm:text-2xl"
-          />
-        </h1>
+        </motion.h1>
 
         <motion.div
-          initial={{ opacity: 0, y: 20 }}
+          initial={{ opacity: 0, y: 16 }}
           animate={{ opacity: 1, y: 0 }}
-          transition={{ duration: 0.65, ease: FLUID_EASE, delay: 1.05 }}
-          className="mt-10 flex flex-wrap gap-3"
+          transition={{ duration: 0.55, ease: FLUID_EASE, delay: 0.28 }}
+          className="mt-10 flex flex-wrap items-center gap-3"
         >
           <Link href="/catalog" className="btn-primary group">
-            Перейти в каталог
+            Каталог
             <ArrowRight
-              size={18}
-              className="transition-transform group-hover:translate-x-1"
+              size={14}
+              className="transition-transform group-hover:translate-x-0.5"
             />
           </Link>
-          <button type="button" onClick={() => open("tradein")} className="btn-ghost group">
-            <Repeat size={17} className="text-accent" />
-            Рассчитать трейд-ин
+          <button
+            type="button"
+            onClick={() => open("tradein")}
+            className="btn-ghost group"
+          >
+            <Repeat size={13} />
+            Трейд-ин
           </button>
         </motion.div>
 
-        <motion.dl
+        <motion.nav
           initial={{ opacity: 0 }}
           animate={{ opacity: 1 }}
-          transition={{ duration: 0.8, delay: 1.2 }}
-          className="mt-14 flex flex-wrap gap-8 sm:gap-12"
+          transition={{ duration: 0.7, delay: 0.45 }}
+          className="mt-16 flex flex-wrap items-center gap-x-8 gap-y-3 pt-2"
+          aria-label="Быстрые разделы"
         >
-          {HERO_COPY.stats.map(([v, l]) => (
-            <div key={l}>
-              <dt className="font-display text-2xl font-bold text-accent">{v}</dt>
-              <dd className="text-xs text-faint">{l}</dd>
-            </div>
+          {HERO_COPY.quickLinks.map((item) => (
+            <Link
+              key={item.href}
+              href={item.href}
+              className="text-[10px] font-medium uppercase tracking-[0.24em] text-muted transition-colors hover:text-accent"
+            >
+              + {item.label}
+            </Link>
           ))}
-        </motion.dl>
+        </motion.nav>
       </div>
     </section>
   );
diff --git a/Client/features/not-found-maze/ui/NotFoundMaze.tsx b/Client/features/not-found-maze/ui/NotFoundMaze.tsx
index e1b4281..22c4d24 100644
--- a/Client/features/not-found-maze/ui/NotFoundMaze.tsx
+++ b/Client/features/not-found-maze/ui/NotFoundMaze.tsx
@@ -61,7 +61,7 @@ export function NotFoundMaze() {
           restY={rest.y}
           fit="cover"
           focusY={42}
-          veilColor="#070b0a"
+          veilColor="#000000"
           size={560}
           visibility={4}
           rounded={0}
diff --git a/Client/features/not-found-maze/ui/NotFoundVisitCard.tsx b/Client/features/not-found-maze/ui/NotFoundVisitCard.tsx
index d4b32f3..7568abf 100644
--- a/Client/features/not-found-maze/ui/NotFoundVisitCard.tsx
+++ b/Client/features/not-found-maze/ui/NotFoundVisitCard.tsx
@@ -87,7 +87,7 @@ export function NotFoundVisitCard() {
                 className="size-full"
                 draggable={false}
               />
-              <span className="absolute grid size-7 place-items-center rounded-sm bg-[#1a1210] sm:size-8">
+              <span className="absolute grid size-7 place-items-center rounded-sm bg-[#000000] sm:size-8">
                 <svg
                   viewBox="12 8 24 28"
                   className="size-5 text-accent sm:size-6"
diff --git a/Client/features/not-found-maze/ui/not-found-visit-card.module.css b/Client/features/not-found-maze/ui/not-found-visit-card.module.css
index 0b638aa..b4818f7 100644
--- a/Client/features/not-found-maze/ui/not-found-visit-card.module.css
+++ b/Client/features/not-found-maze/ui/not-found-visit-card.module.css
@@ -9,23 +9,23 @@
   height: 12.75rem;
   overflow: hidden;
   border-radius: 0.85rem;
-  background: #1a1210;
+  background: #000000;
   transform-style: preserve-3d;
   transition: transform 0.35s var(--ease-fluid, cubic-bezier(0.22, 1, 0.36, 1)),
     box-shadow 0.35s var(--ease-fluid, cubic-bezier(0.22, 1, 0.36, 1));
   box-shadow:
     0 18px 40px -18px rgba(0, 0, 0, 0.7),
-    0 0 0 1px rgba(201, 170, 120, 0.12);
+    0 0 0 1px rgba(227, 121, 47, 0.2);
 }
 
 .card:hover,
 .card:focus-within {
   box-shadow:
     0 22px 48px -16px rgba(0, 0, 0, 0.75),
-    0 0 28px -6px rgba(201, 170, 120, 0.45);
+    0 0 28px -6px rgba(227, 121, 47, 0.4);
 }
 
-/* Uiverse rotating bar → bronze/bordo, not cyan/magenta */
+/* Uiverse rotating bar → champagne gold */
 .card::before {
   content: "";
   position: absolute;
@@ -35,10 +35,10 @@
   height: 160%;
   background-image: linear-gradient(
     180deg,
-    #e0c48c,
-    #c9aa78 42%,
-    #5c3838 78%,
-    #c9aa78
+    #e6a06a,
+    #e3792f 42%,
+    #2d3e33 78%,
+    #e3792f
   );
   animation: rot-edge 3.6s linear infinite;
 }
@@ -49,7 +49,7 @@
   inset: 2px;
   z-index: 0;
   border-radius: 0.72rem;
-  background: #1a1210;
+  background: #000000;
 }
 
 .face {
@@ -69,7 +69,7 @@
   inset: auto -18% -42% auto;
   width: 78%;
   height: auto;
-  color: #c9aa78;
+  color: #e3792f;
   opacity: 0.07;
   pointer-events: none;
 }
diff --git a/Client/lib/data.ts b/Client/lib/data.ts
index 781ac02..428060e 100644
--- a/Client/lib/data.ts
+++ b/Client/lib/data.ts
@@ -224,7 +224,7 @@ export const products: Product[] = [
     badge: null,
     rating: 4.7,
     reviews: 176,
-    tint: ["#1c1c1c", "#c9962f"],
+    tint: ["#1a2b23", "#c9962f"],
     glyph: "Major V",
     colors: [
       { name: "Black", hex: "#171717" },
@@ -394,7 +394,7 @@ export const products: Product[] = [
     tint: ["#1a1a1a", "#b98a2e"],
     glyph: "Stanmore III",
     colors: [
-      { name: "Black", hex: "#161616" },
+      { name: "Black", hex: "#0e1f16" },
       { name: "Cream", hex: "#e7dcc3" },
     ],
     specs: [
diff --git a/Client/lib/site-source.ts b/Client/lib/site-source.ts
index 7ed0e1f..193b354 100644
--- a/Client/lib/site-source.ts
+++ b/Client/lib/site-source.ts
@@ -86,7 +86,7 @@ const CATEGORY_ICONS: Record<string, string> = {
   used: "recycle",
 };
 
-const REVIEW_HUES = ["#ad946b", "#5c3838", "#6b9a7a", "#8a7355", "#c4a87a", "#2b1a1a"];
+const REVIEW_HUES = ["#080C0D", "#0D1516", "#122322", "#A8BDB4", "#6D8580", "#E8EEEC"];
 
 function initials(name: string): string {
   return name
diff --git a/Client/shared/config/brand-colors.ts b/Client/shared/config/brand-colors.ts
index acbb456..a6826c1 100644
--- a/Client/shared/config/brand-colors.ts
+++ b/Client/shared/config/brand-colors.ts
@@ -1,41 +1,38 @@
-/** Фирменные цвета MAZE (визитка) */
+/** MAZE — forest + Pumpkin Spice */
 export const BRAND = {
   green: {
-    base: "#1a2421",
-    panel: "#1e2a26",
-    soft: "#243530",
-    mid: "#6b9a7a",
+    base: "#0E1D1A",
+    panel: "#0A1613",
+    soft: "#0B1815",
+    mid: "#101F1C",
   },
   warm: {
-    base: "#2b1a1a",
-    /** Красно-коричневый для hover-пятна (#2b1d1d) */
-    hover: "#2b1d1d",
-    mid: "#5c3838",
-    glow: "rgba(92, 56, 56, 0.45)",
-    shadow: "rgba(92, 56, 56, 0.32)",
+    base: "#091411",
+    hover: "#0B1815",
+    mid: "#152623",
+    glow: "rgba(227, 121, 47, 0.14)",
+    shadow: "rgba(0, 0, 0, 0.5)",
   },
   gold: {
-    base: "#c9aa78",
-    light: "#dcc498",
-    dark: "#9a8058",
+    base: "#E3792F",
+    light: "#F08A45",
+    dark: "#C46520",
   },
 } as const;
 
-/** Угловое свечение при hover — один bordo, без золота */
-export const CARD_HOVER_GLOW = `radial-gradient(circle at center, ${BRAND.warm.glow} 0%, rgba(43, 29, 29, 0.28) 38%, transparent 72%)`;
+export const CARD_HOVER_GLOW = `radial-gradient(circle at center, ${BRAND.warm.glow} 0%, rgba(0, 0, 0, 0.55) 45%, transparent 72%)`;
 
-/** Градиенты иконок категорий — только зелёный · бронза · bordo */
 export const CATEGORY_TINTS: Record<string, [string, string]> = {
-  apple: ["#c4a87a", "#8a7355"],
-  samsung: ["#ad946b", "#5c3838"],
-  sony: ["#8a7355", "#5c3838"],
-  marshall: ["#c4a87a", "#ad946b"],
-  dyson: ["#6b9a7a", "#243530"],
-  harman: ["#ad946b", "#2b1a1a"],
-  gaming: ["#5c3838", "#8a7355"],
-  console: ["#5c3838", "#8a7355"],
-  accessories: ["#8a7355", "#5c3838"],
-  used: ["#6b9a7a", "#243530"],
+  apple: ["#1C302C", "#0A1815"],
+  samsung: ["#E3792F", "#152623"],
+  sony: ["#F0EDE6", "#0A1815"],
+  marshall: ["#9A9588", "#000000"],
+  dyson: ["#1C302C", "#000000"],
+  harman: ["#E3792F", "#070F0E"],
+  gaming: ["#243A36", "#9A9588"],
+  console: ["#152623", "#E3792F"],
+  accessories: ["#0A1815", "#243A36"],
+  used: ["#9A9588", "#000000"],
 };
 
-export const DEFAULT_CATEGORY_TINT: [string, string] = ["#ad946b", "#5c3838"];
+export const DEFAULT_CATEGORY_TINT: [string, string] = ["#1C302C", "#0A1815"];
diff --git a/Client/shared/ui/card-icon/CardIcon.tsx b/Client/shared/ui/card-icon/CardIcon.tsx
new file mode 100644
index 0000000..f0980b5
--- /dev/null
+++ b/Client/shared/ui/card-icon/CardIcon.tsx
@@ -0,0 +1,30 @@
+import type { ReactNode } from "react";
+import { cn } from "@/lib/utils";
+
+export type CardIconSize = "sm" | "md" | "lg";
+
+const SIZE: Record<CardIconSize, string> = {
+  sm: "card-icon--sm",
+  md: "",
+  lg: "card-icon--lg",
+};
+
+/**
+ * Иконка на карточках: акцент-круг + тёмная обводка (как кнопка «+»).
+ * Shared UI — без бизнес-логики.
+ */
+export function CardIcon({
+  children,
+  size = "md",
+  className,
+}: {
+  children: ReactNode;
+  size?: CardIconSize;
+  className?: string;
+}) {
+  return (
+    <span className={cn("card-icon", SIZE[size], className)} aria-hidden>
+      {children}
+    </span>
+  );
+}
diff --git a/Client/shared/ui/card-icon/index.ts b/Client/shared/ui/card-icon/index.ts
new file mode 100644
index 0000000..150e511
--- /dev/null
+++ b/Client/shared/ui/card-icon/index.ts
@@ -0,0 +1 @@
+export { CardIcon, type CardIconSize } from "./CardIcon";
diff --git a/Client/shared/ui/mobile-drawer/MobileDrawer.tsx b/Client/shared/ui/mobile-drawer/MobileDrawer.tsx
index 9188678..128e342 100644
--- a/Client/shared/ui/mobile-drawer/MobileDrawer.tsx
+++ b/Client/shared/ui/mobile-drawer/MobileDrawer.tsx
@@ -11,8 +11,8 @@ import {
 } from "@/shared/lib/client-mounted";
 import { cn } from "@/lib/utils";
 
-const PANEL_BG = "#1e2a26";
-const SCRIM_BG = "rgba(21, 29, 26, 0.92)";
+const PANEL_BG = "#0d1e1b";
+const SCRIM_BG = "#000000";
 
 export type MobileDrawerProps = {
   open: boolean;
diff --git a/Client/shared/ui/smooth-scroll/SmoothScroll.tsx b/Client/shared/ui/smooth-scroll/SmoothScroll.tsx
index c7c549e..638c490 100644
--- a/Client/shared/ui/smooth-scroll/SmoothScroll.tsx
+++ b/Client/shared/ui/smooth-scroll/SmoothScroll.tsx
@@ -2,20 +2,19 @@
 
 import { useEffect, type ReactNode } from "react";
 import Lenis from "lenis";
+import "lenis/dist/lenis.css";
 import { useReducedMotion } from "motion/react";
 
 /**
  * Плавный скролл только на десктопе (колесо / трекпад).
- * На таче, Telegram WebView и coarse-pointer — нативный скролл:
- * Lenis + инерция ОС дают дёрганья при резком вниз↔вверх.
+ * На таче, Telegram WebView и coarse-pointer — нативный скролл.
+ * lerp + autoRaf — отзывчивее на 120Hz, без тяжёлого duration.
  */
 function shouldUseLenis(): boolean {
   if (typeof window === "undefined") return false;
-  // Тач / «толстый» указатель (телефоны, часть планшетов)
   if (window.matchMedia("(hover: none), (pointer: coarse)").matches) {
     return false;
   }
-  // Узкий экран даже с мышью (DevTools, складные)
   if (window.matchMedia("(max-width: 768px)").matches) return false;
   return true;
 }
@@ -27,27 +26,18 @@ export function SmoothScroll({ children }: { children: ReactNode }) {
     if (reduce || !shouldUseLenis()) return;
 
     const lenis = new Lenis({
-      duration: 1.15,
-      easing: (t) => Math.min(1, 1.001 - 2 ** (-10 * t)),
+      // Без duration: lerp следует за кадром дисплея (60/120Hz)
+      lerp: 0.12,
       smoothWheel: true,
-      // Явно: не трогаем тач-инерцию (Telegram / iOS / Android)
       syncTouch: false,
       touchMultiplier: 1,
+      wheelMultiplier: 0.92,
+      autoRaf: true,
+      overscroll: true,
     });
 
-    document.documentElement.classList.add("lenis", "lenis-smooth");
-
-    let raf = 0;
-    const frame = (time: number) => {
-      lenis.raf(time);
-      raf = requestAnimationFrame(frame);
-    };
-    raf = requestAnimationFrame(frame);
-
     return () => {
-      cancelAnimationFrame(raf);
       lenis.destroy();
-      document.documentElement.classList.remove("lenis", "lenis-smooth");
     };
   }, [reduce]);
 

From 10ae0d6b2f9d2be20ae1704df6a18086f5526593 Mon Sep 17 00:00:00 2001
From: Nikita <Matigulin2018@mail.ru>
Date: Fri, 4 Sep 2026 14:25:03 +0300
Subject: [PATCH 4/6] =?UTF-8?q?fix(client):=20=D0=BE=D1=82=D0=BA=D0=BB?=
 =?UTF-8?q?=D1=8E=D1=87=D0=B8=D1=82=D1=8C=20=D0=BA=D1=8D=D1=88=20HTML/CSS?=
 =?UTF-8?q?=20=D0=B2=20Safari=20=D0=B2=20development.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

В dev Safari держал старые стили рядом с Chrome; no-store headers и комментарий CTA под Pumpkin Spice.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 Client/app/globals.css |  2 +-
 Client/next.config.ts  | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Client/app/globals.css b/Client/app/globals.css
index 560789f..1cbd8ad 100644
--- a/Client/app/globals.css
+++ b/Client/app/globals.css
@@ -287,7 +287,7 @@ select:focus-visible {
     box-shadow: none;
   }
 
-  /* Yamaha: CTA — champagne gold outline */
+  /* CTA — Pumpkin Spice outline */
   .btn-primary {
     display: inline-flex;
     align-items: center;
diff --git a/Client/next.config.ts b/Client/next.config.ts
index 16f04d4..36d97a2 100644
--- a/Client/next.config.ts
+++ b/Client/next.config.ts
@@ -31,6 +31,22 @@ const nextConfig: NextConfig = {
       { protocol: "https", hostname: "*.onrender.com", pathname: "/uploads/**" },
     ],
   },
+  async headers() {
+    // Safari агрессивно кэширует HTML/CSS в dev → «старый» дизайн рядом с Chrome
+    if (process.env.NODE_ENV !== "development") return [];
+    return [
+      {
+        source: "/:path*",
+        headers: [
+          {
+            key: "Cache-Control",
+            value: "no-store, no-cache, must-revalidate, max-age=0",
+          },
+          { key: "Pragma", value: "no-cache" },
+        ],
+      },
+    ];
+  },
   async rewrites() {
     return [
       {

From 4b2379010be1d1a1747b47704b1b54016232e512 Mon Sep 17 00:00:00 2001
From: Nikita <Matigulin2018@mail.ru>
Date: Fri, 4 Sep 2026 15:24:04 +0300
Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=D0=B7=D0=B0=D0=BA=D1=80=D1=8B=D1=82?=
 =?UTF-8?q?=D1=8C=20=D0=B7=D0=B0=D0=BC=D0=B5=D1=87=D0=B0=D0=BD=D0=B8=D1=8F?=
 =?UTF-8?q?=20CodeRabbit=20=D0=BF=D0=BE=20=D0=BA=D0=BE=D1=80=D0=B7=D0=B8?=
 =?UTF-8?q?=D0=BD=D0=B5,=20a11y=20=D0=B8=20=D0=B4=D0=B5=D0=BF=D0=BB=D0=BE?=
 =?UTF-8?q?=D1=8E.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Устранены гонки корзины/checkout, неверные варианты и idempotency, усилены фокус/zoom и безопасные дефолты compose/Docker.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 Client/.npmrc                                 |  1 -
 Client/README.md                              | 39 +++-----
 Client/app/(storefront)/catalog/page.tsx      |  1 +
 Client/app/layout.tsx                         |  4 +-
 Client/components/Footer.tsx                  | 37 +++++---
 Client/components/Header.tsx                  |  1 +
 Client/components/MiniCart.tsx                |  1 +
 Client/components/ProductCard.tsx             | 92 ++++++++++---------
 Client/components/ProductThumb.tsx            |  9 +-
 Client/components/TradeInModal.tsx            | 11 ++-
 Client/components/admin/AdminContentPages.tsx |  1 +
 .../components/admin/AdminInventoryPages.tsx  |  5 +-
 Client/components/admin/AdminOrdersPages.tsx  | 12 ++-
 Client/components/admin/AdminShell.tsx        |  6 +-
 Client/components/home/CategoryGrid.tsx       |  4 +-
 Client/components/modals.tsx                  | 51 +++++++++-
 Client/components/product/ProductDetail.tsx   | 30 +++---
 Client/components/staff/StaffAuthProvider.tsx | 48 ++++++----
 .../account-orders/model/use-user-orders.ts   | 11 ++-
 Client/features/account/ui/AccountClient.tsx  | 38 ++++++--
 .../auth/model/user-auth-provider.tsx         | 14 +--
 Client/features/cart/api/cart-api.ts          | 21 +++--
 Client/features/cart/model/cart-provider.tsx  | 46 ++++++++--
 Client/features/cart/ui/CartClient.tsx        | 28 +++++-
 .../features/catalog-filters/ui/CheckRow.tsx  |  1 +
 .../catalog-search/lib/format-brand-hint.ts   |  6 +-
 .../catalog-search/ui/RotatingBrandHint.tsx   | 11 ++-
 Client/features/catalog/ui/CatalogClient.tsx  |  1 +
 Client/features/checkout/api/checkout-api.ts  | 31 ++++++-
 Client/lib/admin/client.ts                    | 18 +++-
 Client/lib/admin/types.ts                     |  2 +
 Client/lib/admin/ui.tsx                       | 36 +++++++-
 Client/lib/api.ts                             | 13 ++-
 Client/lib/catalog-source.ts                  |  1 +
 Client/lib/data.ts                            |  6 +-
 Client/lib/site-source.ts                     | 27 ++++--
 .../shared/ui/image-spotlight/lib/easing.ts   | 29 +++++-
 .../shared/ui/mobile-drawer/MobileDrawer.tsx  | 62 ++++++++++++-
 Client/shared/ui/split-text/SplitText.tsx     | 20 +++-
 .../widgets/authenticated-cart-provider.tsx   |  1 +
 Server/Dockerfile                             |  9 +-
 Server/docker-compose.yml                     |  4 +-
 Server/sequelize-cli.cjs                      |  3 +-
 Server/src/services/admin-products.service.ts | 20 +++-
 docker-compose.yml                            | 14 +--
 45 files changed, 596 insertions(+), 230 deletions(-)

diff --git a/Client/.npmrc b/Client/.npmrc
index 09b35cd..b215581 100644
--- a/Client/.npmrc
+++ b/Client/.npmrc
@@ -1,2 +1 @@
-audit=false
 fund=false
diff --git a/Client/README.md b/Client/README.md
index e215bc4..56bab1d 100644
--- a/Client/README.md
+++ b/Client/README.md
@@ -1,36 +1,23 @@
-This is a [Next.js](https://nextjs.org) project bootstrapped with [`create-next-app`](https://nextjs.org/docs/app/api-reference/cli/create-next-app).
+# MAZE Client
 
-## Getting Started
+Storefront и админка магазина MAZE на Next.js (App Router).
 
-First, run the development server:
+## Запуск
+
+Из корня репозитория подними API (`Server/`, порт 4000), затем:
 
 ```bash
+cd Client
+npm install
 npm run dev
-# or
-yarn dev
-# or
-pnpm dev
-# or
-bun dev
 ```
 
-Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
-
-You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.
-
-This project uses [`next/font`](https://nextjs.org/docs/app/building-your-application/optimizing/fonts) to automatically optimize and load [Geist](https://vercel.com/font), a new font family for Vercel.
-
-## Learn More
-
-To learn more about Next.js, take a look at the following resources:
-
-- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
-- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
-
-You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js) - your feedback and contributions are welcome!
+Открой [http://localhost:3000](http://localhost:3000).
 
-## Deploy on Vercel
+Переменные окружения — см. `.env.example` (URL API, публичный origin).
 
-The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.
+## Скрипты
 
-Check out our [Next.js deployment documentation](https://nextjs.org/docs/app/building-your-application/deploying) for more details.
+- `npm run dev` — development
+- `npm run build` / `npm start` — production
+- `npm run lint` — ESLint
diff --git a/Client/app/(storefront)/catalog/page.tsx b/Client/app/(storefront)/catalog/page.tsx
index 1526bf2..792295d 100644
--- a/Client/app/(storefront)/catalog/page.tsx
+++ b/Client/app/(storefront)/catalog/page.tsx
@@ -26,6 +26,7 @@ export default async function CatalogPage({
       </div>
 
       <CatalogClient
+        key={`${sp.q ?? ""}:${sp.cat ?? ""}`}
         products={products}
         initialQuery={sp.q ?? ""}
         initialCat={sp.cat}
diff --git a/Client/app/layout.tsx b/Client/app/layout.tsx
index 6fc20e5..c98c228 100644
--- a/Client/app/layout.tsx
+++ b/Client/app/layout.tsx
@@ -24,12 +24,9 @@ export const metadata: Metadata = {
     "MAZE — премиальный магазин техники. Apple, Samsung, Sony, Marshall, Dyson, Harman Kardon. Трейд-ин, рассрочка, доставка по РФ.",
 };
 
-/** Без pinch / double-tap zoom на мобилке (витрина + админка). */
 export const viewport: Viewport = {
   width: "device-width",
   initialScale: 1,
-  maximumScale: 1,
-  userScalable: false,
   viewportFit: "cover",
 };
 
@@ -38,6 +35,7 @@ export default async function RootLayout({
 }: Readonly<{
   children: React.ReactNode;
 }>) {
+  // fetchSiteChrome при недоступном API отдаёт mock chrome
   const siteData = await fetchSiteChrome();
 
   return (
diff --git a/Client/components/Footer.tsx b/Client/components/Footer.tsx
index ed50f21..853f85f 100644
--- a/Client/components/Footer.tsx
+++ b/Client/components/Footer.tsx
@@ -47,7 +47,9 @@ function mapHref(city: string, address: string, lat: number, lng: number) {
 
 function brandCatalogHref(name: string, categories: NavCategory[]): string | null {
   const normalized = name.trim().toLowerCase();
+  if (!normalized) return null;
   const compact = normalized.replace(/[^a-z0-9а-яё]+/gi, "");
+  if (!compact) return null;
   const match = categories.find((c) => {
     const slug = c.slug.toLowerCase();
     const catName = c.name.toLowerCase();
@@ -150,6 +152,7 @@ export function Footer() {
 
   const hasTelegram = Boolean(STORE.telegram);
   const hasEmail = Boolean(STORE.email);
+  const hasPhone = Boolean(STORE.phone?.trim());
 
   return (
     <footer className="relative mt-28 overflow-hidden border-t border-line bg-bg-2">
@@ -204,10 +207,12 @@ export function Footer() {
                 Ответим по телефону или в мессенджере
               </p>
               <div className="mt-3 flex flex-wrap gap-2">
-                <a href={tel} className="btn-primary !px-4 !py-2.5 text-xs">
-                  <Phone size={14} />
-                  Позвонить
-                </a>
+                {hasPhone ? (
+                  <a href={tel} className="btn-primary !px-4 !py-2.5 text-xs">
+                    <Phone size={14} />
+                    Позвонить
+                  </a>
+                ) : null}
                 {hasTelegram ? (
                   <a
                     href={STORE.telegram}
@@ -233,17 +238,19 @@ export function Footer() {
 
           <NavSection title="Контакты" collapsible defaultOpen>
             <ul className="space-y-1">
-              <li>
-                <a
-                  href={tel}
-                  className="flex min-h-11 min-w-0 items-center gap-2.5 text-sm font-medium text-ink transition-colors hover:text-accent md:min-h-0"
-                >
-                  <Phone size={15} className="shrink-0 text-accent" />
-                  <span className="min-w-0 break-words">
-                    Позвонить · {STORE.phone}
-                  </span>
-                </a>
-              </li>
+              {hasPhone ? (
+                <li>
+                  <a
+                    href={tel}
+                    className="flex min-h-11 min-w-0 items-center gap-2.5 text-sm font-medium text-ink transition-colors hover:text-accent md:min-h-0"
+                  >
+                    <Phone size={15} className="shrink-0 text-accent" />
+                    <span className="min-w-0 break-words">
+                      Позвонить · {STORE.phone}
+                    </span>
+                  </a>
+                </li>
+              ) : null}
               {hasEmail ? (
                 <li>
                   <a
diff --git a/Client/components/Header.tsx b/Client/components/Header.tsx
index e207d93..0b66bd4 100644
--- a/Client/components/Header.tsx
+++ b/Client/components/Header.tsx
@@ -219,6 +219,7 @@ export function Header() {
         onClose={closeMobile}
         rootClassName="md:hidden"
         panelClassName="w-[min(100vw-2.5rem,20rem)] max-w-[20rem] rounded-l-3xl"
+        aria-label="Навигация"
       >
         <div className="shrink-0 border-b border-line px-5 py-5">
           <div className="flex items-center justify-between">
diff --git a/Client/components/MiniCart.tsx b/Client/components/MiniCart.tsx
index f8b3f03..e3309a7 100644
--- a/Client/components/MiniCart.tsx
+++ b/Client/components/MiniCart.tsx
@@ -18,6 +18,7 @@ export function MiniCart() {
       open={miniOpen}
       onClose={() => setMiniOpen(false)}
       panelClassName="w-full max-w-md"
+      aria-label="Корзина"
     >
       <header className="flex shrink-0 items-center justify-between border-b border-line px-5 py-4">
         <div className="flex items-center gap-2">
diff --git a/Client/components/ProductCard.tsx b/Client/components/ProductCard.tsx
index 21cecfa..496e21b 100644
--- a/Client/components/ProductCard.tsx
+++ b/Client/components/ProductCard.tsx
@@ -19,11 +19,13 @@ import { formatStockLabel } from "@/lib/stock";
 
 /**
  * Premium product showcase — cinematic, minimal chrome.
+ * Кнопки избранного/корзины вне Link (a11y: без вложенных interactive).
  */
 export function ProductCard({ product }: { product: Product }) {
   const reduce = useReducedMotion();
   const { addItem, toggleWishlist, isWished, items } = useCart();
   const [tiltOk, setTiltOk] = useState(false);
+  const href = `/product/${product.slug}`;
 
   const mx = useMotionValue(0);
   const my = useMotionValue(0);
@@ -82,27 +84,24 @@ export function ProductCard({ product }: { product: Product }) {
       }
       className="group relative h-full w-full max-w-full min-w-0"
     >
-      <Link
-        href={`/product/${product.slug}`}
-        className="product-showcase flex h-full min-w-0 flex-col overflow-hidden transition-transform duration-500"
-      >
+      <div className="product-showcase flex h-full min-w-0 flex-col overflow-hidden transition-transform duration-500">
         <div className="relative shrink-0 overflow-hidden">
-          <div className="transition-transform duration-500 ease-out group-hover:scale-[1.04]">
-            <ProductThumb product={product} className="aspect-[4/5] w-full sm:aspect-square" />
-          </div>
+          <Link href={href} className="block transition-transform duration-500 ease-out group-hover:scale-[1.04]">
+            <ProductThumb
+              product={product}
+              className="aspect-[4/5] w-full sm:aspect-square"
+            />
+          </Link>
           {product.badge || salePct != null ? (
-            <span className="absolute left-3 top-3 text-[10px] font-medium uppercase tracking-[0.18em] text-ink">
+            <span className="pointer-events-none absolute left-3 top-3 text-[10px] font-medium uppercase tracking-[0.18em] text-ink">
               {salePct != null ? `−${salePct}%` : product.badge}
             </span>
           ) : null}
           <button
             type="button"
             aria-label={wished ? "Убрать из избранного" : "В избранное"}
-            onClick={(e) => {
-              e.preventDefault();
-              toggleWishlist(product.id);
-            }}
-            className="absolute right-2 top-2 grid h-9 w-9 place-items-center rounded-full bg-bg-2 text-ink transition-colors hover:bg-panel cursor-pointer"
+            onClick={() => toggleWishlist(product.id)}
+            className="absolute right-2 top-2 z-10 grid h-9 w-9 place-items-center rounded-full bg-bg-2 text-ink transition-colors hover:bg-panel cursor-pointer"
           >
             <Heart
               size={15}
@@ -113,38 +112,42 @@ export function ProductCard({ product }: { product: Product }) {
         </div>
 
         <div className="flex min-w-0 flex-1 flex-col gap-2 p-4 sm:p-5">
-          <p
-            className="truncate text-[10px] uppercase tracking-[0.2em] text-faint"
-            title={meta}
-          >
-            {meta}
-          </p>
-          <h3 className="line-clamp-2 min-h-[2.75rem] font-display text-base font-semibold uppercase leading-snug tracking-[0.04em] text-ink sm:text-lg">
-            {product.name}
-          </h3>
-          <div className="flex min-w-0 items-center gap-2 text-[11px] text-muted">
-            <span className="inline-flex items-center gap-1">
-              <Star size={11} className="fill-accent text-accent" />
-              {product.rating.toFixed(1)}
-            </span>
-            <span className="text-line">|</span>
-            <span
-              className={cn(
-                "min-w-0 truncate",
-                (product.quantityAvailable ?? 0) > 0 ? "text-muted" : "text-faint",
-              )}
+          <Link href={href} className="min-w-0 space-y-2">
+            <p
+              className="truncate text-[10px] uppercase tracking-[0.2em] text-faint"
+              title={meta}
             >
-              <span className="sm:hidden">
-                {formatStockCompact(product.quantityAvailable)}
+              {meta}
+            </p>
+            <h3 className="line-clamp-2 min-h-[2.75rem] font-display text-base font-semibold uppercase leading-snug tracking-[0.04em] text-ink sm:text-lg">
+              {product.name}
+            </h3>
+            <div className="flex min-w-0 items-center gap-2 text-[11px] text-muted">
+              <span className="inline-flex items-center gap-1">
+                <Star size={11} className="fill-accent text-accent" />
+                {product.rating.toFixed(1)}
               </span>
-              <span className="hidden sm:inline">
-                {formatStockLabel(product.quantityAvailable)}
+              <span className="text-line">|</span>
+              <span
+                className={cn(
+                  "min-w-0 truncate",
+                  (product.quantityAvailable ?? 0) > 0
+                    ? "text-muted"
+                    : "text-faint",
+                )}
+              >
+                <span className="sm:hidden">
+                  {formatStockCompact(product.quantityAvailable)}
+                </span>
+                <span className="hidden sm:inline">
+                  {formatStockLabel(product.quantityAvailable)}
+                </span>
               </span>
-            </span>
-          </div>
+            </div>
+          </Link>
 
           <div className="mt-auto flex min-w-0 items-end justify-between gap-3 pt-4">
-            <div className="min-w-0">
+            <Link href={href} className="min-w-0">
               <div className="font-display text-xl font-semibold tabular-nums tracking-tight text-ink sm:text-2xl">
                 {formatPrice(product.price)}
               </div>
@@ -153,7 +156,7 @@ export function ProductCard({ product }: { product: Product }) {
                   {formatPrice(product.oldPrice)}
                 </div>
               ) : null}
-            </div>
+            </Link>
             <button
               type="button"
               disabled={!canAdd}
@@ -164,13 +167,12 @@ export function ProductCard({ product }: { product: Product }) {
                     ? "В корзине максимум по остатку"
                     : "Нет в наличии"
               }
-              onClick={(e) => {
-                e.preventDefault();
+              onClick={() => {
                 if (!canAdd) return;
                 void addItem(product);
               }}
               className={cn(
-                "grid h-10 w-10 shrink-0 place-items-center rounded-full transition-all duration-300",
+                "relative z-10 grid h-10 w-10 shrink-0 place-items-center rounded-full transition-all duration-300",
                 canAdd
                   ? "cursor-pointer border-[1.5px] border-[#1a221f] bg-accent text-bg opacity-95 hover:opacity-100 group-hover:opacity-100"
                   : "cursor-not-allowed border border-line text-faint opacity-40",
@@ -180,7 +182,7 @@ export function ProductCard({ product }: { product: Product }) {
             </button>
           </div>
         </div>
-      </Link>
+      </div>
     </motion.div>
   );
 }
diff --git a/Client/components/ProductThumb.tsx b/Client/components/ProductThumb.tsx
index 75a2f11..42cb5b5 100644
--- a/Client/components/ProductThumb.tsx
+++ b/Client/components/ProductThumb.tsx
@@ -79,8 +79,9 @@ export function ProductThumb({
   glyphClassName?: string;
   angle?: number;
 }) {
-  const [failed, setFailed] = useState(false);
-  const showPhoto = Boolean(product.imageUrl) && !failed;
+  const imageUrl = product.imageUrl ?? null;
+  const [failedUrl, setFailedUrl] = useState<string | null>(null);
+  const showPhoto = Boolean(imageUrl) && failedUrl !== imageUrl;
 
   if (!showPhoto) {
     return (
@@ -101,12 +102,12 @@ export function ProductThumb({
       )}
     >
       <Image
-        src={product.imageUrl!}
+        src={imageUrl!}
         alt={product.name ?? product.glyph}
         fill
         className="object-cover"
         sizes="(max-width: 768px) 50vw, 25vw"
-        onError={() => setFailed(true)}
+        onError={() => setFailedUrl(imageUrl)}
       />
     </div>
   );
diff --git a/Client/components/TradeInModal.tsx b/Client/components/TradeInModal.tsx
index 8fc9628..2376162 100644
--- a/Client/components/TradeInModal.tsx
+++ b/Client/components/TradeInModal.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { useEffect, useState } from "react";
+import { useRouter } from "next/navigation";
 import { Modal } from "./modals";
 import { Field, fieldCls } from "./Field";
 import { PhoneNationalField } from "./PhoneNationalField";
@@ -22,6 +23,7 @@ export function TradeInModal({
   open: boolean;
   onClose: () => void;
 }) {
+  const router = useRouter();
   const [step, setStep] = useState<"form" | "result">("form");
   const [device, setDevice] = useState("");
   const [condition, setCondition] = useState(CONDITIONS[0].label);
@@ -145,7 +147,14 @@ export function TradeInModal({
             >
               Другое
             </button>
-            <button onClick={close} className="btn-primary flex-1">
+            <button
+              type="button"
+              onClick={() => {
+                close();
+                router.push("/catalog");
+              }}
+              className="btn-primary flex-1"
+            >
               В каталог
             </button>
           </div>
diff --git a/Client/components/admin/AdminContentPages.tsx b/Client/components/admin/AdminContentPages.tsx
index e497b42..c32f5b2 100644
--- a/Client/components/admin/AdminContentPages.tsx
+++ b/Client/components/admin/AdminContentPages.tsx
@@ -314,6 +314,7 @@ export function SlidesPage() {
   }, []); // eslint-disable-line react-hooks/exhaustive-deps
   async function save(e: FormEvent) {
     e.preventDefault();
+    setError("");
     try {
       if (editing) await api.updateSlide(editing.id, form);
       else await api.createSlide(form);
diff --git a/Client/components/admin/AdminInventoryPages.tsx b/Client/components/admin/AdminInventoryPages.tsx
index d9352ce..2555c87 100644
--- a/Client/components/admin/AdminInventoryPages.tsx
+++ b/Client/components/admin/AdminInventoryPages.tsx
@@ -93,12 +93,11 @@ export function StockPage() {
         slug: applied.slug.trim() || undefined,
         inStock: applied.inStock || undefined,
       });
-      const details = await Promise.all(list.map((p) => api.getProduct(p.id)));
       setQuantities((prev) => {
         const next = { ...prev };
-        for (const product of details) {
+        for (const product of list) {
           if (!(product.id in next)) {
-            next[product.id] = product.variants[0]?.quantity ?? 0;
+            next[product.id] = product.stockQuantity ?? 0;
           }
         }
         return next;
diff --git a/Client/components/admin/AdminOrdersPages.tsx b/Client/components/admin/AdminOrdersPages.tsx
index 5e7490a..308f820 100644
--- a/Client/components/admin/AdminOrdersPages.tsx
+++ b/Client/components/admin/AdminOrdersPages.tsx
@@ -85,7 +85,8 @@ export function OrdersListPage() {
   const [focusId, setFocusId] = useState<string | null>(
     () => focusFromUrl || readLastWorkedOrderId(),
   );
-  const focusRef = useRef<HTMLElement | null>(null);
+  const focusCardRef = useRef<HTMLElement | null>(null);
+  const focusRowRef = useRef<HTMLElement | null>(null);
   const [items, setItems] = useState<ManagerOrderListItem[]>([]);
   const [page, setPage] = useState(1);
   const [pages, setPages] = useState(1);
@@ -99,7 +100,10 @@ export function OrdersListPage() {
 
   useEffect(() => {
     if (!focusId || loading) return;
-    const el = focusRef.current;
+    const isDesktop =
+      typeof window !== "undefined" &&
+      window.matchMedia("(min-width: 1024px)").matches;
+    const el = isDesktop ? focusRowRef.current : focusCardRef.current;
     if (!el) return;
     el.scrollIntoView({ behavior: "smooth", block: "center" });
   }, [focusId, loading, items]);
@@ -205,7 +209,7 @@ export function OrdersListPage() {
                     ref={
                       isFocus
                         ? (node) => {
-                            focusRef.current = node;
+                            focusCardRef.current = node;
                           }
                         : undefined
                     }
@@ -288,7 +292,7 @@ export function OrdersListPage() {
                     ref={
                       isFocus
                         ? (node) => {
-                            focusRef.current = node;
+                            focusRowRef.current = node;
                           }
                         : undefined
                     }
diff --git a/Client/components/admin/AdminShell.tsx b/Client/components/admin/AdminShell.tsx
index 871d83e..ae33a2c 100644
--- a/Client/components/admin/AdminShell.tsx
+++ b/Client/components/admin/AdminShell.tsx
@@ -56,7 +56,11 @@ function AdminNav({ onNavigate }: { onNavigate?: () => void }) {
   const { count: pendingOrdersCount } = usePendingOrdersCount();
 
   async function onLogout() {
-    await logout();
+    try {
+      await logout();
+    } catch {
+      // всё равно уходим на логин
+    }
     onNavigate?.();
     router.replace("/staff/login");
   }
diff --git a/Client/components/home/CategoryGrid.tsx b/Client/components/home/CategoryGrid.tsx
index 743253a..aeea2d9 100644
--- a/Client/components/home/CategoryGrid.tsx
+++ b/Client/components/home/CategoryGrid.tsx
@@ -4,7 +4,7 @@ import { Reveal } from "@/components/Reveal";
 import { Icon } from "@/components/Icon";
 import { CardIcon } from "@/shared/ui/card-icon";
 import type { NavCategory } from "@/lib/site-source";
-import { cn } from "@/lib/utils";
+import { cn, plural } from "@/lib/utils";
 
 export function CategoryGrid({ categories }: { categories: NavCategory[] }) {
   return (
@@ -42,7 +42,7 @@ export function CategoryGrid({ categories }: { categories: NavCategory[] }) {
                   {c.name}
                 </h3>
                 <p className="mt-1 text-[10px] uppercase tracking-[0.18em] text-faint">
-                  {c.count} моделей
+                  {c.count} {plural(c.count, ["модель", "модели", "моделей"])}
                 </p>
               </div>
             </Link>
diff --git a/Client/components/modals.tsx b/Client/components/modals.tsx
index e874bbe..392f191 100644
--- a/Client/components/modals.tsx
+++ b/Client/components/modals.tsx
@@ -6,6 +6,7 @@ import {
   useContext,
   useEffect,
   useLayoutEffect,
+  useRef,
   useState,
   useSyncExternalStore,
   type CSSProperties,
@@ -32,6 +33,9 @@ type ModalCtx = {
 
 const Ctx = createContext<ModalCtx | null>(null);
 
+const FOCUSABLE =
+  'a[href],button:not([disabled]),textarea:not([disabled]),input:not([disabled]),select:not([disabled]),[tabindex]:not([tabindex="-1"])';
+
 export function ModalProvider({ children }: { children: ReactNode }) {
   const [modal, setModal] = useState<ModalKind>(null);
   const open = useCallback((m: Exclude<ModalKind, null>) => setModal(m), []);
@@ -109,12 +113,54 @@ export function Modal({
     getServerSnapshot,
   );
   const viewportFrame = useVisualViewportFrame(open);
+  const panelRef = useRef<HTMLDivElement>(null);
+  const previousFocusRef = useRef<HTMLElement | null>(null);
 
   useEffect(() => {
     if (!open) return;
-    const onKey = (e: KeyboardEvent) => e.key === "Escape" && onClose();
+    previousFocusRef.current =
+      document.activeElement instanceof HTMLElement
+        ? document.activeElement
+        : null;
+
+    const panel = panelRef.current;
+    const focusFirst = () => {
+      const nodes = panel?.querySelectorAll<HTMLElement>(FOCUSABLE);
+      nodes?.[0]?.focus();
+    };
+    const id = window.requestAnimationFrame(focusFirst);
+
+    const onKey = (e: KeyboardEvent) => {
+      if (e.key === "Escape") {
+        onClose();
+        return;
+      }
+      if (e.key !== "Tab" || !panel) return;
+      const nodes = [...panel.querySelectorAll<HTMLElement>(FOCUSABLE)].filter(
+        (el) => !el.hasAttribute("disabled") && el.tabIndex !== -1,
+      );
+      if (nodes.length === 0) {
+        e.preventDefault();
+        return;
+      }
+      const first = nodes[0];
+      const last = nodes[nodes.length - 1];
+      if (e.shiftKey && document.activeElement === first) {
+        e.preventDefault();
+        last.focus();
+      } else if (!e.shiftKey && document.activeElement === last) {
+        e.preventDefault();
+        first.focus();
+      }
+    };
+
     document.addEventListener("keydown", onKey);
-    return () => document.removeEventListener("keydown", onKey);
+    return () => {
+      window.cancelAnimationFrame(id);
+      document.removeEventListener("keydown", onKey);
+      previousFocusRef.current?.focus?.();
+      previousFocusRef.current = null;
+    };
   }, [open, onClose]);
 
   useEffect(() => {
@@ -170,6 +216,7 @@ export function Modal({
             onClick={onClose}
           />
           <motion.div
+            ref={panelRef}
             role="dialog"
             aria-modal="true"
             aria-label={title}
diff --git a/Client/components/product/ProductDetail.tsx b/Client/components/product/ProductDetail.tsx
index d281e2b..5949c47 100644
--- a/Client/components/product/ProductDetail.tsx
+++ b/Client/components/product/ProductDetail.tsx
@@ -37,21 +37,21 @@ export function ProductDetail({ product }: { product: Product }) {
   const selectedVariant = useMemo(() => {
     const variants = product.variants ?? [];
     if (variants.length === 0) return undefined;
-    return (
-      variants.find(
-        (v) =>
-          (color == null || v.color === color) &&
-          (memory == null || v.memory == null || v.memory === memory),
-      ) ??
-      variants.find((v) => v.inStock) ??
-      variants[0]
+    return variants.find(
+      (v) =>
+        v.color === color &&
+        (v.memory ?? undefined) === (memory ?? undefined),
     );
   }, [product.variants, color, memory]);
 
-  const stockQty =
-    selectedVariant?.quantityAvailable ?? product.quantityAvailable ?? 0;
+  const hasVariants = (product.variants?.length ?? 0) > 0;
+  // С вариантами — только точный selectedVariant; без fallback на общий остаток товара
+  const stockQty = hasVariants
+    ? (selectedVariant?.quantityAvailable ?? 0)
+    : (product.quantityAvailable ?? 0);
   const maxQty = Math.max(0, stockQty);
-  const canBuy = maxQty > 0;
+  const canBuy =
+    maxQty > 0 && (!hasVariants || Boolean(selectedVariant?.id));
   const qty = maxQty <= 0 ? 1 : Math.min(Math.max(1, qtyRaw), maxQty);
 
   const setQty = (next: number | ((prev: number) => number)) => {
@@ -73,7 +73,13 @@ export function ProductDetail({ product }: { product: Product }) {
 
   function onAdd() {
     if (!canBuy) return;
-    void addItem(product, { color, memory, qty });
+    if (hasVariants && !selectedVariant?.id) return;
+    void addItem(product, {
+      color,
+      memory,
+      qty,
+      variantId: selectedVariant?.id,
+    });
   }
 
   function decQty() {
diff --git a/Client/components/staff/StaffAuthProvider.tsx b/Client/components/staff/StaffAuthProvider.tsx
index 5a60a69..f5bb4e6 100644
--- a/Client/components/staff/StaffAuthProvider.tsx
+++ b/Client/components/staff/StaffAuthProvider.tsx
@@ -6,6 +6,7 @@ import {
   useContext,
   useEffect,
   useMemo,
+  useRef,
   useState,
   type ReactNode,
 } from "react";
@@ -73,6 +74,7 @@ export function StaffAuthProvider({ children }: { children: ReactNode }) {
   const [staff, setStaff] = useState<StaffUser | null>(null);
   const [accessToken, setAccessToken] = useState<string | null>(null);
   const [ready, setReady] = useState(false);
+  const refreshInFlight = useRef<Promise<string | null> | null>(null);
 
   useEffect(() => {
     let cancelled = false;
@@ -110,7 +112,7 @@ export function StaffAuthProvider({ children }: { children: ReactNode }) {
   }, []);
 
   const login = useCallback(async (email: string, password: string) => {
-    const result = await staffLogin(email.trim().toLowerCase(), password.trim());
+    const result = await staffLogin(email.trim().toLowerCase(), password);
     const next: StaffUser = {
       id: result.staff.id,
       role: result.staff.role,
@@ -138,24 +140,32 @@ export function StaffAuthProvider({ children }: { children: ReactNode }) {
   const getAccessToken = useCallback(() => accessToken, [accessToken]);
 
   const refreshSession = useCallback(async () => {
-    try {
-      const result = await staffRefresh();
-      const cached = readCachedProfile();
-      setAccessToken(result.accessToken);
-      setStaff({
-        id: result.staff.id,
-        role: result.staff.role,
-        email: cached?.email,
-        firstName: cached?.firstName ?? null,
-        lastName: cached?.lastName ?? null,
-      });
-      return result.accessToken;
-    } catch {
-      clearCachedProfile();
-      setAccessToken(null);
-      setStaff(null);
-      return null;
-    }
+    if (refreshInFlight.current) return refreshInFlight.current;
+
+    refreshInFlight.current = (async () => {
+      try {
+        const result = await staffRefresh();
+        const cached = readCachedProfile();
+        setAccessToken(result.accessToken);
+        setStaff({
+          id: result.staff.id,
+          role: result.staff.role,
+          email: cached?.email,
+          firstName: cached?.firstName ?? null,
+          lastName: cached?.lastName ?? null,
+        });
+        return result.accessToken;
+      } catch {
+        clearCachedProfile();
+        setAccessToken(null);
+        setStaff(null);
+        return null;
+      } finally {
+        refreshInFlight.current = null;
+      }
+    })();
+
+    return refreshInFlight.current;
   }, []);
 
   const value = useMemo<StaffAuthState>(
diff --git a/Client/features/account-orders/model/use-user-orders.ts b/Client/features/account-orders/model/use-user-orders.ts
index 72d3ae7..179e4c5 100644
--- a/Client/features/account-orders/model/use-user-orders.ts
+++ b/Client/features/account-orders/model/use-user-orders.ts
@@ -1,6 +1,6 @@
 "use client";
 
-import { useCallback, useEffect, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import { runAfterCommit } from "@/lib/run-after-commit";
 import { shouldUseMocks } from "@/lib/mocks";
 import {
@@ -26,6 +26,7 @@ export function useUserOrders(
   const [orders, setOrders] = useState<UserOrderListItem[]>([]);
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
+  const refreshRequestIdRef = useRef(0);
 
   const refresh = useCallback(async () => {
     if (!enabled || useMocks) {
@@ -35,8 +36,10 @@ export function useUserOrders(
       return;
     }
 
+    const requestId = ++refreshRequestIdRef.current;
     try {
       const token = await ensureAccessToken();
+      if (requestId !== refreshRequestIdRef.current) return;
       if (!token) {
         setOrders([]);
         return;
@@ -45,12 +48,16 @@ export function useUserOrders(
         page: 1,
         limit: USER_ORDERS_PAGE_LIMIT,
       });
+      if (requestId !== refreshRequestIdRef.current) return;
       setOrders(next);
       setError(null);
     } catch {
+      if (requestId !== refreshRequestIdRef.current) return;
       setError("Не удалось загрузить заказы");
     } finally {
-      setLoading(false);
+      if (requestId === refreshRequestIdRef.current) {
+        setLoading(false);
+      }
     }
   }, [enabled, useMocks, ensureAccessToken]);
 
diff --git a/Client/features/account/ui/AccountClient.tsx b/Client/features/account/ui/AccountClient.tsx
index 59985d6..e48148e 100644
--- a/Client/features/account/ui/AccountClient.tsx
+++ b/Client/features/account/ui/AccountClient.tsx
@@ -9,7 +9,7 @@ import { ProductCard } from "@/components/ProductCard";
 import { AccountProfile } from "./AccountProfile";
 import { ACCOUNT_TAB_EVENT } from "../lib/tab-event";
 import { products, type Product } from "@/lib/data";
-import { apiGet } from "@/lib/api";
+import { apiGetWithMeta } from "@/lib/api";
 import { shouldUseMocks } from "@/lib/mocks";
 import {
   mapProductListItemToUiProduct,
@@ -103,17 +103,35 @@ export function AccountClient({
     if (useMocks || wishlistIds.length === 0) return;
 
     let cancelled = false;
+    const wanted = new Set(wishlistIds);
+
     void (async () => {
       try {
-        const items = await apiGet<ProductListItemDto[]>("/catalog/products", {
-          limit: 48,
-          page: 1,
-        });
-        if (cancelled) return;
-        const mapped = items
-          .map(mapProductListItemToUiProduct)
-          .filter((p) => wishlistIds.includes(p.id));
-        setWished(mapped);
+        const found = new Map<string, Product>();
+        let page = 1;
+        const limit = 48;
+
+        while (!cancelled && found.size < wanted.size) {
+          const { data: items, meta } = await apiGetWithMeta<
+            ProductListItemDto[]
+          >("/catalog/products", { limit, page });
+          if (cancelled) return;
+
+          for (const dto of items) {
+            const p = mapProductListItemToUiProduct(dto);
+            if (wanted.has(p.id)) found.set(p.id, p);
+          }
+
+          const total = meta?.total;
+          const done =
+            found.size >= wanted.size ||
+            items.length < limit ||
+            (total != null && page * limit >= total);
+          if (done) break;
+          page += 1;
+        }
+
+        if (!cancelled) setWished([...found.values()]);
       } catch {
         if (!cancelled) setWished([]);
       }
diff --git a/Client/features/auth/model/user-auth-provider.tsx b/Client/features/auth/model/user-auth-provider.tsx
index 0db3354..c7ea7c3 100644
--- a/Client/features/auth/model/user-auth-provider.tsx
+++ b/Client/features/auth/model/user-auth-provider.tsx
@@ -16,7 +16,6 @@ import {
   fetchUserProfile,
   type AuthUser,
 } from "@/entities/user";
-import { ApiError } from "@/lib/api";
 
 const USER_PROFILE_KEY = "maze:user-profile";
 /** Обновлять access-токен за минуту до истечения (TTL на бэке — 15 мин). */
@@ -156,16 +155,7 @@ export function UserAuthProvider({ children }: { children: ReactNode }) {
 
     async function restore() {
       try {
-        const result = await authService.refreshSession();
-        if (cancelled) return;
-        applyAccessToken(result.accessToken, result.expiresIn);
-        await hydrateUserFromToken(result.accessToken);
-      } catch (err) {
-        if (cancelled) return;
-        if (!(err instanceof ApiError && err.status === 401)) {
-          console.warn("[user] session restore failed", err);
-        }
-        clearSession();
+        await refreshSession();
       } finally {
         if (!cancelled) setReady(true);
       }
@@ -175,7 +165,7 @@ export function UserAuthProvider({ children }: { children: ReactNode }) {
     return () => {
       cancelled = true;
     };
-  }, []);
+  }, [refreshSession]);
 
   /** Проактивный refresh до истечения access-токена. */
   useEffect(() => {
diff --git a/Client/features/cart/api/cart-api.ts b/Client/features/cart/api/cart-api.ts
index 0469caf..78f0ea1 100644
--- a/Client/features/cart/api/cart-api.ts
+++ b/Client/features/cart/api/cart-api.ts
@@ -115,19 +115,24 @@ export function resolveVariantId(
   opts?: { color?: string; memory?: string; variantId?: string },
 ): string | undefined {
   if (opts?.variantId) return opts.variantId;
-  if (product.defaultVariantId) return product.defaultVariantId;
 
   const variants = product.variants ?? [];
-  if (variants.length === 0) return undefined;
+  const hasExplicitOptions = Boolean(opts?.color || opts?.memory);
+  if (variants.length > 0 && hasExplicitOptions) {
+    const match = variants.find((v) => {
+      if (opts?.memory && v.memory !== opts.memory) return false;
+      if (opts?.color && v.color !== opts.color) return false;
+      return (v.quantityAvailable ?? 0) > 0 || v.inStock;
+    });
+    // Не подменяем defaultVariant — только точный match по опциям
+    return match?.id;
+  }
 
-  const match = variants.find((v) => {
-    if (opts?.memory && v.memory !== opts.memory) return false;
-    if (opts?.color && v.color !== opts.color) return false;
-    return (v.quantityAvailable ?? 0) > 0 || v.inStock;
-  });
+  if (product.defaultVariantId) return product.defaultVariantId;
+
+  if (variants.length === 0) return undefined;
 
   return (
-    match?.id ??
     variants.find((v) => (v.quantityAvailable ?? 0) > 0 || v.inStock)?.id ??
     variants[0]?.id
   );
diff --git a/Client/features/cart/model/cart-provider.tsx b/Client/features/cart/model/cart-provider.tsx
index 11acbab..b7aeb1c 100644
--- a/Client/features/cart/model/cart-provider.tsx
+++ b/Client/features/cart/model/cart-provider.tsx
@@ -46,6 +46,7 @@ export type CartAuthAdapter = {
   checkoutContact: {
     userId: string;
     firstName: string | null;
+    lastName: string | null;
     phone: string | null;
   } | null;
   ensureAccessToken: () => Promise<string | null>;
@@ -104,6 +105,15 @@ export function CartProvider({
   const [hydrated, setHydrated] = useState(false);
   const [cartLoading, setCartLoading] = useState(false);
   const pendingAddRef = useRef<PendingAddItem | null>(null);
+  /** Инкремент при смене userId / новом refresh — отсекает stale setItems/writeCachedCart. */
+  const cartRequestIdRef = useRef(0);
+  /** userId, которому соответствуют текущие items (null = ещё не загидрировали). */
+  const itemsOwnerUserIdRef = useRef<string | null>(null);
+
+  useEffect(() => {
+    cartRequestIdRef.current += 1;
+    itemsOwnerUserIdRef.current = null;
+  }, [userId]);
 
   const cartAuth = useCallback(async () => {
     const accessToken = await ensureAccessToken();
@@ -116,21 +126,32 @@ export function CartProvider({
       return;
     }
 
+    const requestId = ++cartRequestIdRef.current;
+    const requestUserId = userId;
     setCartLoading(true);
     try {
       const token = await ensureAccessToken();
+      if (requestId !== cartRequestIdRef.current) return;
       if (!token) {
         setItems([]);
         return;
       }
       const next = await fetchCart(token);
+      if (requestId !== cartRequestIdRef.current) return;
+      itemsOwnerUserIdRef.current = requestUserId;
       setItems(next);
-      writeCachedCart(userId, next);
+      writeCachedCart(requestUserId, next);
     } catch {
-      const cached = readCachedCart(userId);
-      if (cached) setItems(cached);
+      if (requestId !== cartRequestIdRef.current) return;
+      const cached = readCachedCart(requestUserId);
+      if (cached) {
+        itemsOwnerUserIdRef.current = requestUserId;
+        setItems(cached);
+      }
     } finally {
-      setCartLoading(false);
+      if (requestId === cartRequestIdRef.current) {
+        setCartLoading(false);
+      }
     }
   }, [useApi, isAuthenticated, userId, ensureAccessToken]);
 
@@ -139,7 +160,12 @@ export function CartProvider({
       setItems([]);
       return;
     }
-    setItems(readCachedCart(userId) ?? []);
+    const requestId = ++cartRequestIdRef.current;
+    const requestUserId = userId;
+    const next = readCachedCart(userId) ?? [];
+    if (requestId !== cartRequestIdRef.current) return;
+    itemsOwnerUserIdRef.current = requestUserId;
+    setItems(next);
   }, [userId]);
 
   /** Реальное добавление — только для уже авторизованного. */
@@ -266,9 +292,15 @@ export function CartProvider({
   ]);
 
   useEffect(() => {
-    if (hydrated && isAuthenticated && userId) {
-      writeCachedCart(userId, items);
+    if (
+      !hydrated ||
+      !isAuthenticated ||
+      !userId ||
+      itemsOwnerUserIdRef.current !== userId
+    ) {
+      return;
     }
+    writeCachedCart(userId, items);
   }, [items, hydrated, isAuthenticated, userId]);
 
   useEffect(() => {
diff --git a/Client/features/cart/ui/CartClient.tsx b/Client/features/cart/ui/CartClient.tsx
index 70dabb5..a195a92 100644
--- a/Client/features/cart/ui/CartClient.tsx
+++ b/Client/features/cart/ui/CartClient.tsx
@@ -98,6 +98,7 @@ export function CartClient() {
 
   const contactUserId = checkoutContact?.userId ?? null;
   const contactFirstName = checkoutContact?.firstName ?? null;
+  const contactLastName = checkoutContact?.lastName ?? null;
   const contactPhone = checkoutContact?.phone ?? null;
 
   useEffect(() => {
@@ -135,6 +136,13 @@ export function CartClient() {
   const deliveryLabel =
     DELIVERY.find((d) => d.id === delivery)?.label ?? "Доставка";
 
+  /** Один Idempotency-Key на intent — не менять при retry того же заказа. */
+  const checkoutIntentKeyRef = useRef<string | null>(null);
+
+  useEffect(() => {
+    checkoutIntentKeyRef.current = null;
+  }, [items, delivery, payment, firstName, phoneNational, contactLastName]);
+
   useEffect(() => {
     if (!doneOrder) return;
     scrollWindowToTop();
@@ -152,7 +160,11 @@ export function CartClient() {
     try {
       const lines: Array<{ variantId: string; quantity: number }> = [];
       for (const it of items) {
-        if (!it.variantId) continue;
+        if (!it.variantId) {
+          throw new Error(
+            "В корзине есть товар без варианта. Обновите страницу или удалите позицию.",
+          );
+        }
         lines.push({ variantId: it.variantId, quantity: it.qty });
       }
 
@@ -167,15 +179,27 @@ export function CartClient() {
       const phone = validated.e164;
 
       const accessToken = await ensureAccessToken();
+      const city = delivery === "cdek" ? "Москва" : "Санкт-Петербург";
+      const address =
+        delivery === "pickup"
+          ? undefined
+          : { street: "Невский пр.", house: "1" };
+      if (!checkoutIntentKeyRef.current) {
+        checkoutIntentKeyRef.current = crypto.randomUUID();
+      }
       const order = await checkoutCart({
         deliveryUiId: delivery,
         paymentUiId: payment,
         firstName,
-        lastName: "Клиент",
+        lastName: contactLastName?.trim() ?? "",
         phone,
         items: lines,
         accessToken,
+        city,
+        address,
+        idempotencyKey: checkoutIntentKeyRef.current,
       });
+      checkoutIntentKeyRef.current = null;
       setConfirmOpen(false);
       setDoneOrder(order.orderNumber);
       requestAccountOrdersRefresh();
diff --git a/Client/features/catalog-filters/ui/CheckRow.tsx b/Client/features/catalog-filters/ui/CheckRow.tsx
index 3aa8491..2dc5218 100644
--- a/Client/features/catalog-filters/ui/CheckRow.tsx
+++ b/Client/features/catalog-filters/ui/CheckRow.tsx
@@ -14,6 +14,7 @@ export function CheckRow({ label, checked, onClick }: CheckRowProps) {
     <button
       type="button"
       onClick={onClick}
+      aria-pressed={checked}
       className="flex w-full items-center gap-2.5 rounded-lg py-1 text-left text-sm text-muted transition-colors hover:text-ink cursor-pointer"
     >
       <span
diff --git a/Client/features/catalog-search/lib/format-brand-hint.ts b/Client/features/catalog-search/lib/format-brand-hint.ts
index d513710..bd399e0 100644
--- a/Client/features/catalog-search/lib/format-brand-hint.ts
+++ b/Client/features/catalog-search/lib/format-brand-hint.ts
@@ -10,7 +10,9 @@ const BRAND_TITLE_OVERRIDES: Record<string, string> = {
 };
 
 export function formatBrandHint(name: string): string {
-  const key = name.trim().toUpperCase();
+  const normalized = name.trim();
+  const key = normalized.toUpperCase();
   if (BRAND_TITLE_OVERRIDES[key]) return BRAND_TITLE_OVERRIDES[key];
-  return name.charAt(0).toUpperCase() + name.slice(1).toLowerCase();
+  if (!normalized) return normalized;
+  return normalized.charAt(0).toUpperCase() + normalized.slice(1).toLowerCase();
 }
diff --git a/Client/features/catalog-search/ui/RotatingBrandHint.tsx b/Client/features/catalog-search/ui/RotatingBrandHint.tsx
index e349e0c..275ef13 100644
--- a/Client/features/catalog-search/ui/RotatingBrandHint.tsx
+++ b/Client/features/catalog-search/ui/RotatingBrandHint.tsx
@@ -26,6 +26,11 @@ export function RotatingBrandHint({ brands, className }: RotatingBrandHintProps)
     [brands],
   );
   const [index, setIndex] = useState(0);
+  const safeIndex = hints.length === 0 ? 0 : index % hints.length;
+
+  useEffect(() => {
+    setIndex((i) => (hints.length === 0 ? 0 : i % hints.length));
+  }, [hints.length]);
 
   useEffect(() => {
     if (hints.length < 2 || reduce) return;
@@ -42,7 +47,7 @@ export function RotatingBrandHint({ brands, className }: RotatingBrandHintProps)
   if (reduce || hints.length === 1) {
     return (
       <span className={cn("block truncate", className)}>
-        {hints[index] ?? hints[0]}
+        {hints[safeIndex] ?? hints[0]}
       </span>
     );
   }
@@ -53,14 +58,14 @@ export function RotatingBrandHint({ brands, className }: RotatingBrandHintProps)
     >
       <AnimatePresence mode="wait" initial={false}>
         <motion.span
-          key={hints[index]}
+          key={hints[safeIndex]}
           className="absolute inset-x-0 top-0 block truncate whitespace-nowrap leading-[1.125rem]"
           initial={{ y: `-${SLIDE_OFFSET}`, opacity: 0 }}
           animate={{ y: 0, opacity: 1 }}
           exit={{ y: SLIDE_OFFSET, opacity: 0 }}
           transition={{ duration: SLIDE_DURATION, ease: FLUID_EASE }}
         >
-          {hints[index]}
+          {hints[safeIndex]}
         </motion.span>
       </AnimatePresence>
     </span>
diff --git a/Client/features/catalog/ui/CatalogClient.tsx b/Client/features/catalog/ui/CatalogClient.tsx
index b3c660c..3a03c85 100644
--- a/Client/features/catalog/ui/CatalogClient.tsx
+++ b/Client/features/catalog/ui/CatalogClient.tsx
@@ -303,6 +303,7 @@ export function CatalogClient({
         onClose={() => setMobileFilters(false)}
         side="left"
         rootClassName="lg:hidden"
+        aria-label="Фильтры каталога"
       >
         <div className="shrink-0 border-b border-line p-6 pb-4">
           <div className="flex items-center justify-between gap-3">
diff --git a/Client/features/checkout/api/checkout-api.ts b/Client/features/checkout/api/checkout-api.ts
index 8564abc..32c5af0 100644
--- a/Client/features/checkout/api/checkout-api.ts
+++ b/Client/features/checkout/api/checkout-api.ts
@@ -112,12 +112,14 @@ export async function createOrder(input: {
   payment: { method: CheckoutPaymentMethod };
   comment?: string;
   accessToken?: string | null;
+  /** Один ключ на intent — передавать тот же при retry. */
+  idempotencyKey: string;
 }): Promise<CreateOrderResponse> {
-  const { accessToken, ...body } = input;
+  const { accessToken, idempotencyKey, ...body } = input;
   return apiPostJson<CreateOrderResponse>("/orders", body, {
     accessToken,
     headers: {
-      "Idempotency-Key": crypto.randomUUID(),
+      "Idempotency-Key": idempotencyKey,
     },
   });
 }
@@ -130,13 +132,31 @@ export async function checkoutCart(opts: {
   phone: string;
   items: Array<{ variantId: string; quantity: number }>;
   accessToken?: string | null;
+  /** Город доставки клиента (для quote). */
+  city?: string;
+  /** Адрес доставки клиента (для quote; не нужен для pickup). */
+  address?: { street?: string; house?: string; flat?: string };
+  /**
+   * Один ключ на checkout intent — создаёт UI и держит между retry.
+   * Не генерировать внутри этой функции.
+   */
+  idempotencyKey: string;
 }): Promise<CreateOrderResponse> {
   const provider = mapUiDeliveryProvider(opts.deliveryUiId);
-  const city = provider === "rf_cdek" ? "Москва" : "Санкт-Петербург";
+  const city =
+    opts.city?.trim() ||
+    (provider === "rf_cdek" || provider === "rf_yandex"
+      ? "Москва"
+      : "Санкт-Петербург");
   const address =
     provider === "pickup"
       ? undefined
-      : { street: "Невский пр.", house: "1" };
+      : (opts.address ?? { street: "Невский пр.", house: "1" });
+
+  const lastName = opts.lastName.trim();
+  if (!lastName) {
+    throw new Error("Укажите фамилию в профиле перед оформлением");
+  }
 
   let quote = await requestDeliveryQuote({
     provider,
@@ -157,11 +177,12 @@ export async function checkoutCart(opts: {
   return createOrder({
     customer: {
       firstName: opts.firstName.trim(),
-      lastName: opts.lastName.trim() || "Клиент",
+      lastName,
       phone: opts.phone.trim(),
     },
     delivery: { quoteId: quote.quoteId },
     payment: { method: mapUiPaymentMethod(opts.paymentUiId) },
     accessToken: opts.accessToken,
+    idempotencyKey: opts.idempotencyKey,
   });
 }
diff --git a/Client/lib/admin/client.ts b/Client/lib/admin/client.ts
index 3a015e5..5806eb7 100644
--- a/Client/lib/admin/client.ts
+++ b/Client/lib/admin/client.ts
@@ -1,6 +1,6 @@
 "use client";
 
-import { useCallback, useMemo } from "react";
+import { useCallback, useMemo, useRef } from "react";
 import {
   apiDelete,
   apiGet,
@@ -38,12 +38,22 @@ import type {
 
 export function useAdminApi() {
   const { accessToken, refreshSession } = useStaffAuth();
+  const refreshInFlight = useRef<Promise<string | null> | null>(null);
+
+  const refreshOnce = useCallback(() => {
+    if (!refreshInFlight.current) {
+      refreshInFlight.current = refreshSession().finally(() => {
+        refreshInFlight.current = null;
+      });
+    }
+    return refreshInFlight.current;
+  }, [refreshSession]);
 
   const withAuth = useCallback(
     async <T>(fn: (token: string) => Promise<T>): Promise<T> => {
       let token = accessToken;
       if (!token) {
-        token = await refreshSession();
+        token = await refreshOnce();
       }
       if (!token) throw new ApiError({ message: "Unauthorized", status: 401, code: "UNAUTHORIZED" });
 
@@ -51,14 +61,14 @@ export function useAdminApi() {
         return await fn(token);
       } catch (err) {
         if (err instanceof ApiError && err.status === 401) {
-          const next = await refreshSession();
+          const next = await refreshOnce();
           if (!next) throw err;
           return fn(next);
         }
         throw err;
       }
     },
-    [accessToken, refreshSession],
+    [accessToken, refreshOnce],
   );
 
   return useMemo(
diff --git a/Client/lib/admin/types.ts b/Client/lib/admin/types.ts
index 2c257bd..60a22c1 100644
--- a/Client/lib/admin/types.ts
+++ b/Client/lib/admin/types.ts
@@ -45,6 +45,8 @@ export type AdminProductSummary = {
   inStock: boolean;
   ratingAvg: number;
   reviewsCount: number;
+  /** Остаток из list (без N+1 getProduct). */
+  stockQuantity?: number;
   createdAt: string;
   updatedAt: string;
 };
diff --git a/Client/lib/admin/ui.tsx b/Client/lib/admin/ui.tsx
index 67e62e1..c5f63b7 100644
--- a/Client/lib/admin/ui.tsx
+++ b/Client/lib/admin/ui.tsx
@@ -543,6 +543,7 @@ export function AdminSelect({
   className?: string;
 }) {
   const [open, setOpen] = useState(false);
+  const [missing, setMissing] = useState(false);
   const [menuPos, setMenuPos] = useState({ top: 0, left: 0, width: 224 });
   const rootRef = useRef<HTMLDivElement>(null);
   const buttonRef = useRef<HTMLButtonElement>(null);
@@ -597,6 +598,29 @@ export function AdminSelect({
     };
   }, [open]);
 
+  useEffect(() => {
+    if (!required) {
+      setMissing(false);
+      return;
+    }
+    const form = rootRef.current?.closest("form");
+    if (!form) return;
+
+    function onSubmit(e: Event) {
+      if (value) {
+        setMissing(false);
+        return;
+      }
+      e.preventDefault();
+      e.stopImmediatePropagation();
+      setMissing(true);
+      buttonRef.current?.focus();
+    }
+
+    form.addEventListener("submit", onSubmit, true);
+    return () => form.removeEventListener("submit", onSubmit, true);
+  }, [required, value]);
+
   const menu =
     open &&
     typeof document !== "undefined" &&
@@ -632,6 +656,7 @@ export function AdminSelect({
                   type="button"
                   onClick={() => {
                     onChange(option.value);
+                    setMissing(false);
                     setOpen(false);
                   }}
                   className={cn(
@@ -669,7 +694,6 @@ export function AdminSelect({
       </label>
 
       <select
-        required={required}
         value={value}
         onChange={(e) => onChange(e.target.value)}
         tabIndex={-1}
@@ -688,14 +712,18 @@ export function AdminSelect({
         type="button"
         aria-haspopup="listbox"
         aria-expanded={open}
+        aria-required={required || undefined}
+        aria-invalid={missing || undefined}
         aria-labelledby={`${listId}-label`}
         aria-controls={listId}
         onClick={() => setOpen((v) => !v)}
         className={cn(
           "flex w-full items-center gap-3 rounded-xl border bg-bg-2/60 px-3.5 py-3 text-left text-[15px] outline-none transition-colors cursor-pointer",
-          open
-            ? "border-cyan/70 ring-2 ring-cyan/20"
-            : "border-line hover:border-white/20 focus:border-cyan/70 focus:ring-2 focus:ring-cyan/20",
+          missing
+            ? "border-magenta/60 ring-2 ring-magenta/20"
+            : open
+              ? "border-cyan/70 ring-2 ring-cyan/20"
+              : "border-line hover:border-white/20 focus:border-cyan/70 focus:ring-2 focus:ring-cyan/20",
         )}
       >
         <span className="min-w-0 flex-1">
diff --git a/Client/lib/api.ts b/Client/lib/api.ts
index e99090f..9786ae0 100644
--- a/Client/lib/api.ts
+++ b/Client/lib/api.ts
@@ -116,9 +116,18 @@ async function parseEnvelope<T>(
     });
   }
 
-  const envelope = json as ApiEnvelope<T>;
+  const envelope = json as ApiEnvelope<T> | null;
+  const data = envelope && "data" in envelope ? envelope.data : undefined;
+  if (data === undefined || data === null) {
+    throw new ApiError({
+      message: "Invalid API response: missing data",
+      status: res.status,
+      requestId: envelope?.requestId,
+    });
+  }
+
   return {
-    data: (envelope?.data ?? json) as T,
+    data: data as T,
     meta: envelope?.meta,
   };
 }
diff --git a/Client/lib/catalog-source.ts b/Client/lib/catalog-source.ts
index 1cc663e..32cee1c 100644
--- a/Client/lib/catalog-source.ts
+++ b/Client/lib/catalog-source.ts
@@ -29,6 +29,7 @@ function filterMockProducts(opts: {
       if (catSlug === "gaming" && p.category !== "Игровые приставки")
         return false;
       if (catSlug === "accessories" && p.category !== "Аудио") return false;
+      if (catSlug === "used") return false;
     }
     return true;
   });
diff --git a/Client/lib/data.ts b/Client/lib/data.ts
index 428060e..5e8b1d7 100644
--- a/Client/lib/data.ts
+++ b/Client/lib/data.ts
@@ -513,6 +513,10 @@ export function relatedProducts(slug: string, n = 4) {
   const current = products.find((p) => p.slug === slug);
   return products
     .filter((p) => p.slug !== slug)
-    .sort((a) => (a.brand === current?.brand ? -1 : 1))
+    .sort((a, b) => {
+      const aMatch = a.brand === current?.brand ? 0 : 1;
+      const bMatch = b.brand === current?.brand ? 0 : 1;
+      return aMatch - bMatch;
+    })
     .slice(0, n);
 }
diff --git a/Client/lib/site-source.ts b/Client/lib/site-source.ts
index 193b354..416ff75 100644
--- a/Client/lib/site-source.ts
+++ b/Client/lib/site-source.ts
@@ -144,9 +144,9 @@ export async function fetchSiteChrome(): Promise<SiteChrome> {
         address: string;
         metro: string;
         workingHours: string;
-        socialLinks: {
-          telegram: string;
-        };
+        socialLinks?: {
+          telegram?: string;
+        } | null;
         mapCoordinates: { lat: number; lng: number };
       }>("/settings/public"),
       apiGet<{ partnerBrands: HomePartnerBrandDto[] }>("/home"),
@@ -163,15 +163,30 @@ export async function fetchSiteChrome(): Promise<SiteChrome> {
         address: addressParts.join(", ") || settings.address,
         metro: settings.metro,
         hours: settings.workingHours,
-        telegram: MAZE_TELEGRAM_URL,
+        telegram: settings.socialLinks?.telegram || MAZE_TELEGRAM_URL,
         mapLat: settings.mapCoordinates?.lat ?? STORE.mapLat,
         mapLng: settings.mapCoordinates?.lng ?? STORE.mapLng,
       },
       partnerBrands: home.partnerBrands.map((b) => b.name),
     };
   } catch {
-    if (!canUseDevMocksFallback()) throw new Error("Site chrome API unavailable");
-    return mockSiteChrome();
+    // Не валим root layout / SSR при недоступном API
+    if (canUseDevMocksFallback()) return mockSiteChrome();
+    return {
+      categories: [],
+      store: {
+        phone: STORE.phone,
+        email: STORE.email,
+        city: STORE.city,
+        address: STORE.address,
+        metro: STORE.metro,
+        hours: STORE.hours,
+        telegram: STORE.telegram,
+        mapLat: STORE.mapLat,
+        mapLng: STORE.mapLng,
+      },
+      partnerBrands: [],
+    };
   }
 }
 
diff --git a/Client/shared/ui/image-spotlight/lib/easing.ts b/Client/shared/ui/image-spotlight/lib/easing.ts
index 78f79ca..c2cb5a6 100644
--- a/Client/shared/ui/image-spotlight/lib/easing.ts
+++ b/Client/shared/ui/image-spotlight/lib/easing.ts
@@ -15,17 +15,38 @@ function cubicBezierEase(x1: number, y1: number, x2: number, y2: number) {
   const sampleX = (t: number) => ((ax * t + bx) * t + cx) * t;
   const sampleY = (t: number) => ((ay * t + by) * t + cy) * t;
   const dX = (t: number) => (3 * ax * t + 2 * bx) * t + cx;
-  return (p: number) => {
+
+  function solveT(p: number) {
     let t = p;
+    let newtonOk = true;
     for (let i = 0; i < 8; i++) {
       const x = sampleX(t) - p;
       const d = dX(t);
-      if (Math.abs(x) < 1e-4 || Math.abs(d) < 1e-6) break;
+      if (Math.abs(x) < 1e-4) return t;
+      if (Math.abs(d) < 1e-6) {
+        newtonOk = false;
+        break;
+      }
       t -= x / d;
     }
     t = t < 0 ? 0 : t > 1 ? 1 : t;
-    return sampleY(t);
-  };
+    if (newtonOk && Math.abs(sampleX(t) - p) < 1e-3) return t;
+
+    // Bisection fallback when Newton diverges / flat derivative
+    let lo = 0;
+    let hi = 1;
+    t = p;
+    for (let i = 0; i < 16; i++) {
+      const x = sampleX(t) - p;
+      if (Math.abs(x) < 1e-5) return t;
+      if (x > 0) hi = t;
+      else lo = t;
+      t = (lo + hi) / 2;
+    }
+    return t;
+  }
+
+  return (p: number) => sampleY(solveT(p));
 }
 
 export function makeEase(ease: unknown) {
diff --git a/Client/shared/ui/mobile-drawer/MobileDrawer.tsx b/Client/shared/ui/mobile-drawer/MobileDrawer.tsx
index 128e342..d29e873 100644
--- a/Client/shared/ui/mobile-drawer/MobileDrawer.tsx
+++ b/Client/shared/ui/mobile-drawer/MobileDrawer.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useEffect, useSyncExternalStore, type ReactNode } from "react";
+import { useEffect, useRef, useSyncExternalStore, type ReactNode } from "react";
 import { createPortal } from "react-dom";
 import { AnimatePresence, motion } from "motion/react";
 import { useBodyScrollLock } from "@/lib/body-scroll-lock";
@@ -14,6 +14,9 @@ import { cn } from "@/lib/utils";
 const PANEL_BG = "#0d1e1b";
 const SCRIM_BG = "#000000";
 
+const FOCUSABLE =
+  'a[href],button:not([disabled]),textarea:not([disabled]),input:not([disabled]),select:not([disabled]),[tabindex]:not([tabindex="-1"])';
+
 export type MobileDrawerProps = {
   open: boolean;
   onClose: () => void;
@@ -23,6 +26,9 @@ export type MobileDrawerProps = {
   panelClassName?: string;
   rootClassName?: string;
   zIndexClassName?: string;
+  /** Подпись диалога; иначе aria-labelledby */
+  "aria-label"?: string;
+  "aria-labelledby"?: string;
   children: ReactNode;
 };
 
@@ -39,6 +45,8 @@ export function MobileDrawer({
   panelClassName,
   rootClassName,
   zIndexClassName = "z-[200]",
+  "aria-label": ariaLabel,
+  "aria-labelledby": ariaLabelledBy,
   children,
 }: MobileDrawerProps) {
   const mounted = useSyncExternalStore(
@@ -46,16 +54,58 @@ export function MobileDrawer({
     getClientSnapshot,
     getServerSnapshot,
   );
+  const panelRef = useRef<HTMLElement>(null);
+  const previousFocusRef = useRef<HTMLElement | null>(null);
 
   useBodyScrollLock(open);
 
   useEffect(() => {
     if (!open) return;
+
+    previousFocusRef.current =
+      document.activeElement instanceof HTMLElement
+        ? document.activeElement
+        : null;
+
+    const panel = panelRef.current;
+    const focusFirst = () => {
+      const nodes = panel?.querySelectorAll<HTMLElement>(FOCUSABLE);
+      (nodes?.[0] ?? panel)?.focus();
+    };
+    const id = window.requestAnimationFrame(focusFirst);
+
     const onKey = (e: KeyboardEvent) => {
-      if (e.key === "Escape") onClose();
+      if (e.key === "Escape") {
+        onClose();
+        return;
+      }
+      if (e.key !== "Tab" || !panel) return;
+      const nodes = [...panel.querySelectorAll<HTMLElement>(FOCUSABLE)].filter(
+        (el) => !el.hasAttribute("disabled") && el.tabIndex !== -1,
+      );
+      if (nodes.length === 0) {
+        e.preventDefault();
+        panel.focus();
+        return;
+      }
+      const first = nodes[0];
+      const last = nodes[nodes.length - 1];
+      if (e.shiftKey && document.activeElement === first) {
+        e.preventDefault();
+        last.focus();
+      } else if (!e.shiftKey && document.activeElement === last) {
+        e.preventDefault();
+        first.focus();
+      }
     };
+
     document.addEventListener("keydown", onKey);
-    return () => document.removeEventListener("keydown", onKey);
+    return () => {
+      window.cancelAnimationFrame(id);
+      document.removeEventListener("keydown", onKey);
+      previousFocusRef.current?.focus?.();
+      previousFocusRef.current = null;
+    };
   }, [open, onClose]);
 
   if (!mounted) return null;
@@ -93,10 +143,14 @@ export function MobileDrawer({
             onClick={onClose}
           />
           <motion.aside
+            ref={panelRef}
+            tabIndex={-1}
             aria-modal="true"
             role="dialog"
+            aria-label={ariaLabel ?? (ariaLabelledBy ? undefined : "Меню")}
+            aria-labelledby={ariaLabelledBy}
             className={cn(
-              "absolute top-0 z-10 flex h-dvh min-h-dvh flex-col overflow-hidden bg-panel",
+              "absolute top-0 z-10 flex h-dvh min-h-dvh flex-col overflow-hidden bg-panel outline-none",
               panelWidthClass,
               panelPositionClass,
               panelClassName,
diff --git a/Client/shared/ui/split-text/SplitText.tsx b/Client/shared/ui/split-text/SplitText.tsx
index 08aba00..a040091 100644
--- a/Client/shared/ui/split-text/SplitText.tsx
+++ b/Client/shared/ui/split-text/SplitText.tsx
@@ -20,6 +20,18 @@ const CLIP_STYLE: CSSProperties = {
   marginBottom: "-0.1em",
 };
 
+const SR_ONLY: CSSProperties = {
+  position: "absolute",
+  width: 1,
+  height: 1,
+  padding: 0,
+  margin: -1,
+  overflow: "hidden",
+  clip: "rect(0, 0, 0, 0)",
+  whiteSpace: "nowrap",
+  border: 0,
+};
+
 type SplitTextProps = {
   text: string;
   mode?: SplitMode;
@@ -66,7 +78,6 @@ export function SplitText({
     <motion.span
       ref={ref}
       className={className}
-      aria-label={text}
       initial="hidden"
       animate={active ? "visible" : "hidden"}
       variants={{
@@ -76,6 +87,7 @@ export function SplitText({
         },
       }}
     >
+      <span style={SR_ONLY}>{text}</span>
       {units.map((unit, i) => (
         <span
           key={`${unit}-${i}`}
@@ -88,7 +100,11 @@ export function SplitText({
               : { verticalAlign: "bottom" }),
           }}
         >
-          <motion.span className="inline-block will-change-transform" variants={unitVariants}>
+          <motion.span
+            className="inline-block will-change-transform"
+            variants={unitVariants}
+            aria-hidden
+          >
             {mode === "chars" && unit === " " ? "\u00A0" : unit}
           </motion.span>
         </span>
diff --git a/Client/widgets/authenticated-cart-provider.tsx b/Client/widgets/authenticated-cart-provider.tsx
index 1486311..2b9ee2b 100644
--- a/Client/widgets/authenticated-cart-provider.tsx
+++ b/Client/widgets/authenticated-cart-provider.tsx
@@ -23,6 +23,7 @@ export function AuthenticatedCartProvider({
         ? {
             userId: user.id,
             firstName: user.firstName,
+            lastName: user.lastName,
             phone: user.phone,
           }
         : null,
diff --git a/Server/Dockerfile b/Server/Dockerfile
index ecde1c5..adb4cb0 100644
--- a/Server/Dockerfile
+++ b/Server/Dockerfile
@@ -16,7 +16,9 @@ WORKDIR /app
 ENV NODE_ENV=production
 ENV HOST=0.0.0.0
 ENV PORT=4000
-RUN apk add --no-cache wget
+RUN apk add --no-cache wget \
+  && addgroup --system --gid 1001 nodejs \
+  && adduser --system --uid 1001 apiuser
 
 COPY package.json package-lock.json ./
 RUN npm ci --omit=dev && npm cache clean --force
@@ -27,7 +29,10 @@ COPY src/migrations ./src/migrations
 COPY src/seeders ./src/seeders
 COPY scripts ./scripts
 COPY docker-entrypoint.sh ./docker-entrypoint.sh
-RUN chmod +x docker-entrypoint.sh && mkdir -p uploads
+RUN chmod +x docker-entrypoint.sh \
+  && mkdir -p uploads \
+  && chown -R apiuser:nodejs /app
 
+USER apiuser
 EXPOSE 4000
 ENTRYPOINT ["./docker-entrypoint.sh"]
diff --git a/Server/docker-compose.yml b/Server/docker-compose.yml
index eb917cd..e1d196e 100644
--- a/Server/docker-compose.yml
+++ b/Server/docker-compose.yml
@@ -7,7 +7,7 @@ services:
       POSTGRES_PASSWORD: maze
       POSTGRES_DB: maze
     ports:
-      - '5432:5432'
+      - '127.0.0.1:5432:5432'
     volumes:
       - maze_pg_data:/var/lib/postgresql/data
     healthcheck:
@@ -20,7 +20,7 @@ services:
     image: redis:7-alpine
     container_name: maze-redis
     ports:
-      - '6379:6379'
+      - '127.0.0.1:6379:6379'
     healthcheck:
       test: ['CMD', 'redis-cli', 'ping']
       interval: 5s
diff --git a/Server/sequelize-cli.cjs b/Server/sequelize-cli.cjs
index 59018ef..8d4d016 100644
--- a/Server/sequelize-cli.cjs
+++ b/Server/sequelize-cli.cjs
@@ -2,6 +2,7 @@ require('dotenv').config({ path: require('path').resolve(__dirname, '.env') });
 
 const sslOff = process.env.DATABASE_SSL === 'false' || process.env.DATABASE_SSL === '0';
 const sslOn = process.env.DATABASE_SSL === 'true' || process.env.DATABASE_SSL === '1';
+const sslInsecure = process.env.DATABASE_SSL_INSECURE === 'true';
 
 const productionSsl =
   sslOff
@@ -11,7 +12,7 @@ const productionSsl =
           dialectOptions: {
             ssl: {
               require: true,
-              rejectUnauthorized: false,
+              rejectUnauthorized: !sslInsecure,
             },
           },
         }
diff --git a/Server/src/services/admin-products.service.ts b/Server/src/services/admin-products.service.ts
index c152d9e..bb11091 100644
--- a/Server/src/services/admin-products.service.ts
+++ b/Server/src/services/admin-products.service.ts
@@ -16,7 +16,7 @@ import {
 } from '../models/catalog.js';
 import { invalidateCatalogAndHomeCache } from './cache-invalidation.service.js';
 
-function mapAdminProductSummary(product: Product) {
+function mapAdminProductSummary(product: Product, stockQuantity?: number) {
   return {
     id: product.id,
     slug: product.slug,
@@ -32,6 +32,8 @@ function mapAdminProductSummary(product: Product) {
     inStock: product.in_stock,
     ratingAvg: toNumber(product.rating_avg),
     reviewsCount: product.reviews_count,
+    /** Остаток (одинаковый на все варианты после PATCH /stock). */
+    stockQuantity: stockQuantity ?? 0,
     createdAt: isoTimestamp(product, 'createdAt'),
     updatedAt: isoTimestamp(product, 'updatedAt'),
   };
@@ -148,8 +150,22 @@ export async function listAdminProducts(query: Record<string, unknown>) {
     offset,
   });
 
+  const productIds = rows.map((row) => row.id);
+  const stockByProduct = new Map<string, number>();
+  if (productIds.length > 0) {
+    const variants = await ProductVariant.findAll({
+      where: { product_id: productIds },
+      attributes: ['product_id'],
+      include: [{ model: Stock, as: 'stock', required: false, attributes: ['quantity'] }],
+    });
+    for (const variant of variants) {
+      if (stockByProduct.has(variant.product_id)) continue;
+      stockByProduct.set(variant.product_id, variant.stock?.quantity ?? 0);
+    }
+  }
+
   return {
-    items: rows.map(mapAdminProductSummary),
+    items: rows.map((row) => mapAdminProductSummary(row, stockByProduct.get(row.id))),
     meta: { page, limit, total: count },
   };
 }
diff --git a/docker-compose.yml b/docker-compose.yml
index 246986d..a3b242c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,7 @@ services:
       POSTGRES_PASSWORD: maze
       POSTGRES_DB: maze
     ports:
-      - '5432:5432'
+      - '127.0.0.1:5432:5432'
     volumes:
       - maze_pg_data:/var/lib/postgresql/data
     healthcheck:
@@ -23,7 +23,7 @@ services:
     image: redis:7-alpine
     container_name: maze-redis
     ports:
-      - '6379:6379'
+      - '127.0.0.1:6379:6379'
     healthcheck:
       test: ['CMD', 'redis-cli', 'ping']
       interval: 5s
@@ -41,10 +41,10 @@ services:
       DATABASE_URL: postgres://maze:maze@postgres:5432/maze
       DATABASE_SSL: 'false'
       REDIS_URL: redis://redis:6379
-      JWT_SECRET: ${JWT_SECRET:-dev-jwt-secret-change-me-32chars!!}
-      JWT_REFRESH_SECRET: ${JWT_REFRESH_SECRET:-dev-refresh-secret-change-32chars!!}
+      JWT_SECRET: ${JWT_SECRET:?set JWT_SECRET}
+      JWT_REFRESH_SECRET: ${JWT_REFRESH_SECRET:?set JWT_REFRESH_SECRET}
       CORS_ORIGIN: ${CORS_ORIGIN:-http://localhost,http://localhost:3000}
-      AUTH_DEV_OTP: ${AUTH_DEV_OTP:-true}
+      AUTH_DEV_OTP: "${AUTH_DEV_OTP:-false}"
       UPLOAD_DIR: /app/uploads
       UPLOAD_PUBLIC_URL: ${UPLOAD_PUBLIC_URL:-/uploads}
       RUN_MIGRATIONS: ${RUN_MIGRATIONS:-true}
@@ -67,8 +67,8 @@ services:
   client:
     build:
       context: ./Client
-      args:
-        API_INTERNAL_URL: http://api:4000
+    args:
+      API_INTERNAL_URL: http://api:4000
     container_name: maze-client
     environment:
       NODE_ENV: production

From 1ec25ecf66a02478027a319bed8f30f920ffdb64 Mon Sep 17 00:00:00 2001
From: Nikita <Matigulin2018@mail.ru>
Date: Fri, 4 Sep 2026 20:23:12 +0300
Subject: [PATCH 6/6] =?UTF-8?q?feat(storefront):=20=D0=BD=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B1=D0=B0=D1=80=20=D0=BD=D0=B0=D0=B4=20hero,=20=D0=BA=D0=B0?=
 =?UTF-8?q?=D1=82=D0=B0=D0=BB=D0=BE=D0=B3=20=D0=B8=20=D1=84=D0=B8=D0=BB?=
 =?UTF-8?q?=D1=8C=D1=82=D1=80=20=D1=86=D0=B5=D0=BD=D1=8B.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Прозрачный pill над видео, плоский charcoal-фон, сетка 5 колонок, поля «от/до» без автоскролла и цены с неразрывным ₽.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 Client/app/globals.css                        |  87 ++++---
 Client/components/Footer.tsx                  |   2 +-
 Client/components/Header.tsx                  | 221 +++++++++---------
 Client/components/Logo.tsx                    |   4 +
 Client/components/ProductCard.tsx             |   4 +-
 Client/features/auth/ui/HeaderAuthActions.tsx |   2 +-
 .../catalog-filters/ui/PriceFilter.tsx        | 140 ++++++++++-
 .../catalog-search/ui/CatalogSearchInput.tsx  |   2 +-
 Client/features/catalog/ui/CatalogClient.tsx  |  51 ++--
 Client/features/home-hero/index.ts            |   2 +
 Client/features/home-hero/lib/constants.ts    |   6 +
 .../home-hero/model/use-nav-over-hero.ts      |  86 +++++++
 Client/features/home-hero/ui/HomeHero.tsx     |   7 +-
 Client/lib/admin/ui.tsx                       |   5 +-
 Client/lib/utils.ts                           |   7 +-
 Client/shared/config/brand-colors.ts          |  18 +-
 .../shared/ui/mobile-drawer/MobileDrawer.tsx  |   6 +-
 17 files changed, 446 insertions(+), 204 deletions(-)
 create mode 100644 Client/features/home-hero/model/use-nav-over-hero.ts

diff --git a/Client/app/globals.css b/Client/app/globals.css
index 1cbd8ad..3e4a0cf 100644
--- a/Client/app/globals.css
+++ b/Client/app/globals.css
@@ -6,13 +6,13 @@
    ============================================================ */
 
 @theme {
-  /* — Surfaces —
-     bg = страница; panel = карточки чуть темнее (мягкий шаг, не почти-чёрный) */
-  --color-bg: #0e1d1a;
-  --color-bg-2: #0b1815;
-  --color-panel: #0a1613;
-  --color-panel-2: #101f1c;
-  --color-bg-warm: #091411;
+  /* — Surfaces — Yamaha-like charcoal teal
+     bg = страница; panel = карточки чуть плотнее */
+  --color-bg: #121a18;
+  --color-bg-2: #0e1614;
+  --color-panel: #0c1412;
+  --color-panel-2: #182420;
+  --color-bg-warm: #0a100e;
 
   /* — Text — */
   --color-ink: #f0ede6;
@@ -108,25 +108,13 @@ body {
 }
 
 body {
-  background-color: #0e1d1a;
+  background-color: #121a18;
   color: var(--color-ink);
   touch-action: manipulation;
   overscroll-behavior-y: contain;
   overflow-x: clip;
   max-width: 100%;
-  background-image:
-    radial-gradient(
-      ellipse 110% 75% at 50% -5%,
-      #1a2f2c 0%,
-      transparent 55%
-    ),
-    linear-gradient(
-      180deg,
-      #132623 0%,
-      #0e1d1a 50%,
-      #0c1a17 100%
-    );
-  background-attachment: scroll;
+  background-image: none;
   font-feature-settings: "ss01" on, "kern" on;
 }
 
@@ -229,13 +217,31 @@ select:focus-visible {
 
   .nav-pill {
     border-radius: 9999px;
-    background: #0b1815;
-    border: 1px solid rgba(255, 255, 255, 0.1);
-    box-shadow: 0 18px 50px -18px rgba(0, 0, 0, 0.8);
-  }
-  .nav-pill-scrolled {
-    background: #0a1613;
-    border-color: rgba(255, 255, 255, 0.14);
+    transition:
+      background-color 0.55s var(--ease-fluid),
+      border-color 0.55s var(--ease-fluid),
+      box-shadow 0.55s var(--ease-fluid),
+      backdrop-filter 0.55s var(--ease-fluid),
+      -webkit-backdrop-filter 0.55s var(--ease-fluid);
+  }
+  /* Поверх hero-видео: без фона/обводки */
+  .nav-pill-over-hero {
+    background: transparent !important;
+    background-color: transparent !important;
+    border-color: transparent !important;
+    border-width: 1px;
+    border-style: solid;
+    box-shadow: none !important;
+    backdrop-filter: none !important;
+    -webkit-backdrop-filter: none !important;
+  }
+  .nav-pill-solid {
+    background: #0e1614 !important;
+    background-color: #0e1614 !important;
+    border: 1px solid rgba(255, 255, 255, 0.12) !important;
+    box-shadow: 0 18px 50px -18px rgba(0, 0, 0, 0.85) !important;
+    backdrop-filter: none !important;
+    -webkit-backdrop-filter: none !important;
   }
 
   .chrome-sticky {
@@ -383,18 +389,19 @@ select:focus-visible {
 
   .eyebrow {
     font-family: var(--font-sans);
-    font-size: 0.6875rem;
+    font-size: 0.75rem;
     font-weight: 500;
-    letter-spacing: 0.28em;
+    letter-spacing: 0.2em;
     text-transform: uppercase;
     color: var(--color-muted);
   }
 
+  /* Laws of UX: читаемость + Fitts — не микро-капс 11px */
   .nav-link {
     position: relative;
-    font-size: 0.6875rem;
+    font-size: 0.8125rem;
     font-weight: 500;
-    letter-spacing: 0.22em;
+    letter-spacing: 0.12em;
     text-transform: uppercase;
     color: var(--color-muted);
     transition: color 0.25s var(--ease-fluid);
@@ -411,12 +418,24 @@ select:focus-visible {
     position: absolute;
     left: 0.75rem;
     right: 0.75rem;
-    bottom: 0.35rem;
+    bottom: 0.3rem;
     height: 2px;
     background: var(--color-accent);
     border-radius: 1px;
   }
 
+  .nav-phone {
+    font-size: 0.875rem;
+    font-weight: 500;
+    letter-spacing: 0.02em;
+    text-transform: none;
+    color: var(--color-ink);
+    transition: color 0.25s var(--ease-fluid);
+  }
+  .nav-phone:hover {
+    color: var(--color-accent);
+  }
+
   .edge-fade {
     -webkit-mask-image: linear-gradient(
       90deg,
@@ -437,7 +456,7 @@ select:focus-visible {
 
 .container-x {
   width: 100%;
-  max-width: 80rem;
+  max-width: 90rem;
   margin-inline: auto;
   padding-inline: 1.25rem;
   box-sizing: border-box;
diff --git a/Client/components/Footer.tsx b/Client/components/Footer.tsx
index 853f85f..108db5b 100644
--- a/Client/components/Footer.tsx
+++ b/Client/components/Footer.tsx
@@ -199,7 +199,7 @@ export function Footer() {
               </p>
             ) : null}
 
-            <div className="border border-line bg-panel p-5">
+            <div className="rounded-2xl border border-line bg-panel p-5">
               <p className="font-display text-sm font-semibold text-ink">
                 Нужна помощь?
               </p>
diff --git a/Client/components/Header.tsx b/Client/components/Header.tsx
index 0b66bd4..4d67c1c 100644
--- a/Client/components/Header.tsx
+++ b/Client/components/Header.tsx
@@ -14,6 +14,7 @@ import {
 import { HeaderAuthActions, MobileAuthActions } from "@/features/auth";
 import { ACCOUNT_TAB_EVENT } from "@/features/account";
 import { CatalogSearchInput } from "@/features/catalog-search";
+import { useNavOverHero } from "@/features/home-hero";
 import { MobileDrawer } from "@/shared/ui/mobile-drawer";
 import { resetWindowScroll } from "@/lib/scroll";
 import { Logo } from "./Logo";
@@ -41,23 +42,15 @@ export function Header() {
   const router = useRouter();
   const pathname = usePathname();
   const { count, wishlist, setMiniOpen } = useCart();
-  const { categories, partnerBrands } = useSiteData();
-  const [scrolled, setScrolled] = useState(false);
+  const { categories, partnerBrands, store } = useSiteData();
   const [catOpen, setCatOpen] = useState(false);
   const [mobileOpen, setMobileOpen] = useState(false);
   const [q, setQ] = useState("");
   const catRef = useRef<HTMLDivElement>(null);
   const closeMobile = useCallback(() => setMobileOpen(false), []);
-
-  useEffect(() => {
-    const onScroll = () => {
-      const next = window.scrollY > 8;
-      setScrolled((prev) => (prev === next ? prev : next));
-    };
-    onScroll();
-    window.addEventListener("scroll", onScroll, { passive: true });
-    return () => window.removeEventListener("scroll", onScroll);
-  }, []);
+  const solid = useNavOverHero({ forceSolid: mobileOpen });
+  const phone = store.phone?.trim() ?? "";
+  const telHref = phone ? `tel:${phone.replace(/[^\d+]/g, "")}` : null;
 
   useEffect(() => {
     const onClick = (e: MouseEvent) => {
@@ -70,116 +63,95 @@ export function Header() {
 
   function search(e: React.FormEvent) {
     e.preventDefault();
-    router.push(
-      q.trim() ? `/catalog?q=${encodeURIComponent(q.trim())}` : "/catalog",
-    );
+    const query = q.trim();
+    router.push(query ? `/catalog?q=${encodeURIComponent(query)}` : "/catalog");
+    setQ("");
     closeMobile();
   }
 
   return (
     <>
       <header className="pointer-events-none fixed inset-x-0 top-0 z-50">
-        <div className="pointer-events-auto px-3 pt-3 sm:px-4 sm:pt-4 md:px-6">
+        <div className="pointer-events-auto container-x pt-3 sm:pt-4">
           <div
             className={cn(
-              "nav-pill mx-auto flex h-14 max-w-7xl min-w-0 flex-nowrap items-center gap-1.5 px-3 transition-[background-color,border-color] duration-300 sm:h-16 sm:gap-3 sm:px-5 md:h-[4.25rem] md:gap-5 md:px-6",
-              (scrolled || mobileOpen) && "nav-pill-scrolled",
+              "nav-pill flex h-14 w-full min-w-0 flex-nowrap items-center gap-1.5 px-3 sm:h-16 sm:gap-3 sm:px-5 md:h-[4.25rem] md:gap-4 md:px-6",
+              solid ? "nav-pill-solid" : "nav-pill-over-hero",
             )}
           >
-            <button
-              type="button"
-              onClick={() => setMobileOpen(true)}
-              aria-label="Открыть меню"
-              className="grid h-10 w-10 shrink-0 place-items-center rounded-full text-ink transition-colors hover:bg-panel hover:text-white md:hidden cursor-pointer"
-            >
-              <Menu size={20} strokeWidth={1.5} />
-            </button>
+            {/* 1. Логотип */}
+            <Logo compact="mobile" className="min-w-0 shrink" />
 
-            <div className="hidden items-center gap-1 md:flex">
-              <div ref={catRef} className="relative">
-                <button
-                  type="button"
-                  onClick={() => setCatOpen((v) => !v)}
+            {/* 2. Меню (desktop) */}
+            <div className="relative hidden shrink-0 md:block" ref={catRef}>
+              <button
+                type="button"
+                onClick={() => setCatOpen((v) => !v)}
+                className={cn(
+                  "nav-link inline-flex min-h-11 items-center gap-1.5 px-3 py-2 cursor-pointer",
+                  catOpen && "nav-link-active",
+                )}
+                aria-expanded={catOpen}
+              >
+                Меню
+                <ChevronDown
+                  size={16}
                   className={cn(
-                    "nav-link inline-flex items-center gap-1.5 px-3 py-2 cursor-pointer",
-                    catOpen && "nav-link-active",
+                    "transition-transform",
+                    catOpen && "rotate-180",
                   )}
-                  aria-expanded={catOpen}
-                >
-                  Меню
-                  <ChevronDown
-                    size={14}
-                    className={cn(
-                      "transition-transform",
-                      catOpen && "rotate-180",
-                    )}
-                  />
-                </button>
-                <AnimatePresence>
-                  {catOpen && (
-                    <motion.div
-                      initial={{ opacity: 0, y: 8 }}
-                      animate={{ opacity: 1, y: 0 }}
-                      exit={{ opacity: 0, y: 8 }}
-                      transition={{ duration: 0.22 }}
-                      className="absolute left-0 top-full z-50 mt-3 grid w-[28rem] grid-cols-2 gap-0.5 rounded-2xl border border-line bg-bg-2 p-2 shadow-[0_24px_60px_-24px_rgba(0,0,0,0.85)]"
-                    >
-                      {categories.map((c) => (
-                        <Link
-                          key={c.slug}
-                          href={`/catalog?cat=${c.slug}`}
-                          onClick={() => setCatOpen(false)}
-                          className="flex items-center gap-3 rounded-xl px-3 py-2.5 transition-colors hover:bg-panel"
-                        >
-                          <CardIcon size="sm">
-                            <Icon name={c.icon} size={15} strokeWidth={1.5} />
-                          </CardIcon>
-                          <span className="min-w-0">
-                            <span className="block truncate text-xs font-medium tracking-wide text-ink">
-                              {c.name}
-                            </span>
-                            <span className="text-[10px] uppercase tracking-wider text-faint">
-                              {c.count} моделей
-                            </span>
+                />
+              </button>
+              <AnimatePresence>
+                {catOpen && (
+                  <motion.div
+                    initial={{ opacity: 0, y: 8 }}
+                    animate={{ opacity: 1, y: 0 }}
+                    exit={{ opacity: 0, y: 8 }}
+                    transition={{ duration: 0.22 }}
+                    className="absolute left-0 top-full z-50 mt-3 grid w-[28rem] grid-cols-2 gap-0.5 rounded-2xl border border-line bg-bg-2 p-2 shadow-[0_24px_60px_-24px_rgba(0,0,0,0.85)]"
+                  >
+                    {categories.map((c) => (
+                      <Link
+                        key={c.slug}
+                        href={`/catalog?cat=${c.slug}`}
+                        onClick={() => setCatOpen(false)}
+                        className="flex items-center gap-3 rounded-xl px-3 py-2.5 transition-colors hover:bg-panel"
+                      >
+                        <CardIcon size="sm">
+                          <Icon name={c.icon} size={15} strokeWidth={1.5} />
+                        </CardIcon>
+                        <span className="min-w-0">
+                          <span className="block truncate text-xs font-medium tracking-wide text-ink">
+                            {c.name}
                           </span>
-                        </Link>
-                      ))}
-                    </motion.div>
-                  )}
-                </AnimatePresence>
-              </div>
+                          <span className="text-[10px] uppercase tracking-wider text-faint">
+                            {c.count} моделей
+                          </span>
+                        </span>
+                      </Link>
+                    ))}
+                  </motion.div>
+                )}
+              </AnimatePresence>
             </div>
 
-            <Logo compact="mobile" className="min-w-0 shrink" />
-
+            {/* 3. Поиск с вращающимися брендами */}
             <form onSubmit={search} className="hidden min-w-0 flex-1 lg:block">
               <CatalogSearchInput
                 value={q}
                 onChange={setQ}
                 brands={partnerBrands}
-                inputClassName="border-white/12 bg-black/20 focus:border-white/35 focus:bg-black/30"
+                inputClassName={
+                  solid
+                    ? "border-white/12 bg-black/20 focus:border-white/35 focus:bg-black/30"
+                    : "border-white/20 bg-transparent focus:border-white/40 focus:bg-black/15"
+                }
               />
             </form>
 
-            <nav className="hidden items-center gap-1 xl:flex">
-              {NAV.map((item) => {
-                const active = item.match(pathname);
-                return (
-                  <Link
-                    key={item.href}
-                    href={item.href}
-                    className={cn(
-                      "nav-link px-3 py-2",
-                      active && "nav-link-active",
-                    )}
-                  >
-                    {item.label}
-                  </Link>
-                );
-              })}
-            </nav>
-
-            <div className="ml-auto flex shrink-0 items-center gap-0.5 sm:gap-1 lg:ml-0">
+            {/* 4. Действия сгруппированы (Proximity) · телефон справа (desktop) */}
+            <div className="ml-auto flex shrink-0 items-center gap-1 sm:gap-1.5">
               <IconButton
                 label="Избранное"
                 badge={wishlist.length}
@@ -197,18 +169,35 @@ export function Header() {
                   }
                 }}
               >
-                <Heart size={18} strokeWidth={1.5} />
+                <Heart size={19} strokeWidth={1.5} />
               </IconButton>
               <IconButton
                 label="Корзина"
                 badge={count}
                 onClick={() => setMiniOpen(true)}
               >
-                <ShoppingCart size={18} strokeWidth={1.5} />
+                <ShoppingCart size={19} strokeWidth={1.5} />
               </IconButton>
               <div className="hidden md:block">
                 <HeaderAuthActions />
               </div>
+              {telHref ? (
+                <a
+                  href={telHref}
+                  className="nav-phone ml-1 hidden min-h-11 items-center whitespace-nowrap px-2 py-2 tabular-nums md:inline-flex"
+                  aria-label={`Позвонить ${phone}`}
+                >
+                  {phone}
+                </a>
+              ) : null}
+              <button
+                type="button"
+                onClick={() => setMobileOpen(true)}
+                aria-label="Открыть меню"
+                className="grid h-11 w-11 shrink-0 place-items-center rounded-full text-ink transition-colors hover:bg-panel hover:text-white md:hidden cursor-pointer"
+              >
+                <Menu size={22} strokeWidth={1.5} />
+              </button>
             </div>
           </div>
         </div>
@@ -221,20 +210,36 @@ export function Header() {
         panelClassName="w-[min(100vw-2.5rem,20rem)] max-w-[20rem] rounded-l-3xl"
         aria-label="Навигация"
       >
-        <div className="shrink-0 border-b border-line px-5 py-5">
-          <div className="flex items-center justify-between">
-            <Logo compact />
+        <div className="shrink-0 border-b border-line px-4 py-4 sm:px-5">
+          <div className="flex items-center gap-2">
+            <Logo
+              compact
+              className="min-w-0 shrink"
+              onNavigate={closeMobile}
+            />
+            {telHref ? (
+              <a
+                href={telHref}
+                onClick={closeMobile}
+                className="min-w-0 flex-1 truncate text-sm font-medium tabular-nums tracking-normal text-ink"
+                aria-label={`Позвонить ${phone}`}
+              >
+                {phone}
+              </a>
+            ) : (
+              <span className="flex-1" />
+            )}
             <button
               type="button"
               onClick={closeMobile}
               aria-label="Закрыть меню"
-              className="grid h-10 w-10 place-items-center rounded-full text-muted hover:bg-panel hover:text-ink cursor-pointer"
+              className="grid h-10 w-10 shrink-0 place-items-center rounded-full text-muted hover:bg-panel hover:text-ink cursor-pointer"
             >
               <X size={18} strokeWidth={1.5} />
             </button>
           </div>
         </div>
-        <div className="flex-1 overflow-y-auto px-5 py-5">
+        <div className="min-h-0 flex-1 overflow-y-auto overscroll-contain px-5 py-5 [-webkit-overflow-scrolling:touch]">
           <div className="mb-6">
             <MobileAuthActions onNavigate={closeMobile} />
           </div>
@@ -260,7 +265,7 @@ export function Header() {
             ))}
           </nav>
           <p className="eyebrow mb-3">Категории</p>
-          <nav className="space-y-1">
+          <nav className="space-y-1 pb-6">
             {categories.map((c) => (
               <Link
                 key={c.slug}
@@ -299,12 +304,12 @@ function IconButton({
   href?: string;
 }) {
   const cls =
-    "relative grid h-10 w-10 shrink-0 place-items-center rounded-full text-muted transition-colors hover:bg-panel hover:text-ink cursor-pointer";
+    "relative grid h-11 w-11 shrink-0 place-items-center rounded-full text-muted transition-colors hover:bg-panel hover:text-ink cursor-pointer";
   const inner = (
     <>
       {children}
       {badge != null && badge > 0 && (
-        <span className="pointer-events-none absolute right-0.5 top-0.5 grid h-4 min-w-4 place-items-center rounded-full bg-accent px-1 text-[9px] font-semibold tabular-nums text-bg">
+        <span className="pointer-events-none absolute right-0.5 top-0.5 grid h-5 min-w-5 place-items-center rounded-full bg-accent px-1 text-[10px] font-semibold tabular-nums text-bg">
           {badge}
         </span>
       )}
diff --git a/Client/components/Logo.tsx b/Client/components/Logo.tsx
index 4ae41dc..4995f42 100644
--- a/Client/components/Logo.tsx
+++ b/Client/components/Logo.tsx
@@ -8,9 +8,12 @@ import { scrollWindowToTop } from "@/lib/scroll";
 export function Logo({
   className,
   compact = false,
+  onNavigate,
 }: {
   className?: string;
   compact?: boolean | "mobile";
+  /** Например закрыть мобильное меню после перехода. */
+  onNavigate?: () => void;
 }) {
   const pathname = usePathname();
   const onHome = pathname === "/";
@@ -21,6 +24,7 @@ export function Logo({
       className={cn("inline-flex min-w-0 shrink items-center", className)}
       aria-label={onHome ? "MAZE — наверх" : "MAZE — на главную"}
       onClick={(e) => {
+        onNavigate?.();
         if (!onHome) return;
         e.preventDefault();
         scrollWindowToTop();
diff --git a/Client/components/ProductCard.tsx b/Client/components/ProductCard.tsx
index 496e21b..620704c 100644
--- a/Client/components/ProductCard.tsx
+++ b/Client/components/ProductCard.tsx
@@ -148,11 +148,11 @@ export function ProductCard({ product }: { product: Product }) {
 
           <div className="mt-auto flex min-w-0 items-end justify-between gap-3 pt-4">
             <Link href={href} className="min-w-0">
-              <div className="font-display text-xl font-semibold tabular-nums tracking-tight text-ink sm:text-2xl">
+              <div className="whitespace-nowrap font-display text-xl font-semibold tabular-nums tracking-tight text-ink sm:text-2xl">
                 {formatPrice(product.price)}
               </div>
               {product.oldPrice ? (
-                <div className="text-xs text-faint line-through">
+                <div className="whitespace-nowrap text-xs text-faint line-through">
                   {formatPrice(product.oldPrice)}
                 </div>
               ) : null}
diff --git a/Client/features/auth/ui/HeaderAuthActions.tsx b/Client/features/auth/ui/HeaderAuthActions.tsx
index 21c6dbc..33e3f90 100644
--- a/Client/features/auth/ui/HeaderAuthActions.tsx
+++ b/Client/features/auth/ui/HeaderAuthActions.tsx
@@ -20,7 +20,7 @@ function AuthIconButton({
   className?: string;
 }) {
   const cls = cn(
-    "relative grid h-10 w-10 shrink-0 place-items-center rounded-full text-muted transition-colors hover:bg-panel hover:text-ink cursor-pointer",
+    "relative grid h-11 w-11 shrink-0 place-items-center rounded-full text-muted transition-colors hover:bg-panel hover:text-ink cursor-pointer",
     className,
   );
 
diff --git a/Client/features/catalog-filters/ui/PriceFilter.tsx b/Client/features/catalog-filters/ui/PriceFilter.tsx
index 357abfe..e1d67f3 100644
--- a/Client/features/catalog-filters/ui/PriceFilter.tsx
+++ b/Client/features/catalog-filters/ui/PriceFilter.tsx
@@ -1,26 +1,142 @@
 "use client";
 
-import { formatPrice } from "@/lib/utils";
+import { useEffect, useId, useState } from "react";
 import { FilterGroup } from "./FilterGroup";
 import { PriceRangeSlider } from "./PriceRangeSlider";
 
 type PriceFilterProps = {
-  price: number;
-  maxPrice: number;
-  onChange: (next: number) => void;
+  min: number;
+  max: number;
+  /** Потолок каталога (самая дорогая позиция) */
+  ceiling: number;
+  onMinChange: (next: number) => void;
+  onMaxChange: (next: number) => void;
 };
 
-export function PriceFilter({ price, maxPrice, onChange }: PriceFilterProps) {
+function formatAmount(value: number) {
+  return new Intl.NumberFormat("ru-RU")
+    .format(Math.max(0, Math.round(value)))
+    .replace(/\s/g, "\u00A0");
+}
+
+function parseAmount(raw: string): number | null {
+  const digits = raw.replace(/\D/g, "");
+  if (!digits) return null;
+  return Number(digits);
+}
+
+function PriceField({
+  label,
+  value,
+  onCommit,
+  disabled,
+}: {
+  label: string;
+  value: number;
+  onCommit: (next: number) => void;
+  disabled?: boolean;
+}) {
+  const id = useId();
+  const [text, setText] = useState(() => formatAmount(value));
+  const [focused, setFocused] = useState(false);
+
+  useEffect(() => {
+    if (!focused) setText(formatAmount(value));
+  }, [value, focused]);
+
+  function commit() {
+    const parsed = parseAmount(text);
+    const next = parsed == null ? value : parsed;
+    onCommit(next);
+    setText(formatAmount(next));
+  }
+
+  return (
+    <label
+      htmlFor={id}
+      className="flex min-w-0 flex-1 cursor-text items-center gap-1 rounded-xl border border-line bg-white/[0.03] px-2 py-2 transition-colors focus-within:border-accent/50"
+    >
+      <span className="shrink-0 text-[10px] uppercase tracking-wider text-faint">
+        {label}
+      </span>
+      <input
+        id={id}
+        type="text"
+        inputMode="numeric"
+        autoComplete="off"
+        disabled={disabled}
+        value={text}
+        onChange={(e) => setText(e.target.value)}
+        onFocus={(e) => {
+          setFocused(true);
+          e.target.select();
+        }}
+        onBlur={() => {
+          setFocused(false);
+          commit();
+        }}
+        onKeyDown={(e) => {
+          if (e.key === "Enter") {
+            e.currentTarget.blur();
+          }
+        }}
+        className="min-w-0 flex-1 bg-transparent text-[13px] font-medium tabular-nums tracking-tight text-ink outline-none disabled:opacity-50"
+        aria-label={label}
+      />
+      <span className="shrink-0 text-[13px] tabular-nums text-muted" aria-hidden>
+        ₽
+      </span>
+    </label>
+  );
+}
+
+/**
+ * Цена как у DNS / М.Видео: поля «от» / «до» + ползунок максимума.
+ * Ползунок не меняем — только синхронизируем с «до».
+ */
+export function PriceFilter({
+  min,
+  max,
+  ceiling,
+  onMinChange,
+  onMaxChange,
+}: PriceFilterProps) {
+  const safeCeiling = Number.isFinite(ceiling) && ceiling > 0 ? ceiling : 0;
+
+  function commitMin(raw: number) {
+    const next = Math.min(Math.max(0, raw), safeCeiling);
+    if (next > max) onMaxChange(next);
+    onMinChange(next);
+  }
+
+  function commitMax(raw: number) {
+    const next = Math.min(Math.max(0, raw), safeCeiling);
+    if (next < min) onMinChange(next);
+    onMaxChange(next);
+  }
+
   return (
     <FilterGroup title="Цена">
-      <div className="px-1">
-        <div className="mb-3 flex items-center justify-between gap-2 text-sm">
-          <span className="text-faint">0 ₽</span>
-          <span className="rounded-lg border border-line bg-white/[0.03] px-2.5 py-1 font-medium tabular-nums text-cyan">
-            до {formatPrice(price)}
-          </span>
+      <div className="px-0.5">
+        <div className="mb-3 flex items-stretch gap-2">
+          <PriceField
+            label="от"
+            value={min}
+            onCommit={commitMin}
+            disabled={safeCeiling <= 0}
+          />
+          <PriceField
+            label="до"
+            value={max}
+            onCommit={commitMax}
+            disabled={safeCeiling <= 0}
+          />
         </div>
-        <PriceRangeSlider value={price} max={maxPrice} onChange={onChange} />
+        <PriceRangeSlider
+          value={max}
+          max={safeCeiling}
+          onChange={commitMax}
+        />
       </div>
     </FilterGroup>
   );
diff --git a/Client/features/catalog-search/ui/CatalogSearchInput.tsx b/Client/features/catalog-search/ui/CatalogSearchInput.tsx
index 3581a9b..c00b501 100644
--- a/Client/features/catalog-search/ui/CatalogSearchInput.tsx
+++ b/Client/features/catalog-search/ui/CatalogSearchInput.tsx
@@ -37,7 +37,7 @@ export function CatalogSearchInput({
         placeholder=""
         aria-label={ariaLabel}
         className={cn(
-          "relative z-[1] w-full rounded-full border border-line bg-white/[0.03] py-2.5 pl-11 pr-4 text-sm text-ink outline-none transition-colors focus:border-accent/60 focus:bg-white/[0.05]",
+          "relative z-[1] w-full rounded-full border border-line bg-white/[0.03] py-2.5 pl-11 pr-4 text-[0.9375rem] leading-normal text-ink outline-none transition-colors focus:border-accent/60 focus:bg-white/[0.05]",
           inputClassName,
         )}
       />
diff --git a/Client/features/catalog/ui/CatalogClient.tsx b/Client/features/catalog/ui/CatalogClient.tsx
index 3a03c85..5d8e514 100644
--- a/Client/features/catalog/ui/CatalogClient.tsx
+++ b/Client/features/catalog/ui/CatalogClient.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useMemo, useRef, useState } from "react";
+import { useMemo, useState } from "react";
 import { useRouter } from "next/navigation";
 import { motion, AnimatePresence } from "motion/react";
 import { SlidersHorizontal, X } from "lucide-react";
@@ -61,7 +61,6 @@ export function CatalogClient({
   initialCat?: string;
 }) {
   const router = useRouter();
-  const resultsRef = useRef<HTMLDivElement>(null);
   const routeSelections = useMemo(
     () => resolveRouteFilterSelections(initialCat),
     [initialCat],
@@ -89,7 +88,8 @@ export function CatalogClient({
     if (initialCategory) return [initialCategory];
     return routeSelections.cats;
   });
-  const [price, setPrice] = useState(maxPrice);
+  const [priceMin, setPriceMin] = useState(0);
+  const [priceMax, setPriceMax] = useState(maxPrice);
   const [sort, setSort] = useState<Sort>("pop");
   const [mobileFilters, setMobileFilters] = useState(false);
 
@@ -104,7 +104,8 @@ export function CatalogClient({
         return false;
       if (selBrands.length && !selBrands.includes(p.brand)) return false;
       if (selCats.length && !selCats.includes(p.category)) return false;
-      if (maxPrice > 0 && p.price > price) return false;
+      if (p.price < priceMin) return false;
+      if (maxPrice > 0 && p.price > priceMax) return false;
       return true;
     });
     list = [...list].sort((a, b) => {
@@ -115,9 +116,10 @@ export function CatalogClient({
       return b.reviews - a.reviews;
     });
     return list;
-  }, [products, query, selBrands, selCats, price, sort, maxPrice]);
+  }, [products, query, selBrands, selCats, priceMin, priceMax, sort, maxPrice]);
 
-  const priceFilterActive = maxPrice > 0 && price < maxPrice;
+  const priceFilterActive =
+    priceMin > 0 || (maxPrice > 0 && priceMax < maxPrice);
   const activeCount =
     selBrands.length +
     selCats.length +
@@ -127,32 +129,25 @@ export function CatalogClient({
 
   const hasActiveFilters = activeCount > 0;
 
-  function scrollResultsToTop() {
-    resultsRef.current?.scrollIntoView({ behavior: "smooth", block: "start" });
-  }
-
   function reset() {
     setSelBrands([]);
     setSelCats([]);
-    setPrice(maxPrice);
+    setPriceMin(0);
+    setPriceMax(maxPrice);
     setQuery("");
     setMobileFilters(false);
     router.push("/catalog");
-    scrollResultsToTop();
-  }
-
-  function onPriceChange(next: number) {
-    setPrice(next);
-    scrollResultsToTop();
   }
 
   const FilterPanel = (
     <div className="space-y-7">
       <div className="sticky top-0 z-10 -mx-5 bg-[var(--color-panel)]/95 px-5 pb-4 pt-1 backdrop-blur-md">
         <PriceFilter
-          price={price}
-          maxPrice={maxPrice}
-          onChange={onPriceChange}
+          min={priceMin}
+          max={priceMax}
+          ceiling={maxPrice}
+          onMinChange={setPriceMin}
+          onMaxChange={setPriceMax}
         />
       </div>
 
@@ -193,21 +188,21 @@ export function CatalogClient({
   );
 
   return (
-    <div className="mx-auto grid w-full min-w-0 max-w-7xl gap-8 lg:grid-cols-[15rem_minmax(0,1fr)]">
-      <aside className="hidden min-w-0 lg:block lg:w-[15rem] lg:shrink-0">
+    <div className="mx-auto grid w-full min-w-0 gap-8 lg:grid-cols-[16rem_minmax(0,1fr)]">
+      <aside className="hidden min-w-0 lg:block lg:w-[16rem] lg:shrink-0">
         <div className="border border-line bg-bg-2 sticky top-24 flex max-h-[calc(100dvh-7rem)] flex-col overflow-hidden rounded-2xl">
-          {hasActiveFilters && (
+          {hasActiveFilters ? (
             <div className="shrink-0 border-b border-line px-5 pb-4 pt-5">
               <ResetFiltersButton onClick={reset} />
             </div>
-          )}
+          ) : null}
           <div className="min-h-0 flex-1 overflow-y-auto px-5 pb-5 pt-4">
             {FilterPanel}
           </div>
         </div>
       </aside>
 
-      <div ref={resultsRef} className="min-w-0 w-full max-w-full scroll-mt-28">
+      <div className="min-w-0 w-full max-w-full">
         <div className="mb-5 flex min-w-0 flex-col gap-3 sm:mb-6 sm:flex-row sm:flex-wrap sm:items-center">
           <div className="flex min-w-0 flex-1 items-center justify-between gap-3">
             <div className="text-sm text-muted">
@@ -267,7 +262,7 @@ export function CatalogClient({
         </div>
 
         {filtered.length ? (
-          <div className="grid w-full grid-cols-2 gap-2 sm:gap-4 lg:grid-cols-3 [grid-template-columns:minmax(0,1fr)_minmax(0,1fr)] lg:[grid-template-columns:repeat(3,minmax(0,1fr))]">
+          <div className="grid w-full grid-cols-2 gap-2 sm:gap-3 lg:grid-cols-5 [grid-template-columns:minmax(0,1fr)_minmax(0,1fr)] lg:[grid-template-columns:repeat(5,minmax(0,1fr))]">
             <AnimatePresence mode="popLayout">
               {filtered.map((p) => (
                 <motion.div
@@ -317,9 +312,9 @@ export function CatalogClient({
               <X size={18} />
             </button>
           </div>
-          {hasActiveFilters && (
+          {hasActiveFilters ? (
             <ResetFiltersButton onClick={reset} className="mt-4" />
-          )}
+          ) : null}
         </div>
         <div className="flex-1 overflow-y-auto p-6 pt-4">
           {FilterPanel}
diff --git a/Client/features/home-hero/index.ts b/Client/features/home-hero/index.ts
index e7c3fc5..a8ddfd2 100644
--- a/Client/features/home-hero/index.ts
+++ b/Client/features/home-hero/index.ts
@@ -1 +1,3 @@
 export { HomeHero } from "./ui/HomeHero";
+export { useNavOverHero } from "./model/use-nav-over-hero";
+export { HERO_SECTION_ID, HERO_NAV_SOLID_OFFSET_PX } from "./lib/constants";
diff --git a/Client/features/home-hero/lib/constants.ts b/Client/features/home-hero/lib/constants.ts
index 5213e38..ec4e4dc 100644
--- a/Client/features/home-hero/lib/constants.ts
+++ b/Client/features/home-hero/lib/constants.ts
@@ -1,6 +1,12 @@
 /** Обрезано до 18 с (до появления логотипа). ?v= — сброс кэша браузера */
 export const HERO_VIDEO_SRC = "/media/hero-bg.mp4?v=18cut";
 
+/** Секция hero на главной — якорь для прозрачного навбара над видео. */
+export const HERO_SECTION_ID = "home-hero";
+
+/** Высота зоны fixed-header: когда низ hero уходит выше — включаем solid pill. */
+export const HERO_NAV_SOLID_OFFSET_PX = 80;
+
 export const HERO_COPY = {
   badge: "Более 12 000 клиентов нашли свой путь",
   title: "MAZE",
diff --git a/Client/features/home-hero/model/use-nav-over-hero.ts b/Client/features/home-hero/model/use-nav-over-hero.ts
new file mode 100644
index 0000000..ba9896b
--- /dev/null
+++ b/Client/features/home-hero/model/use-nav-over-hero.ts
@@ -0,0 +1,86 @@
+"use client";
+
+import { usePathname } from "next/navigation";
+import { useEffect, useState } from "react";
+import {
+  HERO_NAV_SOLID_OFFSET_PX,
+  HERO_SECTION_ID,
+} from "../lib/constants";
+
+type Options = {
+  /** Например открытое мобильное меню — всегда solid. */
+  forceSolid?: boolean;
+};
+
+function readPastHero(): boolean {
+  const hero = document.getElementById(HERO_SECTION_ID);
+  if (!hero) return false;
+
+  // У самого верха главной всегда прозрачный навбар (поверх видео)
+  if (window.scrollY < 40) return false;
+
+  return hero.getBoundingClientRect().bottom <= HERO_NAV_SOLID_OFFSET_PX;
+}
+
+/**
+ * На главной: solid=false, пока секция hero (видео) ещё под навбаром.
+ * После конца видео / на других страницах — solid pill.
+ */
+export function useNavOverHero({ forceSolid = false }: Options = {}) {
+  const pathname = usePathname();
+  const isHome = pathname === "/";
+  const [pastHero, setPastHero] = useState(() => !isHome);
+
+  useEffect(() => {
+    if (!isHome) {
+      setPastHero(true);
+      return;
+    }
+
+    setPastHero(false);
+
+    let cancelled = false;
+    let raf = 0;
+    let io: IntersectionObserver | null = null;
+
+    const apply = (next: boolean) => {
+      if (cancelled) return;
+      setPastHero((prev) => (prev === next ? prev : next));
+    };
+
+    const sync = () => apply(readPastHero());
+
+    const attach = () => {
+      if (cancelled) return;
+      const hero = document.getElementById(HERO_SECTION_ID);
+      if (!hero) {
+        raf = window.requestAnimationFrame(attach);
+        return;
+      }
+
+      sync();
+
+      io = new IntersectionObserver(sync, {
+        root: null,
+        rootMargin: `-${HERO_NAV_SOLID_OFFSET_PX}px 0px 0px 0px`,
+        threshold: [0, 0.01, 0.1, 0.25, 0.5, 1],
+      });
+      io.observe(hero);
+
+      window.addEventListener("scroll", sync, { passive: true });
+      window.addEventListener("resize", sync);
+    };
+
+    attach();
+
+    return () => {
+      cancelled = true;
+      window.cancelAnimationFrame(raf);
+      io?.disconnect();
+      window.removeEventListener("scroll", sync);
+      window.removeEventListener("resize", sync);
+    };
+  }, [isHome]);
+
+  return forceSolid || pastHero;
+}
diff --git a/Client/features/home-hero/ui/HomeHero.tsx b/Client/features/home-hero/ui/HomeHero.tsx
index e2d190b..998a290 100644
--- a/Client/features/home-hero/ui/HomeHero.tsx
+++ b/Client/features/home-hero/ui/HomeHero.tsx
@@ -5,14 +5,17 @@ import { motion } from "motion/react";
 import { ArrowRight, Repeat } from "lucide-react";
 import { useModal } from "@/components/modals";
 import { FLUID_EASE } from "@/shared/lib/motion";
-import { HERO_COPY } from "../lib/constants";
+import { HERO_COPY, HERO_SECTION_ID } from "../lib/constants";
 import { HeroVideoBackground } from "./HeroVideoBackground";
 
 export function HomeHero() {
   const { open } = useModal();
 
   return (
-    <section className="relative -mt-[4.75rem] min-h-[min(100svh,920px)] w-full overflow-hidden sm:-mt-[5.5rem] md:-mt-[5.75rem]">
+    <section
+      id={HERO_SECTION_ID}
+      className="relative -mt-[4.75rem] min-h-[min(100svh,920px)] w-full overflow-hidden sm:-mt-[5.5rem] md:-mt-[5.75rem]"
+    >
       <HeroVideoBackground />
       <div
         className="pointer-events-none absolute inset-0 bg-gradient-to-r from-black via-black/50 to-transparent"
diff --git a/Client/lib/admin/ui.tsx b/Client/lib/admin/ui.tsx
index c5f63b7..b70538b 100644
--- a/Client/lib/admin/ui.tsx
+++ b/Client/lib/admin/ui.tsx
@@ -747,7 +747,10 @@ export function AdminSelect({
 }
 
 export function formatPrice(n: number) {
-  return new Intl.NumberFormat("ru-RU").format(n) + " ₽";
+  const amount = new Intl.NumberFormat("ru-RU")
+    .format(n)
+    .replace(/\s/g, "\u00A0");
+  return `${amount}\u00A0₽`;
 }
 
 export function errorMessage(err: unknown, fallback = "Ошибка запроса") {
diff --git a/Client/lib/utils.ts b/Client/lib/utils.ts
index 8d78cdb..6e7488c 100644
--- a/Client/lib/utils.ts
+++ b/Client/lib/utils.ts
@@ -5,9 +5,12 @@ export function cn(...inputs: ClassValue[]) {
   return twMerge(clsx(inputs));
 }
 
-/** Форматирует цену в рублях: 129990 → «129 990 ₽» */
+/** Форматирует цену в рублях: 129990 → «129 990 ₽» (неразрывные пробелы — ₽ не переносится) */
 export function formatPrice(value: number) {
-  return new Intl.NumberFormat("ru-RU").format(value) + " ₽";
+  const amount = new Intl.NumberFormat("ru-RU")
+    .format(value)
+    .replace(/\s/g, "\u00A0");
+  return `${amount}\u00A0₽`;
 }
 
 /** Склонение: plural(2, ['товар','товара','товаров']) → 'товара' */
diff --git a/Client/shared/config/brand-colors.ts b/Client/shared/config/brand-colors.ts
index a6826c1..3192b69 100644
--- a/Client/shared/config/brand-colors.ts
+++ b/Client/shared/config/brand-colors.ts
@@ -1,17 +1,17 @@
-/** MAZE — forest + Pumpkin Spice */
+/** MAZE — Yamaha-like charcoal teal + Pumpkin Spice */
 export const BRAND = {
   green: {
-    base: "#0E1D1A",
-    panel: "#0A1613",
-    soft: "#0B1815",
-    mid: "#101F1C",
+    base: "#121A18",
+    panel: "#0C1412",
+    soft: "#0E1614",
+    mid: "#182420",
   },
   warm: {
-    base: "#091411",
-    hover: "#0B1815",
-    mid: "#152623",
+    base: "#0A100E",
+    hover: "#0E1614",
+    mid: "#1C2825",
     glow: "rgba(227, 121, 47, 0.14)",
-    shadow: "rgba(0, 0, 0, 0.5)",
+    shadow: "rgba(0, 0, 0, 0.55)",
   },
   gold: {
     base: "#E3792F",
diff --git a/Client/shared/ui/mobile-drawer/MobileDrawer.tsx b/Client/shared/ui/mobile-drawer/MobileDrawer.tsx
index d29e873..8e464b3 100644
--- a/Client/shared/ui/mobile-drawer/MobileDrawer.tsx
+++ b/Client/shared/ui/mobile-drawer/MobileDrawer.tsx
@@ -125,7 +125,7 @@ export function MobileDrawer({
       {open && (
         <div
           className={cn(
-            "fixed inset-0 isolate touch-none",
+            "fixed inset-0 isolate",
             zIndexClassName,
             rootClassName,
           )}
@@ -134,7 +134,7 @@ export function MobileDrawer({
           <motion.button
             type="button"
             aria-label="Закрыть"
-            className="absolute inset-0 z-0 bg-bg/92 backdrop-blur-md"
+            className="absolute inset-0 z-0 touch-none bg-bg/92 backdrop-blur-md"
             style={{ backgroundColor: SCRIM_BG }}
             initial={{ opacity: 0 }}
             animate={{ opacity: 1 }}
@@ -150,7 +150,7 @@ export function MobileDrawer({
             aria-label={ariaLabel ?? (ariaLabelledBy ? undefined : "Меню")}
             aria-labelledby={ariaLabelledBy}
             className={cn(
-              "absolute top-0 z-10 flex h-dvh min-h-dvh flex-col overflow-hidden bg-panel outline-none",
+              "absolute top-0 z-10 flex h-dvh min-h-0 max-h-dvh flex-col overflow-hidden overscroll-contain bg-panel outline-none touch-pan-y",
               panelWidthClass,
               panelPositionClass,
               panelClassName,