Follow-up PR to #95 (Liquid Glass foundation + primitives + Layout shell) that closes out the remaining sub-convoy briefs in a single sweep. Operator-instructed scope: "finish off the design changes." After this PR, **all 8 Liquid Glass sub-convoys are MERGED to main**; the deferred-from-#5 `fix-card3d-state` convoy is dropped (its target, `components/Card3D.js`, turned out to be dead code). ## #2 Brief 2 — Remaining 8 modals migrated to <Modal> primitive - `CollectionsSuccessModal.js` — wrap in <Modal hideCloseButton>; 2 Buttons. - `CollectionsEditModal.js` — full <Modal> + <Input> + <Button> rewrite (4 fields, tag chip section, public-toggle preserved, 2 footer Buttons). - `CollectionEditModal.js` — same pattern as above (4 fields + public-toggle + 2 Buttons). - `CardDetailDeckModal.js` — <Modal> + native select (Select primitive not in scope) + 2 Buttons; sweep `gradient-bg-purple` → `<Button variant="primary">`. - `UploadImageModal.js` — <Modal> + token-driven URL/file tab switcher + drag-drop using `--accent-ember` rim + 2 Buttons (one with `loading` prop). - `CollectionSelectionModal.js` — largest of the set (header summary + SearchBar + scrollable list w/ checkbox toggles + footer); migrated to <Modal size="lg"> while preserving the per-collection card preview thumbnails. - `OCRSettings.js` — trivial <Modal> wrap + single primary <Button>. - `pages/decks.js` — both inline modals (Create Deck + Edit Deck) and `components/ScannerPageView.js` (Create List) migrated; ScannerPageView dropped its `useFocusTrap` named-import (Modal's internal focus trap owns the panel ref now). - **`.github/workflows/ci.yml` `forbidden-modal-shell-without-primitive`** — grandfather list emptied to zero entries; gate is now strict. ## #3 Brief 2 — Forms migrated to <Button> / <SearchBar> - `pages/dashboard.js` — 3 CTAs → <Button> (Create List with leadingIcon, Create Your First List, View All Lists). - `pages/my-cards.js` — empty-state CTA → <Button variant="primary" size="lg">. View-mode toggle buttons intentionally left native (icon-only, doesn't match Button variants). - `pages/community/collections.js` — Go to My Lists CTA → <Button>. - `components/CollectionsPageView.js` — Discover Community + Create List header CTAs → <Button>; search input → <SearchBar>. - Card-grid per-row icon buttons (CollectionsPageView, my-cards, CardsPageView) intentionally left native — tiny per-card actions whose styling doesn't match Button variants and would invalidate visual-diff baselines. ## #5 — scope revised + landed `components/Card3D.js` deletion: surveyed every importer with grep — **zero consumers** in `pages/**` or `components/**`. Only references were in convoy docs. The "pre-existing state-management bug" (state setters used without useState declarations) never affected the running app because the component was never rendered. -505 LOC. The `fix-card3d-state` convoy is dropped from the roadmap as a result. The actual card-grid component (`components/CardItem.js`) is intentionally **not** modified in this sweep — it has per-rarity glow tuning that the existing visual-diff baseline locks in, and the architect's #5 deferral note specifically called out the dedicated baseline re-seed cost. A future implementer turn can apply rim-light tokens to CardItem with its own baseline re-seed when an operator wants that polish. ## #6 Brief 1 — Landing + invite pages glass-migrated - `pages/index.js` — top nav: `var(--glass-surface-mid)` + `--glass-blur-mid` + rim-light. 3 feature cards: `<GlassSurface tint="mid" rim="subtle" elevation="ambient">`. Featured-list cards (the public collection grid): same `<GlassSurface>` recipe with motion-token transitions. All 6 CTA buttons → <Button variant="primary"|"secondary"|"ghost"> with proper sizes. Pulse-loading placeholders tagged `.motion-essential` so reduced-motion users still see them animate (state-meaningful). - `pages/invite/accept.js` + `pages/invite/decline.js` — both outcome panels wrapped in `<GlassSurface tint="mid" rim="subtle" elevation="pronounced">`. Loading spinner border colors corrected from `--text-accent` (which didn't exist) to `--accent-ember`. All 8 buttons → <Button>. `gradient-bg-ember` consumers retained (the canonical warm-palette utility class is fine). ## #8 Brief 2 — Legacy alias sweep + CI gate graduation - Swept `gradient-bg-purple` → `gradient-bg-ember` across **8 files** / **13 occurrences**: `CardDetailQuantityModal`, `CardEditorView`, `CardEditorForm`, `AdminProtected`, `pages/card/[id]`, `pages/invite/{accept,decline}`, `pages/admin/card-import`. `gradient-bg-purple` was a dangling class name with no CSS definition (it was rendering no styling), so the sweep is also a bug fix — those buttons now actually get the ember gradient. - Deleted the 5 dead CSS classes from `styles/globals.css`: `.gradient-text-blue`, `.gradient-text-purple`, `[data-theme="dark"] .glow-blue`, `[data-theme="dark"] .glow-purple`, `[data-theme="dark"] .glow-pink`. Each was zero-consumer post-sweep. - **Graduated the `forbidden-deprecated-color-aliases` CI job from WARN to FAIL.** All 9 patterns (`gradient-text-{purple,pink,blue}`, `glow-{purple,pink,blue}`, `gradient-bg-{purple,blue,pink}`) now block the build if any consumer is reintroduced. ## Verification (local + CI gates locally exercised) - Lint: 0 errors, 2 pre-existing warnings (`CardEditorForm.js` + `CollectionsPageView.js` carry-overs from before #95; out of scope). - Vitest: 104/104 passing — unchanged from #95. - Build: clean (Turbopack default; passes both light + dark theme prerender). - `forbidden-modal-shell-without-primitive` gate: locally clear (`grep -lE 'fixed inset-0 bg-black bg-opacity-' pages components -r --include='*.js'` returns no matches). - `forbidden-deprecated-color-aliases` gate: locally clear (all 9 patterns return no matches in `pages/` or `components/`). ## What still needs human action - **Linux visual-diff baselines** must re-seed via the Docker workflow in `AGENTS.md` § 6. This PR's landing-page + invite-page changes will produce baseline drift on the homepage screenshot (which is currently the only baseline committed) AND additional baselines will be generated for the landing's glass-card sections once the visual spec is expanded. Recommended: run the Docker re-seed against this PR's Vercel preview, commit the result to this branch, push, verify CI green, then merge. - Vercel auto-promotes the merge to production. ## Closes / supersedes - Closes `.convoys/liquid-glass-modal-and-surface-primitive.md` Brief 2 (status → merged). - Closes `.convoys/liquid-glass-form-primitives.md` Brief 2 (status → merged with explicit per-row-icon-button deferral note). - Closes `.convoys/liquid-glass-public-and-auth.md` Brief 1 (status → merged). - Closes `.convoys/cleanup-legacy-design-css.md` Brief 2 (status → merged + CI gate FAIL). - Drops `.convoys/liquid-glass-card-surfaces.md` Brief 1 prerequisite (`fix-card3d-state` no longer needed; Card3D deleted). - Drops the queued `fix-card3d-state` follow-up from the roadmap (target deleted). - Updates `.convoys/ship-readiness.md` § "Design-system redesign portfolio" with a "Finish-portfolio sweep" subsection documenting final status of all 8 sub-convoys. Co-authored-by: Cursor <cursoragent@cursor.com>
335 lines
13 KiB
JavaScript
335 lines
13 KiB
JavaScript
import CameraScanner from './CameraScanner';
|
||
import ScannerDestinationPicker from './ScannerDestinationPicker';
|
||
import ScannedCardItem, { CONDITION_OPTIONS } from './ScannedCardItem';
|
||
import OCRSettings from './OCRSettings';
|
||
import { Modal, Input, Button } from './ui';
|
||
import { VOCAB } from '../lib/collection-vocabulary.js';
|
||
|
||
export default function ScannerPageView({
|
||
gameFilter,
|
||
onGameFilterChange,
|
||
sessionDestination,
|
||
onDestinationChange,
|
||
scanDefaults,
|
||
onScanDefaultsChange,
|
||
queue,
|
||
showOCRSettings,
|
||
onOpenOCRSettings,
|
||
onCloseOCRSettings,
|
||
onScannerError,
|
||
}) {
|
||
|
||
return (
|
||
<div className="h-full flex flex-col">
|
||
<div className="px-6 pt-6 pb-4">
|
||
<h1 className="text-3xl font-bold mb-2" style={{ color: 'var(--text-primary)' }}>
|
||
🃏 Card Scanner
|
||
</h1>
|
||
<p className="text-lg" style={{ color: 'var(--text-secondary)' }}>
|
||
Pick a destination once — every scan lands there until you change it
|
||
</p>
|
||
</div>
|
||
|
||
<ScannerDestinationPicker
|
||
gameFilter={gameFilter}
|
||
onGameFilterChange={onGameFilterChange}
|
||
destination={sessionDestination}
|
||
onDestinationChange={onDestinationChange}
|
||
collections={queue.collections}
|
||
decks={queue.decks}
|
||
disabled={queue.isProcessing}
|
||
/>
|
||
|
||
{queue.autoRouteError && (
|
||
<div
|
||
className="mx-6 mb-4 px-4 py-3 rounded-lg border text-sm"
|
||
style={{
|
||
backgroundColor: 'var(--bg-secondary)',
|
||
borderColor: 'var(--accent-flame)',
|
||
color: 'var(--text-primary)',
|
||
}}
|
||
role="alert"
|
||
>
|
||
{queue.autoRouteError}
|
||
</div>
|
||
)}
|
||
|
||
<div
|
||
className="mx-6 mb-4 rounded-xl border p-4 flex flex-wrap items-end gap-4"
|
||
style={{ backgroundColor: 'var(--bg-secondary)', borderColor: 'var(--border)' }}
|
||
>
|
||
<div>
|
||
<h2 className="text-sm font-semibold uppercase tracking-wide mb-1" style={{ color: 'var(--text-secondary)' }}>
|
||
Defaults for new scans
|
||
</h2>
|
||
<p className="text-xs" style={{ color: 'var(--text-secondary)' }}>
|
||
Applied to each card when it enters the queue
|
||
</p>
|
||
</div>
|
||
<label className="flex flex-col gap-1 text-sm">
|
||
<span style={{ color: 'var(--text-secondary)' }}>Condition</span>
|
||
<select
|
||
value={scanDefaults.condition}
|
||
onChange={(e) => onScanDefaultsChange({ condition: e.target.value })}
|
||
className="px-3 py-2 rounded-lg border"
|
||
style={{
|
||
backgroundColor: 'var(--bg-tertiary)',
|
||
borderColor: 'var(--border)',
|
||
color: 'var(--text-primary)',
|
||
}}
|
||
>
|
||
{CONDITION_OPTIONS.map((option) => (
|
||
<option key={option} value={option}>
|
||
{option}
|
||
</option>
|
||
))}
|
||
</select>
|
||
</label>
|
||
<label className="flex items-center gap-2 text-sm pb-2 cursor-pointer" style={{ color: 'var(--text-primary)' }}>
|
||
<input
|
||
type="checkbox"
|
||
checked={scanDefaults.isFoil}
|
||
onChange={(e) => onScanDefaultsChange({ isFoil: e.target.checked })}
|
||
style={{ accentColor: 'var(--accent-ember)' }}
|
||
/>
|
||
Foil
|
||
</label>
|
||
</div>
|
||
|
||
<div className="flex-1 grid grid-cols-1 lg:grid-cols-5 gap-6 px-6 pb-6">
|
||
<div className="lg:col-span-3 flex flex-col">
|
||
<div
|
||
className="flex-1 rounded-xl p-6 flex flex-col"
|
||
style={{ backgroundColor: 'var(--bg-secondary)', border: '1px solid var(--border)' }}
|
||
>
|
||
<div className="flex justify-between items-center mb-4">
|
||
<h2 className="text-xl font-semibold" style={{ color: 'var(--text-primary)' }}>
|
||
Camera Scanner
|
||
</h2>
|
||
<button
|
||
onClick={onOpenOCRSettings}
|
||
className="px-4 py-2 rounded-xl font-medium border transition-all duration-200 hover:opacity-80"
|
||
style={{
|
||
borderColor: 'var(--border)',
|
||
color: 'var(--text-primary)',
|
||
}}
|
||
>
|
||
⚙️ OCR Settings
|
||
</button>
|
||
</div>
|
||
|
||
<div className="flex-1">
|
||
<CameraScanner onCardScanned={queue.handleCardScanned} onError={onScannerError} />
|
||
</div>
|
||
</div>
|
||
</div>
|
||
|
||
<div className="lg:col-span-2 flex flex-col">
|
||
<div
|
||
className="flex-1 rounded-xl p-6 flex flex-col"
|
||
style={{ backgroundColor: 'var(--bg-secondary)', border: '1px solid var(--border)' }}
|
||
>
|
||
<div className="flex justify-between items-center mb-4">
|
||
<h2 className="text-xl font-semibold" style={{ color: 'var(--text-primary)' }}>
|
||
Scanned Cards
|
||
</h2>
|
||
<div className="flex items-center gap-2">
|
||
<div
|
||
className="text-sm"
|
||
style={{ color: 'var(--text-secondary)' }}
|
||
aria-live="polite"
|
||
aria-atomic="true"
|
||
>
|
||
{queue.scannedCards.length} cards
|
||
</div>
|
||
{queue.scannedCards.length > 0 && (
|
||
<button
|
||
onClick={queue.clearScannedCards}
|
||
className="px-3 py-1 rounded-lg text-sm border hover:opacity-80"
|
||
style={{
|
||
borderColor: 'var(--border)',
|
||
color: 'var(--text-secondary)',
|
||
}}
|
||
aria-label="Clear all scanned cards from queue"
|
||
>
|
||
Clear All
|
||
</button>
|
||
)}
|
||
</div>
|
||
</div>
|
||
|
||
<div className="flex-1 overflow-y-auto">
|
||
{queue.scannedCards.length === 0 ? (
|
||
<div className="text-center py-8" style={{ color: 'var(--text-secondary)' }}>
|
||
<div className="text-4xl mb-2" aria-hidden="true">📱</div>
|
||
<div className="font-medium">No cards scanned yet</div>
|
||
<div className="text-sm">Start scanning to see cards here</div>
|
||
</div>
|
||
) : (
|
||
<ul className="space-y-3 list-none p-0 m-0" aria-label="Scanned cards queue">
|
||
{queue.scannedCards.map((card) => (
|
||
<li key={card.id}>
|
||
<ScannedCardItem
|
||
card={card}
|
||
collections={queue.collections}
|
||
decks={queue.decks}
|
||
selected={queue.selectedCards.has(card.id)}
|
||
onToggleSelect={() => queue.toggleCardSelection(card.id)}
|
||
onIncrement={() => queue.incrementCardQuantity(card.id)}
|
||
onDecrement={() => queue.decrementCardQuantity(card.id)}
|
||
onUpdateMetadata={(patch) => queue.updateCardMetadata(card.id, patch)}
|
||
onMarkOwned={() => queue.addSingleCardToOwned(card)}
|
||
onAddToCollection={(collectionId) => queue.addSingleCardToCollection(card, collectionId)}
|
||
onAddToDeck={(deckId) => queue.addSingleCardToDeck(card, deckId)}
|
||
onRemove={() => queue.removeScannedCard(card.id)}
|
||
isAdding={queue.addingCardIds.has(card.id)}
|
||
/>
|
||
</li>
|
||
))}
|
||
</ul>
|
||
)}
|
||
</div>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
|
||
{queue.selectedCards.size > 0 && (
|
||
<div className="fixed bottom-6 left-1/2 transform -translate-x-1/2 z-50">
|
||
<div
|
||
className="rounded-2xl shadow-2xl border px-6 py-4 flex items-center gap-4 max-w-4xl"
|
||
role="toolbar"
|
||
aria-label="Bulk actions for selected scanned cards"
|
||
style={{
|
||
backgroundColor: 'var(--bg-secondary)',
|
||
borderColor: 'var(--border)',
|
||
backdropFilter: 'blur(10px)',
|
||
}}
|
||
>
|
||
<div className="flex items-center gap-2" aria-live="polite" aria-atomic="true">
|
||
<div
|
||
className="w-8 h-8 rounded-full flex items-center justify-center text-sm font-bold text-white"
|
||
style={{ backgroundColor: 'var(--accent-ember)' }}
|
||
>
|
||
{queue.selectedCards.size}
|
||
</div>
|
||
<span className="font-medium" style={{ color: 'var(--text-primary)' }}>
|
||
{queue.selectedCards.size === 1 ? 'card selected' : 'cards selected'}
|
||
</span>
|
||
</div>
|
||
|
||
<div className="w-px h-8" style={{ backgroundColor: 'var(--border)' }}></div>
|
||
|
||
<div className="flex items-center gap-3">
|
||
<button
|
||
onClick={() => queue.handleBulkAction('owned')}
|
||
disabled={queue.isProcessing}
|
||
className="px-4 py-2 rounded-lg font-medium hover:opacity-80 disabled:opacity-50 flex items-center gap-2"
|
||
style={{ backgroundColor: 'var(--accent-gold)', color: 'white' }}
|
||
>
|
||
<span aria-hidden="true">💎 </span>
|
||
{VOCAB.ADD_TO_MY_COLLECTION}
|
||
</button>
|
||
|
||
{queue.collections.length > 0 && (
|
||
<select
|
||
onChange={(e) => {
|
||
const collectionId = e.target.value;
|
||
e.target.value = '';
|
||
if (collectionId) {
|
||
queue.handleBulkAction('collection', collectionId);
|
||
}
|
||
}}
|
||
disabled={queue.isProcessing}
|
||
className="px-4 py-2 rounded-lg font-medium"
|
||
style={{ backgroundColor: 'var(--accent-ember)', color: 'white', border: 'none' }}
|
||
aria-label="Add selected cards to list"
|
||
>
|
||
<option value="">{`📚 ${VOCAB.ADD_TO_LIST}`}</option>
|
||
{queue.collections.map((collection) => (
|
||
<option key={collection.id} value={collection.id}>
|
||
{collection.name}
|
||
</option>
|
||
))}
|
||
</select>
|
||
)}
|
||
|
||
{queue.decks.length > 0 && (
|
||
<select
|
||
onChange={(e) => {
|
||
const deckId = e.target.value;
|
||
e.target.value = '';
|
||
if (deckId) {
|
||
queue.handleBulkAction('deck', deckId);
|
||
}
|
||
}}
|
||
disabled={queue.isProcessing}
|
||
className="px-4 py-2 rounded-lg font-medium"
|
||
style={{ backgroundColor: 'var(--accent-flame)', color: 'white', border: 'none' }}
|
||
aria-label="Add selected cards to deck"
|
||
>
|
||
<option value="">🃏 Add to Deck</option>
|
||
{queue.decks.map((deck) => (
|
||
<option key={deck.id} value={deck.id}>
|
||
{deck.name} ({deck.game})
|
||
</option>
|
||
))}
|
||
</select>
|
||
)}
|
||
</div>
|
||
|
||
<div className="w-px h-8" style={{ backgroundColor: 'var(--border)' }}></div>
|
||
|
||
<button
|
||
onClick={queue.clearSelection}
|
||
className="px-3 py-2 rounded-lg hover:opacity-80"
|
||
style={{ color: 'var(--text-secondary)' }}
|
||
aria-label="Clear selection"
|
||
>
|
||
<span aria-hidden="true">✕</span>
|
||
</button>
|
||
</div>
|
||
</div>
|
||
)}
|
||
|
||
<Modal
|
||
open={queue.showCreateCollection}
|
||
onClose={() => queue.setShowCreateCollection(false)}
|
||
title="Create New List"
|
||
size="md"
|
||
>
|
||
<Input
|
||
id="create-collection-name"
|
||
label="List name"
|
||
placeholder="List name..."
|
||
value={queue.newCollectionName}
|
||
onChange={(e) => queue.setNewCollectionName(e.target.value)}
|
||
onKeyPress={(e) => {
|
||
if (e.key === 'Enter') {
|
||
queue.createCollection();
|
||
}
|
||
}}
|
||
className="mb-4"
|
||
/>
|
||
<div className="flex gap-3">
|
||
<Button
|
||
variant="primary"
|
||
onClick={queue.createCollection}
|
||
disabled={!queue.newCollectionName.trim()}
|
||
className="flex-1"
|
||
>
|
||
Create
|
||
</Button>
|
||
<Button
|
||
variant="secondary"
|
||
onClick={() => queue.setShowCreateCollection(false)}
|
||
className="flex-1"
|
||
>
|
||
Cancel
|
||
</Button>
|
||
</div>
|
||
</Modal>
|
||
|
||
{showOCRSettings && <OCRSettings onClose={onCloseOCRSettings} />}
|
||
</div>
|
||
);
|
||
}
|