2026-06-02 17:17:15 -04:00
|
|
|
|
import { useEffect, useState } from 'react';
|
2025-07-29 15:19:48 -04:00
|
|
|
|
import { useRouter } from 'next/router';
|
|
|
|
|
|
import Layout from '../components/Layout';
|
|
|
|
|
|
import CameraScanner from '../components/CameraScanner';
|
2026-05-27 14:50:54 -04:00
|
|
|
|
import ScannerDestinationPicker from '../components/ScannerDestinationPicker';
|
2026-05-27 14:54:33 -04:00
|
|
|
|
import ScannedCardItem, { CONDITION_OPTIONS } from '../components/ScannedCardItem';
|
2025-07-29 15:19:48 -04:00
|
|
|
|
import OCRSettings from '../components/OCRSettings';
|
refactor(auth): collapse lib/auth-context.js + lib/admin-auth.js onto lib/use-auth.js (#31)
`lib/use-auth.js` is now the sole client-side auth surface (P1 §9 of
`.convoys/ship-readiness.md`). The legacy `lib/auth-context.js`
(`AuthProvider` + `useAuth`) and `lib/admin-auth.js` (`AdminProvider` +
`useAdmin` + `useIsAdmin`) are deleted; every importer is migrated to
the canonical hook. Pre-convoy a worst-case page mount issued THREE
identical `GET /api/auth/verify` requests (one per provider/hook); the
post-convoy floor is one verify per page mount (3 → 1 on
`pages/card/[id].js`, 2 → 1 elsewhere).
Importer inventory swept (7 source files):
- `pages/_app.js` — removed `<AuthProvider>` wrapper; `<ThemeProvider>`
is now the only top-level provider. `lib/use-auth.js` is hook-only,
no replacement provider needed.
- `pages/index.js`, `pages/scanner.js`, `pages/decks.js`,
`pages/deck/[id].js`, `pages/deck-builder.js` — `import { useAuth }`
path swap from `../lib/auth-context` to `../lib/use-auth`. All five
pages destructured only `{ user }` or `{ user, loading }`; verified
no consumer reads `login` / `register` from useAuth (those flows are
in `pages/login.js` / `pages/signup.js` which call the API directly),
so no shape-parity gap on `lib/use-auth.js`.
- `pages/card/[id].js` — replaced `useIsAdmin()` (the only consumer of
`lib/admin-auth.js` anywhere in the tree) with synchronous
`user?.role === 'admin'` derived from the existing `useAuth()` call.
Render condition at line 524 stays byte-identical.
Decisions documented in `.convoys/single-auth-provider.md`:
- D1: no extension to `lib/use-auth.js` (zero call sites for `login` /
`register` from useAuth — those flows are direct fetches in
`login.js` / `signup.js`).
- D2: `useIsAdmin()` collapses onto `useAuth()`; no separate hook.
- D3: provider tree `<ThemeProvider><AuthProvider>{children}</AuthProvider></ThemeProvider>`
→ `<ThemeProvider>{children}</ThemeProvider>`.
- D4: 3 → 1 verify roundtrip on `card/[id].js`; 2 → 1 on every other
page-load.
- D5: zero test files modified; the 21-test vitest suite is server-
side or prop-driven (`Layout.test.js` passes `user` as a prop, never
imports the legacy hooks).
Doc / config updates so the deletion lands cleanly:
- `.github/CODEOWNERS` — drop the two CODEOWNERS lines for the deleted
files.
- `AGENTS.md` § 2 architecture row + § 3 "Auth (client)" bullet —
rewritten for the post-convoy single-surface state.
- `.cursor/rules/auth-and-permissions.mdc` — § "Legacy" reframed to
"deleted by this convoy"; § "Authentication state on the client"
updated to the post-convoy `useAuth()` shape and the direct-fetch
login flow used by `login.js` / `signup.js`.
- `.cursor/rules/no-go-zones.mdc` — auth-refactors bullet drops the
deleted files from the canonical list.
- `.cursor/skills/add-page/SKILL.md` — checklist + anti-pattern row
refer to the deletion.
Verification:
- `rg "lib/auth-context|lib/admin-auth" --type js` → 0 hits in source.
- `npm run lint` → 128 → 125 problems (3 fewer errors from the deleted
unused-import lines; no regression).
- `npm run test:run` → 21/21 pass (including the 5 Layout regression
locks from `fix-layout-default-user`, which are prop-driven and
unaffected).
- `npm run build` → all 26 pages compile end-to-end; no SSR / static-
generation breakage that would have surfaced if a page tried to use
the legacy context hook unwrapped.
- Manual smoke deferred to operator post-merge per convoy doc.
Risks (full discussion in convoy file):
- R1 shape parity gap — verified zero consumers of legacy-only
surface; mitigated.
- R2 SSR mismatch from removing `<AuthProvider>` — `useEffect`-
guarded `localStorage` read; identical SSR shape pre/post; build
passes.
- R3 missed importer — post-delete grep + build pass would surface
any miss.
- R5 stale `useAuth` cache across components — pre-existing
pattern, called out as follow-up rather than addressed here.
Out of scope: any change to `lib/permission-middleware.js` (server-
side; resolved P0 #1), `lib/auth-secret.js` (resolved P0 #2),
`pages/api/**` route handlers, login / register API contracts, or
the seeded admin account flow.
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-26 23:58:08 -04:00
|
|
|
|
import { useAuth } from '../lib/use-auth';
|
2026-05-27 15:22:18 -04:00
|
|
|
|
import { useFocusTrap } from '../lib/use-focus-trap.js';
|
2026-05-29 10:53:40 -04:00
|
|
|
|
import { VOCAB } from '../lib/collection-vocabulary.js';
|
2026-06-02 17:15:27 -04:00
|
|
|
|
import {
|
|
|
|
|
|
DEFAULT_SCANNER_DESTINATION,
|
|
|
|
|
|
loadSavedScannerSession,
|
|
|
|
|
|
saveScannerSession,
|
|
|
|
|
|
} from '../lib/scanner-session.js';
|
2026-06-02 17:17:15 -04:00
|
|
|
|
import { useScannerQueue } from '../lib/use-scanner-queue.js';
|
2026-05-27 14:50:54 -04:00
|
|
|
|
|
2025-07-29 15:19:48 -04:00
|
|
|
|
export default function Scanner() {
|
2026-05-27 13:36:58 -04:00
|
|
|
|
const { user, loading: authLoading } = useAuth();
|
2025-07-29 15:19:48 -04:00
|
|
|
|
const router = useRouter();
|
|
|
|
|
|
const [showOCRSettings, setShowOCRSettings] = useState(false);
|
2026-05-27 14:50:54 -04:00
|
|
|
|
const [sessionDestination, setSessionDestination] = useState(
|
|
|
|
|
|
() => loadSavedScannerSession().destination
|
|
|
|
|
|
);
|
|
|
|
|
|
const [gameFilter, setGameFilter] = useState(() => loadSavedScannerSession().gameFilter);
|
2026-05-27 14:54:33 -04:00
|
|
|
|
const [scanDefaults, setScanDefaults] = useState(() => loadSavedScannerSession().scanDefaults);
|
2025-07-29 15:19:48 -04:00
|
|
|
|
|
2026-06-02 17:17:15 -04:00
|
|
|
|
const queue = useScannerQueue({ user, sessionDestination, scanDefaults });
|
|
|
|
|
|
const createCollectionDialogRef = useFocusTrap(queue.showCreateCollection);
|
|
|
|
|
|
|
2025-07-29 15:19:48 -04:00
|
|
|
|
useEffect(() => {
|
2026-05-27 13:36:58 -04:00
|
|
|
|
if (!authLoading && !user) {
|
2025-07-29 15:19:48 -04:00
|
|
|
|
router.push('/login');
|
|
|
|
|
|
}
|
2026-05-27 13:36:58 -04:00
|
|
|
|
}, [authLoading, user, router]);
|
2025-07-29 15:19:48 -04:00
|
|
|
|
|
2026-05-27 14:50:54 -04:00
|
|
|
|
useEffect(() => {
|
2026-06-02 17:15:27 -04:00
|
|
|
|
saveScannerSession({ destination: sessionDestination, gameFilter, scanDefaults });
|
2026-05-27 14:54:33 -04:00
|
|
|
|
}, [sessionDestination, gameFilter, scanDefaults]);
|
2026-05-27 14:50:54 -04:00
|
|
|
|
|
|
|
|
|
|
const handleGameFilterChange = (nextFilter) => {
|
|
|
|
|
|
setGameFilter(nextFilter);
|
|
|
|
|
|
setSessionDestination((current) => {
|
|
|
|
|
|
if (!current || current.type === 'owned') return current;
|
2026-06-02 17:15:27 -04:00
|
|
|
|
return DEFAULT_SCANNER_DESTINATION;
|
2026-05-27 14:50:54 -04:00
|
|
|
|
});
|
|
|
|
|
|
};
|
|
|
|
|
|
|
2025-07-29 15:19:48 -04:00
|
|
|
|
const handleError = (error) => {
|
|
|
|
|
|
console.error('Scanner error:', error);
|
|
|
|
|
|
};
|
|
|
|
|
|
|
2026-05-27 13:36:58 -04:00
|
|
|
|
if (authLoading) {
|
|
|
|
|
|
return (
|
|
|
|
|
|
<Layout user={null}>
|
|
|
|
|
|
<div className="flex items-center justify-center min-h-[50vh]">
|
|
|
|
|
|
<div className="animate-spin rounded-full h-12 w-12 border-b-2" style={{ borderColor: 'var(--text-accent)' }} />
|
|
|
|
|
|
</div>
|
|
|
|
|
|
</Layout>
|
|
|
|
|
|
);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2025-07-29 15:19:48 -04:00
|
|
|
|
if (!user) {
|
|
|
|
|
|
return <div>Redirecting to login...</div>;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return (
|
fix(layout+pages): default user=null + page audit sweep (P0 #7) (#15)
* convoy: scope fix-layout-default-user (P0 #7 — Layout maintainer-email leak)
The last remaining P0 ship-blocker from .convoys/ship-readiness.md.
components/Layout.js line 562 defaults the user prop to a real email
address (me@randallstillwell.com); any page that renders Layout without
passing user explicitly impersonates the maintainer.
Scope: components/Layout.js + audit of 17 pages that import Layout
(grep-confirmed list in convoy file). Single PR likely. Auditor cohort
skipped (no design-system, IA, or browser-smoke surface).
Architect to address:
- Q1: logged-out rendering branch design (navbar, mobile-nav,
auth-only items treatment)
- Q2: page audit triage into always-auth / public-or-auth /
anonymous-allowed buckets
- Q3: brief decomposition (single brief / 2 briefs in 1 PR / fan-out)
- Q4: whether to add vitest coverage for the logged-out branch
(recommend yes — small surface, high regression protection)
Hard out-of-scope: branding (pick-a-name), auth-provider collapse
(single-auth-provider), Layout god-component split (god-component-split).
depends_on: bump-next-js (shipped), fix-auth-bypass (shipped),
drop-public-setup (shipped)
addresses: P0 #7 from .convoys/ship-readiness.md
parent: ship-readiness
Co-authored-by: Cursor <cursoragent@cursor.com>
* architect(fix-layout-default-user): plan + briefs 1-2 (Layout fix + page audit)
2 briefs, single PR. ~12 files net (down from the 18 in the original scope —
10 of the 17 Layout-importing pages already pass user explicitly).
Brief 1: components/Layout.js default user=null + Sign-in CTA branch in
UserProfileDropdown when logged out. Adds first jsdom test in the repo
at test/components/Layout.test.js (Decision D2) with 5 regression-lock
assertions. devDeps: jsdom@^29, @testing-library/react@^16.
Brief 2: page audit sweep — 7 pages need code changes:
- Pass user={user} to Layout: scanner.js, deck-builder.js (×4),
deck/[id].js (×3), decks.js (×3)
- Replace page-level useState({email: 'me@...'}) → useState(null) +
null-guards: profile.js, settings.js
- Replace hardcoded const user = {email: 'me@...'} with useAuth():
card/[id].js
Discovered second anti-pattern: profile.js, settings.js, card/[id].js
seed page-level state with the maintainer email. Folded into Brief 2 since
success metric "no real email address remains in any component default-prop"
reads naturally to include page-level seed values.
Decisions:
A1 — Sign-in CTA replaces avatar+email+dropdown when user===null;
hides auth-only dropdown (Profile/Settings/Logout/Admin);
keeps public + community nav visible
B — Per-page bucket assignment (10 already correct, 7 need fix);
full per-page table with justification in convoy file
C2 — Two briefs in one PR (Brief 1 = Layout + test; Brief 2 = page
sweep depends on Brief 1). C1 buries the conceptual change under
mechanical edits; C3 is over-orchestrated for this scope
D2 — vitest lock-in; first jsdom test in repo; same negative-regression
style as test/lib/permission-middleware.test.js (synthetic-admin
shape). devDeps jsdom + @testing-library/react
Risks tracked R1-R8. Biggest: R2 (useState(null) null-deref in 3 leaky
pages — mitigated by audit-pass mandate + manual smoke).
MobileNavigation deliberately NOT folded in: its user prop is dead code
(never reads user.*); different bug class; cleanup queued separately to
avoid scope expansion.
Flagged-but-deferred:
- 4 pages still import useAuth from lib/auth-context.js
→ single-auth-provider (queued P1 #9)
- Layout headers still render "Deck Hearth" / "DH" branding
→ pick-a-name (queued P1 #12)
- MobileNavigation dead user prop → cleanup-mobile-nav-dead-props
or fold into god-component-split
addresses: P0 #7 from .convoys/ship-readiness.md (last P0 ship-blocker)
parent: ship-readiness
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat(layout): default user=null + Sign-in CTA when logged out (Brief 1 of fix-layout-default-user)
Closes the source-side half of P0 #7 from .convoys/ship-readiness.md.
The page-side sweep (Brief 2) follows in a separate commit.
components/Layout.js:
- Default user prop is now null (was hardcoded to
{ email: 'me@randallstillwell.com', role: 'user' })
- UserProfileDropdown renders a "Sign in" link to /login when
user === null instead of the maintainer's email + auth-only menu
items (Decision A1)
- All user.* accesses guarded with optional chaining or null checks
- useState hook stays above the new null-user early return to satisfy
rules-of-hooks (boot-the-brief caught this on the first try;
see AGENTS.md Gotcha #11.5)
test/components/Layout.test.js (new):
- First jsdom test in the repo (Decision D2)
- 5 regression-lock assertions: no maintainer email ever rendered
(prop omitted, prop=null), Sign-in link exists with href=/login,
supplied email renders when prop is set, no "Guest" placeholder
(locks A1 copy choice)
- Mocks next/link, next/router (prefetch, replace, events, query),
and theme-context.useTheme for jsdom safety under Next 16
package.json + package-lock.json:
- Add jsdom@^29 and @testing-library/react@^16 to devDependencies
- @testing-library/dom@^10 added explicitly (peer auto-install
skipped it under npm 11; brief anticipated this fallback)
vitest.config.js (deviation from brief — see PR description):
- Add esbuild { loader: 'jsx', jsx: 'automatic' } so vitest can
parse JSX in .js files. Required to import any React component
written in the repo's Next.js pages-router .js convention
(AGENTS.md Gotcha #9). The brief said "no change" to this file,
but JSX-in-.js parsing is a hard prerequisite for the new test
to import components/Layout.js — the alternatives (rename test
to .test.jsx; rewrite test in React.createElement) either break
the test glob or still hit the same Layout.js parse failure.
Other tests are unaffected (they import non-JSX modules).
Smoke output: see PR description.
addresses: P0 #7 from .convoys/ship-readiness.md (last P0 ship-blocker)
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat(pages): pass user explicitly + null-guard leaky page seeds (Brief 2 of fix-layout-default-user)
Closes the page-side half of P0 #7 from .convoys/ship-readiness.md.
Brief 1 (commit ddf8fd2) handled the Layout-side fix.
Per the architect's per-page bucket table (Decision B in
.convoys/fix-layout-default-user.md), 7 pages needed code changes;
the other 10 of 17 Layout-importing pages already pass `user` correctly.
Pass user={user} to Layout (4 pages, 11 call sites):
- pages/scanner.js (1 call)
- pages/decks.js (3 calls)
- pages/deck-builder.js (4 calls)
- pages/deck/[id].js (3 calls)
(All four still import useAuth from lib/auth-context.js — that's
intentional and stays as-is until the single-auth-provider convoy
collapses the three parallel auth surfaces.)
Replace leaky page-level seed values with useState(null) + null guards
(2 pages, R2 mitigation):
- pages/profile.js: useState({email: 'me@...', role: 'user', ...})
→ useState(null) + ?. on every sync user.* read
+ early-return guards in getDisplayName/getInitials
+ conditional render around the "Member since" block
so formatDate(undefined) never runs
- pages/settings.js: same pattern (single user.email reader guarded)
Replace hardcoded const with useAuth from lib/use-auth.js (1 page):
- pages/card/[id].js: const user = {email: 'me@...'}
→ const { user } = useAuth() (called unconditionally
at the top of the component; rules-of-hooks safe)
Verification:
- grep 'me@randallstillwell.com' pages/ → 0 hits
- 21/21 vitest tests pass (16 pre-existing + 5 from Brief 1)
- npm run lint matches baseline (128 problems pre, 128 post; verified
via git stash before/after)
- Manual static read-through of every diff; ReadLints clean on the 7
files
- Dev-server smoke: /cards anonymous returned HTTP 200 with 0
'me@randallstillwell' matches before the user's shared dev server
became unresponsive mid-session (same dev-server-shared-by-user
constraint flagged in Brief 1); interactive logged-in smoke is
parent/operator gated
Flagged-but-deferred (untouched per scope):
- 4 pages still import useAuth from lib/auth-context.js
→ single-auth-provider (queued P1 #9)
- components/MobileNavigation.js still receives dead user prop
→ cleanup-mobile-nav-dead-props (or fold into god-component-split)
addresses: P0 #7 from .convoys/ship-readiness.md (last P0 ship-blocker)
Co-authored-by: Cursor <cursoragent@cursor.com>
---------
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-05-24 15:31:37 -04:00
|
|
|
|
<Layout user={user}>
|
2025-08-01 18:41:42 -04:00
|
|
|
|
<div className="h-full flex flex-col">
|
|
|
|
|
|
<div className="px-6 pt-6 pb-4">
|
2025-07-29 15:19:48 -04:00
|
|
|
|
<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)' }}>
|
2026-05-27 14:50:54 -04:00
|
|
|
|
Pick a destination once — every scan lands there until you change it
|
2025-07-29 15:19:48 -04:00
|
|
|
|
</p>
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
2026-05-27 14:50:54 -04:00
|
|
|
|
<ScannerDestinationPicker
|
|
|
|
|
|
gameFilter={gameFilter}
|
|
|
|
|
|
onGameFilterChange={handleGameFilterChange}
|
|
|
|
|
|
destination={sessionDestination}
|
|
|
|
|
|
onDestinationChange={setSessionDestination}
|
2026-06-02 17:17:15 -04:00
|
|
|
|
collections={queue.collections}
|
|
|
|
|
|
decks={queue.decks}
|
|
|
|
|
|
disabled={queue.isProcessing}
|
2026-05-27 14:50:54 -04:00
|
|
|
|
/>
|
|
|
|
|
|
|
2026-06-02 17:17:15 -04:00
|
|
|
|
{queue.autoRouteError && (
|
2026-05-27 14:50:54 -04:00
|
|
|
|
<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"
|
|
|
|
|
|
>
|
2026-06-02 17:17:15 -04:00
|
|
|
|
{queue.autoRouteError}
|
2026-05-27 14:50:54 -04:00
|
|
|
|
</div>
|
|
|
|
|
|
)}
|
|
|
|
|
|
|
2026-05-27 14:54:33 -04:00
|
|
|
|
<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) => setScanDefaults((current) => ({ ...current, 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) => setScanDefaults((current) => ({ ...current, isFoil: e.target.checked }))}
|
|
|
|
|
|
style={{ accentColor: 'var(--accent-ember)' }}
|
|
|
|
|
|
/>
|
|
|
|
|
|
Foil
|
|
|
|
|
|
</label>
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
2025-08-01 18:41:42 -04:00
|
|
|
|
<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)' }}>
|
2025-07-29 15:19:48 -04:00
|
|
|
|
<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={() => setShowOCRSettings(true)}
|
|
|
|
|
|
className="px-4 py-2 rounded-xl font-medium border transition-all duration-200 hover:opacity-80"
|
|
|
|
|
|
style={{
|
|
|
|
|
|
borderColor: 'var(--border)',
|
2026-06-02 17:17:15 -04:00
|
|
|
|
color: 'var(--text-primary)',
|
2025-07-29 15:19:48 -04:00
|
|
|
|
}}
|
|
|
|
|
|
>
|
|
|
|
|
|
⚙️ OCR Settings
|
|
|
|
|
|
</button>
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
2025-08-01 18:41:42 -04:00
|
|
|
|
<div className="flex-1">
|
2026-06-02 17:17:15 -04:00
|
|
|
|
<CameraScanner onCardScanned={queue.handleCardScanned} onError={handleError} />
|
2025-08-01 18:41:42 -04:00
|
|
|
|
</div>
|
2025-07-29 15:19:48 -04:00
|
|
|
|
</div>
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
2025-08-01 18:41:42 -04:00
|
|
|
|
<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)' }}>
|
2025-07-29 15:19:48 -04:00
|
|
|
|
<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">
|
2026-05-27 15:22:18 -04:00
|
|
|
|
<div
|
|
|
|
|
|
className="text-sm"
|
|
|
|
|
|
style={{ color: 'var(--text-secondary)' }}
|
|
|
|
|
|
aria-live="polite"
|
|
|
|
|
|
aria-atomic="true"
|
|
|
|
|
|
>
|
2026-06-02 17:17:15 -04:00
|
|
|
|
{queue.scannedCards.length} cards
|
2025-07-29 15:19:48 -04:00
|
|
|
|
</div>
|
2026-06-02 17:17:15 -04:00
|
|
|
|
{queue.scannedCards.length > 0 && (
|
2025-07-29 15:19:48 -04:00
|
|
|
|
<button
|
2026-06-02 17:17:15 -04:00
|
|
|
|
onClick={queue.clearScannedCards}
|
2025-07-29 15:19:48 -04:00
|
|
|
|
className="px-3 py-1 rounded-lg text-sm border hover:opacity-80"
|
|
|
|
|
|
style={{
|
|
|
|
|
|
borderColor: 'var(--border)',
|
2026-06-02 17:17:15 -04:00
|
|
|
|
color: 'var(--text-secondary)',
|
2025-07-29 15:19:48 -04:00
|
|
|
|
}}
|
2026-05-29 23:58:41 -04:00
|
|
|
|
aria-label="Clear all scanned cards from queue"
|
2025-07-29 15:19:48 -04:00
|
|
|
|
>
|
|
|
|
|
|
Clear All
|
|
|
|
|
|
</button>
|
|
|
|
|
|
)}
|
|
|
|
|
|
</div>
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
2025-08-01 18:41:42 -04:00
|
|
|
|
<div className="flex-1 overflow-y-auto">
|
2026-06-02 17:17:15 -04:00
|
|
|
|
{queue.scannedCards.length === 0 ? (
|
2025-07-29 15:19:48 -04:00
|
|
|
|
<div className="text-center py-8" style={{ color: 'var(--text-secondary)' }}>
|
2026-05-27 15:22:18 -04:00
|
|
|
|
<div className="text-4xl mb-2" aria-hidden="true">📱</div>
|
2025-07-29 15:19:48 -04:00
|
|
|
|
<div className="font-medium">No cards scanned yet</div>
|
|
|
|
|
|
<div className="text-sm">Start scanning to see cards here</div>
|
|
|
|
|
|
</div>
|
|
|
|
|
|
) : (
|
2026-05-27 15:22:18 -04:00
|
|
|
|
<ul className="space-y-3 list-none p-0 m-0" aria-label="Scanned cards queue">
|
2026-06-02 17:17:15 -04:00
|
|
|
|
{queue.scannedCards.map((card) => (
|
2026-05-27 15:22:18 -04:00
|
|
|
|
<li key={card.id}>
|
|
|
|
|
|
<ScannedCardItem
|
|
|
|
|
|
card={card}
|
2026-06-02 17:17:15 -04:00
|
|
|
|
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)}
|
2026-05-27 15:22:18 -04:00
|
|
|
|
/>
|
|
|
|
|
|
</li>
|
|
|
|
|
|
))}
|
|
|
|
|
|
</ul>
|
2025-07-29 15:19:48 -04:00
|
|
|
|
)}
|
|
|
|
|
|
</div>
|
|
|
|
|
|
</div>
|
|
|
|
|
|
</div>
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
2026-06-02 17:17:15 -04:00
|
|
|
|
{queue.selectedCards.size > 0 && (
|
2025-07-29 15:19:48 -04:00
|
|
|
|
<div className="fixed bottom-6 left-1/2 transform -translate-x-1/2 z-50">
|
2026-05-29 23:58:41 -04:00
|
|
|
|
<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">
|
2026-06-02 17:17:15 -04:00
|
|
|
|
<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}
|
2025-07-29 15:19:48 -04:00
|
|
|
|
</div>
|
|
|
|
|
|
<span className="font-medium" style={{ color: 'var(--text-primary)' }}>
|
2026-06-02 17:17:15 -04:00
|
|
|
|
{queue.selectedCards.size === 1 ? 'card selected' : 'cards selected'}
|
2025-07-29 15:19:48 -04:00
|
|
|
|
</span>
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
<div className="w-px h-8" style={{ backgroundColor: 'var(--border)' }}></div>
|
|
|
|
|
|
|
|
|
|
|
|
<div className="flex items-center gap-3">
|
|
|
|
|
|
<button
|
2026-06-02 17:17:15 -04:00
|
|
|
|
onClick={() => queue.handleBulkAction('owned')}
|
|
|
|
|
|
disabled={queue.isProcessing}
|
2025-07-29 15:19:48 -04:00
|
|
|
|
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' }}
|
|
|
|
|
|
>
|
2026-05-27 15:22:18 -04:00
|
|
|
|
<span aria-hidden="true">💎 </span>
|
2026-05-29 10:53:40 -04:00
|
|
|
|
{VOCAB.ADD_TO_MY_COLLECTION}
|
2025-07-29 15:19:48 -04:00
|
|
|
|
</button>
|
|
|
|
|
|
|
2026-06-02 17:17:15 -04:00
|
|
|
|
{queue.collections.length > 0 && (
|
2025-07-29 15:19:48 -04:00
|
|
|
|
<select
|
|
|
|
|
|
onChange={(e) => {
|
2026-05-27 14:44:47 -04:00
|
|
|
|
const collectionId = e.target.value;
|
|
|
|
|
|
e.target.value = '';
|
|
|
|
|
|
if (collectionId) {
|
2026-06-02 17:17:15 -04:00
|
|
|
|
queue.handleBulkAction('collection', collectionId);
|
2025-07-29 15:19:48 -04:00
|
|
|
|
}
|
|
|
|
|
|
}}
|
2026-06-02 17:17:15 -04:00
|
|
|
|
disabled={queue.isProcessing}
|
2025-07-29 15:19:48 -04:00
|
|
|
|
className="px-4 py-2 rounded-lg font-medium"
|
|
|
|
|
|
style={{ backgroundColor: 'var(--accent-ember)', color: 'white', border: 'none' }}
|
2026-05-29 10:53:40 -04:00
|
|
|
|
aria-label="Add selected cards to list"
|
2025-07-29 15:19:48 -04:00
|
|
|
|
>
|
2026-05-29 10:53:40 -04:00
|
|
|
|
<option value="">{`📚 ${VOCAB.ADD_TO_LIST}`}</option>
|
2026-06-02 17:17:15 -04:00
|
|
|
|
{queue.collections.map((collection) => (
|
2025-07-29 15:19:48 -04:00
|
|
|
|
<option key={collection.id} value={collection.id}>
|
|
|
|
|
|
{collection.name}
|
|
|
|
|
|
</option>
|
|
|
|
|
|
))}
|
|
|
|
|
|
</select>
|
|
|
|
|
|
)}
|
|
|
|
|
|
|
2026-06-02 17:17:15 -04:00
|
|
|
|
{queue.decks.length > 0 && (
|
2025-07-29 15:19:48 -04:00
|
|
|
|
<select
|
|
|
|
|
|
onChange={(e) => {
|
2026-05-27 14:44:47 -04:00
|
|
|
|
const deckId = e.target.value;
|
|
|
|
|
|
e.target.value = '';
|
|
|
|
|
|
if (deckId) {
|
2026-06-02 17:17:15 -04:00
|
|
|
|
queue.handleBulkAction('deck', deckId);
|
2025-07-29 15:19:48 -04:00
|
|
|
|
}
|
|
|
|
|
|
}}
|
2026-06-02 17:17:15 -04:00
|
|
|
|
disabled={queue.isProcessing}
|
2025-07-29 15:19:48 -04:00
|
|
|
|
className="px-4 py-2 rounded-lg font-medium"
|
|
|
|
|
|
style={{ backgroundColor: 'var(--accent-flame)', color: 'white', border: 'none' }}
|
2026-05-27 15:22:18 -04:00
|
|
|
|
aria-label="Add selected cards to deck"
|
2025-07-29 15:19:48 -04:00
|
|
|
|
>
|
|
|
|
|
|
<option value="">🃏 Add to Deck</option>
|
2026-06-02 17:17:15 -04:00
|
|
|
|
{queue.decks.map((deck) => (
|
2025-07-29 15:19:48 -04:00
|
|
|
|
<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
|
2026-06-02 17:17:15 -04:00
|
|
|
|
onClick={queue.clearSelection}
|
2025-07-29 15:19:48 -04:00
|
|
|
|
className="px-3 py-2 rounded-lg hover:opacity-80"
|
|
|
|
|
|
style={{ color: 'var(--text-secondary)' }}
|
2026-05-27 15:22:18 -04:00
|
|
|
|
aria-label="Clear selection"
|
2025-07-29 15:19:48 -04:00
|
|
|
|
>
|
2026-05-27 15:22:18 -04:00
|
|
|
|
<span aria-hidden="true">✕</span>
|
2025-07-29 15:19:48 -04:00
|
|
|
|
</button>
|
|
|
|
|
|
</div>
|
|
|
|
|
|
</div>
|
|
|
|
|
|
)}
|
|
|
|
|
|
|
2026-06-02 17:17:15 -04:00
|
|
|
|
{queue.showCreateCollection && (
|
2025-07-29 15:19:48 -04:00
|
|
|
|
<div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50">
|
2026-05-27 15:22:18 -04:00
|
|
|
|
<div
|
|
|
|
|
|
ref={createCollectionDialogRef}
|
|
|
|
|
|
className="rounded-xl p-6 max-w-md w-full mx-4"
|
|
|
|
|
|
style={{ backgroundColor: 'var(--bg-secondary)' }}
|
|
|
|
|
|
role="dialog"
|
|
|
|
|
|
aria-modal="true"
|
|
|
|
|
|
aria-labelledby="create-collection-title"
|
|
|
|
|
|
>
|
|
|
|
|
|
<h3 id="create-collection-title" className="text-lg font-semibold mb-4" style={{ color: 'var(--text-primary)' }}>
|
2026-05-29 10:53:40 -04:00
|
|
|
|
Create New List
|
2025-07-29 15:19:48 -04:00
|
|
|
|
</h3>
|
2026-05-27 15:22:18 -04:00
|
|
|
|
<label htmlFor="create-collection-name" className="sr-only">
|
2026-05-29 10:53:40 -04:00
|
|
|
|
List name
|
2026-05-27 15:22:18 -04:00
|
|
|
|
</label>
|
2025-07-29 15:19:48 -04:00
|
|
|
|
<input
|
2026-05-27 15:22:18 -04:00
|
|
|
|
id="create-collection-name"
|
2025-07-29 15:19:48 -04:00
|
|
|
|
type="text"
|
2026-05-29 10:53:40 -04:00
|
|
|
|
placeholder="List name..."
|
2026-06-02 17:17:15 -04:00
|
|
|
|
value={queue.newCollectionName}
|
|
|
|
|
|
onChange={(e) => queue.setNewCollectionName(e.target.value)}
|
2025-07-29 15:19:48 -04:00
|
|
|
|
className="w-full px-4 py-2 rounded-lg border mb-4"
|
|
|
|
|
|
style={{
|
|
|
|
|
|
backgroundColor: 'var(--bg-tertiary)',
|
|
|
|
|
|
borderColor: 'var(--border)',
|
2026-06-02 17:17:15 -04:00
|
|
|
|
color: 'var(--text-primary)',
|
2025-07-29 15:19:48 -04:00
|
|
|
|
}}
|
|
|
|
|
|
onKeyPress={(e) => {
|
|
|
|
|
|
if (e.key === 'Enter') {
|
2026-06-02 17:17:15 -04:00
|
|
|
|
queue.createCollection();
|
2025-07-29 15:19:48 -04:00
|
|
|
|
}
|
|
|
|
|
|
}}
|
|
|
|
|
|
/>
|
|
|
|
|
|
<div className="flex gap-3">
|
|
|
|
|
|
<button
|
2026-06-02 17:17:15 -04:00
|
|
|
|
onClick={queue.createCollection}
|
|
|
|
|
|
disabled={!queue.newCollectionName.trim()}
|
2025-07-29 15:19:48 -04:00
|
|
|
|
className="flex-1 px-4 py-2 rounded-lg font-medium disabled:opacity-50"
|
|
|
|
|
|
style={{ backgroundColor: 'var(--accent-ember)', color: 'white' }}
|
|
|
|
|
|
>
|
|
|
|
|
|
Create
|
|
|
|
|
|
</button>
|
|
|
|
|
|
<button
|
2026-06-02 17:17:15 -04:00
|
|
|
|
onClick={() => queue.setShowCreateCollection(false)}
|
2025-07-29 15:19:48 -04:00
|
|
|
|
className="flex-1 px-4 py-2 rounded-lg border font-medium"
|
|
|
|
|
|
style={{ borderColor: 'var(--border)', color: 'var(--text-primary)' }}
|
|
|
|
|
|
>
|
|
|
|
|
|
Cancel
|
|
|
|
|
|
</button>
|
|
|
|
|
|
</div>
|
|
|
|
|
|
</div>
|
|
|
|
|
|
</div>
|
|
|
|
|
|
)}
|
|
|
|
|
|
|
2026-06-02 17:17:15 -04:00
|
|
|
|
{showOCRSettings && <OCRSettings onClose={() => setShowOCRSettings(false)} />}
|
2025-07-29 15:19:48 -04:00
|
|
|
|
</div>
|
|
|
|
|
|
</Layout>
|
|
|
|
|
|
);
|
2026-06-02 17:17:15 -04:00
|
|
|
|
}
|