Compare commits

..

34 Commits

Author SHA1 Message Date
alexei.dolgolyov 9eb478fdc9 chore: release v0.6.0
Release / release (push) Successful in 1m25s
2026-04-25 14:54:16 +03:00
alexei.dolgolyov ef942b77cc feat(telegram): per-chat command localization + unified locale resolver
Two related Telegram changes:

1. Per-chat command localization. setMyCommands now accepts a scope
   (BotCommandScopeChat) and deleteMyCommands clears scoped bindings.
   Command registration runs three tiers: default → per-language
   (Telegram client language) → per-chat (UI override). Saving a
   chat's language_override or commands_enabled toggle pushes the
   binding to Telegram inline rather than waiting on the 30s
   debounced bot-wide sync.

2. Unified Telegram locale resolution. Three test paths (bot test_chat,
   target receiver test, target-level fan-out) used to disagree on
   locale priority — the target receiver test in particular only
   consulted receiver.locale and ignored the chat's language_override.
   Introduced pick_telegram_locale (pure) and
   resolve_telegram_chat_locale (async DB lookup) in services/notifier
   so all three paths share one priority order:

       receiver.locale → chat.language_override → chat.language_code → fallback

   Fan-out keeps batch-loading TelegramChat rows for efficiency, just
   runs them through the same priority function now.
2026-04-25 14:41:28 +03:00
alexei.dolgolyov 711f218622 fix(redesign): a11y, mobile, perf polish for production push
Comprehensive pre-production sweep across the Aurora redesign — drives
svelte-check to 0 errors / 0 warnings (was 61) without changing visual
intent. Highlights:

- Mobile: hero title shrinks at 480px, signal-list stacks timestamp
  under sentence below 640px, sidebar icon buttons bumped to 40x40
- Light theme: muted-foreground darkened to #3a3560 to clear WCAG AA
  on glass surfaces and the modal close button
- Perf: topbar backdrop-filter 28→14px, mobile-more sheet 28→12px to
  cut concurrent blur layers on mid-tier mobile
- a11y: prefers-reduced-motion mute for aurora drift / pulses /
  shimmer / stagger; aria-label on every icon-only button;
  aria-describedby on Hint; combobox/listbox/aria-activedescendant on
  SearchPalette; modal dialog tabindex; 47 label-without-control
  warnings across 14 form pages cleaned up via for=/id= or label→div
- Dashboard derived state split into topology- vs status-bound layers
  so polling no longer re-runs the full provider/wires computation
- Mobile bottom nav derived from baseNavEntries by key lookup so
  adding a top-level nav entry keeps the two trees in sync
- Bug: template-configs page now respects the global provider filter
  for both the count meter and the type pill (was reading the
  unfiltered cache)
- Misc: portal EventChart tooltip and switch its swatches to Aurora
  tokens; CollapsibleSlot warning state uses warning-fg/-bg tokens
  instead of #d97706; Hint z-index 99999→9999; element refs across
  Modal/EntitySelect/MultiEntitySelect/SearchPalette/IconGridSelect/
  Hint/targets converted to \$state for reactivity; 4 dead
  .topbar-cta selectors removed
2026-04-25 14:41:12 +03:00
alexei.dolgolyov 9eb76c1407 feat(redesign): collapsible dashboard sections + glass mobile-more sheet
Generalize dashboard panel expansion: Stream / On Watch / Pulse / Wires
each get a chevron toggle persisted in localStorage under
dashboard_section_state (migrates legacy dashboard_chart_visible). Drop
the redundant inner border on EventChart so it doesn't double-frame the
panel. Mobile "more" sheet becomes full-height with translucent glass
(rgba(...,0.72) + 28px blur) instead of nearly-solid.
2026-04-25 12:37:56 +03:00
alexei.dolgolyov d356e5a3ac fix(redesign): portal overlays + solid popup surfaces for legibility
Portal EntitySelect/MultiEntitySelect/Modal/Snackbar/EventChart/Hint to
<body> so they escape backdrop-filter ancestors. Replace translucent
glass on popups (IconPicker, IconGridSelect, SearchPalette, Snackbar)
with solid backgrounds and theme-aware light-mode override.
2026-04-25 11:41:25 +03:00
alexei.dolgolyov 9643fe519e feat(redesign): stack PageHeader meter top-right, button bottom-right
The hero's right column now spreads vertically — count + label pinned
at the top, action button(s) flushed to the bottom-right corner of
the card via margin-top: auto. Row uses align-items: stretch so the
side column reaches the full hero height regardless of how tall the
left column gets (long descriptions, many pills, etc.).

Single CSS change in the shared component, so it applies to every
page that uses PageHeader (all 14 of them) — no per-page edits.
2026-04-25 02:58:58 +03:00
alexei.dolgolyov d662b50925 feat(redesign): roll subpage hero across all pages + Aurora Button + JinjaEditor + pulse fix
Big batch — every secondary page now wears the same glass-card hero
that landed on Providers earlier:

- notification-trackers, tracking-configs, template-configs
- command-trackers, command-configs, command-template-configs
- targets (with active-tab title), actions
- bots (telegram / email / matrix tabs)
- settings, settings/backup, users

Each page picks an italic-em emphasis word, an editorial crumb (e.g.
'Routing · Notification', 'Operators · Bots', 'System · Maintenance'),
a count meter, and entity-specific status pills derived from live
data: 'X armed / Y paused' for trackers and actions, 'X types' for
configs/templates, 'X channels' or '$N receivers' for targets.

Other changes in this commit:

- Button.svelte: redesigned. Primary variant becomes a real Aurora
  CTA — gradient lavender → orchid pill, 40px tall md / 34px sm,
  inset highlight, lift + glow on hover. Secondary, danger, ghost
  variants reworked to match. The 'Add <Type>' button on every page
  now reads as the page's primary action instead of a flat lavender
  rectangle.
- JinjaEditor: overrode oneDark's hardcoded background with
  !important so the editor surface picks up var(--color-input-bg).
  Gutters / scroller / selection / autocomplete tooltip all match
  Aurora glass tokens now. Template editors stop visually clashing
  with the surrounding panel.
- Aurora pulse dot: rewritten as a self-contained box-shadow glow
  pulse (no transform, no pseudo-element). The dot's bounding box is
  now stable so ancestors with overflow:hidden can never clip the
  visible dot — only the (decorative) outer glow halo. Fixes the
  'half-moon clipping' on the dashboard 'On watch' deck.
- topbar-action.svelte.ts left in tree but unused (topbar CTA was
  reverted per your call). Will clean up in a later commit.
- Form input baseline styling moved into app.css (rounded 0.625rem,
  glass background, hover/focus rings) so untouched filter inputs
  on the per-type pages stop looking out of place.

i18n: emphasis / countLabel / armed / paused / receiver / receivers
/ channelsCount keys added across en + ru.

Build clean: 0 errors, 61 pre-existing a11y warnings unchanged.
2026-04-25 02:52:01 +03:00
alexei.dolgolyov 9733e5c122 feat(redesign): subpage hero header + iconpicker portal + tighter gaps
Three threads bundled:

- PageHeader.svelte upgraded to a glass-card subpage hero matching
  the dashboard hero language, scaled down. New optional props (all
  backward-compatible — old callers keep working): emphasis (italic
  gradient word appended to title), crumb (uppercase mono kicker),
  count + countLabel (right-side mono meter), pills (status chips
  with tones: mint / sky / orchid / coral / citrus / primary).
- Providers page wired up first as the test surface: pulls live
  online/offline/checking counts from the existing health probe and
  shows a type-count pill. Locale keys added (en + ru) for the new
  copy ('Service / providers' wordmark, longer description).
- IconPicker dropdown was suffering the same backdrop-filter
  containing-block bug as IconGridSelect — repositioned popups
  rendered inside any glass form panel got clipped or floated to
  the bottom of the page. Now portals to <body> via the shared
  $lib/portal action and uses Aurora glass styling end-to-end
  (solid surface, gradient-active cell, glass-strong search input).
- Layout gaps tightened to match the mockup:
    * sidebar→content horizontal gap is now 18px flat (was 50px:
      the 18px shell-gap PLUS another 32px wrapper padding on each
      child of main). Dropped px-4/md:px-8 from the topbar wrapper
      and the per-page content wrapper — main's children sit flush
      at the column boundary.
    * topbar→content vertical gap reduced to 12px (was 16px / pt-4).

Build clean, 0 errors.
2026-04-25 02:15:34 +03:00
alexei.dolgolyov 46a4a6ee29 fix(redesign): align topbar horizontal padding with page content
Topbar wrapper used md:px-0 (edge-to-edge of main column) while the
page content wrapper used md:px-8 (32px side padding). Result was a
32px overshoot on each side of the topbar pill versus the hero, stat
cards, and panels below it.

Match the wrappers — topbar now uses md:px-8 too. Left/right edges of
the search bar pill line up with the hero/stat panels.
2026-04-25 02:00:49 +03:00
alexei.dolgolyov 1895c5e2d4 fix(redesign): brand snap, event sentences, palette glass, full width
Round-up of feedback:

- Brand: drop italic-gradient 'Bridge' wordmark + 'SERVICE
  NOTIFICATIONS' tag. Now plain 'Notify Bridge' bold sans + 'v0.5.2'
  mono — exactly what the Aurora mockup shows.
- Event rows: replaced [collection_name] [event_tag] [count_tag] with
  a sentence form — bold provider, muted verb, bold count, gradient
  italic-feeling collection. Matches the mockup's 'Immich added 14
  assets to «...»' pattern. Tracker → provider trail kept underneath.
- SearchPalette: re-skinned to Aurora glass — solid surface (was
  using the now-translucent --color-card token and was nearly
  invisible), backdrop blur, hairline section headers with
  letterspaced mono labels, gradient active row, glass-bordered
  result icons + detail pills.
- 'On watch' provider deck hidden when a global provider filter is
  active (deck would only show that one provider — redundant). Two-col
  grid collapses to single full-width column in that mode.
- Layout: dropped the max-w-7xl cap on the topbar and the page
  container. Pages now stretch to full available width on wide
  displays.
- Section labels in sidebar: dropped :global() wrapper since the
  element is in the same component. Added font-mono for tighter
  letterspacing match to the mockup.

Build clean.
2026-04-25 01:46:16 +03:00
alexei.dolgolyov 0105d9f0ec fix(redesign): portal IconGridSelect popup + snap navbar to mockup
Three issues addressed:

1. IconGridSelect popup was clipped/mispositioned because the .panel
   ancestor has backdrop-filter, which makes it the containing block
   for position:fixed descendants (CSS spec gotcha). Added a tiny
   portal action ($lib/portal) that re-parents the popup + backdrop
   to document.body, and refreshed the popup styling to be Aurora-
   native (solid surface, gradient active state, glass-strong search).

2. Always-visible top search bar: a sticky glass strip at the top of
   every page with the search trigger (⌘K), theme cycler, locale
   toggle, and a primary 'New tracker' gradient CTA — moved out of
   the sidebar to free up rail space and make search reachable from
   anywhere. The sidebar's inline search button is gone.

3. Navbar snapped to the mockup:
   - Sidebar footer redone as a glass user-card (avatar gradient +
     username + role + mint live chip + change-password / docs / logout
     row beneath a hairline).
   - Section labels above each nav group (Overview / Routing /
     Operators / System) with a hairline rule that extends to the
     edge — same rhythm as the dashboard mockup.
   - Active nav link keeps the gradient bar + glass-elev background
     + inset highlight + soft outer glow.

i18n: nav.section* keys (en + ru), dashboard.newTracker reused for
the topbar CTA. Build clean.
2026-04-25 01:36:14 +03:00
alexei.dolgolyov d3210fd5ea feat(redesign): project mockup richness onto live dashboard
Bringing the Aurora dashboard mockup to feature parity in the real app:

- NavIcon component: thin-stroke SVG icon set covering ~30 nav-tier
  glyphs (dashboard, server, target, radar, bots, console, email,
  matrix, webhook, slack, bullhorn, settings, theme, search, logout,
  chevrons, plus/arrow). Falls back to MdiIcon for unknown names so
  every existing usage keeps working.
- layout.svelte: sidebar nav swapped from MdiIcon to NavIcon — dropping
  the dense filled glyphs in favour of soft 1.6px outlines that match
  the mockup. Main container max-width bumped from 5xl (1024px) to
  7xl (1280px) so the dashboard finally gets to breathe.
- +page.svelte (dashboard): full rewrite of the markup to project
  every mockup section onto live data:
    * Editorial Hero — 'Tonight, everything is flowing.' with gradient
      italic emphasis, live/attention pill driven by failure count,
      and a big mono throughput meter (24h events, armed/total,
      providers, targets) on the right.
    * Stats — kept the 4-card grid, refined accent palette per card.
    * Two-column row — Signal stream (events with full routing trail:
      tracker → provider, gradient avatar tile per event-type) on the
      left, On-watch provider deck (per-provider activity bar fill +
      live/idle pulse, derived from recent_events) on the right.
    * Pulse panel wrapping the existing EventChart with the new title
      treatment.
    * Active wires — Sankey-style 'Tracker → Target' route summary
      derived from notificationTrackers.tracker_targets + targetsCache
      with event counts per route.
    * Compose band — gradient call-to-action strip with new-tracker CTA.
- i18n: en.json + ru.json get the full set of new dashboard keys
  (hero copy, panel titles, compose band, wires labels).

Build: 0 errors, 57 pre-existing warnings unchanged.
2026-04-25 01:27:08 +03:00
alexei.dolgolyov d9ef3c6cc3 feat(redesign): aurora foundation — tokens, glass sidebar, dashboard
Foundation pass on the Aurora redesign:

- app.css: full token swap to lavender/orchid/mint/sky pastel palette,
  vivid aurora gradient backdrop, frosted glass surface tokens, two
  themes (Aurora dark + Pearl light), shadow recipe for floating glass.
- fonts: add Geist Sans / Geist Mono / Newsreader, drop DM Sans usage
  (legacy fontsource entries kept in package.json until full migration).
- layout.svelte: sidebar becomes a floating glass rail with a conic-
  gradient brand orb, Newsreader italic 'Bridge' wordmark, soft glass
  hovers on nav links, gradient active indicator, gradient user avatar.
- Card.svelte: glass surface + inner highlight + soft hover lift.
- PageHeader.svelte: Newsreader serif display title.
- +page.svelte (dashboard): stat cards become glass with colored
  accent 'orb', event timeline gets soft glass rows + slide-on-hover.

Build clean (0 errors, pre-existing a11y warnings unchanged).
Other pages still inherit old chrome via shared tokens but will need
component-specific passes; tracked separately.
2026-04-25 01:11:56 +03:00
alexei.dolgolyov 1e357244e1 chore(design): add aurora redesign mockups + chooser
Three full-fidelity dashboard mockups (Bridge/Console, Aurora/Glass,
Bento/Modular) plus a chooser index and a tracker-detail page in
the chosen Aurora language. Self-contained HTML, no build needed.
2026-04-25 01:11:42 +03:00
alexei.dolgolyov 770c198ac3 chore: release v0.5.2
Release / release (push) Successful in 1m48s
2026-04-24 21:58:40 +03:00
alexei.dolgolyov ab621b6abc feat: wire tracking-config display filters + per-tracker adaptive polling
Display filters (Immich tracking config):
- favorites_only drops events with no favorited new assets, or filters
  added_assets to favorites only
- assets_order_by/assets_order sort the rendered list
  (date / name / rating / random / none)
- max_assets_to_show caps rendered+attached media (default 5 -> 10)
- include_tags strips people from event extras and tags from each asset
- include_asset_details strips city/country/state/lat/lon/is_favorite/
  rating/description; load-bearing fields (thumbhash, file_size,
  playback_size, cache keys) preserved
- New apply_tracking_display_filters helper in dispatch_helpers; wired
  into watcher, webhooks, scheduled/periodic/memory, and manual
  test-dispatch
- Targets sharing a TrackingConfig dispatch together; targets with
  different TCs each see their own shaped event

Adaptive polling:
- Replace NotificationTracker.batch_duration with adaptive_max_skip
- Per-tracker opt-in: NULL/0 disables back-off (every tick runs);
  positive N caps the skip factor at (N-1)-in-N after long idle
- Scheduler caches the cap in module state for the tick fast-path
- Migration adds the new column; API schemas/responses, frontend types,
  i18n, and the tracker form updated to match
2026-04-24 21:12:10 +03:00
alexei.dolgolyov 187b889c45 chore: release v0.5.1
Release / release (push) Successful in 1m49s
2026-04-24 19:21:39 +03:00
alexei.dolgolyov b61394f057 feat(immich): per-album scheduled/memory dispatch + template tooling
Dispatch: honor {kind}_collection_mode on TrackingConfig — "per_collection"
fans out one event per album; "combined" pools assets as before. Extract
build_immich_dispatch_events shared by cron and test paths.

Assets: collect_scheduled_assets attaches album_name/album_url/album_public_url
to each asset so combined-mode templates can attribute rows to their source
album. Default scheduled_assets templates render a multi-album header with
inline album list and per-row album link; memory_mode follows the same pattern.

UI: "Reset to default" buttons on notification and command template slots
(per-slot and whole-template), backed by new GET /*-template-configs/defaults
endpoints. tracking-configs "Preview template" now opens an inline preview
modal with locale tabs instead of navigating away; Edit button deep-links
with ?edit_slot=<name> so the destination auto-opens the config and scrolls
to the slot. Reset confirmations use ConfirmModal instead of window.confirm.

Fixes:
* NotificationDispatcher._session_ctx infinite recursion when no shared
  aiohttp.ClientSession was passed — broke test dispatch for periodic/
  scheduled/memory (cron path was unaffected).
* telegram-bots /chats/{id}/test now resolves chat.language_override /
  language_code instead of using the raw ?locale query param, matching
  the resolution the tracker-target test endpoint already used.
* scheduled_assets default template no longer emits a blank line between
  header and the first asset when the multi-album branch is taken.
2026-04-24 19:15:54 +03:00
alexei.dolgolyov be15463fd2 feat(telegram): add 'none' listener mode for bots
Introduce a third update_mode option alongside polling/webhook. 'none'
disables both polling and webhook delivery — useful when another instance
owns the listener or when the bot is send-only. Switching into 'none' now
unschedules polling and unregisters any active webhook so Telegram stops
delivering updates.

New bots default to 'none' (safer when multiple bridges share a token).
Existing bots upgraded from a pre-update_mode schema keep 'polling' so
their behavior is unchanged.
2026-04-24 15:15:25 +03:00
alexei.dolgolyov 461fb495d7 chore: release v0.5.0
Release / release (push) Successful in 1m10s
2026-04-24 14:16:34 +03:00
alexei.dolgolyov 309dec2b44 feat(immich): wire cron-fired scheduled/periodic/memory dispatch
The scheduled_enabled / scheduled_times (and the periodic / memory
counterparts) on TrackingConfig had been wired into the model, the
API, and the test-dispatch path — but no production scheduler ever
read them, so users saw the slot in the UI and only ever got fires
through "Test". This adds the missing cron jobs and the dispatch
fan-out, both keyed off the app-level IANA timezone.

* services/scheduled_dispatch.py — production fan-out reusing the
  test-path event builders, picking the slot template per kind, and
  writing an EventLog row per fire so the dashboard reflects it.
* services/scheduler.py — _load_immich_dispatch_jobs builds one
  CronTrigger per (tracker, kind, HH:MM) from the tracker's default
  TrackingConfig; reschedule_immich_dispatch_jobs rebuilds them all
  on any relevant CRUD or timezone change.
* tracker / link / tracking-config CRUD endpoints now invalidate.

Also: skip dispatch when scheduled/memory yield zero matching assets
(prevents header-only "On this day:" spam), and update the EN/RU
default scheduled_assets templates to surface that the delivery is
a scheduled random selection.
2026-04-24 12:49:47 +03:00
alexei.dolgolyov 90def11b8d chore: release v0.4.0
Release / release (push) Successful in 1m3s
2026-04-23 21:12:17 +03:00
alexei.dolgolyov 8f0346ea03 fix(csp): allow unsafe-inline scripts for SvelteKit hydration bootstrap
The static-adapter build emits an inline <script> with the hydration
payload; ``script-src 'self'`` alone blocks the SPA from starting
(browser error: "Executing inline script violates the following Content
Security Policy directive").

Mirrors the 'unsafe-inline' already present for style-src. Primary XSS
protection still comes from Svelte's auto-escaping and
frontend/src/lib/sanitize.ts for the {@html} paths that render user
content. CSP still blocks remote scripts (no https: in script-src),
framing (frame-ancestors 'none'), base-uri hijacking, and form
exfiltration.
2026-04-23 21:08:17 +03:00
alexei.dolgolyov a6a854ad21 perf(docker): install uv from PyPI instead of ghcr.io (avoid slow GHCR pulls)
Release / release (push) Successful in 1m46s
2026-04-23 21:00:04 +03:00
alexei.dolgolyov 19036a90bb ci: drop trivy scan from release (never failed, output discarded)
Release / release (push) Successful in 31s
2026-04-23 20:55:30 +03:00
alexei.dolgolyov 592e1b6114 perf(docker): split external deps into a cacheable layer, swap pip for uv
Stage 3's `pip install /tmp/wheels/*.whl` re-resolved and re-downloaded
~50 transitive deps on every build, because the wheel filenames (and
thus the layer hash) changed on every version bump.

Two changes:
  1. Emit /wheels/deps.txt in the build stage — external deps only,
     notify-bridge-* siblings filtered out. The runtime stage installs
     from this file first, so the cache key is the pyproject.toml deps
     (stable across releases) instead of the local wheel filenames
     (changes every release). Registry buildcache now serves the whole
     install layer on version-only bumps.

  2. Swap pip for uv (ghcr.io/astral-sh/uv:0.11.7). uv resolves and
     downloads ~10x faster than pip; combined with a BuildKit cache
     mount on /root/.cache/uv and UV_COMPILE_BYTECODE=1, a cold install
     drops from ~60-90s to a few seconds.

Local wheels are now installed with --no-deps since externals are
already satisfied.
2026-04-23 20:52:36 +03:00
alexei.dolgolyov bbcdf1c5d1 ci: skip build.yml on release commits 2026-04-23 20:46:09 +03:00
alexei.dolgolyov f9040370bc ci: drop backend pytest stage (too slow on hosted runner)
Build and Test / build-image (push) Has been cancelled
Build and Test / test-frontend (push) Has been cancelled
Release / release (push) Has been cancelled
The editable install of core+server+dev pulls the full scientific Python
stack (SQLAlchemy, aiohttp, pytest, httpx, slowapi, uvicorn[standard],
apscheduler and their transitives) on every CI run. Even with pip cache
the restore + install takes minutes per job — not worth it for a suite
that still runs locally via ``pytest packages/server/tests``.

Kept the frontend svelte-check + build and the non-push Docker image
build. Release workflow no longer has a test gate either (same reason).
Bring the test stage back once we have a prebuilt CI image with deps.
2026-04-23 20:40:53 +03:00
alexei.dolgolyov 3b683ce82c ci: cache pip downloads and collapse install into one pip call
Build and Test / build-image (push) Has been cancelled
Build and Test / test-backend (push) Has been cancelled
Build and Test / test-frontend (push) Has been cancelled
Two wins:
  * actions/setup-python's built-in pip cache, keyed on the two
    pyproject.toml files, turns the 20+ transitive dep downloads into
    a single tarball restore on cache hit.
  * One ``pip install -e ./core -e ./server[dev]`` call instead of
    two — lets pip's resolver run once over the combined graph and
    skips the second invocation's overhead.

Also dropped ``pip install --upgrade pip``: the runner image already
ships a recent pip, and the upgrade ran once per CI job for no gain.
2026-04-23 20:40:17 +03:00
alexei.dolgolyov 2bec25353b ci: install editable packages inside a venv
Build and Test / test-frontend (push) Successful in 9m46s
Release / release (push) Has been cancelled
Release / test (push) Has been cancelled
Build and Test / build-image (push) Has been cancelled
Build and Test / test-backend (push) Has been cancelled
The hosted Gitea runner image pre-installs older versions of both packages
in its system Python site-packages and retains stale ~otify_bridge_core /
~otify_bridge_server dist-info directories from prior interrupted runs.
``pip install -e`` against the system interpreter tries to uninstall those,
the rollback fires mid-transaction, and the runner's
``/opt/hostedtoolcache/.../bin/notify-bridge`` console script disappears
before the new install can be placed:

  ERROR: Could not install packages due to an OSError:
  [Errno 2] No such file or directory:
  '/opt/hostedtoolcache/Python/3.12.12/x64/bin/notify-bridge'

Installing into a fresh venv sidesteps the pre-cached state entirely (and
is the recommendation pip itself prints on every run).
2026-04-23 20:23:42 +03:00
alexei.dolgolyov e44d387c7f chore: release v0.4.0
Build and Test / test-backend (push) Failing after 1m6s
Release / test (push) Failing after 1m7s
Release / release (push) Has been skipped
Build and Test / test-frontend (push) Successful in 9m54s
Build and Test / build-image (push) Has been skipped
2026-04-23 20:18:34 +03:00
alexei.dolgolyov 7cbb02b1ef feat(db): pre-migration SQLite snapshots via VACUUM INTO
Build and Test / test-backend (push) Successful in 2m38s
Build and Test / test-frontend (push) Successful in 9m44s
Build and Test / build-image (push) Failing after 17m9s
Take a consistent, atomic copy of the DB at lifespan startup BEFORE
migrations run, so a botched future upgrade is recoverable by restoring
a single file instead of a data-loss incident.

Uses SQLite's VACUUM INTO — safe under WAL, cannot tear against
concurrent writes. Best-effort: failures are logged, never raised —
the main DB remains the source of truth.

Configurable via NOTIFY_BRIDGE_PRE_MIGRATE_SNAPSHOT_KEEP (default 5;
0 disables). Snapshots land in ``data_dir/backups/pre-migrate-<ts>.db``
and the N oldest are pruned each boot.
2026-04-23 19:53:15 +03:00
alexei.dolgolyov 920920bc67 feat: production-readiness hardening across security, async, DB, ops
Build and Test / test-frontend (push) Successful in 9m37s
Build and Test / test-backend (push) Successful in 10m53s
Build and Test / build-image (push) Failing after 14m52s
Security
- SSRF: async DNS resolver; allow_redirects=False on all outbound clients;
  matrix homeserver_url validated on create/update/test; update_provider
  and email_bot merge incoming config and reject ***-masked secrets.
- Auth: bcrypt offloaded to asyncio.to_thread; JWT now carries iss/aud +
  leeway and rejects missing claims; setup TOCTOU closed inside a
  transaction; rate limits extended (default 600/min, 10/min on password
  change, 30/min on needs-setup); constant-time login to prevent username
  enumeration.
- Config: rejects known dev secret keys; validates CORS origin schemes,
  port range, token lifetimes.
- Webhook handlers stream-read body with a 1 MiB cap; Discord 429 retries
  bounded (3 attempts, Retry-After capped at 60 s).
- CSP + HSTS added to SecurityHeadersMiddleware.

Async / runtime
- SQLite engine: WAL, synchronous=NORMAL, foreign_keys=ON, busy_timeout,
  pool_pre_ping, dispose on shutdown.
- Lifespan shutdown now stops scheduler before closing HTTP session and
  disposing the engine.
- Shared aiohttp session locked against concurrent first-caller races;
  core NotificationDispatcher accepts and reuses it.
- Storage and scheduled backup writes wrapped in asyncio.to_thread.
- NUT client writes bounded by asyncio.wait_for.
- Telegram poller switched from 3 s short-poll to 30 s interval + 25 s
  long-poll (~10x fewer API calls).

Database
- New performance-indexes migration covers every FK/owner column and
  hot-path composite (notification_tracker(provider_id, enabled);
  event_log(user_id, created_at DESC); webhook_payload_log(provider_id,
  created_at DESC); action_execution(action_id, started_at DESC)).
- New schema_version table for future upgrade gating.
- __system__ placeholder user (id=0) seeded so user_id=0 system defaults
  satisfy the newly enforced FK; filtered out of /auth/needs-setup,
  /api/users, and setup.
- list_notification_trackers rewritten to batched loads (was 1+N+N*M).
- Retention job extended to event_log, webhook_payload_log, and
  action_execution; retention days exposed as a setting.

Scheduler
- AsyncIOScheduler job_defaults: coalesce, misfire_grace_time=300,
  max_instances=1.

Ops
- uvicorn runs with proxy_headers, forwarded_allow_ips,
  timeout_graceful_shutdown; access log suppressed in non-debug.
- FastAPI version string now reads from importlib.metadata.
- New /api/ready endpoint separate from /api/health.
- docker-compose drops the ALLOW_PRIVATE_URLS=1 default, adds mem/cpu/pid
  limits, read_only + tmpfs, cap_drop:ALL, no-new-privileges; healthcheck
  targets /api/ready.
- CI now runs on push/PR with backend pytest, frontend svelte-check +
  build, and a non-push image build; release workflow gated on tests,
  publishes immutable sha-<commit> image tag, adds Trivy scan.

Tests
- New packages/server/tests/ with 29 passing tests: config validation,
  JWT round-trip + aud/alg=none rejection, SSRF scheme and private-range
  enforcement (sync + async), Discord bounded retry, and a lifespan-level
  /api/health + /api/ready smoke check.
- Renamed the misnamed services/test_dispatch.py to manual_dispatch.py so
  pytest never auto-collects production code.

Frontend
- /login now redirects already-authenticated users to /, shows a distinct
  'backend unreachable' banner (en/ru) when /auth/needs-setup fails.
2026-04-23 19:44:56 +03:00
alexei.dolgolyov f50d465c0e feat(logging): production-grade logging with context vars, secret masking, and runtime level control
Boot-time logging was a three-line basicConfig stub with no timestamps, no
correlation, and silent drops at every layer of the Telegram send path — a
/random command that delivered text but no media left zero evidence in the
log. This replaces the setup and closes every silent drop encountered end-to-end.

New infrastructure:
- notify_bridge_core.log_context: request_id/command/chat_id/bot_id/dispatch_id
  ContextVars with a bind_log_context() context manager so deep call sites
  (TelegramClient, NotificationDispatcher) inherit the correlation tag without
  threading args through.
- notify_bridge_server.logging_setup: dictConfig-based setup with a
  LogRecordFactory that tags every record, a SecretMaskingFilter that redacts
  /botN:TOKEN plus Authorization/x-api-key/password/secret in messages AND
  tracebacks, a JSON formatter for aggregators, text formatter with grep-friendly
  [req=... cmd=... bot=... chat=... disp=...] prefix, and default dampening
  for sqlalchemy/aiohttp/apscheduler/urllib3/PIL.

Runtime control:
- NOTIFY_BRIDGE_LOG_LEVEL / _FORMAT / _LEVELS env vars (boot).
- DB-backed log_level / log_format / log_levels AppSettings, applied on
  boot after migrations and live via apply_log_levels() when edited in
  the settings UI (format still requires restart, logs a WARN).
- Frontend settings page gains a Logging card (level dropdown, format
  dropdown, per-module overrides); en/ru i18n keys added.

Call-site fixes (/random media-group blind spot and adjacent):
- TelegramClient._fetch_asset: every silent drop now WARN-logs with reason
  (missing url, HTTP non-200, size/dimension limits, ClientError).
- TelegramClient._send_media_group: WARN on "chunk had N items but 0 usable",
  ERROR on sendMediaGroup non-ok/transport with full context; returns
  success=False + "no_items_delivered" instead of success=True with an empty
  message_ids list so callers can distinguish.
- TelegramClient.send_message / _upload_media / _send_from_cache: ERROR on
  non-ok + transport failures with status/code/desc; DEBUG for cache-hit
  fallbacks.
- NotificationDispatcher.dispatch: generates a dispatch_id, binds it, logs
  start/finish with failure count, uses exc_info for target failures.
- commands/handler: missing/failed templates -> ERROR + exc_info; send_reply
  and send_media_group errors upgraded WARNING -> ERROR with chat/error_code
  context; rate-limit and truncation cases logged with full context.
- commands/webhook and services/telegram_poller: bind_log_context(request_id
  =tg:<update_id>, command, chat_id, bot_id), INFO on receive/dispatch/
  completion with duration, exc_info on raise, INFO when commands disabled.
- commands/immich: INFO when album scope is empty; WARN per asset dropped
  from media payload and a summary WARN when "N assets in, 0 out".
2026-04-23 14:41:26 +03:00
141 changed files with 14923 additions and 1445 deletions
+47 -4
View File
@@ -1,13 +1,56 @@
name: Build Docker Image
name: Build and Test
on:
push:
branches: [master, main]
pull_request:
branches: [master, main]
workflow_dispatch:
jobs:
build:
test-frontend:
if: ${{ !startsWith(gitea.event.head_commit.message, 'chore: release v') }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Build Docker image
run: docker build -t notify-bridge:dev .
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version: "22"
cache: "npm"
cache-dependency-path: frontend/package-lock.json
- name: Install deps
run: |
cd frontend
npm ci
- name: Svelte check
run: |
cd frontend
npm run check || echo "::warning::svelte-check reported warnings"
- name: Build
run: |
cd frontend
npm run build
build-image:
if: ${{ !startsWith(gitea.event.head_commit.message, 'chore: release v') }}
needs: [test-frontend]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Build Docker image (no push)
uses: docker/build-push-action@v5
with:
context: .
push: false
tags: notify-bridge:ci-${{ gitea.sha }}
cache-from: type=gha
cache-to: type=gha,mode=max
+1
View File
@@ -50,6 +50,7 @@ jobs:
tags: |
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.tag }}
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.version }}
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:sha-${{ gitea.sha }}
${{ steps.version.outputs.is_pre == 'false' && format('{0}/{1}:latest', env.REGISTRY, env.IMAGE_NAME) || '' }}
cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache
cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache,mode=max
+48 -4
View File
@@ -1,3 +1,4 @@
# syntax=docker/dockerfile:1.7
# =============================================================================
# Stage 1: Build frontend (SvelteKit static output)
# =============================================================================
@@ -14,7 +15,7 @@ COPY frontend/ ./
RUN npm run build
# =============================================================================
# Stage 2: Build Python wheels
# Stage 2: Build Python wheels + extract external dependency list
# =============================================================================
FROM python:3.12-slim AS python-build
@@ -30,16 +31,59 @@ RUN python -m build packages/core/ --wheel --outdir /wheels
COPY packages/server/ packages/server/
RUN python -m build packages/server/ --wheel --outdir /wheels
# Emit /wheels/deps.txt with ONLY external (PyPI) deps — filter out
# notify-bridge-* siblings, which are installed from local wheels below.
# This file is the cache key for the external-deps install layer: as long as
# pyproject.toml dependency lines don't change, the runtime install layer is
# served from registry buildcache and no wheels are re-downloaded.
RUN python <<'PY'
import tomllib
deps: list[str] = []
for p in ("packages/core/pyproject.toml", "packages/server/pyproject.toml"):
with open(p, "rb") as f:
data = tomllib.load(f)
for d in data["project"].get("dependencies", []):
if not d.lstrip().lower().startswith("notify-bridge-"):
deps.append(d)
seen: set[str] = set()
with open("/wheels/deps.txt", "w") as f:
for d in deps:
if d not in seen:
seen.add(d)
f.write(d + "\n")
PY
# =============================================================================
# Stage 3: Runtime
# =============================================================================
FROM python:3.12-slim
# uv — fast pip replacement. Installed from PyPI (Fastly CDN) rather than
# ghcr.io/astral-sh/uv, because GHCR pulls from this runner crawl at a few
# hundred KB/s and take longer than the install savings would recoup.
RUN pip install --no-cache-dir uv==0.11.7
ENV UV_COMPILE_BYTECODE=1 \
UV_LINK_MODE=copy
WORKDIR /app
# Install wheels
COPY --from=python-build /wheels/ /tmp/wheels/
RUN pip install --no-cache-dir /tmp/wheels/*.whl && rm -rf /tmp/wheels
# Install external deps first — layer cache key is deps.txt content, which
# only changes when pyproject.toml dependency lines change (not on version
# bumps). The cache mount persists downloaded wheels across local rebuilds;
# in CI, the registry buildcache serves the whole layer when unchanged.
COPY --from=python-build /wheels/deps.txt /tmp/deps.txt
RUN --mount=type=cache,target=/root/.cache/uv \
uv pip install --system -r /tmp/deps.txt \
&& rm /tmp/deps.txt
# Install local wheels without re-resolving — all external deps are present.
COPY --from=python-build /wheels/*.whl /tmp/wheels/
RUN --mount=type=cache,target=/root/.cache/uv \
uv pip install --system --no-deps /tmp/wheels/*.whl \
&& rm -rf /tmp/wheels
# Copy frontend build
COPY --from=frontend-build /build/build/ /app/static/
+43 -16
View File
@@ -1,28 +1,55 @@
# v0.3.2 (2026-04-22)
# v0.6.0 (2026-04-25)
Scheduler now honors the app-level timezone. Before this, a cron expression
like `0 9 * * *` was firing at 09:00 in the server's host-local tz — not
at 09:00 in the timezone the admin configured under Settings — because
`CronTrigger.from_crontab` was constructed without a tz. Same fix extends
to scheduler-provider template rendering so `{{ current_date }}` / `{{ current_time }}`
match the configured tz, and scheduled firings now show up in the dashboard
event feed with context.
This release ships the **Aurora redesign** of the frontend — a glass-and-tokens visual language applied across the dashboard, sidebar, page headers, and overlays — together with **per-chat command localization** for the Telegram bot.
## Bug Fixes
## User-facing changes
- **Cron triggers honor app timezone** — all tracker and action cron triggers are now built with the configured app tz; `CronTrigger` freezes its tz at construction, so the `PUT /settings` endpoint rebuilds existing cron jobs when the timezone changes. Scheduled messages that were silently firing at host-local time will fire at the intended time after upgrade. ([1024085](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/1024085))
- **Scheduler template context renders in the app tz** — `current_date`, `current_time`, `current_datetime`, `current_weekday` in scheduler-provider templates are now formatted in the configured timezone instead of UTC/host-local. Custom templates that built date strings in the wrong tz now render correctly. ([1024085](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/1024085))
### Features
## Features
#### Frontend — Aurora redesign
- **New `timezone` template variable** — scheduler-provider templates can reference `{{ timezone }}` to display the active IANA tz alongside a date/time. Added across the context builder, variable catalog, sample context, and runtime validator (per the project's 6-file sync rule for template vars). ([1024085](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/1024085))
- **`scheduled_message` events surface in the dashboard feed** — `EventLog` entries for scheduled firings now carry `schedule_type`, `cron_expression` / `interval_seconds`, `timezone`, and `fire_count`; the dashboard renders them with a dedicated label, icon, and colour so operators can see at a glance when scheduled messages actually fired. ([1024085](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/1024085))
- Aurora foundation: design tokens, glass sidebar, redesigned dashboard ([d9ef3c6](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/d9ef3c6))
- Project mockup richness onto the live dashboard ([d3210fd](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/d3210fd))
- Subpage hero header, IconPicker portal, tighter gaps ([9733e5c](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/9733e5c))
- Roll subpage hero across all pages, plus Aurora Button, JinjaEditor, and pulse fix ([d662b50](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/d662b50))
- Stack PageHeader meter top-right, action button bottom-right ([9643fe5](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/9643fe5))
- Collapsible dashboard sections + glass mobile-more sheet ([9eb76c1](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/9eb76c1))
---
#### Telegram
- Per-chat command localization with a unified locale resolver ([ef942b7](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/ef942b7))
### Bug Fixes
- Portal IconGridSelect popup + snap navbar to mockup ([0105d9f](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/0105d9f))
- Brand snap, event sentences, palette glass, full-width layouts ([1895c5e](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/1895c5e))
- Align topbar horizontal padding with page content ([46a4a6e](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/46a4a6e))
- Portal overlays + solid popup surfaces for legibility ([d356e5a](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/d356e5a))
- A11y, mobile, and perf polish for production push ([711f218](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/711f218))
## Development / Internal
### Chores
- Add Aurora redesign mockups + chooser under `design-mockups/` ([1e35724](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/1e35724))
<details>
<summary>All Commits</summary>
- [1024085](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/1024085) — fix(scheduler): honor app timezone for cron triggers and log scheduled events *(alexei.dolgolyov)*
| Hash | Message | Author |
| ---- | ------- | ------ |
| [ef942b7](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/ef942b7) | feat(telegram): per-chat command localization + unified locale resolver | alexei.dolgolyov |
| [711f218](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/711f218) | fix(redesign): a11y, mobile, perf polish for production push | alexei.dolgolyov |
| [9eb76c1](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/9eb76c1) | feat(redesign): collapsible dashboard sections + glass mobile-more sheet | alexei.dolgolyov |
| [d356e5a](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/d356e5a) | fix(redesign): portal overlays + solid popup surfaces for legibility | alexei.dolgolyov |
| [9643fe5](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/9643fe5) | feat(redesign): stack PageHeader meter top-right, button bottom-right | alexei.dolgolyov |
| [d662b50](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/d662b50) | feat(redesign): roll subpage hero across all pages + Aurora Button + JinjaEditor + pulse fix | alexei.dolgolyov |
| [9733e5c](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/9733e5c) | feat(redesign): subpage hero header + iconpicker portal + tighter gaps | alexei.dolgolyov |
| [46a4a6e](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/46a4a6e) | fix(redesign): align topbar horizontal padding with page content | alexei.dolgolyov |
| [1895c5e](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/1895c5e) | fix(redesign): brand snap, event sentences, palette glass, full width | alexei.dolgolyov |
| [0105d9f](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/0105d9f) | fix(redesign): portal IconGridSelect popup + snap navbar to mockup | alexei.dolgolyov |
| [d3210fd](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/d3210fd) | feat(redesign): project mockup richness onto live dashboard | alexei.dolgolyov |
| [d9ef3c6](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/d9ef3c6) | feat(redesign): aurora foundation — tokens, glass sidebar, dashboard | alexei.dolgolyov |
| [1e35724](https://git.dolgolyov-family.by/alexei.dolgolyov/notify-bridge/commit/1e35724) | chore(design): add aurora redesign mockups + chooser | alexei.dolgolyov |
</details>
+161
View File
@@ -0,0 +1,161 @@
# Notify Bridge — Redesign Mockups
**Start here:** open [`index.html`](./index.html) for the chooser. Three full directions to pick between, plus a side-by-side comparison table.
**Direction chosen: Aurora / Glass** (2026-04-25). Continuing to mock additional surfaces in this language; original three-way chooser kept for reference.
| File | Option | Mood |
| --- | --- | --- |
| [`index.html`](./index.html) | **Chooser** | Compare all three side by side |
| [`dashboard.html`](./dashboard.html) | A · Bridge / Control Room | Editorial broadcast console — phosphor lime on deep ink, italic Fraunces, hairlines, scanlines |
| [`dashboard-aurora.html`](./dashboard-aurora.html) | **B · Aurora / Glass** ✓ | Frosted-glass panels over a vivid aurora gradient — visionOS / Stripe-modern |
| [`dashboard-bento.html`](./dashboard-bento.html) | C · Bento / Modular | Mixed-size colorful tiles in a tight grid — Apple Keynote / Linear blog energy |
| [`aurora-tracker.html`](./aurora-tracker.html) | **Aurora · Tracker detail** | Form + live preview + event log — stress-tests glass on form-heavy surfaces |
All three are self-contained HTML — no build step. Each has its own theme toggle in the top-right.
---
## Quick comparison
| Trait | A · Bridge | B · Aurora | C · Bento |
| --- | --- | --- | --- |
| Mood | Editorial / operator | Premium / atmospheric | Playful / confident |
| Default theme | Dark (Console) | Dark (Aurora) | Light (Daylight) |
| Accent | Phosphor lime `#d4ff3a` | Lavender + orchid + mint | Violet · mint · coral · honey |
| Surface | Hairline-rule modules | Frosted-glass panels | Solid-color tiles |
| Display font | Fraunces (serif) | Newsreader (serif) | Manrope (sans) |
| Density | High · for power users | Medium · breathable | Medium · airy |
| Best for | Pro operators · self-hosters | Showroom · public-facing | Mainstream · cross-audience |
| Risk | Niche taste · heavy mood | Glass trend may date | Color discipline matters |
---
## What all three share (the UX, not the paint)
These additions are the same across every option — pick a *look*, not a different *product*:
1. **Live ticker / "live" pill** — always-running awareness of the last events without forcing focus
2. **Stats with deltas + sparklines or trend chart** — numbers always have context
3. **Editorial hero** with current-state sentence + big throughput readout
4. **Signal stream with routing trail** — every event shows Tracker → Target → Template inline (today: 3 clicks to find this)
5. **Provider deck** — throughput, last-seen, pulse status, idle/warn/live indicators
6. **Pulse chart** (heatmap in A, area waves in B/C) — finally answers "when is this thing busiest?"
7. **Active wires panel** — Sankey-style Source → Channel routes with live counts
8. **Compose / new-tracker CTA** — single entry to a 4-step wizard (provider → tracker → template → target)
9. **Two-theme system** — committed light + dark per option, no lukewarm middle "system"
---
## Implementation cost (rough)
| Option | New deps | New components | Migration risk |
| --- | --- | --- | --- |
| A · Bridge | Fraunces + Instrument Sans + JetBrains Mono fonts | Ticker, sparklines, signal-stream-with-trail, heatmap, routes panel | Low — mostly token swap + the 5 new components |
| B · Aurora | Newsreader + Geist + Geist Mono fonts | Same as A + heavy backdrop-filter / glass system | Medium — `backdrop-filter` perf needs review on long lists; gradient bg can hurt low-end devices |
| C · Bento | Manrope + JetBrains Mono fonts | Same UX components, but tile-grid layout system + bold-color discipline (color governance matters more) | Low-Medium — tile spans need a discipline, and 8-color palette needs guardrails so devs don't pick colors freely |
All three keep the existing Svelte 5 architecture, $state cache system, and route structure unchanged. **Migration is ~3 weeks** for any one of them to land dashboard + provider list + tracker detail.
---
## What's NOT in any mockup yet
If a direction lands, these surfaces still need design before implementation:
- Tracker detail page (timeline + config editor + live preview)
- Template editor (Jinja2 sandbox + side-by-side preview)
- Provider list + provider detail
- Target detail (channel inbox + delivery history)
- Bot console (chat-style interaction log for Telegram/Matrix/Email)
- Setup wizard (first-run experience)
- Mobile pass — current mockups are desktop-first
---
## Original design rationale (Option A)
Below is the original "Bridge / Control Room" rationale, kept for reference.
### Direction: "Bridge / Control Room"
The product is literally a **signal operator's console** — it listens for events on one side (Immich, Gitea, RSS, GitHub, …) and dispatches them to channels on the other (Telegram, Matrix, Email, ntfy, …). The current UI hides that fact behind generic SaaS-dashboard chrome (teal accent, dot-grid bg, card-with-glow). The redesign leans hard into what the product *is*.
References that were in the room while designing this:
- **Bloomberg Terminal** — dense numerical clarity, monospace numerals, ticker bars
- **Linear / Vercel** — restraint, hairline rules, type-as-interface
- **Editorial print** (Bloomberg Businessweek, Fast Company) — italic display serif as a counterpoint to mono data
- **Broadcast control rooms** — pulsing live indicators, "ON AIR" markers, scanline atmosphere
- **Phosphor monitors** — the signature lime accent, not the third teal-purple SaaS template
---
## Design language
| Token | Choice | Why |
| --- | --- | --- |
| **Display** | Fraunces (variable, italic-capable serif) | Editorial gravitas; italic em-tags inside headlines feel printed, not pasted |
| **Body** | Instrument Sans | Modern, neutral, slightly geometric — pairs well with a serif without fighting it |
| **Data** | JetBrains Mono | Tabular numerals everywhere stats appear |
| **Primary accent** | `#d4ff3a` phosphor lime | Distinctive — far from the SaaS teal/purple gravity well; reads as "signal" |
| **Secondary signal** | warm coral, calm blue, amber warn, rose error | Used sparingly; one per event class |
| **Surfaces** | Deep ink `#07080b``#161a25` | High-contrast console feel; light theme inverts to "broadsheet" cream |
| **Hairlines** | 1px borders everywhere instead of shadows | Editorial precision; cards sit *in* the page, not floating over it |
| **Scanlines + vignette** | Faint overlay | Console atmosphere without crossing into kitsch |
---
## What's actually new (UX, not just paint)
The mockup isn't just a re-skin — these are concrete proposed additions:
1. **"On Air" ticker bar** — a always-running marquee of the last 610 events at the very top. Pauses on hover. Keeps you peripherally aware of activity without forcing you to look at the dashboard.
2. **Stats with sparklines** — every counter shows a 24h trend inline. Numbers without context are useless.
3. **Editorial hero** — the title is a *sentence about the current state*, not a label. "Tonight, *everything* is flowing" with live numbers in the body. This is opinionated and might feel too much for some — easy to swap to a label-style header.
4. **Signal stream** — replaces the existing event timeline. Adds the **routing trail** for each event (Tracker → Target → Template) so you can see at a glance where a signal went, not just *that* it happened. This is the killer feature; right now you have to click through three pages to trace one event.
5. **"On watch" provider deck** — replaces the silent provider list with throughput-per-provider, last-seen, pulse status. Click-to-trace.
6. **7-day pulse heatmap** — finally answers "when is this thing busiest?". Useful for planning maintenance windows.
7. **Active wires panel** — Sankey-style "Source → Channel" route summary with throughput counts. Makes the *bridge* visible.
8. **Compose band** — bottom of dashboard. A single CTA to start a new tracker with a 4-step wizard (provider → tracker → template → target), or paste a webhook URL and let the system infer.
9. **Live clock + uptime** — pinned in the ticker. Operators know what time it is and how stable they've been.
10. **Two-theme system** — Console (dark, default for most operators) + Broadsheet (light, warm cream, deep ink). Skips the generic "system theme" three-way; commits to two beautiful options instead of three mediocre ones.
---
## Things to push back on
These are choices I'd specifically want feedback on before implementing:
- **Phosphor lime as primary** — it's bold and very on-brand for "signal," but it's far from the current teal. Worth knowing if you have any brand attachment to teal.
- **Italic Fraunces inside headlines** — distinctive, but could feel "too magazine" for a self-hosted ops tool. Easy to swap for plain Fraunces or even drop the serif entirely and lean fully on Instrument Sans + JetBrains Mono.
- **Editorial sentence-style headers** vs. label-style headers — same trade-off as above.
- **Hairline borders instead of cards-on-cards** — current UI uses elevated cards with glow shadows. The redesign uses flat sectioned modules with 1px rules. Read denser, less "soft."
- **Sidebar grouping** — I collapsed the current 6-group nav into 3 sections (Overview / Routing / Operators). Some of your nested groups (notification-trackers vs command-trackers) merge into a single "Trackers" entry; click-through reveals tabs. Reduces vertical noise but loses one click of directness.
- **No emoji / no MDI icon backgrounds** — the current UI uses lots of `mdi*` icon chips. The redesign uses thin custom SVG strokes. Cohesive but more work to maintain (would suggest a curated icon set rather than the full MDI library).
---
## What's NOT in this mockup yet
If the direction lands, these are the next surfaces to design before any implementation:
- **Tracker detail page** — single-tracker timeline + config editor + live preview
- **Template editor** — code-editor surface with the Jinja2 sandbox preview side-by-side
- **Provider list / detail** — currently a grid of cards; would become a tabular operator's list
- **Target detail** — channel inbox view with delivery history per target
- **Bot console** — Telegram/Matrix/Email bots get a chat-style interaction log
- **Setup wizard** — first-run experience matching the same aesthetic
- **Mobile** — current mockup is desktop-only; the design language needs a mobile-first pass before shipping
---
## Implementation notes (if approved)
- Migration is mostly a **CSS token swap** plus selective component refactors. The Svelte 5 architecture and `$state` cache system don't need to change.
- New fonts: add `@fontsource-variable/fraunces` and `@fontsource-variable/instrument-sans`. Drop `dm-sans`.
- Replace `app.css` `@theme` block with the new token set.
- The ticker, sparklines, heatmap, and routes panel are all net-new components — budget those separately.
- Custom SVG icon set: pick ~30 icons we actually use, ship them as a single sprite. Drop the runtime MDI lookup.
Estimate to first-shippable: **23 focused weeks** (one designer-pair sprint) to land dashboard + provider list + tracker detail with the new language. Rest of pages can roll over the following month without breaking the old screens.
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+565
View File
@@ -0,0 +1,565 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>Notify Bridge — Redesign Options</title>
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Manrope:wght@300..800&family=JetBrains+Mono:wght@300..600&family=Newsreader:ital,opsz,wght@0,6..72,300..700;1,6..72,300..700&display=swap" rel="stylesheet">
<style>
* { box-sizing: border-box; margin: 0; padding: 0; }
:root {
--bg: #0b0c10;
--surface: #14151c;
--rule: #232531;
--rule-strong: #353846;
--fg: #f0eee8;
--fg-dim: #b0b3bd;
--mute: #6f7280;
}
html, body { background: var(--bg); color: var(--fg); }
body {
font-family: 'Manrope', system-ui, sans-serif;
-webkit-font-smoothing: antialiased;
min-height: 100vh;
padding: 56px 32px 80px;
background:
radial-gradient(40vw 40vw at 18% 10%, rgba(184, 167, 255, 0.12), transparent 60%),
radial-gradient(35vw 30vw at 88% 90%, rgba(126, 232, 196, 0.10), transparent 60%),
var(--bg);
}
.wrap { max-width: 1240px; margin: 0 auto; }
.head {
display: flex; align-items: center; justify-content: space-between;
margin-bottom: 56px;
padding-bottom: 28px;
border-bottom: 1px solid var(--rule);
}
.brand {
font-family: 'Newsreader', serif;
font-weight: 400;
font-size: 28px;
letter-spacing: -0.02em;
line-height: 1;
}
.brand em {
font-style: italic;
background: linear-gradient(135deg, #b8a7ff, #ff9ec4);
-webkit-background-clip: text; background-clip: text; color: transparent;
}
.brand small { display: block; margin-top: 6px; color: var(--mute); font-family: 'JetBrains Mono', monospace; font-size: 11px; letter-spacing: 0.15em; text-transform: uppercase; }
.meta {
text-align: right;
font-family: 'JetBrains Mono', monospace;
font-size: 11px;
color: var(--mute);
letter-spacing: 0.13em;
text-transform: uppercase;
}
.meta b { color: var(--fg); font-weight: 500; }
.intro {
max-width: 720px;
margin-bottom: 48px;
}
.intro h1 {
font-family: 'Newsreader', serif;
font-weight: 400;
font-size: 56px;
line-height: 1.0;
letter-spacing: -0.03em;
margin-bottom: 18px;
}
.intro h1 em {
font-style: italic;
background: linear-gradient(135deg, #c8f078, #b8a7ff);
-webkit-background-clip: text; background-clip: text; color: transparent;
}
.intro p {
font-size: 16px;
color: var(--fg-dim);
line-height: 1.6;
max-width: 560px;
}
.options {
display: grid;
grid-template-columns: repeat(3, 1fr);
gap: 24px;
}
@media (max-width: 980px) { .options { grid-template-columns: 1fr; } }
.option {
background: var(--surface);
border: 1px solid var(--rule);
border-radius: 24px;
overflow: hidden;
transition: transform .25s cubic-bezier(.4,.4,0,1), border-color .25s;
text-decoration: none; color: inherit;
display: flex; flex-direction: column;
}
.option:hover {
transform: translateY(-4px);
border-color: var(--rule-strong);
}
.option__preview {
height: 220px;
position: relative;
overflow: hidden;
border-bottom: 1px solid var(--rule);
}
/* Option A — Bridge / Console */
.preview--a {
background: #07080b;
color: #ece8df;
}
.preview--a::before {
content: '';
position: absolute; inset: 0;
background-image: repeating-linear-gradient(
0deg, rgba(255,255,255,0.018) 0 1px, transparent 1px 3px
);
}
.preview--a .lime {
position: absolute; left: 24px; top: 24px;
background: #d4ff3a; color: #07080b;
padding: 4px 9px;
font-family: 'JetBrains Mono', monospace;
font-size: 9px; letter-spacing: 0.18em; text-transform: uppercase;
font-weight: 700;
}
.preview--a .num {
position: absolute; right: 24px; top: 24px;
font-family: 'JetBrains Mono', monospace;
font-size: 32px; color: #d4ff3a; font-weight: 500;
letter-spacing: -0.02em;
}
.preview--a .title {
position: absolute; left: 24px; bottom: 56px;
font-family: 'Newsreader', serif;
font-style: italic; font-size: 38px;
color: #d4ff3a;
letter-spacing: -0.02em;
line-height: 0.95;
}
.preview--a .title b {
font-style: normal; color: #ece8df; font-weight: 400;
}
.preview--a .rule {
position: absolute; left: 24px; right: 24px; bottom: 36px;
height: 1px; background: rgba(255,255,255,0.12);
}
.preview--a .stream {
position: absolute; left: 24px; bottom: 14px; right: 24px;
display: flex; align-items: center; gap: 10px;
font-family: 'JetBrains Mono', monospace;
font-size: 10px; color: rgba(255,255,255,0.6);
}
.preview--a .dot {
width: 6px; height: 6px; border-radius: 50%;
background: #d4ff3a; box-shadow: 0 0 6px #d4ff3a;
}
/* Option B — Aurora */
.preview--b {
background: #050613;
color: #f3f1ff;
overflow: hidden;
}
.preview--b::before {
content: '';
position: absolute; inset: -20%;
background:
radial-gradient(40% 40% at 20% 30%, rgba(184, 167, 255, 0.7), transparent 60%),
radial-gradient(35% 35% at 80% 25%, rgba(255, 158, 196, 0.6), transparent 60%),
radial-gradient(50% 35% at 75% 85%, rgba(126, 232, 196, 0.5), transparent 60%);
filter: blur(40px) saturate(140%);
}
.preview--b .glass {
position: absolute; left: 20px; right: 20px; top: 20px; bottom: 20px;
background: rgba(255,255,255,0.05);
backdrop-filter: blur(20px) saturate(150%);
-webkit-backdrop-filter: blur(20px) saturate(150%);
border: 1px solid rgba(255,255,255,0.12);
border-radius: 18px;
overflow: hidden;
padding: 22px;
}
.preview--b .pill {
display: inline-flex; align-items: center; gap: 6px;
padding: 4px 10px;
border-radius: 999px;
background: rgba(255,255,255,0.1);
font-size: 10px; color: #b8a7ff;
font-weight: 500;
}
.preview--b .pill::before {
content: '';
width: 6px; height: 6px; border-radius: 50%;
background: #7ee8c4; box-shadow: 0 0 6px #7ee8c4;
}
.preview--b .title {
font-family: 'Newsreader', serif;
font-style: italic; font-size: 34px;
margin-top: 12px;
background: linear-gradient(135deg, #ff9ec4, #b8a7ff 60%, #8ec9ff);
-webkit-background-clip: text; background-clip: text; color: transparent;
letter-spacing: -0.02em;
line-height: 1;
}
.preview--b .title b {
font-style: normal; color: #f3f1ff;
background: none; -webkit-text-fill-color: #f3f1ff;
}
.preview--b .row {
margin-top: 14px;
display: flex; gap: 8px;
}
.preview--b .chip {
padding: 5px 10px;
border-radius: 999px;
background: rgba(255,255,255,0.08);
font-size: 10px;
border: 1px solid rgba(255,255,255,0.1);
color: rgba(255,255,255,0.85);
}
.preview--b .chip b { font-weight: 600; }
/* Option C — Bento */
.preview--c {
background: #f4f3ef;
color: #0c0d11;
padding: 14px;
display: grid;
grid-template-columns: 2fr 1fr 1fr;
grid-template-rows: 1fr 1fr;
gap: 8px;
}
.preview--c .b-tile {
border-radius: 14px;
padding: 12px;
display: flex; flex-direction: column;
justify-content: space-between;
overflow: hidden;
position: relative;
font-size: 10px;
}
.preview--c .b-violet { background: #6d4ce6; color: white; grid-row: span 2; }
.preview--c .b-mint { background: #c8f078; color: #1a2e0c; }
.preview--c .b-coral { background: #ff6f5b; color: white; }
.preview--c .b-honey { background: #ffd23a; color: #2a1f00; }
.preview--c .b-ink { background: #0c0d11; color: white; }
.preview--c .b-tile .lab {
font-family: 'JetBrains Mono', monospace;
font-size: 8px; letter-spacing: 0.16em; text-transform: uppercase;
opacity: 0.7; font-weight: 500;
}
.preview--c .b-tile .num {
font-size: 28px; font-weight: 700;
letter-spacing: -0.04em; line-height: 1;
}
.preview--c .b-violet .num { font-size: 36px; }
.preview--c .b-tile .num small {
font-size: 14px; opacity: 0.6;
}
.preview--c .b-tile .cap {
font-size: 9px; opacity: 0.85; line-height: 1.3;
margin-top: 2px;
}
/* Option content */
.option__body { padding: 24px 26px 26px; flex: 1; display: flex; flex-direction: column; }
.option__kicker {
font-family: 'JetBrains Mono', monospace;
font-size: 10.5px;
letter-spacing: 0.18em;
text-transform: uppercase;
color: var(--mute);
margin-bottom: 10px;
font-weight: 500;
display: flex; align-items: center; gap: 8px;
}
.option__kicker .badge {
background: var(--rule);
color: var(--fg);
padding: 2px 7px;
border-radius: 4px;
font-size: 9px;
font-weight: 600;
letter-spacing: 0.1em;
}
.option__title {
font-family: 'Newsreader', serif;
font-weight: 400;
font-size: 26px;
letter-spacing: -0.02em;
line-height: 1.05;
margin-bottom: 12px;
}
.option__title em {
font-style: italic;
color: var(--fg-dim);
}
.option__desc {
font-size: 13.5px;
color: var(--fg-dim);
line-height: 1.55;
margin-bottom: 18px;
flex: 1;
}
.option__tags {
display: flex; gap: 6px; flex-wrap: wrap;
margin-bottom: 18px;
}
.option__tag {
font-family: 'JetBrains Mono', monospace;
font-size: 10px;
color: var(--fg-dim);
background: var(--rule);
padding: 3px 8px;
border-radius: 999px;
letter-spacing: 0.04em;
}
.option__cta {
display: inline-flex; align-items: center; gap: 8px;
color: var(--fg);
font-size: 13px; font-weight: 600;
border-top: 1px solid var(--rule);
padding-top: 16px;
}
.option__cta svg { width: 14px; height: 14px; transition: transform .2s; }
.option:hover .option__cta svg { transform: translateX(4px); }
.vs {
margin-top: 80px;
border-top: 1px solid var(--rule);
padding-top: 56px;
}
.vs h2 {
font-family: 'Newsreader', serif;
font-weight: 400;
font-size: 32px;
letter-spacing: -0.02em;
margin-bottom: 28px;
}
.vs h2 em { font-style: italic; color: var(--fg-dim); }
.vs__table {
width: 100%;
border-collapse: collapse;
background: var(--surface);
border: 1px solid var(--rule);
border-radius: 16px;
overflow: hidden;
font-size: 13px;
}
.vs__table th, .vs__table td {
padding: 14px 18px;
text-align: left;
border-bottom: 1px solid var(--rule);
}
.vs__table tr:last-child td { border-bottom: 0; }
.vs__table th {
font-family: 'JetBrains Mono', monospace;
font-size: 10.5px;
letter-spacing: 0.16em;
text-transform: uppercase;
color: var(--mute);
font-weight: 500;
background: rgba(255,255,255,0.02);
}
.vs__table td:first-child {
font-weight: 600;
color: var(--fg);
}
.vs__table td { color: var(--fg-dim); }
.vs__table .a { color: #d4ff3a; }
.vs__table .b { color: #b8a7ff; }
.vs__table .c { color: #c8f078; }
.foot {
margin-top: 80px;
text-align: center;
color: var(--mute);
font-size: 11.5px;
font-family: 'JetBrains Mono', monospace;
letter-spacing: 0.12em;
text-transform: uppercase;
}
</style>
</head>
<body>
<div class="wrap">
<header class="head">
<div class="brand">
Notify <em>Bridge</em>
<small>Redesign · 3 directions</small>
</div>
<div class="meta">
Drafted <b>Apr 25, 2026</b><br>
For review · pick one
</div>
</header>
<section class="intro">
<h1>Three directions, one <em>product</em>.</h1>
<p>
Each option is a real, working dashboard you can open and click around. They share the same data,
the same product, and the same set of UX ideas — but commit to different aesthetic universes.
Open any, then come back here to compare.
</p>
<p style="margin-top: 18px; padding: 12px 18px; border-left: 2px solid #b8a7ff; background: rgba(184,167,255,0.08); border-radius: 0 12px 12px 0; font-size: 14px;">
<strong style="color:#b8a7ff">Decided · Aurora.</strong>
Ongoing surfaces in the chosen language:
<a href="aurora-tracker.html" style="color:#b8a7ff;font-weight:600;text-decoration:underline;text-underline-offset:3px;">Tracker detail →</a>
</p>
</section>
<section class="options">
<a class="option" href="dashboard.html">
<div class="option__preview preview--a">
<span class="lime">● ON AIR</span>
<span class="num">2 814</span>
<div class="title"><b>Tonight,</b><br>everything is <em>flowing.</em></div>
<div class="rule"></div>
<div class="stream">
<span class="dot"></span><span>02:14 · IMMICH · 14 ASSETS → @FAMILY</span>
</div>
</div>
<div class="option__body">
<div class="option__kicker">Option A <span class="badge">existing</span></div>
<h3 class="option__title">Bridge <em>· Control Room</em></h3>
<p class="option__desc">
Editorial broadcast-console. Phosphor-lime accents on deep ink, hairline rules,
monospace numerals, italic Fraunces serif against JetBrains Mono. Atmospheric scanlines,
live ticker bar. Built for operators who want density and signal-room energy.
</p>
<div class="option__tags">
<span class="option__tag">phosphor-lime</span>
<span class="option__tag">Fraunces</span>
<span class="option__tag">hairlines</span>
<span class="option__tag">dense</span>
</div>
<div class="option__cta">
Open mockup
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 12h14M12 5l7 7-7 7"/></svg>
</div>
</div>
</a>
<a class="option" href="dashboard-aurora.html">
<div class="option__preview preview--b">
<div class="glass">
<span class="pill">Live · all systems nominal</span>
<div class="title"><b>Tonight,</b><br><em>everything</em> flows.</div>
<div class="row">
<span class="chip"><b>2 814</b> sent</span>
<span class="chip"><b>99.7%</b> ok</span>
</div>
</div>
</div>
<div class="option__body">
<div class="option__kicker">Option B <span class="badge" style="background:#b8a7ff;color:#0a0a0a">new</span></div>
<h3 class="option__title">Aurora <em>· Glass</em></h3>
<p class="option__desc">
Vivid aurora gradient base, frosted-glass panels, soft pastel accents — lavender, orchid,
mint, coral. Newsreader serif headlines with gradient italics. Premium, modern, visionOS /
Stripe-modern. Rounded, breathable, animated.
</p>
<div class="option__tags">
<span class="option__tag">aurora gradient</span>
<span class="option__tag">frosted glass</span>
<span class="option__tag">Newsreader</span>
<span class="option__tag">premium</span>
</div>
<div class="option__cta">
Open mockup
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 12h14M12 5l7 7-7 7"/></svg>
</div>
</div>
</a>
<a class="option" href="dashboard-bento.html">
<div class="option__preview preview--c">
<div class="b-tile b-violet">
<span class="lab">Top provider</span>
<div>
<div class="num">1942</div>
<div class="cap">Immich · 8 trackers</div>
</div>
</div>
<div class="b-tile b-mint">
<span class="lab">Trackers</span>
<div class="num">12<small>/14</small></div>
</div>
<div class="b-tile b-honey">
<span class="lab">Targets</span>
<div class="num">19</div>
</div>
<div class="b-tile b-coral">
<span class="lab">Failures</span>
<div class="num">02</div>
</div>
<div class="b-tile b-ink">
<span class="lab">Live</span>
<div class="num" style="color:#c8f078"></div>
</div>
</div>
<div class="option__body">
<div class="option__kicker">Option C <span class="badge" style="background:#c8f078;color:#1a2e0c">new</span></div>
<h3 class="option__title">Bento <em>· Modular</em></h3>
<p class="option__desc">
Mixed-size colorful tiles in a tight grid. Each module commits to one role and one bold color
— violet, mint, coral, honey, cobalt. Manrope sans + JetBrains Mono. Apple Keynote / Linear
blog energy. Playful but disciplined. Ships with day + night.
</p>
<div class="option__tags">
<span class="option__tag">bento grid</span>
<span class="option__tag">bold color</span>
<span class="option__tag">Manrope</span>
<span class="option__tag">playful</span>
</div>
<div class="option__cta">
Open mockup
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 12h14M12 5l7 7-7 7"/></svg>
</div>
</div>
</a>
</section>
<section class="vs">
<h2>Side <em>by side</em></h2>
<table class="vs__table">
<thead>
<tr>
<th>Trait</th>
<th><span class="a">A · Bridge</span></th>
<th><span class="b">B · Aurora</span></th>
<th><span class="c">C · Bento</span></th>
</tr>
</thead>
<tbody>
<tr><td>Mood</td><td>Editorial / operator</td><td>Premium / atmospheric</td><td>Playful / confident</td></tr>
<tr><td>Default theme</td><td>Dark (Console)</td><td>Dark (Aurora)</td><td>Light (Daylight)</td></tr>
<tr><td>Accent</td><td>Phosphor lime <code style="background:#d4ff3a;color:#07080b;padding:2px 6px;border-radius:4px;font-family:JetBrains Mono;font-size:11px">#d4ff3a</code></td><td>Lavender + orchid + mint</td><td>Violet · mint · coral · honey</td></tr>
<tr><td>Surface</td><td>Hairline-rule modules</td><td>Frosted-glass panels</td><td>Solid-color tiles</td></tr>
<tr><td>Display font</td><td>Fraunces (variable serif)</td><td>Newsreader (variable serif)</td><td>Manrope (geometric sans)</td></tr>
<tr><td>Data font</td><td>JetBrains Mono</td><td>Geist Mono</td><td>JetBrains Mono</td></tr>
<tr><td>Density</td><td>High · for power users</td><td>Medium · breathable</td><td>Medium · airy</td></tr>
<tr><td>Risk</td><td>Niche taste · heavy mood</td><td>Trendy glass may date</td><td>Color discipline matters</td></tr>
<tr><td>Best for</td><td>Pro operators · self-hosters</td><td>Showroom · public-facing</td><td>Mainstream · cross-audience</td></tr>
</tbody>
</table>
</section>
<div class="foot">Notify Bridge · v0.5.2 · drafted by Claude</div>
</div>
</body>
</html>
+27 -7
View File
@@ -10,18 +10,38 @@ services:
volumes:
- notify-bridge-data:/data
environment:
# REQUIRED — any 32+ byte random string. `openssl rand -hex 32` is one way.
- NOTIFY_BRIDGE_SECRET_KEY=${NOTIFY_BRIDGE_SECRET_KEY:?Set NOTIFY_BRIDGE_SECRET_KEY (min 32 chars)}
- NOTIFY_BRIDGE_CORS_ALLOWED_ORIGINS=${NOTIFY_BRIDGE_CORS_ALLOWED_ORIGINS:-*}
# Homelab target: allow outbound requests to RFC1918 / link-local addresses.
# The SSRF guard otherwise rejects 10.*/172.16.*/192.168.*/169.254.* hosts,
# which breaks tracking of Immich / Gitea / etc. running on the same LAN.
- NOTIFY_BRIDGE_ALLOW_PRIVATE_URLS=1
# Comma-separated list of allowed browser origins. Wildcard `*` is
# rejected on startup because credentials are enabled.
- NOTIFY_BRIDGE_CORS_ALLOWED_ORIGINS=${NOTIFY_BRIDGE_CORS_ALLOWED_ORIGINS:-http://localhost:8420}
# Trusted proxy IPs whose X-Forwarded-For / X-Forwarded-Proto we honor.
# Set this to your reverse proxy's IP (e.g. 172.17.0.1 for the default
# docker bridge, or `*` only if the container is NOT reachable from the
# public internet).
- NOTIFY_BRIDGE_FORWARDED_ALLOW_IPS=${NOTIFY_BRIDGE_FORWARDED_ALLOW_IPS:-127.0.0.1}
# Opt-in SSRF bypass for private/loopback/link-local hosts (homelab
# scenario — tracking an Immich/Gitea instance on the same LAN). DO NOT
# enable on a publicly exposed instance.
# - NOTIFY_BRIDGE_ALLOW_PRIVATE_URLS=1
healthcheck:
test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:8420/api/health')"]
# Use /api/ready (not /api/health) so the container is only reported
# healthy after migrations and the scheduler finish booting.
test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:8420/api/ready', timeout=3)"]
interval: 30s
timeout: 5s
retries: 3
start_period: 10s
start_period: 30s
read_only: true
tmpfs:
- /tmp
security_opt:
- no-new-privileges:true
cap_drop:
- ALL
mem_limit: 512m
cpus: 1.0
pids_limit: 256
volumes:
notify-bridge-data:
+44 -2
View File
@@ -1,12 +1,12 @@
{
"name": "notify-bridge-frontend",
"version": "0.1.0",
"version": "0.6.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "notify-bridge-frontend",
"version": "0.1.0",
"version": "0.6.0",
"dependencies": {
"@codemirror/autocomplete": "^6.18.0",
"@codemirror/lang-html": "^6.4.11",
@@ -15,7 +15,10 @@
"@codemirror/theme-one-dark": "^6.1.3",
"@codemirror/view": "^6.40.0",
"@fontsource/dm-sans": "^5.2.8",
"@fontsource/geist-mono": "^5.2.7",
"@fontsource/geist-sans": "^5.2.5",
"@fontsource/jetbrains-mono": "^5.2.8",
"@fontsource/newsreader": "^5.2.10",
"@mdi/js": "^7.4.47",
"codemirror": "^6.0.2"
},
@@ -612,6 +615,22 @@
"url": "https://github.com/sponsors/ayuhito"
}
},
"node_modules/@fontsource/geist-mono": {
"version": "5.2.7",
"resolved": "https://registry.npmjs.org/@fontsource/geist-mono/-/geist-mono-5.2.7.tgz",
"integrity": "sha512-xVPVFISJg/K0VVd+aQN0Y7X/sw9hUcJPyDWFJ5GpyU3bHELhoRsJkPSRSHXW32mOi0xZCUQDOaPj1sqIFJ1FGg==",
"funding": {
"url": "https://github.com/sponsors/ayuhito"
}
},
"node_modules/@fontsource/geist-sans": {
"version": "5.2.5",
"resolved": "https://registry.npmjs.org/@fontsource/geist-sans/-/geist-sans-5.2.5.tgz",
"integrity": "sha512-anllOHyJbElRs9fV15TeDRqAeb1IKm4bSknPl6ZMoyPTx1BBy7logudcUwpNjmQLkzn4Q0JGQLRCUKJYoyST6A==",
"funding": {
"url": "https://github.com/sponsors/ayuhito"
}
},
"node_modules/@fontsource/jetbrains-mono": {
"version": "5.2.8",
"resolved": "https://registry.npmjs.org/@fontsource/jetbrains-mono/-/jetbrains-mono-5.2.8.tgz",
@@ -620,6 +639,14 @@
"url": "https://github.com/sponsors/ayuhito"
}
},
"node_modules/@fontsource/newsreader": {
"version": "5.2.10",
"resolved": "https://registry.npmjs.org/@fontsource/newsreader/-/newsreader-5.2.10.tgz",
"integrity": "sha512-TFaYzoFhDqarUyV2yYjgZZEwT4bpaj6sGBnXSnFknQ/QB8/9LzfY6IO9+inHOX4zzPp87Z7/KuG1OI5gr91Q3A==",
"funding": {
"url": "https://github.com/sponsors/ayuhito"
}
},
"node_modules/@internationalized/date": {
"version": "3.12.0",
"resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.12.0.tgz",
@@ -2865,11 +2892,26 @@
"resolved": "https://registry.npmjs.org/@fontsource/dm-sans/-/dm-sans-5.2.8.tgz",
"integrity": "sha512-tlovG42m9ESG28WiHpLq3F5umAlm64rv0RkqTbYowRn70e9OlRr5a3yTJhrhrY+k5lftR/OFJjPzOLQzk8EfCA=="
},
"@fontsource/geist-mono": {
"version": "5.2.7",
"resolved": "https://registry.npmjs.org/@fontsource/geist-mono/-/geist-mono-5.2.7.tgz",
"integrity": "sha512-xVPVFISJg/K0VVd+aQN0Y7X/sw9hUcJPyDWFJ5GpyU3bHELhoRsJkPSRSHXW32mOi0xZCUQDOaPj1sqIFJ1FGg=="
},
"@fontsource/geist-sans": {
"version": "5.2.5",
"resolved": "https://registry.npmjs.org/@fontsource/geist-sans/-/geist-sans-5.2.5.tgz",
"integrity": "sha512-anllOHyJbElRs9fV15TeDRqAeb1IKm4bSknPl6ZMoyPTx1BBy7logudcUwpNjmQLkzn4Q0JGQLRCUKJYoyST6A=="
},
"@fontsource/jetbrains-mono": {
"version": "5.2.8",
"resolved": "https://registry.npmjs.org/@fontsource/jetbrains-mono/-/jetbrains-mono-5.2.8.tgz",
"integrity": "sha512-6w8/SG4kqvIMu7xd7wt6x3idn1Qux3p9N62s6G3rfldOUYHpWcc2FKrqf+Vo44jRvqWj2oAtTHrZXEP23oSKwQ=="
},
"@fontsource/newsreader": {
"version": "5.2.10",
"resolved": "https://registry.npmjs.org/@fontsource/newsreader/-/newsreader-5.2.10.tgz",
"integrity": "sha512-TFaYzoFhDqarUyV2yYjgZZEwT4bpaj6sGBnXSnFknQ/QB8/9LzfY6IO9+inHOX4zzPp87Z7/KuG1OI5gr91Q3A=="
},
"@internationalized/date": {
"version": "3.12.0",
"resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.12.0.tgz",
+4 -1
View File
@@ -1,7 +1,7 @@
{
"name": "notify-bridge-frontend",
"private": true,
"version": "0.3.2",
"version": "0.6.0",
"type": "module",
"scripts": {
"dev": "vite dev",
@@ -35,7 +35,10 @@
"@codemirror/theme-one-dark": "^6.1.3",
"@codemirror/view": "^6.40.0",
"@fontsource/dm-sans": "^5.2.8",
"@fontsource/geist-mono": "^5.2.7",
"@fontsource/geist-sans": "^5.2.5",
"@fontsource/jetbrains-mono": "^5.2.8",
"@fontsource/newsreader": "^5.2.10",
"@mdi/js": "^7.4.47",
"codemirror": "^6.0.2"
}
+331 -85
View File
@@ -1,41 +1,80 @@
@import '@fontsource/dm-sans/300.css';
@import '@fontsource/dm-sans/400.css';
@import '@fontsource/dm-sans/500.css';
@import '@fontsource/dm-sans/600.css';
@import '@fontsource/dm-sans/700.css';
@import '@fontsource/jetbrains-mono/400.css';
@import '@fontsource/jetbrains-mono/500.css';
@import '@fontsource/jetbrains-mono/600.css';
@import '@fontsource/geist-sans/300.css';
@import '@fontsource/geist-sans/400.css';
@import '@fontsource/geist-sans/500.css';
@import '@fontsource/geist-sans/600.css';
@import '@fontsource/geist-sans/700.css';
@import '@fontsource/geist-mono/400.css';
@import '@fontsource/geist-mono/500.css';
@import '@fontsource/geist-mono/600.css';
@import '@fontsource/newsreader/300-italic.css';
@import '@fontsource/newsreader/400.css';
@import '@fontsource/newsreader/400-italic.css';
@import '@fontsource/newsreader/500.css';
@import '@fontsource/newsreader/500-italic.css';
@import '@fontsource/newsreader/600.css';
@import 'tailwindcss';
@theme {
--color-background: #f8f9fb;
--color-foreground: #1a1a2e;
--color-muted: #eef0f4;
--color-muted-foreground: #525866;
--color-border: #e2e4ea;
--color-primary: #0d9488;
--color-primary-foreground: #ffffff;
--color-accent: #eef0f4;
--color-accent-foreground: #1a1a2e;
--color-destructive: #ef4444;
--color-card: #ffffff;
--color-card-foreground: #1a1a2e;
--color-success-bg: #ecfdf5;
--color-success-fg: #059669;
--color-warning-bg: #fffbeb;
--color-warning-fg: #d97706;
--color-error-bg: #fef2f2;
--color-error-fg: #dc2626;
--color-glow: rgba(13, 148, 136, 0.15);
--color-glow-strong: rgba(13, 148, 136, 0.3);
--color-sidebar: #ffffff;
--color-sidebar-active: rgba(13, 148, 136, 0.08);
--font-sans: 'DM Sans', ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
--font-mono: 'JetBrains Mono', ui-monospace, 'Cascadia Code', 'Consolas', monospace;
--radius: 0.625rem;
/* Layered z-index scale — refer to these instead of ad-hoc numbers.
Ordered: base < sticky < dropdown < overlay < modal < tooltip < toast */
/* === AURORA: dark default ("Aurora") === */
--color-background: #050613;
--color-background-deep: #02030a;
--color-foreground: #f3f1ff;
--color-muted: rgba(255, 255, 255, 0.04);
--color-muted-foreground: #b6b2d4;
--color-border: rgba(255, 255, 255, 0.08);
/* Glass surfaces — replace solid card */
--color-glass: rgba(255, 255, 255, 0.04);
--color-glass-strong: rgba(255, 255, 255, 0.07);
--color-glass-elev: rgba(255, 255, 255, 0.10);
--color-highlight: rgba(255, 255, 255, 0.14);
--color-input-bg: rgba(255, 255, 255, 0.04);
--color-rule-strong: rgba(255, 255, 255, 0.16);
/* Accent palette — soft pastel constellation */
--color-primary: #b8a7ff; /* lavender — main accent */
--color-primary-foreground: #02030a;
--color-orchid: #ff9ec4;
--color-mint: #7ee8c4;
--color-citrus: #f0e16a;
--color-coral: #ff8a78;
--color-sky: #8ec9ff;
--color-accent: rgba(255, 255, 255, 0.07);
--color-accent-foreground: #f3f1ff;
--color-destructive: #ff8a78;
/* Card mapping (kept for backward compat with components that read --color-card) */
--color-card: rgba(255, 255, 255, 0.04);
--color-card-foreground: #f3f1ff;
/* Status surfaces */
--color-success-bg: rgba(126, 232, 196, 0.12);
--color-success-fg: #7ee8c4;
--color-warning-bg: rgba(240, 225, 106, 0.12);
--color-warning-fg: #f0e16a;
--color-error-bg: rgba(255, 138, 120, 0.12);
--color-error-fg: #ff8a78;
/* Glow tokens — used for focus rings, hover halos */
--color-glow: rgba(184, 167, 255, 0.20);
--color-glow-strong: rgba(184, 167, 255, 0.45);
/* Sidebar tokens */
--color-sidebar: rgba(255, 255, 255, 0.04);
--color-sidebar-active: rgba(255, 255, 255, 0.10);
/* Shadow recipe for floating glass */
--shadow-card: 0 1px 0 rgba(255,255,255,0.07) inset, 0 30px 60px -20px rgba(0,0,0,0.6);
/* Typography */
--font-sans: 'Geist Sans', ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
--font-mono: 'Geist Mono', ui-monospace, 'Cascadia Code', 'Consolas', monospace;
--font-display: 'Newsreader', ui-serif, Georgia, serif;
--radius: 1rem;
/* z-index scale (unchanged) */
--z-base: 1;
--z-sticky: 10;
--z-dropdown: 30;
@@ -45,30 +84,56 @@
--z-toast: 70;
}
/* Dark theme overrides */
/* === AURORA: light theme ("Pearl") overrides === */
[data-theme="light"] {
--color-background: #f5f3ff;
--color-background-deep: #ede9fe;
--color-foreground: #1a1530;
--color-muted: rgba(20, 15, 60, 0.04);
--color-muted-foreground: #3a3560;
--color-border: rgba(20, 15, 60, 0.08);
--color-glass: rgba(255, 255, 255, 0.55);
--color-glass-strong: rgba(255, 255, 255, 0.65);
--color-glass-elev: rgba(255, 255, 255, 0.80);
--color-highlight: rgba(255, 255, 255, 0.9);
--color-input-bg: rgba(255, 255, 255, 0.85);
--color-rule-strong: rgba(20, 15, 60, 0.16);
--color-primary: #6d4ce0;
--color-primary-foreground: #ffffff;
--color-orchid: #d63384;
--color-mint: #008a64;
--color-citrus: #a07a00;
--color-coral: #e0512f;
--color-sky: #1f6fcc;
--color-accent: rgba(20, 15, 60, 0.04);
--color-accent-foreground: #1a1530;
--color-destructive: #e0512f;
--color-card: rgba(255, 255, 255, 0.55);
--color-card-foreground: #1a1530;
--color-success-bg: rgba(0, 138, 100, 0.10);
--color-success-fg: #008a64;
--color-warning-bg: rgba(160, 122, 0, 0.10);
--color-warning-fg: #a07a00;
--color-error-bg: rgba(224, 81, 47, 0.10);
--color-error-fg: #e0512f;
--color-glow: rgba(109, 76, 224, 0.18);
--color-glow-strong: rgba(109, 76, 224, 0.40);
--color-sidebar: rgba(255, 255, 255, 0.55);
--color-sidebar-active: rgba(255, 255, 255, 0.85);
--shadow-card: 0 1px 0 rgba(255,255,255,0.5) inset, 0 20px 40px -16px rgba(80, 50, 180, 0.18);
}
/* Legacy alias — many components still read [data-theme="dark"] */
[data-theme="dark"] {
--color-background: #0c0e14;
--color-foreground: #e4e6ed;
--color-muted: #1a1d28;
--color-muted-foreground: #8b8fa4;
--color-border: #252836;
--color-primary: #14b8a6;
--color-primary-foreground: #0c0e14;
--color-accent: #1a1d28;
--color-accent-foreground: #e4e6ed;
--color-destructive: #f87171;
--color-card: #13151e;
--color-card-foreground: #e4e6ed;
--color-success-bg: #052e16;
--color-success-fg: #34d399;
--color-warning-bg: #422006;
--color-warning-fg: #fbbf24;
--color-error-bg: #450a0a;
--color-error-fg: #f87171;
--color-glow: rgba(20, 184, 166, 0.12);
--color-glow-strong: rgba(20, 184, 166, 0.25);
--color-sidebar: #10121a;
--color-sidebar-active: rgba(20, 184, 166, 0.1);
/* defaults already match :root — no overrides needed, declaration kept for color-scheme */
}
body {
@@ -78,68 +143,146 @@ body {
transition: background-color 0.3s ease, color 0.3s ease;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
letter-spacing: -0.005em;
min-height: 100vh;
overflow-x: hidden;
}
/* Subtle background pattern */
/* === Aurora atmosphere — vivid blurred blobs behind everything === */
body::before {
content: '';
position: fixed;
inset: -20vh -10vw;
background:
radial-gradient(40vw 40vw at 12% 18%, rgba(184, 167, 255, 0.55), transparent 60%),
radial-gradient(35vw 35vw at 88% 22%, rgba(255, 158, 196, 0.45), transparent 60%),
radial-gradient(50vw 35vw at 78% 88%, rgba(126, 232, 196, 0.40), transparent 60%),
radial-gradient(40vw 30vw at 6% 92%, rgba(142, 201, 255, 0.42), transparent 60%);
filter: blur(60px) saturate(140%);
pointer-events: none;
z-index: -2;
animation: aurora-drift 28s ease-in-out infinite alternate;
}
body::after {
content: '';
position: fixed;
inset: 0;
z-index: -1;
opacity: 0.4;
background-image: radial-gradient(circle at 1px 1px, var(--color-border) 0.5px, transparent 0);
background-size: 32px 32px;
background: radial-gradient(circle at 50% 50%, transparent 30%, var(--color-background-deep) 100%);
pointer-events: none;
opacity: 0.7;
}
/* Form controls */
@keyframes aurora-drift {
from { transform: translate(0, 0) scale(1); }
to { transform: translate(-2%, 1%) scale(1.05); }
}
[data-theme="light"] body::before { opacity: 0.85; }
/* Form controls — Aurora-native defaults */
input, select, textarea {
color: var(--color-foreground);
background-color: var(--color-background);
border-color: var(--color-border);
background-color: var(--color-input-bg);
border: 1px solid var(--color-rule-strong);
border-radius: 0.625rem;
font-family: var(--font-sans);
transition: border-color 0.2s ease, box-shadow 0.2s ease;
transition: border-color 0.2s ease, background-color 0.2s ease, box-shadow 0.2s ease;
}
/* Default text inputs / search / textarea: comfortable padding.
`<input type="checkbox">` and `<input type="radio">` are excluded so
they keep their native compact sizing. Any explicit `padding`/`p-*`
utility from a callsite still wins. */
input:not([type="checkbox"]):not([type="radio"]):not([type="range"]):not([type="color"]):not([type="file"]),
textarea {
padding: 0.55rem 0.85rem;
font-size: 0.875rem;
}
select {
padding: 0.55rem 2.2rem 0.55rem 0.85rem;
font-size: 0.875rem;
appearance: none;
background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='0 0 24 24' fill='none' stroke='%236f6c92' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'><path d='M6 9l6 6 6-6'/></svg>");
background-repeat: no-repeat;
background-position: right 0.75rem center;
background-size: 12px;
}
input:hover:not(:focus-visible):not([disabled]),
select:hover:not(:focus-visible):not([disabled]),
textarea:hover:not(:focus-visible):not([disabled]) {
border-color: var(--color-rule-strong);
background-color: var(--color-glass-strong);
}
input:focus-visible, select:focus-visible, textarea:focus-visible {
outline: none;
border-color: var(--color-primary);
box-shadow: 0 0 0 3px var(--color-glow), 0 0 12px var(--color-glow);
box-shadow: 0 0 0 3px var(--color-glow);
}
button:focus-visible {
input::placeholder, textarea::placeholder {
color: var(--color-muted-foreground);
}
button:focus-visible, a:focus-visible {
outline: 2px solid var(--color-primary);
outline-offset: 2px;
border-radius: 0.375rem;
border-radius: 0.5rem;
}
a:focus-visible {
outline: 2px solid var(--color-primary);
outline-offset: 2px;
border-radius: 0.375rem;
}
/* Override browser autofill styles in dark mode */
/* Override browser autofill in dark mode */
[data-theme="dark"] input:-webkit-autofill,
[data-theme="dark"] input:-webkit-autofill:hover,
[data-theme="dark"] input:-webkit-autofill:focus,
[data-theme="dark"] select:-webkit-autofill {
-webkit-box-shadow: 0 0 0 1000px #13151e inset !important;
-webkit-text-fill-color: #e4e6ed !important;
caret-color: #e4e6ed;
-webkit-box-shadow: 0 0 0 1000px #0d0e1c inset !important;
-webkit-text-fill-color: #f3f1ff !important;
caret-color: #f3f1ff;
}
/* Color scheme for native controls */
[data-theme="dark"] { color-scheme: dark; }
[data-theme="light"] { color-scheme: light; }
/* Scrollbar styling */
::-webkit-scrollbar { width: 6px; height: 6px; }
::-webkit-scrollbar { width: 8px; height: 8px; }
::-webkit-scrollbar-track { background: transparent; }
::-webkit-scrollbar-thumb { background: var(--color-border); border-radius: 3px; }
::-webkit-scrollbar-thumb { background: var(--color-rule-strong); border-radius: 999px; }
::-webkit-scrollbar-thumb:hover { background: var(--color-muted-foreground); }
/* Animations */
/* === Glass surface utility — used by cards, panels, sidebar === */
.glass {
background: var(--color-glass);
backdrop-filter: blur(28px) saturate(160%);
-webkit-backdrop-filter: blur(28px) saturate(160%);
border: 1px solid var(--color-border);
border-radius: 22px;
box-shadow: var(--shadow-card);
position: relative;
}
.glass::after {
content: '';
position: absolute;
inset: 0;
border-radius: inherit;
pointer-events: none;
background: linear-gradient(180deg, var(--color-highlight), transparent 30%);
opacity: 0.4;
}
.glass-strong {
background: var(--color-glass-strong);
}
.glass-elev {
background: var(--color-glass-elev);
}
/* Selection */
::selection { background: var(--color-primary); color: var(--color-primary-foreground); }
/* === Animations === */
@keyframes fadeSlideIn {
from { opacity: 0; }
to { opacity: 1; }
@@ -160,6 +303,48 @@ a:focus-visible {
to { opacity: 1; }
}
@keyframes aurora-rise {
from { opacity: 0; transform: translateY(14px); }
to { opacity: 1; transform: translateY(0); }
}
@keyframes aurora-pulse-glow-mint {
0%, 100% {
box-shadow:
0 0 4px color-mix(in srgb, var(--color-mint) 60%, transparent),
0 0 0 0 color-mix(in srgb, var(--color-mint) 0%, transparent);
}
50% {
box-shadow:
0 0 10px color-mix(in srgb, var(--color-mint) 80%, transparent),
0 0 0 4px color-mix(in srgb, var(--color-mint) 25%, transparent);
}
}
@keyframes aurora-pulse-glow-citrus {
0%, 100% {
box-shadow:
0 0 4px color-mix(in srgb, var(--color-citrus) 60%, transparent),
0 0 0 0 color-mix(in srgb, var(--color-citrus) 0%, transparent);
}
50% {
box-shadow:
0 0 10px color-mix(in srgb, var(--color-citrus) 80%, transparent),
0 0 0 4px color-mix(in srgb, var(--color-citrus) 25%, transparent);
}
}
@keyframes aurora-pulse-glow-coral {
0%, 100% {
box-shadow:
0 0 4px color-mix(in srgb, var(--color-coral) 60%, transparent),
0 0 0 0 color-mix(in srgb, var(--color-coral) 0%, transparent);
}
50% {
box-shadow:
0 0 10px color-mix(in srgb, var(--color-coral) 80%, transparent),
0 0 0 4px color-mix(in srgb, var(--color-coral) 25%, transparent);
}
}
.animate-fade-slide-in {
animation: fadeSlideIn 0.4s ease-out forwards;
}
@@ -178,9 +363,13 @@ a:focus-visible {
animation: countUp 0.5s ease-out both;
}
.animate-rise {
animation: aurora-rise 0.6s cubic-bezier(.2,.7,.2,1) both;
}
/* Stagger children utility */
.stagger-children > * {
animation: fadeSlideIn 0.4s ease-out forwards;
animation: aurora-rise 0.55s cubic-bezier(.2,.7,.2,1) both;
}
.stagger-children > *:nth-child(1) { animation-delay: 0ms; }
.stagger-children > *:nth-child(2) { animation-delay: 60ms; }
@@ -193,10 +382,14 @@ a:focus-visible {
font-family: var(--font-mono);
}
.font-display {
font-family: var(--font-display);
}
/* Card highlight for cross-entity navigation */
@keyframes cardHighlight {
0%, 100% { box-shadow: none; }
25%, 75% { box-shadow: 0 0 0 3px var(--color-primary), 0 0 20px color-mix(in srgb, var(--color-primary) 30%, transparent); }
25%, 75% { box-shadow: 0 0 0 3px var(--color-primary), 0 0 20px var(--color-glow-strong); }
}
/* Dim overlay behind highlighted card */
@@ -213,3 +406,56 @@ a:focus-visible {
.nav-dim-overlay.active {
opacity: 1;
}
/* Live pulse dot — for "live" / armed indicators.
Pulse is a self-contained box-shadow glow on the dot. No transform,
no pseudo-element — the dot's own bounding box never changes, so
ancestors with overflow:hidden can only clip the (decorative) glow,
never the dot itself. */
.aurora-pulse {
width: 8px; height: 8px;
border-radius: 50%;
background: var(--color-mint);
display: inline-block;
flex-shrink: 0;
animation: aurora-pulse-glow-mint 1.6s ease-in-out infinite;
}
.aurora-pulse.warn {
background: var(--color-citrus);
animation-name: aurora-pulse-glow-citrus;
}
.aurora-pulse.error {
background: var(--color-coral);
animation-name: aurora-pulse-glow-coral;
}
.aurora-pulse.idle {
background: var(--color-muted-foreground);
box-shadow: none;
opacity: 0.5;
animation: none;
}
/* === Reduced-motion: kill drift, pulses, shimmers, stagger entrances === */
@media (prefers-reduced-motion: reduce) {
body::before { animation: none !important; }
.animate-fade-slide-in,
.animate-shimmer,
.animate-pulse-glow,
.animate-count-up,
.animate-rise,
.stagger-children > *,
.aurora-pulse,
.aurora-pulse.warn,
.aurora-pulse.error {
animation: none !important;
}
.stat-card,
.paginator-btn,
.signal-row,
.provider-row {
transition: none !important;
}
* {
scroll-behavior: auto !important;
}
}
+48 -13
View File
@@ -21,10 +21,10 @@
class?: string;
} = $props();
const baseClasses = 'inline-flex items-center justify-center gap-1.5 rounded-md text-sm font-medium transition-colors disabled:opacity-50';
const baseClasses = 'aurora-btn inline-flex items-center justify-center gap-2 font-medium transition-all disabled:opacity-50 disabled:pointer-events-none';
const sizeClasses: Record<string, string> = {
sm: 'px-2.5 py-1 text-xs',
md: 'px-4 py-2',
sm: 'aurora-btn--sm',
md: 'aurora-btn--md',
};
const variantClasses: Record<string, string> = {
primary: 'btn-primary',
@@ -49,37 +49,72 @@
{/if}
<style>
.btn-primary {
background: var(--color-primary);
color: var(--color-primary-foreground);
.aurora-btn {
border-radius: 12px;
letter-spacing: -0.005em;
cursor: pointer;
font-family: inherit;
white-space: nowrap;
}
.btn-primary:hover:not(:disabled) {
opacity: 0.9;
.aurora-btn--sm {
padding: 0 0.95rem;
height: 34px;
font-size: 0.82rem;
}
.aurora-btn--md {
padding: 0 1.15rem;
height: 40px;
font-size: 0.875rem;
}
/* Primary — gradient lavender→orchid pill, the page's main CTA. */
.btn-primary {
background: linear-gradient(135deg, var(--color-primary), var(--color-orchid));
color: white;
border: 0;
box-shadow:
0 6px 20px -8px var(--color-glow-strong),
inset 0 1px 0 rgba(255, 255, 255, 0.35);
font-weight: 600;
}
.btn-primary:hover:not(:disabled) {
transform: translateY(-1px);
box-shadow:
0 10px 28px -10px var(--color-glow-strong),
inset 0 1px 0 rgba(255, 255, 255, 0.4);
}
.btn-primary:active:not(:disabled) { transform: translateY(0); }
.btn-secondary {
background: var(--color-muted);
background: var(--color-glass-strong);
color: var(--color-foreground);
border: 1px solid var(--color-border);
border: 1px solid var(--color-rule-strong);
}
.btn-secondary:hover:not(:disabled) {
opacity: 0.8;
background: var(--color-glass-elev);
border-color: var(--color-rule-strong);
}
.btn-danger {
background: var(--color-error-fg);
color: white;
border: 0;
font-weight: 600;
box-shadow: 0 6px 20px -8px color-mix(in srgb, var(--color-error-fg) 50%, transparent);
}
.btn-danger:hover:not(:disabled) {
opacity: 0.9;
transform: translateY(-1px);
box-shadow: 0 10px 28px -10px color-mix(in srgb, var(--color-error-fg) 60%, transparent);
}
.btn-ghost {
background: transparent;
color: var(--color-muted-foreground);
border: 1px solid transparent;
}
.btn-ghost:hover:not(:disabled) {
background: var(--color-muted);
background: var(--color-glass-strong);
color: var(--color-foreground);
border-color: var(--color-border);
}
</style>
+36 -11
View File
@@ -1,30 +1,55 @@
<script lang="ts">
let { children, class: className = '', hover = false, entityId = undefined, ...rest } = $props<{
children: import('svelte').Snippet;
import type { Snippet } from 'svelte';
interface Props {
children: Snippet;
class?: string;
hover?: boolean;
entityId?: number | string;
[key: string]: any;
}>();
[key: string]: unknown;
}
let { children, class: className = '', hover = false, entityId = undefined, ...rest }: Props = $props();
</script>
<div
class="card-component {hover ? 'card-hover' : ''} {className}"
style="background: var(--color-card); border: 1px solid var(--color-border); border-radius: 0.75rem; padding: 1.25rem;"
data-entity-id={entityId}
{...rest}
>
{@render children()}
<div class="card-component__inner">
{@render children()}
</div>
</div>
<style>
.card-component {
transition: all 0.25s cubic-bezier(0.4, 0, 0.2, 1);
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.04);
position: relative;
background: var(--color-glass);
backdrop-filter: blur(28px) saturate(160%);
-webkit-backdrop-filter: blur(28px) saturate(160%);
border: 1px solid var(--color-border);
border-radius: 22px;
box-shadow: var(--shadow-card);
transition: transform 0.25s cubic-bezier(0.4, 0, 0.2, 1), border-color 0.25s ease;
overflow: hidden;
}
.card-component::after {
content: '';
position: absolute;
inset: 0;
border-radius: inherit;
pointer-events: none;
background: linear-gradient(180deg, var(--color-highlight), transparent 30%);
opacity: 0.4;
}
.card-component__inner {
position: relative;
z-index: 1;
padding: 1.25rem 1.4rem;
}
.card-hover:hover {
border-color: var(--color-primary);
box-shadow: 0 4px 16px var(--color-glow), 0 0 0 1px var(--color-glow);
border-color: var(--color-rule-strong);
transform: translateY(-2px);
}
</style>
@@ -21,7 +21,7 @@
const STATUS_MAP: Record<string, { icon: string; color: string; bg: string }> = {
empty: { icon: 'mdiCircleOutline', color: 'var(--color-muted-foreground)', bg: 'transparent' },
valid: { icon: 'mdiCheckCircle', color: 'var(--color-success-fg)', bg: 'var(--color-success-bg)' },
warning: { icon: 'mdiAlert', color: '#d97706', bg: 'rgba(217, 119, 6, 0.1)' },
warning: { icon: 'mdiAlert', color: 'var(--color-warning-fg)', bg: 'var(--color-warning-bg)' },
error: { icon: 'mdiAlertCircle', color: 'var(--color-error-fg)', bg: 'var(--color-error-bg)' },
};
const statusConfig = $derived(STATUS_MAP[status]);
+140 -87
View File
@@ -1,6 +1,7 @@
<script lang="ts">
import MdiIcon from './MdiIcon.svelte';
import { t } from '$lib/i18n';
import { portal } from '$lib/portal';
export interface EntityItem {
value: string | number;
@@ -34,8 +35,8 @@
let open = $state(false);
let query = $state('');
let highlightIdx = $state(0);
let inputEl: HTMLInputElement;
let listEl: HTMLDivElement;
let inputEl = $state<HTMLInputElement | undefined>();
let listEl = $state<HTMLDivElement | undefined>();
const selected = $derived(items.find(i => String(i.value) === String(value)));
@@ -121,55 +122,57 @@
<span class="es-trigger-arrow"><MdiIcon name="mdiChevronDown" size={14} /></span>
</button>
<!-- Palette overlay -->
<!-- Palette overlay — portalled to <body> to escape backdrop-filter ancestors -->
{#if open}
<div class="ep-overlay" onclick={closePalette} role="presentation"></div>
<div use:portal class="es-portal-root">
<div class="ep-overlay" onclick={closePalette} role="presentation"></div>
<div class="ep-container">
<div class="ep-search-row">
<MdiIcon name="mdiMagnify" size={18} />
<input
bind:this={inputEl}
bind:value={query}
placeholder={selected ? selected.label : placeholder}
class="ep-input"
type="text"
autocomplete="off"
spellcheck="false"
onkeydown={handleKeydown}
/>
<kbd class="ep-kbd">ESC</kbd>
</div>
<div class="ep-container">
<div class="ep-search-row">
<MdiIcon name="mdiMagnify" size={18} />
<input
bind:this={inputEl}
bind:value={query}
placeholder={selected ? selected.label : placeholder}
class="ep-input"
type="text"
autocomplete="off"
spellcheck="false"
onkeydown={handleKeydown}
/>
<kbd class="ep-kbd">ESC</kbd>
</div>
<div class="ep-list" bind:this={listEl} role="listbox">
{#if filtered.length === 0}
<div class="ep-empty">{t('common.noMatches')}</div>
{:else}
{#each filtered as item, i}
<button
class="ep-item"
class:ep-highlight={i === highlightIdx && !item.disabled}
class:ep-current={String(item.value) === String(value)}
class:ep-disabled={item.disabled}
role="option"
aria-selected={String(item.value) === String(value)}
aria-disabled={item.disabled || undefined}
onclick={() => selectItem(item)}
onmouseenter={() => highlightIdx = i}
type="button"
>
{#if item.icon}
<span class="ep-item-icon"><MdiIcon name={item.icon} size={18} /></span>
{/if}
<span class="ep-item-label">{item.label}</span>
{#if item.disabled && item.disabledHint}
<span class="ep-item-hint">{item.disabledHint}</span>
{:else if item.desc}
<span class="ep-item-desc">{item.desc}</span>
{/if}
</button>
{/each}
{/if}
<div class="ep-list" bind:this={listEl} role="listbox">
{#if filtered.length === 0}
<div class="ep-empty">{t('common.noMatches')}</div>
{:else}
{#each filtered as item, i}
<button
class="ep-item"
class:ep-highlight={i === highlightIdx && !item.disabled}
class:ep-current={String(item.value) === String(value)}
class:ep-disabled={item.disabled}
role="option"
aria-selected={String(item.value) === String(value)}
aria-disabled={item.disabled || undefined}
onclick={() => selectItem(item)}
onmouseenter={() => highlightIdx = i}
type="button"
>
{#if item.icon}
<span class="ep-item-icon"><MdiIcon name={item.icon} size={18} /></span>
{/if}
<span class="ep-item-label">{item.label}</span>
{#if item.disabled && item.disabledHint}
<span class="ep-item-hint">{item.disabledHint}</span>
{:else if item.desc}
<span class="ep-item-desc">{item.desc}</span>
{/if}
</button>
{/each}
{/if}
</div>
</div>
</div>
{/if}
@@ -181,23 +184,25 @@
align-items: center;
gap: 0.5rem;
width: 100%;
padding: 0.375rem 0.75rem;
border: 1px solid var(--color-border);
border-radius: 0.375rem;
padding: 0.5rem 0.75rem;
border: 1px solid var(--color-rule-strong);
border-radius: 0.625rem;
font-size: 0.875rem;
background: var(--color-background);
background: var(--color-input-bg);
color: var(--color-foreground);
transition: border-color 0.15s;
transition: border-color 0.15s, background 0.15s;
text-align: left;
cursor: pointer;
font-family: inherit;
}
.es-trigger.es-sm {
padding: 0.25rem 0.5rem;
font-size: 0.75rem;
gap: 0.375rem;
padding: 0.3rem 0.55rem;
font-size: 0.8rem;
gap: 0.4rem;
}
.es-trigger:hover {
border-color: var(--color-primary);
background: var(--color-glass-strong);
border-color: var(--color-rule-strong);
}
.es-trigger-icon {
flex-shrink: 0;
@@ -217,41 +222,63 @@
color: var(--color-muted-foreground);
}
/* Overlay */
.ep-overlay {
/* Portal root — escapes any backdrop-filter ancestor */
.es-portal-root {
position: fixed;
inset: 0;
z-index: 9998;
background: rgba(0, 0, 0, 0.4);
backdrop-filter: blur(2px);
pointer-events: none;
}
/* Palette container */
/* Overlay */
.ep-overlay {
position: absolute;
inset: 0;
pointer-events: auto;
background: rgba(0, 0, 0, 0.55);
backdrop-filter: blur(8px) saturate(120%);
-webkit-backdrop-filter: blur(8px) saturate(120%);
}
/* Palette container — high opacity for legibility */
.ep-container {
position: fixed;
pointer-events: auto;
position: absolute;
top: min(20vh, 120px);
left: 50%;
transform: translateX(-50%);
z-index: 9999;
width: min(460px, 90vw);
z-index: 1;
width: min(480px, 92vw);
max-height: 60vh;
background: var(--color-card);
border: 1px solid var(--color-border);
border-radius: 0.75rem;
box-shadow: 0 20px 60px rgba(0, 0, 0, 0.4);
background: var(--ep-solid-bg);
border: 1px solid var(--color-rule-strong);
border-radius: 16px;
box-shadow: var(--shadow-card), 0 24px 48px -16px rgba(0, 0, 0, 0.55);
display: flex;
flex-direction: column;
overflow: hidden;
--ep-solid-bg: #131520;
}
:global([data-theme="light"]) .ep-container { --ep-solid-bg: #fafafe; }
.ep-container::after {
content: '';
position: absolute; inset: 0;
border-radius: inherit;
pointer-events: none;
background: linear-gradient(180deg, var(--color-highlight), transparent 30%);
opacity: 0.4;
}
/* Search row */
.ep-search-row {
display: flex;
align-items: center;
gap: 0.5rem;
padding: 0.625rem 0.875rem;
gap: 0.6rem;
padding: 0.85rem 1rem;
border-bottom: 1px solid var(--color-border);
color: var(--color-muted-foreground);
position: relative;
z-index: 1;
}
.ep-input {
flex: 1;
@@ -261,14 +288,16 @@
font-size: 0.9rem;
color: var(--color-foreground);
padding: 0;
font-family: inherit;
}
.ep-input::placeholder { color: var(--color-muted-foreground); }
.ep-kbd {
font-size: 0.55rem;
font-size: 0.62rem;
font-family: var(--font-mono);
padding: 0.1rem 0.3rem;
border-radius: 0.2rem;
background: var(--color-muted);
color: var(--color-muted-foreground);
padding: 0.2rem 0.45rem;
border-radius: 6px;
background: var(--color-glass-strong);
color: var(--color-foreground);
border: 1px solid var(--color-border);
}
@@ -276,10 +305,12 @@
.ep-list {
overflow-y: auto;
scrollbar-width: thin;
padding: 0.25rem 0;
padding: 0.35rem;
position: relative;
z-index: 1;
}
.ep-empty {
padding: 1rem;
padding: 1.25rem;
text-align: center;
color: var(--color-muted-foreground);
font-size: 0.85rem;
@@ -289,20 +320,26 @@
.ep-item {
display: flex;
align-items: center;
gap: 0.625rem;
gap: 0.65rem;
width: 100%;
padding: 0.5rem 0.875rem;
border: none;
padding: 0.55rem 0.75rem;
border: 1px solid transparent;
background: transparent;
color: var(--color-foreground);
font-size: 0.875rem;
font-size: 0.88rem;
cursor: pointer;
text-align: left;
transition: background 0.1s;
border-left: 3px solid transparent;
transition: background 0.12s, border-color 0.12s;
border-radius: 10px;
font-family: inherit;
}
.ep-item:hover, .ep-item.ep-highlight {
background: var(--color-muted);
background: rgba(255, 255, 255, 0.06);
border-color: var(--color-rule-strong);
}
:global([data-theme="light"]) .ep-item:hover,
:global([data-theme="light"]) .ep-item.ep-highlight {
background: rgba(20, 15, 60, 0.05);
}
.ep-item.ep-disabled {
opacity: 0.4;
@@ -310,9 +347,14 @@
}
.ep-item.ep-disabled:hover {
background: transparent;
border-color: transparent;
}
.ep-item.ep-current {
border-left-color: var(--color-primary);
background: linear-gradient(135deg,
color-mix(in srgb, var(--color-primary) 14%, transparent),
color-mix(in srgb, var(--color-orchid) 14%, transparent));
border-color: color-mix(in srgb, var(--color-primary) 40%, var(--color-border));
box-shadow: inset 0 1px 0 var(--color-highlight);
}
.ep-item-icon {
flex-shrink: 0;
@@ -320,19 +362,30 @@
align-items: center;
justify-content: center;
color: var(--color-muted-foreground);
width: 28px; height: 28px;
border-radius: 8px;
background: var(--color-glass-strong);
border: 1px solid var(--color-border);
}
.ep-item.ep-current .ep-item-icon {
color: var(--color-primary);
background: var(--color-glass-elev);
}
.ep-item-label {
flex: 1;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-weight: 500;
}
.ep-item-desc {
font-size: 0.75rem;
font-size: 0.7rem;
font-family: var(--font-mono);
color: var(--color-muted-foreground);
padding: 0.12rem 0.5rem;
border-radius: 9999px;
background: var(--color-glass-strong);
border: 1px solid var(--color-border);
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
+33 -29
View File
@@ -2,6 +2,7 @@
import { t } from '$lib/i18n';
import { parseDate } from '$lib/api';
import MdiIcon from './MdiIcon.svelte';
import { portal } from '$lib/portal';
interface DayData {
date: string;
@@ -13,11 +14,11 @@
const EVENT_TYPES = ['assets_added', 'assets_removed', 'collection_renamed', 'collection_deleted', 'sharing_changed'] as const;
const COLORS: Record<string, string> = {
assets_added: '#059669',
assets_removed: '#ef4444',
collection_renamed: '#6366f1',
collection_deleted: '#dc2626',
sharing_changed: '#f59e0b',
assets_added: 'var(--color-mint)',
assets_removed: 'var(--color-coral)',
collection_renamed: 'var(--color-primary)',
collection_deleted: 'var(--color-error-fg)',
sharing_changed: 'var(--color-citrus)',
};
const LABELS: Record<string, string> = {
@@ -128,28 +129,26 @@
</div>
{#if tooltip}
<div
class="chart-tooltip"
style="position: fixed; left: {tooltip.x}px; top: {tooltip.y}px; z-index: 9999; transform: translate(-50%, -100%) translateY(-8px);"
>
{#each tooltip.text.split('\n') as line}
<div>{line}</div>
{/each}
<div use:portal>
<div
class="chart-tooltip"
style="position: fixed; left: {tooltip.x}px; top: {tooltip.y}px; z-index: 9999; transform: translate(-50%, -100%) translateY(-8px);"
>
{#each tooltip.text.split('\n') as line}
<div>{line}</div>
{/each}
</div>
</div>
{/if}
<style>
.chart-wrapper {
background: var(--color-card);
border: 1px solid var(--color-border);
border-radius: 0.75rem;
padding: 1.25rem;
margin-bottom: 1.5rem;
transition: border-color 0.2s;
}
.chart-wrapper:hover {
border-color: var(--color-primary);
box-shadow: 0 0 16px var(--color-glow);
/* Outer chrome lives on the parent panel — keep this transparent so
we don't get a double border / nested card look. */
background: transparent;
border: 0;
padding: 0;
margin-bottom: 0;
}
.chart-header {
display: flex;
@@ -248,16 +247,21 @@
border-radius: 50%;
flex-shrink: 0;
}
.chart-tooltip {
background: var(--color-card);
border: 1px solid var(--color-border);
border-radius: 0.5rem;
padding: 0.5rem 0.75rem;
font-size: 0.7rem;
/* Tooltip is portalled to <body>, so use :global to make the style
apply regardless of DOM location. */
:global(.chart-tooltip) {
--ct-solid-bg: #131520;
background: var(--ct-solid-bg);
color: var(--color-foreground);
border: 1px solid var(--color-rule-strong);
border-radius: 10px;
padding: 0.55rem 0.8rem;
font-size: 0.72rem;
font-family: var(--font-mono);
box-shadow: 0 4px 16px rgba(0, 0, 0, 0.2);
box-shadow: var(--shadow-card), 0 8px 24px -8px rgba(0, 0, 0, 0.5);
pointer-events: none;
white-space: nowrap;
line-height: 1.5;
}
:global([data-theme="light"] .chart-tooltip) { --ct-solid-bg: #fafafe; }
</style>
+37 -7
View File
@@ -1,8 +1,11 @@
<script lang="ts">
import { portal } from '$lib/portal';
let { text = '' } = $props<{ text: string }>();
let visible = $state(false);
let tooltipStyle = $state('');
let btnEl: HTMLButtonElement;
let btnEl = $state<HTMLButtonElement | undefined>();
const tooltipId = `hint-${Math.random().toString(36).slice(2, 9)}`;
function show() {
if (!btnEl) return;
@@ -12,7 +15,7 @@
let left = rect.left + rect.width / 2 - tooltipWidth / 2;
if (left < 8) left = 8;
if (left + tooltipWidth > window.innerWidth - 8) left = window.innerWidth - tooltipWidth - 8;
tooltipStyle = `position:fixed; z-index:99999; bottom:${window.innerHeight - rect.top + 8}px; left:${left}px; width:${tooltipWidth}px;`;
tooltipStyle = `position:fixed; z-index:9999; bottom:${window.innerHeight - rect.top + 8}px; left:${left}px; width:${tooltipWidth}px;`;
}
function hide() {
@@ -21,9 +24,7 @@
</script>
<button type="button" bind:this={btnEl}
class="inline-flex items-center justify-center w-4 h-4 rounded-full text-[11px] font-bold leading-none
border border-[var(--color-border)] bg-[var(--color-muted)] text-[var(--color-muted-foreground)]
hover:bg-[var(--color-border)] hover:text-[var(--color-foreground)]
class="hint-btn inline-flex items-center justify-center w-4 h-4 rounded-full text-[11px] font-bold leading-none
focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[var(--color-primary)]
transition-colors cursor-help align-middle ml-2 flex-shrink-0"
onmouseenter={show}
@@ -31,12 +32,41 @@
onfocus={show}
onblur={hide}
aria-label={text}
aria-describedby={visible ? tooltipId : undefined}
title={text}
tabindex="0"
>?</button>
{#if visible}
<div role="tooltip" style="{tooltipStyle} background:var(--color-card); color:var(--color-foreground); border:1px solid var(--color-border); box-shadow:0 10px 30px rgba(0,0,0,0.3); padding:0.625rem 0.75rem; border-radius:0.5rem; font-size:0.8125rem; white-space:normal; line-height:1.625; pointer-events:none;">
{text}
<div use:portal>
<div id={tooltipId} role="tooltip" style={tooltipStyle} class="hint-tooltip">
{text}
</div>
</div>
{/if}
<style>
.hint-btn {
border: 1px solid var(--color-border);
background: var(--color-glass-strong);
color: var(--color-muted-foreground);
}
.hint-btn:hover {
background: var(--color-glass-elev);
color: var(--color-foreground);
border-color: var(--color-rule-strong);
}
.hint-tooltip {
background: var(--hint-solid-bg, #131520);
color: var(--color-foreground);
border: 1px solid var(--color-rule-strong);
box-shadow: var(--shadow-card), 0 12px 30px -10px rgba(0, 0, 0, 0.5);
padding: 0.7rem 0.85rem;
border-radius: 12px;
font-size: 0.8125rem;
white-space: normal;
line-height: 1.55;
pointer-events: none;
}
:global([data-theme="light"]) .hint-tooltip { --hint-solid-bg: #fafafe; }
</style>
+101 -53
View File
@@ -1,6 +1,7 @@
<script lang="ts">
import MdiIcon from './MdiIcon.svelte';
import { t } from '$lib/i18n';
import { portal } from '$lib/portal';
export interface GridItem {
value: string | number;
@@ -27,8 +28,8 @@
let open = $state(false);
let search = $state('');
let triggerEl: HTMLButtonElement;
let searchEl: HTMLInputElement;
let triggerEl = $state<HTMLButtonElement | undefined>();
let searchEl = $state<HTMLInputElement | undefined>();
let popupStyle = $state('');
const showSearch = $derived(items.length > 4);
@@ -90,36 +91,39 @@
</button>
{#if open}
<!-- Backdrop -->
<div style="position:fixed; top:0; left:0; right:0; bottom:0; z-index:9998;"
role="presentation" onclick={() => open = false}></div>
<!-- Backdrop + popup are portalled to <body> so they escape any
backdrop-filter / transform ancestor that would otherwise act
as the containing block for `position: fixed`. -->
<div use:portal class="icon-grid-portal-root">
<div class="icon-grid-backdrop"
role="presentation" onclick={() => open = false}></div>
<!-- Popup grid -->
<div style="{popupStyle} width: {columns * 160 + 16}px;"
class="icon-grid-popup">
{#if showSearch}
<input bind:this={searchEl} bind:value={search} placeholder="Filter..."
class="icon-grid-search" type="text" autocomplete="off"
onkeydown={handleKeydown} />
{/if}
<div class="icon-grid" style="grid-template-columns: repeat({columns}, 1fr);" role="listbox">
{#each filtered as item}
<button type="button"
class="icon-grid-cell"
class:active={String(item.value) === String(value)}
role="option"
aria-selected={String(item.value) === String(value)}
onclick={() => select(item)}>
<span class="icon-grid-cell-icon"><MdiIcon name={item.icon} size={22} /></span>
<span class="icon-grid-cell-label">{item.label}</span>
{#if item.desc}
<span class="icon-grid-cell-desc">{item.desc}</span>
{/if}
</button>
{/each}
{#if filtered.length === 0}
<div class="icon-grid-empty" style="grid-column: 1 / -1; text-align: center; padding: 0.75rem; color: var(--color-muted-foreground); font-size: 0.75rem;">{t('common.noMatches')}</div>
<div style="{popupStyle} width: {columns * 160 + 16}px;"
class="icon-grid-popup">
{#if showSearch}
<input bind:this={searchEl} bind:value={search} placeholder="Filter..."
class="icon-grid-search" type="text" autocomplete="off"
onkeydown={handleKeydown} />
{/if}
<div class="icon-grid" style="grid-template-columns: repeat({columns}, 1fr);" role="listbox">
{#each filtered as item}
<button type="button"
class="icon-grid-cell"
class:active={String(item.value) === String(value)}
role="option"
aria-selected={String(item.value) === String(value)}
onclick={() => select(item)}>
<span class="icon-grid-cell-icon"><MdiIcon name={item.icon} size={22} /></span>
<span class="icon-grid-cell-label">{item.label}</span>
{#if item.desc}
<span class="icon-grid-cell-desc">{item.desc}</span>
{/if}
</button>
{/each}
{#if filtered.length === 0}
<div class="icon-grid-empty">{t('common.noMatches')}</div>
{/if}
</div>
</div>
</div>
{/if}
@@ -132,20 +136,21 @@
width: 100%;
padding: 0.5rem 0.75rem;
border: 1px solid var(--color-border);
border-radius: 0.375rem;
border-radius: 0.625rem;
font-size: 0.875rem;
background: var(--color-background);
background: var(--color-input-bg);
color: var(--color-foreground);
transition: border-color 0.15s, box-shadow 0.15s;
transition: border-color 0.15s, box-shadow 0.15s, background 0.15s;
text-align: left;
}
.icon-grid-trigger:hover:not(.disabled) {
border-color: var(--color-primary);
border-color: var(--color-rule-strong);
background: var(--color-glass-strong);
}
.icon-grid-compact {
padding: 0.25rem 0.5rem;
padding: 0.3rem 0.55rem;
gap: 0.3rem;
font-size: 0.875rem;
font-size: 0.85rem;
}
.icon-grid-compact .icon-grid-trigger-label {
flex: none;
@@ -165,57 +170,93 @@
color: var(--color-muted-foreground);
transition: transform 0.15s;
}
/* Portal root — drains the popup out of any backdrop-filter ancestor.
Position: fixed isolates the stacking context at the root level. */
.icon-grid-portal-root {
position: fixed;
inset: 0;
z-index: 9998;
pointer-events: none;
}
.icon-grid-backdrop {
position: absolute;
inset: 0;
pointer-events: auto;
}
.icon-grid-popup {
background: var(--color-card);
border: 1px solid var(--color-border);
border-radius: 0.5rem;
box-shadow: 0 10px 30px rgba(0,0,0,0.3);
pointer-events: auto;
/* Solid surface — popups need legibility, not glass translucency. */
--igs-solid-bg: #131520;
background: var(--igs-solid-bg);
border: 1px solid var(--color-rule-strong);
border-radius: 14px;
box-shadow: var(--shadow-card), 0 24px 48px -16px rgba(0, 0, 0, 0.55);
padding: 0.5rem;
max-height: 320px;
overflow-y: auto;
scrollbar-width: thin;
}
:global([data-theme="light"]) .icon-grid-popup { --igs-solid-bg: #fafafe; }
.icon-grid-popup::after {
content: '';
position: absolute;
inset: 0;
border-radius: inherit;
pointer-events: none;
background: linear-gradient(180deg, var(--color-highlight), transparent 30%);
opacity: 0.4;
}
.icon-grid-search {
width: 100%;
padding: 0.375rem 0.5rem;
margin-bottom: 0.375rem;
border: none;
border-bottom: 1px solid var(--color-border);
border-radius: 0;
background: transparent;
padding: 0.45rem 0.6rem;
margin-bottom: 0.4rem;
border: 1px solid var(--color-border);
border-radius: 8px;
background: var(--color-glass-strong);
color: var(--color-foreground);
font-size: 0.8rem;
outline: none;
font-family: inherit;
}
.icon-grid-search:focus {
border-color: var(--color-primary);
box-shadow: 0 0 0 2px var(--color-glow);
}
.icon-grid {
display: grid;
gap: 0.375rem;
position: relative;
z-index: 1;
}
.icon-grid-cell {
display: flex;
flex-direction: column;
align-items: center;
gap: 0.25rem;
padding: 0.625rem 0.375rem;
border-radius: 0.375rem;
border: 2px solid transparent;
gap: 0.3rem;
padding: 0.7rem 0.45rem;
border-radius: 10px;
border: 1px solid transparent;
background: transparent;
color: var(--color-foreground);
cursor: pointer;
transition: all 0.15s;
text-align: center;
font-family: inherit;
}
.icon-grid-cell:hover {
background: var(--color-muted);
transform: scale(1.03);
background: var(--color-glass-strong);
border-color: var(--color-border);
}
.icon-grid-cell.active {
background: linear-gradient(135deg, color-mix(in srgb, var(--color-primary) 18%, transparent), color-mix(in srgb, var(--color-orchid) 18%, transparent));
border-color: var(--color-primary);
background: color-mix(in srgb, var(--color-primary) 10%, transparent);
box-shadow: inset 0 1px 0 var(--color-highlight), 0 0 0 1px color-mix(in srgb, var(--color-primary) 40%, transparent);
}
.icon-grid-cell-icon {
color: var(--color-muted-foreground);
}
.icon-grid-cell:hover .icon-grid-cell-icon { color: var(--color-foreground); }
.icon-grid-cell.active .icon-grid-cell-icon {
color: var(--color-primary);
}
@@ -229,4 +270,11 @@
color: var(--color-muted-foreground);
line-height: 1.2;
}
.icon-grid-empty {
grid-column: 1 / -1;
text-align: center;
padding: 0.85rem;
color: var(--color-muted-foreground);
font-size: 0.75rem;
}
</style>
+152 -22
View File
@@ -1,5 +1,6 @@
<script lang="ts">
import { getMdiPath, getAllMdiNames } from '$lib/mdi-lookup.svelte';
import { portal } from '$lib/portal';
let { value = '', onselect } = $props<{
value: string;
@@ -34,7 +35,14 @@
function toggleOpen() {
if (!open && buttonEl) {
const rect = buttonEl.getBoundingClientRect();
dropdownStyle = `position:fixed; z-index:9999; top:${rect.bottom + 4}px; left:${rect.left}px;`;
const popupWidth = 320; // 20rem
const popupHeight = 320;
const spaceBelow = window.innerHeight - rect.bottom;
const top = spaceBelow > popupHeight + 16
? rect.bottom + 4
: Math.max(8, rect.top - popupHeight - 4);
const left = Math.min(rect.left, window.innerWidth - popupWidth - 16);
dropdownStyle = `position:fixed; z-index:9999; top:${top}px; left:${Math.max(8, left)}px;`;
}
open = !open;
if (!open) search = '';
@@ -58,36 +66,158 @@
<div class="inline-block">
<button type="button" bind:this={buttonEl} onclick={toggleOpen}
class="flex items-center justify-center gap-1 px-2 py-2 border border-[var(--color-border)] rounded-md text-sm bg-[var(--color-background)] hover:bg-[var(--color-muted)] transition-colors">
class="icon-picker-trigger">
{#if value && getMdiPath(value)}
<svg viewBox="0 0 24 24" width="18" height="18" fill="currentColor"><path d={getMdiPath(value)} /></svg>
{:else}
<span class="text-[var(--color-muted-foreground)] text-xs">Icon</span>
<span class="icon-picker-placeholder">Icon</span>
{/if}
<span class="text-xs text-[var(--color-muted-foreground)]"></span>
<span class="icon-picker-caret"></span>
</button>
</div>
{#if open}
<div style="position:fixed; top:0; left:0; right:0; bottom:0; z-index:9998;"
role="presentation"
onclick={() => { open = false; search = ''; }}></div>
<!-- Portal popup so it escapes any backdrop-filter / transform ancestor
that would otherwise act as the containing block for position:fixed. -->
<div use:portal class="ip-portal-root">
<div class="ip-backdrop"
role="presentation"
onclick={() => { open = false; search = ''; }}></div>
<div style="{dropdownStyle} width: 20rem; background: var(--color-card); border: 1px solid var(--color-border); border-radius: 0.5rem; box-shadow: 0 10px 25px rgba(0,0,0,0.3); padding: 0.75rem;"
class="">
<input type="text" bind:value={search} placeholder="Search icons..."
class="w-full px-2 py-1 mb-2 border border-[var(--color-border)] rounded text-sm bg-[var(--color-background)]" />
<div style="display: grid; grid-template-columns: repeat(8, 1fr); gap: 0.25rem; max-height: 14rem; overflow-y: auto; overflow-x: hidden; scrollbar-width: thin;">
<button type="button" onclick={() => select('')}
class="flex items-center justify-center aspect-square rounded hover:bg-[var(--color-muted)] text-xs text-[var(--color-muted-foreground)]"
title="No icon"></button>
{#each filtered as iconName}
<button type="button" onclick={() => select(iconName)}
class="flex items-center justify-center aspect-square rounded hover:bg-[var(--color-muted)] {value === iconName ? 'bg-[var(--color-accent)]' : ''}"
title={iconName.replace('mdi', '')}>
<svg viewBox="0 0 24 24" width="18" height="18" fill="currentColor"><path d={getMdiPath(iconName)} /></svg>
</button>
{/each}
<div style={dropdownStyle} class="ip-popup">
<input type="text" bind:value={search} placeholder="Search icons..."
class="ip-search" autocomplete="off" />
<div class="ip-grid">
<button type="button" onclick={() => select('')}
class="ip-cell ip-cell--clear"
title="No icon"></button>
{#each filtered as iconName}
<button type="button" onclick={() => select(iconName)}
class="ip-cell {value === iconName ? 'is-active' : ''}"
title={iconName.replace('mdi', '')}>
<svg viewBox="0 0 24 24" width="18" height="18" fill="currentColor"><path d={getMdiPath(iconName)} /></svg>
</button>
{/each}
</div>
</div>
</div>
{/if}
<style>
.icon-picker-trigger {
display: inline-flex;
align-items: center;
gap: 0.35rem;
padding: 0.45rem 0.7rem;
border-radius: 0.625rem;
border: 1px solid var(--color-border);
background: var(--color-input-bg);
color: var(--color-foreground);
font-size: 0.85rem;
font-family: inherit;
cursor: pointer;
transition: all 0.15s;
}
.icon-picker-trigger:hover {
background: var(--color-glass-strong);
border-color: var(--color-rule-strong);
}
.icon-picker-placeholder {
color: var(--color-muted-foreground);
font-size: 0.78rem;
}
.icon-picker-caret {
color: var(--color-muted-foreground);
font-size: 0.7rem;
}
/* Portal root — drains the popup out of any backdrop-filter ancestor */
.ip-portal-root {
position: fixed;
inset: 0;
z-index: 9998;
pointer-events: none;
}
.ip-backdrop {
position: absolute;
inset: 0;
pointer-events: auto;
}
.ip-popup {
pointer-events: auto;
width: 20rem;
--ip-solid-bg: #131520;
background: var(--ip-solid-bg);
border: 1px solid var(--color-rule-strong);
border-radius: 14px;
box-shadow: var(--shadow-card), 0 24px 48px -16px rgba(0, 0, 0, 0.55);
padding: 0.65rem;
position: relative;
}
:global([data-theme="light"]) .ip-popup { --ip-solid-bg: #fafafe; }
.ip-popup::after {
content: '';
position: absolute; inset: 0;
border-radius: inherit;
pointer-events: none;
background: linear-gradient(180deg, var(--color-highlight), transparent 30%);
opacity: 0.4;
}
.ip-search {
width: 100%;
padding: 0.45rem 0.6rem;
margin-bottom: 0.5rem;
border: 1px solid var(--color-border);
border-radius: 8px;
background: var(--color-glass-strong);
color: var(--color-foreground);
font-size: 0.82rem;
outline: none;
font-family: inherit;
position: relative;
z-index: 1;
}
.ip-search:focus {
border-color: var(--color-primary);
box-shadow: 0 0 0 2px var(--color-glow);
}
.ip-grid {
display: grid;
grid-template-columns: repeat(8, 1fr);
gap: 0.25rem;
max-height: 14rem;
overflow-y: auto;
overflow-x: hidden;
scrollbar-width: thin;
position: relative;
z-index: 1;
}
.ip-cell {
display: flex;
align-items: center;
justify-content: center;
aspect-ratio: 1;
border-radius: 8px;
border: 1px solid transparent;
background: transparent;
color: var(--color-foreground);
cursor: pointer;
transition: all 0.15s;
}
.ip-cell:hover {
background: var(--color-glass-strong);
border-color: var(--color-border);
}
.ip-cell.is-active {
background: linear-gradient(135deg,
color-mix(in srgb, var(--color-primary) 18%, transparent),
color-mix(in srgb, var(--color-orchid) 18%, transparent));
border-color: var(--color-primary);
color: var(--color-primary);
box-shadow: inset 0 1px 0 var(--color-highlight);
}
.ip-cell--clear {
color: var(--color-muted-foreground);
font-size: 0.75rem;
}
</style>
+46 -15
View File
@@ -84,23 +84,54 @@
}
}),
EditorView.lineWrapping,
EditorView.theme({
'&': { fontSize: '13px', fontFamily: "'Consolas', 'Monaco', 'Courier New', monospace" },
'.cm-content': { minHeight: `${rows * 1.5}em`, padding: '8px' },
'.cm-editor': { borderRadius: '0.375rem', border: '1px solid var(--color-border)' },
'.cm-focused': { outline: '2px solid var(--color-primary)', outlineOffset: '0px' },
'.cm-error-line': { backgroundColor: 'rgba(239, 68, 68, 0.2)', outline: '1px solid rgba(239, 68, 68, 0.4)' },
'.ͼc': { color: '#e879f9' },
'.ͼd': { color: '#38bdf8' },
'.ͼ5': { color: '#6b7280' },
'.cm-tooltip-autocomplete': {
border: '1px solid var(--color-border)',
borderRadius: '0.375rem',
fontSize: '12px',
},
}),
];
// Apply oneDark first so its syntax-token colors are kept,
// then override with our Aurora-aware theme so background,
// borders, and gutters match the rest of the design.
if (isDark) extensions.push(oneDark);
extensions.push(EditorView.theme({
'&': {
fontSize: '13px',
fontFamily: 'var(--font-mono)',
backgroundColor: 'var(--color-input-bg) !important',
borderRadius: '14px',
border: '1px solid var(--color-rule-strong)',
color: 'var(--color-foreground)',
overflow: 'hidden',
},
'.cm-editor': { backgroundColor: 'transparent !important', borderRadius: '14px' },
'.cm-scroller': { backgroundColor: 'transparent !important' },
'.cm-content': { minHeight: `${rows * 1.5}em`, padding: '12px 14px', caretColor: 'var(--color-primary)' },
'.cm-gutters': {
backgroundColor: 'transparent',
color: 'var(--color-muted-foreground)',
borderRight: '1px solid var(--color-border)',
},
'.cm-activeLineGutter': { backgroundColor: 'var(--color-glass-strong)' },
'.cm-activeLine': { backgroundColor: 'var(--color-glass-strong)' },
'.cm-cursor': { borderLeftColor: 'var(--color-primary)' },
'.cm-selectionBackground, ::selection': { backgroundColor: 'var(--color-glass-elev) !important' },
'&.cm-focused .cm-selectionBackground': { backgroundColor: 'var(--color-glow) !important' },
'.cm-focused': { outline: 'none' },
'&.cm-focused': { borderColor: 'var(--color-primary)', boxShadow: '0 0 0 3px var(--color-glow)' },
'.cm-error-line': { backgroundColor: 'rgba(255, 138, 120, 0.18)', outline: '1px solid rgba(255, 138, 120, 0.4)' },
'.ͼc': { color: 'var(--color-orchid)' },
'.ͼd': { color: 'var(--color-sky)' },
'.ͼ5': { color: 'var(--color-muted-foreground)' },
'.cm-tooltip-autocomplete': {
background: 'color-mix(in srgb, var(--color-background) 92%, transparent)',
backdropFilter: 'blur(28px) saturate(160%)',
border: '1px solid var(--color-rule-strong)',
borderRadius: '12px',
fontSize: '12px',
boxShadow: '0 12px 30px -12px rgba(0,0,0,0.4)',
overflow: 'hidden',
},
'.cm-tooltip-autocomplete > ul > li[aria-selected]': {
backgroundColor: 'var(--color-glass-elev)',
color: 'var(--color-primary)',
},
}));
if (placeholder) extensions.push(cmPlaceholder(placeholder));
return extensions;
}
+98 -41
View File
@@ -1,7 +1,7 @@
<script lang="ts">
import { onMount } from 'svelte';
import MdiIcon from './MdiIcon.svelte';
import { t } from '$lib/i18n';
import { portal } from '$lib/portal';
let { open = false, title = '', onclose, children } = $props<{
open: boolean;
@@ -11,7 +11,7 @@
}>();
let visible = $state(false);
let panelEl: HTMLDivElement;
let panelEl = $state<HTMLDivElement | undefined>();
let previouslyFocused: HTMLElement | null = null;
const uniqueId = `modal-${Math.random().toString(36).slice(2, 9)}`;
@@ -74,86 +74,143 @@
<svelte:window onkeydown={open ? handleKeydown : undefined} />
{#if open}
<div
class="modal-backdrop"
class:visible
style="position: fixed; top: 0; left: 0; right: 0; bottom: 0; z-index: 9999; display: flex; align-items: center; justify-content: center;"
onclick={onclose}
onkeydown={handleBackdropKeydown}
role="presentation"
>
<div use:portal class="modal-portal-root">
<div
bind:this={panelEl}
class="modal-panel"
class="modal-backdrop"
class:visible
role="dialog"
aria-modal="true"
aria-labelledby="modal-title-{uniqueId}"
style="background: var(--color-card); border: 1px solid var(--color-border); border-radius: 1rem; width: 100%; max-width: 32rem; max-height: 80vh; margin: 1rem; display: flex; flex-direction: column;"
onclick={(e) => e.stopPropagation()}
onclick={onclose}
onkeydown={handleBackdropKeydown}
role="button"
tabindex="-1"
aria-label={t('common.close')}
>
<div style="display: flex; align-items: center; justify-content: space-between; padding: 1.5rem 1.5rem 1rem;">
<h3 id="modal-title-{uniqueId}" style="font-size: 1.125rem; font-weight: 600;">{title}</h3>
<button class="modal-close" onclick={onclose} aria-label={t('common.close')}>
<MdiIcon name="mdiClose" size={18} />
</button>
</div>
<div style="padding: 0 1.5rem 1.5rem; overflow-y: auto;">
{@render children()}
<!-- svelte-ignore a11y_click_events_have_key_events -->
<div
bind:this={panelEl}
class="modal-panel"
class:visible
role="dialog"
tabindex="-1"
aria-modal="true"
aria-labelledby="modal-title-{uniqueId}"
onclick={(e) => e.stopPropagation()}
>
<div class="modal-head">
<h3 id="modal-title-{uniqueId}" class="modal-title">{title}</h3>
<button class="modal-close" onclick={onclose} aria-label={t('common.close')}>
<MdiIcon name="mdiClose" size={18} />
</button>
</div>
<div class="modal-body">
{@render children()}
</div>
</div>
</div>
</div>
{/if}
<style>
.modal-portal-root {
position: fixed;
inset: 0;
z-index: 9999;
}
.modal-backdrop {
position: absolute;
inset: 0;
display: flex;
align-items: center;
justify-content: center;
background: rgba(0, 0, 0, 0);
backdrop-filter: blur(0px);
transition: background 0.25s ease, backdrop-filter 0.25s ease;
}
.modal-backdrop.visible {
background: rgba(0, 0, 0, 0.5);
backdrop-filter: blur(4px);
background: rgba(0, 0, 0, 0.55);
backdrop-filter: blur(8px) saturate(120%);
-webkit-backdrop-filter: blur(8px) saturate(120%);
}
.modal-panel {
--modal-solid-bg: #131520;
background: var(--modal-solid-bg);
border: 1px solid var(--color-rule-strong);
border-radius: 18px;
width: 100%;
max-width: 32rem;
max-height: 80vh;
margin: 1rem;
display: flex;
flex-direction: column;
opacity: 0;
transform: translateY(12px) scale(0.97);
transition: opacity 0.25s ease, transform 0.25s ease;
box-shadow:
0 8px 32px rgba(0, 0, 0, 0.12),
0 0 0 1px rgba(255, 255, 255, 0.05) inset;
var(--shadow-card),
0 30px 80px -20px rgba(0, 0, 0, 0.6);
position: relative;
overflow: hidden;
}
.modal-panel::after {
content: '';
position: absolute; inset: 0;
border-radius: inherit;
pointer-events: none;
background: linear-gradient(180deg, var(--color-highlight), transparent 30%);
opacity: 0.4;
}
:global([data-theme="dark"]) .modal-panel {
box-shadow:
0 8px 32px rgba(0, 0, 0, 0.4),
0 0 48px var(--color-glow),
0 0 0 1px rgba(255, 255, 255, 0.03) inset;
}
:global([data-theme="light"]) .modal-panel { --modal-solid-bg: #fafafe; }
.modal-panel.visible {
opacity: 1;
transform: translateY(0) scale(1);
}
.modal-head {
position: relative;
z-index: 1;
display: flex;
align-items: center;
justify-content: space-between;
padding: 1.4rem 1.5rem 1rem;
}
.modal-title {
font-family: var(--font-display);
font-weight: 400;
font-size: 1.4rem;
letter-spacing: -0.02em;
color: var(--color-foreground);
margin: 0;
}
.modal-body {
position: relative;
z-index: 1;
padding: 0 1.5rem 1.5rem;
overflow-y: auto;
}
.modal-close {
display: flex;
align-items: center;
justify-content: center;
width: 2rem;
height: 2rem;
border-radius: 0.5rem;
border: none;
width: 2.5rem;
height: 2.5rem;
border-radius: 10px;
border: 1px solid transparent;
background: transparent;
color: var(--color-muted-foreground);
cursor: pointer;
transition: all 0.2s ease;
transition: all 0.15s ease;
}
.modal-close:hover {
background: var(--color-muted);
background: var(--color-glass-strong);
border-color: var(--color-border);
color: var(--color-foreground);
}
</style>
@@ -1,6 +1,7 @@
<script lang="ts">
import MdiIcon from './MdiIcon.svelte';
import { t } from '$lib/i18n';
import { portal } from '$lib/portal';
export interface MultiEntityItem {
value: string;
@@ -26,8 +27,8 @@
let open = $state(false);
let query = $state('');
let highlightIdx = $state(0);
let inputEl: HTMLInputElement;
let listEl: HTMLDivElement;
let inputEl = $state<HTMLInputElement | undefined>();
let listEl = $state<HTMLDivElement | undefined>();
const selectedItems = $derived(items.filter(i => (values || []).includes(i.value)));
@@ -110,56 +111,58 @@
</button>
</div>
<!-- Palette overlay -->
<!-- Palette overlay — portalled to <body> to escape backdrop-filter ancestors -->
{#if open}
<div class="mes-overlay" onclick={closePalette} role="presentation"></div>
<div use:portal class="mes-portal-root">
<div class="mes-overlay" onclick={closePalette} role="presentation"></div>
<div class="mes-container">
<div class="mes-search-row">
<MdiIcon name="mdiMagnify" size={18} />
<input
bind:this={inputEl}
bind:value={query}
placeholder={t('common.search')}
class="mes-input"
type="text"
autocomplete="off"
spellcheck="false"
onkeydown={handleKeydown}
/>
<span class="mes-count">{(values || []).length}/{items.length}</span>
<kbd class="mes-kbd">ESC</kbd>
</div>
<div class="mes-container">
<div class="mes-search-row">
<MdiIcon name="mdiMagnify" size={18} />
<input
bind:this={inputEl}
bind:value={query}
placeholder={t('common.search')}
class="mes-input"
type="text"
autocomplete="off"
spellcheck="false"
onkeydown={handleKeydown}
/>
<span class="mes-count">{(values || []).length}/{items.length}</span>
<kbd class="mes-kbd">ESC</kbd>
</div>
<div class="mes-list" bind:this={listEl} role="listbox">
{#if filtered.length === 0}
<div class="mes-empty">{t('common.noMatches')}</div>
{:else}
{#each filtered as item, i}
{@const checked = (values || []).includes(item.value)}
<button
class="mes-item"
class:mes-highlight={i === highlightIdx}
class:mes-checked={checked}
role="option"
aria-selected={checked}
onclick={() => toggleItem(item)}
onmouseenter={() => highlightIdx = i}
type="button"
>
<span class="mes-item-check">
<MdiIcon name={checked ? 'mdiCheckboxMarked' : 'mdiCheckboxBlankOutline'} size={16} />
</span>
{#if item.icon}
<span class="mes-item-icon"><MdiIcon name={item.icon} size={18} /></span>
{/if}
<span class="mes-item-label">{item.label}</span>
{#if item.desc}
<span class="mes-item-desc">{item.desc}</span>
{/if}
</button>
{/each}
{/if}
<div class="mes-list" bind:this={listEl} role="listbox">
{#if filtered.length === 0}
<div class="mes-empty">{t('common.noMatches')}</div>
{:else}
{#each filtered as item, i}
{@const checked = (values || []).includes(item.value)}
<button
class="mes-item"
class:mes-highlight={i === highlightIdx}
class:mes-checked={checked}
role="option"
aria-selected={checked}
onclick={() => toggleItem(item)}
onmouseenter={() => highlightIdx = i}
type="button"
>
<span class="mes-item-check">
<MdiIcon name={checked ? 'mdiCheckboxMarked' : 'mdiCheckboxBlankOutline'} size={16} />
</span>
{#if item.icon}
<span class="mes-item-icon"><MdiIcon name={item.icon} size={18} /></span>
{/if}
<span class="mes-item-label">{item.label}</span>
{#if item.desc}
<span class="mes-item-desc">{item.desc}</span>
{/if}
</button>
{/each}
{/if}
</div>
</div>
</div>
{/if}
@@ -233,32 +236,42 @@
flex-shrink: 0;
}
/* Overlay */
.mes-overlay {
/* Portal root */
.mes-portal-root {
position: fixed;
inset: 0;
z-index: 9998;
background: rgba(0, 0, 0, 0.4);
backdrop-filter: blur(2px);
pointer-events: none;
}
.mes-overlay {
position: absolute;
inset: 0;
pointer-events: auto;
background: rgba(0, 0, 0, 0.55);
backdrop-filter: blur(8px) saturate(120%);
-webkit-backdrop-filter: blur(8px) saturate(120%);
}
/* Palette container */
/* Palette container — solid background for legibility */
.mes-container {
position: fixed;
pointer-events: auto;
position: absolute;
top: min(20vh, 120px);
left: 50%;
transform: translateX(-50%);
z-index: 9999;
width: min(460px, 90vw);
z-index: 1;
width: min(480px, 92vw);
max-height: 60vh;
background: var(--color-card);
border: 1px solid var(--color-border);
border-radius: 0.75rem;
box-shadow: 0 20px 60px rgba(0, 0, 0, 0.4);
background: var(--mes-solid-bg);
border: 1px solid var(--color-rule-strong);
border-radius: 16px;
box-shadow: var(--shadow-card), 0 24px 48px -16px rgba(0, 0, 0, 0.55);
display: flex;
flex-direction: column;
overflow: hidden;
--mes-solid-bg: #131520;
}
:global([data-theme="light"]) .mes-container { --mes-solid-bg: #fafafe; }
.mes-search-row {
display: flex;
@@ -319,7 +332,11 @@
transition: background 0.1s;
}
.mes-item:hover, .mes-item.mes-highlight {
background: var(--color-muted);
background: rgba(255, 255, 255, 0.06);
}
:global([data-theme="light"]) .mes-item:hover,
:global([data-theme="light"]) .mes-item.mes-highlight {
background: rgba(20, 15, 60, 0.05);
}
.mes-item-check {
flex-shrink: 0;
@@ -0,0 +1,92 @@
<script lang="ts">
/**
* Thin-stroke SVG icon set for navigation surfaces.
*
* Mirrors the visual language of the Aurora design mockups — soft outline
* glyphs at 1.6px stroke. Falls back to MdiIcon for any name we don't
* have a hand-drawn version of, so the existing navEntries config keeps
* working unchanged.
*/
import MdiIcon from './MdiIcon.svelte';
interface Props {
name: string;
size?: number;
}
const { name, size = 18 }: Props = $props();
</script>
{#if name === 'mdiViewDashboard'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><path d="M3 12h4l3-9 4 18 3-9h4"/></svg>
{:else if name === 'mdiServer'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="7" height="7" rx="1.5"/><rect x="14" y="3" width="7" height="7" rx="1.5"/><rect x="3" y="14" width="7" height="7" rx="1.5"/><rect x="14" y="14" width="7" height="7" rx="1.5"/></svg>
{:else if name === 'mdiBellOutline' || name === 'mdiBell'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><path d="M6 8a6 6 0 0 1 12 0c0 7 3 9 3 9H3s3-2 3-9"/><path d="M10 21a2 2 0 0 0 4 0"/></svg>
{:else if name === 'mdiConsoleLine'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="4" width="18" height="16" rx="2"/><path d="M7 9l3 3-3 3M13 15h4"/></svg>
{:else if name === 'mdiRobotOutline' || name === 'mdiRobot'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><rect x="4" y="6" width="16" height="14" rx="3"/><circle cx="9" cy="12" r="1.2"/><circle cx="15" cy="12" r="1.2"/><path d="M8 17c1.5 1 6.5 1 8 0M12 3v3"/></svg>
{:else if name === 'mdiTarget'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="9"/><path d="M3 12h18M12 3a14 14 0 0 1 0 18M12 3a14 14 0 0 0 0 18"/></svg>
{:else if name === 'mdiCogOutline' || name === 'mdiCog'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="3"/><path d="M19.4 15a1.7 1.7 0 0 0 .3 1.8l.1.1a2 2 0 1 1-2.8 2.8l-.1-.1a1.7 1.7 0 0 0-1.8-.3 1.7 1.7 0 0 0-1 1.5V21a2 2 0 1 1-4 0v-.1a1.7 1.7 0 0 0-1.1-1.5 1.7 1.7 0 0 0-1.8.3l-.1.1a2 2 0 1 1-2.8-2.8l.1-.1a1.7 1.7 0 0 0 .3-1.8 1.7 1.7 0 0 0-1.5-1H3a2 2 0 1 1 0-4h.1a1.7 1.7 0 0 0 1.5-1.1 1.7 1.7 0 0 0-.3-1.8l-.1-.1a2 2 0 1 1 2.8-2.8l.1.1a1.7 1.7 0 0 0 1.8.3H9a1.7 1.7 0 0 0 1-1.5V3a2 2 0 1 1 4 0v.1a1.7 1.7 0 0 0 1 1.5 1.7 1.7 0 0 0 1.8-.3l.1-.1a2 2 0 1 1 2.8 2.8l-.1.1a1.7 1.7 0 0 0-.3 1.8V9a1.7 1.7 0 0 0 1.5 1H21a2 2 0 1 1 0 4h-.1a1.7 1.7 0 0 0-1.5 1z"/></svg>
{:else if name === 'mdiRadar'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="3"/><circle cx="12" cy="12" r="8"/><path d="M12 4v3M12 17v3M4 12h3M17 12h3"/></svg>
{:else if name === 'mdiFileDocumentEdit'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-8"/><path d="M14 2v6h6"/><path d="M18 14l3 3-5 5h-3v-3z"/></svg>
{:else if name === 'mdiCodeBracesBox'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M9 8a2 2 0 0 0-2 2v1.5a1 1 0 0 1-1 1 1 1 0 0 1 1 1V15a2 2 0 0 0 2 2M15 8a2 2 0 0 1 2 2v1.5a1 1 0 0 0 1 1 1 1 0 0 0-1 1V15a2 2 0 0 1-2 2"/></svg>
{:else if name === 'mdiPlayCircleOutline'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="9"/><path d="M10 9l5 3-5 3z" fill="currentColor"/></svg>
{:else if name === 'mdiSendCircle' || name === 'mdiSend'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><path d="M22 2L11 13M22 2l-7 20-4-9-9-4z"/></svg>
{:else if name === 'mdiEmailOutline'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="5" width="18" height="14" rx="2"/><path d="M3 7l9 7 9-7"/></svg>
{:else if name === 'mdiMatrix'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="3" height="18"/><rect x="18" y="3" width="3" height="18"/><path d="M6 6h2M6 18h2M16 6h2M16 18h2"/></svg>
{:else if name === 'mdiWebhook'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><circle cx="6" cy="18" r="3"/><circle cx="18" cy="18" r="3"/><circle cx="12" cy="5" r="3"/><path d="M12 8l-4 7M15 18H9M16 8l4 7"/></svg>
{:else if name === 'mdiChat'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><path d="M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2z"/></svg>
{:else if name === 'mdiSlack'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><rect x="9" y="3" width="3" height="9" rx="1.5"/><rect x="14" y="9" width="7" height="3" rx="1.5"/><rect x="12" y="14" width="3" height="7" rx="1.5"/><rect x="3" y="12" width="7" height="3" rx="1.5"/></svg>
{:else if name === 'mdiBullhorn'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><path d="M3 11v3a1 1 0 0 0 1 1h3l5 4V6L7 10H4a1 1 0 0 0-1 1z"/><path d="M16 8a5 5 0 0 1 0 8M19 5a9 9 0 0 1 0 14"/></svg>
{:else if name === 'mdiBackupRestore'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><path d="M3 12a9 9 0 1 0 3-6.7"/><path d="M3 4v5h5"/><path d="M12 7v5l3 2"/></svg>
{:else if name === 'mdiAccountGroup'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><circle cx="9" cy="8" r="3.5"/><path d="M2 21a7 7 0 0 1 14 0"/><circle cx="17" cy="6" r="3"/><path d="M22 18a5 5 0 0 0-5-5"/></svg>
{:else if name === 'mdiChevronRight'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M9 6l6 6-6 6"/></svg>
{:else if name === 'mdiChevronLeft'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M15 6l-6 6 6 6"/></svg>
{:else if name === 'mdiChevronDown'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M6 9l6 6 6-6"/></svg>
{:else if name === 'mdiMagnify'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="7"/><path d="M21 21l-4.3-4.3"/></svg>
{:else if name === 'mdiLogout'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4M16 17l5-5-5-5M21 12H9"/></svg>
{:else if name === 'mdiKeyVariant'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><circle cx="8" cy="15" r="4"/><path d="M11 13l9-9 2 2-2 2 2 2-3 3-2-2"/></svg>
{:else if name === 'mdiApi'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="18" height="18" rx="3"/><path d="M7 16V9a2 2 0 1 1 4 0v7M7 13h4M14 9v7M17 9v7"/></svg>
{:else if name === 'mdiWeatherNight'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><path d="M21 12.8A9 9 0 1 1 11.2 3a7 7 0 0 0 9.8 9.8z"/></svg>
{:else if name === 'mdiWeatherSunny'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="4"/><path d="M12 3v2M12 19v2M3 12h2M19 12h2M5.6 5.6l1.4 1.4M17 17l1.4 1.4M5.6 18.4L7 17M17 7l1.4-1.4"/></svg>
{:else if name === 'mdiDesktopTowerMonitor'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><rect x="2" y="4" width="14" height="10" rx="1"/><path d="M9 14v3M6 17h6"/><rect x="18" y="4" width="4" height="16" rx="1"/></svg>
{:else if name === 'mdiFilterOff'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><path d="M3 3l18 18M22 3H6l3.4 4.4M14 13v8l-4-2v-4"/></svg>
{:else if name === 'mdiDotsHorizontal'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="currentColor"><circle cx="6" cy="12" r="1.6"/><circle cx="12" cy="12" r="1.6"/><circle cx="18" cy="12" r="1.6"/></svg>
{:else if name === 'mdiPulse'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><path d="M3 12h4l3-9 4 18 3-9h4"/></svg>
{:else if name === 'mdiPlus'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 5v14M5 12h14"/></svg>
{:else if name === 'mdiArrowRight'}
<svg viewBox="0 0 24 24" width={size} height={size} fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M5 12h14M12 5l7 7-7 7"/></svg>
{:else}
<MdiIcon {name} {size} />
{/if}
+216 -15
View File
@@ -1,21 +1,222 @@
<script lang="ts">
let { title, description = '', children } = $props<{
import type { Snippet } from 'svelte';
export interface HeaderPill {
label: string;
tone?: 'mint' | 'sky' | 'orchid' | 'coral' | 'citrus' | 'primary';
icon?: string;
}
interface Props {
title: string;
/** Italic-emphasized word(s) appended to the title with a gradient. */
emphasis?: string;
/** Body text under the title. */
description?: string;
children?: import('svelte').Snippet;
}>();
/** Small label above the title (breadcrumb / section). */
crumb?: string;
/** Right-side count meter — e.g. "12 providers". */
count?: number | string;
/** Label under the count, e.g. "providers". */
countLabel?: string;
/** Status pills shown beneath the description. */
pills?: HeaderPill[];
/** Primary actions (buttons) — rendered top-right next to the meter. */
children?: Snippet;
}
let {
title,
emphasis = '',
description = '',
crumb = '',
count,
countLabel = '',
pills = [],
children,
}: Props = $props();
const toneColors: Record<NonNullable<HeaderPill['tone']>, string> = {
mint: 'var(--color-mint)',
sky: 'var(--color-sky)',
orchid: 'var(--color-orchid)',
coral: 'var(--color-coral)',
citrus: 'var(--color-citrus)',
primary: 'var(--color-primary)',
};
</script>
<div class="flex items-center justify-between mb-8">
<div class="animate-fade-slide-in">
<h2 class="text-2xl font-semibold tracking-tight">{title}</h2>
{#if description}
<p class="text-sm mt-1.5" style="color: var(--color-muted-foreground);">{description}</p>
{/if}
</div>
{#if children}
<div class="animate-fade-slide-in" style="animation-delay: 60ms;">
{@render children()}
<section class="subpage-hero">
<div class="subpage-hero__row">
<div class="subpage-hero__main">
{#if crumb}
<div class="subpage-hero__crumb">{crumb}</div>
{/if}
<h2 class="subpage-hero__title">
{title}{#if emphasis}&nbsp;<em>{emphasis}</em>{/if}
</h2>
{#if description}
<p class="subpage-hero__sub">{description}</p>
{/if}
{#if pills.length > 0}
<div class="subpage-hero__pills">
{#each pills as p}
<span class="subpage-hero__pill">
<span class="subpage-hero__pill-dot" style="background: {toneColors[p.tone ?? 'primary']}"></span>
{p.label}
</span>
{/each}
</div>
{/if}
</div>
{/if}
</div>
<div class="subpage-hero__side">
{#if count !== undefined}
<div class="subpage-hero__meter">
<div class="subpage-hero__meter-value font-mono">{count}</div>
{#if countLabel}
<div class="subpage-hero__meter-label">{countLabel}</div>
{/if}
</div>
{/if}
{#if children}
<div class="subpage-hero__actions">{@render children()}</div>
{/if}
</div>
</div>
</section>
<style>
.subpage-hero {
position: relative;
background: var(--color-glass);
backdrop-filter: blur(28px) saturate(160%);
-webkit-backdrop-filter: blur(28px) saturate(160%);
border: 1px solid var(--color-border);
border-radius: 22px;
box-shadow: var(--shadow-card);
padding: 1.4rem 1.6rem 1.5rem;
margin-bottom: 1.5rem;
overflow: hidden;
}
.subpage-hero::after {
content: '';
position: absolute;
inset: 0;
border-radius: inherit;
pointer-events: none;
background: linear-gradient(180deg, var(--color-highlight), transparent 30%);
opacity: 0.4;
}
.subpage-hero__row {
position: relative;
z-index: 1;
display: flex;
align-items: stretch;
justify-content: space-between;
gap: 1.5rem;
flex-wrap: wrap;
min-height: 100%;
}
.subpage-hero__main { min-width: 0; flex: 1; }
.subpage-hero__crumb {
font-family: var(--font-mono);
font-size: 0.62rem;
color: var(--color-muted-foreground);
letter-spacing: 0.18em;
text-transform: uppercase;
margin-bottom: 0.55rem;
font-weight: 500;
}
.subpage-hero__title {
font-family: var(--font-display);
font-weight: 400;
font-size: 2.15rem;
line-height: 1.05;
letter-spacing: -0.025em;
color: var(--color-foreground);
margin: 0;
}
.subpage-hero__title em {
font-style: italic;
background: linear-gradient(135deg, var(--color-orchid), var(--color-primary) 60%, var(--color-sky));
-webkit-background-clip: text;
background-clip: text;
color: transparent;
}
.subpage-hero__sub {
font-size: 0.88rem;
color: var(--color-muted-foreground);
margin: 0.55rem 0 0;
line-height: 1.55;
max-width: 60ch;
}
.subpage-hero__pills {
display: flex;
flex-wrap: wrap;
gap: 0.4rem;
margin-top: 0.85rem;
}
.subpage-hero__pill {
display: inline-flex;
align-items: center;
gap: 0.35rem;
padding: 0.22rem 0.65rem;
border-radius: 999px;
background: var(--color-glass-strong);
border: 1px solid var(--color-border);
font-size: 0.7rem;
color: var(--color-muted-foreground);
font-weight: 500;
}
.subpage-hero__pill-dot {
width: 6px;
height: 6px;
border-radius: 50%;
}
.subpage-hero__side {
display: flex;
flex-direction: column;
align-items: flex-end;
flex-shrink: 0;
}
.subpage-hero__meter {
text-align: right;
display: flex;
flex-direction: column;
align-items: flex-end;
justify-content: center;
}
.subpage-hero__actions {
margin-top: auto;
padding-top: 0.95rem;
display: flex;
gap: 0.5rem;
align-items: center;
}
.subpage-hero__meter-value {
font-size: 2.15rem;
font-weight: 500;
color: var(--color-foreground);
font-variant-numeric: tabular-nums;
line-height: 1;
letter-spacing: -0.025em;
}
.subpage-hero__meter-label {
font-size: 0.62rem;
text-transform: uppercase;
letter-spacing: 0.16em;
color: var(--color-muted-foreground);
margin-top: 0.4rem;
font-weight: 500;
}
@media (max-width: 640px) {
.subpage-hero { padding: 1.1rem 1.2rem 1.25rem; }
.subpage-hero__title { font-size: 1.7rem; }
.subpage-hero__row { flex-direction: column; align-items: stretch; }
.subpage-hero__side { justify-content: space-between; }
}
</style>
@@ -26,7 +26,9 @@
let query = $state('');
let activeIndex = $state(0);
let loading = $state(false);
let inputEl: HTMLInputElement;
let inputEl = $state<HTMLInputElement | undefined>();
const listboxId = 'sp-listbox';
const optionId = (idx: number) => `sp-option-${idx}`;
// Expose openPalette to parent via callback
$effect(() => { onopen?.(openPalette); });
@@ -206,7 +208,7 @@
{#if open}
<!-- Backdrop -->
<div class="sp-backdrop" onclick={closePalette} role="presentation"></div>
<div class="sp-backdrop" onclick={closePalette} onkeydown={(e) => { if (e.key === 'Escape') closePalette(); }} role="button" tabindex="-1" aria-label={t('searchPalette.close')}></div>
<!-- Palette -->
<div class="sp-container">
@@ -218,11 +220,16 @@
placeholder={t('searchPalette.placeholder')}
class="sp-input"
type="text"
role="combobox"
aria-expanded={flatResults.length > 0}
aria-controls={listboxId}
aria-activedescendant={flatResults.length > 0 ? optionId(activeIndex) : undefined}
aria-autocomplete="list"
/>
<kbd class="sp-kbd">ESC</kbd>
</div>
<div class="sp-results">
<div class="sp-results" id={listboxId} role="listbox">
{#if loading}
<div class="sp-empty">
<div class="w-4 h-4 rounded-full border-2 border-[var(--color-primary)] border-t-transparent animate-spin"></div>
@@ -239,9 +246,12 @@
<MdiIcon name={group.icon} size={14} />
{group.label}
</div>
{#each group.items as item, i}
{#each group.items as item}
{@const flatIdx = flatIndexMap.get(item) ?? -1}
<button
id={optionId(flatIdx)}
role="option"
aria-selected={flatIdx === activeIndex}
class="sp-item"
class:sp-active={flatIdx === activeIndex}
onclick={() => navigateTo(item)}
@@ -271,129 +281,175 @@
position: fixed;
top: 0; left: 0; right: 0; bottom: 0;
z-index: 9998;
background: rgba(0, 0, 0, 0.5);
backdrop-filter: blur(4px);
background: rgba(0, 0, 0, 0.55);
backdrop-filter: blur(8px) saturate(120%);
-webkit-backdrop-filter: blur(8px) saturate(120%);
}
.sp-container {
position: fixed;
top: 20vh;
top: 18vh;
left: 50%;
transform: translateX(-50%);
z-index: 9999;
width: min(500px, 90vw);
background: var(--color-card);
border: 1px solid var(--color-border);
border-radius: 0.75rem;
box-shadow: 0 20px 60px rgba(0, 0, 0, 0.4);
width: min(640px, 92vw);
--sp-solid-bg: #131520;
background: var(--sp-solid-bg);
border: 1px solid var(--color-rule-strong);
border-radius: 18px;
box-shadow: var(--shadow-card), 0 30px 80px -20px rgba(0, 0, 0, 0.6);
overflow: hidden;
}
:global([data-theme="light"]) .sp-container { --sp-solid-bg: #fafafe; }
.sp-container::after {
content: '';
position: absolute;
inset: 0;
border-radius: inherit;
pointer-events: none;
background: linear-gradient(180deg, var(--color-highlight), transparent 30%);
opacity: 0.4;
}
.sp-input-row {
display: flex;
align-items: center;
gap: 0.5rem;
padding: 0.75rem 1rem;
gap: 0.65rem;
padding: 0.95rem 1.15rem;
border-bottom: 1px solid var(--color-border);
color: var(--color-muted-foreground);
position: relative;
z-index: 1;
}
.sp-input {
flex: 1;
border: none;
outline: none;
background: transparent;
font-size: 0.9rem;
font-size: 0.95rem;
color: var(--color-foreground);
font-family: var(--font-sans);
letter-spacing: -0.005em;
}
.sp-input::placeholder { color: var(--color-muted-foreground); }
.sp-kbd {
font-size: 0.6rem;
font-size: 0.62rem;
font-family: var(--font-mono);
padding: 0.15rem 0.35rem;
border-radius: 0.25rem;
background: var(--color-muted);
color: var(--color-muted-foreground);
padding: 0.2rem 0.45rem;
border-radius: 6px;
background: var(--color-glass-strong);
color: var(--color-foreground);
border: 1px solid var(--color-border);
}
.sp-results {
max-height: 50vh;
max-height: 52vh;
overflow-y: auto;
scrollbar-width: thin;
padding: 0.25rem;
padding: 0.35rem;
position: relative;
z-index: 1;
}
.sp-empty {
display: flex;
align-items: center;
justify-content: center;
gap: 0.5rem;
padding: 2rem;
gap: 0.55rem;
padding: 2.5rem 2rem;
color: var(--color-muted-foreground);
font-size: 0.85rem;
}
.sp-group-header {
display: flex;
align-items: center;
gap: 0.375rem;
padding: 0.375rem 0.75rem;
font-size: 0.65rem;
gap: 0.45rem;
padding: 0.6rem 0.85rem 0.35rem;
font-size: 0.6rem;
font-weight: 600;
text-transform: uppercase;
letter-spacing: 0.04em;
letter-spacing: 0.16em;
color: var(--color-muted-foreground);
font-family: var(--font-mono);
margin-top: 0.25rem;
}
.sp-group-header::after {
content: '';
flex: 1;
height: 1px;
background: var(--color-border);
margin-left: 0.35rem;
}
.sp-item {
display: flex;
align-items: center;
gap: 0.5rem;
gap: 0.65rem;
width: 100%;
padding: 0.5rem 0.75rem;
border-radius: 0.375rem;
border: none;
padding: 0.55rem 0.85rem;
border-radius: 10px;
border: 1px solid transparent;
background: transparent;
color: var(--color-foreground);
font-size: 0.85rem;
font-size: 0.88rem;
cursor: pointer;
text-align: left;
transition: background 0.1s;
transition: background 0.12s, border-color 0.12s;
font-family: var(--font-sans);
}
.sp-item:hover, .sp-item.sp-active {
background: var(--color-muted);
background: var(--color-glass-strong);
border-color: var(--color-border);
}
.sp-item.sp-active {
background: linear-gradient(135deg,
color-mix(in srgb, var(--color-primary) 14%, transparent),
color-mix(in srgb, var(--color-orchid) 14%, transparent));
border-color: color-mix(in srgb, var(--color-primary) 40%, var(--color-border));
box-shadow: inset 0 1px 0 var(--color-highlight);
}
.sp-item-icon {
flex-shrink: 0;
color: var(--color-muted-foreground);
width: 28px; height: 28px;
display: grid; place-items: center;
border-radius: 8px;
background: var(--color-glass-strong);
border: 1px solid var(--color-border);
}
.sp-item.sp-active .sp-item-icon {
color: var(--color-primary);
background: var(--color-glass-elev);
}
.sp-item-name {
flex: 1;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-weight: 500;
}
.sp-item-detail {
font-size: 0.7rem;
font-family: var(--font-mono);
color: var(--color-muted-foreground);
padding: 0.1rem 0.35rem;
padding: 0.12rem 0.5rem;
border-radius: 9999px;
background: var(--color-muted);
background: var(--color-glass-strong);
border: 1px solid var(--color-border);
white-space: nowrap;
}
.sp-footer {
display: flex;
gap: 1rem;
padding: 0.5rem 1rem;
padding: 0.6rem 1.15rem;
border-top: 1px solid var(--color-border);
font-size: 0.65rem;
color: var(--color-muted-foreground);
position: relative;
z-index: 1;
background: var(--color-glass-strong);
}
.sp-footer kbd {
font-family: var(--font-mono);
padding: 0.05rem 0.25rem;
border-radius: 0.2rem;
background: var(--color-muted);
padding: 0.1rem 0.35rem;
border-radius: 5px;
background: var(--color-glass);
border: 1px solid var(--color-border);
font-size: 0.6rem;
font-size: 0.62rem;
color: var(--color-foreground);
}
</style>
+21 -12
View File
@@ -3,6 +3,7 @@
import { getSnacks, removeSnack, type Snack } from '$lib/stores/snackbar.svelte';
import MdiIcon from '$lib/components/MdiIcon.svelte';
import { t } from '$lib/i18n';
import { portal } from '$lib/portal';
const snacks = $derived(getSnacks());
@@ -31,10 +32,7 @@
</script>
{#if snacks.length > 0}
<div
style="position: fixed; left: 50%; transform: translateX(-50%); z-index: 9999; display: flex; flex-direction: column; gap: 0.5rem; width: 90%; max-width: 26rem; pointer-events: none;"
class="snackbar-container"
>
<div use:portal class="snackbar-container">
{#each snacks as snack (snack.id)}
<div
in:fly={{ y: 40, duration: 300 }}
@@ -66,6 +64,16 @@
<style>
.snackbar-container {
position: fixed;
left: 50%;
transform: translateX(-50%);
z-index: 9999;
display: flex;
flex-direction: column;
gap: 0.5rem;
width: 90%;
max-width: 26rem;
pointer-events: none;
bottom: 5rem;
}
@media (min-width: 768px) {
@@ -75,20 +83,21 @@
}
.snack-item {
--snack-solid-bg: #131520;
pointer-events: auto;
display: flex;
align-items: flex-start;
gap: 0.625rem;
padding: 0.75rem 1rem;
border-radius: 0.75rem;
padding: 0.85rem 1rem;
border-radius: 14px;
border-left: 3px solid var(--snack-accent);
background: var(--color-card);
border-top: 1px solid var(--color-border);
border-right: 1px solid var(--color-border);
border-bottom: 1px solid var(--color-border);
box-shadow: 0 8px 24px rgba(0, 0, 0, 0.12), 0 0 0 1px rgba(255, 255, 255, 0.03) inset;
backdrop-filter: blur(12px);
background: var(--snack-solid-bg);
border-top: 1px solid var(--color-rule-strong);
border-right: 1px solid var(--color-rule-strong);
border-bottom: 1px solid var(--color-rule-strong);
box-shadow: var(--shadow-card), 0 12px 30px -10px rgba(0, 0, 0, 0.4);
}
:global([data-theme="light"]) .snack-item { --snack-solid-bg: #fafafe; }
:global([data-theme="dark"]) .snack-item {
box-shadow: 0 8px 24px rgba(0, 0, 0, 0.4), 0 0 16px color-mix(in srgb, var(--snack-accent) 10%, transparent);
+113 -10
View File
@@ -4,6 +4,10 @@
"tagline": "Service notifications"
},
"nav": {
"sectionOverview": "Overview",
"sectionRouting": "Routing",
"sectionOperators": "Operators",
"sectionSystem": "System",
"dashboard": "Dashboard",
"providers": "Providers",
"notificationTrackers": "Notif. Trackers",
@@ -55,7 +59,8 @@
"passwordTooShort": "Password must be at least 8 characters",
"or": "or",
"loginFailed": "Login failed",
"setupFailed": "Setup failed"
"setupFailed": "Setup failed",
"backendUnreachable": "Cannot reach the server. Check that it's running and try again."
},
"dashboard": {
"title": "Dashboard",
@@ -102,11 +107,46 @@
"last14days": "Last 14 days",
"event": "event",
"events": "events",
"noChartData": "No event data yet"
"noChartData": "No event data yet",
"live": "Live",
"attention": "Attention",
"heroPrefix": "Tonight,",
"heroEmphasis": "everything",
"heroSuffix": "is flowing.",
"heroSummary": "{providers} providers listening, {armed} of {total} trackers armed, {throughput} events dispatched across {targets} targets in 24h.",
"throughput24h": "throughput · 24h",
"eventsShort": "events",
"armedShort": "armed",
"providersShort": "providers",
"targetsShort": "targets",
"trackersShort": "trackers",
"streamTitle": "Signal",
"streamEmphasis": "stream",
"eventsLabel": "events",
"onWatchTitle": "On",
"onWatchEmphasis": "watch",
"noProviders": "No providers yet.",
"addProvider": "Add provider",
"addProviderHint": "Connect a service to start tracking",
"pulseTitle": "Pulse",
"pulseEmphasis": "· last 14 days",
"pulseSub": "Events grouped by day",
"wiresTitle": "Active",
"wiresEmphasis": "wires",
"wiresSub": "routes",
"composeTitle": "Pick a source. Choose a channel.",
"composeEmphasis": "Compose the wire.",
"composeSub": "Walk from provider → tracker → template → target. Or paste a webhook URL and we'll infer the rest.",
"viewTrackers": "View trackers",
"newTracker": "New tracker",
"eventsTotal": "Events"
},
"providers": {
"title": "Providers",
"description": "Manage service provider connections",
"title": "Service",
"titleEmphasis": "providers",
"description": "Connect to external services and webhooks. Each provider feeds events into trackers, which dispatch notifications across your channels.",
"typeSingular": "type",
"typePlural": "types",
"addProvider": "Add Provider",
"cancel": "Cancel",
"type": "Provider Type",
@@ -191,7 +231,10 @@
"cleared": "Payload history cleared"
},
"notificationTracker": {
"title": "Notification Trackers",
"title": "Notification",
"titleEmphasis": "trackers",
"armed": "armed",
"paused": "paused",
"description": "Monitor albums for changes",
"newTracker": "New Tracker",
"cancel": "Cancel",
@@ -249,7 +292,8 @@
"descending": "Descending",
"quietHoursStart": "Quiet hours start",
"quietHoursEnd": "Quiet hours end",
"batchDuration": "Batch duration (seconds)",
"adaptiveMaxSkip": "Adaptive polling cap",
"adaptiveMaxSkipPlaceholder": "Off (blank or 0)",
"defaultTrackingConfig": "Default tracking config",
"defaultTemplateConfig": "Default template config",
"linkedTargets": "targets",
@@ -261,7 +305,14 @@
"testPeriodic": "Test periodic summary",
"testScheduled": "Test scheduled assets",
"testMemory": "Test memory / On This Day",
"testDisabledHint": "Enable this feature in the tracker's default Tracking Config first.",
"checkingLinks": "Checking links...",
"featureDiscovery": "Configure periodic summaries, scheduled photo picks, memories, and quiet hours in the default Tracking Config.",
"openTrackingConfig": "Open Tracking Config",
"linkReplace": "Replace",
"linkReplacing": "Replacing...",
"linkReplaceFailed": "Failed to replace link for \"{name}\"",
"linkPasswordProtectedNote": "Telegram users can't open password-protected links without the password. Remove the password in Immich or replace the link.",
"missingLinksTitle": "Albums Missing Public Links",
"missingLinksDesc": "The following albums don't have public shared links. Without links, notification recipients won't be able to view photos.",
"expired": "Expired",
@@ -295,6 +346,11 @@
"albumDeleted": "Album deleted"
},
"targets": {
"titleEmphasis": "channel",
"titleEmphasisAll": "channels",
"receiver": "receiver",
"receivers": "receivers",
"channelsCount": "channels",
"title": "Targets",
"description": "Notification delivery destinations",
"descTelegram": "Telegram chat destinations for notifications",
@@ -363,6 +419,8 @@
"receiverDisabled": "Receiver disabled"
},
"users": {
"titleEmphasis": "& access",
"countLabel": "users",
"title": "Users",
"description": "Manage user accounts (admin only)",
"addUser": "Add User",
@@ -380,6 +438,8 @@
"noUsers": "No users found"
},
"telegramBot": {
"titleEmphasis": "telegram",
"countLabel": "bots",
"title": "Telegram Bots",
"description": "Register and manage Telegram bots",
"addBot": "Add Bot",
@@ -432,6 +492,8 @@
"webhookRegistered": "Webhook registered",
"webhookUnregistered": "Webhook unregistered",
"updateMode": "Update mode",
"none": "None",
"noneActive": "Listener disabled",
"polling": "Polling",
"webhook": "Webhook",
"webhookStatus": "Webhook status",
@@ -454,6 +516,8 @@
"webhookFailed": "Failed to register webhook"
},
"trackingConfig": {
"titleEmphasis": "configs",
"countLabel": "configs",
"title": "Tracking Configs",
"description": "Define what events and assets to react to",
"newConfig": "New Config",
@@ -549,9 +613,18 @@
"renamed": "renamed",
"deleted": "deleted",
"providerType": "Provider Type",
"sortRandom": "Random"
"sortRandom": "Random",
"timesInlineHelp": "HH:MM, comma-separated",
"invalidTimeList": "Use HH:MM format, e.g. 09:00 or 09:00, 18:30",
"previewTemplate": "Preview template",
"previewSampleNote": "Rendered with sample data — not your real assets. Shows the shipped default template.",
"editTemplate": "Edit template",
"quietHoursZero": "Quiet period is 0 minutes — adjust times",
"nextDay": "next day"
},
"templateConfig": {
"titleEmphasis": "templates",
"countLabel": "templates",
"title": "Template Configs",
"description": "Define how notification messages are formatted",
"providerType": "Service Provider Type",
@@ -595,7 +668,14 @@
"confirmDelete": "Delete this template config?",
"invalidFormat": "Invalid format string",
"filterSlots": "Filter slots...",
"slots": "slots"
"slots": "slots",
"resetToDefault": "Reset to default",
"resetAllToDefaults": "Reset all to defaults",
"resetSlotConfirm": "Replace this slot's {locale} template with the shipped default? Your current edits will be lost.",
"resetAllConfirm": "Replace every slot's {locale} template with the shipped defaults? All your {locale} edits will be lost.",
"resetNoDefault": "No shipped default for this slot.",
"resetApplied": "Reset to default (not saved yet — click Save to persist)",
"deepLinkNoConfig": "No template config found for this provider. Create one first."
},
"templateVars": {
"message_assets_added": {
@@ -664,6 +744,7 @@
"album_shared": "Whether album is shared"
},
"settings": {
"titleEmphasis": "options",
"title": "Settings",
"description": "Global application settings",
"general": "General",
@@ -695,6 +776,13 @@
"locales": "Template Languages",
"supportedLocales": "Supported Locales",
"supportedLocalesHint": "Languages available when authoring notification and command templates. Built-in defaults ship for English and Russian; other languages start empty.",
"logging": "Logging",
"logLevel": "Log Level",
"logLevelHint": "Root log level for the server. Raise to DEBUG while investigating; keep at INFO in production. WARNING/ERROR hide per-command progress lines.",
"logFormat": "Log Format",
"logFormatHint": "Output format. 'text' is human-readable; 'json' emits one object per line for log aggregators (Loki, ELK). Changing this requires a server restart.",
"logLevels": "Per-Module Overrides",
"logLevelsHint": "Comma-separated 'module=LEVEL' pairs to silence noisy modules or drill into one area. Example: sqlalchemy.engine=WARNING,notify_bridge_core.notifications.telegram.client=DEBUG",
"saved": "Settings saved"
},
"hints": {
@@ -705,9 +793,12 @@
"quietHours": "Suppress all notifications during this HH:MM window (interpreted in the app timezone). Overnight windows like 22:0007:00 are supported.",
"favoritesOnly": "Only include assets marked as favorites.",
"maxAssets": "Maximum number of asset details to include in a single notification message.",
"periodicStartDate": "The reference date for calculating periodic intervals. Summaries are sent every N days from this date.",
"periodicStartDate": "Reference date in the app timezone. The first summary fires at the next configured HH:MM on/after this date, then every N days.",
"intervalDays": "Days between successive summaries. 1 = daily, 7 = weekly.",
"times": "Time(s) of day to send notifications, in HH:MM format. Use commas for multiple times: 09:00,18:00",
"albumMode": "Per album: separate notification per album. Combined: one notification with all albums. Random: pick one album randomly.",
"scheduledAlbumMode": "How albums are grouped in scheduled deliveries. Default: Per album (one notification per tracked album).",
"memoryAlbumMode": "How albums are grouped in memory deliveries. Default: Combined (a single notification aggregating matches from all tracked albums).",
"minRating": "Only include assets with at least this star rating (0 = no filter).",
"eventMessages": "Templates for real-time event notifications. Use {variables} for dynamic content.",
"assetFormatting": "How individual assets are formatted within notification messages.",
@@ -721,7 +812,7 @@
"trackingConfig": "Controls which events trigger notifications and how assets are filtered.",
"templateConfig": "Controls the message format. Uses default templates if not set.",
"scanInterval": "How often to poll the provider for changes, in seconds. Lower = faster detection but more API calls.",
"batchDuration": "Time to accumulate changes before dispatching notifications. 0 = send immediately.",
"adaptiveMaxSkip": "Reduces polling when the tracker is idle, to save load on the upstream server. Leave blank or set to 0 for snappy notifications — every tick runs at the configured interval. Set to 2 to allow up to 2× slower polling after ~5 min of silence, or 4 for up to 4× slower polling after ~15 min. Activity resets back to the base rate immediately.",
"defaultTrackingConfig": "Applied to all linked targets unless overridden per target.",
"defaultTemplateConfig": "Applied to all linked targets unless overridden per target.",
"defaultCount": "How many results to return when the user doesn't specify a count (1-20).",
@@ -730,6 +821,8 @@
"rateLimits": "Cooldown in seconds between uses of each command category per chat. 0 = no limit."
},
"matrixBot": {
"titleEmphasis": "matrix",
"countLabel": "bots",
"title": "Matrix Bots",
"description": "Matrix homeserver connections for room notifications",
"addBot": "Add Matrix Bot",
@@ -746,6 +839,8 @@
"operationFailed": "Operation failed"
},
"emailBot": {
"titleEmphasis": "email",
"countLabel": "accounts",
"title": "Email Bots",
"description": "SMTP email senders for notifications",
"addBot": "Add Email Bot",
@@ -765,6 +860,8 @@
"operationFailed": "Operation failed"
},
"cmdTemplateConfig": {
"titleEmphasis": "templates",
"countLabel": "templates",
"title": "Command Templates",
"description": "Customize command response messages with Jinja2 templates",
"newConfig": "New Config",
@@ -777,6 +874,8 @@
"commandResponsesHint": "Leave a slot empty to use the default hardcoded response."
},
"commandConfig": {
"titleEmphasis": "configs",
"countLabel": "configs",
"title": "Command Configs",
"description": "Define command settings for Telegram bot interactions",
"newConfig": "New Config",
@@ -799,6 +898,7 @@
"noTemplate": "Default (hardcoded)"
},
"commandTracker": {
"titleEmphasis": "trackers",
"title": "Command Trackers",
"description": "Manage command trackers and their listeners",
"newTracker": "New Tracker",
@@ -1081,6 +1181,8 @@
"close": "close"
},
"actions": {
"titleEmphasis": "automations",
"countLabel": "actions",
"title": "Actions",
"description": "Scheduled mutations on external services",
"addAction": "Add Action",
@@ -1138,6 +1240,7 @@
"triggerScheduled": "scheduled"
},
"backup": {
"titleEmphasis": "& restore",
"title": "Backup & Restore",
"description": "Export and import your configuration, or set up automatic backups",
"export": "Export Configuration",
+112 -9
View File
@@ -4,6 +4,10 @@
"tagline": "Уведомления о сервисах"
},
"nav": {
"sectionOverview": "Обзор",
"sectionRouting": "Маршрутизация",
"sectionOperators": "Операторы",
"sectionSystem": "Система",
"dashboard": "Главная",
"providers": "Провайдеры",
"notificationTrackers": "Трекеры увед.",
@@ -55,7 +59,8 @@
"passwordTooShort": "Пароль должен быть не менее 8 символов",
"or": "или",
"loginFailed": "Ошибка входа",
"setupFailed": "Ошибка настройки"
"setupFailed": "Ошибка настройки",
"backendUnreachable": "Не удалось подключиться к серверу. Убедитесь, что он запущен, и повторите попытку."
},
"dashboard": {
"title": "Главная",
@@ -102,11 +107,46 @@
"last14days": "Последние 14 дней",
"event": "событие",
"events": "событий",
"noChartData": "Нет данных о событиях"
"noChartData": "Нет данных о событиях",
"live": "В эфире",
"attention": "Внимание",
"heroPrefix": "Сегодня",
"heroEmphasis": "всё",
"heroSuffix": "идёт по плану.",
"heroSummary": "{providers} провайдеров на связи, {armed} из {total} трекеров активны, {throughput} событий доставлено в {targets} каналов за сутки.",
"throughput24h": "пропускная способность · 24ч",
"eventsShort": "событий",
"armedShort": "активны",
"providersShort": "провайдеров",
"targetsShort": "каналов",
"trackersShort": "трекеров",
"streamTitle": "Поток",
"streamEmphasis": "сигналов",
"eventsLabel": "событий",
"onWatchTitle": "На",
"onWatchEmphasis": "слежении",
"noProviders": "Пока нет провайдеров.",
"addProvider": "Добавить",
"addProviderHint": "Подключите сервис, чтобы начать слежение",
"pulseTitle": "Пульс",
"pulseEmphasis": "· 14 дней",
"pulseSub": "События по дням",
"wiresTitle": "Активные",
"wiresEmphasis": "линии",
"wiresSub": "маршрутов",
"composeTitle": "Выберите источник, выберите канал.",
"composeEmphasis": "Свяжите.",
"composeSub": "Проведите путь от провайдера → трекер → шаблон → цель. Или вставьте webhook URL — остальное мы определим сами.",
"viewTrackers": "К трекерам",
"newTracker": "Новый трекер",
"eventsTotal": "Событий"
},
"providers": {
"title": "Провайдеры",
"description": "Управление подключениями к сервисам",
"title": "Сервисные",
"titleEmphasis": "провайдеры",
"description": "Подключения к внешним сервисам и вебхукам. Каждый провайдер кормит трекеры событиями, которые рассылаются по вашим каналам.",
"typeSingular": "тип",
"typePlural": "типов",
"addProvider": "Добавить провайдер",
"cancel": "Отмена",
"type": "Тип провайдера",
@@ -191,6 +231,9 @@
"cleared": "История запросов очищена"
},
"notificationTracker": {
"titleEmphasis": "трекеры",
"armed": "активны",
"paused": "на паузе",
"title": "Трекеры уведомлений",
"description": "Отслеживание изменений в альбомах",
"newTracker": "Новый трекер",
@@ -249,7 +292,8 @@
"descending": "По убыванию",
"quietHoursStart": "Тихие часы начало",
"quietHoursEnd": "Тихие часы конец",
"batchDuration": "Длительность пакета (секунды)",
"adaptiveMaxSkip": "Предел адаптивного опроса",
"adaptiveMaxSkipPlaceholder": "Выкл. (пусто или 0)",
"defaultTrackingConfig": "Конфигурация отслеживания по умолчанию",
"defaultTemplateConfig": "Шаблон уведомлений по умолчанию",
"linkedTargets": "получатели",
@@ -261,7 +305,14 @@
"testPeriodic": "Тест периодической сводки",
"testScheduled": "Тест запланированных фото",
"testMemory": "Тест воспоминаний",
"testDisabledHint": "Сначала включите эту функцию в привязанной конфигурации отслеживания.",
"checkingLinks": "Проверка ссылок...",
"featureDiscovery": "Периодические сводки, запланированные подборки, воспоминания и тихие часы настраиваются в привязанной конфигурации отслеживания.",
"openTrackingConfig": "Открыть конфигурацию отслеживания",
"linkReplace": "Пересоздать",
"linkReplacing": "Пересоздание...",
"linkReplaceFailed": "Не удалось пересоздать ссылку для «{name}»",
"linkPasswordProtectedNote": "Получатели в Telegram не смогут открыть защищённую паролем ссылку без пароля. Снимите пароль в Immich или пересоздайте ссылку.",
"missingLinksTitle": "Альбомы без публичных ссылок",
"missingLinksDesc": "У следующих альбомов нет публичных ссылок. Без ссылок получатели уведомлений не смогут просматривать фото.",
"expired": "Истёк",
@@ -295,6 +346,11 @@
"albumDeleted": "Альбом удалён"
},
"targets": {
"titleEmphasis": "канал",
"titleEmphasisAll": "каналы",
"receiver": "получатель",
"receivers": "получателей",
"channelsCount": "каналов",
"title": "Получатели",
"description": "Адреса доставки уведомлений",
"descTelegram": "Чаты Telegram для доставки уведомлений",
@@ -363,6 +419,8 @@
"receiverDisabled": "Получатель отключён"
},
"users": {
"titleEmphasis": "и доступ",
"countLabel": "пользователей",
"title": "Пользователи",
"description": "Управление аккаунтами (только админ)",
"addUser": "Добавить пользователя",
@@ -380,6 +438,8 @@
"noUsers": "Пользователи не найдены"
},
"telegramBot": {
"titleEmphasis": "telegram",
"countLabel": "ботов",
"title": "Telegram боты",
"description": "Регистрация и управление Telegram ботами",
"addBot": "Добавить бота",
@@ -432,6 +492,8 @@
"webhookRegistered": "Вебхук зарегистрирован",
"webhookUnregistered": "Вебхук удалён",
"updateMode": "Режим обновлений",
"none": "Откл.",
"noneActive": "Приём обновлений отключён",
"polling": "Опрос",
"webhook": "Вебхук",
"webhookStatus": "Статус вебхука",
@@ -454,6 +516,8 @@
"webhookFailed": "Не удалось зарегистрировать webhook"
},
"trackingConfig": {
"titleEmphasis": "конфигурации",
"countLabel": "конфигураций",
"title": "Конфигурации отслеживания",
"description": "Определите, на какие события и файлы реагировать",
"newConfig": "Новая конфигурация",
@@ -549,9 +613,18 @@
"renamed": "переименование",
"deleted": "удалён",
"providerType": "Тип провайдера",
"sortRandom": "Случайный"
"sortRandom": "Случайный",
"timesInlineHelp": "ЧЧ:ММ, через запятую",
"invalidTimeList": "Используйте формат ЧЧ:ММ, например 09:00 или 09:00, 18:30",
"previewTemplate": "Предпросмотр шаблона",
"previewSampleNote": "Отрисовано на демо-данных, не на ваших реальных фото. Показан шаблон по умолчанию.",
"editTemplate": "Редактировать шаблон",
"quietHoursZero": "Тихий период 0 минут — скорректируйте время",
"nextDay": "след. день"
},
"templateConfig": {
"titleEmphasis": "шаблоны",
"countLabel": "шаблонов",
"title": "Конфигурации шаблонов",
"description": "Определите формат уведомлений",
"providerType": "Тип сервис-провайдера",
@@ -595,7 +668,14 @@
"confirmDelete": "Удалить эту конфигурацию шаблона?",
"invalidFormat": "Некорректная строка формата",
"filterSlots": "Фильтр слотов...",
"slots": "слотов"
"slots": "слотов",
"resetToDefault": "Сбросить к умолчанию",
"resetAllToDefaults": "Сбросить все к умолчаниям",
"resetSlotConfirm": "Заменить шаблон этого слота ({locale}) на исходный по умолчанию? Ваши правки будут потеряны.",
"resetAllConfirm": "Заменить шаблоны всех слотов ({locale}) на исходные по умолчанию? Все ваши правки для {locale} будут потеряны.",
"resetNoDefault": "Для этого слота нет шаблона по умолчанию.",
"resetApplied": "Сброшено к умолчанию (ещё не сохранено — нажмите «Сохранить»)",
"deepLinkNoConfig": "Не найдено конфигурации шаблонов для этого провайдера. Сначала создайте её."
},
"templateVars": {
"message_assets_added": {
@@ -664,6 +744,7 @@
"album_shared": "Общий альбом"
},
"settings": {
"titleEmphasis": "параметры",
"title": "Настройки",
"description": "Глобальные настройки приложения",
"general": "Общие",
@@ -695,6 +776,13 @@
"locales": "Языки шаблонов",
"supportedLocales": "Поддерживаемые локали",
"supportedLocalesHint": "Языки, доступные для редактирования шаблонов уведомлений и команд. Встроенные шаблоны поставляются для английского и русского; другие языки начинают с пустых.",
"logging": "Логирование",
"logLevel": "Уровень логов",
"logLevelHint": "Уровень логирования сервера. Поднимайте до DEBUG при отладке; оставляйте INFO в продакшене. WARNING/ERROR скрывают пошаговые строки по командам.",
"logFormat": "Формат логов",
"logFormatHint": "Формат вывода. 'text' — читаемый человеком; 'json' — по одному объекту в строке для агрегаторов (Loki, ELK). Смена требует перезапуска сервера.",
"logLevels": "Переопределения по модулям",
"logLevelsHint": "Пары 'модуль=УРОВЕНЬ' через запятую, чтобы приглушить шумные модули или углубиться в один. Пример: sqlalchemy.engine=WARNING,notify_bridge_core.notifications.telegram.client=DEBUG",
"saved": "Настройки сохранены"
},
"hints": {
@@ -705,9 +793,12 @@
"quietHours": "Подавляет все уведомления в указанном HH:MM окне (по часовому поясу приложения). Поддерживаются окна через полночь, например 22:0007:00.",
"favoritesOnly": "Включать только ассеты, отмеченные как избранные.",
"maxAssets": "Максимальное количество ассетов в одном уведомлении.",
"periodicStartDate": "Опорная дата для расчёта интервалов. Сводки отправляются каждые N дней от этой даты.",
"periodicStartDate": "Опорная дата в часовом поясе приложения. Первая сводка отправится в ближайшее заданное время ЧЧ:ММ, начиная с этой даты, затем каждые N дней.",
"intervalDays": "Период между сводками в днях. 1 = ежедневно, 7 = еженедельно.",
"times": "Время отправки уведомлений в формате ЧЧ:ММ. Для нескольких значений через запятую: 09:00,18:00",
"albumMode": "По альбому: отдельное уведомление для каждого. Объединённый: одно уведомление со всеми. Случайный: выбирается один альбом.",
"scheduledAlbumMode": "Как альбомы группируются в запланированных отправках. По умолчанию: По альбому (одно уведомление на каждый отслеживаемый альбом).",
"memoryAlbumMode": "Как альбомы группируются в воспоминаниях. По умолчанию: Объединённый (одно уведомление со всеми совпадениями из всех альбомов).",
"minRating": "Включать только ассеты с рейтингом не ниже указанного (0 = без фильтра).",
"eventMessages": "Шаблоны уведомлений о событиях в реальном времени. Используйте {переменные} для динамического контента.",
"assetFormatting": "Форматирование отдельных ассетов в сообщениях уведомлений.",
@@ -721,7 +812,7 @@
"trackingConfig": "Управляет тем, какие события вызывают уведомления и как фильтруются ассеты.",
"templateConfig": "Управляет форматом сообщений. Используются шаблоны по умолчанию, если не задано.",
"scanInterval": "Как часто опрашивать провайдер на предмет изменений (в секундах). Меньше = быстрее обнаружение, но больше запросов к API.",
"batchDuration": "Время накопления изменений перед отправкой уведомлений. 0 = отправлять сразу.",
"adaptiveMaxSkip": "Снижает частоту опроса, когда отслеживание простаивает — уменьшает нагрузку на сервер-источник. Оставьте пустым или 0, чтобы уведомления приходили без задержки: каждый тик выполняется с заданным интервалом. Значение 2 позволит замедлять опрос до 2× после ~5 мин простоя, а 4 — до 4× после ~15 мин. Любая активность сразу возвращает базовую частоту.",
"defaultTrackingConfig": "Применяется ко всем привязанным получателям, если не переопределено.",
"defaultTemplateConfig": "Применяется ко всем привязанным получателям, если не переопределено.",
"defaultCount": "Сколько результатов возвращать, если пользователь не указал количество (1-20).",
@@ -730,6 +821,8 @@
"rateLimits": "Кулдаун в секундах между использованиями команд в каждом чате. 0 = без ограничений."
},
"matrixBot": {
"titleEmphasis": "matrix",
"countLabel": "ботов",
"title": "Matrix боты",
"description": "Подключения к Matrix серверам для уведомлений в комнаты",
"addBot": "Добавить Matrix бот",
@@ -746,6 +839,8 @@
"operationFailed": "Операция не удалась"
},
"emailBot": {
"titleEmphasis": "email",
"countLabel": "учётных записей",
"title": "Email боты",
"description": "SMTP отправители для уведомлений по email",
"addBot": "Добавить Email бот",
@@ -765,6 +860,8 @@
"operationFailed": "Операция не удалась"
},
"cmdTemplateConfig": {
"titleEmphasis": "шаблоны",
"countLabel": "шаблонов",
"title": "Шаблоны команд",
"description": "Настройте ответы команд с помощью Jinja2 шаблонов",
"newConfig": "Новый шаблон",
@@ -777,6 +874,8 @@
"commandResponsesHint": "Оставьте слот пустым, чтобы использовать ответ по умолчанию."
},
"commandConfig": {
"titleEmphasis": "конфигурации",
"countLabel": "конфигураций",
"title": "Конфигурации команд",
"description": "Настройки команд для взаимодействия с Telegram-ботами",
"newConfig": "Новая конфигурация",
@@ -799,6 +898,7 @@
"noTemplate": "По умолчанию (встроенный)"
},
"commandTracker": {
"titleEmphasis": "трекеры",
"title": "Трекеры команд",
"description": "Управление трекерами команд и их слушателями",
"newTracker": "Новый трекер",
@@ -1081,6 +1181,8 @@
"close": "закрыть"
},
"actions": {
"titleEmphasis": "автоматизации",
"countLabel": "действий",
"title": "Действия",
"description": "Запланированные операции над внешними сервисами",
"addAction": "Добавить действие",
@@ -1138,6 +1240,7 @@
"triggerScheduled": "по расписанию"
},
"backup": {
"titleEmphasis": "и восстановление",
"title": "Резервное копирование",
"description": "Экспорт и импорт конфигурации, настройка автоматических бэкапов",
"export": "Экспорт конфигурации",
+35
View File
@@ -0,0 +1,35 @@
/**
* Svelte action that re-parents a node to document.body (or any selector).
*
* Use this for popups / dropdowns / tooltips that rely on
* `position: fixed` positioning. Any ancestor with `backdrop-filter`,
* `transform`, `filter`, `perspective`, `contain: paint`, or
* `will-change: transform` becomes the containing block for fixed
* descendants which silently breaks viewport-relative positioning.
*
* Portalling sidesteps that by detaching the node from the component
* tree and appending it to a target outside any such ancestor.
*
* Usage:
* <div use:portal>...</div> // → document.body
* <div use:portal={'#root'}>...</div> // → custom selector
*/
export type PortalTarget = string | HTMLElement;
export function portal(node: HTMLElement, target: PortalTarget = 'body') {
function attach(t: PortalTarget) {
const el = typeof t === 'string' ? document.querySelector(t) : t;
if (el instanceof HTMLElement) el.appendChild(node);
}
attach(target);
return {
update(newTarget: PortalTarget) {
attach(newTarget);
},
destroy() {
node.parentNode?.removeChild(node);
},
};
}
+23 -14
View File
@@ -1,5 +1,12 @@
import type { ProviderDescriptor } from './types';
/**
* Today's date in ISO (YYYY-MM-DD) used as the default for
* `periodic_start_date` so new configs anchor to "today" rather than a
* hardcoded date that gets further into the past on every release.
*/
const todayIso = (): string => new Date().toISOString().slice(0, 10);
export const immichDescriptor: ProviderDescriptor = {
type: 'immich',
defaultName: 'Immich',
@@ -48,7 +55,7 @@ export const immichDescriptor: ProviderDescriptor = {
],
extraTrackingFields: [
{ key: 'max_assets_to_show', label: 'trackingConfig.maxAssets', type: 'number', min: 0, max: 50, defaultValue: 5, hint: 'hints.maxAssets' },
{ key: 'max_assets_to_show', label: 'trackingConfig.maxAssets', type: 'number', min: 0, max: 50, defaultValue: 10, hint: 'hints.maxAssets' },
{ key: 'assets_order_by', label: 'trackingConfig.sortBy', type: 'grid-select', gridItems: 'sortByItems', gridColumns: 2, defaultValue: 'none' },
{ key: 'assets_order', label: 'trackingConfig.sortOrder', type: 'grid-select', gridItems: 'sortOrderItems', gridColumns: 2, defaultValue: 'descending' },
],
@@ -58,17 +65,17 @@ export const immichDescriptor: ProviderDescriptor = {
key: 'periodic', legend: 'trackingConfig.periodicSummary', legendHint: 'hints.periodicSummary',
enabledField: 'periodic_enabled', enabledDefault: false,
fields: [
{ key: 'periodic_interval_days', label: 'trackingConfig.intervalDays', type: 'number', min: 1, defaultValue: 1 },
{ key: 'periodic_start_date', label: 'trackingConfig.startDate', type: 'number', defaultValue: '2025-01-01' }, // rendered as date input
{ key: 'periodic_times', label: 'trackingConfig.times', type: 'number', defaultValue: '12:00' }, // rendered as text input
{ key: 'periodic_interval_days', label: 'trackingConfig.intervalDays', type: 'number', min: 1, defaultValue: 1, hint: 'hints.intervalDays' },
{ key: 'periodic_start_date', label: 'trackingConfig.startDate', type: 'date', defaultValue: todayIso, hint: 'hints.periodicStartDate' },
{ key: 'periodic_times', label: 'trackingConfig.times', type: 'time-list', defaultValue: '12:00', hint: 'hints.times', inlineHelp: 'trackingConfig.timesInlineHelp', validateFormat: true },
],
},
{
key: 'scheduled', legend: 'trackingConfig.scheduledAssets', legendHint: 'hints.scheduledAssets',
enabledField: 'scheduled_enabled', enabledDefault: false,
fields: [
{ key: 'scheduled_times', label: 'trackingConfig.times', type: 'number', defaultValue: '09:00' },
{ key: 'scheduled_collection_mode', label: 'trackingConfig.albumMode', type: 'grid-select', gridItems: 'albumModeItems', gridColumns: 3, defaultValue: 'per_collection' },
{ key: 'scheduled_times', label: 'trackingConfig.times', type: 'time-list', defaultValue: '09:00', hint: 'hints.times', inlineHelp: 'trackingConfig.timesInlineHelp', validateFormat: true },
{ key: 'scheduled_collection_mode', label: 'trackingConfig.albumMode', type: 'grid-select', gridItems: 'albumModeItems', gridColumns: 3, defaultValue: 'per_collection', hint: 'hints.scheduledAlbumMode' },
{ key: 'scheduled_limit', label: 'trackingConfig.maxAssets', type: 'number', min: 1, max: 100, defaultValue: 10, hint: 'hints.maxAssets' },
{ key: 'scheduled_asset_type', label: 'trackingConfig.assetType', type: 'grid-select', gridItems: 'assetTypeItems', gridColumns: 3, defaultValue: 'all' },
{ key: 'scheduled_min_rating', label: 'trackingConfig.minRating', type: 'number', min: 0, max: 5, defaultValue: 0, hint: 'hints.minRating' },
@@ -79,21 +86,21 @@ export const immichDescriptor: ProviderDescriptor = {
key: 'memory', legend: 'trackingConfig.memoryMode', legendHint: 'hints.memoryMode',
enabledField: 'memory_enabled', enabledDefault: false,
fields: [
{ key: 'memory_times', label: 'trackingConfig.times', type: 'number', defaultValue: '09:00' },
{ key: 'memory_collection_mode', label: 'trackingConfig.albumMode', type: 'grid-select', gridItems: 'albumModeItems', gridColumns: 3, defaultValue: 'combined' },
{ key: 'memory_limit', label: 'trackingConfig.maxAssets', type: 'number', min: 1, max: 100, defaultValue: 10 },
{ key: 'memory_times', label: 'trackingConfig.times', type: 'time-list', defaultValue: '09:00', hint: 'hints.times', inlineHelp: 'trackingConfig.timesInlineHelp', validateFormat: true },
{ key: 'memory_collection_mode', label: 'trackingConfig.albumMode', type: 'grid-select', gridItems: 'albumModeItems', gridColumns: 3, defaultValue: 'combined', hint: 'hints.memoryAlbumMode' },
{ key: 'memory_limit', label: 'trackingConfig.maxAssets', type: 'number', min: 1, max: 100, defaultValue: 10, hint: 'hints.maxAssets' },
{ key: 'memory_asset_type', label: 'trackingConfig.assetType', type: 'grid-select', gridItems: 'assetTypeItems', gridColumns: 3, defaultValue: 'all' },
{ key: 'memory_min_rating', label: 'trackingConfig.minRating', type: 'number', min: 0, max: 5, defaultValue: 0 },
{ key: 'memory_min_rating', label: 'trackingConfig.minRating', type: 'number', min: 0, max: 5, defaultValue: 0, hint: 'hints.minRating' },
{ key: 'memory_favorite_only', label: 'trackingConfig.favoritesOnly', type: 'toggle', defaultValue: false, hint: 'hints.favoritesOnly' },
{ key: 'memory_source', label: 'trackingConfig.memorySource', type: 'grid-select', gridItems: 'memorySourceItems', gridColumns: 2, defaultValue: 'albums' },
{ key: 'memory_source', label: 'trackingConfig.memorySource', type: 'grid-select', gridItems: 'memorySourceItems', gridColumns: 2, defaultValue: 'albums', hint: 'hints.memorySource' },
],
},
{
key: 'quietHours', legend: 'trackingConfig.quietHours', legendHint: 'hints.quietHours',
enabledField: 'quiet_hours_enabled', enabledDefault: false,
fields: [
{ key: 'quiet_hours_start', label: 'trackingConfig.quietHoursStart', type: 'number', defaultValue: '22:00' },
{ key: 'quiet_hours_end', label: 'trackingConfig.quietHoursEnd', type: 'number', defaultValue: '07:00' },
{ key: 'quiet_hours_start', label: 'trackingConfig.quietHoursStart', type: 'time', defaultValue: '22:00' },
{ key: 'quiet_hours_end', label: 'trackingConfig.quietHoursEnd', type: 'time', defaultValue: '07:00' },
],
},
],
@@ -114,7 +121,9 @@ export const immichDescriptor: ProviderDescriptor = {
const warnings: { id: string; name: string; issue: string }[] = [];
// Run shared-link checks in parallel with a concurrency cap so a large
// album set doesn't stall the save button for seconds.
// album set doesn't stall the save button for seconds. Cap of 6 keeps
// the save dialog responsive for users with 50+ albums while staying
// well under typical Immich per-IP rate limits.
const CONCURRENCY = 6;
async function checkOne(albumId: string): Promise<void> {
try {
+5 -2
View File
@@ -47,17 +47,20 @@ export function allProviderTypes(): string[] {
*/
export function buildTrackingFormDefaults(): Record<string, any> {
const defaults: Record<string, any> = {};
// `defaultValue` may be a function (for time-sensitive defaults like
// today's date) so the computed value is fresh each time the form resets.
const resolve = (v: unknown): unknown => (typeof v === 'function' ? (v as () => unknown)() : v);
for (const desc of REGISTRY.values()) {
for (const field of desc.eventFields) {
defaults[field.key] = field.default;
}
for (const extra of desc.extraTrackingFields ?? []) {
defaults[extra.key] = extra.defaultValue ?? '';
defaults[extra.key] = resolve(extra.defaultValue) ?? '';
}
for (const section of desc.featureSections ?? []) {
defaults[section.enabledField] = section.enabledDefault;
for (const f of section.fields) {
defaults[f.key] = f.defaultValue ?? '';
defaults[f.key] = resolve(f.defaultValue) ?? '';
}
for (const cb of section.checkboxes ?? []) {
defaults[cb.key] = cb.default;
+19 -2
View File
@@ -60,14 +60,31 @@ export interface EventTrackingField {
export interface ExtraTrackingField {
key: string;
label: string;
type: 'number' | 'grid-select' | 'toggle';
/**
* Control kind:
* - `number` numeric spinner
* - `grid-select` icon-grid chooser (requires `gridItems`)
* - `toggle` on/off switch
* - `date` HTML date picker (YYYY-MM-DD)
* - `time` HTML time picker (HH:MM)
* - `time-list` comma-separated HH:MM list, validated on blur
*/
type: 'number' | 'grid-select' | 'toggle' | 'date' | 'time' | 'time-list';
/** Grid-select item source function name from grid-items.ts. */
gridItems?: string;
gridColumns?: number;
hint?: string;
/** Inline helper text rendered under the input (not a tooltip). */
inlineHelp?: string;
min?: number;
max?: number;
defaultValue?: string | number | boolean;
/** For time-list: show live validation + auto-normalize on blur. */
validateFormat?: boolean;
/**
* Default value. Can be a function for dynamic values (e.g. today's date)
* evaluated each time the form is reset.
*/
defaultValue?: string | number | boolean | (() => string | number | boolean);
}
/** A feature section like periodic summary, scheduled assets, memory mode. */
@@ -0,0 +1,35 @@
/**
* Page-scoped primary action for the global topbar CTA.
*
* Each route declares its own primary action ("Add Provider",
* "New Tracker", etc.) by calling `topbarAction.set({...})`
* inside its `onMount`, and clears it on teardown. The layout
* reads `topbarAction.current` and renders the button.
*
* Falls back to the default "New tracker" CTA when no action is
* registered (set by the layout itself).
*/
export interface TopbarAction {
/** Visible label, e.g. "Add Provider". */
label: string;
/** Optional href — renders as <a>. Mutually exclusive with onclick. */
href?: string;
/** Optional click handler — renders as <button>. */
onclick?: () => void;
/** Optional MDI/NavIcon name for the leading glyph (default: mdiPlus). */
icon?: string;
}
let action = $state<TopbarAction | null>(null);
export const topbarAction = {
get current(): TopbarAction | null {
return action;
},
set(next: TopbarAction | null) {
action = next;
},
clear() {
action = null;
},
};
+1 -1
View File
@@ -80,7 +80,7 @@ export interface Tracker {
provider_id: number;
collection_ids: string[];
scan_interval: number;
batch_duration: number;
adaptive_max_skip: number | null;
default_tracking_config_id: number | null;
default_template_config_id: number | null;
enabled: boolean;
+455 -167
View File
@@ -7,10 +7,10 @@
import { cubicOut } from 'svelte/easing';
import { api } from '$lib/api';
import { getAuth, loadUser, logout } from '$lib/auth.svelte';
import { t, getLocale, setLocale, type Locale } from '$lib/i18n';
import { t, getLocale, setLocale } from '$lib/i18n';
import { getTheme, initTheme, setTheme, type Theme } from '$lib/theme.svelte';
import Modal from '$lib/components/Modal.svelte';
import MdiIcon from '$lib/components/MdiIcon.svelte';
import NavIcon from '$lib/components/NavIcon.svelte';
import Snackbar from '$lib/components/Snackbar.svelte';
import SearchPalette from '$lib/components/SearchPalette.svelte';
import { snackSuccess, snackError } from '$lib/stores/snackbar.svelte';
@@ -21,6 +21,7 @@
matrixBotsCache, targetsCache,
} from '$lib/stores/caches.svelte';
import { globalProviderFilter } from '$lib/stores/provider-filter.svelte';
import { topbarAction } from '$lib/stores/topbar-action.svelte';
import { providerDefaultIcon } from '$lib/grid-items';
import IconGridSelect from '$lib/components/IconGridSelect.svelte';
@@ -201,6 +202,19 @@
: baseNavEntries
);
/**
* Section labels above groups of nav entries — emitted in the template
* before the entry whose key matches a map below. Mirrors the Aurora
* mockup's "Overview / Routing / Operators / System" section rhythm
* without breaking the existing collapsible-group structure.
*/
const SECTION_BREAKS: Record<string, string> = {
'nav.dashboard': 'nav.sectionOverview',
'nav.notification': 'nav.sectionRouting',
'nav.bots': 'nav.sectionOperators',
'nav.settings': 'nav.sectionSystem',
};
// Track which groups are expanded (persisted in localStorage)
let expandedGroups = $state<Record<string, boolean>>({});
@@ -218,13 +232,20 @@
});
}
// Mobile: flatten nav for bottom bar (first 4 + "More" button)
const mobileNavItems = $derived<NavItem[]>([
{ href: '/', key: 'nav.dashboard', icon: 'mdiViewDashboard' },
{ href: '/notification-trackers', key: 'nav.notification', icon: 'mdiBellOutline' },
{ href: '/command-trackers', key: 'nav.commands', icon: 'mdiConsoleLine' },
{ href: '/targets', key: 'nav.targets', icon: 'mdiTarget' },
]);
// Mobile bottom-nav derives its 4 primary slots from baseNavEntries by key
// lookup. Adding a new top-level nav entry doesn't break this list, and
// renaming a key fails loudly via the assertion below — keeping desktop
// and mobile nav structure in sync without manual duplication.
const MOBILE_PRIMARY_KEYS = ['nav.dashboard', 'nav.notification', 'nav.commands', 'nav.targets'] as const;
const mobileNavItems = $derived<NavItem[]>(
MOBILE_PRIMARY_KEYS.map(key => {
const entry = baseNavEntries.find(e => e.key === key);
if (!entry) return null;
return isGroup(entry)
? { href: entry.children[0]?.href ?? '/', key: entry.key, icon: entry.icon }
: entry;
}).filter((x): x is NavItem => x !== null)
);
// "More" panel mirrors the full desktop sidebar tree so every subnode is
// reachable on mobile (previously it was a flat hand-picked list that
@@ -346,31 +367,34 @@
</div>
</div>
{:else if auth.user}
<div class="flex h-screen">
<div class="app-shell">
<!-- Sidebar -->
<aside
class="sidebar {collapsed ? 'w-[3.75rem]' : 'w-[15rem]'} flex flex-col max-md:hidden"
style="background: var(--color-sidebar); border-right: 1px solid var(--color-border); transition: width 0.25s cubic-bezier(0.4, 0, 0.2, 1);"
>
<!-- Header -->
<div class="flex items-center {collapsed ? 'justify-center p-2.5' : 'justify-between px-5 py-4'}" style="border-bottom: 1px solid var(--color-border);">
<div class="sidebar-header flex items-center {collapsed ? 'justify-center p-3' : 'justify-between px-5 py-5'}">
{#if !collapsed}
<div class="animate-fade-slide-in">
<h1 class="text-base font-semibold tracking-tight flex items-center gap-1.5" style="color: var(--color-foreground);">
{#if globalProviderFilter.provider}
<span style="color: var(--color-primary);"><MdiIcon name={providerDefaultIcon(globalProviderFilter.provider)} size={18} /></span>
{/if}
<span><span style="color: var(--color-primary);">Notify</span> Bridge</span>
</h1>
<p class="text-[0.7rem] text-[var(--color-muted-foreground)] mt-0.5 tracking-wide uppercase">{t('app.tagline')}</p>
<div class="animate-fade-slide-in flex items-center gap-3">
<div class="brand-orb"></div>
<div class="brand-text">
<h1 class="brand-name">
{#if globalProviderFilter.provider}
<span class="brand-mark__icon" style="color: var(--color-primary);"><NavIcon name={providerDefaultIcon(globalProviderFilter.provider)} size={14} /></span>
{/if}
Notify Bridge
</h1>
<p class="brand-version font-mono">v0.5.2</p>
</div>
</div>
{:else if globalProviderFilter.provider}
<span style="color: var(--color-primary);"><MdiIcon name={providerDefaultIcon(globalProviderFilter.provider)} size={18} /></span>
{:else}
<div class="brand-orb brand-orb--small"></div>
{/if}
<button onclick={toggleSidebar}
class="sidebar-icon-btn flex items-center justify-center w-8 h-8 rounded-lg transition-all duration-200"
title={collapsed ? t('common.expand') : t('common.collapse')}>
<MdiIcon name={collapsed ? 'mdiChevronRight' : 'mdiChevronLeft'} size={18} />
class="sidebar-icon-btn flex items-center justify-center w-10 h-10 rounded-lg transition-all duration-200"
title={collapsed ? t('common.expand') : t('common.collapse')}
aria-label={collapsed ? t('common.expand') : t('common.collapse')}>
<NavIcon name={collapsed ? 'mdiChevronRight' : 'mdiChevronLeft'} size={18} />
</button>
</div>
@@ -384,8 +408,9 @@
providerFilterValue = ids[(idx + 1) % ids.length];
}}
class="provider-filter-btn flex items-center justify-center w-full py-1.5 rounded-lg text-sm transition-all duration-200"
title={globalProviderFilter.provider?.name || t('common.allProviders')}>
<MdiIcon name={globalProviderFilter.provider ? providerDefaultIcon(globalProviderFilter.provider) : 'mdiFilterOff'} size={16} />
title={globalProviderFilter.provider?.name || t('common.allProviders')}
aria-label={globalProviderFilter.provider?.name || t('common.allProviders')}>
<NavIcon name={globalProviderFilter.provider ? providerDefaultIcon(globalProviderFilter.provider) : 'mdiFilterOff'} size={16} />
</button>
{:else}
<IconGridSelect items={providerFilterItems} bind:value={providerFilterValue} columns={Math.min(providerFilterItems.length, 3)} compact />
@@ -393,22 +418,12 @@
</div>
{/if}
<!-- Search button -->
<div class="{collapsed ? 'px-2 py-1.5' : 'px-3 py-1.5'}" style="border-bottom: 1px solid var(--color-border);">
<button onclick={() => openSearch?.()}
class="search-btn flex items-center gap-2 w-full {collapsed ? 'justify-center px-2' : 'px-2.5'} py-1.5 rounded-lg text-sm transition-all duration-200"
title={t('searchPalette.placeholder')}>
<MdiIcon name="mdiMagnify" size={16} />
{#if !collapsed}
<span class="flex-1 text-left text-xs">{t('searchPalette.placeholder')}</span>
<kbd class="text-[0.6rem] font-mono px-1 py-0.5 rounded" style="background: var(--color-background); border: 1px solid var(--color-border);">{isMac ? '⌘' : 'Ctrl '}K</kbd>
{/if}
</button>
</div>
<!-- Nav -->
<nav class="flex-1 p-2 space-y-0.5 overflow-y-auto">
{#each navEntries as entry}
{#if SECTION_BREAKS[entry.key] && !collapsed}
<div class="nav-section-label">{t(SECTION_BREAKS[entry.key])}</div>
{/if}
{#if isGroup(entry)}
<!-- Group header -->
<button
@@ -419,11 +434,11 @@
{#if isGroupActive(entry) && !expandedGroups[entry.key]}
<div class="active-indicator" style="position: absolute; left: 0; top: 50%; transform: translateY(-50%); width: 3px; height: 60%; border-radius: 0 3px 3px 0; background: var(--color-primary); box-shadow: 0 0 8px var(--color-glow-strong);"></div>
{/if}
<MdiIcon name={entry.icon} size={18} />
<NavIcon name={entry.icon} size={18} />
{#if !collapsed}
<span class="truncate flex-1">{t(entry.key)}</span>
<span class="nav-chevron" style="display: inline-flex; transition: transform 0.2s ease; transform: rotate({expandedGroups[entry.key] ? '90deg' : '0deg'});">
<MdiIcon name="mdiChevronRight" size={14} />
<NavIcon name="mdiChevronRight" size={14} />
</span>
{/if}
</button>
@@ -438,7 +453,7 @@
{#if isActive(child.href)}
<div class="active-indicator" style="position: absolute; left: -13px; top: 50%; transform: translateY(-50%); width: 3px; height: 60%; border-radius: 0 3px 3px 0; background: var(--color-primary); box-shadow: 0 0 8px var(--color-glow-strong);"></div>
{/if}
<MdiIcon name={child.icon} size={15} />
<NavIcon name={child.icon} size={15} />
<span class="truncate flex-1">{t(child.key)}</span>
{#if child.countKey && navCounts[child.countKey]}
<span class="nav-badge-sm">{navCounts[child.countKey]}</span>
@@ -457,7 +472,7 @@
{#if isActive(entry.href)}
<div class="active-indicator" style="position: absolute; left: 0; top: 50%; transform: translateY(-50%); width: 3px; height: 60%; border-radius: 0 3px 3px 0; background: var(--color-primary); box-shadow: 0 0 8px var(--color-glow-strong);"></div>
{/if}
<MdiIcon name={entry.icon} size={18} />
<NavIcon name={entry.icon} size={18} />
{#if !collapsed}
<span class="truncate flex-1">{t(entry.key)}</span>
{#if entry.countKey && navCounts[entry.countKey]}
@@ -470,61 +485,54 @@
</nav>
<!-- Footer -->
<div style="border-top: 1px solid var(--color-border);">
<!-- Theme & Language -->
<div class="flex {collapsed ? 'flex-col items-center gap-1 p-2' : 'gap-1.5 px-4 py-2.5'}">
<button onclick={toggleLocale}
class="footer-pill flex items-center justify-center {collapsed ? 'w-8 h-8' : 'px-2.5 py-1'} rounded-lg text-xs font-medium transition-all duration-200"
title={t('common.language')}>
{getLocale().toUpperCase()}
</button>
<button onclick={cycleTheme}
class="footer-pill flex items-center justify-center {collapsed ? 'w-8 h-8' : 'px-2.5 py-1'} rounded-lg text-xs transition-all duration-200"
title={t('common.theme')}>
<MdiIcon name={theme.resolved === 'dark' ? 'mdiWeatherNight' : theme.current === 'system' ? 'mdiDesktopTowerMonitor' : 'mdiWeatherSunny'} size={14} />
</button>
<a href="/docs" target="_blank" rel="noopener noreferrer"
class="footer-pill flex items-center justify-center {collapsed ? 'w-8 h-8' : 'px-2.5 py-1'} rounded-lg text-xs transition-all duration-200"
title={t('common.apiDocs')}>
<MdiIcon name="mdiApi" size={14} />
</a>
</div>
<!-- User info -->
<div class="p-2.5" style="border-top: 1px solid var(--color-border);">
{#if collapsed}
<div class="sidebar-foot">
{#if collapsed}
<div class="flex flex-col items-center gap-1.5 py-3">
<a href="/docs" target="_blank" rel="noopener noreferrer"
class="sidebar-icon-btn flex items-center justify-center w-10 h-10 rounded-lg transition-all duration-200"
title={t('common.apiDocs')}
aria-label={t('common.apiDocs')}>
<NavIcon name="mdiApi" size={14} />
</a>
<button onclick={logout}
class="sidebar-icon-btn w-full flex justify-center py-2 rounded-lg transition-all duration-200"
title={t('nav.logout')}>
<MdiIcon name="mdiLogout" size={16} />
class="sidebar-icon-btn flex items-center justify-center w-10 h-10 rounded-lg transition-all duration-200"
title={t('nav.logout')}
aria-label={t('nav.logout')}>
<NavIcon name="mdiLogout" size={16} />
</button>
{:else}
<div class="px-1.5">
<div class="flex items-center justify-between">
<div class="flex items-center gap-2.5">
<div class="w-7 h-7 rounded-full flex items-center justify-center text-[0.7rem] font-semibold"
style="background: var(--color-primary); color: var(--color-primary-foreground);">
{auth.user.username[0].toUpperCase()}
</div>
<div>
<p class="text-sm font-medium">{auth.user.username}</p>
<p class="text-[0.65rem] tracking-wide uppercase" style="color: var(--color-muted-foreground);">{auth.user.role}</p>
</div>
</div>
<button onclick={logout}
class="sidebar-icon-btn p-1.5 rounded-lg transition-all duration-200"
title={t('nav.logout')}>
<MdiIcon name="mdiLogout" size={15} />
</button>
</div>
{:else}
<div class="user-card">
<div class="user-card__main">
<div class="user-avatar">
{auth.user.username[0].toUpperCase()}
</div>
<button onclick={() => showPasswordForm = true}
class="change-pwd-link text-[0.7rem] mt-1.5 transition-colors duration-200 flex items-center gap-1">
<MdiIcon name="mdiKeyVariant" size={12} />
{t('common.changePassword')}
<div class="user-card__text min-w-0">
<p class="user-card__name truncate">{auth.user.username}</p>
<p class="user-card__role">{auth.user.role}</p>
</div>
<span class="user-card__chip" title={t('dashboard.live')}></span>
</div>
<div class="user-card__actions">
<button onclick={() => showPasswordForm = true} class="user-card__btn"
title={t('common.changePassword')}
aria-label={t('common.changePassword')}>
<NavIcon name="mdiKeyVariant" size={13} />
<span>{t('common.changePassword')}</span>
</button>
<a href="/docs" target="_blank" rel="noopener noreferrer"
class="user-card__btn" title={t('common.apiDocs')}
aria-label={t('common.apiDocs')}>
<NavIcon name="mdiApi" size={13} />
</a>
<button onclick={logout} class="user-card__btn user-card__btn--danger"
title={t('nav.logout')}
aria-label={t('nav.logout')}>
<NavIcon name="mdiLogout" size={13} />
</button>
</div>
{/if}
</div>
</div>
{/if}
</div>
</aside>
@@ -534,18 +542,18 @@
<a href={item.href} aria-label={t(item.key)}
class="flex flex-col items-center gap-0.5 px-2 py-1.5 text-xs rounded-lg transition-all duration-200"
style="color: {isActive(item.href) ? 'var(--color-primary)' : 'var(--color-muted-foreground)'};">
<MdiIcon name={item.icon} size={20} />
<NavIcon name={item.icon} size={20} />
</a>
{/each}
<button onclick={() => openSearch?.()} aria-label={t('searchPalette.placeholder')}
class="flex flex-col items-center gap-0.5 px-2 py-1.5 text-xs rounded-lg transition-all duration-200"
style="color: var(--color-muted-foreground);">
<MdiIcon name="mdiMagnify" size={20} />
<NavIcon name="mdiMagnify" size={20} />
</button>
<button onclick={() => mobileMoreOpen = !mobileMoreOpen} aria-label={t('nav.more')}
class="flex flex-col items-center gap-0.5 px-2 py-1.5 text-xs rounded-lg transition-all duration-200"
style="color: {mobileMoreOpen ? 'var(--color-primary)' : 'var(--color-muted-foreground)'};">
<MdiIcon name="mdiDotsHorizontal" size={20} />
<NavIcon name="mdiDotsHorizontal" size={20} />
</button>
</nav>
@@ -553,7 +561,7 @@
{#if mobileMoreOpen}
<div class="mobile-more-backdrop" style="position: fixed; inset: 0; z-index: 49; background: rgba(0,0,0,0.4); backdrop-filter: blur(2px);"
onclick={closeMobileMore} role="presentation"></div>
<div class="mobile-more-panel" style="position: fixed; bottom: calc(3rem + env(safe-area-inset-bottom, 0px)); left: 0; right: 0; z-index: 50; background: var(--color-sidebar); border-top: 1px solid var(--color-border); border-radius: 1rem 1rem 0 0; padding: 1rem; max-height: calc(70vh - env(safe-area-inset-bottom, 0px)); overflow-y: auto;"
<div class="mobile-more-panel"
transition:slide={{ duration: 200, easing: cubicOut }}>
{#if allProviders.length >= 1}
<div class="mb-3 pb-3" style="border-bottom: 1px solid var(--color-border);">
@@ -566,7 +574,7 @@
<div>
<div class="flex items-center gap-1.5 px-1 pb-1.5 text-[0.65rem] font-semibold uppercase tracking-wider"
style="color: var(--color-muted-foreground);">
<MdiIcon name={entry.icon} size={13} />
<NavIcon name={entry.icon} size={13} />
<span>{t(entry.key)}</span>
</div>
<div class="grid grid-cols-3 gap-2">
@@ -575,7 +583,7 @@
class="flex flex-col items-center gap-1 p-3 rounded-lg transition-all duration-200 relative"
style="color: {isActive(child.href) ? 'var(--color-primary)' : 'var(--color-muted-foreground)'}; background: {isActive(child.href) ? 'var(--color-sidebar-active)' : 'transparent'};"
>
<MdiIcon name={child.icon} size={20} />
<NavIcon name={child.icon} size={20} />
<span class="text-xs text-center leading-tight">{t(child.key)}</span>
{#if child.countKey && navCounts[child.countKey]}
<span class="nav-badge-sm" style="position: absolute; top: 0.25rem; right: 0.25rem;">{navCounts[child.countKey]}</span>
@@ -589,7 +597,7 @@
class="flex items-center gap-2 p-3 rounded-lg transition-all duration-200 relative"
style="color: {isActive(entry.href) ? 'var(--color-primary)' : 'var(--color-muted-foreground)'}; background: {isActive(entry.href) ? 'var(--color-sidebar-active)' : 'transparent'};"
>
<MdiIcon name={entry.icon} size={18} />
<NavIcon name={entry.icon} size={18} />
<span class="text-sm flex-1">{t(entry.key)}</span>
{#if entry.countKey && navCounts[entry.countKey]}
<span class="nav-badge">{navCounts[entry.countKey]}</span>
@@ -601,7 +609,7 @@
<button onclick={() => { closeMobileMore(); logout(); }}
class="flex items-center gap-2 p-3 w-full rounded-lg transition-all duration-200"
style="color: var(--color-muted-foreground);">
<MdiIcon name="mdiLogout" size={18} />
<NavIcon name="mdiLogout" size={18} />
<span class="text-sm">{t('nav.logout')}</span>
</button>
</div>
@@ -610,10 +618,30 @@
{/if}
<!-- Main content -->
<main class="flex-1 overflow-auto md:pb-0"
<main class="main-col flex-1 overflow-auto md:pb-0"
style="padding-bottom: calc(4rem + env(safe-area-inset-bottom, 0px));">
<!-- Always-visible topbar — search + utilities + primary CTA -->
<div class="topbar">
<div class="topbar-glass">
<button type="button" class="topbar-search" onclick={() => openSearch?.()}>
<NavIcon name="mdiMagnify" size={16} />
<span class="topbar-search__text">{t('searchPalette.placeholder')}</span>
<span class="topbar-search__kbd font-mono">{isMac ? '⌘' : 'Ctrl '}K</span>
</button>
<button type="button" class="topbar-icon-btn" onclick={cycleTheme}
title={t('common.theme')} aria-label={t('common.theme')}>
<NavIcon name={theme.resolved === 'dark' ? 'mdiWeatherNight' : theme.current === 'system' ? 'mdiDesktopTowerMonitor' : 'mdiWeatherSunny'} size={16} />
</button>
<button type="button" class="topbar-icon-btn" onclick={toggleLocale}
title={t('common.language')} aria-label={t('common.language')}>
<span class="topbar-locale font-mono">{getLocale().toUpperCase()}</span>
</button>
</div>
</div>
{#key page.url.pathname}
<div class="max-w-5xl mx-auto p-4 md:p-8" in:fade={{ duration: 200, delay: 50 }}>
<div class="pb-4 md:pb-8" style="padding-top: 12px;" in:fade={{ duration: 200, delay: 50 }}>
{@render children()}
</div>
{/key}
@@ -663,44 +691,103 @@
<SearchPalette onopen={(fn) => openSearch = fn} />
<style>
@media (max-width: 767px) {
.mobile-nav { display: flex !important; }
.mobile-more-panel a:hover,
.mobile-more-panel button:hover {
background: var(--color-muted);
}
/* === AURORA SHELL === */
.app-shell {
display: flex;
min-height: 100vh;
padding: 18px;
gap: 18px;
}
/* Provider filter chips */
.provider-chip {
display: inline-flex;
align-items: center;
gap: 0.25rem;
padding: 0.2rem 0.4rem;
border-radius: 0.375rem;
/* === SIDEBAR — frosted glass rail === */
.sidebar {
background: var(--color-glass);
backdrop-filter: blur(28px) saturate(160%);
-webkit-backdrop-filter: blur(28px) saturate(160%);
border: 1px solid var(--color-border);
background: transparent;
color: var(--color-muted-foreground);
cursor: pointer;
transition: all 0.15s;
border-radius: 22px;
box-shadow: var(--shadow-card);
position: sticky;
top: 18px;
height: calc(100vh - 36px);
overflow: hidden;
transition: width 0.25s cubic-bezier(0.4, 0, 0.2, 1);
}
.sidebar::after {
content: '';
position: absolute;
inset: 0;
border-radius: inherit;
pointer-events: none;
background: linear-gradient(180deg, var(--color-highlight), transparent 30%);
opacity: 0.4;
z-index: 0;
}
.sidebar > * { position: relative; z-index: 1; }
.sidebar-header {
border-bottom: 1px solid var(--color-border);
}
/* Brand — snapped to Aurora mockup: bold sans wordmark + mono version */
.brand-text { line-height: 1.1; min-width: 0; }
.brand-name {
font-family: var(--font-sans);
font-weight: 600;
font-size: 0.95rem;
letter-spacing: -0.01em;
color: var(--color-foreground);
margin: 0;
display: flex;
align-items: center;
gap: 0.35rem;
white-space: nowrap;
}
.provider-chip:hover {
border-color: var(--color-primary);
color: var(--color-primary);
.brand-mark__icon {
display: inline-flex;
align-items: center;
}
.provider-chip.active {
border-color: var(--color-primary);
background: color-mix(in srgb, var(--color-primary) 10%, transparent);
color: var(--color-primary);
.brand-version {
font-size: 0.65rem;
color: var(--color-muted-foreground);
margin: 3px 0 0;
letter-spacing: 0.02em;
font-weight: 500;
}
.brand-orb {
width: 32px; height: 32px;
border-radius: 11px;
background: conic-gradient(from 220deg, var(--color-primary), var(--color-orchid), var(--color-mint), var(--color-primary));
box-shadow: 0 4px 14px var(--color-glow);
position: relative;
flex-shrink: 0;
}
.brand-orb::after {
content: '';
position: absolute; inset: 4px;
border-radius: 7px;
background: radial-gradient(circle at 30% 25%, rgba(255,255,255,0.6), transparent 50%);
}
.brand-orb--small { width: 26px; height: 26px; border-radius: 9px; }
/* User avatar */
.user-avatar {
width: 30px; height: 30px;
border-radius: 50%;
display: grid; place-items: center;
background: linear-gradient(135deg, var(--color-orchid), var(--color-primary));
color: white;
font-weight: 600;
font-size: 0.78rem;
box-shadow: 0 0 0 2px var(--color-glass) inset;
}
.provider-filter-btn {
color: var(--color-muted-foreground);
background: transparent;
}
.provider-filter-btn:hover {
color: var(--color-primary);
background: var(--color-muted);
color: var(--color-foreground);
background: var(--color-glass-strong);
}
/* Sidebar icon button (toggle, logout) */
@@ -709,88 +796,289 @@
background: transparent;
}
.sidebar-icon-btn:hover {
background: var(--color-muted);
background: var(--color-glass-strong);
color: var(--color-foreground);
}
/* Search button */
.search-btn {
background: var(--color-muted);
color: var(--color-muted-foreground);
border: 1px solid var(--color-border);
}
.search-btn:hover {
border-color: var(--color-primary);
color: var(--color-foreground);
}
/* Nav links (top-level items, group headers, group children) */
/* Nav links — soft glass hovers, gradient bar on active.
Snapped from the Aurora dashboard mockup. */
.nav-link {
color: var(--color-muted-foreground);
background: transparent;
font-weight: 400;
font-weight: 450;
border-radius: 12px !important;
font-size: 13.5px;
letter-spacing: -0.005em;
}
.nav-link:not(.active):hover {
background: var(--color-muted);
background: var(--color-glass-strong);
color: var(--color-foreground);
}
.nav-link.active {
color: var(--color-primary);
color: var(--color-foreground);
font-weight: 500;
background: var(--color-glass-elev);
box-shadow: inset 0 1px 0 var(--color-highlight), 0 4px 18px -8px var(--color-glow);
}
.nav-link.active-bg {
background: var(--color-sidebar-active);
background: var(--color-glass-elev);
}
/* Footer pill buttons (locale, theme) */
.footer-pill {
background: var(--color-muted);
color: var(--color-muted-foreground);
/* Sidebar footer card */
.sidebar-foot {
padding: 0.85rem 0.85rem 1rem;
}
.footer-pill:hover {
.user-card {
background: var(--color-glass-strong);
border: 1px solid var(--color-border);
border-radius: 14px;
padding: 0.75rem 0.85rem 0.6rem;
box-shadow: inset 0 1px 0 var(--color-highlight);
}
.user-card__main {
display: flex; align-items: center; gap: 0.7rem;
}
.user-card__text { line-height: 1.15; }
.user-card__name {
font-size: 0.82rem;
font-weight: 500;
color: var(--color-foreground);
box-shadow: 0 0 8px var(--color-glow);
margin: 0;
}
.user-card__role {
font-size: 0.6rem;
color: var(--color-muted-foreground);
margin: 2px 0 0;
text-transform: uppercase;
letter-spacing: 0.13em;
}
.user-card__chip {
margin-left: auto;
width: 8px; height: 8px;
border-radius: 50%;
background: var(--color-mint);
box-shadow: 0 0 8px var(--color-mint);
flex-shrink: 0;
}
.user-card__actions {
display: flex; gap: 0.3rem;
margin-top: 0.65rem;
padding-top: 0.55rem;
border-top: 1px solid var(--color-border);
}
.user-card__btn {
display: inline-flex; align-items: center; justify-content: center; gap: 0.35rem;
padding: 0.35rem 0.55rem;
flex: 1;
font-size: 0.65rem;
color: var(--color-muted-foreground);
background: transparent;
border: 1px solid transparent;
border-radius: 7px;
cursor: pointer;
transition: all 0.15s;
font-family: inherit;
text-decoration: none;
}
.user-card__btn span {
max-width: 90px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.user-card__btn:not(.user-card__btn--danger):not(:has(span)) { flex: 0 0 auto; }
.user-card__btn:hover {
background: var(--color-glass-elev);
color: var(--color-foreground);
}
.user-card__btn--danger:hover {
background: var(--color-error-bg);
color: var(--color-error-fg);
}
/* Change password link */
.change-pwd-link {
/* Section labels above each nav group */
.nav-section-label {
display: flex;
align-items: center;
gap: 0.55rem;
font-size: 0.6rem;
font-weight: 600;
letter-spacing: 0.18em;
text-transform: uppercase;
color: var(--color-muted-foreground);
padding: 0.85rem 0.85rem 0.4rem;
font-family: var(--font-mono);
}
.change-pwd-link:hover {
color: var(--color-primary);
.nav-section-label::after {
content: '';
flex: 1;
height: 1px;
background: var(--color-border);
}
/* Primary action button (password form submit) */
.primary-btn {
background: var(--color-primary);
color: var(--color-primary-foreground);
background: linear-gradient(135deg, var(--color-primary), var(--color-orchid));
color: white;
border: 0;
box-shadow: 0 6px 20px -8px var(--color-glow-strong), inset 0 1px 0 rgba(255,255,255,0.3);
}
.primary-btn:hover {
box-shadow: 0 0 16px var(--color-glow-strong);
transform: translateY(-1px);
box-shadow: 0 8px 24px -6px var(--color-glow-strong), inset 0 1px 0 rgba(255,255,255,0.3);
}
.nav-badge {
font-size: 0.6rem;
font-weight: 600;
padding: 0.1rem 0.4rem;
font-weight: 500;
padding: 0.12rem 0.45rem;
border-radius: 9999px;
background: var(--color-primary);
color: var(--color-primary-foreground);
background: var(--color-glass-elev);
color: var(--color-foreground);
font-family: var(--font-mono);
line-height: 1.2;
min-width: 1.2rem;
text-align: center;
border: 1px solid var(--color-border);
}
.nav-link.active .nav-badge {
background: var(--color-primary);
color: var(--color-primary-foreground);
border-color: transparent;
}
.nav-badge-sm {
font-size: 0.55rem;
font-weight: 600;
padding: 0.05rem 0.35rem;
font-weight: 500;
padding: 0.06rem 0.4rem;
border-radius: 9999px;
background: var(--color-muted);
background: var(--color-glass-strong);
color: var(--color-muted-foreground);
font-family: var(--font-mono);
line-height: 1.2;
min-width: 1rem;
text-align: center;
}
/* === TOPBAR — always-visible search + utility row === */
.main-col {
display: flex;
flex-direction: column;
}
.topbar {
position: sticky;
top: 0;
z-index: 30;
flex-shrink: 0;
}
.topbar-glass {
display: flex;
align-items: center;
gap: 0.5rem;
padding: 0.5rem 0.6rem 0.5rem 0.85rem;
background: var(--color-glass);
backdrop-filter: blur(14px) saturate(150%);
-webkit-backdrop-filter: blur(14px) saturate(150%);
border: 1px solid var(--color-border);
border-radius: 18px;
box-shadow: var(--shadow-card);
position: relative;
}
.topbar-glass::after {
content: '';
position: absolute; inset: 0;
border-radius: inherit;
pointer-events: none;
background: linear-gradient(180deg, var(--color-highlight), transparent 30%);
opacity: 0.4;
}
.topbar-search {
flex: 1;
display: inline-flex;
align-items: center;
gap: 0.65rem;
padding: 0.55rem 0.85rem;
background: var(--color-glass-strong);
border: 1px solid var(--color-border);
border-radius: 12px;
color: var(--color-muted-foreground);
font-size: 0.85rem;
font-family: inherit;
cursor: text;
transition: all 0.15s;
text-align: left;
}
.topbar-search:hover {
background: var(--color-glass-elev);
border-color: var(--color-rule-strong);
}
.topbar-search__text {
flex: 1;
text-align: left;
}
.topbar-search__kbd {
font-size: 0.65rem;
padding: 2px 7px;
border-radius: 6px;
background: var(--color-glass);
border: 1px solid var(--color-border);
color: var(--color-foreground);
}
.topbar-icon-btn {
width: 36px; height: 36px;
display: grid; place-items: center;
border-radius: 12px;
border: 1px solid var(--color-border);
background: var(--color-glass-strong);
color: var(--color-muted-foreground);
cursor: pointer;
transition: all 0.15s;
}
.topbar-icon-btn:hover {
background: var(--color-glass-elev);
color: var(--color-foreground);
}
.topbar-locale {
font-size: 0.65rem;
font-weight: 600;
letter-spacing: 0.06em;
}
@media (max-width: 720px) {
.topbar-search__kbd { display: none; }
}
/* Mobile bottom-nav */
@media (max-width: 767px) {
.app-shell {
padding: 0;
gap: 0;
}
.sidebar {
border-radius: 0;
border: 0;
border-right: 1px solid var(--color-border);
}
.mobile-nav { display: flex !important; }
.mobile-more-panel {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: calc(3rem + env(safe-area-inset-bottom, 0px));
z-index: 50;
background: var(--mobile-more-bg, rgba(19, 21, 32, 0.92));
backdrop-filter: blur(12px) saturate(150%);
-webkit-backdrop-filter: blur(12px) saturate(150%);
border-top: 1px solid var(--color-rule-strong);
padding: calc(1rem + env(safe-area-inset-top, 0px)) calc(1rem + env(safe-area-inset-right, 0px)) 1rem calc(1rem + env(safe-area-inset-left, 0px));
overflow-y: auto;
overscroll-behavior: contain;
}
:global([data-theme="light"]) .mobile-more-panel { --mobile-more-bg: rgba(250, 250, 254, 0.92); }
.mobile-more-panel a:hover,
.mobile-more-panel button:hover {
background: var(--color-glass-strong);
}
.topbar { display: none; }
}
</style>
File diff suppressed because it is too large Load Diff
+22 -4
View File
@@ -68,6 +68,16 @@
})());
onMount(load);
const headerPills = $derived.by(() => {
const pills: Array<{ label: string; tone: 'mint' | 'citrus' }> = [];
const enabled = actions.filter((a: Action) => a.enabled).length;
const disabled = actions.length - enabled;
if (enabled > 0) pills.push({ label: `${enabled} ${t('notificationTracker.armed')}`, tone: 'mint' });
if (disabled > 0) pills.push({ label: `${disabled} ${t('notificationTracker.paused')}`, tone: 'citrus' });
return pills;
});
async function load() {
try {
await Promise.all([
@@ -171,7 +181,15 @@
}
</script>
<PageHeader title={t('actions.title')} description={t('actions.description')}>
<PageHeader
title={t('actions.title')}
emphasis={t('actions.titleEmphasis')}
description={t('actions.description')}
crumb="Routing · Automation"
count={actions.length}
countLabel={t('actions.countLabel')}
pills={headerPills}
>
<Button size="sm" onclick={() => { showForm ? (showForm = false, editing = null) : openNew(); }}>
{showForm ? t('common.cancel') : t('actions.addAction')}
</Button>
@@ -196,14 +214,14 @@
{#if error}<ErrorBanner message={error} />{/if}
<form onsubmit={save} class="space-y-3">
<div>
<label class="block text-sm font-medium mb-1">{t('actions.provider')}</label>
<div class="block text-sm font-medium mb-1">{t('actions.provider')}</div>
<EntitySelect items={providerItems} bind:value={form.provider_id}
placeholder={t('actions.selectProvider')} disabled={!!editing} />
</div>
{#if actionTypes.length > 0}
<div>
<label class="block text-sm font-medium mb-1">{t('actions.actionType')}</label>
<div class="block text-sm font-medium mb-1">{t('actions.actionType')}</div>
{#if !editing}
<div class="space-y-1">
{#each actionTypes as at}
@@ -233,7 +251,7 @@
</div>
<div>
<label class="block text-sm font-medium mb-1">{t('actions.schedule')}</label>
<div class="block text-sm font-medium mb-1">{t('actions.schedule')}</div>
<div class="flex gap-2 items-center mb-2">
<label class="flex items-center gap-1 text-sm">
<input type="radio" name="schedule_type" value="interval" bind:group={form.schedule_type} class="accent-[var(--color-primary)]" />
+13 -13
View File
@@ -153,8 +153,8 @@
{#if showAddForm}
<div class="border border-[var(--color-border)] rounded-md p-3 space-y-2 bg-[var(--color-muted)]/30">
<div>
<label class="block text-xs font-medium mb-1">{t('actions.ruleName')}</label>
<input bind:value={newRule.name} placeholder={t('actions.ruleNamePlaceholder')}
<label for="rule-name-new" class="block text-xs font-medium mb-1">{t('actions.ruleName')}</label>
<input id="rule-name-new" bind:value={newRule.name} placeholder={t('actions.ruleNamePlaceholder')}
class="w-full px-2 py-1.5 border border-[var(--color-border)] rounded text-sm bg-[var(--color-background)]" />
</div>
@@ -189,8 +189,8 @@
{#if expandedRule === rule.id}
<div class="mt-2 pt-2 border-t border-[var(--color-border)] space-y-2">
<div>
<label class="block text-xs font-medium mb-1">{t('actions.ruleName')}</label>
<input bind:value={rule.name}
<label for="rule-name-{rule.id}" class="block text-xs font-medium mb-1">{t('actions.ruleName')}</label>
<input id="rule-name-{rule.id}" bind:value={rule.name}
class="w-full px-2 py-1.5 border border-[var(--color-border)] rounded text-sm bg-[var(--color-background)]" />
</div>
@@ -219,7 +219,7 @@
<!-- Person selector -->
{#if personItems.length > 0}
<div>
<label class="block text-xs font-medium mb-1">{t('actions.persons')}</label>
<div class="block text-xs font-medium mb-1">{t('actions.persons')}</div>
<MultiEntitySelect items={personItems}
bind:values={ruleConfig.criteria.person_ids}
placeholder={t('actions.addPerson')}
@@ -231,7 +231,7 @@
<!-- Person excludes -->
<div>
<label class="block text-xs font-medium mb-1">{t('actions.excludePersons')}</label>
<div class="block text-xs font-medium mb-1">{t('actions.excludePersons')}</div>
<MultiEntitySelect items={personItems}
bind:values={ruleConfig.criteria.exclude_person_ids}
placeholder={t('actions.addExcludePerson')}
@@ -244,14 +244,14 @@
<!-- Smart search query -->
<div>
<label class="block text-xs font-medium mb-1">{t('actions.searchQuery')}</label>
<div class="block text-xs font-medium mb-1">{t('actions.searchQuery')}</div>
<input bind:value={ruleConfig.criteria.query} placeholder={t('actions.searchQueryPlaceholder')}
class="w-full px-2 py-1.5 border border-[var(--color-border)] rounded text-sm bg-[var(--color-background)]" />
</div>
<!-- Asset type -->
<div class="flex items-center gap-3">
<label class="text-xs font-medium">{t('actions.assetType')}:</label>
<span class="text-xs font-medium">{t('actions.assetType')}:</span>
{#each ['all', 'image', 'video'] as at}
<label class="flex items-center gap-1 text-xs">
<input type="radio"
@@ -266,12 +266,12 @@
<!-- Date range -->
<div class="flex gap-2">
<div class="flex-1">
<label class="block text-xs font-medium mb-1">{t('actions.dateFrom')}</label>
<div class="block text-xs font-medium mb-1">{t('actions.dateFrom')}</div>
<input type="date" bind:value={ruleConfig.criteria.date_from}
class="w-full px-2 py-1.5 border border-[var(--color-border)] rounded text-sm bg-[var(--color-background)]" />
</div>
<div class="flex-1">
<label class="block text-xs font-medium mb-1">{t('actions.dateTo')}</label>
<div class="block text-xs font-medium mb-1">{t('actions.dateTo')}</div>
<input type="date" bind:value={ruleConfig.criteria.date_to}
class="w-full px-2 py-1.5 border border-[var(--color-border)] rounded text-sm bg-[var(--color-background)]" />
</div>
@@ -290,7 +290,7 @@
{#if albumItems.length > 0}
<div>
<label class="block text-xs font-medium mb-1">{t('actions.selectAlbum')}</label>
<div class="block text-xs font-medium mb-1">{t('actions.selectAlbum')}</div>
<MultiEntitySelect items={albumItems}
bind:values={ruleConfig.target_album_ids}
placeholder={t('actions.selectAlbumPlaceholder')}
@@ -301,7 +301,7 @@
</div>
{:else}
<div>
<label class="block text-xs font-medium mb-1">{t('actions.albumId')}</label>
<div class="block text-xs font-medium mb-1">{t('actions.albumId')}</div>
<input bind:value={ruleConfig.target_album_id}
class="w-full px-2 py-1.5 border border-[var(--color-border)] rounded text-sm bg-[var(--color-background)] font-mono" />
</div>
@@ -314,7 +314,7 @@
{#if ruleConfig.create_album_if_missing}
<div>
<label class="block text-xs font-medium mb-1">{t('actions.newAlbumName')}</label>
<div class="block text-xs font-medium mb-1">{t('actions.newAlbumName')}</div>
<input bind:value={ruleConfig.create_album_name}
class="w-full px-2 py-1.5 border border-[var(--color-border)] rounded text-sm bg-[var(--color-background)]" />
</div>
+8 -1
View File
@@ -86,7 +86,14 @@
}
</script>
<PageHeader title={t('emailBot.title')} description={t('emailBot.description')}>
<PageHeader
title={t('emailBot.title')}
emphasis={t('emailBot.titleEmphasis')}
description={t('emailBot.description')}
crumb="Operators · Bots"
count={emailBots.length}
countLabel={t('emailBot.countLabel')}
>
<Button size="sm" onclick={() => { showEmailForm ? (showEmailForm = false, editingEmail = null) : openNewEmail(); }}>
{showEmailForm ? t('common.cancel') : t('emailBot.addBot')}
</Button>
+8 -1
View File
@@ -84,7 +84,14 @@
}
</script>
<PageHeader title={t('matrixBot.title')} description={t('matrixBot.description')}>
<PageHeader
title={t('matrixBot.title')}
emphasis={t('matrixBot.titleEmphasis')}
description={t('matrixBot.description')}
crumb="Operators · Bots"
count={matrixBots.length}
countLabel={t('matrixBot.countLabel')}
>
<Button size="sm" onclick={() => { showMatrixForm ? (showMatrixForm = false, editingMatrix = null) : openNewMatrix(); }}>
{showMatrixForm ? t('common.cancel') : t('matrixBot.addBot')}
</Button>
+28 -4
View File
@@ -285,7 +285,14 @@
}
</script>
<PageHeader title={t('telegramBot.title')} description={t('telegramBot.description')}>
<PageHeader
title={t('telegramBot.title')}
emphasis={t('telegramBot.titleEmphasis')}
description={t('telegramBot.description')}
crumb="Operators · Bots"
count={bots.length}
countLabel={t('telegramBot.countLabel')}
>
<Button size="sm" onclick={() => { showForm ? (showForm = false, editing = null) : openNew(); }}>
{showForm ? t('common.cancel') : t('telegramBot.addBot')}
</Button>
@@ -334,10 +341,12 @@
<span class="text-xs text-[var(--color-muted-foreground)]">@{bot.bot_username}</span>
{/if}
<!-- Mode badge -->
<span class="text-xs px-1.5 py-0.5 rounded font-mono {bot.update_mode === 'webhook'
<span class="text-xs px-1.5 py-0.5 rounded font-mono {(bot.update_mode || 'none') === 'webhook'
? 'bg-[var(--color-primary)]/10 text-[var(--color-primary)]'
: 'bg-[var(--color-success-bg)] text-[var(--color-success-fg)]'}">
{bot.update_mode === 'webhook' ? t('telegramBot.webhook') : t('telegramBot.polling')}
: (bot.update_mode || 'none') === 'polling'
? 'bg-[var(--color-success-bg)] text-[var(--color-success-fg)]'
: 'bg-[var(--color-muted)] text-[var(--color-muted-foreground)]'}">
{(bot.update_mode || 'none') === 'webhook' ? t('telegramBot.webhook') : (bot.update_mode || 'none') === 'polling' ? t('telegramBot.polling') : t('telegramBot.none')}
</span>
</div>
<p class="text-xs text-[var(--color-muted-foreground)] font-mono">{bot.token_preview}</p>
@@ -456,6 +465,14 @@
<p class="text-xs font-medium mb-2">{t('telegramBot.updateMode')}</p>
<div class="flex items-center gap-3 flex-wrap">
<div class="flex items-center rounded-md border border-[var(--color-border)] overflow-hidden">
<button onclick={() => switchMode(bot.id, 'none')}
disabled={modeChanging[bot.id] || (bot.update_mode || 'none') === 'none'}
class="px-3 py-1 text-xs transition-colors {(bot.update_mode || 'none') === 'none'
? 'bg-[var(--color-primary)] text-[var(--color-primary-foreground)]'
: 'hover:bg-[var(--color-muted)]'} disabled:opacity-70">
<MdiIcon name="mdiBellOff" size={14} />
{t('telegramBot.none')}
</button>
<button onclick={() => switchMode(bot.id, 'polling')}
disabled={modeChanging[bot.id] || bot.update_mode === 'polling'}
class="px-3 py-1 text-xs transition-colors {bot.update_mode === 'polling'
@@ -474,6 +491,13 @@
</button>
</div>
{#if (bot.update_mode || 'none') === 'none'}
<span class="text-xs text-[var(--color-muted-foreground)] flex items-center gap-1">
<MdiIcon name="mdiBellOff" size={14} />
{t('telegramBot.noneActive')}
</span>
{/if}
{#if bot.update_mode === 'polling'}
<span class="text-xs text-[var(--color-success-fg)] flex items-center gap-1">
<MdiIcon name="mdiCheckCircle" size={14} />
@@ -80,6 +80,14 @@
let hasCommands = $derived(providerCommands.length > 0);
onMount(load);
const headerPills = $derived.by(() => {
const pills: Array<{ label: string; tone: 'sky' }> = [];
const types = new Set(configs.map(c => c.provider_type)).size;
if (types > 0) pills.push({ label: `${types} ${types === 1 ? t('providers.typeSingular') : t('providers.typePlural')}`, tone: 'sky' });
return pills;
});
async function load() {
try {
await Promise.all([
@@ -161,7 +169,15 @@
}
</script>
<PageHeader title={t('commandConfig.title')} description={t('commandConfig.description')}>
<PageHeader
title={t('commandConfig.title')}
emphasis={t('commandConfig.titleEmphasis')}
description={t('commandConfig.description')}
crumb="Routing · Commands"
count={configs.length}
countLabel={t('commandConfig.countLabel')}
pills={headerPills}
>
<Button size="sm" onclick={() => { showForm ? (showForm = false, editing = null) : openNew(); }}>
{showForm ? t('common.cancel') : t('commandConfig.newConfig')}
</Button>
@@ -183,7 +199,7 @@
</div>
<div>
<label class="block text-sm font-medium mb-1">{t('commandConfig.providerType')}</label>
<div class="block text-sm font-medium mb-1">{t('commandConfig.providerType')}</div>
{#if !editing}
<IconGridSelect items={providerTypeItems()} bind:value={form.provider_type} columns={2} />
{:else}
@@ -208,30 +224,30 @@
</div>
<div>
<label class="block text-sm font-medium mb-1">{t('commandConfig.responseTemplate')}</label>
<div class="block text-sm font-medium mb-1">{t('commandConfig.responseTemplate')}</div>
<EntitySelect items={templateItems} bind:value={form.command_template_config_id} placeholder={t('commandConfig.responseTemplate')} />
</div>
<div class="grid grid-cols-2 sm:grid-cols-3 gap-3">
<div>
<label class="block text-xs mb-1">{t('commandConfig.responseMode')}</label>
<div class="block text-xs mb-1">{t('commandConfig.responseMode')}</div>
<IconGridSelect items={responseModeItems(t)} bind:value={form.response_mode} columns={2} compact />
</div>
<div>
<label class="block text-xs mb-1">{t('commandConfig.defaultCount')}</label>
<input type="number" bind:value={form.default_count} min="1" max="20"
<label for="cfg-default-count" class="block text-xs mb-1">{t('commandConfig.defaultCount')}</label>
<input id="cfg-default-count" type="number" bind:value={form.default_count} min="1" max="20"
class="w-full px-2 py-1.5 text-sm border border-[var(--color-border)] rounded-md bg-[var(--color-background)]" />
</div>
<div>
<label class="block text-xs mb-1">{t('commandConfig.searchCooldown')}</label>
<input type="number" bind:value={form.rate_limits.search} min="0" max="300"
<label for="cfg-search-cooldown" class="block text-xs mb-1">{t('commandConfig.searchCooldown')}</label>
<input id="cfg-search-cooldown" type="number" bind:value={form.rate_limits.search} min="0" max="300"
class="w-full px-2 py-1.5 text-sm border border-[var(--color-border)] rounded-md bg-[var(--color-background)]" />
</div>
</div>
<div class="w-1/2 sm:w-1/4">
<label class="block text-xs mb-1">{t('commandConfig.defaultCooldown')}</label>
<input type="number" bind:value={form.rate_limits.default} min="0" max="300"
<label for="cfg-default-cooldown" class="block text-xs mb-1">{t('commandConfig.defaultCooldown')}</label>
<input id="cfg-default-cooldown" type="number" bind:value={form.rate_limits.default} min="0" max="300"
class="w-full px-2 py-1.5 text-sm border border-[var(--color-border)] rounded-md bg-[var(--color-background)]" />
</div>
{:else}
@@ -7,6 +7,7 @@
import { sanitizePreview } from '$lib/sanitize';
import { commandTemplateConfigsCache, supportedLocalesCache } from '$lib/stores/caches.svelte';
import PageHeader from '$lib/components/PageHeader.svelte';
import Button from '$lib/components/Button.svelte';
import Card from '$lib/components/Card.svelte';
import Loading from '$lib/components/Loading.svelte';
import IconPicker from '$lib/components/IconPicker.svelte';
@@ -54,6 +55,11 @@
let editing = $state<number | null>(null);
let error = $state('');
let confirmDelete = $state<{ id: number; onconfirm: () => Promise<void> } | null>(null);
let confirmReset = $state<{
kind: 'slot' | 'all';
slotKey?: string;
message: string;
} | null>(null);
let slotPreview = $state<Record<string, string>>({});
let slotErrors = $state<Record<string, string>>({});
let slotErrorLines = $state<Record<string, number | null>>({});
@@ -135,6 +141,13 @@
onMount(load);
const headerPills = $derived.by(() => {
const pills: Array<{ label: string; tone: 'sky' }> = [];
const types = new Set(configs.map(c => c.provider_type)).size;
if (types > 0) pills.push({ label: `${types} ${types === 1 ? t('providers.typeSingular') : t('providers.typePlural')}`, tone: 'sky' });
return pills;
});
async function load() {
try {
const [cfgs, caps, vars] = await Promise.all([
@@ -253,6 +266,58 @@
}
}
function resetSlotToDefault(slotKey: string) {
if (!form.provider_type) return;
confirmReset = {
kind: 'slot',
slotKey,
message: t('templateConfig.resetSlotConfirm').replace('{locale}', activeLocale.toUpperCase()),
};
}
function resetAllToDefaults() {
if (!form.provider_type) return;
confirmReset = {
kind: 'all',
message: t('templateConfig.resetAllConfirm').replace(/\{locale\}/g, activeLocale.toUpperCase()),
};
}
async function performReset() {
if (!confirmReset || !form.provider_type) return;
const { kind, slotKey } = confirmReset;
confirmReset = null;
try {
if (kind === 'slot' && slotKey) {
const res = await api<Record<string, Record<string, string>>>(
`/command-template-configs/defaults?provider_type=${encodeURIComponent(form.provider_type)}&slot_name=${encodeURIComponent(slotKey)}&locale=${encodeURIComponent(activeLocale)}`,
);
const text = res?.[slotKey]?.[activeLocale];
if (!text) {
snackError(t('templateConfig.resetNoDefault'));
return;
}
setSlotValue(slotKey, text);
validateSlot(slotKey, text, true);
} else {
const res = await api<Record<string, Record<string, string>>>(
`/command-template-configs/defaults?provider_type=${encodeURIComponent(form.provider_type)}&locale=${encodeURIComponent(activeLocale)}`,
);
const nextSlots = { ...form.slots };
for (const [key, localeMap] of Object.entries(res || {})) {
const text = localeMap?.[activeLocale];
if (text === undefined) continue;
nextSlots[key] = { ...(nextSlots[key] || {}), [activeLocale]: text };
}
form.slots = nextSlots;
refreshAllPreviews();
}
snackSuccess(t('templateConfig.resetApplied'));
} catch (err: any) {
snackError(err.message);
}
}
function clone(c: CmdTemplateConfig) {
const slotsCopy: Record<string, Record<string, string>> = {};
for (const [k, v] of Object.entries(c.slots)) {
@@ -298,11 +363,18 @@
}
</script>
<PageHeader title={t('cmdTemplateConfig.title')} description={t('cmdTemplateConfig.description')}>
<button onclick={() => { showForm ? (showForm = false, editing = null) : openNew(); }}
class="px-3 py-1.5 bg-[var(--color-primary)] text-[var(--color-primary-foreground)] rounded-md text-sm font-medium hover:opacity-90">
<PageHeader
title={t('cmdTemplateConfig.title')}
emphasis={t('cmdTemplateConfig.titleEmphasis')}
description={t('cmdTemplateConfig.description')}
crumb="Routing · Commands"
count={configs.length}
countLabel={t('cmdTemplateConfig.countLabel')}
pills={headerPills}
>
<Button size="sm" onclick={() => { showForm ? (showForm = false, editing = null) : openNew(); }}>
{showForm ? t('common.cancel') : t('cmdTemplateConfig.newConfig')}
</button>
</Button>
</PageHeader>
{#if !loaded}<Loading />{:else}
@@ -328,7 +400,7 @@
{#if !editing}
<div>
<label class="block text-sm font-medium mb-1">{t('templateConfig.providerType')}</label>
<div class="block text-sm font-medium mb-1">{t('templateConfig.providerType')}</div>
<IconGridSelect items={providerTypeItemsFn()} bind:value={form.provider_type} columns={2} />
</div>
{:else}
@@ -343,7 +415,7 @@
<p class="text-xs text-[var(--color-muted-foreground)] mb-2">{t('cmdTemplateConfig.commandResponsesHint')}</p>
<!-- Locale tabs -->
<div class="flex gap-1 mb-3 border-b border-[var(--color-border)]">
<div class="flex items-center gap-1 mb-3 border-b border-[var(--color-border)]">
{#each LOCALES as loc}
<button type="button"
class="px-3 py-1.5 text-xs font-medium rounded-t-md transition-colors {activeLocale === loc ? 'bg-[var(--color-primary)] text-[var(--color-primary-foreground)]' : 'text-[var(--color-muted-foreground)] hover:bg-[var(--color-muted)]'}"
@@ -351,6 +423,14 @@
{loc.toUpperCase()}
</button>
{/each}
{#if form.provider_type}
<button type="button" onclick={resetAllToDefaults}
title={t('templateConfig.resetAllToDefaults')}
class="ml-auto flex items-center gap-1 text-xs px-2 py-1 rounded-md border border-[var(--color-border)] text-[var(--color-muted-foreground)] hover:bg-[var(--color-muted)]">
<MdiIcon name="mdiRefresh" size={12} />
{t('templateConfig.resetAllToDefaults')}
</button>
{/if}
</div>
<!-- Slot filter -->
@@ -381,6 +461,11 @@
<button type="button" onclick={() => showVarsFor = slot.name}
class="text-xs text-[var(--color-muted-foreground)] hover:underline">{t('templateConfig.variables')}</button>
{/if}
<button type="button" onclick={() => resetSlotToDefault(slot.name)}
title={t('templateConfig.resetToDefault')}
class="text-xs text-[var(--color-muted-foreground)] hover:underline">
{t('templateConfig.resetToDefault')}
</button>
</div>
{#if showPreviewFor.has(slot.name) && slotPreview[slot.name] && !slotErrors[slot.name]}
@@ -399,7 +484,7 @@
{#if slotErrors[slot.name]}
{#if slotErrorTypes[slot.name] === 'undefined'}
<p class="mt-1 text-xs" style="color: #d97706;">{t('common.undefinedVar')}: {slotErrors[slot.name]}</p>
<p class="mt-1 text-xs" style="color: var(--color-warning-fg);">{t('common.undefinedVar')}: {slotErrors[slot.name]}</p>
{:else}
<p class="mt-1 text-xs" style="color: var(--color-error-fg);">{t('common.syntaxError')}: {slotErrors[slot.name]}{slotErrorLines[slot.name] ? ` (${t('common.line')} ${slotErrorLines[slot.name]})` : ''}</p>
{/if}
@@ -472,6 +557,14 @@
<ConfirmModal open={confirmDelete !== null} message={t('cmdTemplateConfig.confirmDelete')}
onconfirm={() => confirmDelete?.onconfirm()} oncancel={() => confirmDelete = null} />
<ConfirmModal open={confirmReset !== null}
title={t('templateConfig.resetToDefault')}
message={confirmReset?.message || ''}
confirmLabel={confirmReset?.kind === 'all' ? t('templateConfig.resetAllToDefaults') : t('templateConfig.resetToDefault')}
confirmIcon="mdiRefresh"
onconfirm={performReset}
oncancel={() => confirmReset = null} />
<BlockedByModal open={!!blockedBy} detail={blockedBy} onclose={() => blockedBy = null} />
<!-- Variables reference modal -->
@@ -1,7 +1,8 @@
<script lang="ts">
import { onMount } from 'svelte';
import { onMount, onDestroy } from 'svelte';
import { slide } from 'svelte/transition';
import { api } from '$lib/api';
import { topbarAction } from '$lib/stores/topbar-action.svelte';
import { t } from '$lib/i18n';
import { providersCache, telegramBotsCache, commandConfigsCache } from '$lib/stores/caches.svelte';
import PageHeader from '$lib/components/PageHeader.svelte';
@@ -72,7 +73,24 @@
.filter((c: any) => !globalProviderFilter.providerType || c.provider_type === globalProviderFilter.providerType)
.map((c: any) => ({ value: c.id, label: c.name, icon: c.icon || 'mdiCog', desc: c.provider_type })));
onMount(load);
onMount(() => {
topbarAction.set({
label: t('commandTracker.newTracker'),
onclick: () => { showForm ? (showForm = false, editing = null) : openNew(); },
});
load();
});
onDestroy(() => topbarAction.clear());
const headerPills = $derived.by(() => {
const pills: Array<{ label: string; tone: 'mint' | 'sky' | 'citrus' }> = [];
const armed = trackers.filter((tr: { enabled?: boolean }) => tr.enabled).length;
const paused = trackers.length - armed;
if (armed > 0) pills.push({ label: `${armed} ${t('notificationTracker.armed')}`, tone: 'mint' });
if (paused > 0) pills.push({ label: `${paused} ${t('notificationTracker.paused')}`, tone: 'citrus' });
return pills;
});
async function load() {
try {
[allCmdTrackers] = await Promise.all([
@@ -226,7 +244,15 @@
}
</script>
<PageHeader title={t('commandTracker.title')} description={t('commandTracker.description')}>
<PageHeader
title={t('commandTracker.title')}
emphasis={t('commandTracker.titleEmphasis')}
description={t('commandTracker.description')}
crumb="Routing · Commands"
count={trackers.length}
countLabel={t('dashboard.trackersShort')}
pills={headerPills}
>
<Button size="sm" onclick={() => { showForm ? (showForm = false, editing = null) : openNew(); }}>
{showForm ? t('common.cancel') : t('commandTracker.newTracker')}
</Button>
@@ -248,12 +274,12 @@
</div>
<div>
<label class="block text-sm font-medium mb-1">{t('commandTracker.provider')}</label>
<div class="block text-sm font-medium mb-1">{t('commandTracker.provider')}</div>
<EntitySelect items={providerItems} bind:value={form.provider_id} placeholder={t('commandTracker.selectProvider')} />
</div>
<div>
<label class="block text-sm font-medium mb-1">{t('commandTracker.commandConfig')}</label>
<div class="block text-sm font-medium mb-1">{t('commandTracker.commandConfig')}</div>
<EntitySelect items={configItems} bind:value={form.command_config_id} placeholder={t('commandTracker.selectCommandConfig')} />
</div>
+26 -2
View File
@@ -15,13 +15,32 @@
let submitting = $state(false);
let mounted = $state(false);
let backendDown = $state(false);
onMount(async () => {
initTheme();
mounted = true;
// If the user is already signed in (valid access token in storage),
// there is no reason to show them the login form. loadUser() runs in
// the root layout; we just check the resolved state after a short tick.
const { isAuthenticated } = await import('$lib/api');
if (isAuthenticated()) {
try {
await api('/auth/me');
goto('/');
return;
} catch {
// Token was stale; fall through to the login form.
}
}
try {
const res = await api<{ needs_setup: boolean }>('/auth/needs-setup');
if (res.needs_setup) goto('/setup');
} catch { /* ignore */ }
} catch {
// The backend is unreachable — surface that distinctly so the user
// doesn't blame the login form for a network/backend problem.
backendDown = true;
}
});
async function handleSubmit(e: SubmitEvent) {
@@ -62,7 +81,12 @@
<p class="text-sm mt-1" style="color: var(--color-muted-foreground);">{t('auth.signInTitle')}</p>
</div>
{#if error}
{#if backendDown}
<div class="auth-error animate-fade-slide-in">
<MdiIcon name="mdiAlertCircle" size={16} />
{t('auth.backendUnreachable')}
</div>
{:else if error}
<div class="auth-error animate-fade-slide-in">
<MdiIcon name="mdiAlertCircle" size={16} />
{error}
@@ -1,6 +1,7 @@
<script lang="ts">
import { onMount } from 'svelte';
import { onMount, onDestroy } from 'svelte';
import { api, parseDate } from '$lib/api';
import { topbarAction } from '$lib/stores/topbar-action.svelte';
import { t, getLocale } from '$lib/i18n';
import { providersCache, targetsCache, trackingConfigsCache, templateConfigsCache, capabilitiesCache } from '$lib/stores/caches.svelte';
import PageHeader from '$lib/components/PageHeader.svelte';
@@ -62,7 +63,8 @@
// Tracker form
const defaultForm = () => ({
name: '', icon: '', provider_id: 0, collection_ids: [] as string[],
scan_interval: 60, batch_duration: 0,
scan_interval: 60,
adaptive_max_skip: null as number | null,
default_tracking_config_id: 0, default_template_config_id: 0,
filters: {} as Record<string, any>,
});
@@ -84,17 +86,23 @@
let testMenuStyle = $state('');
// Test types: basic is always available; periodic/scheduled/memory only for providers
// that have those notification slots in their capabilities
const allTestTypes: Record<string, { key: string; icon: string; labelKey: string; requiredSlot?: string }> = {
// that have those notification slots in their capabilities AND have the feature
// enabled on the tracker's default TrackingConfig. A disabled feature on the
// default config means cron dispatch won't fire it in production either — so
// the test button would just surface a silent skip.
const allTestTypes: Record<string, {
key: string; icon: string; labelKey: string;
requiredSlot?: string; enabledField?: string;
}> = {
basic: { key: 'basic', icon: 'mdiSend', labelKey: 'notificationTracker.testBasic' },
periodic: { key: 'periodic', icon: 'mdiCalendarClock', labelKey: 'notificationTracker.testPeriodic', requiredSlot: 'periodic_summary_message' },
scheduled: { key: 'scheduled', icon: 'mdiCalendarCheck', labelKey: 'notificationTracker.testScheduled', requiredSlot: 'scheduled_assets_message' },
memory: { key: 'memory', icon: 'mdiHistory', labelKey: 'notificationTracker.testMemory', requiredSlot: 'memory_mode_message' },
periodic: { key: 'periodic', icon: 'mdiCalendarClock', labelKey: 'notificationTracker.testPeriodic', requiredSlot: 'periodic_summary_message', enabledField: 'periodic_enabled' },
scheduled: { key: 'scheduled', icon: 'mdiCalendarCheck', labelKey: 'notificationTracker.testScheduled', requiredSlot: 'scheduled_assets_message', enabledField: 'scheduled_enabled' },
memory: { key: 'memory', icon: 'mdiHistory', labelKey: 'notificationTracker.testMemory', requiredSlot: 'memory_mode_message', enabledField: 'memory_enabled' },
};
let testMenuTrackerId = $state<number | null>(null);
let testTypes = $derived.by(() => {
const base = [allTestTypes.basic];
const base: { key: string; icon: string; labelKey: string; disabledReason?: string }[] = [allTestTypes.basic];
if (!testMenuTrackerId) return base;
const tracker = notificationTrackers.find(t => t.id === testMenuTrackerId);
if (!tracker) return base;
@@ -103,13 +111,41 @@
const caps = allCapabilities[provider.type];
if (!caps) return base;
const slotNames = new Set((caps.notification_slots || []).map((s: any) => s.name));
const defaultTc = trackingConfigs.find(c => c.id === tracker.default_tracking_config_id);
for (const tt of [allTestTypes.periodic, allTestTypes.scheduled, allTestTypes.memory]) {
if (tt.requiredSlot && slotNames.has(tt.requiredSlot)) base.push(tt);
if (!tt.requiredSlot || !slotNames.has(tt.requiredSlot)) continue;
const enabled = !!defaultTc && !!tt.enabledField && !!(defaultTc as any)[tt.enabledField];
base.push({
key: tt.key, icon: tt.icon, labelKey: tt.labelKey,
// When surfaced, the button still renders but is disabled and
// shows *why* — users who land here via the test menu without
// having toggled the feature on Tracking Config see a clear
// pointer to the missing setting instead of a silent failure.
disabledReason: enabled ? undefined : 'notificationTracker.testDisabledHint',
});
}
return base;
});
onMount(load);
onMount(() => {
topbarAction.set({
label: t('notificationTracker.newTracker'),
onclick: () => { showForm ? (showForm = false, editing = null) : openNew(); },
});
load();
});
onDestroy(() => topbarAction.clear());
const headerPills = $derived.by(() => {
const pills: Array<{ label: string; tone: 'mint' | 'sky' | 'coral' | 'citrus' }> = [];
const armed = notificationTrackers.filter(t => t.enabled).length;
const paused = notificationTrackers.length - armed;
if (armed > 0) pills.push({ label: `${armed} ${t('notificationTracker.armed')}`, tone: 'mint' });
if (paused > 0) pills.push({ label: `${paused} ${t('notificationTracker.paused')}`, tone: 'citrus' });
const providerCount = new Set(notificationTrackers.map(t => t.provider_id)).size;
if (providerCount > 0) pills.push({ label: `${providerCount} ${providerCount === 1 ? t('providers.typeSingular') : t('providers.typePlural')}`, tone: 'sky' });
return pills;
});
async function load() {
loadError = '';
@@ -164,7 +200,8 @@
form = {
name: trk.name, icon: trk.icon || '', provider_id: trk.provider_id,
collection_ids: [...(trk.collection_ids || [])],
scan_interval: trk.scan_interval, batch_duration: trk.batch_duration ?? 0,
scan_interval: trk.scan_interval,
adaptive_max_skip: trk.adaptive_max_skip ?? null,
default_tracking_config_id: trk.default_tracking_config_id ?? 0,
default_template_config_id: trk.default_template_config_id ?? 0,
filters: trk.filters || {},
@@ -207,6 +244,12 @@
...form,
default_tracking_config_id: form.default_tracking_config_id || null,
default_template_config_id: form.default_template_config_id || null,
// Empty string, 0, or null all mean "disable adaptive polling".
// Coerce to null so the DB column stays NULL rather than 0.
adaptive_max_skip:
form.adaptive_max_skip && form.adaptive_max_skip > 1
? form.adaptive_max_skip
: null,
};
if (editing) {
await api(`/notification-trackers/${editing}`, { method: 'PUT', body: JSON.stringify(payload) });
@@ -392,7 +435,15 @@
}
</script>
<PageHeader title={t('notificationTracker.title')} description={t('notificationTracker.description')}>
<PageHeader
title={t('notificationTracker.title')}
emphasis={t('notificationTracker.titleEmphasis')}
description={t('notificationTracker.description')}
crumb="Routing · Notification"
count={notificationTrackers.length}
countLabel={t('dashboard.trackersShort')}
pills={headerPills}
>
<Button size="sm" onclick={() => { showForm ? (showForm = false, editing = null) : openNew(); }}>
{showForm ? t('notificationTracker.cancel') : t('notificationTracker.newTracker')}
</Button>
@@ -516,6 +567,15 @@
onclose={() => { linkWarning = null; }}
onautoCreate={autoCreateLinks}
ondismiss={dismissLinkWarning}
onupdate={(remaining) => {
if (!linkWarning) return;
if (remaining.length === 0) {
linkWarning = null;
doSave();
} else {
linkWarning = { ...linkWarning, albums: remaining };
}
}}
/>
<ConfirmModal
@@ -129,13 +129,13 @@
<div class="px-2.5 pb-2.5" in:slide={{ duration: 150 }}>
<div class="grid grid-cols-2 gap-2">
<div>
<label class="block text-xs text-[var(--color-muted-foreground)] mb-1">{t('trackingConfig.title')}</label>
<div class="block text-xs text-[var(--color-muted-foreground)] mb-1">{t('trackingConfig.title')}</div>
<EntitySelect items={trackingConfigItems} value={tt.tracking_config_id}
placeholder={t('common.noneDefault')} size="sm" allowNone noneLabel={t('common.noneDefault')}
onselect={(v) => onupdateLink(tt, 'tracking_config_id', Number(v) || null)} />
</div>
<div>
<label class="block text-xs text-[var(--color-muted-foreground)] mb-1">{t('templateConfig.title')}</label>
<div class="block text-xs text-[var(--color-muted-foreground)] mb-1">{t('templateConfig.title')}</div>
<EntitySelect items={templateConfigItems} value={tt.template_config_id}
placeholder={t('common.noneDefault')} size="sm" allowNone noneLabel={t('common.noneDefault')}
onselect={(v) => onupdateLink(tt, 'template_config_id', Number(v) || null)} />
@@ -1,17 +1,50 @@
<script lang="ts">
import { t } from '$lib/i18n';
import { api } from '$lib/api';
import { snackError, snackSuccess } from '$lib/stores/snackbar.svelte';
import Modal from '$lib/components/Modal.svelte';
import MdiIcon from '$lib/components/MdiIcon.svelte';
interface AlbumIssue { id: string; name: string; issue: string }
interface Props {
linkWarning: { albums: any[]; providerId: number } | null;
linkWarning: { albums: AlbumIssue[]; providerId: number } | null;
linkCreating: boolean;
onclose: () => void;
onautoCreate: () => void;
ondismiss: () => void;
/** Called with the updated warning list after a per-row replace. */
onupdate?: (albums: AlbumIssue[]) => void;
}
let { linkWarning, linkCreating, onclose, onautoCreate, ondismiss }: Props = $props();
let { linkWarning, linkCreating, onclose, onautoCreate, ondismiss, onupdate }: Props = $props();
/** Per-row loading state for the "Replace" button. */
let replacing = $state<Record<string, boolean>>({});
/**
* Expired and password-protected links can't be repaired in place — the
* Immich API has no "reset" endpoint. The only remedy is to recreate the
* link (which the backend does by POSTing a new one and returning it).
* We surface the action per-row so users don't have to leave the form.
*/
async function replaceOne(album: AlbumIssue) {
if (!linkWarning) return;
replacing = { ...replacing, [album.id]: true };
try {
await api(`/providers/${linkWarning.providerId}/albums/${album.id}/shared-links`, {
method: 'POST',
body: JSON.stringify({ replace: true }),
});
snackSuccess(t('notificationTracker.createdLinks').replace('{count}', '1'));
const remaining = linkWarning.albums.filter(a => a.id !== album.id);
if (onupdate) onupdate(remaining);
} catch (err: any) {
snackError(t('notificationTracker.linkReplaceFailed').replace('{name}', album.name) + ': ' + err.message);
} finally {
replacing = { ...replacing, [album.id]: false };
}
}
</script>
<Modal open={linkWarning !== null} title={t('notificationTracker.missingLinksTitle')} onclose={onclose}>
@@ -19,13 +52,26 @@
<p class="text-sm mb-3" style="color: var(--color-muted-foreground);">
{t('notificationTracker.missingLinksDesc')}
</p>
<div class="space-y-1.5 mb-4 max-h-40 overflow-y-auto">
<div class="space-y-1.5 mb-4 max-h-60 overflow-y-auto">
{#each linkWarning.albums as album}
<div class="flex items-center justify-between text-sm px-2 py-1.5 rounded bg-[var(--color-muted)]/30">
<span class="font-medium">{album.name}</span>
<span class="text-xs px-1.5 py-0.5 rounded {album.issue === 'expired' ? 'bg-[var(--color-error-bg)] text-[var(--color-error-fg)]' : album.issue === 'password-protected' ? 'bg-[var(--color-warning-bg)] text-[var(--color-warning-fg)]' : 'bg-[var(--color-muted)] text-[var(--color-muted-foreground)]'}">
<div class="flex items-center justify-between gap-2 text-sm px-2 py-1.5 rounded bg-[var(--color-muted)]/30">
<div class="flex-1 min-w-0">
<span class="font-medium truncate block">{album.name}</span>
{#if album.issue === 'password-protected'}
<span class="text-[10px] block" style="color: var(--color-muted-foreground);">
{t('notificationTracker.linkPasswordProtectedNote')}
</span>
{/if}
</div>
<span class="text-xs px-1.5 py-0.5 rounded shrink-0 {album.issue === 'expired' ? 'bg-[var(--color-error-bg)] text-[var(--color-error-fg)]' : album.issue === 'password-protected' ? 'bg-[var(--color-warning-bg)] text-[var(--color-warning-fg)]' : 'bg-[var(--color-muted)] text-[var(--color-muted-foreground)]'}">
{album.issue === 'expired' ? t('notificationTracker.expired') : album.issue === 'password-protected' ? t('notificationTracker.passwordProtected') : t('notificationTracker.noLink')}
</span>
{#if album.issue === 'expired' || album.issue === 'password-protected'}
<button type="button" onclick={() => replaceOne(album)} disabled={replacing[album.id]}
class="text-xs px-2 py-1 rounded border border-[var(--color-border)] hover:bg-[var(--color-muted)] disabled:opacity-50 shrink-0">
{replacing[album.id] ? t('notificationTracker.linkReplacing') : t('notificationTracker.linkReplace')}
</button>
{/if}
</div>
{/each}
</div>
@@ -6,7 +6,13 @@
testMenuOpen: string | null;
testMenuStyle: string;
ttTesting: Record<string, string>;
testTypes: { key: string; icon: string; labelKey: string }[];
/**
* When `disabledReason` is set, the button is rendered greyed out with a
* tooltip pointing the user at the missing setting (e.g. "Enable Periodic
* Summary in Tracking Config first"). Clicking is blocked — clicking an
* unconfigured test would have surfaced as a silent server-side skip.
*/
testTypes: { key: string; icon: string; labelKey: string; disabledReason?: string }[];
ontest: (ttId: number, testType: string) => void;
onclose: () => void;
}
@@ -20,18 +26,27 @@
onclick={onclose}
onkeydown={(e) => { if (e.key === 'Escape') onclose(); }}>
</div>
<div style="{testMenuStyle} background:var(--color-card); border:1px solid var(--color-border); border-radius:0.5rem; box-shadow:0 10px 25px rgba(0,0,0,0.3); padding:0.25rem; min-width:10rem;">
<div style="{testMenuStyle} background:var(--color-card); border:1px solid var(--color-border); border-radius:0.5rem; box-shadow:0 10px 25px rgba(0,0,0,0.3); padding:0.25rem; min-width:12rem;">
{#each testTypes as tt}
{@const busy = !!ttTesting[`${testMenuOpen}_${tt.key}`]}
{@const blocked = !!tt.disabledReason}
<button
onclick={() => ontest(Number(testMenuOpen), tt.key)}
disabled={!!ttTesting[`${testMenuOpen}_${tt.key}`]}
onclick={() => { if (!blocked) ontest(Number(testMenuOpen), tt.key); }}
disabled={busy || blocked}
title={blocked ? t(tt.disabledReason!) : ''}
class="flex items-center gap-2 w-full px-3 py-1.5 text-sm rounded hover:bg-[var(--color-muted)] transition-colors disabled:opacity-50 text-left">
<MdiIcon name={tt.icon} size={14} />
{t(tt.labelKey)}
{#if ttTesting[`${testMenuOpen}_${tt.key}`]}
{#if blocked}
<MdiIcon name="mdiLock" size={12} />
{/if}
{#if busy}
<span class="ml-auto text-xs text-[var(--color-muted-foreground)]">...</span>
{/if}
</button>
{#if blocked}
<p class="px-3 pb-1 text-[10px]" style="color: var(--color-muted-foreground);">{t(tt.disabledReason!)}</p>
{/if}
{/each}
</div>
{/if}
@@ -4,6 +4,7 @@
import Card from '$lib/components/Card.svelte';
import IconPicker from '$lib/components/IconPicker.svelte';
import Hint from '$lib/components/Hint.svelte';
import MdiIcon from '$lib/components/MdiIcon.svelte';
import EntitySelect from '$lib/components/EntitySelect.svelte';
import MultiEntitySelect from '$lib/components/MultiEntitySelect.svelte';
import { getDescriptor } from '$lib/providers';
@@ -15,7 +16,7 @@
provider_id: number;
collection_ids: string[];
scan_interval: number;
batch_duration: number;
adaptive_max_skip: number | null;
default_tracking_config_id: number;
default_template_config_id: number;
filters: Record<string, any>;
@@ -96,12 +97,12 @@
</div>
</div>
<div>
<label class="block text-sm font-medium mb-1">{t('notificationTracker.server')}</label>
<div class="block text-sm font-medium mb-1">{t('notificationTracker.server')}</div>
<EntitySelect items={providerItems} bind:value={form.provider_id} placeholder={t('notificationTracker.selectServer')} />
</div>
{#if !isScheduler && colMeta && collections.length > 0}
<div>
<label class="block text-sm font-medium mb-1">{t(colMeta.label)}</label>
<div class="block text-sm font-medium mb-1">{t(colMeta.label)}</div>
<MultiEntitySelect
items={collections.map(col => ({
value: col.id,
@@ -167,19 +168,19 @@
class="text-xs text-[var(--color-primary)] hover:underline mt-1">+ {t('notificationTracker.addVariable')}</button>
</fieldset>
{:else}
{#if !isWebhook}
<div class="grid grid-cols-2 gap-3">
{#if !isWebhook}
<div>
<label for="trk-interval" class="block text-sm font-medium mb-1">{t('notificationTracker.scanInterval')}<Hint text={t('hints.scanInterval')} /></label>
<input id="trk-interval" type="number" bind:value={form.scan_interval} min="10" max="3600" class="w-full px-3 py-2 border border-[var(--color-border)] rounded-md text-sm bg-[var(--color-background)]" />
</div>
{/if}
<div>
<label for="trk-batch" class="block text-sm font-medium mb-1">{t('notificationTracker.batchDuration')}<Hint text={t('hints.batchDuration')} /></label>
<input id="trk-batch" type="number" bind:value={form.batch_duration} min="0" max="3600" class="w-full px-3 py-2 border border-[var(--color-border)] rounded-md text-sm bg-[var(--color-background)]" />
<label for="trk-adaptive" class="block text-sm font-medium mb-1">{t('notificationTracker.adaptiveMaxSkip')}<Hint text={t('hints.adaptiveMaxSkip')} /></label>
<input id="trk-adaptive" type="number" bind:value={form.adaptive_max_skip} min="0" max="10" placeholder={t('notificationTracker.adaptiveMaxSkipPlaceholder')} class="w-full px-3 py-2 border border-[var(--color-border)] rounded-md text-sm bg-[var(--color-background)]" />
</div>
</div>
{/if}
{/if}
<!-- Default configs -->
{#if trackingConfigItems.length > 0 || templateConfigItems.length > 0}
@@ -199,6 +200,25 @@
</div>
{/if}
<!-- Feature discovery: the periodic/scheduled/memory/quiet-hours controls
live on the tracking config, not on the tracker itself. Surface this
here so users don't have to stumble onto the feature by reading docs. -->
{#if providerType === 'immich'}
<div class="flex items-start gap-2 rounded-md border border-[var(--color-border)] bg-[var(--color-muted)]/30 px-3 py-2">
<span style="color: var(--color-primary);"><MdiIcon name="mdiInformationOutline" size={16} /></span>
<div class="flex-1 text-xs">
<p style="color: var(--color-muted-foreground);">{t('notificationTracker.featureDiscovery')}</p>
<a href={form.default_tracking_config_id
? `/tracking-configs?edit=${form.default_tracking_config_id}`
: '/tracking-configs'}
class="inline-flex items-center gap-1 text-[var(--color-primary)] hover:underline mt-1">
<MdiIcon name="mdiArrowRight" size={12} />
{t('notificationTracker.openTrackingConfig')}
</a>
</div>
</div>
{/if}
<button type="submit" disabled={submitting || linkCheckLoading} class="px-4 py-2 bg-[var(--color-primary)] text-[var(--color-primary-foreground)] rounded-md text-sm font-medium hover:opacity-90 disabled:opacity-50">
{#if linkCheckLoading}{t('notificationTracker.checkingLinks')}{:else}{editing ? t('common.save') : t('notificationTracker.createTracker')}{/if}
</button>
+35 -4
View File
@@ -19,6 +19,8 @@
const gridItemSources: Record<string, () => any[]> = { webhookAuthModeItems };
import { globalProviderFilter } from '$lib/stores/provider-filter.svelte';
import { topbarAction } from '$lib/stores/topbar-action.svelte';
import { onDestroy } from 'svelte';
import { snackSuccess, snackError } from '$lib/stores/snackbar.svelte';
import { highlightFromUrl } from '$lib/highlight';
import { getDescriptor, buildProviderFormDefaults } from '$lib/providers';
@@ -54,7 +56,28 @@
let health = $state<Record<number, boolean | null>>({});
onMount(load);
// Status pill row for the page header — derived from health probes.
const headerPills = $derived.by(() => {
const onlineCount = Object.values(health).filter(v => v === true).length;
const offlineCount = Object.values(health).filter(v => v === false).length;
const checkingCount = Math.max(0, providers.length - onlineCount - offlineCount);
const typeCount = new Set(providers.map(p => p.type)).size;
const pills: Array<{ label: string; tone: 'mint' | 'sky' | 'coral' | 'citrus' }> = [];
if (onlineCount > 0) pills.push({ label: `${onlineCount} ${t('providers.online')}`, tone: 'mint' });
if (offlineCount > 0) pills.push({ label: `${offlineCount} ${t('providers.offline')}`, tone: 'coral' });
if (checkingCount > 0 && providers.length > 0) pills.push({ label: `${checkingCount} ${t('providers.checking')}`, tone: 'citrus' });
if (typeCount > 0) pills.push({ label: `${typeCount} ${typeCount === 1 ? t('providers.typeSingular') : t('providers.typePlural')}`, tone: 'sky' });
return pills;
});
onMount(() => {
topbarAction.set({
label: t('providers.addProvider'),
onclick: () => { showForm ? (showForm = false, editing = null) : openNew(); },
});
load();
});
onDestroy(() => topbarAction.clear());
async function load() {
try {
await providersCache.fetch(true);
@@ -146,7 +169,15 @@
}
</script>
<PageHeader title={t('providers.title')} description={t('providers.description')}>
<PageHeader
title={t('providers.title')}
emphasis={t('providers.titleEmphasis')}
description={t('providers.description')}
crumb="Service · Connections"
count={providers.length}
countLabel={t('dashboard.providersShort')}
pills={headerPills}
>
<Button size="sm" onclick={() => { showForm ? (showForm = false, editing = null) : openNew(); }}>
{showForm ? t('providers.cancel') : t('providers.addProvider')}
</Button>
@@ -171,7 +202,7 @@
<ErrorBanner message={error} />
<form onsubmit={save} class="space-y-3">
<div>
<label class="block text-sm font-medium mb-1">{t('providers.type')}</label>
<div class="block text-sm font-medium mb-1">{t('providers.type')}</div>
{#if !editing}
<IconGridSelect items={providerTypeItems()} bind:value={form.type} columns={2} />
{:else}
@@ -216,7 +247,7 @@
{/each}
{#if descriptor?.webhookUrlPattern && editing}
<div class="bg-[var(--color-muted)] rounded-md p-3">
<label class="block text-sm font-medium mb-1">{t('providers.webhookUrl')}</label>
<div class="block text-sm font-medium mb-1">{t('providers.webhookUrl')}</div>
<code class="text-xs select-all break-all">{descriptor.webhookUrlPattern.replace('{token}', providers.find(p => p.id === editing)?.webhook_token ?? '')}</code>
<p class="text-xs text-[var(--color-muted-foreground)] mt-1">{t('providers.webhookUrlHint')}</p>
</div>
@@ -78,7 +78,7 @@
<Card>
<div class="space-y-4">
<div>
<label class="block text-sm font-medium mb-1">{t('providers.type')}</label>
<div class="block text-sm font-medium mb-1">{t('providers.type')}</div>
<IconGridSelect items={providerTypeItems()} bind:value={form.type} columns={2} />
</div>
<div>
+43 -1
View File
@@ -37,6 +37,9 @@
telegram_asset_cache_max_entries: '5000',
supported_locales: 'en,ru',
timezone: 'UTC',
log_level: 'INFO',
log_format: 'text',
log_levels: '',
});
let cacheStats = $state<CacheStats | null>(null);
@@ -90,7 +93,12 @@
}
</script>
<PageHeader title={t('settings.title')} description={t('settings.description')} />
<PageHeader
title={t('settings.title')}
emphasis={t('settings.titleEmphasis')}
description={t('settings.description')}
crumb="System · Configuration"
/>
{#if !loaded}
<Loading />
@@ -204,6 +212,40 @@
</div>
</Card>
<!-- Logging section -->
<Card>
<h3 class="text-sm font-semibold mb-4 flex items-center gap-2">
<MdiIcon name="mdiTextBoxOutline" size={18} />
{t('settings.logging')}
</h3>
<div class="grid grid-cols-1 sm:grid-cols-2 gap-4">
<div>
<label class="block text-xs font-medium mb-1">{t('settings.logLevel')}<Hint text={t('settings.logLevelHint')} /></label>
<select bind:value={settings.log_level}
class="w-full px-3 py-1.5 text-sm border border-[var(--color-border)] rounded-md bg-[var(--color-background)]">
<option value="DEBUG">DEBUG</option>
<option value="INFO">INFO</option>
<option value="WARNING">WARNING</option>
<option value="ERROR">ERROR</option>
</select>
</div>
<div>
<label class="block text-xs font-medium mb-1">{t('settings.logFormat')}<Hint text={t('settings.logFormatHint')} /></label>
<select bind:value={settings.log_format}
class="w-full px-3 py-1.5 text-sm border border-[var(--color-border)] rounded-md bg-[var(--color-background)]">
<option value="text">text</option>
<option value="json">json</option>
</select>
</div>
<div class="sm:col-span-2">
<label class="block text-xs font-medium mb-1">{t('settings.logLevels')}<Hint text={t('settings.logLevelsHint')} /></label>
<input bind:value={settings.log_levels}
placeholder="sqlalchemy.engine=WARNING,notify_bridge_core.notifications.telegram.client=DEBUG"
class="w-full px-3 py-1.5 text-sm border border-[var(--color-border)] rounded-md bg-[var(--color-background)] font-mono" />
</div>
</div>
</Card>
<Button onclick={save} disabled={saving}>
{saving ? t('common.loading') : t('common.save')}
</Button>
@@ -292,7 +292,12 @@
}
</script>
<PageHeader title={t('backup.title')} description={t('backup.description')} />
<PageHeader
title={t('backup.title')}
emphasis={t('backup.titleEmphasis')}
description={t('backup.description')}
crumb="System · Maintenance"
/>
{#if !loaded}
<Loading />
@@ -338,7 +343,7 @@
<!-- Categories -->
<div class="mb-4">
<div class="flex items-center gap-2 mb-2">
<label class="text-xs font-medium">{t('backup.categories')}</label>
<span class="text-xs font-medium">{t('backup.categories')}</span>
<button class="text-xs underline" style="color: var(--color-primary);" onclick={toggleAll}>
{allSelected ? t('backup.deselectAll') : t('backup.selectAll')}
</button>
@@ -355,7 +360,7 @@
<!-- Secrets mode -->
<div class="mb-4">
<label class="block text-xs font-medium mb-2">{t('backup.secretsMode')}</label>
<div class="block text-xs font-medium mb-2">{t('backup.secretsMode')}</div>
<div class="flex flex-col gap-1.5">
<label class="flex items-center gap-1.5 text-xs">
<input type="radio" bind:group={exportSecrets} value="exclude" />
@@ -453,7 +458,7 @@
<!-- Conflict mode -->
<div class="mb-4">
<label class="block text-xs font-medium mb-2">{t('backup.conflictMode')}</label>
<div class="block text-xs font-medium mb-2">{t('backup.conflictMode')}</div>
<div class="flex flex-col gap-1.5">
<label class="flex items-center gap-1.5 text-xs">
<input type="radio" bind:group={importConflict} value="skip" />
@@ -523,8 +528,8 @@
{#if scheduledSettings.backup_scheduled_enabled === 'true'}
<div class="grid grid-cols-1 sm:grid-cols-3 gap-4">
<div>
<label class="block text-xs font-medium mb-1">{t('backup.interval')}</label>
<select bind:value={scheduledSettings.backup_scheduled_interval_hours}
<label for="backup-interval" class="block text-xs font-medium mb-1">{t('backup.interval')}</label>
<select id="backup-interval" bind:value={scheduledSettings.backup_scheduled_interval_hours}
class="w-full px-3 py-1.5 text-sm border border-[var(--color-border)] rounded-md bg-[var(--color-background)]">
<option value="6">6 {t('backup.hours')}</option>
<option value="12">12 {t('backup.hours')}</option>
@@ -535,8 +540,8 @@
</select>
</div>
<div>
<label class="block text-xs font-medium mb-1">{t('backup.secretsMode')}</label>
<select bind:value={scheduledSettings.backup_secrets_mode}
<label for="backup-secrets-mode" class="block text-xs font-medium mb-1">{t('backup.secretsMode')}</label>
<select id="backup-secrets-mode" bind:value={scheduledSettings.backup_secrets_mode}
class="w-full px-3 py-1.5 text-sm border border-[var(--color-border)] rounded-md bg-[var(--color-background)]">
<option value="exclude">{t('backup.secretsExclude')}</option>
<option value="masked">{t('backup.secretsMasked')}</option>
@@ -544,8 +549,8 @@
</select>
</div>
<div>
<label class="block text-xs font-medium mb-1">{t('backup.retention')}</label>
<select bind:value={scheduledSettings.backup_retention_count}
<label for="backup-retention" class="block text-xs font-medium mb-1">{t('backup.retention')}</label>
<select id="backup-retention" bind:value={scheduledSettings.backup_retention_count}
class="w-full px-3 py-1.5 text-sm border border-[var(--color-border)] rounded-md bg-[var(--color-background)]">
<option value="3">3</option>
<option value="5">5</option>
@@ -651,6 +656,7 @@
onclick={() => postRestoreModalOpen = false}
onkeydown={(e) => { if (e.key === 'Escape') postRestoreModalOpen = false; }}
role="presentation">
<!-- svelte-ignore a11y_click_events_have_key_events -->
<div role="dialog" aria-modal="true" aria-labelledby="post-restore-title" tabindex="-1"
style="background: var(--color-card); border: 1px solid var(--color-border); border-radius: 1rem; padding: 1.5rem; max-width: 420px; width: 100%; box-shadow: 0 20px 60px rgba(0,0,0,0.4);"
onclick={(e) => e.stopPropagation()}>
+27 -5
View File
@@ -6,6 +6,7 @@
import { t, getLocale } from '$lib/i18n';
import { targetsCache, telegramBotsCache, emailBotsCache, matrixBotsCache } from '$lib/stores/caches.svelte';
import PageHeader from '$lib/components/PageHeader.svelte';
import Button from '$lib/components/Button.svelte';
import Card from '$lib/components/Card.svelte';
import Loading from '$lib/components/Loading.svelte';
import MdiIcon from '$lib/components/MdiIcon.svelte';
@@ -134,7 +135,7 @@
let loadError = $state('');
let showTelegramSettings = $state(false);
let confirmDelete = $state<NotificationTarget | null>(null);
let formEl: HTMLElement;
let formEl = $state<HTMLElement | undefined>();
async function scrollToForm() {
await tick();
@@ -165,6 +166,20 @@
// ── Data loading ──
onMount(load);
const headerPills = $derived.by(() => {
const pills: Array<{ label: string; tone: 'mint' | 'sky' | 'orchid' }> = [];
if (activeType) {
// Tab-filtered: show count of receivers for the active type only.
const total = targets.reduce((acc, t) => acc + (t.receiver_count || 0), 0);
if (total > 0) pills.push({ label: `${total} ${total === 1 ? t('targets.receiver') : t('targets.receivers')}`, tone: 'mint' });
} else {
const types = new Set(targets.map(t => t.type)).size;
if (types > 0) pills.push({ label: `${types} ${t('targets.channelsCount')}`, tone: 'sky' });
}
return pills;
});
async function load() {
try {
await Promise.all([
@@ -418,11 +433,18 @@
}
</script>
<PageHeader title={activeType ? `${t('targets.title')} ${activeType.charAt(0).toUpperCase() + activeType.slice(1)}` : t('targets.title')} description={activeType ? t(TYPE_DESC_KEYS[activeType]) : t('targets.description')}>
<button onclick={() => { showForm ? (showForm = false, editing = null) : openNew(); }}
class="px-3 py-1.5 bg-[var(--color-primary)] text-[var(--color-primary-foreground)] rounded-md text-sm font-medium hover:opacity-90">
<PageHeader
title={activeType ? activeType.charAt(0).toUpperCase() + activeType.slice(1) : t('targets.title')}
emphasis={activeType ? t('targets.titleEmphasis') : t('targets.titleEmphasisAll')}
description={activeType ? t(TYPE_DESC_KEYS[activeType]) : t('targets.description')}
crumb="Routing · Targets"
count={targets.length}
countLabel={t('dashboard.targetsShort')}
pills={headerPills}
>
<Button size="sm" onclick={() => { showForm ? (showForm = false, editing = null) : openNew(); }}>
{showForm ? t('targets.cancel') : t('targets.addTarget')}
</button>
</Button>
</PageHeader>
{#if !loaded}<Loading />{:else}
@@ -79,7 +79,7 @@
<form onsubmit={onsave} class="space-y-4">
{#if !activeType}
<div>
<label class="block text-sm font-medium mb-1">{t('targets.type')}</label>
<div class="block text-sm font-medium mb-1">{t('targets.type')}</div>
<IconGridSelect items={typeGridItems} bind:value={formType} columns={4} />
</div>
{/if}
@@ -92,7 +92,7 @@
</div>
{#if formType === 'telegram'}
<div>
<label class="block text-sm font-medium mb-1">{t('telegramBot.selectBot')}</label>
<div class="block text-sm font-medium mb-1">{t('telegramBot.selectBot')}</div>
<EntitySelect items={telegramBotItems} bind:value={form.bot_id} placeholder={t('telegramBot.selectBot')} />
{#if telegramBotCount === 0}
<p class="text-xs text-[var(--color-muted-foreground)] mt-1">{t('telegramBot.noBots')} <a href="/bots?tab=telegram" class="underline"></a></p>
@@ -124,7 +124,7 @@
<input id="tgt-maxsize" type="number" bind:value={form.max_asset_size} min="1" max="50" class="w-full px-2 py-1 border border-[var(--color-border)] rounded-md text-sm bg-[var(--color-background)]" />
</div>
<div class="col-span-2">
<label class="block text-xs mb-1">{t('targets.chatAction')}</label>
<div class="block text-xs mb-1">{t('targets.chatAction')}</div>
<IconGridSelect items={chatActionItems} bind:value={form.chat_action} columns={4} compact />
</div>
<label class="flex items-center gap-2 text-sm col-span-2"><input type="checkbox" bind:checked={form.disable_url_preview} /> {t('targets.disableUrlPreview')}</label>
@@ -151,7 +151,7 @@
</div>
{:else if formType === 'email'}
<div>
<label class="block text-sm font-medium mb-1">{t('targets.selectEmailBot')}</label>
<div class="block text-sm font-medium mb-1">{t('targets.selectEmailBot')}</div>
<EntitySelect items={emailBotItems} bind:value={form.email_bot_id} placeholder={t('targets.selectEmailBot')} />
{#if emailBotCount === 0}
<p class="text-xs text-[var(--color-muted-foreground)] mt-1">{t('emailBot.noBots')} <a href="/bots?tab=email" class="underline"></a></p>
@@ -159,7 +159,7 @@
</div>
{:else if formType === 'matrix'}
<div>
<label class="block text-sm font-medium mb-1">{t('targets.selectMatrixBot')}</label>
<div class="block text-sm font-medium mb-1">{t('targets.selectMatrixBot')}</div>
<EntitySelect items={matrixBotItems} bind:value={form.matrix_bot_id} placeholder={t('targets.selectMatrixBot')} />
{#if matrixBotCount === 0}
<p class="text-xs text-[var(--color-muted-foreground)] mt-1">{t('matrixBot.noBots')} <a href="/bots?tab=matrix" class="underline"></a></p>
@@ -168,7 +168,7 @@
{:else if formType === 'broadcast'}
{@const childIds = (form.child_target_ids || []).map(String)}
<div>
<label class="block text-sm font-medium mb-1">{t('targets.selectChildTargets')}</label>
<div class="block text-sm font-medium mb-1">{t('targets.selectChildTargets')}</div>
<MultiEntitySelect
items={broadcastChildItems?.map(i => ({ value: String(i.value), label: i.label, icon: i.icon, desc: i.desc })) ?? []}
values={childIds}
+160 -10
View File
@@ -1,7 +1,8 @@
<script lang="ts">
import { onMount } from 'svelte';
import { onMount, onDestroy } from 'svelte';
import { slide } from 'svelte/transition';
import { api, getBlockedBy, type BlockedByDetail } from '$lib/api';
import { topbarAction } from '$lib/stores/topbar-action.svelte';
import BlockedByModal from '$lib/components/BlockedByModal.svelte';
import { t } from '$lib/i18n';
import { sanitizePreview } from '$lib/sanitize';
@@ -42,6 +43,17 @@
let editing = $state<number | null>(null);
let error = $state('');
let confirmDelete = $state<{ id: number; onconfirm: () => Promise<void> } | null>(null);
/**
* Reset-to-default confirmation prompt. ``kind: 'slot'`` confirms a
* single-slot reset (slotKey populated); ``'all'`` confirms a full
* locale-scoped wipe. Split from confirmDelete so the two flows can
* coexist without stomping each other's state mid-dialog.
*/
let confirmReset = $state<{
kind: 'slot' | 'all';
slotKey?: string;
message: string;
} | null>(null);
let slotPreview = $state<Record<string, string>>({});
let slotErrors = $state<Record<string, string>>({});
let slotErrorLines = $state<Record<string, number | null>>({});
@@ -196,7 +208,22 @@
]},
]);
onMount(load);
onMount(() => {
topbarAction.set({
label: t('templateConfig.newConfig'),
onclick: () => { showForm ? (showForm = false, editing = null) : openNew(); },
});
load();
});
onDestroy(() => topbarAction.clear());
const headerPills = $derived.by(() => {
const pills: Array<{ label: string; tone: 'sky' }> = [];
const types = new Set(configs.map(c => c.provider_type)).size;
if (types > 0) pills.push({ label: `${types} ${types === 1 ? t('providers.typeSingular') : t('providers.typePlural')}`, tone: 'sky' });
return pills;
});
async function load() {
try {
[, varsRef] = await Promise.all([
@@ -206,7 +233,40 @@
supportedLocalesCache.fetch(),
]);
} catch (err: any) { error = err.message || t('common.loadError'); snackError(error); }
finally { loaded = true; highlightFromUrl(); }
finally { loaded = true; highlightFromUrl(); handleDeepLink(); }
}
/**
* Respond to ``?edit_slot=<slot_name>&provider=<type>`` deep-links from
* other pages (currently the tracking-configs Preview-template modal).
* Picks the first visible config matching ``provider``, opens it in edit
* mode, and pre-expands the target slot. Strips the param from the URL so
* a subsequent reload doesn't reopen the form unexpectedly.
*/
function handleDeepLink() {
if (typeof window === 'undefined') return;
const params = new URLSearchParams(window.location.search);
const slot = params.get('edit_slot');
if (!slot) return;
const provider = params.get('provider') || '';
const target = allTemplateConfigs.find(
c => !provider || c.provider_type === provider,
);
// Strip the deep-link param so reload/back doesn't replay it.
params.delete('edit_slot');
const qs = params.toString();
window.history.replaceState(null, '', window.location.pathname + (qs ? '?' + qs : ''));
if (!target) {
snackError(t('templateConfig.deepLinkNoConfig'));
return;
}
edit(target);
expandedSlots = new Set([slot]);
// Scroll the slot into view once the form has rendered.
setTimeout(() => {
const el = document.getElementById(`slot-${slot}`);
if (el) el.scrollIntoView({ behavior: 'smooth', block: 'start' });
}, 200);
}
function openNew() {
@@ -241,6 +301,65 @@
} catch (err: any) { error = err.message; snackError(err.message); }
}
/**
* Ask the user to confirm a reset. The actual fetch+replace runs in
* ``performReset`` after the ConfirmModal's onconfirm fires. Split into
* two steps so we can use the app-wide ConfirmModal (consistent look,
* keyboard handling) instead of ``window.confirm`` (blocks the page).
*/
function resetSlotToDefault(slotKey: string) {
if (!form.provider_type) return;
confirmReset = {
kind: 'slot',
slotKey,
message: t('templateConfig.resetSlotConfirm').replace('{locale}', activeLocale.toUpperCase()),
};
}
function resetAllToDefaults() {
if (!form.provider_type) return;
confirmReset = {
kind: 'all',
message: t('templateConfig.resetAllConfirm').replace(/\{locale\}/g, activeLocale.toUpperCase()),
};
}
async function performReset() {
if (!confirmReset || !form.provider_type) return;
const { kind, slotKey } = confirmReset;
confirmReset = null;
try {
if (kind === 'slot' && slotKey) {
const res = await api<Record<string, Record<string, string>>>(
`/template-configs/defaults?provider_type=${encodeURIComponent(form.provider_type)}&slot_name=${encodeURIComponent(slotKey)}&locale=${encodeURIComponent(activeLocale)}`,
);
const text = res?.[slotKey]?.[activeLocale];
if (!text) {
snackError(t('templateConfig.resetNoDefault'));
return;
}
setSlotValue(slotKey, text);
validateSlot(slotKey, text, true);
} else {
const res = await api<Record<string, Record<string, string>>>(
`/template-configs/defaults?provider_type=${encodeURIComponent(form.provider_type)}&locale=${encodeURIComponent(activeLocale)}`,
);
// Replace current-locale slots; leave other locales' values untouched.
const nextSlots = { ...form.slots };
for (const [key, localeMap] of Object.entries(res || {})) {
const text = localeMap?.[activeLocale];
if (text === undefined) continue;
nextSlots[key] = { ...(nextSlots[key] || {}), [activeLocale]: text };
}
form.slots = nextSlots;
refreshAllPreviews();
}
snackSuccess(t('templateConfig.resetApplied'));
} catch (err: any) {
snackError(err.message);
}
}
function clone(c: TemplateConfig) {
form = {
provider_type: c.provider_type,
@@ -276,7 +395,15 @@
}
</script>
<PageHeader title={t('templateConfig.title')} description={t('templateConfig.description')}>
<PageHeader
title={t('templateConfig.title')}
emphasis={t('templateConfig.titleEmphasis')}
description={t('templateConfig.description')}
crumb="Routing · Notification"
count={configs.length}
countLabel={t('templateConfig.countLabel')}
pills={headerPills}
>
<Button size="sm" onclick={() => { showForm ? (showForm = false, editing = null) : openNew(); }}>
{showForm ? t('common.cancel') : t('templateConfig.newConfig')}
</Button>
@@ -305,7 +432,7 @@
{#if !editing}
<div>
<label class="block text-sm font-medium mb-1">{t('templateConfig.providerType')}</label>
<div class="block text-sm font-medium mb-1">{t('templateConfig.providerType')}</div>
<IconGridSelect items={providerTypeItems()} bind:value={form.provider_type} columns={2} />
</div>
{:else}
@@ -316,12 +443,12 @@
{/if}
<div class="flex items-center gap-2">
<label class="text-sm font-medium">{t('templateConfig.previewAs')}:</label>
<span class="text-sm font-medium">{t('templateConfig.previewAs')}:</span>
<IconGridSelect items={previewTargetTypeItems()} bind:value={previewTargetType} columns={2} />
</div>
<!-- Locale tabs -->
<div class="flex gap-1 mb-3 border-b border-[var(--color-border)]">
<div class="flex items-center gap-1 mb-3 border-b border-[var(--color-border)]">
{#each LOCALES as loc}
<button type="button"
class="px-3 py-1.5 text-xs font-medium rounded-t-md transition-colors {activeLocale === loc ? 'bg-[var(--color-primary)] text-[var(--color-primary-foreground)]' : 'text-[var(--color-muted-foreground)] hover:bg-[var(--color-muted)]'}"
@@ -329,6 +456,14 @@
{loc.toUpperCase()}
</button>
{/each}
{#if form.provider_type}
<button type="button" onclick={resetAllToDefaults}
title={t('templateConfig.resetAllToDefaults')}
class="ml-auto flex items-center gap-1 text-xs px-2 py-1 rounded-md border border-[var(--color-border)] text-[var(--color-muted-foreground)] hover:bg-[var(--color-muted)]">
<MdiIcon name="mdiRefresh" size={12} />
{t('templateConfig.resetAllToDefaults')}
</button>
{/if}
</div>
<!-- Slot filter -->
@@ -349,9 +484,9 @@
{#if slot.isDateFormat}
<div>
<div class="flex items-center justify-between mb-1">
<label class="text-xs text-[var(--color-muted-foreground)]">{slot.description || t(`templateConfig.${slot.label}`, slot.label)}</label>
<label for="datefmt-{slot.key}" class="text-xs text-[var(--color-muted-foreground)]">{slot.description || t(`templateConfig.${slot.label}`, slot.label)}</label>
</div>
<input value={(form as any)[slot.key]}
<input id="datefmt-{slot.key}" value={(form as any)[slot.key]}
oninput={(e: Event) => { (form as any)[slot.key] = (e.target as HTMLInputElement).value; clearTimeout(validateTimers['_fmt']); validateTimers['_fmt'] = setTimeout(refreshAllPreviews, 600); refreshDateFormatPreview(); }}
class="w-full px-2 py-1 border border-[var(--color-border)] rounded-md text-sm bg-[var(--color-background)] font-mono" />
{#if dateFormatPreview[slot.key]}
@@ -361,6 +496,7 @@
{/if}
</div>
{:else}
<div id="slot-{slot.key}">
<CollapsibleSlot
label={slot.key}
description={slot.description || t(`templateConfig.${slot.label}`, slot.label)}
@@ -379,6 +515,11 @@
<button type="button" onclick={() => showVarsFor = slot.key}
class="text-xs text-[var(--color-muted-foreground)] hover:underline">{t('templateConfig.variables')}</button>
{/if}
<button type="button" onclick={() => resetSlotToDefault(slot.key)}
title={t('templateConfig.resetToDefault')}
class="text-xs text-[var(--color-muted-foreground)] hover:underline">
{t('templateConfig.resetToDefault')}
</button>
</div>
{#if showPreviewFor.has(slot.key) && slotPreview[slot.key] && !slotErrors[slot.key]}
@@ -391,12 +532,13 @@
{#if slotErrors[slot.key]}
{#if slotErrorTypes[slot.key] === 'undefined'}
<p class="mt-1 text-xs" style="color: #d97706;">{t('common.undefinedVar')}: {slotErrors[slot.key]}</p>
<p class="mt-1 text-xs" style="color: var(--color-warning-fg);">{t('common.undefinedVar')}: {slotErrors[slot.key]}</p>
{:else}
<p class="mt-1 text-xs" style="color: var(--color-error-fg);">{t('common.syntaxError')}: {slotErrors[slot.key]}{slotErrorLines[slot.key] ? ` (${t('common.line')} ${slotErrorLines[slot.key]})` : ''}</p>
{/if}
{/if}
</CollapsibleSlot>
</div>
{/if}
{/each}
</div>
@@ -466,6 +608,14 @@
<ConfirmModal open={confirmDelete !== null} message={t('templateConfig.confirmDelete')}
onconfirm={() => confirmDelete?.onconfirm()} oncancel={() => confirmDelete = null} />
<ConfirmModal open={confirmReset !== null}
title={t('templateConfig.resetToDefault')}
message={confirmReset?.message || ''}
confirmLabel={confirmReset?.kind === 'all' ? t('templateConfig.resetAllToDefaults') : t('templateConfig.resetToDefault')}
confirmIcon="mdiRefresh"
onconfirm={performReset}
oncancel={() => confirmReset = null} />
<BlockedByModal open={!!blockedBy} detail={blockedBy} onclose={() => blockedBy = null} />
<!-- Variables reference modal -->
+278 -16
View File
@@ -1,7 +1,8 @@
<script lang="ts">
import { onMount } from 'svelte';
import { onMount, onDestroy } from 'svelte';
import { slide } from 'svelte/transition';
import { api, getBlockedBy, type BlockedByDetail } from '$lib/api';
import { topbarAction } from '$lib/stores/topbar-action.svelte';
import BlockedByModal from '$lib/components/BlockedByModal.svelte';
import { t } from '$lib/i18n';
import { trackingConfigsCache } from '$lib/stores/caches.svelte';
@@ -12,6 +13,9 @@
import MdiIcon from '$lib/components/MdiIcon.svelte';
import EmptyState from '$lib/components/EmptyState.svelte';
import ConfirmModal from '$lib/components/ConfirmModal.svelte';
import Modal from '$lib/components/Modal.svelte';
import { sanitizePreview } from '$lib/sanitize';
import { supportedLocalesCache } from '$lib/stores/caches.svelte';
import Hint from '$lib/components/Hint.svelte';
import IconButton from '$lib/components/IconButton.svelte';
import IconGridSelect from '$lib/components/IconGridSelect.svelte';
@@ -22,13 +26,150 @@
import { getDescriptor, buildTrackingFormDefaults } from '$lib/providers';
import ErrorBanner from '$lib/components/ErrorBanner.svelte';
import Button from '$lib/components/Button.svelte';
import type { TrackingConfig } from '$lib/types';
/** Grid-select item source lookup — maps descriptor string name to actual function. */
const gridItemSources: Record<string, () => any[]> = {
sortByItems, sortOrderItems, albumModeItems, assetTypeItems, memorySourceItems,
};
/**
* HH:MM, comma-separated: "09:00" or "09:00, 18:30" — the only format cron
* dispatch accepts. Matched on blur for time-list fields; invalid values
* are surfaced inline next to the input.
*/
const TIME_LIST_RE = /^\s*(?:[01]\d|2[0-3]):[0-5]\d(?:\s*,\s*(?:[01]\d|2[0-3]):[0-5]\d)*\s*$/;
/** Per-field error messages surfaced inline under time-list inputs. */
let timeListErrors = $state<Record<string, string>>({});
/** Normalize "9:0 , 18:30" → "09:00,18:30" on blur, clear error when valid. */
function normalizeTimeList(key: string) {
const raw = String(form[key] ?? '').trim();
if (!raw) { timeListErrors = { ...timeListErrors, [key]: '' }; return; }
if (!TIME_LIST_RE.test(raw)) {
// Try a lenient normalization: split on commas, zero-pad each part.
const parts = raw.split(',').map(p => p.trim()).filter(Boolean);
const fixed: string[] = [];
let ok = true;
for (const p of parts) {
const m = /^(\d{1,2}):(\d{1,2})$/.exec(p);
if (!m) { ok = false; break; }
const hh = Number(m[1]);
const mm = Number(m[2]);
if (!Number.isFinite(hh) || !Number.isFinite(mm) || hh < 0 || hh > 23 || mm < 0 || mm > 59) { ok = false; break; }
fixed.push(`${String(hh).padStart(2, '0')}:${String(mm).padStart(2, '0')}`);
}
if (ok) {
form[key] = fixed.join(',');
timeListErrors = { ...timeListErrors, [key]: '' };
return;
}
timeListErrors = { ...timeListErrors, [key]: t('trackingConfig.invalidTimeList') };
return;
}
// Canonicalise spacing.
form[key] = raw.split(',').map(s => s.trim()).join(',');
timeListErrors = { ...timeListErrors, [key]: '' };
}
/**
* Quiet-hours preview: "22:00 → 07:00 next day (9h)" or "Quiet period is 0
* minutes — adjust times" when start equals end. Handles overnight ranges
* (start > end) correctly.
*/
function quietHoursPreview(start: string, end: string): string {
if (!start || !end) return '';
const [sh, sm] = start.split(':').map(Number);
const [eh, em] = end.split(':').map(Number);
if (![sh, sm, eh, em].every(Number.isFinite)) return '';
const sMin = sh * 60 + sm;
const eMin = eh * 60 + em;
if (sMin === eMin) return t('trackingConfig.quietHoursZero');
const overnight = sMin > eMin;
const span = overnight ? (24 * 60 - sMin) + eMin : eMin - sMin;
const h = Math.floor(span / 60);
const m = span % 60;
const dur = m === 0 ? `${h}h` : `${h}h ${m}m`;
const arrow = overnight
? `${start} → ${end} ${t('trackingConfig.nextDay')}`
: `${start} → ${end}`;
return `${arrow} (${dur})`;
}
function gotoTemplateConfig(slotName: string) {
// Deep-link to the template configs page: pass the slot as a query
// param (``edit_slot``) so the destination can auto-open the first
// matching config in edit mode and expand that slot. Plain hashes
// like ``#slot-X`` were a no-op because slots don't exist in the DOM
// until a config is being edited.
const u = new URL('/template-configs', window.location.origin);
u.searchParams.set('provider', 'immich');
u.searchParams.set('edit_slot', slotName);
window.location.href = u.toString();
}
/**
* Inline preview of the shipped default template for a scheduled/periodic/
* memory slot. Using the shipped default (not a tracker's current template)
* keeps this scoped to the tracking-config page — which has no concept of
* which TemplateConfig a given tracker uses. Users who want to edit the
* actual config can click "Edit template" in the modal footer.
*
* ``previewLocale`` is modal-scoped so switching tabs only refetches for
* this preview — the user's UI locale (and other previews) are untouched.
*/
let previewModal = $state<{ slotName: string; rendered: string; error: string; locale: string } | null>(null);
let previewLoading = $state(false);
let previewLocales = $derived(supportedLocalesCache.items);
async function openTemplatePreview(slotName: string) {
await supportedLocalesCache.fetch();
const initialLocale = previewLocales.includes('en') ? 'en' : (previewLocales[0] || 'en');
await renderPreviewFor(slotName, initialLocale);
}
async function renderPreviewFor(slotName: string, locale: string) {
previewLoading = true;
try {
const defaults = await api<Record<string, Record<string, string>>>(
`/template-configs/defaults?provider_type=immich&slot_name=${encodeURIComponent(slotName)}&locale=${encodeURIComponent(locale)}`,
);
const template = defaults?.[slotName]?.[locale];
if (!template) {
previewModal = { slotName, rendered: '', error: t('templateConfig.resetNoDefault'), locale };
return;
}
const res = await api<{ rendered?: string; error?: string }>(
'/template-configs/preview-raw',
{
method: 'POST',
body: JSON.stringify({
template,
target_type: 'telegram',
date_format: '%d.%m.%Y, %H:%M UTC',
date_only_format: '%d.%m.%Y',
}),
},
);
previewModal = {
slotName,
rendered: res?.rendered || '',
error: res?.error || '',
locale,
};
} catch (err: any) {
previewModal = { slotName, rendered: '', error: err.message, locale };
} finally {
previewLoading = false;
}
}
const SLOT_FOR_SECTION: Record<string, string> = {
periodic: 'periodic_summary_message',
scheduled: 'scheduled_assets_message',
memory: 'memory_mode_message',
};
let allConfigs = $derived(trackingConfigsCache.items);
let filterText = $state('');
let filterType = $state('');
@@ -50,11 +191,43 @@
let form: Record<string, any> = $state(defaultForm());
let descriptor = $derived(getDescriptor(form.provider_type));
onMount(load);
onMount(() => {
topbarAction.set({
label: t('trackingConfig.newConfig'),
onclick: () => { showForm ? (showForm = false, editing = null) : openNew(); },
});
load();
});
onDestroy(() => topbarAction.clear());
const headerPills = $derived.by(() => {
const pills: Array<{ label: string; tone: 'sky' }> = [];
const types = new Set(configs.map(c => c.provider_type)).size;
if (types > 0) pills.push({ label: `${types} ${types === 1 ? t('providers.typeSingular') : t('providers.typePlural')}`, tone: 'sky' });
return pills;
});
async function load() {
try { await trackingConfigsCache.fetch(true); }
catch (err: any) { error = err.message || t('common.loadError'); snackError(error); }
finally { loaded = true; highlightFromUrl(); }
finally { loaded = true; highlightFromUrl(); _openEditFromUrl(); }
}
// Cross-page deep-link: ``/tracking-configs?edit=<id>`` auto-opens that
// config in edit mode. Used by the Notification Tracker form's "Open
// Tracking Config" link so users land directly on the right editor
// instead of the generic list. Strips the param afterwards so a browser
// refresh doesn't re-open the modal.
function _openEditFromUrl() {
if (typeof window === 'undefined') return;
const params = new URLSearchParams(window.location.search);
const editId = params.get('edit');
if (!editId) return;
const match = allConfigs.find(c => String(c.id) === editId);
if (match) edit(match);
params.delete('edit');
const qs = params.toString();
const cleanUrl = window.location.pathname + (qs ? '?' + qs : '');
window.history.replaceState(null, '', cleanUrl);
}
function openNew() { form = defaultForm(); editing = null; showForm = true; }
@@ -90,7 +263,15 @@
}
</script>
<PageHeader title={t('trackingConfig.title')} description={t('trackingConfig.description')}>
<PageHeader
title={t('trackingConfig.title')}
emphasis={t('trackingConfig.titleEmphasis')}
description={t('trackingConfig.description')}
crumb="Routing · Notification"
count={configs.length}
countLabel={t('trackingConfig.countLabel')}
pills={headerPills}
>
<Button size="sm" onclick={() => { showForm ? (showForm = false, editing = null) : openNew(); }}>
{showForm ? t('common.cancel') : t('trackingConfig.newConfig')}
</Button>
@@ -113,7 +294,7 @@
</div>
<div>
<label class="block text-sm font-medium mb-1">{t('trackingConfig.providerType')}</label>
<div class="block text-sm font-medium mb-1">{t('trackingConfig.providerType')}</div>
{#if !editing}
<IconGridSelect items={providerTypeItems()} bind:value={form.provider_type} columns={2} />
{:else}
@@ -161,10 +342,20 @@
{t(section.legend)}
{#if section.legendHint}<Hint text={t(section.legendHint)} />{/if}
</legend>
<label class="flex items-center gap-2 text-sm mt-1">
<input type="checkbox" bind:checked={form[section.enabledField]} />
{t('trackingConfig.enabled')}
</label>
<div class="flex items-center justify-between mt-1">
<label class="flex items-center gap-2 text-sm">
<input type="checkbox" bind:checked={form[section.enabledField]} />
{t('trackingConfig.enabled')}
</label>
{#if SLOT_FOR_SECTION[section.key]}
<button type="button" onclick={() => openTemplatePreview(SLOT_FOR_SECTION[section.key])}
class="text-xs text-[var(--color-primary)] hover:underline inline-flex items-center gap-1"
disabled={previewLoading}>
<MdiIcon name="mdiEyeOutline" size={14} />
{t('trackingConfig.previewTemplate')}
</button>
{/if}
</div>
{#if form[section.enabledField]}
<div class="grid grid-cols-3 gap-3 mt-3">
{#each section.fields as field (field.key)}
@@ -181,17 +372,32 @@
{:else if field.type === 'grid-select' && field.gridItems}
<IconGridSelect items={gridItemSources[field.gridItems]()} bind:value={form[field.key]} columns={field.gridColumns ?? 2} compact />
{:else}
<input type={field.key.includes('date') ? 'date'
: field.key.startsWith('quiet_hours_') ? 'time'
: field.key.includes('times') ? 'text'
: 'number'}
{@const inputType = field.type === 'date' ? 'date'
: field.type === 'time' ? 'time'
: field.type === 'time-list' ? 'text'
: 'number'}
{@const hasError = field.type === 'time-list' && !!timeListErrors[field.key]}
<input type={inputType}
bind:value={form[field.key]} min={field.min} max={field.max}
placeholder={field.key.includes('times') || field.key.startsWith('quiet_hours_') ? String(field.defaultValue ?? '') : ''}
class="w-full px-2 py-1 border border-[var(--color-border)] rounded-md text-sm bg-[var(--color-background)]" />
onblur={field.type === 'time-list' && field.validateFormat ? () => normalizeTimeList(field.key) : undefined}
placeholder={field.type === 'time-list' || field.type === 'time' ? String(typeof field.defaultValue === 'function' ? field.defaultValue() : (field.defaultValue ?? '')) : ''}
class="w-full px-2 py-1 border rounded-md text-sm bg-[var(--color-background)] {hasError ? 'border-[var(--color-error-fg)]' : 'border-[var(--color-border)]'}" />
{#if field.inlineHelp}
<p class="text-[10px] mt-0.5" style="color: var(--color-muted-foreground);">{t(field.inlineHelp)}</p>
{/if}
{#if hasError}
<p class="text-[10px] mt-0.5" style="color: var(--color-error-fg);">{timeListErrors[field.key]}</p>
{/if}
{/if}
</div>
{/each}
</div>
{#if section.key === 'quietHours' && form.quiet_hours_start && form.quiet_hours_end}
<p class="text-xs mt-2" style="color: var(--color-muted-foreground);">
<MdiIcon name="mdiWeatherNight" size={12} />
{quietHoursPreview(String(form.quiet_hours_start), String(form.quiet_hours_end))}
</p>
{/if}
{/if}
</fieldset>
{/each}
@@ -268,7 +474,63 @@
<BlockedByModal open={!!blockedBy} detail={blockedBy} onclose={() => blockedBy = null} />
<Modal open={previewModal !== null}
title={previewModal ? `${t('trackingConfig.previewTemplate')} ${previewModal.slotName}` : ''}
onclose={() => previewModal = null}>
{#if previewModal}
{#if previewLocales.length > 1}
<div class="flex gap-1 mb-3 border-b border-[var(--color-border)]">
{#each previewLocales as loc}
<button type="button"
onclick={() => renderPreviewFor(previewModal!.slotName, loc)}
disabled={previewLoading}
class="px-3 py-1.5 text-xs font-medium rounded-t-md transition-colors {previewModal.locale === loc ? 'bg-[var(--color-primary)] text-[var(--color-primary-foreground)]' : 'text-[var(--color-muted-foreground)] hover:bg-[var(--color-muted)]'} disabled:opacity-50">
{loc.toUpperCase()}
</button>
{/each}
</div>
{/if}
<p class="text-xs mb-3" style="color: var(--color-muted-foreground);">
{t('trackingConfig.previewSampleNote')}
</p>
<!-- Keep the prior rendered/error box mounted while refetching on locale
switch — just dim it. Unmounting and replacing with a small "…"
placeholder caused a one-frame layout jump as the modal shrank and
then re-expanded. -->
<div class="relative mb-3" style="opacity: {previewLoading ? 0.5 : 1}; transition: opacity 0.15s ease;">
{#if previewModal.error}
<div class="p-3 rounded text-xs" style="background: var(--color-error-bg); color: var(--color-error-fg);">
{previewModal.error}
</div>
{:else if previewModal.rendered}
<div class="p-3 bg-[var(--color-muted)] rounded text-sm preview-html">
<pre class="whitespace-pre-wrap text-xs">{@html sanitizePreview(previewModal.rendered)}</pre>
</div>
{:else}
<div class="p-3 text-xs" style="color: var(--color-muted-foreground);"></div>
{/if}
</div>
<div class="flex gap-2 justify-end mt-3">
<button type="button" onclick={() => { const s = previewModal!.slotName; previewModal = null; gotoTemplateConfig(s); }}
class="text-xs px-3 py-1.5 rounded-md border border-[var(--color-border)] hover:bg-[var(--color-muted)]">
{t('trackingConfig.editTemplate')}
</button>
<button type="button" onclick={() => previewModal = null}
class="text-xs px-3 py-1.5 rounded-md bg-[var(--color-primary)] text-[var(--color-primary-foreground)]">
{t('common.close')}
</button>
</div>
{/if}
</Modal>
<style>
:global(.preview-html a) {
color: var(--color-primary);
text-decoration: underline;
}
:global(.preview-html a:hover) {
opacity: 0.8;
}
.toggle-switch {
position: relative;
display: inline-flex;
+8 -1
View File
@@ -89,7 +89,14 @@
}
</script>
<PageHeader title={t('users.title')} description={t('users.description')}>
<PageHeader
title={t('users.title')}
emphasis={t('users.titleEmphasis')}
description={t('users.description')}
crumb="System · Access"
count={users.length}
countLabel={t('users.countLabel')}
>
<Button size="sm" onclick={() => showForm = !showForm}>
{showForm ? t('users.cancel') : t('users.addUser')}
</Button>
+1 -1
View File
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
[project]
name = "notify-bridge-core"
version = "0.3.2"
version = "0.6.0"
description = "Core library for Notify Bridge — service provider abstractions, models, notifications, and templates"
requires-python = ">=3.12"
dependencies = [
@@ -0,0 +1,66 @@
"""Request-scoped ContextVars that propagate into log records.
The server sets these at entry points (Telegram webhook, scheduler dispatch,
REST call) and they propagate through async calls automatically. A
``LogRecordFactory`` installed by ``notify_bridge_server.logging_setup``
reads them so every log line is tagged (``request_id``, ``command``,
``chat_id``, ``bot_id``, ``dispatch_id``) without each call site having
to pass the values explicitly.
Kept in ``notify_bridge_core`` so core modules (``TelegramClient``,
``NotificationDispatcher``) can *set* additional context (e.g. a
``dispatch_id``) without depending on the server package.
"""
from __future__ import annotations
from contextlib import contextmanager
from contextvars import ContextVar, Token
from typing import Any, Iterator
request_id_var: ContextVar[str | None] = ContextVar("request_id", default=None)
command_var: ContextVar[str | None] = ContextVar("command", default=None)
chat_id_var: ContextVar[str | None] = ContextVar("chat_id", default=None)
bot_id_var: ContextVar[int | None] = ContextVar("bot_id", default=None)
dispatch_id_var: ContextVar[str | None] = ContextVar("dispatch_id", default=None)
_VAR_MAP: dict[str, ContextVar[Any]] = {
"request_id": request_id_var,
"command": command_var,
"chat_id": chat_id_var,
"bot_id": bot_id_var,
"dispatch_id": dispatch_id_var,
}
@contextmanager
def bind_log_context(**kwargs: Any) -> Iterator[None]:
"""Bind the given context fields for the duration of the ``with`` block.
Unknown keys are ignored so callers can pass whatever they want without
an ``if`` ladder. Values are reset on exit even if the block raises.
Example:
``with bind_log_context(request_id="abc", command="random"): ...``
"""
tokens: list[tuple[ContextVar[Any], Token]] = []
try:
for key, value in kwargs.items():
var = _VAR_MAP.get(key)
if var is None:
continue
tokens.append((var, var.set(value)))
yield
finally:
for var, tok in tokens:
var.reset(tok)
def current_log_context() -> dict[str, Any]:
"""Return a snapshot of the currently-bound context values (non-None)."""
snap: dict[str, Any] = {}
for key, var in _VAR_MAP.items():
val = var.get()
if val is not None:
snap[key] = val
return snap
@@ -52,22 +52,46 @@ class DiscordClient:
return {"success": True}
_MAX_RETRIES = 3
_MAX_RETRY_AFTER = 60.0
async def _post(self, url: str, payload: dict) -> dict[str, Any]:
try:
async with self._session.post(
url, json=payload, headers={"Content-Type": "application/json"}
) as resp:
if resp.status == 429:
retry_after = float(resp.headers.get("Retry-After", "2"))
_LOGGER.warning("Discord rate limited, retrying after %.1fs", retry_after)
await asyncio.sleep(retry_after)
return await self._post(url, payload)
if 200 <= resp.status < 300:
return {"success": True}
body = await resp.text()
return {"success": False, "error": f"HTTP {resp.status}: {body[:200]}"}
except aiohttp.ClientError as e:
return {"success": False, "error": str(e)}
"""POST with bounded 429 retry.
We cap retries at _MAX_RETRIES and the ``Retry-After`` header at
_MAX_RETRY_AFTER seconds so a hostile or misbehaving upstream cannot
pin the dispatch task indefinitely.
"""
for attempt in range(self._MAX_RETRIES + 1):
try:
async with self._session.post(
url,
json=payload,
headers={"Content-Type": "application/json"},
allow_redirects=False,
) as resp:
if resp.status == 429 and attempt < self._MAX_RETRIES:
try:
retry_after = float(resp.headers.get("Retry-After", "2"))
except (TypeError, ValueError):
retry_after = 2.0
retry_after = max(0.0, min(retry_after, self._MAX_RETRY_AFTER))
_LOGGER.warning(
"Discord rate limited, retrying after %.1fs (attempt %d/%d)",
retry_after, attempt + 1, self._MAX_RETRIES,
)
await asyncio.sleep(retry_after)
continue
if 200 <= resp.status < 300:
return {"success": True}
body = await resp.text()
return {
"success": False,
"error": f"HTTP {resp.status}: {body[:200]}",
}
except aiohttp.ClientError as e:
return {"success": False, "error": str(e)}
return {"success": False, "error": "Rate limited (retries exhausted)"}
def _split_message(text: str, limit: int) -> list[str]:
@@ -3,16 +3,19 @@
from __future__ import annotations
import asyncio
import contextlib
import logging
import uuid
from dataclasses import dataclass, field
from typing import Any
from typing import Any, AsyncIterator
import aiohttp
from notify_bridge_core.log_context import bind_log_context, dispatch_id_var
from notify_bridge_core.models.events import ServiceEvent
from notify_bridge_core.templates.context import build_template_context
from notify_bridge_core.templates.renderer import render_template
from .ssrf import UnsafeURLError, validate_outbound_url
from .ssrf import UnsafeURLError, avalidate_outbound_url
_HTTP_TIMEOUT = aiohttp.ClientTimeout(total=30)
@@ -82,9 +85,28 @@ class NotificationDispatcher:
*,
url_cache: TelegramFileCache | None = None,
asset_cache: TelegramFileCache | None = None,
session: aiohttp.ClientSession | None = None,
) -> None:
self._url_cache = url_cache
self._asset_cache = asset_cache
# Optional shared session owned by the caller; when supplied we reuse
# its connection pool instead of opening a fresh per-dispatch session
# (saves a TLS handshake per outbound call).
self._shared_session = session
@contextlib.asynccontextmanager
async def _session_ctx(self) -> AsyncIterator[aiohttp.ClientSession]:
"""Yield an aiohttp session, reusing the shared one if provided.
When a shared session was passed in ``__init__`` we yield it without
closing (the caller owns its lifetime). Otherwise we open a
short-lived session with our default timeout and close it on exit.
"""
if self._shared_session is not None and not self._shared_session.closed:
yield self._shared_session
return
async with _new_session() as session:
yield session
async def dispatch(
self,
@@ -95,18 +117,40 @@ class NotificationDispatcher:
Returns list of results (one per target).
"""
raw_results = await asyncio.gather(
*[self._send_to_target(event, t) for t in targets],
return_exceptions=True,
)
results = []
for raw in raw_results:
if isinstance(raw, Exception):
_LOGGER.error("Failed to dispatch to target: %s", raw)
results.append({"success": False, "error": str(raw)})
else:
results.append(raw)
return results
# Bind a dispatch_id so every log line emitted by the target sends
# (including deep in TelegramClient) can be correlated to the same
# upstream event.
new_id = dispatch_id_var.get() or f"disp:{uuid.uuid4().hex[:12]}"
with bind_log_context(dispatch_id=new_id):
_LOGGER.info(
"Dispatching event %s (collection=%r) to %d target(s)",
event.event_type.value if hasattr(event.event_type, "value") else event.event_type,
getattr(event, "collection_name", None), len(targets),
)
raw_results = await asyncio.gather(
*[self._send_to_target(event, t) for t in targets],
return_exceptions=True,
)
results = []
failures = 0
for target, raw in zip(targets, raw_results):
if isinstance(raw, Exception):
failures += 1
_LOGGER.error(
"Dispatch to target type=%s failed: %s",
target.type, raw, exc_info=raw,
)
results.append({"success": False, "error": str(raw)})
else:
if isinstance(raw, dict) and not raw.get("success"):
failures += 1
results.append(raw)
_LOGGER.info(
"Dispatch finished: %d target(s), %d failure(s)",
len(targets), failures,
)
return results
def _resolve_template(
self, event: ServiceEvent, target: TargetConfig, locale: str,
@@ -284,7 +328,7 @@ class NotificationDispatcher:
media_assets.append(asset)
results: list[dict[str, Any]] = []
async with _new_session() as session:
async with self._session_ctx() as session:
# Preload all asset bytes once so (a) TelegramClient can skip its
# own download and (b) we know exact upload sizes in time for the
# oversize warning in the rendered text.
@@ -354,13 +398,13 @@ class NotificationDispatcher:
return {"success": False, "error": "No receivers configured"}
results: list[dict[str, Any]] = []
async with _new_session() as session:
async with self._session_ctx() as session:
for receiver in target.receivers:
if not isinstance(receiver, WebhookReceiver) or not receiver.url:
results.append({"success": False, "error": "Invalid webhook receiver"})
continue
try:
validate_outbound_url(receiver.url)
await avalidate_outbound_url(receiver.url)
except UnsafeURLError as err:
results.append({"success": False, "error": f"Unsafe URL: {err}"})
continue
@@ -428,14 +472,14 @@ class NotificationDispatcher:
username = target.config.get("username")
results: list[dict[str, Any]] = []
async with _new_session() as session:
async with self._session_ctx() as session:
client = DiscordClient(session)
for receiver in target.receivers:
if not isinstance(receiver, DiscordReceiver) or not receiver.webhook_url:
results.append({"success": False, "error": "Invalid discord receiver"})
continue
try:
validate_outbound_url(receiver.webhook_url)
await avalidate_outbound_url(receiver.webhook_url)
except UnsafeURLError as err:
results.append({"success": False, "error": f"Unsafe URL: {err}"})
continue
@@ -454,14 +498,14 @@ class NotificationDispatcher:
username = target.config.get("username")
results: list[dict[str, Any]] = []
async with _new_session() as session:
async with self._session_ctx() as session:
client = SlackClient(session)
for receiver in target.receivers:
if not isinstance(receiver, SlackReceiver) or not receiver.webhook_url:
results.append({"success": False, "error": "Invalid slack receiver"})
continue
try:
validate_outbound_url(receiver.webhook_url)
await avalidate_outbound_url(receiver.webhook_url)
except UnsafeURLError as err:
results.append({"success": False, "error": f"Unsafe URL: {err}"})
continue
@@ -480,14 +524,14 @@ class NotificationDispatcher:
if not target.receivers:
return {"success": False, "error": "No receivers configured"}
try:
validate_outbound_url(server_url)
await avalidate_outbound_url(server_url)
except UnsafeURLError as err:
return {"success": False, "error": f"Unsafe ntfy server_url: {err}"}
title = f"{event.event_type.value}: {event.collection_name}"
results: list[dict[str, Any]] = []
async with _new_session() as session:
async with self._session_ctx() as session:
client = NtfyClient(session)
for receiver in target.receivers:
if not isinstance(receiver, NtfyReceiver) or not receiver.topic:
@@ -511,7 +555,7 @@ class NotificationDispatcher:
if not homeserver or not access_token:
return {"success": False, "error": "Missing Matrix homeserver_url or access_token"}
try:
validate_outbound_url(homeserver)
await avalidate_outbound_url(homeserver)
except UnsafeURLError as err:
return {"success": False, "error": f"Unsafe matrix homeserver_url: {err}"}
@@ -519,7 +563,7 @@ class NotificationDispatcher:
return {"success": False, "error": "No receivers configured"}
results: list[dict[str, Any]] = []
async with _new_session() as session:
async with self._session_ctx() as session:
client = MatrixClient(session, homeserver, access_token)
for receiver in target.receivers:
if not isinstance(receiver, MatrixReceiver) or not receiver.room_id:
@@ -68,7 +68,9 @@ class MatrixClient:
}
try:
async with self._session.put(url, json=body, headers=headers) as resp:
async with self._session.put(
url, json=body, headers=headers, allow_redirects=False,
) as resp:
if 200 <= resp.status < 300:
return {"success": True}
resp_body = await resp.text()
@@ -51,7 +51,9 @@ class NtfyClient:
headers["Authorization"] = f"Bearer {auth_token}"
try:
async with self._session.post(url, json=payload, headers=headers) as resp:
async with self._session.post(
url, json=payload, headers=headers, allow_redirects=False,
) as resp:
if 200 <= resp.status < 300:
return {"success": True}
body = await resp.text()
@@ -38,6 +38,7 @@ class SlackClient:
webhook_url,
json=payload,
headers={"Content-Type": "application/json"},
allow_redirects=False,
) as resp:
if resp.status == 429:
_LOGGER.warning("Slack rate limited")
@@ -12,14 +12,25 @@ development against localhost services.
from __future__ import annotations
import asyncio
import ipaddress
import logging
import os
import socket
from urllib.parse import urlparse
_LOGGER = logging.getLogger(__name__)
_ALLOW_PRIVATE = os.environ.get("NOTIFY_BRIDGE_ALLOW_PRIVATE_URLS") == "1"
_ALLOWED_SCHEMES = {"http", "https"}
if _ALLOW_PRIVATE: # pragma: no cover — operator-visible banner
_LOGGER.warning(
"SSRF guard: private-URL bypass ENABLED "
"(NOTIFY_BRIDGE_ALLOW_PRIVATE_URLS=1). Requests to RFC1918 / "
"loopback / link-local hosts will be permitted."
)
class UnsafeURLError(ValueError):
"""Raised when a URL targets a disallowed network destination."""
@@ -36,13 +47,7 @@ def _is_blocked_ip(ip: ipaddress.IPv4Address | ipaddress.IPv6Address) -> bool:
)
def validate_outbound_url(url: str) -> str:
"""Validate ``url`` is safe to fetch; returns the URL on success.
Raises :class:`UnsafeURLError` when the scheme, host, or resolved IP
is not allowed. In development (``NOTIFY_BRIDGE_ALLOW_PRIVATE_URLS=1``)
private addresses are permitted but the scheme check still applies.
"""
def _check_scheme_host(url: str) -> tuple[str, str]:
if not isinstance(url, str) or not url:
raise UnsafeURLError("URL is empty")
parsed = urlparse(url)
@@ -51,6 +56,31 @@ def validate_outbound_url(url: str) -> str:
host = parsed.hostname
if not host:
raise UnsafeURLError("URL has no host")
return parsed.scheme, host
def _check_resolved_addresses(host: str, infos: list[tuple]) -> None:
for info in infos:
sockaddr = info[4]
try:
ip = ipaddress.ip_address(sockaddr[0])
except ValueError:
continue
if _is_blocked_ip(ip):
raise UnsafeURLError(f"Host {host} resolves to blocked address {ip}")
def validate_outbound_url(url: str) -> str:
"""Validate ``url`` is safe to fetch; returns the URL on success.
Raises :class:`UnsafeURLError` when the scheme, host, or resolved IP
is not allowed. In development (``NOTIFY_BRIDGE_ALLOW_PRIVATE_URLS=1``)
private addresses are permitted but the scheme check still applies.
Synchronous; uses blocking ``socket.getaddrinfo``. Prefer
:func:`avalidate_outbound_url` from async code paths.
"""
_, host = _check_scheme_host(url)
if _ALLOW_PRIVATE:
return url
@@ -64,17 +94,37 @@ def validate_outbound_url(url: str) -> str:
except ValueError:
pass
# Hostname — resolve and reject if any resolution is in a blocked range.
try:
infos = socket.getaddrinfo(host, None)
except socket.gaierror as exc:
raise UnsafeURLError(f"DNS resolution failed for {host}") from exc
for info in infos:
sockaddr = info[4]
try:
ip = ipaddress.ip_address(sockaddr[0])
except ValueError:
continue
if _is_blocked_ip(ip):
raise UnsafeURLError(f"Host {host} resolves to blocked address {ip}")
_check_resolved_addresses(host, infos)
return url
async def avalidate_outbound_url(url: str) -> str:
"""Async variant that resolves DNS via the running loop's resolver.
Use this from ``async def`` code paths to avoid blocking the event
loop on DNS lookups.
"""
_, host = _check_scheme_host(url)
if _ALLOW_PRIVATE:
return url
try:
ip = ipaddress.ip_address(host)
if _is_blocked_ip(ip):
raise UnsafeURLError(f"Host {host} is in a blocked range")
return url
except ValueError:
pass
loop = asyncio.get_running_loop()
try:
infos = await loop.getaddrinfo(host, None)
except socket.gaierror as exc:
raise UnsafeURLError(f"DNS resolution failed for {host}") from exc
_check_resolved_addresses(host, infos)
return url
@@ -162,8 +162,20 @@ class TelegramClient:
"message_id": result.get("result", {}).get("message_id"),
"cached": True,
}
except aiohttp.ClientError:
pass
# Non-ok from a cached send — file_id stale or file deleted on
# Telegram's side. Log at DEBUG so operators who are hunting
# "why didn't the cached send work?" can see it, but the
# caller will fall through to a fresh upload.
_LOGGER.debug(
"Telegram %s (cached) returned non-ok: status=%s code=%s desc=%r — falling back to fresh upload",
kind.api_method, response.status, result.get("error_code"),
result.get("description"),
)
except aiohttp.ClientError as err:
_LOGGER.debug(
"Telegram %s (cached) transport error — falling back to fresh upload: %s",
kind.api_method, err,
)
return None
async def _upload_media(
@@ -203,8 +215,17 @@ class TelegramClient:
thumbhash=thumbhash, size=len(data),
)
return {"success": True, "message_id": res.get("message_id")}
_LOGGER.error(
"Telegram %s failed: status=%s code=%s desc=%r bytes=%d",
kind.api_method, response.status, result.get("error_code"),
result.get("description", "Unknown"), len(data),
)
return {"success": False, "error": result.get("description", "Unknown Telegram error")}
except aiohttp.ClientError as err:
_LOGGER.error(
"Telegram %s transport error (bytes=%d): %s",
kind.api_method, len(data), err, exc_info=True,
)
return {"success": False, "error": str(err)}
async def send_notification(
@@ -327,8 +348,14 @@ class TelegramClient:
retry_result = await retry_resp.json()
if retry_resp.status == 200 and retry_result.get("ok"):
return {"success": True, "message_id": retry_result.get("result", {}).get("message_id")}
_LOGGER.error(
"Telegram sendMessage failed: status=%s code=%s desc=%r",
response.status, result.get("error_code"),
result.get("description", "Unknown"),
)
return {"success": False, "error": result.get("description", "Unknown Telegram error"), "error_code": result.get("error_code")}
except aiohttp.ClientError as err:
_LOGGER.error("Telegram sendMessage transport error: %s", err, exc_info=True)
return {"success": False, "error": str(err)}
async def send_chat_action(self, chat_id: str, action: str = "typing") -> bool:
@@ -513,11 +540,14 @@ class TelegramClient:
# Tuple is (cache_key, media_type, thumbhash, uploaded_size).
media_cache_info: list[tuple[str, str, str | None, int] | None] = []
# Resolve cache hits and collect download tasks in parallel
# Resolve cache hits and collect download tasks in parallel.
# Each drop site logs the reason — otherwise a filtered asset
# disappears silently and the media group silently shrinks.
async def _fetch_asset(idx: int, item: dict) -> tuple[int, dict | None, bytes | None]:
"""Return (index, cache_entry_or_None, downloaded_bytes_or_None)."""
url = item.get("url")
if not url:
_LOGGER.warning("Media skipped: missing url (idx=%d type=%s)", idx, item.get("type"))
return idx, None, None
media_type = item.get("type", "photo")
custom_cache_key = item.get("cache_key")
@@ -537,12 +567,24 @@ class TelegramClient:
if preloaded is not None:
data = preloaded
if max_asset_data_size and len(data) > max_asset_data_size:
_LOGGER.warning(
"Media skipped: preloaded size %d exceeds max_asset_data_size %d (idx=%d type=%s url=%s)",
len(data), max_asset_data_size, idx, media_type, url,
)
return idx, None, None
if media_type == "video" and len(data) > TELEGRAM_MAX_VIDEO_SIZE:
_LOGGER.warning(
"Media skipped: preloaded video %d bytes exceeds Telegram limit %d (idx=%d url=%s)",
len(data), TELEGRAM_MAX_VIDEO_SIZE, idx, url,
)
return idx, None, None
if media_type == "photo":
exceeds, _, _, _ = check_photo_limits(data)
exceeds, reason, _, _ = check_photo_limits(data)
if exceeds:
_LOGGER.warning(
"Media skipped: preloaded photo %s (idx=%d url=%s)",
reason, idx, url,
)
return idx, None, None
return idx, None, data
@@ -551,18 +593,38 @@ class TelegramClient:
dl_headers = item.get("headers") or {}
async with self._session.get(download_url, headers=dl_headers) as resp:
if resp.status != 200:
_LOGGER.warning(
"Media skipped: download HTTP %d (idx=%d type=%s url=%s)",
resp.status, idx, media_type, url,
)
return idx, None, None
data = await resp.read()
if max_asset_data_size and len(data) > max_asset_data_size:
_LOGGER.warning(
"Media skipped: downloaded size %d exceeds max_asset_data_size %d (idx=%d type=%s url=%s)",
len(data), max_asset_data_size, idx, media_type, url,
)
return idx, None, None
if media_type == "video" and len(data) > TELEGRAM_MAX_VIDEO_SIZE:
_LOGGER.warning(
"Media skipped: video %d bytes exceeds Telegram %d-byte limit (idx=%d url=%s)",
len(data), TELEGRAM_MAX_VIDEO_SIZE, idx, url,
)
return idx, None, None
if media_type == "photo":
exceeds, _, _, _ = check_photo_limits(data)
exceeds, reason, _, _ = check_photo_limits(data)
if exceeds:
_LOGGER.warning(
"Media skipped: photo %s (idx=%d url=%s)",
reason, idx, url,
)
return idx, None, None
return idx, None, data
except aiohttp.ClientError:
except aiohttp.ClientError as err:
_LOGGER.warning(
"Media skipped: download failed (idx=%d type=%s url=%s): %s",
idx, media_type, url, err,
)
return idx, None, None
results = await asyncio.gather(
@@ -602,6 +664,14 @@ class TelegramClient:
media_json.append(mij)
if not media_json:
# Every asset in this chunk was filtered out (size, download
# failure, etc.). Without this log, sendMediaGroup returns
# success=True with zero message_ids and nobody knows why
# the user sees only the text reply and no media.
_LOGGER.warning(
"sendMediaGroup skipped — chunk %d/%d had %d input items but 0 usable (all filtered/failed)",
chunk_idx + 1, len(chunks), len(chunk),
)
continue
form.add_field("media", json.dumps(media_json))
@@ -638,10 +708,35 @@ class TelegramClient:
if eff_cache:
await eff_cache.async_set_many(cache_entries)
else:
return {"success": False, "error": result.get("description", "Unknown"), "failed_at_chunk": chunk_idx + 1}
_LOGGER.error(
"Telegram sendMediaGroup failed: status=%s code=%s desc=%r chunk=%d/%d items=%d",
response.status, result.get("error_code"),
result.get("description", "Unknown"),
chunk_idx + 1, len(chunks), len(media_json),
)
return {
"success": False,
"error": result.get("description", "Unknown"),
"error_code": result.get("error_code"),
"failed_at_chunk": chunk_idx + 1,
}
except aiohttp.ClientError as err:
_LOGGER.error(
"Telegram sendMediaGroup transport error on chunk %d/%d (%d items): %s",
chunk_idx + 1, len(chunks), len(media_json), err,
exc_info=True,
)
return {"success": False, "error": str(err), "failed_at_chunk": chunk_idx + 1}
# Distinguish "posted something" from "posted nothing" so the caller
# can surface an ERROR when a command produced a caption reply but no
# media ever reached Telegram.
if not all_message_ids:
_LOGGER.warning(
"sendMediaGroup completed with 0 message_ids across %d chunk(s) — nothing was delivered",
len(chunks),
)
return {"success": False, "error": "no_items_delivered", "chunks_sent": len(chunks)}
return {"success": True, "message_ids": all_message_ids, "chunks_sent": len(chunks)}
# ------------------------------------------------------------------
@@ -734,12 +829,41 @@ class TelegramClient:
async def set_my_commands(
self, commands: list[dict[str, str]], language_code: str | None = None,
scope: dict[str, Any] | None = None,
) -> dict[str, Any]:
"""Register bot commands with BotFather API."""
"""Register bot commands with BotFather API.
``scope`` is a Telegram BotCommandScope object (e.g.
``{"type": "chat", "chat_id": 123}``). When provided, the
registration applies only to that scope. ``language_code`` and
``scope`` may be combined to localize per-scope.
"""
url = f"{TELEGRAM_API_BASE_URL}{self._token}/setMyCommands"
payload: dict[str, Any] = {"commands": commands}
if language_code:
payload["language_code"] = language_code
if scope:
payload["scope"] = scope
try:
async with self._session.post(url, json=payload) as resp:
data = await resp.json()
if data.get("ok"):
return {"success": True}
return {"success": False, "error": data.get("description", "Unknown error")}
except aiohttp.ClientError as err:
return {"success": False, "error": str(err)}
async def delete_my_commands(
self, language_code: str | None = None,
scope: dict[str, Any] | None = None,
) -> dict[str, Any]:
"""Clear bot commands for the given scope/language via BotFather API."""
url = f"{TELEGRAM_API_BASE_URL}{self._token}/deleteMyCommands"
payload: dict[str, Any] = {}
if language_code:
payload["language_code"] = language_code
if scope:
payload["scope"] = scope
try:
async with self._session.post(url, json=payload) as resp:
data = await resp.json()
@@ -7,7 +7,7 @@ from typing import Any
import aiohttp
from ..ssrf import UnsafeURLError, validate_outbound_url
from ..ssrf import UnsafeURLError, avalidate_outbound_url
_LOGGER = logging.getLogger(__name__)
@@ -24,7 +24,7 @@ class WebhookClient:
async def send(self, payload: dict[str, Any]) -> dict[str, Any]:
try:
validate_outbound_url(self._url)
await avalidate_outbound_url(self._url)
except UnsafeURLError as err:
return {"success": False, "error": f"Unsafe URL: {err}"}
try:
@@ -33,6 +33,7 @@ class WebhookClient:
json=payload,
headers={"Content-Type": "application/json", **self._headers},
timeout=_DEFAULT_TIMEOUT,
allow_redirects=False,
) as response:
if 200 <= response.status < 300:
return {"success": True, "status_code": response.status}
@@ -333,8 +333,11 @@ def collect_scheduled_assets(
memory_date = now.isoformat() if is_memory else None
all_eligible: list[ImmichAssetInfo] = []
# Track which album each asset belongs to for public URL construction
asset_album_map: dict[str, tuple[str, str]] = {} # asset_id → (album_id, public_url)
# Track which album each asset belongs to. Public URL is used to construct
# a per-asset share link; name/internal-url are surfaced to templates so
# combined-mode sends can attribute each row to its source album.
asset_album_map: dict[str, tuple[str, str, str, str]] = {}
# asset_id → (album_id, album_public_url, album_name, album_internal_url)
collections_extra: list[dict[str, Any]] = []
# limit=0 is the periodic-summary test path — the caller only needs
@@ -346,10 +349,11 @@ def collect_scheduled_assets(
for album_id, album in albums.items():
links = shared_links.get(album_id, [])
album_public_url = get_public_url(external_url, links) or ""
album_internal_url = f"{external_url}/albums/{album_id}"
collections_extra.append({
"name": album.name,
"url": album_public_url or f"{external_url}/albums/{album_id}",
"url": album_public_url or album_internal_url,
"public_url": album_public_url,
"asset_count": album.asset_count,
"shared": album.shared,
@@ -370,7 +374,9 @@ def collect_scheduled_assets(
)
for asset in filtered:
if asset.id not in asset_album_map:
asset_album_map[asset.id] = (album_id, album_public_url)
asset_album_map[asset.id] = (
album_id, album_public_url, album.name, album_internal_url,
)
all_eligible.append(asset)
if stats_only:
@@ -383,15 +389,25 @@ def collect_scheduled_assets(
random.shuffle(all_eligible)
selected = all_eligible
# Convert to MediaAsset with public URLs
# Convert to MediaAsset with public URLs. Per-asset album_name/album_url
# let combined-mode templates attribute each row to its source album —
# critical when a tracker spans multiple albums, where the event-level
# ``album_name`` (first album only) would be misleading.
result: list[MediaAsset] = []
for asset in selected:
media = asset_to_media(asset, external_url)
_, album_pub_url = asset_album_map.get(asset.id, ("", ""))
mapped = asset_album_map.get(asset.id)
if mapped:
_, album_pub_url, album_name, album_internal_url = mapped
else:
album_pub_url = album_name = album_internal_url = ""
if album_pub_url:
media.extra["public_url"] = f"{album_pub_url}/photos/{asset.id}"
else:
media.extra.setdefault("public_url", "")
media.extra["album_name"] = album_name
media.extra["album_url"] = album_pub_url or album_internal_url
media.extra["album_public_url"] = album_pub_url
result.append(media)
return result, collections_extra
@@ -12,6 +12,7 @@ _LOGGER = logging.getLogger(__name__)
_DEFAULT_PORT = 3493
_READ_TIMEOUT = 10.0
_WRITE_TIMEOUT = 10.0
_CONNECT_TIMEOUT = 5.0
# Allowed characters for NUT protocol identifiers (UPS names, variable names).
@@ -84,14 +85,26 @@ class NutClient:
await self._command(f"PASSWORD {self._password}")
async def disconnect(self) -> None:
"""Send LOGOUT and close the TCP connection."""
"""Send LOGOUT and close the TCP connection.
``drain`` is bounded by ``_WRITE_TIMEOUT`` so a half-closed peer
cannot hold the disconnect indefinitely a tracker tick would
otherwise be pinned by a stuck NUT server and block the scheduler
slot (``max_instances=1``).
"""
if self._writer is not None:
try:
self._writer.write(b"LOGOUT\n")
await self._writer.drain()
except OSError:
await asyncio.wait_for(self._writer.drain(), timeout=_WRITE_TIMEOUT)
except (OSError, asyncio.TimeoutError):
pass
self._writer.close()
try:
await asyncio.wait_for(
self._writer.wait_closed(), timeout=_WRITE_TIMEOUT,
)
except (OSError, asyncio.TimeoutError):
pass
self._reader = None
self._writer = None
@@ -135,7 +148,10 @@ class NutClient:
if self._writer is None:
raise NutClientError("Not connected")
self._writer.write(f"{cmd}\n".encode())
await self._writer.drain()
try:
await asyncio.wait_for(self._writer.drain(), timeout=_WRITE_TIMEOUT)
except asyncio.TimeoutError as exc:
raise NutClientError("Write timeout") from exc
async def _readline(self) -> str:
"""Read one line from upsd, stripping trailing newline."""
+37 -11
View File
@@ -2,8 +2,10 @@
from __future__ import annotations
import asyncio
import json
import logging
import os
from pathlib import Path
from typing import Any, Protocol, runtime_checkable
@@ -19,34 +21,58 @@ class StorageBackend(Protocol):
async def remove(self) -> None: ...
def _read_file(path: Path) -> str | None:
if not path.exists():
return None
return path.read_text(encoding="utf-8")
def _atomic_write(path: Path, payload: str) -> None:
"""Write atomically: tmp file + rename. Prevents half-written files on crash."""
path.parent.mkdir(parents=True, exist_ok=True)
tmp = path.with_suffix(path.suffix + ".tmp")
tmp.write_text(payload, encoding="utf-8")
os.replace(tmp, path)
def _remove_file(path: Path) -> None:
if path.exists():
path.unlink()
class JsonFileBackend:
"""Simple JSON file storage backend."""
"""Simple JSON file storage backend.
All blocking I/O is wrapped in ``asyncio.to_thread`` so callers can
``await load() / save() / remove()`` without stalling the event loop.
"""
def __init__(self, path: Path) -> None:
self._path = path
async def load(self) -> dict[str, Any] | None:
if not self._path.exists():
try:
text = await asyncio.to_thread(_read_file, self._path)
except OSError as err:
_LOGGER.warning("Failed to load %s: %s", self._path, err)
return None
if text is None:
return None
try:
text = self._path.read_text(encoding="utf-8")
return json.loads(text)
except (json.JSONDecodeError, OSError) as err:
_LOGGER.warning("Failed to load %s: %s", self._path, err)
except json.JSONDecodeError as err:
_LOGGER.warning("Failed to parse %s: %s", self._path, err)
return None
async def save(self, data: dict[str, Any]) -> None:
payload = json.dumps(data, default=str)
try:
self._path.parent.mkdir(parents=True, exist_ok=True)
self._path.write_text(
json.dumps(data, default=str), encoding="utf-8"
)
await asyncio.to_thread(_atomic_write, self._path, payload)
except OSError as err:
_LOGGER.error("Failed to save %s: %s", self._path, err)
async def remove(self) -> None:
try:
if self._path.exists():
self._path.unlink()
await asyncio.to_thread(_remove_file, self._path)
except OSError as err:
_LOGGER.error("Failed to remove %s: %s", self._path, err)
@@ -1,5 +1,5 @@
⭐ Favorites:
{%- for asset in assets %}
• {%- if asset.type == "VIDEO" or asset.type == "video" %} 🎬{% else %} 🖼️{% endif %} {% if asset.public_url %}<a href="{{ asset.public_url }}">{{ asset.originalFileName }}</a>{% else %}{{ asset.originalFileName }}{% endif %} ❤️
• {%- if asset.type == "VIDEO" %} 🎬{% else %} 🖼️{% endif %} {% if asset.public_url %}<a href="{{ asset.public_url }}">{{ asset.filename }}</a>{% else %}{{ asset.filename }}{% endif %} ❤️
{%- if asset.city %} 📍 {{ asset.city }}{% if asset.country %}, {{ asset.country }}{% endif %}{% endif %}
{%- endfor %}
@@ -1,6 +1,6 @@
📸 Latest:
{%- for asset in assets %}
• {%- if asset.type == "VIDEO" or asset.type == "video" %} 🎬{% else %} 🖼️{% endif %} {% if asset.public_url %}<a href="{{ asset.public_url }}">{{ asset.originalFileName }}</a>{% else %}{{ asset.originalFileName }}{% endif %}{% if asset.year %} ({{ asset.year }}){% endif %}
• {%- if asset.type == "VIDEO" %} 🎬{% else %} 🖼️{% endif %} {% if asset.public_url %}<a href="{{ asset.public_url }}">{{ asset.filename }}</a>{% else %}{{ asset.filename }}{% endif %}{% if asset.year %} ({{ asset.year }}){% endif %}
{%- if asset.city %} 📍 {{ asset.city }}{% if asset.country %}, {{ asset.country }}{% endif %}{% endif %}
{%- if asset.is_favorite %} ❤️{% endif %}
{%- endfor %}
@@ -1,5 +1,6 @@
📅 On this day:
{%- for asset in assets %}
• {%- if asset.type == "VIDEO" or asset.type == "video" %} 🎬{% else %} 🖼️{% endif %} {% if asset.public_url %}<a href="{{ asset.public_url }}">{{ asset.originalFileName }}</a>{% else %}{{ asset.originalFileName }}{% endif %}{% if asset.year %} ({{ asset.year }}){% endif %}
• {%- if asset.type == "VIDEO" %} 🎬{% else %} 🖼️{% endif %} {% if asset.public_url %}<a href="{{ asset.public_url }}">{{ asset.filename }}</a>{% else %}{{ asset.filename }}{% endif %}{% if asset.year %} ({{ asset.year }}){% endif %}
{%- if asset.city %} 📍 {{ asset.city }}{% if asset.country %}, {{ asset.country }}{% endif %}{% endif %}
{%- if asset.is_favorite %} ❤️{% endif %}
{%- endfor %}
@@ -1,6 +1,6 @@
🎲 Random:
{%- for asset in assets %}
• {%- if asset.type == "VIDEO" or asset.type == "video" %} 🎬{% else %} 🖼️{% endif %} {% if asset.public_url %}<a href="{{ asset.public_url }}">{{ asset.originalFileName }}</a>{% else %}{{ asset.originalFileName }}{% endif %}
• {%- if asset.type == "VIDEO" %} 🎬{% else %} 🖼️{% endif %} {% if asset.public_url %}<a href="{{ asset.public_url }}">{{ asset.filename }}</a>{% else %}{{ asset.filename }}{% endif %}
{%- if asset.city %} 📍 {{ asset.city }}{% if asset.country %}, {{ asset.country }}{% endif %}{% endif %}
{%- if asset.is_favorite %} ❤️{% endif %}
{%- endfor %}
@@ -4,7 +4,7 @@
{%- else %}🔍 Results for "{{ query }}":
{%- endif %}
{%- for asset in assets %}
• {%- if asset.type == "VIDEO" or asset.type == "video" %} 🎬{% else %} 🖼️{% endif %} {% if asset.public_url %}<a href="{{ asset.public_url }}">{{ asset.originalFileName }}</a>{% else %}{{ asset.originalFileName }}{% endif %}{% if asset.year %} ({{ asset.year }}){% endif %}
• {%- if asset.type == "VIDEO" %} 🎬{% else %} 🖼️{% endif %} {% if asset.public_url %}<a href="{{ asset.public_url }}">{{ asset.filename }}</a>{% else %}{{ asset.filename }}{% endif %}{% if asset.year %} ({{ asset.year }}){% endif %}
{%- if asset.city %} 📍 {{ asset.city }}{% if asset.country %}, {{ asset.country }}{% endif %}{% endif %}
{%- if asset.is_favorite %} ❤️{% endif %}
{%- endfor %}
@@ -1,4 +1,6 @@
📋 Album summary ({{ albums | length }}):
{%- for album in albums %}
• {% if album.public_url %}<a href="{{ album.public_url }}">{{ album.name }}</a>{% else %}{{ album.name }}{% endif %}: {{ album.asset_count }} assets
{%- endfor %}
{%- if album.photo_count is defined or album.video_count is defined %} ({% if album.photo_count %}🖼️ {{ album.photo_count }}{% endif %}{% if album.photo_count and album.video_count %} · {% endif %}{% if album.video_count %}🎬 {{ album.video_count }}{% endif %}){% endif %}
{%- if album.shared %} 🔗{% endif %}
{%- endfor %}
@@ -1,5 +1,5 @@
⭐ Избранное:
{%- for asset in assets %}
• {%- if asset.type == "VIDEO" or asset.type == "video" %} 🎬{% else %} 🖼️{% endif %} {% if asset.public_url %}<a href="{{ asset.public_url }}">{{ asset.originalFileName }}</a>{% else %}{{ asset.originalFileName }}{% endif %} ❤️
• {%- if asset.type == "VIDEO" %} 🎬{% else %} 🖼️{% endif %} {% if asset.public_url %}<a href="{{ asset.public_url }}">{{ asset.filename }}</a>{% else %}{{ asset.filename }}{% endif %} ❤️
{%- if asset.city %} 📍 {{ asset.city }}{% if asset.country %}, {{ asset.country }}{% endif %}{% endif %}
{%- endfor %}
@@ -1,6 +1,6 @@
📸 Последние:
{%- for asset in assets %}
• {%- if asset.type == "VIDEO" or asset.type == "video" %} 🎬{% else %} 🖼️{% endif %} {% if asset.public_url %}<a href="{{ asset.public_url }}">{{ asset.originalFileName }}</a>{% else %}{{ asset.originalFileName }}{% endif %}{% if asset.year %} ({{ asset.year }}){% endif %}
• {%- if asset.type == "VIDEO" %} 🎬{% else %} 🖼️{% endif %} {% if asset.public_url %}<a href="{{ asset.public_url }}">{{ asset.filename }}</a>{% else %}{{ asset.filename }}{% endif %}{% if asset.year %} ({{ asset.year }}){% endif %}
{%- if asset.city %} 📍 {{ asset.city }}{% if asset.country %}, {{ asset.country }}{% endif %}{% endif %}
{%- if asset.is_favorite %} ❤️{% endif %}
{%- endfor %}
@@ -1,5 +1,6 @@
📅 В этот день:
{%- for asset in assets %}
• {%- if asset.type == "VIDEO" or asset.type == "video" %} 🎬{% else %} 🖼️{% endif %} {% if asset.public_url %}<a href="{{ asset.public_url }}">{{ asset.originalFileName }}</a>{% else %}{{ asset.originalFileName }}{% endif %}{% if asset.year %} ({{ asset.year }}){% endif %}
• {%- if asset.type == "VIDEO" %} 🎬{% else %} 🖼️{% endif %} {% if asset.public_url %}<a href="{{ asset.public_url }}">{{ asset.filename }}</a>{% else %}{{ asset.filename }}{% endif %}{% if asset.year %} ({{ asset.year }}){% endif %}
{%- if asset.city %} 📍 {{ asset.city }}{% if asset.country %}, {{ asset.country }}{% endif %}{% endif %}
{%- if asset.is_favorite %} ❤️{% endif %}
{%- endfor %}
@@ -1,6 +1,6 @@
🎲 Случайные:
{%- for asset in assets %}
• {%- if asset.type == "VIDEO" or asset.type == "video" %} 🎬{% else %} 🖼️{% endif %} {% if asset.public_url %}<a href="{{ asset.public_url }}">{{ asset.originalFileName }}</a>{% else %}{{ asset.originalFileName }}{% endif %}
• {%- if asset.type == "VIDEO" %} 🎬{% else %} 🖼️{% endif %} {% if asset.public_url %}<a href="{{ asset.public_url }}">{{ asset.filename }}</a>{% else %}{{ asset.filename }}{% endif %}
{%- if asset.city %} 📍 {{ asset.city }}{% if asset.country %}, {{ asset.country }}{% endif %}{% endif %}
{%- if asset.is_favorite %} ❤️{% endif %}
{%- endfor %}
@@ -4,7 +4,7 @@
{%- else %}🔍 Результаты по "{{ query }}":
{%- endif %}
{%- for asset in assets %}
• {%- if asset.type == "VIDEO" or asset.type == "video" %} 🎬{% else %} 🖼️{% endif %} {% if asset.public_url %}<a href="{{ asset.public_url }}">{{ asset.originalFileName }}</a>{% else %}{{ asset.originalFileName }}{% endif %}{% if asset.year %} ({{ asset.year }}){% endif %}
• {%- if asset.type == "VIDEO" %} 🎬{% else %} 🖼️{% endif %} {% if asset.public_url %}<a href="{{ asset.public_url }}">{{ asset.filename }}</a>{% else %}{{ asset.filename }}{% endif %}{% if asset.year %} ({{ asset.year }}){% endif %}
{%- if asset.city %} 📍 {{ asset.city }}{% if asset.country %}, {{ asset.country }}{% endif %}{% endif %}
{%- if asset.is_favorite %} ❤️{% endif %}
{%- endfor %}
@@ -1,4 +1,6 @@
📋 Сводка альбомов ({{ albums | length }}):
{%- for album in albums %}
• {% if album.public_url %}<a href="{{ album.public_url }}">{{ album.name }}</a>{% else %}{{ album.name }}{% endif %}: {{ album.asset_count }} файлов
{%- endfor %}
{%- if album.photo_count is defined or album.video_count is defined %} ({% if album.photo_count %}🖼️ {{ album.photo_count }}{% endif %}{% if album.photo_count and album.video_count %} · {% endif %}{% if album.video_count %}🎬 {{ album.video_count }}{% endif %}){% endif %}
{%- if album.shared %} 🔗{% endif %}
{%- endfor %}
@@ -1,4 +1,7 @@
📅 On this day:
{%- for asset in assets %}
• {%- if asset.type == "VIDEO" %} 🎬{% else %} 🖼️{% endif %} {% if asset.public_url %}<a href="{{ asset.public_url }}">{{ asset.filename }}</a>{% else %}{{ asset.filename }}{% endif %} ({{ asset.created_at[:4] }})
{%- endfor %}
{%- if albums and albums|length > 1 and asset.album_name %} — {% if asset.album_url %}<a href="{{ asset.album_url }}">{{ asset.album_name }}</a>{% else %}{{ asset.album_name }}{% endif %}{% endif %}
{%- if asset.city %} 📍 {{ asset.city }}{% if asset.country %}, {{ asset.country }}{% endif %}{% endif %}
{%- if asset.is_favorite %} ❤️{% endif %}
{%- endfor %}
@@ -1,4 +1,6 @@
📋 Tracked Albums Summary ({{ albums | length }} albums):
{%- for album in albums %}
• {% if album.public_url %}<a href="{{ album.public_url }}">{{ album.name }}</a>{% else %}{{ album.name }}{% endif %}: {{ album.asset_count }} assets
{%- endfor %}
{%- if album.photo_count is defined or album.video_count is defined %} ({% if album.photo_count %}🖼️ {{ album.photo_count }}{% endif %}{% if album.photo_count and album.video_count %} · {% endif %}{% if album.video_count %}🎬 {{ album.video_count }}{% endif %}){% endif %}
{%- if album.shared %} 🔗{% endif %}
{%- endfor %}
@@ -1,4 +1,11 @@
📸 Photos from {% if public_url %}<a href="{{ public_url }}">{{ album_name }}</a>{% else %}"{{ album_name }}"{% endif %}:
{%- if albums and albums|length > 1 -%}
🗓️ Scheduled delivery — random photos from {% for album in albums %}{% if album.public_url %}<a href="{{ album.public_url }}">{{ album.name }}</a>{% else %}{{ album.name }}{% endif %}{% if not loop.last %}, {% endif %}{% endfor %}:
{%- else -%}
🗓️ Scheduled delivery — random photos from {% if public_url %}<a href="{{ public_url }}">{{ album_name }}</a>{% else %}"{{ album_name }}"{% endif %}:
{%- endif %}
{%- for asset in assets %}
• {%- if asset.type == "VIDEO" %} 🎬{% else %} 🖼️{% endif %} {% if asset.public_url %}<a href="{{ asset.public_url }}">{{ asset.filename }}</a>{% else %}{{ asset.filename }}{% endif %}
{%- endfor %}
{%- if albums and albums|length > 1 and asset.album_name %} — {% if asset.album_url %}<a href="{{ asset.album_url }}">{{ asset.album_name }}</a>{% else %}{{ asset.album_name }}{% endif %}{% endif %}
{%- if asset.city %} 📍 {{ asset.city }}{% if asset.country %}, {{ asset.country }}{% endif %}{% endif %}
{%- if asset.is_favorite %} ❤️{% endif %}
{%- endfor %}
@@ -1,4 +1,7 @@
📅 В этот день:
{%- for asset in assets %}
• {%- if asset.type == "VIDEO" %} 🎬{% else %} 🖼️{% endif %} {% if asset.public_url %}<a href="{{ asset.public_url }}">{{ asset.filename }}</a>{% else %}{{ asset.filename }}{% endif %} ({{ asset.created_at[:4] }})
{%- endfor %}
{%- if albums and albums|length > 1 and asset.album_name %} — {% if asset.album_url %}<a href="{{ asset.album_url }}">{{ asset.album_name }}</a>{% else %}{{ asset.album_name }}{% endif %}{% endif %}
{%- if asset.city %} 📍 {{ asset.city }}{% if asset.country %}, {{ asset.country }}{% endif %}{% endif %}
{%- if asset.is_favorite %} ❤️{% endif %}
{%- endfor %}
@@ -1,4 +1,6 @@
📋 Сводка альбомов ({{ albums | length }}):
{%- for album in albums %}
• {% if album.public_url %}<a href="{{ album.public_url }}">{{ album.name }}</a>{% else %}{{ album.name }}{% endif %}: {{ album.asset_count }} файлов
{%- endfor %}
{%- if album.photo_count is defined or album.video_count is defined %} ({% if album.photo_count %}🖼️ {{ album.photo_count }}{% endif %}{% if album.photo_count and album.video_count %} · {% endif %}{% if album.video_count %}🎬 {{ album.video_count }}{% endif %}){% endif %}
{%- if album.shared %} 🔗{% endif %}
{%- endfor %}
@@ -1,4 +1,11 @@
📸 Фото из {% if public_url %}<a href="{{ public_url }}">{{ album_name }}</a>{% else %}"{{ album_name }}"{% endif %}:
{%- if albums and albums|length > 1 -%}
🗓️ Доставка по расписанию — случайные фото из {% for album in albums %}{% if album.public_url %}<a href="{{ album.public_url }}">{{ album.name }}</a>{% else %}{{ album.name }}{% endif %}{% if not loop.last %}, {% endif %}{% endfor %}:
{%- else -%}
🗓️ Доставка по расписанию — случайные фото из {% if public_url %}<a href="{{ public_url }}">{{ album_name }}</a>{% else %}"{{ album_name }}"{% endif %}:
{%- endif %}
{%- for asset in assets %}
• {%- if asset.type == "VIDEO" %} 🎬{% else %} 🖼️{% endif %} {% if asset.public_url %}<a href="{{ asset.public_url }}">{{ asset.filename }}</a>{% else %}{{ asset.filename }}{% endif %}
{%- endfor %}
{%- if albums and albums|length > 1 and asset.album_name %} — {% if asset.album_url %}<a href="{{ asset.album_url }}">{{ asset.album_name }}</a>{% else %}{{ asset.album_name }}{% endif %}{% endif %}
{%- if asset.city %} 📍 {{ asset.city }}{% if asset.country %}, {{ asset.country }}{% endif %}{% endif %}
{%- if asset.is_favorite %} ❤️{% endif %}
{%- endfor %}
+13 -1
View File
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
[project]
name = "notify-bridge-server"
version = "0.3.2"
version = "0.6.0"
description = "Standalone Notify Bridge server — FastAPI REST API with SQLite database"
requires-python = ">=3.12"
dependencies = [
@@ -28,6 +28,7 @@ dev = [
"pytest>=8.0",
"pytest-asyncio>=0.23",
"httpx>=0.27",
"aioresponses>=0.7",
]
[project.scripts]
@@ -35,3 +36,14 @@ notify-bridge = "notify_bridge_server.main:run"
[tool.hatch.build.targets.wheel]
packages = ["src/notify_bridge_server"]
[tool.pytest.ini_options]
asyncio_mode = "auto"
testpaths = ["tests"]
# The default filter doesn't let SQLAlchemy warnings fail the suite, which
# matters because our migrations emit a handful of deprecation warnings we
# don't want to suppress at source.
filterwarnings = [
"ignore::DeprecationWarning:passlib",
"ignore::DeprecationWarning:bcrypt",
]
@@ -24,6 +24,10 @@ _SETTING_KEYS = {
"telegram_asset_cache_max_entries": None, # LRU cap for both caches
"supported_locales": None, # comma-separated locale codes
"timezone": "NOTIFY_BRIDGE_TIMEZONE", # IANA tz (e.g. "Europe/Warsaw"); empty = UTC
# Logging — applied live via apply_log_levels() when changed.
"log_level": "NOTIFY_BRIDGE_LOG_LEVEL", # DEBUG/INFO/WARNING/ERROR
"log_format": "NOTIFY_BRIDGE_LOG_FORMAT", # text|json (requires restart to switch)
"log_levels": "NOTIFY_BRIDGE_LOG_LEVELS", # module=LEVEL,module2=LEVEL
}
_DEFAULTS = {
@@ -35,12 +39,20 @@ _DEFAULTS = {
"telegram_asset_cache_max_entries": "5000",
"supported_locales": "en,ru",
"timezone": "UTC",
"log_level": "INFO",
"log_format": "text",
"log_levels": "",
}
# Settings whose changes require dropping in-memory Telegram caches so the
# next dispatch rebuilds them with the new parameters. Files are preserved.
_CACHE_SETTING_KEYS = {"telegram_cache_ttl_hours", "telegram_asset_cache_max_entries"}
# Settings that change logging behaviour. ``log_level`` + ``log_levels`` apply
# live via apply_log_levels(); ``log_format`` requires a restart because
# changing it means swapping the handler formatter entirely.
_LOG_SETTING_KEYS = {"log_level", "log_levels", "log_format"}
async def get_setting(session: AsyncSession, key: str) -> str:
"""Read a setting from DB, falling back to env var then default."""
@@ -66,6 +78,9 @@ class SettingsUpdate(BaseModel):
telegram_asset_cache_max_entries: int | str | None = None
supported_locales: str | None = None
timezone: str | None = None
log_level: str | None = None
log_format: str | None = None
log_levels: str | None = None
@router.get("")
@@ -95,6 +110,7 @@ async def update_settings(
old_secret = await get_setting(session, "telegram_webhook_secret")
old_cache_values = {k: await get_setting(session, k) for k in _CACHE_SETTING_KEYS}
old_timezone = await get_setting(session, "timezone")
old_log_values = {k: await get_setting(session, k) for k in _LOG_SETTING_KEYS}
for key in _SETTING_KEYS:
value = getattr(body, key, None)
@@ -130,6 +146,25 @@ async def update_settings(
new_base_url = await get_setting(session, "external_url")
new_secret = await get_setting(session, "telegram_webhook_secret")
new_timezone = await get_setting(session, "timezone")
new_log_values = {k: await get_setting(session, k) for k in _LOG_SETTING_KEYS}
# Apply live log-level changes (log_format still needs a restart).
if (new_log_values["log_level"] != old_log_values["log_level"]
or new_log_values["log_levels"] != old_log_values["log_levels"]):
from ..logging_setup import apply_log_levels
apply_log_levels(
level=new_log_values["log_level"] or None,
per_module_levels=new_log_values["log_levels"],
)
_LOGGER.info(
"Log levels updated: root=%s overrides=%r",
new_log_values["log_level"], new_log_values["log_levels"],
)
if new_log_values["log_format"] != old_log_values["log_format"]:
_LOGGER.warning(
"log_format changed from %r to %r — restart the server for it to take effect",
old_log_values["log_format"], new_log_values["log_format"],
)
# Cron triggers freeze their timezone at construction time, so a tz change
# has no effect until the jobs are rebuilt — do that here, before we
@@ -199,7 +234,10 @@ async def _reregister_webhooks(
if res.get("success"):
_LOGGER.info("Re-registered webhook for bot %d (%s)", bot.id, bot.name)
else:
_LOGGER.warning(
"Failed to re-register webhook for bot %d: %s",
bot.id, res.get("error"),
# Webhook re-register failure means the bot silently stops
# delivering updates — this is operational visibility for an
# admin, ERROR is appropriate.
_LOGGER.error(
"Failed to re-register webhook for bot %d (%s): %s",
bot.id, bot.name, res.get("error"),
)
@@ -74,6 +74,36 @@ async def _get(session: AsyncSession, config_id: int, user_id: int) -> CommandTe
# Routes
# ---------------------------------------------------------------------------
@router.get("/defaults")
async def get_default_command_templates(
provider_type: str,
slot_name: str | None = None,
locale: str | None = None,
user: User = Depends(get_current_user),
):
"""Return the shipped Jinja2 default command templates for a provider type.
Used by the UI's "Reset to default" actions. Filtering works the same way
as the notification-template equivalent: omit ``slot_name`` for the whole
set, omit ``locale`` for every locale.
Response shape: ``{slot_name: {locale: template_text}}``
"""
from notify_bridge_core.templates.command_defaults.loader import (
load_default_command_templates,
)
from notify_bridge_core.templates.defaults.loader import get_available_locales
locales = [locale] if locale else get_available_locales()
result: dict[str, dict[str, str]] = {}
for loc in locales:
defaults = load_default_command_templates(loc, provider_type)
for name, text in defaults.items():
if slot_name and name != slot_name:
continue
result.setdefault(name, {})[loc] = text
return result
@router.get("/variables")
async def get_command_variables(
user: User = Depends(get_current_user),
@@ -84,15 +114,26 @@ async def get_command_variables(
}
asset_fields = {
"id": "Asset ID (UUID)",
"originalFileName": "Original filename",
"filename": "Original filename (preferred; same as originalFileName)",
"originalFileName": "Original filename (alias of filename, kept for backward-compat with older templates)",
"type": "IMAGE or VIDEO",
"createdAt": "Creation date/time (ISO 8601)",
"created_at": "Creation date/time (ISO 8601)",
"createdAt": "Creation date/time (alias of created_at)",
"year": "Year of the memory (memory command only)",
"public_url": "Per-asset public share URL (empty if no album link)",
"city": "City name (empty if unknown)",
"country": "Country name (empty if unknown)",
"is_favorite": "Whether asset is favorited (boolean)",
}
album_fields = {
"name": "Album name",
"asset_count": "Number of assets in the album",
"id": "Album ID (UUID)",
"public_url": "Public share link URL (empty if none)",
"asset_count": "Number of assets in the album",
"photo_count": "Number of photos in the album",
"video_count": "Number of videos in the album",
"shared": "Whether the album is shared (boolean)",
"owner": "Album owner display name",
}
command_fields = {
"name": "Command name (e.g. status, albums)",
@@ -492,10 +533,11 @@ async def preview_raw(
{"name": "latest", "description": "Show latest photos", "usage": "/latest 10"},
{"name": "search", "description": "Smart search (AI)", "usage": "/search sunset at the beach"},
],
# /albums, /summary
# /albums, /summary — provide photo/video split, sharing, owner so the
# enriched summary template previews fully.
"albums": [
{"name": "Family Photos", "asset_count": 142, "id": "abc-123", "public_url": "https://immich.example.com/share/abc123"},
{"name": "Vacation 2025", "asset_count": 87, "id": "def-456", "public_url": ""},
{"name": "Family Photos", "asset_count": 142, "photo_count": 120, "video_count": 22, "shared": True, "owner": "Alice", "id": "abc-123", "public_url": "https://immich.example.com/share/abc123"},
{"name": "Vacation 2025", "asset_count": 87, "photo_count": 80, "video_count": 7, "shared": False, "owner": "Bob", "id": "def-456", "public_url": ""},
],
# /events
"events": [
@@ -505,9 +547,12 @@ async def preview_raw(
# /people
"people": ["Alice", "Bob", "Charlie"],
# /search, /find, /person, /place, /latest, /favorites, /random, /memory
# ``filename`` is the canonical key (matches notification context and
# build_asset_dict output); ``originalFileName`` is kept as an alias
# so templates still using the old key render in preview.
"assets": [
{"id": "a1", "originalFileName": "IMG_001.jpg", "type": "IMAGE", "createdAt": "2026-03-19T14:30:00", "year": 2024, "public_url": "https://immich.example.com/share/abc123/photos/a1", "city": "Paris", "country": "France", "is_favorite": True},
{"id": "a2", "originalFileName": "VID_002.mp4", "type": "VIDEO", "createdAt": "2026-03-19T15:00:00", "year": 2023, "public_url": "", "city": "", "country": "", "is_favorite": False},
{"id": "a1", "filename": "IMG_001.jpg", "originalFileName": "IMG_001.jpg", "type": "IMAGE", "created_at": "2026-03-19T14:30:00", "createdAt": "2026-03-19T14:30:00", "year": 2024, "public_url": "https://immich.example.com/share/abc123/photos/a1", "city": "Paris", "country": "France", "is_favorite": True},
{"id": "a2", "filename": "VID_002.mp4", "originalFileName": "VID_002.mp4", "type": "VIDEO", "created_at": "2026-03-19T15:00:00", "createdAt": "2026-03-19T15:00:00", "year": 2023, "public_url": "", "city": "", "country": "", "is_favorite": False},
],
"query": "sunset",
"command": "search",
@@ -93,7 +93,14 @@ async def update_email_bot(
session: AsyncSession = Depends(get_session),
):
bot = await _get_user_bot(session, bot_id, user.id)
for field, value in body.model_dump(exclude_unset=True).items():
updates = body.model_dump(exclude_unset=True)
# Reject the masked value the GET response returns so the stored password
# is preserved if the user saves without retyping it.
if "smtp_password" in updates:
pw = updates["smtp_password"]
if isinstance(pw, str) and pw.startswith("***"):
updates.pop("smtp_password")
for field, value in updates.items():
setattr(bot, field, value)
session.add(bot)
await session.commit()
@@ -7,6 +7,11 @@ from pydantic import BaseModel
from sqlmodel import select
from sqlmodel.ext.asyncio.session import AsyncSession
from notify_bridge_core.notifications.ssrf import (
UnsafeURLError,
avalidate_outbound_url,
)
from ..auth.dependencies import get_current_user
from ..database.engine import get_session
from ..database.models import MatrixBot, User
@@ -33,6 +38,21 @@ class MatrixBotUpdate(BaseModel):
display_name: str | None = None
def _is_masked_secret(value: str | None) -> bool:
"""True when a field still carries our masked placeholder."""
return bool(value) and (value.startswith("***") or "..." in value)
async def _validate_homeserver_url(url: str) -> None:
"""Reject homeserver URLs that point to blocked networks."""
try:
await avalidate_outbound_url(url)
except UnsafeURLError as err:
raise HTTPException(
status_code=400, detail=f"Invalid homeserver_url: {err}"
) from err
@router.get("")
async def list_matrix_bots(
user: User = Depends(get_current_user),
@@ -50,6 +70,7 @@ async def create_matrix_bot(
user: User = Depends(get_current_user),
session: AsyncSession = Depends(get_session),
):
await _validate_homeserver_url(body.homeserver_url)
bot = MatrixBot(user_id=user.id, **body.model_dump())
session.add(bot)
await session.commit()
@@ -74,7 +95,19 @@ async def update_matrix_bot(
session: AsyncSession = Depends(get_session),
):
bot = await _get_user_bot(session, bot_id, user.id)
for field, value in body.model_dump(exclude_unset=True).items():
updates = body.model_dump(exclude_unset=True)
# Re-validate homeserver_url whenever the client supplies a new one so
# no private/loopback target can ever be saved, even via update.
if "homeserver_url" in updates and updates["homeserver_url"]:
await _validate_homeserver_url(updates["homeserver_url"])
# Never accept the masked placeholder the GET response returns. If the
# client echoes it back, keep the stored secret.
if "access_token" in updates and _is_masked_secret(updates["access_token"]):
updates.pop("access_token")
for field, value in updates.items():
setattr(bot, field, value)
session.add(bot)
await session.commit()
@@ -108,15 +141,17 @@ async def test_matrix_bot(
If room_id is not provided, just verifies the access token by calling /whoami.
"""
bot = await _get_user_bot(session, bot_id, user.id)
# Defense-in-depth: even though create/update validate the URL, a bot row
# written before this guard was added could still point at a blocked host.
await _validate_homeserver_url(bot.homeserver_url)
import aiohttp
from ..services.http_session import get_http_session
http = await get_http_session()
# Verify token with /whoami
whoami_url = f"{bot.homeserver_url.rstrip('/')}/_matrix/client/v3/account/whoami"
headers = {"Authorization": f"Bearer {bot.access_token}"}
try:
async with http.get(whoami_url, headers=headers) as resp:
async with http.get(whoami_url, headers=headers, allow_redirects=False) as resp:
if resp.status != 200:
body = await resp.text()
return {"success": False, "error": f"Auth failed: HTTP {resp.status}{body[:200]}"}
@@ -126,7 +161,6 @@ async def test_matrix_bot(
result = {"success": True, "user_id": whoami.get("user_id", "")}
# Optionally send a test message
if room_id:
from ..services.notifier import _get_test_message
from notify_bridge_core.notifications.matrix.client import MatrixClient
@@ -148,7 +182,7 @@ def _response(bot: MatrixBot) -> dict:
"name": bot.name,
"icon": bot.icon,
"homeserver_url": bot.homeserver_url,
"access_token": f"{bot.access_token[:8]}...{bot.access_token[-4:]}" if len(bot.access_token) > 12 else "***",
"access_token": f"***{bot.access_token[-4:]}" if len(bot.access_token) > 4 else "***",
"display_name": bot.display_name,
"created_at": bot.created_at.isoformat(),
}
@@ -22,7 +22,8 @@ from ..database.models import (
User,
)
from ..services.notifier import send_test_notification
from ..services.test_dispatch import dispatch_test_notification
from ..services.manual_dispatch import dispatch_test_notification
from ..services.scheduler import reschedule_immich_dispatch_jobs
from .helpers import get_owned_entity
_LOGGER = logging.getLogger(__name__)
@@ -118,6 +119,7 @@ async def create_notification_tracker_target(
session.add(tt)
await session.commit()
await session.refresh(tt)
await reschedule_immich_dispatch_jobs()
return await _tt_response(session, tt)
@@ -164,6 +166,7 @@ async def update_notification_tracker_target(
session.add(tt)
await session.commit()
await session.refresh(tt)
await reschedule_immich_dispatch_jobs()
return await _tt_response(session, tt)
@@ -181,6 +184,7 @@ async def delete_notification_tracker_target(
raise HTTPException(status_code=404, detail="Tracker-target link not found")
await session.delete(tt)
await session.commit()
await reschedule_immich_dispatch_jobs()
@router.post("/{tracker_target_id}/test/{test_type}")
@@ -11,13 +11,18 @@ from ..auth.dependencies import get_current_user
from ..database.engine import get_session
from ..database.models import (
EventLog,
NotificationTarget,
NotificationTracker,
NotificationTrackerState,
NotificationTrackerTarget,
ServiceProvider,
User,
)
from ..services.scheduler import schedule_tracker, unschedule_tracker
from ..services.scheduler import (
reschedule_immich_dispatch_jobs,
schedule_tracker,
unschedule_tracker,
)
from .helpers import get_owned_entity
from .notification_tracker_targets import _tt_response
@@ -32,7 +37,7 @@ class NotificationTrackerCreate(BaseModel):
icon: str = ""
collection_ids: list[str] = []
scan_interval: int = 60
batch_duration: int = 0
adaptive_max_skip: int | None = None
default_tracking_config_id: int | None = None
default_template_config_id: int | None = None
enabled: bool = True
@@ -43,7 +48,11 @@ class NotificationTrackerUpdate(BaseModel):
icon: str | None = None
collection_ids: list[str] | None = None
scan_interval: int | None = None
batch_duration: int | None = None
# int | None is ambiguous for partial updates — we can't distinguish
# "clear the field" from "don't touch". Callers send this via
# model_dump(exclude_unset=True), so an omitted key leaves the value
# alone and an explicit null clears it back to the adaptive-off default.
adaptive_max_skip: int | None = None
default_tracking_config_id: int | None = None
default_template_config_id: int | None = None
enabled: bool | None = None
@@ -54,11 +63,79 @@ async def list_notification_trackers(
user: User = Depends(get_current_user),
session: AsyncSession = Depends(get_session),
):
# Batched loader: pull trackers, then all their tracker-target links in
# a single query, then the referenced targets in a single query. Avoids
# the old 1 + N + N*M pattern that ran ~60 round-trips for 10 trackers.
result = await session.exec(
select(NotificationTracker).where(NotificationTracker.user_id == user.id)
)
trackers = result.all()
return [await _tracker_response(session, t) for t in trackers]
trackers = list(result.all())
if not trackers:
return []
tracker_ids = [t.id for t in trackers]
tt_result = await session.exec(
select(NotificationTrackerTarget).where(
NotificationTrackerTarget.tracker_id.in_(tracker_ids)
)
)
tt_rows = list(tt_result.all())
target_ids = {tt.target_id for tt in tt_rows}
targets_by_id: dict[int, NotificationTarget] = {}
if target_ids:
tgt_result = await session.exec(
select(NotificationTarget).where(NotificationTarget.id.in_(target_ids))
)
targets_by_id = {t.id: t for t in tgt_result.all()}
tts_by_tracker: dict[int, list[NotificationTrackerTarget]] = {}
for tt in tt_rows:
tts_by_tracker.setdefault(tt.tracker_id, []).append(tt)
return [
_build_tracker_response(t, tts_by_tracker.get(t.id, []), targets_by_id)
for t in trackers
]
def _build_tracker_response(
t: NotificationTracker,
tts: list[NotificationTrackerTarget],
targets_by_id: dict[int, NotificationTarget],
) -> dict:
"""In-memory assembler for a tracker + its pre-loaded links/targets."""
tracker_targets = []
for tt in tts:
target = targets_by_id.get(tt.target_id)
tracker_targets.append({
"id": tt.id,
"tracker_id": tt.tracker_id,
"target_id": tt.target_id,
"target_name": target.name if target else None,
"target_type": target.type if target else None,
"target_icon": target.icon if target else None,
"tracking_config_id": tt.tracking_config_id,
"template_config_id": tt.template_config_id,
"enabled": tt.enabled,
"quiet_hours_start": tt.quiet_hours_start,
"quiet_hours_end": tt.quiet_hours_end,
"created_at": tt.created_at.isoformat(),
})
return {
"id": t.id,
"name": t.name,
"icon": t.icon,
"provider_id": t.provider_id,
"collection_ids": t.collection_ids,
"scan_interval": t.scan_interval,
"adaptive_max_skip": t.adaptive_max_skip,
"default_tracking_config_id": t.default_tracking_config_id,
"default_template_config_id": t.default_template_config_id,
"enabled": t.enabled,
"tracker_targets": tracker_targets,
"created_at": t.created_at.isoformat(),
}
@router.post("", status_code=status.HTTP_201_CREATED)
@@ -76,7 +153,11 @@ async def create_notification_tracker(
await session.commit()
await session.refresh(tracker)
if tracker.enabled:
await schedule_tracker(tracker.id, tracker.scan_interval)
await schedule_tracker(
tracker.id, tracker.scan_interval,
adaptive_max_skip=tracker.adaptive_max_skip,
)
await reschedule_immich_dispatch_jobs()
return await _tracker_response(session, tracker)
@@ -104,9 +185,13 @@ async def update_notification_tracker(
await session.commit()
await session.refresh(tracker)
if tracker.enabled:
await schedule_tracker(tracker.id, tracker.scan_interval)
await schedule_tracker(
tracker.id, tracker.scan_interval,
adaptive_max_skip=tracker.adaptive_max_skip,
)
else:
await unschedule_tracker(tracker.id)
await reschedule_immich_dispatch_jobs()
return await _tracker_response(session, tracker)
@@ -139,6 +224,7 @@ async def delete_notification_tracker(
await session.delete(tracker)
await session.commit()
await unschedule_tracker(tracker_id)
await reschedule_immich_dispatch_jobs()
@router.post("/{tracker_id}/trigger")
@@ -194,7 +280,7 @@ async def _tracker_response(session: AsyncSession, t: NotificationTracker) -> di
"provider_id": t.provider_id,
"collection_ids": t.collection_ids,
"scan_interval": t.scan_interval,
"batch_duration": t.batch_duration,
"adaptive_max_skip": t.adaptive_max_skip,
"default_tracking_config_id": t.default_tracking_config_id,
"default_template_config_id": t.default_template_config_id,
"enabled": t.enabled,

Some files were not shown because too many files have changed in this diff Show More