diff --git a/docs/ui-spec.md b/docs/ui-spec.md index 96cda75..84f5c0a 100644 --- a/docs/ui-spec.md +++ b/docs/ui-spec.md @@ -179,4 +179,5 @@ distinguishable. | **"Summarize now" foreground path** | Unified quiet nudge button on actionable non-summarized cards. Five explicit card states — (1) summarized: chip + no button; (2) no captions (`transcript_status = 'none'`): "No transcript available", no button; (3) queued: "Queued" chip, no button; (4) rate-limited: "Fetching soon…" + "Summarize now" → `POST /v/{id}/retry-now` (clears `rate_limited_at`, triggers engine); (5) pending: "Not summarized" + "Summarize now" → `POST /v/{id}/summarize` (queues + triggers engine). One verb, one style (`.btn-quiet`); backend difference invisible to user. Both handlers call `ProcessVideo` through `globalFetchGate`. Rate gate respected, not bypassed — this is onboarding prioritisation. | Fast onboarding value; honest dead-end for no-captions videos (no button that fails). | `internal/web/handlers.go` (`handleRetryNow`, `handleRequestSummarize`); `internal/web/views.templ` (`VideoCard`) | | **Pipeline stats bar** | A one-line status bar above the video list: `N summarized · M fetching soon · K no captions`. Computed from the unfiltered row set; hidden when all videos are summarized. Gives the user a clear read on pipeline state without any interaction. | Replaces the "why is nothing happening?" confusion when most videos are pending or rate-limited. | `internal/web/view.go` (`PipelineStats`, `pipelineStats`) | | **Unavailable channels (account page)** | The `/account` page shows a "Unavailable channels" section when any channels returned HTTP 404 on the last discovery pass. Lists channel name, an "unavailable" badge, and the first-seen date. Data sourced from the `channel_errors` table (migration 013). | Surfaces silent failures so users know why some subscribed channels produce no new videos. | migration 013; `internal/web/account.go`; `internal/adapters/youtube/youtube.go` (`domain.ErrChannelUnavailable`) | +| **Visual refresh — charm-reader theme + light/dark toggle (ADR-032)** | One layout in two palettes expressed as CSS custom properties: a warm "reader" light theme (sketch B) and a "cozy terminal" dark theme (sketch C). Palette is chosen in cascade order — `:root` light default, an OS-preference dark block scoped to `:root:not([data-theme])` so it only applies absent an explicit choice, and `:root[data-theme="dark"\|"light"]` set by a header toggle that outranks the media query and persists in `localStorage` (guarded; degrades to OS default). An init script in `
` applies the stored choice before paint (no flash). Charm touches: monospace meta lines, accent uppercase section dividers with a trailing rule, pill buttons, a lifted/accent-edged expanded card. Error/danger shades became `--err-*` tokens so they follow the theme without per-block dark overrides. Sketches kept as the design record under `docs/sketches/`. | The UI read "flat and boring"; the charm/TUI aesthetic makes it distinctive and gives a real light/dark choice rather than OS-only. | ADR-032; `docs/use-cases/visual_theme.feature`; `internal/web/visual_theme_test.go`; `internal/web/view.go` (`stylesheet`, `themeScript`), `internal/web/views.templ` (Layout/PublicLayout) | | **Recency window + sparse-state honesty (ADR-020)** | Supersedes the copy/sort in the rows above. Auto-summarize is bounded to videos published within `TAPIR_AUTO_SUMMARIZE_WINDOW` (~7d); older un-summarized videos collapse behind a single "Show N older videos — summarize on demand" disclosure, and caption-less videos collapse to a one-line count (not N cards). List order is now `summarized-first, published_at DESC NULLS LAST`. Copy reframed for honest scarcity: pipeline bar reads "N ready · M in queue · K no captions" (no "fetching soon"); a gradual-fill note explains the rate limit; the nudge verb is "Summarize" (not "Summarize now"); the queued card says "summarizing shortly"; the empty-connected state drops the impossible `tapir run` instruction. Detail leads with Takeaways. Filters slimmed (no date pickers; hidden when empty); watched/skipped segmented; back link on detail; empty terms checkbox removed. | Make the sparse reality legible and honest instead of implying abundance/imminence; bound auto load so the back-catalogue doesn't re-drive the caption gate. Never fetch harder — scarcity is surfaced, not engineered around. | ADR-020; `2384c47`, `3df0459`, `40b703e`, `a1a5217`, `4a0a56e`, `9bf1c31`, `980638d`, `12fb031`, `f775441`, `51aa5d9` | diff --git a/docs/use-cases/visual_theme.feature b/docs/use-cases/visual_theme.feature index 18454df..6058c79 100644 --- a/docs/use-cases/visual_theme.feature +++ b/docs/use-cases/visual_theme.feature @@ -8,25 +8,21 @@ Feature: Visual refresh — one charm-reader layout, light + dark themes (ADR-03 # the mockups in docs/sketches/, not unit-tested; these scenarios cover the # testable structure. Each maps to a Go test in scenario_coverage_test.go. - @pending # TestThemeHasLightAndDarkPalettes Scenario: Light and dark themes share one layout via CSS variables Given the app stylesheet When it is rendered Then it defines a light palette on the root and a dark palette under data-theme="dark", with no duplicate markup - @pending # TestThemeFollowsOSPreference Scenario: Without a stored choice the theme follows the OS preference Given a visitor with no saved theme When the page loads Then a prefers-color-scheme dark block applies the dark palette automatically - @pending # TestThemeTogglePersists Scenario: A persisted toggle switches light and dark Given any page When it is rendered Then it includes a theme-toggle control and a small script that flips data-theme and persists the choice - @pending # TestExpandedCardEmbedsVideo Scenario: The expanded card embeds the video player Given a summarized video with a valid provider id When its card is expanded diff --git a/internal/web/view.go b/internal/web/view.go index 5a9ace5..2923103 100644 --- a/internal/web/view.go +++ b/internal/web/view.go @@ -578,33 +578,71 @@ func (f Filter) apply(rows []store.SummaryRow) []store.SummaryRow { // not as template expressions — so the CSS is rendered as a raw node instead). var styleTag = "" -// The design system is a small set of CSS custom properties: one accent, a -// 4/8px-derived spacing scale, a single radius, and full light+dark palettes so -// color-scheme: light dark is actually honoured (review #1). Muted is #595959 -// (~7:1 on white) / #9aa0a8 on dark to clear WCAG AA (review #4). +// themeScript powers the light/dark toggle (ADR-032). The init runs in +// before paint: if the visitor has a stored choice it is applied as data-theme +// immediately, so there is no flash of the wrong palette; with no stored choice +// nothing is set and the CSS @media (prefers-color-scheme) default takes over. +// tapirToggleTheme flips to the opposite of the *effective* theme (reading +// matchMedia when no explicit choice is set yet) and persists it. localStorage +// access is guarded so a privacy-locked browser degrades to the OS default. +const themeScript = ` +(function(){try{var t=localStorage.getItem('theme');if(t==='dark'||t==='light')document.documentElement.setAttribute('data-theme',t);}catch(e){}})(); +function tapirToggleTheme(){var d=document.documentElement,c=d.getAttribute('data-theme');if(!c){c=window.matchMedia&&window.matchMedia('(prefers-color-scheme: dark)').matches?'dark':'light';}var n=c==='dark'?'light':'dark';d.setAttribute('data-theme',n);try{localStorage.setItem('theme',n);}catch(e){}} +` + +// themeScriptTag is the init/toggle script, injected verbatim in . +var themeScriptTag = "" + +// themeToggleButton is the header control that calls tapirToggleTheme. Shared by +// the authenticated and public layouts so the toggle is on every page. +const themeToggleButton = `` + +// The design system is one charm-reader layout in two palettes (ADR-032, #17): +// a warm "reader" light theme (sketch B) and a "cozy terminal" dark theme +// (sketch C), both expressed as CSS custom properties. The palette is selected +// three ways, in cascade order: the :root light default; an OS-preference dark +// block that applies only when the visitor has made no explicit choice +// (:root:not([data-theme])); and an explicit :root[data-theme="dark"|"light"] +// set by the persisted toggle, which outranks the media query by specificity. +// charmDarkVars is declared once and injected in both dark selectors so the two +// never drift. Muted clears WCAG AA on each background (#5b5968 on cream, +// #a59cc0 on the dark card). Error/danger shades are tokens so they follow the +// theme too, instead of needing per-block dark overrides. +const charmDarkVars = ` + --bg:#16131d; --card:#1e1a28; --fg:#ece7f5; --muted:#a59cc0; --line:#322b44; + --mint:#2ee6b6; --purple:#9d7bff; --pink:#ff6bdb; --cream:#f3ead8; + --accent:#9d7bff; --accent-fg:#16131d; --accent-weak:#2a2340; + --badge-bg:#caa24a; --badge-fg:#1a1300; + --err-bg:#3a1714; --err-fg:#f3b5ae; --err-line:#a6362e;` + const stylesheet = ` :root { color-scheme: light dark; - --bg:#fbfbfa; --card:#ffffff; --fg:#1a1a1a; --muted:#595959; --line:#e4e4e1; - --accent:#2b6cb0; --accent-fg:#ffffff; --accent-weak:#eaf1f8; + --bg:#faf7f2; --card:#ffffff; --fg:#1c1b22; --muted:#5b5968; --line:#e7e2d8; + --mint:#0bbf8c; --purple:#6a4cf0; --pink:#e0379a; --cream:#1c1b22; + --accent:#6a4cf0; --accent-fg:#ffffff; --accent-weak:#efebfd; --badge-bg:#e7a13a; --badge-fg:#2a1d00; + --err-bg:#fce8e6; --err-fg:#8a1c10; --err-line:#d9534f; --s1:.25rem; --s2:.5rem; --s3:1rem; --s4:1.5rem; --s5:2.5rem; --radius:.5rem; + --mono: ui-monospace, SFMono-Regular, Menlo, "Cascadia Code", monospace; } @media (prefers-color-scheme: dark) { - :root { - --bg:#15171b; --card:#1e2128; --fg:#e7e7e4; --muted:#9aa0a8; --line:#2d313a; - --accent:#76aae6; --accent-fg:#0c0f13; --accent-weak:#222b38; - --badge-bg:#caa24a; --badge-fg:#1a1300; + :root:not([data-theme]) {` + charmDarkVars + ` } } +:root[data-theme="dark"] {` + charmDarkVars + ` +} * { box-sizing: border-box; } body { font: 15px/1.6 system-ui, -apple-system, sans-serif; margin: 0; color: var(--fg); background: var(--bg); } a { color: var(--accent); text-decoration: none; } a:hover, a:focus-visible { text-decoration: underline; } a:visited { color: var(--accent); } header { padding: var(--s3) var(--s4); border-bottom: 1px solid var(--line); background: var(--card); display: flex; align-items: center; justify-content: space-between; gap: var(--s3); } -.brand { font-weight: 700; font-size: 1.05rem; color: var(--accent); } -.nav { display: flex; gap: var(--s3); font-size: .9rem; } +.brand { font-weight: 800; font-size: 1.05rem; letter-spacing: -.01em; color: var(--accent); } +.nav { display: flex; gap: var(--s3); align-items: center; font-size: .9rem; } +.theme-toggle { font: inherit; font-size: 1rem; line-height: 1; padding: .3rem .5rem; border: 1px solid var(--line); border-radius: 999px; background: var(--card); color: var(--muted); cursor: pointer; } +.theme-toggle:hover { border-color: var(--accent); color: var(--accent); } +.theme-toggle:focus-visible { outline: 2px solid var(--accent); outline-offset: 1px; } main { max-width: 60rem; margin: 0 auto; padding: var(--s4) var(--s3); } .muted { color: var(--muted); } @@ -615,7 +653,7 @@ main { max-width: 60rem; margin: 0 auto; padding: var(--s4) var(--s3); } .filters input:focus-visible { outline: 2px solid var(--accent); outline-offset: 1px; border-color: var(--accent); } .filter-check { flex-direction: row !important; align-items: center; gap: var(--s2) !important; padding-bottom: .45rem; } .filter-check input[type=checkbox] { width: 1rem; height: 1rem; min-width: 0; padding: 0; accent-color: var(--accent); cursor: pointer; } -.btn { font: inherit; font-weight: 600; padding: .45rem 1rem; border: 1px solid var(--accent); border-radius: var(--radius); background: var(--accent); color: var(--accent-fg); cursor: pointer; } +.btn { font: inherit; font-weight: 600; padding: .45rem 1.1rem; border: 1px solid var(--accent); border-radius: 999px; background: var(--accent); color: var(--accent-fg); cursor: pointer; } /* anchors styled as buttons: the generic a{} / a:visited{} colour rules outrank .btn on , painting the label accent-on-accent (invisible). Restore the button foreground for anchor buttons, visited included. */ @@ -627,18 +665,19 @@ a.btn, a.btn:visited { color: var(--accent-fg); } .cards { list-style: none; margin: 0; padding: 0; display: grid; gap: var(--s3); } .card { background: var(--card); border: 1px solid var(--line); border-radius: var(--radius); padding: var(--s3) var(--s4); display: flex; flex-direction: column; gap: var(--s2); } .card-title { font-size: 1.1rem; font-weight: 600; line-height: 1.3; } -.card-meta { color: var(--muted); font-size: .85rem; } +.card-meta { color: var(--muted); font-size: .8rem; font-family: var(--mono); } .card-preview { color: var(--muted); font-size: .9rem; line-height: 1.5; display: -webkit-box; -webkit-line-clamp: 1; line-clamp: 1; -webkit-box-orient: vertical; overflow: hidden; } .card-foot { display: flex; gap: var(--s2); align-items: center; flex-wrap: wrap; margin-top: var(--s1); } -/* Inline-expanded card (ADR-031). Minimal layout only — the TUI/charm restyle is #17. */ -.card-expanded { border-color: var(--accent, #7653fc); } +/* Inline-expanded card (ADR-031/032): lifted, with a charm accent edge so the + open card reads as the focused one in the feed (sketch B/C). */ +.card-expanded { border-color: var(--accent); border-left: 3px solid var(--mint); box-shadow: 0 6px 24px color-mix(in srgb, var(--accent) 14%, transparent); } .card-expanded-head { display: flex; justify-content: space-between; align-items: baseline; gap: var(--s2); } -.card-collapse { font-size: .85rem; white-space: nowrap; } +.card-collapse { font-size: .8rem; font-family: var(--mono); white-space: nowrap; } .chip { display: inline-block; padding: .15rem .55rem; border-radius: 999px; background: var(--accent-weak); color: var(--accent); font-size: .72rem; font-weight: 600; } /* passive "retrying later" chip: dim/grey (CharmDim), not the accent — it is a status, not an action the user can take. */ .chip-retry { background: rgba(108, 108, 108, .16); color: #6c6c6c; } -.pipeline-bar { display: flex; gap: var(--s3); align-items: center; flex-wrap: wrap; margin-bottom: var(--s3); font-size: .8rem; color: var(--muted); } +.pipeline-bar { display: flex; gap: var(--s3); align-items: center; flex-wrap: wrap; margin-bottom: var(--s3); font-size: .78rem; font-family: var(--mono); color: var(--muted); } .pipeline-bar span { display: flex; align-items: center; gap: var(--s1); } .pipeline-bar span + span::before { content: "·"; margin-right: var(--s1); } .pipeline-note { margin: calc(-1 * var(--s2)) 0 var(--s3); font-size: .8rem; line-height: 1.5; max-width: 40rem; } @@ -724,10 +763,7 @@ a.btn, a.btn:visited { color: var(--accent-fg); } /* flash / notification banner */ .flash { padding: var(--s2) var(--s3); border-radius: var(--radius); margin-bottom: var(--s4); font-size: .92rem; border: 1px solid var(--line); } .flash-success { background: var(--accent-weak); color: var(--accent); border-color: var(--accent); } -.flash-error { background: #fce8e6; color: #8a1c10; border-color: #d9534f; } -@media (prefers-color-scheme: dark) { - .flash-error { background: #3a1714; color: #f3b5ae; border-color: #a6362e; } -} +.flash-error { background: var(--err-bg); color: var(--err-fg); border-color: var(--err-line); } /* htmx loading feedback */ .htmx-indicator { opacity: 0; transition: opacity .2s; color: var(--muted); font-size: .8rem; } @@ -737,12 +773,13 @@ a.btn, a.btn:visited { color: var(--accent-fg); } .detail { max-width: 38rem; } .detail .back { margin: 0 0 var(--s3); font-size: .85rem; } .detail h1 { font-size: 1.7rem; line-height: 1.25; margin: 0 0 var(--s2); } -.detail .meta { color: var(--muted); font-size: .9rem; margin: 0 0 var(--s2); display: flex; gap: var(--s2); align-items: center; flex-wrap: wrap; } +.detail .meta { color: var(--muted); font-size: .82rem; font-family: var(--mono); margin: 0 0 var(--s2); display: flex; gap: var(--s2); align-items: center; flex-wrap: wrap; } .detail .source { margin: 0 0 var(--s4); font-size: .9rem; } .detail .embed { margin: 0 0 var(--s4); aspect-ratio: 16 / 9; border-radius: var(--radius); overflow: hidden; background: #000; border: 1px solid var(--line); } .detail .embed iframe { display: block; width: 100%; height: 100%; border: 0; } .detail section { margin-top: var(--s4); } -.detail section h2 { font-size: .78rem; text-transform: uppercase; letter-spacing: .05em; color: var(--muted); border-top: 1px solid var(--line); padding-top: var(--s3); margin: 0 0 var(--s2); } +.detail section h2 { font-size: .72rem; text-transform: uppercase; letter-spacing: .12em; color: var(--accent); display: flex; align-items: center; gap: var(--s2); margin: var(--s4) 0 var(--s2); } +.detail section h2::after { content: ""; flex: 1; height: 1px; background: var(--line); } .detail .body { white-space: pre-wrap; line-height: 1.7; margin: 0; } .detail ul { margin: 0; padding-left: 1.2rem; line-height: 1.6; } .detail li { margin-bottom: var(--s1); } @@ -760,8 +797,7 @@ a.btn, a.btn:visited { color: var(--accent-fg); } .chat-a { background: var(--card); border: 1px solid var(--line); } .chat-a .body { white-space: pre-wrap; line-height: 1.6; } .chat-note { margin: 0; font-size: .82rem; font-style: italic; } -.chat-error { margin: 0; color: #8a1c10; font-size: .9rem; } -@media (prefers-color-scheme: dark) { .chat-error { color: #f3b5ae; } } +.chat-error { margin: 0; color: var(--err-fg); font-size: .9rem; } .chat-form { display: flex; flex-direction: column; gap: var(--s2); margin: var(--s2) 0 0; } .chat-model { flex-direction: column; display: flex; gap: var(--s1); font-size: .78rem; text-transform: uppercase; letter-spacing: .04em; color: var(--muted); align-items: flex-start; } .chat-model select { font: inherit; text-transform: none; letter-spacing: 0; padding: .4rem .55rem; border: 1px solid var(--line); border-radius: var(--radius); background: var(--card); color: var(--fg); } @@ -811,17 +847,13 @@ a.btn, a.btn:visited { color: var(--accent-fg); } .danger-zone h2 { border-top-color: #d9534f; } .confirm-delete > summary { display: inline-block; list-style: none; cursor: pointer; font: inherit; font-weight: 600; padding: .45rem 1rem; border: 1px solid #d9534f; border-radius: var(--radius); background: transparent; color: #c0392b; } .confirm-delete > summary::-webkit-details-marker { display: none; } -.confirm-delete > summary:hover { background: #fce8e6; } +.confirm-delete > summary:hover { background: var(--err-bg); } .confirm-delete[open] > summary { margin-bottom: var(--s3); } -.confirm-body { border: 1px solid #d9534f; border-radius: var(--radius); padding: var(--s3); background: #fce8e6; color: #8a1c10; } +.confirm-body { border: 1px solid #d9534f; border-radius: var(--radius); padding: var(--s3); background: var(--err-bg); color: var(--err-fg); } .btn-danger { font: inherit; font-weight: 600; padding: .45rem 1rem; border: 1px solid #d9534f; border-radius: var(--radius); background: #d9534f; color: #fff; cursor: pointer; } .btn-danger:hover { filter: brightness(1.05); } .btn-danger:focus-visible { outline: 2px solid #d9534f; outline-offset: 1px; } -@media (prefers-color-scheme: dark) { - .confirm-body { background: #3a1714; color: #f3b5ae; } - .confirm-delete > summary { color: #f3b5ae; } - .confirm-delete > summary:hover { background: #3a1714; } -} +.confirm-delete > summary { color: var(--err-fg); } /* public landing page (/welcome) — the Charm-box mascot hero plus the sign-in CTA */ .welcome { text-align: center; padding: var(--s5) var(--s3); display: flex; flex-direction: column; align-items: center; gap: var(--s4); } diff --git a/internal/web/views.templ b/internal/web/views.templ index 828c9d6..b2d138d 100644 --- a/internal/web/views.templ +++ b/internal/web/views.templ @@ -17,13 +17,14 @@ templ Layout(title string) {