Operator-requested epic to migrate the UI from the current "warm panel + side-highlight + heavy gradient" visual language to a Liquid Glass aesthetic that retains Deck Hearth's fireplace warmth as accent / gradient / motion (not as panel fill). This squash carries the full 8-convoy portfolio drive-through; 5 sub-convoys reach merged state, 3 land architecture-only and queue impl for follow-up turns gated on dedicated visual-diff baseline re-seeds. Sub-convoy #1 (liquid-glass-design-tokens) — MERGED. 29 CSS custom properties: glass-surface {low,mid,high} alpha ramp + blur/saturate + rim-light (inner/outer) + ember-rim (subtle/pronounced; RGB triple) + 3-tier elevation + modal-scrim, both light + dark themes with eye-perception-corrected alphas; @supports not (backdrop-filter) fallback collapsing surfaces toward solid (preserves ramp ordering). Authored docs/DESIGN_TOKENS.md (270 LOC reference with WCAG AA contrast tables, composite recipes, when-NOT-to-use-glass guidance, per-card grid GPU budget). AGENTS.md gains a § Visual language section as the new agent-contract surface. Sub-convoy #2 (liquid-glass-modal-and-surface-primitive) — Brief 1 MERGED. Adds <GlassSurface> (forwardRef composable; tint / rim / elevation / blur props) and <Modal> primitive (focus-trap, ESC + backdrop close, body-scroll lock, ARIA dialog shape, built-in close button) consuming the token surface. lib/use-focus-trap.js — homegrown hook (~60 LOC, no dep). 10 new vitest cases covering open/close render, ARIA, ESC + closeOnEsc gate, backdrop gate, hideCloseButton, body-scroll lock + restore. 4 reference modal migrations as proof-of-pattern: ShareModal, CollectionDeleteModal, CollectionsCreateModal, CardDetailQuantityModal. Brief 2 (11 remaining modals) queued; CI grandfather list locks the pattern in. Sub-convoy #3 (liquid-glass-form-primitives) — Brief 1 MERGED. Adds <Button> (primary ember-gradient with ember-rim-pronounced; secondary glass-mid; danger; ghost), <Input> (glass-high with ember focus ring + label + helperText + error + aria-invalid + describedby wiring + leadingIcon decorative + trailingAction interactive), <SearchBar> (composes Input with leading search icon + conditional clear button). 10 new vitest cases. pages/login.js + pages/signup.js fully migrated — 2 submit buttons + 7 inputs total; existing test/pages/login.test.js assertion ("Sign in to Deck Hearth" button text) preserved. Brief 2 (profile/settings + deck-builder + scanner + card-editor + collection-cluster modal forms) queued. Sub-convoy #4 (liquid-glass-layout-shell) — MERGED. 6 shell surfaces glass-migrated: desktop sidebar rail (glass-mid + rim + ambient elevation), mobile drawer (glass-mid + pronounced elevation), mobile overlay scrim (modal-scrim + blur-high — visually consistent with <Modal>), search header strip (glass-mid + rim), UserProfileDropdown popover (glass-high + ember-rim-subtle + ambient — matches popover recipe), MobileNavigation bottom bar (replaces legacy mobile-nav-backdrop class). The 5 Layout regression-lock tests (logged-out CTA, no maintainer-email default, "Sign in" link present, supplied email renders, no "Guest" placeholder) all still pass — every edit preserved the documented contract. Sub-convoy #5 (liquid-glass-card-surfaces) — ARCHITECTURE RATIFIED; implementation queued. Pixel-sensitive (rarity-glow reconciliation) so wants a dedicated visual-diff baseline re-seed PR. Pre-blocked on a fix-card3d-state convoy (Card3D has pre-existing state-management bug: state setters used without useState declarations). Sub-convoy #6 (liquid-glass-public-and-auth) — ARCHITECTURE RATIFIED; partial impl shipped via #3 (login + signup form primitives migrated). Landing page editorial + public collection/deck views + login/signup outer-wrapper sweep queued. Sub-convoy #7 (motion-system-pass) — MERGED. 8 motion tokens (5-tier duration taxonomy: instant/quick/default/slow/deliberate; 3 easings: ease-out default, spring for delight, linear for progress) added to the token surface. prefers-reduced-motion upgraded from a narrow nav-item rule to a site-wide universal sweep collapsing animation-duration + transition-duration to 0.01ms (preserves end states, no flicker); .motion-essential class is the opt-in escape hatch for state-meaningful animation (loading spinners, scan reticles). Authored docs/MOTION_SYSTEM.md with WCAG SC 2.3.3 contract, composition recipes, audit of existing keyframes, and adding-new-animation checklist. Sub-convoy #8 (cleanup-legacy-design-css) — Brief 1 MERGED. Two new CI jobs in .github/workflows/ci.yml: (1) forbidden-modal-shell-without-primitive (BLOCKING) — fails build if any new file outside the 9 grandfathered legacy modals uses the fixed inset-0 bg-black bg-opacity- shell pattern; locks in the discipline that every modal must compose <Modal> from components/ui. (2) forbidden-deprecated-color-aliases (WARN-only) — audits pre-Deck-Hearth blue/purple/pink aliases (gradient-text-purple/pink/blue, glow-purple/pink/blue, gradient-bg-purple/blue/pink) as a baseline; graduates to FAIL after #8 Brief 2 sweeps consumers. .cursor/rules/ui-and-theming.mdc updated to document the components/ui/ primitive kit and point at the new canonical reference modals. Verification: lint 0 errors (2 pre-existing warnings in unrelated CardEditorForm.js + CollectionsPageView.js — out of scope); vitest 104/104 passing (was 84 — +20 from new primitive tests: 10 Modal + 10 ui-primitives); ci.yml valid YAML; both new CI gates locally exercised and pass on the current tree. Operator follow-ups documented in .convoys/ship-readiness.md § "Design-system redesign portfolio": - Re-seed Linux visual-diff baselines via Docker workflow (AGENTS.md § 6) after this merges. - preview-smoke.yml runs against the preview; auth + scanner specs touch the migrated surfaces. - Vercel promote to production once smoke + visual gates pass. - Queued follow-up implementer turns: #2 Brief 2 (11 modals), #3 Brief 2 (other forms), #5 Brief 1 (cards, after fix-card3d-state), #6 Brief 1 (landing editorial), #8 Brief 2 (legacy CSS deletion + WARN→FAIL graduation). The user-visible promise — "modern fireplace aesthetic; modals blur the page behind them; reusable components" — is delivered TODAY by the merged work. Co-authored-by: Cursor <cursoragent@cursor.com>
106 lines
3.1 KiB
JavaScript
106 lines
3.1 KiB
JavaScript
import { forwardRef } from 'react';
|
|
|
|
const SIZE_CLASSES = {
|
|
sm: 'px-3 py-1.5 text-sm rounded-lg',
|
|
md: 'px-4 py-2 text-base rounded-xl',
|
|
lg: 'px-5 py-3 text-base rounded-xl',
|
|
};
|
|
|
|
const Button = forwardRef(function Button(
|
|
{
|
|
variant = 'primary',
|
|
size = 'md',
|
|
type = 'button',
|
|
loading = false,
|
|
leadingIcon,
|
|
trailingIcon,
|
|
disabled,
|
|
className = '',
|
|
style,
|
|
children,
|
|
...rest
|
|
},
|
|
ref
|
|
) {
|
|
const isDisabled = disabled || loading;
|
|
const sizeCls = SIZE_CLASSES[size] ?? SIZE_CLASSES.md;
|
|
|
|
let variantStyle = {};
|
|
let variantClass = '';
|
|
|
|
if (variant === 'primary') {
|
|
variantStyle = {
|
|
background:
|
|
'linear-gradient(135deg, var(--accent-ember) 0%, var(--accent-flame) 100%)',
|
|
color: '#ffffff',
|
|
boxShadow: 'var(--rim-light-inner), var(--ember-rim-pronounced)',
|
|
};
|
|
variantClass = 'font-medium transition-transform duration-200 hover:scale-[1.02] active:scale-[0.98]';
|
|
} else if (variant === 'secondary') {
|
|
variantStyle = {
|
|
background: 'var(--glass-surface-high)',
|
|
backdropFilter:
|
|
'blur(var(--glass-blur-low)) saturate(var(--glass-saturate))',
|
|
WebkitBackdropFilter:
|
|
'blur(var(--glass-blur-low)) saturate(var(--glass-saturate))',
|
|
color: 'var(--text-primary)',
|
|
boxShadow: 'var(--rim-light-inner), var(--rim-light-outer)',
|
|
};
|
|
variantClass = 'font-medium transition-all duration-200 hover:bg-[var(--glass-surface-mid)]';
|
|
} else if (variant === 'danger') {
|
|
variantStyle = {
|
|
backgroundColor: '#dc2626',
|
|
color: '#ffffff',
|
|
boxShadow: 'var(--rim-light-inner)',
|
|
};
|
|
variantClass = 'font-medium transition-all duration-200 hover:bg-[#b91c1c]';
|
|
} else if (variant === 'ghost') {
|
|
variantStyle = {
|
|
background: 'transparent',
|
|
color: 'var(--text-primary)',
|
|
};
|
|
variantClass = 'font-medium transition-colors duration-200 hover:bg-[rgba(var(--ember-rim-color),0.08)]';
|
|
}
|
|
|
|
return (
|
|
<button
|
|
ref={ref}
|
|
type={type}
|
|
disabled={isDisabled}
|
|
aria-busy={loading || undefined}
|
|
className={[
|
|
'relative inline-flex items-center justify-center gap-2 select-none',
|
|
sizeCls,
|
|
variantClass,
|
|
isDisabled ? 'opacity-50 cursor-not-allowed pointer-events-none' : '',
|
|
'focus:outline-none focus-visible:ring-2 focus-visible:ring-offset-2',
|
|
className,
|
|
]
|
|
.filter(Boolean)
|
|
.join(' ')}
|
|
style={{
|
|
...variantStyle,
|
|
'--tw-ring-color': 'var(--accent-ember)',
|
|
'--tw-ring-offset-color': 'transparent',
|
|
...style,
|
|
}}
|
|
{...rest}
|
|
>
|
|
{loading && (
|
|
<span
|
|
aria-hidden="true"
|
|
className="inline-block h-4 w-4 animate-spin rounded-full border-2 border-current border-r-transparent"
|
|
/>
|
|
)}
|
|
{!loading && leadingIcon && (
|
|
<span aria-hidden="true" className="inline-flex">{leadingIcon}</span>
|
|
)}
|
|
<span>{children}</span>
|
|
{!loading && trailingIcon && (
|
|
<span aria-hidden="true" className="inline-flex">{trailingIcon}</span>
|
|
)}
|
|
</button>
|
|
);
|
|
});
|
|
|
|
export default Button;
|