b28ddfc2d4
Console polish on the Virtual displays card + shell: - Topology help now leads with the streamed display's role (Extend/Primary/Exclusive) instead of the confusing physical-monitor-only framing; notes the headless case. Identity help spells out the actual behavior (stable per-client identity → the desktop reapplies that client's scaling/resolution on reconnect) + what Shared / Per-client / Per-client+resolution each do. - Cap description/help width at max-w-prose so long help text isn't a full-viewport line on large screens. - Mobile bottom nav: 8 flat tabs were too cramped → 4 pinned tabs + a "More" tab whose sheet holds the rest (Performance/Logs/Pairing/Settings), "More" highlighted when the active route is in the overflow. - More breathing room under the "Preset" heading. web tsc + biome + vite build green. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
225 lines
7.6 KiB
TypeScript
225 lines
7.6 KiB
TypeScript
import { Link, useRouterState } from "@tanstack/react-router";
|
|
import {
|
|
Activity,
|
|
GaugeCircle,
|
|
KeyRound,
|
|
LibraryBig,
|
|
MonitorPlay,
|
|
MoreHorizontal,
|
|
ScrollText,
|
|
Server,
|
|
Settings,
|
|
} from "lucide-react";
|
|
import { motion, stagger } from "motion/react";
|
|
import { type ReactNode, useState } from "react";
|
|
import { BrandMark } from "@/components/brand-mark";
|
|
import { Wordmark } from "@/components/wordmark";
|
|
import { changeLocale, type Locale, locales, useLocale } from "@/lib/i18n";
|
|
import { cn } from "@/lib/utils";
|
|
import { m } from "@/paraglide/messages";
|
|
|
|
const MLink = motion(Link);
|
|
|
|
const NAV = [
|
|
{ to: "/", icon: Activity, label: () => m.nav_dashboard() },
|
|
{ to: "/host", icon: Server, label: () => m.nav_host() },
|
|
{ to: "/displays", icon: MonitorPlay, label: () => m.nav_displays() },
|
|
{ to: "/library", icon: LibraryBig, label: () => m.nav_library() },
|
|
{ to: "/stats", icon: GaugeCircle, label: () => m.nav_stats() },
|
|
{ to: "/logs", icon: ScrollText, label: () => m.nav_logs() },
|
|
{ to: "/pairing", icon: KeyRound, label: () => m.nav_pairing() },
|
|
{ to: "/settings", icon: Settings, label: () => m.nav_settings() },
|
|
] as const;
|
|
|
|
// On phones a flat 8-tab bar is too cramped, so the first four are pinned and the rest live behind a
|
|
// "More" tab that opens a sheet above the bar. Keep it ≤ 5 slots including "More".
|
|
const MOBILE_PRIMARY = NAV.slice(0, 4);
|
|
const MOBILE_OVERFLOW = NAV.slice(4);
|
|
|
|
export function AppShell({ children }: { children: ReactNode }) {
|
|
// Read the locale so the whole shell re-renders on a language switch.
|
|
useLocale();
|
|
return (
|
|
<div className="flex min-h-screen">
|
|
{/* Desktop sidebar (≥ sm). Sticky at viewport height: the page (body) scrolls with
|
|
long content, but the sidebar stays pinned — the explicit h-dvh stops the flex
|
|
stretch that would otherwise grow it (and push the language switcher) below the
|
|
fold. overflow-y-auto lets the nav itself scroll on very short viewports. */}
|
|
<aside className="sticky top-0 hidden h-dvh w-60 shrink-0 flex-col overflow-y-auto border-r bg-card/40 p-4 sm:flex">
|
|
<Link
|
|
to="/"
|
|
aria-label="punktfunk"
|
|
className="mb-7 flex items-center gap-2 px-2 pt-1"
|
|
>
|
|
<BrandMark className="size-7 drop-shadow-[0_2px_12px_rgba(108,91,243,0.45)]" />
|
|
<Wordmark className="h-4" />
|
|
</Link>
|
|
<motion.nav
|
|
animate="enter"
|
|
initial="from"
|
|
transition={{
|
|
delayChildren: stagger(0.1),
|
|
}}
|
|
variants={{ enter: {}, from: {} }}
|
|
className="flex flex-col gap-1"
|
|
>
|
|
{NAV.map(({ to, icon: Icon, label }) => (
|
|
<MLink
|
|
key={to}
|
|
variants={{
|
|
from: { opacity: 0, x: -20 },
|
|
enter: { opacity: 1, x: 0 },
|
|
}}
|
|
whileHover={{ scale: 1.02 }}
|
|
whileTap={{ scale: 0.98 }}
|
|
to={to}
|
|
activeOptions={{ exact: to === "/" }}
|
|
className="group relative flex items-center gap-3 rounded-md px-3 py-2 text-sm text-muted-foreground transition-colors hover:text-foreground"
|
|
activeProps={{
|
|
className: "bg-primary/15 text-foreground font-medium",
|
|
}}
|
|
>
|
|
{/* Hover brightens: a brand-tinted wash layered OVER whatever the
|
|
link's background is (transparent or the active tint), so the
|
|
item gets lighter on hover — including the active one. */}
|
|
<span
|
|
aria-hidden
|
|
className="pointer-events-none absolute inset-0 rounded-md bg-primary/0 transition-colors duration-200 group-hover:bg-primary/15"
|
|
/>
|
|
<Icon className="relative size-4" />
|
|
<span className="relative">{label()}</span>
|
|
</MLink>
|
|
))}
|
|
</motion.nav>
|
|
<div className="mt-auto pt-4">
|
|
<LanguageSwitcher />
|
|
</div>
|
|
</aside>
|
|
|
|
<div className="flex flex-1 flex-col overflow-x-hidden">
|
|
{/* Mobile top bar (< sm): brand + language. The sidebar is hidden here. */}
|
|
<header className="flex items-center gap-2 border-b bg-card/40 px-4 py-3 sm:hidden">
|
|
<BrandMark className="size-6" />
|
|
<Wordmark className="h-3.5" />
|
|
<div className="ml-auto">
|
|
<LanguageSwitcher />
|
|
</div>
|
|
</header>
|
|
|
|
<main className="flex-1">
|
|
{/* pb-24 leaves room for the fixed bottom nav on mobile. */}
|
|
<div className="mx-auto max-w-[1700px] p-6 pb-24 sm:p-10 sm:pb-10">
|
|
{children}
|
|
</div>
|
|
</main>
|
|
</div>
|
|
|
|
<MobileNav />
|
|
</div>
|
|
);
|
|
}
|
|
|
|
/** Mobile bottom navigation (< sm): four pinned tabs + a "More" tab whose sheet holds the rest. */
|
|
function MobileNav() {
|
|
const [moreOpen, setMoreOpen] = useState(false);
|
|
const pathname = useRouterState({ select: (s) => s.location.pathname });
|
|
// Highlight "More" when the current route lives in the overflow.
|
|
const overflowActive = MOBILE_OVERFLOW.some(
|
|
(n) => pathname === n.to || pathname.startsWith(`${n.to}/`),
|
|
);
|
|
// Fixed two-line-tall label box so a 1- or 2-line label (labels vary by locale) keeps every icon
|
|
// at the same height.
|
|
const tab =
|
|
"flex flex-1 flex-col items-center justify-center gap-1 px-0.5 py-2 text-muted-foreground transition-colors";
|
|
const lbl =
|
|
"flex h-7 w-full items-center justify-center text-center text-[10px] leading-tight";
|
|
return (
|
|
<>
|
|
{/* Tap-outside backdrop, under the bar (z-50) but over the page. */}
|
|
{moreOpen && (
|
|
<button
|
|
type="button"
|
|
aria-label="Close menu"
|
|
className="fixed inset-0 z-40 bg-black/40 sm:hidden"
|
|
onClick={() => setMoreOpen(false)}
|
|
/>
|
|
)}
|
|
<nav
|
|
className="fixed inset-x-0 bottom-0 z-50 sm:hidden"
|
|
style={{ paddingBottom: "env(safe-area-inset-bottom)" }}
|
|
>
|
|
{/* The "More" sheet sits directly above the bar (bottom-full of the fixed nav). */}
|
|
{moreOpen && (
|
|
<div className="absolute inset-x-0 bottom-full border-t bg-card/95 backdrop-blur">
|
|
<div className="grid grid-cols-4 gap-1 p-2">
|
|
{MOBILE_OVERFLOW.map(({ to, icon: Icon, label }) => (
|
|
<Link
|
|
key={to}
|
|
to={to}
|
|
onClick={() => setMoreOpen(false)}
|
|
className={cn(tab, "rounded-md")}
|
|
activeProps={{ className: "text-[var(--brand-light)]" }}
|
|
>
|
|
<Icon className="size-5 shrink-0" />
|
|
<span className={lbl}>{label()}</span>
|
|
</Link>
|
|
))}
|
|
</div>
|
|
</div>
|
|
)}
|
|
<div className="flex border-t bg-card/95 backdrop-blur">
|
|
{MOBILE_PRIMARY.map(({ to, icon: Icon, label }) => (
|
|
<Link
|
|
key={to}
|
|
to={to}
|
|
onClick={() => setMoreOpen(false)}
|
|
activeOptions={{ exact: to === "/" }}
|
|
className={tab}
|
|
activeProps={{ className: "text-[var(--brand-light)]" }}
|
|
>
|
|
<Icon className="size-5 shrink-0" />
|
|
<span className={lbl}>{label()}</span>
|
|
</Link>
|
|
))}
|
|
<button
|
|
type="button"
|
|
onClick={() => setMoreOpen((o) => !o)}
|
|
aria-expanded={moreOpen}
|
|
className={cn(
|
|
tab,
|
|
(moreOpen || overflowActive) && "text-[var(--brand-light)]",
|
|
)}
|
|
>
|
|
<MoreHorizontal className="size-5 shrink-0" />
|
|
<span className={lbl}>{m.nav_more()}</span>
|
|
</button>
|
|
</div>
|
|
</nav>
|
|
</>
|
|
);
|
|
}
|
|
|
|
function LanguageSwitcher() {
|
|
const current = useLocale();
|
|
return (
|
|
// biome-ignore lint/a11y/useSemanticElements: an aria-labelled role="group" is the right pattern for this small control cluster — no single semantic element fits.
|
|
<div className="flex gap-1" role="group" aria-label="Language">
|
|
{locales.map((l: Locale) => (
|
|
<button
|
|
key={l}
|
|
type="button"
|
|
onClick={() => changeLocale(l)}
|
|
className={cn(
|
|
"rounded px-2 py-1 text-xs uppercase transition-colors",
|
|
l === current
|
|
? "bg-primary/20 text-foreground font-medium"
|
|
: "text-muted-foreground hover:text-foreground",
|
|
)}
|
|
>
|
|
{l}
|
|
</button>
|
|
))}
|
|
</div>
|
|
);
|
|
}
|