Compare commits
125 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
56d318811f | ||
|
|
0859327464 | ||
|
|
53cad29c7e | ||
|
|
5acaa3b2b4 | ||
|
|
226d0c3f95 | ||
|
|
f646d5aa14 | ||
|
|
0fe82c28d8 | ||
|
|
20de6ba8e1 | ||
|
|
bcc277a054 | ||
|
|
c8f471b290 | ||
|
|
c2750eae85 | ||
|
|
609b15be08 | ||
|
|
cc0545cc5c | ||
|
|
31d1630c50 | ||
|
|
1d810ea964 | ||
|
|
a813e1e7f7 | ||
|
|
618d961f72 | ||
|
|
e1a011045a | ||
|
|
a44665f05f | ||
|
|
4392df3202 | ||
|
|
99f04edf5d | ||
|
|
3edef9cbdf | ||
|
|
42d25818b4 | ||
|
|
5a1d849681 | ||
|
|
b4fbae693b | ||
|
|
c08d5d4baa | ||
|
|
2c8bd594a4 | ||
|
|
9ce57bedf9 | ||
|
|
bfc777c18b | ||
|
|
a2b732317e | ||
|
|
5ebf741427 | ||
|
|
4ae30ee8e6 | ||
|
|
72e5f89b49 | ||
|
|
d003748bb1 | ||
|
|
6048eafc0d | ||
|
|
562a7de7c0 | ||
|
|
8b12001fa6 | ||
|
|
383ff8a5cf | ||
|
|
65914144d1 | ||
|
|
a8780d5236 | ||
|
|
2dcf5a2aad | ||
|
|
50c95d0ff7 | ||
|
|
4ff736734d | ||
|
|
fd1713f6b1 | ||
|
|
6c9b6fab02 | ||
|
|
0ae4c59630 | ||
|
|
ab11b0d3ed | ||
|
|
0355c10dbc | ||
|
|
28d34e3fbe | ||
|
|
b0df599b52 | ||
|
|
74bd140295 | ||
|
|
42f47304dd | ||
|
|
c00bffdf78 | ||
|
|
5026b63323 | ||
|
|
601393ece3 | ||
|
|
ee6db357c2 | ||
|
|
cdf4a63809 | ||
|
|
23929653d3 | ||
|
|
344b41afc8 | ||
|
|
52a84479d4 | ||
|
|
f71f5eeef8 | ||
|
|
1f27311903 | ||
|
|
465683cf71 | ||
|
|
a4f72a3d05 | ||
|
|
c4a1671f81 | ||
|
|
20b2b0d676 | ||
|
|
95ff486038 | ||
|
|
7791cbe9fa | ||
|
|
26a8c5eb31 | ||
|
|
69a86493e8 | ||
|
|
f2787d79cf | ||
|
|
a1b069da13 | ||
|
|
c65e6effb5 | ||
|
|
b39c2ec386 | ||
|
|
22eb46c62b | ||
|
|
65a7f0bdbb | ||
|
|
f95adeecf1 | ||
|
|
f8a1054894 | ||
|
|
7958ca59bc | ||
|
|
68b77d6c14 | ||
|
|
8a347b4435 | ||
|
|
3d905af6ec | ||
|
|
1c361b8df5 | ||
|
|
20ff45089f | ||
|
|
e22e2ec85f | ||
|
|
dbc78a1760 | ||
|
|
0175645f3a | ||
|
|
008fb81f73 | ||
|
|
9838aa6d72 | ||
|
|
a9dffbf09d | ||
|
|
afd5a09acd | ||
|
|
e234253870 | ||
|
|
c66aeb526f | ||
|
|
267e93abc7 | ||
|
|
9dd2231332 | ||
|
|
1a88f8637d | ||
|
|
b95371a123 | ||
|
|
b76891798e | ||
|
|
7dc8c2c08b | ||
|
|
822cca23d7 | ||
|
|
c36bf2f029 | ||
|
|
443c7122d8 | ||
|
|
2d9758593a | ||
|
|
44be542366 | ||
|
|
7719be12d9 | ||
|
|
6aba9b356f | ||
|
|
7a928dae6d | ||
|
|
bf47d43674 | ||
|
|
41f420ae55 | ||
|
|
262eb32e7c | ||
|
|
dddfe51f86 | ||
|
|
b94ac3d409 | ||
|
|
eaf345e2ec | ||
|
|
96503b672c | ||
|
|
b0f6dd9f77 | ||
|
|
6746353670 | ||
|
|
096f2155fe | ||
|
|
5d40a67a8a | ||
|
|
569ad9b01c | ||
|
|
d3d82f7d46 | ||
|
|
4a4f398df0 | ||
|
|
957033e678 | ||
|
|
7f29a822ab | ||
|
|
3f35a6f3a4 | ||
|
|
8a6968735c |
251 changed files with 8826 additions and 1011 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -52,7 +52,8 @@ stats.json
|
||||||
|
|
||||||
# Local/generated assets & incidental lockfiles (do not commit)
|
# Local/generated assets & incidental lockfiles (do not commit)
|
||||||
/assets/
|
/assets/
|
||||||
/resources/
|
/resources/*
|
||||||
|
!/resources/splash.png
|
||||||
/bun.lock
|
/bun.lock
|
||||||
cvm-server/bun.lock
|
cvm-server/bun.lock
|
||||||
push-service/bun.lock
|
push-service/bun.lock
|
||||||
|
|
|
||||||
365
AGENTS.md
365
AGENTS.md
|
|
@ -659,7 +659,11 @@ session with **no other memory of this project**. So:
|
||||||
calls are suppressed so partial JSON never renders. Pollinations' `mistral`
|
calls are suppressed so partial JSON never renders. Pollinations' `mistral`
|
||||||
slug is dead (404); only `openai` (gpt-oss-20b) is live. `findCoaches` +
|
slug is dead (404); only `openai` (gpt-oss-20b) is live. `findCoaches` +
|
||||||
`getCommunityStats` cover **all** Lab roles (kinds 35001–35014).
|
`getCommunityStats` cover **all** Lab roles (kinds 35001–35014).
|
||||||
**Bubble visibility (2026-10-04):** the floating Sasquatch FAB no longer
|
**Form-page visibility (2026-10-29):** the assistant is deliberately hidden on
|
||||||
|
`/become/*`, `/create*`, `/edit*`, `/supporters` and `/onboarding` — the
|
||||||
|
floating bubble covered form inputs/chips (especially on mobile). It remains
|
||||||
|
available everywhere else.
|
||||||
|
**Bubble visibility (2026-10-04):** the floating Sasquatch FAB no longer
|
||||||
pulses forever — the `animate-ping` halo shows **only when an unread tip
|
pulses forever — the `animate-ping` halo shows **only when an unread tip
|
||||||
exists**, is `motion-reduce:hidden`, and is suppressed on **full-bleed routes**
|
exists**, is `motion-reduce:hidden`, and is suppressed on **full-bleed routes**
|
||||||
(`isFullBleed` passed from `Layout`). The bubble keeps its **full size/glow**
|
(`isFullBleed` passed from `Layout`). The bubble keeps its **full size/glow**
|
||||||
|
|
@ -906,6 +910,16 @@ session with **no other memory of this project**. So:
|
||||||
burger menu (`MOBILE_MENU_LISTED_HREFS`) now **appends catalog items that
|
burger menu (`MOBILE_MENU_LISTED_HREFS`) now **appends catalog items that
|
||||||
aren't hard-coded**, so Marketplace/Mints (and any future section) are always
|
aren't hard-coded**, so Marketplace/Mints (and any future section) are always
|
||||||
reachable on mobile — don't re-hardcode only a subset.
|
reachable on mobile — don't re-hardcode only a subset.
|
||||||
|
- **Transport / Driver Lab craft (2026-10-29):** kind `35016`
|
||||||
|
(`skatetransport`) is a data-driven `BECOME_ROLES.transport` craft over
|
||||||
|
`CraftProfileForm`. Vehicles (`car/taxi/van/moto/helicopter/plane/boat/other`),
|
||||||
|
services (`people/goods/gear/airport/venue/tours/logistics/other`),
|
||||||
|
capabilities, capacity and coverage are `t` tags; extras are `capacity`,
|
||||||
|
`cargo`, `coverage`, `availability`, `base`, `accessibility`. `LabPage` has a
|
||||||
|
Transport tab + filters, `CoachDetailPage` renders the shared trust/vouch/
|
||||||
|
review blocks and a prominent **self-attested** notice. No licence, insurance,
|
||||||
|
roadworthiness or operator permit is verified — never label it verified.
|
||||||
|
`useGrowthStats.totalTransport` / `/stats` and Supporters impact include it.
|
||||||
- **DIY resources (`/diy`, 2026-10-05):** a hub for making your own
|
- **DIY resources (`/diy`, 2026-10-05):** a hub for making your own
|
||||||
boards/ramps/concrete. Content is a seed list in **`src/lib/diyGuides.ts`**
|
boards/ramps/concrete. Content is a seed list in **`src/lib/diyGuides.ts`**
|
||||||
(`DIY_CATEGORIES` boards/ramps/concrete/repairs/tools + `DIY_CARDS` +
|
(`DIY_CATEGORIES` boards/ramps/concrete/repairs/tools + `DIY_CARDS` +
|
||||||
|
|
@ -1174,6 +1188,17 @@ session with **no other memory of this project**. So:
|
||||||
(`NIP19Page`): the app badge in the header, user badges in a "Badges" card.
|
(`NIP19Page`): the app badge in the header, user badges in a "Badges" card.
|
||||||
⚠️ `NostrMetadata` has no `badges` field, so it's read via a cast
|
⚠️ `NostrMetadata` has no `badges` field, so it's read via a cast
|
||||||
(`metadata as … & Record<string, unknown>`), like `sponsors`/`cordn` before it.
|
(`metadata as … & Record<string, unknown>`), like `sponsors`/`cordn` before it.
|
||||||
|
- **Sponsor-ready profile (2026-10-29):** `NIP19Page` now has Follow/Unfollow,
|
||||||
|
Followers/Following, **Events hosted** (`useUserEvents`), a six-cell stats
|
||||||
|
strip and a neutral **For sponsors & collabs** card (followers/events/spots/
|
||||||
|
zaps, prefilled collab DM, Rider Card link). The card only appears when the
|
||||||
|
profile has actual skate activity. NIP-05 has a loading/verifying state.
|
||||||
|
`useFollowing` invalidates follower counts on follow/unfollow. Sponsorship
|
||||||
|
is an **explicit opt-in** (`sponsorships_open` + optional
|
||||||
|
`sponsorships_note` in kind-0), never inferred from activity; the neutral card
|
||||||
|
is shown only when the profile has skate activity or opted in. `/supporters`
|
||||||
|
has a Bitcoin-grantmaker inquiry form that composes a private DM to the owner
|
||||||
|
(no storage) and a humorous KYC disclosure.
|
||||||
- **Report → action + a publish floor (2026-09-28):** the one-tap "not a skate
|
- **Report → action + a publish floor (2026-09-28):** the one-tap "not a skate
|
||||||
spot" report used to only land in the admin queue (invisible effect). It now
|
spot" report used to only land in the admin queue (invisible effect). It now
|
||||||
**shows on the spot page to everyone** ("Reported as not a skate spot by N —
|
**shows on the spot page to everyone** ("Reported as not a skate spot by N —
|
||||||
|
|
@ -1393,6 +1418,15 @@ session with **no other memory of this project**. So:
|
||||||
it in when known.
|
it in when known.
|
||||||
**Profile discovery (built 2026-09-29):** the carrier is the existing kind-0
|
**Profile discovery (built 2026-09-29):** the carrier is the existing kind-0
|
||||||
**`cordn`** field (app convention, documented in NIP.md — not a new kind).
|
**`cordn`** field (app convention, documented in NIP.md — not a new kind).
|
||||||
|
**Crew-owned coordinator kit (2026-10-31):** `deploy/cordn/` is the
|
||||||
|
production hand-off for crews: Docker Compose, SQLite volume, `.env` template,
|
||||||
|
backup/restore scripts and a runbook. Cordn connects **outbound** to ContextVM
|
||||||
|
relays; no inbound port, domain or TLS terminator is required for the
|
||||||
|
coordinator itself. The app still does **not** embed a coordinator. Settings →
|
||||||
|
Coordinator links to the kit; the crew's `coordinator` tag/operator remains
|
||||||
|
the adoption path. Keep the coordinator key separate from crew/admin keys.
|
||||||
|
Do not claim multi-coordinator failover; this is one trusted delivery service
|
||||||
|
with backups, not BFT.
|
||||||
`EditProfileForm` accepts a pointer (nprofile / cordn.net link / npub / hex /
|
`EditProfileForm` accepts a pointer (nprofile / cordn.net link / npub / hex /
|
||||||
http URL), **normalises a bare pointer to Cordn's canonical add-link** before
|
http URL), **normalises a bare pointer to Cordn's canonical add-link** before
|
||||||
saving (`coordinatorAddUrl`), and has **"Use my coordinator"**. `NIP19Page`
|
saving (`coordinatorAddUrl`), and has **"Use my coordinator"**. `NIP19Page`
|
||||||
|
|
@ -1613,11 +1647,13 @@ session with **no other memory of this project**. So:
|
||||||
**custom coordinator** are skipped (only the SkateSpots embedded coordinator is
|
**custom coordinator** are skipped (only the SkateSpots embedded coordinator is
|
||||||
queried); approved requests leave the coordinator but the bell card remains
|
queried); approved requests leave the coordinator but the bell card remains
|
||||||
until dismissed.
|
until dismissed.
|
||||||
- **Map site-links strip (2026-10-05):** the desktop footer is hidden on the map
|
- **Map site-links strip (2026-10-05; mobile bar 2026-10-29):** the desktop footer
|
||||||
(full-bleed), so `components/MapFooterStrip.tsx` surfaces the same links
|
is hidden on the map (full-bleed), so `components/MapFooterStrip.tsx` surfaces
|
||||||
(DIY/Newsletter/License/Privacy + "not sponsored by OpenSats") as an overlay
|
the same links (DIY/Newsletter/License/Privacy + "not sponsored by OpenSats")
|
||||||
inside the map container: a **slim full-width bar on desktop** and a **tiny
|
as an overlay inside the map container. Desktop is a slim full-width bar;
|
||||||
collapsed "Links" chip on mobile** (expands to a compact scrollable row).
|
mobile is now a **slim always-visible strip above the bottom nav** (the old
|
||||||
|
floating “Links” chip in the centre was removed — it collided visually with
|
||||||
|
the Events/Crews nav items and its popover looked broken).
|
||||||
**Always visible (2026-10-28):** the old dismissible `useMapFooterHidden`
|
**Always visible (2026-10-28):** the old dismissible `useMapFooterHidden`
|
||||||
behavior/setting was removed — it was easy to hide the only footer on the map
|
behavior/setting was removed — it was easy to hide the only footer on the map
|
||||||
forever and then report it missing. The map's OpenStreetMap attribution moved
|
forever and then report it missing. The map's OpenStreetMap attribution moved
|
||||||
|
|
@ -2199,9 +2235,9 @@ session with **no other memory of this project**. So:
|
||||||
- **Lazy routes**: every route uses `lazyWithRetry` (`src/lib/lazyWithRetry.ts`) —
|
- **Lazy routes**: every route uses `lazyWithRetry` (`src/lib/lazyWithRetry.ts`) —
|
||||||
retries, then one full reload per session, so a chunk-load failure self-heals
|
retries, then one full reload per session, so a chunk-load failure self-heals
|
||||||
instead of showing the error boundary.
|
instead of showing the error boundary.
|
||||||
- **Baselines** (verified 2026-09-27): `npm test` → **0 errors, 0 warnings**,
|
- **Baselines** (verified 2026-10-29): `npm test` → **0 errors, 0 warnings**,
|
||||||
**101 tests**, build ok. The gate also type-checks the CVM server
|
**156 tests**, build ok. The gate also type-checks the CVM server
|
||||||
(`tsc -p cvm-server/tsconfig.json`). `package.json` version **1.5.4**.
|
(`tsc -p cvm-server/tsconfig.json`). `package.json` version **1.7.70**.
|
||||||
- ✅ Lint is **clean**: `no-explicit-any` = 0 · `react-hooks/exhaustive-deps` = 0
|
- ✅ Lint is **clean**: `no-explicit-any` = 0 · `react-hooks/exhaustive-deps` = 0
|
||||||
· `no-unused-vars` = 0 · `react-refresh` = 0. Non-component exports were
|
· `no-unused-vars` = 0 · `react-refresh` = 0. Non-component exports were
|
||||||
**split into their own modules** (`contexts/language.ts`, `lib/sortOptions.ts`,
|
**split into their own modules** (`contexts/language.ts`, `lib/sortOptions.ts`,
|
||||||
|
|
@ -2388,6 +2424,95 @@ Rules:
|
||||||
- Any time the deploy output isn't verified by the smoke test, run
|
- Any time the deploy output isn't verified by the smoke test, run
|
||||||
`node scripts/smoke-test.mjs` manually before shipping.
|
`node scripts/smoke-test.mjs` manually before shipping.
|
||||||
|
|
||||||
|
### Trust, privacy and consistency invariants
|
||||||
|
- **No BFT / no relay quorum.** Nostr events are signed facts; relays are not
|
||||||
|
voters. Social feeds resolve conflicts locally, not by consensus.
|
||||||
|
- **Deterministic merge:** `src/lib/eventMerge.ts` is the single merge policy
|
||||||
|
(newest `created_at`, event-id tie-break, local tombstones). Do not add
|
||||||
|
"first relay wins" logic; relay arrival order must not change the result.
|
||||||
|
- **Trust boundaries are documented** in `docs/THREAT_MODEL.md`. Keep UI copy
|
||||||
|
honest: a confirmed trade means both parties signed; a payment proof means the
|
||||||
|
money leg was paid; escrow is time-locked, not arbitration.
|
||||||
|
- **No remote hotlinks for small brand assets:** OpenSats icons are local under
|
||||||
|
`public/images/` so rendering the footer does not leak the viewer's IP.
|
||||||
|
- **Android Auto Backup is off** (`android:allowBackup="false"` injected by
|
||||||
|
`scripts/inject-backup-policy.mjs`); identity/settings/escrow state stays on
|
||||||
|
the device and must be exported explicitly.
|
||||||
|
- **Image uploads re-encode decodable formats through canvas** to strip
|
||||||
|
EXIF/GPS before Blossom. GIF and HEIC/HEIF are passed through because they need
|
||||||
|
special handling; do not claim they are metadata-stripped.
|
||||||
|
- **No mandatory identity, deposit or global trust score.** Use warnings,
|
||||||
|
explicit consent and optional escrow at value boundaries.
|
||||||
|
|
||||||
|
### Distribution without GitHub
|
||||||
|
> **Owner decision (2026-10-30): no external identities.** Distribution must
|
||||||
|
> stay self-hosted and Nostr-based. Do **not** create or ask for GitLab,
|
||||||
|
> Codeberg, GitHub, email or F-Droid-main accounts. The local Forgejo admin
|
||||||
|
> account and the self-hosted F-Droid repo key are infrastructure credentials,
|
||||||
|
> not third-party identities. F-Droid main and IzzyOnDroid are therefore
|
||||||
|
> **out of scope**.
|
||||||
|
|
||||||
|
- **Self-hosted Forgejo:** `https://git.skate-spots.org/skatespots/SkateSpots`
|
||||||
|
(public source, registration disabled, admin credentials only on the relay
|
||||||
|
host). It runs on `185.18.221.2` behind Caddy; do not commit its credentials.
|
||||||
|
- **Latest release (Obtanium HTML source):**
|
||||||
|
`https://git.skate-spots.org/skatespots/SkateSpots/releases/latest`.
|
||||||
|
The page exposes one signed `.apk`; Obtanium may need **Override Source →
|
||||||
|
HTML** because the host is self-hosted, not Codeberg.
|
||||||
|
- **Static download page:** `public/download/index.html` → `https://skate-spots.org/download/`.
|
||||||
|
- **Forgejo release helper:** `scripts/publish-forgejo.sh` (uses `FORGEJO_TOKEN`
|
||||||
|
or `FORGEJO_PASSWORD`; `scripts/release.sh` calls it automatically when either
|
||||||
|
is set). It uploads the APK and checksum, but does not push git history.
|
||||||
|
- **Self-hosted F-Droid repo:** `https://fdroid.skate-spots.org/repo`
|
||||||
|
(`org.skatespots.app`; currently 1.7.70). It is a **third-party repo**, not
|
||||||
|
F-Droid main. Repo signing fingerprint:
|
||||||
|
`88:B1:71:1C:24:02:89:FB:B2:A7:FC:C1:B3:1F:BB:9D:60:F5:7F:19:18:E0:3D:62:2D:35:F2:3D:E1:84:46:75`.
|
||||||
|
The developer APK signature is unchanged; the repo key only signs indexes.
|
||||||
|
A backup of the repo keystore/config is in
|
||||||
|
`~/.config/skatespots/fdroid-repo/` (mode 600).
|
||||||
|
- **F-Droid main/IzzyOnDroid:** **out of scope by owner decision.** Both require
|
||||||
|
external GitLab/Codeberg identities and review; do not submit, create accounts,
|
||||||
|
or present them as live. The self-hosted F-Droid repo above is the supported
|
||||||
|
F-Droid-family channel.
|
||||||
|
- **No GitHub required.** Keep Zapstore, Forgejo, the self-hosted F-Droid repo,
|
||||||
|
and the static page in sync for each release.
|
||||||
|
|
||||||
|
### Future release / distribution checklist
|
||||||
|
1. Bump `package.json`; update the top of `release-notes.txt`; run
|
||||||
|
`scripts/release.sh patch --yes --deploy`.
|
||||||
|
2. Set `FORGEJO_TOKEN` (or `FORGEJO_PASSWORD`) to upload the APK/checksum to the
|
||||||
|
latest Forgejo release; the helper is `scripts/publish-forgejo.sh`.
|
||||||
|
3. **Push source/tags to Forgejo.** The local machine's DNS for
|
||||||
|
`git.skate-spots.org` is intermittent, so the reliable path is: create a git
|
||||||
|
bundle locally, `scp` it to the relay, clone there, and push to
|
||||||
|
`http://127.0.0.1:3000/skatespots/SkateSpots.git` with the host admin
|
||||||
|
credentials. Do not put the password in a committed remote URL.
|
||||||
|
4. Add the APK to `/home/ubuntu/fdroid/repo/`, update the F-Droid metadata
|
||||||
|
changelog, run `fdroid update` in `/home/ubuntu/fdroid`, then rsync `repo/`
|
||||||
|
to `/var/www/fdroid/repo/`.
|
||||||
|
5. Update `public/download/index.html` with the new version/checksum and deploy
|
||||||
|
the web page.
|
||||||
|
6. Verify: latest Forgejo release exposes one `.apk`; static page 200;
|
||||||
|
`https://fdroid.skate-spots.org/repo/index-v2.json` lists the new
|
||||||
|
`versionCode`; Obtanium still resolves the latest release.
|
||||||
|
7. Keep Forgejo/F-Droid credentials and the F-Droid repo keystore out of git.
|
||||||
|
Local backups: `~/.config/skatespots/forgejo-admin.txt` and
|
||||||
|
`~/.config/skatespots/fdroid-repo/` (mode 600).
|
||||||
|
|
||||||
|
### Nostr-only distribution (no external identities)
|
||||||
|
- **Zapstore** is the Nostr-native app store/update channel; keep publishing
|
||||||
|
release events there.
|
||||||
|
- **Obtanium** is URL-based, not an account: users add the latest Forgejo
|
||||||
|
release URL (HTML source if needed) or the self-hosted F-Droid repo.
|
||||||
|
- **F-Droid main and IzzyOnDroid do not support Nostr identities.** They are
|
||||||
|
intentionally not pursued. Do not create or request GitLab/Codeberg/email
|
||||||
|
accounts, and do not claim those stores are live.
|
||||||
|
- The local Forgejo admin account, the relay, and the F-Droid repo signing key
|
||||||
|
are self-hosted infrastructure, not third-party identities.
|
||||||
|
- The F-Droid recipe remains in `distribution/fdroiddata/` only as an unused
|
||||||
|
technical reference. It was locally test-built at `5ebf741`, but must not be
|
||||||
|
submitted.
|
||||||
|
|
||||||
### Deploy
|
### Deploy
|
||||||
- **Web (auto)**: a systemd user timer (`skatespots-deploy.timer`) runs `scripts/auto-deploy.sh` every ~3 min. When `origin/main` changes it builds and runs `netlify deploy --prod --dir=dist`. It deploys **only committed code** (skips if tracked files are modified) and never mutates a dirty tree. **Doc/scripts-only commits are skipped** (matches `AGENTS.md`/`*.md`/`scripts/`/`cvm-server/`/`skills/`) — Netlify bills **15 credits per production deploy**, so don't spend them on non-site changes. One-time setup: `netlify login` + `netlify link`. Logs: `journalctl --user -u skatespots-deploy`. Manual run: `scripts/auto-deploy.sh`.
|
- **Web (auto)**: a systemd user timer (`skatespots-deploy.timer`) runs `scripts/auto-deploy.sh` every ~3 min. When `origin/main` changes it builds and runs `netlify deploy --prod --dir=dist`. It deploys **only committed code** (skips if tracked files are modified) and never mutates a dirty tree. **Doc/scripts-only commits are skipped** (matches `AGENTS.md`/`*.md`/`scripts/`/`cvm-server/`/`skills/`) — Netlify bills **15 credits per production deploy**, so don't spend them on non-site changes. One-time setup: `netlify login` + `netlify link`. Logs: `journalctl --user -u skatespots-deploy`. Manual run: `scripts/auto-deploy.sh`.
|
||||||
- ⚠️ **Deploy throttle (2026-09-28):** production deploys are capped to one per **24h** by default (after a week of 68 deploys ≈ **1,020 credits** — a third of the monthly allowance). Batching a day's commits into one 15-credit deploy is the single biggest credit lever. Override with `SKATESPOTS_DEPLOY_MIN_INTERVAL=<seconds>` (`0` disables); deploy on demand with **`scripts/auto-deploy.sh --force`**. A throttled tick deliberately does **not** record the deployed SHA, so the pending change still deploys on a later tick; a **failed** deploy doesn't set the clock, so it retries immediately.
|
- ⚠️ **Deploy throttle (2026-09-28):** production deploys are capped to one per **24h** by default (after a week of 68 deploys ≈ **1,020 credits** — a third of the monthly allowance). Batching a day's commits into one 15-credit deploy is the single biggest credit lever. Override with `SKATESPOTS_DEPLOY_MIN_INTERVAL=<seconds>` (`0` disables); deploy on demand with **`scripts/auto-deploy.sh --force`**. A throttled tick deliberately does **not** record the deployed SHA, so the pending change still deploys on a later tick; a **failed** deploy doesn't set the clock, so it retries immediately.
|
||||||
|
|
@ -2619,6 +2744,196 @@ Rules:
|
||||||
Cordn outbox with bounded auto-retry. APK sha256 `d84b57de…`, versionCode
|
Cordn outbox with bounded auto-retry. APK sha256 `d84b57de…`, versionCode
|
||||||
10731. Web forced live (manual `netlify deploy`; the release-script deploy
|
10731. Web forced live (manual `netlify deploy`; the release-script deploy
|
||||||
hit a transient build failure).
|
hit a transient build failure).
|
||||||
|
- **1.7.32 (2026-10-29):** sponsor-ready profiles — Follow/Unfollow,
|
||||||
|
Followers/Following counts, Events hosted (`useUserEvents`), a balanced
|
||||||
|
six-cell stats strip, and a sponsor/collab card with audience stats,
|
||||||
|
prefilled collab DM and Rider Card link. NIP-05 shows a verifying state;
|
||||||
|
public stash images use the shared fallback. APK sha256 `31aced78…`,
|
||||||
|
versionCode 10732. Web forced live (manual `netlify deploy`; the
|
||||||
|
release-script deploy still hits the Netlify build failure).
|
||||||
|
- **1.7.33 (2026-10-29):** explicit profile **Open to sponsorships** opt-in
|
||||||
|
(`sponsorships_open` + `sponsorships_note` in kind-0; only shown when
|
||||||
|
opted in), plus a Bitcoin grantmaker inquiry form on `/supporters`.
|
||||||
|
The form opens a private DM to the owner and stores nothing; its funny
|
||||||
|
disclosure says KYC is for grantees, not for SkateSpots. Followers stat
|
||||||
|
now has a “relay-reported, not audited” info hint. APK sha256
|
||||||
|
`fd6ffb8b…`, versionCode 10733. Web forced live (manual
|
||||||
|
`netlify deploy`; the release-script deploy still hits the Netlify build
|
||||||
|
failure).
|
||||||
|
- **1.7.34 (2026-10-29):** follower stat layout fixed (2/3/6 responsive
|
||||||
|
columns; relay-reported caveat moved to a footnote instead of an edge
|
||||||
|
tooltip), and the Bitcoin grantmaker section gained explicit ethos and
|
||||||
|
privacy boundaries (no KYC of SkateSpots, no tracking/CRM, private
|
||||||
|
NIP-17 DM, open-source-only grants). APK sha256 `a23e8c3d…`, versionCode
|
||||||
|
10734. Web forced live at `d3d82f7`.
|
||||||
|
- **1.7.35 (2026-10-29):** replaced the floating mobile “Links” pill over
|
||||||
|
the bottom nav with a slim always-visible footer strip. APK sha256
|
||||||
|
`d3cfdc3d…`, versionCode 10735. Web forced live at `5d40a67`.
|
||||||
|
- **1.7.36 (2026-10-29):** new **Transport / Driver** Lab craft (kind
|
||||||
|
`35016`, self-tag `skatetransport`) — vehicles, services, capabilities,
|
||||||
|
capacity and coverage; `/lab?craft=transport` filters; a self-attested
|
||||||
|
notice (no licence/insurance/operator verification); WoT/vouches/reviews
|
||||||
|
inherited from the shared Lab detail; stats/impact counts. All 24 locales
|
||||||
|
100%. APK sha256 `53286e0f…`, versionCode 10736. Web forced live at
|
||||||
|
`b0f6dd9`.
|
||||||
|
- **1.7.37 (2026-10-29):** Cordn coordinator client tolerates empty tool
|
||||||
|
responses: reads `structuredContent` or JSON text, and falls back to
|
||||||
|
`{requests:[]}`/`{welcomes:[]}`/`{messages:[]}`/`{keyPackages:[]}` instead
|
||||||
|
of a Zod “expected object, received undefined” error. APK sha256
|
||||||
|
`6cacedc0…`, versionCode 10737. Web forced live at `b94ac3d`.
|
||||||
|
- **1.7.38 (2026-10-29):** audit pass — follower query limit 100→500;
|
||||||
|
Clothing Designers added to `/stats` + Supporters impact; Sasquatch FAB
|
||||||
|
hidden on `/become`, create/edit and `/supporters` forms; protobufjs
|
||||||
|
override 7.6.5 (only remaining production advisory is write-only xlsx).
|
||||||
|
APK sha256 `c5975f8b…`, versionCode 10738. Web forced live at `41f420a`.
|
||||||
|
- **1.7.39 (2026-10-30):** replaced write-only SheetJS `xlsx` with a small
|
||||||
|
local OOXML writer (`lib/xlsx.ts` + fflate); `npm audit --omit=dev` is now
|
||||||
|
**0 vulnerabilities**. Personal profiles have a **Lab services** strip
|
||||||
|
linking their Lab profiles. Added parser/XLSX tests (156 tests). APK
|
||||||
|
sha256 `1202aded…`, versionCode 10739. Web forced live at `6aba9b3`.
|
||||||
|
- **1.7.40 (2026-10-30):** native boot fix for the white/black reload loop —
|
||||||
|
`boot-guard.js` and `registerAppServiceWorker` clear stale
|
||||||
|
`skate-spots-shell-*` service workers/caches on the Capacitor
|
||||||
|
`https://localhost` origin before the bundle runs. APK sha256 `162488b5…`,
|
||||||
|
versionCode 10740. Web forced live at `44be542`.
|
||||||
|
- **1.7.41 (2026-10-30):** app-shell cache bumped to v3; `/boot-guard.js` is
|
||||||
|
never cached by the worker and web registration uses
|
||||||
|
`updateViaCache: 'none'`, so the cleanup cannot be trapped by an old
|
||||||
|
worker. APK sha256 `a32d56bb…`, versionCode 10741. Web forced live at
|
||||||
|
`c36bf2f`.
|
||||||
|
- **1.7.42 (2026-10-30):** black document background before CSS (no native
|
||||||
|
white flash) and a cache-busted boot-guard URL. APK sha256 `5baf7129…`,
|
||||||
|
versionCode 10742. Web forced live at `7dc8c2c`.
|
||||||
|
- **1.7.43 (2026-10-30):** boot-guard reload-loop breaker — three loads
|
||||||
|
within a minute clear the app-shell worker/cache and reload once into a
|
||||||
|
clean shell. APK sha256 `d25e28a4…`, versionCode 10743. Web forced live at
|
||||||
|
`1a88f86`.
|
||||||
|
- **1.7.44 (2026-10-30):** native service-worker cleanup fully
|
||||||
|
feature-checked/wrapped; it can no longer abort boot on Android WebViews
|
||||||
|
with a partial Service Worker API. APK sha256 `6193ab1b…`, versionCode
|
||||||
|
10744. Web forced live at `c66aeb5`.
|
||||||
|
- **1.7.45 (2026-10-30):** `MapPage` is eager instead of a lazy Suspense
|
||||||
|
boundary; slow/hung native chunk import could leave the black PageLoader
|
||||||
|
forever. APK sha256 `bd6a498b…`, versionCode 10745. Web forced live at
|
||||||
|
`afd5a09`.
|
||||||
|
- **1.7.46 (2026-10-30):** smoother open transition — logo starts near the
|
||||||
|
native splash centre and settles into the wordmark column; splash content
|
||||||
|
lifts/softens on exit while the app stays still. APK sha256 `89c07493…`,
|
||||||
|
versionCode 10746. Web forced live via manual `netlify deploy` at
|
||||||
|
`008fb81`.
|
||||||
|
- **1.7.47 (2026-10-30):** faster open (~0.7s typical, 0.9s cap); logo no
|
||||||
|
longer spins — it drops in once with a single spark burst — and the exit
|
||||||
|
is an aperture iris closing into the logo, with no dead black frame.
|
||||||
|
APK sha256 `d4b0dd74…`, versionCode 10747. Web forced live at `e22e2ec`.
|
||||||
|
- **1.7.48 (2026-10-30):** Amber decrypt loops now honour query
|
||||||
|
cancellation — leaving the DM inbox or closing the bell stops the next
|
||||||
|
Amber prompt instead of continuing through every remaining message.
|
||||||
|
The seal half of a DM decrypt is cached when a two-step decrypt is cut
|
||||||
|
short. APK sha256 `a74f21de…`, versionCode 10748. Web forced live at
|
||||||
|
`3d905af`.
|
||||||
|
- **1.7.49 (2026-10-30):** Cordn setup is single-flight, so a double-tap on
|
||||||
|
“Set up” cannot launch overlapping coordinator/Amber flows. Amber users
|
||||||
|
see the two real setup steps (device key → join request); each coordinator
|
||||||
|
request is a separate approval. APK sha256 `9dee0c4d…`, versionCode 10749.
|
||||||
|
Web forced live at `7958ca5`.
|
||||||
|
- **1.7.50 (2026-10-30):** performance/navigation/Amber polish. Web entry
|
||||||
|
shrank from ~863 KB to ~648 KB gzip: the map is web-lazy (native remains
|
||||||
|
eager via a Capacitor Vite alias), the Cashu/Zap dialog is loaded on first
|
||||||
|
tap, and primary routes prefetch on hover/touch. Page-level Suspense keeps
|
||||||
|
the header/bottom nav mounted with a delayed skeleton instead of a
|
||||||
|
full-screen black loader; the burger closes on route changes. Native Amber
|
||||||
|
calls are serialized/coalesced and decrypt results are memory-cached.
|
||||||
|
APK sha256 `d338c158…`, versionCode 10750. Web live at `65a7f0b`.
|
||||||
|
Production dependency audit: 0 vulnerabilities.
|
||||||
|
- **1.7.51 (2026-10-30):** profile/payment polish. The profile tip card no
|
||||||
|
longer renders empty when neither method exists; Lightning addresses accept
|
||||||
|
a pasted `lightning:` prefix and the profile row is tap-to-copy; CLINK codes
|
||||||
|
are canonicalised on save in profile/shop/crew/Lab forms; marketplace
|
||||||
|
listing detail surfaces a seller CLINK tip when their profile has one.
|
||||||
|
CLINK remains a wallet handoff, not an in-app rail. APK sha256 `ac433d91…`,
|
||||||
|
versionCode 10751. Web live at `c65e6ef`.
|
||||||
|
- **1.7.52 (2026-10-30):** compact tabbed `/supporters` page (Support /
|
||||||
|
Supporters / Community / Grants). The three funding rails are now a
|
||||||
|
one-at-a-time selector; impact, pay-for cards, partners/friends and the
|
||||||
|
grantmaker form keep all content with tighter mobile spacing. `/support`
|
||||||
|
redirects to `/supporters`. APK sha256 `acd581a2…`, versionCode 10752.
|
||||||
|
Web live at `69a8649`.
|
||||||
|
- **1.7.53 (2026-10-30):** Cordn/Staircase reliability. Newlay coordinator
|
||||||
|
budget raised (300/min, burst 120, concurrency 64), client polling now
|
||||||
|
backs off with jitter and polls hidden tabs half as often; relay health
|
||||||
|
alerts cover Cordn 429s/announce/TLS; Settings shows per-relay health pills;
|
||||||
|
Crew coordinator card adds a Staircase/Cordn QR. APK sha256 `f124669c…`,
|
||||||
|
versionCode 10753. Web live at `95ff486`.
|
||||||
|
- **1.7.54 (2026-10-30):** image-only Blossom quotas. Newlay per-object cap
|
||||||
|
10 MiB, signed per-npub quota proxy (50/250 MiB daily, admins 3×, per-IP
|
||||||
|
hourly backstop, 20 GB relay cap), app-side image/type/size guard and clear
|
||||||
|
errors; uploads use only our Blossom (mirrors are read-only fallbacks).
|
||||||
|
APK sha256 `f554d934…`, versionCode 10754. Web live at `465683c`.
|
||||||
|
- **1.7.55 (2026-10-30):** private read-only `/ops` status page for the two
|
||||||
|
relay admins, NIP-98-signed status endpoint fed by the host health timer;
|
||||||
|
admin link in Settings → Advanced. Added HSTS to relay/blossom and CAA
|
||||||
|
records limiting their certificates to Let’s Encrypt. APK sha256
|
||||||
|
`1142c425…`, versionCode 10755. Web live at `52a8447`.
|
||||||
|
- **1.7.56 (2026-10-30):** mobile nav simplified to five intents — Spots,
|
||||||
|
The Lab, Events, Crews, More. Profile/login stays in the header avatar;
|
||||||
|
Mints and all secondary sections moved to More. Customizer edits three
|
||||||
|
middle slots; desktop default primary tabs use Community instead of Mints.
|
||||||
|
APK sha256 `ec15b80d…`, versionCode 10756. Web live at `cdf4a63`.
|
||||||
|
- **1.7.57 (2026-10-30):** mobile header avatar opens the user’s public
|
||||||
|
profile; the adjacent chevron opens the account menu. Removed the
|
||||||
|
redundant “IN” label so the header fits at 390px. APK sha256 `846efb24…`,
|
||||||
|
versionCode 10757. Web live at `5026b63`.
|
||||||
|
- **1.7.58 (2026-10-30):** the top-left SkateSpots brand lockup opens the
|
||||||
|
signed-in user’s profile on mobile and desktop; signed out it still opens
|
||||||
|
the map. Bottom Spots / desktop Map remains the home shortcut. APK sha256
|
||||||
|
`0d7bdad7…`, versionCode 10758. Web live at `74bd140`.
|
||||||
|
- **1.7.59 (2026-10-30):** owner/admin Delete in spot/shop card menus; mobile
|
||||||
|
Back arrow on every non-map screen (history fallback to map); avatar account
|
||||||
|
menu trimmed to status/profile/settings/accounts/logout; brand wordmark
|
||||||
|
hidden on sub-pages for narrow-header fit. APK sha256 `0fd4a149…`,
|
||||||
|
versionCode 10759. Web live at `0355c10`.
|
||||||
|
- **1.7.60 (2026-10-30):** Cordn header shows last successful check; sellers
|
||||||
|
see payment-readiness in Create Listing + offers; uploads resize photos to
|
||||||
|
1600px WebP when smaller (GIF/undecodable formats untouched), cutting
|
||||||
|
quota/storage/upload time. APK sha256 `8f11c229…`, versionCode 10760.
|
||||||
|
Web live at `6c9b6fa`.
|
||||||
|
- **1.7.61 (2026-10-30):** Cordn setup timeline now checks prepared device
|
||||||
|
/sent request and spins on the approval step while waiting. APK sha256
|
||||||
|
`db0279f7…`, versionCode 10761. Web live at `50c95d0`.
|
||||||
|
- **1.7.62 (2026-10-31):** 404 uses an in-app link; profile badge URLs are
|
||||||
|
sanitized; marketplace readiness only counts a usable lud16; duplicate
|
||||||
|
Korean picker entry hidden; beta source link points self-hosted. APK
|
||||||
|
sha256 `e746b18e…`, versionCode 10762. Web live at `c08d5d4`.
|
||||||
|
- **1.7.63 (2026-10-31):** deterministic event merge with event-id tie-break
|
||||||
|
and local deletion tombstones; EXIF/GPS stripping for decodable uploads;
|
||||||
|
Android Auto Backup disabled; local OpenSats icon; threat-model document.
|
||||||
|
APK sha256 `70e1dd1a…`, versionCode 10763. Web live at `3edef9c`.
|
||||||
|
- **1.7.64 (2026-10-31):** low-friction new-seller safety note beside trade
|
||||||
|
actions, using existing marketplace guidance; no new gate. APK sha256
|
||||||
|
`32d5cd35…`, versionCode 10764. Web live at `a44665f`.
|
||||||
|
- **1.7.65 (2026-10-31):** Settings relay-consistency diagnostic (profiles,
|
||||||
|
on demand, no merge); recent 90-day confirmed-trade count beside lifetime
|
||||||
|
reputation. APK sha256 `73684085…`, versionCode 10765. Web live at
|
||||||
|
`a813e1e`.
|
||||||
|
- **1.7.66 (2026-10-31):** high-value safety copy (no arbitration, escrow),
|
||||||
|
180-day half-life reputation weighting, and the unit-tested 2-of-3 escrow
|
||||||
|
policy primitive (not exposed in UI pending arbiter policy). APK sha256
|
||||||
|
`0ed775ed…`, versionCode 10766. Web live at `cc0545c`.
|
||||||
|
- **1.7.67 (2026-10-31):** crew-owned Cordn coordinator deployment kit
|
||||||
|
(`deploy/cordn/`: Compose, SQLite volume, env template, backup/restore,
|
||||||
|
runbook); persistent Docker command and links from Settings/Crew edit.
|
||||||
|
No embedded coordinator, no BFT claim. APK sha256 `ac7c9589…`, versionCode
|
||||||
|
10767. Web live at `c8f471b`.
|
||||||
|
- **1.7.68 (2026-10-31):** real ContextVM RPC coordinator health probe with
|
||||||
|
throwaway key, and optional crew coordinator operator field. APK sha256
|
||||||
|
`d8222789…`, versionCode 10768. Web live at `0fe82c2`.
|
||||||
|
- **1.7.69 (2026-10-31):** desktop status control is a compact status
|
||||||
|
emoji/label chip (no large outlined pill or permanent ping). APK sha256
|
||||||
|
`45add6a3…`, versionCode 10769. Web live at `226d0c3`.
|
||||||
|
- **1.7.70 (2026-10-31):** Amber inbox decrypt gate (explicit Unlock card),
|
||||||
|
10-minute expiry for redirect pending ops, and no plaintext/crypto results
|
||||||
|
left in browser storage. APK sha256 `be521c16…`, versionCode 10770. Web
|
||||||
|
live at `0859327`.
|
||||||
|
|
||||||
### Relay archive (dataset backup)
|
### Relay archive (dataset backup)
|
||||||
- **Transfer content between keys (`scripts/transfer-content.mjs`, 2026-10-04):**
|
- **Transfer content between keys (`scripts/transfer-content.mjs`, 2026-10-04):**
|
||||||
|
|
@ -2679,6 +2994,11 @@ Rules:
|
||||||
and enables them. Logs: `journalctl --user -u skatespots-archive`.
|
and enables them. Logs: `journalctl --user -u skatespots-archive`.
|
||||||
- Commits touching only `scripts/`, `*.md`, `cvm-server/`, `skills/`, `.agents/`
|
- Commits touching only `scripts/`, `*.md`, `cvm-server/`, `skills/`, `.agents/`
|
||||||
are **skipped by the deploy timer** → no Netlify credits spent.
|
are **skipped by the deploy timer** → no Netlify credits spent.
|
||||||
|
- **XLSX writer without SheetJS (2026-10-30):** the only SheetJS use was the
|
||||||
|
deck-cost **export** (write-only). It is now `src/lib/xlsx.ts` using `fflate`
|
||||||
|
to emit a minimal OOXML workbook (inline strings, multi-sheet, safe names).
|
||||||
|
`xlsx` was removed; production `npm audit --omit=dev` is **0**. Keep the
|
||||||
|
writer write-only; never parse untrusted XLSX with it.
|
||||||
- **Dependency updates + vulnerability scan (2026-10-12):** `scripts/update-deps.sh`
|
- **Dependency updates + vulnerability scan (2026-10-12):** `scripts/update-deps.sh`
|
||||||
runs `npm outdated` + `npm audit` (dated report in `~/.local/state/skatespots-deps/`),
|
runs `npm outdated` + `npm audit` (dated report in `~/.local/state/skatespots-deps/`),
|
||||||
applies **non-breaking** updates only (`npm update` + `npm audit fix`, never
|
applies **non-breaking** updates only (`npm update` + `npm audit fix`, never
|
||||||
|
|
@ -2922,6 +3242,11 @@ The community relay moved off the hosted relay.tools instance
|
||||||
cosmetic; unauthenticated reads work. Config backup:
|
cosmetic; unauthenticated reads work. Config backup:
|
||||||
`~/newlay/deploy/docker/newlay.toml.bak-*`; restart with
|
`~/newlay/deploy/docker/newlay.toml.bak-*`; restart with
|
||||||
`sudo docker compose up -d --force-recreate` from `~/newlay`.
|
`sudo docker compose up -d --force-recreate` from `~/newlay`.
|
||||||
|
**2026-10-30:** after 3,767 `cordn rate limit` rejects in 24h (`msg_fetch_many`,
|
||||||
|
mostly the two admin pubkeys), raised `[cordn] rate_per_min` 120→300,
|
||||||
|
`rate_burst` 30→120 and `max_concurrent_requests` 32→64. Config backup
|
||||||
|
`newlay.toml.bak-cordn-20261030-102947`; restarted and verified coordinator
|
||||||
|
announce + NIP-11 200. Recheck the reject count before/after a Staircase soak.
|
||||||
⚠️ **Content can silently miss the canonical relay:** the app publishes to
|
⚠️ **Content can silently miss the canonical relay:** the app publishes to
|
||||||
`getWriteRelays()` and resolves on the **first** relay that accepts, so a
|
`getWriteRelays()` and resolves on the **first** relay that accepts, so a
|
||||||
rate-limited community-relay write can leave a spot only on ditto/damus (this
|
rate-limited community-relay write can leave a spot only on ditto/damus (this
|
||||||
|
|
@ -2950,7 +3275,9 @@ The community relay moved off the hosted relay.tools instance
|
||||||
dies, and posts to **ntfy.sh** when the problem set changes (deduped; also a
|
dies, and posts to **ntfy.sh** when the problem set changes (deduped; also a
|
||||||
"recovered" message). The topic is in `/home/ubuntu/skatespots-health.env`
|
"recovered" message). The topic is in `/home/ubuntu/skatespots-health.env`
|
||||||
(mode 600, not tracked) — subscribe to it in the ntfy app. Units tracked at
|
(mode 600, not tracked) — subscribe to it in the ntfy app. Units tracked at
|
||||||
`scripts/systemd/skatespots-health.{service,timer}`.
|
`scripts/systemd/skatespots-health.{service,timer}`. **2026-10-30:** the host
|
||||||
|
script also alerts on ≥40 Cordn rate-limit rejects/15m, a missing coordinator
|
||||||
|
announce/20m, and TLS expiry <14d; deployed to `/home/ubuntu/skatespots-health.sh`.
|
||||||
- **Media / Blossom (2026-10-12):** the relay also serves Newlay's Blossom at
|
- **Media / Blossom (2026-10-12):** the relay also serves Newlay's Blossom at
|
||||||
**`blossom.skate-spots.org`** (a Caddy site block → the same `127.0.0.1:7777`;
|
**`blossom.skate-spots.org`** (a Caddy site block → the same `127.0.0.1:7777`;
|
||||||
blobs stored at `/var/lib/newlay/data/blobs`, INSIDE the data volume so they
|
blobs stored at `/var/lib/newlay/data/blobs`, INSIDE the data volume so they
|
||||||
|
|
@ -2961,6 +3288,24 @@ The community relay moved off the hosted relay.tools instance
|
||||||
(`lib/imageFallback.ts`) includes it so reads fall back across all three.
|
(`lib/imageFallback.ts`) includes it so reads fall back across all three.
|
||||||
Verified end-to-end (signed PUT /upload → 201, GET /<sha> → 200). To fully
|
Verified end-to-end (signed PUT /upload → 201, GET /<sha> → 200). To fully
|
||||||
self-host media later, drop the two public hosts from both lists.
|
self-host media later, drop the two public hosts from both lists.
|
||||||
|
**2026-10-30 — image-only quota proxy:** `[blossom] max_size_bytes` lowered
|
||||||
|
to **10 MiB**. Caddy routes only `PUT /upload` through
|
||||||
|
`skatespots-quota.service` (`scripts/quota-proxy.mjs`, `127.0.0.1:8790`);
|
||||||
|
reads and all other Blossom routes still go straight to Newlay. The proxy
|
||||||
|
verifies the BUD-11 token, enforces image types and per-npub daily budgets
|
||||||
|
(50 uploads/250 MiB; admins 3×), a per-IP hourly backstop (100/500 MiB), and a
|
||||||
|
20 GB relay-wide cap. State is `/home/ubuntu/skatespots-quota/usage.json`;
|
||||||
|
the service is enabled, and the host health check checks its `/health`, the
|
||||||
|
service, and >18 GiB media. App uploads now use **only** our Blossom; public
|
||||||
|
mirrors are read-side fallbacks only, so a quota rejection cannot silently
|
||||||
|
land on a third party. No video upload support was added.
|
||||||
|
**2026-10-30 — transport/ops hardening:** HSTS is set on `relay.` and
|
||||||
|
`blossom.` (`max-age=31536000; includeSubDomains`); CAA records restrict
|
||||||
|
issuance for those two hosts to `letsencrypt.org`. The health timer writes an
|
||||||
|
aggregate `/home/ubuntu/skatespots-quota/status.json`; the quota proxy serves
|
||||||
|
it at `https://relay.skate-spots.org/ops` only for a NIP-98-signed request
|
||||||
|
from one of the two admin pubkeys. `/ops` is a read-only app page linked from
|
||||||
|
Settings → Advanced (AdminReviewCard). No restart/config actions are exposed.
|
||||||
- **Cordn coordinator (2026-10-12):** the relay also runs Newlay's **embedded Cordn
|
- **Cordn coordinator (2026-10-12):** the relay also runs Newlay's **embedded Cordn
|
||||||
coordinator** for crew MLS chat (`[cordn] enabled`, `mode = "embedded"`,
|
coordinator** for crew MLS chat (`[cordn] enabled`, `mode = "embedded"`,
|
||||||
`data_dir = /var/lib/newlay/data/cordn` inside the volume, `relay_url =
|
`data_dir = /var/lib/newlay/data/cordn` inside the volume, `relay_url =
|
||||||
|
|
|
||||||
19
ESCROW.md
19
ESCROW.md
|
|
@ -77,11 +77,26 @@ token in a public event is spendable by anyone who sees it.
|
||||||
promptly, and lock windows should be generous.
|
promptly, and lock windows should be generous.
|
||||||
- **Native only**: the app's Cashu wallet is Capacitor-only, so escrow is too.
|
- **Native only**: the app's Cashu wallet is Capacitor-only, so escrow is too.
|
||||||
|
|
||||||
|
## Optional 2-of-3 primitive
|
||||||
|
|
||||||
|
`escrowP2PKOptions` now accepts an optional `arbiterPubkey` and can express the
|
||||||
|
NUT-11 policy used by a future 2-of-3 escrow:
|
||||||
|
|
||||||
|
- normal path: seller + arbiter, `n_sigs=2`;
|
||||||
|
- refund path: buyer + arbiter, `n_sigs_refund=2`;
|
||||||
|
- no arbiter: the current 1-of-1 seller/buyer policy.
|
||||||
|
|
||||||
|
The primitive is unit-tested, but **no UI or default flow uses it yet**. There is
|
||||||
|
no arbiter policy, bond, dispute process or appeal path, so exposing it would add
|
||||||
|
friction and false confidence. Do not enable it for real money until those are
|
||||||
|
defined and the flow is verified on-device.
|
||||||
|
|
||||||
## Status
|
## Status
|
||||||
|
|
||||||
- ✅ **Core** (`src/lib/cashuEscrow.ts`, unit-tested): pubkey normalisation,
|
- ✅ **Core** (`src/lib/cashuEscrow.ts`, unit-tested): pubkey normalisation,
|
||||||
`escrowP2PKOptions`, offline token inspection/`parseEscrowToken`,
|
`escrowP2PKOptions` (1-of-1, optional 2-of-3), offline token
|
||||||
locktime/refund policy, and the injectable `createEscrowToken` mint flow.
|
inspection/`parseEscrowToken`, locktime/refund policy, and the injectable
|
||||||
|
`createEscrowToken` mint flow.
|
||||||
- 🟡 **Wallet UI** (native-only): implement → verify with the **On-device test
|
- 🟡 **Wallet UI** (native-only): implement → verify with the **On-device test
|
||||||
checklist** below before treating as production. Do not use real money until
|
checklist** below before treating as production. Do not use real money until
|
||||||
every box passes.
|
every box passes.
|
||||||
|
|
|
||||||
38
NIP.md
38
NIP.md
|
|
@ -14,6 +14,8 @@ other clients, and preserved on edit:
|
||||||
| `noffer` | string | CLINK Offer code (`noffer1…`) — self-custodial Bitcoin tip code. |
|
| `noffer` | string | CLINK Offer code (`noffer1…`) — self-custodial Bitcoin tip code. |
|
||||||
| `bitcoin_silent_payment` | string | Bitcoin Silent Payment address (BIP-352, `sp1…`) — a reusable, private on-chain address. |
|
| `bitcoin_silent_payment` | string | Bitcoin Silent Payment address (BIP-352, `sp1…`) — a reusable, private on-chain address. |
|
||||||
| `sponsors` | string | Freeform highlight of the skater's sponsors / supporters (brands, shops, people). |
|
| `sponsors` | string | Freeform highlight of the skater's sponsors / supporters (brands, shops, people). |
|
||||||
|
| `sponsorships_open` | boolean | Explicit opt-in: the skater is open to sponsorship/collab conversations. Absence means **not** opted in; never infer this from activity. |
|
||||||
|
| `sponsorships_note` | string | Optional short note shown on the sponsor/collab card when `sponsorships_open` is true. |
|
||||||
| `cordn` | string | The **Cordn coordinator** others use to reach you — private, end-to-end encrypted messaging. Holds a coordinator **pointer**: either an `nprofile` (coordinator pubkey + relay hints), Cordn's canonical `https://cordn.net/chat/coordinators?c=<nprofile>` add-link, or an `http(s)` endpoint URL. This is the discovery field: clients SHOULD offer a one-tap **add** when it parses as a pointer, and otherwise open it as a plain link. See *Private Crew Chat (Cordn / MLS)*. |
|
| `cordn` | string | The **Cordn coordinator** others use to reach you — private, end-to-end encrypted messaging. Holds a coordinator **pointer**: either an `nprofile` (coordinator pubkey + relay hints), Cordn's canonical `https://cordn.net/chat/coordinators?c=<nprofile>` add-link, or an `http(s)` endpoint URL. This is the discovery field: clients SHOULD offer a one-tap **add** when it parses as a pointer, and otherwise open it as a plain link. See *Private Crew Chat (Cordn / MLS)*. |
|
||||||
| `cashu_escrow` | string | Cashu escrow pubkey (33-byte compressed secp256k1 hex, `02…`) used as the P2PK lock target for marketplace escrow. Derived from the Cashu wallet keyring. See `ESCROW.md`. |
|
| `cashu_escrow` | string | Cashu escrow pubkey (33-byte compressed secp256k1 hex, `02…`) used as the P2PK lock target for marketplace escrow. Derived from the Cashu wallet keyring. See `ESCROW.md`. |
|
||||||
| `cashu_mint` | string | Preferred Cashu mint URL for marketplace escrow (`https://…`). Buyers are nudged to lock funds at this mint, since a mint the seller already uses is one they can redeem from. Optional; see `ESCROW.md`. |
|
| `cashu_mint` | string | Preferred Cashu mint URL for marketplace escrow (`https://…`). Buyers are nudged to lock funds at this mint, since a mint the seller already uses is one they can redeem from. Optional; see `ESCROW.md`. |
|
||||||
|
|
@ -29,6 +31,8 @@ Example:
|
||||||
"lud16": "sk8rboi@getalby.com",
|
"lud16": "sk8rboi@getalby.com",
|
||||||
"bitcoin_silent_payment": "sp1qq...long...",
|
"bitcoin_silent_payment": "sp1qq...long...",
|
||||||
"sponsors": "Independent Trucks, Local Skate Co.",
|
"sponsors": "Independent Trucks, Local Skate Co.",
|
||||||
|
"sponsorships_open": true,
|
||||||
|
"sponsorships_note": "Open to deck, shoe, travel and event partners.",
|
||||||
"cordn": "https://cordn.net/u/abc123",
|
"cordn": "https://cordn.net/u/abc123",
|
||||||
"noffer": "noffer1..."
|
"noffer": "noffer1..."
|
||||||
}
|
}
|
||||||
|
|
@ -1844,6 +1848,7 @@ They share a common base schema and are distinguished by kind and a self-tag.
|
||||||
| 35013 | Event Organizer / Host | `skateorganizer` |
|
| 35013 | Event Organizer / Host | `skateorganizer` |
|
||||||
| 35014 | Barber / Hairstylist | `skatebarber` |
|
| 35014 | Barber / Hairstylist | `skatebarber` |
|
||||||
| 35015 | Clothing Designer | `skateclothing` |
|
| 35015 | Clothing Designer | `skateclothing` |
|
||||||
|
| 35016 | Transport / Driver | `skatetransport` |
|
||||||
|
|
||||||
> Kind `35006` is **not** a Lab provider — it is the Skate Crew (see below).
|
> Kind `35006` is **not** a Lab provider — it is the Skate Crew (see below).
|
||||||
|
|
||||||
|
|
@ -1888,7 +1893,7 @@ below), `p` (collective member pubkeys — see Collective Membership below),
|
||||||
|
|
||||||
#### Shared enrichment (all Lab crafts)
|
#### Shared enrichment (all Lab crafts)
|
||||||
|
|
||||||
Every Lab provider kind (35001–35014) may also carry the same craft-agnostic
|
Every Lab provider kind (35001–35016) may also carry the same craft-agnostic
|
||||||
enrichment tags — how they work, how to pay them, and their media. They are
|
enrichment tags — how they work, how to pay them, and their media. They are
|
||||||
repeatable, **not relay-indexed** (clients filter them client-side), and parsed
|
repeatable, **not relay-indexed** (clients filter them client-side), and parsed
|
||||||
by **`src/lib/labExtras.ts`** (`parseLabExtras`), which the shared profile detail
|
by **`src/lib/labExtras.ts`** (`parseLabExtras`), which the shared profile detail
|
||||||
|
|
@ -2417,12 +2422,39 @@ Barber-specific optional tags:
|
||||||
A shop or collective can be a `collective` with member `p` tags, and may link to
|
A shop or collective can be a `collective` with member `p` tags, and may link to
|
||||||
its skate crew via an `a` tag (`35006:pubkey:d`).
|
its skate crew via an `a` tag (`35006:pubkey:d`).
|
||||||
|
|
||||||
|
### Transport / Driver (kind 35016)
|
||||||
|
|
||||||
|
Skaters who can move people, gear or cargo — cars, taxis, vans, motorcycles,
|
||||||
|
helicopters, planes and boats. **Self-attested:** the app does not verify
|
||||||
|
licences or insurance; trust comes from WoT, vouches, reviews and reports.
|
||||||
|
Uses the common base schema.
|
||||||
|
|
||||||
|
Categories encoded as `t` tags:
|
||||||
|
|
||||||
|
- **Vehicles**: `car`, `taxi`, `van`, `moto`, `helicopter`, `plane`, `boat`, `other`
|
||||||
|
- **Services**: `people`, `goods`, `gear`, `airport`, `venue`, `tours`, `logistics`, `other`
|
||||||
|
- **Capabilities**: `cargo`, `bike_board`, `wheelchair`, `pets`, `border`, `night`, `covered`, `group`
|
||||||
|
|
||||||
|
Transport-specific optional tags:
|
||||||
|
|
||||||
|
| Tag | Description |
|
||||||
|
|-----|-------------|
|
||||||
|
| `capacity` | Passenger / board capacity note. |
|
||||||
|
| `cargo` | Cargo space / weight / volume note. |
|
||||||
|
| `coverage` | Routes, regions or cross-border coverage. |
|
||||||
|
| `availability` | Freeform availability. |
|
||||||
|
| `base` | Base area / airport. |
|
||||||
|
| `accessibility` | Ramp, wheelchair space, assistance, etc. |
|
||||||
|
|
||||||
|
A transport company can be a `collective` with member `p` tags, and may link to
|
||||||
|
its skate crew via an `a` tag (`35006:pubkey:d`).
|
||||||
|
|
||||||
### Querying Lab Profiles
|
### Querying Lab Profiles
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"kinds": [35001, 35002, 35003, 35004, 35005, 35007, 35008, 35009, 35010, 35011, 35012, 35013, 35014],
|
"kinds": [35001, 35002, 35003, 35004, 35005, 35007, 35008, 35009, 35010, 35011, 35012, 35013, 35014, 35015, 35016],
|
||||||
"#t": ["skatecoach", "skatefilmer", "skateeditor", "skatephotographer", "skatebuilder", "skateartist", "skategraffiti", "skatetattoo", "skatetrainer", "skatemusician", "skatejudge", "skateorganizer", "skatebarber"],
|
"#t": ["skatecoach", "skatefilmer", "skateeditor", "skatephotographer", "skatebuilder", "skateartist", "skategraffiti", "skatetattoo", "skatetrainer", "skatemusician", "skatejudge", "skateorganizer", "skatebarber", "skateclothing", "skatetransport"],
|
||||||
"limit": 100
|
"limit": 100
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
|
||||||
19
deploy/cordn/.env.example
Normal file
19
deploy/cordn/.env.example
Normal file
|
|
@ -0,0 +1,19 @@
|
||||||
|
# Copy this file to .env, then generate a key:
|
||||||
|
# openssl rand -hex 32
|
||||||
|
# Keep .env mode 600 and back it up with the coordinator data.
|
||||||
|
CORDN_SERVER_PRIVATE_KEY=
|
||||||
|
|
||||||
|
# ContextVM relays the coordinator connects to. Add a second one if you want
|
||||||
|
# more reachability; the coordinator does not need an inbound port.
|
||||||
|
CORDN_RELAY_URLS=wss://relay.contextvm.org,wss://relay2.contextvm.org
|
||||||
|
|
||||||
|
# Publicly announce the coordinator on its relays.
|
||||||
|
CORDN_ANNOUNCED=true
|
||||||
|
CORDN_SERVER_NAME=my-crew-coordinator
|
||||||
|
|
||||||
|
# Per-identity abuse protection. Raise for larger crews; keep it bounded.
|
||||||
|
CORDN_RATE_LIMIT_ENABLED=true
|
||||||
|
CORDN_RATE_LIMIT_REFILL_PER_MINUTE=250
|
||||||
|
CORDN_RATE_LIMIT_BURST=80
|
||||||
|
CORDN_MAX_KEY_PACKAGES_PER_IDENTITY=50
|
||||||
|
CORDN_MAX_LAST_RESORT_KEY_PACKAGES_PER_IDENTITY=1
|
||||||
127
deploy/cordn/README.md
Normal file
127
deploy/cordn/README.md
Normal file
|
|
@ -0,0 +1,127 @@
|
||||||
|
# Crew-owned Cordn coordinator
|
||||||
|
|
||||||
|
This kit runs a **Cordn MLS delivery-service coordinator** that a crew owns. It
|
||||||
|
is transport only: the coordinator sees ciphertext and routing metadata (who,
|
||||||
|
when, which group), never message plaintext. It can withhold or delay messages;
|
||||||
|
it cannot forge members' messages.
|
||||||
|
|
||||||
|
This is a **server** kit. SkateSpots remains a Cordn *client*; it does not embed a
|
||||||
|
coordinator in the APK.
|
||||||
|
|
||||||
|
## What you need
|
||||||
|
|
||||||
|
- A small Linux server or always-on home machine with Docker + Compose.
|
||||||
|
- Outbound HTTPS/WSS access. **No inbound port is required** — the coordinator
|
||||||
|
connects out to its ContextVM relay(s).
|
||||||
|
- A domain is **not** required for the coordinator itself.
|
||||||
|
- A crew willing to trust the operator with availability and metadata.
|
||||||
|
|
||||||
|
## 1. Install
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cp .env.example .env
|
||||||
|
chmod 600 .env
|
||||||
|
openssl rand -hex 32
|
||||||
|
```
|
||||||
|
|
||||||
|
Put the generated value into `CORDN_SERVER_PRIVATE_KEY`. Set
|
||||||
|
`CORDN_RELAY_URLS` to the relay(s) you want; the default is ContextVM’s public
|
||||||
|
relay. Set a useful `CORDN_SERVER_NAME`.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker compose up -d
|
||||||
|
docker compose logs -f cordn
|
||||||
|
```
|
||||||
|
|
||||||
|
The server prints its coordinator public identity/add link. It may show an
|
||||||
|
`nprofile` or a `cordn.net/chat/coordinators?c=…` link.
|
||||||
|
|
||||||
|
If your build does not print an add link, derive the public key from the private
|
||||||
|
key using the Cordn CLI or `nostr-tools`, then encode an `nprofile` with the same
|
||||||
|
relay hints. Keep the private key on the server.
|
||||||
|
|
||||||
|
## 2. Adopt it in SkateSpots
|
||||||
|
|
||||||
|
Either:
|
||||||
|
|
||||||
|
- Settings → **Coordinator** → paste the `nprofile`/add-link → **Add**; or
|
||||||
|
- Crew edit → **Coordinator** → paste it and save; or
|
||||||
|
- scan the coordinator QR.
|
||||||
|
|
||||||
|
Use exactly the relay hints from the server. A mismatch produces an honest
|
||||||
|
“Not seen” health state even when the server is actually running.
|
||||||
|
|
||||||
|
The coordinator should show **Online** (or “Stale” if its heartbeat is old).
|
||||||
|
“Offline” means presence was not found, not necessarily that the service is
|
||||||
|
broken.
|
||||||
|
|
||||||
|
## 3. What the crew should know
|
||||||
|
|
||||||
|
- The coordinator can **censor or drop messages**.
|
||||||
|
- It cannot **read** MLS plaintext.
|
||||||
|
- It can see **who, when and which group**.
|
||||||
|
- It can disappear; local messages remain on members' devices, but delivery
|
||||||
|
pauses until the coordinator returns or the crew switches.
|
||||||
|
- The operator should **not** also become a crew admin automatically.
|
||||||
|
- A loss of the database is a loss of delivery history; back it up.
|
||||||
|
|
||||||
|
## 4. Backup
|
||||||
|
|
||||||
|
```bash
|
||||||
|
./backup.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
Backups land in `./backups/` as a compressed copy of the coordinator volume.
|
||||||
|
Store them off the server, encrypted.
|
||||||
|
|
||||||
|
## 5. Restore
|
||||||
|
|
||||||
|
Stop the coordinator, restore the archive into the `cordn-data` volume, start it
|
||||||
|
again:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker compose stop cordn
|
||||||
|
./restore.sh backups/cordn-YYYYMMDD-HHMMSS.tgz
|
||||||
|
docker compose start cordn
|
||||||
|
```
|
||||||
|
|
||||||
|
## 6. Upgrade
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker compose pull
|
||||||
|
docker compose up -d
|
||||||
|
```
|
||||||
|
|
||||||
|
The image is pinned only by the `latest` tag. If you need reproducible upgrades,
|
||||||
|
pin a digest and record it in your crew runbook.
|
||||||
|
|
||||||
|
## 7. Move to a new coordinator
|
||||||
|
|
||||||
|
MLS delivery state is tied to the coordinator’s database and identity. Before
|
||||||
|
switching:
|
||||||
|
|
||||||
|
1. back up the current coordinator;
|
||||||
|
2. export/retain the crew’s local chat state on members’ devices;
|
||||||
|
3. start the new coordinator;
|
||||||
|
4. paste its `nprofile` into the crew record;
|
||||||
|
5. have members reopen the private chat and re-establish delivery;
|
||||||
|
6. update the crew operator/notice.
|
||||||
|
|
||||||
|
Do not claim the switch is seamless unless the old and new coordinator state
|
||||||
|
have actually been migrated.
|
||||||
|
|
||||||
|
## Security notes
|
||||||
|
|
||||||
|
- Never commit `.env`; it contains the coordinator signing key.
|
||||||
|
- The coordinator key is **not** a crew admin key and must not be reused as one.
|
||||||
|
- Run it behind a trusted host/network; outbound relay traffic is metadata.
|
||||||
|
- Keep Docker and the image current.
|
||||||
|
- Do not expose an OpenCode or coordinator admin port publicly.
|
||||||
|
- This is **not** a BFT or multi-coordinator system. One coordinator is a
|
||||||
|
delivery service under the crew's social trust.
|
||||||
|
|
||||||
|
## Files
|
||||||
|
|
||||||
|
- `docker-compose.yml` — persistent SQLite deployment.
|
||||||
|
- `.env.example` — required environment.
|
||||||
|
- `backup.sh` / `restore.sh` — volume snapshots.
|
||||||
14
deploy/cordn/backup.sh
Executable file
14
deploy/cordn/backup.sh
Executable file
|
|
@ -0,0 +1,14 @@
|
||||||
|
#!/bin/sh
|
||||||
|
# Snapshot the Cordn coordinator data volume. Run from this directory.
|
||||||
|
set -eu
|
||||||
|
cd "$(dirname "$0")"
|
||||||
|
mkdir -p backups
|
||||||
|
stamp="$(date +%Y%m%d-%H%M%S)"
|
||||||
|
out="cordn-$stamp.tgz"
|
||||||
|
docker run --rm \
|
||||||
|
-v cordn_cordn-data:/data:ro \
|
||||||
|
-v "$PWD/backups":/backup \
|
||||||
|
alpine:3.20 \
|
||||||
|
sh -c "tar czf /backup/$out -C /data ."
|
||||||
|
echo "Backup: $PWD/backups/$out"
|
||||||
|
echo "Store it off this server and keep it encrypted."
|
||||||
19
deploy/cordn/docker-compose.yml
Normal file
19
deploy/cordn/docker-compose.yml
Normal file
|
|
@ -0,0 +1,19 @@
|
||||||
|
name: cordn
|
||||||
|
|
||||||
|
services:
|
||||||
|
cordn:
|
||||||
|
image: ghcr.io/cordn-msg/cordn:latest
|
||||||
|
container_name: cordn
|
||||||
|
restart: unless-stopped
|
||||||
|
env_file:
|
||||||
|
- .env
|
||||||
|
environment:
|
||||||
|
CORDN_STORAGE_BACKEND: sqlite
|
||||||
|
CORDN_SQLITE_PATH: /data/cordn.sqlite
|
||||||
|
volumes:
|
||||||
|
- cordn-data:/data
|
||||||
|
# No inbound port is required: the coordinator connects *out* to the
|
||||||
|
# ContextVM relay(s) configured in CORDN_RELAY_URLS.
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
cordn-data:
|
||||||
17
deploy/cordn/restore.sh
Executable file
17
deploy/cordn/restore.sh
Executable file
|
|
@ -0,0 +1,17 @@
|
||||||
|
#!/bin/sh
|
||||||
|
# Restore a Cordn coordinator backup into the cordn-data volume.
|
||||||
|
# Usage: ./restore.sh backups/cordn-YYYYMMDD-HHMMSS.tgz
|
||||||
|
set -eu
|
||||||
|
cd "$(dirname "$0")"
|
||||||
|
[ "$#" -eq 1 ] || { echo "usage: $0 backups/cordn-YYYYMMDD-HHMMSS.tgz" >&2; exit 1; }
|
||||||
|
archive="$1"
|
||||||
|
[ -f "$archive" ] || { echo "no such backup: $archive" >&2; exit 1; }
|
||||||
|
printf 'This replaces the current coordinator volume. Type "restore" to continue: '
|
||||||
|
read -r answer
|
||||||
|
[ "$answer" = restore ] || { echo "aborted" >&2; exit 1; }
|
||||||
|
docker run --rm \
|
||||||
|
-v cordn_cordn-data:/data \
|
||||||
|
-v "$(cd "$(dirname "$archive")" && pwd)":/backup:ro \
|
||||||
|
alpine:3.20 \
|
||||||
|
sh -c "rm -rf /data/* /data/.[!.]* /data/..?* 2>/dev/null || true; tar xzf /backup/$(basename "$archive") -C /data"
|
||||||
|
echo "Restored $(basename "$archive")."
|
||||||
97
distribution/README.md
Normal file
97
distribution/README.md
Normal file
|
|
@ -0,0 +1,97 @@
|
||||||
|
# Distribution without GitHub
|
||||||
|
|
||||||
|
SkateSpots is published from a self-hosted **Forgejo** instance. No GitHub
|
||||||
|
account is required.
|
||||||
|
|
||||||
|
## Current release source
|
||||||
|
|
||||||
|
- Forge: <https://git.skate-spots.org/skatespots/SkateSpots>
|
||||||
|
- Latest release: <https://git.skate-spots.org/skatespots/SkateSpots/releases/latest>
|
||||||
|
- Signed APK (1.7.70):
|
||||||
|
<https://git.skate-spots.org/skatespots/SkateSpots/releases/download/v1.7.70/SkateSpots-1.7.70.apk>
|
||||||
|
- SHA-256:
|
||||||
|
`be521c167814a78dc68b98bc7ac5e3c73a096f9f690fcac20ecf294bcf875767`
|
||||||
|
|
||||||
|
The APK is signed with the same key as the Zapstore build. Installing an
|
||||||
|
F-Droid-signed build over it would require uninstalling SkateSpots and losing
|
||||||
|
the local key/settings. Obtanium and direct APK updates keep the install.
|
||||||
|
|
||||||
|
## Obtanium
|
||||||
|
|
||||||
|
Obtanium cannot use a Zapstore URL as a source. Use the self-hosted Forgejo
|
||||||
|
release page instead:
|
||||||
|
|
||||||
|
1. Open Obtanium → **Add App**.
|
||||||
|
2. Paste:
|
||||||
|
`https://git.skate-spots.org/skatespots/SkateSpots/releases/latest`
|
||||||
|
3. If Obtanium does not recognise the self-hosted host, select **Override
|
||||||
|
Source → HTML**.
|
||||||
|
4. Set version extraction if desired:
|
||||||
|
`SkateSpots-([0-9.]+)\.apk`, match group `1`.
|
||||||
|
|
||||||
|
The release page contains exactly one `.apk`, so Obtanium can follow the latest
|
||||||
|
release without a custom store listing.
|
||||||
|
|
||||||
|
## F-Droid family
|
||||||
|
|
||||||
|
### Self-hosted F-Droid repo (live now)
|
||||||
|
|
||||||
|
A signed third-party F-Droid repository is published here:
|
||||||
|
|
||||||
|
- Repo: <https://fdroid.skate-spots.org/repo>
|
||||||
|
- App ID: `org.skatespots.app`
|
||||||
|
- Repo signing fingerprint:
|
||||||
|
`88:B1:71:1C:24:02:89:FB:B2:A7:FC:C1:B3:1F:BB:9D:60:F5:7F:19:18:E0:3D:62:2D:35:F2:3D:E1:84:46:75`
|
||||||
|
|
||||||
|
Users can add this URL in F-Droid, or add it in Obtanium as an **F-Droid Third
|
||||||
|
Party Repo**. This is not F-Droid main: it is a self-hosted, signed repository
|
||||||
|
of the developer-signed APK. It keeps the existing install and signing key.
|
||||||
|
|
||||||
|
The repository metadata and APK are served from the relay host. The repo index
|
||||||
|
is signed with a repository key stored on that host; the APK itself keeps the
|
||||||
|
SkateSpots developer signature.
|
||||||
|
|
||||||
|
### No external store identities
|
||||||
|
|
||||||
|
**Owner decision:** distribution stays self-hosted and Nostr-based. No GitLab,
|
||||||
|
Codeberg, GitHub, email or F-Droid-main accounts are created or requested.
|
||||||
|
|
||||||
|
F-Droid main and IzzyOnDroid both require external identities and review, so
|
||||||
|
they are intentionally out of scope. The self-hosted repo above is the supported
|
||||||
|
F-Droid-family channel.
|
||||||
|
|
||||||
|
`distribution/fdroiddata/` and `fastlane/` are kept as an unused technical
|
||||||
|
reference only. A fresh local clone at `5ebf741` built the unsigned APK through
|
||||||
|
the recipe's `npm ci → android:init → android:sync → assembleRelease` path, but
|
||||||
|
the recipe must not be submitted.
|
||||||
|
|
||||||
|
## Release checklist
|
||||||
|
|
||||||
|
1. `npm test`
|
||||||
|
2. `scripts/release.sh patch --yes --deploy` (Zapstore + web)
|
||||||
|
3. Push the release tag and `main` to Forgejo.
|
||||||
|
4. Upload the APK through the helper:
|
||||||
|
`FORGEJO_TOKEN=... scripts/publish-forgejo.sh <version>`
|
||||||
|
(or set `FORGEJO_TOKEN` before `release.sh`; the APK upload is then automatic)
|
||||||
|
5. Copy the signed APK into the F-Droid repo on the relay host, add a
|
||||||
|
`metadata/org.skatespots.app.yml` changelog entry, run `fdroid update`, and
|
||||||
|
sync `repo/` to `/var/www/fdroid/repo/`:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /home/ubuntu/fdroid
|
||||||
|
cp /path/to/SkateSpots-<version>.apk repo/
|
||||||
|
. /home/ubuntu/fdroid-venv/bin/activate
|
||||||
|
fdroid update
|
||||||
|
sudo rsync -a --delete repo/ /var/www/fdroid/repo/
|
||||||
|
sudo chown -R caddy:caddy /var/www/fdroid
|
||||||
|
```
|
||||||
|
|
||||||
|
6. Verify the public latest-release page contains the new `.apk`, and that
|
||||||
|
`https://fdroid.skate-spots.org/repo/index-v2.json` lists the new
|
||||||
|
`versionCode`.
|
||||||
|
7. Update the static download page if the displayed version/checksum changes:
|
||||||
|
`public/download/index.html`.
|
||||||
|
|
||||||
|
The Forgejo instance runs on the same host as the relay. It exposes public
|
||||||
|
read access and HTTPS through Caddy; registration is disabled and administrative
|
||||||
|
credentials are kept on the host, not in this repository.
|
||||||
51
distribution/fdroiddata/org.skatespots.app.yml
Normal file
51
distribution/fdroiddata/org.skatespots.app.yml
Normal file
|
|
@ -0,0 +1,51 @@
|
||||||
|
Categories:
|
||||||
|
- Sports & Health
|
||||||
|
License: AGPL-3.0-only
|
||||||
|
AuthorName: SkateSpots
|
||||||
|
WebSite: https://skate-spots.org
|
||||||
|
SourceCode: https://git.skate-spots.org/skatespots/SkateSpots
|
||||||
|
IssueTracker: https://git.skate-spots.org/skatespots/SkateSpots/issues
|
||||||
|
Changelog: https://git.skate-spots.org/skatespots/SkateSpots/releases
|
||||||
|
|
||||||
|
AutoName: SkateSpots
|
||||||
|
Summary: Local-first skate map, crews, events and marketplace
|
||||||
|
Description: |-
|
||||||
|
SkateSpots is a local-first skating map for finding spots, crews, events and
|
||||||
|
gear. Your keys stay on your device, your messages stay in encrypted crew
|
||||||
|
chats and the app does not use analytics or sell your data.
|
||||||
|
|
||||||
|
Find skate spots on the map, add new ones, organise sessions with your crew,
|
||||||
|
follow events and browse the community marketplace. The Android app bundles
|
||||||
|
the same web app for fast shell startup and native camera, location, push and
|
||||||
|
NFC support where available.
|
||||||
|
|
||||||
|
SkateSpots is self-hosted and built on open protocols. You can run your own
|
||||||
|
relay and Blossom storage instead of relying on a central service.
|
||||||
|
|
||||||
|
RepoType: git
|
||||||
|
Repo: https://git.skate-spots.org/skatespots/SkateSpots.git
|
||||||
|
|
||||||
|
Builds:
|
||||||
|
- versionName: 1.7.61
|
||||||
|
versionCode: 10761
|
||||||
|
commit: 5ebf741427303be0b0feeff5ce1d8420e2c0ddea
|
||||||
|
subdir: .
|
||||||
|
prebuild:
|
||||||
|
- npm ci
|
||||||
|
- npm run android:init
|
||||||
|
- npm run android:sync
|
||||||
|
# F-Droid signs the APK itself. Remove the developer signing config so
|
||||||
|
# Gradle emits an unsigned release APK instead of requiring the keystore.
|
||||||
|
- sed -i '/signingConfig signingConfigs.release/d' android/app/build.gradle
|
||||||
|
build:
|
||||||
|
- cd android && ./gradlew assembleRelease --no-daemon
|
||||||
|
output: android/app/build/outputs/apk/release/app-release-unsigned.apk
|
||||||
|
# The generated Android project is intentionally not committed. This
|
||||||
|
# recipe recreates it with Capacitor before Gradle runs. F-Droid will sign
|
||||||
|
# the resulting APK with its own key. The F-Droid buildserver supplies the
|
||||||
|
# JDK/Android SDK; do not install packages with sudo in a recipe.
|
||||||
|
|
||||||
|
AutoUpdateMode: Version
|
||||||
|
UpdateCheckMode: Tags
|
||||||
|
CurrentVersion: 1.7.61
|
||||||
|
CurrentVersionCode: 10761
|
||||||
104
docs/THREAT_MODEL.md
Normal file
104
docs/THREAT_MODEL.md
Normal file
|
|
@ -0,0 +1,104 @@
|
||||||
|
# SkateSpots threat model
|
||||||
|
|
||||||
|
This is the short, technical version of what SkateSpots can and cannot guarantee.
|
||||||
|
It exists so product copy, support answers and future code do not accidentally
|
||||||
|
promise consensus, arbitration or delivery verification that the system does not
|
||||||
|
have.
|
||||||
|
|
||||||
|
## The model in one sentence
|
||||||
|
|
||||||
|
**SkateSpots verifies signed facts, keeps a local view, and uses social/economic
|
||||||
|
signals at value boundaries. It does not run a consensus protocol.**
|
||||||
|
|
||||||
|
Nostr relays are not voters. A relay can withhold, censor, reorder or serve a
|
||||||
|
stale event, but it cannot forge a valid signature. Different clients can
|
||||||
|
therefore see different snapshots of the network without either side being
|
||||||
|
"wrong" in a Byzantine-consensus sense.
|
||||||
|
|
||||||
|
## Assets
|
||||||
|
|
||||||
|
- Nostr identity keys and local signer access.
|
||||||
|
- Local cache, drafts, pending posts and local deletion tombstones.
|
||||||
|
- Crew membership and Cordn group membership.
|
||||||
|
- Marketplace listings, offers, trade attestations and reputation.
|
||||||
|
- Cashu proofs and escrow tokens.
|
||||||
|
- Device storage and any local backup/export.
|
||||||
|
|
||||||
|
## Actors and trust boundaries
|
||||||
|
|
||||||
|
| Actor | Can do | Cannot do |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| Author | Sign events with their key | Forge another author's signature |
|
||||||
|
| Relay | Withhold, censor, reorder, serve stale or conflicting signed events | Forge a valid event; guarantee availability |
|
||||||
|
| Cordn coordinator | Route opaque group ciphertext; drop or delay messages | Read plaintext; forge an author proof |
|
||||||
|
| Cashu mint | Issue/redeem proofs, enforce locktime, freeze or become insolvent | Spend a correctly locked P2PK proof without a valid witness |
|
||||||
|
| Founder/admin | Modify the crew record, moderate crew content | Forge members' signatures; guarantee global agreement |
|
||||||
|
| Buyer/seller | Publish attestations and payment/receipt claims | Make a false claim true by signing it |
|
||||||
|
| WebView / host | Run the client | Be assumed trustworthy after device compromise |
|
||||||
|
|
||||||
|
## Guarantees
|
||||||
|
|
||||||
|
- **Authenticity:** a valid Schnorr signature proves which key signed an event,
|
||||||
|
not that the content is true.
|
||||||
|
- **Availability:** the client can use cached data and multiple relays; there is
|
||||||
|
no guarantee that every relay has every event.
|
||||||
|
- **Local determinism:** when two valid versions of an addressable or replaceable
|
||||||
|
event exist, the client chooses the newest `created_at`, with an event-id
|
||||||
|
tie-breaker. This is deterministic, not globally agreed.
|
||||||
|
- **Deletion:** NIP-09 is a request. Local tombstones prevent a deleted item from
|
||||||
|
flashing back on that device; relays may ignore the request.
|
||||||
|
- **Payments:** a Lightning preimage proves the invoice was paid. It does not
|
||||||
|
prove goods were delivered.
|
||||||
|
- **Escrow:** a time-locked Cashu P2PK token protects the buyer after the lock
|
||||||
|
expires and lets the seller redeem on delivery. It is not arbitration and does
|
||||||
|
not prove delivery.
|
||||||
|
- **Reputation:** reciprocal signed attestations, distinct partners and
|
||||||
|
web-of-trust weighting are evidence. Two colluding accounts can still create a
|
||||||
|
fake trade; the app must not present that as proof of goods.
|
||||||
|
|
||||||
|
## Non-guarantees
|
||||||
|
|
||||||
|
- No global ordering or consensus over relays.
|
||||||
|
- No protection from a compromised identity key, signer or device.
|
||||||
|
- No guaranteed delivery or carrier verification.
|
||||||
|
- No neutral dispute resolution.
|
||||||
|
- No guarantee that every relay honours deletion or moderation.
|
||||||
|
- No guarantee that a mint remains solvent, online or P2PK-compatible.
|
||||||
|
- No anonymity guarantee: public events, relays, image hosts and map/weather
|
||||||
|
providers may observe network metadata.
|
||||||
|
- No guarantee that a Cordn coordinator cannot censor a group. It cannot read or
|
||||||
|
forge messages, but it can drop them.
|
||||||
|
|
||||||
|
## Cordn specifically
|
||||||
|
|
||||||
|
The current Cordn group scheme is NIP-44 group delivery with a signed author
|
||||||
|
proof inside the ciphertext. It is not full MLS yet: it does not provide MLS
|
||||||
|
forward secrecy or post-compromise security. A coordinator cannot read the
|
||||||
|
message or impersonate the author, but it can refuse to relay it.
|
||||||
|
|
||||||
|
## Marketplace safety rules
|
||||||
|
|
||||||
|
- Prefer escrowed or in-person deals for high-value trades.
|
||||||
|
- Never send a plain, unlocked Cashu token in a public event.
|
||||||
|
- Treat "confirmed trade" as "both parties signed", not "goods verified".
|
||||||
|
- Treat "payment verified" as "the money leg is verified".
|
||||||
|
- A new account with no distinct confirmed partners is a warning, not a ban.
|
||||||
|
- Cash, barter and off-platform settlement have no on-chain proof; use
|
||||||
|
reputation and judgement.
|
||||||
|
|
||||||
|
## Privacy boundaries
|
||||||
|
|
||||||
|
- Public Nostr events are public forever in practice; deletion is best-effort.
|
||||||
|
- DMs and Cordn ciphertext are encrypted, but metadata (who, when, which group)
|
||||||
|
may be visible to relays/coordinators depending on the feature.
|
||||||
|
- Images are public once uploaded; strip metadata before upload and do not put
|
||||||
|
addresses in public listing images.
|
||||||
|
- Self-hosted infrastructure avoids third-party analytics, but network observers
|
||||||
|
can still see traffic to relays, image hosts, map tiles and weather services.
|
||||||
|
|
||||||
|
## What would change this model
|
||||||
|
|
||||||
|
A real consensus or arbitration layer would need a separate design with explicit
|
||||||
|
participants, quorum, liveness, slashing/appeals and privacy trade-offs. It
|
||||||
|
should not be smuggled in as "trust" copy or a global score. Until then:
|
||||||
|
**signed facts, local merge, explicit boundaries, no fake guarantees.**
|
||||||
1
fastlane/metadata/android/en-US/changelogs/10761.txt
Normal file
1
fastlane/metadata/android/en-US/changelogs/10761.txt
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
Cordn setup now shows visible progress: the device-key step is checked once prepared, and the approval step shows a spinner while waiting. The APK uses the same signing key as the Zapstore release.
|
||||||
1
fastlane/metadata/android/en-US/changelogs/10762.txt
Normal file
1
fastlane/metadata/android/en-US/changelogs/10762.txt
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
Small correctness pass: 404 navigation stays in-app, profile badge URLs are sanitized, marketplace readiness only counts a usable Lightning address, and the duplicate Korean picker entry is hidden.
|
||||||
1
fastlane/metadata/android/en-US/changelogs/10763.txt
Normal file
1
fastlane/metadata/android/en-US/changelogs/10763.txt
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
Deterministic relay merging with a stable event-id tie-break and local deletion tombstones; EXIF/GPS stripping on upload; Android cloud backup disabled; local OpenSats icon; added the trust-model document.
|
||||||
1
fastlane/metadata/android/en-US/changelogs/10764.txt
Normal file
1
fastlane/metadata/android/en-US/changelogs/10764.txt
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
Listings from a new seller with no confirmed trading partner now show a compact safety note beside the trade actions: meet in public, prefer escrow for shipped deals, and never pay outside the app's rails.
|
||||||
1
fastlane/metadata/android/en-US/changelogs/10765.txt
Normal file
1
fastlane/metadata/android/en-US/changelogs/10765.txt
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
Settings now has an on-demand relay consistency check for profile snapshots; it reports differences without merging data. Trade reputation also shows how many mutually-confirmed trades happened in the last 90 days, alongside lifetime counts.
|
||||||
1
fastlane/metadata/android/en-US/changelogs/10766.txt
Normal file
1
fastlane/metadata/android/en-US/changelogs/10766.txt
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
High-value listings now show the safety note including the no-arbitration reminder; reputation uses a 180-day half-life and recent 90-day count; the 2-of-3 escrow policy primitive is unit-tested but not exposed until an arbiter policy exists.
|
||||||
1
fastlane/metadata/android/en-US/changelogs/10767.txt
Normal file
1
fastlane/metadata/android/en-US/changelogs/10767.txt
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
Added a production crew-owned Cordn coordinator kit: Docker Compose with SQLite persistence, an env template, backup/restore scripts, and a runbook. The coordinator needs only outbound relay access; Settings and crew edit link to the kit. The app still does not embed a coordinator.
|
||||||
1
fastlane/metadata/android/en-US/changelogs/10769.txt
Normal file
1
fastlane/metadata/android/en-US/changelogs/10769.txt
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
The desktop header status control is now a compact chip showing your current status emoji and label, or a neutral Status affordance when none is set. No permanent ping or large outlined pill.
|
||||||
1
fastlane/metadata/android/en-US/changelogs/10770.txt
Normal file
1
fastlane/metadata/android/en-US/changelogs/10770.txt
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
Amber users now unlock encrypted conversations explicitly instead of triggering a decrypt storm on Messages. Amber redirect requests expire after 10 minutes, and plaintext/crypto results are no longer persisted in browser storage.
|
||||||
15
fastlane/metadata/android/en-US/full_description.txt
Normal file
15
fastlane/metadata/android/en-US/full_description.txt
Normal file
|
|
@ -0,0 +1,15 @@
|
||||||
|
SkateSpots is a local-first skating map for finding spots, crews, events and
|
||||||
|
gear. Your keys stay on your device, your messages stay in encrypted crew chats
|
||||||
|
and the app does not use analytics or sell your data.
|
||||||
|
|
||||||
|
Find skate spots on the map, add new ones, organise sessions with your crew,
|
||||||
|
follow events and browse the community marketplace. The Android app bundles the
|
||||||
|
same web app for fast offline shell startup and native camera, location, push
|
||||||
|
and NFC support where available.
|
||||||
|
|
||||||
|
SkateSpots is self-hosted and built on open protocols. You can run your own
|
||||||
|
relay and Blossom storage instead of relying on a central service.
|
||||||
|
|
||||||
|
Lightning payments are optional and self-custodial. Transport and driver
|
||||||
|
profiles are self-attested; SkateSpots does not verify a licence, insurance or
|
||||||
|
vehicle roadworthiness.
|
||||||
BIN
fastlane/metadata/android/en-US/images/icon.png
Normal file
BIN
fastlane/metadata/android/en-US/images/icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 26 KiB |
1
fastlane/metadata/android/en-US/short_description.txt
Normal file
1
fastlane/metadata/android/en-US/short_description.txt
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
Local-first skate map, crews, events and marketplace.
|
||||||
1
fastlane/metadata/android/en-US/title.txt
Normal file
1
fastlane/metadata/android/en-US/title.txt
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
SkateSpots
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en" style="background:#050505">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
|
||||||
|
|
@ -80,14 +80,14 @@
|
||||||
<link rel="preconnect" href="https://relay.skate-spots.org" crossorigin>
|
<link rel="preconnect" href="https://relay.skate-spots.org" crossorigin>
|
||||||
<link rel="preconnect" href="https://blossom.skate-spots.org" crossorigin>
|
<link rel="preconnect" href="https://blossom.skate-spots.org" crossorigin>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body style="background:#050505">
|
||||||
<div id="root"></div>
|
<div id="root"></div>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
BOOT CRASH GUARD (native-safe) — external so the web build can ship a
|
BOOT CRASH GUARD (native-safe) — external so the web build can ship a
|
||||||
strict CSP (script-src 'self') with no 'unsafe-inline'. See boot-guard.js.
|
strict CSP (script-src 'self') with no 'unsafe-inline'. See boot-guard.js.
|
||||||
-->
|
-->
|
||||||
<script src="/boot-guard.js"></script>
|
<script src="/boot-guard.js?v=20261030"></script>
|
||||||
|
|
||||||
<script type="module" src="/src/main.tsx"></script>
|
<script type="module" src="/src/main.tsx"></script>
|
||||||
</body>
|
</body>
|
||||||
|
|
|
||||||
122
package-lock.json
generated
122
package-lock.json
generated
|
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
"name": "skate-spots",
|
"name": "skate-spots",
|
||||||
"version": "1.7.32",
|
"version": "1.7.70",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "skate-spots",
|
"name": "skate-spots",
|
||||||
"version": "1.7.32",
|
"version": "1.7.70",
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@bitcoinerlab/secp256k1": "^1.2.0",
|
"@bitcoinerlab/secp256k1": "^1.2.0",
|
||||||
|
|
@ -89,6 +89,7 @@
|
||||||
"dotenv": "^17.4.2",
|
"dotenv": "^17.4.2",
|
||||||
"ecpair": "^3.0.0",
|
"ecpair": "^3.0.0",
|
||||||
"embla-carousel-react": "^8.3.0",
|
"embla-carousel-react": "^8.3.0",
|
||||||
|
"fflate": "^0.8.3",
|
||||||
"hls.js": "^1.6.15",
|
"hls.js": "^1.6.15",
|
||||||
"html2canvas": "^1.4.1",
|
"html2canvas": "^1.4.1",
|
||||||
"html5-qrcode": "^2.3.8",
|
"html5-qrcode": "^2.3.8",
|
||||||
|
|
@ -120,7 +121,6 @@
|
||||||
"tinyld": "^1.3.4",
|
"tinyld": "^1.3.4",
|
||||||
"vaul": "^0.9.3",
|
"vaul": "^0.9.3",
|
||||||
"websocket-ts": "^2.2.1",
|
"websocket-ts": "^2.2.1",
|
||||||
"xlsx": "^0.18.5",
|
|
||||||
"zod": "^4.6.7"
|
"zod": "^4.6.7"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|
@ -2946,12 +2946,6 @@
|
||||||
"integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==",
|
"integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==",
|
||||||
"license": "BSD-3-Clause"
|
"license": "BSD-3-Clause"
|
||||||
},
|
},
|
||||||
"node_modules/@protobufjs/inquire": {
|
|
||||||
"version": "1.1.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.2.tgz",
|
|
||||||
"integrity": "sha512-pa0vFRuws4wkvaXKK1uXZMAwAX4/t8ANaJo45iw/oQHNQ9q5xUzwgFmVJGXiga2BeN+zpX7Vf9vmsiIa2J+MUw==",
|
|
||||||
"license": "BSD-3-Clause"
|
|
||||||
},
|
|
||||||
"node_modules/@protobufjs/path": {
|
"node_modules/@protobufjs/path": {
|
||||||
"version": "1.1.2",
|
"version": "1.1.2",
|
||||||
"resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
|
||||||
|
|
@ -6012,15 +6006,6 @@
|
||||||
"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
|
"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/adler-32": {
|
|
||||||
"version": "1.3.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz",
|
|
||||||
"integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==",
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=0.8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/agent-base": {
|
"node_modules/agent-base": {
|
||||||
"version": "7.1.4",
|
"version": "7.1.4",
|
||||||
"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
|
"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
|
||||||
|
|
@ -7054,19 +7039,6 @@
|
||||||
"@capacitor/core": ">=8.0.0"
|
"@capacitor/core": ">=8.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/cfb": {
|
|
||||||
"version": "1.2.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/cfb/-/cfb-1.2.2.tgz",
|
|
||||||
"integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==",
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"dependencies": {
|
|
||||||
"adler-32": "~1.3.0",
|
|
||||||
"crc-32": "~1.2.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=0.8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/chai": {
|
"node_modules/chai": {
|
||||||
"version": "6.3.0",
|
"version": "6.3.0",
|
||||||
"resolved": "https://registry.npmjs.org/chai/-/chai-6.3.0.tgz",
|
"resolved": "https://registry.npmjs.org/chai/-/chai-6.3.0.tgz",
|
||||||
|
|
@ -7213,15 +7185,6 @@
|
||||||
"typescript": "^5"
|
"typescript": "^5"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/codepage": {
|
|
||||||
"version": "1.15.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/codepage/-/codepage-1.15.0.tgz",
|
|
||||||
"integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==",
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=0.8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/color-convert": {
|
"node_modules/color-convert": {
|
||||||
"version": "2.0.1",
|
"version": "2.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
|
||||||
|
|
@ -7335,18 +7298,6 @@
|
||||||
"url": "https://opencollective.com/express"
|
"url": "https://opencollective.com/express"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/crc-32": {
|
|
||||||
"version": "1.2.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
|
|
||||||
"integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"bin": {
|
|
||||||
"crc32": "bin/crc32.njs"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=0.8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/cross-spawn": {
|
"node_modules/cross-spawn": {
|
||||||
"version": "7.0.6",
|
"version": "7.0.6",
|
||||||
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
|
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
|
||||||
|
|
@ -8621,15 +8572,6 @@
|
||||||
"node": ">= 0.6"
|
"node": ">= 0.6"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/frac": {
|
|
||||||
"version": "1.1.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/frac/-/frac-1.1.2.tgz",
|
|
||||||
"integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==",
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=0.8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/fraction.js": {
|
"node_modules/fraction.js": {
|
||||||
"version": "5.3.4",
|
"version": "5.3.4",
|
||||||
"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-5.3.4.tgz",
|
"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-5.3.4.tgz",
|
||||||
|
|
@ -10926,9 +10868,9 @@
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/protobufjs": {
|
"node_modules/protobufjs": {
|
||||||
"version": "7.6.3",
|
"version": "7.6.5",
|
||||||
"resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.6.3.tgz",
|
"resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.6.5.tgz",
|
||||||
"integrity": "sha512-+k0vdJKNdW+Vu+dYe8tZA/VvQb6XKNWexC6URwBFXxNnjLJz9nQJCemGyNgRAWD+B7+nGNc9qMPGwcD7s4nzUw==",
|
"integrity": "sha512-/FPD0nUc9jH6rfFjji9IBqOz4pcSE3CsT1m7Ep6Mdb0LxSUMj8hgl6GomOvZzpNpAqqGaXA0P3VSrZLFzIhQrw==",
|
||||||
"hasInstallScript": true,
|
"hasInstallScript": true,
|
||||||
"license": "BSD-3-Clause",
|
"license": "BSD-3-Clause",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
@ -10938,7 +10880,6 @@
|
||||||
"@protobufjs/eventemitter": "^1.1.1",
|
"@protobufjs/eventemitter": "^1.1.1",
|
||||||
"@protobufjs/fetch": "^1.1.1",
|
"@protobufjs/fetch": "^1.1.1",
|
||||||
"@protobufjs/float": "^1.0.2",
|
"@protobufjs/float": "^1.0.2",
|
||||||
"@protobufjs/inquire": "^1.1.2",
|
|
||||||
"@protobufjs/path": "^1.1.2",
|
"@protobufjs/path": "^1.1.2",
|
||||||
"@protobufjs/pool": "^1.1.0",
|
"@protobufjs/pool": "^1.1.0",
|
||||||
"@protobufjs/utf8": "^1.1.1",
|
"@protobufjs/utf8": "^1.1.1",
|
||||||
|
|
@ -12273,18 +12214,6 @@
|
||||||
"node": ">= 10.x"
|
"node": ">= 10.x"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/ssf": {
|
|
||||||
"version": "0.11.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/ssf/-/ssf-0.11.2.tgz",
|
|
||||||
"integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==",
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"dependencies": {
|
|
||||||
"frac": "~1.1.2"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=0.8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/stackblur-canvas": {
|
"node_modules/stackblur-canvas": {
|
||||||
"version": "2.7.0",
|
"version": "2.7.0",
|
||||||
"resolved": "https://registry.npmjs.org/stackblur-canvas/-/stackblur-canvas-2.7.0.tgz",
|
"resolved": "https://registry.npmjs.org/stackblur-canvas/-/stackblur-canvas-2.7.0.tgz",
|
||||||
|
|
@ -14134,24 +14063,6 @@
|
||||||
"bs58check": "^4.0.0"
|
"bs58check": "^4.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/wmf": {
|
|
||||||
"version": "1.0.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz",
|
|
||||||
"integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==",
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=0.8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/word": {
|
|
||||||
"version": "0.3.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/word/-/word-0.3.0.tgz",
|
|
||||||
"integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==",
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=0.8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/word-wrap": {
|
"node_modules/word-wrap": {
|
||||||
"version": "1.2.5",
|
"version": "1.2.5",
|
||||||
"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
|
"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
|
||||||
|
|
@ -14253,27 +14164,6 @@
|
||||||
"node": ">=14.17.0"
|
"node": ">=14.17.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/xlsx": {
|
|
||||||
"version": "0.18.5",
|
|
||||||
"resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.18.5.tgz",
|
|
||||||
"integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==",
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"dependencies": {
|
|
||||||
"adler-32": "~1.3.0",
|
|
||||||
"cfb": "~1.2.1",
|
|
||||||
"codepage": "~1.15.0",
|
|
||||||
"crc-32": "~1.2.1",
|
|
||||||
"ssf": "~0.11.2",
|
|
||||||
"wmf": "~1.0.1",
|
|
||||||
"word": "~0.3.0"
|
|
||||||
},
|
|
||||||
"bin": {
|
|
||||||
"xlsx": "bin/xlsx.njs"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=0.8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/xml-name-validator": {
|
"node_modules/xml-name-validator": {
|
||||||
"version": "5.0.0",
|
"version": "5.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz",
|
||||||
|
|
|
||||||
12
package.json
12
package.json
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "skate-spots",
|
"name": "skate-spots",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "1.7.32",
|
"version": "1.7.70",
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"homepage": "https://skate-spots.org",
|
"homepage": "https://skate-spots.org",
|
||||||
|
|
@ -21,11 +21,11 @@
|
||||||
"check:i18n": "node scripts/check-i18n.mjs",
|
"check:i18n": "node scripts/check-i18n.mjs",
|
||||||
"test": "npm i --silent && tsc --noEmit && tsc -p cvm-server/tsconfig.json && tsc -p ai-proxy/tsconfig.json && tsc -p push-service/tsconfig.json && eslint && node scripts/check-i18n.mjs && vitest run --reporter=dot --silent && vite build -l error && cp dist/index.html dist/404.html && echo 'All tests passed!'",
|
"test": "npm i --silent && tsc --noEmit && tsc -p cvm-server/tsconfig.json && tsc -p ai-proxy/tsconfig.json && tsc -p push-service/tsconfig.json && eslint && node scripts/check-i18n.mjs && vitest run --reporter=dot --silent && vite build -l error && cp dist/index.html dist/404.html && echo 'All tests passed!'",
|
||||||
"deploy": "npm i --silent && npm run build && npx -y nostr-deploy-cli deploy --skip-setup",
|
"deploy": "npm i --silent && npm run build && npx -y nostr-deploy-cli deploy --skip-setup",
|
||||||
"android:init": "npm run android:build:apk && npx cap add android && npx cap sync android && node scripts/inject-amber-queries.mjs && node scripts/inject-main-activity.mjs && node scripts/inject-network-security.mjs && node scripts/inject-signing-config.mjs && node scripts/make-android-splash.mjs",
|
"android:init": "npm run android:build:apk && npx cap add android && npx cap sync android && node scripts/inject-amber-queries.mjs && node scripts/inject-main-activity.mjs && node scripts/inject-network-security.mjs && node scripts/inject-backup-policy.mjs && node scripts/inject-signing-config.mjs && node scripts/make-android-splash.mjs",
|
||||||
"android:sync": "npm run android:build:apk && npx cap sync android && node scripts/sync-android-version.mjs && node scripts/inject-amber-queries.mjs && node scripts/inject-deep-links.mjs && node scripts/inject-main-activity.mjs && node scripts/inject-network-security.mjs && node scripts/inject-signing-config.mjs && node scripts/make-android-splash.mjs",
|
"android:sync": "npm run android:build:apk && npx cap sync android && node scripts/sync-android-version.mjs && node scripts/inject-amber-queries.mjs && node scripts/inject-deep-links.mjs && node scripts/inject-main-activity.mjs && node scripts/inject-network-security.mjs && node scripts/inject-backup-policy.mjs && node scripts/inject-signing-config.mjs && node scripts/make-android-splash.mjs",
|
||||||
"android:open": "npx cap open android",
|
"android:open": "npx cap open android",
|
||||||
"android:version": "node scripts/sync-android-version.mjs",
|
"android:version": "node scripts/sync-android-version.mjs",
|
||||||
"android:build": "npm run android:build:apk && npx cap sync android && node scripts/sync-android-version.mjs && node scripts/inject-amber-queries.mjs && node scripts/inject-deep-links.mjs && node scripts/inject-main-activity.mjs && node scripts/inject-network-security.mjs && node scripts/inject-signing-config.mjs && node scripts/make-android-splash.mjs && cd android && ./gradlew assembleRelease",
|
"android:build": "npm run android:build:apk && npx cap sync android && node scripts/sync-android-version.mjs && node scripts/inject-amber-queries.mjs && node scripts/inject-deep-links.mjs && node scripts/inject-main-activity.mjs && node scripts/inject-network-security.mjs && node scripts/inject-backup-policy.mjs && node scripts/inject-signing-config.mjs && node scripts/make-android-splash.mjs && cd android && ./gradlew assembleRelease",
|
||||||
"android:build:apk": "CAPACITOR_BUILD=1 vite build && sed -i 's|<script type=\"module\" src=\"/shakespeare_tailwind[^\"]*\\.js\"></script>||g' dist/index.html && sed -i 's|<style type=\"text/tailwindcss\">|<style>|g' dist/index.html && cp dist/index.html dist/404.html",
|
"android:build:apk": "CAPACITOR_BUILD=1 vite build && sed -i 's|<script type=\"module\" src=\"/shakespeare_tailwind[^\"]*\\.js\"></script>||g' dist/index.html && sed -i 's|<style type=\"text/tailwindcss\">|<style>|g' dist/index.html && cp dist/index.html dist/404.html",
|
||||||
"newsletter:weekly": "tsx scripts/newsletter-weekly.ts",
|
"newsletter:weekly": "tsx scripts/newsletter-weekly.ts",
|
||||||
"translation:matrix": "node scripts/translation-matrix.mjs"
|
"translation:matrix": "node scripts/translation-matrix.mjs"
|
||||||
|
|
@ -111,6 +111,7 @@
|
||||||
"dotenv": "^17.4.2",
|
"dotenv": "^17.4.2",
|
||||||
"ecpair": "^3.0.0",
|
"ecpair": "^3.0.0",
|
||||||
"embla-carousel-react": "^8.3.0",
|
"embla-carousel-react": "^8.3.0",
|
||||||
|
"fflate": "^0.8.3",
|
||||||
"hls.js": "^1.6.15",
|
"hls.js": "^1.6.15",
|
||||||
"html2canvas": "^1.4.1",
|
"html2canvas": "^1.4.1",
|
||||||
"html5-qrcode": "^2.3.8",
|
"html5-qrcode": "^2.3.8",
|
||||||
|
|
@ -142,7 +143,6 @@
|
||||||
"tinyld": "^1.3.4",
|
"tinyld": "^1.3.4",
|
||||||
"vaul": "^0.9.3",
|
"vaul": "^0.9.3",
|
||||||
"websocket-ts": "^2.2.1",
|
"websocket-ts": "^2.2.1",
|
||||||
"xlsx": "^0.18.5",
|
|
||||||
"zod": "^4.6.7"
|
"zod": "^4.6.7"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|
@ -184,7 +184,7 @@
|
||||||
},
|
},
|
||||||
"overrides": {
|
"overrides": {
|
||||||
"@tanstack/query-core": "$@tanstack/react-query",
|
"@tanstack/query-core": "$@tanstack/react-query",
|
||||||
"protobufjs": "7.6.3",
|
"protobufjs": "7.6.5",
|
||||||
"sharp": "0.35.5"
|
"sharp": "0.35.5"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,71 @@
|
||||||
*/
|
*/
|
||||||
(function () {
|
(function () {
|
||||||
var shown = false;
|
var shown = false;
|
||||||
|
|
||||||
|
// Reload-loop breaker. A stale app-shell worker can reload before the boot
|
||||||
|
// guard's 12s error panel is ever shown. After three loads inside one minute,
|
||||||
|
// clear the shell cache/worker once and reload into a clean shell.
|
||||||
|
try {
|
||||||
|
var ATTEMPT_KEY = 'skatespots:boot-attempts';
|
||||||
|
var now = Date.now();
|
||||||
|
var attempts = { count: 0, at: now };
|
||||||
|
try {
|
||||||
|
var stored = JSON.parse(sessionStorage.getItem(ATTEMPT_KEY) || 'null');
|
||||||
|
if (stored && typeof stored.at === 'number' && now - stored.at < 60000) {
|
||||||
|
attempts.count = Number(stored.count) || 0;
|
||||||
|
}
|
||||||
|
} catch (e) {}
|
||||||
|
attempts.count += 1;
|
||||||
|
attempts.at = now;
|
||||||
|
try { sessionStorage.setItem(ATTEMPT_KEY, JSON.stringify(attempts)); } catch (e) {}
|
||||||
|
if (attempts.count >= 3) {
|
||||||
|
try { sessionStorage.removeItem(ATTEMPT_KEY); } catch (e) {}
|
||||||
|
var finished = false;
|
||||||
|
var finish = function () {
|
||||||
|
if (finished) return;
|
||||||
|
finished = true;
|
||||||
|
location.reload();
|
||||||
|
};
|
||||||
|
var jobs = [];
|
||||||
|
try {
|
||||||
|
if ('serviceWorker' in navigator) {
|
||||||
|
jobs.push(navigator.serviceWorker.getRegistrations().then(function (regs) {
|
||||||
|
regs.forEach(function (reg) { try { reg.unregister(); } catch (e) {} });
|
||||||
|
}).catch(function () {}));
|
||||||
|
}
|
||||||
|
if (window.caches) {
|
||||||
|
jobs.push(window.caches.keys().then(function (keys) {
|
||||||
|
return Promise.all(keys.filter(function (key) { return key.indexOf('skate-spots-shell-') === 0; })
|
||||||
|
.map(function (key) { return window.caches.delete(key).catch(function () {}); }));
|
||||||
|
}).catch(function () {}));
|
||||||
|
}
|
||||||
|
} catch (e) {}
|
||||||
|
if (jobs.length) Promise.all(jobs).then(finish).catch(finish);
|
||||||
|
else finish();
|
||||||
|
setTimeout(finish, 1000);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
} catch (e) { /* best effort */ }
|
||||||
|
|
||||||
|
// Native WebViews can keep a service worker from an older build forever.
|
||||||
|
// That worker can serve a stale index.html whose hashed chunks no longer
|
||||||
|
// exist, producing a white/black reload loop. The native shell is served from
|
||||||
|
// https://localhost; clear its app-shell registrations before the bundle runs.
|
||||||
|
try {
|
||||||
|
var isNativeShell = location.protocol === 'https:' && location.hostname === 'localhost';
|
||||||
|
if (isNativeShell && 'serviceWorker' in navigator) {
|
||||||
|
navigator.serviceWorker.getRegistrations().then(function (regs) {
|
||||||
|
regs.forEach(function (reg) { try { reg.unregister(); } catch (e) {} });
|
||||||
|
}).catch(function () {});
|
||||||
|
if (window.caches) {
|
||||||
|
window.caches.keys().then(function (keys) {
|
||||||
|
keys.filter(function (key) { return key.indexOf('skate-spots-shell-') === 0; })
|
||||||
|
.forEach(function (key) { window.caches.delete(key).catch(function () {}); });
|
||||||
|
}).catch(function () {});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (e) { /* best effort */ }
|
||||||
|
|
||||||
function paint(kind, err) {
|
function paint(kind, err) {
|
||||||
if (shown) return;
|
if (shown) return;
|
||||||
shown = true;
|
shown = true;
|
||||||
|
|
|
||||||
127
public/download/index.html
Normal file
127
public/download/index.html
Normal file
|
|
@ -0,0 +1,127 @@
|
||||||
|
<!doctype html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover" />
|
||||||
|
<meta name="color-scheme" content="dark" />
|
||||||
|
<title>SkateSpots APK</title>
|
||||||
|
<meta
|
||||||
|
name="description"
|
||||||
|
content="Download the signed SkateSpots Android APK. No account, no store, no tracking."
|
||||||
|
/>
|
||||||
|
<style>
|
||||||
|
:root {
|
||||||
|
color-scheme: dark;
|
||||||
|
--bg: #090b0c;
|
||||||
|
--panel: #121719;
|
||||||
|
--line: #273033;
|
||||||
|
--text: #f2f5f4;
|
||||||
|
--muted: #9aa7a5;
|
||||||
|
--teal: #56e0c0;
|
||||||
|
--amber: #f5b83d;
|
||||||
|
}
|
||||||
|
* { box-sizing: border-box; }
|
||||||
|
body {
|
||||||
|
margin: 0;
|
||||||
|
min-height: 100dvh;
|
||||||
|
display: grid;
|
||||||
|
place-items: center;
|
||||||
|
padding: 24px;
|
||||||
|
background:
|
||||||
|
radial-gradient(circle at 20% 0%, rgba(86, 224, 192, 0.12), transparent 42%),
|
||||||
|
var(--bg);
|
||||||
|
color: var(--text);
|
||||||
|
font: 15px/1.55 ui-sans-serif, system-ui, -apple-system, "Segoe UI", sans-serif;
|
||||||
|
}
|
||||||
|
main {
|
||||||
|
width: min(100%, 560px);
|
||||||
|
padding: 28px;
|
||||||
|
border: 1px solid var(--line);
|
||||||
|
border-radius: 18px;
|
||||||
|
background: color-mix(in srgb, var(--panel) 92%, transparent);
|
||||||
|
box-shadow: 0 18px 60px rgba(0, 0, 0, 0.35);
|
||||||
|
}
|
||||||
|
.eyebrow {
|
||||||
|
margin: 0 0 10px;
|
||||||
|
color: var(--teal);
|
||||||
|
font-size: 12px;
|
||||||
|
font-weight: 800;
|
||||||
|
letter-spacing: 0.14em;
|
||||||
|
text-transform: uppercase;
|
||||||
|
}
|
||||||
|
h1 { margin: 0; font-size: clamp(28px, 7vw, 38px); line-height: 1.02; }
|
||||||
|
p { margin: 14px 0 0; color: var(--muted); }
|
||||||
|
a.download {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 16px;
|
||||||
|
margin-top: 24px;
|
||||||
|
padding: 16px 18px;
|
||||||
|
border-radius: 12px;
|
||||||
|
background: var(--teal);
|
||||||
|
color: #06201b;
|
||||||
|
font-weight: 800;
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
a.download:focus-visible { outline: 3px solid var(--amber); outline-offset: 3px; }
|
||||||
|
a.download span:last-child { font-size: 20px; }
|
||||||
|
.meta {
|
||||||
|
display: grid;
|
||||||
|
gap: 8px;
|
||||||
|
margin-top: 18px;
|
||||||
|
padding-top: 18px;
|
||||||
|
border-top: 1px solid var(--line);
|
||||||
|
color: var(--muted);
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
code {
|
||||||
|
overflow-wrap: anywhere;
|
||||||
|
color: var(--text);
|
||||||
|
font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
.links { display: flex; flex-wrap: wrap; gap: 10px 18px; margin-top: 16px; }
|
||||||
|
.links a { color: var(--amber); font-weight: 700; text-decoration: none; }
|
||||||
|
.links a:hover { text-decoration: underline; }
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<main>
|
||||||
|
<p class="eyebrow">SkateSpots · Android</p>
|
||||||
|
<h1>Get the signed APK.</h1>
|
||||||
|
<p>
|
||||||
|
Local-first skating map, crews, events and marketplace. No store account
|
||||||
|
required. This is the same signing key as the Zapstore and Obtanium
|
||||||
|
releases, so it updates over an existing install.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<a
|
||||||
|
class="download"
|
||||||
|
href="https://git.skate-spots.org/skatespots/SkateSpots/releases/download/v1.7.70/SkateSpots-1.7.70.apk"
|
||||||
|
rel="noopener"
|
||||||
|
>
|
||||||
|
<span>Download SkateSpots-1.7.70.apk · 56 MB</span>
|
||||||
|
<span aria-hidden="true">↓</span>
|
||||||
|
</a>
|
||||||
|
|
||||||
|
<div class="meta">
|
||||||
|
<span>Requires Android 7.0 or newer.</span>
|
||||||
|
<span>SHA-256: <code>be521c167814a78dc68b98bc7ac5e3c73a096f9f690fcac20ecf294bcf875767</code></span>
|
||||||
|
<span>Only install APKs from a source you trust. Android will ask you to allow installs from your browser.</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="links">
|
||||||
|
<a href="https://git.skate-spots.org/skatespots/SkateSpots/releases">All releases</a>
|
||||||
|
<a href="https://git.skate-spots.org/skatespots/SkateSpots">Source code</a>
|
||||||
|
<a href="https://skate-spots.org">Open the web app</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="meta">
|
||||||
|
<span><strong>Obtanium:</strong> add the latest release page above as the app source, or select <em>Override Source → HTML</em> if it is not recognised.</span>
|
||||||
|
<span><strong>F-Droid repo:</strong> <a href="https://fdroid.skate-spots.org/repo">https://fdroid.skate-spots.org/repo</a> (third-party self-hosted repo; app ID <code>org.skatespots.app</code>).</span>
|
||||||
|
<span>Repo signing fingerprint: <code>88:B1:71:1C:24:02:89:FB:B2:A7:FC:C1:B3:1F:BB:9D:60:F5:7F:19:18:E0:3D:62:2D:35:F2:3D:E1:84:46:75</code></span>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
BIN
public/images/opensats.ico
Normal file
BIN
public/images/opensats.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.8 KiB |
|
|
@ -10,7 +10,7 @@
|
||||||
* navigations are network-first with an index fallback. No API, DM or model
|
* navigations are network-first with an index fallback. No API, DM or model
|
||||||
* request is ever stored; only same-origin static bytes.
|
* request is ever stored; only same-origin static bytes.
|
||||||
*/
|
*/
|
||||||
const SHELL_CACHE = 'skate-spots-shell-v2';
|
const SHELL_CACHE = 'skate-spots-shell-v3';
|
||||||
const SHELL_ASSETS = ['/', '/index.html'];
|
const SHELL_ASSETS = ['/', '/index.html'];
|
||||||
|
|
||||||
self.addEventListener('install', (event) => {
|
self.addEventListener('install', (event) => {
|
||||||
|
|
@ -39,6 +39,12 @@ self.addEventListener('fetch', (event) => {
|
||||||
const url = new URL(request.url);
|
const url = new URL(request.url);
|
||||||
if (url.origin !== self.location.origin) return;
|
if (url.origin !== self.location.origin) return;
|
||||||
if (url.pathname.startsWith('/api/') || url.pathname.startsWith('/.netlify/')) return;
|
if (url.pathname.startsWith('/api/') || url.pathname.startsWith('/.netlify/')) return;
|
||||||
|
// Never cache the boot guard: an old cached copy must not be able to trap
|
||||||
|
// the app in its own stale-worker cleanup path.
|
||||||
|
if (url.pathname === '/boot-guard.js') {
|
||||||
|
event.respondWith(fetch(request).catch(() => caches.match(request).then((cached) => cached || Response.error())));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (request.mode === 'navigate') {
|
if (request.mode === 'navigate') {
|
||||||
event.respondWith(
|
event.respondWith(
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,443 @@
|
||||||
|
🛡️ Amber is quieter and safer
|
||||||
|
- Encrypted-message inboxes no longer auto-decrypt on arrival for Amber users.
|
||||||
|
Messages now show a deliberate “Unlock messages” card; opening Messages itself
|
||||||
|
does not fire a decrypt storm. The gate is Amber-only; silent signers keep the
|
||||||
|
automatic inbox.
|
||||||
|
- Amber redirect operations now expire after 10 minutes; stale callbacks are
|
||||||
|
rejected and cleared, so an old request cannot be replayed later.
|
||||||
|
- Redirect encryption operations no longer persist plaintext in localStorage,
|
||||||
|
sessionStorage or IndexedDB. Crypto results are no longer left in browser
|
||||||
|
storage.
|
||||||
|
- Added regression tests for stale Amber callback handling.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🎯 Quiet status control
|
||||||
|
- The desktop header no longer shows a large green outlined “Status” pill with a
|
||||||
|
permanent ping. It now shows a compact chip with your current status emoji and
|
||||||
|
label, or a neutral “Status” affordance when none is set.
|
||||||
|
- The control stays a single tap to open the status dialog; the existing avatar
|
||||||
|
status dot and mobile status flow are unchanged.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🧭 Coordinator setup that actually verifies itself
|
||||||
|
- Settings → Coordinator now runs a real ContextVM RPC probe, not just a
|
||||||
|
heartbeat presence check. It shows RPC latency when reachable and clearly
|
||||||
|
distinguishes “visible but RPC unavailable”.
|
||||||
|
- Crew edit now has an optional coordinator operator field (npub/hex), published
|
||||||
|
in the existing coordinator tag. The operator is a label, not an admin key.
|
||||||
|
- The RPC check uses a throwaway local key, so it never prompts Amber or touches
|
||||||
|
your identity.
|
||||||
|
- Added a live coordinator RPC test (skipped by default; `CORDN_LIVE=1`).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🏠 A real crew-owned coordinator kit
|
||||||
|
- Added `deploy/cordn/`: Docker Compose with SQLite persistence, `.env` template,
|
||||||
|
backup/restore scripts, and a runbook for a crew operator.
|
||||||
|
- The coordinator needs only outbound access to ContextVM relays — no inbound
|
||||||
|
port, domain or TLS terminator is required for the coordinator itself.
|
||||||
|
- Settings → Coordinator and the crew edit form now link to the production kit;
|
||||||
|
the displayed Docker command is persistent instead of the old `--rm` demo.
|
||||||
|
- The app still does not embed a coordinator. One crew-trusted coordinator is
|
||||||
|
the model; no multi-coordinator/BFT claims.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🎯 Value-aware safety and fresher reputation
|
||||||
|
- High-value fixed-price listings (100,000 sats or 100 USD/EUR/GBP) now get the
|
||||||
|
same compact safety note as new sellers: meet in public, prefer escrow for
|
||||||
|
shipped deals, never pay outside the app, and remember escrow is not
|
||||||
|
arbitration.
|
||||||
|
- Trade reputation now applies a 180-day half-life to the trust/activity weight,
|
||||||
|
while keeping lifetime counts and the existing distinct-partner/ring warnings.
|
||||||
|
The profile card also shows how many mutually-confirmed trades happened in the
|
||||||
|
last 90 days.
|
||||||
|
- Added the unit-tested NUT-11 2-of-3 escrow policy primitive (seller+arbiter /
|
||||||
|
buyer+arbiter). It is not exposed in the UI until an arbiter policy, bond and
|
||||||
|
appeal process exist.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🔎 Relay consistency and recent reputation
|
||||||
|
- Settings → Relays has an on-demand consistency check: it compares a bounded
|
||||||
|
profile snapshot from the community relay with your read relays and reports
|
||||||
|
newer/different signed profiles. It never merges data or treats relays as
|
||||||
|
voters.
|
||||||
|
- Trade reputation now shows how many mutually-confirmed trades happened in the
|
||||||
|
last 90 days, alongside the lifetime count and existing distinct-partner
|
||||||
|
warnings. Older reputation remains visible; this is a recency signal, not a
|
||||||
|
reset.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🛡️ A clearer warning before a new seller deal
|
||||||
|
- Listings from a seller with no confirmed trading partner, or an account under
|
||||||
|
30 days old, now show a compact safety note with the marketplace guidance:
|
||||||
|
meet in public, prefer escrow for shipped deals, and never pay outside the
|
||||||
|
app’s rails.
|
||||||
|
- The note sits beside the trade actions only — browsing stays frictionless.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🔒 Privacy, privacy, consistent merging
|
||||||
|
- Relay results are now merged deterministically with a newest-event rule and a
|
||||||
|
stable event-id tie-break instead of “first relay wins”. Local deletion
|
||||||
|
tombstones are applied during the same merge, so a deleted item cannot flash
|
||||||
|
back because a different relay answered first.
|
||||||
|
- Photo uploads are redrawn through a canvas before Blossom, stripping EXIF/GPS
|
||||||
|
metadata from decodable images. GIF and HEIC/HEIF still pass through as-is
|
||||||
|
because they need special handling.
|
||||||
|
- Android cloud backup is disabled for the app: local keys, settings and pending
|
||||||
|
escrow state stay on the device and must be exported explicitly.
|
||||||
|
- The OpenSats footer icon is now served locally, so opening the app does not
|
||||||
|
contact opensats.org just to render the footer.
|
||||||
|
- Added a technical threat-model document and linked it from the trust page:
|
||||||
|
signed facts, no relay consensus, no delivery proof, no arbitration.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🧹 Small correctness pass
|
||||||
|
- Unknown routes now return home with a real in-app link, so the native app no
|
||||||
|
longer does a full page reload on a 404.
|
||||||
|
- Profile badge links are sanitized before rendering, blocking `javascript:` and
|
||||||
|
other unsafe URL schemes from user metadata.
|
||||||
|
- Marketplace payment readiness now only says “ready” when checkout has a
|
||||||
|
Lightning address it can actually pay; an LNURL-only profile is no longer
|
||||||
|
advertised as ready.
|
||||||
|
- Removed the duplicate North Korean option from the language picker while
|
||||||
|
keeping stored preferences valid.
|
||||||
|
- The beta screen’s “View the code” link now points at the self-hosted source
|
||||||
|
instead of a GitHub search.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🧩 Cordn setup is easier to follow
|
||||||
|
- The setup steps now show progress: preparing this device is checked once the
|
||||||
|
key package is ready, and the approval step shows a spinner while waiting.
|
||||||
|
- The private-chat header already shows the last successful check, so “live” and
|
||||||
|
“still waiting” are distinguishable at a glance.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
⚡ Cordn status, payment readiness, lighter photos
|
||||||
|
- Cordn panels now show the last successful check next to the connection status,
|
||||||
|
so “waiting” and “live” are easier to tell apart.
|
||||||
|
- Sellers see a payment-readiness card in listing creation and on incoming
|
||||||
|
offers, with a direct link to add a Lightning address before accepting a deal.
|
||||||
|
- Photos are resized to max 1600px and converted to WebP before upload when that
|
||||||
|
makes them smaller. GIFs and formats the WebView cannot decode are left alone.
|
||||||
|
This cuts upload time, quota use and Blossom storage.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🧹 Spot owners can delete from the card menu
|
||||||
|
- Owner/admin members now get a **Delete** action in the three-dot menu on
|
||||||
|
spot and shop cards, opening the existing confirmation dialog.
|
||||||
|
- Added a mobile **Back** arrow on every non-map screen, with history fallback
|
||||||
|
to the map. The bottom Spots tab remains the home shortcut.
|
||||||
|
- Trimmed the avatar account menu to purpose-built actions: status, profile,
|
||||||
|
settings, account switching and logout. The larger navigation stays in the
|
||||||
|
burger menu.
|
||||||
|
- Brand wordmark hides on sub-pages so the Back arrow and header controls fit
|
||||||
|
on narrow phones without truncation.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🧭 Brand logo opens your profile
|
||||||
|
- The top-left SkateSpots lockup now opens your public profile when signed in
|
||||||
|
(both mobile and desktop). Signed out, it still goes to the map.
|
||||||
|
- The bottom Spots tab / desktop Map tab remains the home shortcut, so map
|
||||||
|
access is unchanged.
|
||||||
|
- The green avatar still opens your profile too; its chevron opens the account
|
||||||
|
menu.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
👤 Avatar opens your profile
|
||||||
|
- The green user avatar in the mobile header now opens your public profile.
|
||||||
|
- The small chevron beside it opens the account menu (status, add account,
|
||||||
|
wallet, settings, logout) — the avatar itself is no longer a menu trigger.
|
||||||
|
- Removed the redundant “IN” label so the brand and header controls fit on
|
||||||
|
narrow phones.
|
||||||
|
- The SkateSpots brand mark still goes to the map.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🧭 Simpler mobile navigation
|
||||||
|
- The bottom bar is now exactly five intents: Spots, The Lab, Events, Crews
|
||||||
|
and More. Profile/login moved to the header avatar, where it already lived.
|
||||||
|
- Mints and every other secondary section stay in the More menu — nothing was
|
||||||
|
removed, only moved out of the way.
|
||||||
|
- The nav customiser now edits three middle slots and previews the fixed More
|
||||||
|
button. Existing four-slot layouts are normalised to three on read.
|
||||||
|
- Desktop defaults now show Community instead of Mints as a primary tab.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🔐 Private operator status + transport hardening
|
||||||
|
- New admin-only `/ops` page shows relay/coordinator health, Cordn 429s,
|
||||||
|
services, disk/memory, media usage and TLS expiry.
|
||||||
|
- The status endpoint requires a NIP-98 signature from one of the two relay
|
||||||
|
admin npubs. Nothing is public; the page has no restart/config actions.
|
||||||
|
- The host health timer now writes an aggregate status snapshot for that
|
||||||
|
endpoint every five minutes.
|
||||||
|
- Added HSTS to `relay.skate-spots.org` and `blossom.skate-spots.org`.
|
||||||
|
- Added CAA records restricting certificate issuance for those two hosts to
|
||||||
|
Let's Encrypt.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🖼️ Image uploads are now bounded by npub, not just IP
|
||||||
|
- Blossom uploads are image-only: JPEG, PNG, WebP, AVIF, HEIC or GIF, max 10 MB.
|
||||||
|
No video uploads were added.
|
||||||
|
- A signed quota proxy now verifies the BUD-11 upload token, then enforces:
|
||||||
|
• 50 images / 250 MB per npub per day
|
||||||
|
• 3× that budget for the two relay admins
|
||||||
|
• a generous 100 images / 500 MB per IP per hour backstop
|
||||||
|
• a 20 GB relay-wide media budget with health alerts
|
||||||
|
- Uploads go through our own Blossom only. Public mirrors remain read-side
|
||||||
|
fallbacks for existing images, but can no longer silently bypass the quota.
|
||||||
|
- Clear size/type/daily-limit errors replace raw Blossom responses.
|
||||||
|
- Newlay’s own per-object cap is now 10 MB as a second line of defence.
|
||||||
|
|
||||||
|
The private read-only admin dashboard is next; this release is the quota layer.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🛰️ Cordn / Staircase reliability pass
|
||||||
|
- Raised the embedded coordinator’s request budget (120/min → 300/min,
|
||||||
|
burst 30 → 120) and concurrency (32 → 64) after finding 3,767 rate-limit
|
||||||
|
rejections in one day.
|
||||||
|
- Cordn polling now backs off exponentially with jitter after failures, polls
|
||||||
|
hidden tabs half as often, and clears stale error state on recovery.
|
||||||
|
- The relay health check now alerts on Cordn rate-limit bursts, a missing
|
||||||
|
coordinator announcement, and TLS expiry — not just a dead relay.
|
||||||
|
- Settings → Coordinator shows live health dots for each configured relay.
|
||||||
|
- Crew coordination card adds a scan-to-add QR for Staircase/Cordn clients.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🛹 Support page: compact, tabbed, easier to scan
|
||||||
|
- The supporters page is now split into four tabs — Support, Supporters,
|
||||||
|
Community, Grants — instead of one very long scroll.
|
||||||
|
- The three funding rails are a compact selector: only the chosen rail opens,
|
||||||
|
while “what your support pays for” stays visible underneath.
|
||||||
|
- Hero, section headers, impact stats, cards and spacing are tighter on mobile
|
||||||
|
while keeping all grantmaker transparency and everyone’s credit.
|
||||||
|
- `/support` now redirects to `/supporters`, so the page is easy to find.
|
||||||
|
- Donate page keeps its focused single-page layout and still uses the same rail
|
||||||
|
cards.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
💸 Profile payments: CLINK + Lightning, properly separated
|
||||||
|
- The profile tip card no longer appears as an empty box when a skater has no
|
||||||
|
payment method. Both can now coexist cleanly:
|
||||||
|
• Lightning address (`you@yourdomain.com`) powers Zaps and direct sats.
|
||||||
|
• CLINK (`noffer1…`) powers the self-custodial “Tip in Bitcoin” handoff.
|
||||||
|
- Lightning addresses are normalised (accept a pasted `lightning:` prefix) and
|
||||||
|
the profile Lightning row is now tap-to-copy.
|
||||||
|
- CLINK codes are normalised on save everywhere (profile, shops, crews, Lab),
|
||||||
|
so a pasted `nostr:noffer1…` is stored as the canonical raw code.
|
||||||
|
- Marketplace listing detail now surfaces the seller’s CLINK tip button when
|
||||||
|
their profile has a valid CLINK offer.
|
||||||
|
- CLINK remains an explicit handoff to a CLINK-compatible wallet; it is not
|
||||||
|
presented as an in-app payment rail. Lightning remains the in-app rail.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
⚡ Faster shell, smoother menus, safer Amber
|
||||||
|
- The web entry bundle is ~25% smaller after moving the map to a web-only lazy
|
||||||
|
route and loading the Cashu/Zap dialog on first tap. Android keeps the map
|
||||||
|
eager (static) so the native boot path is unchanged.
|
||||||
|
- Page navigation keeps the header and bottom nav mounted. A short delayed
|
||||||
|
skeleton fades in under the chrome instead of a full-screen black spinner,
|
||||||
|
and primary menu destinations prefetch on hover/touch.
|
||||||
|
- The mobile burger menu now closes on any route change (back, notifications,
|
||||||
|
global search), and nav links expose aria-current.
|
||||||
|
- Amber native calls are serialized and coalesced by request. Identical
|
||||||
|
concurrent decrypts/signs share one result, decrypts are memory-cached, and
|
||||||
|
overlapping intents can no longer race the 60s native timeout.
|
||||||
|
- Production dependency audit: 0 vulnerabilities. No risky major upgrades.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🔐 Community chat setup: no overlapping Amber requests
|
||||||
|
- Cordn setup now runs one coordinator operation at a time. A double-tap on
|
||||||
|
“Set up” can no longer start two publish/join flows and leave one Amber
|
||||||
|
request orphaned.
|
||||||
|
- The setup panel now shows the two real steps for Amber users:
|
||||||
|
Set up this device → Request join. Those are two separate coordinator
|
||||||
|
signatures, so seeing two prompts is expected; the first publishes this
|
||||||
|
device’s key package, the second asks the room to approve it.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🛑 Amber: no more popups after you navigate away
|
||||||
|
- The DM inbox and Cordn notification readers decrypt message-by-message. When
|
||||||
|
you left the screen while Amber was open, the query was cancelled but the loop
|
||||||
|
kept launching Amber for every remaining message — the app looked possessed.
|
||||||
|
- Every decrypt loop now checks the query's abort signal before the next message
|
||||||
|
and stops immediately. Closing the notification bell also stops its decrypt
|
||||||
|
loop.
|
||||||
|
- The first half of a two-step DM decrypt is cached, so if you leave mid-request
|
||||||
|
the next visit only asks once for that message instead of asking twice again.
|
||||||
|
- Cordn's crew-message fetch now honours the same cancellation rule.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
⚡ Faster open, no spinning logo
|
||||||
|
- The cold-start splash now clears in about 0.7s instead of ~1.7s: no artificial
|
||||||
|
hold, no long relay wait, and a hard 0.9s cap.
|
||||||
|
- The wheel mark no longer spins. It drops in once, throws a single short spark
|
||||||
|
burst, then stays still.
|
||||||
|
- The exit is an aperture-style iris that closes into the logo, revealing the
|
||||||
|
app from the edges without moving the map. Content stays visible through the
|
||||||
|
transition, so there is no dead black frame.
|
||||||
|
- Reduced-motion users get the same faster timing with a plain fade.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
✨ Smoother app-open transition
|
||||||
|
- The logo now starts near the native splash’s centred position and settles into
|
||||||
|
the wordmark/progress column, so the native → web handoff has no jump.
|
||||||
|
- On exit the splash content lifts and softens while the app revealed beneath
|
||||||
|
stays still; no map nudge or zoom flash.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🚨 Native boot: eager map + safe cleanup
|
||||||
|
- The home map is now imported eagerly instead of through a lazy Suspense
|
||||||
|
boundary. A slow/hung native chunk import could leave the app on the black
|
||||||
|
PageLoader forever; the header and map now start immediately.
|
||||||
|
- Native service-worker cleanup is feature-checked and can no longer throw
|
||||||
|
before React mounts.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🚨 Critical native boot fix
|
||||||
|
- Native service-worker cleanup is now fully feature-checked and wrapped.
|
||||||
|
Some Android WebViews expose a partial Service Worker API; the cleanup could
|
||||||
|
throw before React mounted, leaving the splash/logo then a black screen.
|
||||||
|
- Boot now continues even when that cleanup is unsupported. The cleanup remains
|
||||||
|
best-effort.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🚨 Boot-loop breaker
|
||||||
|
- If the app reloads three times within a minute, the boot guard now clears the
|
||||||
|
old app-shell worker/caches once and reloads into a clean shell before the
|
||||||
|
error panel can be trapped. Normal opens and reloads are unaffected.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🩹 Remove the white flash from native boot
|
||||||
|
- The document background is black before CSS loads, so a native launch can no
|
||||||
|
longer flash white between the splash and the app shell.
|
||||||
|
- `boot-guard.js` uses a cache-busting query and is never cached by the app-shell
|
||||||
|
worker, so the old-worker cleanup is always the new code.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🩹 Stronger native boot recovery
|
||||||
|
- Bumped the app-shell worker cache to v3; old shell caches are deleted on
|
||||||
|
activate.
|
||||||
|
- `boot-guard.js` is no longer cached by the service worker, so a stale worker
|
||||||
|
can never trap the app in its own cleanup path.
|
||||||
|
- Native WebViews unregister old app-shell workers and clear their caches before
|
||||||
|
the bundle runs. Web registrations use updateViaCache: none.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🩹 Fix native white/black reload loop
|
||||||
|
- Native installs now clear any old app-shell service worker and
|
||||||
|
`skate-spots-shell-*` cache from `https://localhost` before the bundle runs.
|
||||||
|
A stale worker could serve an old index.html whose hashed chunks no longer
|
||||||
|
existed, causing the white/black reload loop after an upgrade.
|
||||||
|
- Web installs are unchanged; the app-shell worker still updates normally.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🧪 Zero known production vulnerabilities + profile services
|
||||||
|
- Replaced the write-only SheetJS xlsx package with a small local OOXML writer.
|
||||||
|
`npm audit --omit=dev` is now **0 vulnerabilities**.
|
||||||
|
- Personal profiles now show a **Lab services** strip linking to their
|
||||||
|
Transport, coaching, design, building and other Lab profiles.
|
||||||
|
- Added tests for the Transport parser and XLSX writer (156 tests total).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🔍 Audit pass: counts, forms, dependencies
|
||||||
|
- Followers now query up to 500 follow lists instead of 100, so profile and
|
||||||
|
sponsor counts are less likely to undercount.
|
||||||
|
- Clothing designers were missing from /stats and Supporters impact; they now
|
||||||
|
have their own count and card (15 Lab crafts total).
|
||||||
|
- The floating Sasquatch bubble is hidden on /become forms, create/edit forms
|
||||||
|
and /supporters so it can't cover inputs or the grantmaker form.
|
||||||
|
- protobufjs override moved to 7.6.5, clearing the moderate ONNX-path advisory.
|
||||||
|
The only remaining production advisory is xlsx (write-only export, no fix
|
||||||
|
published).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🛠 Cordn empty-response fix
|
||||||
|
- The coordinator client now accepts both structuredContent and JSON text
|
||||||
|
responses, and treats an empty list response as an empty list. This fixes the
|
||||||
|
“expected object, received undefined” error when a coordinator omits the
|
||||||
|
structured field on an empty join-request/welcome/message result.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🚐 Transport / Driver profiles in The Lab
|
||||||
|
- New Transport craft for skaters who move people, gear or cargo:
|
||||||
|
cars, taxis, vans, motorcycles, helicopters, planes and boats.
|
||||||
|
- Services: people, goods/cargo, skate gear, airport and venue transfers,
|
||||||
|
tours and event logistics.
|
||||||
|
- Capabilities, capacity and coverage filters on /lab: cargo, bike/board rack,
|
||||||
|
wheelchair access, pets, cross-border, night driving, covered, group size,
|
||||||
|
local/regional/national/international.
|
||||||
|
- Capacity, cargo, coverage, availability, base area and accessibility fields.
|
||||||
|
- WoT badge, crew link, vouches, reviews and the normal report/hide flow.
|
||||||
|
- Explicitly self-attested: SkateSpots does not verify licences, insurance,
|
||||||
|
vehicle roadworthiness or operator permits. A visible notice says so.
|
||||||
|
- Transport counts on /stats and Supporters impact.
|
||||||
|
- All Transport copy is in all 24 languages at 100%.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🗺 Cleaner map footer + follower stat fit
|
||||||
|
- The grey floating “Links” pill between Events and Crews is gone. The map
|
||||||
|
footer is now a slim, always-visible strip above the bottom nav.
|
||||||
|
- Profile stats use 2/3/6 responsive columns; the Followers label and caveat
|
||||||
|
no longer overflow or open an edge tooltip.
|
||||||
|
- The Bitcoin grantmaker section now states its ethos and privacy boundaries:
|
||||||
|
no KYC of SkateSpots, no tracking/CRM, private NIP-17 DM, and only grants
|
||||||
|
that keep the project open source, self-hosted and analytics-free.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
🧾 Grantmaker transparency + stat fit
|
||||||
|
- The Followers stat no longer overflows its card: stats use 2/3/6 columns,
|
||||||
|
and the relay-reported caveat is a proper footnote instead of an edge tooltip.
|
||||||
|
- The Bitcoin grantmaker section now spells out the ethos and the boundaries:
|
||||||
|
no KYC of SkateSpots, no tracking/CRM, private NIP-17 DM, and only grants
|
||||||
|
that keep the project open source, self-hosted and analytics-free.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
💸 Sponsorship opt-in + Bitcoin grantmakers
|
||||||
|
- Profiles have an explicit “Open to sponsorships” switch and optional note;
|
||||||
|
the badge and sponsor card only claim it after the skater opts in.
|
||||||
|
- The Supporters page now has a Bitcoin grantmaker inquiry form. It opens a
|
||||||
|
private DM to the owner and stores nothing: not to KYC us — to KYC YOU.
|
||||||
|
It is only for grantmakers that KYC/KYB their grantees.
|
||||||
|
- The Followers stat carries an info tooltip: relay-reported, not audited
|
||||||
|
analytics.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
👤 Sponsor-ready profiles
|
👤 Sponsor-ready profiles
|
||||||
- Profiles now have Follow/Unfollow, Followers and Following counts, and an
|
- Profiles now have Follow/Unfollow, Followers and Following counts, and an
|
||||||
Events hosted section.
|
Events hosted section.
|
||||||
|
|
|
||||||
BIN
resources/splash.png
Normal file
BIN
resources/splash.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 23 KiB |
|
|
@ -35,18 +35,92 @@ svc skatespots-relay.service
|
||||||
svc skatespots-ai.service
|
svc skatespots-ai.service
|
||||||
svc skatespots-push.service
|
svc skatespots-push.service
|
||||||
svc skatespots-cvm.service
|
svc skatespots-cvm.service
|
||||||
|
svc skatespots-quota.service
|
||||||
svc caddy.service
|
svc caddy.service
|
||||||
|
|
||||||
[ "$(code -H 'Accept: application/nostr+json' https://relay.skate-spots.org/)" != "200" ] \
|
[ "$(code -H 'Accept: application/nostr+json' https://relay.skate-spots.org/)" != "200" ] \
|
||||||
&& ISSUES+=("relay public TLS not answering 200")
|
&& ISSUES+=("relay public TLS not answering 200")
|
||||||
[ "$(code https://push.skate-spots.org/health)" != "200" ] \
|
[ "$(code https://push.skate-spots.org/health)" != "200" ] \
|
||||||
&& ISSUES+=("push /health not 200")
|
&& ISSUES+=("push /health not 200")
|
||||||
|
[ "$(code http://127.0.0.1:8790/health)" != "200" ] \
|
||||||
|
&& ISSUES+=("blossom quota proxy /health not 200")
|
||||||
|
|
||||||
disk=$(df --output=pcent / | tail -1 | tr -d ' %')
|
disk=$(df --output=pcent / | tail -1 | tr -d ' %')
|
||||||
[ "${disk:-0}" -ge 85 ] && ISSUES+=("disk ${disk}% used")
|
[ "${disk:-0}" -ge 85 ] && ISSUES+=("disk ${disk}% used")
|
||||||
avail=$(free -m | awk '/Mem:/{print $7}')
|
avail=$(free -m | awk '/Mem:/{print $7}')
|
||||||
[ "${avail:-0}" -lt 300 ] && ISSUES+=("low memory: ${avail} MiB available")
|
[ "${avail:-0}" -lt 300 ] && ISSUES+=("low memory: ${avail} MiB available")
|
||||||
|
|
||||||
|
# Cordn/Staircase RPC health. Newlay logs one warning per rejected request, so
|
||||||
|
# a burst is easy to miss in routine log noise. Surface it as an operational
|
||||||
|
# problem before users experience a stuck private chat.
|
||||||
|
cordn_rejects=$(docker logs --since 15m newlay-newlay-1 2>&1 | grep -c 'cordn rate limit' || true)
|
||||||
|
[ "${cordn_rejects:-0}" -ge 40 ] && ISSUES+=("cordn rate limits: ${cordn_rejects} rejects in 15m")
|
||||||
|
|
||||||
|
# `grep -q` + pipefail makes `docker logs` exit 141 on SIGPIPE, which used to
|
||||||
|
# make this check fire even when an announcement was present. Count instead.
|
||||||
|
cordn_announce=$(docker logs --since 20m newlay-newlay-1 2>&1 | grep -c 'cordn announce' || true)
|
||||||
|
[ "${cordn_announce:-0}" -eq 0 ] && ISSUES+=("cordn coordinator has not announced in 20m")
|
||||||
|
|
||||||
|
# Blossom media budget (usage is persisted by the quota proxy).
|
||||||
|
quota_state=/home/ubuntu/skatespots-quota/usage.json
|
||||||
|
if [ -f "$quota_state" ]; then
|
||||||
|
total_bytes=$(python3 -c 'import json,sys; print(json.load(open(sys.argv[1])).get("totalBytes",0))' "$quota_state" 2>/dev/null || echo 0)
|
||||||
|
[ "${total_bytes:-0}" -ge 19327352832 ] && ISSUES+=("blossom media >18 GiB")
|
||||||
|
fi
|
||||||
|
|
||||||
|
# TLS expiry (Caddy auto-renews; this catches a broken renewal early).
|
||||||
|
expiry=$(echo | openssl s_client -servername relay.skate-spots.org -connect relay.skate-spots.org:443 2>/dev/null \
|
||||||
|
| openssl x509 -noout -enddate 2>/dev/null | cut -d= -f2)
|
||||||
|
if [ -n "$expiry" ]; then
|
||||||
|
days=$(( ( $(date -d "$expiry" +%s) - $(date +%s) ) / 86400 ))
|
||||||
|
[ "$days" -lt 14 ] && ISSUES+=("relay TLS expires in ${days}d")
|
||||||
|
else
|
||||||
|
ISSUES+=("could not read relay TLS certificate")
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Machine-readable snapshot for the signed admin dashboard. Aggregate numbers
|
||||||
|
# only: no IPs, pubkeys, paths or secrets.
|
||||||
|
local_relay=$(code -H 'Accept: application/nostr+json' http://127.0.0.1:7777/)
|
||||||
|
public_relay=$(code -H 'Accept: application/nostr+json' https://relay.skate-spots.org/)
|
||||||
|
push_status=$(code https://push.skate-spots.org/health)
|
||||||
|
quota_status=$(code http://127.0.0.1:8790/health)
|
||||||
|
version=$(curl -s -m 8 -H 'Accept: application/nostr+json' https://relay.skate-spots.org/ \
|
||||||
|
| python3 -c 'import json,sys; d=json.load(sys.stdin); print(d.get("version",""))' 2>/dev/null || true)
|
||||||
|
svc_on() { systemctl is-active --quiet "$1" && echo true || echo false; }
|
||||||
|
STATUS_DISK="${disk:-0}" STATUS_AVAIL="${avail:-0}" STATUS_MEDIA="${total_bytes:-0}" \
|
||||||
|
STATUS_CORDN_REJECTS="${cordn_rejects:-0}" STATUS_CORDN_ANNOUNCE="${cordn_announce:-0}" \
|
||||||
|
STATUS_TLS_DAYS="${days:-0}" STATUS_LOCAL="${local_relay:-000}" STATUS_PUBLIC="${public_relay:-000}" \
|
||||||
|
STATUS_PUSH="${push_status:-000}" STATUS_QUOTA="${quota_status:-000}" STATUS_VERSION="$version" \
|
||||||
|
STATUS_SERVICES="$(printf 'relay=%s\nai=%s\npush=%s\ncvm=%s\nquota=%s\ncaddy=%s\n' \
|
||||||
|
"$(svc_on skatespots-relay.service)" "$(svc_on skatespots-ai.service)" \
|
||||||
|
"$(svc_on skatespots-push.service)" "$(svc_on skatespots-cvm.service)" \
|
||||||
|
"$(svc_on skatespots-quota.service)" "$(svc_on caddy.service)")" \
|
||||||
|
STATUS_ISSUES="$(printf '%s\n' "${ISSUES[@]}")" \
|
||||||
|
python3 - <<'PY'
|
||||||
|
import datetime, json, os
|
||||||
|
services = {}
|
||||||
|
for line in os.environ.get('STATUS_SERVICES','').splitlines():
|
||||||
|
if '=' in line:
|
||||||
|
k,v = line.split('=',1); services[k] = v == 'true'
|
||||||
|
issues = [x for x in os.environ.get('STATUS_ISSUES','').splitlines() if x]
|
||||||
|
payload = {
|
||||||
|
'updatedAt': datetime.datetime.now(datetime.timezone.utc).isoformat(),
|
||||||
|
'relay': {'local': os.environ.get('STATUS_LOCAL'), 'public': os.environ.get('STATUS_PUBLIC')},
|
||||||
|
'version': os.environ.get('STATUS_VERSION',''),
|
||||||
|
'cordn': {'announces20m': int(os.environ.get('STATUS_CORDN_ANNOUNCE','0') or 0),
|
||||||
|
'rejects15m': int(os.environ.get('STATUS_CORDN_REJECTS','0') or 0)},
|
||||||
|
'storage': {'diskPct': int(os.environ.get('STATUS_DISK','0') or 0),
|
||||||
|
'memAvailMiB': int(os.environ.get('STATUS_AVAIL','0') or 0),
|
||||||
|
'mediaBytes': int(os.environ.get('STATUS_MEDIA','0') or 0)},
|
||||||
|
'tls': {'days': int(os.environ.get('STATUS_TLS_DAYS','0') or 0)},
|
||||||
|
'services': services,
|
||||||
|
'issues': issues,
|
||||||
|
}
|
||||||
|
path = '/home/ubuntu/skatespots-quota/status.json'
|
||||||
|
with open(path,'w') as f: json.dump(payload,f)
|
||||||
|
os.chmod(path, 0o644)
|
||||||
|
PY
|
||||||
|
|
||||||
sig=""
|
sig=""
|
||||||
[ "${#ISSUES[@]}" -gt 0 ] && sig=$(printf '%s\n' "${ISSUES[@]}" | sort | tr '\n' '|')
|
[ "${#ISSUES[@]}" -gt 0 ] && sig=$(printf '%s\n' "${ISSUES[@]}" | sort | tr '\n' '|')
|
||||||
prev=""
|
prev=""
|
||||||
|
|
|
||||||
41
scripts/inject-backup-policy.mjs
Normal file
41
scripts/inject-backup-policy.mjs
Normal file
|
|
@ -0,0 +1,41 @@
|
||||||
|
#!/usr/bin/env node
|
||||||
|
/**
|
||||||
|
* Disable Android Auto Backup for SkateSpots.
|
||||||
|
*
|
||||||
|
* The app stores identity material, local settings, pending escrow tokens and
|
||||||
|
* other private state in its WebView storage. Android Auto Backup can copy that
|
||||||
|
* data to a cloud account without the user ever asking for a backup. Keep it
|
||||||
|
* device-local: SkateSpots has its own explicit export/backup flows.
|
||||||
|
*
|
||||||
|
* Idempotent; exits quietly when android/ has not been generated yet.
|
||||||
|
*/
|
||||||
|
import { existsSync, readFileSync, writeFileSync } from 'node:fs';
|
||||||
|
import { dirname, join } from 'node:path';
|
||||||
|
import { fileURLToPath } from 'node:url';
|
||||||
|
|
||||||
|
const root = join(dirname(fileURLToPath(import.meta.url)), '..');
|
||||||
|
const manifestPath = join(root, 'android', 'app', 'src', 'main', 'AndroidManifest.xml');
|
||||||
|
|
||||||
|
if (!existsSync(manifestPath)) {
|
||||||
|
console.log('[inject-backup-policy] android/ not generated yet — skipping.');
|
||||||
|
process.exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
let manifest = readFileSync(manifestPath, 'utf8');
|
||||||
|
const before = manifest;
|
||||||
|
|
||||||
|
if (/android:allowBackup="[^"]*"/.test(manifest)) {
|
||||||
|
manifest = manifest.replace(/android:allowBackup="[^"]*"/, 'android:allowBackup="false"');
|
||||||
|
} else {
|
||||||
|
manifest = manifest.replace(
|
||||||
|
/<application\b/,
|
||||||
|
'<application android:allowBackup="false"',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (manifest === before) {
|
||||||
|
console.log('[inject-backup-policy] allowBackup already disabled.');
|
||||||
|
} else {
|
||||||
|
writeFileSync(manifestPath, manifest);
|
||||||
|
console.log('[inject-backup-policy] ✓ Disabled Android cloud backup (allowBackup=false).');
|
||||||
|
}
|
||||||
108
scripts/publish-forgejo.sh
Executable file
108
scripts/publish-forgejo.sh
Executable file
|
|
@ -0,0 +1,108 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
#
|
||||||
|
# Publish a built APK to the self-hosted Forgejo release page.
|
||||||
|
#
|
||||||
|
# Usage:
|
||||||
|
# FORGEJO_TOKEN=... scripts/publish-forgejo.sh 1.7.62 [path/to.apk]
|
||||||
|
# FORGEJO_PASSWORD=... FORGEJO_USER=skatespots scripts/publish-forgejo.sh 1.7.62
|
||||||
|
#
|
||||||
|
# This uploads the APK and its .sha256 file. It does not push the git tag or
|
||||||
|
# source; do that separately (the Forgejo repo is a mirror, not an auto-push
|
||||||
|
# remote). Keep credentials in your shell/environment, never in this repo.
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
VERSION="${1:?usage: publish-forgejo.sh <version> [apk]}"
|
||||||
|
APK="${2:-android/app/build/outputs/apk/release/app-release.apk}"
|
||||||
|
TAG="${FORGEJO_TAG:-v$VERSION}"
|
||||||
|
BASE="${FORGEJO_URL:-https://git.skate-spots.org}"
|
||||||
|
OWNER="${FORGEJO_OWNER:-skatespots}"
|
||||||
|
REPO="${FORGEJO_REPO:-SkateSpots}"
|
||||||
|
API="$BASE/api/v1/repos/$OWNER/$REPO"
|
||||||
|
|
||||||
|
command -v curl >/dev/null || { echo "curl is required" >&2; exit 1; }
|
||||||
|
command -v python3 >/dev/null || { echo "python3 is required" >&2; exit 1; }
|
||||||
|
[ -f "$APK" ] || { echo "APK not found: $APK" >&2; exit 1; }
|
||||||
|
|
||||||
|
AUTH=()
|
||||||
|
if [ -n "${FORGEJO_TOKEN:-}" ]; then
|
||||||
|
AUTH=(-H "Authorization: token $FORGEJO_TOKEN")
|
||||||
|
elif [ -n "${FORGEJO_PASSWORD:-}" ]; then
|
||||||
|
AUTH=(-u "${FORGEJO_USER:-skatespots}:$FORGEJO_PASSWORD")
|
||||||
|
else
|
||||||
|
echo "set FORGEJO_TOKEN (preferred) or FORGEJO_PASSWORD" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
tmpdir="$(mktemp -d)"
|
||||||
|
trap 'rm -rf "$tmpdir"' EXIT
|
||||||
|
|
||||||
|
sha="$(sha256sum "$APK" | awk '{print $1}')"
|
||||||
|
body="$tmpdir/release.md"
|
||||||
|
cat >"$body" <<EOF
|
||||||
|
## SkateSpots $VERSION
|
||||||
|
|
||||||
|
Signed Android release. SHA-256: \`$sha\`
|
||||||
|
|
||||||
|
- Source: $BASE/$OWNER/$REPO
|
||||||
|
- APK signing key: same as the Zapstore release.
|
||||||
|
EOF
|
||||||
|
|
||||||
|
python3 - "$TAG" "$VERSION" "$body" >"$tmpdir/payload.json" <<'PY'
|
||||||
|
import json
|
||||||
|
import sys
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
tag, version, body_path = sys.argv[1:]
|
||||||
|
print(json.dumps({
|
||||||
|
"tag_name": tag,
|
||||||
|
"name": version,
|
||||||
|
"body": Path(body_path).read_text(),
|
||||||
|
"draft": False,
|
||||||
|
"prerelease": False,
|
||||||
|
}))
|
||||||
|
PY
|
||||||
|
|
||||||
|
create_code="$(curl -sS -o "$tmpdir/release.json" -w '%{http_code}' \
|
||||||
|
"${AUTH[@]}" -H 'Content-Type: application/json' \
|
||||||
|
-X POST "$API/releases" --data-binary @"$tmpdir/payload.json" || true)"
|
||||||
|
|
||||||
|
if [ "$create_code" = "201" ]; then
|
||||||
|
release_id="$(python3 -c 'import json,sys; print(json.load(open(sys.argv[1]))["id"])' "$tmpdir/release.json")"
|
||||||
|
elif [ "$create_code" = "409" ] || [ "$create_code" = "422" ]; then
|
||||||
|
curl -fsS "${AUTH[@]}" "$API/releases/tags/$TAG" -o "$tmpdir/release.json"
|
||||||
|
release_id="$(python3 -c 'import json,sys; print(json.load(open(sys.argv[1]))["id"])' "$tmpdir/release.json")"
|
||||||
|
else
|
||||||
|
echo "Forgejo release creation failed (HTTP $create_code)" >&2
|
||||||
|
cat "$tmpdir/release.json" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
sha_file="$tmpdir/SkateSpots-$VERSION.apk.sha256"
|
||||||
|
printf '%s SkateSpots-%s.apk\n' "$sha" "$VERSION" >"$sha_file"
|
||||||
|
|
||||||
|
existing_assets="$(python3 - "$tmpdir/release.json" <<'PY'
|
||||||
|
import json
|
||||||
|
import sys
|
||||||
|
|
||||||
|
data = json.load(open(sys.argv[1]))
|
||||||
|
print("\n".join(asset["name"] for asset in data.get("assets", [])))
|
||||||
|
PY
|
||||||
|
)"
|
||||||
|
|
||||||
|
for file in "$APK" "$sha_file"; do
|
||||||
|
name="$(basename "$file")"
|
||||||
|
if printf '%s\n' "$existing_assets" | grep -Fqx "$name"; then
|
||||||
|
echo "already present: $name"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
code="$(curl -sS -o "$tmpdir/asset.json" -w '%{http_code}' \
|
||||||
|
"${AUTH[@]}" -X POST "$API/releases/$release_id/assets?name=$name" \
|
||||||
|
-F "attachment=@$file" || true)"
|
||||||
|
case "$code" in
|
||||||
|
201|202) echo "uploaded $name" ;;
|
||||||
|
*) echo "warning: upload of $name returned HTTP $code" >&2 ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "release: $BASE/$OWNER/$REPO/releases/tag/$TAG"
|
||||||
|
echo "latest: $BASE/$OWNER/$REPO/releases/latest"
|
||||||
220
scripts/quota-proxy.mjs
Normal file
220
scripts/quota-proxy.mjs
Normal file
|
|
@ -0,0 +1,220 @@
|
||||||
|
#!/usr/bin/env node
|
||||||
|
/**
|
||||||
|
* SkateSpots Blossom upload quota proxy.
|
||||||
|
*
|
||||||
|
* Caddy sends ONLY `PUT /upload` here; reads and all other Blossom routes go
|
||||||
|
* straight to Newlay. The proxy verifies the signed BUD-11 (kind 24242) token,
|
||||||
|
* enforces image-only + size, per-npub daily budgets and a generous per-IP
|
||||||
|
* backstop, then forwards the accepted bytes to Newlay.
|
||||||
|
*
|
||||||
|
* Primary quota key = npub (portable, fair across devices/IPs).
|
||||||
|
* Secondary key = client IP (anti-abuse / key-rotation backstop).
|
||||||
|
* Admin pubkeys get a higher npub budget, never an unlimited bypass.
|
||||||
|
*
|
||||||
|
* This is intentionally dependency-light: it reuses the nostr-tools already
|
||||||
|
* installed by the push service, so the relay host needs no new npm install.
|
||||||
|
*
|
||||||
|
* Environment:
|
||||||
|
* PORT=8790
|
||||||
|
* NOSTR_TOOLS_ROOT=/home/ubuntu/skatespots-push/
|
||||||
|
* QUOTA_STATE=/home/ubuntu/skatespots-quota/usage.json
|
||||||
|
* ADMIN_PUBKEYS=20e7...,caba...
|
||||||
|
* MAX_IMAGE_BYTES=10485760
|
||||||
|
* DAILY_BYTES=262144000 (250 MiB)
|
||||||
|
* DAILY_UPLOADS=50
|
||||||
|
* ADMIN_MULTIPLIER=3
|
||||||
|
* IP_HOURLY_BYTES=524288000 (500 MiB)
|
||||||
|
* IP_HOURLY_UPLOADS=100
|
||||||
|
* TOTAL_BYTES=21474836480 (20 GiB)
|
||||||
|
*/
|
||||||
|
import http from 'node:http';
|
||||||
|
import { createHash } from 'node:crypto';
|
||||||
|
import { mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
|
||||||
|
import { dirname, join } from 'node:path';
|
||||||
|
import { createRequire } from 'node:module';
|
||||||
|
|
||||||
|
const require = createRequire(process.env.NOSTR_TOOLS_ROOT || '/home/ubuntu/skatespots-push/');
|
||||||
|
const { verifyEvent } = require('nostr-tools');
|
||||||
|
|
||||||
|
const PORT = Number(process.env.PORT || 8790);
|
||||||
|
const UPSTREAM_PORT = Number(process.env.UPSTREAM_PORT || 7777);
|
||||||
|
const MAX_IMAGE_BYTES = Number(process.env.MAX_IMAGE_BYTES || 10 * 1024 * 1024);
|
||||||
|
const DAILY_BYTES = Number(process.env.DAILY_BYTES || 250 * 1024 * 1024);
|
||||||
|
const DAILY_UPLOADS = Number(process.env.DAILY_UPLOADS || 50);
|
||||||
|
const ADMIN_MULTIPLIER = Number(process.env.ADMIN_MULTIPLIER || 3);
|
||||||
|
const IP_HOURLY_BYTES = Number(process.env.IP_HOURLY_BYTES || 500 * 1024 * 1024);
|
||||||
|
const IP_HOURLY_UPLOADS = Number(process.env.IP_HOURLY_UPLOADS || 100);
|
||||||
|
const TOTAL_BYTES = Number(process.env.TOTAL_BYTES || 20 * 1024 * 1024 * 1024);
|
||||||
|
const STATE_PATH = process.env.QUOTA_STATE || '/home/ubuntu/skatespots-quota/usage.json';
|
||||||
|
const STATUS_PATH = process.env.STATUS_PATH || '/home/ubuntu/skatespots-quota/status.json';
|
||||||
|
const ADMIN_PUBKEYS = new Set(
|
||||||
|
String(process.env.ADMIN_PUBKEYS || '')
|
||||||
|
.split(',').map((v) => v.trim().toLowerCase()).filter(Boolean),
|
||||||
|
);
|
||||||
|
const IMAGE_TYPES = new Set([
|
||||||
|
'image/jpeg', 'image/png', 'image/webp', 'image/avif',
|
||||||
|
'image/heic', 'image/heif', 'image/gif',
|
||||||
|
]);
|
||||||
|
|
||||||
|
mkdirSync(dirname(STATE_PATH), { recursive: true });
|
||||||
|
|
||||||
|
let state = loadState();
|
||||||
|
function loadState() {
|
||||||
|
try {
|
||||||
|
return JSON.parse(readFileSync(STATE_PATH, 'utf8'));
|
||||||
|
} catch {
|
||||||
|
return { day: '', hour: '', totalBytes: 0, users: {}, ips: {} };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
function saveState() {
|
||||||
|
const tmp = `${STATE_PATH}.tmp`;
|
||||||
|
writeFileSync(tmp, JSON.stringify(state));
|
||||||
|
renameSync(tmp, STATE_PATH);
|
||||||
|
}
|
||||||
|
function rollWindows() {
|
||||||
|
const now = new Date();
|
||||||
|
const day = now.toISOString().slice(0, 10);
|
||||||
|
const hour = now.toISOString().slice(0, 13);
|
||||||
|
if (state.day !== day) { state.day = day; state.users = {}; }
|
||||||
|
if (state.hour !== hour) { state.hour = hour; state.ips = {}; }
|
||||||
|
}
|
||||||
|
function clientIp(req) {
|
||||||
|
const xff = String(req.headers['x-forwarded-for'] || '').split(',')[0].trim();
|
||||||
|
return xff || req.socket.remoteAddress || 'unknown';
|
||||||
|
}
|
||||||
|
function json(res, status, body) {
|
||||||
|
const payload = JSON.stringify(body);
|
||||||
|
res.writeHead(status, {
|
||||||
|
'content-type': 'application/json',
|
||||||
|
'content-length': Buffer.byteLength(payload),
|
||||||
|
'access-control-allow-origin': '*',
|
||||||
|
});
|
||||||
|
res.end(payload);
|
||||||
|
}
|
||||||
|
function readBody(req, limit) {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
const declared = Number(req.headers['content-length'] || 0);
|
||||||
|
if (declared > limit) { reject(Object.assign(new Error('too large'), { code: 413 })); return; }
|
||||||
|
const chunks = [];
|
||||||
|
let total = 0;
|
||||||
|
req.on('data', (chunk) => {
|
||||||
|
total += chunk.length;
|
||||||
|
if (total > limit) {
|
||||||
|
reject(Object.assign(new Error('too large'), { code: 413 }));
|
||||||
|
req.destroy();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
chunks.push(chunk);
|
||||||
|
});
|
||||||
|
req.on('end', () => resolve(Buffer.concat(chunks)));
|
||||||
|
req.on('error', reject);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
function decodeToken(header) {
|
||||||
|
const m = /^Nostr\s+(.+)$/i.exec(String(header || ''));
|
||||||
|
if (!m) return null;
|
||||||
|
try {
|
||||||
|
return JSON.parse(Buffer.from(m[1], 'base64').toString('utf8'));
|
||||||
|
} catch {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
function tag(event, name) {
|
||||||
|
return event.tags?.find(([n]) => n === name)?.[1];
|
||||||
|
}
|
||||||
|
function checkToken(event, body, contentType) {
|
||||||
|
if (!event || event.kind !== 24242) return 'Invalid upload authorization.';
|
||||||
|
if (!verifyEvent(event)) return 'Invalid upload signature.';
|
||||||
|
if (tag(event, 't') !== 'upload') return 'Invalid upload token type.';
|
||||||
|
const exp = Number(tag(event, 'expiration') || 0);
|
||||||
|
if (!exp || exp < Math.floor(Date.now() / 1000)) return 'Upload authorization expired.';
|
||||||
|
if (!contentType.startsWith('image/')) return 'Only images can be uploaded.';
|
||||||
|
const x = String(tag(event, 'x') || '').toLowerCase();
|
||||||
|
const size = Number(tag(event, 'size') || 0);
|
||||||
|
const digest = createHash('sha256').update(body).digest('hex');
|
||||||
|
if (!x || x !== digest || size !== body.length) return 'Upload token does not match the image.';
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
function checkQuota(pubkey, bytes, ip) {
|
||||||
|
const admin = ADMIN_PUBKEYS.has(pubkey);
|
||||||
|
const multiplier = admin ? ADMIN_MULTIPLIER : 1;
|
||||||
|
const user = state.users[pubkey] || (state.users[pubkey] = { uploads: 0, bytes: 0 });
|
||||||
|
if (user.uploads + 1 > DAILY_UPLOADS * multiplier) return 'Daily upload count reached. Try again tomorrow.';
|
||||||
|
if (user.bytes + bytes > DAILY_BYTES * multiplier) return 'Daily upload size reached. Try again tomorrow.';
|
||||||
|
const ipKey = createHash('sha256').update(ip).digest('hex').slice(0, 24);
|
||||||
|
const ipRow = state.ips[ipKey] || (state.ips[ipKey] = { uploads: 0, bytes: 0 });
|
||||||
|
if (ipRow.uploads + 1 > IP_HOURLY_UPLOADS) return 'Too many uploads from this connection. Try again later.';
|
||||||
|
if (ipRow.bytes + bytes > IP_HOURLY_BYTES) return 'Upload burst limit reached. Try again later.';
|
||||||
|
if (state.totalBytes + bytes > TOTAL_BYTES) return 'The relay media budget is full. Try again later.';
|
||||||
|
user.uploads += 1; user.bytes += bytes;
|
||||||
|
ipRow.uploads += 1; ipRow.bytes += bytes;
|
||||||
|
state.totalBytes += bytes;
|
||||||
|
saveState();
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
function forward(req, res, body) {
|
||||||
|
const headers = { ...req.headers, host: `127.0.0.1:${UPSTREAM_PORT}` };
|
||||||
|
if (body) headers['content-length'] = String(body.length);
|
||||||
|
const upstream = http.request({
|
||||||
|
hostname: '127.0.0.1', port: UPSTREAM_PORT, path: req.url, method: req.method, headers,
|
||||||
|
}, (up) => {
|
||||||
|
res.writeHead(up.statusCode || 502, up.headers);
|
||||||
|
up.pipe(res);
|
||||||
|
});
|
||||||
|
upstream.on('error', () => json(res, 502, { error: 'Media relay unavailable.' }));
|
||||||
|
if (body) upstream.end(body); else req.pipe(upstream);
|
||||||
|
}
|
||||||
|
function opsAuth(req) {
|
||||||
|
const event = decodeToken(req.headers.authorization);
|
||||||
|
if (!event || event.kind !== 27235 || !verifyEvent(event)) return false;
|
||||||
|
if (!ADMIN_PUBKEYS.has(String(event.pubkey).toLowerCase())) return false;
|
||||||
|
if (tag(event, 'method') !== 'GET') return false;
|
||||||
|
if (tag(event, 'u') !== 'https://relay.skate-spots.org/ops') return false;
|
||||||
|
const exp = Number(tag(event, 'expiration') || 0);
|
||||||
|
if (exp && exp < Math.floor(Date.now() / 1000)) return false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
const server = http.createServer(async (req, res) => {
|
||||||
|
if (req.url === '/health') { json(res, 200, { ok: true }); return; }
|
||||||
|
if (req.url === '/ops') {
|
||||||
|
if (req.method === 'OPTIONS') {
|
||||||
|
res.writeHead(204, {
|
||||||
|
'access-control-allow-origin': '*',
|
||||||
|
'access-control-allow-methods': 'GET, OPTIONS',
|
||||||
|
'access-control-allow-headers': 'Authorization, Content-Type',
|
||||||
|
});
|
||||||
|
res.end();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (req.method !== 'GET' || !opsAuth(req)) { json(res, 401, { error: 'Admin authorization required.' }); return; }
|
||||||
|
try {
|
||||||
|
const raw = readFileSync(STATUS_PATH, 'utf8');
|
||||||
|
res.writeHead(200, {
|
||||||
|
'content-type': 'application/json',
|
||||||
|
'cache-control': 'no-store',
|
||||||
|
'access-control-allow-origin': '*',
|
||||||
|
});
|
||||||
|
res.end(raw);
|
||||||
|
} catch {
|
||||||
|
json(res, 503, { error: 'Status snapshot unavailable.' });
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (req.method !== 'PUT' || req.url !== '/upload') { forward(req, res); return; }
|
||||||
|
|
||||||
|
const contentType = String(req.headers['content-type'] || '').toLowerCase().split(';')[0];
|
||||||
|
if (!IMAGE_TYPES.has(contentType)) { json(res, 415, { error: 'Only JPEG, PNG, WebP, AVIF, HEIC or GIF images can be uploaded.' }); return; }
|
||||||
|
let body;
|
||||||
|
try { body = await readBody(req, MAX_IMAGE_BYTES); }
|
||||||
|
catch (err) { json(res, err?.code === 413 ? 413 : 400, { error: err?.code === 413 ? 'Image is too large. Max 10 MB.' : 'Could not read upload.' }); return; }
|
||||||
|
const event = decodeToken(req.headers.authorization);
|
||||||
|
const problem = checkToken(event, body, contentType);
|
||||||
|
if (problem) { json(res, 401, { error: problem }); return; }
|
||||||
|
rollWindows();
|
||||||
|
const quota = checkQuota(event.pubkey.toLowerCase(), body.length, clientIp(req));
|
||||||
|
if (quota) { json(res, 429, { error: quota, 'retry-after': '3600' }); return; }
|
||||||
|
console.log(`[quota] accepted ${event.pubkey.slice(0, 8)}… ${body.length} bytes ${contentType}`);
|
||||||
|
forward(req, res, body);
|
||||||
|
});
|
||||||
|
server.listen(PORT, '127.0.0.1', () => console.log(`[quota] listening on 127.0.0.1:${PORT}`));
|
||||||
|
|
@ -126,6 +126,14 @@ for _ in 1 2 3 4 5 6; do
|
||||||
done
|
done
|
||||||
[ "$FOUND" -eq 1 ] || log "warning: the release event did not appear on the relay yet (it usually propagates shortly)"
|
[ "$FOUND" -eq 1 ] || log "warning: the release event did not appear on the relay yet (it usually propagates shortly)"
|
||||||
|
|
||||||
|
if [ -n "${FORGEJO_TOKEN:-}" ] || [ -n "${FORGEJO_PASSWORD:-}" ]; then
|
||||||
|
log "publishing the APK to the self-hosted Forgejo release page…"
|
||||||
|
scripts/publish-forgejo.sh "$VERSION" "$APK" || \
|
||||||
|
log "warning: Forgejo upload failed — the Zapstore release is still valid"
|
||||||
|
else
|
||||||
|
log "Forgejo: skipped (set FORGEJO_TOKEN or FORGEJO_PASSWORD to publish there)"
|
||||||
|
fi
|
||||||
|
|
||||||
log "committing the release…"
|
log "committing the release…"
|
||||||
git add package.json package-lock.json release-notes.txt
|
git add package.json package-lock.json release-notes.txt
|
||||||
git commit -m "release: $VERSION" >/dev/null
|
git commit -m "release: $VERSION" >/dev/null
|
||||||
|
|
|
||||||
28
scripts/systemd/skatespots-quota.service
Normal file
28
scripts/systemd/skatespots-quota.service
Normal file
|
|
@ -0,0 +1,28 @@
|
||||||
|
[Unit]
|
||||||
|
Description=SkateSpots Blossom upload quota proxy
|
||||||
|
After=network-online.target docker.service
|
||||||
|
Wants=network-online.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=simple
|
||||||
|
User=ubuntu
|
||||||
|
WorkingDirectory=/home/ubuntu/skatespots-quota
|
||||||
|
ExecStart=/usr/bin/node /home/ubuntu/skatespots-quota/quota-proxy.mjs
|
||||||
|
Restart=always
|
||||||
|
RestartSec=2
|
||||||
|
Environment=PORT=8790
|
||||||
|
Environment=NOSTR_TOOLS_ROOT=/home/ubuntu/skatespots-push/
|
||||||
|
Environment=QUOTA_STATE=/home/ubuntu/skatespots-quota/usage.json
|
||||||
|
Environment=ADMIN_PUBKEYS=20e7c953439e66f3882ab96fe0faa8ba246d6fb12c03b0cb4e2dc4623b8bcb21,caba497f7beda0650d6b78ab211216e4d2ebabeec9ca6eb2a05cee8e55c6871b
|
||||||
|
Environment=MAX_IMAGE_BYTES=10485760
|
||||||
|
Environment=DAILY_BYTES=262144000
|
||||||
|
Environment=DAILY_UPLOADS=50
|
||||||
|
Environment=ADMIN_MULTIPLIER=3
|
||||||
|
Environment=IP_HOURLY_BYTES=524288000
|
||||||
|
Environment=IP_HOURLY_UPLOADS=100
|
||||||
|
Environment=TOTAL_BYTES=21474836480
|
||||||
|
NoNewPrivileges=true
|
||||||
|
PrivateTmp=true
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
|
@ -6,10 +6,11 @@ import { BECOME_ROLES } from "./lib/becomeRoles";
|
||||||
import { DeepLinkHandler } from "./components/DeepLinkHandler";
|
import { DeepLinkHandler } from "./components/DeepLinkHandler";
|
||||||
import { RouteErrorBoundary } from "./components/RouteErrorBoundary";
|
import { RouteErrorBoundary } from "./components/RouteErrorBoundary";
|
||||||
import { Layout } from "./components/Layout";
|
import { Layout } from "./components/Layout";
|
||||||
|
import { RoutePreloader } from "./components/RoutePreloader";
|
||||||
|
|
||||||
// The map is the homepage, but lazy-loading it keeps its chunk (plus the
|
// HomePage resolves to a lazy map on web (smaller first entry) and to the
|
||||||
// IndexedDB offline-cache layer) out of the initial entry bundle.
|
// eager MapPage via a Capacitor-only Vite alias on Android.
|
||||||
const MapPage = lazyWithRetry(() => import("./pages/MapPage"));
|
import HomePage from "@/pages/HomePage";
|
||||||
|
|
||||||
// Lazy load everything else — each page becomes its own JS chunk
|
// Lazy load everything else — each page becomes its own JS chunk
|
||||||
const Index = lazyWithRetry(() => import("./pages/Index"));
|
const Index = lazyWithRetry(() => import("./pages/Index"));
|
||||||
|
|
@ -22,6 +23,7 @@ const DiyPage = lazyWithRetry(() => import("./pages/DiyPage"));
|
||||||
const DeckCostPage = lazyWithRetry(() => import("./pages/DeckCostPage"));
|
const DeckCostPage = lazyWithRetry(() => import("./pages/DeckCostPage"));
|
||||||
const DeckDesignerPage = lazyWithRetry(() => import("./pages/DeckDesignerPage"));
|
const DeckDesignerPage = lazyWithRetry(() => import("./pages/DeckDesignerPage"));
|
||||||
const AdminReviewPage = lazyWithRetry(() => import("./pages/AdminReviewPage"));
|
const AdminReviewPage = lazyWithRetry(() => import("./pages/AdminReviewPage"));
|
||||||
|
const OpsPage = lazyWithRetry(() => import("./pages/OpsPage"));
|
||||||
const SettingsPage = lazyWithRetry(() => import("./pages/SettingsPage"));
|
const SettingsPage = lazyWithRetry(() => import("./pages/SettingsPage"));
|
||||||
const CreateSpotPage = lazyWithRetry(() => import("./pages/CreateSpotPage"));
|
const CreateSpotPage = lazyWithRetry(() => import("./pages/CreateSpotPage"));
|
||||||
const CreateShopPage = lazyWithRetry(() => import("./pages/CreateShopPage"));
|
const CreateShopPage = lazyWithRetry(() => import("./pages/CreateShopPage"));
|
||||||
|
|
@ -99,6 +101,7 @@ export function AppRouter() {
|
||||||
return (
|
return (
|
||||||
<HashRouter>
|
<HashRouter>
|
||||||
<DeepLinkHandler />
|
<DeepLinkHandler />
|
||||||
|
<RoutePreloader />
|
||||||
<ScrollToTop />
|
<ScrollToTop />
|
||||||
{/* Per-route boundary: a crash in one page shows a recoverable message
|
{/* Per-route boundary: a crash in one page shows a recoverable message
|
||||||
instead of blanking the whole app. Resets automatically on navigate
|
instead of blanking the whole app. Resets automatically on navigate
|
||||||
|
|
@ -111,9 +114,9 @@ export function AppRouter() {
|
||||||
navigation. Pages no longer wrap themselves in <Layout>. */}
|
navigation. Pages no longer wrap themselves in <Layout>. */}
|
||||||
<Route element={<Layout />}>
|
<Route element={<Layout />}>
|
||||||
{/* Map is the homepage */}
|
{/* Map is the homepage */}
|
||||||
<Route path="/" element={<MapPage />} />
|
<Route path="/" element={<HomePage />} />
|
||||||
{/* /map redirects to / */}
|
{/* /map redirects to / */}
|
||||||
<Route path="/map" element={<MapPage />} />
|
<Route path="/map" element={<HomePage />} />
|
||||||
{/* Legacy home page still accessible */}
|
{/* Legacy home page still accessible */}
|
||||||
<Route path="/home" element={<Index />} />
|
<Route path="/home" element={<Index />} />
|
||||||
<Route path="/events" element={<EventsPage />} />
|
<Route path="/events" element={<EventsPage />} />
|
||||||
|
|
@ -157,6 +160,7 @@ export function AppRouter() {
|
||||||
<Route path="/diy/deck-cost" element={<DeckCostPage />} />
|
<Route path="/diy/deck-cost" element={<DeckCostPage />} />
|
||||||
<Route path="/diy/deck-designer" element={<DeckDesignerPage />} />
|
<Route path="/diy/deck-designer" element={<DeckDesignerPage />} />
|
||||||
<Route path="/review" element={<AdminReviewPage />} />
|
<Route path="/review" element={<AdminReviewPage />} />
|
||||||
|
<Route path="/ops" element={<OpsPage />} />
|
||||||
<Route path="/settings" element={<SettingsPage />} />
|
<Route path="/settings" element={<SettingsPage />} />
|
||||||
<Route path="/create-spot" element={<CreateSpotPage />} />
|
<Route path="/create-spot" element={<CreateSpotPage />} />
|
||||||
<Route path="/create-shop" element={<CreateShopPage />} />
|
<Route path="/create-shop" element={<CreateShopPage />} />
|
||||||
|
|
@ -192,6 +196,8 @@ export function AppRouter() {
|
||||||
<Route path="/license" element={<LicensePage />} />
|
<Route path="/license" element={<LicensePage />} />
|
||||||
<Route path="/privacy" element={<PrivacyPage />} />
|
<Route path="/privacy" element={<PrivacyPage />} />
|
||||||
<Route path="/supporters" element={<SupportersPage />} />
|
<Route path="/supporters" element={<SupportersPage />} />
|
||||||
|
{/* Friendly alias: people naturally type /support. */}
|
||||||
|
<Route path="/support" element={<Navigate to="/supporters" replace />} />
|
||||||
<Route path="/donate" element={<DonatePage />} />
|
<Route path="/donate" element={<DonatePage />} />
|
||||||
{/* Marketplace */}
|
{/* Marketplace */}
|
||||||
<Route path="/marketplace-listings" element={<MarketplacePage />} />
|
<Route path="/marketplace-listings" element={<MarketplacePage />} />
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
import { Link } from 'react-router-dom';
|
import { Link } from 'react-router-dom';
|
||||||
import { useMemo } from 'react';
|
import { useMemo } from 'react';
|
||||||
import { ShieldAlert, ArrowRight } from 'lucide-react';
|
import { ShieldAlert, ArrowRight, Activity } from 'lucide-react';
|
||||||
import { useCurrentUser } from '@/hooks/useCurrentUser';
|
import { useCurrentUser } from '@/hooks/useCurrentUser';
|
||||||
import { useSkateSpots } from '@/hooks/useSkateSpots';
|
import { useSkateSpots } from '@/hooks/useSkateSpots';
|
||||||
import { isAdminPubkey } from '@/lib/admins';
|
import { isAdminPubkey } from '@/lib/admins';
|
||||||
|
|
@ -24,22 +24,37 @@ export function AdminReviewCard() {
|
||||||
if (!isAdmin) return null;
|
if (!isAdmin) return null;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Link
|
<div className="space-y-2">
|
||||||
to="/review"
|
<Link
|
||||||
className="block rounded-2xl border border-amber-500/20 bg-white/[0.02] transition-colors hover:border-amber-500/40"
|
to="/review"
|
||||||
>
|
className="block rounded-2xl border border-amber-500/20 bg-white/[0.02] transition-colors hover:border-amber-500/40"
|
||||||
<div className="flex items-center gap-3 px-4 py-3.5">
|
>
|
||||||
<ShieldAlert className="h-5 w-5 shrink-0 text-amber-400" />
|
<div className="flex items-center gap-3 px-4 py-3.5">
|
||||||
<div className="min-w-0 flex-1">
|
<ShieldAlert className="h-5 w-5 shrink-0 text-amber-400" />
|
||||||
<p className="text-sm font-bold text-amber-400">{t('settingsUi.adminReview.title')}</p>
|
<div className="min-w-0 flex-1">
|
||||||
<p className="mt-0.5 text-xs text-muted-foreground">
|
<p className="text-sm font-bold text-amber-400">{t('settingsUi.adminReview.title')}</p>
|
||||||
{flaggedCount > 0
|
<p className="mt-0.5 text-xs text-muted-foreground">
|
||||||
? t('settingsUi.adminReview.flagged', { count: flaggedCount, s: flaggedCount === 1 ? '' : 's' })
|
{flaggedCount > 0
|
||||||
: t('settingsUi.adminReview.clean')}
|
? t('settingsUi.adminReview.flagged', { count: flaggedCount, s: flaggedCount === 1 ? '' : 's' })
|
||||||
</p>
|
: t('settingsUi.adminReview.clean')}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<ArrowRight className="h-4 w-4 shrink-0 text-gray-500" />
|
||||||
</div>
|
</div>
|
||||||
<ArrowRight className="h-4 w-4 shrink-0 text-gray-500" />
|
</Link>
|
||||||
</div>
|
<Link
|
||||||
</Link>
|
to="/ops"
|
||||||
|
className="block rounded-2xl border border-cyan-500/20 bg-white/[0.02] transition-colors hover:border-cyan-500/40"
|
||||||
|
>
|
||||||
|
<div className="flex items-center gap-3 px-4 py-3.5">
|
||||||
|
<Activity className="h-5 w-5 shrink-0 text-cyan-400" />
|
||||||
|
<div className="min-w-0 flex-1">
|
||||||
|
<p className="text-sm font-bold text-cyan-400">Operator status</p>
|
||||||
|
<p className="mt-0.5 text-xs text-muted-foreground">Read-only relay, Cordn, storage and TLS health.</p>
|
||||||
|
</div>
|
||||||
|
<ArrowRight className="h-4 w-4 shrink-0 text-gray-500" />
|
||||||
|
</div>
|
||||||
|
</Link>
|
||||||
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -19,8 +19,7 @@ import { useTranslation } from '@/contexts/language';
|
||||||
const DISCLAIMER_VERSION = 1;
|
const DISCLAIMER_VERSION = 1;
|
||||||
const STORAGE_KEY = `skatespots_disclaimer_accepted_v${DISCLAIMER_VERSION}`;
|
const STORAGE_KEY = `skatespots_disclaimer_accepted_v${DISCLAIMER_VERSION}`;
|
||||||
|
|
||||||
const REPO_URL =
|
const REPO_URL = 'https://git.skate-spots.org/skatespots/SkateSpots';
|
||||||
'https://github.com/search?q=SkateSpots';
|
|
||||||
|
|
||||||
export function BetaDisclaimerDialog() {
|
export function BetaDisclaimerDialog() {
|
||||||
const [accepted, setAccepted] = useLocalStorage<boolean>(STORAGE_KEY, false);
|
const [accepted, setAccepted] = useLocalStorage<boolean>(STORAGE_KEY, false);
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@ import {
|
||||||
import { Button } from '@/components/ui/button';
|
import { Button } from '@/components/ui/button';
|
||||||
import { Input } from '@/components/ui/input';
|
import { Input } from '@/components/ui/input';
|
||||||
import { QRCodeCanvas } from '@/components/ui/qrcode';
|
import { QRCodeCanvas } from '@/components/ui/qrcode';
|
||||||
|
import { useRelayStatus } from '@/hooks/useRelayStatus';
|
||||||
import { QRScannerModal } from '@/components/wallet/QRScannerModal';
|
import { QRScannerModal } from '@/components/wallet/QRScannerModal';
|
||||||
import { useCoordinator, useCoordinatorHealth, type CoordinatorHealthStatus } from '@/hooks/useCoordinator';
|
import { useCoordinator, useCoordinatorHealth, type CoordinatorHealthStatus } from '@/hooks/useCoordinator';
|
||||||
import { useTranslation } from '@/contexts/language';
|
import { useTranslation } from '@/contexts/language';
|
||||||
|
|
@ -20,6 +21,7 @@ import { toast } from '@/hooks/useToast';
|
||||||
import {
|
import {
|
||||||
CORDN_APP_URL,
|
CORDN_APP_URL,
|
||||||
CORDN_DOCKER_COMMAND,
|
CORDN_DOCKER_COMMAND,
|
||||||
|
CORDN_DEPLOY_KIT_URL,
|
||||||
CORDN_RELAY_URL,
|
CORDN_RELAY_URL,
|
||||||
coordinatorAddUrl,
|
coordinatorAddUrl,
|
||||||
parseCoordinatorInput,
|
parseCoordinatorInput,
|
||||||
|
|
@ -27,6 +29,7 @@ import {
|
||||||
SKATESPOTS_COORDINATOR,
|
SKATESPOTS_COORDINATOR,
|
||||||
} from '@/lib/coordinator';
|
} from '@/lib/coordinator';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
|
import { urlDomain } from '@/lib/sanitizeUrl';
|
||||||
|
|
||||||
function timeAgo(unixSeconds: number, t: (key: string, params?: Record<string, string | number>) => string): string {
|
function timeAgo(unixSeconds: number, t: (key: string, params?: Record<string, string | number>) => string): string {
|
||||||
const s = Math.floor(Date.now() / 1000 - unixSeconds);
|
const s = Math.floor(Date.now() / 1000 - unixSeconds);
|
||||||
|
|
@ -59,6 +62,28 @@ async function copyText(text: string, copiedText: string, failedTitle: string, f
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Small live health pill for one relay. Probes only while this card is open. */
|
||||||
|
function RelayHealthPill({ url }: { url: string }) {
|
||||||
|
const { status, reason, recheck } = useRelayStatus(url);
|
||||||
|
const dot =
|
||||||
|
status === 'connected'
|
||||||
|
? 'bg-green-400'
|
||||||
|
: status === 'connecting'
|
||||||
|
? 'bg-blue-400 animate-pulse'
|
||||||
|
: 'bg-red-400';
|
||||||
|
return (
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={recheck}
|
||||||
|
title={reason ?? status}
|
||||||
|
className="inline-flex max-w-full items-center gap-1.5 rounded-full border border-white/10 bg-white/[0.03] px-2 py-1 text-[10px] text-gray-400 transition-colors hover:border-white/20 hover:text-gray-200"
|
||||||
|
>
|
||||||
|
<span className={cn('h-1.5 w-1.5 shrink-0 rounded-full', dot)} />
|
||||||
|
<span className="truncate">{urlDomain(url)}</span>
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Settings → Coordinator.
|
* Settings → Coordinator.
|
||||||
*
|
*
|
||||||
|
|
@ -70,7 +95,7 @@ async function copyText(text: string, copiedText: string, failedTitle: string, f
|
||||||
export function CoordinatorSettingsCard() {
|
export function CoordinatorSettingsCard() {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const { coordinator, setCoordinator, removeCoordinator } = useCoordinator();
|
const { coordinator, setCoordinator, removeCoordinator } = useCoordinator();
|
||||||
const { status, lastSeen, eventCount, name, error, check } = useCoordinatorHealth(coordinator);
|
const { status, lastSeen, eventCount, name, error, rpcStatus, rpcLatencyMs, check } = useCoordinatorHealth(coordinator);
|
||||||
|
|
||||||
const [input, setInput] = useState('');
|
const [input, setInput] = useState('');
|
||||||
const [showQr, setShowQr] = useState(false);
|
const [showQr, setShowQr] = useState(false);
|
||||||
|
|
@ -119,6 +144,11 @@ export function CoordinatorSettingsCard() {
|
||||||
: t('socialUi.coordinator.relayMany', { count: coordinator.relays.length })}
|
: t('socialUi.coordinator.relayMany', { count: coordinator.relays.length })}
|
||||||
{lastSeen ? ` · ${t('socialUi.coordinator.lastSeen', { time: timeAgo(lastSeen, t) })}` : ''}
|
{lastSeen ? ` · ${t('socialUi.coordinator.lastSeen', { time: timeAgo(lastSeen, t) })}` : ''}
|
||||||
</p>
|
</p>
|
||||||
|
{coordinator.relays.length > 0 && (
|
||||||
|
<div className="mt-2 flex flex-wrap gap-1.5">
|
||||||
|
{coordinator.relays.map((url) => <RelayHealthPill key={url} url={url} />)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
<span
|
<span
|
||||||
className={cn(
|
className={cn(
|
||||||
|
|
@ -146,6 +176,17 @@ export function CoordinatorSettingsCard() {
|
||||||
: ` · ${t('socialUi.coordinator.eventFoundMany', { count: eventCount })}`)}
|
: ` · ${t('socialUi.coordinator.eventFoundMany', { count: eventCount })}`)}
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
{rpcStatus === 'ok' && (
|
||||||
|
<p className="text-[11px] font-medium text-green-400">
|
||||||
|
{t('socialUi.coordinator.rpcOk', { ms: rpcLatencyMs ?? 0 })}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
{rpcStatus === 'error' && (
|
||||||
|
<p className="text-[11px] text-amber-400">
|
||||||
|
{t('socialUi.coordinator.rpcError')}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
|
||||||
<div className="flex flex-wrap items-center gap-2">
|
<div className="flex flex-wrap items-center gap-2">
|
||||||
<Button size="sm" variant="outline" onClick={() => void check()} disabled={status === 'checking'}>
|
<Button size="sm" variant="outline" onClick={() => void check()} disabled={status === 'checking'}>
|
||||||
<RefreshCw className={cn('mr-1.5 h-3.5 w-3.5', status === 'checking' && 'animate-spin')} />
|
<RefreshCw className={cn('mr-1.5 h-3.5 w-3.5', status === 'checking' && 'animate-spin')} />
|
||||||
|
|
@ -285,6 +326,14 @@ export function CoordinatorSettingsCard() {
|
||||||
<Copy className="h-3.5 w-3.5" />
|
<Copy className="h-3.5 w-3.5" />
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
<div className="flex flex-wrap items-center gap-2">
|
||||||
|
<a href={CORDN_DEPLOY_KIT_URL} target="_blank" rel="noopener noreferrer">
|
||||||
|
<Button size="sm" variant="outline">
|
||||||
|
{t('common.learnMore')}
|
||||||
|
<ExternalLink className="ml-1.5 h-3.5 w-3.5" />
|
||||||
|
</Button>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
<p className="flex items-start gap-2 text-[11px] text-amber-400/90 leading-relaxed">
|
<p className="flex items-start gap-2 text-[11px] text-amber-400/90 leading-relaxed">
|
||||||
<AlertTriangle className="mt-0.5 h-3.5 w-3.5 flex-shrink-0" />
|
<AlertTriangle className="mt-0.5 h-3.5 w-3.5 flex-shrink-0" />
|
||||||
{t('socialUi.coordinator.androidSleep')}
|
{t('socialUi.coordinator.androidSleep')}
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,7 @@ import { LabDraftBanner } from '@/components/LabDraftBanner';
|
||||||
import { LabProfileProgress } from '@/components/LabProfileProgress';
|
import { LabProfileProgress } from '@/components/LabProfileProgress';
|
||||||
import { FormWizard, WizardStep } from '@/components/FormWizard';
|
import { FormWizard, WizardStep } from '@/components/FormWizard';
|
||||||
import { isValidNoffer, type EntityType } from '@/lib/types';
|
import { isValidNoffer, type EntityType } from '@/lib/types';
|
||||||
|
import { normalizeClinkCode } from '@/lib/clink';
|
||||||
import type { LabOption } from '@/lib/labExtras';
|
import type { LabOption } from '@/lib/labExtras';
|
||||||
import { labProfilePathFromKind } from '@/lib/labRoutes';
|
import { labProfilePathFromKind } from '@/lib/labRoutes';
|
||||||
import { normalizeUrlInput, sanitizeUrl, isValidEmail } from '@/lib/sanitizeUrl';
|
import { normalizeUrlInput, sanitizeUrl, isValidEmail } from '@/lib/sanitizeUrl';
|
||||||
|
|
@ -327,7 +328,7 @@ export function CraftProfileForm({ config }: { config: CraftFormConfig }) {
|
||||||
if (website.trim()) tags.push(['website', normalizeUrlInput(website)]);
|
if (website.trim()) tags.push(['website', normalizeUrlInput(website)]);
|
||||||
if (portfolio.trim()) tags.push(['portfolio', normalizeUrlInput(portfolio)]);
|
if (portfolio.trim()) tags.push(['portfolio', normalizeUrlInput(portfolio)]);
|
||||||
if (social.trim()) tags.push(['social', normalizeUrlInput(social)]);
|
if (social.trim()) tags.push(['social', normalizeUrlInput(social)]);
|
||||||
if (isValidNoffer(noffer.trim())) tags.push(['noffer', noffer.trim().toLowerCase()]);
|
if (isValidNoffer(noffer.trim())) tags.push(['noffer', normalizeClinkCode(noffer)]);
|
||||||
|
|
||||||
// Craft-specific extras
|
// Craft-specific extras
|
||||||
for (const f of extraFields) {
|
for (const f of extraFields) {
|
||||||
|
|
|
||||||
|
|
@ -23,12 +23,13 @@ import { isCrewVideoUrl, parseCrewVideo } from '@/lib/videoEmbed';
|
||||||
import { CrewSponsorPicker } from '@/components/crew/CrewSponsorPicker';
|
import { CrewSponsorPicker } from '@/components/crew/CrewSponsorPicker';
|
||||||
import { NofferField } from '@/components/NofferField';
|
import { NofferField } from '@/components/NofferField';
|
||||||
import { SKATE_CREW_KIND, SKATE_SPOT_KIND, SKATE_SHOP_KIND, parseAddrCoord, ZAP_GOAL_KIND, CREW_VIBE_LABELS, CREW_FOCUS_LABELS, CREW_FOCUS_DESCRIPTIONS, CREW_FOCUS_TAG, CREW_LOOKING_FOR_OPTIONS, CREW_ROLE_META, CREW_ROLE_ORDER, SHOW_CREW_TREASURY, isValidNoffer, type SkateCrew, type CrewFocus, type CrewRole } from '@/lib/types';
|
import { SKATE_CREW_KIND, SKATE_SPOT_KIND, SKATE_SHOP_KIND, parseAddrCoord, ZAP_GOAL_KIND, CREW_VIBE_LABELS, CREW_FOCUS_LABELS, CREW_FOCUS_DESCRIPTIONS, CREW_FOCUS_TAG, CREW_LOOKING_FOR_OPTIONS, CREW_ROLE_META, CREW_ROLE_ORDER, SHOW_CREW_TREASURY, isValidNoffer, type SkateCrew, type CrewFocus, type CrewRole } from '@/lib/types';
|
||||||
|
import { normalizeClinkCode } from '@/lib/clink';
|
||||||
import { CREW_VIBE_KEYS, CREW_FOCUS_KEYS, CREW_FOCUS_DESC_KEYS, CREW_LOOKING_FOR_KEYS, CREW_ROLE_KEYS } from '@/lib/labelKeys';
|
import { CREW_VIBE_KEYS, CREW_FOCUS_KEYS, CREW_FOCUS_DESC_KEYS, CREW_LOOKING_FOR_KEYS, CREW_ROLE_KEYS } from '@/lib/labelKeys';
|
||||||
import { useCrewGoal } from '@/hooks/useCrewGoal';
|
import { useCrewGoal } from '@/hooks/useCrewGoal';
|
||||||
import { useCoordinator, useCoordinatorHealth } from '@/hooks/useCoordinator';
|
import { useCoordinator, useCoordinatorHealth } from '@/hooks/useCoordinator';
|
||||||
import { normalizeUrlInput, sanitizeUrl } from '@/lib/sanitizeUrl';
|
import { normalizeUrlInput, sanitizeUrl } from '@/lib/sanitizeUrl';
|
||||||
import { Nip05HandlesEditor } from '@/components/Nip05HandlesEditor';
|
import { Nip05HandlesEditor } from '@/components/Nip05HandlesEditor';
|
||||||
import { coordinatorAddUrl, crewCoordinatorInputValue, parseCrewCoordinatorInput, shortNpub, SKATESPOTS_COORDINATOR } from '@/lib/coordinator';
|
import { coordinatorAddUrl, crewCoordinatorInputValue, parseCrewCoordinatorInput, parseOperatorPubkey, shortNpub, SKATESPOTS_COORDINATOR, CORDN_DEPLOY_KIT_URL } from '@/lib/coordinator';
|
||||||
import { useRelays } from '@/lib/relays';
|
import { useRelays } from '@/lib/relays';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
import { Users, Upload, X, Loader2, MapPin, Plus, ShieldCheck, AtSign, HardHat, Camera, GraduationCap, Sparkles, Target, Megaphone, Music, Palette, Dumbbell, Eye, Store, Film, Check, ArrowRight, ArrowLeft as ArrowLeftIcon, Server, ChevronDown, Zap } from 'lucide-react';
|
import { Users, Upload, X, Loader2, MapPin, Plus, ShieldCheck, AtSign, HardHat, Camera, GraduationCap, Sparkles, Target, Megaphone, Music, Palette, Dumbbell, Eye, Store, Film, Check, ArrowRight, ArrowLeft as ArrowLeftIcon, Server, ChevronDown, Zap } from 'lucide-react';
|
||||||
|
|
@ -335,6 +336,7 @@ export function CrewForm({ existing }: CrewFormProps) {
|
||||||
crewCoordinatorInputValue(existing?.coordinator) ||
|
crewCoordinatorInputValue(existing?.coordinator) ||
|
||||||
(isEditing ? '' : crewCoordinatorInputValue({ url: SKATESPOTS_COORDINATOR.relays[0], pubkey: SKATESPOTS_COORDINATOR.pubkey })),
|
(isEditing ? '' : crewCoordinatorInputValue({ url: SKATESPOTS_COORDINATOR.relays[0], pubkey: SKATESPOTS_COORDINATOR.pubkey })),
|
||||||
);
|
);
|
||||||
|
const [coordinatorOperator, setCoordinatorOperator] = useState(existing?.coordinator?.operator ?? '');
|
||||||
// The coordinator the user set in Settings → Coordinator, for a one-tap prefill.
|
// The coordinator the user set in Settings → Coordinator, for a one-tap prefill.
|
||||||
const { coordinator: myCoordinator } = useCoordinator();
|
const { coordinator: myCoordinator } = useCoordinator();
|
||||||
// Live parse so the founder gets feedback (and the publish path reuses it).
|
// Live parse so the founder gets feedback (and the publish path reuses it).
|
||||||
|
|
@ -493,6 +495,11 @@ export function CrewForm({ existing }: CrewFormProps) {
|
||||||
toast({ title: t('socialUi.coordinator.invalid'), variant: 'destructive' });
|
toast({ title: t('socialUi.coordinator.invalid'), variant: 'destructive' });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
const operatorPubkey = coordinatorOperator.trim() ? parseOperatorPubkey(coordinatorOperator) : null;
|
||||||
|
if (coordinatorOperator.trim() && !operatorPubkey) {
|
||||||
|
toast({ title: t('socialUi.coordinator.invalidOperator'), variant: 'destructive' });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const identifier = existing?.identifier ?? `crew-${Date.now().toString(36)}`;
|
const identifier = existing?.identifier ?? `crew-${Date.now().toString(36)}`;
|
||||||
|
|
@ -571,7 +578,7 @@ export function CrewForm({ existing }: CrewFormProps) {
|
||||||
if (s.trim()) tags.push(['social', s.trim()]);
|
if (s.trim()) tags.push(['social', s.trim()]);
|
||||||
}
|
}
|
||||||
for (const handle of nip05s) tags.push(['nip05', handle]);
|
for (const handle of nip05s) tags.push(['nip05', handle]);
|
||||||
if (isValidNoffer(noffer.trim())) tags.push(['noffer', noffer.trim().toLowerCase()]);
|
if (isValidNoffer(noffer.trim())) tags.push(['noffer', normalizeClinkCode(noffer)]);
|
||||||
|
|
||||||
// Members: admins get an `admin` role marker on their `p` tag.
|
// Members: admins get an `admin` role marker on their `p` tag.
|
||||||
for (const pk of members) {
|
for (const pk of members) {
|
||||||
|
|
@ -613,6 +620,10 @@ export function CrewForm({ existing }: CrewFormProps) {
|
||||||
if (parsedCoordinator) {
|
if (parsedCoordinator) {
|
||||||
const coordinatorTag = ['coordinator', parsedCoordinator.url];
|
const coordinatorTag = ['coordinator', parsedCoordinator.url];
|
||||||
if (parsedCoordinator.pubkey) coordinatorTag.push(parsedCoordinator.pubkey);
|
if (parsedCoordinator.pubkey) coordinatorTag.push(parsedCoordinator.pubkey);
|
||||||
|
if (operatorPubkey) {
|
||||||
|
if (!parsedCoordinator.pubkey) coordinatorTag.push('');
|
||||||
|
coordinatorTag.push(operatorPubkey);
|
||||||
|
}
|
||||||
tags.push(coordinatorTag);
|
tags.push(coordinatorTag);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1183,6 +1194,15 @@ export function CrewForm({ existing }: CrewFormProps) {
|
||||||
>
|
>
|
||||||
{t('socialUi.coordinator.cordnCoordinator')}
|
{t('socialUi.coordinator.cordnCoordinator')}
|
||||||
</a>
|
</a>
|
||||||
|
{' · '}
|
||||||
|
<a
|
||||||
|
href={CORDN_DEPLOY_KIT_URL}
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
className="text-teal-400 underline underline-offset-2 hover:text-teal-300"
|
||||||
|
>
|
||||||
|
{t('common.learnMore')}
|
||||||
|
</a>
|
||||||
.
|
.
|
||||||
</p>
|
</p>
|
||||||
<div className="flex gap-2">
|
<div className="flex gap-2">
|
||||||
|
|
@ -1232,6 +1252,21 @@ export function CrewForm({ existing }: CrewFormProps) {
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
<div className="space-y-1.5">
|
||||||
|
<Label htmlFor="crew-coordinator-operator" className="text-xs text-gray-400">
|
||||||
|
{t('socialUi.coordinator.operatorLabel')}
|
||||||
|
</Label>
|
||||||
|
<Input
|
||||||
|
id="crew-coordinator-operator"
|
||||||
|
placeholder={t('socialUi.coordinator.operatorPlaceholder')}
|
||||||
|
value={coordinatorOperator}
|
||||||
|
onChange={(e) => setCoordinatorOperator(e.target.value)}
|
||||||
|
className="bg-gray-800 border-gray-700 font-mono text-xs"
|
||||||
|
spellCheck={false}
|
||||||
|
/>
|
||||||
|
<p className="text-[10px] text-gray-600">{t('socialUi.coordinator.operatorHint')}</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div className="space-y-1.5">
|
<div className="space-y-1.5">
|
||||||
<Label htmlFor="crew-cordn-group" className="text-xs text-gray-400">{t('socialUi.form.cordnGroup')}</Label>
|
<Label htmlFor="crew-cordn-group" className="text-xs text-gray-400">{t('socialUi.form.cordnGroup')}</Label>
|
||||||
<Input
|
<Input
|
||||||
|
|
|
||||||
|
|
@ -7,10 +7,10 @@ import {
|
||||||
DEFAULT_TAB_IDS,
|
DEFAULT_TAB_IDS,
|
||||||
type NavTab,
|
type NavTab,
|
||||||
} from '@/hooks/useNavPreferences';
|
} from '@/hooks/useNavPreferences';
|
||||||
import { useCurrentUser } from '@/hooks/useCurrentUser';
|
|
||||||
import { useTranslation } from '@/contexts/language';
|
import { useTranslation } from '@/contexts/language';
|
||||||
|
import { useCurrentUser } from '@/hooks/useCurrentUser';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
import { MapPin, User, Lock, ArrowUp, ArrowDown, RotateCcw, Check, Sparkles } from 'lucide-react';
|
import { MapPin, MoreHorizontal, Lock, ArrowUp, ArrowDown, RotateCcw, Check, Sparkles } from 'lucide-react';
|
||||||
|
|
||||||
interface CustomizeNavSheetProps {
|
interface CustomizeNavSheetProps {
|
||||||
open: boolean;
|
open: boolean;
|
||||||
|
|
@ -20,14 +20,14 @@ interface CustomizeNavSheetProps {
|
||||||
/**
|
/**
|
||||||
* Bottom-sheet editor for the mobile nav bar.
|
* Bottom-sheet editor for the mobile nav bar.
|
||||||
*
|
*
|
||||||
* Layout model: Map (fixed left) · 3 user-picked · Profile (fixed right).
|
* Layout model: Map (fixed left) · 3 user-picked · More (fixed right).
|
||||||
* The user toggles up to 3 destinations from the catalog and can reorder them.
|
* The user toggles up to 3 destinations from the catalog and can reorder them.
|
||||||
* Draft state is local until "Done", so changes feel deliberate and cancelable.
|
* Draft state is local until "Done", so changes feel deliberate and cancelable.
|
||||||
*/
|
*/
|
||||||
export function CustomizeNavSheet({ open, onOpenChange }: CustomizeNavSheetProps) {
|
export function CustomizeNavSheet({ open, onOpenChange }: CustomizeNavSheetProps) {
|
||||||
const { middleIds, setMiddleIds, reset, catalog } = useNavPreferences();
|
const { middleIds, setMiddleIds, reset, catalog } = useNavPreferences();
|
||||||
const { user } = useCurrentUser();
|
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
|
const { user } = useCurrentUser();
|
||||||
|
|
||||||
// Local draft so we can cancel without persisting.
|
// Local draft so we can cancel without persisting.
|
||||||
const [draft, setDraft] = useState<string[]>(middleIds);
|
const [draft, setDraft] = useState<string[]>(middleIds);
|
||||||
|
|
@ -115,8 +115,8 @@ export function CustomizeNavSheet({ open, onOpenChange }: CustomizeNavSheetProps
|
||||||
}
|
}
|
||||||
return <PreviewSlot key={tab.id} icon={tab.icon} label={label(tab)} accent="#ff0040" />;
|
return <PreviewSlot key={tab.id} icon={tab.icon} label={label(tab)} accent="#ff0040" />;
|
||||||
})}
|
})}
|
||||||
{/* Fixed Profile */}
|
{/* Fixed More */}
|
||||||
<PreviewSlot icon={User} label={isLoggedIn ? t('navSheet.profile') : t('navSheet.login')} locked accent="#ff0040" />
|
<PreviewSlot icon={MoreHorizontal} label={t('nav.more')} locked accent="#ff0040" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1002,10 +1002,10 @@ export function DeckCostCalculator() {
|
||||||
a.click();
|
a.click();
|
||||||
};
|
};
|
||||||
|
|
||||||
// Multi-sheet XLSX workbook (lazy — SheetJS is only loaded on demand).
|
// Multi-sheet XLSX workbook (lazy — our tiny local OOXML writer is only
|
||||||
|
// loaded when the user asks for the spreadsheet).
|
||||||
const exportXlsx = async () => {
|
const exportXlsx = async () => {
|
||||||
const XLSX = await import('xlsx');
|
const { downloadXlsx } = await import('@/lib/xlsx');
|
||||||
const wb = XLSX.utils.book_new();
|
|
||||||
const num = (v: number) => Number(v.toFixed(4));
|
const num = (v: number) => Number(v.toFixed(4));
|
||||||
const summary: (string | number)[][] = [
|
const summary: (string | number)[][] = [
|
||||||
[t('legacyMiscUi.exportTitle')],
|
[t('legacyMiscUi.exportTitle')],
|
||||||
|
|
@ -1024,24 +1024,29 @@ export function DeckCostCalculator() {
|
||||||
[t('legacyMiscUi.exportKvProcessesPerBoard'), num(r.processes)],
|
[t('legacyMiscUi.exportKvProcessesPerBoard'), num(r.processes)],
|
||||||
[t('legacyMiscUi.exportKvPackagingPerBoard'), num(r.packaging)],
|
[t('legacyMiscUi.exportKvPackagingPerBoard'), num(r.packaging)],
|
||||||
];
|
];
|
||||||
XLSX.utils.book_append_sheet(wb, XLSX.utils.aoa_to_sheet(summary), t('legacyMiscUi.exportXlsxSummary'));
|
const equipment: (string | number)[][] = [
|
||||||
XLSX.utils.book_append_sheet(wb, XLSX.utils.aoa_to_sheet([
|
|
||||||
[t('legacyMiscUi.exportSectionEquipment'), t('legacyMiscUi.exportColCost'), t('legacyMiscUi.exportColSetupH'), t('legacyMiscUi.exportColBoards'), t('legacyMiscUi.exportColPerBoard')],
|
[t('legacyMiscUi.exportSectionEquipment'), t('legacyMiscUi.exportColCost'), t('legacyMiscUi.exportColSetupH'), t('legacyMiscUi.exportColBoards'), t('legacyMiscUi.exportColPerBoard')],
|
||||||
...s.equipment.map((e) => [e.name, e.cost, e.setupHrs, e.boards, num(e.boards > 0 ? (e.cost + e.setupHrs * r.laborPerHr) / e.boards : 0)]),
|
...s.equipment.map((e) => [e.name, e.cost, e.setupHrs, e.boards, num(e.boards > 0 ? (e.cost + e.setupHrs * r.laborPerHr) / e.boards : 0)]),
|
||||||
]), t('legacyMiscUi.exportSectionEquipment'));
|
];
|
||||||
XLSX.utils.book_append_sheet(wb, XLSX.utils.aoa_to_sheet([
|
const materials: (string | number)[][] = [
|
||||||
[t('legacyMiscUi.exportColMaterial'), t('legacyMiscUi.exportColOrderCost'), t('legacyMiscUi.exportColShipping'), t('legacyMiscUi.exportColBoards'), t('legacyMiscUi.exportColOrderMin'), t('legacyMiscUi.exportColUnloadMin'), t('legacyMiscUi.exportColPerBoard')],
|
[t('legacyMiscUi.exportColMaterial'), t('legacyMiscUi.exportColOrderCost'), t('legacyMiscUi.exportColShipping'), t('legacyMiscUi.exportColBoards'), t('legacyMiscUi.exportColOrderMin'), t('legacyMiscUi.exportColUnloadMin'), t('legacyMiscUi.exportColPerBoard')],
|
||||||
...s.materials.map((m) => [m.name, m.orderCost, m.shipping, m.boards, m.orderMin, m.unloadMin, num(m.boards > 0 ? (m.orderCost + m.shipping + (m.orderMin + m.unloadMin) * r.laborPerMin) / m.boards : 0)]),
|
...s.materials.map((m) => [m.name, m.orderCost, m.shipping, m.boards, m.orderMin, m.unloadMin, num(m.boards > 0 ? (m.orderCost + m.shipping + (m.orderMin + m.unloadMin) * r.laborPerMin) / m.boards : 0)]),
|
||||||
]), t('legacyMiscUi.exportSectionMaterials'));
|
];
|
||||||
XLSX.utils.book_append_sheet(wb, XLSX.utils.aoa_to_sheet([
|
const processes: (string | number)[][] = [
|
||||||
[t('legacyMiscUi.exportColProcess'), t('legacyMiscUi.exportColTimeMin'), t('legacyMiscUi.exportColBoards'), t('legacyMiscUi.exportColPerBoard')],
|
[t('legacyMiscUi.exportColProcess'), t('legacyMiscUi.exportColTimeMin'), t('legacyMiscUi.exportColBoards'), t('legacyMiscUi.exportColPerBoard')],
|
||||||
...s.processes.map((p) => [p.name, p.minutes, p.boards, p.rate, p.scrapPct, num(p.boards > 0 ? (p.minutes * ((p.rate > 0 ? p.rate : r.laborPerHr) / 60)) / p.boards : 0)]),
|
...s.processes.map((p) => [p.name, p.minutes, p.boards, p.rate, p.scrapPct, num(p.boards > 0 ? (p.minutes * ((p.rate > 0 ? p.rate : r.laborPerHr) / 60)) / p.boards : 0)]),
|
||||||
]), t('legacyMiscUi.exportLabelProcesses'));
|
];
|
||||||
XLSX.utils.book_append_sheet(wb, XLSX.utils.aoa_to_sheet([
|
const packaging: (string | number)[][] = [
|
||||||
[t('legacyMiscUi.exportSectionPackaging'), t('legacyMiscUi.exportColTimeBoardMin'), t('legacyMiscUi.exportColMaterialsBoard'), t('legacyMiscUi.exportColPerBoard')],
|
[t('legacyMiscUi.exportSectionPackaging'), t('legacyMiscUi.exportColTimeBoardMin'), t('legacyMiscUi.exportColMaterialsBoard'), t('legacyMiscUi.exportColPerBoard')],
|
||||||
...s.packaging.map((p) => [p.name, p.minutesPerBoard, p.materialsPerBoard, num(p.materialsPerBoard + p.minutesPerBoard * r.laborPerMin)]),
|
...s.packaging.map((p) => [p.name, p.minutesPerBoard, p.materialsPerBoard, num(p.materialsPerBoard + p.minutesPerBoard * r.laborPerMin)]),
|
||||||
]), t('legacyMiscUi.exportSectionPackaging'));
|
];
|
||||||
XLSX.writeFile(wb, `deck-cost-${new Date().toISOString().slice(0, 10)}.xlsx`);
|
downloadXlsx(`deck-cost-${new Date().toISOString().slice(0, 10)}.xlsx`, [
|
||||||
|
{ name: t('legacyMiscUi.exportXlsxSummary'), rows: summary },
|
||||||
|
{ name: t('legacyMiscUi.exportSectionEquipment'), rows: equipment },
|
||||||
|
{ name: t('legacyMiscUi.exportSectionMaterials'), rows: materials },
|
||||||
|
{ name: t('legacyMiscUi.exportLabelProcesses'), rows: processes },
|
||||||
|
{ name: t('legacyMiscUi.exportSectionPackaging'), rows: packaging },
|
||||||
|
]);
|
||||||
};
|
};
|
||||||
|
|
||||||
const copySummary = async () => {
|
const copySummary = async () => {
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ import { Input } from '@/components/ui/input';
|
||||||
import { Textarea } from '@/components/ui/textarea';
|
import { Textarea } from '@/components/ui/textarea';
|
||||||
import { Switch } from '@/components/ui/switch';
|
import { Switch } from '@/components/ui/switch';
|
||||||
import { Label } from '@/components/ui/label';
|
import { Label } from '@/components/ui/label';
|
||||||
import { Loader2, Upload, Zap, ShieldCheck, AlertCircle, Bitcoin, Award, MessageSquareLock, UserRound, X, Plus, Bot, BadgeCheck, HelpCircle, Server, AtSign } from 'lucide-react';
|
import { Loader2, Upload, Zap, ShieldCheck, AlertCircle, Bitcoin, Award, MessageSquareLock, UserRound, Handshake, X, Plus, Bot, BadgeCheck, HelpCircle, Server, AtSign } from 'lucide-react';
|
||||||
import { NSchema as n, type NostrMetadata } from '@nostrify/nostrify';
|
import { NSchema as n, type NostrMetadata } from '@nostrify/nostrify';
|
||||||
import { useQueryClient } from '@tanstack/react-query';
|
import { useQueryClient } from '@tanstack/react-query';
|
||||||
import { useUploadFile } from '@/hooks/useUploadFile';
|
import { useUploadFile } from '@/hooks/useUploadFile';
|
||||||
|
|
@ -30,6 +30,7 @@ import { Nip05HandlesEditor } from '@/components/Nip05HandlesEditor';
|
||||||
import { SkateNip05Input } from '@/components/SkateNip05Input';
|
import { SkateNip05Input } from '@/components/SkateNip05Input';
|
||||||
import { SKATE_NIP05_DOMAIN, parseSkateNip05 } from '@/lib/skateNip05';
|
import { SKATE_NIP05_DOMAIN, parseSkateNip05 } from '@/lib/skateNip05';
|
||||||
import { isValidNoffer, isValidSilentPayment, isValidLightningAddress } from '@/lib/types';
|
import { isValidNoffer, isValidSilentPayment, isValidLightningAddress } from '@/lib/types';
|
||||||
|
import { normalizeClinkCode } from '@/lib/clink';
|
||||||
import { useTranslation } from '@/contexts/language';
|
import { useTranslation } from '@/contexts/language';
|
||||||
|
|
||||||
export const EditProfileForm: React.FC = () => {
|
export const EditProfileForm: React.FC = () => {
|
||||||
|
|
@ -52,7 +53,7 @@ export const EditProfileForm: React.FC = () => {
|
||||||
// Lightning address (LUD-16). Part of NostrMetadata but not in the default
|
// Lightning address (LUD-16). Part of NostrMetadata but not in the default
|
||||||
// form fields, so we manage it here and merge it on save.
|
// form fields, so we manage it here and merge it on save.
|
||||||
const [lud16, setLud16] = useState('');
|
const [lud16, setLud16] = useState('');
|
||||||
const lud16Trimmed = lud16.trim();
|
const lud16Trimmed = lud16.trim().replace(/^lightning:\/\//i, '').replace(/^lightning:/i, '');
|
||||||
const lud16Invalid = lud16Trimmed.length > 0 && !isValidLightningAddress(lud16Trimmed);
|
const lud16Invalid = lud16Trimmed.length > 0 && !isValidLightningAddress(lud16Trimmed);
|
||||||
|
|
||||||
// Bitcoin Silent Payment address (BIP-352). Custom kind-0 field.
|
// Bitcoin Silent Payment address (BIP-352). Custom kind-0 field.
|
||||||
|
|
@ -72,6 +73,8 @@ export const EditProfileForm: React.FC = () => {
|
||||||
// pointer formats as Settings → Coordinator (nprofile / cordn.net link /
|
// pointer formats as Settings → Coordinator (nprofile / cordn.net link /
|
||||||
// npub / hex) as well as an http(s) URL — this is the discovery field.
|
// npub / hex) as well as an http(s) URL — this is the discovery field.
|
||||||
const [cordn, setCordn] = useState('');
|
const [cordn, setCordn] = useState('');
|
||||||
|
const [openToSponsorships, setOpenToSponsorships] = useState(false);
|
||||||
|
const [sponsorNote, setSponsorNote] = useState('');
|
||||||
|
|
||||||
// Extra personal NIP-05 handles — stored in a separate kind-30078 record so
|
// Extra personal NIP-05 handles — stored in a separate kind-30078 record so
|
||||||
// another client re-saving the profile can't drop them.
|
// another client re-saving the profile can't drop them.
|
||||||
|
|
@ -131,6 +134,8 @@ export const EditProfileForm: React.FC = () => {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
if (typeof raw.cordn === 'string') setCordn(raw.cordn);
|
if (typeof raw.cordn === 'string') setCordn(raw.cordn);
|
||||||
|
setOpenToSponsorships(raw.sponsorships_open === true);
|
||||||
|
if (typeof raw.sponsorships_note === 'string') setSponsorNote(raw.sponsorships_note);
|
||||||
}
|
}
|
||||||
}, [metadata, form]);
|
}, [metadata, form]);
|
||||||
|
|
||||||
|
|
@ -220,7 +225,7 @@ export const EditProfileForm: React.FC = () => {
|
||||||
|
|
||||||
// Merge the custom CLINK offer code (or remove it when cleared).
|
// Merge the custom CLINK offer code (or remove it when cleared).
|
||||||
if (nofferValid) {
|
if (nofferValid) {
|
||||||
data.noffer = nofferTrimmed.toLowerCase();
|
data.noffer = normalizeClinkCode(nofferTrimmed);
|
||||||
} else {
|
} else {
|
||||||
delete data.noffer;
|
delete data.noffer;
|
||||||
}
|
}
|
||||||
|
|
@ -252,6 +257,17 @@ export const EditProfileForm: React.FC = () => {
|
||||||
// Retire the legacy field now that badges supersede it.
|
// Retire the legacy field now that badges supersede it.
|
||||||
delete data.sponsors;
|
delete data.sponsors;
|
||||||
|
|
||||||
|
// Sponsorship opt-in (custom kind-0 fields). The profile only claims
|
||||||
|
// this when the skater explicitly turned it on.
|
||||||
|
if (openToSponsorships) {
|
||||||
|
data.sponsorships_open = true;
|
||||||
|
if (sponsorNote.trim()) data.sponsorships_note = sponsorNote.trim();
|
||||||
|
else delete data.sponsorships_note;
|
||||||
|
} else {
|
||||||
|
delete data.sponsorships_open;
|
||||||
|
delete data.sponsorships_note;
|
||||||
|
}
|
||||||
|
|
||||||
// Cordn contact link (custom field).
|
// Cordn contact link (custom field).
|
||||||
if (cordnTrimmed) {
|
if (cordnTrimmed) {
|
||||||
// Normalise a bare pointer (nprofile/npub/hex) to Cordn's canonical
|
// Normalise a bare pointer (nprofile/npub/hex) to Cordn's canonical
|
||||||
|
|
@ -402,6 +418,41 @@ export const EditProfileForm: React.FC = () => {
|
||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
{/* Sponsorship opt-in — explicit consent, never inferred from activity. */}
|
||||||
|
<div className="space-y-3 rounded-xl border border-pink-500/20 bg-pink-500/[0.04] p-3">
|
||||||
|
<div className="flex items-center justify-between gap-3">
|
||||||
|
<div className="min-w-0">
|
||||||
|
<Label htmlFor="profile-open-sponsorships" className="flex items-center gap-2 text-sm font-semibold">
|
||||||
|
<Handshake className="h-4 w-4 text-pink-400" />
|
||||||
|
{t('settingsUi.editProfile.openToSponsorships')}
|
||||||
|
</Label>
|
||||||
|
<p className="mt-1 text-xs text-muted-foreground">
|
||||||
|
{t('settingsUi.editProfile.openToSponsorshipsHint')}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<Switch
|
||||||
|
id="profile-open-sponsorships"
|
||||||
|
checked={openToSponsorships}
|
||||||
|
onCheckedChange={setOpenToSponsorships}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
{openToSponsorships && (
|
||||||
|
<div className="space-y-1.5">
|
||||||
|
<Label htmlFor="profile-sponsor-note" className="text-xs font-bold uppercase tracking-wide text-pink-300">
|
||||||
|
{t('settingsUi.editProfile.sponsorNote')}
|
||||||
|
</Label>
|
||||||
|
<Textarea
|
||||||
|
id="profile-sponsor-note"
|
||||||
|
value={sponsorNote}
|
||||||
|
onChange={(event) => setSponsorNote(event.target.value)}
|
||||||
|
placeholder={t('settingsUi.editProfile.sponsorNotePlaceholder')}
|
||||||
|
maxLength={180}
|
||||||
|
rows={2}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
{/* NIP-05 — the verified-handle field. Given real prominence + live
|
{/* NIP-05 — the verified-handle field. Given real prominence + live
|
||||||
verification feedback so people know if it's actually working. */}
|
verification feedback so people know if it's actually working. */}
|
||||||
<FormField
|
<FormField
|
||||||
|
|
@ -443,6 +494,7 @@ export const EditProfileForm: React.FC = () => {
|
||||||
value={lud16}
|
value={lud16}
|
||||||
onChange={setLud16}
|
onChange={setLud16}
|
||||||
placeholder="you@yourdomain.com"
|
placeholder="you@yourdomain.com"
|
||||||
|
inputMode="email"
|
||||||
status={
|
status={
|
||||||
lud16Invalid
|
lud16Invalid
|
||||||
? { kind: 'error', text: t('settingsUi.editProfile.lud16Invalid') }
|
? { kind: 'error', text: t('settingsUi.editProfile.lud16Invalid') }
|
||||||
|
|
@ -663,7 +715,8 @@ const FieldRow: React.FC<{
|
||||||
onChange: (v: string) => void;
|
onChange: (v: string) => void;
|
||||||
placeholder: string;
|
placeholder: string;
|
||||||
status: { kind: 'hint' | 'ok' | 'error'; text: string };
|
status: { kind: 'hint' | 'ok' | 'error'; text: string };
|
||||||
}> = ({ id, icon, iconClass, label, value, onChange, placeholder, status }) => (
|
inputMode?: React.HTMLAttributes<HTMLInputElement>['inputMode'];
|
||||||
|
}> = ({ id, icon, iconClass, label, value, onChange, placeholder, status, inputMode }) => (
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
<Label htmlFor={id} className="flex items-center gap-2 text-sm font-semibold">
|
<Label htmlFor={id} className="flex items-center gap-2 text-sm font-semibold">
|
||||||
<span className={`h-6 w-6 rounded-lg flex items-center justify-center ${iconClass}`}>{icon}</span>
|
<span className={`h-6 w-6 rounded-lg flex items-center justify-center ${iconClass}`}>{icon}</span>
|
||||||
|
|
@ -676,6 +729,7 @@ const FieldRow: React.FC<{
|
||||||
onChange={(e) => onChange(e.target.value)}
|
onChange={(e) => onChange(e.target.value)}
|
||||||
spellCheck={false}
|
spellCheck={false}
|
||||||
autoCapitalize="none"
|
autoCapitalize="none"
|
||||||
|
inputMode={inputMode}
|
||||||
className="font-mono text-sm"
|
className="font-mono text-sm"
|
||||||
/>
|
/>
|
||||||
{status.kind === 'error' ? (
|
{status.kind === 'error' ? (
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
|
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
|
||||||
import { ZapDialog } from '@/components/ZapDialog';
|
import { LazyZapDialog } from '@/components/LazyZapDialog';
|
||||||
import { useZaps } from '@/hooks/useZaps';
|
import { useZaps } from '@/hooks/useZaps';
|
||||||
import { useWallet } from '@/hooks/useWallet';
|
import { useWallet } from '@/hooks/useWallet';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
|
|
@ -64,7 +64,7 @@ export function FundingGoalCard({
|
||||||
)}
|
)}
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<ZapDialog target={event}>
|
<LazyZapDialog target={event}>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className="flex w-full items-center justify-center gap-2 rounded-md bg-[#ccff00] py-2 text-sm font-bold uppercase tracking-wide text-black transition-colors hover:bg-[#ccff00]/90"
|
className="flex w-full items-center justify-center gap-2 rounded-md bg-[#ccff00] py-2 text-sm font-bold uppercase tracking-wide text-black transition-colors hover:bg-[#ccff00]/90"
|
||||||
|
|
@ -72,7 +72,7 @@ export function FundingGoalCard({
|
||||||
<Zap className="h-4 w-4" />
|
<Zap className="h-4 w-4" />
|
||||||
{reached ? 'Keep supporting' : 'Fund this event'}
|
{reached ? 'Keep supporting' : 'Fund this event'}
|
||||||
</button>
|
</button>
|
||||||
</ZapDialog>
|
</LazyZapDialog>
|
||||||
</CardContent>
|
</CardContent>
|
||||||
</Card>
|
</Card>
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,8 @@ import { Skeleton } from '@/components/ui/skeleton';
|
||||||
/** The Lab page's own ServiceType union (kept in sync with LabPage). */
|
/** The Lab page's own ServiceType union (kept in sync with LabPage). */
|
||||||
type ServiceType =
|
type ServiceType =
|
||||||
| 'coaching' | 'filming' | 'editing' | 'photography' | 'building'
|
| 'coaching' | 'filming' | 'editing' | 'photography' | 'building'
|
||||||
| 'art' | 'graffiti' | 'tattoo' | 'training' | 'music' | 'judging' | 'organizing' | 'barbering' | 'clothing';
|
| 'art' | 'graffiti' | 'tattoo' | 'training' | 'music' | 'judging' | 'organizing' | 'barbering' | 'clothing'
|
||||||
|
| 'transport';
|
||||||
|
|
||||||
/** Translate the Lab page's ServiceType into a crew focus scene (or null). */
|
/** Translate the Lab page's ServiceType into a crew focus scene (or null). */
|
||||||
function focusForLabService(serviceType: ServiceType): Exclude<CrewFocus, 'mixed'> | null {
|
function focusForLabService(serviceType: ServiceType): Exclude<CrewFocus, 'mixed'> | null {
|
||||||
|
|
@ -20,6 +21,7 @@ function focusForLabService(serviceType: ServiceType): Exclude<CrewFocus, 'mixed
|
||||||
case 'judging':
|
case 'judging':
|
||||||
case 'organizing':
|
case 'organizing':
|
||||||
case 'barbering':
|
case 'barbering':
|
||||||
|
case 'transport':
|
||||||
return null;
|
return null;
|
||||||
case 'art':
|
case 'art':
|
||||||
case 'graffiti':
|
case 'graffiti':
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ export function LabLinkField({ value, onChange, maxLinks = 8 }: LabLinkFieldProp
|
||||||
const { data: allProfiles } = useLabProfiles(200);
|
const { data: allProfiles } = useLabProfiles(200);
|
||||||
|
|
||||||
const typeLabel = (type: string) => {
|
const typeLabel = (type: string) => {
|
||||||
const known = ['coach', 'filmer', 'editor', 'photographer', 'builder', 'artist', 'graffiti', 'tattoo', 'trainer', 'musician', 'judge', 'barber', 'organizer'];
|
const known = ['coach', 'filmer', 'editor', 'photographer', 'builder', 'artist', 'graffiti', 'tattoo', 'trainer', 'musician', 'judge', 'barber', 'organizer', 'transport'];
|
||||||
return known.includes(type) ? t(`labUi.labLink.${type}`) : t('labUi.labLink.lab');
|
return known.includes(type) ? t(`labUi.labLink.${type}`) : t('labUi.labLink.lab');
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,8 @@ import { useTranslation } from '@/contexts/language';
|
||||||
import { LANGUAGE_OPTIONS } from '@/lib/languageOptions';
|
import { LANGUAGE_OPTIONS } from '@/lib/languageOptions';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
|
|
||||||
|
const VISIBLE_LANGUAGE_OPTIONS = LANGUAGE_OPTIONS.filter((language) => !language.hidden);
|
||||||
|
|
||||||
interface LanguageToggleProps {
|
interface LanguageToggleProps {
|
||||||
/** Show only the flag icon (compact mode) */
|
/** Show only the flag icon (compact mode) */
|
||||||
compact?: boolean;
|
compact?: boolean;
|
||||||
|
|
@ -65,13 +67,13 @@ export function LanguageToggle({ compact = false, inline = false, className, var
|
||||||
|
|
||||||
const safeQuery = query.trim().toLowerCase();
|
const safeQuery = query.trim().toLowerCase();
|
||||||
const filteredLanguages = safeQuery
|
const filteredLanguages = safeQuery
|
||||||
? LANGUAGE_OPTIONS.filter(
|
? VISIBLE_LANGUAGE_OPTIONS.filter(
|
||||||
(l) =>
|
(l) =>
|
||||||
l.name.toLowerCase().includes(safeQuery) ||
|
l.name.toLowerCase().includes(safeQuery) ||
|
||||||
l.nativeName.toLowerCase().includes(safeQuery) ||
|
l.nativeName.toLowerCase().includes(safeQuery) ||
|
||||||
l.code.toLowerCase().includes(safeQuery)
|
l.code.toLowerCase().includes(safeQuery)
|
||||||
)
|
)
|
||||||
: LANGUAGE_OPTIONS;
|
: VISIBLE_LANGUAGE_OPTIONS;
|
||||||
|
|
||||||
const currentLanguage =
|
const currentLanguage =
|
||||||
LANGUAGE_OPTIONS.find((l) => l.code === language) || LANGUAGE_OPTIONS[0];
|
LANGUAGE_OPTIONS.find((l) => l.code === language) || LANGUAGE_OPTIONS[0];
|
||||||
|
|
@ -196,7 +198,7 @@ export function LanguageSelector() {
|
||||||
<div className="space-y-3">
|
<div className="space-y-3">
|
||||||
<label className="text-sm font-medium">{t('settings.selectLanguage')}</label>
|
<label className="text-sm font-medium">{t('settings.selectLanguage')}</label>
|
||||||
<div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
|
<div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
|
||||||
{LANGUAGE_OPTIONS.map((lang) => (
|
{VISIBLE_LANGUAGE_OPTIONS.map((lang) => (
|
||||||
<button
|
<button
|
||||||
key={lang.code}
|
key={lang.code}
|
||||||
onClick={() => setLanguage(lang.code)}
|
onClick={() => setLanguage(lang.code)}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
import { useState, useRef, useEffect, lazy, Suspense } from 'react';
|
import { useState, useRef, useEffect, lazy, Suspense } from 'react';
|
||||||
import { Link, Outlet, useLocation } from 'react-router-dom';
|
import { Link, Outlet, useLocation, useNavigate } from 'react-router-dom';
|
||||||
import { nip19 } from 'nostr-tools';
|
import { nip19 } from 'nostr-tools';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
import { isNativePlatform } from '@/lib/platform';
|
import { isNativePlatform } from '@/lib/platform';
|
||||||
|
|
@ -39,7 +39,6 @@ import {
|
||||||
User,
|
User,
|
||||||
Plus,
|
Plus,
|
||||||
CheckCircle2,
|
CheckCircle2,
|
||||||
Database,
|
|
||||||
Package,
|
Package,
|
||||||
Heart,
|
Heart,
|
||||||
CreditCard,
|
CreditCard,
|
||||||
|
|
@ -52,10 +51,14 @@ import {
|
||||||
MessagesSquare,
|
MessagesSquare,
|
||||||
ChevronLeft,
|
ChevronLeft,
|
||||||
ChevronRight,
|
ChevronRight,
|
||||||
|
ChevronDown,
|
||||||
|
ArrowLeft,
|
||||||
Search,
|
Search,
|
||||||
|
SmilePlus,
|
||||||
} from 'lucide-react';
|
} from 'lucide-react';
|
||||||
import { OfflineIndicator } from '@/components/OfflineIndicator';
|
import { OfflineIndicator } from '@/components/OfflineIndicator';
|
||||||
import { UserStatusIndicator } from '@/components/UserStatusIndicator';
|
import { UserStatusIndicator } from '@/components/UserStatusIndicator';
|
||||||
|
import { SKATING_STATUSES, useUserStatus } from '@/hooks/useUserStatus';
|
||||||
import { Avatar, AvatarImage, AvatarFallback } from '@/components/ui/avatar';
|
import { Avatar, AvatarImage, AvatarFallback } from '@/components/ui/avatar';
|
||||||
import { useAuthor } from '@/hooks/useAuthor';
|
import { useAuthor } from '@/hooks/useAuthor';
|
||||||
import { genUserName } from '@/lib/genUserName';
|
import { genUserName } from '@/lib/genUserName';
|
||||||
|
|
@ -111,6 +114,30 @@ function hasCashuWalletHint(): boolean {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Page-level Suspense fallback. Keeps the header and bottom nav mounted while a
|
||||||
|
* lazy route chunk loads, so tapping a menu item never blanks the whole app.
|
||||||
|
* The fade is delayed slightly: a fast chunk resolves before it becomes visible.
|
||||||
|
*/
|
||||||
|
function RouteLoadingFallback() {
|
||||||
|
return (
|
||||||
|
<div className="container mx-auto max-w-5xl px-4 py-6" aria-hidden="true">
|
||||||
|
<div style={{ animation: 'pageFallbackIn 180ms ease 120ms both' }}>
|
||||||
|
<div className="animate-pulse motion-reduce:animate-none space-y-5">
|
||||||
|
<div className="h-8 w-48 rounded-lg bg-white/[0.07]" />
|
||||||
|
<div className="h-4 w-3/4 rounded bg-white/[0.05]" />
|
||||||
|
<div className="grid gap-3 pt-3 sm:grid-cols-2">
|
||||||
|
<div className="h-28 rounded-xl bg-white/[0.05]" />
|
||||||
|
<div className="h-28 rounded-xl bg-white/[0.05]" />
|
||||||
|
<div className="h-28 rounded-xl bg-white/[0.05]" />
|
||||||
|
<div className="h-28 rounded-xl bg-white/[0.05]" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
interface LayoutProps {
|
interface LayoutProps {
|
||||||
/** Page content. Optional: when rendered as a router layout (via <Outlet/>)
|
/** Page content. Optional: when rendered as a router layout (via <Outlet/>)
|
||||||
* there are no children. */
|
* there are no children. */
|
||||||
|
|
@ -159,6 +186,7 @@ function NavLink({
|
||||||
<Link
|
<Link
|
||||||
to={href}
|
to={href}
|
||||||
onClick={onClick}
|
onClick={onClick}
|
||||||
|
aria-current={isActive ? 'page' : undefined}
|
||||||
className={cn(
|
className={cn(
|
||||||
'flex min-w-0 items-center gap-3 px-4 py-3 rounded-xl text-left transition-all duration-200',
|
'flex min-w-0 items-center gap-3 px-4 py-3 rounded-xl text-left transition-all duration-200',
|
||||||
isActive
|
isActive
|
||||||
|
|
@ -195,8 +223,12 @@ function MobileHeaderUserMenu({
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<DropdownMenu>
|
<DropdownMenu>
|
||||||
<DropdownMenuTrigger asChild>
|
<div className="flex items-center gap-0.5">
|
||||||
<button className="touch-manipulation relative flex items-center gap-2 px-2 py-1.5 rounded-full bg-green-500/10 border border-green-500/30 active:scale-95 transition-transform">
|
<Link
|
||||||
|
to={`/${nip19.npubEncode(pubkey)}`}
|
||||||
|
aria-label={t('chromeUi.viewMyProfile')}
|
||||||
|
className="touch-manipulation relative flex items-center gap-1.5 rounded-l-full rounded-r-md border border-green-500/30 bg-green-500/10 px-1.5 py-1.5 transition-transform active:scale-95"
|
||||||
|
>
|
||||||
<Avatar className="h-7 w-7 border-2 border-green-500/50">
|
<Avatar className="h-7 w-7 border-2 border-green-500/50">
|
||||||
<AvatarImage src={avatar} alt={displayName} />
|
<AvatarImage src={avatar} alt={displayName} />
|
||||||
<AvatarFallback className="bg-green-500/20 text-green-400 text-[10px] font-bold">
|
<AvatarFallback className="bg-green-500/20 text-green-400 text-[10px] font-bold">
|
||||||
|
|
@ -205,14 +237,19 @@ function MobileHeaderUserMenu({
|
||||||
</Avatar>
|
</Avatar>
|
||||||
{/* Status indicator */}
|
{/* Status indicator */}
|
||||||
<UserStatusIndicator pubkey={pubkey} size="sm" />
|
<UserStatusIndicator pubkey={pubkey} size="sm" />
|
||||||
<span className="text-green-400 text-xs font-bold uppercase tracking-wide hidden xs:inline">
|
|
||||||
<CheckCircle2 className="h-3 w-3 inline mr-1" />
|
|
||||||
{t('chromeUi.inBadge')}
|
|
||||||
</span>
|
|
||||||
{/* Green online indicator dot */}
|
{/* Green online indicator dot */}
|
||||||
<span className="absolute -bottom-0.5 -right-0.5 w-2.5 h-2.5 bg-green-500 border-2 border-black rounded-full xs:hidden" />
|
<span className="absolute -bottom-0.5 -right-0.5 h-2.5 w-2.5 rounded-full border-2 border-black bg-green-500 xs:hidden" />
|
||||||
</button>
|
</Link>
|
||||||
</DropdownMenuTrigger>
|
<DropdownMenuTrigger asChild>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
aria-label={t('chromeUi.menu')}
|
||||||
|
className="flex h-9 w-5 items-center justify-center rounded-r-full text-green-400/80 transition-colors hover:text-green-300 active:scale-95"
|
||||||
|
>
|
||||||
|
<ChevronDown className="h-4 w-4" />
|
||||||
|
</button>
|
||||||
|
</DropdownMenuTrigger>
|
||||||
|
</div>
|
||||||
<DropdownMenuContent align="end" className="w-56 p-2 [&_[role=menuitem]]:min-h-11">
|
<DropdownMenuContent align="end" className="w-56 p-2 [&_[role=menuitem]]:min-h-11">
|
||||||
{/* User info header */}
|
{/* User info header */}
|
||||||
<div className="px-2 py-3 mb-2 rounded-lg bg-green-500/10 border border-green-500/20">
|
<div className="px-2 py-3 mb-2 rounded-lg bg-green-500/10 border border-green-500/20">
|
||||||
|
|
@ -248,12 +285,6 @@ function MobileHeaderUserMenu({
|
||||||
<span className="text-green-400 font-bold">{t('chromeUi.setStatus')}</span>
|
<span className="text-green-400 font-bold">{t('chromeUi.setStatus')}</span>
|
||||||
<span className="ml-auto text-xs text-green-500">🛹</span>
|
<span className="ml-auto text-xs text-green-500">🛹</span>
|
||||||
</DropdownMenuItem>
|
</DropdownMenuItem>
|
||||||
<DropdownMenuItem asChild>
|
|
||||||
<Link to="/create-spot" className="flex items-center gap-2 cursor-pointer">
|
|
||||||
<Plus className="h-4 w-4 text-[#ccff00]" />
|
|
||||||
<span className="text-[#ccff00] font-medium">{t('chromeUi.addSpot')}</span>
|
|
||||||
</Link>
|
|
||||||
</DropdownMenuItem>
|
|
||||||
<DropdownMenuItem asChild>
|
<DropdownMenuItem asChild>
|
||||||
<Link to={`/${nip19.npubEncode(pubkey)}`} className="flex items-center gap-2 cursor-pointer">
|
<Link to={`/${nip19.npubEncode(pubkey)}`} className="flex items-center gap-2 cursor-pointer">
|
||||||
<User className="h-4 w-4" />
|
<User className="h-4 w-4" />
|
||||||
|
|
@ -266,36 +297,6 @@ function MobileHeaderUserMenu({
|
||||||
{t('nav.settings')}
|
{t('nav.settings')}
|
||||||
</Link>
|
</Link>
|
||||||
</DropdownMenuItem>
|
</DropdownMenuItem>
|
||||||
<DropdownMenuItem asChild>
|
|
||||||
<Link to="/settings?section=mydata" className="flex items-center gap-2 cursor-pointer">
|
|
||||||
<Database className="h-4 w-4 text-[#ccff00]" />
|
|
||||||
<span className="text-[#ccff00]">{t('chromeUi.myData')}</span>
|
|
||||||
</Link>
|
|
||||||
</DropdownMenuItem>
|
|
||||||
<DropdownMenuItem asChild>
|
|
||||||
<Link to="/stash" className="flex items-center gap-2 cursor-pointer">
|
|
||||||
<Package className="h-4 w-4 text-purple-400" />
|
|
||||||
<span className="text-purple-400">{t('chromeUi.myStash')}</span>
|
|
||||||
</Link>
|
|
||||||
</DropdownMenuItem>
|
|
||||||
<DropdownMenuItem asChild>
|
|
||||||
<Link to="/wallet" className="flex items-center gap-2 cursor-pointer">
|
|
||||||
<Wallet className="h-4 w-4 text-orange-400" />
|
|
||||||
<span className="text-orange-400">{t('nav.wallet')}</span>
|
|
||||||
</Link>
|
|
||||||
</DropdownMenuItem>
|
|
||||||
<DropdownMenuItem asChild>
|
|
||||||
<Link to="/leaderboards" className="flex items-center gap-2 cursor-pointer">
|
|
||||||
<BarChart3 className="h-4 w-4 text-[#ccff00]" />
|
|
||||||
<span className="text-[#ccff00]">{t('nav.leaderboards')}</span>
|
|
||||||
</Link>
|
|
||||||
</DropdownMenuItem>
|
|
||||||
<DropdownMenuItem asChild>
|
|
||||||
<Link to="/marketplace" className="flex items-center gap-2 cursor-pointer">
|
|
||||||
<Package className="h-4 w-4 text-orange-400" />
|
|
||||||
<span className="text-orange-400">{t('nav.marketplace')}</span>
|
|
||||||
</Link>
|
|
||||||
</DropdownMenuItem>
|
|
||||||
|
|
||||||
{/* ── Accounts: switch between logged-in npubs + add another ── */}
|
{/* ── Accounts: switch between logged-in npubs + add another ── */}
|
||||||
<DropdownMenuSeparator />
|
<DropdownMenuSeparator />
|
||||||
|
|
@ -342,21 +343,17 @@ function MobileHeaderUserMenu({
|
||||||
function MobileNav({
|
function MobileNav({
|
||||||
isActive,
|
isActive,
|
||||||
isLoggedIn,
|
isLoggedIn,
|
||||||
userPubkey,
|
|
||||||
userAvatar,
|
|
||||||
userName,
|
|
||||||
t,
|
t,
|
||||||
onCustomize,
|
onCustomize,
|
||||||
|
onMore,
|
||||||
fixedMapTab,
|
fixedMapTab,
|
||||||
middleTabs,
|
middleTabs,
|
||||||
}: {
|
}: {
|
||||||
isActive: (path: string) => boolean;
|
isActive: (path: string) => boolean;
|
||||||
isLoggedIn: boolean;
|
isLoggedIn: boolean;
|
||||||
userPubkey?: string;
|
|
||||||
userAvatar?: string;
|
|
||||||
userName?: string;
|
|
||||||
t: (key: string) => string;
|
t: (key: string) => string;
|
||||||
onCustomize: () => void;
|
onCustomize: () => void;
|
||||||
|
onMore: () => void;
|
||||||
fixedMapTab: NavTab;
|
fixedMapTab: NavTab;
|
||||||
middleTabs: NavTab[];
|
middleTabs: NavTab[];
|
||||||
}) {
|
}) {
|
||||||
|
|
@ -399,6 +396,7 @@ function MobileNav({
|
||||||
<Link
|
<Link
|
||||||
key={key}
|
key={key}
|
||||||
to={tab.href}
|
to={tab.href}
|
||||||
|
aria-current={active ? 'page' : undefined}
|
||||||
onTouchStart={startPress}
|
onTouchStart={startPress}
|
||||||
onTouchEnd={cancelPress}
|
onTouchEnd={cancelPress}
|
||||||
onTouchMove={cancelPress}
|
onTouchMove={cancelPress}
|
||||||
|
|
@ -457,73 +455,84 @@ function MobileNav({
|
||||||
{/* CUSTOM: 3 middle tabs */}
|
{/* CUSTOM: 3 middle tabs */}
|
||||||
{resolvedMiddle.map((tab, i) => renderTab(tab, `mid-${tab.id}-${i}`))}
|
{resolvedMiddle.map((tab, i) => renderTab(tab, `mid-${tab.id}-${i}`))}
|
||||||
|
|
||||||
{/* FIXED: Profile / Login tab.
|
{/* FIXED: More — the burger menu owns profile, login, wallet,
|
||||||
Logged in → your public profile (View Profile).
|
settings and every secondary section. */}
|
||||||
Logged out → Settings (login lives there).
|
<button
|
||||||
Long-press / right-click still opens nav customization. */}
|
type="button"
|
||||||
{(() => {
|
onClick={onMore}
|
||||||
const profileHref = isLoggedIn && userPubkey ? `/${nip19.npubEncode(userPubkey)}` : '/settings';
|
className="group relative flex flex-1 touch-manipulation flex-col items-center justify-center gap-1 px-1 py-1.5 active:scale-90 transition-transform duration-150 text-gray-500"
|
||||||
const tabActive = isActive(profileHref);
|
aria-label={t('nav.more')}
|
||||||
return (
|
>
|
||||||
<Link
|
<span className="relative flex h-9 w-12 items-center justify-center rounded-2xl bg-transparent transition-all duration-300">
|
||||||
to={profileHref}
|
<MoreHorizontal className="h-[22px] w-[22px] transition-transform duration-300 group-active:scale-95" />
|
||||||
onTouchStart={startPress}
|
</span>
|
||||||
onTouchEnd={cancelPress}
|
<span className="block w-full truncate text-center text-[9px] xs:text-[10px] font-semibold uppercase leading-tight tracking-wide">
|
||||||
onTouchMove={cancelPress}
|
{t('nav.more')}
|
||||||
onContextMenu={(e) => {
|
</span>
|
||||||
e.preventDefault();
|
</button>
|
||||||
onCustomize();
|
|
||||||
}}
|
|
||||||
className={cn(
|
|
||||||
'group relative flex flex-col items-center justify-center gap-1 py-1.5 px-1 flex-1 touch-manipulation active:scale-90 transition-transform duration-150',
|
|
||||||
tabActive ? 'text-[#ff0040]' : 'text-gray-500'
|
|
||||||
)}
|
|
||||||
>
|
|
||||||
<span
|
|
||||||
className={cn(
|
|
||||||
'relative flex items-center justify-center h-9 w-12 rounded-2xl transition-all duration-300',
|
|
||||||
tabActive ? 'bg-[#ff0040]/15 shadow-[0_0_16px_rgba(255,0,64,0.35)]' : 'bg-transparent',
|
|
||||||
)}
|
|
||||||
>
|
|
||||||
{isLoggedIn && userPubkey ? (
|
|
||||||
<div className="relative">
|
|
||||||
<Avatar className={cn(
|
|
||||||
'h-[24px] w-[24px] border-2 transition-transform duration-300',
|
|
||||||
tabActive ? 'border-[#ff0040] scale-110' : 'border-gray-600 group-active:scale-95'
|
|
||||||
)}>
|
|
||||||
<AvatarImage src={userAvatar} alt={userName} />
|
|
||||||
<AvatarFallback className="bg-[#ff0040]/20 text-[#ff0040] text-[8px] font-bold">
|
|
||||||
{(userName || '??').slice(0, 2).toUpperCase()}
|
|
||||||
</AvatarFallback>
|
|
||||||
</Avatar>
|
|
||||||
<span className="absolute -bottom-0.5 -right-0.5 w-2 h-2 bg-green-500 border border-black rounded-full" />
|
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
<User className={cn('h-[22px] w-[22px] transition-transform duration-300', tabActive ? 'scale-110' : 'group-active:scale-95')} />
|
|
||||||
)}
|
|
||||||
</span>
|
|
||||||
<span className={cn(
|
|
||||||
'block w-full truncate text-center text-[9px] xs:text-[10px] leading-tight tracking-wide uppercase transition-all',
|
|
||||||
tabActive ? 'font-extrabold' : 'font-semibold',
|
|
||||||
)}>
|
|
||||||
{isLoggedIn ? t('chromeUi.profile') : t('chromeUi.logIn')}
|
|
||||||
</span>
|
|
||||||
</Link>
|
|
||||||
);
|
|
||||||
})()}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Compact desktop status control. The old outlined pill + permanent ping read
|
||||||
|
* like an alert; this shows the current status as a quiet chip and falls back
|
||||||
|
* to a neutral "Status" affordance when none is set.
|
||||||
|
*/
|
||||||
|
function DesktopStatusButton({ onOpen }: { onOpen: () => void }) {
|
||||||
|
const { user } = useCurrentUser();
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const { data: status } = useUserStatus(user?.pubkey);
|
||||||
|
const preset = status?.statusId
|
||||||
|
? SKATING_STATUSES.find((item) => item.id === status.statusId)
|
||||||
|
: null;
|
||||||
|
const label = preset ? t(preset.labelKey) : status?.status;
|
||||||
|
const emoji = status?.emoji || preset?.emoji;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
onClick={onOpen}
|
||||||
|
title={t('chromeUi.setYourStatus')}
|
||||||
|
aria-label={t('chromeUi.setYourStatus')}
|
||||||
|
className={cn(
|
||||||
|
'h-9 gap-1.5 rounded-full border border-white/10 px-2.5 text-gray-300',
|
||||||
|
'hover:border-green-500/30 hover:bg-green-500/10 hover:text-green-300',
|
||||||
|
status && 'border-green-500/20 bg-green-500/5 text-green-200',
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
{emoji ? (
|
||||||
|
<span className="text-base leading-none" aria-hidden="true">{emoji}</span>
|
||||||
|
) : (
|
||||||
|
<SmilePlus className="h-4 w-4 text-green-400/80" />
|
||||||
|
)}
|
||||||
|
<span className="hidden max-w-[7rem] truncate text-xs font-semibold lg:inline">
|
||||||
|
{label || t('chromeUi.status')}
|
||||||
|
</span>
|
||||||
|
</Button>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
export function Layout({ children, noPadding }: LayoutProps) {
|
export function Layout({ children, noPadding }: LayoutProps) {
|
||||||
const location = useLocation();
|
const location = useLocation();
|
||||||
|
const navigate = useNavigate();
|
||||||
|
const showMobileBack = location.pathname !== '/' && location.pathname !== '/map';
|
||||||
// The map is full-bleed (it manages its own height), so it gets no bottom
|
// The map is full-bleed (it manages its own height), so it gets no bottom
|
||||||
// padding even though it shares this one persistent layout with every route.
|
// padding even though it shares this one persistent layout with every route.
|
||||||
const isFullBleed = noPadding || location.pathname === '/' || location.pathname === '/map';
|
const isFullBleed = noPadding || location.pathname === '/' || location.pathname === '/map';
|
||||||
|
// The floating assistant must not cover form controls on long-form pages.
|
||||||
|
const hideSasquatch = /^\/(become|create|edit|supporters|onboarding)(\/|$)/.test(location.pathname);
|
||||||
const [mobileMenuOpen, setMobileMenuOpen] = useState(false);
|
const [mobileMenuOpen, setMobileMenuOpen] = useState(false);
|
||||||
const [mobileLanguageView, setMobileLanguageView] = useState(false);
|
const [mobileLanguageView, setMobileLanguageView] = useState(false);
|
||||||
|
|
||||||
|
// Back/forward, notification taps and global search can change routes without
|
||||||
|
// clicking a menu row. Never leave the burger sheet covering the new page.
|
||||||
|
useEffect(() => {
|
||||||
|
setMobileMenuOpen(false);
|
||||||
|
setMobileLanguageView(false);
|
||||||
|
}, [location.pathname]);
|
||||||
// One auth dialog for the header + burger menu. Owning it here (not inside
|
// One auth dialog for the header + burger menu. Owning it here (not inside
|
||||||
// LoginArea) keeps it above the sheet and outside the sheet's unmount tree.
|
// LoginArea) keeps it above the sheet and outside the sheet's unmount tree.
|
||||||
const [authDialog, setAuthDialog] = useState<'login' | 'signup' | null>(null);
|
const [authDialog, setAuthDialog] = useState<'login' | 'signup' | null>(null);
|
||||||
|
|
@ -583,7 +592,6 @@ export function Layout({ children, noPadding }: LayoutProps) {
|
||||||
const { currentUser: currentAccount, removeLogin } = useLoggedInAccounts();
|
const { currentUser: currentAccount, removeLogin } = useLoggedInAccounts();
|
||||||
const author = useAuthor(user?.pubkey || '');
|
const author = useAuthor(user?.pubkey || '');
|
||||||
const displayName = author.data?.metadata?.name ?? genUserName(user?.pubkey);
|
const displayName = author.data?.metadata?.name ?? genUserName(user?.pubkey);
|
||||||
const userAvatar = author.data?.metadata?.picture;
|
|
||||||
const { fixedMapTab, middleTabs, catalog: navCatalog } = useNavPreferences();
|
const { fixedMapTab, middleTabs, catalog: navCatalog } = useNavPreferences();
|
||||||
const {
|
const {
|
||||||
primaryTabs: desktopPrimaryTabs,
|
primaryTabs: desktopPrimaryTabs,
|
||||||
|
|
@ -618,7 +626,11 @@ export function Layout({ children, noPadding }: LayoutProps) {
|
||||||
<div className="mx-auto flex w-full max-w-[1700px] items-center justify-between h-16 px-4 gap-4 xl:gap-8">
|
<div className="mx-auto flex w-full max-w-[1700px] items-center justify-between h-16 px-4 gap-4 xl:gap-8">
|
||||||
{/* Brand lockup — `shrink-0` + `whitespace-nowrap` guarantee the
|
{/* Brand lockup — `shrink-0` + `whitespace-nowrap` guarantee the
|
||||||
logo never gets squeezed into (or glowed over by) the nav. */}
|
logo never gets squeezed into (or glowed over by) the nav. */}
|
||||||
<Link to="/" className="flex items-center gap-3 group shrink-0">
|
<Link
|
||||||
|
to={user ? `/${nip19.npubEncode(user.pubkey)}` : '/'}
|
||||||
|
className="flex items-center gap-3 group shrink-0"
|
||||||
|
title={user ? t('chromeUi.viewMyProfile') : t('nav.map')}
|
||||||
|
>
|
||||||
<img
|
<img
|
||||||
src="/images/icon-1024.png"
|
src="/images/icon-1024.png"
|
||||||
alt="SkateSpots"
|
alt="SkateSpots"
|
||||||
|
|
@ -781,20 +793,7 @@ export function Layout({ children, noPadding }: LayoutProps) {
|
||||||
</Link>
|
</Link>
|
||||||
)}
|
)}
|
||||||
{/* Status Quick Access - Desktop */}
|
{/* Status Quick Access - Desktop */}
|
||||||
{user && (
|
{user && <DesktopStatusButton onOpen={() => setShowStatusDialog(true)} />}
|
||||||
<Button
|
|
||||||
variant="outline"
|
|
||||||
className="gap-2 px-3 border-green-500/50 text-green-400 hover:text-green-300 hover:bg-green-500/10 hover:border-green-500"
|
|
||||||
onClick={() => setShowStatusDialog(true)}
|
|
||||||
title={t('chromeUi.setYourStatus')}
|
|
||||||
>
|
|
||||||
<span className="relative flex h-2.5 w-2.5">
|
|
||||||
<span className="animate-ping absolute inline-flex h-full w-full rounded-full bg-green-400 opacity-75" />
|
|
||||||
<span className="relative inline-flex rounded-full h-2.5 w-2.5 bg-green-500" />
|
|
||||||
</span>
|
|
||||||
<span className="text-sm font-bold">{t('chromeUi.status')}</span>
|
|
||||||
</Button>
|
|
||||||
)}
|
|
||||||
<Button
|
<Button
|
||||||
variant="ghost"
|
variant="ghost"
|
||||||
size="icon"
|
size="icon"
|
||||||
|
|
@ -837,13 +836,34 @@ export function Layout({ children, noPadding }: LayoutProps) {
|
||||||
{/* Mobile Header */}
|
{/* Mobile Header */}
|
||||||
<header className="md:hidden sticky top-0 z-50 border-b border-red-500/30 bg-black/95 backdrop-blur safe-area-top">
|
<header className="md:hidden sticky top-0 z-50 border-b border-red-500/30 bg-black/95 backdrop-blur safe-area-top">
|
||||||
<div className="flex items-center justify-between h-14 px-3 gap-3">
|
<div className="flex items-center justify-between h-14 px-3 gap-3">
|
||||||
<Link to="/" className="flex items-center gap-2 touch-manipulation active:opacity-80 flex-1 min-w-0">
|
{showMobileBack && (
|
||||||
|
<Button
|
||||||
|
type="button"
|
||||||
|
variant="ghost"
|
||||||
|
size="icon"
|
||||||
|
className="-ml-1 h-9 w-9 shrink-0 text-gray-300 hover:bg-white/5 hover:text-white"
|
||||||
|
aria-label={t('common.back')}
|
||||||
|
title={t('common.back')}
|
||||||
|
onClick={() => {
|
||||||
|
if (location.key !== 'default') navigate(-1);
|
||||||
|
else navigate('/');
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<ArrowLeft className="h-5 w-5" />
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
<Link
|
||||||
|
to={user ? `/${nip19.npubEncode(user.pubkey)}` : '/'}
|
||||||
|
className="flex items-center gap-2 touch-manipulation active:opacity-80 flex-1 min-w-0"
|
||||||
|
title={user ? t('chromeUi.viewMyProfile') : t('nav.map')}
|
||||||
|
aria-label={user ? t('chromeUi.viewMyProfile') : t('nav.map')}
|
||||||
|
>
|
||||||
<img
|
<img
|
||||||
src="/images/icon-1024.png"
|
src="/images/icon-1024.png"
|
||||||
alt="SkateSpots"
|
alt="SkateSpots"
|
||||||
className="w-9 h-9 rounded-lg flex-shrink-0 shadow-lg shadow-red-500/30"
|
className="w-9 h-9 rounded-lg flex-shrink-0 shadow-lg shadow-red-500/30"
|
||||||
/>
|
/>
|
||||||
<span className="min-w-0 truncate font-display text-lg neon-red tracking-wide" style={{
|
<span className={cn('min-w-0 truncate font-display text-lg neon-red tracking-wide', showMobileBack && 'hidden')} style={{
|
||||||
textShadow: '0 0 8px #ff0040'
|
textShadow: '0 0 8px #ff0040'
|
||||||
}}>SKATESPOTS</span>
|
}}>SKATESPOTS</span>
|
||||||
</Link>
|
</Link>
|
||||||
|
|
@ -1181,7 +1201,9 @@ export function Layout({ children, noPadding }: LayoutProps) {
|
||||||
tabIndex={-1}
|
tabIndex={-1}
|
||||||
className={isFullBleed ? "outline-none" : "pb-[calc(5rem+env(safe-area-inset-bottom,0px))] md:pb-6 outline-none"}
|
className={isFullBleed ? "outline-none" : "pb-[calc(5rem+env(safe-area-inset-bottom,0px))] md:pb-6 outline-none"}
|
||||||
>
|
>
|
||||||
{children ?? <Outlet />}
|
<Suspense fallback={<RouteLoadingFallback />}>
|
||||||
|
{children ?? <Outlet />}
|
||||||
|
</Suspense>
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
{/* Footer - Desktop */}
|
{/* Footer - Desktop */}
|
||||||
|
|
@ -1229,7 +1251,7 @@ export function Layout({ children, noPadding }: LayoutProps) {
|
||||||
<span>{t('chromeUi.notSponsoredBy')}</span>
|
<span>{t('chromeUi.notSponsoredBy')}</span>
|
||||||
<span className="inline-flex items-center gap-1.5">
|
<span className="inline-flex items-center gap-1.5">
|
||||||
<img
|
<img
|
||||||
src="https://opensats.org/favicon.ico"
|
src="/images/opensats.ico"
|
||||||
alt="OpenSats"
|
alt="OpenSats"
|
||||||
className="h-4 w-4"
|
className="h-4 w-4"
|
||||||
/>
|
/>
|
||||||
|
|
@ -1246,10 +1268,8 @@ export function Layout({ children, noPadding }: LayoutProps) {
|
||||||
{/* Mobile Bottom Navigation */}
|
{/* Mobile Bottom Navigation */}
|
||||||
<MobileNav
|
<MobileNav
|
||||||
isActive={isActive}
|
isActive={isActive}
|
||||||
|
onMore={() => setMobileMenuOpen(true)}
|
||||||
isLoggedIn={!!user}
|
isLoggedIn={!!user}
|
||||||
userPubkey={user?.pubkey}
|
|
||||||
userAvatar={userAvatar}
|
|
||||||
userName={displayName}
|
|
||||||
t={t}
|
t={t}
|
||||||
onCustomize={() => setShowCustomizeNav(true)}
|
onCustomize={() => setShowCustomizeNav(true)}
|
||||||
fixedMapTab={fixedMapTab}
|
fixedMapTab={fixedMapTab}
|
||||||
|
|
@ -1262,12 +1282,14 @@ export function Layout({ children, noPadding }: LayoutProps) {
|
||||||
</Suspense>
|
</Suspense>
|
||||||
|
|
||||||
{/* Sasquatch Guide (all screens) — lazy; not needed at first paint */}
|
{/* Sasquatch Guide (all screens) — lazy; not needed at first paint */}
|
||||||
<Suspense fallback={null}>
|
{!hideSasquatch && (
|
||||||
<LazySasquatchGuide
|
<Suspense fallback={null}>
|
||||||
message={currentMessage}
|
<LazySasquatchGuide
|
||||||
onDismiss={dismissCurrentMessage}
|
message={currentMessage}
|
||||||
/>
|
onDismiss={dismissCurrentMessage}
|
||||||
</Suspense>
|
/>
|
||||||
|
</Suspense>
|
||||||
|
)}
|
||||||
|
|
||||||
{/* Set Status Dialog — lazy (on-demand modal) */}
|
{/* Set Status Dialog — lazy (on-demand modal) */}
|
||||||
<Suspense fallback={null}>
|
<Suspense fallback={null}>
|
||||||
|
|
|
||||||
72
src/components/LazyZapDialog.tsx
Normal file
72
src/components/LazyZapDialog.tsx
Normal file
|
|
@ -0,0 +1,72 @@
|
||||||
|
import {
|
||||||
|
cloneElement,
|
||||||
|
isValidElement,
|
||||||
|
lazy,
|
||||||
|
Suspense,
|
||||||
|
useState,
|
||||||
|
type MouseEvent,
|
||||||
|
type ReactElement,
|
||||||
|
type ReactNode,
|
||||||
|
} from 'react';
|
||||||
|
import type { Event } from 'nostr-tools';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Lightweight zap trigger.
|
||||||
|
*
|
||||||
|
* The full ZapDialog pulls in the Cashu wallet stack (`useCashu`, mint repos,
|
||||||
|
* token operations) — several hundred KB that used to land in the initial
|
||||||
|
* bundle because every SpotCard rendered a ZapButton. This wrapper keeps only
|
||||||
|
* the trigger in the entry chunk and loads the actual dialog on first tap.
|
||||||
|
*/
|
||||||
|
const LoadedZapDialog = lazy(() =>
|
||||||
|
import('@/components/ZapDialog').then((m) => ({ default: m.ZapDialog })),
|
||||||
|
);
|
||||||
|
|
||||||
|
interface LazyZapDialogProps {
|
||||||
|
target: Event;
|
||||||
|
children: ReactNode;
|
||||||
|
className?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function LazyZapDialog({ target, children, className }: LazyZapDialogProps) {
|
||||||
|
const [open, setOpen] = useState(false);
|
||||||
|
|
||||||
|
const handleClick = (event: MouseEvent) => {
|
||||||
|
if (isValidElement(children)) {
|
||||||
|
const child = children as ReactElement<{ onClick?: (event: MouseEvent) => void }>;
|
||||||
|
child.props.onClick?.(event);
|
||||||
|
}
|
||||||
|
setOpen(true);
|
||||||
|
};
|
||||||
|
|
||||||
|
const trigger = isValidElement(children) ? (
|
||||||
|
cloneElement(
|
||||||
|
children as ReactElement<{ onClick?: (event: MouseEvent) => void; className?: string }>,
|
||||||
|
{
|
||||||
|
onClick: handleClick,
|
||||||
|
className: [
|
||||||
|
(children as ReactElement<{ className?: string }>).props.className,
|
||||||
|
'cursor-pointer',
|
||||||
|
].filter(Boolean).join(' '),
|
||||||
|
},
|
||||||
|
)
|
||||||
|
) : (
|
||||||
|
<div className={className} onClick={handleClick}>{children}</div>
|
||||||
|
);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{trigger}
|
||||||
|
{open && (
|
||||||
|
<Suspense fallback={null}>
|
||||||
|
<LoadedZapDialog
|
||||||
|
target={target}
|
||||||
|
open={open}
|
||||||
|
onOpenChange={setOpen}
|
||||||
|
hideTrigger
|
||||||
|
/>
|
||||||
|
</Suspense>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
@ -20,6 +20,7 @@ import { genUserName } from '@/lib/genUserName';
|
||||||
import type { MarketplaceItem } from '@/lib/types';
|
import type { MarketplaceItem } from '@/lib/types';
|
||||||
import { PayWithSats } from '@/components/PayWithSats';
|
import { PayWithSats } from '@/components/PayWithSats';
|
||||||
import { MarkSoldDialog } from '@/components/MarkSoldDialog';
|
import { MarkSoldDialog } from '@/components/MarkSoldDialog';
|
||||||
|
import { PaymentReadinessNote } from '@/components/PaymentReadinessNote';
|
||||||
import { Handshake, CheckCircle, X, Loader2, ArrowLeftRight, Undo2, Zap } from 'lucide-react';
|
import { Handshake, CheckCircle, X, Loader2, ArrowLeftRight, Undo2, Zap } from 'lucide-react';
|
||||||
import { useTranslation } from '@/contexts/language';
|
import { useTranslation } from '@/contexts/language';
|
||||||
|
|
||||||
|
|
@ -183,6 +184,8 @@ export function ListingOffersPanel({ item, isOwner }: { item: MarketplaceItem; i
|
||||||
<Handshake className="h-4 w-4" /> {isOwner ? t('marketUi.offers.titleOwner', { count: mine.length }) : t('marketUi.offers.titleBuyer')}
|
<Handshake className="h-4 w-4" /> {isOwner ? t('marketUi.offers.titleOwner', { count: mine.length }) : t('marketUi.offers.titleBuyer')}
|
||||||
</h3>
|
</h3>
|
||||||
|
|
||||||
|
{isOwner && <PaymentReadinessNote />}
|
||||||
|
|
||||||
{mine.map((thread) => {
|
{mine.map((thread) => {
|
||||||
const latest = thread.latest;
|
const latest = thread.latest;
|
||||||
const other = latest.author === user.pubkey
|
const other = latest.author === user.pubkey
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,5 @@
|
||||||
import { useState } from 'react';
|
|
||||||
import { Link } from 'react-router-dom';
|
import { Link } from 'react-router-dom';
|
||||||
import { ChevronUp } from 'lucide-react';
|
|
||||||
import { useTranslation } from '@/contexts/language';
|
import { useTranslation } from '@/contexts/language';
|
||||||
import { cn } from '@/lib/utils';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The site links that live in the desktop footer — surfaced on the map
|
* The site links that live in the desktop footer — surfaced on the map
|
||||||
|
|
@ -14,8 +11,6 @@ import { cn } from '@/lib/utils';
|
||||||
*/
|
*/
|
||||||
export function MapFooterStrip() {
|
export function MapFooterStrip() {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const [open, setOpen] = useState(false);
|
|
||||||
|
|
||||||
const links = [
|
const links = [
|
||||||
{ to: '/diy', label: t('nav.diy') },
|
{ to: '/diy', label: t('nav.diy') },
|
||||||
{ to: '/newsletter', label: t('nav.newsletter') },
|
{ to: '/newsletter', label: t('nav.newsletter') },
|
||||||
|
|
@ -37,31 +32,19 @@ export function MapFooterStrip() {
|
||||||
<div className="flex items-center gap-3">
|
<div className="flex items-center gap-3">
|
||||||
<span className="flex items-center gap-1.5 text-gray-500">
|
<span className="flex items-center gap-1.5 text-gray-500">
|
||||||
{t('chromeUi.notSponsoredBy')}
|
{t('chromeUi.notSponsoredBy')}
|
||||||
<img src="https://opensats.org/favicon.ico" alt="OpenSats" className="h-3 w-3" />
|
<img src="/images/opensats.ico" alt="OpenSats" className="h-3 w-3" />
|
||||||
<span className="font-medium text-gray-400">OpenSats</span>
|
<span className="font-medium text-gray-400">OpenSats</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Mobile — a tiny chip that expands to a compact row */}
|
{/* Mobile — a slim always-visible strip, not a floating chip over the nav */}
|
||||||
<div className="pointer-events-auto relative mb-1.5 flex justify-center md:hidden">
|
<div className="pointer-events-auto flex w-full items-center justify-center gap-3 border-t border-white/10 bg-black/80 px-3 py-1 text-[10px] text-gray-400 backdrop-blur md:hidden">
|
||||||
{open && (
|
{links.map((l) => (
|
||||||
<div className="absolute bottom-full left-1/2 mb-1.5 flex max-w-[calc(100vw-1rem)] -translate-x-1/2 items-center gap-3 overflow-x-auto whitespace-nowrap rounded-full border border-white/10 bg-black/85 px-3 py-1.5 text-[10px] text-gray-300 backdrop-blur scrollbar-hide">
|
<Link key={l.to} to={l.to} className="font-semibold transition-colors hover:text-[#ccff00]">
|
||||||
{links.map((l) => (
|
{l.label}
|
||||||
<Link key={l.to} to={l.to} className="font-medium hover:text-[#ccff00]">
|
</Link>
|
||||||
{l.label}
|
))}
|
||||||
</Link>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
<button
|
|
||||||
onClick={() => setOpen((v) => !v)}
|
|
||||||
aria-expanded={open}
|
|
||||||
className="flex min-h-0 items-center gap-1 rounded-full bg-black/45 px-2.5 py-[3px] text-[10px] font-semibold text-gray-400/90 backdrop-blur transition-colors hover:text-gray-200"
|
|
||||||
>
|
|
||||||
<ChevronUp className={cn('h-3 w-3 transition-transform', open && 'rotate-180')} />
|
|
||||||
{t('mapUi.mapFooter.links')}
|
|
||||||
</button>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,10 @@ export function PaymentReadinessNote() {
|
||||||
const metadata = author.data?.metadata;
|
const metadata = author.data?.metadata;
|
||||||
|
|
||||||
const lud16 = metadata?.lud16;
|
const lud16 = metadata?.lud16;
|
||||||
const hasLightning = isValidLightningAddress(lud16) || !!metadata?.lud06;
|
// PayWithSats falls back to the profile's lud16. A lud06/LNURL alone is
|
||||||
|
// not enough to settle a marketplace offer, so do not advertise readiness
|
||||||
|
// for a payment path checkout cannot actually use.
|
||||||
|
const hasLightning = isValidLightningAddress(lud16);
|
||||||
// Silent payment lives in a custom kind-0 field the app reads elsewhere.
|
// Silent payment lives in a custom kind-0 field the app reads elsewhere.
|
||||||
const rawSp = (metadata as Record<string, unknown> | undefined)?.bitcoin_silent_payment;
|
const rawSp = (metadata as Record<string, unknown> | undefined)?.bitcoin_silent_payment;
|
||||||
const hasSilentPayment = typeof rawSp === 'string' && isValidSilentPayment(rawSp);
|
const hasSilentPayment = typeof rawSp === 'string' && isValidSilentPayment(rawSp);
|
||||||
|
|
@ -58,7 +61,7 @@ export function PaymentReadinessNote() {
|
||||||
<AlertCircle className="mt-0.5 h-3.5 w-3.5 shrink-0 text-yellow-400" />
|
<AlertCircle className="mt-0.5 h-3.5 w-3.5 shrink-0 text-yellow-400" />
|
||||||
<span>
|
<span>
|
||||||
{t('marketUi.paymentReadiness.notReadyBefore')}{' '}
|
{t('marketUi.paymentReadiness.notReadyBefore')}{' '}
|
||||||
<Link to="/settings" className="text-yellow-400 underline hover:text-yellow-300">
|
<Link to="/settings?section=profile" className="text-yellow-400 underline hover:text-yellow-300">
|
||||||
{t('marketUi.paymentReadiness.nostrProfile')}
|
{t('marketUi.paymentReadiness.nostrProfile')}
|
||||||
</Link>{' '}
|
</Link>{' '}
|
||||||
{t('marketUi.paymentReadiness.notReadyAfter')}
|
{t('marketUi.paymentReadiness.notReadyAfter')}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
import { BadgeCheck, ExternalLink } from 'lucide-react';
|
import { BadgeCheck, ExternalLink } from 'lucide-react';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
import { SKATESPOTS_SITE, type ProfileBadge } from '@/lib/badges';
|
import { SKATESPOTS_SITE, type ProfileBadge } from '@/lib/badges';
|
||||||
|
import { sanitizeUrl } from '@/lib/sanitizeUrl';
|
||||||
|
|
||||||
/** The app logo is already served with the site. */
|
/** The app logo is already served with the site. */
|
||||||
const SKATESPOTS_LOGO = '/images/logo-icon.png';
|
const SKATESPOTS_LOGO = '/images/logo-icon.png';
|
||||||
|
|
@ -26,6 +27,7 @@ export function ProfileBadges({
|
||||||
<div className={cn('flex flex-wrap items-center gap-2', className)}>
|
<div className={cn('flex flex-wrap items-center gap-2', className)}>
|
||||||
{badges.map((b, i) => {
|
{badges.map((b, i) => {
|
||||||
const app = isApp(b);
|
const app = isApp(b);
|
||||||
|
const safeUrl = b.url ? sanitizeUrl(b.url) : null;
|
||||||
const cls = cn(
|
const cls = cn(
|
||||||
'inline-flex items-center gap-1.5 rounded-full border font-bold transition-colors',
|
'inline-flex items-center gap-1.5 rounded-full border font-bold transition-colors',
|
||||||
size === 'sm' ? 'px-2 py-0.5 text-[11px]' : 'px-3 py-1.5 text-sm',
|
size === 'sm' ? 'px-2 py-0.5 text-[11px]' : 'px-3 py-1.5 text-sm',
|
||||||
|
|
@ -41,17 +43,17 @@ export function ProfileBadges({
|
||||||
<BadgeCheck className={size === 'sm' ? 'h-3 w-3' : 'h-3.5 w-3.5'} />
|
<BadgeCheck className={size === 'sm' ? 'h-3 w-3' : 'h-3.5 w-3.5'} />
|
||||||
)}
|
)}
|
||||||
<span className="max-w-[12rem] truncate">{b.label}</span>
|
<span className="max-w-[12rem] truncate">{b.label}</span>
|
||||||
{b.url && !app && <ExternalLink className="h-3 w-3 opacity-60" />}
|
{safeUrl && !app && <ExternalLink className="h-3 w-3 opacity-60" />}
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|
||||||
return b.url ? (
|
return safeUrl ? (
|
||||||
<a
|
<a
|
||||||
key={`${b.label}-${i}`}
|
key={`${b.label}-${i}`}
|
||||||
href={b.url}
|
href={safeUrl}
|
||||||
target="_blank"
|
target="_blank"
|
||||||
rel="noopener noreferrer"
|
rel="noopener noreferrer"
|
||||||
title={b.url}
|
title={safeUrl}
|
||||||
className={cls}
|
className={cls}
|
||||||
>
|
>
|
||||||
{inner}
|
{inner}
|
||||||
|
|
|
||||||
69
src/components/RelayDivergenceCard.tsx
Normal file
69
src/components/RelayDivergenceCard.tsx
Normal file
|
|
@ -0,0 +1,69 @@
|
||||||
|
import { Activity, RefreshCw } from 'lucide-react';
|
||||||
|
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
|
||||||
|
import { Button } from '@/components/ui/button';
|
||||||
|
import { useTranslation } from '@/contexts/language';
|
||||||
|
import { useRelayDivergence } from '@/hooks/useRelayDivergence';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Settings diagnostic: compare the community relay with the user's read relays.
|
||||||
|
* No merge, no vote, no data mutation.
|
||||||
|
*/
|
||||||
|
export function RelayDivergenceCard() {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const { result, checking, error, check } = useRelayDivergence();
|
||||||
|
|
||||||
|
const differences = result?.differences.length ?? 0;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Card className="bg-black/90 border-white/10">
|
||||||
|
<CardHeader className="pb-2">
|
||||||
|
<CardTitle className="flex items-center gap-2 text-sm font-bold text-white">
|
||||||
|
<Activity className="h-4 w-4 text-[#ccff00]" />
|
||||||
|
{t('settingsUi.relayList.relayDiagTitle')}
|
||||||
|
</CardTitle>
|
||||||
|
</CardHeader>
|
||||||
|
<CardContent className="space-y-3">
|
||||||
|
<p className="text-xs leading-relaxed text-gray-400">
|
||||||
|
{t('settingsUi.relayList.relayDiagDesc')}
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
size="sm"
|
||||||
|
variant="outline"
|
||||||
|
onClick={() => void check()}
|
||||||
|
disabled={checking}
|
||||||
|
className="gap-1.5"
|
||||||
|
>
|
||||||
|
<RefreshCw className={checking ? 'h-3.5 w-3.5 animate-spin' : 'h-3.5 w-3.5'} />
|
||||||
|
{checking
|
||||||
|
? t('settingsUi.relayList.relayDiagChecking')
|
||||||
|
: t('settingsUi.relayList.relayDiagCheck')}
|
||||||
|
</Button>
|
||||||
|
|
||||||
|
{error && (
|
||||||
|
<p className="text-xs text-red-400">
|
||||||
|
{t('settingsUi.relayList.relayDiagFailed')}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{result && !error && (
|
||||||
|
<div className="space-y-1 text-xs">
|
||||||
|
<p className={differences > 0 ? 'font-bold text-amber-300' : 'text-green-400'}>
|
||||||
|
{differences > 0
|
||||||
|
? t('settingsUi.relayList.relayDiagDiff', { count: differences })
|
||||||
|
: t('settingsUi.relayList.relayDiagAgree')}
|
||||||
|
</p>
|
||||||
|
{differences > 0 && (
|
||||||
|
<p className="text-gray-500">{t('settingsUi.relayList.relayDiagDetails')}</p>
|
||||||
|
)}
|
||||||
|
{result.errors.length > 0 && (
|
||||||
|
<p className="text-gray-500">
|
||||||
|
{result.errors.length} {t('settingsUi.relayList.offline')}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
|
);
|
||||||
|
}
|
||||||
82
src/components/RoutePreloader.tsx
Normal file
82
src/components/RoutePreloader.tsx
Normal file
|
|
@ -0,0 +1,82 @@
|
||||||
|
import { useEffect } from 'react';
|
||||||
|
import { isNativePlatform } from '@/lib/platform';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Hover / touch prefetch for the primary navigation destinations.
|
||||||
|
*
|
||||||
|
* The route chunks stay lazy (so first paint is not blocked), but once the user
|
||||||
|
* shows intent — hovers a menu row, tabs into a link, or touches it — the page
|
||||||
|
* module starts downloading. On mobile the touchstart head start is often enough
|
||||||
|
* to avoid the page skeleton entirely. Only modules are fetched; no page hooks
|
||||||
|
* mount, so this never triggers relay work or an Amber prompt.
|
||||||
|
*/
|
||||||
|
const loaders: Record<string, () => Promise<unknown>> = {
|
||||||
|
'/lab': () => import('@/pages/LabPage'),
|
||||||
|
'/events': () => import('@/pages/EventsPage'),
|
||||||
|
'/crews': () => import('@/pages/CrewsPage'),
|
||||||
|
'/community': () => import('@/pages/CommunityPage'),
|
||||||
|
'/skaters': () => import('@/pages/SkatersPage'),
|
||||||
|
'/messages': () => import('@/pages/DirectMessagesPage'),
|
||||||
|
'/settings': () => import('@/pages/SettingsPage'),
|
||||||
|
'/wallet': () => import('@/pages/WalletPage'),
|
||||||
|
'/stash': () => import('@/pages/StashPage'),
|
||||||
|
'/marketplace': () => import('@/pages/MarketplaceHubPage'),
|
||||||
|
'/stats': () => import('@/pages/CommunityStatsPage'),
|
||||||
|
'/collections': () => import('@/pages/SpotCollectionsPage'),
|
||||||
|
'/glossary': () => import('@/pages/GlossaryPage'),
|
||||||
|
'/about': () => import('@/pages/AboutPage'),
|
||||||
|
'/card': () => import('@/pages/RiderCardPage'),
|
||||||
|
'/supporters': () => import('@/pages/SupportersPage'),
|
||||||
|
'/newsletter': () => import('@/pages/NewsletterPage'),
|
||||||
|
};
|
||||||
|
|
||||||
|
const preloaded = new Set<string>();
|
||||||
|
|
||||||
|
function routePath(anchor: HTMLAnchorElement): string | null {
|
||||||
|
const href = anchor.getAttribute('href') ?? '';
|
||||||
|
if (!href || href.startsWith('http') || href.startsWith('mailto:') || href.startsWith('tel:')) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
// HashRouter renders to="#/lab" as href="#/lab".
|
||||||
|
if (href.startsWith('#/')) return href.slice(1).split('?')[0] || '/';
|
||||||
|
try {
|
||||||
|
const url = new URL(anchor.href, window.location.href);
|
||||||
|
if (url.hash.startsWith('#/')) return url.hash.slice(1).split('?')[0] || '/';
|
||||||
|
return url.pathname;
|
||||||
|
} catch {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function preloadFromTarget(target: EventTarget | null): void {
|
||||||
|
if (!(target instanceof Element)) return;
|
||||||
|
const anchor = target.closest('a[href]');
|
||||||
|
if (!(anchor instanceof HTMLAnchorElement)) return;
|
||||||
|
const path = routePath(anchor);
|
||||||
|
if (!path || preloaded.has(path)) return;
|
||||||
|
const loader = loaders[path];
|
||||||
|
if (!loader) return;
|
||||||
|
preloaded.add(path);
|
||||||
|
void loader().catch(() => {
|
||||||
|
// A failed prefetch is harmless; lazyWithRetry will retry on navigation.
|
||||||
|
preloaded.delete(path);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function RoutePreloader() {
|
||||||
|
useEffect(() => {
|
||||||
|
if (isNativePlatform()) return;
|
||||||
|
|
||||||
|
const onIntent = (event: Event) => preloadFromTarget(event.target);
|
||||||
|
document.addEventListener('pointerover', onIntent, { capture: true, passive: true });
|
||||||
|
document.addEventListener('focusin', onIntent, { capture: true, passive: true });
|
||||||
|
document.addEventListener('touchstart', onIntent, { capture: true, passive: true });
|
||||||
|
return () => {
|
||||||
|
document.removeEventListener('pointerover', onIntent, true);
|
||||||
|
document.removeEventListener('focusin', onIntent, true);
|
||||||
|
document.removeEventListener('touchstart', onIntent, true);
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
@ -23,23 +23,23 @@ import { useTranslation } from '@/contexts/language';
|
||||||
*/
|
*/
|
||||||
|
|
||||||
const SESSION_KEY = 'splash-shown-session';
|
const SESSION_KEY = 'splash-shown-session';
|
||||||
const MIN_MS = 900; // choreography needs room to breathe
|
const MIN_MS = 380; // keep the brand beat, lose the artificial wait
|
||||||
const WARM_GRACE_MS = 550; // wait after connection for content to stream in
|
const WARM_GRACE_MS = 180; // a short breath after relays connect
|
||||||
const MAX_MS = 2600; // hard cap — never block on a slow/offline network
|
const MAX_MS = 900; // hard cap — reveal the shell even on a dead network
|
||||||
const FADE_MS = 480;
|
const FADE_MS = 280; // iris-close exit
|
||||||
const READY_HOLD_MS = 340; // savour the 100% "ready" beat before revealing
|
const READY_HOLD_MS = 120; // show the ready check, then move
|
||||||
|
|
||||||
const SPARKS = [
|
const SPARKS = [
|
||||||
{ sx: '-8px', sy: '18px', ex: '-54px', ey: '44px', delay: '0ms' },
|
{ sx: '-8px', sy: '18px', ex: '-54px', ey: '44px', delay: '0ms' },
|
||||||
{ sx: '4px', sy: '22px', ex: '38px', ey: '58px', delay: '90ms' },
|
{ sx: '4px', sy: '22px', ex: '38px', ey: '58px', delay: '20ms' },
|
||||||
{ sx: '-16px', sy: '10px', ex: '-72px', ey: '18px', delay: '180ms' },
|
{ sx: '-16px', sy: '10px', ex: '-72px', ey: '18px', delay: '40ms' },
|
||||||
{ sx: '12px', sy: '14px', ex: '66px', ey: '30px', delay: '260ms' },
|
{ sx: '12px', sy: '14px', ex: '66px', ey: '30px', delay: '60ms' },
|
||||||
{ sx: '-4px', sy: '24px', ex: '-28px', ey: '76px', delay: '340ms' },
|
{ sx: '-4px', sy: '24px', ex: '-28px', ey: '76px', delay: '80ms' },
|
||||||
{ sx: '8px', sy: '24px', ex: '22px', ey: '78px', delay: '430ms' },
|
{ sx: '8px', sy: '24px', ex: '22px', ey: '78px', delay: '100ms' },
|
||||||
{ sx: '-12px', sy: '2px', ex: '-48px', ey: '-16px', delay: '520ms' },
|
{ sx: '-12px', sy: '2px', ex: '-48px', ey: '-16px', delay: '120ms' },
|
||||||
{ sx: '14px', sy: '4px', ex: '52px', ey: '-12px', delay: '610ms' },
|
{ sx: '14px', sy: '4px', ex: '52px', ey: '-12px', delay: '140ms' },
|
||||||
{ sx: '-2px', sy: '28px', ex: '-10px', ey: '88px', delay: '700ms' },
|
{ sx: '-2px', sy: '28px', ex: '-10px', ey: '88px', delay: '160ms' },
|
||||||
{ sx: '2px', sy: '28px', ex: '12px', ey: '90px', delay: '790ms' },
|
{ sx: '2px', sy: '28px', ex: '12px', ey: '90px', delay: '180ms' },
|
||||||
];
|
];
|
||||||
|
|
||||||
const STATUS_KEYS = [
|
const STATUS_KEYS = [
|
||||||
|
|
@ -75,7 +75,7 @@ export function SplashScreen() {
|
||||||
if (!visible || ready) return;
|
if (!visible || ready) return;
|
||||||
const id = setInterval(() => {
|
const id = setInterval(() => {
|
||||||
setStatusIndex((i) => (i + 1) % STATUS_KEYS.length);
|
setStatusIndex((i) => (i + 1) % STATUS_KEYS.length);
|
||||||
}, 640);
|
}, 380);
|
||||||
return () => clearInterval(id);
|
return () => clearInterval(id);
|
||||||
}, [visible, ready]);
|
}, [visible, ready]);
|
||||||
|
|
||||||
|
|
@ -84,8 +84,8 @@ export function SplashScreen() {
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!visible || ready) return;
|
if (!visible || ready) return;
|
||||||
const id = setInterval(() => {
|
const id = setInterval(() => {
|
||||||
setProgress((p) => (p >= 85 ? p : p + Math.max(0.6, (85 - p) * 0.045)));
|
setProgress((p) => (p >= 85 ? p : p + Math.max(0.9, (85 - p) * 0.065)));
|
||||||
}, 90);
|
}, 60);
|
||||||
return () => clearInterval(id);
|
return () => clearInterval(id);
|
||||||
}, [visible, ready]);
|
}, [visible, ready]);
|
||||||
|
|
||||||
|
|
@ -155,9 +155,24 @@ export function SplashScreen() {
|
||||||
<div
|
<div
|
||||||
className="fixed inset-0 z-[9999] flex flex-col items-center justify-center bg-[#050505] overflow-hidden"
|
className="fixed inset-0 z-[9999] flex flex-col items-center justify-center bg-[#050505] overflow-hidden"
|
||||||
style={{
|
style={{
|
||||||
opacity: leaving ? 0 : 1,
|
// The exit is an aperture-style iris closing into the logo. It reveals
|
||||||
transform: leaving && !prefersReducedMotion ? 'scale(1.04)' : 'scale(1)',
|
// the already-painted app from the edges without moving the map. Users
|
||||||
transition: `opacity ${FADE_MS}ms cubic-bezier(0.4,0,0.2,1), transform ${FADE_MS}ms cubic-bezier(0.4,0,0.2,1)`,
|
// who prefer reduced motion get a simple, quick fade instead.
|
||||||
|
opacity: leaving && prefersReducedMotion ? 0 : 1,
|
||||||
|
clipPath: prefersReducedMotion
|
||||||
|
? undefined
|
||||||
|
: leaving
|
||||||
|
? 'circle(0px at 50% 42%)'
|
||||||
|
: 'circle(150vmax at 50% 42%)',
|
||||||
|
WebkitClipPath: prefersReducedMotion
|
||||||
|
? undefined
|
||||||
|
: leaving
|
||||||
|
? 'circle(0px at 50% 42%)'
|
||||||
|
: 'circle(150vmax at 50% 42%)',
|
||||||
|
transition: prefersReducedMotion
|
||||||
|
? `opacity ${FADE_MS}ms ease`
|
||||||
|
: `clip-path ${FADE_MS}ms cubic-bezier(0.7,0,0.84,0)`,
|
||||||
|
willChange: 'clip-path',
|
||||||
paddingTop: 'env(safe-area-inset-top, 0px)',
|
paddingTop: 'env(safe-area-inset-top, 0px)',
|
||||||
paddingBottom: 'env(safe-area-inset-bottom, 0px)',
|
paddingBottom: 'env(safe-area-inset-bottom, 0px)',
|
||||||
paddingLeft: 'env(safe-area-inset-left, 0px)',
|
paddingLeft: 'env(safe-area-inset-left, 0px)',
|
||||||
|
|
@ -189,10 +204,22 @@ export function SplashScreen() {
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<div className="relative z-10 flex flex-col items-center px-8">
|
<div
|
||||||
{/* The orange wheel mark rolls in, keeps a slow roll, and throws sparks */}
|
className="relative z-10 flex flex-col items-center px-8"
|
||||||
<div className="relative" style={anim('splashRise 620ms cubic-bezier(0.22,1,0.36,1) both')}>
|
style={{
|
||||||
{/* Rotating conic ring — orange to match the wheel, with a lime kick */}
|
// Keep the mark visible all the way through the iris-close exit.
|
||||||
|
// The shrinking aperture clips it away, so there is never a dead
|
||||||
|
// black frame between the splash and the app underneath.
|
||||||
|
opacity: 1,
|
||||||
|
transform: leaving && !prefersReducedMotion ? 'translateY(-4px)' : 'translateY(0)',
|
||||||
|
transition: 'transform 280ms cubic-bezier(0.22,1,0.36,1)',
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{/* The mark arrives from the native splash's centre and settles into the
|
||||||
|
column. No rotation: a quick, grounded drop with one landing burst. */}
|
||||||
|
<div style={anim('splashLogoHandoff 440ms cubic-bezier(0.22,1,0.36,1) both')}>
|
||||||
|
<div className="relative">
|
||||||
|
{/* Static conic halo — colour and breathing glow, no spin */}
|
||||||
<div
|
<div
|
||||||
className="absolute -inset-3 rounded-full"
|
className="absolute -inset-3 rounded-full"
|
||||||
style={{
|
style={{
|
||||||
|
|
@ -200,15 +227,14 @@ export function SplashScreen() {
|
||||||
'conic-gradient(from 0deg, transparent 0deg, #ff6a00 90deg, #ccff00 190deg, transparent 310deg)',
|
'conic-gradient(from 0deg, transparent 0deg, #ff6a00 90deg, #ccff00 190deg, transparent 310deg)',
|
||||||
opacity: ready ? 0.9 : 0.58,
|
opacity: ready ? 0.9 : 0.58,
|
||||||
filter: 'blur(7px)',
|
filter: 'blur(7px)',
|
||||||
transition: 'opacity 400ms ease',
|
transition: 'opacity 240ms ease',
|
||||||
...anim('splashSpin 3.2s linear infinite'),
|
|
||||||
}}
|
}}
|
||||||
aria-hidden="true"
|
aria-hidden="true"
|
||||||
/>
|
/>
|
||||||
{/* Mask ring interior so only a thin halo shows */}
|
{/* Mask ring interior so only a thin halo shows */}
|
||||||
<div className="absolute -inset-1 rounded-full bg-[#050505]" aria-hidden="true" />
|
<div className="absolute -inset-1 rounded-full bg-[#050505]" aria-hidden="true" />
|
||||||
|
|
||||||
{/* Sparks are decorative and disabled for reduced-motion users. */}
|
{/* One-shot landing sparks, disabled for reduced-motion users. */}
|
||||||
{!prefersReducedMotion && (
|
{!prefersReducedMotion && (
|
||||||
<div className="pointer-events-none absolute inset-0" aria-hidden="true">
|
<div className="pointer-events-none absolute inset-0" aria-hidden="true">
|
||||||
{SPARKS.map((spark, index) => (
|
{SPARKS.map((spark, index) => (
|
||||||
|
|
@ -227,25 +253,16 @@ export function SplashScreen() {
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{/* Bounce wrapper + rolling wheel. Nested transforms keep the spin
|
|
||||||
from fighting the entry animation. */}
|
|
||||||
<div
|
<div
|
||||||
style={anim('splashLogoRollIn 720ms cubic-bezier(0.22,1,0.36,1) both')}
|
style={anim('splashLogoDrop 380ms cubic-bezier(0.22,1,0.36,1) both')}
|
||||||
className="relative"
|
className="relative"
|
||||||
>
|
>
|
||||||
<div
|
<img
|
||||||
style={anim('splashHover 1.9s ease-in-out infinite')}
|
src="/images/icon-1024.png"
|
||||||
className="relative"
|
alt="SkateSpots"
|
||||||
>
|
draggable={false}
|
||||||
<div style={anim('splashWheelRoll 5.4s linear infinite')} className="relative">
|
className="relative h-28 w-28 select-none drop-shadow-[0_0_34px_rgba(255,106,0,0.65)]"
|
||||||
<img
|
/>
|
||||||
src="/images/icon-1024.png"
|
|
||||||
alt="SkateSpots"
|
|
||||||
draggable={false}
|
|
||||||
className="relative h-28 w-28 select-none drop-shadow-[0_0_34px_rgba(255,106,0,0.65)]"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{/* Contact shadow / dust line under the wheel */}
|
{/* Contact shadow / dust line under the wheel */}
|
||||||
<div
|
<div
|
||||||
className="absolute -bottom-2 left-1/2 h-2 w-20 -translate-x-1/2 rounded-full bg-[#ff6a00]/30 blur-md"
|
className="absolute -bottom-2 left-1/2 h-2 w-20 -translate-x-1/2 rounded-full bg-[#ff6a00]/30 blur-md"
|
||||||
|
|
@ -254,14 +271,15 @@ export function SplashScreen() {
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
{/* Wordmark */}
|
{/* Wordmark */}
|
||||||
<h1
|
<h1
|
||||||
className="font-display neon-red mt-7 text-4xl tracking-[0.06em]"
|
className="font-display neon-red mt-7 text-4xl tracking-[0.06em]"
|
||||||
style={{
|
style={{
|
||||||
textShadow: '0 0 14px #ff0040, 0 0 30px rgba(255,0,64,0.6)',
|
textShadow: '0 0 14px #ff0040, 0 0 30px rgba(255,0,64,0.6)',
|
||||||
...anim('splashRise 620ms cubic-bezier(0.22,1,0.36,1) both'),
|
...anim('splashRise 320ms cubic-bezier(0.22,1,0.36,1) both'),
|
||||||
animationDelay: prefersReducedMotion ? undefined : '120ms',
|
animationDelay: prefersReducedMotion ? undefined : '0ms',
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
SKATESPOTS
|
SKATESPOTS
|
||||||
|
|
@ -271,8 +289,8 @@ export function SplashScreen() {
|
||||||
<div
|
<div
|
||||||
className="relative mt-8 h-1.5 w-52 overflow-hidden rounded-full bg-white/[0.06] ring-1 ring-white/[0.05]"
|
className="relative mt-8 h-1.5 w-52 overflow-hidden rounded-full bg-white/[0.06] ring-1 ring-white/[0.05]"
|
||||||
style={{
|
style={{
|
||||||
...anim('splashRise 620ms cubic-bezier(0.22,1,0.36,1) both'),
|
...anim('splashRise 320ms cubic-bezier(0.22,1,0.36,1) both'),
|
||||||
animationDelay: prefersReducedMotion ? undefined : '220ms',
|
animationDelay: prefersReducedMotion ? undefined : '30ms',
|
||||||
}}
|
}}
|
||||||
role="progressbar"
|
role="progressbar"
|
||||||
aria-valuemin={0}
|
aria-valuemin={0}
|
||||||
|
|
@ -283,7 +301,7 @@ export function SplashScreen() {
|
||||||
className="relative h-full rounded-full bg-gradient-to-r from-[#ff0040] via-[#ff0040] to-[#ccff00]"
|
className="relative h-full rounded-full bg-gradient-to-r from-[#ff0040] via-[#ff0040] to-[#ccff00]"
|
||||||
style={{
|
style={{
|
||||||
width: `${progress}%`,
|
width: `${progress}%`,
|
||||||
transition: 'width 420ms cubic-bezier(0.4,0,0.2,1)',
|
transition: 'width 240ms cubic-bezier(0.4,0,0.2,1)',
|
||||||
boxShadow: '0 0 12px rgba(255,0,64,0.6)',
|
boxShadow: '0 0 12px rgba(255,0,64,0.6)',
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
|
@ -305,8 +323,8 @@ export function SplashScreen() {
|
||||||
<div
|
<div
|
||||||
className="mt-5 flex h-4 items-center gap-2"
|
className="mt-5 flex h-4 items-center gap-2"
|
||||||
style={{
|
style={{
|
||||||
...anim('splashRise 620ms cubic-bezier(0.22,1,0.36,1) both'),
|
...anim('splashRise 320ms cubic-bezier(0.22,1,0.36,1) both'),
|
||||||
animationDelay: prefersReducedMotion ? undefined : '320ms',
|
animationDelay: prefersReducedMotion ? undefined : '60ms',
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{ready ? (
|
{ready ? (
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ import {
|
||||||
DropdownMenuItem,
|
DropdownMenuItem,
|
||||||
DropdownMenuTrigger,
|
DropdownMenuTrigger,
|
||||||
} from '@/components/ui/dropdown-menu';
|
} from '@/components/ui/dropdown-menu';
|
||||||
import { MapPin, Store, Bookmark, MoreVertical, Flag, ShieldCheck } from 'lucide-react';
|
import { MapPin, Store, Bookmark, MoreVertical, Flag, ShieldCheck, Trash2 } from 'lucide-react';
|
||||||
import { useAuthor } from '@/hooks/useAuthor';
|
import { useAuthor } from '@/hooks/useAuthor';
|
||||||
import { useCurrentUser } from '@/hooks/useCurrentUser';
|
import { useCurrentUser } from '@/hooks/useCurrentUser';
|
||||||
import { useVenuesWithPasses } from '@/hooks/useRiderCard';
|
import { useVenuesWithPasses } from '@/hooks/useRiderCard';
|
||||||
|
|
@ -23,6 +23,7 @@ import { OfficialBadge } from '@/components/OfficialBadge';
|
||||||
import { AddToCollectionDialog } from '@/components/AddToCollectionDialog';
|
import { AddToCollectionDialog } from '@/components/AddToCollectionDialog';
|
||||||
import { ReportDialog } from '@/components/ReportDialog';
|
import { ReportDialog } from '@/components/ReportDialog';
|
||||||
import { MuteMenuItem } from '@/components/MuteMenuItem';
|
import { MuteMenuItem } from '@/components/MuteMenuItem';
|
||||||
|
import { DeleteEntityDialog } from '@/components/DeleteEntityDialog';
|
||||||
import { SpotStatusBadge } from '@/components/SpotStatusBadge';
|
import { SpotStatusBadge } from '@/components/SpotStatusBadge';
|
||||||
import type { SkateSpot } from '@/lib/types';
|
import type { SkateSpot } from '@/lib/types';
|
||||||
import { ACCESS_TYPE_INFO, SHELTER_INFO, SKATE_SHOP_KIND } from '@/lib/types';
|
import { ACCESS_TYPE_INFO, SHELTER_INFO, SKATE_SHOP_KIND } from '@/lib/types';
|
||||||
|
|
@ -30,6 +31,7 @@ import { spotTypeLabel } from '@/lib/spotTypeLabel';
|
||||||
import { ACCESS_TYPE_KEYS, SHELTER_SHORT_KEYS } from '@/lib/labelKeys';
|
import { ACCESS_TYPE_KEYS, SHELTER_SHORT_KEYS } from '@/lib/labelKeys';
|
||||||
import type { AggregatedSpotStatus } from '@/hooks/useSpotStatus';
|
import type { AggregatedSpotStatus } from '@/hooks/useSpotStatus';
|
||||||
import { useTranslation } from '@/contexts/language';
|
import { useTranslation } from '@/contexts/language';
|
||||||
|
import { isAdminPubkey } from '@/lib/admins';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
|
|
||||||
interface SpotCardProps {
|
interface SpotCardProps {
|
||||||
|
|
@ -48,10 +50,13 @@ export function SpotCard({ spot, status, community }: SpotCardProps) {
|
||||||
const displayName = metadata?.name ?? genUserName(spot.pubkey);
|
const displayName = metadata?.name ?? genUserName(spot.pubkey);
|
||||||
const [showCollectionDialog, setShowCollectionDialog] = useState(false);
|
const [showCollectionDialog, setShowCollectionDialog] = useState(false);
|
||||||
const [showReportDialog, setShowReportDialog] = useState(false);
|
const [showReportDialog, setShowReportDialog] = useState(false);
|
||||||
|
const [showDeleteDialog, setShowDeleteDialog] = useState(false);
|
||||||
|
|
||||||
// Determine if this is a shop or a spot
|
// Determine if this is a shop or a spot
|
||||||
const isShop = spot.types.includes('shop');
|
const isShop = spot.types.includes('shop');
|
||||||
const isOwner = user?.pubkey === spot.pubkey;
|
const isOwner = user?.pubkey === spot.pubkey;
|
||||||
|
const isAdmin = isAdminPubkey(user?.pubkey);
|
||||||
|
const canDelete = !!user && (isOwner || isAdmin);
|
||||||
const route = isShop ? `/shop/${spot.pubkey}/${spot.identifier}` : `/spot/${spot.pubkey}/${spot.identifier}`;
|
const route = isShop ? `/shop/${spot.pubkey}/${spot.identifier}` : `/spot/${spot.pubkey}/${spot.identifier}`;
|
||||||
|
|
||||||
// Shops that actually issue access passes get a badge (one shared, cached query).
|
// Shops that actually issue access passes get a badge (one shared, cached query).
|
||||||
|
|
@ -245,7 +250,19 @@ export function SpotCard({ spot, status, community }: SpotCardProps) {
|
||||||
<MoreVertical className="h-4 w-4" />
|
<MoreVertical className="h-4 w-4" />
|
||||||
</Button>
|
</Button>
|
||||||
</DropdownMenuTrigger>
|
</DropdownMenuTrigger>
|
||||||
<DropdownMenuContent align="end" className="w-40">
|
<DropdownMenuContent align="end" className="w-44">
|
||||||
|
{canDelete && (
|
||||||
|
<DropdownMenuItem
|
||||||
|
onSelect={(e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
setShowDeleteDialog(true);
|
||||||
|
}}
|
||||||
|
className="text-red-500 focus:text-red-500"
|
||||||
|
>
|
||||||
|
<Trash2 className="mr-2 h-4 w-4" />
|
||||||
|
{isOwner ? t('common.delete') : t('spotUi.removeAdmin')}
|
||||||
|
</DropdownMenuItem>
|
||||||
|
)}
|
||||||
{!isOwner && (
|
{!isOwner && (
|
||||||
<DropdownMenuItem
|
<DropdownMenuItem
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
|
|
@ -275,6 +292,17 @@ export function SpotCard({ spot, status, community }: SpotCardProps) {
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* Owner/admin delete confirmation */}
|
||||||
|
{canDelete && (
|
||||||
|
<DeleteEntityDialog
|
||||||
|
open={showDeleteDialog}
|
||||||
|
onOpenChange={setShowDeleteDialog}
|
||||||
|
event={spot.event}
|
||||||
|
entityLabel={isShop ? t('mapUi.skateShop') : t('spotUi.spot')}
|
||||||
|
entityName={spot.title}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
|
||||||
{/* Report Dialog */}
|
{/* Report Dialog */}
|
||||||
<ReportDialog
|
<ReportDialog
|
||||||
open={showReportDialog}
|
open={showReportDialog}
|
||||||
|
|
|
||||||
|
|
@ -48,9 +48,20 @@ export function TradeReputationCard({ pubkey, className }: { pubkey: string; cla
|
||||||
// Activity factor: a fresh account with no published content contributes ~0,
|
// Activity factor: a fresh account with no published content contributes ~0,
|
||||||
// so a ring of empty accounts can't move the score even if cross-confirmed.
|
// so a ring of empty accounts can't move the score even if cross-confirmed.
|
||||||
const activityFactor = (pk: string) => Math.min(1, (activity?.get(pk) ?? 0) / 3);
|
const activityFactor = (pk: string) => Math.min(1, (activity?.get(pk) ?? 0) / 3);
|
||||||
|
const now = Math.floor(Date.now() / 1000);
|
||||||
|
const decayFactor = (v: { lastAt: number; recentCount: number }) => {
|
||||||
|
// 180-day half-life, floored so a good historical record is still visible.
|
||||||
|
// This changes the ranking weight only; lifetime counts stay unchanged.
|
||||||
|
const ageDays = Math.max(0, (now - v.lastAt) / 86_400);
|
||||||
|
return Math.max(0.25, Math.exp(-ageDays / 180));
|
||||||
|
};
|
||||||
const weighted = verifiedWith.reduce(
|
const weighted = verifiedWith.reduce(
|
||||||
(sum, v) =>
|
(sum, v) =>
|
||||||
sum + Math.min(v.count, 3) * ((scores?.get(v.pubkey) ?? 0) / 100) * activityFactor(v.pubkey),
|
sum +
|
||||||
|
Math.min(v.count, 3) *
|
||||||
|
((scores?.get(v.pubkey) ?? 0) / 100) *
|
||||||
|
activityFactor(v.pubkey) *
|
||||||
|
decayFactor(v),
|
||||||
0,
|
0,
|
||||||
);
|
);
|
||||||
const trustLabel =
|
const trustLabel =
|
||||||
|
|
@ -79,6 +90,13 @@ export function TradeReputationCard({ pubkey, className }: { pubkey: string; cla
|
||||||
? `${data.verified} ${data.verified === 1 ? t('marketUi.reputation.tradeConfirmedOne') : t('marketUi.reputation.tradeConfirmedMany')} ${t('marketUi.reputation.with')} ${people} ${people === 1 ? t('marketUi.reputation.personOne') : t('marketUi.reputation.personMany')}`
|
? `${data.verified} ${data.verified === 1 ? t('marketUi.reputation.tradeConfirmedOne') : t('marketUi.reputation.tradeConfirmedMany')} ${t('marketUi.reputation.with')} ${people} ${people === 1 ? t('marketUi.reputation.personOne') : t('marketUi.reputation.personMany')}`
|
||||||
: t('marketUi.reputation.awaiting')}
|
: t('marketUi.reputation.awaiting')}
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
{data.recentVerified > 0 && (
|
||||||
|
<p className="text-xs text-gray-500">
|
||||||
|
<span className="font-bold text-[#ccff00]">{data.recentVerified}</span>{' '}
|
||||||
|
{t('marketUi.reputation.recentConfirmed')}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
{data.withPaymentProof > 0 && (
|
{data.withPaymentProof > 0 && (
|
||||||
<p className="text-xs text-gray-500">
|
<p className="text-xs text-gray-500">
|
||||||
<span className="font-bold text-[#ccff00]">{data.withPaymentProof}</span> {t('marketUi.reputation.withPaymentProof')} <span className="text-gray-600">{t('marketUi.reputation.selfReported')}</span>
|
<span className="font-bold text-[#ccff00]">{data.withPaymentProof}</span> {t('marketUi.reputation.withPaymentProof')} <span className="text-gray-600">{t('marketUi.reputation.selfReported')}</span>
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,20 @@
|
||||||
import { useTranslation } from '@/contexts/language';
|
import { useTranslation } from '@/contexts/language';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* "Ways to support" — three purpose-first cards; each scrolls to its rail by id
|
* "Ways to support" — three purpose-first cards; each scrolls to its rail by id
|
||||||
* (#support-lightning / #support-silent / #support-angor), so it works anywhere
|
* (#support-lightning / #support-silent / #support-angor), so it works anywhere
|
||||||
* those anchors exist (/supporters and /donate).
|
* those anchors exist (/supporters and /donate).
|
||||||
*/
|
*/
|
||||||
export function WaysToSupport({ className }: { className?: string }) {
|
export function WaysToSupport({
|
||||||
|
className,
|
||||||
|
active,
|
||||||
|
onSelect,
|
||||||
|
}: {
|
||||||
|
className?: string;
|
||||||
|
active?: string;
|
||||||
|
onSelect?: (id: string) => void;
|
||||||
|
}) {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const ways = [
|
const ways = [
|
||||||
{ id: 'support-lightning', emoji: '⚡', title: t('walletUi.supporters.wayLightningTitle'), desc: t('walletUi.supporters.wayLightningDesc') },
|
{ id: 'support-lightning', emoji: '⚡', title: t('walletUi.supporters.wayLightningTitle'), desc: t('walletUi.supporters.wayLightningDesc') },
|
||||||
|
|
@ -13,16 +22,29 @@ export function WaysToSupport({ className }: { className?: string }) {
|
||||||
{ id: 'support-angor', emoji: '⛓', title: t('walletUi.supporters.wayAngorTitle'), desc: t('walletUi.supporters.wayAngorDesc') },
|
{ id: 'support-angor', emoji: '⛓', title: t('walletUi.supporters.wayAngorTitle'), desc: t('walletUi.supporters.wayAngorDesc') },
|
||||||
];
|
];
|
||||||
return (
|
return (
|
||||||
<div className={`grid grid-cols-1 gap-3 sm:grid-cols-3 ${className ?? ''}`}>
|
<div className={`grid grid-cols-3 gap-2 ${className ?? ''}`}>
|
||||||
{ways.map((w) => (
|
{ways.map((w) => (
|
||||||
<button
|
<button
|
||||||
key={w.id}
|
key={w.id}
|
||||||
onClick={() => document.getElementById(w.id)?.scrollIntoView({ behavior: 'smooth', block: 'start' })}
|
type="button"
|
||||||
className="min-h-0 min-w-0 rounded-xl border border-white/10 bg-black/60 p-4 text-left transition-colors hover:border-[#ccff00]/40 hover:bg-white/5"
|
aria-pressed={active === w.id}
|
||||||
|
onClick={() => {
|
||||||
|
if (onSelect) {
|
||||||
|
onSelect(w.id);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
document.getElementById(w.id)?.scrollIntoView({ behavior: 'smooth', block: 'start' });
|
||||||
|
}}
|
||||||
|
className={cn(
|
||||||
|
'min-h-0 min-w-0 rounded-xl border p-2.5 text-left transition-colors sm:p-3',
|
||||||
|
active === w.id
|
||||||
|
? 'border-[#ccff00]/60 bg-[#ccff00]/10'
|
||||||
|
: 'border-white/10 bg-black/60 hover:border-[#ccff00]/40 hover:bg-white/5',
|
||||||
|
)}
|
||||||
>
|
>
|
||||||
<span className="text-2xl">{w.emoji}</span>
|
<span className="text-xl">{w.emoji}</span>
|
||||||
<p className="mt-2 text-sm font-black uppercase text-white">{w.title}</p>
|
<p className="mt-1 text-[10px] font-black uppercase leading-tight text-white sm:mt-2 sm:text-xs">{w.title}</p>
|
||||||
<p className="mt-1 text-xs text-gray-400">{w.desc}</p>
|
<p className="mt-0.5 hidden text-[10px] leading-snug text-gray-400 sm:block">{w.desc}</p>
|
||||||
</button>
|
</button>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
import { ZapDialog } from '@/components/ZapDialog';
|
import { LazyZapDialog } from '@/components/LazyZapDialog';
|
||||||
import { useZaps } from '@/hooks/useZaps';
|
import { useZaps } from '@/hooks/useZaps';
|
||||||
import { useWallet } from '@/hooks/useWallet';
|
import { useWallet } from '@/hooks/useWallet';
|
||||||
import { useCurrentUser } from '@/hooks/useCurrentUser';
|
import { useCurrentUser } from '@/hooks/useCurrentUser';
|
||||||
|
|
@ -65,7 +65,7 @@ export function ZapButton({
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ZapDialog target={target}>
|
<LazyZapDialog target={target}>
|
||||||
<div className={`flex items-center gap-1 ${className}`}>
|
<div className={`flex items-center gap-1 ${className}`}>
|
||||||
<Zap className="h-4 w-4" />
|
<Zap className="h-4 w-4" />
|
||||||
<span className="text-xs">
|
<span className="text-xs">
|
||||||
|
|
@ -78,6 +78,6 @@ export function ZapButton({
|
||||||
)}
|
)}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</ZapDialog>
|
</LazyZapDialog>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
import { useState, useEffect, useRef, forwardRef } from 'react';
|
import { useState, useEffect, useRef, forwardRef, useCallback } from 'react';
|
||||||
import { Zap, Copy, Check, ExternalLink, Sparkle, Sparkles, Star, Rocket, ArrowLeft, X, Wallet } from 'lucide-react';
|
import { Zap, Copy, Check, ExternalLink, Sparkle, Sparkles, Star, Rocket, ArrowLeft, X, Wallet } from 'lucide-react';
|
||||||
import { Button } from '@/components/ui/button';
|
import { Button } from '@/components/ui/button';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
|
|
@ -42,6 +42,11 @@ interface ZapDialogProps {
|
||||||
target: Event;
|
target: Event;
|
||||||
children?: React.ReactNode;
|
children?: React.ReactNode;
|
||||||
className?: string;
|
className?: string;
|
||||||
|
/** Controlled open state (used by LazyZapDialog). */
|
||||||
|
open?: boolean;
|
||||||
|
onOpenChange?: (open: boolean) => void;
|
||||||
|
/** Skip the built-in trigger when the caller owns the trigger. */
|
||||||
|
hideTrigger?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
const presetAmounts = [
|
const presetAmounts = [
|
||||||
|
|
@ -420,9 +425,21 @@ const ZapContent = forwardRef<HTMLDivElement, ZapContentProps>(({
|
||||||
});
|
});
|
||||||
ZapContent.displayName = 'ZapContent';
|
ZapContent.displayName = 'ZapContent';
|
||||||
|
|
||||||
export function ZapDialog({ target, children, className }: ZapDialogProps) {
|
export function ZapDialog({
|
||||||
|
target,
|
||||||
|
children,
|
||||||
|
className,
|
||||||
|
open: controlledOpen,
|
||||||
|
onOpenChange,
|
||||||
|
hideTrigger = false,
|
||||||
|
}: ZapDialogProps) {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const [open, setOpen] = useState(false);
|
const [internalOpen, setInternalOpen] = useState(false);
|
||||||
|
const open = controlledOpen ?? internalOpen;
|
||||||
|
const setOpen = useCallback((next: boolean) => {
|
||||||
|
if (controlledOpen !== undefined) onOpenChange?.(next);
|
||||||
|
else setInternalOpen(next);
|
||||||
|
}, [controlledOpen, onOpenChange]);
|
||||||
const { user } = useCurrentUser();
|
const { user } = useCurrentUser();
|
||||||
const { data: author } = useAuthor(target.pubkey);
|
const { data: author } = useAuthor(target.pubkey);
|
||||||
const { toast } = useToast();
|
const { toast } = useToast();
|
||||||
|
|
@ -664,11 +681,13 @@ export function ZapDialog({ target, children, className }: ZapDialogProps) {
|
||||||
shouldScaleBackground={false}
|
shouldScaleBackground={false}
|
||||||
fadeFromIndex={0}
|
fadeFromIndex={0}
|
||||||
>
|
>
|
||||||
<DrawerTrigger asChild>
|
{!hideTrigger && children != null && (
|
||||||
<div className={`cursor-pointer ${className || ''}`}>
|
<DrawerTrigger asChild>
|
||||||
{children}
|
<div className={`cursor-pointer ${className || ''}`}>
|
||||||
</div>
|
{children}
|
||||||
</DrawerTrigger>
|
</div>
|
||||||
|
</DrawerTrigger>
|
||||||
|
)}
|
||||||
<DrawerContent
|
<DrawerContent
|
||||||
key={invoice ? 'payment' : 'form'}
|
key={invoice ? 'payment' : 'form'}
|
||||||
className={cn(
|
className={cn(
|
||||||
|
|
@ -732,11 +751,13 @@ export function ZapDialog({ target, children, className }: ZapDialogProps) {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Dialog open={open} onOpenChange={setOpen}>
|
<Dialog open={open} onOpenChange={setOpen}>
|
||||||
<DialogTrigger asChild>
|
{!hideTrigger && children != null && (
|
||||||
<div className={`cursor-pointer ${className || ''}`}>
|
<DialogTrigger asChild>
|
||||||
{children}
|
<div className={`cursor-pointer ${className || ''}`}>
|
||||||
</div>
|
{children}
|
||||||
</DialogTrigger>
|
</div>
|
||||||
|
</DialogTrigger>
|
||||||
|
)}
|
||||||
<DialogContent className="w-[calc(100%-1rem)] sm:max-w-[425px] max-h-[90vh] max-h-[90dvh] overflow-hidden p-4 sm:p-6" data-testid="zap-modal">
|
<DialogContent className="w-[calc(100%-1rem)] sm:max-w-[425px] max-h-[90vh] max-h-[90dvh] overflow-hidden p-4 sm:p-6" data-testid="zap-modal">
|
||||||
<DialogHeader>
|
<DialogHeader>
|
||||||
<DialogTitle className="text-base sm:text-lg break-words">
|
<DialogTitle className="text-base sm:text-lg break-words">
|
||||||
|
|
|
||||||
|
|
@ -180,7 +180,8 @@ export function AmberCallbackHandler() {
|
||||||
case 'nip04_decrypt':
|
case 'nip04_decrypt':
|
||||||
case 'nip44_decrypt': {
|
case 'nip44_decrypt': {
|
||||||
// Store encryption/decryption results
|
// Store encryption/decryption results
|
||||||
sessionStorage.setItem('amber_crypto_result', result);
|
// The result is delivered through the callback promise/flow; do not
|
||||||
|
// leave private plaintext in browser storage.
|
||||||
clearAmberPendingOperation();
|
clearAmberPendingOperation();
|
||||||
toast({
|
toast({
|
||||||
title: t('settingsUi.amberCallback.operationCompleteTitle'),
|
title: t('settingsUi.amberCallback.operationCompleteTitle'),
|
||||||
|
|
|
||||||
|
|
@ -814,6 +814,11 @@ export function CordnNativePanel({
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<p className="pt-1 text-xs text-gray-500">{copy.subtitle}</p>
|
<p className="pt-1 text-xs text-gray-500">{copy.subtitle}</p>
|
||||||
|
{native.group && native.lastCheckedAt && (
|
||||||
|
<p className="pt-0.5 text-[10px] text-gray-600">
|
||||||
|
{t('cordnUi.lastChecked')} {formatDistanceToNow(new Date(native.lastCheckedAt), { addSuffix: true })}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
{!isCommunity && (
|
{!isCommunity && (
|
||||||
<details className="group mt-1 rounded-md border border-white/10 bg-black/20 px-2.5 py-1.5">
|
<details className="group mt-1 rounded-md border border-white/10 bg-black/20 px-2.5 py-1.5">
|
||||||
<summary className="flex cursor-pointer list-none items-center gap-1 text-[11px] text-gray-400">
|
<summary className="flex cursor-pointer list-none items-center gap-1 text-[11px] text-gray-400">
|
||||||
|
|
@ -870,20 +875,49 @@ export function CordnNativePanel({
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<ol className="mx-auto max-w-sm space-y-2 text-left">
|
<ol className="mx-auto max-w-sm space-y-2 text-left">
|
||||||
{steps.map((step, index) => (
|
{steps.map((step, index) => {
|
||||||
<li key={step} className="flex items-start gap-2 text-xs text-gray-400">
|
// Members see the setup move visibly: device key prepared →
|
||||||
<span className="mt-0.5 flex h-4 w-4 shrink-0 items-center justify-center rounded-full bg-teal-500/15 text-[10px] font-bold text-teal-300">
|
// request sent → waiting for an admin. Founders start at step 1.
|
||||||
{index + 1}
|
const stepDone = !canCreate && index === 0 && (awaiting || native.keyPackageReady);
|
||||||
</span>
|
const stepWaiting = !canCreate && index === 1 && awaiting;
|
||||||
<span>{step}</span>
|
return (
|
||||||
</li>
|
<li
|
||||||
))}
|
key={step}
|
||||||
|
className={cn(
|
||||||
|
'flex items-start gap-2 text-xs',
|
||||||
|
stepDone || stepWaiting ? 'text-teal-200' : 'text-gray-400',
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
<span className={cn(
|
||||||
|
'mt-0.5 flex h-4 w-4 shrink-0 items-center justify-center rounded-full text-[10px] font-bold',
|
||||||
|
stepDone ? 'bg-teal-500/20 text-teal-300' : 'bg-teal-500/15 text-teal-300',
|
||||||
|
)}>
|
||||||
|
{stepDone ? <Check className="h-2.5 w-2.5" /> : stepWaiting ? <Loader2 className="h-2.5 w-2.5 animate-spin" /> : index + 1}
|
||||||
|
</span>
|
||||||
|
<span>{step}</span>
|
||||||
|
</li>
|
||||||
|
);
|
||||||
|
})}
|
||||||
</ol>
|
</ol>
|
||||||
|
|
||||||
<p className="mx-auto max-w-sm text-[11px] text-gray-500">
|
<p className="mx-auto max-w-sm text-[11px] text-gray-500">
|
||||||
{copy.encryptedNote}
|
{copy.encryptedNote}
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
{/* Amber needs one foreground approval for the device key and one
|
||||||
|
for the join request. Show the two translated step labels so the
|
||||||
|
second prompt is expected, not a mystery. */}
|
||||||
|
{native.interactiveHintVisible && !canCreate && (
|
||||||
|
<p className="mx-auto flex max-w-sm items-center justify-center gap-1.5 text-[11px] text-amber-300/80">
|
||||||
|
<KeyRound className="h-3 w-3 shrink-0" />
|
||||||
|
<span>Amber</span>
|
||||||
|
<span aria-hidden="true">·</span>
|
||||||
|
<span>{t('cordnUi.setupDevice')}</span>
|
||||||
|
<span aria-hidden="true">→</span>
|
||||||
|
<span>{t('cordnUi.requestJoin')}</span>
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
|
||||||
<div className="flex flex-wrap items-center justify-center gap-2">
|
<div className="flex flex-wrap items-center justify-center gap-2">
|
||||||
{canCreate ? (
|
{canCreate ? (
|
||||||
<Button
|
<Button
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,9 @@
|
||||||
|
import { useState } from 'react';
|
||||||
import { Link } from 'react-router-dom';
|
import { Link } from 'react-router-dom';
|
||||||
import { Lock, ShieldCheck, Server, ExternalLink, Settings, Copy, MessagesSquare, Users } from 'lucide-react';
|
import { Lock, ShieldCheck, Server, ExternalLink, Settings, Copy, MessagesSquare, Users, QrCode } from 'lucide-react';
|
||||||
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
|
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
|
||||||
import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar';
|
import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar';
|
||||||
|
import { QRCodeCanvas } from '@/components/ui/qrcode';
|
||||||
import { useAuthor } from '@/hooks/useAuthor';
|
import { useAuthor } from '@/hooks/useAuthor';
|
||||||
import { useTranslation } from '@/contexts/language';
|
import { useTranslation } from '@/contexts/language';
|
||||||
import { useToast } from '@/hooks/useToast';
|
import { useToast } from '@/hooks/useToast';
|
||||||
|
|
@ -217,6 +219,7 @@ export function CrewCoordinatorCard({
|
||||||
function StaircaseLink({ coordinator }: { coordinator: { pubkey?: string; relays?: string[] } }) {
|
function StaircaseLink({ coordinator }: { coordinator: { pubkey?: string; relays?: string[] } }) {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const { toast } = useToast();
|
const { toast } = useToast();
|
||||||
|
const [showQr, setShowQr] = useState(false);
|
||||||
const nprofile = coordinator.pubkey
|
const nprofile = coordinator.pubkey
|
||||||
? nip19.nprofileEncode({ pubkey: coordinator.pubkey, relays: coordinator.relays ?? [] })
|
? nip19.nprofileEncode({ pubkey: coordinator.pubkey, relays: coordinator.relays ?? [] })
|
||||||
: null;
|
: null;
|
||||||
|
|
@ -247,13 +250,31 @@ function StaircaseLink({ coordinator }: { coordinator: { pubkey?: string; relays
|
||||||
<ExternalLink className="h-3.5 w-3.5" /> {t('socialUi.crewCoordinator.openInCordnWeb')}
|
<ExternalLink className="h-3.5 w-3.5" /> {t('socialUi.crewCoordinator.openInCordnWeb')}
|
||||||
</a>
|
</a>
|
||||||
{nprofile && (
|
{nprofile && (
|
||||||
<button
|
<>
|
||||||
type="button"
|
<button
|
||||||
onClick={() => void copyNprofile()}
|
type="button"
|
||||||
className={`${btn} border-white/15 bg-white/5 text-gray-300 hover:bg-white/10`}
|
onClick={() => void copyNprofile()}
|
||||||
>
|
className={`${btn} border-white/15 bg-white/5 text-gray-300 hover:bg-white/10`}
|
||||||
<Copy className="h-3.5 w-3.5" /> {t('socialUi.crewCoordinator.copyForStaircase')}
|
>
|
||||||
</button>
|
<Copy className="h-3.5 w-3.5" /> {t('socialUi.crewCoordinator.copyForStaircase')}
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => setShowQr((v) => !v)}
|
||||||
|
aria-expanded={showQr}
|
||||||
|
className={`${btn} border-white/15 bg-white/5 text-gray-300 hover:bg-white/10`}
|
||||||
|
>
|
||||||
|
<QrCode className="h-3.5 w-3.5" /> QR
|
||||||
|
</button>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
{showQr && nprofile && (
|
||||||
|
<div className="mt-2 flex w-full flex-col items-center gap-2 rounded-xl border border-white/10 bg-black/40 p-3">
|
||||||
|
<QRCodeCanvas value={nprofile} size={168} level="M" />
|
||||||
|
<p className="text-center text-[11px] text-gray-500">
|
||||||
|
{t('socialUi.coordinator.scanToJoin')}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -99,7 +99,7 @@ export interface EventResult {
|
||||||
export type LabRole =
|
export type LabRole =
|
||||||
| 'coach' | 'filmer' | 'editor' | 'photographer' | 'builder'
|
| 'coach' | 'filmer' | 'editor' | 'photographer' | 'builder'
|
||||||
| 'artist' | 'graffiti' | 'tattoo' | 'trainer' | 'musician' | 'judge'
|
| 'artist' | 'graffiti' | 'tattoo' | 'trainer' | 'musician' | 'judge'
|
||||||
| 'organizer' | 'barber';
|
| 'organizer' | 'barber' | 'transport';
|
||||||
|
|
||||||
export interface CoachResult {
|
export interface CoachResult {
|
||||||
role: LabRole;
|
role: LabRole;
|
||||||
|
|
@ -562,6 +562,7 @@ export function useCVMClient() {
|
||||||
builder: 35005, artist: 35007, graffiti: 35008, tattoo: 35009,
|
builder: 35005, artist: 35007, graffiti: 35008, tattoo: 35009,
|
||||||
trainer: 35010, musician: 35011, judge: 35012, organizer: 35013,
|
trainer: 35010, musician: 35011, judge: 35012, organizer: 35013,
|
||||||
barber: 35014,
|
barber: 35014,
|
||||||
|
transport: 35016,
|
||||||
};
|
};
|
||||||
const KIND_ROLE: Record<number, LabRole> = Object.fromEntries(
|
const KIND_ROLE: Record<number, LabRole> = Object.fromEntries(
|
||||||
Object.entries(ROLE_KIND).map(([role, kind]) => [kind, role as LabRole])
|
Object.entries(ROLE_KIND).map(([role, kind]) => [kind, role as LabRole])
|
||||||
|
|
@ -607,7 +608,7 @@ export function useCVMClient() {
|
||||||
const SELF_TAGS = new Set([
|
const SELF_TAGS = new Set([
|
||||||
'skatecoach', 'skatefilmer', 'skateeditor', 'skatephotographer', 'skatebuilder',
|
'skatecoach', 'skatefilmer', 'skateeditor', 'skatephotographer', 'skatebuilder',
|
||||||
'skateartist', 'skategraffiti', 'skatetattoo', 'skatetrainer', 'skatemusician', 'skatejudge',
|
'skateartist', 'skategraffiti', 'skatetattoo', 'skatetrainer', 'skatemusician', 'skatejudge',
|
||||||
'skateorganizer', 'skatebarber',
|
'skateorganizer', 'skatebarber', 'skatetransport',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const result: CoachResult[] = profiles.map((e) => {
|
const result: CoachResult[] = profiles.map((e) => {
|
||||||
|
|
|
||||||
|
|
@ -50,6 +50,10 @@ export interface CoordinatorHealth {
|
||||||
name: string | null;
|
name: string | null;
|
||||||
error: string | null;
|
error: string | null;
|
||||||
checkedAt: number | null;
|
checkedAt: number | null;
|
||||||
|
/** Actual ContextVM RPC probe, not just presence. */
|
||||||
|
rpcStatus: 'idle' | 'checking' | 'ok' | 'error';
|
||||||
|
rpcLatencyMs: number | null;
|
||||||
|
rpcError: string | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -65,8 +69,52 @@ const INITIAL: CoordinatorHealth = {
|
||||||
name: null,
|
name: null,
|
||||||
error: null,
|
error: null,
|
||||||
checkedAt: null,
|
checkedAt: null,
|
||||||
|
rpcStatus: 'idle',
|
||||||
|
rpcLatencyMs: null,
|
||||||
|
rpcError: null,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
function randomKeyHex(): string {
|
||||||
|
const bytes = new Uint8Array(32);
|
||||||
|
if (globalThis.crypto?.getRandomValues) {
|
||||||
|
globalThis.crypto.getRandomValues(bytes);
|
||||||
|
} else {
|
||||||
|
for (let i = 0; i < bytes.length; i += 1) bytes[i] = Math.floor(Math.random() * 256);
|
||||||
|
}
|
||||||
|
return Array.from(bytes, (b) => b.toString(16).padStart(2, '0')).join('');
|
||||||
|
}
|
||||||
|
|
||||||
|
async function probeCoordinatorRpc(
|
||||||
|
coordinator: CoordinatorConfig,
|
||||||
|
relays: string[],
|
||||||
|
): Promise<Pick<CoordinatorHealth, 'rpcStatus' | 'rpcLatencyMs' | 'rpcError'>> {
|
||||||
|
let client: { listAvailableKeyPackages: () => Promise<unknown>; disconnect: () => Promise<void> } | null = null;
|
||||||
|
const started = Date.now();
|
||||||
|
try {
|
||||||
|
const { CordnCoordinatorClient } = await import('@/lib/cordn/native/coordinator');
|
||||||
|
client = new CordnCoordinatorClient({
|
||||||
|
serverPubkey: coordinator.pubkey,
|
||||||
|
relays,
|
||||||
|
privateKeyHex: randomKeyHex(),
|
||||||
|
});
|
||||||
|
await Promise.race([
|
||||||
|
client.listAvailableKeyPackages(),
|
||||||
|
new Promise<never>((_, reject) =>
|
||||||
|
setTimeout(() => reject(new Error('Coordinator RPC timed out.')), 7_000),
|
||||||
|
),
|
||||||
|
]);
|
||||||
|
return { rpcStatus: 'ok', rpcLatencyMs: Date.now() - started, rpcError: null };
|
||||||
|
} catch (e) {
|
||||||
|
return {
|
||||||
|
rpcStatus: 'error',
|
||||||
|
rpcLatencyMs: null,
|
||||||
|
rpcError: e instanceof Error ? e.message : 'Coordinator RPC failed.',
|
||||||
|
};
|
||||||
|
} finally {
|
||||||
|
if (client) await client.disconnect().catch(() => undefined);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Presence probe for a coordinator.
|
* Presence probe for a coordinator.
|
||||||
*
|
*
|
||||||
|
|
@ -86,7 +134,16 @@ export function useCoordinatorHealth(coordinator: CoordinatorConfig | null) {
|
||||||
|
|
||||||
const check = useCallback(async () => {
|
const check = useCallback(async () => {
|
||||||
if (!coordinator) return;
|
if (!coordinator) return;
|
||||||
setResult((r) => ({ ...r, status: 'checking', error: null }));
|
setResult((r) => ({
|
||||||
|
...r,
|
||||||
|
status: 'checking',
|
||||||
|
error: null,
|
||||||
|
rpcStatus: 'checking',
|
||||||
|
rpcLatencyMs: null,
|
||||||
|
rpcError: null,
|
||||||
|
}));
|
||||||
|
|
||||||
|
const rpc = await probeCoordinatorRpc(coordinator, relays);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const signal = AbortSignal.timeout(8000);
|
const signal = AbortSignal.timeout(8000);
|
||||||
|
|
@ -113,6 +170,7 @@ export function useCoordinatorHealth(coordinator: CoordinatorConfig | null) {
|
||||||
name: null,
|
name: null,
|
||||||
error: null,
|
error: null,
|
||||||
checkedAt: Date.now(),
|
checkedAt: Date.now(),
|
||||||
|
...rpc,
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -127,6 +185,7 @@ export function useCoordinatorHealth(coordinator: CoordinatorConfig | null) {
|
||||||
name: coordinatorNameFromEvent(newest),
|
name: coordinatorNameFromEvent(newest),
|
||||||
error: null,
|
error: null,
|
||||||
checkedAt: Date.now(),
|
checkedAt: Date.now(),
|
||||||
|
...rpc,
|
||||||
});
|
});
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
setResult({
|
setResult({
|
||||||
|
|
@ -136,6 +195,7 @@ export function useCoordinatorHealth(coordinator: CoordinatorConfig | null) {
|
||||||
name: null,
|
name: null,
|
||||||
error: err instanceof Error ? err.message : 'Could not reach the relays',
|
error: err instanceof Error ? err.message : 'Could not reach the relays',
|
||||||
checkedAt: Date.now(),
|
checkedAt: Date.now(),
|
||||||
|
...rpc,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}, [coordinator, relays, nostr]);
|
}, [coordinator, relays, nostr]);
|
||||||
|
|
|
||||||
|
|
@ -58,11 +58,13 @@ export function useCordnChat({ endpoint, roster, enabled }: UseCordnChatParams)
|
||||||
staleTime: interactive ? Infinity : 2000,
|
staleTime: interactive ? Infinity : 2000,
|
||||||
// Amber: decrypt the backlog once per session, not on every crew-page visit.
|
// Amber: decrypt the backlog once per session, not on every crew-page visit.
|
||||||
...(interactive ? { gcTime: Infinity, refetchOnMount: false as const } : {}),
|
...(interactive ? { gcTime: Infinity, refetchOnMount: false as const } : {}),
|
||||||
queryFn: async (): Promise<CordnMessage[]> => {
|
queryFn: async (c): Promise<CordnMessage[]> => {
|
||||||
if (!endpoint || !user) return [];
|
if (!endpoint || !user) return [];
|
||||||
const relay = nostr.relay(endpoint.relayUrl) as unknown as CordnRelay;
|
const relay = nostr.relay(endpoint.relayUrl) as unknown as CordnRelay;
|
||||||
const signer = user.signer as unknown as Nip44Signer;
|
const signer = user.signer as unknown as Nip44Signer;
|
||||||
const signal = AbortSignal.timeout(10000);
|
// Honour query cancellation too — the fetch loop decrypts per message and
|
||||||
|
// must not keep opening Amber after the crew page is closed.
|
||||||
|
const signal = AbortSignal.any([c.signal, AbortSignal.timeout(10000)]);
|
||||||
return fetchGroupMessages({
|
return fetchGroupMessages({
|
||||||
relay,
|
relay,
|
||||||
endpoint,
|
endpoint,
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
import { useCallback, useMemo } from 'react';
|
import { useCallback, useMemo, useRef } from 'react';
|
||||||
import { useQuery } from '@tanstack/react-query';
|
import { useQuery } from '@tanstack/react-query';
|
||||||
import { useNostrLogin } from '@nostrify/react/login';
|
import { useNostrLogin } from '@nostrify/react/login';
|
||||||
import { useCurrentUser } from '@/hooks/useCurrentUser';
|
import { useCurrentUser } from '@/hooks/useCurrentUser';
|
||||||
|
|
@ -25,6 +25,11 @@ export function useCordnJoinNotifications(opened = false) {
|
||||||
const interactive = isInteractiveSigner(user, logins);
|
const interactive = isInteractiveSigner(user, logins);
|
||||||
const { querySkateContent, getQueryKeySuffix } = useSkateRelays();
|
const { querySkateContent, getQueryKeySuffix } = useSkateRelays();
|
||||||
const [dismissed, setDismissed] = useLocalStorage<string[]>(DISMISSED_KEY, []);
|
const [dismissed, setDismissed] = useLocalStorage<string[]>(DISMISSED_KEY, []);
|
||||||
|
// The bell can close while a decrypt loop is running; React Query stops
|
||||||
|
// scheduling new fetches when `enabled` flips, but does not necessarily abort
|
||||||
|
// the current queryFn. Read the live open state inside the loop.
|
||||||
|
const openedRef = useRef(opened);
|
||||||
|
openedRef.current = opened;
|
||||||
// Amber prompts once per decrypt. Load these only when the bell is opened;
|
// Amber prompts once per decrypt. Load these only when the bell is opened;
|
||||||
// passive signers can fetch them quietly in the background.
|
// passive signers can fetch them quietly in the background.
|
||||||
const canRead = !!user?.pubkey && hasNip44(user, logins) && (!interactive || opened);
|
const canRead = !!user?.pubkey && hasNip44(user, logins) && (!interactive || opened);
|
||||||
|
|
@ -51,6 +56,9 @@ export function useCordnJoinNotifications(opened = false) {
|
||||||
);
|
);
|
||||||
const notices: CordnJoinNotice[] = [];
|
const notices: CordnJoinNotice[] = [];
|
||||||
for (const event of events) {
|
for (const event of events) {
|
||||||
|
// Closing the bell/unmounting the query must stop further Amber
|
||||||
|
// decrypt prompts; the old loop kept going after navigation.
|
||||||
|
if (!openedRef.current || c.signal.aborted) break;
|
||||||
let plain: string;
|
let plain: string;
|
||||||
try {
|
try {
|
||||||
plain = event.content.trim().startsWith('{')
|
plain = event.content.trim().startsWith('{')
|
||||||
|
|
|
||||||
|
|
@ -71,7 +71,7 @@ export interface UseCordnNativeResult {
|
||||||
/** Send a read receipt for an inbound message. */
|
/** Send a read receipt for an inbound message. */
|
||||||
markRead: (messageId: string) => Promise<boolean>;
|
markRead: (messageId: string) => Promise<boolean>;
|
||||||
/** Re-fetch messages (and adopt any new commits). */
|
/** Re-fetch messages (and adopt any new commits). */
|
||||||
refresh: () => Promise<void>;
|
refresh: () => Promise<boolean>;
|
||||||
/** Founder/admin: create the crew's MLS group. */
|
/** Founder/admin: create the crew's MLS group. */
|
||||||
createChat: () => Promise<boolean>;
|
createChat: () => Promise<boolean>;
|
||||||
/** Non-admin: ask the coordinator to be added (publishes a key package). */
|
/** Non-admin: ask the coordinator to be added (publishes a key package). */
|
||||||
|
|
@ -110,6 +110,8 @@ export interface UseCordnNativeResult {
|
||||||
}
|
}
|
||||||
|
|
||||||
const POLL_MS = 6000;
|
const POLL_MS = 6000;
|
||||||
|
const HIDDEN_POLL_MS = 12000;
|
||||||
|
const MAX_BACKOFF_MS = 60000;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Drives a {@link CordnSession} for one crew: real MLS over the crew's Cordn
|
* Drives a {@link CordnSession} for one crew: real MLS over the crew's Cordn
|
||||||
|
|
@ -231,9 +233,9 @@ export function useCordnNative({
|
||||||
};
|
};
|
||||||
}, [enabled, pubkey, signer, coordinator, groupId, reloadKey]);
|
}, [enabled, pubkey, signer, coordinator, groupId, reloadKey]);
|
||||||
|
|
||||||
const refresh = useCallback(async () => {
|
const refresh = useCallback(async (): Promise<boolean> => {
|
||||||
const session = sessionRef.current;
|
const session = sessionRef.current;
|
||||||
if (!session || !group) return;
|
if (!session || !group) return false;
|
||||||
try {
|
try {
|
||||||
await session.fetch(group.gid);
|
await session.fetch(group.gid);
|
||||||
const next = session.messages(group.gid);
|
const next = session.messages(group.gid);
|
||||||
|
|
@ -241,22 +243,56 @@ export function useCordnNative({
|
||||||
setGroup(session.listGroups().find((g) => g.gid === group.gid) ?? group);
|
setGroup(session.listGroups().find((g) => g.gid === group.gid) ?? group);
|
||||||
setError(null);
|
setError(null);
|
||||||
setLastCheckedAt(Date.now());
|
setLastCheckedAt(Date.now());
|
||||||
|
return true;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
setError(err instanceof Error ? err.message : String(err));
|
setError(err instanceof Error ? err.message : String(err));
|
||||||
setLastCheckedAt(Date.now());
|
setLastCheckedAt(Date.now());
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}, [group]);
|
}, [group]);
|
||||||
|
|
||||||
// Live polling for silent signers only — an interactive signer would pop for
|
// Live polling for silent signers only — an interactive signer would pop for
|
||||||
// every request, so those users refresh/send manually (same rule as the DM
|
// every request, so those users refresh/send manually (same rule as the DM
|
||||||
// and sealed-relay chat hooks).
|
// and sealed-relay chat hooks). Hidden tabs poll less, and a failure backs
|
||||||
|
// off exponentially with jitter so a busy/rate-limited coordinator is not
|
||||||
|
// hammered by every open device.
|
||||||
|
const pollDelayRef = useRef(POLL_MS);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!ready || !group || interactive || !canBackgroundPoll) return;
|
if (!ready || !group || interactive || !canBackgroundPoll) return;
|
||||||
const id = setInterval(() => void refresh(), POLL_MS);
|
let cancelled = false;
|
||||||
return () => clearInterval(id);
|
let timer: ReturnType<typeof setTimeout> | undefined;
|
||||||
}, [ready, group, interactive, canBackgroundPoll, refresh]);
|
pollDelayRef.current = active ? POLL_MS : HIDDEN_POLL_MS;
|
||||||
|
|
||||||
|
const tick = async () => {
|
||||||
|
const ok = await refresh();
|
||||||
|
if (cancelled) return;
|
||||||
|
if (ok) {
|
||||||
|
pollDelayRef.current = active ? POLL_MS : HIDDEN_POLL_MS;
|
||||||
|
} else {
|
||||||
|
pollDelayRef.current = Math.min(
|
||||||
|
MAX_BACKOFF_MS,
|
||||||
|
Math.max(POLL_MS, Math.round(pollDelayRef.current * 1.7)),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
const jitter = Math.round(Math.random() * 800);
|
||||||
|
timer = setTimeout(() => void tick(), pollDelayRef.current + jitter);
|
||||||
|
};
|
||||||
|
|
||||||
|
timer = setTimeout(() => void tick(), pollDelayRef.current);
|
||||||
|
return () => {
|
||||||
|
cancelled = true;
|
||||||
|
if (timer) clearTimeout(timer);
|
||||||
|
};
|
||||||
|
}, [ready, group, interactive, canBackgroundPoll, active, refresh]);
|
||||||
|
|
||||||
|
// One coordinator operation at a time. With Amber every coordinator request
|
||||||
|
// is a foreground approval; a double-tap on "Set up" used to start two
|
||||||
|
// publish/join flows, which looked like Amber randomly opening twice and left
|
||||||
|
// one of the two requests to time out.
|
||||||
|
const runInFlight = useRef(false);
|
||||||
const run = useCallback(async <T,>(fn: () => Promise<T>): Promise<T | undefined> => {
|
const run = useCallback(async <T,>(fn: () => Promise<T>): Promise<T | undefined> => {
|
||||||
|
if (runInFlight.current) return undefined;
|
||||||
|
runInFlight.current = true;
|
||||||
setBusy(true);
|
setBusy(true);
|
||||||
setError(null);
|
setError(null);
|
||||||
try {
|
try {
|
||||||
|
|
@ -265,6 +301,7 @@ export function useCordnNative({
|
||||||
setError(err instanceof Error ? err.message : String(err));
|
setError(err instanceof Error ? err.message : String(err));
|
||||||
return undefined;
|
return undefined;
|
||||||
} finally {
|
} finally {
|
||||||
|
runInFlight.current = false;
|
||||||
setBusy(false);
|
setBusy(false);
|
||||||
setLastCheckedAt(Date.now());
|
setLastCheckedAt(Date.now());
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -245,6 +245,21 @@ type DecryptedDm = CachedDm;
|
||||||
const DM_DECRYPT_CACHE_MAX = 4000;
|
const DM_DECRYPT_CACHE_MAX = 4000;
|
||||||
const dmDecryptCache = new Map<string, DecryptedDm>();
|
const dmDecryptCache = new Map<string, DecryptedDm>();
|
||||||
const dmDecryptInFlight = new Map<string, Promise<DecryptedDm | null>>();
|
const dmDecryptInFlight = new Map<string, Promise<DecryptedDm | null>>();
|
||||||
|
/**
|
||||||
|
* Seal plaintext cache. A gift wrap needs TWO decrypts (seal, then rumor). If
|
||||||
|
* the user navigates while Amber is open after the first one, the query aborts
|
||||||
|
* before we can build the full message. Keeping the seal means the next visit
|
||||||
|
* only asks Amber for the rumor instead of prompting twice for the same wrap.
|
||||||
|
*/
|
||||||
|
const dmSealCache = new Map<string, string>();
|
||||||
|
|
||||||
|
function rememberSeal(key: string, sealJson: string): void {
|
||||||
|
if (dmSealCache.size >= DM_DECRYPT_CACHE_MAX) {
|
||||||
|
const oldest = dmSealCache.keys().next().value;
|
||||||
|
if (oldest !== undefined) dmSealCache.delete(oldest);
|
||||||
|
}
|
||||||
|
dmSealCache.set(key, sealJson);
|
||||||
|
}
|
||||||
|
|
||||||
// Which accounts' persisted caches have been loaded into memory this session,
|
// Which accounts' persisted caches have been loaded into memory this session,
|
||||||
// and any hydration in flight (so concurrent readers await the same load).
|
// and any hydration in flight (so concurrent readers await the same load).
|
||||||
|
|
@ -286,11 +301,17 @@ async function decryptGiftWrap(
|
||||||
viewerPk: string,
|
viewerPk: string,
|
||||||
signer: DmSigner,
|
signer: DmSigner,
|
||||||
wrap: NostrEvent,
|
wrap: NostrEvent,
|
||||||
|
signal?: AbortSignal,
|
||||||
): Promise<DecryptedDm | null> {
|
): Promise<DecryptedDm | null> {
|
||||||
|
// A cancelled query must stop launching NEW Amber intents. Without this, a
|
||||||
|
// user who starts decrypting the inbox and then navigates away would keep
|
||||||
|
// getting Amber popups for every remaining gift wrap in the background.
|
||||||
|
if (signal?.aborted) return null;
|
||||||
const key = `${viewerPk}:${wrap.id}`;
|
const key = `${viewerPk}:${wrap.id}`;
|
||||||
// Hydrate the persisted cache once per account before the first lookup, so a
|
// Hydrate the persisted cache once per account before the first lookup, so a
|
||||||
// relaunch reuses decryptions that already happened on this device.
|
// relaunch reuses decryptions that already happened on this device.
|
||||||
await ensureDmCacheHydrated(viewerPk);
|
await ensureDmCacheHydrated(viewerPk);
|
||||||
|
if (signal?.aborted) return null;
|
||||||
const cached = dmDecryptCache.get(key);
|
const cached = dmDecryptCache.get(key);
|
||||||
if (cached) return cached;
|
if (cached) return cached;
|
||||||
const flying = dmDecryptInFlight.get(key);
|
const flying = dmDecryptInFlight.get(key);
|
||||||
|
|
@ -298,7 +319,15 @@ async function decryptGiftWrap(
|
||||||
|
|
||||||
const task = (async (): Promise<DecryptedDm | null> => {
|
const task = (async (): Promise<DecryptedDm | null> => {
|
||||||
try {
|
try {
|
||||||
const sealJson = await signer.nip44!.decrypt(wrap.pubkey, wrap.content);
|
let sealJson = dmSealCache.get(key);
|
||||||
|
if (!sealJson) {
|
||||||
|
sealJson = await signer.nip44!.decrypt(wrap.pubkey, wrap.content);
|
||||||
|
rememberSeal(key, sealJson);
|
||||||
|
}
|
||||||
|
// Navigation may have cancelled the query while Amber was open. Do not
|
||||||
|
// ask for the second decrypt (which would pop Amber again) — the next
|
||||||
|
// explicit visit reuses the cached seal and only asks for the rumor.
|
||||||
|
if (signal?.aborted) return null;
|
||||||
const seal = JSON.parse(sealJson) as NostrEvent;
|
const seal = JSON.parse(sealJson) as NostrEvent;
|
||||||
if (seal.kind !== SEAL_KIND) return null;
|
if (seal.kind !== SEAL_KIND) return null;
|
||||||
// SECURITY: verify the seal's signature (sender impersonation).
|
// SECURITY: verify the seal's signature (sender impersonation).
|
||||||
|
|
@ -326,6 +355,7 @@ async function decryptGiftWrap(
|
||||||
if (oldest !== undefined) dmDecryptCache.delete(oldest);
|
if (oldest !== undefined) dmDecryptCache.delete(oldest);
|
||||||
}
|
}
|
||||||
dmDecryptCache.set(key, dm);
|
dmDecryptCache.set(key, dm);
|
||||||
|
dmSealCache.delete(key);
|
||||||
// Persist so this wrap is never decrypted again (fire-and-forget).
|
// Persist so this wrap is never decrypted again (fire-and-forget).
|
||||||
void saveDmDecryptKey(key, viewerPk, dm).catch(() => {});
|
void saveDmDecryptKey(key, viewerPk, dm).catch(() => {});
|
||||||
return dm;
|
return dm;
|
||||||
|
|
@ -661,10 +691,11 @@ export function useConversation(otherPubkey: string) {
|
||||||
const messages: DirectMessage[] = [];
|
const messages: DirectMessage[] = [];
|
||||||
|
|
||||||
for (const giftWrap of uniqueEvents) {
|
for (const giftWrap of uniqueEvents) {
|
||||||
|
if (c.signal.aborted) break;
|
||||||
try {
|
try {
|
||||||
// Decrypt via the shared session cache (coalesced; one decrypt per wrap
|
// Decrypt via the shared session cache (coalesced; one decrypt per wrap
|
||||||
// per session even across different views).
|
// per session even across different views).
|
||||||
const dm = await decryptGiftWrap(user.pubkey, user.signer, giftWrap);
|
const dm = await decryptGiftWrap(user.pubkey, user.signer, giftWrap, c.signal);
|
||||||
if (!dm) continue;
|
if (!dm) continue;
|
||||||
|
|
||||||
// 1:1 only. A message with more than one recipient is a GROUP message
|
// 1:1 only. A message with more than one recipient is a GROUP message
|
||||||
|
|
@ -707,7 +738,8 @@ export function useConversation(otherPubkey: string) {
|
||||||
/**
|
/**
|
||||||
* Hook to fetch all conversations
|
* Hook to fetch all conversations
|
||||||
*/
|
*/
|
||||||
export function useConversations() {
|
export function useConversations(options: { enabled?: boolean } = {}) {
|
||||||
|
const callerEnabled = options.enabled ?? true;
|
||||||
const { nostr } = useNostr();
|
const { nostr } = useNostr();
|
||||||
const { user } = useCurrentUser();
|
const { user } = useCurrentUser();
|
||||||
const { logins } = useNostrLogin();
|
const { logins } = useNostrLogin();
|
||||||
|
|
@ -750,9 +782,10 @@ export function useConversations() {
|
||||||
let undecryptable = 0;
|
let undecryptable = 0;
|
||||||
|
|
||||||
for (const giftWrap of uniqueEvents) {
|
for (const giftWrap of uniqueEvents) {
|
||||||
|
if (c.signal.aborted) break;
|
||||||
try {
|
try {
|
||||||
// Decrypt via the shared session cache.
|
// Decrypt via the shared session cache.
|
||||||
const dm = await decryptGiftWrap(user.pubkey, user.signer, giftWrap);
|
const dm = await decryptGiftWrap(user.pubkey, user.signer, giftWrap, c.signal);
|
||||||
if (!dm) continue;
|
if (!dm) continue;
|
||||||
|
|
||||||
// 1:1 list only. A message with more than one recipient is a GROUP
|
// 1:1 list only. A message with more than one recipient is a GROUP
|
||||||
|
|
@ -811,7 +844,7 @@ export function useConversations() {
|
||||||
);
|
);
|
||||||
return { conversations: sorted, undecryptable, wraps: uniqueEvents.length };
|
return { conversations: sorted, undecryptable, wraps: uniqueEvents.length };
|
||||||
},
|
},
|
||||||
enabled: nip44Available,
|
enabled: nip44Available && callerEnabled,
|
||||||
...amberSafeQueryOptions(isInteractiveSigner(user, logins)),
|
...amberSafeQueryOptions(isInteractiveSigner(user, logins)),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -828,7 +861,8 @@ export function useConversations() {
|
||||||
* the protocols to adopt if those guarantees are required later.
|
* the protocols to adopt if those guarantees are required later.
|
||||||
* See GROUP_MESSAGING.md for the full decision and upgrade paths.
|
* See GROUP_MESSAGING.md for the full decision and upgrade paths.
|
||||||
*/
|
*/
|
||||||
export function useGroupConversations() {
|
export function useGroupConversations(options: { enabled?: boolean } = {}) {
|
||||||
|
const callerEnabled = options.enabled ?? true;
|
||||||
const { nostr } = useNostr();
|
const { nostr } = useNostr();
|
||||||
const { user } = useCurrentUser();
|
const { user } = useCurrentUser();
|
||||||
const { logins } = useNostrLogin();
|
const { logins } = useNostrLogin();
|
||||||
|
|
@ -864,8 +898,9 @@ export function useGroupConversations() {
|
||||||
const byGroup = new Map<string, DirectMessage[]>();
|
const byGroup = new Map<string, DirectMessage[]>();
|
||||||
|
|
||||||
for (const giftWrap of uniqueEvents) {
|
for (const giftWrap of uniqueEvents) {
|
||||||
|
if (c.signal.aborted) break;
|
||||||
try {
|
try {
|
||||||
const dm = await decryptGiftWrap(user.pubkey, user.signer, giftWrap);
|
const dm = await decryptGiftWrap(user.pubkey, user.signer, giftWrap, c.signal);
|
||||||
if (!dm) continue;
|
if (!dm) continue;
|
||||||
// 1:1 messages are surfaced by useConversations, not here.
|
// 1:1 messages are surfaced by useConversations, not here.
|
||||||
if (dm.recipients.length <= 1) continue;
|
if (dm.recipients.length <= 1) continue;
|
||||||
|
|
@ -910,7 +945,7 @@ export function useGroupConversations() {
|
||||||
(a, b) => (b.lastMessage?.createdAt || 0) - (a.lastMessage?.createdAt || 0),
|
(a, b) => (b.lastMessage?.createdAt || 0) - (a.lastMessage?.createdAt || 0),
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
enabled: nip44Available,
|
enabled: nip44Available && callerEnabled,
|
||||||
...amberSafeQueryOptions(isInteractiveSigner(user, logins)),
|
...amberSafeQueryOptions(isInteractiveSigner(user, logins)),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -975,8 +1010,9 @@ export function useGroupConversation(participants: string[]) {
|
||||||
const messages: DirectMessage[] = [];
|
const messages: DirectMessage[] = [];
|
||||||
|
|
||||||
for (const giftWrap of uniqueEvents) {
|
for (const giftWrap of uniqueEvents) {
|
||||||
|
if (c.signal.aborted) break;
|
||||||
try {
|
try {
|
||||||
const dm = await decryptGiftWrap(user.pubkey, user.signer, giftWrap);
|
const dm = await decryptGiftWrap(user.pubkey, user.signer, giftWrap, c.signal);
|
||||||
if (!dm) continue;
|
if (!dm) continue;
|
||||||
|
|
||||||
// Only include if this message is part of the target group.
|
// Only include if this message is part of the target group.
|
||||||
|
|
|
||||||
|
|
@ -56,7 +56,7 @@ export function useFollowers(pubkey?: string) {
|
||||||
|
|
||||||
// Query all kind 3 events that have a p tag with our pubkey
|
// Query all kind 3 events that have a p tag with our pubkey
|
||||||
const events = await nostr.query(
|
const events = await nostr.query(
|
||||||
[{ kinds: [3], '#p': [targetPubkey], limit: 100 }],
|
[{ kinds: [3], '#p': [targetPubkey], limit: 500 }],
|
||||||
{ signal }
|
{ signal }
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ import {
|
||||||
SKATE_MUSICIAN_KIND,
|
SKATE_MUSICIAN_KIND,
|
||||||
SKATE_JUDGE_KIND,
|
SKATE_JUDGE_KIND,
|
||||||
SKATE_ORGANIZER_KIND,
|
SKATE_ORGANIZER_KIND,
|
||||||
SKATE_BARBER_KIND,
|
SKATE_BARBER_KIND, SKATE_TRANSPORT_KIND, SKATE_DESIGNER_KIND,
|
||||||
SKATE_TOUR_KIND,
|
SKATE_TOUR_KIND,
|
||||||
SKATE_CREW_KIND,
|
SKATE_CREW_KIND,
|
||||||
MARKETPLACE_ITEM_KIND,
|
MARKETPLACE_ITEM_KIND,
|
||||||
|
|
@ -79,6 +79,8 @@ export interface GrowthStats {
|
||||||
totalJudges: number;
|
totalJudges: number;
|
||||||
totalOrganizers: number;
|
totalOrganizers: number;
|
||||||
totalBarbers: number;
|
totalBarbers: number;
|
||||||
|
totalTransport: number;
|
||||||
|
totalDesigners: number;
|
||||||
totalTours: number;
|
totalTours: number;
|
||||||
totalCrews: number;
|
totalCrews: number;
|
||||||
/** All unique pubkeys that have published any content */
|
/** All unique pubkeys that have published any content */
|
||||||
|
|
@ -230,6 +232,8 @@ export function useGrowthStats() { // Community stats read from the CANONICAL c
|
||||||
judgeEvents,
|
judgeEvents,
|
||||||
organizerEvents,
|
organizerEvents,
|
||||||
barberEvents,
|
barberEvents,
|
||||||
|
transportEvents,
|
||||||
|
designerEvents,
|
||||||
listingEvents,
|
listingEvents,
|
||||||
tradeEvents,
|
tradeEvents,
|
||||||
] = await Promise.all([
|
] = await Promise.all([
|
||||||
|
|
@ -253,6 +257,8 @@ export function useGrowthStats() { // Community stats read from the CANONICAL c
|
||||||
querySkateContent([{ kinds: [SKATE_JUDGE_KIND], limit: 500 }], { signal }).catch(() => []),
|
querySkateContent([{ kinds: [SKATE_JUDGE_KIND], limit: 500 }], { signal }).catch(() => []),
|
||||||
querySkateContent([{ kinds: [SKATE_ORGANIZER_KIND], limit: 500 }], { signal }).catch(() => []),
|
querySkateContent([{ kinds: [SKATE_ORGANIZER_KIND], limit: 500 }], { signal }).catch(() => []),
|
||||||
querySkateContent([{ kinds: [SKATE_BARBER_KIND], limit: 500 }], { signal }).catch(() => []),
|
querySkateContent([{ kinds: [SKATE_BARBER_KIND], limit: 500 }], { signal }).catch(() => []),
|
||||||
|
querySkateContent([{ kinds: [SKATE_TRANSPORT_KIND], limit: 500 }], { signal }).catch(() => []),
|
||||||
|
querySkateContent([{ kinds: [SKATE_DESIGNER_KIND], limit: 500 }], { signal }).catch(() => []),
|
||||||
// Marketplace: live listings + completed-trade attestations.
|
// Marketplace: live listings + completed-trade attestations.
|
||||||
querySkateContent([{ kinds: [MARKETPLACE_ITEM_KIND], '#t': ['skateboarding'], limit: 2000 }], { signal }).catch(() => []),
|
querySkateContent([{ kinds: [MARKETPLACE_ITEM_KIND], '#t': ['skateboarding'], limit: 2000 }], { signal }).catch(() => []),
|
||||||
querySkateContent([{ kinds: [TRADE_ATTESTATION_KIND], limit: 1000 }], { signal }).catch(() => []),
|
querySkateContent([{ kinds: [TRADE_ATTESTATION_KIND], limit: 1000 }], { signal }).catch(() => []),
|
||||||
|
|
@ -295,8 +301,10 @@ export function useGrowthStats() { // Community stats read from the CANONICAL c
|
||||||
const judges = dedup(judgeEvents);
|
const judges = dedup(judgeEvents);
|
||||||
const organizers = dedup(organizerEvents);
|
const organizers = dedup(organizerEvents);
|
||||||
const barbers = dedup(barberEvents);
|
const barbers = dedup(barberEvents);
|
||||||
|
const transport = dedup(transportEvents);
|
||||||
|
const designers = dedup(designerEvents);
|
||||||
// Aggregate of the "other" crafts for active-mapper / total rollups.
|
// Aggregate of the "other" crafts for active-mapper / total rollups.
|
||||||
const otherLab = [...artists, ...graffiti, ...tattoo, ...trainers, ...musicians, ...judges, ...organizers, ...barbers];
|
const otherLab = [...artists, ...graffiti, ...tattoo, ...trainers, ...musicians, ...judges, ...organizers, ...barbers, ...transport, ...designers];
|
||||||
|
|
||||||
// ── Marketplace ──────────────────────────────────────────────────────
|
// ── Marketplace ──────────────────────────────────────────────────────
|
||||||
// Showcase-only stash items are public but NOT for sale, so exclude them.
|
// Showcase-only stash items are public but NOT for sale, so exclude them.
|
||||||
|
|
@ -574,6 +582,8 @@ export function useGrowthStats() { // Community stats read from the CANONICAL c
|
||||||
totalJudges: judges.length,
|
totalJudges: judges.length,
|
||||||
totalOrganizers: organizers.length,
|
totalOrganizers: organizers.length,
|
||||||
totalBarbers: barbers.length,
|
totalBarbers: barbers.length,
|
||||||
|
totalTransport: transport.length,
|
||||||
|
totalDesigners: designers.length,
|
||||||
totalTours: tours.length,
|
totalTours: tours.length,
|
||||||
totalCrews: crews.length,
|
totalCrews: crews.length,
|
||||||
totalMappers: allPubkeys.size,
|
totalMappers: allPubkeys.size,
|
||||||
|
|
|
||||||
|
|
@ -2,14 +2,14 @@ import { useQuery } from '@tanstack/react-query';
|
||||||
import {
|
import {
|
||||||
SKATE_COACH_KIND, SKATE_FILMER_KIND, SKATE_EDITOR_KIND, SKATE_PHOTOGRAPHER_KIND, SKATE_BUILDER_KIND,
|
SKATE_COACH_KIND, SKATE_FILMER_KIND, SKATE_EDITOR_KIND, SKATE_PHOTOGRAPHER_KIND, SKATE_BUILDER_KIND,
|
||||||
SKATE_ARTIST_KIND, SKATE_GRAFFITI_KIND, SKATE_TATTOO_KIND, SKATE_TRAINER_KIND, SKATE_MUSICIAN_KIND, SKATE_JUDGE_KIND, SKATE_ORGANIZER_KIND,
|
SKATE_ARTIST_KIND, SKATE_GRAFFITI_KIND, SKATE_TATTOO_KIND, SKATE_TRAINER_KIND, SKATE_MUSICIAN_KIND, SKATE_JUDGE_KIND, SKATE_ORGANIZER_KIND,
|
||||||
SKATE_BARBER_KIND, SKATE_DESIGNER_KIND,
|
SKATE_BARBER_KIND, SKATE_DESIGNER_KIND, SKATE_TRANSPORT_KIND,
|
||||||
parseSkateCoach, parseSkateFilmer, parseSkateEditor, parseSkatePhotographer, parseSkateBuilder,
|
parseSkateCoach, parseSkateFilmer, parseSkateEditor, parseSkatePhotographer, parseSkateBuilder,
|
||||||
parseSkateArtist, parseSkateGraffiti, parseSkateTattoo, parseSkateTrainer, parseSkateMusician, parseSkateJudge, parseSkateOrganizer,
|
parseSkateArtist, parseSkateGraffiti, parseSkateTattoo, parseSkateTrainer, parseSkateMusician, parseSkateJudge, parseSkateOrganizer,
|
||||||
parseSkateBarber, parseSkateDesigner,
|
parseSkateBarber, parseSkateDesigner, parseSkateTransport,
|
||||||
isFeaturedActive,
|
isFeaturedActive,
|
||||||
type SkateCoach, type SkateFilmer, type SkateEditor, type SkatePhotographer, type SkateBuilder,
|
type SkateCoach, type SkateFilmer, type SkateEditor, type SkatePhotographer, type SkateBuilder,
|
||||||
type SkateArtist, type SkateGraffiti, type SkateTattoo, type SkateTrainer, type SkateMusician, type SkateJudge, type SkateOrganizer,
|
type SkateArtist, type SkateGraffiti, type SkateTattoo, type SkateTrainer, type SkateMusician, type SkateJudge, type SkateOrganizer,
|
||||||
type SkateBarber, type SkateDesigner,
|
type SkateBarber, type SkateDesigner, type SkateTransport,
|
||||||
} from '@/lib/types';
|
} from '@/lib/types';
|
||||||
import type { NostrEvent } from '@nostrify/nostrify';
|
import type { NostrEvent } from '@nostrify/nostrify';
|
||||||
import { useSkateRelays } from '@/hooks/useSkateRelays';
|
import { useSkateRelays } from '@/hooks/useSkateRelays';
|
||||||
|
|
@ -18,12 +18,12 @@ import { verifiedFeaturedCoords } from '@/lib/featuredVerification';
|
||||||
|
|
||||||
export type LabProfileType =
|
export type LabProfileType =
|
||||||
| 'coach' | 'filmer' | 'editor' | 'photographer' | 'builder'
|
| 'coach' | 'filmer' | 'editor' | 'photographer' | 'builder'
|
||||||
| 'artist' | 'graffiti' | 'tattoo' | 'trainer' | 'musician' | 'judge' | 'organizer' | 'barber' | 'designer';
|
| 'artist' | 'graffiti' | 'tattoo' | 'trainer' | 'musician' | 'judge' | 'organizer' | 'barber' | 'designer' | 'transport';
|
||||||
|
|
||||||
export type LabProfile = (
|
export type LabProfile = (
|
||||||
| SkateCoach | SkateFilmer | SkateEditor | SkatePhotographer | SkateBuilder
|
| SkateCoach | SkateFilmer | SkateEditor | SkatePhotographer | SkateBuilder
|
||||||
| SkateArtist | SkateGraffiti | SkateTattoo | SkateTrainer | SkateMusician | SkateJudge | SkateOrganizer
|
| SkateArtist | SkateGraffiti | SkateTattoo | SkateTrainer | SkateMusician | SkateJudge | SkateOrganizer
|
||||||
| SkateBarber | SkateDesigner
|
| SkateBarber | SkateDesigner | SkateTransport
|
||||||
) & {
|
) & {
|
||||||
profileType: LabProfileType;
|
profileType: LabProfileType;
|
||||||
};
|
};
|
||||||
|
|
@ -31,13 +31,13 @@ export type LabProfile = (
|
||||||
const LAB_KINDS = [
|
const LAB_KINDS = [
|
||||||
SKATE_COACH_KIND, SKATE_FILMER_KIND, SKATE_EDITOR_KIND, SKATE_PHOTOGRAPHER_KIND, SKATE_BUILDER_KIND,
|
SKATE_COACH_KIND, SKATE_FILMER_KIND, SKATE_EDITOR_KIND, SKATE_PHOTOGRAPHER_KIND, SKATE_BUILDER_KIND,
|
||||||
SKATE_ARTIST_KIND, SKATE_GRAFFITI_KIND, SKATE_TATTOO_KIND, SKATE_TRAINER_KIND, SKATE_MUSICIAN_KIND, SKATE_JUDGE_KIND, SKATE_ORGANIZER_KIND,
|
SKATE_ARTIST_KIND, SKATE_GRAFFITI_KIND, SKATE_TATTOO_KIND, SKATE_TRAINER_KIND, SKATE_MUSICIAN_KIND, SKATE_JUDGE_KIND, SKATE_ORGANIZER_KIND,
|
||||||
SKATE_BARBER_KIND, SKATE_DESIGNER_KIND,
|
SKATE_BARBER_KIND, SKATE_DESIGNER_KIND, SKATE_TRANSPORT_KIND,
|
||||||
];
|
];
|
||||||
|
|
||||||
const LAB_SELF_TAGS = [
|
const LAB_SELF_TAGS = [
|
||||||
'skatecoach', 'skatefilmer', 'skateeditor', 'skatephotographer', 'skatebuilder',
|
'skatecoach', 'skatefilmer', 'skateeditor', 'skatephotographer', 'skatebuilder',
|
||||||
'skateartist', 'skategraffiti', 'skatetattoo', 'skatetrainer', 'skatemusician', 'skatejudge', 'skateorganizer',
|
'skateartist', 'skategraffiti', 'skatetattoo', 'skatetrainer', 'skatemusician', 'skatejudge', 'skateorganizer',
|
||||||
'skatebarber', 'skateclothing',
|
'skatebarber', 'skateclothing', 'skatetransport',
|
||||||
];
|
];
|
||||||
|
|
||||||
/** profileType → addressable kind, for building a coordinate. */
|
/** profileType → addressable kind, for building a coordinate. */
|
||||||
|
|
@ -46,7 +46,7 @@ const KIND_BY_TYPE: Record<LabProfileType, number> = {
|
||||||
photographer: SKATE_PHOTOGRAPHER_KIND, builder: SKATE_BUILDER_KIND, artist: SKATE_ARTIST_KIND,
|
photographer: SKATE_PHOTOGRAPHER_KIND, builder: SKATE_BUILDER_KIND, artist: SKATE_ARTIST_KIND,
|
||||||
graffiti: SKATE_GRAFFITI_KIND, tattoo: SKATE_TATTOO_KIND, trainer: SKATE_TRAINER_KIND,
|
graffiti: SKATE_GRAFFITI_KIND, tattoo: SKATE_TATTOO_KIND, trainer: SKATE_TRAINER_KIND,
|
||||||
musician: SKATE_MUSICIAN_KIND, judge: SKATE_JUDGE_KIND, organizer: SKATE_ORGANIZER_KIND,
|
musician: SKATE_MUSICIAN_KIND, judge: SKATE_JUDGE_KIND, organizer: SKATE_ORGANIZER_KIND,
|
||||||
barber: SKATE_BARBER_KIND, designer: SKATE_DESIGNER_KIND,
|
barber: SKATE_BARBER_KIND, designer: SKATE_DESIGNER_KIND, transport: SKATE_TRANSPORT_KIND,
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Parse any Lab event into a LabProfile, or null if invalid / unknown kind. */
|
/** Parse any Lab event into a LabProfile, or null if invalid / unknown kind. */
|
||||||
|
|
@ -108,6 +108,10 @@ export function parseLabProfile(event: NostrEvent): LabProfile | null {
|
||||||
const p = parseSkateDesigner(event);
|
const p = parseSkateDesigner(event);
|
||||||
return p ? { ...p, profileType: 'designer' } : null;
|
return p ? { ...p, profileType: 'designer' } : null;
|
||||||
}
|
}
|
||||||
|
case SKATE_TRANSPORT_KIND: {
|
||||||
|
const p = parseSkateTransport(event);
|
||||||
|
return p ? { ...p, profileType: 'transport' } : null;
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
@ -212,3 +216,33 @@ export function useLabProfile(identifier: string, pubkey?: string) {
|
||||||
refetchOnMount: 'always',
|
refetchOnMount: 'always',
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Lab provider profiles authored by one pubkey (profile-page services strip). */
|
||||||
|
export function useUserLabProfiles(pubkey: string | undefined) {
|
||||||
|
const { querySkateContent, getQueryKeySuffix } = useSkateRelays();
|
||||||
|
const hidden = useAdminModeration();
|
||||||
|
|
||||||
|
return useQuery({
|
||||||
|
queryKey: ['user-lab-profiles', pubkey, getQueryKeySuffix()],
|
||||||
|
enabled: !!pubkey,
|
||||||
|
select: (profiles: LabProfile[]) => filterAdminHiddenMixed(profiles, hidden),
|
||||||
|
queryFn: async () => {
|
||||||
|
if (!pubkey) return [];
|
||||||
|
const signal = AbortSignal.timeout(12_000);
|
||||||
|
const events = await querySkateContent(
|
||||||
|
[{
|
||||||
|
kinds: LAB_KINDS,
|
||||||
|
authors: [pubkey],
|
||||||
|
'#t': LAB_SELF_TAGS,
|
||||||
|
limit: 50,
|
||||||
|
}],
|
||||||
|
{ signal },
|
||||||
|
);
|
||||||
|
return events
|
||||||
|
.map(parseLabProfile)
|
||||||
|
.filter((profile): profile is LabProfile => !!profile)
|
||||||
|
.sort((a, b) => b.createdAt - a.createdAt);
|
||||||
|
},
|
||||||
|
staleTime: 60_000,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -23,8 +23,8 @@ import { usePreferences } from '@/hooks/usePreferences';
|
||||||
* Bottom-nav customization (mobile).
|
* Bottom-nav customization (mobile).
|
||||||
*
|
*
|
||||||
* Model: the bar always shows a FIXED Map (Shops & Spots) on the left and a
|
* Model: the bar always shows a FIXED Map (Shops & Spots) on the left and a
|
||||||
* FIXED Profile/Login slot on the right. The user customizes the **3 middle
|
* FIXED More button on the right. The user customizes the **3 middle slots**
|
||||||
* slots** from a curated catalog. Anything they don't pin stays reachable in the
|
* from a curated catalog. Profile/login lives in the header avatar menu. Anything they don't pin stays reachable in the
|
||||||
* burger menu, so nothing is ever lost — just re-prioritized.
|
* burger menu, so nothing is ever lost — just re-prioritized.
|
||||||
*
|
*
|
||||||
* Stored per-device in localStorage (v1). Could later sync across devices via a
|
* Stored per-device in localStorage (v1). Could later sync across devices via a
|
||||||
|
|
@ -55,7 +55,7 @@ export const FIXED_MAP_TAB: NavTab = {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Everything the user can pin to the 3 middle slots.
|
* Everything the user can pin to the 3 middle slots.
|
||||||
* (Map is excluded — it's the fixed anchor. Profile is the fixed right slot.)
|
* (Map is excluded — it's the fixed anchor. More is the fixed right slot.)
|
||||||
*/
|
*/
|
||||||
export const NAV_CATALOG: NavTab[] = [
|
export const NAV_CATALOG: NavTab[] = [
|
||||||
{ id: 'lab', href: '/lab', labelKey: 'nav.lab', label: 'The Lab', icon: GraduationCap },
|
{ id: 'lab', href: '/lab', labelKey: 'nav.lab', label: 'The Lab', icon: GraduationCap },
|
||||||
|
|
@ -75,11 +75,12 @@ export const NAV_CATALOG: NavTab[] = [
|
||||||
];
|
];
|
||||||
|
|
||||||
/** Number of user-customizable middle slots. */
|
/** Number of user-customizable middle slots. */
|
||||||
export const MIDDLE_SLOTS = 4;
|
export const MIDDLE_SLOTS = 3;
|
||||||
|
|
||||||
/** Default middle tabs. Includes Mints (Cashu mint directory) so it's reachable
|
/** Default middle tabs. Keep the mobile bar to five intents total:
|
||||||
* from the phone nav out of the box; users can swap any of them via long-press. */
|
* fixed Map + these three + a fixed More button. Everything else lives in the
|
||||||
export const DEFAULT_TAB_IDS = ['lab', 'events', 'crews', 'mints'];
|
* burger menu, and users can still swap any middle tab via long-press. */
|
||||||
|
export const DEFAULT_TAB_IDS = ['lab', 'events', 'crews'];
|
||||||
|
|
||||||
const STORAGE_KEY = 'skatespots:nav-tabs:v1';
|
const STORAGE_KEY = 'skatespots:nav-tabs:v1';
|
||||||
|
|
||||||
|
|
@ -90,7 +91,7 @@ const STORAGE_KEY = 'skatespots:nav-tabs:v1';
|
||||||
// ever lost. Map is always the first primary tab and cannot be hidden/moved.
|
// ever lost. Map is always the first primary tab and cannot be hidden/moved.
|
||||||
|
|
||||||
/** Default desktop primary tabs. */
|
/** Default desktop primary tabs. */
|
||||||
export const DEFAULT_DESKTOP_IDS = ['lab', 'events', 'crews', 'mints'];
|
export const DEFAULT_DESKTOP_IDS = ['lab', 'events', 'crews', 'community'];
|
||||||
|
|
||||||
const DESKTOP_STORAGE_KEY = 'skatespots:desktop-nav:v1';
|
const DESKTOP_STORAGE_KEY = 'skatespots:desktop-nav:v1';
|
||||||
|
|
||||||
|
|
|
||||||
62
src/hooks/useRelayDivergence.ts
Normal file
62
src/hooks/useRelayDivergence.ts
Normal file
|
|
@ -0,0 +1,62 @@
|
||||||
|
import { useCallback, useState } from 'react';
|
||||||
|
import { useNostr } from '@nostrify/react';
|
||||||
|
import { useRelays } from '@/lib/relays';
|
||||||
|
import { SKATE_RELAY } from '@/lib/types';
|
||||||
|
import { onlyVerified } from '@/lib/verifyEvents';
|
||||||
|
import {
|
||||||
|
compareRelaySnapshots,
|
||||||
|
type RelayDivergenceResult,
|
||||||
|
type RelaySnapshot,
|
||||||
|
} from '@/lib/relayDivergence';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* On-demand relay consistency diagnostic.
|
||||||
|
*
|
||||||
|
* Queries a bounded profile snapshot from the community relay and the user's
|
||||||
|
* read relays, then reports newer/different signed profiles. This is not a vote
|
||||||
|
* and it never mutates canonical map/community data.
|
||||||
|
*/
|
||||||
|
export function useRelayDivergence() {
|
||||||
|
const { nostr } = useNostr();
|
||||||
|
const { read } = useRelays();
|
||||||
|
const [result, setResult] = useState<RelayDivergenceResult | null>(null);
|
||||||
|
const [checking, setChecking] = useState(false);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
|
||||||
|
const check = useCallback(async () => {
|
||||||
|
setChecking(true);
|
||||||
|
setError(null);
|
||||||
|
try {
|
||||||
|
const relays = Array.from(new Set([SKATE_RELAY, ...read])).slice(0, 5);
|
||||||
|
const signal = AbortSignal.timeout(12_000);
|
||||||
|
|
||||||
|
const snapshots = await Promise.all(
|
||||||
|
relays.map(async (relayUrl): Promise<RelaySnapshot> => {
|
||||||
|
try {
|
||||||
|
const relay = nostr.relay(relayUrl);
|
||||||
|
const events = await relay.query([{ kinds: [0], limit: 100 }], { signal });
|
||||||
|
return { relay: relayUrl, events: onlyVerified(events) };
|
||||||
|
} catch (e) {
|
||||||
|
return {
|
||||||
|
relay: relayUrl,
|
||||||
|
events: [],
|
||||||
|
error: e instanceof Error ? e.message : 'relay error',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
const canonical = snapshots.find((s) => s.relay === SKATE_RELAY);
|
||||||
|
if (!canonical) throw new Error('Community relay snapshot missing.');
|
||||||
|
const others = snapshots.filter((s) => s.relay !== SKATE_RELAY);
|
||||||
|
setResult(compareRelaySnapshots(canonical, others));
|
||||||
|
} catch (e) {
|
||||||
|
setResult(null);
|
||||||
|
setError(e instanceof Error ? e.message : 'check failed');
|
||||||
|
} finally {
|
||||||
|
setChecking(false);
|
||||||
|
}
|
||||||
|
}, [nostr, read]);
|
||||||
|
|
||||||
|
return { result, checking, error, check };
|
||||||
|
}
|
||||||
|
|
@ -4,30 +4,27 @@ import { useAppContext } from '@/hooks/useAppContext';
|
||||||
import { useRelays } from '@/lib/relays';
|
import { useRelays } from '@/lib/relays';
|
||||||
import { useCitrine } from '@/hooks/useCitrine';
|
import { useCitrine } from '@/hooks/useCitrine';
|
||||||
import { SKATE_RELAY } from '@/lib/types';
|
import { SKATE_RELAY } from '@/lib/types';
|
||||||
|
import { mergeEvents } from '@/lib/eventMerge';
|
||||||
|
import { getLocalDeletions } from '@/lib/localDeletions';
|
||||||
import type { NostrEvent, NostrFilter } from '@nostrify/nostrify';
|
import type { NostrEvent, NostrFilter } from '@nostrify/nostrify';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Deduplicate a batch of events from several relays, keeping the newest per
|
* Merge relay results deterministically and drop this device's local deletion
|
||||||
* identity:
|
* tombstones. Consensus is deliberately absent: relays are not voters, and this
|
||||||
* - addressable (has `d`): `pubkey:kind:d-tag`;
|
* client must not let relay timing decide which version of an event is shown.
|
||||||
* - replaceable (0, 3, 10000–19999): `pubkey:kind` (NIP-01 keeps only the
|
|
||||||
* latest per author+kind — keying by id would surface stale profiles/relay
|
|
||||||
* lists when relays return different versions);
|
|
||||||
* - otherwise: the event id.
|
|
||||||
*/
|
*/
|
||||||
function dedupeEvents(events: NostrEvent[]): NostrEvent[] {
|
function dedupeEvents(events: NostrEvent[]): NostrEvent[] {
|
||||||
const map = new Map<string, NostrEvent>();
|
const deleted = getLocalDeletions();
|
||||||
for (const event of events) {
|
return mergeEvents(events, {
|
||||||
const dTag = event.tags.find(([name]) => name === 'd')?.[1];
|
isDeleted: (event) => {
|
||||||
let key: string;
|
const dTag = event.tags.find(([name]) => name === 'd')?.[1];
|
||||||
if (dTag) key = `${event.pubkey}:${event.kind}:${dTag}`;
|
const coord = dTag !== undefined ? `${event.kind}:${event.pubkey}:${dTag}` : undefined;
|
||||||
else if (event.kind === 0 || event.kind === 3 || (event.kind >= 10000 && event.kind < 20000)) {
|
return !!(
|
||||||
key = `${event.pubkey}:${event.kind}`;
|
(coord && deleted.has(coord)) ||
|
||||||
} else key = event.id;
|
deleted.has(`e:${event.id}`)
|
||||||
const existing = map.get(key);
|
);
|
||||||
if (!existing || event.created_at > existing.created_at) map.set(key, event);
|
},
|
||||||
}
|
});
|
||||||
return Array.from(map.values());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -178,6 +178,8 @@ export interface TradeReputation {
|
||||||
purchases: number;
|
purchases: number;
|
||||||
/** Deals where both sides attested the same listing. */
|
/** Deals where both sides attested the same listing. */
|
||||||
verified: number;
|
verified: number;
|
||||||
|
/** Mutually confirmed deals with an attestation in the last 90 days. */
|
||||||
|
recentVerified: number;
|
||||||
/**
|
/**
|
||||||
* Mutually-confirmed trades that ALSO carry a `proof` tag (a payment claim).
|
* Mutually-confirmed trades that ALSO carry a `proof` tag (a payment claim).
|
||||||
* ⚠️ The `proof` is self-reported and the app does NOT verify it — it is a
|
* ⚠️ The `proof` is self-reported and the app does NOT verify it — it is a
|
||||||
|
|
@ -199,7 +201,7 @@ export interface TradeReputation {
|
||||||
*/
|
*/
|
||||||
verifiedCounterparties: number;
|
verifiedCounterparties: number;
|
||||||
/** Per-counterparty count of mutually-confirmed trades (for WoT weighting). */
|
/** Per-counterparty count of mutually-confirmed trades (for WoT weighting). */
|
||||||
verifiedWith: { pubkey: string; count: number }[];
|
verifiedWith: { pubkey: string; count: number; recentCount: number; lastAt: number }[];
|
||||||
/** Distinct counterparties involved. */
|
/** Distinct counterparties involved. */
|
||||||
counterparties: string[];
|
counterparties: string[];
|
||||||
/** Raw trade attestations this pubkey is involved in. */
|
/** Raw trade attestations this pubkey is involved in. */
|
||||||
|
|
@ -222,7 +224,7 @@ export function useTradeReputation(pubkey: string | undefined) {
|
||||||
enabled: !!pubkey,
|
enabled: !!pubkey,
|
||||||
staleTime: 5 * 60 * 1000,
|
staleTime: 5 * 60 * 1000,
|
||||||
queryFn: async (c): Promise<TradeReputation> => {
|
queryFn: async (c): Promise<TradeReputation> => {
|
||||||
const empty: TradeReputation = { sales: 0, purchases: 0, verified: 0, withPaymentProof: 0, paymentVerified: 0, verifiedCounterparties: 0, verifiedWith: [], counterparties: [], attestations: [] };
|
const empty: TradeReputation = { sales: 0, purchases: 0, verified: 0, recentVerified: 0, withPaymentProof: 0, paymentVerified: 0, verifiedCounterparties: 0, verifiedWith: [], counterparties: [], attestations: [] };
|
||||||
if (!pubkey) return empty;
|
if (!pubkey) return empty;
|
||||||
|
|
||||||
const signal = AbortSignal.any([c.signal, AbortSignal.timeout(12000)]);
|
const signal = AbortSignal.any([c.signal, AbortSignal.timeout(12000)]);
|
||||||
|
|
@ -253,10 +255,14 @@ export function useTradeReputation(pubkey: string | undefined) {
|
||||||
|
|
||||||
const counterparties = new Set<string>();
|
const counterparties = new Set<string>();
|
||||||
const verifiedWith = new Map<string, number>();
|
const verifiedWith = new Map<string, number>();
|
||||||
|
const verifiedRecentWith = new Map<string, number>();
|
||||||
|
const verifiedLastAt = new Map<string, number>();
|
||||||
let sales = 0;
|
let sales = 0;
|
||||||
let purchases = 0;
|
let purchases = 0;
|
||||||
let verified = 0;
|
let verified = 0;
|
||||||
|
let recentVerified = 0;
|
||||||
let withPaymentProof = 0;
|
let withPaymentProof = 0;
|
||||||
|
const recentCutoff = Math.floor(Date.now() / 1000) - 90 * 24 * 60 * 60;
|
||||||
|
|
||||||
for (const [key, attestations] of byListing) {
|
for (const [key, attestations] of byListing) {
|
||||||
const coord = parseListingCoord(key);
|
const coord = parseListingCoord(key);
|
||||||
|
|
@ -271,9 +277,16 @@ export function useTradeReputation(pubkey: string | undefined) {
|
||||||
else purchases++;
|
else purchases++;
|
||||||
if (isVerified) {
|
if (isVerified) {
|
||||||
verified++;
|
verified++;
|
||||||
|
const latestAt = Math.max(...attestations.map((e) => e.created_at));
|
||||||
|
const isRecent = latestAt >= recentCutoff;
|
||||||
|
if (isRecent) recentVerified++;
|
||||||
// Attribute the verified trade to the other attestor(s).
|
// Attribute the verified trade to the other attestor(s).
|
||||||
for (const a of attestors) {
|
for (const a of attestors) {
|
||||||
if (a !== pubkey) verifiedWith.set(a, (verifiedWith.get(a) ?? 0) + 1);
|
if (a !== pubkey) {
|
||||||
|
verifiedWith.set(a, (verifiedWith.get(a) ?? 0) + 1);
|
||||||
|
if (isRecent) verifiedRecentWith.set(a, (verifiedRecentWith.get(a) ?? 0) + 1);
|
||||||
|
verifiedLastAt.set(a, Math.max(verifiedLastAt.get(a) ?? 0, latestAt));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// A `proof` tag is a payment CLAIM, not verification — count it on its
|
// A `proof` tag is a payment CLAIM, not verification — count it on its
|
||||||
// own tier so it is never confused with a confirmed trade.
|
// own tier so it is never confused with a confirmed trade.
|
||||||
|
|
@ -329,10 +342,16 @@ export function useTradeReputation(pubkey: string | undefined) {
|
||||||
sales,
|
sales,
|
||||||
purchases,
|
purchases,
|
||||||
verified,
|
verified,
|
||||||
|
recentVerified,
|
||||||
withPaymentProof,
|
withPaymentProof,
|
||||||
paymentVerified,
|
paymentVerified,
|
||||||
verifiedCounterparties: verifiedWith.size,
|
verifiedCounterparties: verifiedWith.size,
|
||||||
verifiedWith: [...verifiedWith.entries()].map(([pubkey, count]) => ({ pubkey, count })),
|
verifiedWith: [...verifiedWith.entries()].map(([pubkey, count]) => ({
|
||||||
|
pubkey,
|
||||||
|
count,
|
||||||
|
recentCount: verifiedRecentWith.get(pubkey) ?? 0,
|
||||||
|
lastAt: verifiedLastAt.get(pubkey) ?? 0,
|
||||||
|
})),
|
||||||
counterparties: [...counterparties],
|
counterparties: [...counterparties],
|
||||||
attestations: unique,
|
attestations: unique,
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,73 @@ import { useCurrentUser } from "./useCurrentUser";
|
||||||
* mirror URL on the returned tags so photo redundancy is explicit in the event;
|
* mirror URL on the returned tags so photo redundancy is explicit in the event;
|
||||||
* the read side also derives it from the sha256 (lib/imageFallback).
|
* the read side also derives it from the sha256 (lib/imageFallback).
|
||||||
*/
|
*/
|
||||||
const UPLOAD_SERVERS = ['https://blossom.skate-spots.org/', 'https://blossom.primal.net/', 'https://blossom.band/'];
|
// Uploads go only through our own Blossom/quota proxy. The public mirrors are
|
||||||
|
// still used by the read-side image fallback for older blobs, but including them
|
||||||
|
// here would let a quota rejection silently fall through to third-party hosting.
|
||||||
|
const UPLOAD_SERVERS = ['https://blossom.skate-spots.org/'];
|
||||||
|
|
||||||
|
const MAX_IMAGE_BYTES = 10 * 1024 * 1024;
|
||||||
|
const IMAGE_TYPES = new Set([
|
||||||
|
'image/jpeg', 'image/png', 'image/webp', 'image/avif',
|
||||||
|
'image/heic', 'image/heif', 'image/gif',
|
||||||
|
]);
|
||||||
|
|
||||||
|
/** Unwrap the quota proxy's JSON error so forms can show a human message. */
|
||||||
|
function uploadErrorMessage(error: unknown): string {
|
||||||
|
const message = error instanceof Error ? error.message : String(error);
|
||||||
|
const match = /Blossom upload failed \(\d+\):\s*(\{.*\})/.exec(message);
|
||||||
|
if (match) {
|
||||||
|
try {
|
||||||
|
const parsed = JSON.parse(match[1]) as { error?: string };
|
||||||
|
if (parsed.error) return parsed.error;
|
||||||
|
} catch {
|
||||||
|
// fall through to the original message
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return message;
|
||||||
|
}
|
||||||
|
|
||||||
|
function validateImage(file: File): void {
|
||||||
|
const type = (file.type || '').toLowerCase();
|
||||||
|
if (!IMAGE_TYPES.has(type)) {
|
||||||
|
throw new Error('Only JPEG, PNG, WebP, AVIF, HEIC or GIF images can be uploaded.');
|
||||||
|
}
|
||||||
|
if (file.size > MAX_IMAGE_BYTES) {
|
||||||
|
throw new Error('Image is too large. The maximum is 10 MB.');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Resize/compress camera photos before upload. Most phone photos are far larger
|
||||||
|
* than the app ever displays; 1600px WebP cuts upload time and Blossom storage
|
||||||
|
* without touching GIFs or formats the WebView cannot decode.
|
||||||
|
*/
|
||||||
|
async function prepareImage(file: File): Promise<File> {
|
||||||
|
const type = (file.type || '').toLowerCase();
|
||||||
|
if (type === 'image/gif' || type === 'image/heic' || type === 'image/heif') return file;
|
||||||
|
if (typeof createImageBitmap !== 'function' || typeof document === 'undefined') return file;
|
||||||
|
try {
|
||||||
|
const bitmap = await createImageBitmap(file);
|
||||||
|
const scale = Math.min(1, 1600 / Math.max(bitmap.width, bitmap.height));
|
||||||
|
// Always redraw through a canvas, even for images that are already small:
|
||||||
|
// this strips EXIF/GPS and other metadata before the file leaves the device.
|
||||||
|
const canvas = document.createElement('canvas');
|
||||||
|
canvas.width = Math.max(1, Math.round(bitmap.width * scale));
|
||||||
|
canvas.height = Math.max(1, Math.round(bitmap.height * scale));
|
||||||
|
const ctx = canvas.getContext('2d');
|
||||||
|
if (!ctx) { bitmap.close(); return file; }
|
||||||
|
ctx.drawImage(bitmap, 0, 0, canvas.width, canvas.height);
|
||||||
|
bitmap.close();
|
||||||
|
const blob = await new Promise<Blob | null>((resolve) => {
|
||||||
|
canvas.toBlob(resolve, 'image/webp', 0.84);
|
||||||
|
});
|
||||||
|
if (!blob) return file;
|
||||||
|
const base = file.name.replace(/\.[^.]+$/, '') || 'image';
|
||||||
|
return new File([blob], `${base}.webp`, { type: 'image/webp', lastModified: file.lastModified });
|
||||||
|
} catch {
|
||||||
|
return file;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function hostOf(url: string): string {
|
function hostOf(url: string): string {
|
||||||
try {
|
try {
|
||||||
|
|
@ -30,12 +96,20 @@ export function useUploadFile() {
|
||||||
throw new Error('Must be logged in to upload files');
|
throw new Error('Must be logged in to upload files');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
validateImage(file);
|
||||||
|
const prepared = await prepareImage(file);
|
||||||
|
|
||||||
const uploader = new BlossomUploader({
|
const uploader = new BlossomUploader({
|
||||||
servers: UPLOAD_SERVERS,
|
servers: UPLOAD_SERVERS,
|
||||||
signer: user.signer,
|
signer: user.signer,
|
||||||
});
|
});
|
||||||
|
|
||||||
const tags = await uploader.upload(file);
|
let tags;
|
||||||
|
try {
|
||||||
|
tags = await uploader.upload(prepared);
|
||||||
|
} catch (error) {
|
||||||
|
throw new Error(uploadErrorMessage(error));
|
||||||
|
}
|
||||||
|
|
||||||
// Remember the mirror copy of the same blob. Blossom is content-addressed,
|
// Remember the mirror copy of the same blob. Blossom is content-addressed,
|
||||||
// so `<other-host>/<sha256>` is the same file.
|
// so `<other-host>/<sha256>` is the same file.
|
||||||
|
|
|
||||||
|
|
@ -87,11 +87,13 @@ export function useCashuEscrow() {
|
||||||
async ({
|
async ({
|
||||||
amountSats,
|
amountSats,
|
||||||
sellerPubkey,
|
sellerPubkey,
|
||||||
|
arbiterPubkey,
|
||||||
lockDays,
|
lockDays,
|
||||||
mintUrl,
|
mintUrl,
|
||||||
}: {
|
}: {
|
||||||
amountSats: number;
|
amountSats: number;
|
||||||
sellerPubkey: string;
|
sellerPubkey: string;
|
||||||
|
arbiterPubkey?: string;
|
||||||
lockDays?: number;
|
lockDays?: number;
|
||||||
mintUrl?: string;
|
mintUrl?: string;
|
||||||
}): Promise<{ token: string; locktime: number; info: EscrowTokenInfo }> => {
|
}): Promise<{ token: string; locktime: number; info: EscrowTokenInfo }> => {
|
||||||
|
|
@ -105,7 +107,7 @@ export function useCashuEscrow() {
|
||||||
|
|
||||||
const { token, locktime } = await createEscrowToken(
|
const { token, locktime } = await createEscrowToken(
|
||||||
{ wallet: makeMintWallet(mint), payInvoice },
|
{ wallet: makeMintWallet(mint), payInvoice },
|
||||||
{ mintUrl: mint, amountSats, sellerPubkey, buyerPubkey, lockDays },
|
{ mintUrl: mint, amountSats, sellerPubkey, buyerPubkey, arbiterPubkey, lockDays },
|
||||||
);
|
);
|
||||||
|
|
||||||
return { token, locktime, info: parseEscrowToken(token) };
|
return { token, locktime, info: parseEscrowToken(token) };
|
||||||
|
|
|
||||||
|
|
@ -608,6 +608,52 @@ const labOptions = {
|
||||||
recycled: 'Recycled / Deadstock',
|
recycled: 'Recycled / Deadstock',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
transport: {
|
||||||
|
vehicle: {
|
||||||
|
car: 'Car',
|
||||||
|
taxi: 'Taxi / Rideshare',
|
||||||
|
van: 'Van / Minibus',
|
||||||
|
moto: 'Motorcycle',
|
||||||
|
helicopter: 'Helicopter',
|
||||||
|
plane: 'Plane',
|
||||||
|
boat: 'Boat',
|
||||||
|
other: 'Other vehicle',
|
||||||
|
},
|
||||||
|
service: {
|
||||||
|
people: 'People',
|
||||||
|
goods: 'Goods / Cargo',
|
||||||
|
gear: 'Skate gear',
|
||||||
|
airport: 'Airport transfer',
|
||||||
|
venue: 'Venue / Event transfer',
|
||||||
|
tours: 'Tours / Road trips',
|
||||||
|
logistics: 'Event logistics',
|
||||||
|
other: 'Other service',
|
||||||
|
},
|
||||||
|
feature: {
|
||||||
|
cargo: 'Cargo space',
|
||||||
|
bike_board: 'Bike / board rack',
|
||||||
|
wheelchair: 'Wheelchair access',
|
||||||
|
pets: 'Pets welcome',
|
||||||
|
border: 'Cross-border',
|
||||||
|
night: 'Night driving',
|
||||||
|
covered: 'Covered / weatherproof',
|
||||||
|
group: 'Large groups',
|
||||||
|
},
|
||||||
|
capacity: {
|
||||||
|
solo: '1–3 people',
|
||||||
|
small_group: '4–7 people',
|
||||||
|
large_group: '8+ people',
|
||||||
|
van_load: 'Van load',
|
||||||
|
freight: 'Freight / cargo',
|
||||||
|
},
|
||||||
|
coverage: {
|
||||||
|
local: 'Local',
|
||||||
|
regional: 'Regional',
|
||||||
|
national: 'National',
|
||||||
|
international: 'International',
|
||||||
|
cross_border: 'Cross-border routes',
|
||||||
|
},
|
||||||
|
},
|
||||||
tour: {
|
tour: {
|
||||||
skill: {
|
skill: {
|
||||||
beginner: { label: 'Beginner', description: 'New to skating or basic tricks' },
|
beginner: { label: 'Beginner', description: 'New to skating or basic tricks' },
|
||||||
|
|
@ -1218,6 +1264,52 @@ const labOptions = {
|
||||||
recycled: 'Reciclado / deadstock',
|
recycled: 'Reciclado / deadstock',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
transport: {
|
||||||
|
vehicle: {
|
||||||
|
car: 'Coche',
|
||||||
|
taxi: 'Taxi / VTC',
|
||||||
|
van: 'Furgoneta / minibús',
|
||||||
|
moto: 'Motocicleta',
|
||||||
|
helicopter: 'Helicóptero',
|
||||||
|
plane: 'Avión',
|
||||||
|
boat: 'Barco',
|
||||||
|
other: 'Otro vehículo',
|
||||||
|
},
|
||||||
|
service: {
|
||||||
|
people: 'Personas',
|
||||||
|
goods: 'Mercancía / carga',
|
||||||
|
gear: 'Material de skate',
|
||||||
|
airport: 'Traslado al aeropuerto',
|
||||||
|
venue: 'Traslado a evento / local',
|
||||||
|
tours: 'Rutas / viajes',
|
||||||
|
logistics: 'Logística de eventos',
|
||||||
|
other: 'Otro servicio',
|
||||||
|
},
|
||||||
|
feature: {
|
||||||
|
cargo: 'Espacio de carga',
|
||||||
|
bike_board: 'Portabicis / portatablas',
|
||||||
|
wheelchair: 'Acceso para silla de ruedas',
|
||||||
|
pets: 'Mascotas bienvenidas',
|
||||||
|
border: 'Cruza fronteras',
|
||||||
|
night: 'Conduce de noche',
|
||||||
|
covered: 'Cubierto / resistente al clima',
|
||||||
|
group: 'Grupos grandes',
|
||||||
|
},
|
||||||
|
capacity: {
|
||||||
|
solo: '1–3 personas',
|
||||||
|
small_group: '4–7 personas',
|
||||||
|
large_group: '8+ personas',
|
||||||
|
van_load: 'Carga de furgoneta',
|
||||||
|
freight: 'Mercancía / carga',
|
||||||
|
},
|
||||||
|
coverage: {
|
||||||
|
local: 'Local',
|
||||||
|
regional: 'Regional',
|
||||||
|
national: 'Nacional',
|
||||||
|
international: 'Internacional',
|
||||||
|
cross_border: 'Rutas transfronterizas',
|
||||||
|
},
|
||||||
|
},
|
||||||
tour: {
|
tour: {
|
||||||
skill: {
|
skill: {
|
||||||
beginner: { label: 'Principiante', description: 'Nuevo en el skate o trucos básicos' },
|
beginner: { label: 'Principiante', description: 'Nuevo en el skate o trucos básicos' },
|
||||||
|
|
|
||||||
|
|
@ -353,6 +353,10 @@ const batch3 = {
|
||||||
"bannerImage": "Imatge de portada",
|
"bannerImage": "Imatge de portada",
|
||||||
"bannerDesc": "Una imatge ampla per a la part superior del teu perfil.",
|
"bannerDesc": "Una imatge ampla per a la part superior del teu perfil.",
|
||||||
"website": "Lloc web",
|
"website": "Lloc web",
|
||||||
|
"openToSponsorships": "Obert a patrocinis",
|
||||||
|
"openToSponsorshipsHint": "Mostra una targeta de patrocini/col·laboració al teu perfil. No es comparteix res fins que algú t'escriu.",
|
||||||
|
"sponsorNote": "Nota de patrocini (opcional)",
|
||||||
|
"sponsorNotePlaceholder": "p. ex. Obert a socis de taules, sabates, viatges i esdeveniments.",
|
||||||
"bitcoinTitle": "Bitcoin i pagaments",
|
"bitcoinTitle": "Bitcoin i pagaments",
|
||||||
"bitcoinDesc": "Deixa que la gent t'enviï zaps, propines i pagaments directament, sense intermediaris.",
|
"bitcoinDesc": "Deixa que la gent t'enviï zaps, propines i pagaments directament, sense intermediaris.",
|
||||||
"lightningAddress": "Adreça Lightning",
|
"lightningAddress": "Adreça Lightning",
|
||||||
|
|
|
||||||
|
|
@ -666,6 +666,8 @@ const batch5 = {
|
||||||
manage: "Gestiona",
|
manage: "Gestiona",
|
||||||
admin: "Administració",
|
admin: "Administració",
|
||||||
editProfile: "Edita el perfil",
|
editProfile: "Edita el perfil",
|
||||||
|
transportSelfAttestedTitle: "Perfil de transport autodeclarat",
|
||||||
|
transportSelfAttested: "SkateSpots no verifica llicències, assegurances, l'aptitud dels vehicles per circular ni permisos d'operació. Fes servir la insígnia de confiança, les ressenyes, els avals i el teu propi criteri.",
|
||||||
publishedTitle: "Ja estàs en línia",
|
publishedTitle: "Ja estàs en línia",
|
||||||
publishedBody: "El teu perfil s'ha publicat a The Lab. Comparteix-lo perquè els skaters et trobin.",
|
publishedBody: "El teu perfil s'ha publicat a The Lab. Comparteix-lo perquè els skaters et trobin.",
|
||||||
manageRemove: "Elimina el teu perfil de {{noun}} de The Lab.",
|
manageRemove: "Elimina el teu perfil de {{noun}} de The Lab.",
|
||||||
|
|
@ -1437,6 +1439,38 @@ const batch5 = {
|
||||||
recycled: "Reciclat / deadstock"
|
recycled: "Reciclat / deadstock"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
transport: {
|
||||||
|
vehicle: {
|
||||||
|
car: "Cotxe",
|
||||||
|
taxi: "Taxi / VTC",
|
||||||
|
van: "Furgoneta / minibús",
|
||||||
|
moto: "Motocicleta",
|
||||||
|
helicopter: "Helicòpter",
|
||||||
|
plane: "Avió",
|
||||||
|
boat: "Vaixell",
|
||||||
|
other: "Altre vehicle"
|
||||||
|
},
|
||||||
|
service: {
|
||||||
|
people: "Persones",
|
||||||
|
goods: "Mercaderies / càrrega",
|
||||||
|
gear: "Material de skate",
|
||||||
|
airport: "Trasllat a l'aeroport",
|
||||||
|
venue: "Trasllat a local / esdeveniment",
|
||||||
|
tours: "Rutes / viatges",
|
||||||
|
logistics: "Logística d'esdeveniments",
|
||||||
|
other: "Altre servei"
|
||||||
|
},
|
||||||
|
feature: {
|
||||||
|
cargo: "Espai de càrrega",
|
||||||
|
bike_board: "Suport per a bici / taula",
|
||||||
|
wheelchair: "Accés amb cadira de rodes",
|
||||||
|
pets: "Mascotes benvingudes",
|
||||||
|
border: "Travessa fronteres",
|
||||||
|
night: "Conducció nocturna",
|
||||||
|
covered: "Cobert / resistent al clima",
|
||||||
|
group: "Grups grans"
|
||||||
|
}
|
||||||
|
},
|
||||||
tour: {
|
tour: {
|
||||||
skill: {
|
skill: {
|
||||||
beginner: {
|
beginner: {
|
||||||
|
|
|
||||||
|
|
@ -714,8 +714,9 @@ const batch6 = {
|
||||||
judges: "Jutges",
|
judges: "Jutges",
|
||||||
organizers: "Organitzadors",
|
organizers: "Organitzadors",
|
||||||
barbers: "Barbers",
|
barbers: "Barbers",
|
||||||
|
designers: "Dissenyadors",
|
||||||
showFewer: "Mostra'n menys",
|
showFewer: "Mostra'n menys",
|
||||||
showAllCrafts: "Mostra els 13 oficis",
|
showAllCrafts: "Mostra els 15 oficis",
|
||||||
community: "Comunitat",
|
community: "Comunitat",
|
||||||
tours: "Rutes",
|
tours: "Rutes",
|
||||||
crews: "Crews",
|
crews: "Crews",
|
||||||
|
|
@ -833,6 +834,28 @@ const batch6 = {
|
||||||
our: "LA NOSTRA",
|
our: "LA NOSTRA",
|
||||||
community: "COMUNITAT",
|
community: "COMUNITAT",
|
||||||
heroDesc: "SkateSpots està fet per a la comunitat i per la comunitat. Suportadors, col·laboradors, socis i amics que el mantenen gratuït i descentralitzat.",
|
heroDesc: "SkateSpots està fet per a la comunitat i per la comunitat. Suportadors, col·laboradors, socis i amics que el mantenen gratuït i descentralitzat.",
|
||||||
|
grantsSection: "Entitats finançadores de Bitcoin",
|
||||||
|
grantsSectionDesc: "Per a organitzacions que atorguen subvencions a projectes Bitcoin de codi obert.",
|
||||||
|
grantsTitle: "Oberts a patrocinis · Entitats finançadores de Bitcoin",
|
||||||
|
grantsDisclaimer: "Vols donar a aquest projecte? Omple el formulari. No per fer-nos KYC a nosaltres — sinó per fer-te KYC a TU.",
|
||||||
|
grantsDisclaimerDesc: "Aquest canal és només per a entitats finançadores que fan KYC/KYB als seus beneficiaris. Si ets un skater que només vol donar, usa les vies Lightning, Silent Payments o Angor de dalt — ningú no necessita el teu passaport.",
|
||||||
|
grantsOrg: "Organització",
|
||||||
|
grantsContact: "Contacte (npub, correu electrònic o nom d'usuari)",
|
||||||
|
grantsWebsite: "Lloc web",
|
||||||
|
grantsProgram: "Programa / ronda de subvencions",
|
||||||
|
grantsSize: "Import de la subvenció",
|
||||||
|
grantsKyc: "Procés de KYC / KYB",
|
||||||
|
grantsFund: "Què vols finançar?",
|
||||||
|
grantsAck: "Confirmo que som una entitat finançadora que fa KYC/KYB als seus beneficiaris.",
|
||||||
|
grantsSend: "Obrir conversa sobre la subvenció",
|
||||||
|
grantsNoKycTitle: "Sense KYC de SkateSpots",
|
||||||
|
grantsNoKycDesc: "Mai no demanem la teva identificació ni la nostra. La via KYC/KYB és per als teus beneficiaris.",
|
||||||
|
grantsNoTrackingTitle: "Sense seguiment",
|
||||||
|
grantsNoTrackingDesc: "Sense analítica, CRM ni llistes de correu. Aquesta pàgina no desa res.",
|
||||||
|
grantsPrivateTitle: "Missatge privat",
|
||||||
|
grantsPrivateDesc: "Obre una conversa xifrada NIP-17 amb el propietari.",
|
||||||
|
grantsEthos: "Només acceptem subvencions que mantinguin SkateSpots de codi obert, autoallotjat i sense analítica. Cap condició que tanqui el projecte.",
|
||||||
|
grantsNote: "Obre un missatge privat al propietari de SkateSpots. No es desa res en aquesta pàgina.",
|
||||||
backAngor: "Dona'ns suport a Angor",
|
backAngor: "Dona'ns suport a Angor",
|
||||||
backers: "Suportadors",
|
backers: "Suportadors",
|
||||||
backersDesc: "Skaters que han donat suport a SkateSpots — finançament on-chain via Angor i zaps Lightning al projecte.",
|
backersDesc: "Skaters que han donat suport a SkateSpots — finançament on-chain via Angor i zaps Lightning al projecte.",
|
||||||
|
|
@ -963,12 +986,15 @@ const batch6 = {
|
||||||
nip05NotVerified: "NIP-05 no verificat amb aquesta clau",
|
nip05NotVerified: "NIP-05 no verificat amb aquesta clau",
|
||||||
message: "Missatge",
|
message: "Missatge",
|
||||||
eventsHosted: "Esdeveniments organitzats",
|
eventsHosted: "Esdeveniments organitzats",
|
||||||
|
labServices: "Serveis de The Lab",
|
||||||
|
openToSponsorships: "Obert a patrocinis",
|
||||||
forSponsors: "Per a patrocinadors i col·laboracions",
|
forSponsors: "Per a patrocinadors i col·laboracions",
|
||||||
sponsorPitch: "Patrocini, col·laboració, foto/vídeo o esdeveniment? Comença una conversa.",
|
sponsorPitch: "Patrocini, col·laboració, foto/vídeo o esdeveniment? Comença una conversa.",
|
||||||
startCollab: "Inicia un xat de col·laboració",
|
startCollab: "Inicia un xat de col·laboració",
|
||||||
viewRiderCard: "Veure la fitxa del patinador",
|
viewRiderCard: "Veure la fitxa del patinador",
|
||||||
collabMessage: "Hola {{name}}, voldria parlar d'un patrocini o d'una col·laboració.",
|
collabMessage: "Hola {{name}}, voldria parlar d'un patrocini o d'una col·laboració.",
|
||||||
followers: "Seguidors",
|
followers: "Seguidors",
|
||||||
|
followersHint: "Llistes de seguidors reportades pels relés: no són analítiques auditades.",
|
||||||
following: "Seguint",
|
following: "Seguint",
|
||||||
follow: "Segueix",
|
follow: "Segueix",
|
||||||
unfollow: "Deixa de seguir",
|
unfollow: "Deixa de seguir",
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,90 @@ const drift = {
|
||||||
autoTranslateDesc: "Tradueix els missatges entrants al teu idioma. S'executa en aquest dispositiu; no s'envia res.",
|
autoTranslateDesc: "Tradueix els missatges entrants al teu idioma. S'executa en aquest dispositiu; no s'envia res.",
|
||||||
privacy: "La traducció s'executa al teu dispositiu. El teu missatge no surt mai d'aquí. El primer ús descarrega un model de llengua.",
|
privacy: "La traducció s'executa al teu dispositiu. El teu missatge no surt mai d'aquí. El primer ús descarrega un model de llengua.",
|
||||||
},
|
},
|
||||||
|
labUi: {
|
||||||
|
tabTransport: 'Transport',
|
||||||
|
filterVehicles: 'Vehicles',
|
||||||
|
filterTransportServices: 'Serveis',
|
||||||
|
filterCapabilities: 'Capacitats',
|
||||||
|
filterCapacity: 'Capacitat',
|
||||||
|
filterCoverage: 'Cobertura',
|
||||||
|
offerTransport: 'Oferir transport',
|
||||||
|
empty: {
|
||||||
|
transportTitle: 'Encara no hi ha proveïdors de transport',
|
||||||
|
transportBody: 'Mous skaters, equip o càrrega? Publica el teu cotxe, furgoneta, taxi, bici, helicòpter, avió o vaixell.',
|
||||||
|
},
|
||||||
|
labLink: {
|
||||||
|
transport: 'Transport',
|
||||||
|
designer: 'Roba',
|
||||||
|
},
|
||||||
|
detail: {
|
||||||
|
noun: {
|
||||||
|
transport: 'proveïdor de transport',
|
||||||
|
},
|
||||||
|
skillsTitle: {
|
||||||
|
transport: 'Vehicles i serveis',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
craftFields: {
|
||||||
|
capacity: 'Capacitat',
|
||||||
|
cargo: 'Espai de càrrega',
|
||||||
|
coverage: 'Cobertura / rutes',
|
||||||
|
availability: 'Disponibilitat',
|
||||||
|
base: 'Zona base',
|
||||||
|
accessibility: 'Accessibilitat',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
walletUi: {
|
||||||
|
stats: {
|
||||||
|
transport: 'Transport',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
becomeRolesUi: {
|
||||||
|
transport: {
|
||||||
|
seoTitle: 'Oferir transport / conducció - SkateSpots',
|
||||||
|
seoDescription: 'Mou skaters, equip i càrrega — cotxes, taxis, furgonetes, motos, helicòpters, avions i vaixells. Autodeclarat, revisat per la comunitat.',
|
||||||
|
heading: 'Transport / Conductor',
|
||||||
|
tagline: 'Mou persones i equip per l\'escena — terra, aire o mar',
|
||||||
|
noun: 'proveïdor de transport',
|
||||||
|
rateLabel: 'Tarifa / Viatge',
|
||||||
|
portfolioLabel: 'Fotos del vehicle / de la flota',
|
||||||
|
sectionVehicles: 'Vehicles',
|
||||||
|
sectionServices: 'Serveis',
|
||||||
|
sectionFeatures: 'Què pots oferir',
|
||||||
|
sectionCapacity: 'Capacitat',
|
||||||
|
sectionCoverage: 'Cobertura',
|
||||||
|
capacityLabel: 'Capacitat',
|
||||||
|
capacityPlaceholder: 'p. ex. 4 passatgers / 2 taules',
|
||||||
|
cargoLabel: 'Espai de càrrega',
|
||||||
|
cargoPlaceholder: 'p. ex. furgoneta plena, 8 caixes de taules',
|
||||||
|
coverageLabel: 'Cobertura / rutes',
|
||||||
|
coveragePlaceholder: 'p. ex. Barcelona ↔ Perpinyà, regional',
|
||||||
|
availabilityLabel: 'Disponibilitat',
|
||||||
|
availabilityPlaceholder: 'p. ex. caps de setmana, dies d\'esdeveniment, a demanda',
|
||||||
|
baseLabel: 'Zona base',
|
||||||
|
basePlaceholder: 'p. ex. Barcelona / El Prat',
|
||||||
|
accessibilityLabel: 'Accessibilitat',
|
||||||
|
accessibilityPlaceholder: 'p. ex. rampa, espai per a cadira de rodes, assistència',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
labOptions: {
|
||||||
|
transport: {
|
||||||
|
capacity: {
|
||||||
|
solo: '1–3 persones',
|
||||||
|
small_group: '4–7 persones',
|
||||||
|
large_group: '8+ persones',
|
||||||
|
van_load: 'Càrrega de furgoneta',
|
||||||
|
freight: 'Mercaderies / càrrega',
|
||||||
|
},
|
||||||
|
coverage: {
|
||||||
|
local: 'Local',
|
||||||
|
regional: 'Regional',
|
||||||
|
national: 'Nacional',
|
||||||
|
international: 'Internacional',
|
||||||
|
cross_border: 'Rutes transfrontereres',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
export default drift;
|
export default drift;
|
||||||
|
|
|
||||||
|
|
@ -349,6 +349,10 @@ const csBatch3 = {
|
||||||
bannerImage: "Obrázek banneru",
|
bannerImage: "Obrázek banneru",
|
||||||
bannerDesc: "Široký obrázek pro horní část tvého profilu.",
|
bannerDesc: "Široký obrázek pro horní část tvého profilu.",
|
||||||
website: "Web",
|
website: "Web",
|
||||||
|
openToSponsorships: "Otevřeno sponzorům",
|
||||||
|
openToSponsorshipsHint: "Na profilu zobrazí kartu pro sponzory a spolupráce. Nic se nesdílí, dokud ti někdo nenapíše.",
|
||||||
|
sponsorNote: "Poznámka ke sponzoringu (volitelné)",
|
||||||
|
sponsorNotePlaceholder: "např. Otevřeno partnerům pro prkna, boty, cestování a akce.",
|
||||||
bitcoinTitle: "Bitcoin a platby",
|
bitcoinTitle: "Bitcoin a platby",
|
||||||
bitcoinDesc: "Nech lidi posílat ti zaps, spropitné a platby přímo — bez prostředníka.",
|
bitcoinDesc: "Nech lidi posílat ti zaps, spropitné a platby přímo — bez prostředníka.",
|
||||||
lightningAddress: "Lightning adresa",
|
lightningAddress: "Lightning adresa",
|
||||||
|
|
|
||||||
|
|
@ -688,8 +688,9 @@ export const csBatch4 = {
|
||||||
judges: "Rozhodčí",
|
judges: "Rozhodčí",
|
||||||
organizers: "Organizátoři",
|
organizers: "Organizátoři",
|
||||||
barbers: "Barbeři",
|
barbers: "Barbeři",
|
||||||
|
designers: "Designéři",
|
||||||
showFewer: "Zobrazit méně",
|
showFewer: "Zobrazit méně",
|
||||||
showAllCrafts: "Zobrazit všech 13 řemesel",
|
showAllCrafts: "Zobrazit všech 15 řemesel",
|
||||||
community: "Komunita",
|
community: "Komunita",
|
||||||
tours: "Túry",
|
tours: "Túry",
|
||||||
crews: "Crew",
|
crews: "Crew",
|
||||||
|
|
@ -807,6 +808,28 @@ export const csBatch4 = {
|
||||||
our: "NAŠE",
|
our: "NAŠE",
|
||||||
community: "KOMUNITA",
|
community: "KOMUNITA",
|
||||||
heroDesc: "SkateSpots je tvořen komunitou a pro komunitu. Podporovatelé, spolupracovníci, partneři a přátelé, kteří drží tohle zdarma a decentralizované.",
|
heroDesc: "SkateSpots je tvořen komunitou a pro komunitu. Podporovatelé, spolupracovníci, partneři a přátelé, kteří drží tohle zdarma a decentralizované.",
|
||||||
|
grantsSection: "Poskytovatelé grantů na Bitcoin",
|
||||||
|
grantsSectionDesc: "Pro organizace, které udělují granty otevřeným bitcoinovým projektům.",
|
||||||
|
grantsTitle: "Otevřeno sponzorství · Poskytovatelé grantů na Bitcoin",
|
||||||
|
grantsDisclaimer: "Chceš tomuto projektu přispět? Vyplň formulář. Ne abychom prošli KYC my — ale abys prošel KYC TY.",
|
||||||
|
grantsDisclaimerDesc: "Tato kolonka je jen pro poskytovatele grantů, kteří dělají KYC/KYB svým příjemcům. Pokud jsi skejťák, který chce jen přispět, použij výše uvedené cesty Lightning, Silent Payments nebo Angor — tvůj pas nikdo nepotřebuje.",
|
||||||
|
grantsOrg: "Organizace",
|
||||||
|
grantsContact: "Kontakt (npub, e-mail nebo přezdívka)",
|
||||||
|
grantsWebsite: "Web",
|
||||||
|
grantsProgram: "Grantový program / kolo",
|
||||||
|
grantsSize: "Velikost grantu",
|
||||||
|
grantsKyc: "Proces KYC / KYB",
|
||||||
|
grantsFund: "Co bys chtěl financovat?",
|
||||||
|
grantsAck: "Potvrzuji, že jsme poskytovatel grantů, který dělá KYC/KYB svým příjemcům.",
|
||||||
|
grantsSend: "Zahájit rozhovor o grantu",
|
||||||
|
grantsNoKycTitle: "Žádné KYC SkateSpots",
|
||||||
|
grantsNoKycDesc: "Nikdy nechceme tvůj průkaz ani ten náš. Kolonka KYC/KYB je pro tvé příjemce.",
|
||||||
|
grantsNoTrackingTitle: "Žádné sledování",
|
||||||
|
grantsNoTrackingDesc: "Žádné analýzy, CRM ani e-mailové seznamy. Tato stránka nic neukládá.",
|
||||||
|
grantsPrivateTitle: "Soukromá zpráva",
|
||||||
|
grantsPrivateDesc: "Otevře šifrovanou konverzaci NIP-17 s majitelem.",
|
||||||
|
grantsEthos: "Přijímáme jen granty, které udrží SkateSpots s otevřeným zdrojovým kódem, vlastním hostováním a bez analýz. Žádné podmínky, které projekt zavřou.",
|
||||||
|
grantsNote: "Otevře soukromou zprávu majiteli SkateSpots. Na této stránce se nic neukládá.",
|
||||||
backAngor: "Podpoř nás na Angor",
|
backAngor: "Podpoř nás na Angor",
|
||||||
backers: "Podporovatelé",
|
backers: "Podporovatelé",
|
||||||
backersDesc: "Skejťáci, kteří podpořili SkateSpots — on-chain financování přes Angor a Lightning zaps pro projekt.",
|
backersDesc: "Skejťáci, kteří podpořili SkateSpots — on-chain financování přes Angor a Lightning zaps pro projekt.",
|
||||||
|
|
@ -937,12 +960,15 @@ export const csBatch4 = {
|
||||||
nip05NotVerified: "NIP-05 neověřeno vůči tomuto klíči",
|
nip05NotVerified: "NIP-05 neověřeno vůči tomuto klíči",
|
||||||
message: "Zpráva",
|
message: "Zpráva",
|
||||||
eventsHosted: "Uspořádané akce",
|
eventsHosted: "Uspořádané akce",
|
||||||
|
labServices: "Lab služby",
|
||||||
|
openToSponsorships: "Otevřeno sponzorům",
|
||||||
forSponsors: "Pro sponzory a spolupráce",
|
forSponsors: "Pro sponzory a spolupráce",
|
||||||
sponsorPitch: "Sponzorství, spolupráce, foto/video nebo akce? Začni konverzaci.",
|
sponsorPitch: "Sponzorství, spolupráce, foto/video nebo akce? Začni konverzaci.",
|
||||||
startCollab: "Začít chat o spolupráci",
|
startCollab: "Začít chat o spolupráci",
|
||||||
viewRiderCard: "Zobrazit kartu jezdce",
|
viewRiderCard: "Zobrazit kartu jezdce",
|
||||||
collabMessage: "Ahoj {{name}}, chtěl bych mluvit o sponzorství nebo spolupráci.",
|
collabMessage: "Ahoj {{name}}, chtěl bych mluvit o sponzorství nebo spolupráci.",
|
||||||
followers: "Sledující",
|
followers: "Sledující",
|
||||||
|
followersHint: "Seznamy sledujících hlášené relayi — nejde o auditovanou analytiku.",
|
||||||
following: "Sleduji",
|
following: "Sleduji",
|
||||||
follow: "Sledovat",
|
follow: "Sledovat",
|
||||||
unfollow: "Přestat sledovat",
|
unfollow: "Přestat sledovat",
|
||||||
|
|
|
||||||
|
|
@ -663,6 +663,8 @@ const csBatch5 = {
|
||||||
manage: "Spravovat",
|
manage: "Spravovat",
|
||||||
admin: "Admin",
|
admin: "Admin",
|
||||||
editProfile: "Upravit profil",
|
editProfile: "Upravit profil",
|
||||||
|
transportSelfAttestedTitle: "Samodeklarovaný profil dopravce",
|
||||||
|
transportSelfAttested: "SkateSpots neověřuje řidičské průkazy, pojištění, technickou způsobilost vozidel ani oprávnění k provozu. Vycházej z odznaku důvěry, recenzí, záruk a vlastního úsudku.",
|
||||||
publishedTitle: "Jsi live",
|
publishedTitle: "Jsi live",
|
||||||
publishedBody: "Tvůj profil je publikován v The Lab. Sdílej ho, aby tě skejťáci našli.",
|
publishedBody: "Tvůj profil je publikován v The Lab. Sdílej ho, aby tě skejťáci našli.",
|
||||||
manageRemove: "Odeber svůj profil {{noun}} z The Lab.",
|
manageRemove: "Odeber svůj profil {{noun}} z The Lab.",
|
||||||
|
|
|
||||||
|
|
@ -1922,6 +1922,38 @@ export const csBatch6 = {
|
||||||
event: "Skate akce a soutěže"
|
event: "Skate akce a soutěže"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
transport: {
|
||||||
|
vehicle: {
|
||||||
|
car: "Auto",
|
||||||
|
taxi: "Taxi / spolujízda",
|
||||||
|
van: "Dodávka / minibus",
|
||||||
|
moto: "Motocykl",
|
||||||
|
helicopter: "Vrtulník",
|
||||||
|
plane: "Letadlo",
|
||||||
|
boat: "Loď",
|
||||||
|
other: "Jiné vozidlo"
|
||||||
|
},
|
||||||
|
service: {
|
||||||
|
people: "Osoby",
|
||||||
|
goods: "Zboží / náklad",
|
||||||
|
gear: "Skate výbava",
|
||||||
|
airport: "Transfer na letiště",
|
||||||
|
venue: "Transfer na místo / akci",
|
||||||
|
tours: "Výlety / roadtripy",
|
||||||
|
logistics: "Logistika akcí",
|
||||||
|
other: "Jiná služba"
|
||||||
|
},
|
||||||
|
feature: {
|
||||||
|
cargo: "Nákladový prostor",
|
||||||
|
bike_board: "Držák na kolo / prkno",
|
||||||
|
wheelchair: "Přístup pro vozíčkáře",
|
||||||
|
pets: "Mazlíčci vítáni",
|
||||||
|
border: "Překročení hranic",
|
||||||
|
night: "Jízda v noci",
|
||||||
|
covered: "Kryté / odolné počasí",
|
||||||
|
group: "Velké skupiny"
|
||||||
|
}
|
||||||
|
},
|
||||||
tour: {
|
tour: {
|
||||||
skill: {
|
skill: {
|
||||||
beginner: {
|
beginner: {
|
||||||
|
|
|
||||||
|
|
@ -51,13 +51,40 @@ const drift = {
|
||||||
"tabClothing": "Oblečení",
|
"tabClothing": "Oblečení",
|
||||||
"empty": {
|
"empty": {
|
||||||
"clothingTitle": "Zatím žádní návrháři oblečení",
|
"clothingTitle": "Zatím žádní návrháři oblečení",
|
||||||
"clothingBody": "Buď první, kdo nabídne oblečení na zakázku, týmové dresy a apparel pro scénu."
|
"clothingBody": "Buď první, kdo nabídne oblečení na zakázku, týmové dresy a apparel pro scénu.",
|
||||||
|
"transportTitle": "Zatím žádní dopravci",
|
||||||
|
"transportBody": "Převážíš skejťáky, vybavení nebo náklad? Nabídni své auto, dodávku, taxi, kolo, vrtulník, letadlo nebo loď.",
|
||||||
},
|
},
|
||||||
"craftFields": {
|
"craftFields": {
|
||||||
"sizing": "Rozsah velikostí",
|
"sizing": "Rozsah velikostí",
|
||||||
"samples": "Vzorky / prototypy",
|
"samples": "Vzorky / prototypy",
|
||||||
"customization": "Přizpůsobení"
|
"customization": "Přizpůsobení",
|
||||||
}
|
"capacity": "Kapacita",
|
||||||
|
"cargo": "Prostor pro náklad",
|
||||||
|
"coverage": "Pokrytí / trasy",
|
||||||
|
"availability": "Dostupnost",
|
||||||
|
"base": "Domovská oblast",
|
||||||
|
"accessibility": "Bezbariérový přístup",
|
||||||
|
},
|
||||||
|
"tabTransport": "Doprava",
|
||||||
|
"filterVehicles": "Vozidla",
|
||||||
|
"filterTransportServices": "Služby",
|
||||||
|
"filterCapabilities": "Možnosti",
|
||||||
|
"filterCapacity": "Kapacita",
|
||||||
|
"filterCoverage": "Pokrytí",
|
||||||
|
"offerTransport": "Nabídnout dopravu",
|
||||||
|
"labLink": {
|
||||||
|
"transport": "Doprava",
|
||||||
|
"designer": "Oblečení",
|
||||||
|
},
|
||||||
|
"detail": {
|
||||||
|
"noun": {
|
||||||
|
"transport": "dopravce",
|
||||||
|
},
|
||||||
|
"skillsTitle": {
|
||||||
|
"transport": "Vozidla a služby",
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
"socialUi": {
|
"socialUi": {
|
||||||
"coordinator": {
|
"coordinator": {
|
||||||
|
|
@ -140,7 +167,10 @@ const drift = {
|
||||||
"bucketUnknownDesc": "Nikdo v tvé síti se za tento účet zatím nezaručil.",
|
"bucketUnknownDesc": "Nikdo v tvé síti se za tento účet zatím nezaručil.",
|
||||||
"bucketFlaggedDesc": "Důvěryhodní lidé tento účet nahlásili.",
|
"bucketFlaggedDesc": "Důvěryhodní lidé tento účet nahlásili.",
|
||||||
"reportedByTrusted": "Nahlášeno {{count}} důvěryhodnými lidmi"
|
"reportedByTrusted": "Nahlášeno {{count}} důvěryhodnými lidmi"
|
||||||
}
|
},
|
||||||
|
"stats": {
|
||||||
|
"transport": "Doprava",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
"trustUi": {
|
"trustUi": {
|
||||||
"alertsTitle": "Upozornění sítě",
|
"alertsTitle": "Upozornění sítě",
|
||||||
|
|
@ -263,7 +293,23 @@ const drift = {
|
||||||
"leather": "Kůže",
|
"leather": "Kůže",
|
||||||
"recycled": "Recyklované / deadstock"
|
"recycled": "Recyklované / deadstock"
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
|
"transport": {
|
||||||
|
"capacity": {
|
||||||
|
"solo": "1–3 osoby",
|
||||||
|
"small_group": "4–7 osob",
|
||||||
|
"large_group": "8+ osob",
|
||||||
|
"van_load": "Plná dodávka",
|
||||||
|
"freight": "Náklad / zboží",
|
||||||
|
},
|
||||||
|
"coverage": {
|
||||||
|
"local": "Místní",
|
||||||
|
"regional": "Regionální",
|
||||||
|
"national": "Celostátní",
|
||||||
|
"international": "Mezinárodní",
|
||||||
|
"cross_border": "Přeshraniční trasy",
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
"becomeRolesUi": {
|
"becomeRolesUi": {
|
||||||
"clothing": {
|
"clothing": {
|
||||||
|
|
@ -282,7 +328,33 @@ const drift = {
|
||||||
"sizingPlaceholder": "např. XS-3XL / na míru",
|
"sizingPlaceholder": "např. XS-3XL / na míru",
|
||||||
"samplesHelper": "Nabízíš vzorky nebo prototypy před plnou sérií?",
|
"samplesHelper": "Nabízíš vzorky nebo prototypy před plnou sérií?",
|
||||||
"customizationPlaceholder": "např. jména, čísla, grafika"
|
"customizationPlaceholder": "např. jména, čísla, grafika"
|
||||||
}
|
},
|
||||||
|
"transport": {
|
||||||
|
"seoTitle": "Nabídni dopravu / řízení - SkateSpots",
|
||||||
|
"seoDescription": "Převážej skejťáky, vybavení a náklad — auta, taxi, dodávky, motorky, vrtulníky, letadla a lodě. Vlastní ověření, hodnoceno komunitou.",
|
||||||
|
"heading": "Doprava / řidič",
|
||||||
|
"tagline": "Voz lidi i vybavení po scéně — po zemi, vzduchem nebo po vodě",
|
||||||
|
"noun": "dopravce",
|
||||||
|
"rateLabel": "Sazba / jízda",
|
||||||
|
"portfolioLabel": "Fotky vozidla / flotily",
|
||||||
|
"sectionVehicles": "Vozidla",
|
||||||
|
"sectionServices": "Služby",
|
||||||
|
"sectionFeatures": "Možnosti",
|
||||||
|
"sectionCapacity": "Kapacita",
|
||||||
|
"sectionCoverage": "Pokrytí",
|
||||||
|
"capacityLabel": "Kapacita",
|
||||||
|
"capacityPlaceholder": "např. 4 cestující / 2 desky",
|
||||||
|
"cargoLabel": "Prostor pro náklad",
|
||||||
|
"cargoPlaceholder": "např. plná dodávka, 8 boxů na desky",
|
||||||
|
"coverageLabel": "Pokrytí / trasy",
|
||||||
|
"coveragePlaceholder": "např. Barcelona ↔ Perpignan, regionálně",
|
||||||
|
"availabilityLabel": "Dostupnost",
|
||||||
|
"availabilityPlaceholder": "např. víkendy, dny akcí, na zavolání",
|
||||||
|
"baseLabel": "Domovská oblast",
|
||||||
|
"basePlaceholder": "např. Barcelona / El Prat",
|
||||||
|
"accessibilityLabel": "Bezbariérový přístup",
|
||||||
|
"accessibilityPlaceholder": "např. rampa, místo pro vozík, asistence",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
"weatherUi": {
|
"weatherUi": {
|
||||||
"updated": "Aktualizováno",
|
"updated": "Aktualizováno",
|
||||||
|
|
|
||||||
|
|
@ -349,6 +349,10 @@ const deBatch3 = {
|
||||||
bannerImage: "Bannerbild",
|
bannerImage: "Bannerbild",
|
||||||
bannerDesc: "Ein breites Bild für den oberen Bereich deines Profils.",
|
bannerDesc: "Ein breites Bild für den oberen Bereich deines Profils.",
|
||||||
website: "Website",
|
website: "Website",
|
||||||
|
openToSponsorships: "Offen für Sponsoring",
|
||||||
|
openToSponsorshipsHint: "Zeigt eine Sponsoring-/Kooperationskarte in deinem Profil. Es wird nichts geteilt, bis dir jemand schreibt.",
|
||||||
|
sponsorNote: "Sponsoring-Notiz (optional)",
|
||||||
|
sponsorNotePlaceholder: "z. B. offen für Partner bei Decks, Schuhen, Reisen und Events.",
|
||||||
bitcoinTitle: "Bitcoin & Zahlungen",
|
bitcoinTitle: "Bitcoin & Zahlungen",
|
||||||
bitcoinDesc: "Lass andere dich direkt zappen, bezahlen und dir Trinkgeld geben — ohne Mittelsmann.",
|
bitcoinDesc: "Lass andere dich direkt zappen, bezahlen und dir Trinkgeld geben — ohne Mittelsmann.",
|
||||||
lightningAddress: "Lightning-Adresse",
|
lightningAddress: "Lightning-Adresse",
|
||||||
|
|
|
||||||
|
|
@ -688,8 +688,9 @@ const deBatch4 = {
|
||||||
judges: "Juroren",
|
judges: "Juroren",
|
||||||
organizers: "Organisatoren",
|
organizers: "Organisatoren",
|
||||||
barbers: "Barbiere",
|
barbers: "Barbiere",
|
||||||
|
designers: "Designer:innen",
|
||||||
showFewer: "Weniger anzeigen",
|
showFewer: "Weniger anzeigen",
|
||||||
showAllCrafts: "Alle 13 Handwerke anzeigen",
|
showAllCrafts: "Alle 15 Handwerke anzeigen",
|
||||||
community: "Community",
|
community: "Community",
|
||||||
tours: "Touren",
|
tours: "Touren",
|
||||||
crews: "Crews",
|
crews: "Crews",
|
||||||
|
|
@ -807,6 +808,28 @@ const deBatch4 = {
|
||||||
our: "UNSERE",
|
our: "UNSERE",
|
||||||
community: "COMMUNITY",
|
community: "COMMUNITY",
|
||||||
heroDesc: "SkateSpots wird von und für die Community gebaut. Unterstützer, Mitwirkende, Partner und Freunde, die das hier kostenlos und dezentral halten.",
|
heroDesc: "SkateSpots wird von und für die Community gebaut. Unterstützer, Mitwirkende, Partner und Freunde, die das hier kostenlos und dezentral halten.",
|
||||||
|
grantsSection: "Bitcoin-Förderorganisationen",
|
||||||
|
grantsSectionDesc: "Für Organisationen, die Zuschüsse an quelloffene Bitcoin-Projekte vergeben.",
|
||||||
|
grantsTitle: "Offen für Sponsoring · Bitcoin-Förderorganisationen",
|
||||||
|
grantsDisclaimer: "Du willst dieses Projekt unterstützen? Füll das Formular aus. Nicht um uns zu KYCen – sondern um DICH zu KYCen.",
|
||||||
|
grantsDisclaimerDesc: "Dieser Bereich ist nur für Förderorganisationen, die bei ihren Empfängern KYC/KYB durchführen. Wenn du ein Skater bist, der einfach nur spenden will, nutz die Lightning-, Silent-Payments- oder Angor-Wege oben – niemand braucht deinen Pass.",
|
||||||
|
grantsOrg: "Organisation",
|
||||||
|
grantsContact: "Kontakt (npub, E-Mail oder Nutzername)",
|
||||||
|
grantsWebsite: "Webseite",
|
||||||
|
grantsProgram: "Förderprogramm / Runde",
|
||||||
|
grantsSize: "Förderhöhe",
|
||||||
|
grantsKyc: "KYC-/KYB-Verfahren",
|
||||||
|
grantsFund: "Was möchtest du finanzieren?",
|
||||||
|
grantsAck: "Ich bestätige, dass wir eine Förderorganisation sind, die bei unseren Empfängern KYC/KYB durchführt.",
|
||||||
|
grantsSend: "Fördergespräch starten",
|
||||||
|
grantsNoKycTitle: "Kein KYC bei SkateSpots",
|
||||||
|
grantsNoKycDesc: "Wir verlangen weder deinen noch unseren Ausweis. Der KYC/KYB-Bereich ist für deine Empfänger.",
|
||||||
|
grantsNoTrackingTitle: "Kein Tracking",
|
||||||
|
grantsNoTrackingDesc: "Keine Analysen, kein CRM, keine Mailingliste. Diese Seite speichert nichts.",
|
||||||
|
grantsPrivateTitle: "Private Direktnachricht",
|
||||||
|
grantsPrivateDesc: "Öffnet eine verschlüsselte NIP-17-Konversation mit dem Betreiber.",
|
||||||
|
grantsEthos: "Wir nehmen nur Förderungen an, die SkateSpots quelloffen, selbst gehostet und frei von Analysen halten. Keine Bedingungen, die das Projekt schließen.",
|
||||||
|
grantsNote: "Öffnet eine private Direktnachricht an den Betreiber von SkateSpots. Auf dieser Seite wird nichts gespeichert.",
|
||||||
backAngor: "Unterstütze uns auf Angor",
|
backAngor: "Unterstütze uns auf Angor",
|
||||||
backers: "Unterstützer",
|
backers: "Unterstützer",
|
||||||
backersDesc: "Skater, die SkateSpots unterstützt haben – On-Chain-Finanzierung über Angor und Lightning-Zaps an das Projekt.",
|
backersDesc: "Skater, die SkateSpots unterstützt haben – On-Chain-Finanzierung über Angor und Lightning-Zaps an das Projekt.",
|
||||||
|
|
@ -937,12 +960,15 @@ const deBatch4 = {
|
||||||
nip05NotVerified: "NIP-05 nicht gegen diesen Schlüssel verifiziert",
|
nip05NotVerified: "NIP-05 nicht gegen diesen Schlüssel verifiziert",
|
||||||
message: "Nachricht",
|
message: "Nachricht",
|
||||||
eventsHosted: "Organisierte Events",
|
eventsHosted: "Organisierte Events",
|
||||||
|
labServices: "Lab-Dienste",
|
||||||
|
openToSponsorships: "Offen für Sponsoring",
|
||||||
forSponsors: "Für Sponsoren & Kooperationen",
|
forSponsors: "Für Sponsoren & Kooperationen",
|
||||||
sponsorPitch: "Sponsoring, Kooperation, Foto/Video oder Event? Starte ein Gespräch.",
|
sponsorPitch: "Sponsoring, Kooperation, Foto/Video oder Event? Starte ein Gespräch.",
|
||||||
startCollab: "Kooperations-Chat starten",
|
startCollab: "Kooperations-Chat starten",
|
||||||
viewRiderCard: "Skateboarder-Karte ansehen",
|
viewRiderCard: "Skateboarder-Karte ansehen",
|
||||||
collabMessage: "Hi {{name}}, ich würde gern über ein Sponsoring oder eine Kooperation sprechen.",
|
collabMessage: "Hi {{name}}, ich würde gern über ein Sponsoring oder eine Kooperation sprechen.",
|
||||||
followers: "Follower",
|
followers: "Follower",
|
||||||
|
followersHint: "Von Relays gemeldete Follower-Listen – keine geprüften Analysedaten.",
|
||||||
following: "Folge ich",
|
following: "Folge ich",
|
||||||
follow: "Folgen",
|
follow: "Folgen",
|
||||||
unfollow: "Entfolgen",
|
unfollow: "Entfolgen",
|
||||||
|
|
|
||||||
|
|
@ -663,6 +663,8 @@ const deBatch5 = {
|
||||||
manage: "Verwalten",
|
manage: "Verwalten",
|
||||||
admin: "Admin",
|
admin: "Admin",
|
||||||
editProfile: "Profil bearbeiten",
|
editProfile: "Profil bearbeiten",
|
||||||
|
transportSelfAttestedTitle: "Selbst angegebenes Transportprofil",
|
||||||
|
transportSelfAttested: "SkateSpots prüft keine Fahrerlaubnisse, Versicherungen, die Verkehrstauglichkeit von Fahrzeugen oder Betriebsgenehmigungen. Nutze das Vertrauensabzeichen, Bewertungen, Bürgschaften und dein eigenes Urteilsvermögen.",
|
||||||
publishedTitle: "Du bist live",
|
publishedTitle: "Du bist live",
|
||||||
publishedBody: "Dein Profil ist in The Lab veröffentlicht. Teile es, damit Skater dich finden.",
|
publishedBody: "Dein Profil ist in The Lab veröffentlicht. Teile es, damit Skater dich finden.",
|
||||||
manageRemove: "Entferne dein {{noun}}-Profil aus The Lab.",
|
manageRemove: "Entferne dein {{noun}}-Profil aus The Lab.",
|
||||||
|
|
|
||||||
|
|
@ -2015,6 +2015,38 @@ const deBatch6 = {
|
||||||
event: "Skate-Events & Comps",
|
event: "Skate-Events & Comps",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
transport: {
|
||||||
|
vehicle: {
|
||||||
|
car: "Auto",
|
||||||
|
taxi: "Taxi / Fahrdienst",
|
||||||
|
van: "Van / Kleinbus",
|
||||||
|
moto: "Motorrad",
|
||||||
|
helicopter: "Hubschrauber",
|
||||||
|
plane: "Flugzeug",
|
||||||
|
boat: "Boot",
|
||||||
|
other: "Anderes Fahrzeug",
|
||||||
|
},
|
||||||
|
service: {
|
||||||
|
people: "Personen",
|
||||||
|
goods: "Waren / Fracht",
|
||||||
|
gear: "Skate-Ausrüstung",
|
||||||
|
airport: "Flughafentransfer",
|
||||||
|
venue: "Transfer zur Location / zum Event",
|
||||||
|
tours: "Touren / Roadtrips",
|
||||||
|
logistics: "Event-Logistik",
|
||||||
|
other: "Andere Dienstleistung",
|
||||||
|
},
|
||||||
|
feature: {
|
||||||
|
cargo: "Laderaum",
|
||||||
|
bike_board: "Fahrrad- / Boardträger",
|
||||||
|
wheelchair: "Rollstuhlgerecht",
|
||||||
|
pets: "Haustiere willkommen",
|
||||||
|
border: "Grenzüberschreitend",
|
||||||
|
night: "Nachtfahrten",
|
||||||
|
covered: "Überdacht / wetterfest",
|
||||||
|
group: "Große Gruppen",
|
||||||
|
}
|
||||||
|
},
|
||||||
tour: {
|
tour: {
|
||||||
skill: {
|
skill: {
|
||||||
beginner: {
|
beginner: {
|
||||||
|
|
|
||||||
|
|
@ -54,11 +54,38 @@ const drift = {
|
||||||
empty: {
|
empty: {
|
||||||
clothingTitle: "Noch keine Kleidungsdesigner",
|
clothingTitle: "Noch keine Kleidungsdesigner",
|
||||||
clothingBody: "Sei der Erste, der individuelle Kleidung, Team-Kits und Apparel für die Szene anbietet.",
|
clothingBody: "Sei der Erste, der individuelle Kleidung, Team-Kits und Apparel für die Szene anbietet.",
|
||||||
|
transportTitle: "Noch keine Transport-Anbieter",
|
||||||
|
transportBody: "Bewegst du Skater, Ausrüstung oder Fracht? Biete dein Auto, deinen Van, dein Taxi, Fahrrad, Helikopter, Flugzeug oder Boot an.",
|
||||||
},
|
},
|
||||||
craftFields: {
|
craftFields: {
|
||||||
sizing: "Größenbereich",
|
sizing: "Größenbereich",
|
||||||
samples: "Muster / Prototypen",
|
samples: "Muster / Prototypen",
|
||||||
customization: "Individualisierung",
|
customization: "Individualisierung",
|
||||||
|
capacity: "Kapazität",
|
||||||
|
cargo: "Frachtraum",
|
||||||
|
coverage: "Abdeckung / Routen",
|
||||||
|
availability: "Verfügbarkeit",
|
||||||
|
base: "Standort",
|
||||||
|
accessibility: "Barrierefreiheit",
|
||||||
|
},
|
||||||
|
tabTransport: "Transport",
|
||||||
|
filterVehicles: "Fahrzeuge",
|
||||||
|
filterTransportServices: "Services",
|
||||||
|
filterCapabilities: "Möglichkeiten",
|
||||||
|
filterCapacity: "Kapazität",
|
||||||
|
filterCoverage: "Abdeckung",
|
||||||
|
offerTransport: "Transport anbieten",
|
||||||
|
labLink: {
|
||||||
|
transport: "Transport",
|
||||||
|
designer: "Kleidung",
|
||||||
|
},
|
||||||
|
detail: {
|
||||||
|
noun: {
|
||||||
|
transport: "Transport-Anbieter",
|
||||||
|
},
|
||||||
|
skillsTitle: {
|
||||||
|
transport: "Fahrzeuge & Services",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
socialUi: {
|
socialUi: {
|
||||||
|
|
@ -143,6 +170,9 @@ const drift = {
|
||||||
bucketFlaggedDesc: "Vertrauenswürdige Personen haben dieses Konto gemeldet.",
|
bucketFlaggedDesc: "Vertrauenswürdige Personen haben dieses Konto gemeldet.",
|
||||||
reportedByTrusted: "Von {{count}} vertrauenswürdigen Personen gemeldet",
|
reportedByTrusted: "Von {{count}} vertrauenswürdigen Personen gemeldet",
|
||||||
},
|
},
|
||||||
|
stats: {
|
||||||
|
transport: "Transport",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
trustUi: {
|
trustUi: {
|
||||||
alertsTitle: "Netzwerk-Warnungen",
|
alertsTitle: "Netzwerk-Warnungen",
|
||||||
|
|
@ -266,6 +296,22 @@ const drift = {
|
||||||
recycled: "Recycelt / Deadstock",
|
recycled: "Recycelt / Deadstock",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
transport: {
|
||||||
|
capacity: {
|
||||||
|
solo: "1–3 Personen",
|
||||||
|
small_group: "4–7 Personen",
|
||||||
|
large_group: "8+ Personen",
|
||||||
|
van_load: "Van-Ladung",
|
||||||
|
freight: "Fracht / Ladung",
|
||||||
|
},
|
||||||
|
coverage: {
|
||||||
|
local: "Lokal",
|
||||||
|
regional: "Regional",
|
||||||
|
national: "National",
|
||||||
|
international: "International",
|
||||||
|
cross_border: "Grenzüberschreitende Routen",
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
becomeRolesUi: {
|
becomeRolesUi: {
|
||||||
clothing: {
|
clothing: {
|
||||||
|
|
@ -285,6 +331,32 @@ const drift = {
|
||||||
samplesHelper: "Bietest du Muster oder Prototypen vor einer vollen Produktion an?",
|
samplesHelper: "Bietest du Muster oder Prototypen vor einer vollen Produktion an?",
|
||||||
customizationPlaceholder: "z. B. Namen, Nummern, Grafiken",
|
customizationPlaceholder: "z. B. Namen, Nummern, Grafiken",
|
||||||
},
|
},
|
||||||
|
transport: {
|
||||||
|
seoTitle: "Transport anbieten / Fahren - SkateSpots",
|
||||||
|
seoDescription: "Bewege Skater, Ausrüstung und Fracht — Autos, Taxis, Vans, Motorräder, Helikopter, Flugzeuge und Boote. Selbst angegeben, von der Community bewertet.",
|
||||||
|
heading: "Transport / Fahrer",
|
||||||
|
tagline: "Bring Menschen und Ausrüstung durch die Szene — zu Land, in der Luft oder auf dem Wasser",
|
||||||
|
noun: "Transport-Anbieter",
|
||||||
|
rateLabel: "Preis / Fahrt",
|
||||||
|
portfolioLabel: "Fotos von Fahrzeug / Flotte",
|
||||||
|
sectionVehicles: "Fahrzeuge",
|
||||||
|
sectionServices: "Services",
|
||||||
|
sectionFeatures: "Was du kannst",
|
||||||
|
sectionCapacity: "Kapazität",
|
||||||
|
sectionCoverage: "Abdeckung",
|
||||||
|
capacityLabel: "Kapazität",
|
||||||
|
capacityPlaceholder: "z. B. 4 Passagiere / 2 Boards",
|
||||||
|
cargoLabel: "Frachtraum",
|
||||||
|
cargoPlaceholder: "z. B. Van-Ladung, 8 Deckboxen",
|
||||||
|
coverageLabel: "Abdeckung / Routen",
|
||||||
|
coveragePlaceholder: "z. B. Barcelona ↔ Perpignan, regional",
|
||||||
|
availabilityLabel: "Verfügbarkeit",
|
||||||
|
availabilityPlaceholder: "z. B. Wochenenden, Eventtage, auf Abruf",
|
||||||
|
baseLabel: "Standort",
|
||||||
|
basePlaceholder: "z. B. Barcelona / El Prat",
|
||||||
|
accessibilityLabel: "Barrierefreiheit",
|
||||||
|
accessibilityPlaceholder: "z. B. Rampe, Rollstuhlplatz, Assistenz",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
weatherUi: {
|
weatherUi: {
|
||||||
updated: "Aktualisiert",
|
updated: "Aktualisiert",
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue