Fix RangeSlider visual bugs

.env.example

@@ -19,6 +19,3 @@ DATA_DIR=/home/timetracker/app/data
 
 # CSRF trusted origins
 CSRF_TRUSTED_ORIGINS=https://tracker.kucharczyk.xyz
-
-# Create a default admin/admin superuser on startup (for initial setup only)
-CREATE_DEFAULT_SUPERUSER=false

.gitea/workflows/build.yml

@@ -1,62 +0,0 @@
-name: Django CI/CD
-
-on:
-  push:
-    paths-ignore: [ 'README.md' ]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install uv
-        uses: astral-sh/setup-uv@v5
-        with:
-          enable-cache: false
-          python-version: "3.14"
-
-      - name: Install dependencies
-        run: uv sync --frozen
-
-      - name: Set up Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: "22"
-
-      - name: Install pnpm and JS dependencies
-        run: npm install -g pnpm && pnpm install --frozen-lockfile --ignore-scripts
-
-      - name: Build TypeScript
-        run: make ts
-
-      - name: Install Playwright browsers
-        run: uv run playwright install --with-deps chromium
-
-      - name: Run Migrations
-        run: uv run python manage.py migrate
-
-      - name: Run Tests
-        run: uv run --with pytest-django pytest
-
-  build-and-push:
-    needs: test
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/main'
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set Version
-        run: echo "VERSION_NUMBER=1.7.0" >> $GITHUB_ENV
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: |
-            registry.kucharczyk.xyz/timetracker:latest
-            registry.kucharczyk.xyz/timetracker:${{ env.VERSION_NUMBER }}

.gitea/workflows/staging.yml

@@ -1,86 +0,0 @@
-name: Staging deployment
-
-on:
-  push:
-    branches-ignore: [main]
-  delete:
-
-jobs:
-  deploy:
-    if: github.event_name == 'push'
-    runs-on: ubuntu-latest
-    env:
-      BRANCH: ${{ github.ref_name }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Compute staging name
-        run: |
-          SLUG=$(echo "$BRANCH" | tr '[:upper:]' '[:lower:]' | sed -E 's/[^a-z0-9-]+/-/g; s/-+/-/g; s/^-//; s/-$//' | cut -c1-40)
-          echo "SLUG=${SLUG}" >> "$GITHUB_ENV"
-          echo "HOST=tracker-${SLUG}.home.arpa" >> "$GITHUB_ENV"
-          # Per-staging secret so each instance has its own key, decoupling it
-          # from prod even though the database is seeded from a prod snapshot.
-          echo "STAGING_SECRET_KEY=staging-${SLUG}-$(head -c16 /dev/urandom | base64 | tr -dc 'a-zA-Z0-9')" >> "$GITHUB_ENV"
-
-      - name: Build image
-        run: docker build -t "timetracker:staging-${SLUG}" .
-
-      - name: Deploy staging container
-        run: |
-          docker rm -f "timetracker-staging-${SLUG}" 2>/dev/null || true
-          docker run -d --name "timetracker-staging-${SLUG}" \
-            --network docker-compose-templates_public \
-            -e TZ=Europe/Prague \
-            -e PUID=1000 \
-            -e PGID=100 \
-            -e DATA_DIR=/home/timetracker/app/data \
-            -e STAGING=true \
-            -e "SECRET_KEY=${STAGING_SECRET_KEY}" \
-            -e "CSRF_TRUSTED_ORIGINS=https://${HOST}" \
-            -v "timetracker-staging-${SLUG}:/home/timetracker/app/data" \
-            -l "caddy=${HOST}" \
-            -l 'caddy.reverse_proxy={{ upstreams 8000 }}' \
-            -l xyz.kucharczyk.staging=timetracker \
-            -l "xyz.kucharczyk.staging.branch=${BRANCH}" \
-            --restart unless-stopped \
-            "timetracker:staging-${SLUG}"
-
-      - name: Summary
-        run: echo "Deployed to https://${HOST}" >> "$GITHUB_STEP_SUMMARY"
-
-      - name: Comment staging URL on PR
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          auth="Authorization: token ${GITHUB_TOKEN}"
-          api="${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}"
-          pr=$(curl -fsS -H "$auth" "${api}/pulls?state=open&limit=50" \
-            | jq -r --arg branch "$BRANCH" '.[] | select(.head.ref == $branch) | .number' | head -n1)
-          if [ -z "$pr" ]; then
-            echo "No open PR for branch '${BRANCH}', skipping comment"
-            exit 0
-          fi
-          body="Staging deployment: https://${HOST}"
-          if curl -fsS -H "$auth" "${api}/issues/${pr}/comments" \
-            | jq -e --arg body "$body" 'any(.[]; .body == $body)' >/dev/null; then
-            echo "Staging URL already commented on PR #${pr}"
-            exit 0
-          fi
-          curl -fsS -X POST -H "$auth" -H 'Content-Type: application/json' \
-            -d "$(jq -n --arg body "$body" '{body: $body}')" \
-            "${api}/issues/${pr}/comments" >/dev/null
-          echo "Commented staging URL on PR #${pr}"
-
-  teardown:
-    if: github.event_name == 'delete' && github.event.ref_type == 'branch'
-    runs-on: ubuntu-latest
-    env:
-      BRANCH: ${{ github.event.ref }}
-    steps:
-      - name: Remove staging container, volume, and image
-        run: |
-          SLUG=$(echo "$BRANCH" | tr '[:upper:]' '[:lower:]' | sed -E 's/[^a-z0-9-]+/-/g; s/-+/-/g; s/^-//; s/-$//' | cut -c1-40)
-          docker rm -f "timetracker-staging-${SLUG}" 2>/dev/null || true
-          docker volume rm "timetracker-staging-${SLUG}" 2>/dev/null || true
-          docker rmi "timetracker:staging-${SLUG}" 2>/dev/null || true

.github/workflows/build-docker.yml

@@ -19,20 +19,6 @@ jobs:
       - name: Install dependencies
         run: uv sync --frozen
 
-      - name: Set up Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: "22"
-
-      - name: Install pnpm and JS dependencies
-        run: npm install -g pnpm && pnpm install --frozen-lockfile --ignore-scripts
-
-      - name: Build TypeScript
-        run: make ts
-
-      - name: Install Playwright browsers
-        run: uv run playwright install --with-deps chromium
-
       - name: Run Migrations
         run: uv run python manage.py migrate
 

.github/workflows/staging.yml

@@ -1,98 +0,0 @@
-name: Staging deployment
-
-on:
-  push:
-    branches-ignore: [main]
-  delete:
-
-concurrency:
-  group: staging-${{ github.event.ref }}
-  cancel-in-progress: true
-
-jobs:
-  deploy:
-    if: github.event_name == 'push'
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    env:
-      BRANCH: ${{ github.ref_name }}
-      FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Compute staging name
-        run: |
-          SLUG=$(echo "$BRANCH" | tr '[:upper:]' '[:lower:]' | sed -E 's/[^a-z0-9-]+/-/g; s/-+/-/g; s/^-//; s/-$//' | cut -c1-30)
-          APP="timetracker-staging-${SLUG}"
-          echo "SLUG=${SLUG}" >> "$GITHUB_ENV"
-          echo "APP=${APP}" >> "$GITHUB_ENV"
-          echo "HOST=${APP}.fly.dev" >> "$GITHUB_ENV"
-
-      - name: Set up flyctl
-        uses: superfly/flyctl-actions/setup-flyctl@master
-
-      - name: Create app if missing
-        run: |
-          if ! flyctl status --app "$APP" >/dev/null 2>&1; then
-            flyctl apps create "$APP" --org personal
-          fi
-
-      - name: Set staging secrets
-        run: |
-          # Per-app SECRET_KEY so each staging instance is independent and no
-          # session cookie is shared across instances or with production.
-          SECRET_KEY="staging-${SLUG}-$(head -c16 /dev/urandom | base64 | tr -dc 'a-zA-Z0-9')"
-          flyctl secrets set --app "$APP" --stage \
-            "SECRET_KEY=${SECRET_KEY}" \
-            "CSRF_TRUSTED_ORIGINS=https://${HOST}"
-
-      - name: Deploy
-        run: flyctl deploy --app "$APP" --config fly.staging.toml --remote-only --yes
-
-      - name: Summary
-        run: echo "Deployed to https://${HOST}" >> "$GITHUB_STEP_SUMMARY"
-
-      - name: Comment staging URL on PR
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const host = process.env.HOST;
-            const branch = process.env.BRANCH;
-            const body = `Staging deployment: https://${host}`;
-            const { owner, repo } = context.repo;
-            const pulls = await github.rest.pulls.list({
-              owner, repo, state: "open", head: `${owner}:${branch}`,
-            });
-            const pr = pulls.data[0];
-            if (!pr) {
-              core.info(`No open PR for branch '${branch}', skipping comment`);
-              return;
-            }
-            const comments = await github.paginate(github.rest.issues.listComments, {
-              owner, repo, issue_number: pr.number,
-            });
-            if (comments.some((comment) => comment.body === body)) {
-              core.info(`Staging URL already commented on PR #${pr.number}`);
-              return;
-            }
-            await github.rest.issues.createComment({
-              owner, repo, issue_number: pr.number, body,
-            });
-            core.info(`Commented staging URL on PR #${pr.number}`);
-
-  teardown:
-    if: github.event_name == 'delete' && github.event.ref_type == 'branch'
-    runs-on: ubuntu-latest
-    env:
-      BRANCH: ${{ github.event.ref }}
-      FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
-    steps:
-      - name: Set up flyctl
-        uses: superfly/flyctl-actions/setup-flyctl@master
-
-      - name: Destroy staging app
-        run: |
-          SLUG=$(echo "$BRANCH" | tr '[:upper:]' '[:lower:]' | sed -E 's/[^a-z0-9-]+/-/g; s/-+/-/g; s/^-//; s/-$//' | cut -c1-30)
-          APP="timetracker-staging-${SLUG}"
-          flyctl apps destroy "$APP" --yes 2>/dev/null || true

.gitignore

@@ -4,6 +4,7 @@ __pycache__
 .venv/
 node_modules
 package-lock.json
+pnpm-lock.yaml
 db.sqlite3
 data/
 /static/
@@ -12,8 +13,3 @@ dist/
 .python-version
 .direnv
 .hermes/
-
-# Build artifacts: generated in CI/Docker assets stage, not committed
-/games/static/base.css
-/games/static/js/dist/
-/ts/generated/

CLAUDE.md

@@ -35,7 +35,6 @@ games/          — Django app: models, views, templates, forms, signals, tasks,
 common/         — Shared utilities: time formatting, component system, criteria, layout, icons
 timetracker/    — Django project: settings, URL root, ASGI/WSGI
 tests/          — Pytest tests
-e2e/            — Playwright browser tests (run via `make test-e2e`)
 contrib/        — One-off scripts (exchange rate import)
 docs/           — Additional documentation
 ```
@@ -58,12 +57,12 @@ docs/           — Additional documentation
 
 ### Key patterns
 
-**Layout system** (`common/layout.py`): Views call `render_page(request, content, title=...)` instead of Django's `render()`. This assembles a full HTML document via `Page()` — analogous to FastHTML's `fast_app()`. `Page()` handles the `<head>`, navbar, toast container, FOUC-prevention script, and **JS includes**: it calls `collect_media(content)` to gather every component's declared `Media` and emits the `<script>` tags automatically — so views do **not** pass `scripts=` for component-owned JS. The `scripts=` argument remains only for page-specific glue not owned by a reusable component (e.g. the add-form helper `add_*.js`). The navbar shows today's/last-7-days playtime from the `model_counts` context processor.
+**Layout system** (`common/layout.py`): Views call `render_page(request, content, title=...)` instead of Django's `render()`. This assembles a full HTML document via `Page()` — analogous to FastHTML's `fast_app()`. `Page()` handles the `<head>`, navbar, toast container, JS includes, and FOUC-prevention script. The navbar shows today's playtime and last-7-days playtime from the `model_counts` context processor.
 
-**Component system** (`common/components/`): a FastHTML-style **lazy node tree**. Components are `Node` objects that render to HTML only when asked (`str(node)` / `Page()`), so `Page()` can walk a finished tree and collect each component's JS. Split into submodules re-exported via `common/components/__init__.py`:
+**Component system** (`common/components/`): Pure-Python HTML builders, split into four submodules re-exported via `common/components/__init__.py`:
 
-- **`core.py`** — the node layer. `Node` (base; `__html__`/`__str__` return a `SafeString`), `Element` (the single class for *any* HTML element), `Safe` (wraps pre-rendered/trusted HTML), `Fragment` (ordered children, no wrapper tag — use instead of `str(a)+str(b)`), `BaseComponent` (base for higher-level components: implement `render()`, declare `media`), and `Media` (declarative JS deps with order-preserving dedup merge; `collect_media()` sums them over a tree, `node.with_media(...)` attaches them). `_render_element()` is `@lru_cache`-memoized (4096). Attribute values are always escaped. **Children: every string child is escaped — `SafeText`/`mark_safe` included; only `Node` children (so `Safe`) render unescaped.** Trusted pre-rendered HTML must be wrapped in `Safe(...)`, never passed as a safe string. `randomid()` generates stable hash-based IDs.
-- **`primitives.py`** — Generic HTML. Plain leaf builders (`Div`, `Span`, `P`, `Ul`, `Li`, `Strong`, `Label`, `Template`, `Td`, `Tr`, `Th`) are **generated from a whitelist** via the `_html_element(tag)` factory over `Element` — not hand-written per tag. Builders that add classes/behaviour are written out: `A()`, `Button()`, `ButtonGroup()`, `Input()`, `Checkbox()`, `Radio()`, `Pill()`, `Icon()`, `Popover()`, `PopoverTruncated()`, `SearchField()`, `H1()`, `Modal()`, `SimpleTable()`, `TableRow()`, `TableTd()`, `TableHeader()`, `paginated_table_content()`, `AddForm()`, `YearPicker()` (declares datepicker media), `CsrfInput()`/`ModuleScript()`/`StaticScript()` (script-tag string helpers used by `Page()`).
+- **`core.py`** — `Component(tag_name, attributes, children)`: the fundamental builder. `_render_element()` is `@lru_cache`-memoized (4096 entries, always active). Attribute values are always HTML-escaped; children are escaped unless they are `SafeText`. `randomid()` generates stable hash-based IDs.
+- **`primitives.py`** — Generic HTML: `A()`, `Button()` (with color/size/icon params), `ButtonGroup()`, `Div()`, `Span()`, `Label()`, `Input()`, `Icon()`, `Popover()`, `PopoverTruncated()`, `SearchField()`, `H1()`, `Modal()`, `SimpleTable()`, `TableRow()`, `TableTd()`, `TableHeader()`, `paginated_table_content()`, `AddForm()`, `Pill()`, `CsrfInput()`, `ModuleScript()`
 - **`domain.py`** — Domain-specific: `GameLink()`, `GameStatus()` (colored dot + label), `GameStatusSelector()` (Alpine.js PATCH dropdown), `SessionDeviceSelector()` (Alpine.js PATCH dropdown), `LinkedPurchase()`, `NameWithIcon()`, `PriceConverted()`, `PurchasePrice()`
 - **`filters.py`** — Filter UI: `FilterBar()`, `SessionFilterBar()`, `PurchaseFilterBar()` (built from `FilterSelect` widgets)
 - **`search_select.py`** — `SearchSelect()` (form combobox) + `FilterSelect()` (include/exclude filter combobox with pinned Any/None modifiers) + `SearchSelectOption`, all built on a shared `_combobox_shell`; wired by `games/static/js/search_select.js`
@@ -114,30 +113,17 @@ Only a small number of HTML templates remain (platform icon snippets and partial
 ### Frontend stack
 
 - **HTMX** (`games/static/js/htmx.min.js`) — partial page updates
-- **Alpine.js** (vendored: `alpine.min.js`, `alpine-mask.min.js`) — reactive dropdowns (`GameStatusSelector`, `SessionDeviceSelector`), toast store
-- **Flowbite** (vendored: `flowbite.min.js`; `datepicker.umd.js` for the stats YearPicker) — navbar collapse, dropdown toggles
+- **Alpine.js** (CDN) — reactive dropdowns (`GameStatusSelector`, `SessionDeviceSelector`), toast store
+- **Flowbite** (CDN) — navbar collapse, dropdown toggles
 - **Tailwind CSS** — utility classes, compiled from `common/input.css` → `games/static/base.css`
-- All third-party JS is served locally from `games/static/js/` (no CDNs), so pages and browser tests work offline
 - **Custom JS** in `games/static/js/`:
-  - `toast.js` — Alpine.js toast store (listens for `show-toast` HTMX event); also defines `window.fetchWithHtmxTriggers`
+  - `toast.js` — Alpine.js toast store (listens for `show-toast` HTMX event)
   - `search_select.js` — SearchSelect/FilterSelect widgets (search-as-you-type, pills, include/exclude filter mode)
-  - `utils.js` — shared ES-module helpers (`onSwap`, `toISOUTCString`, …)
-- **Widget initialization**: widget JS registers with `onSwap(selector, initializeElement)` from `utils.js` — a port of FastHTML's `proc_htmx` built on `htmx.onLoad`. It runs the initializer once per matching element, on initial page load and inside every htmx-swapped fragment. Never hand-roll `DOMContentLoaded`/`htmx:afterSwap` listeners with per-element guard flags.
-
-### Interactive components: custom elements + TypeScript
-
-New interactive components are **custom elements**, not inline JS in Python. A component that needs behavior emits a semantic tag via `custom_element("tag", Props(...))` (light DOM, server-rendered inner markup built with the htpy-style node builders). Behavior lives in `ts/elements/<tag>.ts` (TypeScript, vanilla DOM, `customElements.define`); the native `connectedCallback` replaces `onSwap` (it fires on parse *and* htmx swap). The server↔client contract is one Python `TypedDict` per element registered with `register_element(...)` in `common/components/custom_elements.py`; `manage.py gen_element_types` codegens `ts/generated/props.ts` (interface + attribute reader) so renaming a prop fails `tsc`.
-
-- **Build:** `tsc` per-module (`tsconfig.json`) compiles `ts/` → `games/static/js/dist/` (build-only, gitignored). `make ts` = codegen + compile; `make ts-check` (in `make check`) = codegen + `tsc --noEmit`; `make dev` runs `tsc --watch`. The Docker image builds CSS + TS in a Node stage. Run `make ts` after editing any `.ts` so e2e/local serving sees fresh output.
-- **htpy-style markup:** generic builders take kwargs attributes and `[]` children — `Div(class_="x", hx_get="/y")[child1, child2]` (`class_`→`class`, `hx_get`→`hx-get`, `True`→bare attr, `False`/`None`→omitted). Still a walkable `Element` tree, so `Media` bubbles.
-- **Do NOT** author HTML/JS as Python f-strings or add new inline Alpine `x-data` blobs. Alpine remains only for trivial pre-existing toggles (toast store, etc.).
-- **Tables collect cell media:** `SimpleTable` stringifies cells, so it explicitly `collect_media`s its rows/header and re-attaches it — a custom element in a table cell still gets its `<script>` emitted by `Page()`.
+  - `utils.js` — shared helpers (e.g., `fetchWithHtmxTriggers`)
 
 ### Deployment
 
-Docker-based: multi-stage Dockerfile (uv builder → Node assets stage → slim runtime), Caddy as reverse proxy on port 8000, Gunicorn with UvicornWorker (ASGI), Supervisor to manage Caddy + Gunicorn + django-q2. `make dev-prod` mimics production locally. CI/CD via GitHub Actions (`.github/workflows/build-docker.yml`): builds Docker image; Drone CI (`.drone.yml`) also present for deployments via Portainer webhook.
-
-**Package manager (pnpm):** front-end deps use **pnpm**, not npm. The pnpm version is pinned in `package.json`'s `packageManager` field and provisioned via **Corepack** (bundled with Node) — the Docker assets stage runs `corepack enable` rather than `npm install -g pnpm`. To bump pnpm, update the `packageManager` field; local, CI, and Docker all follow it. pnpm disables dependency lifecycle scripts by default (opt in via `pnpm.onlyBuiltDependencies`), so the project is unaffected by npm v12's install-script changes.
+Docker-based: multi-stage Dockerfile (uv builder → slim runtime), Caddy as reverse proxy on port 8000, Gunicorn with UvicornWorker (ASGI), Supervisor to manage Caddy + Gunicorn + django-q2. `make dev-prod` mimics production locally. CI/CD via GitHub Actions (`.github/workflows/build-docker.yml`): builds Docker image; Drone CI (`.drone.yml`) also present for deployments via Portainer webhook.
 
 ### Database
 
@@ -169,16 +155,13 @@ Tests live in `tests/`. Run with `make test` or `uv run --with pytest-django pyt
 
 Pytest settings are in `pyproject.toml` under `[tool.pytest.ini_options]` (`DJANGO_SETTINGS_MODULE = "timetracker.settings"`).
 
-**Browser/E2E tests** live in `e2e/` and run with `make test-e2e` (`pytest-playwright` driving a real Chromium against pytest-django's `live_server`). `e2e/conftest.py` sets `DJANGO_ALLOW_ASYNC_UNSAFE` and prefers a system Chrome/Chromium; otherwise install browsers once via `uv run playwright install chromium`. All JS (including Alpine/Flowbite) is vendored in `games/static/js/`, so the tests run fully offline. Note that a bare `pytest` (`make test`) collects `e2e/` too, so it needs a browser as well. Key files: `test_widgets_e2e.py` (onSwap initialization lifecycle, FilterSelect/RangeSlider/add-purchase behavior), `test_search_select_e2e.py` (single-select edge cases on a synthetic page).
-
 ## Conventions for AI assistants
 
 - **Never write to `GeneratedField`s** (`duration_calculated`, `duration_total`, `price_per_game`, `days_to_finish`). They are computed by the database.
 - **Name variables with complete words** — readable, unabbreviated identifiers in both Python and JavaScript (e.g. `template` not `tpl`, `event` not `e`, `element` not `el`, `removeButton` not `removeBtn`, `option`/`value` not single letters in loops). This applies to new code and to code you touch.
 - **Use `render_page()` not `render()`** for all full-page HTTP responses. Import from `common.layout`.
 - **Build UI with Python components** from `common.components`, not raw HTML strings or Django templates. `SafeText` children pass through unescaped; plain strings are auto-escaped.
-- **Components are nodes; use the named builders** — build with `Div()`, `Span()`, `Element("tag", ...)`, etc., which return `Node` objects. For a tag with no builder, add it to the whitelist in `primitives.py` (one line) or use `Element("tag", attrs, children)`. Use `Fragment(a, b, ...)` to group siblings (never `str(a)+str(b)`, which flattens the tree and drops media). Wrap trusted pre-rendered HTML in `Safe(html)` (the `mark_safe` analogue).
-- **JS-bearing components declare `Media`, they don't rely on the view** — give a component `class Media: js = (...)` (a `BaseComponent`) or `return node.with_media(Media(js=...))`. `Page()` collects and emits it. Never re-add `scripts=ModuleScript(...)` threading in a view for a component that can declare its own dependency.
+- **Prefer the named element primitives over raw `Component(tag_name=…)`** — use `Div()`, `Span()`, `Input()`, `Label()`, `Template()`, etc. from `common.components` instead of `Component(tag_name="div")`. Reach for `Component` directly only when no primitive fits (e.g. a bare, custom-styled `<button>` where the opinionated `Button()` would inject unwanted classes). Add a new primitive rather than repeating an inline `Component` for a standard tag.
 - **Filter views** accept `?filter=<JSON>` (structured) and fall back to `?search_string=` (free-text). New filter criteria go in `games/filters.py`; new criterion types go in `common/criteria.py`.
 - **Signals handle side-effects** — do not manually recalculate `Game.playtime` or `Purchase.num_purchases`; the signals in `games/signals.py` do this on save/delete.
 - **Button colors**: `blue` (primary action), `red` (destructive), `gray` (secondary), `green` (positive). Icon buttons use `icon=True`.

Dockerfile

@@ -15,25 +15,6 @@ COPY . .
 RUN --mount=type=cache,target=/root/.cache/uv \
     uv sync --frozen --no-dev
 
-# Codegen the TypeScript prop contracts (needs Django); tsc compiles them in
-# the assets stage below.
-RUN uv run python manage.py gen_element_types
-
-
-# Front-end assets: Tailwind CSS + the TypeScript custom elements. Built here so
-# the compiled output ships in the image (dist/ is build-only, not committed).
-FROM node:22-bookworm-slim AS assets
-
-WORKDIR /app
-COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
-# Corepack ships with Node and activates the pnpm version pinned in
-# package.json's "packageManager" field — no npm bootstrap needed.
-RUN corepack enable && pnpm install --frozen-lockfile --ignore-scripts
-COPY . .
-COPY --from=builder /home/timetracker/app/ts/generated ./ts/generated
-RUN pnpm tailwindcss -i ./common/input.css -o ./games/static/base.css \
-    && pnpm exec tsc
-
 
 FROM python:3.14-slim-bookworm
 
@@ -63,10 +44,6 @@ WORKDIR /home/timetracker/app
 
 COPY --from=builder --chown=timetracker:timetracker /home/timetracker/app /home/timetracker/app
 
-# Built front-end assets from the Node stage (Tailwind CSS + compiled TS).
-COPY --from=assets --chown=timetracker:timetracker /app/games/static/base.css /home/timetracker/app/games/static/base.css
-COPY --from=assets --chown=timetracker:timetracker /app/games/static/js/dist /home/timetracker/app/games/static/js/dist
-
 COPY --chown=timetracker:timetracker Caddyfile /etc/caddy/Caddyfile
 COPY --chown=timetracker:timetracker supervisor.conf /etc/supervisor/conf.d/supervisor.conf
 COPY --chown=timetracker:timetracker entrypoint.sh /

Makefile

@@ -25,22 +25,12 @@ init:
 server:
 	uv run python -Wa manage.py runserver
 
-gen-element-types:
-	uv run python manage.py gen_element_types
-
-ts: gen-element-types
-	pnpm exec tsc
-
-ts-check: gen-element-types
-	pnpm exec tsc --noEmit
-
 dev:
 	@pnpm concurrently \
-		--names "Django,Tailwind,TS" \
-		--prefix-colors "blue,green,magenta" \
+		--names "Django,Tailwind" \
+		--prefix-colors "blue,green" \
 		"uv run python -Wa manage.py runserver" \
-		"pnpm tailwindcss -i ./common/input.css -o ./games/static/base.css --watch" \
-		"pnpm exec tsc --watch"
+		"pnpm tailwindcss -i ./common/input.css -o ./games/static/base.css --watch"
 
 
 caddy:
@@ -95,7 +85,7 @@ format:
 format-check:
 	uv run ruff format --check
 
-check: lint format-check ts-check test
+check: lint format-check test
 
 date:
 	uv run python -c 'import datetime; from zoneinfo import ZoneInfo; print(datetime.datetime.isoformat(datetime.datetime.now(ZoneInfo("Europe/Prague")), timespec="minutes", sep=" "))'

common/components/__init__.py

@@ -5,24 +5,11 @@ re-exports the public API so ``from common.components import X`` keeps working.
 """
 
 from common.components.core import (
-    BaseComponent,
-    Element,
-    Fragment,
+    Component,
     HTMLAttribute,
     HTMLTag,
-    Media,
-    Node,
-    Safe,
     _render_element,
-    collect_media,
     randomid,
-    render,
-)
-from common.components.custom_elements import SessionTimestampButtons, register_element
-from common.components.date_range_picker import (
-    DateRangeCalendar,
-    DateRangeField,
-    DateRangePicker,
 )
 from common.components.domain import (
     GameLink,
@@ -48,6 +35,7 @@ from common.components.primitives import (
     H1,
     A,
     AddForm,
+    Button,
     ButtonGroup,
     Checkbox,
     CsrfInput,
@@ -66,18 +54,14 @@ from common.components.primitives import (
     SearchField,
     SimpleTable,
     Span,
-    StaticScript,
-    StyledButton,
     TableHeader,
     TableRow,
     TableTd,
     Td,
     Template,
-    Th,
     Tr,
     Ul,
     YearPicker,
-    custom_element_builder,
     paginated_table_content,
 )
 from common.components.search_select import (
@@ -92,24 +76,14 @@ from common.utils import truncate
 
 __all__ = [
     "truncate",
-    "BaseComponent",
-    "register_element",
-    "SessionTimestampButtons",
-    "custom_element_builder",
-    "Element",
-    "Fragment",
-    "Media",
-    "Node",
-    "Safe",
-    "collect_media",
-    "render",
+    "Component",
     "HTMLAttribute",
     "HTMLTag",
     "_render_element",
     "randomid",
     "A",
     "AddForm",
-    "StyledButton",
+    "Button",
     "ButtonGroup",
     "Checkbox",
     "CsrfInput",
@@ -133,13 +107,7 @@ __all__ = [
     "searchselect_selected",
     "SimpleTable",
     "Span",
-    "StaticScript",
     "Label",
-    "Li",
-    "Td",
-    "Th",
-    "Tr",
-    "Ul",
     "TableHeader",
     "TableRow",
     "TableTd",
@@ -155,9 +123,6 @@ __all__ = [
     "PurchasePrice",
     "SessionDeviceSelector",
     "_resolve_name_with_icon",
-    "DateRangeCalendar",
-    "DateRangeField",
-    "DateRangePicker",
     "FilterBar",
     "PurchaseFilterBar",
     "SessionFilterBar",

common/components/core.py

@@ -1,20 +1,6 @@
-"""Node layer: the lazy component tree, its renderer, and media collection.
-
-A FastHTML-style model. Everything renderable is a :class:`Node`. The single
-:class:`Element` class represents *any* HTML element (tag + attrs + children);
-named builders like ``Div`` / ``Span`` are generated from a whitelist rather
-than hand-written per tag (see ``primitives.py``). Higher-level, behaviour- or
-media-bearing components subclass :class:`BaseComponent` and implement
-``render()`` returning a node subtree.
-
-Nodes are *lazy*: they hold structure and render to HTML only when asked
-(``str(node)`` / ``node.__html__()`` / :func:`render`). This is what lets
-``Page()`` walk a finished tree and collect every component's declared JS
-(:class:`Media`) instead of each view threading ``scripts=`` by hand.
-"""
+"""Escaping core: the Component builder and its memoised renderer."""
 
 import hashlib
-from collections.abc import Sequence
 from functools import lru_cache
 
 from django.utils.html import escape
@@ -24,181 +10,24 @@ from django.utils.safestring import SafeText, mark_safe
 HTMLAttribute = tuple[str, str | int | bool]
 
 
-# Type for a builder's ``attributes`` parameter. Covariant ``Sequence`` so a
-# caller's ``list[tuple[str, str]]`` is accepted (a plain ``list[HTMLAttribute]``
-# would be invariant and reject it). Locals that get ``.append()``-ed should
-# stay a concrete ``list[HTMLAttribute]``.
-Attributes = Sequence[HTMLAttribute]
-
-
 HTMLTag = str
 
 
-# ── Media: declarative JS dependencies ──────────────────────────────────────
-
-
-def _dedup(*sequences: tuple[str, ...]) -> tuple[str, ...]:
-    """First-seen dedup that preserves declaration order across sequences."""
-    seen: dict[str, None] = {}
-    for sequence in sequences:
-        for item in sequence:
-            seen.setdefault(item, None)
-    return tuple(seen)
-
-
-class Media:
-    """A component's JS dependencies, modelled on ``django.forms.Media``.
-
-    ``js`` are static ES-module filenames (rendered as ``ModuleScript``);
-    ``js_external`` are vendored UMD / classic bundles (rendered as
-    ``StaticScript``). Addition merges with first-seen, order-preserving dedup,
-    so a page that uses a component many times emits each script once.
-    """
-
-    __slots__ = ("js", "js_external")
-
-    def __init__(
-        self,
-        js: tuple[str, ...] | list[str] = (),
-        js_external: tuple[str, ...] | list[str] = (),
-    ) -> None:
-        self.js = tuple(js)
-        self.js_external = tuple(js_external)
-
-    def __add__(self, other: "Media | None") -> "Media":
-        if not other:
-            return self
-        return Media(
-            _dedup(self.js, other.js),
-            _dedup(self.js_external, other.js_external),
-        )
-
-    def __radd__(self, other: "Media | None") -> "Media":
-        # Supports ``sum(medias, Media())`` and ``0 + media``.
-        if not other or other == 0:
-            return self
-        return other.__add__(self)
-
-    def __bool__(self) -> bool:
-        return bool(self.js or self.js_external)
-
-    def __eq__(self, other: object) -> bool:
-        return (
-            isinstance(other, Media)
-            and self.js == other.js
-            and self.js_external == other.js_external
-        )
-
-    def __hash__(self) -> int:
-        return hash((self.js, self.js_external))
-
-    def __repr__(self) -> str:
-        return f"Media(js={self.js!r}, js_external={self.js_external!r})"
-
-
-# ── Node tree ────────────────────────────────────────────────────────────────
-
-
-class Node:
-    """Base class for everything renderable to HTML."""
-
-    # Declared dependencies. Class-level default is shared and empty; concrete
-    # components override with their own ``Media(...)``.
-    media: Media = Media()
-
-    def _render(self) -> str:
-        raise NotImplementedError
-
-    def collect_media(self) -> Media:
-        """Total media of this node and its subtree."""
-        return self.media
-
-    def with_media(self, media: Media) -> "Node":
-        """Attach JS dependencies to this node and return it (for fluent use).
-
-        Lets a function-built node declare its media without becoming a full
-        ``BaseComponent`` subclass: ``return Div(...).with_media(Media(js=...))``.
-        """
-        self.media = self.media + media
-        return self
-
-    # A node's rendered output is always safe HTML by construction (Element
-    # escapes unsafe children; Safe wraps trusted markup; Fragment escapes plain
-    # strings). So both `__html__` (Django's conditional_escape hook) and
-    # `__str__` return a SafeString — this is what keeps ``str(node)`` safe when
-    # fed back into a child list or template, matching the old SafeText shims.
-    def __html__(self) -> SafeText:
-        return mark_safe(self._render())
-
-    def __str__(self) -> SafeText:
-        return mark_safe(self._render())
-
-
-# A renderable child is a node or a string. Strings are ALWAYS escaped (a string
-# is untrusted text — ``SafeText``/``mark_safe`` is escaped too); trusted
-# pre-rendered HTML must be a ``Safe`` node. ``Children`` is the type for a
-# builder's ``children``
-# parameter: a sequence of child nodes/strings, a bare string, or nothing. The
-# sequence is a covariant ``Sequence`` so ``list[Element]`` / ``list[Node]`` are
-# accepted (a plain ``list[str]`` would be invariant and reject them). A single
-# bare ``Node`` is accepted only by ``Element`` itself (which wraps it); the
-# higher-level builders take ``Children``.
-Child = Node | str
-Children = Sequence[Child] | Node | str | None
-
-
-def as_children(children: Children) -> list[Child]:
-    """Normalise a builder's ``children`` argument to a flat list.
-
-    Accepts ``None`` (→ empty), a single node/string (→ one-element list), or a
-    sequence of them. Lets builders drop the ``children if isinstance(children,
-    list) else [children]`` dance and get a properly typed ``list[Child]``.
-    """
-    if children is None:
-        return []
-    if isinstance(children, (str, Node)):
-        return [children]
-    return list(children)
-
-
-def as_attributes(attributes: "Attributes | None") -> list[HTMLAttribute]:
-    """Normalise an ``attributes`` argument to a mutable ``list[HTMLAttribute]``.
-
-    Builders take a covariant ``Attributes`` (so callers can pass a
-    ``list[tuple[str, str]]``) but often append to or concatenate the value;
-    this turns it into a concrete list they can mutate.
-    """
-    return list(attributes) if attributes else []
-
-
-def _child_key(child: object) -> tuple[str, bool]:
-    """Normalise a child to a ``(text, is_safe)`` pair.
-
-    Only :class:`Node` children render unescaped — that includes :class:`Safe`,
-    the one sanctioned way to put trusted pre-rendered HTML into the tree. Every
-    *string* child is escaped, ``SafeText``/``mark_safe`` included: a string is
-    always treated as untrusted text, so trusted markup must be wrapped in
-    ``Safe(...)`` rather than smuggled in as a safe string. ``is_safe`` is part
-    of the render cache key so a safe ``"<b>"`` and an unsafe ``"<b>"`` never
-    collide.
-    """
-    if isinstance(child, Node):
-        return (child._render(), True)
-    if isinstance(child, str):
-        return (child, False)
-    return (str(child), False)
-
-
 @lru_cache(maxsize=4096)
 def _render_element(
     tag_name: str,
     attrs_key: tuple[tuple[str, str], ...],
     children_key: tuple[tuple[str, bool], ...],
 ) -> str:
-    """Pure, memoized HTML builder. Identical (tag, attrs, children) render once.
+    """Pure, memoized HTML builder behind `Component`.
 
-    ``attrs_key`` is (name, stringified value) pairs (values always escaped);
-    ``children_key`` is (text, is_safe) pairs (safe passes through, else escaped).
+    Inputs are fully hashable and fully determine the output, so identical
+    elements are rendered once. `attrs_key` is (name, stringified value) pairs
+    (attribute values are always escaped). `children_key` is (child, is_safe)
+    pairs: SafeText children pass through, plain strings are escaped. The
+    `is_safe` flag is part of the key on purpose — otherwise a safe ``"<b>"``
+    and an unsafe ``"<b>"`` (equal as strings) would collide and one would
+    render with the wrong escaping.
     """
     children_blob = "\n".join(
         child if is_safe else escape(child) for child, is_safe in children_key
@@ -212,132 +41,24 @@ def _render_element(
     return f"<{tag_name}{attributes_blob}>{children_blob}</{tag_name}>"
 
 
-class Element(Node):
-    """Any HTML element: a tag name, attributes and children.
-
-    Children may be other nodes, ``SafeText``, or plain strings (escaped).
-    Rendering goes through the memoized :func:`_render_element`.
-    """
-
-    def __init__(
-        self,
-        tag_name: str,
-        attributes: Attributes | None = None,
-        children: "Children | Node" = None,
-    ) -> None:
+def Component(
+    attributes: list[HTMLAttribute] | None = None,
+    children: list[HTMLTag] | HTMLTag | None = None,
+    tag_name: str = "",
+) -> SafeText:
+    """Render an HTML element. Attribute values are always escaped; children are
+    escaped unless they are `SafeText` (so nested components pass through),
+    preventing accidental HTML injection. Rendering is memoized via
+    `_render_element`."""
+    attributes = attributes or []
+    children = children or []
     if not tag_name:
         raise ValueError("tag_name is required.")
-        self.tag_name = tag_name
-        self.attributes = attributes or []
-        if children is None:
-            children = []
-        elif isinstance(children, (str, Node)):
+    if isinstance(children, str):
         children = [children]
-        self.children = children
-
-    def __getitem__(self, children: "Children | Node") -> "Element":
-        """htpy-style children: ``Div(class_="x")[child1, child2]``.
-
-        Returns an Element with the same tag/attributes/media and these
-        children, so the tree stays walkable (Media still bubbles)."""
-        items = children if isinstance(children, tuple) else (children,)
-        clone = Element(self.tag_name, self.attributes, list(items))
-        clone.media = self.media
-        return clone
-
-    def collect_media(self) -> Media:
-        media = self.media
-        for child in self.children:
-            if isinstance(child, Node):
-                media = media + child.collect_media()
-        return media
-
-    def _render(self) -> str:
-        attrs_key = tuple((name, str(value)) for name, value in self.attributes)
-        children_key = tuple(_child_key(child) for child in self.children)
-        return _render_element(self.tag_name, attrs_key, children_key)
-
-
-class Safe(Node):
-    """A node wrapping pre-rendered, trusted HTML (the ``mark_safe`` analogue).
-
-    Used as the migration bridge for components still built from f-strings:
-    they return ``Safe(html)`` and declare their ``media`` explicitly rather
-    than atomising their markup into a node tree up front.
-    """
-
-    def __init__(self, html: object, media: Media | None = None) -> None:
-        self._html = str(html)
-        if media is not None:
-            self.media = media
-
-    def _render(self) -> str:
-        return self._html
-
-
-class Fragment(Node):
-    """An ordered group of children with no wrapping tag.
-
-    Replaces ``mark_safe(str(a) + str(b))`` / ``"\\n".join(...)`` composition,
-    so media still bubbles up from the grouped children.
-    """
-
-    def __init__(self, *children: object, separator: str = "") -> None:
-        self.children = [c for c in children if c is not None and c != ""]
-        self.separator = separator
-
-    def collect_media(self) -> Media:
-        media = Media()
-        for child in self.children:
-            if isinstance(child, Node):
-                media = media + child.collect_media()
-        return media
-
-    def _render(self) -> str:
-        parts = []
-        for child in self.children:
-            text, is_safe = _child_key(child)
-            parts.append(text if is_safe else escape(text))
-        return self.separator.join(parts)
-
-
-class BaseComponent(Node):
-    """Base for higher-level components: implement ``render()`` returning a node
-    subtree and declare ``media`` (a :class:`Media`).
-
-    ``render()`` is called once and memoized; ``collect_media()`` returns this
-    component's own media merged with the rendered subtree's.
-    """
-
-    def render(self) -> Node:
-        raise NotImplementedError
-
-    def _tree(self) -> Node:
-        cached = getattr(self, "_tree_cache", None)
-        if cached is None:
-            cached = self.render()
-            self._tree_cache = cached
-        return cached
-
-    def _render(self) -> str:
-        return self._tree()._render()
-
-    def collect_media(self) -> Media:
-        return self.media + self._tree().collect_media()
-
-
-def render(node: "Node | str") -> SafeText:
-    """Render a node (or pass a string through) to safe HTML."""
-    if isinstance(node, Node):
-        return mark_safe(node._render())
-    return mark_safe(str(node))
-
-
-def collect_media(node: "Node | str") -> Media:
-    """Collect the media of a node tree (empty for a bare string)."""
-    if isinstance(node, Node):
-        return node.collect_media()
-    return Media()
+    attrs_key = tuple((name, str(value)) for name, value in attributes)
+    children_key = tuple((child, isinstance(child, SafeText)) for child in children)
+    return mark_safe(_render_element(tag_name, attrs_key, children_key))
 
 
 def randomid(seed: str = "", content: str = "", length: int = 10) -> str:

common/components/custom_elements.py

@@ -1,127 +0,0 @@
-"""Custom-element builder, registry, and TypeScript codegen.
-
-A custom element is a light-DOM Web Component: the Python builder emits a
-semantic tag whose typed props become kebab-case attributes and whose behavior
-lives in a compiled TS module (loaded via Media). One ``TypedDict`` per element
-is the single source of truth for the server<->client contract;
-``gen_element_types`` turns each registered spec into a TS interface + attribute
-reader so drift fails ``tsc``.
-"""
-
-from dataclasses import dataclass
-from typing import TypedDict, get_type_hints
-
-from common.components.core import Media
-from common.components.primitives import custom_element_builder
-
-
-@dataclass(frozen=True)
-class ElementSpec:
-    tag: str  # e.g. "game-status-selector"
-    ts_name: str  # e.g. "GameStatusSelector"
-    props: type  # a TypedDict subclass
-
-
-ELEMENT_REGISTRY: list[ElementSpec] = []
-
-
-def register_element(tag: str, ts_name: str, props: type) -> None:
-    """Register an element so codegen can emit its TS contract."""
-    ELEMENT_REGISTRY.append(ElementSpec(tag, ts_name, props))
-
-
-def _kebab(name: str) -> str:
-    return name.replace("_", "-")
-
-
-# ── Codegen ──────────────────────────────────────────────────────────────────
-
-_TYPE_MAP = {int: "number", float: "number", str: "string", bool: "boolean"}
-
-
-def _camel(name: str) -> str:
-    head, *tail = name.split("_")
-    return head + "".join(part.title() for part in tail)
-
-
-def _reader_expr(name: str, python_type: type) -> str:
-    attr = _kebab(name)
-    if python_type in (int, float):
-        return f'Number(el.getAttribute("{attr}"))'
-    if python_type is bool:
-        return f'el.getAttribute("{attr}") === "true"'
-    return f'el.getAttribute("{attr}") ?? ""'
-
-
-def _ts_for_spec(spec: ElementSpec) -> str:
-    hints = get_type_hints(spec.props)
-    interface_lines = "\n".join(
-        f"  {_camel(name)}: {_TYPE_MAP[python_type]};"
-        for name, python_type in hints.items()
-    )
-    reader_lines = "\n".join(
-        f"    {_camel(name)}: {_reader_expr(name, python_type)},"
-        for name, python_type in hints.items()
-    )
-    return (
-        f"export interface {spec.ts_name}Props {{\n{interface_lines}\n}}\n\n"
-        f"export function read{spec.ts_name}Props(el: HTMLElement): "
-        f"{spec.ts_name}Props {{\n  return {{\n{reader_lines}\n  }};\n}}"
-    )
-
-
-def render_props_module() -> str:
-    """The full ``ts/generated/props.ts`` content for every registered element."""
-    header = "// GENERATED by `manage.py gen_element_types` — do not edit.\n"
-    blocks = [_ts_for_spec(spec) for spec in ELEMENT_REGISTRY]
-    return header + "\n" + "\n\n".join(blocks) + "\n"
-
-
-# ── Element prop schemas (registered at import time) ─────────────────────────
-
-
-class GameStatusSelectorProps(TypedDict):
-    game_id: int
-    status: str
-    csrf: str
-
-
-register_element("game-status-selector", "GameStatusSelector", GameStatusSelectorProps)
-
-
-class SessionDeviceSelectorProps(TypedDict):
-    session_id: int
-    csrf: str
-
-
-register_element(
-    "session-device-selector", "SessionDeviceSelector", SessionDeviceSelectorProps
-)
-
-
-class PlayEventRowProps(TypedDict):
-    game_id: int
-    csrf: str
-    api_create_url: str
-
-
-register_element("play-event-row", "PlayEventRow", PlayEventRowProps)
-
-
-class SessionTimestampButtonsProps(TypedDict):
-    pass
-
-
-register_element(
-    "session-timestamp-buttons", "SessionTimestampButtons", SessionTimestampButtonsProps
-)
-
-
-# ── Named tag builders (consistent htpy-style with Div/Span) ─────────────────
-# Underscore-prefixed: used internally by domain wrappers.
-# Public ones (no domain wrapper): exported directly.
-
-_GameStatusSelector = custom_element_builder("game-status-selector")
-_SessionDeviceSelector = custom_element_builder("session-device-selector")
-_PlayEventRow = custom_element_builder("play-event-row")
-SessionTimestampButtons = custom_element_builder("session-timestamp-buttons")

common/components/date_range_picker.py

@@ -1,354 +0,0 @@
-"""DateRangePicker: a segmented date-range input with a calendar popup.
-
-``DateRangePicker`` composes two parts:
-
-- ``DateRangeField`` — the visible widget, styled as a single input. Each
-  date is split into per-part segments (``DD``/``MM``/``YYYY``, ordered by
-  ``common.time.dateformat_hyphenated``) that the user fills digit by digit,
-  plus a calendar icon that opens the popup.
-- ``DateRangeCalendar`` — the popup: a preset column (today, yesterday,
-  last 7 days, …), a month grid rendered client-side, and a
-  Cancel / Clear / Select footer.
-
-The committed value lives in two hidden ISO-date inputs named
-``{input_name_prefix}-min`` / ``{input_name_prefix}-max`` — the same contract
-as the older ``DateRangeFilter``, so ``filter_bar.js`` serializes either
-widget into a ``DateCriterion`` unchanged. All behaviour is wired by
-``games/static/js/date_range_picker.js``.
-"""
-
-from common.components.core import Element, HTMLAttribute, Media, Node, Safe
-from common.components.primitives import Div, Input, Span
-from common.time import DatePartSpec, date_parts
-
-# Wired by date_range_picker.js.
-_DATE_RANGE_MEDIA = Media(js=("date_range_picker.js",))
-
-_FIELD_CONTAINER_CLASS = (
-    "flex items-center gap-0.5 w-full rounded-base border border-default-medium "
-    "bg-neutral-secondary-medium text-sm text-heading p-1.5 cursor-text "
-    "focus-within:ring-1 focus-within:ring-brand focus-within:border-brand"
-)
-
-# The segments must not stand out from the container: transparent background,
-# no border, and only a subtle highlight when active (focused).
-_SEGMENT_INPUT_CLASS = (
-    "bg-transparent border-0 p-0 text-center text-sm text-heading "
-    "placeholder:text-body rounded-xs focus:outline-none focus:ring-0 "
-    "focus:bg-brand/30 caret-transparent"
-)
-
-_SEGMENT_WIDTH_CLASSES = {2: "w-[2.5ch]", 4: "w-[4.5ch]"}
-
-_CALENDAR_ICON_SVG = (
-    '<svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke-width="1.5" '
-    'stroke="currentColor" aria-hidden="true">'
-    '<path stroke-linecap="round" stroke-linejoin="round" '
-    'd="M6.75 3v2.25M17.25 3v2.25M3 18.75V7.5a2.25 2.25 0 0 1 2.25-2.25h13.5'
-    "A2.25 2.25 0 0 1 21 7.5v11.25m-18 0A2.25 2.25 0 0 0 5.25 21h13.5"
-    "A2.25 2.25 0 0 0 21 18.75m-18 0v-7.5A2.25 2.25 0 0 1 5.25 9h13.5"
-    'A2.25 2.25 0 0 1 21 11.25v7.5"/>'
-    "</svg>"
-)
-
-_PRESET_OPTIONS: list[tuple[str, str]] = [
-    ("today", "Today"),
-    ("yesterday", "Yesterday"),
-    ("last_7_days", "Last 7 days"),
-    ("last_30_days", "Last 30 days"),
-    ("this_month", "This month"),
-    ("last_month", "Last month"),
-    ("this_year", "This year"),
-]
-
-_PRESET_BUTTON_CLASS = (
-    "px-3 py-1.5 text-sm text-start text-body hover:text-heading "
-    "hover:bg-neutral-tertiary-medium rounded-base cursor-pointer whitespace-nowrap"
-)
-
-_NAV_BUTTON_CLASS = (
-    "p-1.5 text-body hover:text-heading hover:bg-neutral-tertiary-medium "
-    "rounded-base cursor-pointer"
-)
-
-_FOOTER_BUTTON_CLASS = (
-    "px-3 py-1.5 text-sm font-medium rounded-base cursor-pointer "
-    "text-heading bg-neutral-secondary-medium border border-default-medium "
-    "hover:bg-neutral-tertiary-medium"
-)
-
-_FOOTER_SELECT_BUTTON_CLASS = (
-    "px-3 py-1.5 text-sm font-medium rounded-base cursor-pointer "
-    "text-white bg-brand border border-transparent hover:bg-brand-strong"
-)
-
-
-def _iso_part_values(iso_value: str, parts: list[DatePartSpec]) -> dict[str, str]:
-    """Split an ISO ``YYYY-MM-DD`` string into per-part initial values.
-
-    Returns an empty mapping for empty/malformed input so a bad stored filter
-    renders as empty segments instead of crashing."""
-    if not iso_value:
-        return {}
-    pieces = iso_value.split("-")
-    if len(pieces) != 3:
-        return {}
-    year, month, day = pieces
-    values = {"year": year, "month": month, "day": day}
-    if any(not values[part.name].isdigit() for part in parts):
-        return {}
-    return values
-
-
-def _segment_input(*, part: DatePartSpec, side: str, label: str, value: str) -> Node:
-    side_label = "from" if side == "min" else "to"
-    return Input(
-        attributes=[
-            ("inputmode", "numeric"),
-            ("autocomplete", "off"),
-            ("maxlength", str(part.length)),
-            ("placeholder", part.placeholder),
-            ("value", value),
-            ("data-date-part", part.name),
-            ("data-date-side", side),
-            ("aria-label", f"{label} {side_label} {part.name}"),
-            (
-                "class",
-                f"{_SEGMENT_INPUT_CLASS} "
-                f"{_SEGMENT_WIDTH_CLASSES.get(part.length, 'w-[4.5ch]')}",
-            ),
-        ],
-    )
-
-
-def _segment_group(*, side: str, label: str, iso_value: str) -> Node:
-    """One date's worth of segments (``DD - MM - YYYY``) for a range side."""
-    parts = date_parts()
-    initial_values = _iso_part_values(iso_value, parts)
-    children: list[Node] = []
-    for index, part in enumerate(parts):
-        if index > 0:
-            children.append(
-                Span(
-                    attributes=[("class", "text-body select-none")],
-                    children=["-"],
-                )
-            )
-        children.append(
-            _segment_input(
-                part=part,
-                side=side,
-                label=label,
-                value=initial_values.get(part.name, ""),
-            )
-        )
-    return Span(
-        attributes=[
-            ("class", "flex items-center gap-0.5"),
-            ("data-date-range-side", side),
-        ],
-        children=children,
-    )
-
-
-def DateRangeField(
-    *,
-    label: str,
-    input_name_prefix: str,
-    min_value: str = "",
-    max_value: str = "",
-) -> Node:
-    """The visible half of the DateRangePicker: a single-input-looking
-    container holding two segmented dates, a calendar toggle, and the two
-    hidden ISO inputs (``{prefix}-min`` / ``{prefix}-max``) that carry the
-    committed value to ``filter_bar.js``."""
-    min_input_id = f"{input_name_prefix}-min"
-    max_input_id = f"{input_name_prefix}-max"
-    return Div(
-        attributes=[
-            ("class", _FIELD_CONTAINER_CLASS),
-            ("data-date-range-field", ""),
-        ],
-        children=[
-            Input(
-                type="hidden",
-                attributes=[
-                    ("name", min_input_id),
-                    ("id", min_input_id),
-                    ("value", min_value),
-                    ("data-date-range-hidden", "min"),
-                ],
-            ),
-            Input(
-                type="hidden",
-                attributes=[
-                    ("name", max_input_id),
-                    ("id", max_input_id),
-                    ("value", max_value),
-                    ("data-date-range-hidden", "max"),
-                ],
-            ),
-            _segment_group(side="min", label=label, iso_value=min_value),
-            Span(
-                attributes=[("class", "text-body select-none px-0.5")],
-                children=["–"],
-            ),
-            _segment_group(side="max", label=label, iso_value=max_value),
-            Element(
-                "button",
-                attributes=[
-                    ("type", "button"),
-                    ("data-date-range-calendar-toggle", ""),
-                    ("aria-label", f"Open {label} calendar"),
-                    (
-                        "class",
-                        "ms-auto p-1 text-body hover:text-heading rounded "
-                        "cursor-pointer shrink-0",
-                    ),
-                ],
-                children=[Safe(_CALENDAR_ICON_SVG)],
-            ),
-        ],
-    )
-
-
-def _calendar_nav_button(direction: str, arrow: str, label: str) -> Node:
-    return Element(
-        "button",
-        attributes=[
-            ("type", "button"),
-            (f"data-date-range-{direction}", ""),
-            ("aria-label", label),
-            ("class", _NAV_BUTTON_CLASS),
-        ],
-        children=[arrow],
-    )
-
-
-def _footer_button(action: str, label: str, button_class: str) -> Node:
-    return Element(
-        "button",
-        attributes=[
-            ("type", "button"),
-            (f"data-date-range-{action}", ""),
-            ("class", button_class),
-        ],
-        children=[label],
-    )
-
-
-def DateRangeCalendar(*, input_name_prefix: str) -> Node:
-    """The popup half of the DateRangePicker: preset column, month grid
-    (filled client-side into ``[data-date-range-grid]``), and the
-    Cancel / Clear / Select footer. Hidden until the calendar toggle opens it."""
-    preset_buttons = [
-        Element(
-            "button",
-            attributes=[
-                ("type", "button"),
-                ("data-date-range-preset", preset_value),
-                ("class", _PRESET_BUTTON_CLASS),
-            ],
-            children=[preset_label],
-        )
-        for preset_value, preset_label in _PRESET_OPTIONS
-    ]
-    return Div(
-        attributes=[
-            (
-                "class",
-                "hidden absolute z-20 top-full start-0 mt-1 flex "
-                "rounded-base border border-default-medium "
-                "bg-neutral-secondary-medium shadow-lg",
-            ),
-            ("data-date-range-calendar", ""),
-            ("data-input-name-prefix", input_name_prefix),
-        ],
-        children=[
-            Div(
-                attributes=[
-                    (
-                        "class",
-                        "flex flex-col gap-0.5 p-2 border-e border-default-medium",
-                    ),
-                    ("data-date-range-presets", ""),
-                ],
-                children=preset_buttons,
-            ),
-            Div(
-                attributes=[("class", "p-2")],
-                children=[
-                    Div(
-                        attributes=[
-                            ("class", "flex items-center justify-between gap-2"),
-                        ],
-                        children=[
-                            _calendar_nav_button("prev", "‹", "Previous month"),
-                            Span(
-                                attributes=[
-                                    ("class", "text-sm font-medium text-heading"),
-                                    ("data-date-range-month-label", ""),
-                                ],
-                            ),
-                            _calendar_nav_button("next", "›", "Next month"),
-                        ],
-                    ),
-                    Div(
-                        attributes=[
-                            ("class", "grid grid-cols-7 gap-y-0.5 mt-1"),
-                            ("data-date-range-grid", ""),
-                        ],
-                    ),
-                    Div(
-                        attributes=[
-                            (
-                                "class",
-                                "flex justify-end gap-2 mt-2 pt-2 border-t "
-                                "border-default-medium",
-                            ),
-                        ],
-                        children=[
-                            _footer_button("cancel", "Cancel", _FOOTER_BUTTON_CLASS),
-                            _footer_button("clear", "Clear", _FOOTER_BUTTON_CLASS),
-                            _footer_button(
-                                "select", "Select", _FOOTER_SELECT_BUTTON_CLASS
-                            ),
-                        ],
-                    ),
-                ],
-            ),
-        ],
-    )
-
-
-def DateRangePicker(
-    *,
-    label: str,
-    input_name_prefix: str,
-    min_value: str = "",
-    max_value: str = "",
-) -> Node:
-    """A date-range widget: segmented manual entry plus a calendar popup.
-
-    Drop-in replacement for ``DateRangeFilter`` — exposes the same hidden
-    ``{prefix}-min`` / ``{prefix}-max`` ISO inputs, so the filter-bar
-    serializer needs no changes. ``min_value`` / ``max_value`` are ISO
-    ``YYYY-MM-DD`` strings used to prefill both the segments and the hidden
-    inputs."""
-    attributes: list[HTMLAttribute] = [
-        ("class", "date-range-picker relative"),
-        ("data-date-range-picker", ""),
-        ("data-input-name-prefix", input_name_prefix),
-    ]
-    return Div(
-        attributes=attributes,
-        children=[
-            DateRangeField(
-                label=label,
-                input_name_prefix=input_name_prefix,
-                min_value=min_value,
-                max_value=max_value,
-            ),
-            DateRangeCalendar(input_name_prefix=input_name_prefix),
-        ],
-    ).with_media(_DATE_RANGE_MEDIA)

common/components/domain.py

@@ -4,8 +4,9 @@ from typing import Any
 
 from django.template.defaultfilters import floatformat
 from django.urls import reverse
+from django.utils.safestring import SafeText, mark_safe
 
-from common.components.core import Children, Node, Safe, as_children
+from common.components.core import HTMLTag
 from common.components.primitives import (
     A,
     Div,
@@ -20,12 +21,13 @@ from games.models import Game, Purchase, Session
 def GameLink(
     game_id: int,
     name: str = "",
-    children: Children = None,
-) -> Node:
+    children: list[HTMLTag] | HTMLTag | None = None,
+) -> SafeText:
     """Link to a game's detail page. Uses children (slot) if provided, otherwise name."""
     from django.urls import reverse
 
-    display = as_children(children) or [name]
+    children = children or []
+    display = children if children else [name]
     link = reverse("games:view_game", args=[game_id])
 
     return Span(
@@ -36,7 +38,7 @@ def GameLink(
                 attributes=[
                     ("class", "underline decoration-slate-500 sm:decoration-2"),
                 ],
-                children=display,
+                children=display if isinstance(display, list) else [display],
             ),
         ],
     )
@@ -52,11 +54,11 @@ _STATUS_COLORS = {
 
 
 def GameStatus(
-    children: Children = None,
+    children: list[HTMLTag] | HTMLTag | None = None,
     status: str = "u",
     display: str = "",
     class_: str = "",
-) -> Node:
+) -> SafeText:
     """Colored status dot with label. Status codes: u/p/f/a/r."""
     children = children or []
     outer_class = (
@@ -74,13 +76,13 @@ def GameStatus(
 
     return Span(
         attributes=[("class", outer_class)],
-        children=[dot] + as_children(children),
+        children=[dot] + (children if isinstance(children, list) else [children]),
     )
 
 
 def PriceConverted(
-    children: Children = None,
-) -> Node:
+    children: list[HTMLTag] | HTMLTag | None = None,
+) -> SafeText:
     """Wrap content in a span that indicates the price was converted."""
     children = children or []
     return Span(
@@ -88,11 +90,11 @@ def PriceConverted(
             ("title", "Price is a result of conversion and rounding."),
             ("class", "decoration-dotted underline"),
         ],
-        children=as_children(children),
+        children=children if isinstance(children, list) else [children],
     )
 
 
-def LinkedPurchase(purchase: Purchase) -> Node:
+def LinkedPurchase(purchase: Purchase) -> SafeText:
     link = reverse("games:view_purchase", args=[int(purchase.id)])
     link_content = ""
     popover_content = ""
@@ -129,7 +131,7 @@ def LinkedPurchase(purchase: Purchase) -> Node:
             ),
             PopoverTruncated(
                 input_string=link_content,
-                popover_content=Safe(popover_content),
+                popover_content=mark_safe(popover_content),
                 popover_if_not_truncated=popover_if_not_truncated,
             ),
         ],
@@ -143,7 +145,7 @@ def NameWithIcon(
     session: Session | None = None,
     linkify: bool = True,
     emulated: bool = False,
-) -> Node:
+) -> SafeText:
     _name, platform, final_emulated, create_link, link = _resolve_name_with_icon(
         name, game, session, linkify
     )
@@ -201,7 +203,7 @@ def _resolve_name_with_icon(
     return _name, platform, final_emulated, create_link, link
 
 
-def PurchasePrice(purchase) -> Node:
+def PurchasePrice(purchase) -> SafeText:
     return Popover(
         popover_content=f"{floatformat(purchase.price)} {purchase.price_currency}",
         wrapped_content=f"{floatformat(purchase.converted_price)} {purchase.converted_currency}",
@@ -209,100 +211,131 @@ def PurchasePrice(purchase) -> Node:
     )
 
 
-_SELECTOR_MENU_CLASS = (
-    "absolute top-[105%] left-0 w-full whitespace-nowrap z-10 text-sm "
-    "font-medium bg-gray-800/20 backdrop-blur-lg rounded-md rounded-t-none "
-    "border border-gray-200 dark:border-gray-700"
-)
-_SELECTOR_TOGGLE_CLASS = (
-    "relative px-4 py-2 text-sm font-medium bg-white border border-gray-200 "
-    "rounded-lg hover:bg-gray-100 dark:bg-gray-800 dark:border-gray-700 "
-    "dark:hover:text-white dark:hover:bg-gray-700 hover:cursor-pointer"
-)
-_SELECTOR_OPTION_CLASS = (
-    "block w-full text-left px-4 py-2 rounded-sm cursor-pointer "
-    "hover:bg-gray-700 hover:text-white dark:hover:bg-gray-700 "
-    "dark:hover:text-white border-0"
-)
-
-
-def GameStatusSelector(game, game_statuses, csrf_token: str) -> Node:
-    """Light-DOM custom element; behavior in ts/elements/game-status-selector.ts."""
-    from common.components.core import Element
-    from common.components.custom_elements import _GameStatusSelector, GameStatusSelectorProps
-    from common.components.primitives import Li, Ul
-
-    options = [
-        Li()[
-            Element(
-                "button",
-                [
-                    ("type", "button"),
-                    ("data-option", ""),
-                    ("data-value", str(value)),
-                    ("class", _SELECTOR_OPTION_CLASS),
-                ],
-                GameStatus(status=value, children=[label], display="flex"),
-            )
-        ]
+def GameStatusSelector(game, game_statuses, csrf_token: str) -> SafeText:
+    """Alpine.js dropdown to change a game's status."""
+    options_html = "\n".join(
+        f"<template x-if=\"status == '{value}'\">"
+        f"{GameStatus(status=value, children=[label], display='flex')}"
+        f"</template>"
         for value, label in game_statuses
-    ]
-    current_label = Span(data_label="")[
-        GameStatus(
-            status=game.status,
-            children=[game.get_status_display()],
-            display="flex",
     )
-    ]
-    toggle = Element(
-        "button",
-        [("type", "button"), ("data-toggle", ""), ("class", _SELECTOR_TOGGLE_CLASS)],
-        Span(class_="flex flex-row gap-4 justify-between items-center")[
-            current_label, Icon("arrowdown")
-        ],
+    list_items = "\n".join(
+        f"<li><a href=\"#\" @click.prevent.stop=\"setStatus('{value}', '{label}'); open = false;\" "
+        f'class="block px-4 py-2 dark:hover:text-white dark:hover:bg-gray-700 '
+        f'dark:focus:ring-blue-500 dark:focus:text-white rounded-sm no-underline! border-0!" '
+        f":class=\"{{'font-bold': status === '{value}'}}\">"
+        f"{GameStatus(status=value, children=[label], display='flex', class_='text-slate-300')}"
+        f"</a></li>"
+        for value, label in game_statuses
     )
-    menu = Div(data_menu="", hidden=True, class_=_SELECTOR_MENU_CLASS)[Ul()[*options]]
-    dropdown = Div(
-        data_dropdown="", class_="inline-flex rounded-md shadow-2xs relative"
-    )[toggle, menu]
-    return _GameStatusSelector(game_id=game.id, status=game.status, csrf=csrf_token)[
-        Div(class_="flex gap-2 items-center")[dropdown]
-    ]
+
+    return mark_safe(f"""
+<div class="flex gap-2 items-center"
+     x-data="{{
+         status: '{game.status}',
+         status_display: '{game.get_status_display()}',
+         open: false,
+         saving: false,
+         setStatus(newStatus, newStatusDisplay) {{
+             this.status = newStatus;
+             this.status_display = newStatusDisplay;
+             this.saving = true;
+             fetchWithHtmxTriggers(`/api/games/{game.id}/status`, {{
+                 method: 'PATCH',
+                 headers: {{
+                     'Content-Type': 'application/json',
+                     'X-CSRFToken': '{csrf_token}'
+                 }},
+                 body: JSON.stringify({{ status: newStatus }})
+             }})
+             .then(() => {{
+                 document.body.dispatchEvent(new CustomEvent('status-changed'));
+             }})
+             .catch(() => {{
+                 console.error('Failed to update status');
+             }})
+             .finally(() => this.saving = false);
+         }}
+     }}">
+    {_dropdown_button_html(options_html, list_items)}
+</div>
+""")
 
 
-def SessionDeviceSelector(session, session_devices, csrf_token: str) -> Node:
-    """Light-DOM custom element; behavior in ts/elements/session-device-selector.ts."""
-    from common.components.core import Element
-    from common.components.custom_elements import _SessionDeviceSelector, SessionDeviceSelectorProps
-    from common.components.primitives import Li, Ul
+def SessionDeviceSelector(session, session_devices, csrf_token: str) -> SafeText:
+    """Alpine.js dropdown to change a session's device."""
+    device_id = session.device_id or "null"
+    device_name = (session.device.name if session.device else "Unknown").replace(
+        "'", "\\'"
+    )
 
-    current_name = session.device.name if session.device else "Unknown"
-    options = [
-        Li()[
-            Element(
-                "button",
-                [
-                    ("type", "button"),
-                    ("data-option", ""),
-                    ("data-value", str(device.id)),
-                    ("class", _SELECTOR_OPTION_CLASS),
-                ],
-                children=[device.name],
+    list_items = "\n".join(
+        f'<li><a href="#" @click.prevent.stop="setDevice({d.id}, \'{d.name.replace(chr(39), chr(92) + chr(39))}\'); open = false;" '
+        f'class="block px-4 py-2 dark:hover:text-white dark:hover:bg-gray-700 '
+        f'dark:focus:ring-blue-500 dark:focus:text-white rounded-sm no-underline! border-0!" '
+        f":class=\"{{'font-bold': deviceId === {d.id}}}\">{d.name}</a></li>"
+        for d in session_devices
     )
-        ]
-        for device in session_devices
-    ]
-    toggle = Element(
-        "button",
-        [("type", "button"), ("data-toggle", ""), ("class", _SELECTOR_TOGGLE_CLASS)],
-        Span(class_="flex flex-row gap-4 justify-between items-center")[
-            Span(data_label="")[current_name], Icon("arrowdown")
-        ],
+
+    return mark_safe(f"""
+<div class="flex gap-2 items-center"
+     x-data="{{
+         originalDeviceId: {device_id},
+         originalDeviceName: '{device_name}',
+         deviceId: {device_id},
+         deviceName: '{device_name}',
+         open: false,
+         saving: false,
+         setDevice(newDeviceId, newDeviceName) {{
+               this.deviceId = newDeviceId;
+               this.deviceName = newDeviceName;
+               this.saving = true;
+                fetchWithHtmxTriggers(`/api/session/{session.id}/device`, {{
+                    method: 'PATCH',
+                    headers: {{
+                        'Content-Type': 'application/json',
+                        'X-CSRFToken': '{csrf_token}'
+                    }},
+                    body: JSON.stringify({{ device_id: newDeviceId }})
+                }})
+               .then((res) => {{
+                   document.body.dispatchEvent(new CustomEvent('device-changed'));
+               }})
+               .catch(() => {{
+                   this.deviceName = this.originalDeviceName;
+                   this.deviceId = this.originalDeviceId;
+                   console.error('Failed to update device');
+               }})
+               .finally(() => this.saving = false);
+          }}
+     }}">
+    {
+        _dropdown_button_html(
+            '<span x-text="deviceName"></span>' + str(Icon("arrowdown")), list_items
+        )
+    }
+</div>
+""")
+
+
+def _dropdown_button_html(button_content: str, list_items: str) -> str:
+    """Shared dropdown button + list structure for Alpine.js selectors."""
+    return (
+        '<div class="inline-flex rounded-md shadow-2xs" role="group" @click.outside="open = false">'
+        '<button type="button" @click="open = !open" '
+        'class="relative px-4 py-2 text-sm font-medium bg-white border border-gray-200 '
+        "rounded-lg hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-2 "
+        "focus:ring-blue-700 focus:text-blue-700 dark:bg-gray-800 dark:border-gray-700 "
+        "dark:hover:text-white dark:hover:bg-gray-700 dark:focus:ring-blue-500 "
+        'dark:focus:text-white align-middle hover:cursor-pointer">'
+        f'<span class="flex flex-row gap-4 justify-between items-center">{button_content}</span>'
+        '<div class="absolute top-[105%] left-0 w-full whitespace-nowrap z-10 text-sm '
+        "font-medium bg-gray-800/20 backdrop-blur-lg rounded-md rounded-t-none border "
+        'border-gray-200 dark:border-gray-700" x-show="open" style="display: none;">'
+        '<ul class="[&_li:first-of-type_a]:rounded-none [&_li:last-of-type_a]:rounded-t-none">'
+        f"{list_items}"
+        "</ul>"
+        "</div>"
+        "</button>"
+        "</div>"
     )
-    menu = Div(data_menu="", hidden=True, class_=_SELECTOR_MENU_CLASS)[Ul()[*options]]
-    dropdown = Div(
-        data_dropdown="", class_="inline-flex rounded-md shadow-2xs relative"
-    )[toggle, menu]
-    return _SessionDeviceSelector(session_id=session.id, csrf=csrf_token)[
-        Div(class_="flex gap-2 items-center")[dropdown]
-    ]

common/components/filters.py

@@ -3,9 +3,9 @@
 from typing import NamedTuple
 
 from django.db import models
+from django.utils.safestring import SafeText, mark_safe
 
-from common.components.core import BaseComponent, Element, Media, Node, Safe
-from common.components.date_range_picker import DateRangePicker
+from common.components.core import Component
 from common.components.primitives import Checkbox, Div, Input, Label, Radio, Span
 from common.components.search_select import (
     DEFAULT_PREFETCH,
@@ -52,13 +52,6 @@ _FILTER_RADIO_CLASS = (
 _FILTER_GRID_CLASS = "grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 mb-4"
 
 
-# range_slider.js wires RangeSlider; filter_bar.js wires the bar chrome
-# (Apply/Clear, presets, search injection). Widget media (search_select.js,
-# date_range_picker.js) bubbles up from the contained FilterSelect / picker.
-_RANGE_SLIDER_MEDIA = Media(js=("range_slider.js",))
-_FILTER_BAR_MEDIA = Media(js=("filter_bar.js",))
-
-
 def _filter_parse(filter_json: str) -> dict:
     if not filter_json:
         return {}
@@ -173,7 +166,9 @@ def _split_modifier(modifier: str, has_m2m: bool = False) -> str:
     return ""
 
 
-def _enum_filter(field_name: str, options, choice: FilterChoice, *, nullable) -> Node:
+def _enum_filter(
+    field_name: str, options, choice: FilterChoice, *, nullable
+) -> SafeText:
     """A FilterSelect over a small, fully pre-rendered option set (enum field).
 
     Enum fields are single-valued, so no M2M modifiers (all/only are
@@ -204,7 +199,7 @@ def _model_filter(
     search_url,
     nullable,
     m2m_modifiers: list[LabeledOption] | None = None,
-) -> Node:
+) -> SafeText:
     """A FilterSelect backed by a search endpoint.
 
     Labels are embedded in the filter JSON (Stash-style), so pills render
@@ -237,43 +232,34 @@ def _filter_mins_to_hrs(val) -> str:
     return str(int(hrs)) if hrs == int(hrs) else f"{hrs:.1f}"
 
 
-def _widget_id(widget) -> str:
-    """Best-effort id of a widget node, for the field label's ``for`` target.
-
-    Widgets are nodes carrying ``.attributes``, so the id is now reachable
-    directly (the old free ``Component`` string couldn't expose it).
+def _filter_field(label: str, widget, for_widget: str = None) -> SafeText:
+    """A labelled filter field: <div><label>…</label>{widget}</div>.
+    TODO: Use widget.attributes.get("id", "") to get the widget's ID
+    instead of the superfluous "for" argument. This requires refactoring
+    the Component function to be a class intead.
+    Also see RangeSlider's TODO
     """
-    for name, value in getattr(widget, "attributes", []):
-        if name == "id":
-            return str(value)
-    return ""
-
-
-def _filter_field(label: str, widget) -> Node:
-    """A labelled filter field: ``<div><label>…</label>{widget}</div>``.
-
-    The label's ``for`` points at the widget's own id when it has one;
-    composite widgets without a single root id simply omit ``for``.
-    """
-    label_attributes = [("class", _FILTER_LABEL_CLASS)]
-    widget_id = _widget_id(widget)
-    if widget_id:
-        label_attributes.append(("for", widget_id))
     return Div(
         attributes=[("class", "flex flex-col gap-1")],
         children=[
-            Label(attributes=label_attributes, children=[label]),
+            Label(
+                attributes=[
+                    ("class", _FILTER_LABEL_CLASS),
+                    ("for", for_widget),
+                ],
+                children=[label],
+            ),
             widget,
         ],
     )
 
 
-def _filter_checkbox(name: str, label: str, checked: bool) -> Node:
+def _filter_checkbox(name: str, label: str, checked: bool) -> SafeText:
     """Thin adapter mapping legacy checkbox filters to the generalized Checkbox primitive."""
     return Checkbox(name=name, label=label, checked=checked)
 
 
-def _filter_boolean_radio(name: str, label: str, value: bool | None) -> Node:
+def _filter_boolean_radio(name: str, label: str, value: bool | None) -> SafeText:
     """Renders a filter-specific boolean radio button group with 'True' and 'False' options."""
     return Div(
         attributes=[("class", "flex flex-col gap-1")],
@@ -327,7 +313,7 @@ def RangeSlider(
     step: str = "1",
     min_placeholder: str = "",
     max_placeholder: str = "",
-) -> Node:
+) -> SafeText:
     """A labelled range slider with number inputs and range/point mode toggle.
 
     Renders a label row (label, two number inputs, toggle button) and a slider
@@ -347,9 +333,14 @@ def RangeSlider(
             Div(
                 attributes=[("class", "flex items-center gap-2 mb-1")],
                 children=[
-                    # The field label is rendered by the _filter_field wrapper.
-                    # This composite widget has no single labelable root, so the
-                    # label carries no `for` (the two inputs are named below).
+                    # TODO: This should be done outside the RangeSlider component, but the current Component function doesn't allow getting the id
+                    # Label(
+                    #     attributes=[
+                    #         ("class", _FILTER_LABEL_CLASS),
+                    #         ("for", min_input_id),
+                    #     ],
+                    #     children=[label],
+                    # ),
                     Input(
                         attributes=[
                             ("type", "number"),
@@ -384,8 +375,8 @@ def RangeSlider(
                             ("class", _RANGE_SLIDER_INPUT_CLASS),
                         ],
                     ),
-                    Element(
-                        "button",
+                    Component(
+                        tag_name="button",
                         attributes=[
                             ("type", "button"),
                             (
@@ -411,7 +402,7 @@ def RangeSlider(
                                         + (" hidden" if point_mode else ""),
                                     ),
                                 ],
-                                children=[Safe(_RANGE_ICON_SVG)],
+                                children=[mark_safe(_RANGE_ICON_SVG)],
                             ),
                             Span(
                                 attributes=[
@@ -421,7 +412,7 @@ def RangeSlider(
                                         + ("" if point_mode else " hidden"),
                                     ),
                                 ],
-                                children=[Safe(_POINT_ICON_SVG)],
+                                children=[mark_safe(_POINT_ICON_SVG)],
                             ),
                         ],
                     ),
@@ -430,7 +421,7 @@ def RangeSlider(
             # ── Slider row ──
             Div(
                 attributes=[
-                    ("class", "range-slider relative h-10 w-5/6 select-none mt-1"),
+                    ("class", "range-slider relative h-10 select-none mt-1"),
                     ("data-mode", initial_mode),
                     ("data-min", str(range_min)),
                     ("data-max", str(range_max)),
@@ -490,7 +481,7 @@ def RangeSlider(
                 ],
             ),
         ],
-    ).with_media(_RANGE_SLIDER_MEDIA)
+    )
 
 
 _DATE_RANGE_INPUT_CLASS = (
@@ -507,7 +498,7 @@ def DateRangeFilter(
     max_value: str = "",
     min_placeholder: str = "From",
     max_placeholder: str = "To",
-) -> Node:
+) -> SafeText:
     """A pair of ``<input type="date">`` elements representing a date range.
 
     Mirrors ``RangeSlider`` in shape (two inputs named ``{prefix}-min`` and
@@ -562,16 +553,14 @@ _FILTER_FORM_ID = "filter-bar-form"
 _FILTER_INPUT_ID = "filter-json-input"
 
 
-def _filter_collapse_button() -> Node:
-    return Element(
-        "button",
+def _filter_collapse_button() -> SafeText:
+    return Component(
+        tag_name="button",
         attributes=[
             ("type", "button"),
-            # Slider handles are positioned in percentages, so initializing
-            # them while the body is hidden is safe — no re-init on reveal.
             (
                 "onclick",
-                "document.getElementById('filter-bar-body').classList.toggle('hidden')",
+                "var b=document.getElementById('filter-bar-body');b.classList.toggle('hidden');if(!b.classList.contains('hidden')&&window.initRangeSliders)window.initRangeSliders()",
             ),
             (
                 "class",
@@ -580,7 +569,7 @@ def _filter_collapse_button() -> Node:
             ),
         ],
         children=[
-            Safe(
+            mark_safe(
                 '<svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" d="M10.5 6h9.75M10.5 6a1.5 1.5 0 1 1-3 0m3 0a1.5 1.5 0 1 0-3 0M3.75 6H7.5m3 12h9.75m-9.75 0a1.5 1.5 0 0 1-3 0m3 0a1.5 1.5 0 0 0-3 0m-3.75 0H7.5m9-6h3.75m-3.75 0a1.5 1.5 0 0 1-3 0m3 0a1.5 1.5 0 0 0-3 0m-9.75 0h9.75" /></svg>'
             ),
             "Filters",
@@ -588,12 +577,12 @@ def _filter_collapse_button() -> Node:
     )
 
 
-def _filter_action_row(preset_list_url: str, preset_save_url: str) -> Node:
+def _filter_action_row(preset_list_url: str, preset_save_url: str) -> SafeText:
     return Div(
         attributes=[("class", "flex gap-3 items-center")],
         children=[
-            Element(
-                "button",
+            Component(
+                tag_name="button",
                 attributes=[
                     ("type", "submit"),
                     (
@@ -605,8 +594,8 @@ def _filter_action_row(preset_list_url: str, preset_save_url: str) -> Node:
                 ],
                 children=["Apply"],
             ),
-            Element(
-                "button",
+            Component(
+                tag_name="button",
                 attributes=[
                     ("type", "button"),
                     (
@@ -642,8 +631,8 @@ def _filter_action_row(preset_list_url: str, preset_save_url: str) -> Node:
                             ),
                         ],
                     ),
-                    Element(
-                        "button",
+                    Component(
+                        tag_name="button",
                         attributes=[
                             ("type", "button"),
                             ("id", "save-preset-btn"),
@@ -659,8 +648,8 @@ def _filter_action_row(preset_list_url: str, preset_save_url: str) -> Node:
                         ],
                         children=["Save Preset"],
                     ),
-                    Element(
-                        "button",
+                    Component(
+                        tag_name="button",
                         attributes=[
                             ("type", "button"),
                             ("id", "confirm-save-preset-btn"),
@@ -696,36 +685,10 @@ def _filter_action_row(preset_list_url: str, preset_save_url: str) -> Node:
     )
 
 
-class _FilterBarBase(BaseComponent):
-    """Shared collapsible filter-bar chrome.
-
-    Subclasses implement ``build_fields()`` returning the per-entity body
-    (grids, sliders, checkboxes); this base wraps it in the collapse toggle,
-    the form, the hidden filter-json input and the Apply/Clear/preset action
-    row. ``filter_bar.js`` (declared as this component's ``media``) wires the
-    chrome; widget media (search_select.js, range_slider.js,
-    date_range_picker.js) bubbles up from the contained widgets via the node
-    tree, so the view never threads ``scripts=`` by hand.
-    """
-
-    media = _FILTER_BAR_MEDIA
-
-    def __init__(
-        self,
-        filter_json: str = "",
-        preset_list_url: str = "",
-        preset_save_url: str = "",
-    ) -> None:
-        self.filter_json = filter_json
-        self.preset_list_url = preset_list_url
-        self.preset_save_url = preset_save_url
-        self.existing = _filter_parse(filter_json)
-
-    def build_fields(self) -> list:
-        """Return the per-entity filter body. Implemented by each subclass."""
-        raise NotImplementedError
-
-    def render(self) -> Node:
+def _filter_bar(fields, filter_json, preset_list_url, preset_save_url) -> SafeText:
+    """Shared collapsible filter-bar chrome. `fields` is the per-entity body
+    (grids, sliders, checkboxes); the shell adds the collapse toggle, the form,
+    the hidden filter-json input and the Apply/Clear/preset action row."""
     return Div(
         attributes=[("id", "filter-bar"), ("class", "mb-6")],
         children=[
@@ -740,8 +703,8 @@ class _FilterBarBase(BaseComponent):
                     ),
                 ],
                 children=[
-                        Element(
-                            "form",
+                    Component(
+                        tag_name="form",
                         attributes=[
                             ("id", _FILTER_FORM_ID),
                             ("onsubmit", "return applyFilterBar(event)"),
@@ -752,15 +715,13 @@ class _FilterBarBase(BaseComponent):
                                     ("type", "hidden"),
                                     ("id", _FILTER_INPUT_ID),
                                     ("name", "filter"),
-                                        # NB: attribute values are escaped, so the
-                                        # raw JSON passes through (no double-escape).
-                                        ("value", self.filter_json),
+                                    # NB: Component escapes attribute values, so the
+                                    # raw JSON is passed through (no double-escape).
+                                    ("value", filter_json),
                                 ],
                             ),
-                                *self.build_fields(),
-                                _filter_action_row(
-                                    self.preset_list_url, self.preset_save_url
-                                ),
+                            *fields,
+                            _filter_action_row(preset_list_url, preset_save_url),
                         ],
                     ),
                 ],
@@ -769,31 +730,19 @@ class _FilterBarBase(BaseComponent):
     )
 
 
-class FilterBar(_FilterBarBase):
-    """Collapsible filter bar for the Game list."""
-
-    def __init__(
-        self,
+def FilterBar(
     filter_json: str = "",
     status_options: list[LabeledOption] | None = None,
     preset_list_url: str = "",
     preset_save_url: str = "",
-    ) -> None:
-        super().__init__(filter_json, preset_list_url, preset_save_url)
-        self.status_options = status_options
-
-    def build_fields(self) -> list:
-        return _game_fields(self.existing, self.status_options)
-
-
-def _game_fields(
-    existing: dict, status_options: list[LabeledOption] | None = None
-) -> list:
+) -> SafeText:
+    """Collapsible filter bar for the Game list."""
     from games.models import Game, Purchase
 
     if status_options is None:
         status_options = [(s.value, s.label) for s in Game.Status]
 
+    existing = _filter_parse(filter_json)
     status_choice = _filter_get_choice(existing, "status")
     platform_choice = _filter_get_choice(existing, "platform")
     platform_group_choice = _filter_get_choice(existing, "platform_group")
@@ -810,10 +759,10 @@ def _game_fields(
         existing, "original_year_released"
     )
     mastered_value = _parse_bool_nullable(existing, "mastered")
-    playtime = existing.get("playtime_hours", {})
+    playtime = existing.get("playtime_minutes", {})
     if isinstance(playtime, dict):
-        playtime_min = playtime.get("value", "")
-        playtime_max = playtime.get("value2", "")
+        playtime_min = _filter_mins_to_hrs(playtime.get("value", ""))
+        playtime_max = _filter_mins_to_hrs(playtime.get("value2", ""))
     else:
         playtime_min = ""
         playtime_max = ""
@@ -822,8 +771,8 @@ def _game_fields(
     session_avg_min, session_avg_max = _parse_range(existing, "session_average")
     purchase_count_min, purchase_count_max = _parse_range(existing, "purchase_count")
     playevent_count_min, playevent_count_max = _parse_range(existing, "playevent_count")
-    manual_pt_min, manual_pt_max = _parse_range(existing, "manual_playtime_hours")
-    calc_pt_min, calc_pt_max = _parse_range(existing, "calculated_playtime_hours")
+    manual_pt_min, manual_pt_max = _parse_range(existing, "manual_playtime_minutes")
+    calc_pt_min, calc_pt_max = _parse_range(existing, "calculated_playtime_minutes")
     price_total_min, price_total_max = _parse_range(existing, "purchase_price_total")
     price_any_min, price_any_max = _parse_range(existing, "purchase_price_any")
     purchase_refunded_value = _parse_bool_nullable(existing, "purchase_refunded")
@@ -967,7 +916,7 @@ def _game_fields(
                     "Total playtime",
                     RangeSlider(
                         label="Total playtime",
-                        input_name_prefix="filter-playtime-hours",
+                        input_name_prefix="filter-playtime",
                         min_value=playtime_min,
                         max_value=playtime_max,
                         range_min=0,
@@ -978,31 +927,45 @@ def _game_fields(
                     ),
                 ),
                 _filter_field(
-                    "Manual Playtime (hrs)",
+                    "Manual Playtime (mins)",
                     RangeSlider(
-                        label="Manual Playtime (hrs)",
-                        input_name_prefix="filter-manual-playtime-hours",
+                        label="Manual Playtime (mins)",
+                        input_name_prefix="filter-manual-playtime-minutes",
                         min_value=manual_pt_min,
                         max_value=manual_pt_max,
                         range_min=0,
-                        range_max=max(playtime_range_max, 4),
+                        range_max=max(playtime_range_max * 60, 240),
                         step="1",
-                        min_placeholder="e.g. 1",
-                        max_placeholder="e.g. 10",
+                        min_placeholder="e.g. 10",
+                        max_placeholder="e.g. 120",
                     ),
                 ),
                 _filter_field(
-                    "Calculated Playtime (hrs)",
+                    "Calculated Playtime (mins)",
                     RangeSlider(
-                        label="Calculated Playtime (hrs)",
-                        input_name_prefix="filter-calculated-playtime-hours",
+                        label="Calculated Playtime (mins)",
+                        input_name_prefix="filter-calculated-playtime-minutes",
                         min_value=calc_pt_min,
                         max_value=calc_pt_max,
                         range_min=0,
-                        range_max=max(playtime_range_max, 4),
+                        range_max=max(playtime_range_max * 60, 240),
                         step="1",
-                        min_placeholder="e.g. 1",
-                        max_placeholder="e.g. 10",
+                        min_placeholder="e.g. 30",
+                        max_placeholder="e.g. 120",
+                    ),
+                ),
+                _filter_field(
+                    "Calculated Playtime (mins)",
+                    RangeSlider(
+                        label="Calculated Playtime (mins)",
+                        input_name_prefix="filter-calculated-playtime-minutes",
+                        min_value=calc_pt_min,
+                        max_value=calc_pt_max,
+                        range_min=0,
+                        range_max=max(playtime_range_max * 60, 240),
+                        step="1",
+                        min_placeholder="e.g. 30",
+                        max_placeholder="e.g. 180",
                     ),
                 ),
                 _filter_field(
@@ -1105,7 +1068,7 @@ def _game_fields(
             ],
         ),
     ]
-    return fields
+    return _filter_bar(fields, filter_json, preset_list_url, preset_save_url)
 
 
 def _find_label(options: list[LabeledOption], value: str) -> str:
@@ -1115,24 +1078,21 @@ def _find_label(options: list[LabeledOption], value: str) -> str:
     return value
 
 
-class SessionFilterBar(_FilterBarBase):
+def SessionFilterBar(
+    filter_json="", preset_list_url="", preset_save_url=""
+) -> SafeText:
     """Collapsible filter bar for the Session list."""
-
-    def build_fields(self) -> list:
-        return _session_fields(self.existing)
-
-
-def _session_fields(existing: dict) -> list:
     from games.models import Game, Session
 
+    existing = _filter_parse(filter_json)
     game_choice = _filter_get_choice(existing, "game")
     device_choice = _filter_get_choice(existing, "device")
     note_value = existing.get("note", {}).get("value", "")
     note_modifier = existing.get("note", {}).get("modifier", "EQUALS")
 
-    dur_tot_min, dur_tot_max = _parse_range(existing, "duration_total_hours")
-    dur_man_min, dur_man_max = _parse_range(existing, "duration_manual_hours")
-    dur_calc_min, dur_calc_max = _parse_range(existing, "duration_calculated_hours")
+    dur_tot_min, dur_tot_max = _parse_range(existing, "duration_total_minutes")
+    dur_man_min, dur_man_max = _parse_range(existing, "duration_manual_minutes")
+    dur_calc_min, dur_calc_max = _parse_range(existing, "duration_calculated_minutes")
     emulated_value = _parse_bool_nullable(existing, "emulated")
     is_active_value = _parse_bool_nullable(existing, "is_active")
     try:
@@ -1182,37 +1142,37 @@ def _session_fields(existing: dict) -> list:
             ],
         ),
         RangeSlider(
-            label="Total Duration (hrs)",
-            input_name_prefix="filter-duration-total-hours",
+            label="Total Duration (mins)",
+            input_name_prefix="filter-duration-total-minutes",
             min_value=dur_tot_min,
             max_value=dur_tot_max,
             range_min=0,
-            range_max=duration_range_max,
+            range_max=duration_range_max * 60,  # Range sliders use minutes now
             step="1",
-            min_placeholder="e.g. 1",
-            max_placeholder="e.g. 10",
+            min_placeholder="e.g. 30",
+            max_placeholder="e.g. 180",
         ),
         RangeSlider(
-            label="Manual Duration (hrs)",
-            input_name_prefix="filter-duration-manual-hours",
+            label="Manual Duration (mins)",
+            input_name_prefix="filter-duration-manual-minutes",
             min_value=dur_man_min,
             max_value=dur_man_max,
             range_min=0,
-            range_max=duration_range_max,
+            range_max=240,
             step="1",
-            min_placeholder="e.g. 1",
-            max_placeholder="e.g. 10",
+            min_placeholder="e.g. 10",
+            max_placeholder="e.g. 120",
         ),
         RangeSlider(
-            label="Calculated Duration (hrs)",
-            input_name_prefix="filter-duration-calculated-hours",
+            label="Calculated Duration (mins)",
+            input_name_prefix="filter-duration-calculated-minutes",
             min_value=dur_calc_min,
             max_value=dur_calc_max,
             range_min=0,
-            range_max=duration_range_max,
+            range_max=duration_range_max * 60,
             step="1",
-            min_placeholder="e.g. 1",
-            max_placeholder="e.g. 10",
+            min_placeholder="e.g. 30",
+            max_placeholder="e.g. 180",
         ),
         Div(
             attributes=[("class", "flex gap-6 mb-4")],
@@ -1222,21 +1182,18 @@ def _session_fields(existing: dict) -> list:
             ],
         ),
     ]
-    return fields
+    return _filter_bar(fields, filter_json, preset_list_url, preset_save_url)
 
 
-class PurchaseFilterBar(_FilterBarBase):
+def PurchaseFilterBar(
+    filter_json="", preset_list_url="", preset_save_url=""
+) -> SafeText:
     """Collapsible filter bar for the Purchase list."""
-
-    def build_fields(self) -> list:
-        return _purchase_fields(self.existing)
-
-
-def _purchase_fields(existing: dict) -> list:
     from games.models import Purchase
 
     type_options = Purchase.TYPES
     ownership_options = Purchase.OWNERSHIP_TYPES
+    existing = _filter_parse(filter_json)
     game_choice = _filter_get_choice(existing, "games")
     platform_choice = _filter_get_choice(existing, "platform")
     type_choice = _filter_get_choice(existing, "type")
@@ -1346,7 +1303,7 @@ def _purchase_fields(existing: dict) -> list:
                 ),
                 _filter_field(
                     "Purchased",
-                    DateRangePicker(
+                    DateRangeFilter(
                         label="Purchased",
                         input_name_prefix="filter-date-purchased",
                         min_value=date_purchased_min,
@@ -1408,19 +1365,14 @@ def _purchase_fields(existing: dict) -> list:
             ],
         ),
     ]
-    return fields
+    return _filter_bar(fields, filter_json, preset_list_url, preset_save_url)
 
 
-class DeviceFilterBar(_FilterBarBase):
+def DeviceFilterBar(filter_json="", preset_list_url="", preset_save_url="") -> SafeText:
     """Collapsible filter bar for the Device list."""
-
-    def build_fields(self) -> list:
-        return _device_fields(self.existing)
-
-
-def _device_fields(existing: dict) -> list:
     from games.models import Device
 
+    existing = _filter_parse(filter_json)
     type_options = Device.DEVICE_TYPES
     type_choice = _filter_get_choice(existing, "type")
 
@@ -1440,17 +1392,15 @@ def _device_fields(existing: dict) -> list:
             ],
         ),
     ]
-    return fields
+    return _filter_bar(fields, filter_json, preset_list_url, preset_save_url)
 
 
-class PlatformFilterBar(_FilterBarBase):
+def PlatformFilterBar(
+    filter_json="", preset_list_url="", preset_save_url=""
+) -> SafeText:
     """Collapsible filter bar for the Platform list."""
+    existing = _filter_parse(filter_json)
 
-    def build_fields(self) -> list:
-        return _platform_fields(self.existing)
-
-
-def _platform_fields(existing: dict) -> list:
     name_value = existing.get("name", {}).get("value", "")
     name_modifier = existing.get("name", {}).get("modifier", "EQUALS")
     group_value = existing.get("group", {}).get("value", "")
@@ -1481,17 +1431,14 @@ def _platform_fields(existing: dict) -> list:
             ],
         ),
     ]
-    return fields
+    return _filter_bar(fields, filter_json, preset_list_url, preset_save_url)
 
 
-class PlayEventFilterBar(_FilterBarBase):
+def PlayEventFilterBar(
+    filter_json="", preset_list_url="", preset_save_url=""
+) -> SafeText:
     """Collapsible filter bar for the PlayEvent list."""
-
-    def build_fields(self) -> list:
-        return _playevent_fields(self.existing)
-
-
-def _playevent_fields(existing: dict) -> list:
+    existing = _filter_parse(filter_json)
     game_choice = _filter_get_choice(existing, "game")
     days_min, days_max = _parse_range(existing, "days_to_finish")
 
@@ -1522,7 +1469,7 @@ def _playevent_fields(existing: dict) -> list:
             max_placeholder="e.g. 30",
         ),
     ]
-    return fields
+    return _filter_bar(fields, filter_json, preset_list_url, preset_save_url)
 
 
 def StringFilter(
@@ -1530,7 +1477,7 @@ def StringFilter(
     value: str = "",
     modifier: str = "EQUALS",
     placeholder: str = "",
-) -> Node:
+) -> SafeText:
     """Renders a string filter with 8 modifier radio options and a text input."""
     from common.criteria import Modifier
 

common/components/primitives.py

@@ -1,32 +1,12 @@
-"""Generic HTML primitives (no domain knowledge).
-
-Generic leaf elements (``Div``, ``Span``, ``Td`` …) are *not* hand-written one
-per tag: they are generated from a whitelist via :func:`_html_element`, each a
-thin builder over the single :class:`Element` node class. Only elements that add
-classes or behaviour (``Button``, ``Pill``, ``Checkbox`` …) are written out.
-Everything returns a :class:`Node`; string-built widgets return :class:`Safe`.
-"""
+"""Generic HTML primitives (no domain knowledge)."""
 
 from django.middleware.csrf import get_token
 from django.templatetags.static import static
+from django.urls import reverse
 from django.utils.html import conditional_escape
 from django.utils.safestring import SafeText, mark_safe
 
-from common.components.core import (
-    Attributes,
-    Child,
-    Children,
-    Element,
-    Fragment,
-    HTMLAttribute,
-    Media,
-    Node,
-    Safe,
-    as_attributes,
-    as_children,
-    collect_media,
-    randomid,
-)
+from common.components.core import Component, HTMLAttribute, HTMLTag, randomid
 from common.icons import get_icon
 from common.utils import truncate
 
@@ -47,79 +27,18 @@ _SIZE_CLASSES = {
 }
 
 
-# ── Generic leaf elements ────────────────────────────────────────────────────
-# A whitelist of plain tags, each turned into a builder over `Element`. The
-# tag name is data, not a separate class/function body. Add a tag = one line.
-
-
-def _attrs_from_kwargs(attrs: dict[str, object]) -> list[HTMLAttribute]:
-    """Translate htpy-style attribute kwargs to (name, value) pairs.
-
-    ``class_`` -> ``class`` (trailing underscore stripped); ``hx_get`` ->
-    ``hx-get`` (inner underscores to hyphens); ``True`` -> bare attribute;
-    ``False`` / ``None`` -> omitted."""
-    result: list[HTMLAttribute] = []
-    for key, value in attrs.items():
-        if value is None or value is False:
-            continue
-        name = key.rstrip("_").replace("_", "-")
-        result.append((name, name if value is True else value))  # type: ignore[arg-type]
-    return result
-
-
-def custom_element_builder(tag_name: str):
-    """Create a tag builder for a custom element with auto-attached Media.
-
-    The module path follows the convention ``ts/elements/<tag>.ts`` →
-    ``dist/elements/<tag>.js``.
-    """
-    return _html_element(tag_name, Media(js=(f"dist/elements/{tag_name}.js",)))
-
-
-def _html_element(tag_name: str, media: Media | None = None):
-    """Build a generic element builder for ``tag_name`` (the whitelist factory).
-
-    If ``media`` is provided, every node created by the builder will carry it
-    (used for custom elements whose compiled JS must be loaded automatically).
-    """
-
-    def element(
-        attributes: Attributes | None = None,
-        children: Children = None,
-        **attrs: object,
-    ) -> Element:
-        merged = as_attributes(attributes) + _attrs_from_kwargs(attrs)
-        node = Element(tag_name, merged, children)
-        return node.with_media(media) if media else node
-
-    element.__name__ = element.__qualname__ = tag_name[:1].upper() + tag_name[1:]
-    element.__doc__ = f"Builder for the <{tag_name}> element."
-    return element
-
-
-A = _html_element("a")
-Button = _html_element("button")
-Div = _html_element("div")
-P = _html_element("p")
-Ul = _html_element("ul")
-Li = _html_element("li")
-Strong = _html_element("strong")
-Span = _html_element("span")
-Label = _html_element("label")
-Template = _html_element("template")
-Td = _html_element("td")
-Tr = _html_element("tr")
-Th = _html_element("th")
-
-
 def _popover_html(
     id: str,
-    popover_content: Child,
+    popover_content: str,
     wrapped_content: str = "",
     wrapped_classes: str = "",
-    slot: "Node | str" = "",
-) -> Node:
-    """Generate popover HTML. Single source of truth for popover structure."""
+    slot: str = "",
+) -> SafeText:
+    """Generate popover HTML using Component(tag_name=...).
+
+    Single source of truth for popover HTML structure.
+    Used by Popover() and the python_popover template tag bridge.
+    """
     display_content = wrapped_content if wrapped_content else slot
 
     span = Span(
@@ -150,7 +69,7 @@ def _popover_html(
                 children=[popover_content],
             ),
             Div(attributes=[("data-popper-arrow", "")]),
-            Safe(  # nosec — intentional HTML comment for Tailwind JIT
+            mark_safe(  # nosec — intentional HTML comment for Tailwind JIT
                 "<!-- for Tailwind CSS to generate decoration-dotted CSS "
                 "from Python component -->"
             ),
@@ -160,24 +79,24 @@ def _popover_html(
         ],
     )
 
-    return Fragment(span, div, separator="\n")
+    return mark_safe(span + "\n" + div)
 
 
 def Popover(
-    popover_content: Child,
+    popover_content: str,
     wrapped_content: str = "",
     wrapped_classes: str = "",
-    children: Children = None,
-    attributes: Attributes | None = None,
+    children: list[HTMLTag] | None = None,
+    attributes: list[HTMLAttribute] | None = None,
     id: str = "",
-) -> Node:
-    children = as_children(children)
+) -> str:
+    children = children or []
     if not wrapped_content and not children:
         raise ValueError("One of wrapped_content or children is required.")
     if not id:
         id = randomid(content=f"{wrapped_content}:{popover_content}:{wrapped_classes}")
 
-    slot = Fragment(*children, separator="\n") if children else ""
+    slot = mark_safe("\n".join(children))
     return _popover_html(
         id=id,
         popover_content=popover_content,
@@ -189,12 +108,12 @@ def Popover(
 
 def PopoverTruncated(
     input_string: str,
-    popover_content: Child = "",
+    popover_content: str = "",
     popover_if_not_truncated: bool = False,
     length: int = 30,
     ellipsis: str = "…",
     endpart: str = "",
-) -> "Node | str":
+) -> str:
     """
     Returns `input_string` truncated after `length` of characters
     and displays the untruncated text in a popover HTML element.
@@ -219,9 +138,37 @@ def PopoverTruncated(
             return input_string
 
 
-def StyledButton(
-    attributes: Attributes | None = None,
-    children: Children = None,
+def A(
+    attributes: list[HTMLAttribute] | None = None,
+    children: list[HTMLTag] | HTMLTag | None = None,
+    url_name: str | None = None,
+    href: str | None = None,
+) -> SafeText:
+    """
+    Returns an anchor <a> tag.
+
+    Accepts one of two mutually-exclusive URL specifications:
+        - url_name: URL pattern name, resolved via reverse()
+        - href: Literal path string passed through as-is
+    """
+    attributes = attributes or []
+    children = children or []
+    if url_name is not None and href is not None:
+        raise ValueError("Provide exactly one of 'url_name' or 'href', not both.")
+
+    additional_attributes = []
+    if url_name is not None:
+        additional_attributes = [("href", reverse(url_name))]
+    elif href is not None:
+        additional_attributes = [("href", href)]
+    return Component(
+        tag_name="a", attributes=attributes + additional_attributes, children=children
+    )
+
+
+def Button(
+    attributes: list[HTMLAttribute] | None = None,
+    children: list[HTMLTag] | HTMLTag | None = None,
     size: str = "base",
     icon: bool = False,
     color: str = "blue",
@@ -232,9 +179,8 @@ def StyledButton(
     title: str = "",
     onclick: str = "",
     name: str = "",
-    **attrs: object,
-) -> Element:
-    attributes = as_attributes(attributes) + _attrs_from_kwargs(attrs)
+) -> SafeText:
+    attributes = attributes or []
     children = children or []
 
     # Separate custom class from other generic attributes
@@ -278,8 +224,8 @@ def StyledButton(
         button_attrs.append(("name", name))
     button_attrs.extend(other_attrs)
 
-    return Element(
-        "button",
+    return Component(
+        tag_name="button",
         attributes=button_attrs,
         children=children,
     )
@@ -321,7 +267,7 @@ def _button_group_button(
     title: str = "",
     hx_get: str = "",
     hx_target: str = "",
-) -> Element:
+) -> SafeText:
     """Generate a single button-group button (inner <button> inside <a>)."""
     color_classes = _GROUP_BUTTON_COLORS.get(color, _GROUP_BUTTON_COLORS["gray"])
 
@@ -338,8 +284,8 @@ def _button_group_button(
         )
     )
 
-    button = Element(
-        "button",
+    button = Component(
+        tag_name="button",
         attributes=[
             ("type", "button"),
             ("title", title),
@@ -348,10 +294,10 @@ def _button_group_button(
         children=[slot],
     )
 
-    return Element("a", attributes=a_attrs, children=[button])
+    return Component(tag_name="a", attributes=a_attrs, children=[button])
 
 
-def ButtonGroup(buttons: list[dict] | None = None) -> Element:
+def ButtonGroup(buttons: list[dict] | None = None) -> SafeText:
     """Generate a button group div.
 
     Each button dict accepts: href, slot (required), color, title, hx_get, hx_target.
@@ -359,7 +305,7 @@ def ButtonGroup(buttons: list[dict] | None = None) -> Element:
     for conditional buttons (e.g., end-session only when session is active).
     """
     buttons = buttons or []
-    children: list[Node] = []
+    children: list[SafeText] = []
     for btn in buttons:
         if not btn or not btn.get("slot"):
             continue
@@ -380,14 +326,79 @@ def ButtonGroup(buttons: list[dict] | None = None) -> Element:
     )
 
 
+def Div(
+    attributes: list[HTMLAttribute] | None = None,
+    children: list[HTMLTag] | HTMLTag | None = None,
+) -> SafeText:
+    attributes = attributes or []
+    children = children or []
+    return Component(tag_name="div", attributes=attributes, children=children)
+
+
+def P(
+    attributes: list[HTMLAttribute] | None = None,
+    children: list[HTMLTag] | HTMLTag | None = None,
+) -> SafeText:
+    attributes = attributes or []
+    children = children or []
+    return Component(tag_name="p", attributes=attributes, children=children)
+
+
+def Ul(
+    attributes: list[HTMLAttribute] | None = None,
+    children: list[HTMLTag] | HTMLTag | None = None,
+) -> SafeText:
+    attributes = attributes or []
+    children = children or []
+    return Component(tag_name="ul", attributes=attributes, children=children)
+
+
+def Li(
+    attributes: list[HTMLAttribute] | None = None,
+    children: list[HTMLTag] | HTMLTag | None = None,
+) -> SafeText:
+    attributes = attributes or []
+    children = children or []
+    return Component(tag_name="li", attributes=attributes, children=children)
+
+
+def Strong(
+    attributes: list[HTMLAttribute] | None = None,
+    children: list[HTMLTag] | HTMLTag | None = None,
+) -> SafeText:
+    attributes = attributes or []
+    children = children or []
+    return Component(tag_name="strong", attributes=attributes, children=children)
+
+
 def Input(
     type: str = "text",
-    attributes: Attributes | None = None,
-    children: Children = None,
-) -> Element:
-    attributes = as_attributes(attributes)
+    attributes: list[HTMLAttribute] | None = None,
+    children: list[HTMLTag] | HTMLTag | None = None,
+) -> SafeText:
+    attributes = attributes or []
     children = children or []
-    return Element("input", attributes=attributes + [("type", type)], children=children)
+    return Component(
+        tag_name="input", attributes=attributes + [("type", type)], children=children
+    )
+
+
+def Span(
+    attributes: list[HTMLAttribute] | None = None,
+    children: list[HTMLTag] | HTMLTag | None = None,
+) -> SafeText:
+    attributes = attributes or []
+    children = children or []
+    return Component(tag_name="span", attributes=attributes, children=children)
+
+
+def Label(
+    attributes: list[HTMLAttribute] | None = None,
+    children: list[HTMLTag] | HTMLTag | None = None,
+) -> SafeText:
+    attributes = attributes or []
+    children = children or []
+    return Component(tag_name="label", attributes=attributes, children=children)
 
 
 def Checkbox(
@@ -395,10 +406,10 @@ def Checkbox(
     label: str | None = None,
     checked: bool = False,
     value: str = "1",
-    attributes: Attributes | None = None,
-) -> Node:
+    attributes: list[HTMLAttribute] | None = None,
+) -> SafeText:
     """A filter-agnostic Checkbox component."""
-    attributes = as_attributes(attributes)
+    attributes = attributes or []
     input_attrs = [
         ("name", name),
         ("value", value),
@@ -427,10 +438,10 @@ def Radio(
     label: str | None = None,
     checked: bool = False,
     value: str = "",
-    attributes: Attributes | None = None,
-) -> Node:
+    attributes: list[HTMLAttribute] | None = None,
+) -> SafeText:
     """A filter-agnostic Radio component."""
-    attributes = as_attributes(attributes)
+    attributes = attributes or []
     input_attrs = [
         ("name", name),
         ("value", value),
@@ -454,6 +465,16 @@ def Radio(
     )
 
 
+def Template(
+    attributes: list[HTMLAttribute] | None = None,
+    children: list[HTMLTag] | HTMLTag | None = None,
+) -> SafeText:
+    """An inert ``<template>`` whose contents are not rendered until cloned by JS."""
+    attributes = attributes or []
+    children = children or []
+    return Component(tag_name="template", attributes=attributes, children=children)
+
+
 # Inline Tailwind utilities for Pill (mirrors the .sf-tag / .sf-remove rules in
 # input.css, written inline so styling stays encapsulated in the component). The
 # JS that builds pills client-side (search_select.js) MUST emit these exact class
@@ -472,8 +493,8 @@ def Pill(
     removable: bool = False,
     extra_class: str = "",
     label_slot: bool = False,
-    attributes: Attributes | None = None,
-) -> Node:
+    attributes: list[HTMLAttribute] | None = None,
+) -> SafeText:
     """A small label pill, optionally removable (× button).
 
     Styling is inline Tailwind utilities; ``data-pill`` / ``data-pill-remove``
@@ -484,23 +505,23 @@ def Pill(
     fill it when cloning the pill from a server-rendered ``<template>`` (keeps the
     markup single-sourced — see ``search_select.py``).
     """
-    attributes = as_attributes(attributes)
+    attributes = attributes or []
     pill_class = f"{_PILL_CLASS} {extra_class}".strip()
     pill_attrs: list[HTMLAttribute] = [("class", pill_class), ("data-pill", "")]
     if value != "":
         pill_attrs.append(("data-value", str(value)))
     pill_attrs.extend(attributes)
 
-    label_child: "Node | str" = (
+    label_child: HTMLTag = (
         Span(attributes=[("data-search-select-label", "")], children=[label])
         if label_slot
         else label
     )
-    children: list["Node | str"] = [label_child]
+    children: list[HTMLTag] = [label_child]
     if removable:
         children.append(
-            Element(
-                "button",
+            Component(
+                tag_name="button",
                 attributes=[
                     ("type", "button"),
                     ("data-pill-remove", ""),
@@ -514,12 +535,9 @@ def Pill(
     return Span(attributes=pill_attrs, children=children)
 
 
-def CsrfInput(request) -> Node:
-    """Hidden CSRF input, equivalent to the `{% csrf_token %}` template tag.
-
-    Returns a ``Safe`` node (not a safe string): it is always used as a tree
-    child, and only nodes render unescaped now."""
-    return Safe(
+def CsrfInput(request) -> SafeText:
+    """Hidden CSRF input, equivalent to the `{% csrf_token %}` template tag."""
+    return mark_safe(
         f'<input type="hidden" name="csrfmiddlewaretoken" value="{get_token(request)}">'
     )
 
@@ -536,22 +554,11 @@ def ExternalScript(url: str) -> SafeText:
     return mark_safe(f'<script src="{url}"></script>')
 
 
-def StaticScript(filename: str) -> SafeText:
-    """A plain (classic, non-module) `<script src=...>` tag for a static JS
-    file — for vendored UMD bundles, which break inside module scope."""
-    return mark_safe(f'<script src="{static("js/" + filename)}"></script>')
-
-
-# Media for the Flowbite-datepicker year picker (vendored UMD bundle). Declared
-# on the YearPicker node so Page() loads it wherever a YearPicker appears.
-_YEAR_PICKER_MEDIA = Media(js_external=("datepicker.umd.js",))
-
-
 def YearPicker(
     year: int | None = None,
     available_years: tuple[int, ...] = (),
     url_template: str = "",
-) -> Node:
+) -> SafeText:
     """A Flowbite-datepicker year picker.
 
     `year` is the selected year, or ``None`` for the all-time view (the empty
@@ -560,8 +567,8 @@ def YearPicker(
     placeholder, substituted with the chosen year in JS (keeps this component
     decoupled from the project's URL names).
 
-    The Flowbite-datepicker UMD bundle is declared as ``media`` on the returned
-    node, so ``Page()`` loads it automatically.
+    The Flowbite-datepicker UMD bundle is *not* loaded here — the view hoists it
+    via ``render_page(scripts=...)``.
     """
     label = str(year) if year is not None else "Choose a year"
     selected = str(year) if year is not None else ""
@@ -572,8 +579,7 @@ def YearPicker(
         "hover:bg-neutral-tertiary-medium focus:ring-4 focus:ring-brand-medium"
     )
     years_csv = ",".join(str(y) for y in available_years)
-    return Safe(
-        f"""<div class="relative inline-block" x-data="{{ pickerOpen: false }}"
+    return mark_safe(f"""<div class="relative inline-block" x-data="{{ pickerOpen: false }}"
      @keydown.escape.window="pickerOpen = false">
     <button type="button"
             x-on:click="pickerOpen = !pickerOpen; $refs.pickerInput._pickerInstance && ($refs.pickerInput._pickerInstance.active ? $refs.pickerInput._pickerInstance.hide() : $refs.pickerInput._pickerInstance.show())"
@@ -626,19 +632,17 @@ document.addEventListener('DOMContentLoaded', () => {{
         picker.update();
     }}
 }});
-</script>""",
-        media=_YEAR_PICKER_MEDIA,
-    )
+</script>""")
 
 
 def AddForm(
     form,
     *,
     request,
-    fields: Node | SafeText | str | None = None,
-    additional_row: Node | SafeText | str = "",
+    fields: SafeText | str | None = None,
+    additional_row: SafeText | str = "",
     submit_class: str = "mt-3",
-) -> Node:
+) -> SafeText:
     """Page body for the generic add/edit form (Python equivalent of add.html).
 
     `fields` overrides the default ``form.as_div()`` field markup (used by the
@@ -647,16 +651,16 @@ def AddForm(
     is applied to the main Submit button (the session form passes "" to match
     its original markup).
     """
-    field_markup = fields if fields is not None else Safe(form.as_div())
+    field_markup = fields if fields is not None else mark_safe(form.as_div())
     submit_attrs = [("class", submit_class)] if submit_class else []
 
-    inner_form = Element(
-        "form",
+    inner_form = Component(
+        tag_name="form",
         attributes=[("method", "post"), ("enctype", "multipart/form-data")],
         children=[
             CsrfInput(request),
             field_markup,
-            Div(children=[StyledButton(submit_attrs, "Submit", type="submit")]),
+            Div(children=[Button(submit_attrs, "Submit", type="submit")]),
             Div(
                 [("class", "submit-button-container")],
                 [additional_row] if additional_row else [],
@@ -679,10 +683,10 @@ def SearchField(
     search_string: str = "",
     id: str = "search_string",
     placeholder: str = "Search",
-) -> Element:
+) -> SafeText:
     """Generate a search form with icon, input field, and submit button."""
-    return Element(
-        "form",
+    return Component(
+        tag_name="form",
         attributes=[("class", "max-w-md")],
         children=[
             Label(
@@ -695,7 +699,7 @@ def SearchField(
             Div(
                 attributes=[("class", "relative")],
                 children=[
-                    Safe(
+                    mark_safe(
                         '<div class="absolute inset-y-0 start-0 flex items-center ps-3 pointer-events-none">'
                         '<svg class="w-4 h-4 text-body" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" '
                         'fill="none" viewBox="0 0 24 24">'
@@ -720,8 +724,8 @@ def SearchField(
                             ("required", ""),
                         ],
                     ),
-                    Element(
-                        "button",
+                    Component(
+                        tag_name="button",
                         attributes=[
                             ("type", "submit"),
                             (
@@ -742,13 +746,13 @@ def SearchField(
 
 
 def H1(
-    children: Children = None,
+    children: list[HTMLTag] | HTMLTag | None = None,
     badge: str = "",
-) -> Element:
+) -> SafeText:
     """Heading with optional badge count."""
     children = children or []
     heading_class = "mb-4 text-3xl font-extrabold leading-none tracking-tight text-gray-900 dark:text-white"
-    badge_html: Node | str = ""
+    badge_html = ""
 
     if badge:
         heading_class = "flex items-center " + heading_class
@@ -763,20 +767,21 @@ def H1(
             children=[badge],
         )
 
-    return Element(
-        "h1",
+    return Component(
+        tag_name="h1",
         attributes=[("class", heading_class)],
-        children=as_children(children) + ([badge_html] if badge_html else []),
+        children=(children if isinstance(children, list) else [children])
+        + ([badge_html] if badge_html else []),
     )
 
 
 def Modal(
     modal_id: str,
-    children: Children = None,
-) -> Node:
+    children: list[HTMLTag] | HTMLTag | None = None,
+) -> SafeText:
     """Modal overlay with container. Content (form, buttons) goes in children."""
     children = children or []
-    return Div(
+    outer = Div(
         attributes=[
             ("id", modal_id),
             (
@@ -794,24 +799,52 @@ def Modal(
                         "shadow-lg/50 rounded-md bg-white dark:bg-gray-900",
                     ),
                 ],
-                children=as_children(children),
+                children=(children if isinstance(children, list) else [children]),
             ),
         ],
     )
+    return mark_safe(str(outer))
+
+
+def Td(
+    attributes: list[HTMLAttribute] | None = None,
+    children: list[HTMLTag] | HTMLTag | None = None,
+) -> SafeText:
+    attributes = attributes or []
+    children = children or []
+    return Component(tag_name="td", attributes=attributes, children=children)
+
+
+def Tr(
+    attributes: list[HTMLAttribute] | None = None,
+    children: list[HTMLTag] | HTMLTag | None = None,
+) -> SafeText:
+    attributes = attributes or []
+    children = children or []
+    return Component(tag_name="tr", attributes=attributes, children=children)
+
+
+def Th(
+    attributes: list[HTMLAttribute] | None = None,
+    children: list[HTMLTag] | HTMLTag | None = None,
+) -> SafeText:
+    attributes = attributes or []
+    children = children or []
+    return Component(tag_name="th", attributes=attributes, children=children)
 
 
 def TableTd(
-    children: Children = None,
-) -> Element:
+    children: list[HTMLTag] | HTMLTag | None = None,
+) -> SafeText:
     """Styled table cell."""
     children = children or []
     return Td(
         attributes=[("class", "px-6 py-4 min-w-20-char max-w-20-char")],
-        children=as_children(children),
+        children=children if isinstance(children, list) else [children],
     )
 
 
-def TableRow(data: dict | list | None = None) -> Element:
+def TableRow(data: dict | list | None = None) -> SafeText:
     """Generate a <tr> from a row data dict or list.
 
     Dict form: {"row_id": "...", "cell_data": [...], "hx_trigger": ..., ...}
@@ -846,7 +879,7 @@ def TableRow(data: dict | list | None = None) -> Element:
         if data.get("hx_swap"):
             tr_attrs.append(("hx-swap", data["hx_swap"]))
 
-    cell_elements: list[Node] = []
+    cell_elements: list[SafeText] = []
     for i, cell in enumerate(cells):
         if i == 0:
             cell_elements.append(
@@ -870,18 +903,18 @@ def TableRow(data: dict | list | None = None) -> Element:
 
 def Icon(
     name: str,
-    attributes: Attributes | None = None,
-) -> Node:
-    return Safe(get_icon(name))
+    attributes: list[HTMLAttribute] | None = None,
+) -> SafeText:
+    return mark_safe(get_icon(name))
 
 
 def TableHeader(
-    children: Children = None,
-) -> Element:
+    children: list[HTMLTag] | HTMLTag | None = None,
+) -> SafeText:
     """Table caption."""
     children = children or []
-    return Element(
-        "caption",
+    return Component(
+        tag_name="caption",
         attributes=[
             (
                 "class",
@@ -889,7 +922,7 @@ def TableHeader(
                 "text-gray-900 bg-white dark:text-white dark:bg-gray-900",
             ),
         ],
-        children=as_children(children),
+        children=children if isinstance(children, list) else [children],
     )
 
 
@@ -968,41 +1001,30 @@ def _pagination_nav(page_obj, elided_page_range, request) -> str:
 def SimpleTable(
     columns: list[str] | None = None,
     rows: list | None = None,
-    header_action: Child | None = None,
+    header_action: SafeText | str | None = None,
     page_obj=None,
     elided_page_range=None,
     request=None,
-) -> Node:
+) -> SafeText:
     """Paginated table. Python equivalent of the old simple_table.html."""
     columns = columns or []
     rows = rows or []
 
-    # Rows/header are stringified into the table markup, so their components'
-    # declared Media would be lost; collect it from the nodes first and attach
-    # it to the returned node so Page() still emits each cell component's JS
-    # (e.g. a <game-status-selector> in a cell).
-    media = Media()
-
     header_html = ""
     if header_action:
-        header_node = TableHeader(children=[header_action])
-        header_html = str(header_node)
-        media = media + collect_media(header_node)
+        header_html = str(TableHeader(children=[header_action]))
 
     columns_html = "".join(
         f'<th scope="col" class="px-6 py-3">{conditional_escape(col)}</th>'
         for col in columns
     )
-    row_nodes = [TableRow(data=row) for row in rows]
-    rows_html = "".join(str(node) for node in row_nodes)
-    for node in row_nodes:
-        media = media + collect_media(node)
+    rows_html = "".join(str(TableRow(data=row)) for row in rows)
 
     pagination_html = ""
     if page_obj and elided_page_range:
         pagination_html = _pagination_nav(page_obj, elided_page_range, request)
 
-    return Safe(
+    return mark_safe(
         '<div class="shadow-md" hx-boost="false">'
         '<div class="relative overflow-x-auto sm:rounded-t-lg">'
         '<table class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400">'
@@ -1012,8 +1034,7 @@ def SimpleTable(
         f"<tr>{columns_html}</tr></thead>"
         '<tbody class="dark:divide-y max-sm:[&_td:not(:first-child):not(:last-child)]:hidden">'
         f"{rows_html}</tbody></table></div>"
-        f"{pagination_html}</div>",
-        media=media,
+        f"{pagination_html}</div>"
     )
 
 
@@ -1023,7 +1044,7 @@ def paginated_table_content(
     page_obj=None,
     elided_page_range=None,
     request=None,
-) -> Node:
+) -> SafeText:
     """Standard list-page body: a max-width Div wrapping a SimpleTable.
 
     `data` is the table dict with keys ``columns``, ``rows`` and

common/components/search_select.py

@@ -21,13 +21,11 @@ user types.
 from collections.abc import Callable, Iterable
 from typing import TypedDict
 
+from django.utils.safestring import SafeText
 
-from common.components.core import Attributes, Element, HTMLAttribute, Media, Node
+from common.components.core import Component, HTMLAttribute
 from common.components.primitives import Div, Input, Pill, Span, Template
 
-# Both comboboxes are wired by search_select.js.
-_SEARCH_SELECT_MEDIA = Media(js=("search_select.js",))
-
 
 class SearchSelectOption(TypedDict):
     value: str | int
@@ -143,11 +141,11 @@ def _data_attributes(data: dict[str, str]) -> list[HTMLAttribute]:
     return [(f"data-{key}", str(value)) for key, value in data.items()]
 
 
-def _hidden_input(name: str, value) -> Node:
+def _hidden_input(name: str, value) -> SafeText:
     return Input(type="hidden", attributes=[("name", name), ("value", str(value))])
 
 
-def _label_slot(text: str, *, extra_class: str = "") -> Node:
+def _label_slot(text: str, *, extra_class: str = "") -> SafeText:
     """A ``<span data-search-select-label>`` holding a row/pill's visible label. JS fills this
     one node when cloning the shape from a ``<template>``, so labels are the only
     thing the JS sets — all classes and structure stay server-side."""
@@ -161,7 +159,7 @@ def _label_slot(text: str, *, extra_class: str = "") -> Node:
 _BLANK_OPTION: SearchSelectOption = {"value": "", "label": "", "data": {}}
 
 
-def _option_row(option: SearchSelectOption) -> Node:
+def _option_row(option: SearchSelectOption) -> SafeText:
     return Div(
         attributes=[
             ("data-search-select-option", ""),
@@ -176,14 +174,14 @@ def _option_row(option: SearchSelectOption) -> Node:
 
 def _combobox_shell(
     *,
-    container_attributes: Attributes,
-    pills: Node,
-    search_attributes: Attributes,
-    options_children: list[Node],
+    container_attributes: list[HTMLAttribute],
+    pills: SafeText,
+    search_attributes: list[HTMLAttribute],
+    options_children: list[SafeText],
     always_visible: bool,
     items_visible: int,
-    templates: list[Node] | None = None,
-) -> Node:
+    templates: list[SafeText] | None = None,
+) -> SafeText:
     """Assemble the shared, domain-agnostic combobox skeleton.
 
     Every combobox built on top of this shell has the same three regions in the
@@ -215,7 +213,7 @@ def _combobox_shell(
         children=[*options_children, no_results],
     )
 
-    children: list[Node] = [pills, search, options_panel, *(templates or [])]
+    children: list[SafeText] = [pills, search, options_panel, *(templates or [])]
     return Div(attributes=container_attributes, children=children)
 
 
@@ -234,7 +232,7 @@ def SearchSelect(
     id: str = "",
     sync_url: bool = False,
     autofocus: bool = False,
-) -> Node:
+) -> SafeText:
     """Render the search-select widget. See module docstring for the contract."""
     selected = [_normalize_option(option) for option in (selected or [])]
     options = [_normalize_option(option) for option in (options or [])]
@@ -244,7 +242,7 @@ def SearchSelect(
     # pill — the committed label shows inside the search box instead, with a
     # lone hidden input carrying the value. Both keep the hidden input(s) inside
     # `[data-search-select-pills]` so the JS reads/writes values uniformly.
-    pills_children: list[Node] = []
+    pills_children: list[SafeText] = []
     search_value = ""
     if multi_select:
         for option in selected:
@@ -285,7 +283,7 @@ def SearchSelect(
 
     # ── Templates the JS clones: a row when results are fetched, a pill when
     #    multi-select adds chosen items. ──
-    templates: list[Node] = []
+    templates: list[SafeText] = []
     if search_url:
         templates.append(
             Template(
@@ -324,12 +322,12 @@ def SearchSelect(
         always_visible=always_visible,
         items_visible=items_visible,
         templates=templates,
-    ).with_media(_SEARCH_SELECT_MEDIA)
+    )
 
 
-def _filter_remove_button() -> Node:
-    return Element(
-        "button",
+def _filter_remove_button() -> SafeText:
+    return Component(
+        tag_name="button",
         attributes=[
             ("type", "button"),
             ("data-pill-remove", ""),
@@ -340,7 +338,7 @@ def _filter_remove_button() -> Node:
     )
 
 
-def _filter_value_pill(option: SearchSelectOption, kind: str) -> Node:
+def _filter_value_pill(option: SearchSelectOption, kind: str) -> SafeText:
     """An include (✓) or exclude (✗) value pill. ``kind`` is "include"/"exclude"."""
     symbol = "✓" if kind == "include" else "✗"
     css = (
@@ -359,7 +357,7 @@ def _filter_value_pill(option: SearchSelectOption, kind: str) -> Node:
     )
 
 
-def _filter_modifier_pill(modifier_value: str, label: str) -> Node:
+def _filter_modifier_pill(modifier_value: str, label: str) -> SafeText:
     """The lone, sticky modifier pill (e.g. "(Any)"/"(None)")."""
     return Span(
         attributes=[
@@ -371,9 +369,9 @@ def _filter_modifier_pill(modifier_value: str, label: str) -> Node:
     )
 
 
-def _filter_action_button(action: str, symbol: str, title: str) -> Node:
-    return Element(
-        "button",
+def _filter_action_button(action: str, symbol: str, title: str) -> SafeText:
+    return Component(
+        tag_name="button",
         attributes=[
             ("type", "button"),
             ("data-search-select-action", action),
@@ -384,7 +382,7 @@ def _filter_action_button(action: str, symbol: str, title: str) -> Node:
     )
 
 
-def _filter_option_row(value: str | int, label: str) -> Node:
+def _filter_option_row(value: str | int, label: str) -> SafeText:
     """A value row with include (+) and exclude (−) buttons."""
     return Div(
         attributes=[
@@ -406,7 +404,7 @@ def _filter_option_row(value: str | int, label: str) -> Node:
     )
 
 
-def _filter_modifier_row(modifier_value: str, label: str) -> Node:
+def _filter_modifier_row(modifier_value: str, label: str) -> SafeText:
     """A pinned pseudo-option row. It carries no ``data-search-select-option`` so the text
     filter never hides it — modifiers stay visible at the top of the panel."""
     return Div(
@@ -434,7 +432,7 @@ def FilterSelect(
     placeholder: str = "Search…",
     id: str = "",
     free_text: bool = False,
-) -> Node:
+) -> SafeText:
     """Include/exclude filter combobox built on the shared ``_combobox_shell``.
 
     Like ``SearchSelect`` but each value row carries +/− buttons that add an
@@ -472,7 +470,7 @@ def FilterSelect(
     # pills — but the stored state guarantees they never coexist, so we render
     # both channels unconditionally.  Non-presence modifiers (INCLUDES_ALL /
     # INCLUDES_ONLY) coexist with value pills and render side by side.
-    pills_children: list[Node] = []
+    pills_children: list[SafeText] = []
     if active_modifier_label:
         pills_children.append(_filter_modifier_pill(modifier, active_modifier_label))
     for option in included:
@@ -506,7 +504,7 @@ def FilterSelect(
 
     # ── Templates the JS clones: include/exclude pills (added on click), the
     #    modifier pill (when modifiers exist), and a value row (when fetched). ──
-    templates: list[Node] = [
+    templates: list[SafeText] = [
         Template(
             attributes=[("data-search-select-template", "pill-include")],
             children=[_filter_value_pill(_BLANK_OPTION, "include")],
@@ -559,7 +557,7 @@ def FilterSelect(
         always_visible=False,
         items_visible=items_visible,
         templates=templates,
-    ).with_media(_SEARCH_SELECT_MEDIA)
+    )
 
 
 def searchselect_selected(

common/layout.py

@@ -8,11 +8,9 @@ it hoists shared `<head>` content (the `_HEADERS` block, analogous to
 """
 
 import json
-from typing import TYPE_CHECKING
 
 from django.contrib.messages import get_messages
 from django.http import HttpRequest, HttpResponse
-from django.middleware.csrf import get_token
 from django.templatetags.static import static
 from django.urls import reverse
 from django.utils.html import conditional_escape
@@ -21,9 +19,6 @@ from django_htmx.jinja import django_htmx_script
 
 from games.templatetags.version import version, version_date
 
-if TYPE_CHECKING:
-    from common.components import Node
-
 # Static head script that sets the dark/light class before paint (avoids FOUC).
 _THEME_FOUC_SCRIPT = """<script>
             if (localStorage.getItem('color-theme') === 'dark' || (!('color-theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
@@ -187,16 +182,10 @@ def _main_script(mastered: bool) -> str:
     return _MAIN_SCRIPT_A + ("true" if mastered else "false") + _MAIN_SCRIPT_B
 
 
-def Navbar(*, today_played: str, last_7_played: str, current_year: int, csrf_token: str) -> "Node":
-    """Top navigation bar.
-
-    Static chrome, so it's a single ``Safe`` node wrapping its markup rather
-    than a hand-built element tree — trusted HTML belongs in a ``Safe`` node,
-    not a ``mark_safe`` string."""
-    from common.components import Safe
-
+def Navbar(*, today_played: str, last_7_played: str, current_year: int) -> SafeText:
+    """Top navigation bar."""
     logo = static("icons/schedule.png")
-    return Safe(f"""<nav class="bg-neutral-primary-soft border-b border-default">
+    return mark_safe(f"""<nav class="bg-neutral-primary-soft border-b border-default">
     <div class="max-w-(--breakpoint-xl) flex flex-wrap items-center justify-between mx-auto p-4">
         <a href="{reverse("games:index")}"
            class="flex items-center space-x-3 rtl:space-x-reverse">
@@ -271,10 +260,7 @@ def Navbar(*, today_played: str, last_7_played: str, current_year: int, csrf_tok
                     <a href="{reverse("games:stats_by_year", args=[current_year])}" class="block py-2 px-3 text-gray-900 rounded-sm hover:bg-gray-100 md:hover:bg-transparent md:border-0 md:hover:text-blue-700 md:p-0 dark:text-white md:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white md:dark:hover:bg-transparent">Stats</a>
                 </li>
                 <li>
-                    <form method="post" action="{reverse("logout")}">
-                        <input type="hidden" name="csrfmiddlewaretoken" value="{csrf_token}">
-                        <button type="submit" class="block py-2 px-3 text-gray-900 rounded-sm hover:bg-gray-100 md:hover:bg-transparent md:border-0 md:hover:text-blue-700 md:p-0 dark:text-white md:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white md:dark:hover:bg-transparent">Log out</button>
-                    </form>
+                    <a href="{reverse("logout")}" class="block py-2 px-3 text-gray-900 rounded-sm hover:bg-gray-100 md:hover:bg-transparent md:border-0 md:hover:text-blue-700 md:p-0 dark:text-white md:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white md:dark:hover:bg-transparent">Log out</a>
                 </li>
             </ul>
         </div>
@@ -283,37 +269,22 @@ def Navbar(*, today_played: str, last_7_played: str, current_year: int, csrf_tok
 
 
 def Page(
-    content: "Node | SafeText | str",
+    content: SafeText | str,
     *,
     request: HttpRequest,
     title: str = "",
-    scripts: "Node | SafeText | str" = "",
+    scripts: SafeText | str = "",
     mastered: bool = False,
 ) -> SafeText:
-    """Assemble a full HTML document around `content` (the fast_app equivalent).
-
-    Scripts are collected from `content`'s component tree: every component
-    declares its JS via `Media`, and `collect_media` gathers (deduped) the union
-    for the whole page. The `scripts` argument remains for page-specific glue
-    that isn't owned by a reusable component (e.g. the add-form helpers).
-    """
-    from common.components import ModuleScript, StaticScript, collect_media
+    """Assemble a full HTML document around `content` (the fast_app equivalent)."""
     from games.views.general import global_current_year, model_counts
 
-    media = collect_media(content)
-    collected_scripts = "".join(
-        [str(ModuleScript(name)) for name in media.js]
-        + [str(StaticScript(name)) for name in media.js_external]
-    )
-    all_scripts = collected_scripts + (str(scripts) if scripts else "")
-
     counts = model_counts(request)
     year = global_current_year(request)["global_current_year"]
     navbar = Navbar(
         today_played=counts["today_played"],
         last_7_played=counts["last_7_played"],
         current_year=year,
-        csrf_token=get_token(request),
     )
 
     messages = [
@@ -338,12 +309,9 @@ def Page(
         f'        <script src="{static("js/htmx-redirect-toast.js")}"></script>\n'
         f"        {django_htmx_script(nonce=None)}\n"
         f'        <link rel="stylesheet" href="{static("base.css")}" />\n'
-        # Vendored bundles (flowbite 2.4.1, alpinejs/@alpinejs/mask 3.15.12) —
-        # served locally so pages work offline (and in browser tests). The mask
-        # plugin must load before Alpine core; both stay deferred.
-        f'        <script src="{static("js/flowbite.min.js")}"></script>\n'
-        f'        <script defer src="{static("js/alpine-mask.min.js")}"></script>\n'
-        f'        <script defer src="{static("js/alpine.min.js")}"></script>\n'
+        '        <script src="https://cdn.jsdelivr.net/npm/flowbite@2.4.1/dist/flowbite.min.js"></script>\n'
+        '        <script defer src="https://cdn.jsdelivr.net/npm/@alpinejs/mask@3.x.x/dist/cdn.min.js"></script>\n'
+        '        <script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3.x.x/dist/cdn.min.js"></script>\n'
         f"        {_THEME_FOUC_SCRIPT}\n"
         "    </head>\n"
     )
@@ -357,7 +325,7 @@ def Page(
         f'            <div id="main-container" class="flex flex-1 flex-col pt-8 pb-16">{content}</div>\n'
         f'            <span class="fixed left-2 bottom-2 text-xs text-slate-300 dark:text-slate-600">{version()} ({version_date()})</span>\n'
         "        </div>\n"
-        f"        {all_scripts}\n"
+        f"        {scripts}\n"
         f"        {_main_script(mastered)}\n"
         "        <!-- hx-swap-oob makes sure the modal gets removed upon any HTMX response -->\n"
         '        <div id="global-modal-container" hx-swap-oob="true"></div>\n'
@@ -371,10 +339,10 @@ def Page(
 
 def render_page(
     request: HttpRequest,
-    content: "Node | SafeText | str",
+    content: SafeText | str,
     *,
     title: str = "",
-    scripts: "Node | SafeText | str" = "",
+    scripts: SafeText | str = "",
     mastered: bool = False,
     status: int = 200,
 ) -> HttpResponse:

common/time.py

@@ -1,43 +1,17 @@
 import re
 from datetime import date, datetime, timedelta
-from typing import NamedTuple
 
 from django.utils import timezone
 
 from common.utils import generate_split_ranges
 
 dateformat: str = "%d/%m/%Y"
-dateformat_hyphenated: str = "%d-%m-%Y"
 datetimeformat: str = "%d/%m/%Y %H:%M"
 timeformat: str = "%H:%M"
 durationformat: str = "%2.1H hours"
 durationformat_manual: str = "%H hours"
 
 
-class DatePartSpec(NamedTuple):
-    """One date part (day/month/year) of a hyphenated date format."""
-
-    name: str
-    placeholder: str
-    length: int
-
-
-_DATE_PART_SPECS: dict[str, DatePartSpec] = {
-    "%d": DatePartSpec("day", "DD", 2),
-    "%m": DatePartSpec("month", "MM", 2),
-    "%Y": DatePartSpec("year", "YYYY", 4),
-}
-
-
-def date_parts(format_string: str = dateformat_hyphenated) -> list[DatePartSpec]:
-    """Split a hyphenated strftime date format into its ordered parts.
-
-    ``"%d-%m-%Y"`` becomes ``[day, month, year]`` specs, each carrying the
-    placeholder text (``DD``/``MM``/``YYYY``) and digit length shown by the
-    DateRangeField segments."""
-    return [_DATE_PART_SPECS[directive] for directive in format_string.split("-")]
-
-
 def _safe_timedelta(duration: timedelta | int | None):
     if duration is None:
         return timedelta(0)

docker-compose.yml

@@ -12,7 +12,6 @@ services:
       - PUID=${PUID:-1000}
       - PGID=${PGID:-100}
       - DATA_DIR=${DATA_DIR:-/home/timetracker/app/data}
-      - CREATE_DEFAULT_SUPERUSER=${CREATE_DEFAULT_SUPERUSER:-false}
     ports:
       - "${TIMETRACKER_EXTERNAL_PORT:-8000}:8000"
     volumes:

docs/custom-element-api.md

@@ -1,51 +0,0 @@
-# Custom Element API: Two patterns, one goal
-
-## Pattern 1: Named builder (current, preferred)
-
-A tag builder with auto-attached `Media`, created via `custom_element_builder()`:
-
-```python
-# definition (custom_elements.py)
-SessionTimestampButtons = custom_element_builder("session-timestamp-buttons")
-
-# usage (session.py)
-SessionTimestampButtons(class_="form-row-button-group", hx_boost="false")[
-    Button(data_target="timestamp_start", data_type="now", size="xs")["Set to now"],
-    Button(data_target="timestamp_start", data_type="toggle", size="xs")["Toggle text"],
-]
-```
-
-**Pros:** explicit dependency, visible import, fails loudly if builder deleted  
-**Cons:** one line of ceremony per element
-
-## Pattern 2: Element + registry (proposed, not implemented)
-
-A global `CUSTOM_ELEMENT_MEDIA` dict in `core.py` that maps tag names to their `Media`. `register_element()` populates it automatically at import time, so `Element("session-timestamp-buttons")` silently picks up its JS dependency:
-
-```python
-# definition (custom_elements.py)
-register_element("session-timestamp-buttons", "SessionTimestampButtons", EmptyProps)
-# CUSTOM_ELEMENT_MEDIA["session-timestamp-buttons"] = Media(js=("dist/elements/...",))
-
-# usage (session.py) — no builder import needed
-Element("session-timestamp-buttons",
-    [("class", "form-row-button-group"), ("hx-boost", "false")],
-    children=[...],
-)
-```
-
-**Pros:** one universal API — `Div(...)`, `Button(...)`, `Element("custom-tag")` all same pattern  
-**Cons:** implicit dependency — deleting a `register_element()` call produces no error, just broken JS at runtime
-
-## Recommendation
-
-Start with Pattern 1 (named builders) — safe by default. Add Pattern 2 later if the ceremony becomes annoying. The two are **not mutually exclusive**: a named builder is just a thin wrapper around an `Element`; the registry can be added without changing any call sites.
-
-## Quick reference
-
-| Want | Write |
-|------|-------|
-| Plain HTML tag | `Div(class_="flex")["text"]` |
-| Custom element (builder) | `SessionTimestampButtons(class_="...")[child]` |
-| Raw element | `Element("custom-tag", attributes_list, children=[...])` |
-| Builder from scratch | `custom_element_builder("tag-name")` |

docs/superpowers/specs/2026-06-13-html-js-authoring-design.md

@@ -1,157 +0,0 @@
-# HTML + JS component authoring — design
-
-**Date:** 2026-06-13
-**Status:** Approved (design); pending implementation plan
-**Branch context:** follows the lazy node-tree component system (`Element`/`Safe`/`Fragment`/`Media`) and the `Children`/`Attributes` typing work.
-
-## Problem
-
-Trusted HTML and JavaScript are authored as Python f-strings in several places. Two distinct pains:
-
-- **HTML-as-string** — `Navbar`, `_TOAST_CONTAINER`, the played-row markup skeleton, and the generally verbose `Element("div", attributes=[...], children=[...])` call shape.
-- **JS-in-string** — the genuinely ugly ones: `GameStatusSelector` (~70 lines) and `SessionDeviceSelector` (~50 lines) inline an Alpine `x-data="{...}"` blob with `fetchWithHtmxTriggers`, server-value interpolation (`{game.status}`), **and** `{{ }}` brace-doubling throughout; `_PLAYED_ROW_TEMPLATE` dodges the brace collision entirely by switching to `@@TOKEN@@` placeholders + a `.replace()` loop.
-
-You cannot node-tree JavaScript, so the JS pain needs a different answer than the HTML pain. The newer widgets (`search_select`, `range_slider`, `filter_bar`) already moved behavior into real `.js` files wired by `onSwap` + `data-*` attributes; the Alpine selectors are the holdouts that still inline their JS.
-
-## Goal
-
-Establish the *right* way to author interactive, server-rendered components in this codebase, and convert a few exemplars to prove it. North-star principle:
-
-> The server never writes a line of JavaScript. The server↔client boundary is a typed, declarative contract. Behavior lives in real, tooled TypeScript files.
-
-## Decisions (locked during brainstorming)
-
-| Decision | Choice |
-| --- | --- |
-| HTML authoring | **htpy-*style* sugar on the existing `Element`** (not the htpy library) — keeps `Media`/`collect_media`, no build step |
-| JS runtime model | **Custom Elements** (Web Components), light DOM |
-| Server↔client contract | **Typed contract + codegen** (one Python `Props` type → generated TS interface + reader) |
-| JS language | **TypeScript** (real `.ts`, compiled) |
-| Build tool | **`tsc` per-module** (no bundler) — preserves per-component `Media` loading |
-| Alpine, for converted components | **Retired** — behavior rewritten as vanilla TS in the element class |
-| Exemplars | **`GameStatusSelector` + `SessionDeviceSelector` + played-row** |
-| Compiled output | **Build-only, gitignored** (produced by `make` + Docker) |
-| Existing hand-written `.js` | **Left as-is**, migrated to TS later |
-
-## Architecture
-
-Three independent layers composing through one typed seam:
-
-```
-Python (server)                          TypeScript (client)
-─────────────────                        ───────────────────
-htpy-style Element  ──renders──►  <game-status-selector       ──connectedCallback──►  game-status-selector.ts
-  + Media (kept)                     game-id="3" status="f">          (vanilla DOM behavior)
-        │                                    ▲
-        └── GameStatusSelectorProps ─codegen─┘  generated props.ts (interface + typed reader)
-            (one Python type = the whole server↔client contract)
-```
-
-- **Layer 1 — htpy-style HTML** removes HTML-string / verbose-`Element` ugliness, pure Python, no build, `Media` untouched.
-- **Layer 2 — Custom Elements (TS)** removes JS-string ugliness; behavior in real typed modules with a native lifecycle.
-- **Layer 3 — Typed contract codegen** makes the seam type-safe in both languages from a single Python source.
-
-### Layer 1 — htpy-style sugar on `Element`
-
-Additive only. Existing `Element("div", attributes=[...], children=[...])` and `Div([("class","x")], "hi")` keep working.
-
-- **Attributes as kwargs:** `Div(class_="card", hx_get="/x", disabled=True)`. Translation: trailing `_` stripped (`class_`→`class`); inner `_`→`-` (`hx_get`→`hx-get`, `data_id`→`data-id`); `True`→bare attribute, `False`/`None`→omitted.
-- **Children via `[]`:** `Div(class_="card")[H1["Title"], body]`. `Element.__getitem__` normalizes through the existing `as_children` and returns an `Element` carrying the same attributes and media.
-
-The result is still a walkable `Element` tree, so `collect_media` / `Media` are unaffected. This is the "htpy feel on our own node so the asset system survives" decision.
-
-Example:
-
-```python
-Div(class_="flex gap-2 items-center")[
-    Icon("play"),
-    Span(class_="label")[name],
-]
-```
-
-### Layer 2 — Custom Elements (TypeScript, light DOM)
-
-- Python builder emits a **semantic tag**: `Element("game-status-selector", attrs).with_media(Media(js=("dist/elements/game-status-selector.js",)))`.
-- **Light DOM** (no shadow root — Tailwind's global classes must apply). The server renders the inner markup (htpy-style); the element enhances it.
-- **Native lifecycle replaces `onSwap`:** `connectedCallback()` fires when the browser parses or htmx-swaps the element in; `disconnectedCallback()` provides free teardown. No init registry, no guard flags.
-- Behavior is **vanilla TS** — the element class owns its state (dropdown open/closed, PATCH-on-select via `fetchWithHtmxTriggers`). Alpine retired for these three.
-- Source `ts/elements/<tag>.ts` → compiled `games/static/js/dist/elements/<tag>.js`, loaded only on pages that use it (via `Media`).
-
-### Layer 3 — Typed contract (one Python type → the whole seam)
-
-Each element declares its props once, in Python:
-
-```python
-class GameStatusSelectorProps(TypedDict):
-    game_id: int
-    status: str
-    csrf: str
-```
-
-- The **Python builder** takes these typed args and serializes them to kebab-case attributes (`game-id="3"`).
-- **Codegen** reads the registered Props types and emits, per component, into `ts/generated/props.ts`:
-  - an **interface** — `GameStatusSelectorProps { gameId: number; status: string; csrf: string }`, and
-  - a **typed reader** — `readGameStatusSelectorProps(el): GameStatusSelectorProps` that pulls and parses attributes (`Number(el.getAttribute("game-id"))`, etc.).
-- The element imports the generated reader. The entire server↔client boundary is generated from one Python type: rename `game_id` in Python, regenerate, and `tsc` fails until the element updates. Drift is caught at build time; no hand-written `getAttribute` soup, no silent attr-name drift.
-
-Type map: `int`/`float` → `number`, `str` → `string`, `bool` → `boolean`. Field `game_id` → attr `game-id` → TS prop `gameId`. Reader parsing follows the type (number → `Number(...)`, bool → presence / `=== "true"`, string → `getAttribute(...) ?? ""`).
-
-## Toolchain (`tsc` per-module, build-only)
-
-Layout:
-
-```
-ts/
-  elements/game-status-selector.ts      # hand-written element classes
-  generated/props.ts                     # codegen output (gitignored)
-  globals.d.ts                           # ambient: window.fetchWithHtmxTriggers, htmx
-tsconfig.json                            # strict, ES2022, lib [ES2022, DOM, DOM.Iterable]
-                                         # rootDir: ts/  →  outDir: games/static/js/dist/
-```
-
-- **`games/static/js/dist/` is the only compiled output**, trivially gitignored, never colliding with hand-written `.js`. `Media` references `dist/elements/...`.
-- **package.json**: add `typescript` devDep; scripts `build:ts` (`tsc -p tsconfig.json`), `watch:ts` (`tsc -p tsconfig.json --watch`).
-- **Makefile**: `make ts` = codegen → `tsc`; `make dev` also runs `tsc --watch` (beside Django runserver + Tailwind watch); `make check` gains `tsc --noEmit` as a drift gate.
-- **.gitignore**: `games/static/js/dist/`, `ts/generated/`.
-- **Docker**: add a `make ts` step in the image build (npm already present for Tailwind); compiled JS baked into the image. Runtime stays offline.
-- **TS lint/format**: deferred — `tsc --strict` is the only gate for now.
-
-### Codegen mechanics
-
-- A registry maps `tag → Props type` (e.g. a decorator `@element("game-status-selector", GameStatusSelectorProps)` on the Python builder, collected into a module-level registry).
-- A Django management command (or script) imports the registry and writes `ts/generated/props.ts` (interface + reader per component).
-- **Ordering:** codegen runs before `tsc` (the generated file is a `tsc` input). CI runs codegen then `tsc --noEmit`, so Python/TS drift fails the build. No committed generated artifact to diff against — `tsc` failing on drift is the gate.
-
-## Exemplar conversions
-
-1. **`GameStatusSelector` → `<game-status-selector game-id status csrf>`** — Python builds the light-DOM htpy-style; `game-status-selector.ts` wires the dropdown toggle + click→PATCH `/api/games/{id}/status` via `fetchWithHtmxTriggers` with CSRF, and updates the displayed status. Deletes the ~70-line f-string + brace-doubling.
-2. **`SessionDeviceSelector` → `<session-device-selector>`** — same shape; PATCH `/api/session/{id}/device`.
-3. **played-row → `<play-event-row>`** (non-Alpine) — deletes `_PLAYED_ROW_TEMPLATE` and the `@@TOKEN@@` / `.replace()` hack; Python builds markup htpy-style; `play-event-row.ts` owns the dropdown + add-playthrough POST. URLs are server-reversed and passed as attributes. Proves the pattern is not Alpine-only.
-
-## Testing
-
-- **Python**: builders render the correct tag + attributes (extend `test_components` / `test_rendered_pages`); assert no f-string remnants remain.
-- **Type-check**: `tsc --noEmit` in `make check` — type errors, including contract drift, fail CI.
-- **e2e (Playwright)**: real Chromium upgrades the custom elements natively; port/extend the existing widget-e2e pattern for all three (open dropdown → select → PATCH → DOM updates).
-
-## Risks and mitigations
-
-1. **Element module must be loaded before its tag appears.** Full-page render loads the module via `Media`; htmx row-swaps reuse the already-defined element. Constraint to document: a fragment response that introduces a brand-new element type must include that element's `Media`. (Same limitation class as today's "`onSwap` needs the script present.")
-2. **A build step is now required** for `make dev` and Docker. One-time wiring, mitigated by Make/Docker integration.
-3. **First TypeScript in the repo** — adds `typescript`, `tsconfig.json`, a Docker build step. Scoped to `ts/`; existing `.js` untouched.
-4. **CSRF/PATCH parity** — the vanilla TS must replicate the Alpine version's fetch/CSRF/`HX-Trigger` behavior; it reuses the existing `fetchWithHtmxTriggers`; e2e guards it.
-5. **Codegen ↔ build ordering** — codegen must precede `tsc`; encoded in `make ts`.
-
-## Out of scope (YAGNI)
-
-- Migrating the existing hand-written `.js` to TypeScript (later, incrementally).
-- Bundling / minification of app JS.
-- Shadow DOM / scoped styles.
-- A general island / props-blob hydration runtime (custom elements cover these three).
-- TS lint/format tooling (prettier/eslint).
-
-## Future on-ramps (not now)
-
-- **More custom elements**: migrate the remaining `onSwap` widgets to custom elements once the pattern is proven.
-- **Existing `.js` → TS**: incremental, file by file (`tsc` checks mixed projects).
-- The typed contract already positions the boundary for full type-safety as more client code becomes TS.

e2e/conftest.py

@@ -7,7 +7,6 @@ import pytest
 # synchronous operations inside the async context safely.
 os.environ.setdefault("DJANGO_ALLOW_ASYNC_UNSAFE", "true")
 
-
 @pytest.fixture(scope="session")
 def browser_type_launch_args(browser_type_launch_args):
     # Try to find a system-installed Google Chrome or Chromium to bypass Nix/NixOS shared library issues

e2e/test_boolean_filter_e2e.py

@@ -21,10 +21,9 @@ def _bar_page(filter_json: str = "") -> str:
 <html>
 <head>
     <title>Boolean filter E2E</title>
-    <script src="/static/js/htmx.min.js"></script>
-    <script src="/static/js/range_slider.js" type="module"></script>
-    <script src="/static/js/search_select.js" type="module"></script>
-    <script src="/static/js/filter_bar.js" type="module"></script>
+    <script src="/static/js/range_slider.js" defer></script>
+    <script src="/static/js/search_select.js" defer></script>
+    <script src="/static/js/filter_bar.js" defer></script>
 </head>
 <body>
     {FilterBar(filter_json=filter_json, preset_list_url="/p/l", preset_save_url="/p/s")}

e2e/test_custom_elements_e2e.py

@@ -1,84 +0,0 @@
-import pytest
-from django.urls import reverse
-from playwright.sync_api import Page, expect
-
-
-@pytest.fixture
-def authenticated_page(live_server, page: Page, django_user_model) -> Page:
-    django_user_model.objects.create_user(username="tester", password="secret123")
-    page.goto(f"{live_server.url}{reverse('login')}")
-    page.fill('input[name="username"]', "tester")
-    page.fill('input[name="password"]', "secret123")
-    page.click('input[type="submit"]')
-    page.wait_for_url(f"{live_server.url}/tracker**")
-    return page
-
-
-@pytest.mark.django_db
-def test_game_status_selector_opens_and_patches(authenticated_page: Page, live_server):
-    from games.models import Game, Platform
-
-    platform = Platform.objects.create(name="PC", icon="pc")
-    game = Game.objects.create(name="Test Game", platform=platform, status="u")
-
-    page = authenticated_page
-    page.goto(f"{live_server.url}{reverse('games:list_games')}")
-
-    host = page.locator("game-status-selector").first
-    expect(host).to_be_attached()
-    host.locator("[data-toggle]").click()
-    expect(host.locator("[data-menu]")).to_be_visible()
-    with page.expect_response(
-        lambda r: "/status" in r.url and r.request.method == "PATCH"
-    ):
-        host.locator('[data-option][data-value="f"]').click()
-    expect(host.locator("[data-menu]")).to_be_hidden()
-    game.refresh_from_db()
-    assert game.status == "f"
-
-
-@pytest.mark.django_db
-def test_session_device_selector_patches(authenticated_page: Page, live_server):
-    from games.models import Device, Game, Platform, Session
-
-    platform = Platform.objects.create(name="PC", icon="pc")
-    game = Game.objects.create(name="Test Game", platform=platform)
-    desktop = Device.objects.create(name="Desktop")
-    deck = Device.objects.create(name="Deck")
-    session = Session.objects.create(
-        game=game, device=desktop, timestamp_start="2025-01-01 00:00:00+00:00"
-    )
-
-    page = authenticated_page
-    page.goto(f"{live_server.url}{reverse('games:list_sessions')}")
-
-    host = page.locator("session-device-selector").first
-    expect(host).to_be_attached()
-    host.locator("[data-toggle]").click()
-    with page.expect_response(
-        lambda r: "/device" in r.url and r.request.method == "PATCH"
-    ):
-        host.locator(f'[data-option][data-value="{deck.id}"]').click()
-    session.refresh_from_db()
-    assert session.device_id == deck.id
-
-
-@pytest.mark.django_db
-def test_play_event_row_increments(authenticated_page: Page, live_server):
-    from games.models import Game, Platform
-
-    platform = Platform.objects.create(name="PC", icon="pc")
-    game = Game.objects.create(name="Test Game", platform=platform)
-
-    page = authenticated_page
-    page.goto(f"{live_server.url}{reverse('games:view_game', args=[game.id])}")
-
-    host = page.locator("play-event-row").first
-    expect(host).to_be_attached()
-    host.locator("[data-toggle]").click()
-    with page.expect_response(
-        lambda r: "playevent" in r.url.lower() and r.request.method == "POST"
-    ):
-        host.locator("[data-add-play]").click()
-    expect(host.locator("[data-count]")).to_have_text("1")
-    assert game.playevents.count() == 1

e2e/test_date_filter_e2e.py

@@ -5,10 +5,6 @@ cannot reach: ``filter_bar.js`` reading the two ``<input type="date">``
 elements, building a ``DateCriterion`` JSON object, and navigating the
 browser to ``?filter=<encoded>``.
 
-The native ``<input type="date">`` path is exercised through the Refunded
-field — the Purchased field now uses the DateRangePicker component, covered
-by ``test_date_range_picker_e2e.py``.
-
 Renders the bar at its own custom URL so the test doesn't need to auth
 against the real app — the bar's JS doesn't care what route serves it.
 """
@@ -29,10 +25,9 @@ def _bar_page(filter_json: str = "") -> str:
 <html>
 <head>
     <title>Date filter E2E</title>
-    <script src="/static/js/htmx.min.js"></script>
-    <script src="/static/js/range_slider.js" type="module"></script>
-    <script src="/static/js/search_select.js" type="module"></script>
-    <script src="/static/js/filter_bar.js" type="module"></script>
+    <script src="/static/js/range_slider.js" defer></script>
+    <script src="/static/js/search_select.js" defer></script>
+    <script src="/static/js/filter_bar.js" defer></script>
 </head>
 <body>
     {PurchaseFilterBar(filter_json=filter_json, preset_list_url="/p/l", preset_save_url="/p/s")}
@@ -47,7 +42,7 @@ def empty_bar_view(request):
 def prefilled_bar_view(request):
     filter_json = json.dumps(
         {
-            "date_refunded": {
+            "date_purchased": {
                 "value": "2024-03-15",
                 "value2": "2024-09-20",
                 "modifier": "BETWEEN",
@@ -75,8 +70,8 @@ def _filter_from_url(url: str) -> dict:
 @override_settings(ROOT_URLCONF="e2e.test_date_filter_e2e")
 def test_both_dates_serializes_as_between(live_server, page):
     page.goto(live_server.url + "/test-date-filter/")
-    page.locator('input[name="filter-date-refunded-min"]').fill("2024-01-01")
-    page.locator('input[name="filter-date-refunded-max"]').fill("2024-12-31")
+    page.locator('input[name="filter-date-purchased-min"]').fill("2024-01-01")
+    page.locator('input[name="filter-date-purchased-max"]').fill("2024-12-31")
     with page.expect_navigation():
         page.evaluate(
             "document.getElementById('filter-bar-form')"
@@ -84,7 +79,7 @@ def test_both_dates_serializes_as_between(live_server, page):
         )
     parsed = _filter_from_url(page.url)
     assert parsed == {
-        "date_refunded": {
+        "date_purchased": {
             "value": "2024-01-01",
             "value2": "2024-12-31",
             "modifier": "BETWEEN",
@@ -96,7 +91,7 @@ def test_both_dates_serializes_as_between(live_server, page):
 @override_settings(ROOT_URLCONF="e2e.test_date_filter_e2e")
 def test_min_only_serializes_as_greater_than(live_server, page):
     page.goto(live_server.url + "/test-date-filter/")
-    page.locator('input[name="filter-date-refunded-min"]').fill("2024-06-15")
+    page.locator('input[name="filter-date-purchased-min"]').fill("2024-06-15")
     with page.expect_navigation():
         page.evaluate(
             "document.getElementById('filter-bar-form')"
@@ -104,10 +99,10 @@ def test_min_only_serializes_as_greater_than(live_server, page):
         )
     parsed = _filter_from_url(page.url)
     assert parsed == {
-        "date_refunded": {"value": "2024-06-15", "modifier": "GREATER_THAN"}
+        "date_purchased": {"value": "2024-06-15", "modifier": "GREATER_THAN"}
     }
     # value2 must not be present when there's no upper bound.
-    assert "value2" not in parsed["date_refunded"]
+    assert "value2" not in parsed["date_purchased"]
 
 
 @pytest.mark.django_db
@@ -121,7 +116,9 @@ def test_max_only_serializes_as_less_than(live_server, page):
             ".dispatchEvent(new Event('submit', {cancelable: true}))"
         )
     parsed = _filter_from_url(page.url)
-    assert parsed == {"date_refunded": {"value": "2025-06-30", "modifier": "LESS_THAN"}}
+    assert parsed == {
+        "date_refunded": {"value": "2025-06-30", "modifier": "LESS_THAN"}
+    }
 
 
 @pytest.mark.django_db
@@ -147,11 +144,11 @@ def test_prefilled_bar_reflects_existing_filter_in_inputs(live_server, page):
     re-submits the same bounds unchanged."""
     page.goto(live_server.url + "/test-date-filter-prefilled/")
     assert (
-        page.locator('input[name="filter-date-refunded-min"]').input_value()
+        page.locator('input[name="filter-date-purchased-min"]').input_value()
         == "2024-03-15"
     )
     assert (
-        page.locator('input[name="filter-date-refunded-max"]').input_value()
+        page.locator('input[name="filter-date-purchased-max"]').input_value()
         == "2024-09-20"
     )
     with page.expect_navigation():
@@ -160,7 +157,7 @@ def test_prefilled_bar_reflects_existing_filter_in_inputs(live_server, page):
             ".dispatchEvent(new Event('submit', {cancelable: true}))"
         )
     parsed = _filter_from_url(page.url)
-    assert parsed["date_refunded"] == {
+    assert parsed["date_purchased"] == {
         "value": "2024-03-15",
         "value2": "2024-09-20",
         "modifier": "BETWEEN",

e2e/test_date_range_picker_e2e.py

@@ -1,326 +0,0 @@
-"""End-to-end Playwright tests for the DateRangePicker component.
-
-Exercises the behaviour layers the rendering tests cannot reach
-(``date_range_picker.js``): segmented digit entry with right-to-left
-placeholder fill and auto-advance, Backspace reverting a part, the calendar
-popup's anchor-style range picking, presets, the Cancel / Clear / Select
-footer, and the ``filter_bar.js`` serialization of the hidden ISO inputs
-into a ``DateCriterion``.
-
-Like the other filter-bar e2e modules, the bar is served from its own
-minimal URLconf (no auth, no CSS) — the JS only cares about the DOM.
-"""
-
-import datetime
-import json
-import urllib.parse
-
-import pytest
-from django.http import HttpResponse
-from django.test import override_settings
-
-from common.components import PurchaseFilterBar
-from django.urls import path
-
-
-def _bar_page(filter_json: str = "") -> str:
-    return f"""<!DOCTYPE html>
-<html>
-<head>
-    <title>Date range picker E2E</title>
-    <script src="/static/js/htmx.min.js"></script>
-    <script src="/static/js/range_slider.js" type="module"></script>
-    <script src="/static/js/search_select.js" type="module"></script>
-    <script src="/static/js/date_range_picker.js" defer></script>
-    <script src="/static/js/filter_bar.js" type="module"></script>
-</head>
-<body>
-    {PurchaseFilterBar(filter_json=filter_json, preset_list_url="/p/l", preset_save_url="/p/s")}
-</body>
-</html>"""
-
-
-def empty_bar_view(request):
-    return HttpResponse(_bar_page())
-
-
-def prefilled_bar_view(request):
-    filter_json = json.dumps(
-        {
-            "date_purchased": {
-                "value": "2024-03-15",
-                "value2": "2024-09-20",
-                "modifier": "BETWEEN",
-            }
-        }
-    )
-    return HttpResponse(_bar_page(filter_json))
-
-
-urlpatterns = [
-    path("test-date-range-picker/", empty_bar_view),
-    path("test-date-range-picker-prefilled/", prefilled_bar_view),
-]
-
-
-PICKER = '[data-date-range-picker][data-input-name-prefix="filter-date-purchased"]'
-POPUP = PICKER + " [data-date-range-calendar]"
-HIDDEN_MIN = 'input[name="filter-date-purchased-min"]'
-HIDDEN_MAX = 'input[name="filter-date-purchased-max"]'
-
-
-def _segment(page, side: str, part: str):
-    return page.locator(
-        f'{PICKER} input[data-date-side="{side}"][data-date-part="{part}"]'
-    )
-
-
-def _day_cell(page, iso_date: str):
-    return page.locator(
-        f'{PICKER} [data-date-range-grid] button[data-date="{iso_date}"]'
-    )
-
-
-def _popup_is_open(page) -> bool:
-    return "hidden" not in (page.locator(POPUP).get_attribute("class") or "")
-
-
-def _submit_filter_bar(page):
-    with page.expect_navigation():
-        page.evaluate(
-            "document.getElementById('filter-bar-form')"
-            ".dispatchEvent(new Event('submit', {cancelable: true}))"
-        )
-
-
-def _filter_from_url(url: str) -> dict:
-    query = urllib.parse.urlparse(url).query
-    params = urllib.parse.parse_qs(query)
-    raw = params.get("filter", [""])[0]
-    return json.loads(raw) if raw else {}
-
-
-# ── Segmented manual entry ──────────────────────────────────────────────────
-
-
-@pytest.mark.django_db
-@override_settings(ROOT_URLCONF="e2e.test_date_range_picker_e2e")
-def test_typing_fills_parts_and_serializes_between(live_server, page):
-    """Digits flow through the parts (DD → MM → YYYY → DD …) with
-    auto-advance, ending in a BETWEEN criterion on submit."""
-    page.goto(live_server.url + "/test-date-range-picker/")
-    _segment(page, "min", "day").click()
-    page.keyboard.type("1503202420092024")
-    assert page.locator(HIDDEN_MIN).input_value() == "2024-03-15"
-    assert page.locator(HIDDEN_MAX).input_value() == "2024-09-20"
-    _submit_filter_bar(page)
-    parsed = _filter_from_url(page.url)
-    assert parsed == {
-        "date_purchased": {
-            "value": "2024-03-15",
-            "value2": "2024-09-20",
-            "modifier": "BETWEEN",
-        }
-    }
-
-
-@pytest.mark.django_db
-@override_settings(ROOT_URLCONF="e2e.test_date_range_picker_e2e")
-def test_placeholder_fills_from_the_right(live_server, page):
-    """Typing 19 into the YYYY part shows YYY1 then YY19."""
-    page.goto(live_server.url + "/test-date-range-picker/")
-    year_segment = _segment(page, "min", "year")
-    year_segment.click()
-    page.keyboard.press("1")
-    assert year_segment.input_value() == "YYY1"
-    page.keyboard.press("9")
-    assert year_segment.input_value() == "YY19"
-
-
-@pytest.mark.django_db
-@override_settings(ROOT_URLCONF="e2e.test_date_range_picker_e2e")
-def test_min_side_only_serializes_greater_than(live_server, page):
-    page.goto(live_server.url + "/test-date-range-picker/")
-    _segment(page, "min", "day").click()
-    page.keyboard.type("15062024")
-    _submit_filter_bar(page)
-    parsed = _filter_from_url(page.url)
-    assert parsed == {
-        "date_purchased": {"value": "2024-06-15", "modifier": "GREATER_THAN"}
-    }
-
-
-@pytest.mark.django_db
-@override_settings(ROOT_URLCONF="e2e.test_date_range_picker_e2e")
-def test_backspace_reverts_part_to_placeholder(live_server, page):
-    page.goto(live_server.url + "/test-date-range-picker/")
-    _segment(page, "min", "day").click()
-    page.keyboard.type("15032024")
-    assert page.locator(HIDDEN_MIN).input_value() == "2024-03-15"
-    month_segment = _segment(page, "min", "month")
-    month_segment.click()
-    page.keyboard.press("Backspace")
-    assert month_segment.input_value() == ""
-    # An incomplete date no longer commits to the hidden input.
-    assert page.locator(HIDDEN_MIN).input_value() == ""
-
-
-@pytest.mark.django_db
-@override_settings(ROOT_URLCONF="e2e.test_date_range_picker_e2e")
-def test_only_numbers_can_be_typed(live_server, page):
-    page.goto(live_server.url + "/test-date-range-picker/")
-    day_segment = _segment(page, "min", "day")
-    day_segment.click()
-    page.keyboard.type("ab-/")
-    assert day_segment.input_value() == ""
-
-
-@pytest.mark.django_db
-@override_settings(ROOT_URLCONF="e2e.test_date_range_picker_e2e")
-def test_invalid_calendar_date_does_not_commit(live_server, page):
-    """31-02-2024 fills all parts but is not a real date — no hidden value."""
-    page.goto(live_server.url + "/test-date-range-picker/")
-    _segment(page, "min", "day").click()
-    page.keyboard.type("31022024")
-    assert page.locator(HIDDEN_MIN).input_value() == ""
-
-
-@pytest.mark.django_db
-@override_settings(ROOT_URLCONF="e2e.test_date_range_picker_e2e")
-def test_clicking_container_activates_first_part(live_server, page):
-    page.goto(live_server.url + "/test-date-range-picker/")
-    page.locator(PICKER + " [data-date-range-field]").click(position={"x": 5, "y": 5})
-    focused = page.evaluate(
-        "document.activeElement.getAttribute('data-date-part') + ':' +"
-        "document.activeElement.getAttribute('data-date-side')"
-    )
-    assert focused == "day:min"
-
-
-# ── Calendar popup ──────────────────────────────────────────────────────────
-
-
-def _open_calendar(page):
-    page.locator(PICKER + " [data-date-range-calendar-toggle]").click()
-
-
-def _current_month_iso(day_of_month: int) -> str:
-    today = datetime.date.today()
-    return today.replace(day=day_of_month).isoformat()
-
-
-@pytest.mark.django_db
-@override_settings(ROOT_URLCONF="e2e.test_date_range_picker_e2e")
-def test_calendar_pick_range_then_select(live_server, page):
-    page.goto(live_server.url + "/test-date-range-picker/")
-    _open_calendar(page)
-    assert _popup_is_open(page)
-    first_pick = _current_month_iso(10)
-    second_pick = _current_month_iso(20)
-    _day_cell(page, first_pick).click()
-    assert page.locator(HIDDEN_MIN).input_value() == first_pick
-    assert page.locator(HIDDEN_MAX).input_value() == ""
-    _day_cell(page, second_pick).click()
-    assert page.locator(HIDDEN_MAX).input_value() == second_pick
-    page.locator(PICKER + " [data-date-range-select]").click()
-    assert not _popup_is_open(page)
-    _submit_filter_bar(page)
-    parsed = _filter_from_url(page.url)
-    assert parsed == {
-        "date_purchased": {
-            "value": first_pick,
-            "value2": second_pick,
-            "modifier": "BETWEEN",
-        }
-    }
-
-
-@pytest.mark.django_db
-@override_settings(ROOT_URLCONF="e2e.test_date_range_picker_e2e")
-def test_picking_before_start_restarts_the_range(live_server, page):
-    """With the StartDate anchored, picking an earlier date clears the range
-    and the clicked date becomes the new StartDate."""
-    page.goto(live_server.url + "/test-date-range-picker/")
-    _open_calendar(page)
-    _day_cell(page, _current_month_iso(20)).click()
-    _day_cell(page, _current_month_iso(10)).click()
-    assert page.locator(HIDDEN_MIN).input_value() == _current_month_iso(10)
-    assert page.locator(HIDDEN_MAX).input_value() == ""
-
-
-@pytest.mark.django_db
-@override_settings(ROOT_URLCONF="e2e.test_date_range_picker_e2e")
-def test_completed_range_anchor_moves_to_end(live_server, page):
-    """After both dates are picked the EndDate becomes the anchor, so a
-    further pick inside the range moves the StartDate."""
-    page.goto(live_server.url + "/test-date-range-picker/")
-    _open_calendar(page)
-    _day_cell(page, _current_month_iso(10)).click()
-    _day_cell(page, _current_month_iso(20)).click()
-    _day_cell(page, _current_month_iso(15)).click()
-    assert page.locator(HIDDEN_MIN).input_value() == _current_month_iso(15)
-    assert page.locator(HIDDEN_MAX).input_value() == _current_month_iso(20)
-
-
-@pytest.mark.django_db
-@override_settings(ROOT_URLCONF="e2e.test_date_range_picker_e2e")
-def test_preset_fills_both_dates(live_server, page):
-    page.goto(live_server.url + "/test-date-range-picker/")
-    _open_calendar(page)
-    page.locator(PICKER + ' [data-date-range-preset="last_7_days"]').click()
-    today = datetime.date.today()
-    assert (
-        page.locator(HIDDEN_MIN).input_value()
-        == (today - datetime.timedelta(days=6)).isoformat()
-    )
-    assert page.locator(HIDDEN_MAX).input_value() == today.isoformat()
-    # Presets keep the popup open; Select commits and closes.
-    assert _popup_is_open(page)
-
-
-@pytest.mark.django_db
-@override_settings(ROOT_URLCONF="e2e.test_date_range_picker_e2e")
-def test_clear_clears_dates_but_keeps_popup_open(live_server, page):
-    page.goto(live_server.url + "/test-date-range-picker/")
-    _open_calendar(page)
-    _day_cell(page, _current_month_iso(10)).click()
-    _day_cell(page, _current_month_iso(20)).click()
-    page.locator(PICKER + " [data-date-range-clear]").click()
-    assert page.locator(HIDDEN_MIN).input_value() == ""
-    assert page.locator(HIDDEN_MAX).input_value() == ""
-    assert _popup_is_open(page)
-
-
-@pytest.mark.django_db
-@override_settings(ROOT_URLCONF="e2e.test_date_range_picker_e2e")
-def test_cancel_clears_dates_and_closes_popup(live_server, page):
-    page.goto(live_server.url + "/test-date-range-picker/")
-    _open_calendar(page)
-    _day_cell(page, _current_month_iso(10)).click()
-    _day_cell(page, _current_month_iso(20)).click()
-    page.locator(PICKER + " [data-date-range-cancel]").click()
-    assert page.locator(HIDDEN_MIN).input_value() == ""
-    assert page.locator(HIDDEN_MAX).input_value() == ""
-    assert not _popup_is_open(page)
-
-
-# ── Prefill round-trip ──────────────────────────────────────────────────────
-
-
-@pytest.mark.django_db
-@override_settings(ROOT_URLCONF="e2e.test_date_range_picker_e2e")
-def test_prefilled_picker_round_trips_unchanged(live_server, page):
-    page.goto(live_server.url + "/test-date-range-picker-prefilled/")
-    assert _segment(page, "min", "day").input_value() == "15"
-    assert _segment(page, "min", "month").input_value() == "03"
-    assert _segment(page, "min", "year").input_value() == "2024"
-    assert _segment(page, "max", "day").input_value() == "20"
-    assert page.locator(HIDDEN_MIN).input_value() == "2024-03-15"
-    assert page.locator(HIDDEN_MAX).input_value() == "2024-09-20"
-    _submit_filter_bar(page)
-    parsed = _filter_from_url(page.url)
-    assert parsed["date_purchased"] == {
-        "value": "2024-03-15",
-        "value2": "2024-09-20",
-        "modifier": "BETWEEN",
-    }

e2e/test_range_slider_e2e.py

@@ -1,4 +1,8 @@
-"""End-to-end Playwright test for the RangeSlider JS synchronization, cross-over, and clamping behavior."""
+"""End-to-end Playwright test for the RangeSlider JS synchronization, cross-over, and clamping behavior.
+"""
+
+import json
+import urllib.parse
 
 import pytest
 from django.http import HttpResponse
@@ -13,10 +17,9 @@ def _bar_page(filter_json: str = "") -> str:
 <html>
 <head>
     <title>Range Slider E2E</title>
-    <script src="/static/js/htmx.min.js"></script>
-    <script src="/static/js/range_slider.js" type="module"></script>
-    <script src="/static/js/search_select.js" type="module"></script>
-    <script src="/static/js/filter_bar.js" type="module"></script>
+    <script src="/static/js/range_slider.js" defer></script>
+    <script src="/static/js/search_select.js" defer></script>
+    <script src="/static/js/filter_bar.js" defer></script>
 </head>
 <body>
     {FilterBar(filter_json=filter_json, preset_list_url="/p/l", preset_save_url="/p/s")}
@@ -97,9 +100,7 @@ def test_range_slider_empty_max_thumb_does_not_jump_to_beginning(live_server, pa
     page.goto(live_server.url + "/test-range-slider/")
     
     # Locate handles
-    max_handle = page.locator(
-        '.range-handle-max[data-target="filter-session-count-max"]'
-    )
+    max_handle = page.locator('.range-handle-max[data-target="filter-session-count-max"]')
     
     # Initially, max_input is empty, so handle should sit at 100% (far right)
     style = max_handle.get_attribute("style")

e2e/test_search_select_e2e.py

@@ -4,43 +4,35 @@ from django.http import HttpResponse
 from django.test import override_settings
 from common.components import SearchSelect
 
-
 def e2e_test_view(request):
     html = f"""
     <!DOCTYPE html>
     <html>
     <head>
         <title>SearchSelect E2E Test</title>
-        <!-- search_select.js is an ES module and initializes via onSwap(),
-             which rides on htmx.onLoad — so htmx must be present. -->
-        <script src="/static/js/htmx.min.js"></script>
-        <script type="module" src="/static/js/search_select.js"></script>
+        <script src="/static/js/search_select.js" defer></script>
     </head>
     <body>
         <div style="padding: 50px;">
-            {
-        SearchSelect(
+            {SearchSelect(
                 name="games",
                 selected=[{"value": "7", "label": "Game A", "data": {}}],
                 options=[
                     {"value": "7", "label": "Game A", "data": {}},
                     {"value": "8", "label": "Game B", "data": {}},
                 ],
-            multi_select=False,
-        )
-    }
+                multi_select=False
+            )}
         </div>
     </body>
     </html>
     """
     return HttpResponse(html)
 
-
 urlpatterns = [
     path("test-search-select/", e2e_test_view),
 ]
 
-
 @pytest.mark.django_db
 @override_settings(ROOT_URLCONF="e2e.test_search_select_e2e")
 def test_search_select_backspace_clears_single_select(live_server, page):

e2e/test_string_filter_e2e.py

@@ -16,10 +16,9 @@ def _bar_page(filter_json: str = "") -> str:
 <html>
 <head>
     <title>String filter E2E</title>
-    <script src="/static/js/htmx.min.js"></script>
-    <script src="/static/js/range_slider.js" type="module"></script>
-    <script src="/static/js/search_select.js" type="module"></script>
-    <script src="/static/js/filter_bar.js" type="module"></script>
+    <script src="/static/js/range_slider.js" defer></script>
+    <script src="/static/js/search_select.js" defer></script>
+    <script src="/static/js/filter_bar.js" defer></script>
 </head>
 <body>
     {PlatformFilterBar(filter_json=filter_json, preset_list_url="/p/l", preset_save_url="/p/s")}
@@ -38,7 +37,9 @@ def prefilled_bar_view(request):
                 "value": "Switch",
                 "modifier": "INCLUDES",
             },
-            "group": {"modifier": "IS_NULL"},
+            "group": {
+                "modifier": "IS_NULL"
+            }
         }
     )
     return HttpResponse(_bar_page(filter_json=filter_json))
@@ -71,9 +72,7 @@ def test_string_filter_defaults_and_toggles(live_server, page):
 
     # 2. Enter values, click "includes" (INCLUDES), and submit
     name_input.fill("PlayStation")
-    includes_radio = page.locator(
-        'input[name="filter-name-modifier"][value="INCLUDES"]'
-    )
+    includes_radio = page.locator('input[name="filter-name-modifier"][value="INCLUDES"]')
     includes_radio.click()
     
     with page.expect_navigation():
@@ -121,16 +120,12 @@ def test_string_filter_prefilled_states(live_server, page):
     # Verifies name matches "Switch" and "includes" is checked
     assert name_input.input_value() == "Switch"
     assert name_input.is_enabled()
-    assert page.locator(
-        'input[name="filter-name-modifier"][value="INCLUDES"]'
-    ).is_checked()
+    assert page.locator('input[name="filter-name-modifier"][value="INCLUDES"]').is_checked()
     
     # Verifies group is empty, disabled, and "is null" is checked
     assert group_input.input_value() == ""
     assert not group_input.is_enabled()
-    assert page.locator(
-        'input[name="filter-group-modifier"][value="IS_NULL"]'
-    ).is_checked()
+    assert page.locator('input[name="filter-group-modifier"][value="IS_NULL"]').is_checked()
 
 
 @pytest.mark.django_db

e2e/test_widgets_e2e.py

@@ -1,135 +0,0 @@
-"""Browser tests for widget JavaScript (search_select.js, range_slider.js,
-add_purchase.js) and their onSwap() initialization lifecycle.
-
-These run a real Chromium via pytest-playwright against pytest-django's
-``live_server``. All JavaScript under test is served locally from
-``games/static/js/`` (htmx, Alpine, Flowbite and the widget files are
-vendored), so no network access is needed beyond the live server itself.
-
-Browser binaries must be installed once: ``uv run playwright install chromium``.
-"""
-
-import pytest
-from django.urls import reverse
-from playwright.sync_api import Page, expect
-
-
-@pytest.fixture
-def authenticated_page(live_server, page: Page, django_user_model) -> Page:
-    django_user_model.objects.create_user(username="tester", password="secret123")
-    page.goto(f"{live_server.url}{reverse('login')}")
-    page.fill('input[name="username"]', "tester")
-    page.fill('input[name="password"]', "secret123")
-    page.click('input[type="submit"]')
-    page.wait_for_url(f"{live_server.url}/tracker**")
-    return page
-
-
-def open_filter_bar(page: Page) -> None:
-    page.click("#filter-bar button:has-text('Filters')")
-    expect(page.locator("#filter-bar-body")).to_be_visible()
-
-
-def status_filter_widget(page: Page):
-    return page.locator('[data-search-select][data-name="status"]')
-
-
-def test_search_select_initializes_on_page_load(authenticated_page: Page, live_server):
-    """Clicking into a FilterSelect search box opens its options panel —
-    proof that onSwap ran the widget initializer on the initial page load."""
-    page = authenticated_page
-    page.goto(f"{live_server.url}{reverse('games:list_games')}")
-    open_filter_bar(page)
-
-    widget = status_filter_widget(page)
-    widget.locator("[data-search-select-search]").click()
-
-    options_panel = widget.locator("[data-search-select-options]")
-    expect(options_panel).to_be_visible()
-    # The pinned "(Any)" modifier pseudo-option is rendered server-side and
-    # only becomes interactable through the initialized panel.
-    expect(
-        options_panel.locator("[data-search-select-modifier-option]").first
-    ).to_have_text("(Any)")
-
-
-def test_search_select_adds_include_pill(authenticated_page: Page, live_server):
-    """Clicking an enum option row adds an include pill (full widget wiring)."""
-    page = authenticated_page
-    page.goto(f"{live_server.url}{reverse('games:list_games')}")
-    open_filter_bar(page)
-
-    widget = status_filter_widget(page)
-    widget.locator("[data-search-select-search]").click()
-    widget.locator('[data-search-select-option][data-label="Finished"]').click()
-
-    pill = widget.locator("[data-search-select-pills] [data-pill]")
-    expect(pill).to_have_count(1)
-    expect(pill).to_contain_text("Finished")
-
-
-def test_range_slider_mode_toggle_fires_exactly_once(
-    authenticated_page: Page, live_server
-):
-    """One click on the mode toggle flips the slider from range to point mode
-    exactly once. Double-bound listeners (the old force-re-init bug) would
-    flip it twice, leaving data-mode unchanged."""
-    page = authenticated_page
-    page.goto(f"{live_server.url}{reverse('games:list_games')}")
-    open_filter_bar(page)
-
-    block = page.locator(".range-slider-block").first
-    slider = block.locator(".range-slider")
-    expect(slider).to_have_attribute("data-mode", "range")
-
-    block.locator(".range-mode-toggle").click()
-    expect(slider).to_have_attribute("data-mode", "point")
-
-
-def test_widgets_initialize_inside_htmx_swapped_content(
-    authenticated_page: Page, live_server
-):
-    """Widgets arriving via an htmx swap initialize without a page load.
-
-    The filter bar is re-fetched and swapped in with htmx.ajax — fresh,
-    uninitialized DOM. The swapped-in FilterSelect must open its panel and the
-    swapped-in slider must toggle exactly once, proving the htmx:load half of
-    onSwap and the once-per-element guard."""
-    page = authenticated_page
-    page.goto(f"{live_server.url}{reverse('games:list_games')}")
-
-    page.evaluate(
-        "htmx.ajax('GET', window.location.pathname, "
-        "{target: '#filter-bar', select: '#filter-bar', swap: 'outerHTML'})"
-    )
-    # The swapped-in bar arrives collapsed again; opening it proves the swap
-    # happened and the fresh DOM is in place.
-    open_filter_bar(page)
-
-    widget = status_filter_widget(page)
-    widget.locator("[data-search-select-search]").click()
-    expect(widget.locator("[data-search-select-options]")).to_be_visible()
-
-    block = page.locator(".range-slider-block").first
-    slider = block.locator(".range-slider")
-    expect(slider).to_have_attribute("data-mode", "range")
-    block.locator(".range-mode-toggle").click()
-    expect(slider).to_have_attribute("data-mode", "point")
-
-
-def test_add_purchase_type_toggles_disabled_fields(
-    authenticated_page: Page, live_server
-):
-    """add_purchase.js disables name/related-purchase while type is "game"
-    and re-enables them for other types."""
-    page = authenticated_page
-    page.goto(f"{live_server.url}{reverse('games:add_purchase')}")
-
-    name_input = page.locator("#id_name")
-    expect(name_input).to_be_disabled()
-
-    page.select_option("#id_type", "dlc")
-    expect(name_input).to_be_enabled()
-
-    page.select_option("#id_type", "game")
-    expect(name_input).to_be_disabled()

entrypoint.sh

@@ -20,35 +20,4 @@ chown "$PUID:$PGID" /var/log/supervisor
 python manage.py migrate
 python manage.py collectstatic --clear --no-input
 
-# Staging seeded from a production snapshot: remove copied sessions and the
-# inherited django-q schedule/queue so staging neither shares prod's session
-# cookies nor independently runs scheduled tasks (see issue #20).
-if [ "${STAGING:-false}" = "true" ]; then
-    python manage.py scrub_staging
-fi
-
-# Public staging with a fresh database (e.g. Fly.io): load demo data instead
-# of any production snapshot. Runs once while the games table is empty.
-if [ "${LOAD_SAMPLE_DATA:-false}" = "true" ]; then
-    python manage.py shell -c "
-from games.models import Game
-from django.core.management import call_command
-if not Game.objects.exists():
-    call_command('loaddata', 'sample.yaml')
-    print('Loaded sample data.')
-"
-fi
-
-if [ "${CREATE_DEFAULT_SUPERUSER:-false}" = "true" ]; then
-    python manage.py shell -c "
-from django.contrib.auth import get_user_model
-User = get_user_model()
-if not User.objects.filter(username='admin').exists():
-    User.objects.create_superuser('admin', '', 'admin')
-    print('Created default superuser: admin / admin')
-"
-fi
-
-chown -R "$PUID:$PGID" /home/timetracker/app/data
-
 exec /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisor.conf

fly.staging.toml

@@ -1,29 +0,0 @@
-# Shared Fly.io configuration for ephemeral, per-branch GitHub staging deploys.
-#
-# The app name is NOT set here on purpose; each branch supplies its own via
-# `flyctl deploy --app timetracker-staging-<slug>`. These instances run with a
-# fresh database seeded from sample fixtures (never production data) and their
-# own SECRET_KEY, so they are safe to expose on a public *.fly.dev hostname.
-
-primary_region = "ams"
-
-[build]
-  dockerfile = "Dockerfile"
-
-[env]
-  PROD = "1"
-  TZ = "Europe/Prague"
-  DATA_DIR = "/home/timetracker/app/data"
-  LOAD_SAMPLE_DATA = "true"
-  CREATE_DEFAULT_SUPERUSER = "true"
-
-[http_service]
-  internal_port = 8000
-  force_https = true
-  auto_stop_machines = "stop"
-  auto_start_machines = true
-  min_machines_running = 0
-
-[[vm]]
-  size = "shared-cpu-1x"
-  memory = "512mb"

games/filters.py

@@ -62,18 +62,18 @@ class GameFilter(OperatorFilter):
     platform_group: MultiCriterion | None = None  # platform__group__in
     status: ChoiceCriterion | None = None  # selectable filter widget
     mastered: BoolCriterion | None = None
-    playtime_hours: IntCriterion | None = None  # converted to timedelta on to_q()
+    playtime_minutes: IntCriterion | None = None  # converted to timedelta on to_q()
     created_at: StringCriterion | None = None  # date string
     updated_at: StringCriterion | None = None  # date string
 
     session_count: IntCriterion | None = None
-    session_average: IntCriterion | None = None  # average in hours
+    session_average: IntCriterion | None = None  # average in minutes
     purchase_count: IntCriterion | None = None  # distinct purchases per game
     playevent_count: IntCriterion | None = None  # playevents per game
 
-    # Aggregate session durations (hours), summed across the game's sessions
-    manual_playtime_hours: IntCriterion | None = None
-    calculated_playtime_hours: IntCriterion | None = None
+    # Aggregate session durations (minutes), summed across the game's sessions
+    manual_playtime_minutes: IntCriterion | None = None
+    calculated_playtime_minutes: IntCriterion | None = None
 
     # Cross-entity: any session played on these devices / matching these flags
     device: MultiCriterion | None = None  # game has session on any of these devices
@@ -119,8 +119,8 @@ class GameFilter(OperatorFilter):
             q &= self.status.to_q("status")
         if self.mastered is not None:
             q &= self.mastered.to_q("mastered")
-        if self.playtime_hours is not None:
-            q &= self._playtime_to_q(self.playtime_hours)
+        if self.playtime_minutes is not None:
+            q &= self._playtime_to_q(self.playtime_minutes)
         if self.created_at is not None:
             q &= self.created_at.to_q("created_at")
         if self.updated_at is not None:
@@ -177,7 +177,7 @@ class GameFilter(OperatorFilter):
             )
             q &= Q(id__in=matching_ids)
 
-        if self.manual_playtime_hours is not None:
+        if self.manual_playtime_minutes is not None:
             from django.db.models import Sum
 
             from games.models import Game
@@ -186,14 +186,14 @@ class GameFilter(OperatorFilter):
                 Game.objects.annotate(s_manual=Sum("sessions__duration_manual"))
                 .filter(
                     self._playtime_to_q_for_field(
-                        self.manual_playtime_hours, "s_manual"
+                        self.manual_playtime_minutes, "s_manual"
                     )
                 )
                 .values_list("id", flat=True)
             )
             q &= Q(id__in=matching_ids)
 
-        if self.calculated_playtime_hours is not None:
+        if self.calculated_playtime_minutes is not None:
             from django.db.models import Sum
 
             from games.models import Game
@@ -202,7 +202,7 @@ class GameFilter(OperatorFilter):
                 Game.objects.annotate(s_calc=Sum("sessions__duration_calculated"))
                 .filter(
                     self._playtime_to_q_for_field(
-                        self.calculated_playtime_hours, "s_calc"
+                        self.calculated_playtime_minutes, "s_calc"
                     )
                 )
                 .values_list("id", flat=True)
@@ -362,30 +362,30 @@ class GameFilter(OperatorFilter):
 
     @staticmethod
     def _playtime_to_q_for_field(c: IntCriterion, field: str) -> Q:
-        """Convert hours-based criterion to a DurationField Q object.
+        """Convert minutes-based criterion to a DurationField Q object.
 
         Django stores DurationField as microseconds in SQLite, so we convert
-        hours → timedelta(microseconds=X) and use the appropriate lookups.
+        minutes → timedelta(microseconds=X) and use the appropriate lookups.
         """
         from datetime import timedelta
 
         from common.criteria import Modifier
 
         m = c.modifier
-        td_val = timedelta(hours=c.value)
+        td_val = timedelta(minutes=c.value)
 
         if m == Modifier.EQUALS:
             return Q(
                 **{
                     f"{field}__gte": td_val,
-                    f"{field}__lt": timedelta(hours=c.value + 1),
+                    f"{field}__lt": timedelta(minutes=c.value + 1),
                 }
             )
         if m == Modifier.NOT_EQUALS:
             return ~Q(
                 **{
                     f"{field}__gte": td_val,
-                    f"{field}__lt": timedelta(hours=c.value + 1),
+                    f"{field}__lt": timedelta(minutes=c.value + 1),
                 }
             )
         if m == Modifier.GREATER_THAN:
@@ -393,12 +393,12 @@ class GameFilter(OperatorFilter):
         if m == Modifier.LESS_THAN:
             return Q(**{f"{field}__lt": td_val})
         if m == Modifier.BETWEEN and c.value2 is not None:
-            lo = timedelta(hours=min(c.value, c.value2))
-            hi = timedelta(hours=max(c.value, c.value2))
+            lo = timedelta(minutes=min(c.value, c.value2))
+            hi = timedelta(minutes=max(c.value, c.value2))
             return Q(**{f"{field}__gte": lo, f"{field}__lte": hi})
         if m == Modifier.NOT_BETWEEN and c.value2 is not None:
-            lo = timedelta(hours=min(c.value, c.value2))
-            hi = timedelta(hours=max(c.value, c.value2))
+            lo = timedelta(minutes=min(c.value, c.value2))
+            hi = timedelta(minutes=max(c.value, c.value2))
             return Q(**{f"{field}__lt": lo}) | Q(**{f"{field}__gt": hi})
         if m == Modifier.IS_NULL:
             return Q(**{f"{field}": timedelta(0)})
@@ -412,9 +412,7 @@ class GameFilter(OperatorFilter):
         from games.models import PlayEvent
 
         event_q = criterion.to_q("note")
-        matching_ids = PlayEvent.objects.filter(event_q).values_list(
-            "game_id", flat=True
-        )
+        matching_ids = PlayEvent.objects.filter(event_q).values_list("game_id", flat=True)
         return Q(id__in=matching_ids)
 
 
@@ -433,10 +431,10 @@ class SessionFilter(OperatorFilter):
     device: MultiCriterion | None = None  # filters on device_id
     emulated: BoolCriterion | None = None
     note: StringCriterion | None = None
-    duration_hours: IntCriterion | None = None  # on duration_total (legacy alias)
-    duration_total_hours: IntCriterion | None = None
-    duration_manual_hours: IntCriterion | None = None
-    duration_calculated_hours: IntCriterion | None = None
+    duration_minutes: IntCriterion | None = None  # on duration_total (legacy alias)
+    duration_total_minutes: IntCriterion | None = None
+    duration_manual_minutes: IntCriterion | None = None
+    duration_calculated_minutes: IntCriterion | None = None
     is_active: BoolCriterion | None = None  # timestamp_end IS NULL
     timestamp_start: StringCriterion | None = None  # date string
     timestamp_end: StringCriterion | None = None  # date string
@@ -456,20 +454,20 @@ class SessionFilter(OperatorFilter):
         from datetime import timedelta
 
         q = Q()
-        td_val = timedelta(hours=c.value)
+        td_val = timedelta(minutes=c.value)
         m = c.modifier
         if m == Modifier.EQUALS:
             q &= Q(
                 **{
                     f"{field}__gte": td_val,
-                    f"{field}__lt": timedelta(hours=c.value + 1),
+                    f"{field}__lt": timedelta(minutes=c.value + 1),
                 }
             )
         elif m == Modifier.NOT_EQUALS:
             q &= ~Q(
                 **{
                     f"{field}__gte": td_val,
-                    f"{field}__lt": timedelta(hours=c.value + 1),
+                    f"{field}__lt": timedelta(minutes=c.value + 1),
                 }
             )
         elif m == Modifier.GREATER_THAN:
@@ -477,12 +475,12 @@ class SessionFilter(OperatorFilter):
         elif m == Modifier.LESS_THAN:
             q &= Q(**{f"{field}__lt": td_val})
         elif m == Modifier.BETWEEN and c.value2 is not None:
-            lo = timedelta(hours=min(c.value, c.value2))
-            hi = timedelta(hours=max(c.value, c.value2))
+            lo = timedelta(minutes=min(c.value, c.value2))
+            hi = timedelta(minutes=max(c.value, c.value2))
             q &= Q(**{f"{field}__gte": lo, f"{field}__lte": hi})
         elif m == Modifier.NOT_BETWEEN and c.value2 is not None:
-            lo = timedelta(hours=min(c.value, c.value2))
-            hi = timedelta(hours=max(c.value, c.value2))
+            lo = timedelta(minutes=min(c.value, c.value2))
+            hi = timedelta(minutes=max(c.value, c.value2))
             q &= Q(**{f"{field}__lt": lo}) | Q(**{f"{field}__gt": hi})
         elif m == Modifier.IS_NULL:
             q &= Q(**{f"{field}": timedelta(0)})
@@ -503,15 +501,15 @@ class SessionFilter(OperatorFilter):
             q &= self.emulated.to_q("emulated")
         if self.note is not None:
             q &= self.note.to_q("note")
-        if self.duration_hours is not None:
-            q &= self._duration_to_q(self.duration_hours, "duration_total")
-        if self.duration_total_hours is not None:
-            q &= self._duration_to_q(self.duration_total_hours, "duration_total")
-        if self.duration_manual_hours is not None:
-            q &= self._duration_to_q(self.duration_manual_hours, "duration_manual")
-        if self.duration_calculated_hours is not None:
+        if self.duration_minutes is not None:
+            q &= self._duration_to_q(self.duration_minutes, "duration_total")
+        if self.duration_total_minutes is not None:
+            q &= self._duration_to_q(self.duration_total_minutes, "duration_total")
+        if self.duration_manual_minutes is not None:
+            q &= self._duration_to_q(self.duration_manual_minutes, "duration_manual")
+        if self.duration_calculated_minutes is not None:
             q &= self._duration_to_q(
-                self.duration_calculated_hours, "duration_calculated"
+                self.duration_calculated_minutes, "duration_calculated"
             )
         if self.is_active is not None:
             if self.is_active.value:

games/fixtures/sample.yaml

@@ -1,90 +1,71 @@
-- model: games.platform
-  pk: 1
-  fields:
-    name: Steam
-    group: PC
-    created_at: "2020-01-01T00:00:00Z"
-- model: games.platform
-  pk: 3
-  fields:
-    name: Xbox Gamepass
-    group: PC
-    created_at: "2020-01-01T00:00:00Z"
-- model: games.platform
-  pk: 4
-  fields:
-    name: Epic Games Store
-    group: PC
-    created_at: "2020-01-01T00:00:00Z"
-- model: games.platform
-  pk: 5
-  fields:
-    name: Playstation 5
-    group: Playstation
-    created_at: "2020-01-01T00:00:00Z"
-- model: games.platform
-  pk: 6
-  fields:
-    name: Playstation 4
-    group: Playstation
-    created_at: "2020-01-01T00:00:00Z"
-- model: games.platform
-  pk: 7
-  fields:
-    name: Nintendo Switch
-    group: Nintendo
-    created_at: "2020-01-01T00:00:00Z"
-- model: games.platform
-  pk: 8
-  fields:
-    name: Nintendo 3DS
-    group: Nintendo
-    created_at: "2020-01-01T00:00:00Z"
 - model: games.game
   pk: 1
   fields:
     name: Nioh 2
     wikidata: Q67482292
-    created_at: "2021-02-13T00:00:00Z"
-    updated_at: "2021-02-13T00:00:00Z"
 - model: games.game
   pk: 2
   fields:
     name: Elden Ring
     wikidata: Q64826862
-    created_at: "2022-02-24T00:00:00Z"
-    updated_at: "2022-02-24T00:00:00Z"
 - model: games.game
   pk: 3
   fields:
     name: Cyberpunk 2077
     wikidata: Q3182559
-    created_at: "2020-12-07T00:00:00Z"
-    updated_at: "2020-12-07T00:00:00Z"
 - model: games.purchase
   pk: 1
   fields:
-    games: [1]
+    game: 1
     platform: 1
     date_purchased: 2021-02-13
     date_refunded: null
-    created_at: "2021-02-13T00:00:00Z"
-    updated_at: "2021-02-13T00:00:00Z"
 - model: games.purchase
   pk: 2
   fields:
-    games: [2]
+    game: 2
     platform: 1
     date_purchased: 2022-02-24
     date_refunded: null
-    created_at: "2022-02-24T00:00:00Z"
-    updated_at: "2022-02-24T00:00:00Z"
 - model: games.purchase
   pk: 3
   fields:
-    games: [3]
+    game: 3
     platform: 1
     date_purchased: 2020-12-07
     date_refunded: null
-    created_at: "2020-12-07T00:00:00Z"
-    updated_at: "2020-12-07T00:00:00Z"
+- model: games.platform
+  pk: 1
+  fields:
+    name: Steam
+    group: PC
+- model: games.platform
+  pk: 3
+  fields:
+    name: Xbox Gamepass
+    group: PC
+- model: games.platform
+  pk: 4
+  fields:
+    name: Epic Games Store
+    group: PC
+- model: games.platform
+  pk: 5
+  fields:
+    name: Playstation 5
+    group: Playstation
+- model: games.platform
+  pk: 6
+  fields:
+    name: Playstation 4
+    group: Playstation
+- model: games.platform
+  pk: 7
+  fields:
+    name: Nintendo Switch
+    group: Nintendo
+- model: games.platform
+  pk: 8
+  fields:
+    name: Nintendo 3DS
+    group: Nintendo

games/forms.py

@@ -6,7 +6,6 @@ from common.components import (
     DEFAULT_PREFETCH,
     SearchSelect,
     SearchSelectOption,
-    render,
     searchselect_selected,
 )
 from common.components.primitives import Checkbox
@@ -29,32 +28,23 @@ autofocus_input_widget = forms.TextInput(attrs={"autofocus": "autofocus"})
 
 class PrimitiveCheckboxWidget(forms.CheckboxInput):
     """Adapts Django's CheckboxInput to use our Checkbox component."""
-
     def render(self, name, value, attrs=None, renderer=None):
         final_attrs = self.build_attrs(self.attrs, attrs)
         checked = self.check_test(value)
-        attributes = [
-            (k, str(v))
-            for k, v in final_attrs.items()
-            if k not in ("type", "name", "value", "checked")
-        ]
+        attributes = [(k, str(v)) for k, v in final_attrs.items() if k not in ("type", "name", "value", "checked")]
         
         # Django uses boolean values differently for checkboxes, we omit value if empty
-        # render() returns a safe string (Django widgets must not be autoescaped).
-        return render(
-            Checkbox(
+        return str(Checkbox(
             name=name,
             label=None,
             checked=checked,
             value=str(value) if value else "1",
-                attributes=attributes,
-            )
-        )
+            attributes=attributes
+        ))
 
 
 class PrimitiveWidgetsMixin:
     """Automatically applies primitive custom widgets to native Django form fields."""
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         for field_name, field in self.fields.items():
@@ -140,9 +130,7 @@ class SearchSelectWidget(forms.Widget):
     def render(self, name, value, attrs=None, renderer=None):
         selected = searchselect_selected(self._values(value), self.options_resolver)
         autofocus = bool((attrs or {}).get("autofocus"))
-        # Django widgets must return a safe string; the component is a node.
-        return render(
-            SearchSelect(
+        return SearchSelect(
             name=name,
             selected=selected,
             options=None,
@@ -156,7 +144,6 @@ class SearchSelectWidget(forms.Widget):
             id=(attrs or {}).get("id", ""),
             autofocus=autofocus,
         )
-        )
 
     def value_from_datadict(self, data, files, name):
         return data.get(name)

games/management/commands/gen_element_types.py

@@ -1,21 +0,0 @@
-"""Write ts/generated/props.ts from the registered custom-element specs."""
-
-from pathlib import Path
-
-from django.conf import settings
-from django.core.management.base import BaseCommand
-
-# Importing the components package triggers element registration at import time.
-import common.components  # noqa: F401
-from common.components.custom_elements import render_props_module
-
-
-class Command(BaseCommand):
-    help = "Generate ts/generated/props.ts from registered custom elements."
-
-    def handle(self, *args, **options) -> None:
-        output_dir = Path(settings.BASE_DIR) / "ts" / "generated"
-        output_dir.mkdir(parents=True, exist_ok=True)
-        target = output_dir / "props.ts"
-        target.write_text(render_props_module(), encoding="utf-8")
-        self.stdout.write(self.style.SUCCESS(f"Wrote {target}"))

games/management/commands/scrub_staging.py

@@ -1,28 +0,0 @@
-from django.contrib.sessions.models import Session
-from django.core.management.base import BaseCommand
-from django_q.models import OrmQ, Schedule, Task
-
-
-class Command(BaseCommand):
-    help = (
-        "Remove copied production artifacts from a staging database seeded "
-        "from a production snapshot: clears authenticated sessions and the "
-        "django-q schedule/queue/results so staging does not share prod's "
-        "session cookies or independently run scheduled tasks."
-    )
-
-    def handle(self, *args, **kwargs):
-        sessions_deleted, _ = Session.objects.all().delete()
-        schedules_deleted, _ = Schedule.objects.all().delete()
-        tasks_deleted, _ = Task.objects.all().delete()
-        queued_deleted, _ = OrmQ.objects.all().delete()
-
-        self.stdout.write(
-            self.style.SUCCESS(
-                "Scrubbed staging database: "
-                f"{sessions_deleted} session(s), "
-                f"{schedules_deleted} schedule(s), "
-                f"{tasks_deleted} task result(s), "
-                f"{queued_deleted} queued task(s) removed."
-            )
-        )

games/migrations/0018_alter_session_timestamp_start.py

@@ -4,14 +4,15 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
-        ("games", "0017_add_filter_preset"),
+        ('games', '0017_add_filter_preset'),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name="session",
-            name="timestamp_start",
-            field=models.DateTimeField(db_index=True, verbose_name="Start"),
+            model_name='session',
+            name='timestamp_start',
+            field=models.DateTimeField(db_index=True, verbose_name='Start'),
         ),
     ]

games/migrations/0019_alter_filterpreset_mode.py

@@ -1,28 +0,0 @@
-# Generated by Django 6.0.5 on 2026-06-13 18:48
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("games", "0018_alter_session_timestamp_start"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="filterpreset",
-            name="mode",
-            field=models.CharField(
-                choices=[
-                    ("games", "Games"),
-                    ("sessions", "Sessions"),
-                    ("purchases", "Purchases"),
-                    ("playevents", "Play Events"),
-                    ("devices", "Devices"),
-                    ("platforms", "Platforms"),
-                ],
-                default="games",
-                max_length=50,
-            ),
-        ),
-    ]

games/static/base.css

@@ -918,9 +918,6 @@
   .ms-2\.5 {
     margin-inline-start: calc(var(--spacing) * 2.5);
   }
-  .ms-auto {
-    margin-inline-start: auto;
-  }
   .me-2 {
     margin-inline-end: calc(var(--spacing) * 2);
   }
@@ -1582,12 +1579,6 @@
   .w-5 {
     width: calc(var(--spacing) * 5);
   }
-  .w-5\/6 {
-    width: calc(5 / 6 * 100%);
-  }
-  .w-8 {
-    width: calc(var(--spacing) * 8);
-  }
   .w-10 {
     width: calc(var(--spacing) * 10);
   }
@@ -1603,12 +1594,6 @@
   .w-72 {
     width: calc(var(--spacing) * 72);
   }
-  .w-\[2\.5ch\] {
-    width: 2.5ch;
-  }
-  .w-\[4\.5ch\] {
-    width: 4.5ch;
-  }
   .w-\[300px\] {
     width: 300px;
   }
@@ -1748,9 +1733,6 @@
   .cursor-pointer {
     cursor: pointer;
   }
-  .cursor-text {
-    cursor: text;
-  }
   .resize {
     resize: both;
   }
@@ -1790,9 +1772,6 @@
   .items-start {
     align-items: flex-start;
   }
-  .items-stretch {
-    align-items: stretch;
-  }
   .justify-between {
     justify-content: space-between;
   }
@@ -1805,9 +1784,6 @@
   .justify-start {
     justify-content: flex-start;
   }
-  .gap-0\.5 {
-    gap: calc(var(--spacing) * 0.5);
-  }
   .gap-1 {
     gap: calc(var(--spacing) * 1);
   }
@@ -1857,9 +1833,6 @@
       margin-inline-end: calc(calc(var(--spacing) * 3) * calc(1 - var(--tw-space-x-reverse)));
     }
   }
-  .gap-y-0\.5 {
-    row-gap: calc(var(--spacing) * 0.5);
-  }
   .gap-y-4 {
     row-gap: calc(var(--spacing) * 4);
   }
@@ -1928,9 +1901,6 @@
   .rounded-xl {
     border-radius: var(--radius-xl);
   }
-  .rounded-xs {
-    border-radius: var(--radius-xs);
-  }
   .rounded-s-base {
     border-start-start-radius: var(--radius-base);
     border-end-start-radius: var(--radius-base);
@@ -1955,21 +1925,20 @@
     border-top-left-radius: 0;
     border-top-right-radius: 0;
   }
-  .rounded-l-lg {
-    border-top-left-radius: var(--radius-lg);
-    border-bottom-left-radius: var(--radius-lg);
-  }
   .rounded-tl-none {
     border-top-left-radius: 0;
   }
-  .rounded-r-lg {
-    border-top-right-radius: var(--radius-lg);
-    border-bottom-right-radius: var(--radius-lg);
+  .rounded-tr-md {
+    border-top-right-radius: var(--radius-md);
   }
   .rounded-b {
     border-bottom-right-radius: var(--radius);
     border-bottom-left-radius: var(--radius);
   }
+  .rounded-b-md {
+    border-bottom-right-radius: var(--radius-md);
+    border-bottom-left-radius: var(--radius-md);
+  }
   .border {
     border-style: var(--tw-border-style);
     border-width: 1px;
@@ -1978,14 +1947,14 @@
     border-style: var(--tw-border-style);
     border-width: 0px;
   }
+  .border-0\! {
+    border-style: var(--tw-border-style) !important;
+    border-width: 0px !important;
+  }
   .border-2 {
     border-style: var(--tw-border-style);
     border-width: 2px;
   }
-  .border-y {
-    border-block-style: var(--tw-border-style);
-    border-block-width: 1px;
-  }
   .border-e {
     border-inline-end-style: var(--tw-border-style);
     border-inline-end-width: 1px;
@@ -2055,21 +2024,9 @@
   .border-blue-200 {
     border-color: var(--color-blue-200);
   }
-  .border-blue-600 {
-    border-color: var(--color-blue-600);
-  }
-  .border-blue-700 {
-    border-color: var(--color-blue-700);
-  }
   .border-brand {
     border-color: var(--color-brand);
   }
-  .border-brand\/70 {
-    border-color: color-mix(in srgb, oklch(48.8% 0.243 264.376) 70%, transparent);
-    @supports (color: color-mix(in lab, red, red)) {
-      border-color: color-mix(in oklab, var(--color-brand) 70%, transparent);
-    }
-  }
   .border-default {
     border-color: var(--color-default);
   }
@@ -2161,24 +2118,12 @@
   .bg-brand {
     background-color: var(--color-brand);
   }
-  .bg-brand\/10 {
-    background-color: color-mix(in srgb, oklch(48.8% 0.243 264.376) 10%, transparent);
-    @supports (color: color-mix(in lab, red, red)) {
-      background-color: color-mix(in oklab, var(--color-brand) 10%, transparent);
-    }
-  }
   .bg-brand\/15 {
     background-color: color-mix(in srgb, oklch(48.8% 0.243 264.376) 15%, transparent);
     @supports (color: color-mix(in lab, red, red)) {
       background-color: color-mix(in oklab, var(--color-brand) 15%, transparent);
     }
   }
-  .bg-brand\/30 {
-    background-color: color-mix(in srgb, oklch(48.8% 0.243 264.376) 30%, transparent);
-    @supports (color: color-mix(in lab, red, red)) {
-      background-color: color-mix(in oklab, var(--color-brand) 30%, transparent);
-    }
-  }
   .bg-dark-backdrop\/70 {
     background-color: color-mix(in srgb, oklch(13% 0.028 261.692) 70%, transparent);
     @supports (color: color-mix(in lab, red, red)) {
@@ -2191,9 +2136,6 @@
   .bg-gray-100 {
     background-color: var(--color-gray-100);
   }
-  .bg-gray-200 {
-    background-color: var(--color-gray-200);
-  }
   .bg-gray-400 {
     background-color: var(--color-gray-400);
   }
@@ -2351,9 +2293,6 @@
       padding: 0 !important;
     }
   }
-  .p-0 {
-    padding: calc(var(--spacing) * 0);
-  }
   .p-1 {
     padding: calc(var(--spacing) * 1);
   }
@@ -2378,9 +2317,6 @@
   .p-6 {
     padding: calc(var(--spacing) * 6);
   }
-  .px-0\.5 {
-    padding-inline: calc(var(--spacing) * 0.5);
-  }
   .px-2 {
     padding-inline: calc(var(--spacing) * 2);
   }
@@ -2480,9 +2416,6 @@
   .text-right {
     text-align: right;
   }
-  .text-start {
-    text-align: start;
-  }
   .align-middle {
     vertical-align: middle;
   }
@@ -2676,9 +2609,6 @@
   .text-blue-500 {
     color: var(--color-blue-500);
   }
-  .text-blue-600 {
-    color: var(--color-blue-600);
-  }
   .text-blue-800 {
     color: var(--color-blue-800);
   }
@@ -2766,6 +2696,9 @@
   .line-through {
     text-decoration-line: line-through;
   }
+  .no-underline\! {
+    text-decoration-line: none !important;
+  }
   .underline {
     text-decoration-line: underline;
   }
@@ -2778,15 +2711,9 @@
   .decoration-dotted {
     text-decoration-style: dotted;
   }
-  .caret-transparent {
-    caret-color: transparent;
-  }
   .opacity-0 {
     opacity: 0%;
   }
-  .opacity-40 {
-    opacity: 40%;
-  }
   .opacity-50 {
     opacity: 50%;
   }
@@ -2822,13 +2749,6 @@
     --tw-shadow: 0 1px 2px 0 var(--tw-shadow-color, rgb(0 0 0 / 0.05));
     box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
   }
-  .ring-2 {
-    --tw-ring-shadow: var(--tw-ring-inset,) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentcolor);
-    box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
-  }
-  .ring-brand-strong {
-    --tw-ring-color: var(--color-brand-strong);
-  }
   .outline {
     outline-style: var(--tw-outline-style);
     outline-width: 1px;
@@ -2894,9 +2814,6 @@
   .\[program\:qcluster\] {
     program: qcluster;
   }
-  .ring-inset {
-    --tw-ring-inset: inset;
-  }
   .group-hover\:absolute {
     &:is(:where(.group):hover *) {
       @media (hover: hover) {
@@ -3038,22 +2955,6 @@
       padding-top: calc(var(--spacing) * 0);
     }
   }
-  .focus-within\:border-brand {
-    &:focus-within {
-      border-color: var(--color-brand);
-    }
-  }
-  .focus-within\:ring-1 {
-    &:focus-within {
-      --tw-ring-shadow: var(--tw-ring-inset,) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentcolor);
-      box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
-    }
-  }
-  .focus-within\:ring-brand {
-    &:focus-within {
-      --tw-ring-color: var(--color-brand);
-    }
-  }
   .hover\:scale-110 {
     &:hover {
       @media (hover: hover) {
@@ -3085,13 +2986,6 @@
       }
     }
   }
-  .hover\:border-gray-300 {
-    &:hover {
-      @media (hover: hover) {
-        border-color: var(--color-gray-300);
-      }
-    }
-  }
   .hover\:border-green-600 {
     &:hover {
       @media (hover: hover) {
@@ -3151,13 +3045,6 @@
       }
     }
   }
-  .hover\:bg-gray-700 {
-    &:hover {
-      @media (hover: hover) {
-        background-color: var(--color-gray-700);
-      }
-    }
-  }
   .hover\:bg-green-500 {
     &:hover {
       @media (hover: hover) {
@@ -3333,14 +3220,6 @@
       border-color: var(--color-brand);
     }
   }
-  .focus\:bg-brand\/30 {
-    &:focus {
-      background-color: color-mix(in srgb, oklch(48.8% 0.243 264.376) 30%, transparent);
-      @supports (color: color-mix(in lab, red, red)) {
-        background-color: color-mix(in oklab, var(--color-brand) 30%, transparent);
-      }
-    }
-  }
   .focus\:text-blue-700 {
     &:focus {
       color: var(--color-blue-700);
@@ -3480,6 +3359,11 @@
       grid-template-columns: repeat(2, minmax(0, 1fr));
     }
   }
+  .sm\:grid-cols-4 {
+    @media (width >= 40rem) {
+      grid-template-columns: repeat(4, minmax(0, 1fr));
+    }
+  }
   .sm\:rounded-t-lg {
     @media (width >= 40rem) {
       border-top-left-radius: var(--radius-lg);
@@ -3645,11 +3529,21 @@
       max-width: var(--breakpoint-2xl);
     }
   }
+  .\@sm\:grid-cols-3 {
+    @container (width >= 24rem) {
+      grid-template-columns: repeat(3, minmax(0, 1fr));
+    }
+  }
   .\@md\:grid-cols-4 {
     @container (width >= 28rem) {
       grid-template-columns: repeat(4, minmax(0, 1fr));
     }
   }
+  .\@lg\:grid-cols-6 {
+    @container (width >= 32rem) {
+      grid-template-columns: repeat(6, minmax(0, 1fr));
+    }
+  }
   .rtl\:rotate-180 {
     &:where(:dir(rtl), [dir="rtl"], [dir="rtl"] *) {
       rotate: 180deg;
@@ -3695,11 +3589,6 @@
       border-color: var(--color-amber-700);
     }
   }
-  .dark\:border-blue-500 {
-    &:is(.dark *) {
-      border-color: var(--color-blue-500);
-    }
-  }
   .dark\:border-blue-700 {
     &:is(.dark *) {
       border-color: var(--color-blue-700);
@@ -3735,11 +3624,6 @@
       border-color: var(--color-red-700);
     }
   }
-  .dark\:border-transparent {
-    &:is(.dark *) {
-      border-color: transparent;
-    }
-  }
   .dark\:bg-amber-900 {
     &:is(.dark *) {
       background-color: var(--color-amber-900);
@@ -4037,15 +3921,6 @@
       }
     }
   }
-  .dark\:hover\:text-blue-500 {
-    &:is(.dark *) {
-      &:hover {
-        @media (hover: hover) {
-          color: var(--color-blue-500);
-        }
-      }
-    }
-  }
   .dark\:hover\:text-gray-300 {
     &:is(.dark *) {
       &:hover {
@@ -4196,6 +4071,17 @@
       text-underline-offset: 4px;
     }
   }
+  .\[\&_li\:first-of-type_a\]\:rounded-none {
+    & li:first-of-type a {
+      border-radius: 0;
+    }
+  }
+  .\[\&_li\:last-of-type_a\]\:rounded-t-none {
+    & li:last-of-type a {
+      border-top-left-radius: 0;
+      border-top-right-radius: 0;
+    }
+  }
   .\[\&_td\:last-child\]\:text-right {
     & td:last-child {
       text-align: right;

games/static/js/add_purchase.js

@@ -1,4 +1,4 @@
-import { getEl, disableElementsWhenTrue, onSwap } from "./utils.js";
+import { getEl, disableElementsWhenTrue } from "./utils.js";
 
 const RELATED_PURCHASE_URL = "/tracker/purchase/related-purchase-by-game";
 
@@ -38,9 +38,8 @@ function setupElementHandlers() {
   ]);
 }
 
-onSwap("#id_type", (typeSelect) => {
-  setupElementHandlers();
-  typeSelect.addEventListener("change", () => {
+document.addEventListener("DOMContentLoaded", setupElementHandlers);
+document.addEventListener("htmx:afterSwap", setupElementHandlers);
+getEl("#id_type").addEventListener("change", () => {
   setupElementHandlers();
 });
-});

games/static/js/add_session.js

@@ -0,0 +1,23 @@
+import { toISOUTCString } from "./utils.js";
+
+for (let button of document.querySelectorAll("[data-target]")) {
+  let target = button.getAttribute("data-target");
+  let type = button.getAttribute("data-type");
+  let targetElement = document.querySelector(`#id_${target}`);
+  button.addEventListener("click", (event) => {
+    event.preventDefault();
+    if (type == "now") {
+      targetElement.value = toISOUTCString(new Date());
+    } else if (type == "copy") {
+      const oppositeName =
+        targetElement.name == "timestamp_start"
+          ? "timestamp_end"
+          : "timestamp_start";
+      document.querySelector(`[name='${oppositeName}']`).value =
+        targetElement.value;
+    } else if (type == "toggle") {
+      if (targetElement.type == "datetime-local") targetElement.type = "text";
+      else targetElement.type = "datetime-local";
+    }
+  });
+}

games/static/js/alpine-mask.min.js

@@ -1 +0,0 @@
-(()=>{function x(n){n.directive("mask",(e,{value:l,expression:r},{effect:s,evaluateLater:i,cleanup:u})=>{let p=()=>r,f="";queueMicrotask(()=>{if(["function","dynamic"].includes(l)){let o=i(r);s(()=>{p=t=>{let c;return n.dontAutoEvaluateFunctions(()=>{o(d=>{c=typeof d=="function"?d(t):d},{scope:{$input:t,$money:M.bind({el:e})}})}),c},a(e,!1)})}else a(e,!1);if(e._x_model){e._x_model.get()!==e.value&&(e._x_model.get()===null&&e.value===""||e._x_model.set(e.value));let o=e._x_forceModelUpdate;e._x_forceModelUpdate=t=>{t=String(t);let c=p(t);c&&c!=="false"&&(t=m(c,t)),f=t,o(t),e._x_model.set(t)}}});let g=new AbortController;u(()=>{g.abort()}),e.addEventListener("input",()=>a(e),{signal:g.signal,capture:!0}),e.addEventListener("blur",()=>a(e,!1),{signal:g.signal});function a(o,t=!0){let c=o.value,d=p(c);if(!d||d==="false")return!1;if(f.length-o.value.length===1)return f=o.value;let h=()=>{f=o.value=m(d,c)};t?v(o,d,()=>{h()}):h()}}).before("model")}function v(n,e,l){let r=n.selectionStart,s=n.value;l();let i=s.slice(0,r),u=m(e,i).length;n.setSelectionRange(u,u)}var _={9:/[0-9]/,a:/[a-zA-Z]/,"*":/[a-zA-Z0-9]/};function m(n,e){let l=0,r=0,s="";for(;l<n.length&&r<e.length;){let i=n[l],u=e[r];i in _?(_[i].test(u)&&(s+=u,l++),r++):(s+=i,l++,i===e[r]&&r++)}return s}function M(n,e=".",l,r=2){if(n==="-")return"-";if(/^\D+$/.test(n))return"9";l==null&&(l=e===","?".":",");let s=(f,g)=>{let a="",o=0;for(let t=f.length-1;t>=0;t--)f[t]!==g&&(o===3?(a=f[t]+g+a,o=0):a=f[t]+a,o++);return a},i=n.startsWith("-")?"-":"",u=n.replaceAll(new RegExp(`[^0-9\\${e}]`,"g"),""),p=Array.from({length:u.split(e)[0].length}).fill("9").join("");return p=`${i}${s(p,l)}`,r>0&&n.includes(e)&&(p+=`${e}`+"9".repeat(r)),queueMicrotask(()=>{this.el.value.endsWith(e)||this.el.value[this.el.selectionStart-1]===e&&this.el.setSelectionRange(this.el.selectionStart-1,this.el.selectionStart-1)}),p}document.addEventListener("alpine:init",()=>{window.Alpine.plugin(x)});})();

games/static/js/date_range_picker.js

@@ -1,530 +0,0 @@
-/**
- * DateRangePicker — vanilla JavaScript implementation.
- *
- * Drives the DateRangePicker component (common/components/date_range_picker.py):
- *
- * - DateRangeField: segmented manual entry. Each date part (DD/MM/YYYY) is its
- *   own input; digits fill the placeholder from the right (YYYY → YYY1 → YY19
- *   → Y198 → 1987), full parts auto-advance to the next one, and
- *   Backspace/Delete reverts the active part to its placeholder.
- * - DateRangeCalendar: popup month grid with a preset column and a
- *   Cancel / Clear / Select footer. Picking works anchor-style: the first
- *   pick becomes the StartDate anchor, the second pick sets the EndDate and
- *   moves the anchor there so further picks adjust the StartDate. Picking on
- *   the wrong side of the anchor clears the range and restarts from the
- *   clicked date.
- *
- * The committed value lives in the two hidden ISO inputs ({prefix}-min /
- * {prefix}-max) that filter_bar.js serializes into a DateCriterion.
- *
- * NB: class strings below are emitted verbatim so the Tailwind scanner picks
- * them up — keep them as plain literals.
- */
-(function () {
-  "use strict";
-
-  var WEEKDAY_LABELS = ["Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"];
-
-  var WEEKDAY_CLASS =
-    "w-8 h-6 flex items-center justify-center text-xs text-body select-none";
-  var DAY_BASE_CLASS =
-    "date-range-day w-8 h-8 flex items-center justify-center text-sm " +
-    "text-heading cursor-pointer hover:bg-neutral-tertiary-medium";
-  var DAY_ROUNDED_CLASS = "rounded-base";
-  var DAY_OUTSIDE_MONTH_CLASS = "opacity-40";
-  var DAY_SELECTED_CLASS = "bg-brand text-white hover:bg-brand-strong";
-  var DAY_ANCHOR_CLASS =
-    "bg-brand text-white ring-2 ring-inset ring-brand-strong hover:bg-brand-strong";
-  // The three visual states of the date range track (the days between the
-  // two endpoints): outlined while picking the second date, filled once both
-  // are picked, muted when showing an already-committed range read-only.
-  var TRACK_OUTLINED_CLASS = "border-y border-brand/70 bg-brand/10";
-  var TRACK_FILLED_CLASS = "bg-brand/30";
-  var TRACK_MUTED_CLASS = "bg-brand/15";
-
-  // ── Date helpers (all local-time; values are ISO YYYY-MM-DD strings) ──
-
-  function padNumber(value, width) {
-    var text = String(value);
-    while (text.length < width) text = "0" + text;
-    return text;
-  }
-
-  function isoFromDate(dateObject) {
-    return (
-      padNumber(dateObject.getFullYear(), 4) +
-      "-" +
-      padNumber(dateObject.getMonth() + 1, 2) +
-      "-" +
-      padNumber(dateObject.getDate(), 2)
-    );
-  }
-
-  function dateFromIso(isoString) {
-    var pieces = isoString.split("-");
-    return new Date(
-      parseInt(pieces[0], 10),
-      parseInt(pieces[1], 10) - 1,
-      parseInt(pieces[2], 10)
-    );
-  }
-
-  function addDays(dateObject, dayCount) {
-    var copy = new Date(dateObject.getTime());
-    copy.setDate(copy.getDate() + dayCount);
-    return copy;
-  }
-
-  /** Validate a (year, month, day) triple as a real calendar date. */
-  function isoFromParts(year, month, day) {
-    var candidate = new Date(year, month - 1, day);
-    if (
-      candidate.getFullYear() !== year ||
-      candidate.getMonth() !== month - 1 ||
-      candidate.getDate() !== day
-    ) {
-      return "";
-    }
-    return isoFromDate(candidate);
-  }
-
-  function presetRange(presetName) {
-    var today = new Date();
-    today.setHours(0, 0, 0, 0);
-    var yesterday = addDays(today, -1);
-    var year = today.getFullYear();
-    var month = today.getMonth();
-    switch (presetName) {
-      case "today":
-        return [today, today];
-      case "yesterday":
-        return [yesterday, yesterday];
-      case "last_7_days":
-        return [addDays(today, -6), today];
-      case "last_30_days":
-        return [addDays(today, -29), today];
-      case "this_month":
-        return [new Date(year, month, 1), new Date(year, month + 1, 0)];
-      case "last_month":
-        return [new Date(year, month - 1, 1), new Date(year, month, 0)];
-      case "this_year":
-        return [new Date(year, 0, 1), new Date(year, 11, 31)];
-      default:
-        return null;
-    }
-  }
-
-  // ── DateRangeField: segmented manual entry ──────────────────────────────
-
-  function segmentBuffer(segment) {
-    return segment.dataset.typedDigits || "";
-  }
-
-  function setSegmentBuffer(segment, buffer) {
-    segment.dataset.typedDigits = buffer;
-    if (buffer === "") {
-      segment.value = "";
-      return;
-    }
-    var placeholder = segment.getAttribute("placeholder");
-    // Fill the placeholder from the right: typing 19 into YYYY shows YY19.
-    segment.value = placeholder.slice(0, placeholder.length - buffer.length) + buffer;
-  }
-
-  function segmentsForSide(picker, side) {
-    return Array.prototype.slice.call(
-      picker.querySelectorAll('input[data-date-side="' + side + '"]')
-    );
-  }
-
-  /** Recompute one hidden ISO input from its side's segment buffers. */
-  function syncHiddenFromSegments(picker, side) {
-    var hidden = picker.querySelector(
-      'input[data-date-range-hidden="' + side + '"]'
-    );
-    var partValues = {};
-    var complete = true;
-    segmentsForSide(picker, side).forEach(function (segment) {
-      var buffer = segmentBuffer(segment);
-      if (buffer.length !== parseInt(segment.getAttribute("maxlength"), 10)) {
-        complete = false;
-      }
-      partValues[segment.dataset.datePart] = buffer;
-    });
-    var previousValue = hidden.value;
-    if (complete) {
-      hidden.value = isoFromParts(
-        parseInt(partValues.year, 10),
-        parseInt(partValues.month, 10),
-        parseInt(partValues.day, 10)
-      );
-    } else {
-      hidden.value = "";
-    }
-    return hidden.value !== previousValue;
-  }
-
-  /** Push an ISO value (or "") into a side's segments and hidden input. */
-  function setSideValue(picker, side, isoString) {
-    var hidden = picker.querySelector(
-      'input[data-date-range-hidden="' + side + '"]'
-    );
-    hidden.value = isoString;
-    var partValues = { year: "", month: "", day: "" };
-    if (isoString) {
-      var pieces = isoString.split("-");
-      partValues = { year: pieces[0], month: pieces[1], day: pieces[2] };
-    }
-    segmentsForSide(picker, side).forEach(function (segment) {
-      setSegmentBuffer(segment, partValues[segment.dataset.datePart]);
-    });
-  }
-
-  function initField(picker, calendarState) {
-    var field = picker.querySelector("[data-date-range-field]");
-    var segments = Array.prototype.slice.call(
-      picker.querySelectorAll("input[data-date-part]")
-    );
-
-    // Adopt server-rendered values (prefilled filter) as typed buffers.
-    segments.forEach(function (segment) {
-      if (segment.value) setSegmentBuffer(segment, segment.value);
-    });
-
-    // Clicking anywhere in the container that is not a date part activates
-    // the first date part.
-    field.addEventListener("mousedown", function (event) {
-      if (event.target.closest("input[data-date-part]")) return;
-      if (event.target.closest("[data-date-range-calendar-toggle]")) return;
-      event.preventDefault();
-      segments[0].focus();
-    });
-
-    segments.forEach(function (segment, segmentIndex) {
-      segment.addEventListener("keydown", function (event) {
-        if (event.key === "Tab") return; // native Tab / Shift+Tab navigation
-        if (event.key === "Enter") return; // let the filter form submit
-        if (event.key === "Backspace" || event.key === "Delete") {
-          event.preventDefault();
-          setSegmentBuffer(segment, "");
-          syncHiddenFromSegments(picker, segment.dataset.dateSide);
-          return;
-        }
-        if (event.ctrlKey || event.metaKey || event.altKey) return;
-        event.preventDefault();
-        if (!/^[0-9]$/.test(event.key)) return; // only numbers can be typed
-        var maximumLength = parseInt(segment.getAttribute("maxlength"), 10);
-        var buffer = segmentBuffer(segment);
-        // Typing into an already-full part starts it over.
-        buffer = buffer.length >= maximumLength ? event.key : buffer + event.key;
-        setSegmentBuffer(segment, buffer);
-        syncHiddenFromSegments(picker, segment.dataset.dateSide);
-        if (buffer.length === maximumLength && segmentIndex + 1 < segments.length) {
-          segments[segmentIndex + 1].focus();
-        }
-      });
-      // Swallow any input that bypassed keydown (e.g. IME/paste).
-      segment.addEventListener("input", function () {
-        setSegmentBuffer(segment, segmentBuffer(segment));
-      });
-      segment.addEventListener("focus", function () {
-        if (calendarState) calendarState.refreshFromField();
-      });
-    });
-  }
-
-  // ── DateRangeCalendar: popup month grid ────────────────────────────────
-
-  function createCalendarState(picker) {
-    var popup = picker.querySelector("[data-date-range-calendar]");
-    var grid = popup.querySelector("[data-date-range-grid]");
-    var monthLabel = popup.querySelector("[data-date-range-month-label]");
-
-    var today = new Date();
-    var state = {
-      open: false,
-      viewYear: today.getFullYear(),
-      viewMonth: today.getMonth(),
-      startIso: "",
-      endIso: "",
-      // The anchor is the fixed endpoint: "start" while picking the EndDate,
-      // "end" once the range is complete (further picks move the StartDate).
-      anchor: "",
-      hoverIso: "",
-      // True while showing a committed range the user has not edited yet —
-      // the track renders muted until the first pick.
-      readOnly: false,
-    };
-
-    function hiddenValue(side) {
-      return picker.querySelector(
-        'input[data-date-range-hidden="' + side + '"]'
-      ).value;
-    }
-
-    state.refreshFromField = function () {
-      if (state.open) return;
-      state.startIso = hiddenValue("min");
-      state.endIso = hiddenValue("max");
-    };
-
-    function syncSelectionToField() {
-      setSideValue(picker, "min", state.startIso);
-      setSideValue(picker, "max", state.endIso);
-    }
-
-    function openPopup() {
-      state.startIso = hiddenValue("min");
-      state.endIso = hiddenValue("max");
-      state.anchor = state.startIso && state.endIso ? "end" : state.startIso ? "start" : "";
-      state.readOnly = Boolean(state.startIso && state.endIso);
-      state.hoverIso = "";
-      var focusDate = state.startIso ? dateFromIso(state.startIso) : new Date();
-      state.viewYear = focusDate.getFullYear();
-      state.viewMonth = focusDate.getMonth();
-      state.open = true;
-      popup.classList.remove("hidden");
-      render();
-    }
-
-    function closePopup() {
-      state.open = false;
-      state.hoverIso = "";
-      popup.classList.add("hidden");
-    }
-
-    function clearSelection() {
-      state.startIso = "";
-      state.endIso = "";
-      state.anchor = "";
-      state.hoverIso = "";
-      state.readOnly = false;
-      syncSelectionToField();
-    }
-
-    /**
-     * Anchor-style picking:
-     * - no selection: the pick becomes the StartDate anchor
-     * - anchor=start (picking EndDate): a pick on/after the StartDate
-     *   completes the range and moves the anchor to the EndDate; a pick
-     *   before it clears the range and restarts
-     * - anchor=end (adjusting StartDate): a pick on/before the EndDate
-     *   moves the StartDate (extend/shorten); a pick after it clears the
-     *   range and restarts from the clicked date
-     */
-    function pickDate(isoString) {
-      state.readOnly = false;
-      if (!state.startIso) {
-        state.startIso = isoString;
-        state.anchor = "start";
-      } else if (state.anchor === "start" && !state.endIso) {
-        if (isoString >= state.startIso) {
-          state.endIso = isoString;
-          state.anchor = "end";
-        } else {
-          state.startIso = isoString;
-          state.endIso = "";
-          state.anchor = "start";
-        }
-      } else {
-        if (isoString <= state.endIso) {
-          state.startIso = isoString;
-        } else {
-          state.startIso = isoString;
-          state.endIso = "";
-          state.anchor = "start";
-        }
-      }
-      syncSelectionToField();
-      render();
-    }
-
-    function applyPreset(presetName) {
-      var range = presetRange(presetName);
-      if (!range) return;
-      state.startIso = isoFromDate(range[0]);
-      state.endIso = isoFromDate(range[1]);
-      state.anchor = "end";
-      state.readOnly = false;
-      state.viewYear = range[0].getFullYear();
-      state.viewMonth = range[0].getMonth();
-      syncSelectionToField();
-      render();
-    }
-
-    /** The (inclusive-exclusive of endpoints) track between the two range
-     * ends; while picking the second date the hovered day acts as the
-     * provisional other end. */
-    function trackBounds() {
-      if (state.startIso && state.endIso) {
-        return [state.startIso, state.endIso, state.readOnly ? TRACK_MUTED_CLASS : TRACK_FILLED_CLASS];
-      }
-      if (state.startIso && state.hoverIso && state.hoverIso !== state.startIso) {
-        var lower = state.hoverIso < state.startIso ? state.hoverIso : state.startIso;
-        var upper = state.hoverIso < state.startIso ? state.startIso : state.hoverIso;
-        return [lower, upper, TRACK_OUTLINED_CLASS];
-      }
-      return null;
-    }
-
-    function dayCellClass(isoString, inViewMonth) {
-      var classes = [DAY_BASE_CLASS];
-      var isStart = isoString === state.startIso;
-      var isEnd = isoString === state.endIso;
-      var isAnchor =
-        (state.anchor === "start" && isStart) || (state.anchor === "end" && isEnd);
-      var track = trackBounds();
-      var inTrack = track && isoString > track[0] && isoString < track[1];
-      if (inTrack) {
-        classes.push(track[2]);
-      } else {
-        classes.push(DAY_ROUNDED_CLASS);
-      }
-      if (isAnchor && !state.readOnly) {
-        classes.push(DAY_ANCHOR_CLASS);
-      } else if (isStart || isEnd) {
-        classes.push(DAY_SELECTED_CLASS);
-      } else if (!inViewMonth) {
-        classes.push(DAY_OUTSIDE_MONTH_CLASS);
-      }
-      return classes.join(" ");
-    }
-
-    function render() {
-      monthLabel.textContent = new Date(
-        state.viewYear,
-        state.viewMonth,
-        1
-      ).toLocaleDateString(undefined, { month: "long", year: "numeric" });
-
-      grid.textContent = "";
-      WEEKDAY_LABELS.forEach(function (weekdayLabel) {
-        var headerCell = document.createElement("span");
-        headerCell.className = WEEKDAY_CLASS;
-        headerCell.textContent = weekdayLabel;
-        grid.appendChild(headerCell);
-      });
-
-      var firstOfMonth = new Date(state.viewYear, state.viewMonth, 1);
-      // Monday-first offset of the leading overflow days.
-      var leadingDays = (firstOfMonth.getDay() + 6) % 7;
-      var cellDate = addDays(firstOfMonth, -leadingDays);
-      for (var cellIndex = 0; cellIndex < 42; cellIndex++) {
-        var isoString = isoFromDate(cellDate);
-        var dayButton = document.createElement("button");
-        dayButton.type = "button";
-        dayButton.setAttribute("data-date", isoString);
-        dayButton.className = dayCellClass(
-          isoString,
-          cellDate.getMonth() === state.viewMonth
-        );
-        dayButton.textContent = String(cellDate.getDate());
-        grid.appendChild(dayButton);
-        cellDate = addDays(cellDate, 1);
-      }
-    }
-
-    // ── Wiring ──
-    picker
-      .querySelector("[data-date-range-calendar-toggle]")
-      .addEventListener("click", function () {
-        if (state.open) closePopup();
-        else openPopup();
-      });
-
-    grid.addEventListener("click", function (event) {
-      var dayButton = event.target.closest("button[data-date]");
-      if (dayButton) pickDate(dayButton.getAttribute("data-date"));
-    });
-
-    grid.addEventListener("mouseover", function (event) {
-      if (!state.startIso || state.endIso) return;
-      var dayButton = event.target.closest("button[data-date]");
-      if (!dayButton) return;
-      var hoveredIso = dayButton.getAttribute("data-date");
-      if (hoveredIso === state.hoverIso) return;
-      state.hoverIso = hoveredIso;
-      render();
-    });
-
-    popup
-      .querySelector("[data-date-range-prev]")
-      .addEventListener("click", function () {
-        state.viewMonth -= 1;
-        if (state.viewMonth < 0) {
-          state.viewMonth = 11;
-          state.viewYear -= 1;
-        }
-        render();
-      });
-
-    popup
-      .querySelector("[data-date-range-next]")
-      .addEventListener("click", function () {
-        state.viewMonth += 1;
-        if (state.viewMonth > 11) {
-          state.viewMonth = 0;
-          state.viewYear += 1;
-        }
-        render();
-      });
-
-    popup.querySelectorAll("[data-date-range-preset]").forEach(function (button) {
-      button.addEventListener("click", function () {
-        applyPreset(button.getAttribute("data-date-range-preset"));
-      });
-    });
-
-    // Cancel: close the popup and clear the selected dates.
-    popup
-      .querySelector("[data-date-range-cancel]")
-      .addEventListener("click", function () {
-        clearSelection();
-        closePopup();
-      });
-
-    // Clear: clear the selected dates but keep the popup open.
-    popup
-      .querySelector("[data-date-range-clear]")
-      .addEventListener("click", function () {
-        clearSelection();
-        render();
-      });
-
-    // Select: close the popup, keeping the selected dates.
-    popup
-      .querySelector("[data-date-range-select]")
-      .addEventListener("click", function () {
-        closePopup();
-      });
-
-    document.addEventListener("keydown", function (event) {
-      if (event.key === "Escape" && state.open) closePopup();
-    });
-
-    document.addEventListener("mousedown", function (event) {
-      if (state.open && !picker.contains(event.target)) closePopup();
-    });
-
-    return state;
-  }
-
-  function initPicker(picker) {
-    if (picker.dataset.dateRangePickerInitialized) return;
-    picker.dataset.dateRangePickerInitialized = "true";
-    var calendarState = createCalendarState(picker);
-    initField(picker, calendarState);
-  }
-
-  function initAllPickers() {
-    document.querySelectorAll("[data-date-range-picker]").forEach(initPicker);
-  }
-
-  window.initDateRangePickers = initAllPickers;
-
-  if (document.readyState === "loading") {
-    document.addEventListener("DOMContentLoaded", initAllPickers);
-  } else {
-    initAllPickers();
-  }
-})();

games/static/js/filter_bar.js

@@ -4,8 +4,6 @@
  * Handles form submission, preset loading/saving, and preset list rendering.
  * No HTMX — plain fetch() and window.location for all interactions.
  */
-import { onSwap } from "./utils.js";
-
 (function () {
   "use strict";
 
@@ -154,17 +152,17 @@ import { onSwap } from "./utils.js";
       { prefix: "filter-session-average", key: "session_average" },
       { prefix: "filter-purchase-count", key: "purchase_count" },
       { prefix: "filter-playevent-count", key: "playevent_count" },
-      { prefix: "filter-duration-total-hours", key: "duration_total_hours" },
-      { prefix: "filter-duration-manual-hours", key: "duration_manual_hours" },
-      { prefix: "filter-duration-calculated-hours", key: "duration_calculated_hours" },
-      { prefix: "filter-manual-playtime-hours", key: "manual_playtime_hours" },
-      { prefix: "filter-calculated-playtime-hours", key: "calculated_playtime_hours" },
+      { prefix: "filter-duration-total-minutes", key: "duration_total_minutes" },
+      { prefix: "filter-duration-manual-minutes", key: "duration_manual_minutes" },
+      { prefix: "filter-duration-calculated-minutes", key: "duration_calculated_minutes" },
+      { prefix: "filter-manual-playtime-minutes", key: "manual_playtime_minutes" },
+      { prefix: "filter-calculated-playtime-minutes", key: "calculated_playtime_minutes" },
       { prefix: "filter-num-purchases", key: "num_purchases" },
       { prefix: "filter-price", key: "price" },
       { prefix: "filter-purchase-price-total", key: "purchase_price_total" },
       { prefix: "filter-purchase-price-any", key: "purchase_price_any" },
       { prefix: "filter-days-to-finish", key: "days_to_finish" },
-      { prefix: "filter-playtime-hours", key: "playtime_hours", ignoreZeroZero: true }
+      { prefix: "filter-playtime", key: "playtime_minutes", convert: function(v) { return Math.round(v * 60); }, ignoreZeroZero: true }
     ];
 
     rangeFields.forEach(function (rf) {
@@ -412,8 +410,9 @@ import { onSwap } from "./utils.js";
 
   // ── Init on page load ───────────────────────────────────────────────────
 
-  // ── Inject the search input into a filter form ──
-  function injectSearchInput(form) {
+  // ── Inject search inputs into filter forms ──
+  function injectSearchInputs() {
+    document.querySelectorAll('[id^="filter-bar-form"]').forEach(function (form) {
       if (form.querySelector('[name="filter-search"]')) return; // already added
       var input = document.createElement("input");
       input.type = "text";
@@ -431,6 +430,7 @@ import { onSwap } from "./utils.js";
         } catch (e) {}
         hidden.parentNode.insertBefore(input, hidden.nextSibling);
       }
+    });
   }
 
   /**
@@ -470,8 +470,8 @@ import { onSwap } from "./utils.js";
     });
   }
 
-  onSwap('[id^="filter-bar-form"]', function (form) {
-    injectSearchInput(form);
+  document.addEventListener("DOMContentLoaded", function () {
+    injectSearchInputs();
     setupDeselectableRadios();
     setupStringFilters();
     loadPresets();

games/static/js/range_slider.js

@@ -8,12 +8,15 @@
  * Handles track-fill positioning and sync between handles and the connected
  * number inputs (linked via data-target attributes).
  */
-import { onSwap } from "./utils.js";
-
 (function () {
   "use strict";
 
-  function initializeSlider(slider) {
+  function initAll(force) {
+    document.querySelectorAll(".range-slider").forEach(function (slider) {
+      if (force) slider._rsInit = false;
+      if (slider._rsInit) return;
+      slider._rsInit = true;
+
       var mode = slider.getAttribute("data-mode") || "range";
       var trackFill = slider.querySelector(".range-track-fill");
       var minHandle = slider.querySelector(".range-handle-min");
@@ -224,7 +227,10 @@ import { onSwap } from "./utils.js";
 
       // ── Initial position ──
       updateHandles();
+    });
   }
 
-  onSwap(".range-slider", initializeSlider);
+  document.addEventListener("DOMContentLoaded", initAll);
+  document.addEventListener("htmx:afterSwap", initAll);
+  window.initRangeSliders = initAll;
 })();

games/static/js/search_select.js

@@ -12,8 +12,8 @@
  * pills. Filter widgets have no hidden inputs; readSearchSelect serialises their
  * state into data-included / data-excluded / data-modifier for the filter bar.
  *
- * Widgets are initialized via onSwap() (utils.js), which covers the initial
- * page load and every htmx-swapped fragment, once per widget.
+ * initAll() runs on DOMContentLoaded + htmx:afterSwap, each widget guarded with
+ * element._searchSelectInit.
  *
  * Dynamically-added rows and pills are cloned from hidden <template> elements
  * the server renders with the same Python components (Pill / SearchSelect /
@@ -21,8 +21,6 @@
  * and data-* attributes — so all markup and Tailwind class strings live in one
  * place (the Python components), never duplicated here.
  */
-import { onSwap } from "./utils.js";
-
 (() => {
   "use strict";
 
@@ -34,6 +32,14 @@ import { onSwap } from "./utils.js";
   // INCLUDES_ONLY) coexist with value pills.
   const PRESENCE_MODIFIERS = ["NOT_NULL", "IS_NULL"];
 
+  const initAll = () => {
+    document.querySelectorAll("[data-search-select]").forEach(element => {
+      if (element._searchSelectInit) return;
+      element._searchSelectInit = true;
+      initWidget(element);
+    });
+  };
+
   const initWidget = (container) => {
     const search = container.querySelector("[data-search-select-search]");
     const options = container.querySelector("[data-search-select-options]");
@@ -660,5 +666,6 @@ import { onSwap } from "./utils.js";
     });
   };
 
-  onSwap("[data-search-select]", initWidget);
+  document.addEventListener("DOMContentLoaded", initAll);
+  document.addEventListener("htmx:afterSwap", initAll);
 })();

games/static/js/utils.js

@@ -1,28 +1,3 @@
-/**
- * @description Runs initializeElement once for each element matching selector,
- * on initial page load and inside every htmx-swapped fragment (a port of
- * FastHTML's proc_htmx). htmx fires htmx:load for the initial document and for
- * each swapped-in element, so a single registration covers both; the WeakSet
- * guarantees once-per-element initialization, replacing the old
- * DOMContentLoaded + htmx:afterSwap + per-element guard-flag pattern.
- * @param {string} selector
- * @param {function(Element): void} initializeElement
- */
-function onSwap(selector, initializeElement) {
-  const initialized = new WeakSet();
-  htmx.onLoad((swappedElement) => {
-    const elements = Array.from(htmx.findAll(swappedElement, selector));
-    if (swappedElement.matches && swappedElement.matches(selector)) {
-      elements.unshift(swappedElement);
-    }
-    for (const element of elements) {
-      if (initialized.has(element)) continue;
-      initialized.add(element);
-      initializeElement(element);
-    }
-  });
-}
-
 /**
  * @description Formats Date to a UTC string accepted by the datetime-local input field.
  * @param {Date} date
@@ -227,7 +202,6 @@ function disableElementsWhenTrue(targetSelect, targetValue, elementList) {
 }
 
 export {
-  onSwap,
   toISOUTCString,
   syncSelectInputUntilChanged,
   getEl,

games/static/js/year_picker.js

@@ -1,38 +0,0 @@
-import { onSwap } from "./utils.js";
-
-onSwap("#year-picker-input", function(pickerEl) {
-    const selectedYear = pickerEl.dataset.selectedYear;
-    const urlTemplate = pickerEl.dataset.urlTemplate;
-    const currentYear = new Date().getFullYear();
-    const availableYears = new Set(
-        pickerEl.dataset.availableYears
-            .split(",")
-            .map(s => parseInt(s.trim()))
-            .filter(n => !isNaN(n))
-    );
-
-    const picker = new Datepicker(pickerEl, {
-        pickLevel: 2,
-        format: "yyyy",
-        minDate: new Date(1999, 0, 1),
-        maxDate: new Date(currentYear, 11, 31),
-        autohide: false,
-        orientation: "bottom end",
-        showOnClick: false,
-        showOnFocus: false,
-        beforeShowYear: (date) => ({ enabled: availableYears.has(date.getFullYear()) }),
-    });
-    pickerEl._pickerInstance = picker;
-
-    picker.element.addEventListener("changeDate", (event) => {
-        const year = event.detail.date?.getFullYear();
-        if (year && urlTemplate) {
-            window.location.href = urlTemplate.replace("__year__", year);
-        }
-    });
-
-    if (selectedYear) {
-        picker.dates = [new Date(parseInt(selectedYear), 0, 1)];
-        picker.update();
-    }
-});

games/views/auth.py

@@ -3,18 +3,19 @@ registration/login.html)."""
 
 from django.contrib.auth import views as auth_views
 from django.http import HttpResponse
+from django.utils.safestring import SafeText, mark_safe
 
-from common.components import CsrfInput, Div, Element, Input, Node, Safe
+from common.components import Component, CsrfInput, Div, Input
 from common.components.primitives import Td, Tr
 from common.layout import render_page
 
 
-def _login_content(form, request) -> Node:
-    table = Element(
-        "table",
+def _login_content(form, request) -> SafeText:
+    table = Component(
+        tag_name="table",
         children=[
             CsrfInput(request),
-            Safe(str(form.as_table())),
+            mark_safe(str(form.as_table())),
             Tr(
                 children=[
                     Td(),
@@ -30,13 +31,13 @@ def _login_content(form, request) -> Node:
     return Div(
         [("class", "flex items-center flex-col")],
         [
-            Element(
-                "h2",
+            Component(
+                tag_name="h2",
                 attributes=[("class", "text-3xl text-white mb-8")],
                 children=["Please log in to continue"],
             ),
-            Element(
-                "form",
+            Component(
+                tag_name="form",
                 attributes=[("method", "post")],
                 children=[table],
             ),

games/views/device.py

@@ -2,16 +2,17 @@ from django.contrib.auth.decorators import login_required
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse
+from django.utils.safestring import mark_safe
 
 from common.components import (
     A,
     AddForm,
+    Button,
     ButtonGroup,
-    DeviceFilterBar,
-    Fragment,
     Icon,
-    StyledButton,
     paginated_table_content,
+    DeviceFilterBar,
+    ModuleScript,
 )
 from common.layout import render_page
 from common.time import dateformat, local_strftime
@@ -34,9 +35,7 @@ def list_devices(request: HttpRequest) -> HttpResponse:
     devices, page_obj, elided_page_range = paginate(request, devices)
 
     data = {
-        "header_action": A(href=reverse("games:add_device"))[
-            StyledButton()["Add device"]
-        ],
+        "header_action": A([], Button([], "Add device"), url_name="games:add_device"),
         "columns": [
             "Name",
             "Type",
@@ -77,11 +76,14 @@ def list_devices(request: HttpRequest) -> HttpResponse:
         preset_list_url=reverse("games:list_presets") + "?mode=devices",
         preset_save_url=reverse("games:save_preset") + "?mode=devices",
     )
-    content = Fragment(filter_bar, content)
+    content = mark_safe(str(filter_bar) + str(content))
     return render_page(
         request,
         content,
         title="Manage devices",
+        scripts=ModuleScript("range_slider.js")
+        + ModuleScript("search_select.js")
+        + ModuleScript("filter_bar.js"),
     )
 
 

games/views/filter_presets.py

@@ -8,6 +8,7 @@ from django.contrib.auth.decorators import login_required
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse
+from django.utils.safestring import mark_safe
 
 from games.models import FilterPreset
 
@@ -39,7 +40,7 @@ def list_presets(request: HttpRequest) -> HttpResponse:
     if not items:
         items = ['<li class="px-4 py-2 text-sm text-body italic">No saved presets</li>']
 
-    return HttpResponse(f'<ul class="py-1">{"".join(items)}</ul>')
+    return HttpResponse(mark_safe(f'<ul class="py-1">{"".join(items)}</ul>'))
 
 
 @login_required

games/views/game.py

@@ -8,18 +8,18 @@ from django.middleware.csrf import get_token
 from django.shortcuts import get_object_or_404, redirect
 from django.template.defaultfilters import date as date_filter
 from django.urls import reverse
-from django.utils.safestring import SafeText
+from django.utils.safestring import SafeText, mark_safe
 
 from common.components import (
     H1,
     A,
     AddForm,
+    Button,
     ButtonGroup,
+    Component,
     CsrfInput,
     Div,
-    Element,
     FilterBar,
-    Fragment,
     GameStatus,
     GameStatusSelector,
     Icon,
@@ -27,18 +27,16 @@ from common.components import (
     Modal,
     ModuleScript,
     NameWithIcon,
-    Node,
     Popover,
     PopoverTruncated,
     PurchasePrice,
-    Safe,
     SearchField,
     SimpleTable,
-    StyledButton,
     Ul,
     paginated_table_content,
 )
 from common.components.primitives import Li, P, Span, Strong
+from common.icons import get_icon
 from common.layout import render_page
 from common.time import (
     dateformat,
@@ -90,11 +88,12 @@ def list_games(request: HttpRequest, search_string: str = "") -> HttpResponse:
 
     data = {
         "header_action": Div(
-            class_="flex justify-between",
-        )[
+            children=[
                 SearchField(search_string=search_string),
-            A(href=reverse("games:add_game"))[StyledButton()["Add game"]],
+                A([], Button([], "Add game"), url_name="games:add_game"),
             ],
+            attributes=[("class", "flex justify-between")],
+        ),
         "columns": [
             "Name",
             "Sort Name",
@@ -146,11 +145,14 @@ def list_games(request: HttpRequest, search_string: str = "") -> HttpResponse:
         preset_list_url=reverse("games:list_presets"),
         preset_save_url=reverse("games:save_preset"),
     )
-    content = Fragment(filter_bar, content)
+    content = mark_safe(str(filter_bar) + str(content))
     return render_page(
         request,
         content,
         title="Manage games",
+        scripts=ModuleScript("range_slider.js")
+        + ModuleScript("search_select.js")
+        + ModuleScript("filter_bar.js"),
     )
 
 
@@ -171,7 +173,7 @@ def add_game(request: HttpRequest) -> HttpResponse:
         AddForm(
             form,
             request=request,
-            additional_row=StyledButton(
+            additional_row=Button(
                 [],
                 "Submit & Create Purchase",
                 color="gray",
@@ -201,8 +203,8 @@ def _delete_game_confirmation_modal(
     if not (session_count or purchase_count or playevent_count):
         data_items.append(Li(children=["No associated data"]))
 
-    form = Element(
-        "form",
+    form = Component(
+        tag_name="form",
         attributes=[
             ("hx-post", reverse("games:delete_game", args=[game.id])),
             ("hx-replace-url", "true"),
@@ -247,14 +249,14 @@ def _delete_game_confirmation_modal(
             Div(
                 [("class", "items-center mt-5")],
                 [
-                    StyledButton(
+                    Button(
                         [("class", "w-full")],
                         "Delete",
                         color="red",
                         size="lg",
                         type="submit",
                     ),
-                    StyledButton(
+                    Button(
                         [("class", "mt-0 w-full")],
                         "Cancel",
                         color="gray",
@@ -338,69 +340,69 @@ _STAT_SVGS = {
     "playrange": '<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6"><path stroke-linecap="round" stroke-linejoin="round" d="M6.75 3v2.25M17.25 3v2.25M3 18.75V7.5a2.25 2.25 0 0 1 2.25-2.25h13.5A2.25 2.25 0 0 1 21 7.5v11.25m-18 0A2.25 2.25 0 0 0 5.25 21h13.5A2.25 2.25 0 0 0 21 18.75m-18 0v-7.5A2.25 2.25 0 0 1 5.25 9h13.5A2.25 2.25 0 0 1 21 11.25v7.5m-9-6h.008v.008H12v-.008ZM12 15h.008v.008H12V15Zm0 2.25h.008v.008H12v-.008ZM9.75 15h.008v.008H9.75V15Zm0 2.25h.008v.008H9.75v-.008ZM7.5 15h.008v.008H7.5V15Zm0 2.25h.008v.008H7.5v-.008Zm6.75-4.5h.008v.008h-.008v-.008Zm0 2.25h.008v.008h-.008V15Zm0 2.25h.008v.008h-.008v-.008Zm2.25-4.5h.008v.008H16.5v-.008Zm0 2.25h.008v.008H16.5V15Z" /></svg>',
 }
 
-_PLAYED_BTN = (
-    "px-4 py-2 text-sm font-medium text-gray-900 bg-white border border-gray-200 "
-    "hover:bg-gray-100 hover:text-blue-700 dark:bg-gray-800 dark:border-gray-700 "
-    "dark:text-white dark:hover:bg-gray-700 hover:cursor-pointer"
-)
-_PLAYED_MENU = (
-    "absolute top-full -left-px w-auto whitespace-nowrap z-10 text-sm font-medium "
-    "bg-gray-800/20 backdrop-blur-lg rounded-md rounded-tl-none border "
-    "border-gray-200 dark:border-gray-700"
-)
+_PLAYED_ROW_TEMPLATE = """<div class="flex gap-2 items-center" x-data="{ open: false }">
+    <span class="uppercase">Played</span>
+    <div class="inline-flex rounded-md shadow-2xs" role="group" x-data="{ played: @@PLAYED_COUNT@@ }">
+        <a href="@@ADD_PE@@">
+        <button type="button" class="px-4 py-2 text-sm font-medium text-gray-900 bg-white border border-gray-200 rounded-s-lg hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-2 focus:ring-blue-700 focus:text-blue-700 dark:bg-gray-800 dark:border-gray-700 dark:text-white dark:hover:text-white dark:hover:bg-gray-700 dark:focus:ring-blue-500 dark:focus:text-white hover:cursor-pointer">
+            <span x-text="played"></span> times
+        </button>
+        </a>
+        <button type="button" x-on:click="open = !open" @click.outside="open = false" class="relative px-4 py-2 text-sm font-medium text-gray-900 bg-white border-e border-b border-t border-gray-200 rounded-e-lg hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-2 focus:ring-blue-700 focus:text-blue-700 dark:bg-gray-800 dark:border-gray-700 dark:text-white dark:hover:text-white dark:hover:bg-gray-700 dark:focus:ring-blue-500 dark:focus:text-white align-middle hover:cursor-pointer">
+            @@ARROWDOWN@@
+            <div
+                class="absolute top-full -left-px w-auto whitespace-nowrap z-10 text-sm font-medium bg-gray-800/20 backdrop-blur-lg rounded-md rounded-tl-none border border-gray-200 dark:border-gray-700"
+                x-show="open"
+            >
+                <ul
+                    class=""
+                >
+                    <li class="px-4 py-2 dark:hover:text-white dark:hover:bg-gray-700 dark:focus:ring-blue-500 dark:focus:text-white rounded-tr-md">
+                        <a href="@@ADD_PE_FOR_GAME@@">Add playthrough...</a>
+                    </li>
+                    <li
+                        x-on:click="createPlayEvent"
+                        class="relative px-4 py-2 dark:hover:text-white dark:hover:bg-gray-700 dark:focus:ring-blue-500 dark:focus:text-white rounded-b-md"
+                    >
+                        Played times +1
+                    </li>
+                    <script>
+                       function createPlayEvent() {
+                        this.played++;
+                        // TODO: migrate to hx-post + hx-on::after-request for HTMX-native toast handling
+                        fetchWithHtmxTriggers('@@API_CREATE@@', {
+                            method: 'POST',
+                            headers: { 'X-CSRFToken': '@@CSRF@@', 'Content-Type': 'application/json' },
+                            body: '{"game_id": @@GAME_ID@@}'
+                        })
+                        .catch(() => {
+                            this.played--;
+                            console.error('Failed to record play');
+                        });
+                       }
+                    </script>
+                </ul>
+            </div>
+        </button>
+      </div>
+</div>"""
 
 
-def _played_row(game: Game, request: HttpRequest) -> Node:
-    """'Played N times' control as a custom element (ts/elements/play-event-row.ts)."""
-    from common.components import Element
-    from common.components.custom_elements import _PlayEventRow
-    from common.components.primitives import Button
-
-    played: int = 0
-    played = game.playevents.count()
-
-    count_button = A(href=reverse("games:add_playevent"))[
-        Button(class_=_PLAYED_BTN + " rounded-s-lg")[
-            Span(data_count="")[str(played)], " times"
-        ]
-    ]
-    menu = Div(data_menu="", hidden=True, class_=_PLAYED_MENU)[
-        Ul()[
-            Li(class_="px-4 py-2")[
-                A(href=reverse("games:add_playevent_for_game", args=[game.id]))[
-                    "Add playthrough..."
-                ]
-            ],
-            Li(class_="px-4 py-2 cursor-pointer")[
-                Element(
-                    "button",
-                    [("type", "button"), ("data-add-play", "")],
-                    children=["Played times +1"],
-                )
-            ],
-        ]
-    ]
-    toggle = Element(
-        "button",
-        [
-            ("type", "button"),
-            ("data-toggle", ""),
-            ("class", _PLAYED_BTN + " rounded-e-lg"),
-        ],
-        [Icon("arrowdown")],
-    )
-    # Menu is a SIBLING of the toggle (not nested inside it): a <button> may not
-    # contain another <button>, and that invalid nesting makes the HTML parser
-    # close ancestors early, ejecting later page sections from their container.
-    toggle_group = Div(class_="relative inline-flex")[toggle, menu]
-    group = Div(class_="inline-flex items-stretch rounded-md shadow-2xs")[
-        count_button, toggle_group
-    ]
-    return _PlayEventRow(
-        game_id=game.id,
-        csrf=get_token(request),
-        api_create_url=reverse("api-1.0.0:create_playevent"),
-    )[Div(class_="flex gap-2 items-center")[Span(class_="uppercase")["Played"], group]]
+def _played_row(game: Game, request: HttpRequest) -> SafeText:
+    """The 'Played N times' control with its Alpine.js dropdown."""
+    replacements = {
+        "@@PLAYED_COUNT@@": str(game.playevents.count()),
+        "@@ADD_PE@@": reverse("games:add_playevent"),
+        "@@ARROWDOWN@@": get_icon("arrowdown"),
+        "@@ADD_PE_FOR_GAME@@": reverse("games:add_playevent_for_game", args=[game.id]),
+        "@@API_CREATE@@": reverse("api-1.0.0:create_playevent"),
+        "@@CSRF@@": get_token(request),
+        "@@GAME_ID@@": str(game.id),
+    }
+    html = _PLAYED_ROW_TEMPLATE
+    for token, value in replacements.items():
+        html = html.replace(token, value)
+    return mark_safe(html)
 
 
 def _stat_popover(popover_id: str, tooltip: str, svg_key: str, value: str) -> SafeText:
@@ -408,12 +410,14 @@ def _stat_popover(popover_id: str, tooltip: str, svg_key: str, value: str) -> Sa
         popover_content=tooltip,
         wrapped_classes="flex gap-2 items-center",
         id=popover_id,
-        children=[Safe(_STAT_SVGS[svg_key]), str(value)],
+        children=[mark_safe(_STAT_SVGS[svg_key]), str(value)],
     )
 
 
-def _meta_row(label: str, value: Node | str, extra: Node | str = "") -> Node:
-    children: list[Node | str] = [
+def _meta_row(
+    label: str, value: SafeText | str, extra: SafeText | str = ""
+) -> SafeText:
+    children: list[SafeText | str] = [
         Span(attributes=[("class", "uppercase")], children=[label]),
         value,
     ]
@@ -440,8 +444,8 @@ def _game_action_buttons(game: Game) -> SafeText:
     edit_link = A(
         href=reverse("games:edit_game", args=[game.id]),
         children=[
-            Element(
-                "button",
+            Component(
+                tag_name="button",
                 attributes=[("type", "button"), ("class", edit_class)],
                 children=["Edit"],
             )
@@ -454,8 +458,8 @@ def _game_action_buttons(game: Game) -> SafeText:
             ("hx-target", "#global-modal-container"),
         ],
         children=[
-            Element(
-                "button",
+            Component(
+                tag_name="button",
                 attributes=[("type", "button"), ("class", delete_class)],
                 children=["Delete"],
             )
@@ -563,7 +567,7 @@ def _game_header(game: Game, request: HttpRequest, metrics: dict[str, Any]) -> S
         ]
         + (
             [
-                Safe("&nbsp;"),
+                mark_safe("&nbsp;"),
                 Popover(
                     popover_content="Original release year",
                     wrapped_classes="text-slate-500 text-2xl",
@@ -684,9 +688,10 @@ def _sessions_section(game: Game, request: HttpRequest) -> SafeText:
 
     header_action = Div(
         children=[
-            A(href=reverse("games:add_session"))[
-                StyledButton(icon=True, color="blue", size="xs")[Icon("plus")]
-            ],
+            A(
+                url_name="games:add_session",
+                children=Button(icon=True, size="xs", children=[Icon("play"), "LOG"]),
+            ),
             A(
                 href=reverse(
                     "games:list_sessions_start_session_from_session",
@@ -695,7 +700,7 @@ def _sessions_section(game: Game, request: HttpRequest) -> SafeText:
                 children=Popover(
                     popover_content=last_session.game.name,
                     children=[
-                        StyledButton(
+                        Button(
                             icon=True,
                             color="gray",
                             size="xs",
@@ -781,7 +786,7 @@ def _history_section(game: Game) -> SafeText:
     )
 
 
-_GET_SESSION_COUNT_SCRIPT = Safe(
+_GET_SESSION_COUNT_SCRIPT = mark_safe(
     "<script>\n"
     "            function getSessionCount() {\n"
     "                return document.getElementById('session-count')"

games/views/general.py

@@ -13,14 +13,17 @@ from django.urls import reverse
 from django.utils.timezone import localtime
 from django.utils.timezone import now as timezone_now
 
+from common.components import ExternalScript
 from common.layout import render_page
 from common.time import format_duration
 from games.models import Game, Platform, Purchase, Session
 from games.views.stats_content import stats_content
 from games.views.stats_data import compute_stats
 
-# The Flowbite-datepicker UMD bundle is declared as media on the YearPicker
-# component, so Page() loads it automatically on the stats pages.
+# Flowbite-datepicker UMD bundle, hoisted into the stats pages for YearPicker.
+_STATS_SCRIPTS = ExternalScript(
+    "https://cdn.jsdelivr.net/npm/flowbite-datepicker@2.0.0/dist/Datepicker.umd.min.js"
+)
 
 
 def model_counts(request: HttpRequest) -> dict[str, bool]:
@@ -74,7 +77,9 @@ def use_custom_redirect(
 def stats_alltime(request: HttpRequest) -> HttpResponse:
     request.session["return_path"] = request.path
     data = compute_stats(None)
-    return render_page(request, stats_content(data), title=data["title"])
+    return render_page(
+        request, stats_content(data), title=data["title"], scripts=_STATS_SCRIPTS
+    )
 
 
 @login_required
@@ -88,7 +93,9 @@ def stats(request: HttpRequest, year: int = 0) -> HttpResponse:
         return HttpResponseRedirect(reverse("games:stats_alltime"))
     request.session["return_path"] = request.path
     data = compute_stats(year)
-    return render_page(request, stats_content(data), title=data["title"])
+    return render_page(
+        request, stats_content(data), title=data["title"], scripts=_STATS_SCRIPTS
+    )
 
 
 @login_required

games/views/platform.py

@@ -2,16 +2,17 @@ from django.contrib.auth.decorators import login_required
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse
+from django.utils.safestring import mark_safe
 
 from common.components import (
     A,
     AddForm,
+    Button,
     ButtonGroup,
-    Fragment,
     Icon,
-    PlatformFilterBar,
-    StyledButton,
     paginated_table_content,
+    PlatformFilterBar,
+    ModuleScript,
 )
 from common.layout import render_page
 from common.time import dateformat, local_strftime
@@ -35,9 +36,9 @@ def list_platforms(request: HttpRequest) -> HttpResponse:
     platforms, page_obj, elided_page_range = paginate(request, platforms)
 
     data = {
-        "header_action": A(href=reverse("games:add_platform"))[
-            StyledButton()["Add platform"]
-        ],
+        "header_action": A(
+            [], Button([], "Add platform"), url_name="games:add_platform"
+        ),
         "columns": [
             "Name",
             "Icon",
@@ -82,11 +83,14 @@ def list_platforms(request: HttpRequest) -> HttpResponse:
         preset_list_url=reverse("games:list_presets") + "?mode=platforms",
         preset_save_url=reverse("games:save_preset") + "?mode=platforms",
     )
-    content = Fragment(filter_bar, content)
+    content = mark_safe(str(filter_bar) + str(content))
     return render_page(
         request,
         content,
         title="Manage platforms",
+        scripts=ModuleScript("range_slider.js")
+        + ModuleScript("search_select.js")
+        + ModuleScript("filter_bar.js"),
     )
 
 

games/views/playevent.py

@@ -9,16 +9,17 @@ from django.http import HttpRequest, HttpResponse, HttpResponseRedirect
 from django.shortcuts import get_object_or_404
 from django.urls import reverse
 
+from django.utils.safestring import mark_safe
+
 from common.components import (
     A,
     AddForm,
+    Button,
     ButtonGroup,
-    Fragment,
     Icon,
     ModuleScript,
-    PlayEventFilterBar,
-    StyledButton,
     paginated_table_content,
+    PlayEventFilterBar,
 )
 from common.layout import render_page
 from common.time import dateformat, format_duration, local_strftime
@@ -86,9 +87,9 @@ def create_playevent_tabledata(
         for row in row_list
     ]
     return {
-        "header_action": A(href=reverse("games:add_playevent"))[
-            StyledButton()["Add play event"]
-        ],
+        "header_action": A(
+            [], Button([], "Add play event"), url_name="games:add_playevent"
+        ),
         "columns": list(filtered_column_list),
         "rows": filtered_row_list,
     }
@@ -150,11 +151,14 @@ def list_playevents(request: HttpRequest) -> HttpResponse:
         preset_list_url=reverse("games:list_presets") + "?mode=playevents",
         preset_save_url=reverse("games:save_preset") + "?mode=playevents",
     )
-    content = Fragment(filter_bar, content)
+    content = mark_safe(str(filter_bar) + str(content))
     return render_page(
         request,
         content,
         title="Manage play events",
+        scripts=ModuleScript("range_slider.js")
+        + ModuleScript("search_select.js")
+        + ModuleScript("filter_bar.js"),
     )
 
 

games/views/purchase.py

@@ -16,20 +16,18 @@ from django.views.decorators.http import require_POST
 from common.components import (
     A,
     AddForm,
+    Button,
     ButtonGroup,
+    Component,
     CsrfInput,
     Div,
-    Element,
-    Fragment,
     GameLink,
     Icon,
     LinkedPurchase,
     Modal,
     ModuleScript,
-    Node,
     PriceConverted,
     PurchasePrice,
-    StyledButton,
     TableRow,
     paginated_table_content,
 )
@@ -110,9 +108,9 @@ def list_purchases(request: HttpRequest) -> HttpResponse:
     purchases, page_obj, elided_page_range = paginate(request, purchases)
 
     data = {
-        "header_action": A(href=reverse("games:add_purchase"))[
-            StyledButton()["Add purchase"]
-        ],
+        "header_action": A(
+            [], Button([], "Add purchase"), url_name="games:add_purchase"
+        ),
         "columns": [
             "Name",
             "Type",
@@ -131,18 +129,21 @@ def list_purchases(request: HttpRequest) -> HttpResponse:
         elided_page_range=elided_page_range,
         request=request,
     )
-    from common.components import PurchaseFilterBar
+    from common.components import ModuleScript, PurchaseFilterBar
 
     filter_bar = PurchaseFilterBar(
         filter_json=filter_json,
         preset_list_url=reverse("games:list_presets"),
         preset_save_url=reverse("games:save_preset"),
     )
-    content = Fragment(filter_bar, content)
+    content = mark_safe(str(filter_bar) + str(content))
     return render_page(
         request,
         content,
         title="Manage purchases",
+        scripts=ModuleScript("range_slider.js")
+        + ModuleScript("search_select.js")
+        + ModuleScript("filter_bar.js"),
     )
 
 
@@ -153,7 +154,7 @@ def _purchase_additional_row() -> SafeText:
             Td(),
             Td(
                 children=[
-                    StyledButton(
+                    Button(
                         [],
                         "Submit & Create Session",
                         color="gray",
@@ -302,9 +303,9 @@ def drop_purchase(request: HttpRequest, purchase_id: int) -> HttpResponse:
     return redirect("games:list_purchases")
 
 
-def _refund_confirmation_modal(purchase_id: int, request: HttpRequest) -> Node:
-    form = Element(
-        "form",
+def _refund_confirmation_modal(purchase_id: int, request: HttpRequest) -> SafeText:
+    form = Component(
+        tag_name="form",
         attributes=[
             ("hx-post", reverse("games:refund_purchase", args=[purchase_id])),
             ("hx-target", f"#purchase-row-{purchase_id}"),
@@ -319,14 +320,14 @@ def _refund_confirmation_modal(purchase_id: int, request: HttpRequest) -> Node:
             Div(
                 [("class", "items-center mt-5")],
                 [
-                    StyledButton(
+                    Button(
                         [("class", "w-full")],
                         "Refund",
                         color="blue",
                         size="lg",
                         type="submit",
                     ),
-                    StyledButton(
+                    Button(
                         [("class", "mt-0 w-full")],
                         "Cancel",
                         color="gray",
@@ -340,8 +341,8 @@ def _refund_confirmation_modal(purchase_id: int, request: HttpRequest) -> Node:
     return Modal(
         "refund-confirmation-modal",
         children=[
-            Element(
-                "h1",
+            Component(
+                tag_name="h1",
                 attributes=[
                     (
                         "class",

games/views/session.py

@@ -13,19 +13,15 @@ from django.utils.safestring import SafeText, mark_safe
 from common.components import (
     A,
     AddForm,
+    Button,
     ButtonGroup,
     Div,
-    Fragment,
     Icon,
     ModuleScript,
     NameWithIcon,
-    Node,
     Popover,
-    Safe,
     SearchField,
     SessionDeviceSelector,
-    SessionTimestampButtons,
-    StyledButton,
     paginated_table_content,
 )
 from common.components.primitives import Span, Td, Tr
@@ -77,13 +73,13 @@ def list_sessions(request: HttpRequest, search_string: str = "") -> HttpResponse
                 Div(
                     children=[
                         A(
-                            href=reverse("games:add_session"),
-                        )[
-                            StyledButton(
+                            url_name="games:add_session",
+                            children=Button(
                                 icon=True,
                                 size="xs",
-                            )[Icon("play"), "LOG"]
-                        ],
+                                children=[Icon("play"), "LOG"],
+                            ),
+                        ),
                         A(
                             href=reverse(
                                 "games:list_sessions_start_session_from_session",
@@ -92,7 +88,7 @@ def list_sessions(request: HttpRequest, search_string: str = "") -> HttpResponse
                             children=Popover(
                                 popover_content=last_session.game.name,
                                 children=[
-                                    StyledButton(
+                                    Button(
                                         icon=True,
                                         color="gray",
                                         size="xs",
@@ -180,11 +176,14 @@ def list_sessions(request: HttpRequest, search_string: str = "") -> HttpResponse
         preset_list_url=reverse("games:list_presets"),
         preset_save_url=reverse("games:save_preset"),
     )
-    content = Fragment(filter_bar, content)
+    content = mark_safe(str(filter_bar) + str(content))
     return render_page(
         request,
         content,
         title="Manage sessions",
+        scripts=ModuleScript("range_slider.js")
+        + ModuleScript("search_select.js")
+        + ModuleScript("filter_bar.js"),
     )
 
 
@@ -193,39 +192,51 @@ def search_sessions(request: HttpRequest) -> HttpResponse:
     return list_sessions(request, search_string=request.GET.get("search_string", ""))
 
 
-def _session_fields(form) -> Fragment:
+def _session_fields(form) -> SafeText:
     """Manual per-field layout for the session form.
 
     Mirrors the old add_session.html: each field gets its label and widget,
     and the timestamp fields gain a row of now/toggle/copy helper buttons.
     """
-    rows: list[Node] = []
+    rows: list[SafeText] = []
     for field in form:
-        children: list[Node | str] = [
-            Safe(str(field.label_tag())),
-            Safe(str(field)),
+        children: list[SafeText | str] = [
+            mark_safe(str(field.label_tag())),
+            mark_safe(str(field)),
         ]
         if field.name in ("timestamp_start", "timestamp_end"):
             this_side = "start" if field.name == "timestamp_start" else "end"
             other_side = "end" if field.name == "timestamp_start" else "start"
             children.append(
-                SessionTimestampButtons(
-                    class_="form-row-button-group flex-row gap-3 justify-start mt-3",
-                    hx_boost="false",
-                )[
-                    StyledButton(data_target=field.name, data_type="now", size="xs")[
-                        "Set to now"
+                Span(
+                    attributes=[
+                        (
+                            "class",
+                            "form-row-button-group flex-row gap-3 justify-start mt-3",
+                        ),
+                        ("hx-boost", "false"),
                     ],
-                    StyledButton(data_target=field.name, data_type="toggle", size="xs")[
-                        "Toggle text"
+                    children=[
+                        Button(
+                            [("data-target", field.name), ("data-type", "now")],
+                            "Set to now",
+                            size="xs",
+                        ),
+                        Button(
+                            [("data-target", field.name), ("data-type", "toggle")],
+                            "Toggle text",
+                            size="xs",
+                        ),
+                        Button(
+                            [("data-target", field.name), ("data-type", "copy")],
+                            f"Copy {this_side} value to {other_side}",
+                            size="xs",
+                        ),
                     ],
-                    StyledButton(data_target=field.name, data_type="copy", size="xs")[
-                        f"Copy {this_side} value to {other_side}"
-                    ],
-                ]
+                )
             )
         rows.append(Div(children=children))
-    return Fragment(*rows, separator="\n")
+    return mark_safe("\n".join(rows))
 
 
 @login_required
@@ -254,7 +265,9 @@ def add_session(request: HttpRequest, game_id: int = 0) -> HttpResponse:
         request,
         AddForm(form, request=request, fields=_session_fields(form), submit_class=""),
         title="Add New Session",
-        scripts=mark_safe(ModuleScript("search_select.js")),
+        scripts=mark_safe(
+            ModuleScript("search_select.js") + ModuleScript("add_session.js")
+        ),
     )
 
 
@@ -269,7 +282,9 @@ def edit_session(request: HttpRequest, session_id: int) -> HttpResponse:
         request,
         AddForm(form, request=request, fields=_session_fields(form), submit_class=""),
         title="Edit Session",
-        scripts=mark_safe(ModuleScript("search_select.js")),
+        scripts=mark_safe(
+            ModuleScript("search_select.js") + ModuleScript("add_session.js")
+        ),
     )
 
 

games/views/stats_content.py

@@ -9,19 +9,9 @@ from django.template.defaultfilters import date as date_filter
 from django.template.defaultfilters import floatformat
 from django.urls import reverse
 from django.utils.html import conditional_escape
+from django.utils.safestring import SafeText, mark_safe
 
-from common.components import (
-    A,
-    Div,
-    Element,
-    GameLink,
-    Node,
-    Safe,
-    Td,
-    Th,
-    Tr,
-    YearPicker,
-)
+from common.components import A, Component, Div, GameLink, YearPicker
 from common.time import durationformat, format_duration
 
 _CELL = "px-2 sm:px-4 md:px-6 md:py-2"
@@ -29,40 +19,41 @@ _CELL_MONO = f"{_CELL} font-mono"
 _NAME_TH = f"{_CELL} purchase-name truncate max-w-20char"
 
 
-def _td(children, cls: str = _CELL_MONO) -> Node:
+def _td(children, cls: str = _CELL_MONO) -> SafeText:
     if not isinstance(children, list):
         children = [children]
-    return Td(attributes=[("class", cls)], children=children)
+    children = [c if isinstance(c, (str, SafeText)) else str(c) for c in children]
+    return Component(tag_name="td", attributes=[("class", cls)], children=children)
 
 
-def _th(text: str, cls: str = _CELL) -> Node:
-    return Th(attributes=[("class", cls)], children=[text])
+def _th(text: str, cls: str = _CELL) -> SafeText:
+    return Component(tag_name="th", attributes=[("class", cls)], children=[text])
 
 
-def _tr(cells: list) -> Node:
-    return Tr(children=cells)
+def _tr(cells: list) -> SafeText:
+    return Component(tag_name="tr", children=cells)
 
 
-def _kv(label, value) -> Node:
+def _kv(label, value) -> SafeText:
     """A label/value row: plain label cell + mono value cell."""
     return _tr([_td(label, _CELL), _td(value)])
 
 
-def _h1(title: str) -> Node:
-    return Element(
-        "h1",
+def _h1(title: str) -> SafeText:
+    return Component(
+        tag_name="h1",
         attributes=[("class", "text-3xl text-heading text-center my-6")],
         children=[title],
     )
 
 
-def _table(rows: list, thead: Node | None = None) -> Node:
+def _table(rows: list, thead: SafeText | None = None) -> SafeText:
     children = []
     if thead is not None:
         children.append(thead)
-    children.append(Element("tbody", children=rows))
-    return Element(
-        "table",
+    children.append(Component(tag_name="tbody", children=rows))
+    return Component(
+        tag_name="table",
         attributes=[("class", "responsive-table")],
         children=children,
     )
@@ -72,7 +63,7 @@ def _dur(value) -> str:
     return format_duration(value, durationformat)
 
 
-def _purchase_name(purchase) -> Node:
+def _purchase_name(purchase) -> SafeText:
     """Mirror of the `purchase-name` partial in the old template."""
     game_name = getattr(purchase, "game_name", None)
     first_game = purchase.first_game
@@ -80,12 +71,12 @@ def _purchase_name(purchase) -> Node:
         name = game_name or purchase.name
         link = GameLink(first_game.id, name)
         suffix = f" ({first_game.name} {purchase.get_type_display()})"
-        return Safe(str(link) + conditional_escape(suffix))
+        return mark_safe(str(link) + conditional_escape(suffix))
     name = game_name or first_game.name
     return GameLink(first_game.id, name)
 
 
-def _year_nav(year, year_range, url_template) -> Node:
+def _year_nav(year, year_range, url_template) -> SafeText:
     # `year` is an int for a specific year, or "Alltime" (from compute_stats)
     # for the all-time view. Normalize to int-or-None so nothing downstream has
     # to know about the "Alltime" sentinel.
@@ -101,9 +92,10 @@ def _year_nav(year, year_range, url_template) -> Node:
         else "text-body hover:text-heading underline decoration-dotted"
     )
     alltime_btn = A(
-        href=reverse("games:stats_alltime"),
-        class_=alltime_classes,
-    )["All-time stats"]
+        url_name="games:stats_alltime",
+        attributes=[("class", alltime_classes)],
+        children=["All-time stats"],
+    )
     picker = YearPicker(
         year=year_int,
         available_years=tuple(year_range or []),
@@ -115,7 +107,7 @@ def _year_nav(year, year_range, url_template) -> Node:
     )
 
 
-def _playtime_table(ctx) -> Node:
+def _playtime_table(ctx) -> SafeText:
     year = ctx.get("year")
     rows = [
         _kv("Hours", ctx.get("total_hours")),
@@ -194,7 +186,7 @@ def _playtime_table(ctx) -> Node:
     return _table(rows)
 
 
-def _purchases_table(ctx) -> Node:
+def _purchases_table(ctx) -> SafeText:
     rows = [
         _kv("Total", ctx.get("all_purchased_this_year_count")),
         _kv(
@@ -221,18 +213,18 @@ def _purchases_table(ctx) -> Node:
     return _table(rows)
 
 
-def _two_col_table(header: str, items, name_key, value_fn) -> Node:
-    thead = Element(
-        "thead",
+def _two_col_table(header: str, items, name_key, value_fn) -> SafeText:
+    thead = Component(
+        tag_name="thead",
         children=[_tr([_th(header), _th("Playtime")])],
     )
     rows = [_tr([_td(name_key(item)), _td(value_fn(item))]) for item in items]
     return _table(rows, thead)
 
 
-def _finished_table(purchases) -> Node:
-    thead = Element(
-        "thead",
+def _finished_table(purchases) -> SafeText:
+    thead = Component(
+        tag_name="thead",
         children=[_tr([_th("Name", _NAME_TH), _th("Date")])],
     )
     rows = [
@@ -242,9 +234,9 @@ def _finished_table(purchases) -> Node:
     return _table(rows, thead)
 
 
-def _priced_table(purchases, currency) -> Node:
-    thead = Element(
-        "thead",
+def _priced_table(purchases, currency) -> SafeText:
+    thead = Component(
+        tag_name="thead",
         children=[
             _tr([_th("Name", _NAME_TH), _th(f"Price ({currency})"), _th("Date")])
         ],
@@ -262,7 +254,7 @@ def _priced_table(purchases, currency) -> Node:
     return _table(rows, thead)
 
 
-def stats_content(ctx: dict) -> Node:
+def stats_content(ctx: dict) -> SafeText:
     year = ctx.get("year")
     currency = ctx.get("total_spent_currency")
     # Build a navigation URL with an `__year__` placeholder the picker's JS

games/views/statuschange.py

@@ -7,10 +7,10 @@ from django.utils.safestring import SafeText
 from common.components import (
     A,
     AddForm,
+    Button,
+    Component,
     CsrfInput,
     Div,
-    Element,
-    StyledButton,
     paginated_table_content,
 )
 from common.components.primitives import P
@@ -79,18 +79,18 @@ def _delete_statuschange_content(statuschange, request: HttpRequest) -> SafeText
             P(
                 children=["Are you sure you want to delete this status change?"],
             ),
-            StyledButton(
+            Button(
                 [("class", "w-full")], "Delete", color="red", type="submit", size="lg"
             ),
             A(
                 [("class", "")],
-                StyledButton([("class", "w-full")], "Cancel", color="gray"),
+                Button([("class", "w-full")], "Cancel", color="gray"),
                 href=reverse("games:view_game", args=[statuschange.game.id]),
             ),
         ],
     )
-    form = Element(
-        "form",
+    form = Component(
+        tag_name="form",
         attributes=[("method", "post"), ("class", "dark:text-white")],
         children=[CsrfInput(request), inner],
     )

package.json

@@ -1,12 +1,10 @@
 {
-  "packageManager": "pnpm@10.33.0",
   "devDependencies": {
     "@tailwindcss/forms": "^0.5.7",
     "@tailwindcss/typography": "^0.5.13",
     "concurrently": "^8.2.2",
     "npm-check-updates": "^16.14.20",
-    "tailwindcss": "^4.1.18",
-    "typescript": "^5.6.0"
+    "tailwindcss": "^4.1.18"
   },
   "dependencies": {
     "@tailwindcss/cli": "^4.1.18",

pnpm-workspace.yaml

@@ -1,2 +1,2 @@
-overrides:
-  tar: ^7.5.11
+allowBuilds:
+  '@parcel/watcher': false

shell.nix

@@ -11,12 +11,6 @@ pkgs.mkShell {
     pnpm
   ];
 
-  # manylinux wheels with native extensions (greenlet, pulled in by
-  # pytest-playwright) link against libstdc++.so.6, which the nixpkgs
-  # Python cannot find on its default search path. Scoped to this dev
-  # shell only — a global LD_LIBRARY_PATH would leak into other programs.
-  LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath [ pkgs.stdenv.cc.cc.lib ];
-
   shellHook = ''
     uv venv --clear
     . .venv/bin/activate

tests/test_components.py

@@ -2,30 +2,22 @@ import unittest
 from unittest.mock import MagicMock, patch
 
 import django
-from django.test import SimpleTestCase
+
 from django.utils.safestring import SafeText, mark_safe
 
 from common import components
-from games.models import Game, Platform, Purchase, Session
-
-# Component builders return lazy ``Node`` objects; these tests assert on rendered
-# HTML, so node-returning calls are wrapped in ``str(...)`` at the call site
-# (``Node.__str__`` returns a ``SafeText``). Non-node helpers (``randomid``,
-# ``_resolve_name_with_icon``, ``_render_element``) are called
-# directly.
+from games.models import Platform, Game, Purchase, Session
 
 
 class ComponentIntegrationTest(unittest.TestCase):
-    """Test Element() renders correctly with caching transparent."""
+    """Test Component() works correctly with caching transparent."""
 
     def test_tag_name_component(self):
-        result = str(
-            components.Element(
+        result = components.Component(
             tag_name="div",
             attributes=[("class", "test")],
             children="hello",
         )
-        )
         self.assertEqual(result, '<div class="test">hello</div>')
 
 
@@ -36,17 +28,9 @@ class ComponentCacheTest(unittest.TestCase):
         components._render_element.cache_clear()
 
     def test_identical_components_hit_cache(self):
-        str(
-            components.Element(
-                tag_name="div", attributes=[("class", "x")], children="hi"
-            )
-        )
+        components.Component(tag_name="div", attributes=[("class", "x")], children="hi")
         misses = components._render_element.cache_info().misses
-        str(
-            components.Element(
-                tag_name="div", attributes=[("class", "x")], children="hi"
-            )
-        )
+        components.Component(tag_name="div", attributes=[("class", "x")], children="hi")
         info = components._render_element.cache_info()
         self.assertEqual(info.misses, misses)  # no new miss
         self.assertGreaterEqual(info.hits, 1)  # served from cache
@@ -55,12 +39,10 @@ class ComponentCacheTest(unittest.TestCase):
         self.assertEqual(components._render_element.cache_parameters()["maxsize"], 4096)
 
     def test_safe_and_unsafe_children_do_not_collide(self):
-        """A Safe-node ``<b>`` and a plain-string ``<b>`` render differently —
-        the cache key must keep them distinct."""
-        safe = str(
-            components.Element(tag_name="span", children=[components.Safe("<b>x</b>")])
-        )
-        unsafe = str(components.Element(tag_name="span", children=["<b>x</b>"]))
+        """A SafeText "<b>" and a plain "<b>" are equal as strings but must
+        render differently — the cache key must keep them distinct."""
+        safe = components.Component(tag_name="span", children=[mark_safe("<b>x</b>")])
+        unsafe = components.Component(tag_name="span", children=["<b>x</b>"])
         self.assertIn("<b>x</b>", safe)
         self.assertIn("&lt;b&gt;x&lt;/b&gt;", unsafe)
         self.assertNotEqual(safe, unsafe)
@@ -132,37 +114,33 @@ class PopoverDeterministicTest(unittest.TestCase):
     """Test that Popover() produces deterministic HTML output."""
 
     def test_same_popover_same_id(self):
-        r1 = str(components.Popover("hello", wrapped_content="hello"))
-        r2 = str(components.Popover("hello", wrapped_content="hello"))
+        r1 = components.Popover("hello", wrapped_content="hello")
+        r2 = components.Popover("hello", wrapped_content="hello")
         self.assertEqual(r1, r2)
 
     def test_different_content_different_id(self):
-        r1 = str(components.Popover("content_a", wrapped_content="content_a"))
-        r2 = str(components.Popover("content_b", wrapped_content="content_b"))
+        r1 = components.Popover("content_a", wrapped_content="content_a")
+        r2 = components.Popover("content_b", wrapped_content="content_b")
         self.assertNotEqual(r1, r2)
 
     def test_wrapped_classes_affect_id(self):
-        r1 = str(
-            components.Popover("c", wrapped_content="c", wrapped_classes="class_x")
-        )
-        r2 = str(
-            components.Popover("c", wrapped_content="c", wrapped_classes="class_y")
-        )
+        r1 = components.Popover("c", wrapped_content="c", wrapped_classes="class_x")
+        r2 = components.Popover("c", wrapped_content="c", wrapped_classes="class_y")
         self.assertNotEqual(r1, r2)
 
     def test_wrapped_content_affects_id(self):
-        r1 = str(components.Popover("popover", wrapped_content="wrapped_a"))
-        r2 = str(components.Popover("popover", wrapped_content="wrapped_b"))
+        r1 = components.Popover("popover", wrapped_content="wrapped_a")
+        r2 = components.Popover("popover", wrapped_content="wrapped_b")
         self.assertNotEqual(r1, r2)
 
     def test_popover_content_affects_id(self):
-        r1 = str(components.Popover("popover_a", wrapped_content="wrapped"))
-        r2 = str(components.Popover("popover_b", wrapped_content="wrapped"))
+        r1 = components.Popover("popover_a", wrapped_content="wrapped")
+        r2 = components.Popover("popover_b", wrapped_content="wrapped")
         self.assertNotEqual(r1, r2)
 
     def test_full_html_deterministic(self):
-        r1 = str(components.Popover("hello world", wrapped_content="hello world"))
-        r2 = str(components.Popover("hello world", wrapped_content="hello world"))
+        r1 = components.Popover("hello world", wrapped_content="hello world")
+        r2 = components.Popover("hello world", wrapped_content="hello world")
         self.assertEqual(r1.encode(), r2.encode())
 
 
@@ -202,50 +180,63 @@ class ComponentReturnTypeTest(unittest.TestCase):
     """Test that component functions return SafeText and render correctly."""
 
     def test_div_returns_safe_text(self):
-        result = str(components.Div([("class", "x")], "hello"))
+        result = components.Div([("class", "x")], "hello")
         self.assertIsInstance(result, SafeText)
 
     def test_div_deterministic(self):
-        r1 = str(components.Div([("class", "x")], "hello"))
-        r2 = str(components.Div([("class", "x")], "hello"))
+        r1 = components.Div([("class", "x")], "hello")
+        r2 = components.Div([("class", "x")], "hello")
         self.assertEqual(r1, r2)
         self.assertIn('<div class="x">hello</div>', r1)
 
     def test_div_no_args(self):
-        result = str(components.Div(children="test"))
+        result = components.Div(children="test")
         self.assertIsInstance(result, SafeText)
         self.assertIn("<div>test</div>", result)
 
     def test_a_returns_safe_text(self):
-        result = str(components.A([], "link"))
+        result = components.A([], "link")
         self.assertIsInstance(result, SafeText)
 
     def test_a_literal_href(self):
-        result = str(components.A([], "x", href="/literal/path"))
+        result = components.A([], "x", href="/literal/path")
         self.assertIn('href="/literal/path"', result)
 
+    def test_a_url_name_reversed(self):
+        from unittest.mock import patch
+
+        with patch(
+            "common.components.primitives.reverse", return_value="/resolved/url"
+        ):
+            result = components.A([], "link", url_name="some_name")
+            self.assertIn('href="/resolved/url"', result)
+
     def test_a_no_url_or_href(self):
-        result = str(components.A([], "link"))
+        result = components.A([], "link")
         self.assertIn("<a>link</a>", result)
         self.assertNotIn("href=", result)
 
+    def test_a_both_url_name_and_href_raises(self):
+        with self.assertRaises(ValueError):
+            components.A(href="/path", url_name="some_name")
+
     def test_button_returns_safe_text(self):
-        result = str(components.StyledButton([], "click"))
+        result = components.Button([], "click")
         self.assertIsInstance(result, SafeText)
         self.assertIn("<button", result)
 
     def test_button_default_colors(self):
-        result = str(components.StyledButton([], "click"))
+        result = components.Button([], "click")
         self.assertIn("text-white bg-brand", result)
 
     def test_name_with_icon_no_link(self):
-        result = str(components.NameWithIcon(name="Game", linkify=False))
+        result = components.NameWithIcon(name="Game", linkify=False)
         self.assertIsInstance(result, SafeText)
         self.assertIn("Game", result)
         self.assertNotIn("<a ", result)
 
     def test_name_with_icon_no_trailing_comma(self):
-        result = str(components.NameWithIcon(name="Test", linkify=False))
+        result = components.NameWithIcon(name="Test", linkify=False)
         self.assertIsInstance(result, SafeText)
         self.assertNotIsInstance(result, tuple)
 
@@ -255,23 +246,21 @@ class ComponentOutputIsNotEscapedTest(unittest.TestCase):
 
     def test_component_output_starts_with_tag(self):
         for label, html in [
-            ("A", str(components.A(href="/foo", children=["link"]))),
-            ("Button", str(components.StyledButton([], "click"))),
-            ("Div", str(components.Div([], ["hello"]))),
-            ("Input", str(components.Input())),
-            ("ButtonGroup", str(components.ButtonGroup([]))),
+            ("A", components.A(href="/foo", children=["link"])),
+            ("Button", components.Button([], "click")),
+            ("Div", components.Div([], ["hello"])),
+            ("Input", components.Input()),
+            ("ButtonGroup", components.ButtonGroup([])),
             (
                 "ButtonGroup with buttons",
-                str(
                 components.ButtonGroup(
                     [{"href": "/", "slot": components.Icon("edit")}]
-                    )
                 ),
             ),
-            ("SearchField", str(components.SearchField())),
-            ("PriceConverted", str(components.PriceConverted(["27 CZK"]))),
-            ("H1", str(components.H1(["Title"]))),
-            ("H1 with badge", str(components.H1(["Title"], badge="3"))),
+            ("SearchField", components.SearchField()),
+            ("PriceConverted", components.PriceConverted(["27 CZK"])),
+            ("H1", components.H1(["Title"])),
+            ("H1 with badge", components.H1(["Title"], badge="3")),
         ]:
             with self.subTest(component=label):
                 self.assertTrue(
@@ -280,21 +269,18 @@ class ComponentOutputIsNotEscapedTest(unittest.TestCase):
                 )
 
     def test_button_with_icon_children_not_escaped(self):
-        result = str(
-            components.StyledButton(
+        result = components.Button(
             icon=True,
             size="xs",
             children=[components.Icon("play"), "LOG"],
         )
-        )
         self.assertTrue(str(result).startswith("<button"))
 
     def test_popover_with_button_children_not_escaped(self):
-        result = str(
-            components.Popover(
+        result = components.Popover(
             popover_content="test tooltip",
             children=[
-                    components.StyledButton(
+                components.Button(
                     icon=True,
                     color="gray",
                     size="xs",
@@ -302,90 +288,71 @@ class ComponentOutputIsNotEscapedTest(unittest.TestCase):
                 ),
             ],
         )
-        )
         self.assertTrue(str(result).startswith("<span data-popover-target"))
 
     def test_name_with_icon_output_not_escaped(self):
-        result = str(components.NameWithIcon(name="Test", linkify=False))
+        result = components.NameWithIcon(name="Test", linkify=False)
         self.assertTrue(str(result).startswith("<div"))
 
 
 class ComponentEdgeCasesTest(unittest.TestCase):
-    """Test Element() edge cases and error handling."""
+    """Test Component() edge cases and error handling."""
 
     def test_no_tag_name_raises(self):
         with self.assertRaises(ValueError) as ctx:
-            str(components.Element("", children="hello"))
+            components.Component(children="hello")
         self.assertIn("tag_name", str(ctx.exception))
 
     def test_single_string_children_wrapped(self):
-        result = str(components.Element(tag_name="span", children="hello"))
+        result = components.Component(tag_name="span", children="hello")
         self.assertIn("hello", result)
 
     def test_multiple_children_joined_with_newlines(self):
-        result = str(components.Element(tag_name="div", children=["hello", "world"]))
+        result = components.Component(tag_name="div", children=["hello", "world"])
         self.assertIn("hello\nworld", result)
         self.assertIn("<div>", result)
         self.assertIn("</div>", result)
 
     def test_raw_html_children_are_escaped(self):
-        result = str(
-            components.Element(
+        result = components.Component(
             tag_name="div", children=["<script>alert('xss')</script>"]
         )
-        )
         self.assertNotIn("<script>", result)
         self.assertIn("&lt;script&gt;", result)
 
-    def test_safe_node_children_pass_through(self):
-        result = str(
-            components.Element(
-                tag_name="div", children=[components.Safe("<span>safe</span>")]
-            )
+    def test_mark_safe_children_pass_through(self):
+        result = components.Component(
+            tag_name="div", children=[mark_safe("<span>safe</span>")]
         )
         self.assertIn("<span>safe</span>", result)
 
-    def test_mark_safe_string_children_are_escaped(self):
-        # Trusted markup must be a Safe node; a mark_safe string is still a
-        # string, so it is escaped like any other text child.
-        result = str(
-            components.Element(
-                tag_name="div", children=[mark_safe("<span>safe</span>")]
-            )
-        )
-        self.assertIn("&lt;span&gt;safe&lt;/span&gt;", result)
-
     def test_attribute_values_are_escaped(self):
-        result = str(
-            components.Element(
+        result = components.Component(
             tag_name="div",
             attributes=[("data-x", 'foo"bar')],
         )
-        )
         self.assertIn("&quot;", result)
         self.assertNotIn('"foo"bar"', result)
 
     def test_attributes_serialized_correctly(self):
-        result = str(
-            components.Element(
+        result = components.Component(
             tag_name="div", attributes=[("class", "foo"), ("id", "bar")]
         )
-        )
         self.assertIn('class="foo"', result)
         self.assertIn('id="bar"', result)
 
     def test_empty_attributes_no_extra_space(self):
-        result = str(components.Element(tag_name="span", children="x"))
+        result = components.Component(tag_name="span", children="x")
         self.assertEqual(result, "<span>x</span>")
         self.assertNotIn(" <span", result)
 
     def test_non_string_children_not_supported(self):
         """Component only accepts str for children, not integers."""
-        result = str(components.Element(tag_name="span", children=str(42)))
+        result = components.Component(tag_name="span", children=str(42))
         self.assertIn("42", result)
 
     def test_returns_safetext(self):
-        result = str(components.Element(tag_name="div", children="test"))
+        result = components.Component(tag_name="div", children="test")
         self.assertIsInstance(result, SafeText)
 
 
@@ -393,22 +360,22 @@ class IconTest(unittest.TestCase):
     """Test Icon() component function."""
 
     def test_valid_icon_renders_svg(self):
-        result = str(components.Icon("play"))
+        result = components.Icon("play")
         self.assertIsInstance(result, SafeText)
         self.assertIn("<svg", result)
         self.assertIn("</svg>", result)
 
     def test_unavailable_icon_falls_back(self):
-        result = str(components.Icon("zzz_nonexistent_platform"))
+        result = components.Icon("zzz_nonexistent_platform")
         self.assertIsInstance(result, SafeText)
         self.assertIn("<svg", result)
 
     def test_icon_passes_attributes_to_template(self):
-        result = str(components.Icon("play", attributes=[("title", "Play")]))
+        result = components.Icon("play", attributes=[("title", "Play")])
         self.assertIsInstance(result, SafeText)
 
     def test_returns_safetext(self):
-        result = str(components.Icon("delete"))
+        result = components.Icon("delete")
         self.assertIsInstance(result, SafeText)
 
 
@@ -416,20 +383,18 @@ class InputTest(unittest.TestCase):
     """Test the Input() component."""
 
     def test_input_default_type_text(self):
-        result = str(components.Input())
+        result = components.Input()
         self.assertIn("<input", result)
         self.assertIn('type="text"', result)
 
     def test_input_custom_type(self):
-        result = str(components.Input(type="submit"))
+        result = components.Input(type="submit")
         self.assertIn('type="submit"', result)
 
     def test_input_attributes_merged_with_type(self):
-        result = str(
-            components.Input(
+        result = components.Input(
             type="email", attributes=[("id", "email"), ("class", "form-input")]
         )
-        )
         self.assertIn('type="email"', result)
         self.assertIn('id="email"', result)
         self.assertIn('class="form-input"', result)
@@ -439,12 +404,12 @@ class PopoverTruncatedTest(unittest.TestCase):
     """Test PopoverTruncated() component function."""
 
     def test_short_string_no_popover(self):
-        result = str(components.PopoverTruncated("hi"))
+        result = components.PopoverTruncated("hi")
         self.assertEqual(result, "hi")
 
     def test_long_string_wrapped_in_popover(self):
         long_text = "a" * 100
-        result = str(components.PopoverTruncated(long_text))
+        result = components.PopoverTruncated(long_text)
         # Should NOT equal the truncated form directly
         truncated = components.truncate(long_text, 30)
         self.assertNotEqual(result, truncated)
@@ -453,55 +418,47 @@ class PopoverTruncatedTest(unittest.TestCase):
 
     def test_custom_ellipsis_used(self):
         long_text = "a" * 50
-        result = str(components.PopoverTruncated(long_text, ellipsis=">>"))
+        result = components.PopoverTruncated(long_text, ellipsis=">>")
         # Django template escapes >> to &gt;&gt; in the wrapped_content
         self.assertIn("&gt;&gt;", result)
 
     def test_popover_if_not_truncated_flag(self):
         short_text = "hi"
-        result = str(
-            components.PopoverTruncated(
-                short_text,
-                popover_content="full content",
-                popover_if_not_truncated=True,
-            )
+        result = components.PopoverTruncated(
+            short_text, popover_content="full content", popover_if_not_truncated=True
         )
         # Should be wrapped in popover even though short
         self.assertNotEqual(result, "hi")
         self.assertIn("data-popover-target", result)
 
     def test_popover_content_override(self):
-        result = str(
-            components.PopoverTruncated("short", popover_content="custom popover")
-        )
+        result = components.PopoverTruncated("short", popover_content="custom popover")
         # With popover_if_not_truncated=False (default), short text returns as-is
         self.assertEqual(result, "short")
 
     def test_popover_content_override_with_flag(self):
-        result = str(
-            components.PopoverTruncated(
+        result = components.PopoverTruncated(
             "short", popover_content="custom popover", popover_if_not_truncated=True
         )
-        )
         self.assertIn("custom popover", result)
 
     def test_endpart_visible_in_output(self):
         long_text = "a" * 50
-        result = str(components.PopoverTruncated(long_text, endpart="..."))
+        result = components.PopoverTruncated(long_text, endpart="...")
         self.assertIn("...", result)
 
     def test_returns_safetext(self):
-        result = str(components.PopoverTruncated("a" * 100))
+        result = components.PopoverTruncated("a" * 100)
         self.assertIsInstance(result, SafeText)
 
     def test_default_length(self):
         text = "a" * 31
-        result = str(components.PopoverTruncated(text))
+        result = components.PopoverTruncated(text)
         # 31 chars exceeds default length of 30, so should be truncated
         self.assertIn("data-popover-target", result)
 
     def test_length_zero(self):
-        result = str(components.PopoverTruncated("hello", length=0))
+        result = components.PopoverTruncated("hello", length=0)
         # Even empty length triggers popover for any content
         self.assertIn("data-popover-target", result)
 
@@ -533,7 +490,7 @@ class ModelDependentComponentsTest(django.test.TestCase):
     def test_name_with_icon_linkify_with_game(self):
         platform = self._create_platform(name="Steam", icon="steam")
         game = self._create_game(platform)
-        result = str(components.NameWithIcon(game=game, linkify=True))
+        result = components.NameWithIcon(game=game, linkify=True)
         self.assertIsInstance(result, SafeText)
         self.assertIn("<a ", result)
         self.assertIn("Test Game", result)
@@ -542,9 +499,7 @@ class ModelDependentComponentsTest(django.test.TestCase):
     def test_name_with_icon_no_linkify(self):
         platform = self._create_platform(name="GOG", icon="gog")
         game = self._create_game(platform)
-        result = str(
-            components.NameWithIcon(name="Test Game", game=game, linkify=False)
-        )
+        result = components.NameWithIcon(name="Test Game", game=game, linkify=False)
         self.assertIsInstance(result, SafeText)
         self.assertNotIn("<a ", result)
         self.assertIn("Test Game", result)
@@ -557,13 +512,13 @@ class ModelDependentComponentsTest(django.test.TestCase):
             timestamp_start="2025-01-01 00:00:00+00:00",
             emulated=True,
         )
-        result = str(components.NameWithIcon(session=session, linkify=True))
+        result = components.NameWithIcon(session=session, linkify=True)
         self.assertIsInstance(result, SafeText)
         self.assertIn("<a ", result)
         self.assertIn("Emulated", result)
 
     def test_name_with_icon_no_platform(self):
-        result = str(components.NameWithIcon(name="Standalone", linkify=False))
+        result = components.NameWithIcon(name="Standalone", linkify=False)
         self.assertIsInstance(result, SafeText)
         self.assertIn("Standalone", result)
 
@@ -574,7 +529,7 @@ class ModelDependentComponentsTest(django.test.TestCase):
             game=game,
             timestamp_start="2025-01-01 00:00:00+00:00",
         )
-        result = str(components.NameWithIcon(session=session, linkify=True))
+        result = components.NameWithIcon(session=session, linkify=True)
         self.assertIsInstance(result, SafeText)
         self.assertIn("Epic Game", result)
 
@@ -582,7 +537,7 @@ class ModelDependentComponentsTest(django.test.TestCase):
         platform = self._create_platform()
         game = self._create_game(platform)
         purchase = self._create_purchase([game], price=29.99)
-        result = str(components.PurchasePrice(purchase))
+        result = components.PurchasePrice(purchase)
         self.assertIsInstance(result, SafeText)
         # floatformat rounds to 1 decimal: 29.99 -> 30.0
         self.assertIn("30.0", result)
@@ -593,7 +548,7 @@ class ModelDependentComponentsTest(django.test.TestCase):
         platform = self._create_platform(icon="steam")
         game = self._create_game(platform, name="Single Game")
         purchase = self._create_purchase([game], price=14.99)
-        result = str(components.LinkedPurchase(purchase))
+        result = components.LinkedPurchase(purchase)
         self.assertIsInstance(result, SafeText)
         self.assertIn("Single Game", result)
         self.assertIn("<a ", result)
@@ -604,7 +559,7 @@ class ModelDependentComponentsTest(django.test.TestCase):
         game1 = self._create_game(platform, name="Game One")
         game2 = self._create_game(platform, name="Game Two")
         purchase = self._create_purchase([game1, game2], price=24.99)
-        result = str(components.LinkedPurchase(purchase))
+        result = components.LinkedPurchase(purchase)
         self.assertIsInstance(result, SafeText)
         self.assertIn("2 games", result)
         self.assertIn("<a ", result)
@@ -620,7 +575,7 @@ class ModelDependentComponentsTest(django.test.TestCase):
         )
         purchase.name = "Bundle"
         purchase.save()
-        result = str(components.LinkedPurchase(purchase))
+        result = components.LinkedPurchase(purchase)
         self.assertIsInstance(result, SafeText)
         self.assertIn("Bundle", result)
 
@@ -629,7 +584,7 @@ class ModelDependentComponentsTest(django.test.TestCase):
         game1 = self._create_game(platform, name="Alpha")
         game2 = self._create_game(platform, name="Beta")
         purchase = self._create_purchase([game1, game2], price=19.99)
-        result = str(components.LinkedPurchase(purchase))
+        result = components.LinkedPurchase(purchase)
         self.assertIsInstance(result, SafeText)
         self.assertIn("Alpha", result)
         self.assertIn("Beta", result)
@@ -640,18 +595,18 @@ class PurchaseTruncatedTest(unittest.TestCase):
 
     def test_endpart_shorter_than_length(self):
         text = "a" * 50
-        result = str(components.PopoverTruncated(text, length=10, endpart="x"))
+        result = components.PopoverTruncated(text, length=10, endpart="x")
         # endpart=x takes 1 char, so content gets truncated at 9 chars
         self.assertIn("data-popover-target", result)
         self.assertIn("x", result)
 
     def test_no_truncation_no_ellipsis(self):
-        result = str(components.PopoverTruncated("short text"))
+        result = components.PopoverTruncated("short text")
         self.assertEqual(result, "short text")
 
     def test_custom_length(self):
         text = "hello world"
-        result = str(components.PopoverTruncated(text, length=6))
+        result = components.PopoverTruncated(text, length=6)
         self.assertIn("data-popover-target", result)
 
 
@@ -665,14 +620,12 @@ class NameWithIconPlatformTest(django.test.TestCase):
         cls.game = Game.objects.create(name="Zelda", platform=cls.platform)
 
     def test_name_with_icon_shows_platform_icon(self):
-        result = str(
-            components.NameWithIcon(name="Zelda", game=self.game, linkify=True)
-        )
+        result = components.NameWithIcon(name="Zelda", game=self.game, linkify=True)
         self.assertIsInstance(result, SafeText)
         self.assertIn("Zelda", result)
 
     def test_name_with_icon_no_game_id_no_platform(self):
-        result = str(components.NameWithIcon(name="Unknown Game", linkify=False))
+        result = components.NameWithIcon(name="Unknown Game", linkify=False)
         self.assertIsInstance(result, SafeText)
         self.assertIn("Unknown Game", result)
 
@@ -796,13 +749,11 @@ class SimpleTableRenderingTest(unittest.TestCase):
     def test_simple_table_renders_list_rows(self):
         """Verify list-style rows render as <tr> with <th scope='row'> + <td>."""
         result = str(
-            str(
             components.SimpleTable(
                 columns=["Game", "Started", "Ended"],
                 rows=[["Game1", "2025-01-01", "2025-03-01"]],
             )
         )
-        )
         tbody = self._tbody(result)
         self.assertIn("<tr", tbody)
         self.assertIn("Game1", tbody)
@@ -823,13 +774,11 @@ class SimpleTableRenderingTest(unittest.TestCase):
     def test_simple_table_multiple_rows(self):
         """Verify multiple rows all render."""
         result = str(
-            str(
             components.SimpleTable(
                 columns=["Game", "Started"],
                 rows=[["GameA", "2025-01-01"], ["GameB", "2025-02-01"]],
             )
         )
-        )
         tbody = self._tbody(result)
         self.assertIn("GameA", tbody)
         self.assertIn("GameB", tbody)
@@ -837,13 +786,13 @@ class SimpleTableRenderingTest(unittest.TestCase):
 
     def test_simple_table_header_action_as_caption(self):
         """Verify header_action renders inside <caption>."""
+        from django.utils.safestring import mark_safe
+
         result = str(
-            str(
             components.SimpleTable(
                 columns=["Game", "Started"],
                 rows=[["Game1", "2025-01-01"]],
-                    header_action=components.Safe('<a href="/add">Add</a>'),
-                )
+                header_action=mark_safe('<a href="/add">Add</a>'),
             )
         )
         self.assertIn("<caption", result)
@@ -853,7 +802,6 @@ class SimpleTableRenderingTest(unittest.TestCase):
     def test_simple_table_dict_rows_with_cell_data(self):
         """Verify dict-style rows with row_id and cell_data render correctly."""
         result = str(
-            str(
             components.SimpleTable(
                 columns=["Name", "Date"],
                 rows=[
@@ -865,7 +813,6 @@ class SimpleTableRenderingTest(unittest.TestCase):
                 ],
             )
         )
-        )
         tbody = self._tbody(result)
         self.assertIn('id="session-row-1"', tbody)
         self.assertIn("device-changed", tbody)
@@ -874,13 +821,15 @@ class SimpleTableRenderingTest(unittest.TestCase):
         self.assertIn("2025-01-01", tbody)
 
 
+from django.test import SimpleTestCase
+from common.components.primitives import Checkbox, Radio
+
+
 class ComponentPrimitivesTest(SimpleTestCase):
     def test_checkbox_primitive(self):
-        html = str(
-            components.Checkbox(
+        html = Checkbox(
             name="test-check", label="Accept Terms", checked=True, value="yes"
         )
-        )
         self.assertIn('type="checkbox"', html)
         self.assertIn('name="test-check"', html)
         self.assertIn('value="yes"', html)
@@ -888,18 +837,14 @@ class ComponentPrimitivesTest(SimpleTestCase):
         self.assertIn("Accept Terms", html)
 
     def test_checkbox_headless(self):
-        html = str(components.Checkbox(name="test-headless", label=None, checked=True))
+        html = Checkbox(name="test-headless", label=None, checked=True)
         self.assertNotIn("<label", html)
         self.assertIn("<input", html)
         self.assertIn('type="checkbox"', html)
         self.assertIn('name="test-headless"', html)
 
     def test_radio_primitive(self):
-        html = str(
-            components.Radio(
-                name="test-radio", label="Option A", checked=False, value="A"
-            )
-        )
+        html = Radio(name="test-radio", label="Option A", checked=False, value="A")
         self.assertIn('type="radio"', html)
         self.assertIn('name="test-radio"', html)
         self.assertIn('value="A"', html)
@@ -910,7 +855,6 @@ class ComponentPrimitivesTest(SimpleTestCase):
 class PrimitiveWidgetsTest(SimpleTestCase):
     def test_mixin_applies_widget_to_boolean_fields_only(self):
         from django import forms
-
         from games.forms import PrimitiveCheckboxWidget, PrimitiveWidgetsMixin
 
         class DummyForm(PrimitiveWidgetsMixin, forms.Form):
@@ -923,7 +867,6 @@ class PrimitiveWidgetsTest(SimpleTestCase):
 
     def test_primitive_checkbox_widget_renders_headless(self):
         from games.forms import PrimitiveCheckboxWidget
-
         widget = PrimitiveCheckboxWidget()
         html = widget.render(name="agree", value=True)
         self.assertNotIn("<label", html)

tests/test_custom_elements.py

@@ -1,95 +0,0 @@
-import unittest
-from typing import TypedDict
-
-from common.components import custom_element_builder, render
-from common.components.custom_elements import (
-    ElementSpec,
-    _ts_for_spec,
-    register_element,
-)
-
-
-class SampleProps(TypedDict):
-    game_id: int
-    status: str
-    is_on: bool
-
-
-class CustomElementBuilderTest(unittest.TestCase):
-    def test_serializes_props_to_kebab_attributes(self):
-        x_sample = custom_element_builder("x-sample")
-        html = render(x_sample(game_id=3, status="f")["hi"])
-        self.assertIn("<x-sample", html)
-        self.assertIn('game-id="3"', html)
-        self.assertIn('status="f"', html)
-        self.assertIn(">hi</x-sample>", html)
-
-    def test_declares_compiled_module_media(self):
-        from common.components import collect_media
-
-        x_sample = custom_element_builder("x-sample")
-        node = x_sample(game_id=3)
-        self.assertEqual(collect_media(node).js, ("dist/elements/x-sample.js",))
-
-
-class CodegenTest(unittest.TestCase):
-    def test_emits_interface_and_reader(self):
-        spec = ElementSpec("x-sample", "XSample", SampleProps)
-        ts = _ts_for_spec(spec)
-        self.assertIn("export interface XSampleProps {", ts)
-        self.assertIn("gameId: number;", ts)
-        self.assertIn("status: string;", ts)
-        self.assertIn("isOn: boolean;", ts)
-        self.assertIn(
-            "export function readXSampleProps(el: HTMLElement): XSampleProps", ts
-        )
-        self.assertIn('Number(el.getAttribute("game-id"))', ts)
-        self.assertIn('el.getAttribute("status") ?? ""', ts)
-        self.assertIn('el.getAttribute("is-on") === "true"', ts)
-
-
-class RegistryTest(unittest.TestCase):
-    def test_register_adds_spec(self):
-        from common.components.custom_elements import ELEMENT_REGISTRY
-
-        before = len(ELEMENT_REGISTRY)
-        register_element("x-reg-test", "XRegTest", SampleProps)
-        self.assertEqual(len(ELEMENT_REGISTRY), before + 1)
-        self.assertEqual(ELEMENT_REGISTRY[-1].tag, "x-reg-test")
-
-
-class GameStatusSelectorRenderTest(unittest.TestCase):
-    def test_emits_tag_props_and_media(self):
-        from types import SimpleNamespace
-
-        from common.components import GameStatusSelector, collect_media, render
-
-        game = SimpleNamespace(id=7, status="f", get_status_display=lambda: "Finished")
-        node = GameStatusSelector(game, [("u", "Unplayed"), ("f", "Finished")], "tok")
-        html = render(node)
-        self.assertIn("<game-status-selector", html)
-        self.assertIn('game-id="7"', html)
-        self.assertIn('status="f"', html)
-        self.assertIn('csrf="tok"', html)
-        self.assertIn("data-option", html)
-        self.assertIn('data-value="u"', html)
-        self.assertNotIn("x-data", html)  # no Alpine left
-        self.assertIn("dist/elements/game-status-selector.js", collect_media(node).js)
-
-
-class SessionDeviceSelectorRenderTest(unittest.TestCase):
-    def test_emits_tag_and_options(self):
-        from types import SimpleNamespace
-
-        from common.components import SessionDeviceSelector, render
-
-        session = SimpleNamespace(id=4, device=SimpleNamespace(name="Desktop"))
-        devices = [
-            SimpleNamespace(id=1, name="Desktop"),
-            SimpleNamespace(id=2, name="Deck"),
-        ]
-        html = render(SessionDeviceSelector(session, devices, "tok"))
-        self.assertIn("<session-device-selector", html)
-        self.assertIn('session-id="4"', html)
-        self.assertIn('data-value="2"', html)
-        self.assertNotIn("x-data", html)

tests/test_date_range_picker.py

@@ -1,196 +0,0 @@
-"""Unit tests for the DateRangePicker component family.
-
-Pins the structural contract of DateRangeField / DateRangeCalendar /
-DateRangePicker — segment inputs ordered by ``dateformat_hyphenated``, the
-hidden ISO ``{prefix}-min`` / ``{prefix}-max`` inputs that ``filter_bar.js``
-serializes, the calendar's preset/footer hooks — and the PurchaseFilterBar
-integration that replaced the native-date DateRangeFilter for the Purchased
-field.
-"""
-
-import json
-import re
-
-from django.test import SimpleTestCase, TestCase
-
-from common.components import (
-    DateRangeCalendar,
-    DateRangeField,
-    DateRangePicker,
-    PurchaseFilterBar,
-)
-from common.time import date_parts, dateformat_hyphenated
-
-_ESCAPED_TAG_MARKERS = ["<div", "<span", "<button", "<input"]
-
-
-class DatePartsTest(SimpleTestCase):
-    def test_default_format_yields_day_month_year(self):
-        parts = date_parts()
-        self.assertEqual([part.name for part in parts], ["day", "month", "year"])
-        self.assertEqual([part.placeholder for part in parts], ["DD", "MM", "YYYY"])
-        self.assertEqual([part.length for part in parts], [2, 2, 4])
-
-    def test_parts_follow_format_order(self):
-        parts = date_parts("%Y-%d-%m")
-        self.assertEqual([part.name for part in parts], ["year", "day", "month"])
-
-    def test_dateformat_hyphenated_is_parseable(self):
-        self.assertEqual(len(date_parts(dateformat_hyphenated)), 3)
-
-
-class DateRangeFieldTest(SimpleTestCase):
-    def render(self, **kwargs):
-        defaults = {"label": "Purchased", "input_name_prefix": "filter-date-purchased"}
-        defaults.update(kwargs)
-        return str(DateRangeField(**defaults))
-
-    def test_renders_hidden_iso_inputs(self):
-        html = self.render(min_value="2024-03-15", max_value="2024-09-20")
-        self.assertIn('name="filter-date-purchased-min"', html)
-        self.assertIn('name="filter-date-purchased-max"', html)
-        self.assertIn('data-date-range-hidden="min"', html)
-        self.assertIn('data-date-range-hidden="max"', html)
-        self.assertIn('value="2024-03-15"', html)
-        self.assertIn('value="2024-09-20"', html)
-
-    def test_renders_segments_in_dateformat_order_for_both_sides(self):
-        html = self.render()
-        for side in ("min", "max"):
-            side_segments = re.findall(
-                rf'data-date-part="(\w+)" data-date-side="{side}"', html
-            )
-            self.assertEqual(side_segments, ["day", "month", "year"])
-
-    def test_segment_placeholders_and_lengths(self):
-        html = self.render()
-        self.assertEqual(html.count('placeholder="DD"'), 2)
-        self.assertEqual(html.count('placeholder="MM"'), 2)
-        self.assertEqual(html.count('placeholder="YYYY"'), 2)
-        self.assertEqual(html.count('maxlength="2"'), 4)
-        self.assertEqual(html.count('maxlength="4"'), 2)
-        self.assertEqual(html.count('inputmode="numeric"'), 6)
-
-    def test_prefills_segments_from_iso_values(self):
-        html = self.render(min_value="2024-03-15")
-        self.assertIn('value="15" data-date-part="day" data-date-side="min"', html)
-        self.assertIn('value="03" data-date-part="month" data-date-side="min"', html)
-        self.assertIn('value="2024" data-date-part="year" data-date-side="min"', html)
-        # The max side stays empty.
-        self.assertIn('value="" data-date-part="day" data-date-side="max"', html)
-
-    def test_malformed_iso_value_renders_empty_segments(self):
-        html = self.render(min_value="not-a-date")
-        self.assertIn('value="" data-date-part="day" data-date-side="min"', html)
-
-    def test_renders_calendar_toggle(self):
-        html = self.render()
-        self.assertIn("data-date-range-calendar-toggle", html)
-        self.assertIn('aria-label="Open Purchased calendar"', html)
-
-    def test_no_native_date_inputs(self):
-        self.assertNotIn('type="date"', self.render())
-
-
-class DateRangeCalendarTest(SimpleTestCase):
-    def render(self):
-        return str(DateRangeCalendar(input_name_prefix="filter-date-purchased"))
-
-    def test_renders_all_presets(self):
-        html = self.render()
-        for preset in (
-            "today",
-            "yesterday",
-            "last_7_days",
-            "last_30_days",
-            "this_month",
-            "last_month",
-            "this_year",
-        ):
-            self.assertIn(f'data-date-range-preset="{preset}"', html)
-
-    def test_renders_footer_buttons(self):
-        html = self.render()
-        self.assertIn("data-date-range-cancel", html)
-        self.assertIn("data-date-range-clear", html)
-        self.assertIn("data-date-range-select", html)
-        self.assertIn(">Cancel<", html)
-        self.assertIn(">Clear<", html)
-        self.assertIn(">Select<", html)
-
-    def test_renders_grid_and_navigation_hooks(self):
-        html = self.render()
-        self.assertIn("data-date-range-grid", html)
-        self.assertIn("data-date-range-month-label", html)
-        self.assertIn("data-date-range-prev", html)
-        self.assertIn("data-date-range-next", html)
-
-    def test_starts_hidden(self):
-        self.assertIn('class="hidden absolute', self.render())
-
-    def test_all_buttons_are_type_button(self):
-        """No button inside the calendar may submit the surrounding filter form."""
-        html = self.render()
-        button_count = html.count("<button")
-        self.assertEqual(html.count('<button type="button"'), button_count)
-
-
-class DateRangePickerTest(SimpleTestCase):
-    def test_composes_field_and_calendar(self):
-        html = str(
-            DateRangePicker(
-                label="Purchased",
-                input_name_prefix="filter-date-purchased",
-                min_value="2024-01-01",
-                max_value="2024-12-31",
-            )
-        )
-        self.assertIn("data-date-range-picker", html)
-        self.assertIn('data-input-name-prefix="filter-date-purchased"', html)
-        self.assertIn("data-date-range-field", html)
-        self.assertIn("data-date-range-calendar", html)
-        for marker in _ESCAPED_TAG_MARKERS:
-            self.assertNotIn(marker, html)
-
-
-class PurchaseFilterBarDateRangePickerTest(TestCase):
-    """The Purchased filter uses the DateRangePicker; Refunded keeps the
-    native-date DateRangeFilter (the picker is a tryout on one field)."""
-
-    def render(self, filter_json=""):
-        return str(
-            PurchaseFilterBar(
-                filter_json=filter_json, preset_list_url="/l", preset_save_url="/s"
-            )
-        )
-
-    def test_purchased_uses_date_range_picker(self):
-        html = self.render()
-        self.assertIn("data-date-range-picker", html)
-        self.assertIn('data-input-name-prefix="filter-date-purchased"', html)
-        # The hidden ISO inputs keep the names filter_bar.js serializes.
-        self.assertIn('name="filter-date-purchased-min"', html)
-        self.assertIn('name="filter-date-purchased-max"', html)
-
-    def test_refunded_keeps_native_date_inputs(self):
-        html = self.render()
-        refunded_min = html.find('name="filter-date-refunded-min"')
-        self.assertGreater(refunded_min, 0)
-        self.assertIn('type="date"', html)
-        self.assertNotIn('data-input-name-prefix="filter-date-refunded"', html)
-
-    def test_prefilled_between_filter_round_trips_into_picker(self):
-        filter_json = json.dumps(
-            {
-                "date_purchased": {
-                    "value": "2024-03-15",
-                    "value2": "2024-09-20",
-                    "modifier": "BETWEEN",
-                }
-            }
-        )
-        html = self.render(filter_json)
-        self.assertIn('value="2024-03-15"', html)
-        self.assertIn('value="2024-09-20"', html)
-        self.assertIn('value="15" data-date-part="day" data-date-side="min"', html)
-        self.assertIn('value="20" data-date-part="day" data-date-side="max"', html)

tests/test_filter_bars.py

@@ -246,8 +246,8 @@ class FilterBarRenderingTest(TestCase):
         # New range slider input prefixes
         self.assertIn('name="filter-purchase-count-min"', html)
         self.assertIn('name="filter-playevent-count-min"', html)
-        self.assertIn('name="filter-manual-playtime-hours-min"', html)
-        self.assertIn('name="filter-calculated-playtime-hours-min"', html)
+        self.assertIn('name="filter-manual-playtime-minutes-min"', html)
+        self.assertIn('name="filter-calculated-playtime-minutes-min"', html)
         self.assertIn('name="filter-original-year-min"', html)
         self.assertIn('name="filter-purchase-price-total-min"', html)
         self.assertIn('name="filter-purchase-price-any-min"', html)
@@ -362,3 +362,4 @@ class FilterBarRenderingTest(TestCase):
         self.assertIn('name="filter-refunded"', purchase_html)
         self.assertIn('value="true"', purchase_html)
         self.assertIn('value="false"', purchase_html)
+

tests/test_filter_helpers.py

@@ -85,3 +85,4 @@ class ParseBoolNullableTest(SimpleTestCase):
         self.assertTrue(_parse_bool_nullable({"field": {"value": "1"}}, "field"))
         self.assertFalse(_parse_bool_nullable({"field": {"value": "false"}}, "field"))
         self.assertFalse(_parse_bool_nullable({"field": {"value": "0"}}, "field"))
+

tests/test_filters.py

@@ -560,14 +560,8 @@ class TestFilterBarRendering:
 
     def test_mastered_not_checked_by_default(self):
         html = str(FilterBar(filter_json=""))
-        assert (
-            'name="filter-mastered" value="true" class="rounded-full border-default-medium bg-neutral-secondary-medium text-brand focus:ring-brand" checked="true"'
-            not in html
-        )
-        assert (
-            'name="filter-mastered" value="false" class="rounded-full border-default-medium bg-neutral-secondary-medium text-brand focus:ring-brand" checked="true"'
-            not in html
-        )
+        assert 'name="filter-mastered" value="true" class="rounded-full border-default-medium bg-neutral-secondary-medium text-brand focus:ring-brand" checked="true"' not in html
+        assert 'name="filter-mastered" value="false" class="rounded-full border-default-medium bg-neutral-secondary-medium text-brand focus:ring-brand" checked="true"' not in html
 
     def test_mastered_checked_when_filtered(self):
         html = str(
@@ -712,7 +706,7 @@ class TestExpandedFiltersAgainstDB:
         # 2. Device & Session
         dev, _ = Device.objects.get_or_create(name="Super Famicom", type="Console")
 
-        # Session 1: total 4 hours (3 hours calc, 1 hour manual)
+        # Session 1: total 40 minutes (30 calc, 10 manual)
         s1 = Session.objects.create(
             game=game,
             device=dev,
@@ -720,9 +714,9 @@ class TestExpandedFiltersAgainstDB:
                 2026, 6, 1, 12, 0, 0, tzinfo=datetime.timezone.utc
             ),
             timestamp_end=datetime.datetime(
-                2026, 6, 1, 15, 0, 0, tzinfo=datetime.timezone.utc
+                2026, 6, 1, 12, 30, 0, tzinfo=datetime.timezone.utc
             ),
-            duration_manual=timedelta(hours=1),
+            duration_manual=timedelta(minutes=10),
         )
 
         # 3. Purchase
@@ -790,23 +784,23 @@ class TestExpandedFiltersAgainstDB:
         from games.filters import SessionFilter
         from games.models import Session
 
-        self._setup_entities()
+        data = self._setup_entities()
 
-        # Test duration_total_hours equals 4
+        # Test duration_total_minutes equals 40
         sf_tot = SessionFilter.from_json(
-            {"duration_total_hours": {"value": 4, "modifier": "EQUALS"}}
+            {"duration_total_minutes": {"value": 40, "modifier": "EQUALS"}}
         )
         assert Session.objects.filter(sf_tot.to_q()).count() == 1
 
-        # Test duration_manual_hours equals 1
+        # Test duration_manual_minutes equals 10
         sf_man = SessionFilter.from_json(
-            {"duration_manual_hours": {"value": 1, "modifier": "EQUALS"}}
+            {"duration_manual_minutes": {"value": 10, "modifier": "EQUALS"}}
         )
         assert Session.objects.filter(sf_man.to_q()).count() == 1
 
-        # Test duration_calculated_hours equals 3
+        # Test duration_calculated_minutes equals 30
         sf_calc = SessionFilter.from_json(
-            {"duration_calculated_hours": {"value": 3, "modifier": "EQUALS"}}
+            {"duration_calculated_minutes": {"value": 30, "modifier": "EQUALS"}}
         )
         assert Session.objects.filter(sf_calc.to_q()).count() == 1
 
@@ -814,7 +808,7 @@ class TestExpandedFiltersAgainstDB:
         from games.filters import PurchaseFilter
         from games.models import Purchase
 
-        self._setup_entities()
+        data = self._setup_entities()
 
         pf = PurchaseFilter.from_json(
             {
@@ -1023,14 +1017,14 @@ class TestExpandedFiltersAgainstDB:
         from games.models import Game
 
         data = self._setup_entities()
-        # data["s1"] has 1 hour manual + 3 hours calculated
+        # data["s1"] has 10 minutes manual + 30 minutes calculated
         gf_manual = GameFilter.from_json(
-            {"manual_playtime_hours": {"value": 1, "modifier": "EQUALS"}}
+            {"manual_playtime_minutes": {"value": 10, "modifier": "EQUALS"}}
         )
         assert data["game"] in set(Game.objects.filter(gf_manual.to_q()))
 
         gf_calc = GameFilter.from_json(
-            {"calculated_playtime_hours": {"value": 3, "modifier": "EQUALS"}}
+            {"calculated_playtime_minutes": {"value": 30, "modifier": "EQUALS"}}
         )
         assert data["game"] in set(Game.objects.filter(gf_calc.to_q()))
 

tests/test_node_tree.py

@@ -1,221 +0,0 @@
-"""Phase 1: the lazy node layer (Node/Element/Safe/Fragment/BaseComponent/Media).
-
-These cover the new machinery directly: rendering, escaping, media bubbling.
-"""
-
-import unittest
-
-from django.utils.safestring import mark_safe
-
-from common.components import (
-    BaseComponent,
-    Element,
-    Fragment,
-    Media,
-    Node,
-    Safe,
-    collect_media,
-    render,
-)
-
-
-class ElementRenderTest(unittest.TestCase):
-    def test_renders_tag_attrs_children(self):
-        element = Element("div", [("class", "test")], "hello")
-        self.assertEqual(render(element), '<div class="test">hello</div>')
-
-    def test_plain_string_children_escaped(self):
-        self.assertEqual(
-            render(Element("span", children=["<b>"])), "<span>&lt;b&gt;</span>"
-        )
-
-    def test_safe_node_child_passes_through(self):
-        self.assertEqual(
-            render(Element("span", children=[Safe("<b>x</b>")])),
-            "<span><b>x</b></span>",
-        )
-
-    def test_safetext_child_is_escaped(self):
-        # A string child is always escaped — even a mark_safe/SafeText one.
-        # Trusted markup must be a Safe node, not a safe string.
-        self.assertEqual(
-            render(Element("span", children=[mark_safe("<b>x</b>")])),
-            "<span>&lt;b&gt;x&lt;/b&gt;</span>",
-        )
-
-    def test_node_children_render_safely(self):
-        inner = Element("b", children=["x"])
-        self.assertEqual(
-            render(Element("span", children=[inner])), "<span><b>x</b></span>"
-        )
-
-
-class SafeAndFragmentTest(unittest.TestCase):
-    def test_safe_passes_html_through(self):
-        self.assertEqual(render(Safe("<i>raw</i>")), "<i>raw</i>")
-
-    def test_fragment_concatenates(self):
-        frag = Fragment(
-            Element("span", children=["a"]), Element("span", children=["b"])
-        )
-        self.assertEqual(render(frag), "<span>a</span><span>b</span>")
-
-    def test_fragment_skips_empty_children(self):
-        frag = Fragment("", None, Element("span", children=["a"]))
-        self.assertEqual(render(frag), "<span>a</span>")
-
-    def test_fragment_escapes_plain_strings(self):
-        self.assertEqual(render(Fragment("<x>", Safe("<y>"))), "&lt;x&gt;<y>")
-
-
-class MediaTest(unittest.TestCase):
-    def test_merge_dedups_preserving_order(self):
-        merged = Media(js=["a.js", "b.js"]) + Media(js=["b.js", "c.js"])
-        self.assertEqual(merged.js, ("a.js", "b.js", "c.js"))
-
-    def test_external_kept_separate(self):
-        merged = Media(js=["a.js"]) + Media(js_external=["umd.js"])
-        self.assertEqual(merged.js, ("a.js",))
-        self.assertEqual(merged.js_external, ("umd.js",))
-
-    def test_sum_with_radd(self):
-        merged = sum([Media(js=["a.js"]), Media(js=["b.js"])], Media())
-        self.assertEqual(merged.js, ("a.js", "b.js"))
-
-    def test_falsy_when_empty(self):
-        self.assertFalse(Media())
-        self.assertTrue(Media(js=["a.js"]))
-
-
-class MediaCollectionTest(unittest.TestCase):
-    def test_bubbles_through_element_children(self):
-        class Widget(BaseComponent):
-            media = Media(js=["widget.js"])
-
-            def render(self) -> Node:
-                return Element("div", children=["x"])
-
-        tree = Element("section", children=[Element("div", children=[Widget()])])
-        self.assertEqual(collect_media(tree).js, ("widget.js",))
-
-    def test_bubbles_through_fragment(self):
-        class Widget(BaseComponent):
-            media = Media(js=["w.js"])
-
-            def render(self) -> Node:
-                return Element("div")
-
-        self.assertEqual(collect_media(Fragment(Widget(), Element("p"))).js, ("w.js",))
-
-    def test_component_merges_own_and_subtree_media(self):
-        class Inner(BaseComponent):
-            media = Media(js=["inner.js"])
-
-            def render(self) -> Node:
-                return Element("span")
-
-        class Outer(BaseComponent):
-            media = Media(js=["outer.js"])
-
-            def render(self) -> Node:
-                return Element("div", children=[Inner()])
-
-        self.assertEqual(collect_media(Outer()).js, ("outer.js", "inner.js"))
-
-    def test_bare_string_has_no_media(self):
-        self.assertFalse(collect_media("just a string"))
-
-
-class RealComponentMediaTest(unittest.TestCase):
-    """Phase 3: JS-bearing components declare media that bubbles up the tree."""
-
-    def test_search_select_declares_its_script(self):
-        from common.components import SearchSelect
-
-        self.assertEqual(
-            collect_media(SearchSelect(name="games")).js, ("search_select.js",)
-        )
-
-    def test_filter_select_declares_its_script(self):
-        from common.components import FilterSelect
-
-        self.assertIn(
-            "search_select.js", collect_media(FilterSelect(field_name="type")).js
-        )
-
-    def test_date_range_picker_declares_its_script(self):
-        from common.components import DateRangePicker
-
-        media = collect_media(
-            DateRangePicker(label="Played", input_name_prefix="played")
-        )
-        self.assertEqual(media.js, ("date_range_picker.js",))
-
-    def test_range_slider_declares_its_script(self):
-        from common.components.filters import RangeSlider
-
-        media = collect_media(
-            RangeSlider(
-                label="Year", input_name_prefix="year", range_min=2000, range_max=2025
-            )
-        )
-        self.assertEqual(media.js, ("range_slider.js",))
-
-    def test_filter_bar_collects_chrome_and_widget_media(self):
-        """A FilterBar's media merges its own chrome script with the scripts that
-        bubble up from the FilterSelect and RangeSlider widgets it contains —
-        exactly the set the view used to thread by hand. (FilterBar wraps its DB
-        aggregates in try/except, so it builds without a database.)"""
-        from common.components import FilterBar
-
-        media = collect_media(FilterBar())
-        self.assertIn("filter_bar.js", media.js)
-        self.assertIn("search_select.js", media.js)
-        self.assertIn("range_slider.js", media.js)
-
-
-class HtpyStyleSugarTest(unittest.TestCase):
-    def test_getitem_sets_children(self):
-        from common.components import Div, Span
-
-        self.assertEqual(
-            render(Div(class_="card")[Span()["hi"]]),
-            '<div class="card"><span>hi</span></div>',
-        )
-
-    def test_getitem_multiple_children(self):
-        from common.components import Div
-
-        self.assertEqual(render(Div()["a", "b"]), "<div>a\nb</div>")
-
-    def test_kwargs_class_underscore_becomes_class(self):
-        from common.components import Div
-
-        self.assertIn('class="x"', render(Div(class_="x")))
-
-    def test_kwargs_inner_underscore_becomes_hyphen(self):
-        from common.components import Div
-
-        self.assertIn('hx-get="/y"', render(Div(hx_get="/y")))
-
-    def test_kwargs_true_renders_bare_attr(self):
-        from common.components import Div
-
-        self.assertIn('hidden="hidden"', render(Div(hidden=True)))
-
-    def test_kwargs_false_and_none_omitted(self):
-        from common.components import Div
-
-        html = render(Div(hidden=False, title=None))
-        self.assertNotIn("hidden", html)
-        self.assertNotIn("title", html)
-
-    def test_getitem_preserves_media(self):
-        from common.components import Div, Media, collect_media
-
-        node = Div(class_="x").with_media(Media(js=("a.js",)))["child"]
-        self.assertEqual(collect_media(node).js, ("a.js",))
-
-
-if __name__ == "__main__":
-    unittest.main()

tests/test_rendered_pages.py

@@ -57,22 +57,6 @@ class RenderedPagesTest(TestCase):
                 marker, html, f"Found double-escaped markup ({marker!r}) in output"
             )
 
-    # --- scripts auto-collected from component media (Phase 4) ---------------
-
-    def test_list_page_auto_loads_widget_scripts(self):
-        """The games list view passes no scripts= argument; the filter bar's
-        components declare their JS and Page() collects it."""
-        html = self.get("games:list_games").content.decode()
-        self.assertIn("js/filter_bar.js", html)
-        self.assertIn("js/search_select.js", html)
-        self.assertIn("js/range_slider.js", html)
-
-    def test_stats_page_auto_loads_datepicker(self):
-        """YearPicker declares the datepicker UMD bundle as media; the stats
-        view no longer hoists it by hand."""
-        html = self.get("games:stats_alltime").content.decode()
-        self.assertIn("js/datepicker.umd.js", html)
-
     # --- layout wrapper ------------------------------------------------------
 
     def test_page_layout_wrapper(self):
@@ -139,7 +123,7 @@ class RenderedPagesTest(TestCase):
 
     def test_add_session_form_has_timestamp_helpers(self):
         html = self.get("games:add_session").content.decode()
-        self.assertIn("session-timestamp-buttons", html)
+        self.assertIn("add_session.js", html)
         for marker in [
             "Set to now",
             "Toggle text",
@@ -168,7 +152,7 @@ class RenderedPagesTest(TestCase):
             "Platform",
             'id="history-container"',
             "status-changed from:body",
-            "<play-event-row",  # the played-row custom element
+            "createPlayEvent",  # the played-row Alpine dropdown script
             'hx-target="#global-modal-container"',  # delete trigger
             "Purchases",
             "Sessions",
@@ -179,14 +163,6 @@ class RenderedPagesTest(TestCase):
         self.assertNoEscapedTags(html)
         self.assertEqual(html.count("<div"), html.count("</div>"))
 
-    def test_view_game_uses_play_event_row_element(self):
-        game = Game.objects.create(name="Played Game", platform=self.platform)
-        html = self.get("games:view_game", game.id).content.decode()
-        self.assertIn("<play-event-row", html)
-        self.assertIn('game-id="', html)
-        self.assertNotIn("@@", html)  # token-replace hack gone
-        self.assertNotIn("createPlayEvent", html)  # the old Alpine fn is gone
-
     def test_view_game_empty_sections(self):
         """A game with no sessions/purchases/etc shows the empty messages."""
         lonely = Game.objects.create(name="Lonely Game", platform=self.platform)
@@ -419,12 +395,15 @@ class PurchaseListDateFilterTest(TestCase):
             html,
         )
         self.assertIn(
-            'name="filter-date-purchased-max" id="filter-date-purchased-max" value=""',
+            'name="filter-date-purchased-max" id="filter-date-purchased-max" '
+            'value=""',
             html,
         )
 
     def test_date_refunded_not_null(self):
-        response = self._get({"date_refunded": {"value": "", "modifier": "NOT_NULL"}})
+        response = self._get(
+            {"date_refunded": {"value": "", "modifier": "NOT_NULL"}}
+        )
         self.assertEqual(response.status_code, 200)
         html = response.content.decode()
         self.assertNotIn("EARLY-MARKER", html)

tests/test_scrub_staging.py

@@ -1,41 +0,0 @@
-from datetime import timedelta
-
-from django.contrib.sessions.models import Session as DjangoSession
-from django.core.management import call_command
-from django.test import TransactionTestCase
-from django.utils.timezone import now
-from django_q.models import Schedule
-
-
-class ScrubStagingTest(TransactionTestCase):
-    # TransactionTestCase flushes the DB before each test instead of wrapping
-    # in a savepoint. Required here because scrub_staging deletes all sessions
-    # — a TestCase savepoint rollback would restore any sessions committed by
-    # earlier tests (e.g. force_login in test_paths_return_200) and leak state
-    # into the e2e live-server tests that follow.
-
-    def test_scrub_removes_sessions_and_schedules(self):
-        DjangoSession.objects.create(
-            session_key="copied-from-prod",
-            session_data="",
-            expire_date=now() + timedelta(days=1),
-        )
-        Schedule.objects.create(
-            func="games.tasks.convert_prices",
-            name="Update converted prices",
-            schedule_type=Schedule.MINUTES,
-        )
-
-        self.assertEqual(DjangoSession.objects.count(), 1)
-        self.assertEqual(Schedule.objects.count(), 1)
-
-        call_command("scrub_staging")
-
-        self.assertEqual(DjangoSession.objects.count(), 0)
-        self.assertEqual(Schedule.objects.count(), 0)
-
-    def test_scrub_is_safe_on_empty_database(self):
-        call_command("scrub_staging")
-
-        self.assertEqual(DjangoSession.objects.count(), 0)
-        self.assertEqual(Schedule.objects.count(), 0)

tests/test_search_select.py

@@ -7,76 +7,69 @@ import django.test
 from django.utils.safestring import SafeText
 
 from common.components import (
+    FilterSelect,
+    Pill,
+    SearchSelect,
     searchselect_selected,
 )
-from common.components import FilterSelect, Pill, SearchSelect
 from games.models import Game, Platform
 
-# These components are lazy nodes; the tests below assert on rendered HTML, so
-# each call is wrapped in ``str(...)`` (``Node.__str__`` returns a ``SafeText``,
-# which keeps the ``assertIsInstance(..., SafeText)`` checks meaningful and the
-# string assertions working).
-
 
 class PillTest(unittest.TestCase):
     def test_returns_safetext(self):
-        self.assertIsInstance(str(Pill("hi")), SafeText)
+        self.assertIsInstance(Pill("hi"), SafeText)
 
     def test_plain_pill_has_data_pill_no_remove(self):
-        html = str(Pill("hi"))
+        html = Pill("hi")
         self.assertIn("data-pill", html)
         self.assertNotIn("data-pill-remove", html)
 
     def test_removable_adds_remove_button(self):
-        html = str(Pill("hi", removable=True))
+        html = Pill("hi", removable=True)
         self.assertIn("data-pill-remove", html)
         self.assertIn('aria-label="Remove"', html)
 
     def test_value_becomes_data_value(self):
-        html = str(Pill("hi", value="42"))
+        html = Pill("hi", value="42")
         self.assertIn('data-value="42"', html)
 
     def test_no_value_omits_data_value(self):
-        self.assertNotIn("data-value", str(Pill("hi")))
+        self.assertNotIn("data-value", Pill("hi"))
 
     def test_label_is_escaped(self):
-        html = str(Pill("<b>x</b>"))
+        html = Pill("<b>x</b>")
         self.assertIn("&lt;b&gt;", html)
         self.assertNotIn("<b>x</b>", html)
 
     def test_extra_data_attributes(self):
-        html = str(Pill("hi", attributes=[("data-platform", "3")]))
+        html = Pill("hi", attributes=[("data-platform", "3")])
         self.assertIn('data-platform="3"', html)
 
 
 class SearchSelectComponentTest(unittest.TestCase):
     def test_returns_safetext(self):
-        self.assertIsInstance(str(SearchSelect(name="games")), SafeText)
+        self.assertIsInstance(SearchSelect(name="games"), SafeText)
 
     def test_empty_options_renders_no_results_scaffold(self):
-        html = str(SearchSelect(name="games"))
+        html = SearchSelect(name="games")
         self.assertIn("data-search-select-no-results", html)
         self.assertIn("No results", html)
 
     def test_outer_container_carries_config(self):
-        html = str(
-            SearchSelect(
+        html = SearchSelect(
             name="games", search_url="/api/games/search", multi_select=True
         )
-        )
         self.assertIn("data-search-select", html)
         self.assertIn('data-name="games"', html)
         self.assertIn('data-search-url="/api/games/search"', html)
         self.assertIn('data-multi="true"', html)
 
     def test_multi_selected_renders_pills_and_hidden_inputs(self):
-        html = str(
-            SearchSelect(
+        html = SearchSelect(
             name="games",
             multi_select=True,
             selected=[{"value": 7, "label": "Game A", "data": {"platform": "2"}}],
         )
-        )
         self.assertIn("data-pill", html)
         self.assertIn('<input name="games" value="7" type="hidden">', html)
         self.assertIn('data-platform="2"', html)
@@ -85,12 +78,10 @@ class SearchSelectComponentTest(unittest.TestCase):
         self.assertEqual(html.count(' name="games"'), 1)
 
     def test_single_selected_has_no_pill_and_value_in_search_box(self):
-        html = str(
-            SearchSelect(
+        html = SearchSelect(
             name="games",
             selected=[{"value": 7, "label": "Game A", "data": {"platform": "2"}}],
         )
-        )
         # single-select renders no pill — the label lives in the search box
         self.assertNotIn("data-pill", html)
         self.assertIn('value="Game A"', html)
@@ -99,23 +90,21 @@ class SearchSelectComponentTest(unittest.TestCase):
         self.assertEqual(html.count(' name="games"'), 1)
 
     def test_search_box_has_no_name(self):
-        html = str(SearchSelect(name="games"))
+        html = SearchSelect(name="games")
         self.assertIn("data-search-select-search", html)
         # container exposes data-name, never a submittable name on the search box
         self.assertEqual(html.count(' name="games"'), 0)
 
     def test_tuple_options_are_normalized(self):
-        html = str(SearchSelect(name="t", options=[("1", "One")]))
+        html = SearchSelect(name="t", options=[("1", "One")])
         self.assertIn('data-search-select-option=""', html)
         self.assertIn('data-value="1"', html)
         self.assertIn("One", html)
 
     def test_options_omitted_when_search_url_set(self):
-        html = str(
-            SearchSelect(
+        html = SearchSelect(
             name="t", options=[("1", "One")], search_url="/api/games/search"
         )
-        )
         # No pre-rendered rows in the live panel; the row prototype lives only in
         # the cloneable <template>.
         panel = html.split("data-search-select-template")[0]
@@ -125,9 +114,7 @@ class SearchSelectComponentTest(unittest.TestCase):
     def test_templates_carry_label_slot_for_js_cloning(self):
         # The dynamic shapes the JS clones expose a [data-search-select-label] slot so the JS
         # only fills text — classes/structure stay server-side.
-        html = str(
-            SearchSelect(name="t", search_url="/api/games/search", multi_select=True)
-        )
+        html = SearchSelect(name="t", search_url="/api/games/search", multi_select=True)
         self.assertIn('data-search-select-template="row"', html)
         self.assertIn('data-search-select-template="pill"', html)
         self.assertIn("data-search-select-label", html)
@@ -135,7 +122,7 @@ class SearchSelectComponentTest(unittest.TestCase):
     def test_shell_region_order_pills_search_options(self):
         # The shared shell assembles the three regions in a fixed order; option
         # rows precede the trailing no-results node inside the options panel.
-        html = str(SearchSelect(name="t", options=[("1", "One")]))
+        html = SearchSelect(name="t", options=[("1", "One")])
         pills = html.index("data-search-select-pills")
         search = html.index("data-search-select-search")
         options = html.index("data-search-select-options")
@@ -148,11 +135,11 @@ class SearchSelectComponentTest(unittest.TestCase):
 
     def test_prefetch_attribute_and_defaults(self):
         # Default prefetch is 0 in SearchSelect
-        html_default = str(SearchSelect(name="t"))
+        html_default = SearchSelect(name="t")
         self.assertIn('data-prefetch="0"', html_default)
 
         # Custom prefetch is rendered
-        html_custom = str(SearchSelect(name="t", prefetch=42))
+        html_custom = SearchSelect(name="t", prefetch=42)
         self.assertIn('data-prefetch="42"', html_custom)
 
 
@@ -160,10 +147,10 @@ class FilterSelectComponentTest(unittest.TestCase):
     MODIFIERS = [("NOT_NULL", "(Any)"), ("IS_NULL", "(None)")]
 
     def test_returns_safetext(self):
-        self.assertIsInstance(str(FilterSelect(field_name="type")), SafeText)
+        self.assertIsInstance(FilterSelect(field_name="type"), SafeText)
 
     def test_is_filter_mode_on_shared_shell(self):
-        html = str(FilterSelect(field_name="type"))
+        html = FilterSelect(field_name="type")
         # Reuses the SearchSelect shell (data-search-select) but flags filter mode.
         self.assertIn("data-search-select", html)
         self.assertIn('data-search-select-mode="filter"', html)
@@ -172,20 +159,18 @@ class FilterSelectComponentTest(unittest.TestCase):
         self.assertEqual(html.count(' name="type"'), 0)
 
     def test_value_rows_have_include_exclude_buttons(self):
-        html = str(FilterSelect(field_name="type", options=[("g", "Game")]))
+        html = FilterSelect(field_name="type", options=[("g", "Game")])
         self.assertIn('data-search-select-action="include"', html)
         self.assertIn('data-search-select-action="exclude"', html)
         self.assertIn('data-value="g"', html)
 
     def test_included_renders_check_pill_excluded_renders_cross_pill(self):
-        html = str(
-            FilterSelect(
+        html = FilterSelect(
             field_name="platform",
             options=[("1", "Steam"), ("2", "GOG")],
             included=[("1", "Steam")],
             excluded=[("2", "GOG")],
         )
-        )
         # Labels live in a [data-search-select-label] slot (so JS can fill clones); the ✓/✗
         # symbol is a sibling text node.
         self.assertIn('data-search-select-type="include"', html)
@@ -197,7 +182,7 @@ class FilterSelectComponentTest(unittest.TestCase):
         self.assertIn("line-through", html)  # excluded pill styling
 
     def test_modifier_options_render_pinned_rows(self):
-        html = str(FilterSelect(field_name="platform", modifier_options=self.MODIFIERS))
+        html = FilterSelect(field_name="platform", modifier_options=self.MODIFIERS)
         # Pinned pseudo-options carry data-search-select-modifier-option, never data-search-select-option,
         # so the text filter leaves them visible.
         self.assertIn('data-search-select-modifier-option="NOT_NULL"', html)
@@ -206,30 +191,28 @@ class FilterSelectComponentTest(unittest.TestCase):
     def test_modifier_pill_coexists_with_value_pills(self):
         """Modifier and value pills both render server-side; the JS handles
         mutual exclusivity for presence modifiers (PRESENCE_MODIFIERS)."""
-        html = str(
-            FilterSelect(
+        html = FilterSelect(
             field_name="platform",
             options=[("1", "Steam")],
             included=[("1", "Steam")],
             modifier="IS_NULL",
             modifier_options=self.MODIFIERS,
         )
-        )
         # Both the modifier pill and the value pill render.
         self.assertIn('data-search-select-modifier="IS_NULL"', html)
         self.assertIn("(None)", html)
-        self.assertIn('data-search-select-type="include"', html)  # value pill present
+        self.assertIn(
+            'data-search-select-type="include"', html
+        )  # value pill present
         self.assertIn('data-modifier="IS_NULL"', html)  # container carries it too
 
     def test_search_url_omits_value_rows_but_keeps_modifiers(self):
-        html = str(
-            FilterSelect(
+        html = FilterSelect(
             field_name="game",
             search_url="/api/games/search",
             prefetch=20,
             modifier_options=self.MODIFIERS,
         )
-        )
         # No value rows in the live panel (they're fetched); the row prototype
         # lives only in a <template>.
         panel = html.split("data-search-select-template")[0]
@@ -242,13 +225,11 @@ class FilterSelectComponentTest(unittest.TestCase):
 
     def test_search_url_pills_use_resolved_labels(self):
         # A selected value outside the fetched window still shows its label.
-        html = str(
-            FilterSelect(
+        html = FilterSelect(
             field_name="game",
             search_url="/api/games/search",
             excluded=[{"value": 4172, "label": "Obscure Game", "data": {}}],
         )
-        )
         self.assertIn(">Obscure Game</span>", html)
         self.assertIn('data-value="4172"', html)
 
@@ -260,8 +241,7 @@ class FilterSelectComponentTest(unittest.TestCase):
     def test_m2m_modifiers_render_as_option_rows(self):
         """M2M modifiers (All)/(Only) render as modifier-option rows in the
         dropdown, not as a separate <select>."""
-        html = str(
-            FilterSelect(
+        html = FilterSelect(
             field_name="games",
             modifier_options=[
                 ("NOT_NULL", "(Any)"),
@@ -270,18 +250,22 @@ class FilterSelectComponentTest(unittest.TestCase):
                 ("INCLUDES_ONLY", "(Only)"),
             ],
         )
+        self.assertIn(
+            'data-search-select-modifier-option="INCLUDES_ALL"', html
+        )
+        self.assertIn(
+            'data-search-select-modifier-option="INCLUDES_ONLY"', html
+        )
+        self.assertIn(
+            'data-search-select-modifier-option="NOT_NULL"', html
         )
-        self.assertIn('data-search-select-modifier-option="INCLUDES_ALL"', html)
-        self.assertIn('data-search-select-modifier-option="INCLUDES_ONLY"', html)
-        self.assertIn('data-search-select-modifier-option="NOT_NULL"', html)
         # No legacy match-mode <select>.
         self.assertNotIn("data-search-select-match", html)
 
     def test_active_modifier_renders_pill(self):
         """When modifier is INCLUDES_ALL, the modifier pill renders with the
         (All) label alongside any value pills."""
-        html = str(
-            FilterSelect(
+        html = FilterSelect(
             field_name="games",
             modifier="INCLUDES_ALL",
             modifier_options=[
@@ -292,7 +276,6 @@ class FilterSelectComponentTest(unittest.TestCase):
             ],
             included=[{"value": 5, "label": "Hollow Knight", "data": {}}],
         )
-        )
         self.assertIn('data-modifier="INCLUDES_ALL"', html)
         self.assertIn("(All)", html)
         self.assertIn("Hollow Knight", html)
@@ -300,13 +283,11 @@ class FilterSelectComponentTest(unittest.TestCase):
 
     def test_presence_only_modifiers_no_m2m_rows(self):
         """When modifier_options only has presence entries, no M2M rows appear."""
-        html = str(
-            FilterSelect(
+        html = FilterSelect(
             field_name="status",
             modifier_options=[("NOT_NULL", "(Any)"), ("IS_NULL", "(None)")],
             options=[("f", "Finished")],
         )
-        )
         self.assertNotIn("INCLUDES_ALL", html)
         self.assertNotIn("INCLUDES_ONLY", html)
 

timetracker/settings.py

@@ -21,12 +21,7 @@ BASE_DIR = Path(__file__).resolve().parent.parent
 # See https://docs.djangoproject.com/en/4.1/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-# Read from the environment so each deployment (prod, staging) can supply its
-# own key; falls back to an insecure default for local development and tests.
-SECRET_KEY = os.environ.get(
-    "SECRET_KEY",
-    "django-insecure-x0_t$gei=_o_p(%%!-db$jezka@y+d67$a8tvw13nl^8$l*t@=",
-)
+SECRET_KEY = "django-insecure-x0_t$gei=_o_p(%%!-db$jezka@y+d67$a8tvw13nl^8$l*t@="
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = False if os.environ.get("PROD") else True

ts/elements/dropdown.ts

@@ -1,50 +0,0 @@
-export interface DropdownConfig {
-  patchUrl: string;
-  bodyKey: string; // server field name, e.g. "status" or "device_id"
-  event: string; // dispatched on document.body after a successful PATCH
-  csrf: string;
-  numericValue?: boolean; // parse the option value as a number
-}
-
-// Wires a light-DOM value-selector dropdown that lives inside `host`.
-// Markup hooks (rendered server-side): [data-toggle], [data-menu],
-// [data-label], and one or more [data-option][data-value].
-export function initDropdown(host: HTMLElement, config: DropdownConfig): void {
-  const toggle = host.querySelector<HTMLElement>("[data-toggle]");
-  const menu = host.querySelector<HTMLElement>("[data-menu]");
-  const label = host.querySelector<HTMLElement>("[data-label]");
-  if (!toggle || !menu || !label) return;
-
-  const close = () => {
-    menu.hidden = true;
-  };
-
-  toggle.addEventListener("click", (event) => {
-    event.stopPropagation();
-    menu.hidden = !menu.hidden;
-  });
-  document.addEventListener("click", (event) => {
-    if (!host.contains(event.target as Node)) close();
-  });
-
-  host.querySelectorAll<HTMLElement>("[data-option]").forEach((option) => {
-    option.addEventListener("click", (event) => {
-      event.preventDefault();
-      event.stopPropagation();
-      const raw = option.dataset.value ?? "";
-      label.innerHTML = option.innerHTML;
-      close();
-      const body: Record<string, unknown> = {
-        [config.bodyKey]: config.numericValue ? Number(raw) : raw,
-      };
-      window
-        .fetchWithHtmxTriggers(config.patchUrl, {
-          method: "PATCH",
-          headers: { "Content-Type": "application/json", "X-CSRFToken": config.csrf },
-          body: JSON.stringify(body),
-        })
-        .then(() => document.body.dispatchEvent(new CustomEvent(config.event)))
-        .catch(() => console.error("Failed to update", config.patchUrl));
-    });
-  });
-}

ts/elements/game-status-selector.ts

@@ -1,16 +0,0 @@
-import { readGameStatusSelectorProps } from "../generated/props.js";
-import { initDropdown } from "./dropdown.js";
-
-class GameStatusSelectorElement extends HTMLElement {
-  connectedCallback(): void {
-    const props = readGameStatusSelectorProps(this);
-    initDropdown(this, {
-      patchUrl: `/api/games/${props.gameId}/status`,
-      bodyKey: "status",
-      event: "status-changed",
-      csrf: props.csrf,
-    });
-  }
-}
-
-customElements.define("game-status-selector", GameStatusSelectorElement);

ts/elements/play-event-row.ts

@@ -1,42 +0,0 @@
-import { readPlayEventRowProps } from "../generated/props.js";
-
-class PlayEventRowElement extends HTMLElement {
-  connectedCallback(): void {
-    const props = readPlayEventRowProps(this);
-    const toggle = this.querySelector<HTMLElement>("[data-toggle]");
-    const menu = this.querySelector<HTMLElement>("[data-menu]");
-    const count = this.querySelector<HTMLElement>("[data-count]");
-    const addPlay = this.querySelector<HTMLElement>("[data-add-play]");
-    if (!toggle || !menu) return;
-
-    const close = () => {
-      menu.hidden = true;
-    };
-    toggle.addEventListener("click", (event) => {
-      event.stopPropagation();
-      menu.hidden = !menu.hidden;
-    });
-    document.addEventListener("click", (event) => {
-      if (!this.contains(event.target as Node)) close();
-    });
-
-    addPlay?.addEventListener("click", (event) => {
-      event.preventDefault();
-      event.stopPropagation();
-      if (count) count.textContent = String(Number(count.textContent) + 1);
-      close();
-      window
-        .fetchWithHtmxTriggers(props.apiCreateUrl, {
-          method: "POST",
-          headers: { "Content-Type": "application/json", "X-CSRFToken": props.csrf },
-          body: JSON.stringify({ game_id: props.gameId }),
-        })
-        .catch(() => {
-          if (count) count.textContent = String(Number(count.textContent) - 1);
-          console.error("Failed to record play");
-        });
-    });
-  }
-}
-
-customElements.define("play-event-row", PlayEventRowElement);

ts/elements/session-device-selector.ts

@@ -1,17 +0,0 @@
-import { readSessionDeviceSelectorProps } from "../generated/props.js";
-import { initDropdown } from "./dropdown.js";
-
-class SessionDeviceSelectorElement extends HTMLElement {
-  connectedCallback(): void {
-    const props = readSessionDeviceSelectorProps(this);
-    initDropdown(this, {
-      patchUrl: `/api/session/${props.sessionId}/device`,
-      bodyKey: "device_id",
-      event: "device-changed",
-      csrf: props.csrf,
-      numericValue: true,
-    });
-  }
-}
-
-customElements.define("session-device-selector", SessionDeviceSelectorElement);

ts/elements/session-timestamp-buttons.ts

@@ -1,49 +0,0 @@
-// import { toISOUTCString } from "../../games/static/js/utils.js";
-
-/**
- * @description Formats Date to a UTC string accepted by the datetime-local input field.
- * @param {Date} date
- * @returns {string}
- */
-function toISOUTCString(date: Date): string {
-    function stringAndPad(number: number): string {
-        return number.toString().padStart(2, "0");
-    }
-    const year = date.getFullYear();
-    const month = stringAndPad(date.getMonth() + 1);
-    const day = stringAndPad(date.getDate());
-    const hours = stringAndPad(date.getHours());
-    const minutes = stringAndPad(date.getMinutes());
-    return `${year}-${month}-${day}T${hours}:${minutes}`;
-}
-
-class SessionTimestampButtonsElement extends HTMLElement {
-    connectedCallback(): void {
-        for (const button of this.querySelectorAll("[data-target]")) {
-            const target = button.getAttribute("data-target");
-            const type = button.getAttribute("data-type");
-            if (!target || !type) continue;
-            const targetElement = document.querySelector(`#id_${target}`);
-            if (!(targetElement instanceof HTMLInputElement)) return;
-            button.addEventListener("click", (event) => {
-                event.preventDefault();
-                if (type == "now") {
-                    targetElement.value = toISOUTCString(new Date());
-                } else if (type == "copy") {
-                    const oppositeName =
-                        targetElement.name == "timestamp_start"
-                            ? "timestamp_end"
-                            : "timestamp_start";
-                    const opposite = document.querySelector(`[name='${oppositeName}']`);
-                    if (!(opposite instanceof HTMLInputElement)) return;
-                    opposite.value = targetElement.value;
-                } else if (type == "toggle") {
-                    if (targetElement.type == "datetime-local") targetElement.type = "text";
-                    else targetElement.type = "datetime-local";
-                }
-            });
-        }
-    }
-}
-
-customElements.define("session-timestamp-buttons", SessionTimestampButtonsElement);

ts/globals.d.ts

@@ -1,7 +0,0 @@
-export {};
-
-declare global {
-  interface Window {
-    fetchWithHtmxTriggers(input: RequestInfo | URL, init?: RequestInit): Promise<Response>;
-  }
-}

tsconfig.json

@@ -1,14 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2022",
-    "module": "ES2022",
-    "moduleResolution": "Bundler",
-    "lib": ["ES2022", "DOM", "DOM.Iterable"],
-    "strict": true,
-    "noEmitOnError": true,
-    "forceConsistentCasingInFileNames": true,
-    "rootDir": "ts",
-    "outDir": "games/static/js/dist"
-  },
-  "include": ["ts/**/*.ts"]
-}