Release / build-and-push (push) Has been cancelled
Replaces the generic shadcn/ui gray theme + horizontal top-bar shell with the paper-and-ink language from the Claude Design handoff bundle: warm off-white paper, near-black ink, Source Serif 4 + Inter, hairline borders, muted ink accents (clay/indigo/sage/plum/ochre) used functionally for calendars and share scopes. Theme switcher expanded from 2 dimensions (theme × mode) to 7: palette × mode × fontPair × density × dashLayout × calView × navStyle. All exposed in Settings → Appearance and persisted on the users row. Pre-paint script applies all four data-* attributes from localStorage so reload doesn't flash. App shell restructured to a CSS-grid driven by data-nav on <html>: sidebar on desktop, bottom-nav + FAB under 760px. Four desktop nav modes wired (sidebar/rail/top/fab-only). Topbar gets a search-→-CommandPalette button, notification bell, "+ New" quick-add, avatar. Dashboard, calendar, lists, notes, settings, login, public share viewer, and quick-add sheet all reskinned. Dashboard editor gains a Preset menu (classic/split/glance) that fills the layout from the registered widgets. FullCalendar wrapped in .fc-skin and inherits all paper-and-ink tokens via CSS variable overrides. Public share viewer (/s/<token>) rebuilt around ShareFrame: expiration banner, brand strip, eyebrow chip, 38px serif title, mini-day + mini-map cards, share-rows. Schema: drops users.theme; adds theme_palette, theme_font_pair, theme_density, theme_dash_layout, theme_cal_view, theme_nav_style with defaults that match the design (clay / serif-sans / regular / classic / month / rail-desktop). Migration 0014_paper_ink_theme. Middleware sets x-pathname so the AppShell server component can render bare for /s/* and /login without a route-group refactor. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
46 lines
1.3 KiB
TypeScript
46 lines
1.3 KiB
TypeScript
import { headers } from "next/headers";
|
|
import type { NavStyle } from "@/modules/_core/themes";
|
|
import type { DashboardMeta } from "@/app/d/actions";
|
|
import { Sidebar } from "@/components/sidebar";
|
|
import { Topbar } from "@/components/topbar";
|
|
import { BottomNav } from "@/components/bottom-nav";
|
|
import { Fab } from "@/components/fab";
|
|
import { NavModeProvider } from "@/components/nav-mode-provider";
|
|
|
|
const BARE_PREFIXES = ["/s/", "/login"];
|
|
|
|
interface Props {
|
|
signedIn: boolean;
|
|
navStyle: NavStyle;
|
|
dashboards: DashboardMeta[];
|
|
children: React.ReactNode;
|
|
}
|
|
|
|
export async function AppShell({ signedIn, navStyle, children }: Props) {
|
|
const h = await headers();
|
|
const pathname = h.get("x-pathname") ?? "";
|
|
const bare = BARE_PREFIXES.some(
|
|
(p) => pathname === p || pathname.startsWith(p + "/") || pathname === p.replace(/\/$/, ""),
|
|
);
|
|
|
|
if (bare || !signedIn) {
|
|
// No shell — share viewer and signed-out pages render bare.
|
|
return <>{children}</>;
|
|
}
|
|
|
|
const useTopVariant = navStyle === "top-nav";
|
|
|
|
return (
|
|
<div className="app">
|
|
{useTopVariant ? <Sidebar variant="top" /> : <Sidebar variant="side" />}
|
|
<main className="main">
|
|
<Topbar />
|
|
<div className="scroll-area">{children}</div>
|
|
</main>
|
|
<BottomNav />
|
|
<Fab />
|
|
<NavModeProvider navStyle={navStyle} />
|
|
</div>
|
|
);
|
|
}
|