mirror of
https://github.com/multica-ai/multica.git
synced 2026-08-12 19:06:06 +02:00
7803a5b9ea
tokens.css defined colours, radii and font families but not a single --text-* step, so font sizes had no baseline to align to and grew wherever they were needed: 51 distinct sizes across web + desktop, 370 written as arbitrary values, six at half a pixel (10.5 / 11.5 / 12.5 / 13.5 / 14.5 / 15.5px). text-xs and text-sm carried nearly all UI text while the range between them — 11, 13, 15px — could only be reached with arbitrary values. Hierarchy does not come from having more sizes; past a handful, each extra size makes the hierarchy blurrier. Add ten role-named steps, each with its own line-height so leading cannot fragment the way size did, and move every product-UI call site onto them. Steps are named for what the text is for, not for a t-shirt size, because that is what keeps the scale from drifting again. Six steps deliberately keep the exact size/line-height pairs of the Tailwind defaults they replace, so the ~1,900-call-site rename moves nothing on screen. The visible changes are confined to former arbitrary values snapping to a step: 8/9/10px -> micro (11px) on badges and overlines; 17 -> 18; 22 -> 24; 30 (text-3xl) -> 36 on headings and stat numbers; 12.8px -> label (13px) on small buttons and toggles. Half-pixel sizes are gone. This supersedes #6108, which was reverted by #6116 because the sidebar group labels rendered at the inherited 16px. The cause was not the scale but cn(): `text-<x>` is ambiguous in Tailwind, and tailwind-merge resolves it against a table listing only the default sizes, so it filed every role step under text-colour and dropped whichever of `text-caption` / `text-sidebar-foreground/70` came first. Registering the steps as a font-size class group restores the real conflict groups — size beats size, colour beats colour, the two coexist — and a test pins the list against the scale, since the failure is silent in source. Hand-written CSS is covered too. The transcript kept a 12.5px body long after every Tailwind call site was on the scale, so the "no half-pixel sizes" claim was true of the classes and false of the product; the editor's prose, code and mermaid ramps had the same blind spot, and seven of their eight values already equalled a step exactly. All now reference var(--text-*). The guard test reads raw `font-size:` declarations as well as class names, exempting only the 16px iOS input-zoom workaround in base.css and the landing pages' marketing ramp. apps/mobile (own NativeWind config) and apps/docs (fumadocs' own type system) keep Tailwind's default scale and are untouched. Landing display type (rem/clamp, 2.2-6.4rem) stays on its separate ramp, as do four decorative emoji / serif-hero sizes. Verified on a running local stack: pinned sidebar rows and group labels measure 12px/16px, nav items 14px/20px — identical to pre-migration. An audit of every rendered font size across the product surfaces finds nothing off the scale; the only exceptions are avatar initials and emoji, which actor-avatar.tsx sizes proportionally to the avatar diameter by design. Co-authored-by: Lambda <lambda@multica.ai> Co-authored-by: multica-agent <github@multica.ai>
73 lines
2.9 KiB
TypeScript
73 lines
2.9 KiB
TypeScript
"use client";
|
|
|
|
import { useEffect } from "react";
|
|
import { useQuery } from "@tanstack/react-query";
|
|
import { Button } from "@multica/ui/components/ui/button";
|
|
import {
|
|
resolvePostAuthDestination,
|
|
useHasOnboarded,
|
|
} from "@multica/core/paths";
|
|
import { workspaceListOptions } from "@multica/core/workspace/queries";
|
|
import { useNavigation } from "../navigation";
|
|
import { useLogout } from "../auth";
|
|
import { DragStrip } from "../platform";
|
|
import { useT } from "../i18n";
|
|
|
|
/**
|
|
* Rendered when the workspace slug in the URL does not resolve to a workspace
|
|
* the current user can access. Deliberately doesn't distinguish "workspace
|
|
* doesn't exist" from "workspace exists but I'm not a member" — showing
|
|
* either would let attackers enumerate workspace slugs.
|
|
*/
|
|
export function NoAccessPage() {
|
|
const { t } = useT("workspace");
|
|
const nav = useNavigation();
|
|
const logout = useLogout();
|
|
const hasOnboarded = useHasOnboarded();
|
|
const { data: workspaces = [] } = useQuery(workspaceListOptions());
|
|
|
|
// Clear stale `last_workspace_slug` cookie. The web proxy redirects `/` to
|
|
// `/<lastSlug>/issues` based on this cookie alone (no access check). When the
|
|
// cookie points at a workspace the user has just lost access to, any hit on
|
|
// `/` — manual navigation, a browser Back into `/`, or a fresh page load —
|
|
// bounces the user straight back to the bad slug and re-traps them on
|
|
// NoAccessPage. The recovery button no longer routes through `/` (recover()
|
|
// resolves a concrete destination directly), but clearing the cookie here
|
|
// keeps those other `/` entry points from re-triggering the loop.
|
|
// No-op outside the browser (desktop renderer also has document, harmless).
|
|
useEffect(() => {
|
|
if (typeof document === "undefined") return;
|
|
document.cookie = "last_workspace_slug=; path=/; max-age=0; SameSite=Lax";
|
|
}, []);
|
|
|
|
// replace, not push: the failed `/<bad-slug>` URL must not stay in history,
|
|
// or a browser Back would land the user right back on this NoAccessPage.
|
|
const recover = () => {
|
|
nav.replace(resolvePostAuthDestination(workspaces, hasOnboarded));
|
|
};
|
|
|
|
return (
|
|
<div className="flex min-h-svh flex-col">
|
|
<DragStrip />
|
|
<div className="flex flex-1 flex-col items-center justify-center gap-6 px-6 pb-12 text-center">
|
|
<div className="space-y-2">
|
|
<h1 className="text-display-sm font-semibold tracking-tight">
|
|
{t(($) => $.no_access.title)}
|
|
</h1>
|
|
<p className="max-w-md text-muted-foreground">
|
|
{t(($) => $.no_access.description)}
|
|
</p>
|
|
</div>
|
|
<div className="flex flex-col gap-2 sm:flex-row">
|
|
<Button onClick={recover}>
|
|
{t(($) => $.no_access.go_to_workspaces)}
|
|
</Button>
|
|
<Button variant="outline" onClick={logout}>
|
|
{t(($) => $.no_access.sign_in_different)}
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|