Padreug
5541d2bc7a
## Why
The module was named `activities` originally to avoid colliding with Nostr's `Event` type. In practice that defense added friction without preventing confusion — the backend extension is named `events`, NIP-52 calls them "Calendar Events", and the UI already displayed "Events". The collision with `nostr-tools` `Event` is handled cleanly by the existing `import { Event as NostrEvent }` alias pattern (already in 5 files inside the module). Renaming collapses the 4-way mismatch into one consistent term.
Separately, deployments needed per-instance app names. `VITE_APP_NAME` was already plumbed per-standalone via NixOS `services.webapp-standalones.<app>.displayName` (e.g. cfaun shipped `"Sortir"`, now rebranded to `"Bouge"`), but nothing in the standalone consumed it — PWA manifest, HTML title, and runtime branding were all hardcoded. This PR wires the env through every app-name display point so any deploy can flip `displayName = "Bouge"` (or anything) and pick up the brand end-to-end.
## What
Nine commits on the branch:
1. **`refactor(events): rename activities module to events`** — 70-file rename. `src/modules/activities/` → `src/modules/events/`, `src/activities-app/` → `src/events-app/`, types/services/composables/views/components/store renamed (`Activity`→`Event`, `Activities`→`Events`). Routes `/activities/*` → `/events/*`; the legacy `/events` (ticketing management) moves to `/my-events` so `/events` belongs to the canonical feed. DI tokens `ACTIVITIES_*` → `EVENTS_*`. i18n namespace renamed; English domain strings updated, French/Spanish title key realigned. npm scripts `:activities` → `:events`. Build output `dist-activities/` → `dist-events/`.
2. **`feat(events): wire VITE_APP_NAME through PWA manifest, HTML, runtime`** — PWA manifest `name`/`short_name` template from `process.env.VITE_APP_NAME` with fallback `'Events'`. `events.html` uses Vite's `%VITE_APP_NAME%` substitution. `src/events-app/app.ts` + `main.ts` runtime brand string drives console logs, offline notification, and `acceptTokenFromUrl()`. `events.title` route meta sources from VITE_APP_NAME. `.env.example` updated with per-standalone scoping notes.
3. **`docs(events): update activities→events references`** — `docs/nostr-patterns/*.md` "Canonical: src/modules/activities/composables/useRSVP.ts" anchors point at renamed paths. CLAUDE.md Payment Rails Pattern section updated.
4. **`fix(events): drop lowercase from PWA description brand name`** — minor casing fix caught during verification.
5. **`fix(events): use domain noun in description, not brand name`** — manifest + HTML description switched from `"Discover ${BRAND} near you"` to static `"Discover events near you"`. Description is about *what* the app does, not the brand.
6. **`chore(events): scrub leftover sortir/activities references`** — nginx.conf.example, package.json (concurrently process label + `build:demo` BASE_PATH), router-helpers comment, useMarket comment, and vite.events.config.ts doc-comment.
7. **`refactor(events): conditional brand in console label, tighten docs`** — adds `APP_LABEL` next to `APP_NAME` in `events-app/app.ts`. Reads as `Events` on unbranded builds and `Events (Bouge)` (etc.) when `VITE_APP_NAME` is set to anything other than "Events" (case-insensitive). Used by all four console messages; `acceptTokenFromUrl` keeps the raw `APP_NAME` (it's a token-namespace identifier, not display copy). Also collapses the redundant "cfaun sets X; future deployments can override (e.g. X)" doc-comment.
8. **`i18n(events): finish activité/actividad → événement/evento sweep`** — completes the i18n rename in fr.ts and es.ts (search placeholders, favorites prompts, settings prompt) and fixes five gender-agreement errors that came along with the masculine `événement`/`evento` switch (French: `Aucune ... trouvée`→`Aucun ... trouvé`, `préférées`→`préférés`, `d'une ... la sauvegarder`→`d'un ... le sauvegarder`; Spanish: `favoritas`→`favoritos`, `guardarla`→`guardarlo`).
9. **`chore(events): finish sortir → bouge sweep in .env.example`** — four remaining doc-comment refs in `.env.example` (cfaun branding, ticket-scanner comment, section header, subdomain-mode URL example).
## Cross-repo coordination
This PR has matching changes already pushed to two other repos. They have to land in a coordinated bump because the names are tightly coupled.
- **`aiolabs/webapp-module` main** — commit `9d82016`. Renames `hubActivitiesUrl` → `hubEventsUrl` and `VITE_HUB_ACTIVITIES_URL` → `VITE_HUB_EVENTS_URL`. No backwards-compat shim.
- **`aiolabs/server-deploy` main** — commits `f15e1eb`, `bf4698b`, `d46a520`:
- `standalones.nix` `apps.events` uses `build:events` / `dist-events` / `events.html`; `hubUrlOption` maps `events → "hubEventsUrl"`; comment + cfaun-as-example doc switched from sortir/Sortir to bouge/Bouge.
- `hosts/cfaun/default.nix` rebranded: `subdomain = "bouge"` + `displayName = "Bouge"`. (Native-French feedback retired the "Sortir" branding as awkward.)
- `hosts/atio/default.nix` stale "activities app" comment dropped (atio's `displayName = "Eventos"` config is unchanged).
server-deploy's `flake.lock` still pins the OLD webapp + OLD webapp-module, so nix builds from server-deploy main will fail until the bumps. Suggested order after this PR merges to `dev`: one server-deploy commit that does `nix flake lock --update-input webapp-module` + `--update-input webapp-demo` together. DNS for `bouge.ariege.io` needs to point at the cfaun host before the deploy lands.
## Verification
- `pnpm typecheck` — clean ✓
- `pnpm build:events` (default) — `dist-events/manifest.webmanifest` has `name: "Events"`, description "Discover events near you" ✓
- `VITE_APP_NAME=Bouge pnpm build:events` — `name: "Bouge"`, HTML title "Bouge", console label resolves to `Events (Bouge)` ✓
- Cross-repo grep sweep: no `Sortir`/`sortir`/`activities`/`Activities` references in events-module scope. (Domain false positives — "Market Activity" in market dashboard, "time-based activities" in nostr-feed content filters, "Activity Lifecycle Kills" in CLAUDE.md mobile-browser docs — are unrelated and intentionally left alone.)
Not verified in-browser (no GUI in this session) — needs a manual smoke at `app.ariege.io/bouge/` once the coordinated flake bump lands on cfaun. Watch for: feed loads, `/events/calendar`, `/events/map`, `/events/favorites`, `/events/:id` routes work; "My Events" appears in the user dropdown and `/my-events` shows the management page; PWA install prompt shows "Bouge".
## Out of scope (deferred)
- Backend extension rename — `aiolabs/events` is already named correctly.
- Nix standalone attribute name — `services.webapp-standalones.events` is already correct.
- Overriding domain-noun strings ("Your event was created", RSVP labels) — those stay locale-driven; `VITE_APP_NAME` covers app-name only.
- Backwards-compat redirects from `/activities/*` to `/events/*` — pre-launch, public URL was `/sortir/` (path-mode) or `sortir.ariege.io` (subdomain-mode), never `/activities/`. No external bookmarks to preserve. (`sortir.ariege.io` → `bouge.ariege.io` is a separate decision; up to the deploy operator whether to keep a 301 for word-of-mouth referrers.)
Reviewed-on: #94
139 lines
6.6 KiB
Bash
139 lines
6.6 KiB
Bash
# App Configuration
|
|
# Per-standalone display name — sets browser tab title, PWA install
|
|
# name/short_name, and the brand string in console logs. Each standalone
|
|
# (events, wallet, chat, market, …) gets its own VITE_APP_NAME at build
|
|
# time via NixOS `services.webapp-standalones.<app>.displayName` (see
|
|
# server-deploy). cfaun ships the events app as "Bouge"; defaults to
|
|
# "Events" / "Wallet" / etc. when unset.
|
|
VITE_APP_NAME=MyApp
|
|
|
|
# Nostr Configuration
|
|
VITE_NOSTR_RELAYS=["wss://relay.damus.io","wss://relay.snort.social"]
|
|
VITE_ADMIN_PUBKEYS=["your-admin-pubkey-here"]
|
|
|
|
# API Configuration
|
|
VITE_LNBITS_BASE_URL=http://localhost:5000
|
|
VITE_API_KEY=your-api-key-here
|
|
VITE_LNBITS_DEBUG=false
|
|
VITE_WEBSOCKET_ENABLED=true
|
|
|
|
# LNbits Nostr-transport server pubkey (kind-21000 RPC endpoint).
|
|
# Logged by the LNbits server at startup:
|
|
# `Nostr transport: starting with pubkey <hex>... on N relay(s)`
|
|
# Required for the events ticket scanner; legacy HTTP path still
|
|
# works without it.
|
|
VITE_LNBITS_NOSTR_TRANSPORT_PUBKEY=
|
|
|
|
# Lightning Address Domain (optional)
|
|
# Override the domain used for Lightning Addresses
|
|
# If not set, domain will be extracted from VITE_LNBITS_BASE_URL
|
|
# Example: mydomain.com will show addresses as username@mydomain.com
|
|
VITE_LIGHTNING_DOMAIN=
|
|
|
|
# Push Notifications
|
|
VITE_VAPID_PUBLIC_KEY=your-vapid-public-key
|
|
VITE_PUSH_NOTIFICATIONS_ENABLED=true
|
|
|
|
# Support
|
|
# OBSOLETE: Not used in codebase - config.support.npub is never consumed
|
|
# VITE_SUPPORT_NPUB=your-support-npub
|
|
|
|
# Image Upload Configuration (pict-rs)
|
|
VITE_PICTRS_BASE_URL=https://img.mydomain.com
|
|
|
|
# Events App Configuration
|
|
# Default language for the standalone events app (fr, en, es)
|
|
VITE_DEFAULT_LOCALE=fr
|
|
# Default map center as "lat,lng" (defaults to France center if not set)
|
|
VITE_DEFAULT_MAP_CENTER=42.9667,1.6000
|
|
|
|
# Market Configuration
|
|
VITE_MARKET_NADDR=naddr1qqjxgdp4vv6rydej943n2dny956rwwf4943xzwfc95ekyd3evenrsvrrvc6r2qf8waehxw309akxucnfw3ejuct5d96xcctw9e5k7tmwdaehgunjv4kxz7f0v96xjmczyqrfrfkxv3m8t4elpe28x065z30zszaaqa4u0744qcmadsz3y50cjqcyqqq82scmcafla
|
|
# OBSOLETE: Not used in codebase - market uses VITE_NOSTR_RELAYS instead
|
|
# VITE_MARKET_RELAYS=["wss://relay.damus.io","wss://relay.snort.social","wss://nostr-pub.wellorder.net"]
|
|
# OBSOLETE: Not used in codebase - config.market.lightningEnabled is never consumed
|
|
# VITE_LIGHTNING_ENABLED=true
|
|
# OBSOLETE: Not used in codebase - config.market.defaultCurrency is never consumed
|
|
# VITE_MARKET_DEFAULT_CURRENCY=sat
|
|
|
|
# ───────────────────────────────────────────────────────────────────────
|
|
# Hub → standalone navigation URLs
|
|
#
|
|
# Each chakra tile in the hub builds an <a href> from these env vars and
|
|
# (when authenticated) appends ?token=<lnbits_token> so the destination
|
|
# auto-logs in via acceptTokenFromUrl().
|
|
#
|
|
# Trailing slash matters under path-mode deployment:
|
|
# ✓ https://demo.example.com/market/ asset URLs resolve correctly
|
|
# ✗ https://demo.example.com/market relies on nginx 301 to add the
|
|
# slash; brittle, extra round trip.
|
|
#
|
|
# In LOCAL DEV with `npm run dev:all` use the per-app dev ports (defined
|
|
# in the vite configs):
|
|
# VITE_HUB_EVENTS_URL=http://localhost:5181
|
|
# VITE_HUB_LIBRA_URL=http://localhost:5180
|
|
# VITE_HUB_WALLET_URL=http://localhost:5182
|
|
# VITE_HUB_CHAT_URL=http://localhost:5183
|
|
# VITE_HUB_FORUM_URL=http://localhost:5184
|
|
# VITE_HUB_MARKET_URL=http://localhost:5185
|
|
# VITE_HUB_TASKS_URL=http://localhost:5186
|
|
# VITE_HUB_RESTAURANT_URL=http://localhost:5187
|
|
#
|
|
# In PATH-MODE production (recommended for demo) — note the trailing slash:
|
|
# VITE_HUB_EVENTS_URL=https://demo.example.com/events/
|
|
# VITE_HUB_LIBRA_URL=https://demo.example.com/libra/
|
|
# VITE_HUB_WALLET_URL=https://demo.example.com/wallet/
|
|
# VITE_HUB_CHAT_URL=https://demo.example.com/chat/
|
|
# VITE_HUB_FORUM_URL=https://demo.example.com/forum/
|
|
# VITE_HUB_MARKET_URL=https://demo.example.com/market/
|
|
# VITE_HUB_TASKS_URL=https://demo.example.com/tasks/
|
|
# VITE_HUB_RESTAURANT_URL=https://demo.example.com/restaurant/
|
|
#
|
|
# In SUBDOMAIN-MODE production:
|
|
# VITE_HUB_EVENTS_URL=https://events.example.com
|
|
# VITE_HUB_LIBRA_URL=https://libra.example.com
|
|
# ...etc
|
|
# ───────────────────────────────────────────────────────────────────────
|
|
VITE_HUB_EVENTS_URL=
|
|
VITE_HUB_LIBRA_URL=
|
|
VITE_HUB_WALLET_URL=
|
|
VITE_HUB_CHAT_URL=
|
|
VITE_HUB_FORUM_URL=
|
|
VITE_HUB_MARKET_URL=
|
|
VITE_HUB_TASKS_URL=
|
|
VITE_HUB_RESTAURANT_URL=
|
|
|
|
# ───────────────────────────────────────────────────────────────────────
|
|
# VITE_HUB_ROOT_URL — standalone → hub (the inverse of the URLs above)
|
|
#
|
|
# Read by the standalone shell's <HubPill> (top-right "back to hub" link)
|
|
# and the "Back to Hub" item inside the profile sheet. Each standalone's
|
|
# bundle gets this value baked in at build time.
|
|
#
|
|
# In PATH-MODE deployment the standalone and hub share an origin, so the
|
|
# default ('/' if unset) is correct — the link is same-origin.
|
|
#
|
|
# In SUBDOMAIN-MODE production the standalone is on a different origin
|
|
# than the hub; set this to the full hub URL:
|
|
# VITE_HUB_ROOT_URL=https://app.example.com/
|
|
#
|
|
# In LOCAL DEV with `npm run dev:all`, the hub is on :5173:
|
|
# VITE_HUB_ROOT_URL=http://localhost:5173/
|
|
# ───────────────────────────────────────────────────────────────────────
|
|
VITE_HUB_ROOT_URL=
|
|
|
|
# ───────────────────────────────────────────────────────────────────────
|
|
# VITE_BASE_PATH — build-time only, NOT per .env
|
|
#
|
|
# Each standalone vite config (vite.<name>.config.ts) reads VITE_BASE_PATH
|
|
# at build time. For path-mode deployment, set it as a shell variable when
|
|
# you build, NOT in this .env file (which is read at runtime by the
|
|
# bundle):
|
|
#
|
|
# VITE_BASE_PATH=/market/ npm run build:market
|
|
# VITE_BASE_PATH=/wallet/ npm run build:wallet
|
|
# ...
|
|
#
|
|
# The default '/' (no override) is what you want for subdomain-mode and
|
|
# for `npm run dev:all`.
|
|
# ───────────────────────────────────────────────────────────────────────
|