Author SHA1 Message Date
sagifer 2032837aad Merge pull request 'Main' (#7) from main into prod
CI / test (push) Successful in 57s
CI / build (push) Successful in 1m20s
CI / deploy (push) Successful in 42s
Reviewed-on: #7
2026-11-17 19:58:35 +01:00
fecoandClaude Opus 5.5 21640ffd9e Amazon SES as the mail sender
CI / test (push) Successful in 53s
CI / build (push) Successful in 4m32s
CI / deploy (push) Skipped
- worker: without SMTP_URL, the SES SMTP address is built from the AWS
  access key and secret in .env.secrets (several common names, any case);
  the SMTP password is derived from the secret as AWS documents; region
  eu-central-1, port 2587 (DigitalOcean blocks 25/465/587)
- deploy compose: no empty SMTP_URL in the worker's environment (it
  overrode .env.secrets); MAIL_FROM defaults to hello@sorsfonalak.hu
- docs/levelkuldes.md rewritten for SES (domain, DKIM, custom MAIL FROM,
  sandbox, firewall); privacy policy names AWS as the mail processor

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 18:43:39 +00:00
fecoandClaude Opus 5.5 7f761a0f0e docs: allow outbound TCP 2525 in the droplet firewall for mail
CI / test (push) Successful in 52s
CI / build (push) Successful in 11s
CI / deploy (push) Skipped
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 18:37:32 +00:00
fecoandClaude Opus 5.5 30b26340a0 Remove the basic auth gate: the site opens, sign-up needs an invitation
CI / test (push) Successful in 52s
CI / build (push) Successful in 5m39s
CI / deploy (push) Skipped
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 18:37:15 +00:00
fecoandClaude Opus 5.5 7272d0f1f3 Invitation-only sign-up, invitation e-mails and waitlist
- SIGNUP_MODE=invite (default): a new account needs an open invitation for
  its address, or the invitation link (then any Google account will do)
- admin page "Meghívók": invite many addresses at once, personal message,
  resend (max 3, 24 h apart), revoke, copy link, mail preview and test copy,
  waitlist
- invitation e-mail in HTML and plain text; Message-ID on the sender's
  domain, List-Unsubscribe with one-click POST, opt-out list (hashes only)
- e-mail texts moved to a shared crate (crates/email-templates)
- login page shows the invitation; waitlist for uninvited visitors;
  unsubscribe page; privacy policy updated
- docs/levelkuldes.md: Brevo, DNS (SPF, DKIM, DMARC) and the SMTP setup

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 18:37:15 +00:00
fecoandClaude Opus 5.5 b53cadcd8c Renaming a person keeps the chart and its analyses
CI / test (push) Successful in 47s
CI / build (push) Successful in 3m55s
CI / deploy (push) Skipped
The person edit form sent the birth data with every save, so a new name alone
recalculated the chart, deleted its analyses and comparisons and queued a new
summary. Now the backend ignores birth data equal to the stored one (and keeps
everything when a recalculation gives the same chart), and the form sends it
only when it changed. The name can be changed after the correction window too
("Átnevezés" on the person card).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 16:59:18 +00:00
sagifer a097cf4311 Merge pull request 'Main' (#6) from main into prod
CI / test (push) Successful in 45s
CI / build (push) Successful in 13s
CI / deploy (push) Successful in 41s
Reviewed-on: #6
2026-11-17 17:45:40 +01:00
fecoandClaude Opus 5.5 e004ea696b Packages: from one analysis to unlimited, admin can give them
CI / test (push) Successful in 47s
CI / build (push) Successful in 4m19s
CI / deploy (push) Skipped
A fixed catalog (packages.rs, reasoning in docs/csomagok.md): Egy elemzés
2 990 Ft, Páros 6 990 Ft, Család 11 990 Ft (featured), Korlátlan 17 990 Ft
for a year, and two top-ups. Every grant is a package_orders row; units are
credit_ledger rows with reason 'package' and never expire. The unlimited
package is a time-limited 'unlimited' entitlement: analyses use no unit and
persons have no limit, with a daily fair-use cap (UNLIMITED_DAILY_LIMIT, 5);
buying it again extends it by a year.

- GET /v1/packages, mock payment by package id, /v1/me unlimited_until
- POST /v1/admin/users/{id}/packages: give a package as a gift
- /csomagok page; the paid step of an analysis offers three packages with
  the bigger one featured; person packs use the catalog; admin user list
  has a package column
- PERSON_PACK_SIZE is replaced by the catalog's +5 személy top-up

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 16:19:20 +00:00
fecoandClaude Opus 5.5 0bd5c39080 Comparisons (synastry) of the own chart and persons
CI / test (push) Successful in 45s
CI / build (push) Successful in 4m19s
CI / deploy (push) Skipped
/osszevetesek compares any two of the user's charts (own and persons); the
person card and the person's chart page have "Összevetés velem". The
comparison page shows a double wheel (first person inside with houses, second
outside, aspects between them), the aspects by character, and tabs: paid
relationship analysis (synastry unit), the cross aspect grid, house overlays,
composite and the full aspect list.

Correcting a person within the hour now deletes the user's own comparisons
with them instead of being refused; still refused after a paid analysis or
when someone else's comparison uses the chart.

The relationship analysis prompt is editable on /admin/promptok too, and can be
tried on one of the admin's comparisons.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 16:04:44 +00:00
fecoandClaude Opus 5.5 b77dafdb26 Try draft prompts on own charts before saving
CI / test (push) Successful in 46s
CI / build (push) Successful in 4m16s
CI / deploy (push) Skipped
Under each prompt on /admin/promptok, "Kipróbálás" writes the summary or
detailed analysis with the text in the editor (saved or not) on one of the
admin's own charts. Test runs live in prompt_previews: never shown with the
chart, not cached, no credits, one attempt, at most three open per admin,
removed after 30 days. The worker writes them when no analysis is due. The
result shows the model, tokens, cost and time, and the draft can be loaded back.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 14:41:12 +00:00
fecoandClaude Opus 5.5 86d5dc5503 Editable analysis prompts on the admin page
CI / test (push) Successful in 44s
CI / build (push) Successful in 4m13s
CI / deploy (push) Skipped
The system prompts of the free summary and the paid detailed analysis can be
edited per language under /admin/promptok. Every save is a new row in
prompt_revisions (NULL = built-in text); new analyses record the revision in
prompt_version (v2-r<id>) and the worker uses exactly that text. Existing
analyses stay; the cross-user cache only copies results of the same revision.

The prompt code moves to the shared analysis-prompt crate so the backend can
show the built-in text.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 14:25:08 +00:00
sagifer bf7fb937d2 Merge pull request 'Worker tests: set the chart kind (charts_primary_is_own)' (#5) from main into prod
CI / test (push) Successful in 44s
CI / build (push) Successful in 13s
CI / deploy (push) Successful in 38s
Reviewed-on: #5
2026-11-17 13:25:02 +01:00
fecoandClaude Opus 5.5 0ba80abb47 Worker tests: set the chart kind (charts_primary_is_own)
CI / test (push) Successful in 44s
CI / build (push) Successful in 4m13s
CI / deploy (push) Skipped
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 12:22:55 +00:00
sagifer a8ce5490c8 Merge pull request 'Main' (#4) from main into prod
CI / test (push) Failing after 43s
CI / build (push) Skipped
CI / deploy (push) Skipped
Reviewed-on: #4
2026-11-17 13:15:24 +01:00
fecoandClaude Opus 5.5 ae9b1b31a9 Deploy: reload Caddy so Caddyfile changes take effect
CI / test (push) Failing after 40s
CI / build (push) Skipped
CI / deploy (push) Skipped
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 11:55:27 +00:00
fecoandClaude Opus 5.5 786696bb1e Privacy policy page (public), data export and account deletion in the profile
CI / test (push) Failing after 42s
CI / build (push) Skipped
CI / deploy (push) Skipped
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 11:55:08 +00:00
fecoandClaude Opus 5.5 0791998c13 Own chart back on the Képletem menu; persons get their own menu, page and a tile
CI / test (push) Failing after 41s
CI / build (push) Skipped
CI / deploy (push) Skipped
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 11:20:26 +00:00
fecoandClaude Opus 5.5 fef1605848 Persons: other people's charts with package slots, list page, switcher
CI / test (push) Failing after 43s
CI / build (push) Skipped
CI / deploy (push) Skipped
- charts.kind own/person; a new person uses a 'person' unit (not refunded
  on delete); person packages and an unlimited entitlement; admins unlimited
- a person's birth data can be corrected within an hour (admins any time)
- /kepletek list with tiles, /kepletek/uj, correction page, mock person
  packages, chart page title switches between charts keeping the tab

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 11:03:55 +00:00
fecoandClaude Opus 5.5 50875c0006 Tabs scroll below the sticky header
CI / test (push) Successful in 39s
CI / build (push) Successful in 3m38s
CI / deploy (push) Skipped
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 10:43:39 +00:00
fecoandClaude Opus 5.5 0e01f88f31 Summary card links to the detailed analysis tab
CI / test (push) Successful in 47s
CI / build (push) Successful in 3m41s
CI / deploy (push) Skipped
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 10:43:03 +00:00
fecoandClaude Opus 5.5 1e95459671 Roomier detailed analysis offer (flex gaps were lost when it moved into a tab)
CI / test (push) Successful in 40s
CI / build (push) Successful in 3m39s
CI / deploy (push) Skipped
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 10:37:37 +00:00
fecoandClaude Opus 5.5 afa113ceca Chart page tabs (analysis, planets, matrix, details); square aspect matrix
CI / test (push) Successful in 40s
CI / build (push) Successful in 3m36s
CI / deploy (push) Skipped
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 10:32:10 +00:00
sagifer b0b0347b04 Merge pull request 'Main' (#3) from main into prod
CI / test (push) Successful in 39s
CI / build (push) Successful in 39s
CI / deploy (push) Successful in 42s
Reviewed-on: #3
2026-11-17 11:24:13 +01:00
fecoandClaude Opus 5.5 d2a24ca42d Chart page: Sun, Moon and ASC in one small tile, columns of equal height, wider analysis
CI / test (push) Successful in 40s
CI / build (push) Successful in 3m39s
CI / deploy (push) Skipped
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 10:21:20 +00:00
fecoandClaude Opus 5.5 7d961fd70b Aspect grid: row and column headers, so both points of a cell are visible
CI / test (push) Successful in 40s
CI / build (push) Successful in 3m39s
CI / deploy (push) Skipped
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 09:58:21 +00:00
sagifer a75712a60a Merge pull request 'Aspect grid: the usual triangular matrix, values in collapsible details' (#2) from main into prod
CI / test (push) Successful in 40s
CI / build (push) Successful in 13s
CI / deploy (push) Successful in 44s
Reviewed-on: #2
2026-11-17 10:51:21 +01:00
fecoandClaude Opus 5.5 90fd87ab4a Aspect grid: the usual triangular matrix, values in collapsible details
CI / test (push) Successful in 40s
CI / build (push) Successful in 3m38s
CI / deploy (push) Skipped
Symbols only, coloured like the wheel's lines; orb and applying/separating
in a "Részletek" disclosure. Smaller cells on phones, scrolls if needed.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 07:11:16 +00:00
sagifer e08b6121a2 Merge pull request 'Main' (#1) from main into prod
CI / test (push) Successful in 39s
CI / build (push) Successful in 13s
CI / deploy (push) Successful in 38s
Reviewed-on: #1
2026-11-17 08:04:09 +01:00
fecoandClaude Opus 5.5 e5cfbd6cdd Detailed analysis button, loading wheel, birth data change limits
CI / test (push) Successful in 41s
CI / build (push) Successful in 4m11s
CI / deploy (push) Skipped
Backend:
- own birth data: three corrections within an hour of the first save,
  then one change per 24 hours (birth_data_changes); 429
  birth_data_change_limit with the user-facing message; /v1/me
  birth_change shows the notice; admins are not limited
- admins get detailed analyses free (no unit spent)
- POST /v1/payments/mock (MOCK_PAYMENTS): stand-in payment that adds a
  unit, until Stripe is connected; on in the compose files for now

Frontend:
- detailed analysis offer: admin starts it free, users with units
  confirm, others go through the (stand-in) payment step
- turning wheel with elapsed time while the summary or the analysis is
  being written
- no "adatok javítása" on the chart page (only in the profile), limit
  notice there; wheel hover highlighting removed

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 06:45:33 +00:00
fecoandClaude Opus 5.5 85337f2c79 Chart wheel: readable aspect lines
CI / test (push) Successful in 38s
CI / build (push) Successful in 3m48s
CI / deploy (push) Skipped
- only the major aspects between the ten planets, ASC and MC (the rest
  stays in the aspect table)
- one style per aspect: trine blue, sextile blue dashed, square orange,
  opposition red; width and opacity by orb, tight aspects on top
- line ends at the spread-out glyph angles, so neighbouring planets'
  lines no longer meet in one point
- hovering or focusing a planet shows only its aspects (CSS :has)
- shared legend, also on the example page

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 06:17:02 +00:00
fecoandClaude Opus 5.5 a937b6f0ff CI: create a tagged Gitea release after every prod deployment
CI / test (push) Successful in 37s
CI / build (push) Successful in 11s
CI / deploy (push) Skipped
Tag v<yyyy.mm.dd>-<hash>, body lists the commits since the previous
release; skipped when the release already exists (redeploy).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 06:11:19 +00:00
fecoandClaude Opus 5.5 24f9024d24 CI: deploy only from the prod branch
CI / test (push) Successful in 39s
CI / build (push) Successful in 12s
CI / deploy (push) Skipped
main builds images tagged with the commit hash and `main`; prod also tags
`prod` and `latest` and deploys. A prod run without DEPLOY_HOST now fails
instead of skipping silently.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 06:06:02 +00:00
fecoandClaude Opus 5.5 163612e527 Login page: newer design from the canvas
CI / test (push) Successful in 39s
CI / build (push) Successful in 3m35s
CI / deploy (push) Successful in 34s
- wheel with sample planets, ticks and aspect lines
- "Continue with Google" in the site's button style (Google's own
  button lies invisibly on top and still returns the ID token)
- new subtitle and account note

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 05:51:30 +00:00
fecoandClaude Opus 5.5 3cfbe439dd ci: first run with the registry token
CI / test (push) Successful in 39s
CI / build (push) Successful in 5m20s
CI / deploy (push) Skipped
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-16 21:36:27 +00:00
fecoandClaude Opus 5.5 dbbe41a41e deploy: temporary basic auth on the site
CI / test (push) Successful in 40s
CI / build (push) Failing after 3s
CI / deploy (push) Skipped
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-16 20:07:24 +00:00
fecoandClaude Opus 5.5 3c58a52725 ci/runner: fixed compose project name
CI / test (push) Successful in 40s
CI / build (push) Failing after 5s
CI / deploy (push) Skipped
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-16 19:59:49 +00:00
fecoandClaude Opus 5.5 d79df2cf76 deploy: Caddy behind Cloudflare (trusted proxies, real client IP); setup notes
CI / test (push) Successful in 38s
CI / build (push) Failing after 3s
CI / deploy (push) Skipped
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-16 19:51:08 +00:00
fecoandClaude Opus 5.5 13cc1e6e7b Gitea Actions CI: tests, image build to registry.sagifer.com, SSH deploy
CI / test (push) Successful in 42s
CI / build (push) Failing after 3s
CI / deploy (push) Skipped
- .gitea/workflows/ci.yml: test (Postgres service), build and push the
  four images tagged with the commit hash, deploy over SSH when
  DEPLOY_HOST is set
- ci/runner: act_runner 0.6.1 on the dev server using the host's Docker
- deploy/: production compose with Caddy (https), daily pg_dump backups,
  log rotation; setup guide

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-16 19:29:51 +00:00
fecoandClaude Opus 5.5 ce3d3804a7 Paid detailed analyses with per-kind units; example analysis page
- Credits become analysis units (migration 0006): a natal analysis uses
  one 'natal' unit, a synastry analysis one 'synastry' unit. No monthly
  free credits, no model tiers: ANALYSIS_MODEL (default Opus 5.5) writes
  every paid analysis. Admins grant units per kind; the worker refunds
  the right unit on failure.
- Chart page: the detailed analysis card (offer with units left and a
  confirmation, progress while writing, the finished six sections).
- Public /pelda page: a full Opus analysis of a made-up chart, with the
  free summary and a login call to action.
- The worker sends the JSON schema with properties in 'required' order.
  serde_json sorted them, so the title came after ~9000 tokens of text
  and Opus sometimes left it empty (3 failed attempts in a live test);
  with the order fixed the same analysis succeeded at the first try.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-16 17:39:15 +00:00
fecoandClaude Opus 5.5 450174c273 Free chart summaries; password login off by default
- New analysis kind 'summary' (migration 0005): saving a chart queues a
  free 3-4 sentence summary written by SUMMARY_MODEL (default Sonnet
  5.5, about 1 cent; Haiku was tested too but chose weaker highlights).
  POST /v1/charts/{id}/summary returns it and re-queues a failed one.
- The chart page shows it in a "Röviden" card and polls until ready.
- PASSWORD_LOGIN (default false): register, login and password reset
  answer 403; only Google (later Apple, Facebook) logins remain.
- Prompt v2: Hungarian names for elements and modalities (an English
  "Fire" slipped into a summary); worker compare-models --summary.
- The worker also reads a lower-case openrouter_api_key.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-16 17:12:17 +00:00
fecoandClaude Opus 5.5 269e3167e2 compare-models: synastry input; reject placeholder strings in answers
- worker compare-models --synastry FILE takes a /v1/synastry response
  and writes a relationship analysis.
- Answer validation now needs at least three letters per string, so a
  placeholder title such as "x" (seen from Opus 5.5) triggers a retry.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-16 14:38:30 +00:00
fecoandClaude Opus 5.5 e789e5a981 Chart page with a drawn wheel; reuse saved charts for identical birth data
- New /kepletek/[id] page: chart wheel (SVG), big three, elements,
  modalities, moon phase, positions and an aspects table. /keplet opens
  the user's own chart; the home page goes there after login.
- The profile only shows the birth data, with a link to the chart.
- Saving the same birth data again returns the stored chart (200)
  instead of calculating a new one.
- Charts without a birth time (angles null) render without houses.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-16 06:37:59 +00:00
fecoandClaude Opus 5.5 1f177f859e Start the Next.js frontend: Google login, profile, birth data, admin
services/frontend (Next.js 16, App Router) runs on port 3001 in compose. The
browser only talks to the frontend: /api/v1/* is proxied to the backend, so
the session cookie lives on the frontend's host, and /api/geo/* exposes the
country list and place search of the horoscope-api.

- /belepes: Google Identity Services button, client id from /v1/config
- /profil: account facts, display name and language, own birth data with
  place search, DST ambiguity prompt and the chart's positions
- /admin: user search, role toggles, credit grants (admins only, 404 otherwise)

Services now tolerate migrations newer than their binary, so they can be
rebuilt one at a time.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-15 21:00:50 +00:00
fecoandClaude Opus 5.5 4aabb7343c Model tiers: per-model credits and premium/vip roles
LLM_MODELS entries are now model[=credits][@role]. The default tiers follow
the model comparison rated by an astrologer: Claude Haiku 5.5 (free, 1
credit), GPT-5.6 Terra (premium, 3 credits), Claude Opus 5.5 (vip, 10 credits).
VIP includes premium, admins may use every model.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-15 20:46:30 +00:00
fecoandClaude Opus 5.5 b30a6c8fb1 Default to MiniMax M3 and fix Hungarian quotes in analyses
MiniMax M3 rated top in a blind comparison at a sixth of the cost of the
other top models. Straight double-quote pairs in Hungarian answers become „…”.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-15 17:05:23 +00:00
fecoandClaude Opus 5.5 812b2d4f73 Write text analyses with OpenRouter in the worker
- analysis job: claims pending analyses (SKIP LOCKED, NOTIFY wake-up),
  builds a compact chart text without birth data, asks OpenRouter with a
  strict JSON schema, validates and stores the answer, model used, tokens
  and cost; retries transient errors, refunds credits on final failure,
  requeues interrupted jobs
- prompt v1 for natal and synastry analyses, Hungarian style guide
- compare-models subcommand for blind model comparison
- migration 0003: attempts, next_attempt_at, model_used, cost_usd,
  notify trigger, one refund per analysis
- db: rebuild when migrations change
- compose: worker reads OPENROUTER_API_KEY from .env.secrets

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-15 12:18:40 +00:00
144 changed files with 15835 additions and 451 deletions
+162
View File
@@ -0,0 +1,162 @@
# main: tests and image build (tags: commit hash, `main`).
# prod: the same, then deployment to the server (tags: commit hash, `prod`, `latest`).
#
# Runs on the self-hosted runner in ci/runner (label `linux`). Jobs use the
# host's Docker daemon, so image builds share its BuildKit cache; a commit
# already built on main is rebuilt from cache in seconds.
#
# Repository settings (Settings → Actions):
# secrets.REGISTRY_TOKEN Gitea access token with package write access
# secrets.DEPLOY_SSH_KEY private key of the deploy user on the server
# vars.DEPLOY_HOST user@host of the server
# vars.DEPLOY_KNOWN_HOSTS `ssh-keyscan <host>` output
# vars.DEPLOY_PATH directory on the server (default /opt/sorsfonalak)
name: CI
on:
push:
branches: [main, prod]
workflow_dispatch:
env:
REGISTRY: registry.sagifer.com
IMAGE_PREFIX: registry.sagifer.com/sagifer/sorsfonalak
defaults:
run:
shell: sh
jobs:
test:
runs-on: linux
container:
image: rust:1.99-alpine
# Kept between runs, so only changed crates are compiled again.
volumes:
- sorsfonalak-ci-cargo:/usr/local/cargo/registry
- sorsfonalak-ci-target:/ci-target
services:
postgres:
image: postgres:18-alpine
env:
POSTGRES_USER: sorsfonalak
POSTGRES_PASSWORD: ci
POSTGRES_DB: sorsfonalak
env:
CARGO_TARGET_DIR: /ci-target
DATABASE_URL: postgres://sorsfonalak:ci@postgres:5432/sorsfonalak
steps:
- name: Checkout
run: |
apk add --no-cache -q git musl-dev
git init -q . && git remote add origin "${{ github.server_url }}/${{ github.repository }}.git"
git fetch -q --depth 1 origin "${{ github.sha }}" && git checkout -q FETCH_HEAD
- name: Wait for Postgres
run: |
for i in $(seq 30); do nc -z postgres 5432 && exit 0; sleep 1; done
echo "postgres did not start" >&2; exit 1
# astro-engine and horoscope-api need the Swiss Ephemeris sources and
# data (scripts/fetch-deps.sh); their tests run locally.
- name: Test
run: cargo test --locked -p backend -p worker -p db -p horoscope-client -p service-kit -p analysis-prompt -p email-templates
build:
needs: test
runs-on: linux
steps:
- name: Checkout
run: |
apk add --no-cache -q git
git init -q . && git remote add origin "${{ github.server_url }}/${{ github.repository }}.git"
git fetch -q --depth 1 origin "${{ github.sha }}" && git checkout -q FETCH_HEAD
- name: Log in to the registry
env:
TOKEN: ${{ secrets.REGISTRY_TOKEN }}
run: printf '%s' "$TOKEN" | docker login "$REGISTRY" -u "${{ github.repository_owner }}" --password-stdin
# The frontend build also type-checks the TypeScript code.
- name: Build and push images
run: |
set -eu
tag=$(echo "${{ github.sha }}" | cut -c1-12)
extra="${{ github.ref_name }}"
[ "$extra" = prod ] && extra="prod latest"
build() {
image="$IMAGE_PREFIX-$1"; shift
docker build --label sorsfonalak.ci=1 -t "$image:$tag" "$@"
docker push -q "$image:$tag"
for t in $extra; do
docker tag "$image:$tag" "$image:$t"
docker push -q "$image:$t"
done
}
build horoscope-api -f services/horoscope-api/Dockerfile .
build backend -f services/backend/Dockerfile .
build worker -f services/worker/Dockerfile .
build frontend services/frontend
- name: Clean up
if: always()
run: |
docker logout "$REGISTRY" || true
docker image prune -f --filter label=sorsfonalak.ci=1 >/dev/null
deploy:
needs: build
if: github.ref == 'refs/heads/prod'
runs-on: linux
steps:
- name: Check settings
run: |
[ -n "${{ vars.DEPLOY_HOST }}" ] || { echo "vars.DEPLOY_HOST is not set (Settings → Actions → Variables)" >&2; exit 1; }
- name: Checkout
run: |
apk add --no-cache -q git openssh-client
git init -q . && git remote add origin "${{ github.server_url }}/${{ github.repository }}.git"
git fetch -q --depth 1 origin "${{ github.sha }}" && git checkout -q FETCH_HEAD
- name: SSH key
env:
KEY: ${{ secrets.DEPLOY_SSH_KEY }}
KNOWN_HOSTS: ${{ vars.DEPLOY_KNOWN_HOSTS }}
run: |
mkdir -p ~/.ssh && chmod 700 ~/.ssh
(umask 077 && printf '%s\n' "$KEY" > ~/.ssh/id_ed25519)
printf '%s\n' "$KNOWN_HOSTS" > ~/.ssh/known_hosts
# Copies the compose files, pins TAG in the server's .env and restarts
# the changed services. The database migrations run when the backend starts.
- name: Deploy
env:
HOST: ${{ vars.DEPLOY_HOST }}
DIR: ${{ vars.DEPLOY_PATH || '/opt/sorsfonalak' }}
run: |
set -eu
tag=$(echo "${{ github.sha }}" | cut -c1-12)
scp -q deploy/docker-compose.yml deploy/Caddyfile "$HOST:$DIR/"
ssh "$HOST" "cd '$DIR' && \
(grep -q '^TAG=' .env && sed -i 's/^TAG=.*/TAG=$tag/' .env || echo 'TAG=$tag' >> .env) && \
docker compose pull -q && docker compose up -d --remove-orphans --wait && \
docker compose exec -T caddy caddy reload --config /etc/caddy/Caddyfile --adapter caddyfile && \
docker image prune -f >/dev/null"
# A release (and its tag, e.g. v2026.11.17-163612e) for every deployment,
# listing the commits since the previous one.
- name: Release
env:
TOKEN: ${{ secrets.GITEA_TOKEN }}
API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }}
run: |
set -eu
apk add --no-cache -q curl jq
git fetch -q --unshallow --tags origin
short=$(echo "${{ github.sha }}" | cut -c1-7)
name="v$(date -u +%Y.%m.%d)-$short"
if curl -fsS -o /dev/null -H "Authorization: token $TOKEN" "$API/releases/tags/$name" 2>/dev/null; then
echo "release $name already exists (redeploy)"; exit 0
fi
prev=$(git describe --tags --abbrev=0 --match 'v*' HEAD 2>/dev/null || true)
if [ -n "$prev" ]; then range="$prev..HEAD"; since="since $prev"; else range="-20 HEAD"; since="(last 20 commits)"; fi
changes=$(git log --no-merges --pretty='- %s (%h)' $range)
body=$(printf 'Deployed to production on %s UTC.\nImages: `registry.sagifer.com/sagifer/sorsfonalak-*:%s`\n\nChanges %s:\n%s\n' \
"$(date -u '+%Y-%m-%d %H:%M')" "$(echo "${{ github.sha }}" | cut -c1-12)" "$since" "$changes")
jq -n --arg tag "$name" --arg sha "${{ github.sha }}" --arg body "$body" \
'{tag_name: $tag, target_commitish: $sha, name: $tag, body: $body}' \
| curl -fsS -X POST -H "Authorization: token $TOKEN" -H 'Content-Type: application/json' -d @- "$API/releases" \
| jq -r '"created release " + .name + ": " + .html_url'
Generated
+24
View File
@@ -17,6 +17,13 @@ version = "0.2.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
[[package]]
name = "analysis-prompt"
version = "0.1.0"
dependencies = [
"serde_json",
]
[[package]]
name = "anyhow"
version = "1.0.104"
@@ -156,11 +163,13 @@ dependencies = [
name = "backend"
version = "0.1.0"
dependencies = [
"analysis-prompt",
"anyhow",
"argon2",
"axum",
"axum-extra",
"db",
"email-templates",
"horoscope-client",
"http-body-util",
"jsonwebtoken",
@@ -438,6 +447,13 @@ dependencies = [
"memchr",
]
[[package]]
name = "email-templates"
version = "0.1.0"
dependencies = [
"serde_json",
]
[[package]]
name = "email_address"
version = "0.2.9"
@@ -2856,12 +2872,20 @@ checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
name = "worker"
version = "0.1.0"
dependencies = [
"analysis-prompt",
"anyhow",
"axum",
"base64 0.22.1",
"db",
"email-templates",
"hmac",
"lettre",
"rand 0.9.5",
"reqwest",
"serde",
"serde_json",
"service-kit",
"sha2",
"sqlx",
"time",
"tokio",
+5
View File
@@ -7,6 +7,8 @@ members = [
"crates/service-kit",
"crates/db",
"crates/horoscope-client",
"crates/analysis-prompt",
"crates/email-templates",
"services/horoscope-api",
"services/backend",
"services/worker",
@@ -25,12 +27,15 @@ geo-tz = { path = "crates/geo-tz" }
service-kit = { path = "crates/service-kit" }
db = { path = "crates/db" }
horoscope-client = { path = "crates/horoscope-client" }
analysis-prompt = { path = "crates/analysis-prompt" }
email-templates = { path = "crates/email-templates" }
anyhow = "1"
argon2 = { version = "0.5", features = ["std"] }
axum = "0.8"
axum-extra = { version = "0.10", features = ["cookie"] }
base64 = "0.22"
hmac = "0.12"
jsonwebtoken = { version = "9", default-features = false }
lettre = { version = "0.11", default-features = false, features = ["builder", "hostname", "smtp-transport", "tokio1", "tokio1-rustls", "webpki-roots", "ring"] }
rand = "0.9"
+4 -1
View File
@@ -6,7 +6,8 @@ Asztrológiai rendszer konténeres backendje. A frontenden kívül minden Rustba
|---|---|
| `services/horoscope-api` | HTTP API: születési adatokból születési horoszkóp (radix) és szinasztria |
| `services/backend` | felhasználók, belépés, mentett képletek, szinasztriák, meghívók, elemzések, kreditek, megosztás. Részletek: [services/backend/README.md](services/backend/README.md) |
| `services/worker` | háttérmunkák: e-mail-küldés, takarítás (később az LLM-elemzések). Részletek: [services/worker/README.md](services/worker/README.md) |
| `services/worker` | háttérmunkák: e-mail-küldés, LLM-elemzések, takarítás. Részletek: [services/worker/README.md](services/worker/README.md) |
| `services/frontend` | Next.js webes felület: Google-belépés, profil, születési adatok, admin. Részletek: [services/frontend/README.md](services/frontend/README.md) |
| `crates/db` | PostgreSQL-séma (migrációk) és a szolgáltatások közös adatelérése |
| `crates/horoscope-client` | a horoscope-api HTTP-kliense (a backend és később a worker használja) |
| `crates/service-kit` | közös alapok: naplózás, listen cím, healthcheck, leállítás |
@@ -32,6 +33,8 @@ A `docker compose up` a `docker-compose.override.yml` fájlt is betölti. Ebben
SMTP_URL=smtps://user:jelszo@smtp.example.com:465 docker compose -f docker-compose.yml up -d
```
Az éles szerverre a CI telepít (Gitea Actions, Caddy és https): lásd [deploy/README.md](deploy/README.md).
A horoscope-api image önálló (`scratch` alapú, kb. 70 MB, nem root felhasználóval fut). Benne van a statikus bináris és az összes adat. A container induláskor ~2 mp alatt betölti az adatokat, és ~190 MB memóriát használ. Egy horoszkóp kiszámítása 2–3 ms.
Build-argumentumok (`docker compose build --build-arg …`):
+26
View File
@@ -0,0 +1,26 @@
# act_runner configuration (see `act_runner generate-config` for every option).
log:
level: info
runner:
file: .runner
capacity: 1
timeout: 1h
# Jobs without their own `container:` run in the Docker CLI image.
labels:
- "linux:docker://docker:29.9.3-cli"
cache:
# Not used: the cargo and BuildKit caches live in Docker volumes.
enabled: false
container:
network: ""
privileged: false
# The host's Docker socket is mounted into every job container (docker_host
# empty), so `docker build` uses the host daemon and its build cache.
docker_host: ""
# Only the CI cache volumes may be mounted by workflows.
valid_volumes:
- "sorsfonalak-ci-*"
force_pull: false
+26
View File
@@ -0,0 +1,26 @@
# Gitea Actions runner for this repository, on the dev server.
#
# First start (registers the runner; the token is only needed once):
# GITEA_RUNNER_REGISTRATION_TOKEN=... docker compose up -d
# Afterwards: docker compose up -d
name: sorsfonalak-runner
services:
runner:
image: gitea/act_runner:0.6.1
environment:
CONFIG_FILE: /config.yaml
GITEA_INSTANCE_URL: ${GITEA_INSTANCE_URL:-http://10.0.0.114:30008}
GITEA_RUNNER_REGISTRATION_TOKEN: ${GITEA_RUNNER_REGISTRATION_TOKEN:-}
GITEA_RUNNER_NAME: ${GITEA_RUNNER_NAME:-dev-195}
volumes:
- ./config.yaml:/config.yaml:ro
# Registration (.runner) lives here.
- runner-data:/data
# Job containers are started on the host daemon.
- /var/run/docker.sock:/var/run/docker.sock
restart: unless-stopped
volumes:
runner-data:
+10
View File
@@ -0,0 +1,10 @@
[package]
name = "analysis-prompt"
description = "Prompts and answer schemas of the Sorsfonalak LLM analyses (shared by backend and worker)"
edition.workspace = true
version.workspace = true
license.workspace = true
publish.workspace = true
[dependencies]
serde_json.workspace = true
+383
View File
@@ -0,0 +1,383 @@
//! Prompts and output schemas of the analyses (prompt version [`PROMPT_VERSION`]).
//!
//! The model answers with one JSON object (OpenRouter structured output);
//! [`validate`] checks it against the same schema before it is stored.
//!
//! The system prompt ([`default_system`]) can be replaced by an admin-edited
//! text; the user message (chart data, section list) and the schema stay fixed.
use serde_json::{Value, json};
/// Matches the backend's `ANALYSIS_PROMPT_VERSION` (part of the cache key).
pub const PROMPT_VERSION: &str = "v2";
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum Kind {
Natal,
Synastry,
/// A free teaser of a natal chart: a title and a few sentences.
Summary,
}
impl Kind {
pub const ALL: [Kind; 3] = [Kind::Summary, Kind::Natal, Kind::Synastry];
pub fn as_str(self) -> &'static str {
match self {
Kind::Natal => "natal",
Kind::Synastry => "synastry",
Kind::Summary => "summary",
}
}
pub fn parse(s: &str) -> Option<Kind> {
match s {
"natal" => Some(Kind::Natal),
"synastry" => Some(Kind::Synastry),
"summary" => Some(Kind::Summary),
_ => None,
}
}
}
pub struct Prompt {
pub system: String,
pub user: String,
pub schema_name: &'static str,
pub schema: Value,
}
/// (key, what the section covers) in reading order.
const NATAL_SECTIONS: [(&str, &str); 6] = [
("personality", "Core identity: the Sun, Moon, Ascendant and chart ruler read together"),
("emotions", "Emotional needs, security and inner life (Moon, 4th house, water emphasis)"),
("mind", "Thinking, communication and learning (Mercury, 3rd and 9th houses)"),
("love", "Love, attraction and relationships (Venus, Mars, 5th and 7th houses, Descendant)"),
("work", "Calling, career, money and daily work (MC, 10th, 2nd and 6th houses, Saturn, Jupiter)"),
(
"growth",
"Main inner tensions, life lessons and the path of growth (tight squares and oppositions, Saturn, Chiron, Nodes)",
),
];
const SYNASTRY_SECTIONS: [(&str, &str); 5] = [
("attraction", "What draws them together: Sun, Moon, Venus, Mars and Ascendant contacts"),
("communication", "How they think and talk together (Mercury contacts, air emphasis, 3rd house overlays)"),
("emotional_bond", "Emotional closeness, safety and care (Moon contacts, 4th and 8th house overlays)"),
("friction", "Where they rub against each other and how to handle it (challenging aspects, Saturn, Pluto, Mars)"),
("long_term", "Long-term potential and shared purpose, including the composite chart"),
];
fn sections(kind: Kind) -> &'static [(&'static str, &'static str)] {
match kind {
Kind::Natal => &NATAL_SECTIONS,
Kind::Synastry => &SYNASTRY_SECTIONS,
Kind::Summary => &[],
}
}
/// The JSON schema of the answer (strict mode: every property required).
pub fn schema(kind: Kind) -> Value {
if kind == Kind::Summary {
return json!({
"type": "object",
"additionalProperties": false,
"required": ["title", "summary"],
"properties": {
"title": {"type": "string", "description": "Short, evocative title for this chart (at most 6 words)"},
"summary": {"type": "string", "description": "3-4 sentences, 60-100 words, one paragraph"}
}
});
}
let mut props = serde_json::Map::new();
for (key, about) in sections(kind) {
props.insert(
(*key).into(),
json!({
"type": "object",
"description": about,
"additionalProperties": false,
"required": ["title", "body"],
"properties": {
"title": {"type": "string", "description": "Short, specific section title (not just the topic name)"},
"body": {"type": "string", "description": "2-4 paragraphs separated by a blank line"}
}
}),
);
}
let keys: Vec<&str> = sections(kind).iter().map(|(k, _)| *k).collect();
json!({
"type": "object",
"additionalProperties": false,
"required": ["title", "summary", "sections", "strengths", "challenges", "advice"],
"properties": {
"title": {"type": "string", "description": "Short, evocative title for this analysis (at most 8 words)"},
"summary": {"type": "string", "description": "3-4 sentence overview"},
"sections": {"type": "object", "additionalProperties": false, "required": keys, "properties": props},
"strengths": {"type": "array", "items": {"type": "string"}, "description": "3-5 key strengths, one sentence each"},
"challenges": {"type": "array", "items": {"type": "string"}, "description": "3-5 key challenges, one sentence each"},
"advice": {"type": "string", "description": "A closing, encouraging paragraph with concrete guidance"}
}
})
}
const HUNGARIAN_STYLE: &str = "\
Write natural, idiomatic Hungarian, as a native Hungarian author would; it must not read like a translation from English. \
Use correct Hungarian suffixes and vowel harmony, Hungarian quotation marks („…”) and the en dash (–). \
Use the usual Hungarian astrological terms:
- signs: Kos, Bika, Ikrek, Rák, Oroszlán, Szűz, Mérleg, Skorpió, Nyilas, Bak, Vízöntő, Halak (\"a Nap a Rák jegyében\", \"Kos Aszcendens\");
- planets and points: Nap, Hold, Merkúr, Vénusz, Mars, Jupiter, Szaturnusz, Uránusz, Neptunusz, Plútó, Chiron (Kiron), \
Észak-Holdcsomópont, Dél-Holdcsomópont, Lilith (Fekete Hold), Aszcendens, Descendens, Medium Coeli (MC), Imum Coeli (IC), Szerencsepont;
- aspects: együttállás (konjunkció), szextil, kvadrát (négyzet), trigon, szembenállás (oppozíció);
- elements and modalities: tűz, föld, levegő, víz (\"tűz elem\", \"a föld hiánya\"); kardinális, fix, változó;
Never leave English words (e.g. fire, earth, air, water) in the Hungarian text.
- other: \"a 3. házban\", \"a horoszkóp uralkodója\", retrográd, uralom (domicilium), száműzetés, exaltáció, esés, nappali/éjszakai horoszkóp.";
fn language_name(language: &str) -> &'static str {
match language {
"hu" => "Hungarian",
_ => "English",
}
}
/// The built-in system prompt of an analysis kind in a language.
pub fn default_system(kind: Kind, language: &str) -> String {
let (role, reader) = match kind {
Kind::Natal => (
"a personal natal chart interpretation",
"Speak to the owner of the chart directly, in the informal second person singular (in Hungarian: tegező forma, \"te\").",
),
Kind::Summary => (
"a short free summary of a natal chart (a teaser shown before the detailed, paid analysis)",
"Speak to the owner of the chart directly, in the informal second person singular (in Hungarian: tegező forma, \"te\").",
),
Kind::Synastry => (
"a relationship (synastry) interpretation for two people",
"Write for both people at once, in the informal second person plural (in Hungarian: \"ti\", \"kettőtök\"). \
When you must tell them apart, call them Person 1 and Person 2 (in Hungarian: \"az első fél\" and \"a második fél\"). \
Do not assume their genders or the type of relationship.",
),
};
let mut text = format!(
"You are an experienced, warm and psychologically minded astrologer. You write {role} for the Sorsfonalak app.
Write in {lang}.
Rules:
- Base every statement on the chart data given. Never invent positions, aspects or houses that are not listed.
- When you interpret a placement, name its astrological basis in a short clause, but keep the focus on the person, not on jargon.
- Synthesize: weave signs, houses, aspects and rulers into one coherent portrait; show how tensions can be integrated. \
Give the most weight to the Sun, Moon, Ascendant, chart ruler, tight aspects (orb under 3°) and strong emphases or gaps in elements and modalities.
- If a birth time is unknown, do not mention houses, the Ascendant or the Midheaven for that chart, and be careful with the Moon's sign.
- {reader}
- Tone: warm, honest, empowering and concrete. Not fatalistic: no predictions of illness, death, accidents or specific events, \
and no medical, legal or financial advice.
- Avoid generic horoscope clichés and filler: every paragraph must say something specific to this chart.
- Texts are plain paragraphs separated by a blank line, without headings or lists inside; **bold** may be used sparingly.
- {length}
- Answer with a single JSON object that matches the given schema, and nothing else.",
lang = language_name(language),
length = match kind {
Kind::Summary => "Length: one paragraph of 3-4 sentences (60-100 words). Pick the Sun, Moon and Ascendant \
(if the birth time is known) and the single most striking feature of the chart (a very tight aspect, \
a stellium, a strong element emphasis or gap). It must be complete in itself and specific to this chart: \
no sales talk, and do not mention a longer analysis.",
_ => "Length: each section 2-4 paragraphs (about 150-250 words); the whole analysis about 1300-1800 words.",
},
);
if language == "hu" {
text.push_str("\n\n");
text.push_str(HUNGARIAN_STYLE);
}
text
}
/// Splits a stored prompt version (`v2` or `v2-r<id>`, the id of an admin-edited
/// system prompt in `prompt_revisions`) into the code version and the revision id.
pub fn split_version(version: &str) -> (&str, Option<i64>) {
match version.rsplit_once("-r") {
Some((base, id)) => match id.parse() {
Ok(id) => (base, Some(id)),
Err(_) => (version, None),
},
None => (version, None),
}
}
/// The built-in text of the user message around the chart data, for showing
/// next to the editable system prompt (`{chart data}` stands for the data).
pub fn user_template(kind: Kind) -> String {
build(kind, "hu", "{chart data}\n", None).user
}
/// The prompt for one analysis; `system` replaces [`default_system`].
pub fn build(kind: Kind, language: &str, chart_text: &str, system: Option<&str>) -> Prompt {
let mut user = String::from("Chart data:\n\n");
user.push_str(chart_text);
if kind == Kind::Summary {
user.push_str("\nWrite the short summary now.");
} else {
user.push_str("\nSections to write, in this order:\n");
for (key, about) in sections(kind) {
user.push_str(&format!("- {key}: {about}\n"));
}
user.push_str("\nWrite the analysis now.");
}
Prompt {
system: system.map_or_else(|| default_system(kind, language), str::to_owned),
user,
schema_name: match kind {
Kind::Natal => "natal_analysis",
Kind::Synastry => "synastry_analysis",
Kind::Summary => "chart_summary",
},
schema: schema(kind),
}
}
/// Checks an answer against our schema subset (objects with required
/// properties, strings with at least three letters, string arrays with at
/// least two items). A placeholder such as "x" counts as missing.
pub fn validate(schema: &Value, value: &Value) -> Result<(), String> {
fn walk(schema: &Value, value: &Value, path: &str) -> Result<(), String> {
match schema["type"].as_str() {
Some("object") => {
let obj = value.as_object().ok_or_else(|| format!("{path}: expected an object"))?;
for key in schema["required"].as_array().into_iter().flatten().filter_map(Value::as_str) {
let child = obj.get(key).ok_or_else(|| format!("{path}.{key}: missing"))?;
walk(&schema["properties"][key], child, &format!("{path}.{key}"))?;
}
Ok(())
}
Some("array") => {
let items = value.as_array().ok_or_else(|| format!("{path}: expected an array"))?;
if items.len() < 2 {
return Err(format!("{path}: too few items"));
}
items.iter().enumerate().try_for_each(|(i, v)| walk(&schema["items"], v, &format!("{path}[{i}]")))
}
Some("string") => match value.as_str() {
Some(s) if s.chars().filter(|c| c.is_alphabetic()).nth(2).is_some() => Ok(()),
_ => Err(format!("{path}: expected a non-empty string")),
},
_ => Ok(()),
}
}
walk(schema, value, "$")
}
/// Fixes typography the models often get wrong. In Hungarian, pairs of
/// straight double quotes become „…” (only when they pair up evenly).
pub fn polish(language: &str, content: &mut Value) {
fn hungarian_quotes(text: &str) -> Option<String> {
if !text.contains('"') || !text.matches('"').count().is_multiple_of(2) {
return None;
}
let mut open = true;
Some(
text.chars()
.map(|c| match c {
'"' => {
let q = if open { '„' } else { '”' };
open = !open;
q
}
c => c,
})
.collect(),
)
}
match content {
Value::String(s) if language == "hu" => {
if let Some(fixed) = hungarian_quotes(s) {
*s = fixed;
}
}
Value::Array(items) => items.iter_mut().for_each(|v| polish(language, v)),
Value::Object(map) => map.values_mut().for_each(|v| polish(language, v)),
_ => {}
}
}
/// The analysis as Markdown (for reading and comparing outputs).
pub fn to_markdown(kind: Kind, language: &str, content: &Value) -> String {
let (strengths, challenges, advice) = if language == "hu" {
("Erősségek", "Kihívások", "Útravaló")
} else {
("Strengths", "Challenges", "Advice")
};
let mut md =
format!("# {}\n\n_{}_\n\n", content["title"].as_str().unwrap_or(""), content["summary"].as_str().unwrap_or(""));
if kind == Kind::Summary {
return md;
}
for (key, _) in sections(kind) {
let s = &content["sections"][*key];
md.push_str(&format!("## {}\n\n{}\n\n", s["title"].as_str().unwrap_or(key), s["body"].as_str().unwrap_or("")));
}
for (title, key) in [(strengths, "strengths"), (challenges, "challenges")] {
md.push_str(&format!("## {title}\n\n"));
for item in content[key].as_array().into_iter().flatten().filter_map(Value::as_str) {
md.push_str(&format!("- {item}\n"));
}
md.push('\n');
}
md.push_str(&format!("## {advice}\n\n{}\n", content["advice"].as_str().unwrap_or("")));
md
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn summary_prompt_is_short() {
let p = build(Kind::Summary, "hu", "SUN: Cancer", None);
assert_eq!(p.schema_name, "chart_summary");
assert!(p.system.contains("3-4 sentences") && p.system.contains("tegező"));
assert!(!p.user.contains("Sections to write"));
assert_eq!(validate(&p.schema, &json!({"title": "Érzékeny mag", "summary": "Rövid szöveg."})), Ok(()));
assert!(validate(&p.schema, &json!({"title": "Érzékeny mag"})).is_err());
let md = to_markdown(Kind::Summary, "hu", &json!({"title": "Cím", "summary": "Szöveg."}));
assert_eq!(md, "# Cím\n\n_Szöveg._\n\n");
}
#[test]
fn custom_system_replaces_only_the_rules() {
let p = build(Kind::Natal, "hu", "SUN: Cancer", Some("Saját szabályok."));
assert_eq!(p.system, "Saját szabályok.");
assert!(p.user.contains("SUN: Cancer") && p.user.contains("- personality:"));
assert_eq!(p.schema, schema(Kind::Natal));
assert!(user_template(Kind::Natal).contains("{chart data}"));
assert_eq!(split_version("v2-r12"), ("v2", Some(12)));
assert_eq!(split_version("v2"), ("v2", None));
assert!(Kind::ALL.iter().all(|k| Kind::parse(k.as_str()) == Some(*k)));
}
#[test]
fn validate_rejects_placeholder_titles() {
let schema = schema(Kind::Synastry);
let section = json!({"title": "Rák-szívek", "body": "Két bekezdés szöveg."});
let mut answer = json!({
"title": "Két Rák-szív", "summary": "Összefoglaló.", "advice": "Útravaló.",
"strengths": ["Egyik erősség.", "Másik erősség."], "challenges": ["Egy kihívás.", "Még egy."],
"sections": {"attraction": section, "communication": section, "emotional_bond": section,
"friction": section, "long_term": section},
});
assert_eq!(validate(&schema, &answer), Ok(()));
answer["sections"]["attraction"]["title"] = json!("x");
assert_eq!(validate(&schema, &answer), Err("$.sections.attraction.title: expected a non-empty string".into()));
}
#[test]
fn polish_turns_straight_quotes_hungarian() {
let mut v = json!({"a": "a \"hazai pálya\" és a \"sorok\"", "b": ["egy \" pár nélkül"], "c": {"d": "nincs"}});
polish("hu", &mut v);
assert_eq!(v["a"], "a „hazai pálya” és a „sorok”");
assert_eq!(v["b"][0], "egy \" pár nélkül");
assert_eq!(v["c"]["d"], "nincs");
let mut en = json!({"a": "the \"home\" ground"});
polish("en", &mut en);
assert_eq!(en["a"], "the \"home\" ground");
}
}
+4
View File
@@ -0,0 +1,4 @@
// Rebuild when a migration is added or changed (`sqlx::migrate!` embeds them).
fn main() {
println!("cargo:rerun-if-changed=migrations");
}
@@ -0,0 +1,28 @@
-- Text analyses written by the worker: retries with backoff, the model that
-- actually answered (e.g. behind 'openrouter/auto'), cost, a notification for
-- new requests, and at most one refund per analysis.
ALTER TABLE analyses
ADD COLUMN attempts integer NOT NULL DEFAULT 0,
ADD COLUMN next_attempt_at timestamptz NOT NULL DEFAULT now(),
ADD COLUMN model_used text,
ADD COLUMN cost_usd double precision;
COMMENT ON COLUMN analyses.content IS
'Structured result: {title, summary, sections: {key: {title, body}}, strengths: [], challenges: [], advice}';
DROP INDEX analyses_pending_idx;
CREATE INDEX analyses_due_idx ON analyses (next_attempt_at) WHERE status = 'pending';
CREATE UNIQUE INDEX credit_ledger_refund_once ON credit_ledger (analysis_id) WHERE reason = 'refund';
CREATE FUNCTION notify_analyses() RETURNS trigger LANGUAGE plpgsql AS $$
BEGIN
PERFORM pg_notify('analyses', '');
RETURN NULL;
END;
$$;
CREATE TRIGGER analyses_notify
AFTER INSERT ON analyses
FOR EACH STATEMENT EXECUTE FUNCTION notify_analyses();
+5
View File
@@ -0,0 +1,5 @@
-- Subscription tiers as roles: 'premium' and 'vip' unlock the models marked
-- for them in the backend's LLM_MODELS.
ALTER TABLE users DROP CONSTRAINT users_roles_valid;
ALTER TABLE users ADD CONSTRAINT users_roles_valid
CHECK (cardinality(roles) > 0 AND roles <@ ARRAY['admin', 'creator', 'premium', 'vip', 'user']::text[]);
@@ -0,0 +1,14 @@
-- Free short summaries: a few sentences about a natal chart, written by a
-- cheap model when the chart is saved. The detailed analyses stay paid.
ALTER TABLE analyses DROP CONSTRAINT analyses_kind_check;
ALTER TABLE analyses ADD CONSTRAINT analyses_kind_check CHECK (kind IN ('natal', 'synastry', 'summary'));
ALTER TABLE analyses DROP CONSTRAINT analyses_target;
ALTER TABLE analyses ADD CONSTRAINT analyses_target CHECK (
(kind IN ('natal', 'summary') AND chart_id IS NOT NULL AND synastry_id IS NULL)
OR (kind = 'synastry' AND synastry_id IS NOT NULL AND chart_id IS NULL)
);
COMMENT ON COLUMN analyses.content IS
'Structured result. natal/synastry: {title, summary, sections: {key: {title, body}}, strengths: [], challenges: [], advice}; summary: {title, summary}';
@@ -0,0 +1,14 @@
-- Paid analyses are counted per kind instead of generic credits: a
-- detailed natal analysis uses one 'natal' unit, a synastry analysis one
-- 'synastry' unit. Units are bought in packages (or granted by an admin).
-- The free monthly credits are gone: the free part is the short summary.
DELETE FROM credit_ledger WHERE reason = 'monthly_grant';
ALTER TABLE credit_ledger ADD COLUMN unit text NOT NULL DEFAULT 'natal' CHECK (unit IN ('natal', 'synastry'));
ALTER TABLE credit_ledger ALTER COLUMN unit DROP DEFAULT;
DROP INDEX credit_ledger_user_idx;
CREATE INDEX credit_ledger_user_idx ON credit_ledger (user_id, unit, created_at DESC);
COMMENT ON COLUMN analyses.credits_charged IS 'Units of the analysis kind spent on it (0 or 1; 0 for summaries and copies)';
@@ -0,0 +1,15 @@
-- Every time a user's own (primary) birth data is set or changed. The
-- backend limits changes with it: after the first save, three corrections
-- within an hour, then one per 24 hours (admins are not limited).
CREATE TABLE birth_data_changes (
id uuid PRIMARY KEY,
user_id uuid NOT NULL REFERENCES users (id) ON DELETE CASCADE,
chart_id uuid REFERENCES charts (id) ON DELETE SET NULL,
created_at timestamptz NOT NULL DEFAULT now()
);
CREATE INDEX birth_data_changes_user_idx ON birth_data_changes (user_id, created_at);
-- The current primary charts count as the first save.
INSERT INTO birth_data_changes (id, user_id, chart_id, created_at)
SELECT gen_random_uuid(), owner_id, id, created_at FROM charts WHERE is_primary;
+30
View File
@@ -0,0 +1,30 @@
-- Charts of other people ("persons": name and birth data, with their own
-- chart and analyses) next to the user's own chart.
--
-- kind 'own': the user's own chart, the current one (is_primary) and the
-- earlier ones replaced by a correction (kept for their analyses, not listed).
-- kind 'person': someone else. Each new person uses one 'person' unit of the
-- user's package (deleting does not give it back); unlimited packages and
-- admins have no limit.
ALTER TABLE charts ADD COLUMN kind text NOT NULL DEFAULT 'person' CHECK (kind IN ('own', 'person'));
UPDATE charts SET kind = 'own'
WHERE is_primary OR id IN (SELECT chart_id FROM birth_data_changes WHERE chart_id IS NOT NULL);
ALTER TABLE charts ADD CONSTRAINT charts_primary_is_own CHECK (NOT is_primary OR kind = 'own');
ALTER TABLE credit_ledger DROP CONSTRAINT credit_ledger_unit_check;
ALTER TABLE credit_ledger ADD CONSTRAINT credit_ledger_unit_check CHECK (unit IN ('natal', 'synastry', 'person'));
ALTER TABLE credit_ledger DROP CONSTRAINT credit_ledger_reason_check;
ALTER TABLE credit_ledger ADD CONSTRAINT credit_ledger_reason_check
CHECK (reason IN ('monthly_grant', 'analysis', 'chat', 'refund', 'admin_adjust', 'purchase', 'person'));
ALTER TABLE credit_ledger ADD COLUMN chart_id uuid REFERENCES charts (id) ON DELETE SET NULL;
-- Lasting rights from a package, e.g. any number of persons.
CREATE TABLE entitlements (
user_id uuid NOT NULL REFERENCES users (id) ON DELETE CASCADE,
entitlement text NOT NULL CHECK (entitlement IN ('unlimited_persons')),
note text,
created_by uuid REFERENCES users (id) ON DELETE SET NULL,
created_at timestamptz NOT NULL DEFAULT now(),
PRIMARY KEY (user_id, entitlement)
);
@@ -0,0 +1,14 @@
-- Admin-edited system prompts of the analyses. The newest row of a
-- (kind, language) is in force; system NULL means the built-in default.
-- An analysis records the revision it was written with in prompt_version
-- ("v2-r<id>"), so the worker uses exactly that text.
CREATE TABLE prompt_revisions (
id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
kind text NOT NULL CHECK (kind IN ('summary', 'natal', 'synastry')),
language text NOT NULL,
system text CHECK (system IS NULL OR length(system) BETWEEN 1 AND 50000),
created_by uuid REFERENCES users ON DELETE SET NULL,
created_at timestamptz NOT NULL DEFAULT now()
);
CREATE INDEX prompt_revisions_current ON prompt_revisions (kind, language, id DESC);
@@ -0,0 +1,29 @@
-- Test runs of an edited (not yet saved) system prompt on one of the admin's
-- charts. Kept apart from analyses: never shown to users, never cached, no
-- credits, one attempt. Removed after 30 days by the cleanup job.
CREATE TABLE prompt_previews (
id uuid PRIMARY KEY,
kind text NOT NULL CHECK (kind IN ('summary', 'natal')),
chart_id uuid NOT NULL REFERENCES charts ON DELETE CASCADE,
language text NOT NULL,
model text NOT NULL,
system text NOT NULL CHECK (length(system) BETWEEN 1 AND 50000),
status text NOT NULL DEFAULT 'pending' CHECK (status IN ('pending', 'running', 'done', 'failed')),
content jsonb,
error text,
model_used text,
input_tokens integer,
output_tokens integer,
cost_usd double precision,
created_by uuid NOT NULL REFERENCES users ON DELETE CASCADE,
created_at timestamptz NOT NULL DEFAULT now(),
started_at timestamptz,
completed_at timestamptz
);
CREATE INDEX prompt_previews_pending_idx ON prompt_previews (created_at) WHERE status = 'pending';
-- Wakes the analysis worker, like a new analysis.
CREATE TRIGGER prompt_previews_notify
AFTER INSERT ON prompt_previews
FOR EACH STATEMENT EXECUTE FUNCTION notify_analyses();
@@ -0,0 +1,10 @@
-- Prompt test runs of the relationship (synastry) analysis: on one of the
-- admin's comparisons instead of a chart.
ALTER TABLE prompt_previews DROP CONSTRAINT prompt_previews_kind_check;
ALTER TABLE prompt_previews ALTER COLUMN chart_id DROP NOT NULL;
ALTER TABLE prompt_previews
ADD COLUMN synastry_id uuid REFERENCES synastries ON DELETE CASCADE,
ADD CONSTRAINT prompt_previews_target CHECK (
(kind IN ('summary', 'natal') AND chart_id IS NOT NULL AND synastry_id IS NULL)
OR (kind = 'synastry' AND synastry_id IS NOT NULL AND chart_id IS NULL)
);
+26
View File
@@ -0,0 +1,26 @@
-- Packages: every purchase or admin grant of a package is an order; the units
-- it gives are credit_ledger rows pointing at it (reason 'package'), and the
-- unlimited package is a time-limited 'unlimited' entitlement.
CREATE TABLE package_orders (
id uuid PRIMARY KEY,
user_id uuid NOT NULL REFERENCES users ON DELETE CASCADE,
package text NOT NULL,
source text NOT NULL CHECK (source IN ('admin', 'mock', 'stripe')),
price_huf integer NOT NULL DEFAULT 0 CHECK (price_huf >= 0),
note text,
created_by uuid REFERENCES users ON DELETE SET NULL,
created_at timestamptz NOT NULL DEFAULT now()
);
CREATE INDEX package_orders_user_idx ON package_orders (user_id, created_at DESC);
ALTER TABLE credit_ledger DROP CONSTRAINT credit_ledger_reason_check;
ALTER TABLE credit_ledger ADD CONSTRAINT credit_ledger_reason_check
CHECK (reason IN ('monthly_grant', 'analysis', 'chat', 'refund', 'admin_adjust', 'purchase', 'person', 'package'));
ALTER TABLE credit_ledger ADD COLUMN order_id uuid REFERENCES package_orders ON DELETE SET NULL;
-- 'unlimited': analyses and persons without limit until expires_at.
ALTER TABLE entitlements DROP CONSTRAINT entitlements_entitlement_check;
ALTER TABLE entitlements ADD CONSTRAINT entitlements_entitlement_check
CHECK (entitlement IN ('unlimited_persons', 'unlimited'));
ALTER TABLE entitlements ADD COLUMN expires_at timestamptz;
+43
View File
@@ -0,0 +1,43 @@
-- Invitations to the closed site. While SIGNUP_MODE=invite, a new account
-- (Google or password) needs an open invitation for its address, or the
-- invitation link itself (then any address will do).
CREATE TABLE invitations (
id uuid PRIMARY KEY,
email text NOT NULL,
message text CHECK (char_length(message) <= 300),
locale text NOT NULL,
invited_by uuid REFERENCES users (id) ON DELETE SET NULL,
created_at timestamptz NOT NULL DEFAULT now(),
expires_at timestamptz NOT NULL,
sent_count integer NOT NULL DEFAULT 1,
last_sent_at timestamptz NOT NULL DEFAULT now(),
accepted_at timestamptz,
accepted_by uuid REFERENCES users (id) ON DELETE SET NULL,
revoked_at timestamptz
);
-- At most one open invitation per address.
CREATE UNIQUE INDEX invitations_open_email_idx ON invitations (email)
WHERE accepted_at IS NULL AND revoked_at IS NULL;
CREATE INDEX invitations_created_idx ON invitations (created_at DESC);
-- Link tokens (only their hashes). Every sending issues a new one, and the
-- earlier links keep working while the invitation is open.
CREATE TABLE invitation_tokens (
token_hash bytea PRIMARY KEY,
invitation_id uuid NOT NULL REFERENCES invitations (id) ON DELETE CASCADE,
created_at timestamptz NOT NULL DEFAULT now()
);
CREATE INDEX invitation_tokens_invitation_idx ON invitation_tokens (invitation_id);
-- Addresses that asked for no more invitations (only the SHA-256 of the address).
CREATE TABLE email_optouts (
email_hash bytea PRIMARY KEY,
created_at timestamptz NOT NULL DEFAULT now()
);
-- "Tell me when it opens": people without an invitation.
CREATE TABLE waitlist (
email text PRIMARY KEY,
locale text NOT NULL,
created_at timestamptz NOT NULL DEFAULT now()
);
+22 -1
View File
@@ -17,6 +17,15 @@ pub use sqlx;
/// All schema migrations, embedded at compile time.
pub static MIGRATOR: sqlx::migrate::Migrator = sqlx::migrate!("./migrations");
/// Applies the pending migrations. Migrations newer than this binary (applied
/// by an already updated service) are tolerated, so services can be rebuilt
/// one at a time.
pub async fn migrate(pool: &PgPool) -> Result<(), sqlx::migrate::MigrateError> {
let mut migrator = sqlx::migrate!("./migrations");
migrator.set_ignore_missing(true);
migrator.run(pool).await
}
pub async fn connect(url: &str) -> Result<PgPool, sqlx::Error> {
PgPoolOptions::new().max_connections(20).acquire_timeout(Duration::from_secs(5)).connect(url).await
}
@@ -27,16 +36,22 @@ pub enum Role {
Admin,
/// May write articles (phase 2).
Creator,
/// Paid tier: may use the models marked `@premium`.
Premium,
/// Top tier: may use the `@vip` and `@premium` models.
Vip,
User,
}
impl Role {
pub const ALL: [Role; 3] = [Role::Admin, Role::Creator, Role::User];
pub const ALL: [Role; 5] = [Role::Admin, Role::Creator, Role::Premium, Role::Vip, Role::User];
pub fn as_str(self) -> &'static str {
match self {
Role::Admin => "admin",
Role::Creator => "creator",
Role::Premium => "premium",
Role::Vip => "vip",
Role::User => "user",
}
}
@@ -63,6 +78,12 @@ impl User {
self.roles.iter().any(|r| r == role.as_str())
}
/// Whether the user may use something that needs `role`: admins may use
/// everything, and the VIP tier includes the premium one.
pub fn has_access(&self, role: Role) -> bool {
self.has_role(role) || self.has_role(Role::Admin) || (role == Role::Premium && self.has_role(Role::Vip))
}
pub fn role_list(&self) -> Vec<Role> {
self.roles.iter().filter_map(|r| Role::parse(r)).collect()
}
+10
View File
@@ -0,0 +1,10 @@
[package]
name = "email-templates"
description = "E-mail texts of Sorsfonalak as HTML and plain text (sent by the worker, previewed by the backend)"
edition.workspace = true
version.workspace = true
license.workspace = true
publish.workspace = true
[dependencies]
serde_json.workspace = true
+482
View File
@@ -0,0 +1,482 @@
//! E-mail texts (Hungarian and English), as plain text and HTML.
//!
//! The payloads are written by the backend; the validity periods in the
//! texts match the token lifetimes there. The worker sends the result, the
//! backend renders it for the admin preview.
//!
//! The layout is deliberately plain for spam filters: one column, inline
//! styles, no images, no tracking, every link on the site's own domain, and
//! a plain-text part with the same content.
use serde_json::Value;
#[derive(Debug, Clone, PartialEq)]
pub struct Rendered {
pub subject: String,
pub text: String,
pub html: String,
/// One-click unsubscribe address for the `List-Unsubscribe` header (RFC 8058).
pub unsubscribe_post_url: Option<String>,
}
#[derive(Debug, PartialEq)]
pub enum TemplateError {
UnknownTemplate(String),
MissingField(&'static str),
}
impl std::fmt::Display for TemplateError {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
TemplateError::UnknownTemplate(t) => write!(f, "unknown e-mail template '{t}'"),
TemplateError::MissingField(field) => write!(f, "e-mail payload has no '{field}'"),
}
}
}
#[derive(Clone, Copy, PartialEq)]
enum Lang {
Hu,
En,
}
/// One e-mail: greeting, paragraphs, a button and a closing note.
struct Content {
subject: String,
/// The line mail clients show after the subject in the inbox.
preheader: Option<String>,
greeting: String,
intro: String,
/// A personal message, shown as a quote.
quote: Option<String>,
/// A short list after the intro, with its heading.
points: Option<(&'static str, Vec<&'static str>)>,
button: &'static str,
url: String,
note: String,
/// Why the recipient got this e-mail (for mails they did not ask for).
reason: Option<String>,
/// Label and page of the unsubscribe link in the footer.
unsubscribe: Option<(&'static str, String)>,
unsubscribe_post_url: Option<String>,
}
impl Content {
fn simple(subject: String, greeting: String, intro: String, button: &'static str, url: String, note: &str) -> Self {
Self {
subject,
preheader: None,
greeting,
intro,
quote: None,
points: None,
button,
url,
note: note.to_owned(),
reason: None,
unsubscribe: None,
unsubscribe_post_url: None,
}
}
}
pub fn render(template: &str, locale: &str, payload: &Value) -> Result<Rendered, TemplateError> {
let lang = if locale.eq_ignore_ascii_case("hu") { Lang::Hu } else { Lang::En };
let url = field(payload, "url")?;
let greeting = |name: Option<String>| match (lang, name) {
(Lang::Hu, Some(n)) => format!("Szia {n}!"),
(Lang::Hu, None) => "Szia!".to_owned(),
(Lang::En, Some(n)) => format!("Hi {n},"),
(Lang::En, None) => "Hi,".to_owned(),
};
let content = match (template, lang) {
("verify_email", Lang::Hu) => Content::simple(
"Erősítsd meg az e-mail-címed".into(),
greeting(name(payload, "display_name")),
"Köszönjük, hogy regisztráltál a Sorsfonalakon! Az alábbi gombbal erősítsd meg az e-mail-címed.".into(),
"E-mail-cím megerősítése",
url,
"A link 3 napig érvényes. Ha nem te regisztráltál, nyugodtan hagyd figyelmen kívül ezt a levelet.",
),
("verify_email", Lang::En) => Content::simple(
"Confirm your e-mail address".into(),
greeting(name(payload, "display_name")),
"Thanks for signing up for Sorsfonalak! Please confirm your e-mail address with the button below.".into(),
"Confirm e-mail address",
url,
"The link is valid for 3 days. If you did not sign up, you can safely ignore this e-mail.",
),
("reset_password", Lang::Hu) => Content::simple(
"Új jelszó megadása".into(),
greeting(name(payload, "display_name")),
"Jelszó-visszaállítást kértél a Sorsfonalak-fiókodhoz. Az alábbi gombbal adhatsz meg új jelszót.".into(),
"Új jelszó megadása",
url,
"A link 1 óráig érvényes, és csak egyszer használható. Ha nem te kérted, hagyd figyelmen kívül ezt a levelet: a jelszavad nem változik.",
),
("reset_password", Lang::En) => Content::simple(
"Set a new password".into(),
greeting(name(payload, "display_name")),
"You asked to reset the password of your Sorsfonalak account. Use the button below to set a new one."
.into(),
"Set a new password",
url,
"The link is valid for 1 hour and can be used once. If you did not ask for this, ignore this e-mail: your password stays the same.",
),
("invite_accepted", Lang::Hu) => {
let who = name(payload, "invitee_name");
Content::simple(
match &who {
Some(n) => format!("{n} elfogadta a meghívásod"),
None => "Elfogadták a meghívásod".into(),
},
greeting(None),
format!(
"{} elfogadta a „Mennyire illünk össze?” meghívásod, és elkészült a szinasztriátok.",
who.as_deref().unwrap_or("A meghívott")
),
"Szinasztria megnyitása",
url,
"A szinasztriát mindketten látjátok, de egymás születési adatait nem.",
)
}
("invite_accepted", Lang::En) => {
let who = name(payload, "invitee_name");
Content::simple(
match &who {
Some(n) => format!("{n} accepted your invitation"),
None => "Your invitation was accepted".into(),
},
greeting(None),
format!(
"{} accepted your “How compatible are we?” invitation, and your synastry is ready.",
who.as_deref().unwrap_or("Your invitee")
),
"Open synastry",
url,
"You both see the synastry, but not each other's birth data.",
)
}
("invitation", _) => invitation(lang, payload, url)?,
_ => return Err(TemplateError::UnknownTemplate(template.to_owned())),
};
Ok(content.render(lang))
}
/// An invitation to the closed site (sent by an administrator).
fn invitation(lang: Lang, payload: &Value, url: String) -> Result<Content, TemplateError> {
let inviter = name(payload, "inviter_name");
let message = message(payload);
let until =
payload["expires_on"].as_str().and_then(|d| date(lang, d)).ok_or(TemplateError::MissingField("expires_on"))?;
// "2026. december 17." + "-ig" = "2026. december 17-ig"
let until_hu = until.trim_end_matches('.');
let unsubscribe_url = field(payload, "unsubscribe_url")?;
let unsubscribe_post_url = field(payload, "unsubscribe_post_url")?;
Ok(match lang {
Lang::Hu => Content {
subject: match &inviter {
Some(n) => format!("{n} meghívott a Sorsfonalakra"),
None => "Meghívót kaptál a Sorsfonalakra".into(),
},
preheader: Some(format!("Születési képlet és rövid elemzés ingyen. A meghívó {until_hu}-ig érvényes.")),
greeting: "Szia!".into(),
intro: match &inviter {
Some(n) => {
format!("{n} meghívott a Sorsfonalakra. Az oldal egyelőre zártkörű: csak meghívóval lehet belépni.")
}
None => {
"Meghívót kaptál a Sorsfonalakra. Az oldal egyelőre zártkörű: csak meghívóval lehet belépni.".into()
}
},
quote: message,
points: Some((
"Mit találsz ott?",
vec![
"a születési képleted kiszámolva és megrajzolva, ingyen,",
"egy rövid, személyre szóló elemzést róla,",
"összevetést a szeretteiddel: mennyire illetek össze.",
],
)),
button: "Meghívás elfogadása",
url,
note: format!(
"A meghívó {until_hu}-ig érvényes. Elfogadáskor Google-fiókkal lépsz be, és ezzel a linkkel bármelyik Google-fiókodat használhatod."
),
reason: Some(match &inviter {
Some(n) => {
format!("Ezt a levelet azért kaptad, mert {n} megadta az e-mail-címed a Sorsfonalak meghívójában.")
}
None => {
"Ezt a levelet azért kaptad, mert valaki megadta az e-mail-címed a Sorsfonalak meghívójában.".into()
}
}),
unsubscribe: Some(("Nem kérek több meghívót", unsubscribe_url)),
unsubscribe_post_url: Some(unsubscribe_post_url),
},
Lang::En => Content {
subject: match &inviter {
Some(n) => format!("{n} invited you to Sorsfonalak"),
None => "You are invited to Sorsfonalak".into(),
},
preheader: Some(format!(
"Your birth chart and a short reading, free. The invitation is valid until {until}."
)),
greeting: "Hi,".into(),
intro: match &inviter {
Some(n) => format!("{n} invited you to Sorsfonalak. The site is invitation-only for now."),
None => "You are invited to Sorsfonalak. The site is invitation-only for now.".into(),
},
quote: message,
points: Some((
"What you will find there:",
vec![
"your birth chart, calculated and drawn, for free,",
"a short, personal reading of it,",
"comparisons with your loved ones: how well you match.",
],
)),
button: "Accept the invitation",
url,
note: format!(
"The invitation is valid until {until}. You sign in with Google, and with this link any of your Google accounts will do."
),
reason: Some(match &inviter {
Some(n) => format!("You got this e-mail because {n} entered your address in a Sorsfonalak invitation."),
None => "You got this e-mail because someone entered your address in a Sorsfonalak invitation.".into(),
}),
unsubscribe: Some(("No more invitations, please", unsubscribe_url)),
unsubscribe_post_url: Some(unsubscribe_post_url),
},
})
}
fn field(payload: &Value, name: &'static str) -> Result<String, TemplateError> {
payload[name].as_str().filter(|u| !u.is_empty()).map(str::to_owned).ok_or(TemplateError::MissingField(name))
}
/// A user-supplied name, safe for a subject line.
fn name(payload: &Value, field: &str) -> Option<String> {
let name: String = payload[field].as_str()?.chars().filter(|c| !c.is_control()).take(60).collect();
let name = name.trim();
(!name.is_empty()).then(|| name.to_owned())
}
/// The personal message of an invitation: line breaks kept, other control characters dropped.
fn message(payload: &Value) -> Option<String> {
let text: String =
payload["message"].as_str()?.chars().filter(|c| *c == '\n' || !c.is_control()).take(500).collect();
let text = text.trim();
(!text.is_empty()).then(|| text.to_owned())
}
/// `2026-12-17` as "2026. december 17." or "17 December 2026".
fn date(lang: Lang, iso: &str) -> Option<String> {
const HU: [&str; 12] = [
"január",
"február",
"március",
"április",
"május",
"június",
"július",
"augusztus",
"szeptember",
"október",
"november",
"december",
];
const EN: [&str; 12] = [
"January",
"February",
"March",
"April",
"May",
"June",
"July",
"August",
"September",
"October",
"November",
"December",
];
let mut parts = iso.splitn(3, '-');
let (y, m, d) = (parts.next()?, parts.next()?, parts.next()?);
let (y, m, d): (u32, usize, u32) = (y.parse().ok()?, m.parse().ok()?, d.get(..2)?.parse().ok()?);
let month = m.checked_sub(1).filter(|&i| i < 12)?;
Some(match lang {
Lang::Hu => format!("{y}. {} {d}.", HU[month]),
Lang::En => format!("{d} {} {y}", EN[month]),
})
}
fn escape(s: &str) -> String {
let mut out = String::with_capacity(s.len());
for c in s.chars() {
match c {
'&' => out.push_str("&amp;"),
'<' => out.push_str("&lt;"),
'>' => out.push_str("&gt;"),
'"' => out.push_str("&quot;"),
'\'' => out.push_str("&#39;"),
_ => out.push(c),
}
}
out
}
const TEXT: &str = "#2a2620";
const MUTED: &str = "#6b645a";
const FAINT: &str = "#9b948a";
const GOLD: &str = "#9a7b3c";
impl Content {
fn render(self, lang: Lang) -> Rendered {
let footer = match lang {
Lang::Hu => "Ezt a levelet a Sorsfonalak küldte.",
Lang::En => "This e-mail was sent by Sorsfonalak.",
};
let mut text = format!("{}\n\n{}\n\n", self.greeting, self.intro);
if let Some(q) = &self.quote {
for line in q.lines() {
text.push_str(&format!("> {line}\n"));
}
text.push('\n');
}
if let Some((heading, items)) = &self.points {
text.push_str(heading);
text.push('\n');
for item in items {
text.push_str(&format!("- {item}\n"));
}
text.push('\n');
}
text.push_str(&format!("{}:\n{}\n\n{}\n\n-- \nSorsfonalak\n", self.button, self.url, self.note));
if let Some(reason) = &self.reason {
text.push_str(&format!("\n{reason}\n"));
}
if let Some((label, url)) = &self.unsubscribe {
text.push_str(&format!("{label}: {url}\n"));
}
let preheader = self.preheader.as_deref().map_or(String::new(), |p| {
format!(
r#"<div style="display:none;max-height:0;overflow:hidden;opacity:0;color:transparent">{}</div>"#,
escape(p)
)
});
let quote = self.quote.as_deref().map_or(String::new(), |q| {
format!(
r#"<tr><td style="padding-bottom:24px"><div style="border-left:3px solid {GOLD};padding:4px 0 4px 16px;font-size:16px;line-height:1.6;font-style:italic;color:{TEXT}">{}</div></td></tr>
"#,
escape(q).replace('\n', "<br>")
)
});
let points = self.points.as_ref().map_or(String::new(), |(heading, items)| {
let items: String = items
.iter()
.map(|i| format!(r#"<li style="margin:0 0 6px">{}</li>"#, escape(i)))
.collect();
format!(
r#"<tr><td style="font-size:16px;line-height:1.6;padding-bottom:24px">{}<ul style="margin:8px 0 0;padding-left:20px">{items}</ul></td></tr>
"#,
escape(heading)
)
});
let mut small = Vec::new();
if let Some(reason) = &self.reason {
small.push(escape(reason));
}
if let Some((label, url)) = &self.unsubscribe {
small.push(format!(r#"<a href="{}" style="color:{FAINT}">{}</a>"#, escape(url), escape(label)));
}
small.push(escape(footer));
let small = small.join("<br>");
let html = format!(
r#"<!doctype html>
<html lang="{lang}">
<head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><title>{subject}</title></head>
<body style="margin:0;padding:0;background:#f4f1ea;font-family:Georgia,'Times New Roman',serif;color:{TEXT}">
{preheader}<table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="background:#f4f1ea;padding:32px 16px">
<tr><td align="center">
<table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="max-width:520px;background:#ffffff;border-radius:8px;padding:32px">
<tr><td style="font-size:20px;letter-spacing:2px;color:{GOLD};padding-bottom:24px">SORSFONALAK</td></tr>
<tr><td style="font-size:16px;line-height:1.6;padding-bottom:12px">{greeting}</td></tr>
<tr><td style="font-size:16px;line-height:1.6;padding-bottom:24px">{intro}</td></tr>
{quote}{points}<tr><td style="padding-bottom:24px"><a href="{url}" style="display:inline-block;background:{GOLD};color:#ffffff;text-decoration:none;padding:12px 24px;border-radius:6px;font-size:16px">{button}</a></td></tr>
<tr><td style="font-size:14px;line-height:1.6;color:{MUTED};padding-bottom:16px">{note}</td></tr>
<tr><td style="font-size:12px;line-height:1.5;color:{FAINT};word-break:break-all">{url_text}</td></tr>
</table>
<p style="font-size:12px;line-height:1.5;color:{FAINT};max-width:520px">{small}</p>
</td></tr>
</table>
</body>
</html>
"#,
lang = if lang == Lang::Hu { "hu" } else { "en" },
subject = escape(&self.subject),
greeting = escape(&self.greeting),
intro = escape(&self.intro),
url = escape(&self.url),
button = escape(self.button),
note = escape(&self.note),
url_text = escape(&self.url),
);
Rendered { subject: self.subject, text, html, unsubscribe_post_url: self.unsubscribe_post_url }
}
}
#[cfg(test)]
mod tests {
use serde_json::json;
use super::*;
fn invitation_payload() -> Value {
json!({
"url": "https://sorsfonalak.test/meghivo/abc",
"inviter_name": "Kata",
"message": "Gyere, nézd meg!\n<b>Szia</b>",
"expires_on": "2026-12-17",
"unsubscribe_url": "https://sorsfonalak.test/leiratkozas?token=abc",
"unsubscribe_post_url": "https://sorsfonalak.test/api/v1/public/invitations/unsubscribe?token=abc",
})
}
#[test]
fn invitation_has_both_parts() {
let hu = render("invitation", "hu", &invitation_payload()).unwrap();
assert_eq!(hu.subject, "Kata meghívott a Sorsfonalakra");
assert!(hu.text.contains("> Gyere, nézd meg!\n> <b>Szia</b>"));
assert!(hu.text.contains("A meghívó 2026. december 17-ig érvényes."));
assert!(hu.text.contains("Nem kérek több meghívót: https://sorsfonalak.test/leiratkozas?token=abc"));
assert!(hu.html.contains("Gyere, nézd meg!<br>&lt;b&gt;Szia&lt;/b&gt;"));
assert!(hu.html.contains(r#"href="https://sorsfonalak.test/meghivo/abc""#));
assert!(hu.html.contains("display:none"));
assert_eq!(
hu.unsubscribe_post_url.as_deref(),
Some("https://sorsfonalak.test/api/v1/public/invitations/unsubscribe?token=abc")
);
let mut anonymous = invitation_payload();
anonymous["inviter_name"] = Value::Null;
anonymous["message"] = Value::Null;
let en = render("invitation", "en", &anonymous).unwrap();
assert_eq!(en.subject, "You are invited to Sorsfonalak");
assert!(en.text.contains("valid until 17 December 2026") && !en.text.contains("> "));
assert!(!en.html.contains("border-left"));
let mut broken = invitation_payload();
broken["unsubscribe_url"] = Value::Null;
assert_eq!(render("invitation", "hu", &broken), Err(TemplateError::MissingField("unsubscribe_url")));
}
#[test]
fn dates() {
assert_eq!(date(Lang::Hu, "2027-01-05").as_deref(), Some("2027. január 5."));
assert_eq!(date(Lang::En, "2027-01-05T10:00:00Z").as_deref(), Some("5 January 2027"));
assert_eq!(date(Lang::Hu, "2027-13-05"), None);
}
}
+22
View File
@@ -0,0 +1,22 @@
# Copy to /opt/sorsfonalak/.env on the server and fill in.
# Public domain (Caddy gets the certificate for it and www.<domain>)
DOMAIN=sorsfonalak.hu
# Long random string: openssl rand -hex 24
POSTGRES_PASSWORD=
# Google OAuth client ID(s), comma-separated
GOOGLE_CLIENT_IDS=
# These accounts become admins at their first login
BOOTSTRAP_ADMIN_EMAILS=
# Outgoing mail: Amazon SES (docs/levelkuldes.md). The credentials go to .env.secrets:
# SES_SMTP_USERNAME + SES_SMTP_PASSWORD, or AWS_ACCESS_KEY_ID + AWS_SECRET_ACCESS_KEY.
SES_REGION=eu-central-1
MAIL_FROM=Sorsfonalak <hello@sorsfonalak.hu>
# invite: new accounts need an invitation (default); open: anyone can sign up
SIGNUP_MODE=invite
# Image version; every deployment rewrites it
TAG=latest
+22
View File
@@ -0,0 +1,22 @@
# Behind the Cloudflare proxy. The certificate comes from Let's Encrypt
# (HTTP-01 challenge through Cloudflare), so "Always Use HTTPS" must stay off
# in Cloudflare; Caddy does the redirect itself. SSL mode: Full (strict).
{
servers {
# Cloudflare ranges (https://www.cloudflare.com/ips): the visitor's
# address is taken from CF-Connecting-IP and passed on in X-Forwarded-For.
trusted_proxies static 173.245.48.0/20 103.21.244.0/22 103.22.200.0/22 103.31.4.0/22 141.101.64.0/18 108.162.192.0/18 190.93.240.0/20 188.114.96.0/20 197.234.240.0/22 198.41.128.0/17 162.158.0.0/15 104.16.0.0/13 104.24.0.0/14 172.64.0.0/13 131.0.72.0/22 2400:cb00::/32 2606:4700::/32 2803:f800::/32 2405:b500::/32 2405:8100::/32 2a06:98c0::/29 2c0f:f248::/32
client_ip_headers CF-Connecting-IP
}
}
{$DOMAIN} {
# No basic auth any more: the site is open, and new accounts need an
# invitation (SIGNUP_MODE=invite in the backend).
encode zstd gzip
reverse_proxy frontend:3000
}
www.{$DOMAIN} {
redir https://{$DOMAIN}{uri} permanent
}
+88
View File
@@ -0,0 +1,88 @@
# Build és telepítés
A `.gitea/workflows/ci.yml` (Gitea Actions) két ágra fut:
- **main**: tesztek, majd image-build. Címkék: a commit hash első 12 karaktere és `main`.
- **prod**: ugyanez, majd telepítés a szerverre. Címkék: hash, `prod` és `latest`. Élesíteni tehát úgy kell, hogy a main-t a prod-ba mergeled (vagy pusholod).
A lépések:
1. **test**: `cargo test` a backendre, a workerre, a db-re, a horoscope-clientre és a service-kitre, egy Postgres szolgáltatás-konténerrel.
2. **build**: megépíti a négy image-et, és feltölti őket a `registry.sagifer.com/sagifer/sorsfonalak-<szolgáltatás>` címre. A frontend buildje a TypeScript-típusokat is ellenőrzi. Egy main-en már megépült commit a cache-ből pár mp alatt újraépül.
3. **deploy** (csak prod): felmásolja a `docker-compose.yml`-t és a `Caddyfile`-t a szerverre, beírja az új `TAG`-et a szerveren lévő `.env`-be, majd `docker compose pull && up -d`. Az adatbázis-migrációk a backend indulásakor futnak le.
4. **release** (csak prod, a deploy után): létrehoz egy `v<év.hónap.nap>-<hash>` taget és Gitea-release-t az előző release óta bekerült commitok listájával (repó → Releases).
Kézzel is indítható a repó Actions oldaláról (workflow_dispatch).
## Runner (dev szerver)
A runner a `ci/runner` mappában van. A jobokat a gép Dockerén indítja, így az image-buildek a meglévő BuildKit cache-t használják. A tesztek cargo-cache-e a `sorsfonalak-ci-*` kötetekben marad meg.
1. Regisztrációs token: Gitea → repó → Beállítások → Actions → Runners → *Create new runner*.
2. Indítás:
```sh
cd ci/runner
GITEA_RUNNER_REGISTRATION_TOKEN=<token> docker compose up -d
```
A regisztráció a `runner-data` kötetbe kerül. A későbbi indításokhoz már nem kell token.
A jobok elérik a gép Docker-socketjét, ez root-jogot jelent a dev szerveren. A workflow csak a repóba pusholt commitokra fut, forkból érkező pull requestekre nem.
## Repó-beállítások
Gitea → repó → Beállítások → Actions:
| Név | Fajta | Érték |
|---|---|---|
| `REGISTRY_TOKEN` | secret | a `sagifer` fiók access tokenje, `write:package` jogosultsággal |
| `DEPLOY_SSH_KEY` | secret | a szerveren lévő deploy felhasználó privát kulcsa |
| `DEPLOY_HOST` | variable | `deploy@<szerver IP>` |
| `DEPLOY_KNOWN_HOSTS` | variable | az `ssh-keyscan <szerver IP>` kimenete |
| `DEPLOY_PATH` | variable | nem kötelező, alapértéke `/opt/sorsfonalak` |
## Szerver (egyszeri beállítás)
Egy friss Ubuntu dropleten, rootként:
```sh
# Docker
curl -fsSL https://get.docker.com | sh
# 2 GB swap a 2 GB RAM mellé
fallocate -l 2G /swapfile && chmod 600 /swapfile && mkswap /swapfile && swapon /swapfile
echo '/swapfile none swap sw 0 0' >> /etc/fstab
# deploy felhasználó, aki dockert futtathat
adduser --disabled-password --gecos '' deploy && usermod -aG docker deploy
mkdir -p /home/deploy/.ssh && echo '<publikus kulcs>' > /home/deploy/.ssh/authorized_keys
chown -R deploy: /home/deploy/.ssh && chmod 700 /home/deploy/.ssh && chmod 600 /home/deploy/.ssh/authorized_keys
mkdir -p /opt/sorsfonalak && chown deploy: /opt/sorsfonalak
# tűzfal: SSH bárhonnan, HTTP/HTTPS csak a Cloudflare felől
ufw allow OpenSSH
for net in $(curl -s https://www.cloudflare.com/ips-v4) $(curl -s https://www.cloudflare.com/ips-v6); do
ufw allow from "$net" to any port 80,443 proto tcp
done
ufw enable
```
A Docker által kinyitott portokat az ufw magától nem szűri, ezért a 80-as és a 443-as portot a DigitalOcean Cloud Firewall-ban is érdemes a Cloudflare tartományaira korlátozni: Networking → Firewalls, Inbound: SSH, és HTTP/HTTPS a Cloudflare IP-listával.
`deploy` felhasználóként, a `/opt/sorsfonalak` mappában:
- `.env`: az itteni `.env.example` kitöltve.
- `.env.secrets`: `OPENROUTER_API_KEY=...`.
- `docker login registry.sagifer.com` egy `read:package` jogú tokennel. Amíg a `sagifer` fiók nyilvános, erre nincs szükség.
### Cloudflare (sorsfonalak.hu)
- DNS: `A sorsfonalak.hu → 165.22.194.5` és `CNAME www → sorsfonalak.hu`, mindkettő proxyzva (narancs felhő).
- SSL/TLS mód: **Full (strict)**.
- **Always Use HTTPS: ki.** A Let's Encrypt a Cloudflare-en át, sima HTTP-n ellenőrzi a domaint, a tanúsítvány megújításakor is. A HTTP→HTTPS átirányítást a Caddy maga végzi.
- A Caddy a Cloudflare címtartományaiban megbízik, ezért a naplókban és a backendnél a látogató valódi IP-címe látszik (`CF-Connecting-IP`).
A Google OAuth kliensnél a `https://sorsfonalak.hu` címet fel kell venni az engedélyezett JavaScript-források közé.
## Üzemeltetés
- Naplók: `docker compose logs -f backend worker`
- Visszaállás korábbi verzióra: `.env`-ben `TAG=<régebbi hash>`, utána `docker compose up -d`
- Mentés: naponta egy `pg_dump` a `/opt/sorsfonalak/backups` mappába, 14 napig megmarad. A mentéseket érdemes a szerverről is elvinni (DigitalOcean backup, vagy `rsync` otthonra).
- Visszatöltés: `gunzip -c backups/sorsfonalak-<dátum>.sql.gz | docker compose exec -T postgres psql -U sorsfonalak sorsfonalak`
+140
View File
@@ -0,0 +1,140 @@
# Production stack on the server (copied there by the CI deploy job).
#
# Needs next to it: .env (see .env.example) and .env.secrets
# (OPENROUTER_API_KEY). TAG in .env is set by every deployment.
x-logging: &logging
driver: json-file
options:
max-size: "10m"
max-file: "3"
services:
caddy:
image: caddy:2.11.9-alpine
ports:
- "80:80"
- "443:443"
- "443:443/udp"
environment:
DOMAIN: ${DOMAIN:?set DOMAIN in .env}
volumes:
- ./Caddyfile:/etc/caddy/Caddyfile:ro
- caddy-data:/data
- caddy-config:/config
depends_on:
- frontend
logging: *logging
restart: unless-stopped
horoscope-api:
image: ${REGISTRY_PREFIX:-registry.sagifer.com/sagifer/sorsfonalak}-horoscope-api:${TAG:-latest}
read_only: true
logging: *logging
restart: unless-stopped
postgres:
image: postgres:18-alpine
environment:
POSTGRES_USER: sorsfonalak
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?set POSTGRES_PASSWORD in .env}
POSTGRES_DB: sorsfonalak
volumes:
- pgdata:/var/lib/postgresql
healthcheck:
test: ["CMD-SHELL", "pg_isready -U sorsfonalak -d sorsfonalak"]
interval: 5s
timeout: 3s
retries: 10
logging: *logging
restart: unless-stopped
# Daily compressed dump into ./backups, kept for 14 days.
backup:
image: postgres:18-alpine
environment:
PGHOST: postgres
PGUSER: sorsfonalak
PGPASSWORD: ${POSTGRES_PASSWORD}
PGDATABASE: sorsfonalak
volumes:
- ./backups:/backups
entrypoint: ["/bin/sh", "-c"]
command:
- |
while true; do
f=/backups/sorsfonalak-$$(date +%F).sql.gz
pg_dump --no-owner | gzip > "$$f.tmp" && mv "$$f.tmp" "$$f"
find /backups -name 'sorsfonalak-*.sql.gz' -mtime +14 -delete
sleep 86400
done
depends_on:
postgres:
condition: service_healthy
logging: *logging
restart: unless-stopped
backend:
image: ${REGISTRY_PREFIX:-registry.sagifer.com/sagifer/sorsfonalak}-backend:${TAG:-latest}
environment:
DATABASE_URL: postgres://sorsfonalak:${POSTGRES_PASSWORD}@postgres:5432/sorsfonalak
HOROSCOPE_API_URL: http://horoscope-api:8080
PUBLIC_BASE_URL: https://${DOMAIN}
GOOGLE_CLIENT_IDS: ${GOOGLE_CLIENT_IDS:-}
BOOTSTRAP_ADMIN_EMAILS: ${BOOTSTRAP_ADMIN_EMAILS:-}
ANALYSIS_MODEL: ${ANALYSIS_MODEL:-}
SUMMARY_MODEL: ${SUMMARY_MODEL:-}
PASSWORD_LOGIN: ${PASSWORD_LOGIN:-false}
# Stand-in payment (adds an analysis unit at once) until Stripe is connected.
MOCK_PAYMENTS: ${MOCK_PAYMENTS:-true}
FREE_PERSON_SLOTS: ${FREE_PERSON_SLOTS:-0}
UNLIMITED_DAILY_LIMIT: ${UNLIMITED_DAILY_LIMIT:-5}
# invite: new accounts need an invitation (admin page "Meghívók"); open: anyone.
SIGNUP_MODE: ${SIGNUP_MODE:-invite}
depends_on:
postgres:
condition: service_healthy
horoscope-api:
condition: service_healthy
read_only: true
logging: *logging
restart: unless-stopped
worker:
image: ${REGISTRY_PREFIX:-registry.sagifer.com/sagifer/sorsfonalak}-worker:${TAG:-latest}
environment:
DATABASE_URL: postgres://sorsfonalak:${POSTGRES_PASSWORD}@postgres:5432/sorsfonalak
# SMTP_URL or the SES credentials come from .env.secrets (docs/levelkuldes.md);
# listing them here with an empty default would override that file.
SES_REGION: ${SES_REGION:-eu-central-1}
MAIL_FROM: ${MAIL_FROM:-Sorsfonalak <hello@sorsfonalak.hu>}
PUBLIC_BASE_URL: https://${DOMAIN}
env_file:
- path: .env.secrets
required: false
depends_on:
postgres:
condition: service_healthy
read_only: true
logging: *logging
restart: unless-stopped
frontend:
image: ${REGISTRY_PREFIX:-registry.sagifer.com/sagifer/sorsfonalak}-frontend:${TAG:-latest}
environment:
BACKEND_URL: http://backend:8081
HOROSCOPE_API_URL: http://horoscope-api:8080
depends_on:
backend:
condition: service_healthy
read_only: true
tmpfs:
- /app/.next/cache
- /tmp
logging: *logging
restart: unless-stopped
volumes:
pgdata:
caddy-data:
caddy-config:
+37 -2
View File
@@ -42,12 +42,23 @@ services:
environment:
DATABASE_URL: postgres://sorsfonalak:${POSTGRES_PASSWORD:-sorsfonalak-dev}@postgres:5432/sorsfonalak
HOROSCOPE_API_URL: http://horoscope-api:8080
PUBLIC_BASE_URL: ${PUBLIC_BASE_URL:-http://localhost:3000}
PUBLIC_BASE_URL: ${PUBLIC_BASE_URL:-http://localhost:3001}
# Plain HTTP in development; leave the default (true) in production.
COOKIE_SECURE: ${COOKIE_SECURE:-false}
GOOGLE_CLIENT_IDS: ${GOOGLE_CLIENT_IDS:-}
BOOTSTRAP_ADMIN_EMAILS: ${BOOTSTRAP_ADMIN_EMAILS:-}
LLM_MODELS: ${LLM_MODELS:-openrouter/auto}
# Paid detailed analyses (empty: anthropic/claude-opus-5.5).
ANALYSIS_MODEL: ${ANALYSIS_MODEL:-}
# Free short summary of every saved chart (empty: anthropic/claude-sonnet-5.5).
SUMMARY_MODEL: ${SUMMARY_MODEL:-}
# E-mail + password login; off by default (Google, Apple and Facebook only).
PASSWORD_LOGIN: ${PASSWORD_LOGIN:-false}
# Stand-in payment (adds an analysis unit at once) until Stripe is connected.
MOCK_PAYMENTS: ${MOCK_PAYMENTS:-true}
FREE_PERSON_SLOTS: ${FREE_PERSON_SLOTS:-0}
UNLIMITED_DAILY_LIMIT: ${UNLIMITED_DAILY_LIMIT:-5}
# invite: new accounts need an invitation (admin page "Meghívók"); open: anyone.
SIGNUP_MODE: ${SIGNUP_MODE:-invite}
depends_on:
postgres:
condition: service_healthy
@@ -67,11 +78,35 @@ services:
# points it at Mailpit.
SMTP_URL: ${SMTP_URL:-}
MAIL_FROM: ${MAIL_FROM:-Sorsfonalak <noreply@sorsfonalak.local>}
PUBLIC_BASE_URL: ${PUBLIC_BASE_URL:-http://localhost:3001}
# OPENROUTER_API_KEY (not in git); without it analyses stay pending.
env_file:
- path: .env.secrets
required: false
depends_on:
postgres:
condition: service_healthy
read_only: true
restart: unless-stopped
frontend:
build:
context: services/frontend
image: sorsfonalak/frontend:latest
# Host port 3001 (3000 is taken on the dev server).
ports:
- "3001:3000"
environment:
BACKEND_URL: http://backend:8081
HOROSCOPE_API_URL: http://horoscope-api:8080
depends_on:
backend:
condition: service_healthy
read_only: true
tmpfs:
- /app/.next/cache
- /tmp
restart: unless-stopped
volumes:
pgdata:
+39
View File
@@ -0,0 +1,39 @@
# Csomagok és árazás
A katalógus a kódban van: `services/backend/src/packages.rs` (`CATALOG`). Ár- vagy tartalomváltozás egy deploy.
## Költség
Egy részletes képletelemzés és egy kapcsolati elemzés is kb. **$0,21 (≈ 80 Ft)** Opus 5.5-tel; a rövid összefoglaló kb. $0,01. A fizetési szolgáltató díja kb. 1,5% + 85 Ft tranzakciónként. Az árak bruttók (27% áfa).
## A lépcső
| Csomag | Tartalom | Ár | Elemzésenként | Külön megvéve | Megtakarítás |
|---|---|---|---|---|---|
| Egy elemzés | 1 képletelemzés | 2 990 Ft | 2 990 Ft | – | – |
| Páros | 2 képletelemzés, 1 kapcsolati, 1 személy | 6 990 Ft | 2 330 Ft | 9 868 Ft | 29% |
| **Család** (Legnépszerűbb) | 6 képletelemzés, 5 kapcsolati, 5 személy | 11 990 Ft | 1 090 Ft | 37 380 Ft | 68% |
| Korlátlan | minden korlátlanul, 12 hónapig | 17 990 Ft | – | – | – |
| +1 kapcsolati elemzés | kiegészítő | 3 490 Ft | | | |
| +5 személy | kiegészítő | 1 990 Ft | | | |
## Miért így (a nagyobb felé terelés)
- **Horgony:** az Egy elemzés ára (2 990 Ft) az egységár. Minden más ehhez mérve látszik olcsónak; a kártyákon áthúzva ott a „külön megvéve” ár.
- **Kis lépések, nagy ugrások:** minden szint csak egy kicsivel drágább az előzőnél, de sokkal többet ad. Páros: +4 000 Ft-ért háromszor annyi elemzés. Család: +5 000 Ft-ért majdnem négyszer annyi. Korlátlan: +6 000 Ft-ért nincs határ. A kártyán ki is írjuk: „Csak +5 000 Ft a Páros csomaghoz képest”.
- **Csali:** a Páros szándékosan „csak jó” ajánlat (−29%), hogy mellette a Család (−68%) kiugorjon. A Család kapja a kiemelést és a „Legnépszerűbb” címkét.
- **A Korlátlan mint felső horgony:** a Család ára mellette mérsékeltnek tűnik; aki sokakat venne fel, annak a 6 000 Ft különbség semmiség.
- **Drága kiegészítők:** a +1 kapcsolati elemzés 3 490 Ft, többe kerül, mint egy képletelemzés, és a Páros már kettő árán ad egyet kettőtök képletével együtt. Aki darabonként venne, annak jobban megéri csomagot venni.
- **A vásárlás pillanatában** (a „Részletes elemzés kérése” után) nem egy darabot kínálunk, hanem három csomagot egymás mellett, kiemelt Családdal.
- **Nem jár le:** a megvett elemzések megmaradnak, ezért a nagyobb csomag nem kockázat a vevőnek.
## Korlátlan csomag
Egy év; ha még tart, egy újabb a lejárathoz ad hozzá egy évet. Méltányos használat: naponta legfeljebb `UNLIMITED_DAILY_LIMIT` (alapból 5) új részletes elemzés. Legrosszabb esetben is jóval a csomag ára alatt marad a költség, ha valaki nem visszaélésszerűen használja; a napi korlát a gépi tömeges lekérést fogja meg.
## Későbbre
- Stripe-bekötés: a `package_orders.source = 'stripe'` már helyet kapott.
- Bevezető kedvezmény vagy kupon (pl. az első 100 vásárlónak).
- Ajándékba adható csomag (karácsony, Valentin-nap): a Páros és a Család jó ajándék.
- Számlázás (NAV Online Számla) a vásárlásokhoz.
+95
View File
@@ -0,0 +1,95 @@
# Levélküldés élesben: Amazon SES
Élesben most nincs levélküldő beállítva (`SMTP_URL` üres), így minden levél az `email_outbox` táblában vár. Amíg ez így van, a meghívót kézzel is továbbadhatod: az admin „Meghívók” oldala küldés után kiírja a linket („Link másolása”).
A meghívó a legkényesebb levéltípus, mert a címzett nem kérte. A spammappát elsősorban a feladó hírneve és a domain hitelesítése dönti el, a sablon csak ezután számít. Ezért kellenek a lenti lépések.
A SES ára 1000 levelenként 0,10 USD; a mi forgalmunknál ez havi néhány cent.
## 1. Régió és domain (SES konzol)
1. **Régió:** `eu-central-1` (Frankfurt), hogy az adatok az EU-ban maradjanak. Minden lépést ebben a régióban kell elvégezni, mert a SES-beállítások régiónként külön élnek.
2. *Configuration → Identities → Create identity → Domain*: `sorsfonalak.hu`.
- **Easy DKIM**, RSA 2048 bit. A SES három CNAME-rekordot ad (lásd 3. pont).
- **Custom MAIL FROM domain:** `mail.sorsfonalak.hu`, és *Behavior on MX failure*: *Use default MAIL FROM domain*. Ettől az SPF is a saját domainünkre szól, ami a DMARC-nál számít. Ehhez egy MX- és egy TXT-rekord kell.
3. A domain igazolása után bármelyik `@sorsfonalak.hu` cím lehet feladó. Javaslat: `hello@sorsfonalak.hu`. A `noreply` cím a szűrőknél rosszabb, és válaszolni sem lehet rá.
## 2. Kilépés a homokozóból (sandbox)
Új SES-fiók homokozóban indul. Ilyenkor:
- csak igazolt címekre lehet küldeni (*Identities → Create identity → Email address*; teszteléshez a saját címed elég);
- naponta legfeljebb 200 levél megy ki.
Meghívót idegen címre csak éles hozzáféréssel lehet küldeni: *Account dashboard → Request production access*. Az AWS kézzel bírálja el, általában egy napon belül. A kérésben érdemes leírni:
- tranzakciós levelek (megerősítés, értesítés) és meghívók egy zártkörű oldalra;
- meghívót csak az admin küld, személyesen ismert embereknek, kis mennyiségben;
- minden meghívóban egykattintásos leiratkozás van, a leiratkozott címekre többé nem megy levél;
- a visszapattanó és panaszos címeket a SES fiókszintű tiltólistája kezeli (*Suppression list*: bounces és complaints).
Fontos: ha a visszapattanási arány 5%, vagy a panaszarány 0,1% fölé megy, az AWS felfüggesztheti a küldést. Ezért csak olyan címre küldj meghívót, amelyről tudod, hogy él.
## 3. DNS a Cloudflare-en
| Típus | Név | Tartalom |
|---|---|---|
| CNAME ×3 | `<kód>._domainkey` | `<kód>.dkim.amazonses.com` (a SES konzol kiírja mindhármat) |
| MX | `mail` | `feedback-smtp.eu-central-1.amazonses.com`, prioritás 10 |
| TXT | `mail` | `v=spf1 include:amazonses.com ~all` |
| TXT | `_dmarc` | `v=DMARC1; p=none; rua=mailto:<a te címed>` |
- Minden rekord **DNS only** (szürke felhő) legyen; a proxyzott CNAME-mel a DKIM nem működik.
- DMARC: induláskor `p=none` (csak jelentés). Ha pár hétig minden levél átmegy, szigorítható `p=quarantine`-ra.
- Ha a `hello@sorsfonalak.hu` címre érkező válaszokat is olvasni szeretnéd: a Cloudflare *Email Routing* ingyen továbbítja őket a Gmailedre. Ez a fő domainre (`sorsfonalak.hu`) tesz MX- és SPF-rekordot, ami nem ütközik a `mail.` aldomain rekordjaival.
## 4. Hozzáférés
Két út van, mindkettő a szerver `.env.secrets` fájljába kerül (kis- vagy nagybetűvel is jó):
- **SMTP-hozzáférés** (*SMTP settings → Create SMTP credentials*): egy IAM-felhasználó, amely csak levelet küldhet.
```
SES_SMTP_USERNAME=AKIA...
SES_SMTP_PASSWORD=...
```
- **IAM-kulcspár**, amelynek van `ses:SendRawEmail` joga:
```
AWS_ACCESS_KEY_ID=AKIA...
AWS_SECRET_ACCESS_KEY=...
```
Más nevek is jók: a kulcsnál `SES_AUTH_KEY`, `SES_ACCESS_KEY`, `SES_KEY`, `AUTH_KEY`, a titoknál `SES_SECRET`, `SES_SECRET_KEY`, `AWS_SECRET`, `AUTH_SECRET` (a teljes lista: `services/worker/src/ses.rs`).
A worker ebből az AWS által leírt módon kiszámolja az SMTP-jelszót. Ha az `AWS_SECRET_ACCESS_KEY` helyére az SMTP-jelszót írtad, azt is felismeri, és változatlanul használja.
A régió alapból `eu-central-1` (Frankfurt); felülírható a `SES_REGION` változóval. A port 2587, ezt a `SES_SMTP_PORT` írja felül. URL-kódolásra itt nincs szükség, mert a worker maga állítja össze a címet.
## 5. Tűzfal
A DigitalOcean a dropleteken tiltja a szokásos kimenő SMTP-portokat (25, 465, 587). A SES erre a **2587**-es portot (STARTTLS) is kínálja.
A droplet saját tűzfala (`sorsfonalak-fw`, DigitalOcean → Networking → Firewalls) a kimenő forgalmat is szűri. Az **Outbound rules** közé fel kell venni a **TCP 2587**-et (cél: All IPv4, All IPv6), különben a worker nem éri el a SES-t.
## 6. Indítás
- A `.env` fájlban opcionális: `MAIL_FROM=Sorsfonalak <hello@sorsfonalak.hu>` (ez az alapérték is).
- Utána: `docker compose up -d worker`. A naplóban ennek kell megjelennie: `e-mail delivery enabled`, `via=Amazon SES eu-central-1:2587, credentials from …`.
- Az eddig várakozó levelek ekkor kimennek. Ha ezt nem szeretnéd, előtte töröld őket: `DELETE FROM email_outbox WHERE sent_at IS NULL;`.
- Hibaüzenetek a naplóban:
- `535 Authentication Credentials Invalid`: hibás kulcs, vagy az IAM-felhasználónak nincs `ses:SendRawEmail` joga;
- `554 Message rejected: Email address is not verified`: a fiók még homokozóban van, és a címzett nincs igazolva;
- időtúllépés: a tűzfalon nincs engedélyezve a kimenő 2587-es port.
- Ha mégis kész SMTP-címet adnál meg, az `SMTP_URL` mindig elsőbbséget élvez a SES-változókkal szemben.
## 7. Próba
1. Admin → Meghívók → **Teszt küldése magamnak**: megérkezik-e, és nem a spamben van-e.
2. A Gmailben a levélnél *⋮ → Eredeti megjelenítése*: az SPF, a DKIM és a DMARC mellett is `PASS` álljon.
3. A [mail-tester.com](https://www.mail-tester.com) ad egy egyszeri címet. Küldj rá meghívót az admin oldalról (utána vond vissza), és nézd meg a pontszámot; 9/10 fölött jó. Ehhez már éles hozzáférés kell.
## Amit a kód már elintéz
- HTML és szöveges változat ugyanazzal a tartalommal. Egyhasábos, képek és követés nélkül, minden link a saját domainre mutat.
- `List-Unsubscribe` és `List-Unsubscribe-Post` (RFC 8058): a Gmail és a többi levelező saját „Leiratkozás” gombot mutat. Aki leiratkozik, annak a címére soha többé nem megy meghívó (`email_optouts`, csak a cím hash-e).
- A worker saját domaines `Message-ID`-t tesz a levélre. A SES ezt a sajátjára cseréli, ami rendben van.
- Meghívót csak admin küldhet. Egy meghívó legfeljebb háromszor megy ki, 24 óránként egyszer. A személyes üzenet legfeljebb 300 karakter, és nem lehet benne link.
## Később
A visszapattanásokról és panaszokról a SES utólag, SNS-értesítésben szól; az SMTP-kapcsolat ezt nem jelzi. Ha lesz forgalom, érdemes bekötni egy SNS → backend webhookot. Ez a meghívólistán megjelölné a visszapattant címeket, és a panaszt tevőket a leiratkozottak közé tenné.
+2
View File
@@ -8,6 +8,8 @@ publish.workspace = true
[dependencies]
db.workspace = true
analysis-prompt.workspace = true
email-templates.workspace = true
horoscope-client.workspace = true
service-kit.workspace = true
anyhow.workspace = true
+52 -21
View File
@@ -1,6 +1,6 @@
# backend
Felhasználók, belépés, mentett születési képletek, szinasztriák és meghívók, szöveges elemzések, kreditek és nyilvános megosztás. A képleteket a `horoscope-api` számolja, az adatok PostgreSQL-ben vannak. A migrációk a `crates/db/migrations` mappában vannak, és induláskor lefutnak.
Felhasználók, belépés, mentett születési képletek, szinasztriák és meghívók, szöveges elemzések, elemzési egységek és nyilvános megosztás. A képleteket a `horoscope-api` számolja, az adatok PostgreSQL-ben vannak. A migrációk a `crates/db/migrations` mappában vannak, és induláskor lefutnak.
## Konfiguráció (környezeti változók)
@@ -13,27 +13,37 @@ Felhasználók, belépés, mentett születési képletek, szinasztriák és megh
| `COOKIE_SECURE` | `true` | csak helyi, sima HTTP-s fejlesztéshez legyen `false` |
| `COOKIE_DOMAIN` | – | pl. `.sorsfonalak.hu`, ha a frontend és az API más aldomainen fut |
| `SESSION_TTL_DAYS` | `30` | a munkamenet élettartama |
| `PASSWORD_LOGIN` | `false` | e-mail + jelszó regisztráció és belépés; élesben ki van kapcsolva (csak Google, Apple, Facebook), a jelszavas végpontok ilyenkor 403-at adnak |
| `MOCK_PAYMENTS` | `false` | próbafizetés a Stripe bekötéséig: a `POST /v1/payments/mock` `{"package": "<id>"}` azonnal jóváírja a katalógus egy csomagját (`{"unit": "natal"}` rövidítés: a legkisebb ilyen csomag); a compose-fájlokban egyelőre `true` |
| `FREE_PERSON_SLOTS` | `0` | ennyi személyt vehet fel csomag nélkül egy felhasználó |
| `UNLIMITED_DAILY_LIMIT` | `5` | a Korlátlan csomaggal naponta ennyi új részletes elemzés kérhető (méltányos használat; utána 429 `fair_use_limit`) |
| `SIGNUP_MODE` | `invite` | `invite`: új fiók csak meghívóval jön létre (403 `not_invited`); `open`: bárki regisztrálhat |
| `GOOGLE_CLIENT_IDS` | – | Google OAuth kliens-azonosító(k); üresen a Google-belépés ki van kapcsolva |
| `BOOTSTRAP_ADMIN_EMAILS` | – | ezek a címek regisztrációkor vagy belépéskor admin szerepet kapnak (így lesz meg az első admin) |
| `SUPPORTED_LOCALES` | `hu,en` | felület- és elemzésnyelvek; az első az alapértelmezett |
| `MONTHLY_FREE_CREDITS` | `10` | havi ingyenes kreditkeret |
| `ANALYSIS_COST` | `1` | egy új elemzés ára kreditben |
| `LLM_MODELS` | `openrouter/auto` | választható OpenRouter-modellek; az első az alapértelmezett |
| `ANALYSIS_PROMPT_VERSION` | `v1` | a prompt verziója (az elemzés-gyorsítótár kulcsának része) |
| `MAX_CHARTS_PER_USER` | `50` | ennyi képletet menthet egy felhasználó |
| `ANALYSIS_MODEL` | `anthropic/claude-opus-5.5` | ez írja a fizetős részletes elemzéseket |
| `SUMMARY_MODEL` | `anthropic/claude-sonnet-5.5` | ez írja minden mentett képlet ingyenes rövid összefoglalóját (kb. 1 cent darabonként) |
| `ANALYSIS_PROMPT_VERSION` | `v2` | a prompt verziója (az elemzés-gyorsítótár kulcsának része) |
| `MAX_CHARTS_PER_USER` | `1000` | biztonsági felső korlát a képletek számára (a korlátlan csomagra is) |
| `BIND_ADDR`, `LOG_FORMAT`, `RUST_LOG` | `0.0.0.0:8081`, `text`, `info` | |
## Belépés és jogosultság
- **Munkamenet:** véletlen token, HttpOnly + SameSite=Lax sütiben (`sf_session`). A belépési válasz törzsében is ott van, hogy nem böngészős kliens `Authorization: Bearer <token>` fejléccel küldhesse vissza. Az adatbázis csak a token SHA-256 hash-ét tárolja, így a munkamenet visszavonható (kijelentkezés, jelszócsere, fióktörlés).
- **E-mail + jelszó:**
- **E-mail + jelszó** (csak `PASSWORD_LOGIN=true` mellett; élesben csak közösségi belépés lesz, hogy ne lehessen tömegesen ingyenes fiókokat nyitni):
- a jelszó legalább 10 karakter, Argon2id hash-sel tárolva;
- címenként 15 percen belül 10 hibás próbálkozás után átmenetileg tiltás jár;
- ismeretlen címnél is ugyanannyi ideig tart a válasz.
- **Google:** a frontend a Google Identity Services gombbal vagy a One Tap felülettel szerez ID tokent, és elküldi a `POST /v1/auth/google` végpontra. A backend Google kulcsaival ellenőrzi az aláírást, a kiállítót és a kliens-azonosítót.
- Ismeretlen Google-fióknál, ha a Google által igazolt e-mail-címmel már van felhasználó, ahhoz kapcsolja; ha nincs, újat hoz létre.
- Ugyanaz a felhasználó több belépési móddal is rendelkezhet (`auth_identities`). A Facebook, az Apple és a passkey ugyanígy adható hozzá.
- **Szerepek** (`users.roles`, tömb): `user` (alap), `creator` (cikkírás, 2. fázis), `admin`.
- **Meghívásos regisztráció** (`SIGNUP_MODE=invite`): új fiók (Google vagy jelszó) akkor jön létre, ha
- a címre szól élő meghívó (`invitations`), vagy
- a kérés a meghívólink tokenjét hozza (`invite_token`): ilyenkor bármelyik cím jó, mert sokan nem azzal a Google-fiókkal lépnek be, amelyiket az ismerősük tudja; a meghívó ezzel elfogy;
- vagy egy élő „Mennyire illünk össze?” link tokenjét hozza, illetve a cím a `BOOTSTRAP_ADMIN_EMAILS` listában van.
Meglévő felhasználók belépése nem változik. Meghívót csak admin küld; a levelet a worker kézbesíti (`invitation` sablon). Minden küldés új linket ad, de a korábbi linkek is élnek, amíg a meghívó nyitott (`invitation_tokens`). A leiratkozott címekre nem megy több meghívó (`email_optouts`, csak hash). Lásd még `docs/levelkuldes.md`.
- **Szerepek** (`users.roles`, tömb): `user` (alap), `creator` (cikkírás, 2. fázis), `premium` és `vip` (jelenleg nincs hozzájuk funkció; a fizetős elemzés egységekkel megy), `admin`.
- **Guardok:**
- `AuthUser`: belépés kell (401);
- `AdminUser`: admin szerep is kell (403).
@@ -44,10 +54,11 @@ Felhasználók, belépés, mentett születési képletek, szinasztriák és megh
| Végpont | Guard | Leírás |
|---|---|---|
| `GET /v1/config` | – | Google kliens-azonosító, nyelvek, modellek, kreditárak |
| `POST /v1/auth/register` | – | `{email, password, display_name?, locale?}` → munkamenet; megerősítő e-mailt küld |
| `GET /v1/config` | – | Google kliens-azonosító, `password_login`, `signup_mode`, nyelvek, elemző és összefoglaló modell |
| `GET /v1/packages` | – | a csomagkatalógus árral, tartalommal, megtakarítással, elemzésenkénti árral (lásd `docs/csomagok.md`) |
| `POST /v1/auth/register` | – | `{email, password, display_name?, locale?, invite_token?}` → munkamenet; megerősítő e-mailt küld |
| `POST /v1/auth/login` | – | `{email, password}` |
| `POST /v1/auth/google` | – | `{id_token}`; `created: true`, ha most jött létre a fiók |
| `POST /v1/auth/google` | – | `{id_token, invite_token?}`; `created: true`, ha most jött létre a fiók; meghívó nélkül 403 `not_invited` |
| `POST /v1/auth/logout`, `/logout-all` | user | kijelentkezés erről, illetve minden eszközről |
| `POST /v1/auth/verify-email` | – | `{token}` az e-mailben kapott linkből |
| `POST /v1/auth/resend-verification` | user | |
@@ -56,9 +67,10 @@ Felhasználók, belépés, mentett születési képletek, szinasztriák és megh
| `GET`/`PATCH`/`DELETE /v1/me` | user | profil (`display_name`, `locale`); törlés: `{confirm: "DELETE"}` |
| `POST /v1/me/password` | user | `{current_password?, new_password}`; Google-fiókhoz jelszót is ad |
| `GET /v1/me/export` | user | GDPR: minden adat egy JSON-ban |
| `GET /v1/credits` | user | egyenleg és kreditmozgások |
| `GET /v1/credits` | user | megmaradt elemzések típusonként (`balance: {natal, synastry}`) és a mozgások |
| `GET`/`POST /v1/charts` | user | képletek listája; új képlet: `{label, is_primary, birth}`, ahol a `birth` a horoscope-api `/v1/natal` kérésformátuma |
| `GET`/`PATCH`/`DELETE /v1/charts/{id}` | tulajdonos | a születési adat nem módosítható: a javított képlet új képlet |
| `GET`/`PATCH`/`DELETE /v1/charts/{id}` | tulajdonos | a születési adat nem módosítható: a javított képlet új képlet. Ugyanarra a születési adatra a `POST /v1/charts` a meglévő képletet adja vissza (200), nem számol újat |
| `POST /v1/charts/{id}/summary` | tulajdonos | az ingyenes rövid összefoglaló (`kind: summary`, `{title, summary}`); mentéskor magától sorba áll, ez visszaadja, és ha elbukott, újra sorba állítja |
| `GET`/`POST /v1/synastries` | user | `{chart1_id, chart2_id}`, mindkét képlet a sajátod |
| `GET`/`DELETE /v1/synastries/{id}` | résztvevő | |
| `GET`/`POST /v1/invites` | user | „Mennyire illünk össze?” link; alapból a saját (primary) képlettel |
@@ -70,9 +82,21 @@ Felhasználók, belépés, mentett születési képletek, szinasztriák és megh
| `GET /v1/analyses/{id}` | jogosult | |
| `GET`/`POST /v1/shares`, `DELETE /v1/shares/{id}` | user | `{kind: chart\|synastry\|analysis, target_id, title?, show_birth_data?}` |
| `GET /v1/public/shares/{slug}` | – | a megosztott tartalom (oldal + OG-kép adatai) |
| `GET /v1/admin/users?q=` | admin | felhasználók kereséssel, szerepekkel, kreditekkel |
| `GET /v1/admin/users?q=` | admin | felhasználók kereséssel, szerepekkel, megmaradt elemzésekkel |
| `PATCH /v1/admin/users/{id}` | admin | `{roles: [...]}`; a saját admin szerep nem vehető el |
| `POST /v1/admin/users/{id}/credits` | admin | `{delta, note?}` |
| `POST /v1/admin/users/{id}/packages` | admin | `{package, note?}`: csomag kiosztása ajándékként (`package_orders`, ár 0) |
| `POST /v1/admin/users/{id}/credits` | admin | `{unit: natal\|synastry, delta, note?}`: elemzések jóváírása vagy levonása |
| `GET`/`POST /v1/admin/invitations` | admin | lista (állapot, az utolsó levél állapota, várólista); új: `{emails: [...], message?, locale?}`, címenként `invited` (linkkel), `invalid`, `already_user`, `already_invited` vagy `opted_out` |
| `POST /v1/admin/invitations/{id}/resend`, `DELETE …/{id}` | admin | újraküldés új linkkel és újabb 30 nappal (legfeljebb 3 küldés, 24 óránként); visszavonás |
| `POST /v1/admin/invitations/preview` | admin | `{message?, locale?, send_to_me?}`: a meghívólevél HTML- és szöveges változata mintalinkekkel; kérésre tesztpéldány az adminnak |
| `DELETE /v1/admin/waitlist/{email}` | admin | törlés a várólistáról |
| `GET /v1/public/invitations/{token}` | – | a meghívó adatai a belépőoldalnak (ki hívott, üzenet, állapot) |
| `POST /v1/public/invitations/unsubscribe?token=` | – | „Nem kérek több meghívót”: a lábléc linkjéről és a levelezők egykattintásos gombjáról (RFC 8058) |
| `POST /v1/public/waitlist` | – | `{email, locale?}`; mindig 202, nem árulja el, kinek van fiókja |
| `GET /v1/admin/prompts` | admin | a tömör és a részletes elemzés system promptja nyelvenként: érvényes szöveg, alapértelmezett, változatok |
| `PUT /v1/admin/prompts/{kind}/{language}` | admin | `{system}` új változatként menti (`null` vagy az alapértelmezett szöveg: vissza a beépítettre); az új elemzések `prompt_version`-je `v2-r<id>` |
| `POST /v1/admin/prompts/{kind}/{language}/preview` | admin | `{system, chart_id}`: próbafuttatás a (mentetlen) szöveggel egy saját képleten; nem kerül a képlethez, nem gyorsítótárazott, nem fogy egység; egyszerre legfeljebb 3 |
| `GET /v1/admin/previews/{id}` | admin | a próbafuttatás állapota és eredménye (modell, token, költség) |
Hibák formátuma: `{"error": {"code", "message"}}`. A születési adatok hibái (például ismeretlen hely, javaslatokkal együtt) változatlanul jönnek tovább a horoscope-api-ból.
@@ -87,7 +111,7 @@ Hibák formátuma: `{"error": {"code", "message"}}`. A születési adatok hibái
| `synastries` | két képlet összevetése (`result`: fényszögek, házak, kompozit), `synastry_hash` |
| `synastry_invites` | meghívó linkek: token hash, lejárat, ki fogadta el, melyik szinasztria lett belőle |
| `analyses` | szöveges elemzések: típus, nyelv, modell, promptverzió, `cache_key`, állapot (`pending` → `running` → `done`/`failed`), strukturált `content` |
| `credit_ledger` | csak hozzáírható kreditnapló; az egyenleg `SUM(delta)`; havi keret lustán, egyszer havonta |
| `credit_ledger` | csak hozzáírható egységnapló (`unit`: `natal` vagy `synastry`); az egyenleg típusonként `SUM(delta)` |
| `shares` | nyilvános linkek: véletlen `slug`, mit mutat, `show_birth_data`, nézettség, visszavonás |
| `email_outbox` | kimenő e-mailek; a worker küldi ki (újrapróbálással) |
@@ -97,15 +121,22 @@ Hibák formátuma: `{"error": {"code", "message"}}`. A születési adatok hibái
- A szinasztria másik fele csak a pozíciókat látja, a születési adatokat nem.
- A fiók törlése mindent töröl, ami a felhasználóhoz tartozik, beleértve a más által létrehozott, de az ő képletét használó szinasztriákat is.
## Elemzések és kreditek
## Elemzések és egységek
- **Kérés:** a `POST .../analyses` létrehoz egy `pending` elemzést, és levonja az `ANALYSIS_COST` kreditet; a szöveget később a worker írja meg. Ha nincs elég kredit, 402 `insufficient_credits` a válasz.
- **Ingyenes rész:** minden mentett képlethez elkészül egy rövid összefoglaló (`summary`, `SUMMARY_MODEL`), ezért nem kell fizetni.
- **Fizetős rész:** a részletes elemzés darabra megy. A képletelemzés egy `natal`, a szinasztria-elemzés egy `synastry` egységet von le (`credit_ledger.unit`). Az egységek csomagvásárlásból (Stripe, később) vagy admin jóváírásból jönnek. Havi ingyenes keret nincs.
- **Modell:** egyetlen, az `ANALYSIS_MODEL` (alapból Opus 5.5, a 2026-11-es összevetés legjobbja, lásd `services/worker/README.md`). A kliens nem választ modellt.
- **Kérés:** a `POST .../analyses` (`{language?}`) létrehoz egy `pending` elemzést, és levon egy egységet; a szöveget a worker írja meg, általában 1–2 perc alatt. A kliens a `GET /v1/analyses/{id}` végponton kérdezi le az állapotát. Ha nincs egység, 402 `insufficient_credits` a válasz (`unit`, `balance` részletekkel). Hiba esetén a worker visszaadja az egységet.
- **Gyorsítótár:** a kulcs `sha256(típus | képlet- vagy szinasztria-hash | promptverzió | modell | nyelv)`.
- Ha ugyanarra a képletre már kértek ilyet, ugyanazt adja vissza (200).
- Ha bárhol van kész elemzés ugyanezzel a kulccsal (például ugyanaz a születési adat egy másik felhasználónál), ingyen átmásolja (201, `done`).
## Háttérmunkák
A [worker](../worker/README.md) már kiküldi az e-maileket az `email_outbox`-ból, és óránként takarít. Még hátravan:
- az elemzések megírása (OpenRouter, strukturált JSON, streaming);
- sikertelen elemzésnél a kredit visszatérítése (`refund`).
A [worker](../worker/README.md) kiküldi az e-maileket, megírja az elemzéseket (OpenRouter, strukturált JSON; hibánál visszaadja az egységet), és óránként takarít. Még hátravan az elemzés streamelése a frontend felé.
## Korlátok
- **Saját születési adatok módosítása:** az első mentés után egy órán belül még háromszor javíthatók, utána naponta egyszer (`birth_data_changes` tábla). A tiltott módosítás 429-et ad `birth_data_change_limit` kóddal, a felhasználónak szóló üzenettel („A rendszer csak napi egy módosítást engedélyez. …”). A `/v1/me` `birth_change` mezője mutatja, él-e a napi korlát. Más emberek képleteit ez nem érinti.
- **Személyek** (más emberek képletei, `charts.kind = 'person'`): minden új személy egy `person` egységet használ (`credit_ledger`, `reason = 'person'`); a törlés nem adja vissza. Helyet a csomagok adnak; korlátlan az `unlimited_persons` jogosultsággal és futó Korlátlan csomaggal. Ha elfogyott, 409 `person_limit_reached`. Egy személy születési adatai a felvétel után egy órán belül javíthatók (`PATCH /v1/charts/{id}` `birth` mezővel), utána 409 `person_locked`. A név (`label`) bármikor változhat; ha a `birth` ugyanaz, mint a tárolt (vagy ugyanazt a képletet adja), nincs újraszámolás, és az elemzések, összevetések maradnak. Részletes elemzés (képlet vagy összevetés) után sem (409 `person_analysed`), és akkor sem, ha valaki más összevetésében szerepel (409 `person_in_synastry`); a saját, elemzés nélküli összevetései a javításkor törlődnek. A `/v1/me` `persons` mezője: `used`, `limit`, `left`, `unlimited`.
- **Admin:** nincs módosítási korlát, korlátlan személy, a személyek adatai bármikor javíthatók, és a részletes elemzés ingyenes (nem fogy egység).
+147
View File
@@ -0,0 +1,147 @@
//! Limits on changing a user's own birth data.
//!
//! The first save is free. Within an hour of it the user may correct the data
//! three more times; after that, once per 24 hours. Admins are not limited.
use serde_json::{Value, json};
use sqlx::PgConnection;
use time::{Duration, OffsetDateTime};
use uuid::Uuid;
use crate::auth::AuthUser;
use crate::error::ApiError;
use crate::views::rfc3339;
use db::Role;
const GRACE_PERIOD: Duration = Duration::hours(1);
const GRACE_CHANGES: usize = 3;
const DAILY: Duration = Duration::hours(24);
pub const DAILY_NOTICE: &str = "A rendszer csak napi egy módosítást engedélyez.";
/// Where a user stands with changing their birth data.
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct Status {
/// The grace period is over (or used up): one change per day.
pub daily: bool,
/// When the next change is possible; `None`: now.
pub next_at: Option<OffsetDateTime>,
}
/// The rule itself, over the times of the earlier saves (oldest first).
pub fn evaluate(saves: &[OffsetDateTime], now: OffsetDateTime) -> Status {
let (Some(&first), Some(&last)) = (saves.first(), saves.last()) else {
return Status { daily: false, next_at: None };
};
let corrections = saves.len() - 1;
if now - first < GRACE_PERIOD && corrections < GRACE_CHANGES {
return Status { daily: false, next_at: None };
}
let next = last + DAILY;
Status { daily: true, next_at: (next > now).then_some(next) }
}
async fn saves(conn: &mut PgConnection, user_id: Uuid) -> Result<Vec<OffsetDateTime>, ApiError> {
let rows: Vec<(OffsetDateTime,)> =
sqlx::query_as("SELECT created_at FROM birth_data_changes WHERE user_id = $1 ORDER BY created_at")
.bind(user_id)
.fetch_all(conn)
.await?;
Ok(rows.into_iter().map(|(t,)| t).collect())
}
/// "23 óra 5 perc" / "40 perc" (rounded up to a minute).
fn wait_text(wait: Duration) -> String {
let minutes = (wait.whole_seconds() + 59) / 60;
let (h, m) = (minutes / 60, minutes % 60);
match (h, m) {
(0, m) => format!("{m} perc"),
(h, 0) => format!("{h} óra"),
(h, m) => format!("{h} óra {m} perc"),
}
}
fn limit_error(next_at: OffsetDateTime, now: OffsetDateTime) -> ApiError {
ApiError::Limited {
code: "birth_data_change_limit",
message: format!("{DAILY_NOTICE} Legközelebb {} múlva módosíthatod.", wait_text(next_at - now)),
}
}
/// For `/v1/me`: whether the daily limit applies and, if so, the notice to show.
pub async fn view(conn: &mut PgConnection, auth: &AuthUser) -> Result<Value, ApiError> {
if auth.user.has_role(Role::Admin) {
return Ok(json!({ "limited": false, "next_change_at": null, "notice": null }));
}
let now = OffsetDateTime::now_utc();
let status = evaluate(&saves(conn, auth.id()).await?, now);
let notice = match status.next_at {
Some(next) => Some(format!("{DAILY_NOTICE} Legközelebb {} múlva módosíthatod.", wait_text(next - now))),
None if status.daily => Some(DAILY_NOTICE.to_string()),
None => None,
};
Ok(json!({
"limited": status.daily,
"next_change_at": status.next_at.map(rfc3339),
"notice": notice,
}))
}
/// Checks the limit and records the change, inside the transaction that
/// makes `chart_id` the user's own chart. Locks the user row, so parallel
/// saves are counted one after the other.
pub async fn record(tx: &mut PgConnection, auth: &AuthUser, chart_id: Uuid) -> Result<(), ApiError> {
sqlx::query("SELECT id FROM users WHERE id = $1 FOR UPDATE").bind(auth.id()).execute(&mut *tx).await?;
if !auth.user.has_role(Role::Admin) {
let now = OffsetDateTime::now_utc();
if let Some(next) = evaluate(&saves(tx, auth.id()).await?, now).next_at {
return Err(limit_error(next, now));
}
}
sqlx::query("INSERT INTO birth_data_changes (id, user_id, chart_id) VALUES ($1, $2, $3)")
.bind(Uuid::now_v7())
.bind(auth.id())
.bind(chart_id)
.execute(tx)
.await?;
Ok(())
}
#[cfg(test)]
mod tests {
use super::*;
fn at(minutes: i64) -> OffsetDateTime {
OffsetDateTime::UNIX_EPOCH + Duration::minutes(minutes)
}
#[test]
fn first_save_is_free() {
assert_eq!(evaluate(&[], at(0)), Status { daily: false, next_at: None });
}
#[test]
fn three_corrections_within_the_first_hour() {
let now = at(30);
assert_eq!(evaluate(&[at(0)], now).next_at, None);
assert_eq!(evaluate(&[at(0), at(5), at(10)], now).next_at, None);
// the third correction used up the grace period
let s = evaluate(&[at(0), at(5), at(10), at(20)], now);
assert!(s.daily);
assert_eq!(s.next_at, Some(at(20) + DAILY));
}
#[test]
fn after_the_first_hour_once_a_day() {
assert_eq!(evaluate(&[at(0)], at(61)), Status { daily: true, next_at: Some(at(24 * 60)) });
assert_eq!(evaluate(&[at(0)], at(24 * 60)), Status { daily: true, next_at: None });
assert_eq!(evaluate(&[at(0), at(24 * 60 + 5)], at(30 * 60)).next_at, Some(at(48 * 60 + 5)));
}
#[test]
fn wait_is_written_in_hours_and_minutes() {
assert_eq!(wait_text(Duration::minutes(40)), "40 perc");
assert_eq!(wait_text(Duration::hours(3)), "3 óra");
assert_eq!(wait_text(Duration::seconds(23 * 3600 + 4 * 60 + 1)), "23 óra 5 perc");
}
}
+59 -24
View File
@@ -2,6 +2,24 @@
use anyhow::{Context, bail};
/// Who may create an account.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum SignupMode {
/// Anyone.
Open,
/// Only invited addresses (or the holder of an invitation link).
Invite,
}
impl SignupMode {
pub fn as_str(self) -> &'static str {
match self {
SignupMode::Open => "open",
SignupMode::Invite => "invite",
}
}
}
#[derive(Debug, Clone)]
pub struct Config {
/// `DATABASE_URL` (required).
@@ -21,6 +39,12 @@ pub struct Config {
pub cookie_domain: Option<String>,
/// `SESSION_TTL_DAYS` (default 30).
pub session_ttl_days: i64,
/// `PASSWORD_LOGIN` (default `false`): e-mail and password registration and
/// login. Off in production, where only Google, Apple and Facebook are offered.
pub password_login: bool,
/// `MOCK_PAYMENTS` (default `false`): a stand-in payment that adds an
/// analysis unit at once, until Stripe is connected.
pub mock_payments: bool,
/// `GOOGLE_CLIENT_IDS`: comma-separated OAuth client ids accepted as the
/// ID token audience; empty disables Google login.
pub google_client_ids: Vec<String>,
@@ -31,17 +55,23 @@ pub struct Config {
pub bootstrap_admin_emails: Vec<String>,
/// `SUPPORTED_LOCALES` (default `hu,en`); the first is the default.
pub supported_locales: Vec<String>,
/// `MONTHLY_FREE_CREDITS` (default 10).
pub monthly_free_credits: i32,
/// `ANALYSIS_COST` credits per new analysis (default 1).
pub analysis_cost: i32,
/// `LLM_MODELS`: comma-separated OpenRouter model ids users may choose;
/// the first is the default (default `openrouter/auto`).
pub llm_models: Vec<String>,
/// `ANALYSIS_PROMPT_VERSION` (default `v1`); part of the analysis cache key.
/// `ANALYSIS_MODEL`: writes the paid detailed analyses (default
/// `anthropic/claude-opus-5.5`, the best of the 2026-11 comparison).
pub analysis_model: String,
/// `SUMMARY_MODEL`: writes the free short summary of every saved chart
/// (default `anthropic/claude-sonnet-5.5`, about 1 US cent each).
pub summary_model: String,
/// `ANALYSIS_PROMPT_VERSION` (default `v2`); part of the analysis cache key.
pub prompt_version: String,
/// `MAX_CHARTS_PER_USER` (default 50).
/// `MAX_CHARTS_PER_USER` (default 1000): a safety cap, also for unlimited packages.
pub max_charts_per_user: i64,
/// `FREE_PERSON_SLOTS` (default 0): persons a user may add without a package.
pub free_person_slots: i64,
/// `UNLIMITED_DAILY_LIMIT` (default 5): new detailed analyses a day with the unlimited package.
pub unlimited_daily_limit: i64,
/// `SIGNUP_MODE` (`invite` or `open`, default `invite`): whether new
/// accounts need an invitation.
pub signup_mode: SignupMode,
}
fn var(name: &str) -> Option<String> {
@@ -76,10 +106,6 @@ impl Config {
if supported_locales.is_empty() {
supported_locales = vec!["hu".into(), "en".into()];
}
let mut llm_models = list("LLM_MODELS");
if llm_models.is_empty() {
llm_models.push("openrouter/auto".into());
}
let config = Self {
database_url: var("DATABASE_URL").context("DATABASE_URL is required")?,
horoscope_api_url: var("HOROSCOPE_API_URL").unwrap_or_else(|| "http://localhost:8080".into()),
@@ -88,23 +114,28 @@ impl Config {
cookie_secure: parsed("COOKIE_SECURE", true)?,
cookie_domain: var("COOKIE_DOMAIN"),
session_ttl_days: parsed("SESSION_TTL_DAYS", 30)?,
password_login: parsed("PASSWORD_LOGIN", false)?,
mock_payments: parsed("MOCK_PAYMENTS", false)?,
google_client_ids: list("GOOGLE_CLIENT_IDS"),
google_jwks_url: var("GOOGLE_JWKS_URL")
.unwrap_or_else(|| "https://www.googleapis.com/oauth2/v3/certs".into()),
bootstrap_admin_emails: list("BOOTSTRAP_ADMIN_EMAILS").into_iter().map(|e| e.to_lowercase()).collect(),
supported_locales,
monthly_free_credits: parsed("MONTHLY_FREE_CREDITS", 10)?,
analysis_cost: parsed("ANALYSIS_COST", 1)?,
llm_models,
prompt_version: var("ANALYSIS_PROMPT_VERSION").unwrap_or_else(|| "v1".into()),
max_charts_per_user: parsed("MAX_CHARTS_PER_USER", 50)?,
analysis_model: var("ANALYSIS_MODEL").unwrap_or_else(|| "anthropic/claude-opus-5.5".into()),
summary_model: var("SUMMARY_MODEL").unwrap_or_else(|| "anthropic/claude-sonnet-5.5".into()),
prompt_version: var("ANALYSIS_PROMPT_VERSION").unwrap_or_else(|| "v2".into()),
max_charts_per_user: parsed("MAX_CHARTS_PER_USER", 1000)?,
free_person_slots: parsed("FREE_PERSON_SLOTS", 0)?,
unlimited_daily_limit: parsed("UNLIMITED_DAILY_LIMIT", 5)?,
signup_mode: match var("SIGNUP_MODE").as_deref() {
None | Some("invite") => SignupMode::Invite,
Some("open") => SignupMode::Open,
Some(other) => bail!("invalid SIGNUP_MODE '{other}': use 'invite' or 'open'"),
},
};
if config.session_ttl_days < 1 {
bail!("SESSION_TTL_DAYS must be at least 1");
}
if config.monthly_free_credits < 0 || config.analysis_cost < 0 {
bail!("MONTHLY_FREE_CREDITS and ANALYSIS_COST must not be negative");
}
Ok(config)
}
@@ -119,15 +150,19 @@ impl Config {
cookie_secure: true,
cookie_domain: None,
session_ttl_days: 30,
password_login: true,
mock_payments: true,
google_client_ids: vec!["test-client.apps.googleusercontent.com".into()],
google_jwks_url,
bootstrap_admin_emails: vec!["admin@example.com".into()],
supported_locales: vec!["hu".into(), "en".into()],
monthly_free_credits: 2,
analysis_cost: 1,
llm_models: vec!["openrouter/auto".into(), "anthropic/claude-test".into()],
analysis_model: "anthropic/claude-test".into(),
summary_model: "anthropic/claude-summary".into(),
prompt_version: "v1".into(),
max_charts_per_user: 50,
free_person_slots: 5,
unlimited_daily_limit: 3,
signup_mode: SignupMode::Open,
}
}
}
+70 -63
View File
@@ -1,78 +1,85 @@
//! Credit ledger: every LLM call costs credits; users get a free monthly
//! allowance, granted lazily on the first balance query or spend of a month.
//! Analysis units: a detailed natal analysis uses one `natal` unit, a
//! synastry analysis one `synastry` unit. Units come from purchases or an
//! admin; a failed analysis gives its unit back (the worker does that).
use sqlx::{PgConnection, PgPool};
use time::OffsetDateTime;
use serde::{Deserialize, Serialize};
use serde_json::{Value, json};
use sqlx::PgConnection;
use uuid::Uuid;
use crate::error::ApiError;
pub fn current_period() -> String {
let now = OffsetDateTime::now_utc();
format!("{:04}-{:02}", now.year(), u8::from(now.month()))
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "lowercase")]
pub enum Unit {
Natal,
Synastry,
/// A slot for adding a person (see [`crate::persons`]).
Person,
}
/// Grants this month's free credits if not granted yet.
pub async fn ensure_monthly_grant(conn: &mut PgConnection, user_id: Uuid, amount: i32) -> Result<(), ApiError> {
if amount <= 0 {
return Ok(());
impl Unit {
pub fn as_str(self) -> &'static str {
match self {
Unit::Natal => "natal",
Unit::Synastry => "synastry",
Unit::Person => "person",
}
}
}
/// Units left per kind.
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq)]
pub struct Balance {
pub natal: i64,
pub synastry: i64,
/// Bought person slots (not the slots left; see [`crate::persons::slots`]).
pub person: i64,
}
impl Balance {
pub fn of(self, unit: Unit) -> i64 {
match unit {
Unit::Natal => self.natal,
Unit::Synastry => self.synastry,
Unit::Person => self.person,
}
}
pub fn view(self) -> Value {
json!({ "natal": self.natal, "synastry": self.synastry })
}
}
pub async fn balance(conn: &mut PgConnection, user_id: Uuid) -> Result<Balance, ApiError> {
let (natal, synastry, person): (i64, i64, i64) = sqlx::query_as(
"SELECT COALESCE(SUM(delta) FILTER (WHERE unit = 'natal'), 0)::bigint, \
COALESCE(SUM(delta) FILTER (WHERE unit = 'synastry'), 0)::bigint, \
COALESCE(SUM(delta) FILTER (WHERE unit = 'person' AND reason <> 'person'), 0)::bigint \
FROM credit_ledger WHERE user_id = $1",
)
.bind(user_id)
.fetch_one(conn)
.await?;
Ok(Balance { natal, synastry, person })
}
/// Spends one unit inside the caller's transaction. The user row is locked
/// so concurrent requests cannot overspend.
pub async fn spend(tx: &mut PgConnection, user_id: Uuid, unit: Unit, analysis_id: Uuid) -> Result<(), ApiError> {
sqlx::query("SELECT id FROM users WHERE id = $1 FOR UPDATE").bind(user_id).execute(&mut *tx).await?;
let left = balance(tx, user_id).await?.of(unit);
if left < 1 {
return Err(ApiError::InsufficientCredits { unit: unit.as_str(), balance: left });
}
sqlx::query(
"INSERT INTO credit_ledger (id, user_id, delta, reason, period, note) \
VALUES ($1, $2, $3, 'monthly_grant', $4, 'monthly free credits') \
ON CONFLICT (user_id, period) WHERE reason = 'monthly_grant' DO NOTHING",
"INSERT INTO credit_ledger (id, user_id, unit, delta, reason, analysis_id) VALUES ($1, $2, $3, -1, 'analysis', $4)",
)
.bind(Uuid::now_v7())
.bind(user_id)
.bind(amount)
.bind(current_period())
.execute(conn)
.bind(unit.as_str())
.bind(analysis_id)
.execute(tx)
.await?;
Ok(())
}
pub async fn balance_of(conn: &mut PgConnection, user_id: Uuid) -> Result<i64, ApiError> {
let (balance,): (i64,) =
sqlx::query_as("SELECT COALESCE(SUM(delta), 0)::bigint FROM credit_ledger WHERE user_id = $1")
.bind(user_id)
.fetch_one(conn)
.await?;
Ok(balance)
}
/// Current balance including this month's allowance.
pub async fn balance(pool: &PgPool, user_id: Uuid, monthly: i32) -> Result<i64, ApiError> {
let mut conn = pool.acquire().await?;
ensure_monthly_grant(&mut conn, user_id, monthly).await?;
balance_of(&mut conn, user_id).await
}
/// Spends `cost` credits inside the caller's transaction. The user row is
/// locked so concurrent requests cannot overspend.
pub async fn spend(
tx: &mut PgConnection,
user_id: Uuid,
cost: i32,
monthly: i32,
reason: &str,
analysis_id: Option<Uuid>,
) -> Result<(), ApiError> {
if cost <= 0 {
return Ok(());
}
sqlx::query("SELECT id FROM users WHERE id = $1 FOR UPDATE").bind(user_id).execute(&mut *tx).await?;
ensure_monthly_grant(tx, user_id, monthly).await?;
let balance = balance_of(tx, user_id).await?;
if balance < i64::from(cost) {
return Err(ApiError::InsufficientCredits { needed: cost, balance });
}
sqlx::query("INSERT INTO credit_ledger (id, user_id, delta, reason, analysis_id) VALUES ($1, $2, $3, $4, $5)")
.bind(Uuid::now_v7())
.bind(user_id)
.bind(-cost)
.bind(reason)
.bind(analysis_id)
.execute(tx)
.await?;
Ok(())
}
+10 -2
View File
@@ -16,6 +16,9 @@ pub enum ApiError {
InvalidCredentials(String),
#[error("{0}")]
Forbidden(String),
/// Refused, with a code the frontend acts on (e.g. `not_invited`).
#[error("{message}")]
Refused { code: &'static str, message: String },
#[error("{0} not found")]
NotFound(&'static str),
#[error("{message}")]
@@ -24,10 +27,13 @@ pub enum ApiError {
Gone(String),
#[error("the link is invalid or has expired")]
InvalidToken,
#[error("not enough credits: {needed} needed, {balance} available")]
InsufficientCredits { needed: i32, balance: i64 },
#[error("no {unit} analysis left (balance {balance})")]
InsufficientCredits { unit: &'static str, balance: i64 },
#[error("too many attempts; try again later")]
TooManyRequests,
/// A usage limit; the message is shown to the user as is.
#[error("{message}")]
Limited { code: &'static str, message: String },
/// Birth data rejected by the horoscope service; its error object is passed through.
#[error("invalid birth data")]
BirthData { status: StatusCode, body: Value },
@@ -48,12 +54,14 @@ impl ApiError {
ApiError::Unauthorized => (StatusCode::UNAUTHORIZED, "unauthorized"),
ApiError::InvalidCredentials(_) => (StatusCode::UNAUTHORIZED, "invalid_credentials"),
ApiError::Forbidden(_) => (StatusCode::FORBIDDEN, "forbidden"),
ApiError::Refused { code, .. } => (StatusCode::FORBIDDEN, code),
ApiError::NotFound(_) => (StatusCode::NOT_FOUND, "not_found"),
ApiError::Conflict { code, .. } => (StatusCode::CONFLICT, code),
ApiError::Gone(_) => (StatusCode::GONE, "gone"),
ApiError::InvalidToken => (StatusCode::BAD_REQUEST, "invalid_token"),
ApiError::InsufficientCredits { .. } => (StatusCode::PAYMENT_REQUIRED, "insufficient_credits"),
ApiError::TooManyRequests => (StatusCode::TOO_MANY_REQUESTS, "too_many_requests"),
ApiError::Limited { code, .. } => (StatusCode::TOO_MANY_REQUESTS, code),
ApiError::BirthData { status, .. } => (*status, "invalid_birth_data"),
ApiError::HoroscopeUnavailable(_) => (StatusCode::BAD_GATEWAY, "horoscope_unavailable"),
ApiError::Internal(_) => (StatusCode::INTERNAL_SERVER_ERROR, "internal_error"),
+4 -1
View File
@@ -8,10 +8,13 @@
//! `backend healthcheck` performs a local health check (for Docker).
mod auth;
mod birth_changes;
mod config;
mod credits;
mod error;
mod google;
mod packages;
mod persons;
mod routes;
#[cfg(test)]
mod tests;
@@ -59,7 +62,7 @@ async fn main() -> anyhow::Result<()> {
service_kit::init_logging();
let config = Config::from_env()?;
let pool = db::connect(&config.database_url).await.context("connecting to the database")?;
db::MIGRATOR.run(&pool).await.context("running database migrations")?;
db::migrate(&pool).await.context("running database migrations")?;
tracing::info!(
google_login = !config.google_client_ids.is_empty(),
horoscope_api = %config.horoscope_api_url,
+285
View File
@@ -0,0 +1,285 @@
//! Packages: what a user can buy (or an admin can give). The catalog is
//! fixed here; see `docs/csomagok.md` for the reasoning behind it.
//!
//! A package gives analysis units and person slots (`credit_ledger` rows
//! with reason `package`) that never expire, or a time-limited `unlimited`
//! entitlement: analyses and persons without limit, with a daily fair-use cap.
use serde_json::{Value, json};
use sqlx::PgConnection;
use time::OffsetDateTime;
use uuid::Uuid;
use crate::credits::Unit;
use crate::error::ApiError;
/// List prices of the single items, for showing what a package saves.
const NATAL_PRICE: i64 = 2_990;
const SYNASTRY_PRICE: i64 = 3_490;
const PERSON_PRICE: i64 = 398; // 1 990 Ft for five
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum Tier {
/// The main ladder, shown side by side.
Main,
/// Top-ups for those who already have something.
Addon,
}
#[derive(Debug, Clone, Copy)]
pub struct Package {
pub id: &'static str,
pub name: &'static str,
pub tagline: &'static str,
pub tier: Tier,
/// Gross price (27% VAT included).
pub price_huf: i64,
pub natal: i64,
pub synastry: i64,
pub persons: i64,
/// Months of unlimited analyses and persons.
pub unlimited_months: Option<i64>,
/// Badge on the card ("Legnépszerűbb").
pub badge: Option<&'static str>,
}
pub const CATALOG: [Package; 6] = [
Package {
id: "single",
name: "Egy elemzés",
tagline: "Egy részletes képletelemzés: neked vagy egy felvett személynek.",
tier: Tier::Main,
price_huf: 2_990,
natal: 1,
synastry: 0,
persons: 0,
unlimited_months: None,
badge: None,
},
Package {
id: "couple",
name: "Páros",
tagline: "Te és ő: mindkettőtök képlete és a kapcsolati elemzés.",
tier: Tier::Main,
price_huf: 6_990,
natal: 2,
synastry: 1,
persons: 1,
unlimited_months: None,
badge: None,
},
Package {
id: "family",
name: "Család",
tagline: "Az egész család: öt személy, mindenki képlete, és öt kapcsolat.",
tier: Tier::Main,
price_huf: 11_990,
natal: 6,
synastry: 5,
persons: 5,
unlimited_months: None,
badge: Some("Legnépszerűbb"),
},
Package {
id: "unlimited",
name: "Korlátlan",
tagline: "Egy évig bárki, bármennyi elemzés és összevetés.",
tier: Tier::Main,
price_huf: 17_990,
natal: 0,
synastry: 0,
persons: 0,
unlimited_months: Some(12),
badge: None,
},
Package {
id: "addon_synastry",
name: "+1 kapcsolati elemzés",
tagline: "Egy újabb összevetés részletes elemzése.",
tier: Tier::Addon,
price_huf: 3_490,
natal: 0,
synastry: 1,
persons: 0,
unlimited_months: None,
badge: None,
},
Package {
id: "addon_persons",
name: "+5 személy",
tagline: "Még öt ember képlete (az elemzés külön jár).",
tier: Tier::Addon,
price_huf: 1_990,
natal: 0,
synastry: 0,
persons: 5,
unlimited_months: None,
badge: None,
},
];
pub fn find(id: &str) -> Option<&'static Package> {
CATALOG.iter().find(|p| p.id == id)
}
impl Package {
/// What the contents would cost one by one (`None` for the unlimited one).
fn list_price(&self) -> Option<i64> {
self.unlimited_months
.is_none()
.then(|| self.natal * NATAL_PRICE + self.synastry * SYNASTRY_PRICE + self.persons * PERSON_PRICE)
}
pub fn view(&self) -> Value {
let analyses = self.natal + self.synastry;
let savings = self
.list_price()
.filter(|&list| list > self.price_huf)
.map(|list| ((list - self.price_huf) * 100 + list / 2) / list);
json!({
"id": self.id,
"name": self.name,
"tagline": self.tagline,
"tier": match self.tier { Tier::Main => "main", Tier::Addon => "addon" },
"price_huf": self.price_huf,
"natal": self.natal,
"synastry": self.synastry,
"persons": self.persons,
"unlimited_months": self.unlimited_months,
"badge": self.badge,
"list_price_huf": self.list_price(),
"savings_percent": savings,
"per_analysis_huf": (analyses > 0).then(|| (self.price_huf + analyses / 2) / analyses),
})
}
}
/// Who gives the package.
#[derive(Debug, Clone, Copy)]
pub enum Source {
Admin,
Mock,
}
impl Source {
fn as_str(self) -> &'static str {
match self {
Source::Admin => "admin",
Source::Mock => "mock",
}
}
}
/// Records an order and gives its contents, inside the caller's transaction.
pub async fn grant(
tx: &mut PgConnection,
user_id: Uuid,
package: &Package,
source: Source,
created_by: Option<Uuid>,
note: Option<&str>,
) -> Result<Uuid, ApiError> {
let order = Uuid::now_v7();
let price = match source {
Source::Admin => 0,
Source::Mock => package.price_huf,
};
sqlx::query(
"INSERT INTO package_orders (id, user_id, package, source, price_huf, note, created_by) \
VALUES ($1, $2, $3, $4, $5, $6, $7)",
)
.bind(order)
.bind(user_id)
.bind(package.id)
.bind(source.as_str())
.bind(price as i32)
.bind(note)
.bind(created_by)
.execute(&mut *tx)
.await?;
for (unit, n) in [(Unit::Natal, package.natal), (Unit::Synastry, package.synastry), (Unit::Person, package.persons)]
{
if n == 0 {
continue;
}
sqlx::query(
"INSERT INTO credit_ledger (id, user_id, unit, delta, reason, order_id, note, created_by) \
VALUES ($1, $2, $3, $4, 'package', $5, $6, $7)",
)
.bind(Uuid::now_v7())
.bind(user_id)
.bind(unit.as_str())
.bind(n as i32)
.bind(order)
.bind(package.name)
.bind(created_by)
.execute(&mut *tx)
.await?;
}
if let Some(months) = package.unlimited_months {
// Buying again extends from the current end, not from today.
sqlx::query(
"INSERT INTO entitlements (user_id, entitlement, note, created_by, expires_at) \
VALUES ($1, 'unlimited', $2, $3, now() + make_interval(months => $4)) \
ON CONFLICT (user_id, entitlement) DO UPDATE SET \
expires_at = greatest(entitlements.expires_at, now()) + make_interval(months => $4), \
note = EXCLUDED.note, created_by = EXCLUDED.created_by",
)
.bind(user_id)
.bind(package.name)
.bind(created_by)
.bind(months as i32)
.execute(&mut *tx)
.await?;
}
Ok(order)
}
/// Until when the user's unlimited package runs (`None`: none, or it ended).
pub async fn unlimited_until(conn: &mut PgConnection, user_id: Uuid) -> Result<Option<OffsetDateTime>, ApiError> {
let until: Option<OffsetDateTime> = sqlx::query_scalar(
"SELECT expires_at FROM entitlements \
WHERE user_id = $1 AND entitlement = 'unlimited' AND expires_at > now()",
)
.bind(user_id)
.fetch_optional(conn)
.await?
.flatten();
Ok(until)
}
/// The fair-use cap of the unlimited package: new detailed analyses in 24 hours.
pub async fn check_fair_use(conn: &mut PgConnection, user_id: Uuid, daily_limit: i64) -> Result<(), ApiError> {
let (count,): (i64,) = sqlx::query_as(
"SELECT count(*) FROM analyses WHERE requested_by = $1 AND kind IN ('natal', 'synastry') \
AND created_at > now() - interval '24 hours'",
)
.bind(user_id)
.fetch_one(conn)
.await?;
if count >= daily_limit {
return Err(ApiError::Limited {
code: "fair_use_limit",
message: format!(
"A korlátlan csomaggal naponta legfeljebb {daily_limit} új részletes elemzés kérhető. Holnap folytathatod."
),
});
}
Ok(())
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn bigger_packages_are_cheaper_per_analysis() {
let per = |id: &str| find(id).unwrap().view()["per_analysis_huf"].as_i64().unwrap();
assert!(per("single") > per("couple") && per("couple") > per("family"));
assert_eq!(find("family").unwrap().view()["savings_percent"], 68);
assert_eq!(find("couple").unwrap().view()["savings_percent"], 29);
assert!(find("single").unwrap().view()["savings_percent"].is_null());
assert!(find("unlimited").unwrap().view()["list_price_huf"].is_null());
assert!(CATALOG.iter().all(|p| find(p.id).is_some()));
}
}
+92
View File
@@ -0,0 +1,92 @@
//! Persons: charts of other people (name and birth data) a user adds next to
//! their own. Each new person uses one `person` unit, bought in packages;
//! deleting a person does not give it back. The `unlimited_persons`
//! entitlement, a running unlimited package and admins have no limit.
//!
//! A person's birth data can be corrected within an hour of adding them,
//! then it is locked (admins: any time).
use serde_json::{Value, json};
use sqlx::PgConnection;
use time::{Duration, OffsetDateTime};
use uuid::Uuid;
use crate::auth::AuthUser;
use crate::error::ApiError;
use db::Role;
/// How long after adding a person their birth data can be corrected.
pub const EDIT_WINDOW: Duration = Duration::hours(1);
pub const LIMIT_MESSAGE: &str = "Elérted a felvehető személyek számát. További személyekhez bővítsd a csomagodat.";
pub const LOCKED_MESSAGE: &str = "A személy születési adatai csak a felvételt követő egy órán belül javíthatók.";
/// A user's person slots.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub struct Slots {
/// Persons added so far (deleted ones included).
pub used: i64,
/// Free slots plus the bought (or granted) ones.
pub granted: i64,
pub unlimited: bool,
}
impl Slots {
/// Slots left; `None`: no limit.
pub fn left(self) -> Option<i64> {
(!self.unlimited).then(|| (self.granted - self.used).max(0))
}
pub fn view(self) -> Value {
json!({
"used": self.used,
"limit": (!self.unlimited).then_some(self.granted),
"left": self.left(),
"unlimited": self.unlimited,
})
}
}
pub async fn slots(conn: &mut PgConnection, auth: &AuthUser, free: i64) -> Result<Slots, ApiError> {
let (used, bought, entitled): (i64, i64, bool) = sqlx::query_as(
"SELECT \
(SELECT COUNT(*) FROM credit_ledger WHERE user_id = $1 AND unit = 'person' AND reason = 'person'), \
(SELECT COALESCE(SUM(delta), 0)::bigint FROM credit_ledger \
WHERE user_id = $1 AND unit = 'person' AND reason <> 'person'), \
EXISTS (SELECT 1 FROM entitlements WHERE user_id = $1 \
AND (entitlement = 'unlimited_persons' OR (entitlement = 'unlimited' AND expires_at > now())))",
)
.bind(auth.id())
.fetch_one(conn)
.await?;
Ok(Slots { used, granted: free + bought, unlimited: entitled || auth.user.has_role(Role::Admin) })
}
/// Fails when no slot is left (a quick check before calculating a chart).
pub async fn check(conn: &mut PgConnection, auth: &AuthUser, free: i64) -> Result<(), ApiError> {
if slots(conn, auth, free).await?.left() == Some(0) {
return Err(ApiError::conflict("person_limit_reached", LIMIT_MESSAGE));
}
Ok(())
}
/// Uses a slot for the new person `chart_id`, inside the transaction that
/// saves it. The user row is locked, so parallel saves cannot overspend.
pub async fn spend(tx: &mut PgConnection, auth: &AuthUser, free: i64, chart_id: Uuid) -> Result<(), ApiError> {
sqlx::query("SELECT id FROM users WHERE id = $1 FOR UPDATE").bind(auth.id()).execute(&mut *tx).await?;
check(tx, auth, free).await?;
sqlx::query(
"INSERT INTO credit_ledger (id, user_id, unit, delta, reason, chart_id) VALUES ($1, $2, 'person', -1, 'person', $3)",
)
.bind(Uuid::now_v7())
.bind(auth.id())
.bind(chart_id)
.execute(tx)
.await?;
Ok(())
}
/// Whether the birth data of a person added at `created_at` can still be corrected.
pub fn editable(auth: &AuthUser, created_at: OffsetDateTime, now: OffsetDateTime) -> bool {
auth.user.has_role(Role::Admin) || now - created_at < EDIT_WINDOW
}
+18 -12
View File
@@ -28,12 +28,19 @@ pub async fn me(State(state): St, auth: AuthUser) -> ApiResult<Json<Value>> {
.bind(auth.id())
.fetch_optional(&state.db)
.await?;
let balance = credits::balance(&state.db, auth.id(), state.config.monthly_free_credits).await?;
let mut conn = state.db.acquire().await?;
let balance = credits::balance(&mut conn, auth.id()).await?;
let birth_change = crate::birth_changes::view(&mut conn, &auth).await?;
let persons = crate::persons::slots(&mut conn, &auth, state.config.free_person_slots).await?;
let unlimited = crate::packages::unlimited_until(&mut conn, auth.id()).await?;
Ok(Json(json!({
"user": UserView::from(&auth.user),
"providers": providers.into_iter().map(|(p,)| p).collect::<Vec<_>>(),
"primary_chart_id": primary.map(|(id,)| id),
"credits": balance,
"analyses_left": balance.view(),
"birth_change": birth_change,
"persons": persons.view(),
"unlimited_until": rfc3339_opt(unlimited),
})))
}
@@ -85,6 +92,7 @@ pub async fn change_password(
auth: AuthUser,
WithRejection(Json(req), _): Body<ChangePassword>,
) -> ApiResult<StatusCode> {
super::auth::password_login_enabled(&state)?;
validate_password(&req.new_password)?;
let existing: Option<(String,)> =
sqlx::query_as("SELECT password_hash FROM auth_identities WHERE user_id = $1 AND provider = 'password'")
@@ -111,22 +119,20 @@ pub async fn change_password(
}
pub async fn credits(State(state): St, auth: AuthUser) -> ApiResult<Json<Value>> {
let balance = credits::balance(&state.db, auth.id(), state.config.monthly_free_credits).await?;
type Row = (Uuid, i32, String, Option<String>, Option<Uuid>, Option<String>, OffsetDateTime);
let balance = credits::balance(&mut *state.db.acquire().await?, auth.id()).await?;
type Row = (Uuid, String, i32, String, Option<Uuid>, Option<String>, OffsetDateTime);
let ledger: Vec<Row> = sqlx::query_as(
"SELECT id, delta, reason, period, analysis_id, note, created_at FROM credit_ledger \
"SELECT id, unit, delta, reason, analysis_id, note, created_at FROM credit_ledger \
WHERE user_id = $1 ORDER BY created_at DESC LIMIT 100",
)
.bind(auth.id())
.fetch_all(&state.db)
.await?;
Ok(Json(json!({
"balance": balance,
"monthly_free_credits": state.config.monthly_free_credits,
"analysis_cost": state.config.analysis_cost,
"period": credits::current_period(),
"ledger": ledger.into_iter().map(|(id, delta, reason, period, analysis_id, note, at)| json!({
"id": id, "delta": delta, "reason": reason, "period": period,
"balance": balance.view(),
"analysis_model": state.config.analysis_model,
"ledger": ledger.into_iter().map(|(id, unit, delta, reason, analysis_id, note, at)| json!({
"id": id, "unit": unit, "delta": delta, "reason": reason,
"analysis_id": analysis_id, "note": note, "created_at": rfc3339(at),
})).collect::<Vec<_>>(),
})))
@@ -152,7 +158,7 @@ pub async fn export(State(state): St, auth: AuthUser) -> ApiResult<impl IntoResp
"synastries": rows("SELECT json_build_object('id', s.id, 'owner_id', s.owner_id, 'chart1_id', s.chart1_id, 'chart2_id', s.chart2_id, 'result', s.result, 'created_at', s.created_at) FROM synastries s JOIN charts c1 ON c1.id = s.chart1_id JOIN charts c2 ON c2.id = s.chart2_id WHERE s.owner_id = $1 OR c1.owner_id = $1 OR c2.owner_id = $1").await?,
"invites": rows("SELECT json_build_object('id', id, 'chart_id', inviter_chart_id, 'message', message, 'created_at', created_at, 'expires_at', expires_at, 'accepted_at', accepted_at) FROM synastry_invites WHERE inviter_id = $1").await?,
"analyses": rows("SELECT json_build_object('id', a.id, 'kind', a.kind, 'chart_id', a.chart_id, 'synastry_id', a.synastry_id, 'language', a.language, 'model', a.model, 'status', a.status, 'content', a.content, 'created_at', a.created_at) FROM analyses a WHERE a.requested_by = $1 OR a.chart_id IN (SELECT id FROM charts WHERE owner_id = $1)").await?,
"credit_ledger": rows("SELECT json_build_object('delta', delta, 'reason', reason, 'period', period, 'note', note, 'created_at', created_at) FROM credit_ledger WHERE user_id = $1 ORDER BY created_at").await?,
"credit_ledger": rows("SELECT json_build_object('unit', unit, 'delta', delta, 'reason', reason, 'note', note, 'created_at', created_at) FROM credit_ledger WHERE user_id = $1 ORDER BY created_at").await?,
"shares": rows("SELECT json_build_object('slug', slug, 'kind', kind, 'title', title, 'show_birth_data', show_birth_data, 'view_count', view_count, 'created_at', created_at, 'revoked_at', revoked_at) FROM shares WHERE owner_id = $1").await?,
});
Ok(([("content-disposition", "attachment; filename=\"sorsfonalak-export.json\"")], Json(document)))
+62 -11
View File
@@ -12,7 +12,9 @@ use uuid::Uuid;
use super::{Body, IdPath, St};
use crate::auth::AdminUser;
use crate::credits::{self, Unit};
use crate::error::{ApiError, ApiResult};
use crate::packages::{self, Source};
use crate::views::{rfc3339, rfc3339_opt};
#[derive(Deserialize)]
@@ -31,11 +33,26 @@ pub async fn list_users(
let limit = query.limit.unwrap_or(50).clamp(1, 200);
let offset = query.offset.unwrap_or(0).max(0);
let pattern = query.q.as_deref().map(|q| format!("%{}%", q.trim().replace(['%', '_'], "")));
type Row = (Uuid, String, Option<String>, Vec<String>, bool, OffsetDateTime, Option<OffsetDateTime>, i64, i64);
type Row = (
Uuid,
String,
Option<String>,
Vec<String>,
bool,
OffsetDateTime,
Option<OffsetDateTime>,
i64,
i64,
i64,
Option<OffsetDateTime>,
);
let rows: Vec<Row> = sqlx::query_as(
"SELECT u.id, u.email, u.display_name, u.roles, u.email_verified_at IS NOT NULL, u.created_at, u.last_login_at, \
(SELECT count(*) FROM charts c WHERE c.owner_id = u.id), \
(SELECT COALESCE(SUM(delta), 0)::bigint FROM credit_ledger l WHERE l.user_id = u.id) \
(SELECT COALESCE(SUM(delta), 0)::bigint FROM credit_ledger l WHERE l.user_id = u.id AND l.unit = 'natal'), \
(SELECT COALESCE(SUM(delta), 0)::bigint FROM credit_ledger l WHERE l.user_id = u.id AND l.unit = 'synastry'), \
(SELECT e.expires_at FROM entitlements e \
WHERE e.user_id = u.id AND e.entitlement = 'unlimited' AND e.expires_at > now()) \
FROM users u \
WHERE $1::text IS NULL OR u.email ILIKE $1 OR u.display_name ILIKE $1 \
ORDER BY u.created_at DESC LIMIT $2 OFFSET $3",
@@ -47,11 +64,12 @@ pub async fn list_users(
.await?;
let users: Vec<Value> = rows
.into_iter()
.map(|(id, email, name, roles, verified, created, last_login, charts, credits)| {
.map(|(id, email, name, roles, verified, created, last_login, charts, natal, synastry, unlimited)| {
json!({
"id": id, "email": email, "display_name": name, "roles": roles, "email_verified": verified,
"created_at": rfc3339(created), "last_login_at": rfc3339_opt(last_login),
"charts": charts, "credits": credits,
"charts": charts, "analyses_left": {"natal": natal, "synastry": synastry},
"unlimited_until": rfc3339_opt(unlimited),
})
})
.collect();
@@ -93,6 +111,7 @@ pub async fn update_user(
#[derive(Deserialize)]
#[serde(deny_unknown_fields)]
pub struct AdjustCredits {
unit: Unit,
/// Positive to add, negative to take away.
delta: i32,
note: Option<String>,
@@ -111,19 +130,51 @@ pub async fn adjust_credits(
sqlx::query_as("SELECT id FROM users WHERE id = $1").bind(id).fetch_optional(&state.db).await?;
exists.ok_or(ApiError::NotFound("user"))?;
sqlx::query(
"INSERT INTO credit_ledger (id, user_id, delta, reason, note, created_by) VALUES ($1, $2, $3, 'admin_adjust', $4, $5)",
"INSERT INTO credit_ledger (id, user_id, unit, delta, reason, note, created_by) \
VALUES ($1, $2, $3, $4, 'admin_adjust', $5, $6)",
)
.bind(Uuid::now_v7())
.bind(id)
.bind(req.unit.as_str())
.bind(req.delta)
.bind(req.note.map(|n| n.chars().take(500).collect::<String>()))
.bind(admin.id())
.execute(&state.db)
.await?;
let (balance,): (i64,) =
sqlx::query_as("SELECT COALESCE(SUM(delta), 0)::bigint FROM credit_ledger WHERE user_id = $1")
.bind(id)
.fetch_one(&state.db)
.await?;
Ok((StatusCode::CREATED, Json(json!({ "user_id": id, "balance": balance }))))
let balance = credits::balance(&mut *state.db.acquire().await?, id).await?;
Ok((StatusCode::CREATED, Json(json!({ "user_id": id, "analyses_left": balance.view() }))))
}
#[derive(Deserialize)]
#[serde(deny_unknown_fields)]
pub struct GrantPackage {
package: String,
note: Option<String>,
}
/// Gives a user a package from the catalog (a gift: no payment, price 0).
pub async fn grant_package(
State(state): St,
AdminUser(admin): AdminUser,
WithRejection(Path(id), _): IdPath,
WithRejection(Json(req), _): Body<GrantPackage>,
) -> ApiResult<(StatusCode, Json<Value>)> {
let package = packages::find(&req.package).ok_or(ApiError::NotFound("package"))?;
let exists: Option<(Uuid,)> =
sqlx::query_as("SELECT id FROM users WHERE id = $1").bind(id).fetch_optional(&state.db).await?;
exists.ok_or(ApiError::NotFound("user"))?;
let note = req.note.map(|n| n.trim().chars().take(500).collect::<String>()).filter(|n| !n.is_empty());
let mut tx = state.db.begin().await?;
let order = packages::grant(&mut tx, id, package, Source::Admin, Some(admin.id()), note.as_deref()).await?;
let balance = credits::balance(&mut tx, id).await?;
let unlimited = packages::unlimited_until(&mut tx, id).await?;
tx.commit().await?;
tracing::info!(admin = %admin.id(), user = %id, package = package.id, "package granted");
Ok((
StatusCode::CREATED,
Json(json!({
"order_id": order, "user_id": id, "package": package.id,
"analyses_left": balance.view(), "unlimited_until": rfc3339_opt(unlimited),
})),
))
}
+85 -29
View File
@@ -1,9 +1,13 @@
//! Text analyses (LLM) of charts and synastries.
//!
//! A request creates a `pending` analysis and spends credits; the worker
//! A request creates a `pending` analysis and spends one unit of its kind
//! (`natal` or `synastry`, see [`credits`]; admins pay nothing); the worker
//! writes the text later. A finished analysis with the same cache key (same
//! chart or synastry hash, prompt version, model and language) is copied
//! instead, free of charge, so the same chart is never paid for twice.
//!
//! Every saved chart also gets a free short summary (`summary` kind, written
//! by `SUMMARY_MODEL`); the detailed analyses are paid.
use axum::Json;
use axum::body::Bytes;
@@ -17,14 +21,16 @@ use time::OffsetDateTime;
use uuid::Uuid;
use super::auth::validate_locale;
use super::charts::{find_chart, owned_chart};
use super::charts::{ChartRow, find_chart, owned_chart};
use super::synastries::{load_synastry, visible_synastry};
use super::{IdPath, St};
use crate::AppState;
use crate::auth::AuthUser;
use crate::credits;
use crate::credits::{self, Unit};
use crate::error::{ApiError, ApiResult};
use crate::packages;
use crate::views::{rfc3339, rfc3339_opt, sha256_hex};
use db::Role;
#[derive(Debug, Clone, sqlx::FromRow)]
pub struct AnalysisRow {
@@ -90,8 +96,6 @@ pub async fn can_see(db: &PgPool, analysis: &AnalysisRow, user: Uuid) -> Result<
pub struct AnalysisRequest {
/// Defaults to the user's locale.
language: Option<String>,
/// One of the configured models; defaults to the first.
model: Option<String>,
}
/// The request body is optional: empty means all defaults.
@@ -104,6 +108,7 @@ fn optional_body(body: &[u8]) -> Result<AnalysisRequest, ApiError> {
enum Target {
Natal { chart_id: Uuid, hash: String },
Summary { chart_id: Uuid, hash: String },
Synastry { synastry_id: Uuid, hash: String },
}
@@ -114,19 +119,50 @@ async fn request(
req: AnalysisRequest,
) -> ApiResult<(StatusCode, Json<Value>)> {
let language = validate_locale(state, Some(req.language.as_deref().unwrap_or(&auth.user.locale)))?;
let model = req.model.unwrap_or_else(|| state.config.llm_models[0].clone());
if !state.config.llm_models.contains(&model) {
return Err(ApiError::BadRequest(format!(
"unknown model '{model}'; available: {}",
state.config.llm_models.join(", ")
)));
}
let (kind, hash, chart_id, synastry_id) = match &target {
// Admins and a running unlimited package (within its daily cap) use no unit.
let admin = auth.user.has_role(Role::Admin);
let unlimited = !admin && {
let mut conn = state.db.acquire().await?;
let until = packages::unlimited_until(&mut conn, auth.id()).await?;
if until.is_some() {
packages::check_fair_use(&mut conn, auth.id(), state.config.unlimited_daily_limit).await?;
}
until.is_some()
};
let unit = match target {
_ if admin || unlimited => None,
Target::Synastry { .. } => Some(Unit::Synastry),
_ => Some(Unit::Natal),
};
let model = state.config.analysis_model.clone();
let (status, row) = queue(state, auth.id(), &target, &language, &model, unit).await?;
Ok((status, Json(row.view())))
}
/// Returns the existing analysis with the same cache key for this target,
/// copies a finished one from another chart with the same data, or queues a
/// new one (spending one `unit`, if given). 200, 201 and 202 respectively.
async fn queue(
state: &AppState,
user: Uuid,
target: &Target,
language: &str,
model: &str,
unit: Option<Unit>,
) -> Result<(StatusCode, AnalysisRow), ApiError> {
let (kind, hash, chart_id, synastry_id) = match target {
Target::Natal { chart_id, hash } => ("natal", hash, Some(*chart_id), None),
Target::Summary { chart_id, hash } => ("summary", hash, Some(*chart_id), None),
Target::Synastry { synastry_id, hash } => ("synastry", hash, None, Some(*synastry_id)),
};
let prompt_version = &state.config.prompt_version;
let cache_key = sha256_hex(&format!("{kind}|{hash}|{prompt_version}|{model}|{language}"));
// The cache key leaves out the admin-edited prompt revision, so a chart keeps
// its analysis when the prompt changes; copying from another chart needs the same revision.
let base_version = &state.config.prompt_version;
let cache_key = sha256_hex(&format!("{kind}|{hash}|{base_version}|{model}|{language}"));
let prompt_version = &match super::prompts::current_revision(&state.db, kind, language).await? {
Some(id) => format!("{base_version}-r{id}"),
None => base_version.clone(),
};
// Already requested for this chart/synastry: return it.
let existing: Option<AnalysisRow> = sqlx::query_as(&format!(
@@ -140,7 +176,7 @@ async fn request(
.fetch_optional(&state.db)
.await?;
if let Some(row) = existing {
return Ok((StatusCode::OK, Json(row.view())));
return Ok((StatusCode::OK, row));
}
let insert = format!(
@@ -152,9 +188,11 @@ async fn request(
// The same chart elsewhere (another user, same birth data) was already analysed: copy it.
let cached: Option<(Value, Option<i32>, Option<i32>)> = sqlx::query_as(
"SELECT content, input_tokens, output_tokens FROM analyses WHERE cache_key = $1 AND status = 'done' LIMIT 1",
"SELECT content, input_tokens, output_tokens FROM analyses \
WHERE cache_key = $1 AND prompt_version = $2 AND status = 'done' LIMIT 1",
)
.bind(&cache_key)
.bind(prompt_version)
.fetch_optional(&state.db)
.await?;
if let Some((content, input_tokens, output_tokens)) = cached {
@@ -163,9 +201,9 @@ async fn request(
.bind(kind)
.bind(chart_id)
.bind(synastry_id)
.bind(auth.id())
.bind(&language)
.bind(&model)
.bind(user)
.bind(language)
.bind(model)
.bind(prompt_version)
.bind(&cache_key)
.bind("done")
@@ -176,33 +214,51 @@ async fn request(
.bind(OffsetDateTime::now_utc())
.fetch_one(&state.db)
.await?;
return Ok((StatusCode::CREATED, Json(row.view())));
return Ok((StatusCode::CREATED, row));
}
// New analysis: spend credits and queue it for the worker.
let cost = state.config.analysis_cost;
// New analysis: spend a unit and queue it for the worker.
let mut tx = state.db.begin().await?;
let row: AnalysisRow = sqlx::query_as(&insert)
.bind(id)
.bind(kind)
.bind(chart_id)
.bind(synastry_id)
.bind(auth.id())
.bind(&language)
.bind(&model)
.bind(user)
.bind(language)
.bind(model)
.bind(prompt_version)
.bind(&cache_key)
.bind("pending")
.bind(None::<Value>)
.bind(None::<i32>)
.bind(None::<i32>)
.bind(cost)
.bind(i32::from(unit.is_some()))
.bind(None::<OffsetDateTime>)
.fetch_one(&mut *tx)
.await?;
credits::spend(&mut tx, auth.id(), cost, state.config.monthly_free_credits, "analysis", Some(id)).await?;
if let Some(unit) = unit {
credits::spend(&mut tx, user, unit, id).await?;
}
tx.commit().await?;
Ok((StatusCode::ACCEPTED, Json(row.view())))
Ok((StatusCode::ACCEPTED, row))
}
/// The free short summary of a chart (in the owner's language): queued if
/// it does not exist yet or the last attempt failed.
pub async fn ensure_summary(state: &AppState, owner: &AuthUser, chart: &ChartRow) -> Result<AnalysisRow, ApiError> {
let target = Target::Summary { chart_id: chart.id, hash: chart.chart_hash.clone() };
let model = state.config.summary_model.clone();
Ok(queue(state, owner.id(), &target, &owner.user.locale, &model, None).await?.1)
}
pub async fn summary_for_chart(
State(state): St,
auth: AuthUser,
WithRejection(Path(id), _): IdPath,
) -> ApiResult<Json<Value>> {
let chart = owned_chart(&state.db, id, auth.id()).await?;
Ok(Json(ensure_summary(&state, &auth, &chart).await?.view()))
}
async fn list_where(db: &PgPool, column: &str, id: Uuid) -> Result<Json<Value>, ApiError> {
+37 -4
View File
@@ -113,16 +113,28 @@ async fn consume_token(conn: &mut PgConnection, token: &str, purpose: &str) -> R
row.map(|(id,)| id).ok_or(ApiError::InvalidToken)
}
/// Queues an e-mail for the worker.
/// Queues an e-mail to a user for the worker.
pub async fn queue_email(conn: &mut PgConnection, user: &User, template: &str, payload: Value) -> Result<(), ApiError> {
queue_email_to(conn, Some(user.id), &user.email, template, &user.locale, payload).await
}
/// Queues an e-mail to any address (e.g. an invitation) for the worker.
pub async fn queue_email_to(
conn: &mut PgConnection,
user_id: Option<Uuid>,
to: &str,
template: &str,
locale: &str,
payload: Value,
) -> Result<(), ApiError> {
sqlx::query(
"INSERT INTO email_outbox (id, user_id, to_email, template, locale, payload) VALUES ($1, $2, $3, $4, $5, $6)",
)
.bind(Uuid::now_v7())
.bind(user.id)
.bind(&user.email)
.bind(user_id)
.bind(to)
.bind(template)
.bind(&user.locale)
.bind(locale)
.bind(payload)
.execute(conn)
.await?;
@@ -156,6 +168,17 @@ pub struct RegisterRequest {
password: String,
display_name: Option<String>,
locale: Option<String>,
/// The invitation link's token, while sign-up needs an invitation.
invite_token: Option<String>,
}
/// Password endpoints answer 403 while `PASSWORD_LOGIN` is off.
pub fn password_login_enabled(state: &crate::AppState) -> Result<(), ApiError> {
if state.config.password_login {
Ok(())
} else {
Err(ApiError::Forbidden("e-mail and password login is disabled; use Google, Apple or Facebook".into()))
}
}
pub async fn register(
@@ -164,6 +187,7 @@ pub async fn register(
jar: CookieJar,
WithRejection(Json(req), _): Body<RegisterRequest>,
) -> ApiResult<impl IntoResponse> {
password_login_enabled(&state)?;
let email = normalize_email(&req.email)?;
validate_password(&req.password)?;
let locale = validate_locale(&state, req.locale.as_deref())?;
@@ -175,6 +199,7 @@ pub async fn register(
if exists.is_some() {
return Err(ApiError::conflict("email_taken", "an account with this e-mail address already exists"));
}
super::invitations::admit(&state, &mut tx, &email, req.invite_token.as_deref()).await?;
let user_id = Uuid::now_v7();
sqlx::query("INSERT INTO users (id, email, display_name, locale) VALUES ($1, $2, $3, $4)")
.bind(user_id)
@@ -191,6 +216,7 @@ pub async fn register(
.bind(&email)
.execute(&mut *tx)
.await?;
super::invitations::mark_accepted(&mut tx, user_id, &email, req.invite_token.as_deref()).await?;
let mut user = load_user(&mut tx, user_id).await?;
apply_bootstrap_admin(&state, &mut tx, &mut user).await?;
queue_verification(&state, &mut tx, &user).await?;
@@ -213,6 +239,7 @@ pub async fn login(
jar: CookieJar,
WithRejection(Json(req), _): Body<LoginRequest>,
) -> ApiResult<impl IntoResponse> {
password_login_enabled(&state)?;
let invalid = || ApiError::InvalidCredentials("wrong e-mail address or password".into());
let email = normalize_email(&req.email).map_err(|_| invalid())?;
state.login_limiter.check(&email)?;
@@ -255,6 +282,8 @@ pub async fn login(
pub struct GoogleRequest {
/// ID token (JWT) from Google Identity Services.
id_token: String,
/// The invitation link's token, while sign-up needs an invitation.
invite_token: Option<String>,
}
/// Logs in with Google. An unknown Google account is linked to the existing
@@ -300,6 +329,7 @@ pub async fn google(
(id, false)
}
None => {
super::invitations::admit(&state, &mut tx, &email, req.invite_token.as_deref()).await?;
let id = Uuid::now_v7();
let locale = claims
.locale
@@ -317,6 +347,7 @@ pub async fn google(
.bind(locale)
.execute(&mut *tx)
.await?;
super::invitations::mark_accepted(&mut tx, id, &email, req.invite_token.as_deref()).await?;
(id, true)
}
};
@@ -394,6 +425,7 @@ pub async fn request_password_reset(
State(state): St,
WithRejection(Json(req), _): Body<ResetRequest>,
) -> ApiResult<StatusCode> {
password_login_enabled(&state)?;
let Ok(email) = normalize_email(&req.email) else { return Ok(StatusCode::ACCEPTED) };
let mut tx = state.db.begin().await?;
let user: Option<User> = sqlx::query_as(&format!("SELECT {USER_COLUMNS} FROM users WHERE email = $1"))
@@ -422,6 +454,7 @@ pub async fn confirm_password_reset(
State(state): St,
WithRejection(Json(req), _): Body<ResetConfirmRequest>,
) -> ApiResult<StatusCode> {
password_login_enabled(&state)?;
validate_password(&req.password)?;
let hash = hash_password(req.password).await?;
let mut tx = state.db.begin().await?;
+170 -14
View File
@@ -1,5 +1,6 @@
//! Natal charts of a user: their own (primary) chart and charts of others
//! they entered (partner, family). Calculated by the horoscope service.
//! Natal charts of a user: their own chart (kind `own`; the current one is
//! primary) and charts of other people they added (kind `person`, see
//! [`crate::persons`]). Calculated by the horoscope service.
use axum::Json;
use axum::extract::State;
@@ -14,7 +15,9 @@ use uuid::Uuid;
use super::{Body, IdPath, St};
use crate::AppState;
use crate::auth::AuthUser;
use crate::birth_changes;
use crate::error::{ApiError, ApiResult};
use crate::persons;
use crate::views::{chart_hash, chart_highlights, rfc3339};
#[derive(Debug, Clone, sqlx::FromRow)]
@@ -23,6 +26,8 @@ pub struct ChartRow {
pub owner_id: Uuid,
pub label: String,
pub is_primary: bool,
/// `own` or `person`.
pub kind: String,
pub birth_data: Value,
pub result: Value,
pub chart_hash: String,
@@ -30,7 +35,8 @@ pub struct ChartRow {
pub updated_at: OffsetDateTime,
}
const CHART_COLUMNS: &str = "id, owner_id, label, is_primary, birth_data, result, chart_hash, created_at, updated_at";
const CHART_COLUMNS: &str =
"id, owner_id, label, is_primary, kind, birth_data, result, chart_hash, created_at, updated_at";
impl ChartRow {
/// Full view for the owner.
@@ -39,6 +45,8 @@ impl ChartRow {
"id": self.id,
"label": self.label,
"is_primary": self.is_primary,
"kind": self.kind,
"editable_until": self.editable_until().map(rfc3339),
"birth_data": self.birth_data,
"highlights": chart_highlights(&self.result),
"chart": self.result,
@@ -48,11 +56,23 @@ impl ChartRow {
})
}
/// Until when a person's birth data can be corrected (admins: any time).
fn editable_until(&self) -> Option<OffsetDateTime> {
(self.kind == "person").then(|| self.created_at + persons::EDIT_WINDOW)
}
pub fn summary_view(&self) -> Value {
json!({
"id": self.id,
"label": self.label,
"is_primary": self.is_primary,
"kind": self.kind,
"editable_until": self.editable_until().map(rfc3339),
"birth": {
"date": self.birth_data.get("date"),
"time": self.birth_data.get("time"),
"place": self.result.pointer("/location/place/name"),
},
"highlights": chart_highlights(&self.result),
"created_at": rfc3339(self.created_at),
})
@@ -106,22 +126,69 @@ pub struct CreateChart {
/// Calculates a chart from birth data; the `name` field is dropped so no
/// personal name reaches the calculation (or, later, the LLM).
pub async fn calculate(state: &AppState, birth: Value) -> Result<(Value, Value, String), ApiError> {
let Value::Object(mut birth) = birth else {
return Err(ApiError::BadRequest("birth must be an object".into()));
};
birth.remove("name");
let birth = Value::Object(birth);
let birth = clean_birth(birth)?;
let result = state.horoscope.natal(&birth).await?;
let hash = chart_hash(&result);
Ok((birth, result, hash))
}
/// Queues the free short summary; a failure here does not fail the save
/// (the chart page asks for the summary again).
async fn queue_summary(state: &AppState, auth: &AuthUser, chart: &ChartRow) {
if let Err(e) = super::analyses::ensure_summary(state, auth, chart).await {
tracing::warn!(chart = %chart.id, error = %e, "queueing the chart summary failed");
}
}
fn clean_birth(birth: Value) -> Result<Value, ApiError> {
let Value::Object(mut birth) = birth else {
return Err(ApiError::BadRequest("birth must be an object".into()));
};
birth.remove("name");
Ok(Value::Object(birth))
}
/// Saves a new chart. If the user already has a chart with exactly the same
/// birth data, that one is returned (and made primary if asked) instead of
/// calculating it again. Replacing the user's own chart counts against the
/// birth data change limit ([`birth_changes`]).
pub async fn create(
State(state): St,
auth: AuthUser,
WithRejection(Json(req), _): Body<CreateChart>,
) -> ApiResult<(StatusCode, Json<Value>)> {
let label = clean_label(&req.label)?;
let birth = clean_birth(req.birth)?;
let kind = if req.is_primary { "own" } else { "person" };
let existing: Option<ChartRow> = sqlx::query_as(&format!(
"SELECT {CHART_COLUMNS} FROM charts WHERE owner_id = $1 AND kind = $2 AND birth_data = $3 LIMIT 1"
))
.bind(auth.id())
.bind(kind)
.bind(&birth)
.fetch_optional(&state.db)
.await?;
if let Some(chart) = existing {
if req.is_primary && !chart.is_primary {
let mut tx = state.db.begin().await?;
sqlx::query("UPDATE charts SET is_primary = false, updated_at = now() WHERE owner_id = $1 AND is_primary")
.bind(auth.id())
.execute(&mut *tx)
.await?;
let row: ChartRow = sqlx::query_as(&format!(
"UPDATE charts SET is_primary = true, updated_at = now() WHERE id = $1 RETURNING {CHART_COLUMNS}"
))
.bind(chart.id)
.fetch_one(&mut *tx)
.await?;
birth_changes::record(&mut tx, &auth, row.id).await?;
tx.commit().await?;
queue_summary(&state, &auth, &row).await;
return Ok((StatusCode::OK, Json(row.owner_view())));
}
queue_summary(&state, &auth, &chart).await;
return Ok((StatusCode::OK, Json(chart.owner_view())));
}
let (count,): (i64,) =
sqlx::query_as("SELECT count(*) FROM charts WHERE owner_id = $1").bind(auth.id()).fetch_one(&state.db).await?;
if count >= state.config.max_charts_per_user {
@@ -130,7 +197,11 @@ pub async fn create(
format!("at most {} charts can be saved", state.config.max_charts_per_user),
));
}
let (birth, result, hash) = calculate(&state, req.birth).await?;
let free = state.config.free_person_slots;
if kind == "person" {
persons::check(&mut *state.db.acquire().await?, &auth, free).await?;
}
let (birth, result, hash) = calculate(&state, birth).await?;
let mut tx = state.db.begin().await?;
if req.is_primary {
@@ -140,19 +211,26 @@ pub async fn create(
.await?;
}
let row: ChartRow = sqlx::query_as(&format!(
"INSERT INTO charts (id, owner_id, label, is_primary, birth_data, result, chart_hash) \
VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING {CHART_COLUMNS}"
"INSERT INTO charts (id, owner_id, label, is_primary, kind, birth_data, result, chart_hash) \
VALUES ($1, $2, $3, $4, $5, $6, $7, $8) RETURNING {CHART_COLUMNS}"
))
.bind(Uuid::now_v7())
.bind(auth.id())
.bind(label)
.bind(req.is_primary)
.bind(kind)
.bind(birth)
.bind(result)
.bind(hash)
.fetch_one(&mut *tx)
.await?;
if req.is_primary {
birth_changes::record(&mut tx, &auth, row.id).await?;
} else {
persons::spend(&mut tx, &auth, free, row.id).await?;
}
tx.commit().await?;
queue_summary(&state, &auth, &row).await;
Ok((StatusCode::CREATED, Json(row.owner_view())))
}
@@ -169,10 +247,14 @@ pub async fn get_one(
pub struct UpdateChart {
label: Option<String>,
is_primary: Option<bool>,
/// Corrected birth data of a person, within an hour of adding them
/// (admins: any time). The user's own data is changed by saving a new
/// own chart instead (analyses belong to the old one).
birth: Option<Value>,
}
/// Renames the chart or changes which chart is the user's own. Birth data is
/// not editable: a corrected chart is a new chart (analyses belong to the old one).
/// Renames the chart, changes which chart is the user's own (a person made
/// primary becomes `own`) or corrects a person's birth data.
pub async fn update(
State(state): St,
auth: AuthUser,
@@ -185,7 +267,33 @@ pub async fn update(
None => chart.label.clone(),
};
let is_primary = req.is_primary.unwrap_or(chart.is_primary);
// The same birth data again (e.g. only the name changed): no recalculation,
// and the analyses and comparisons stay. A new calculation that gives the
// same chart keeps them too.
let birth = req.birth.map(clean_birth).transpose()?.filter(|b| *b != chart.birth_data);
let recalculated = match birth {
Some(birth) => Some(corrected_birth(&state, &auth, &chart, birth).await?),
None => None,
};
let chart_changed = recalculated.as_ref().is_some_and(|(_, _, hash)| *hash != chart.chart_hash);
let mut tx = state.db.begin().await?;
if let Some((birth, result, hash)) = &recalculated {
if chart_changed {
// The old summary, the comparisons (and an admin's analyses) no longer match the chart.
sqlx::query("DELETE FROM analyses WHERE chart_id = $1").bind(id).execute(&mut *tx).await?;
sqlx::query("DELETE FROM synastries WHERE chart1_id = $1 OR chart2_id = $1")
.bind(id)
.execute(&mut *tx)
.await?;
}
sqlx::query("UPDATE charts SET birth_data = $1, result = $2, chart_hash = $3 WHERE id = $4")
.bind(birth)
.bind(result)
.bind(hash)
.bind(id)
.execute(&mut *tx)
.await?;
}
if is_primary && !chart.is_primary {
sqlx::query("UPDATE charts SET is_primary = false, updated_at = now() WHERE owner_id = $1 AND is_primary")
.bind(auth.id())
@@ -193,17 +301,65 @@ pub async fn update(
.await?;
}
let row: ChartRow = sqlx::query_as(&format!(
"UPDATE charts SET label = $1, is_primary = $2, updated_at = now() WHERE id = $3 RETURNING {CHART_COLUMNS}"
"UPDATE charts SET label = $1, is_primary = $2, kind = CASE WHEN $2 THEN 'own' ELSE kind END, \
updated_at = now() WHERE id = $3 RETURNING {CHART_COLUMNS}"
))
.bind(label)
.bind(is_primary)
.bind(id)
.fetch_one(&mut *tx)
.await?;
if is_primary && !chart.is_primary {
birth_changes::record(&mut tx, &auth, id).await?;
}
tx.commit().await?;
if chart_changed {
queue_summary(&state, &auth, &row).await;
}
Ok(Json(row.owner_view()))
}
/// Checks that a person's birth data may still be corrected and calculates the new chart.
async fn corrected_birth(
state: &AppState,
auth: &AuthUser,
chart: &ChartRow,
birth: Value,
) -> Result<(Value, Value, String), ApiError> {
if chart.kind != "person" {
return Err(ApiError::BadRequest("the own birth data is changed by saving a new own chart".into()));
}
if !persons::editable(auth, chart.created_at, OffsetDateTime::now_utc()) {
return Err(ApiError::conflict("person_locked", persons::LOCKED_MESSAGE));
}
let admin = auth.user.has_role(db::Role::Admin);
// The user's own comparisons with the person are deleted on correction (they
// no longer match), unless a paid analysis was written for one of them.
let (analysed, foreign_synastry): (bool, bool) = sqlx::query_as(
"SELECT EXISTS (SELECT 1 FROM analyses WHERE chart_id = $1 AND kind <> 'summary' AND status <> 'failed') \
OR EXISTS (SELECT 1 FROM analyses a JOIN synastries s ON s.id = a.synastry_id \
WHERE (s.chart1_id = $1 OR s.chart2_id = $1) AND a.status <> 'failed'), \
EXISTS (SELECT 1 FROM synastries WHERE (chart1_id = $1 OR chart2_id = $1) AND owner_id <> $2)",
)
.bind(chart.id)
.bind(auth.id())
.fetch_one(&state.db)
.await?;
if analysed && !admin {
return Err(ApiError::conflict(
"person_analysed",
"Ehhez a személyhez már készült részletes elemzés, ezért az adatai nem módosíthatók.",
));
}
if foreign_synastry {
return Err(ApiError::conflict(
"person_in_synastry",
"A személy szerepel valaki más összevetésében, ezért az adatai nem módosíthatók.",
));
}
calculate(state, birth).await
}
/// Deletes the chart with its synastries, analyses and shares.
pub async fn remove(
State(state): St,
+547
View File
@@ -0,0 +1,547 @@
//! Invitations to the closed site.
//!
//! While `SIGNUP_MODE=invite`, a new account needs an open invitation for its
//! e-mail address, or an invitation link (then any address will do, because
//! people often sign in with another Google account than the one their friend
//! knows). Only administrators invite; the worker sends the e-mails.
//!
//! People who asked for no more invitations are kept as the hash of their
//! address. People without an invitation can join the waitlist.
use axum::Json;
use axum::extract::{Path, Query, State};
use axum::http::StatusCode;
use axum_extra::extract::WithRejection;
use serde::Deserialize;
use serde_json::{Value, json};
use sqlx::PgConnection;
use time::OffsetDateTime;
use uuid::Uuid;
use super::auth::{normalize_email, queue_email_to, validate_locale};
use super::{Body, IdPath, St};
use crate::AppState;
use crate::auth::AdminUser;
use crate::config::SignupMode;
use crate::error::{ApiError, ApiResult};
use crate::views::{rfc3339, rfc3339_opt};
pub const INVITATION_TTL: time::Duration = time::Duration::days(30);
/// A resend is possible this often, and at most this many sendings in all.
const RESEND_GAP: time::Duration = time::Duration::hours(24);
const MAX_SENDINGS: i32 = 3;
const MAX_MESSAGE_CHARS: usize = 300;
const MAX_BATCH: usize = 50;
// --- the gate -------------------------------------------------------------------------------
/// Whether a new account may be created for `email` (with the invitation link
/// `token`, if the visitor came through one).
pub async fn admit(
state: &AppState,
conn: &mut PgConnection,
email: &str,
token: Option<&str>,
) -> Result<(), ApiError> {
if state.config.signup_mode == SignupMode::Open || state.config.bootstrap_admin_emails.iter().any(|e| e == email) {
return Ok(());
}
let hash = token.map(|t| db::token_hash(t.trim()));
let invited: bool = sqlx::query_scalar(
"SELECT EXISTS (SELECT 1 FROM invitations i WHERE i.accepted_at IS NULL AND i.revoked_at IS NULL \
AND i.expires_at > now() \
AND (i.email = $1 OR i.id IN (SELECT invitation_id FROM invitation_tokens WHERE token_hash = $2))) \
-- a \"how compatible are we?\" link also lets the invitee in
OR EXISTS (SELECT 1 FROM synastry_invites WHERE token_hash = $2 AND accepted_at IS NULL AND expires_at > now())",
)
.bind(email)
.bind(hash)
.fetch_one(&mut *conn)
.await?;
if invited {
Ok(())
} else {
Err(ApiError::Refused {
code: "not_invited",
message: "A Sorsfonalak jelenleg meghívásos: ehhez az e-mail-címhez nem tartozik meghívó.".into(),
})
}
}
/// After a new account is created: its invitations count as accepted, and it leaves the waitlist.
pub async fn mark_accepted(
conn: &mut PgConnection,
user_id: Uuid,
email: &str,
token: Option<&str>,
) -> Result<(), ApiError> {
let hash = token.map(|t| db::token_hash(t.trim()));
sqlx::query(
"UPDATE invitations SET accepted_at = now(), accepted_by = $1 \
WHERE accepted_at IS NULL AND revoked_at IS NULL \
AND (email = $2 OR (expires_at > now() AND id IN (SELECT invitation_id FROM invitation_tokens WHERE token_hash = $3)))",
)
.bind(user_id)
.bind(email)
.bind(hash)
.execute(&mut *conn)
.await?;
sqlx::query("DELETE FROM waitlist WHERE email = $1").bind(email).execute(&mut *conn).await?;
Ok(())
}
// --- sending ---------------------------------------------------------------------------------
fn clean_message(message: Option<String>) -> Result<Option<String>, ApiError> {
let Some(message) = message.map(|m| m.replace("\r\n", "\n").trim().to_owned()).filter(|m| !m.is_empty()) else {
return Ok(None);
};
if message.chars().count() > MAX_MESSAGE_CHARS {
return Err(ApiError::BadRequest(format!("A személyes üzenet legfeljebb {MAX_MESSAGE_CHARS} karakter lehet.")));
}
// Links in a mail from our domain are what spammers would use this field for.
let lower = message.to_lowercase();
if lower.contains("://") || lower.contains("www.") {
return Err(ApiError::BadRequest("A személyes üzenetben nem lehet link.".into()));
}
Ok(Some(message))
}
fn links(state: &AppState, token: &str) -> (String, String, String) {
let base = &state.config.public_base_url;
(
format!("{base}/meghivo/{token}"),
format!("{base}/leiratkozas?token={token}"),
format!("{base}/api/v1/public/invitations/unsubscribe?token={token}"),
)
}
fn payload(
state: &AppState,
token: &str,
inviter: Option<&str>,
message: Option<&str>,
expires: OffsetDateTime,
) -> Value {
let (url, unsubscribe_url, unsubscribe_post_url) = links(state, token);
json!({
"url": url,
"unsubscribe_url": unsubscribe_url,
"unsubscribe_post_url": unsubscribe_post_url,
"inviter_name": inviter,
"message": message,
"expires_on": expires.date().to_string(),
})
}
/// Issues a new link token for an invitation and queues the e-mail; returns the link.
#[allow(clippy::too_many_arguments)]
async fn send(
state: &AppState,
conn: &mut PgConnection,
id: Uuid,
email: &str,
locale: &str,
inviter: Option<&str>,
message: Option<&str>,
expires: OffsetDateTime,
) -> Result<String, ApiError> {
let token = db::new_token();
sqlx::query("INSERT INTO invitation_tokens (token_hash, invitation_id) VALUES ($1, $2)")
.bind(db::token_hash(&token))
.bind(id)
.execute(&mut *conn)
.await?;
let payload = payload(state, &token, inviter, message, expires);
let url = payload["url"].as_str().unwrap_or_default().to_owned();
queue_email_to(conn, None, email, "invitation", locale, payload).await?;
Ok(url)
}
async fn opted_out(conn: &mut PgConnection, email: &str) -> Result<bool, ApiError> {
Ok(sqlx::query_scalar("SELECT EXISTS (SELECT 1 FROM email_optouts WHERE email_hash = $1)")
.bind(db::token_hash(email))
.fetch_one(conn)
.await?)
}
// --- admin ------------------------------------------------------------------------------------
#[derive(Deserialize)]
#[serde(deny_unknown_fields)]
pub struct CreateInvitations {
emails: Vec<String>,
message: Option<String>,
locale: Option<String>,
}
/// Invites a list of addresses. Each gets a result: `invited` (with the
/// link, to pass on by hand if needed), `already_user`, `already_invited`,
/// `opted_out` or `invalid`.
pub async fn create(
State(state): St,
AdminUser(admin): AdminUser,
WithRejection(Json(req), _): Body<CreateInvitations>,
) -> ApiResult<(StatusCode, Json<Value>)> {
if req.emails.is_empty() || req.emails.len() > MAX_BATCH {
return Err(ApiError::BadRequest(format!("1–{MAX_BATCH} e-mail-cím adható meg egyszerre.")));
}
let message = clean_message(req.message)?;
let locale = validate_locale(&state, req.locale.as_deref())?;
let inviter = admin.user.display_name.clone();
let mut results = Vec::new();
let mut seen = std::collections::HashSet::new();
let mut tx = state.db.begin().await?;
for raw in &req.emails {
let raw = raw.trim();
let Ok(email) = normalize_email(raw) else {
results.push(json!({ "email": raw, "status": "invalid" }));
continue;
};
if !seen.insert(email.clone()) {
continue;
}
let user: bool = sqlx::query_scalar("SELECT EXISTS (SELECT 1 FROM users WHERE email = $1)")
.bind(&email)
.fetch_one(&mut *tx)
.await?;
if user {
results.push(json!({ "email": email, "status": "already_user" }));
continue;
}
if opted_out(&mut tx, &email).await? {
results.push(json!({ "email": email, "status": "opted_out" }));
continue;
}
// An expired open invitation gives way to the new one.
sqlx::query(
"UPDATE invitations SET revoked_at = now() \
WHERE email = $1 AND accepted_at IS NULL AND revoked_at IS NULL AND expires_at <= now()",
)
.bind(&email)
.execute(&mut *tx)
.await?;
let id = Uuid::now_v7();
let expires = OffsetDateTime::now_utc() + INVITATION_TTL;
let inserted = sqlx::query(
"INSERT INTO invitations (id, email, message, locale, invited_by, expires_at) \
VALUES ($1, $2, $3, $4, $5, $6) ON CONFLICT DO NOTHING",
)
.bind(id)
.bind(&email)
.bind(&message)
.bind(&locale)
.bind(admin.id())
.bind(expires)
.execute(&mut *tx)
.await?
.rows_affected();
if inserted == 0 {
results.push(json!({ "email": email, "status": "already_invited" }));
continue;
}
let url = send(&state, &mut tx, id, &email, &locale, inviter.as_deref(), message.as_deref(), expires).await?;
results.push(json!({ "email": email, "status": "invited", "id": id, "url": url }));
}
tx.commit().await?;
Ok((StatusCode::CREATED, Json(json!({ "results": results }))))
}
#[derive(sqlx::FromRow)]
struct Row {
id: Uuid,
email: String,
message: Option<String>,
locale: String,
created_at: OffsetDateTime,
expires_at: OffsetDateTime,
sent_count: i32,
last_sent_at: OffsetDateTime,
accepted_at: Option<OffsetDateTime>,
revoked_at: Option<OffsetDateTime>,
invited_by_name: Option<String>,
accepted_by_name: Option<String>,
mail_created_at: Option<OffsetDateTime>,
mail_sent_at: Option<OffsetDateTime>,
mail_failed_at: Option<OffsetDateTime>,
mail_error: Option<String>,
}
fn status(accepted: Option<OffsetDateTime>, revoked: Option<OffsetDateTime>, expires: OffsetDateTime) -> &'static str {
if accepted.is_some() {
"accepted"
} else if revoked.is_some() {
"revoked"
} else if expires <= OffsetDateTime::now_utc() {
"expired"
} else {
"pending"
}
}
/// Every invitation (newest first) with the state of its last e-mail, and the waitlist.
pub async fn list(State(state): St, _admin: AdminUser) -> ApiResult<Json<Value>> {
let rows: Vec<Row> = sqlx::query_as(
"SELECT i.id, i.email, i.message, i.locale, i.created_at, i.expires_at, i.sent_count, i.last_sent_at, \
i.accepted_at, i.revoked_at, inv.display_name AS invited_by_name, \
coalesce(acc.display_name, acc.email) AS accepted_by_name, \
m.created_at AS mail_created_at, m.sent_at AS mail_sent_at, m.failed_at AS mail_failed_at, m.last_error AS mail_error \
FROM invitations i \
LEFT JOIN users inv ON inv.id = i.invited_by \
LEFT JOIN users acc ON acc.id = i.accepted_by \
LEFT JOIN LATERAL (SELECT created_at, sent_at, failed_at, last_error FROM email_outbox \
WHERE to_email = i.email AND template = 'invitation' \
ORDER BY created_at DESC LIMIT 1) m ON true \
ORDER BY i.created_at DESC LIMIT 500",
)
.fetch_all(&state.db)
.await?;
let now = OffsetDateTime::now_utc();
let invitations: Vec<Value> = rows
.into_iter()
.map(|r| {
let status = status(r.accepted_at, r.revoked_at, r.expires_at);
// Sent e-mails are removed from the outbox after a week.
let mail = match (r.mail_created_at, r.mail_sent_at, r.mail_failed_at) {
(None, _, _) => "archived",
(_, Some(_), _) => "sent",
(_, None, Some(_)) => "failed",
_ => "queued",
};
let can_resend = matches!(status, "pending" | "expired")
&& r.sent_count < MAX_SENDINGS
&& r.last_sent_at + RESEND_GAP <= now;
json!({
"id": r.id, "email": r.email, "message": r.message, "locale": r.locale, "status": status,
"created_at": rfc3339(r.created_at), "expires_at": rfc3339(r.expires_at),
"sent_count": r.sent_count, "last_sent_at": rfc3339(r.last_sent_at),
"accepted_at": rfc3339_opt(r.accepted_at), "accepted_by": r.accepted_by_name,
"invited_by": r.invited_by_name,
"mail": mail, "mail_error": r.mail_error, "can_resend": can_resend,
})
})
.collect();
let waitlist: Vec<(String, String, OffsetDateTime, Option<String>)> = sqlx::query_as(
"SELECT w.email, w.locale, w.created_at, \
(SELECT CASE WHEN accepted_at IS NOT NULL THEN 'accepted' WHEN expires_at > now() THEN 'pending' END \
FROM invitations WHERE email = w.email AND revoked_at IS NULL ORDER BY created_at DESC LIMIT 1) \
FROM waitlist w ORDER BY w.created_at",
)
.fetch_all(&state.db)
.await?;
let waitlist: Vec<Value> = waitlist
.into_iter()
.map(|(email, locale, created, invitation)| {
json!({ "email": email, "locale": locale, "created_at": rfc3339(created), "invitation": invitation })
})
.collect();
Ok(Json(
json!({ "invitations": invitations, "waitlist": waitlist, "signup_mode": state.config.signup_mode.as_str() }),
))
}
/// Sends the invitation again with a new link (the earlier links keep
/// working), and gives it another 30 days.
pub async fn resend(
State(state): St,
AdminUser(admin): AdminUser,
WithRejection(Path(id), _): IdPath,
) -> ApiResult<Json<Value>> {
let mut tx = state.db.begin().await?;
#[derive(sqlx::FromRow)]
struct Open {
email: String,
message: Option<String>,
locale: String,
sent_count: i32,
last_sent_at: OffsetDateTime,
closed: bool,
}
let Open { email, message, locale, sent_count, last_sent_at: last_sent, closed } = sqlx::query_as(
"SELECT email, message, locale, sent_count, last_sent_at, \
accepted_at IS NOT NULL OR revoked_at IS NOT NULL AS closed \
FROM invitations WHERE id = $1 FOR UPDATE",
)
.bind(id)
.fetch_optional(&mut *tx)
.await?
.ok_or(ApiError::NotFound("invitation"))?;
if closed {
return Err(ApiError::conflict("invitation_closed", "Ezt a meghívót már elfogadták vagy visszavonták."));
}
if sent_count >= MAX_SENDINGS {
return Err(ApiError::conflict(
"resend_limit",
format!("Egy meghívó legfeljebb {MAX_SENDINGS}-szor küldhető el (spamvédelem)."),
));
}
if last_sent + RESEND_GAP > OffsetDateTime::now_utc() {
return Err(ApiError::conflict("resend_too_soon", "Újraküldés legkorábban 24 órával az előző küldés után."));
}
if opted_out(&mut tx, &email).await? {
return Err(ApiError::conflict("opted_out", "Ez a cím leiratkozott a meghívókról."));
}
let expires = OffsetDateTime::now_utc() + INVITATION_TTL;
sqlx::query(
"UPDATE invitations SET sent_count = sent_count + 1, last_sent_at = now(), expires_at = $2 WHERE id = $1",
)
.bind(id)
.bind(expires)
.execute(&mut *tx)
.await?;
let inviter = admin.user.display_name.clone();
let url = send(&state, &mut tx, id, &email, &locale, inviter.as_deref(), message.as_deref(), expires).await?;
tx.commit().await?;
Ok(Json(json!({ "id": id, "url": url, "expires_at": rfc3339(expires) })))
}
pub async fn revoke(State(state): St, _admin: AdminUser, WithRejection(Path(id), _): IdPath) -> ApiResult<StatusCode> {
let done = sqlx::query(
"UPDATE invitations SET revoked_at = now() WHERE id = $1 AND accepted_at IS NULL AND revoked_at IS NULL",
)
.bind(id)
.execute(&state.db)
.await?
.rows_affected();
if done == 0 {
return Err(ApiError::NotFound("open invitation"));
}
Ok(StatusCode::NO_CONTENT)
}
pub async fn remove_from_waitlist(
State(state): St,
_admin: AdminUser,
WithRejection(Path(email), _): WithRejection<Path<String>, ApiError>,
) -> ApiResult<StatusCode> {
sqlx::query("DELETE FROM waitlist WHERE email = $1").bind(email.trim().to_lowercase()).execute(&state.db).await?;
Ok(StatusCode::NO_CONTENT)
}
#[derive(Deserialize)]
#[serde(deny_unknown_fields)]
pub struct PreviewRequest {
message: Option<String>,
locale: Option<String>,
/// Also send it to the admin's own address.
#[serde(default)]
send_to_me: bool,
}
/// The invitation e-mail with sample links (they lead nowhere), and
/// optionally a test copy to the admin.
pub async fn preview(
State(state): St,
AdminUser(admin): AdminUser,
WithRejection(Json(req), _): Body<PreviewRequest>,
) -> ApiResult<Json<Value>> {
let message = clean_message(req.message)?;
let locale = validate_locale(&state, req.locale.as_deref())?;
let payload = payload(
&state,
"minta",
admin.user.display_name.as_deref(),
message.as_deref(),
OffsetDateTime::now_utc() + INVITATION_TTL,
);
let mail = email_templates::render("invitation", &locale, &payload)
.map_err(|e| ApiError::Internal(format!("invitation template: {e}")))?;
if req.send_to_me {
let mut conn = state.db.acquire().await?;
queue_email_to(&mut conn, Some(admin.id()), &admin.user.email, "invitation", &locale, payload).await?;
}
Ok(Json(json!({
"subject": mail.subject, "text": mail.text, "html": mail.html,
"sent_to": req.send_to_me.then_some(&admin.user.email),
})))
}
// --- public -------------------------------------------------------------------------------------
/// Landing data of an invitation link.
pub async fn public_view(State(state): St, Path(token): Path<String>) -> ApiResult<Json<Value>> {
#[derive(sqlx::FromRow)]
struct Landing {
inviter: Option<String>,
message: Option<String>,
expires_at: OffsetDateTime,
accepted_at: Option<OffsetDateTime>,
revoked_at: Option<OffsetDateTime>,
}
let l: Landing = sqlx::query_as(
"SELECT u.display_name AS inviter, i.message, i.expires_at, i.accepted_at, i.revoked_at \
FROM invitation_tokens t JOIN invitations i ON i.id = t.invitation_id \
LEFT JOIN users u ON u.id = i.invited_by WHERE t.token_hash = $1",
)
.bind(db::token_hash(token.trim()))
.fetch_optional(&state.db)
.await?
.ok_or(ApiError::NotFound("invitation"))?;
Ok(Json(json!({
"inviter_name": l.inviter,
"message": l.message,
"status": status(l.accepted_at, l.revoked_at, l.expires_at),
"expires_at": rfc3339(l.expires_at),
})))
}
#[derive(Deserialize)]
pub struct TokenQuery {
token: String,
}
/// "No more invitations": from the page behind the footer link, or straight
/// from the mail client's unsubscribe button (RFC 8058 one-click POST).
pub async fn unsubscribe(
State(state): St,
WithRejection(Query(q), _): WithRejection<Query<TokenQuery>, ApiError>,
) -> ApiResult<Json<Value>> {
let mut tx = state.db.begin().await?;
let email: Option<String> = sqlx::query_scalar(
"SELECT i.email FROM invitation_tokens t JOIN invitations i ON i.id = t.invitation_id WHERE t.token_hash = $1",
)
.bind(db::token_hash(q.token.trim()))
.fetch_optional(&mut *tx)
.await?;
let email = email.ok_or(ApiError::NotFound("invitation"))?;
sqlx::query("INSERT INTO email_optouts (email_hash) VALUES ($1) ON CONFLICT DO NOTHING")
.bind(db::token_hash(&email))
.execute(&mut *tx)
.await?;
sqlx::query(
"UPDATE invitations SET revoked_at = now() WHERE email = $1 AND accepted_at IS NULL AND revoked_at IS NULL",
)
.bind(&email)
.execute(&mut *tx)
.await?;
tx.commit().await?;
Ok(Json(json!({ "unsubscribed": true })))
}
#[derive(Deserialize)]
#[serde(deny_unknown_fields)]
pub struct WaitlistRequest {
email: String,
locale: Option<String>,
}
/// Joins the waitlist. Always answers the same, so it does not reveal who has an account.
pub async fn join_waitlist(
State(state): St,
WithRejection(Json(req), _): Body<WaitlistRequest>,
) -> ApiResult<(StatusCode, Json<Value>)> {
let email = normalize_email(&req.email)?;
let locale = validate_locale(&state, req.locale.as_deref())?;
sqlx::query(
"INSERT INTO waitlist (email, locale) SELECT $1, $2 \
WHERE NOT EXISTS (SELECT 1 FROM users WHERE email = $1) \
AND (SELECT count(*) FROM waitlist) < 10000 \
ON CONFLICT DO NOTHING",
)
.bind(&email)
.bind(&locale)
.execute(&state.db)
.await?;
Ok((StatusCode::ACCEPTED, Json(json!({ "ok": true }))))
}
+25 -3
View File
@@ -10,6 +10,9 @@ mod admin;
mod analyses;
mod auth;
mod charts;
mod invitations;
mod payments;
mod prompts;
mod shares;
mod synastries;
@@ -48,6 +51,7 @@ pub fn router(state: Arc<AppState>) -> Router {
Router::new()
.route("/healthz", get(health))
.route("/v1/config", get(public_config))
.route("/v1/packages", get(payments::catalog))
// login
.route("/v1/auth/register", post(auth::register))
.route("/v1/auth/login", post(auth::login))
@@ -63,10 +67,12 @@ pub fn router(state: Arc<AppState>) -> Router {
.route("/v1/me/password", post(account::change_password))
.route("/v1/me/export", get(account::export))
.route("/v1/credits", get(account::credits))
.route("/v1/payments/mock", post(payments::mock))
// charts
.route("/v1/charts", get(charts::list).post(charts::create))
.route("/v1/charts/{id}", get(charts::get_one).patch(charts::update).delete(charts::remove))
.route("/v1/charts/{id}/analyses", get(analyses::list_for_chart).post(analyses::request_for_chart))
.route("/v1/charts/{id}/summary", post(analyses::summary_for_chart))
// synastries and invitations
.route("/v1/synastries", get(synastries::list).post(synastries::create))
.route("/v1/synastries/{id}", get(synastries::get_one).delete(synastries::remove))
@@ -82,10 +88,23 @@ pub fn router(state: Arc<AppState>) -> Router {
// public, no login
.route("/v1/public/shares/{slug}", get(shares::public_view))
.route("/v1/public/invites/{token}", get(synastries::public_invite))
.route("/v1/public/invitations/unsubscribe", post(invitations::unsubscribe))
.route("/v1/public/invitations/{token}", get(invitations::public_view))
.route("/v1/public/waitlist", post(invitations::join_waitlist))
// administration
.route("/v1/admin/users", get(admin::list_users))
.route("/v1/admin/users/{id}", patch(admin::update_user))
.route("/v1/admin/users/{id}/credits", post(admin::adjust_credits))
.route("/v1/admin/users/{id}/packages", post(admin::grant_package))
.route("/v1/admin/invitations", get(invitations::list).post(invitations::create))
.route("/v1/admin/invitations/preview", post(invitations::preview))
.route("/v1/admin/invitations/{id}", delete(invitations::revoke))
.route("/v1/admin/invitations/{id}/resend", post(invitations::resend))
.route("/v1/admin/waitlist/{email}", delete(invitations::remove_from_waitlist))
.route("/v1/admin/prompts", get(prompts::list))
.route("/v1/admin/prompts/{kind}/{language}", axum::routing::put(prompts::save))
.route("/v1/admin/prompts/{kind}/{language}/preview", post(prompts::start_preview))
.route("/v1/admin/previews/{id}", get(prompts::get_preview))
.layer(cors(&state.config.cors_allowed_origins))
.layer(
TraceLayer::new_for_http()
@@ -115,9 +134,12 @@ async fn public_config(State(state): St) -> Json<Value> {
Json(json!({
"google_login": { "enabled": state.google.enabled(), "client_id": c.google_client_ids.first() },
"locales": c.supported_locales,
"llm_models": c.llm_models,
"analysis_cost": c.analysis_cost,
"monthly_free_credits": c.monthly_free_credits,
"analysis_model": c.analysis_model,
"summary_model": c.summary_model,
"password_login": c.password_login,
"mock_payments": c.mock_payments,
"unlimited_daily_limit": c.unlimited_daily_limit,
"signup_mode": c.signup_mode.as_str(),
"password_min_length": crate::auth::MIN_PASSWORD_LEN,
}))
}
+68
View File
@@ -0,0 +1,68 @@
//! Packages and payments. Until Stripe is connected, `MOCK_PAYMENTS=true`
//! turns on a stand-in: "paying" grants the package right away, so the paid
//! flow can be used end to end.
use axum::Json;
use axum::extract::State;
use axum_extra::extract::WithRejection;
use serde::Deserialize;
use serde_json::{Value, json};
use super::{Body, St};
use crate::auth::AuthUser;
use crate::credits::{self, Unit};
use crate::error::{ApiError, ApiResult};
use crate::packages::{self, CATALOG, Source};
use crate::persons;
use crate::views::rfc3339;
/// The package catalog (public).
pub async fn catalog() -> Json<Value> {
Json(json!({ "packages": CATALOG.iter().map(packages::Package::view).collect::<Vec<_>>() }))
}
#[derive(Deserialize)]
#[serde(deny_unknown_fields)]
pub struct MockPayment {
/// A package id from the catalog.
package: Option<String>,
/// Shorthand: the cheapest package with one unit of this kind.
unit: Option<Unit>,
}
/// What the user has now: units left, person slots, the unlimited package.
pub async fn holdings(state: &crate::AppState, auth: &AuthUser) -> Result<Value, ApiError> {
let mut conn = state.db.acquire().await?;
let balance = credits::balance(&mut conn, auth.id()).await?;
let persons = persons::slots(&mut conn, auth, state.config.free_person_slots).await?;
let until = packages::unlimited_until(&mut conn, auth.id()).await?;
Ok(json!({
"analyses_left": balance.view(),
"persons": persons.view(),
"unlimited_until": until.map(rfc3339),
}))
}
/// Grants a package as a (pretend) purchase.
pub async fn mock(
State(state): St,
auth: AuthUser,
WithRejection(Json(req), _): Body<MockPayment>,
) -> ApiResult<Json<Value>> {
if !state.config.mock_payments {
return Err(ApiError::NotFound("payment method"));
}
let id = match (req.package.as_deref(), req.unit) {
(Some(id), None) => id,
(None, Some(Unit::Natal)) => "single",
(None, Some(Unit::Synastry)) => "addon_synastry",
(None, Some(Unit::Person)) => "addon_persons",
_ => return Err(ApiError::BadRequest("give either package or unit".into())),
};
let package = packages::find(id).ok_or(ApiError::NotFound("package"))?;
let mut tx = state.db.begin().await?;
packages::grant(&mut tx, auth.id(), package, Source::Mock, Some(auth.id()), Some("mock payment")).await?;
tx.commit().await?;
tracing::info!(user = %auth.id(), package = package.id, "mock payment");
Ok(Json(holdings(&state, &auth).await?))
}
+280
View File
@@ -0,0 +1,280 @@
//! Editable system prompts of the analyses (admin only).
//!
//! Every save adds a row to `prompt_revisions`; the newest row of a
//! (kind, language) is in force, `system` NULL meaning the built-in text.
//! New analyses record the revision in `prompt_version`, so analyses that
//! are already written or queued keep the text they were started with.
//!
//! A draft can be tried on one of the admin's own charts first: a row in
//! `prompt_previews` that the worker writes like an analysis, but it is never
//! shown to users, cached or charged.
use analysis_prompt::{Kind, default_system, user_template};
use axum::Json;
use axum::extract::{Path, State};
use axum::http::StatusCode;
use axum_extra::extract::WithRejection;
use serde::Deserialize;
use serde_json::{Value, json};
use sqlx::PgPool;
use time::OffsetDateTime;
use uuid::Uuid;
use super::{Body, IdPath, St};
use crate::AppState;
use crate::auth::AdminUser;
use crate::error::{ApiError, ApiResult};
use crate::views::{rfc3339, rfc3339_opt};
/// The kinds whose prompt the admin page edits.
const EDITABLE: [Kind; 3] = [Kind::Summary, Kind::Natal, Kind::Synastry];
const MAX_CHARS: usize = 50_000;
const HISTORY: i64 = 20;
/// Test runs of one admin waiting or being written at the same time.
const MAX_OPEN_PREVIEWS: i64 = 3;
/// The revision id of an admin-edited prompt in force, `None` for the built-in one.
pub async fn current_revision(db: &PgPool, kind: &str, language: &str) -> Result<Option<i64>, sqlx::Error> {
let row: Option<(i64, bool)> = sqlx::query_as(
"SELECT id, system IS NOT NULL FROM prompt_revisions WHERE kind = $1 AND language = $2 ORDER BY id DESC LIMIT 1",
)
.bind(kind)
.bind(language)
.fetch_optional(db)
.await?;
Ok(row.filter(|(_, custom)| *custom).map(|(id, _)| id))
}
type RevisionRow = (i64, Option<String>, OffsetDateTime, Option<String>);
async fn entry(db: &PgPool, kind: Kind, language: &str) -> Result<Value, sqlx::Error> {
let rows: Vec<RevisionRow> = sqlx::query_as(
"SELECT r.id, r.system, r.created_at, u.email FROM prompt_revisions r \
LEFT JOIN users u ON u.id = r.created_by \
WHERE r.kind = $1 AND r.language = $2 ORDER BY r.id DESC LIMIT $3",
)
.bind(kind.as_str())
.bind(language)
.bind(HISTORY)
.fetch_all(db)
.await?;
let default = default_system(kind, language);
let current = rows.first();
let history: Vec<Value> = rows
.iter()
.map(|(id, system, at, by)| {
json!({"id": id, "custom": system.is_some(), "system": system, "created_at": rfc3339(*at), "created_by": by})
})
.collect();
Ok(json!({
"kind": kind.as_str(),
"language": language,
"system": current.and_then(|r| r.1.clone()).unwrap_or_else(|| default.clone()),
"custom": current.is_some_and(|r| r.1.is_some()),
"updated_at": current.map(|r| rfc3339(r.2)),
"updated_by": current.and_then(|r| r.3.clone()),
"default": default,
"user_template": user_template(kind),
"history": history,
}))
}
pub async fn list(State(state): St, _admin: AdminUser) -> ApiResult<Json<Value>> {
let mut prompts = Vec::new();
for kind in EDITABLE {
for language in &state.config.supported_locales {
prompts.push(entry(&state.db, kind, language).await?);
}
}
Ok(Json(json!({ "prompts": prompts })))
}
#[derive(Deserialize)]
#[serde(deny_unknown_fields)]
pub struct SavePrompt {
/// The new system prompt; `null` restores the built-in one.
system: Option<String>,
}
fn parse_target(state: &AppState, kind: &str, language: &str) -> Result<Kind, ApiError> {
let kind = Kind::parse(kind).filter(|k| EDITABLE.contains(k)).ok_or(ApiError::NotFound("prompt"))?;
if !state.config.supported_locales.iter().any(|l| l == language) {
return Err(ApiError::NotFound("prompt"));
}
Ok(kind)
}
/// Trims a submitted prompt and checks its length.
fn clean_system(text: &str) -> Result<String, ApiError> {
let text = text.trim().replace("\r\n", "\n");
if text.is_empty() {
return Err(ApiError::BadRequest("the prompt must not be empty".into()));
}
if text.chars().count() > MAX_CHARS {
return Err(ApiError::BadRequest(format!("the prompt is longer than {MAX_CHARS} characters")));
}
Ok(text)
}
pub async fn save(
State(state): St,
AdminUser(admin): AdminUser,
WithRejection(Path((kind, language)), _): WithRejection<Path<(String, String)>, ApiError>,
WithRejection(Json(req), _): Body<SavePrompt>,
) -> ApiResult<Json<Value>> {
let kind = parse_target(&state, &kind, &language)?;
let default = default_system(kind, &language);
// The built-in text is stored as NULL, so later code changes reach it.
let system = match req.system.as_deref().map(clean_system).transpose()? {
Some(s) if s == default.trim() => None,
other => other,
};
let current: Option<(Option<String>,)> = sqlx::query_as(
"SELECT system FROM prompt_revisions WHERE kind = $1 AND language = $2 ORDER BY id DESC LIMIT 1",
)
.bind(kind.as_str())
.bind(&language)
.fetch_optional(&state.db)
.await?;
let unchanged = match &current {
Some((text,)) => *text == system,
None => system.is_none(),
};
if !unchanged {
sqlx::query("INSERT INTO prompt_revisions (kind, language, system, created_by) VALUES ($1, $2, $3, $4)")
.bind(kind.as_str())
.bind(&language)
.bind(&system)
.bind(admin.id())
.execute(&state.db)
.await?;
tracing::info!(admin = %admin.id(), kind = kind.as_str(), %language, custom = system.is_some(), "prompt changed");
}
Ok(Json(entry(&state.db, kind, &language).await?))
}
#[derive(Deserialize)]
#[serde(deny_unknown_fields)]
pub struct StartPreview {
/// The draft to try (it need not be saved).
system: String,
/// One of the admin's own charts (own or a person), for a summary or natal analysis.
chart_id: Option<Uuid>,
/// One of the admin's own comparisons, for a synastry analysis.
synastry_id: Option<Uuid>,
}
#[derive(sqlx::FromRow)]
struct PreviewRow {
id: Uuid,
kind: String,
chart_id: Option<Uuid>,
synastry_id: Option<Uuid>,
language: String,
model: String,
status: String,
content: Option<Value>,
error: Option<String>,
model_used: Option<String>,
input_tokens: Option<i32>,
output_tokens: Option<i32>,
cost_usd: Option<f64>,
created_at: OffsetDateTime,
started_at: Option<OffsetDateTime>,
completed_at: Option<OffsetDateTime>,
}
const PREVIEW_COLUMNS: &str = "id, kind, chart_id, synastry_id, language, model, status, content, error, model_used, \
input_tokens, output_tokens, cost_usd, created_at, started_at, completed_at";
impl PreviewRow {
fn view(self) -> Value {
let seconds = self.started_at.zip(self.completed_at).map(|(s, c)| (c - s).whole_seconds());
json!({
"id": self.id, "kind": self.kind, "chart_id": self.chart_id, "synastry_id": self.synastry_id,
"language": self.language, "model": self.model, "status": self.status, "content": self.content,
"error": self.error, "model_used": self.model_used, "input_tokens": self.input_tokens,
"output_tokens": self.output_tokens, "cost_usd": self.cost_usd, "created_at": rfc3339(self.created_at),
"completed_at": rfc3339_opt(self.completed_at), "seconds": seconds,
})
}
}
pub async fn start_preview(
State(state): St,
AdminUser(admin): AdminUser,
WithRejection(Path((kind, language)), _): WithRejection<Path<(String, String)>, ApiError>,
WithRejection(Json(req), _): Body<StartPreview>,
) -> ApiResult<(StatusCode, Json<Value>)> {
let kind = parse_target(&state, &kind, &language)?;
let system = clean_system(&req.system)?;
// The target must be the admin's own: a chart, or for a synastry analysis a comparison.
let (chart_id, synastry_id, found) = match (kind, req.chart_id, req.synastry_id) {
(Kind::Synastry, None, Some(id)) => {
let row: Option<(Uuid,)> = sqlx::query_as("SELECT id FROM synastries WHERE id = $1 AND owner_id = $2")
.bind(id)
.bind(admin.id())
.fetch_optional(&state.db)
.await?;
(None, Some(id), row.map(|_| "synastry"))
}
(Kind::Summary | Kind::Natal, Some(id), None) => {
let row: Option<(Uuid,)> = sqlx::query_as("SELECT id FROM charts WHERE id = $1 AND owner_id = $2")
.bind(id)
.bind(admin.id())
.fetch_optional(&state.db)
.await?;
(Some(id), None, row.map(|_| "chart"))
}
(Kind::Synastry, ..) => return Err(ApiError::BadRequest("a synastry analysis needs synastry_id".into())),
_ => return Err(ApiError::BadRequest("this analysis needs chart_id".into())),
};
if found.is_none() {
return Err(ApiError::NotFound(if synastry_id.is_some() { "synastry" } else { "chart" }));
}
let (open,): (i64,) = sqlx::query_as(
"SELECT count(*) FROM prompt_previews WHERE created_by = $1 AND status IN ('pending', 'running')",
)
.bind(admin.id())
.fetch_one(&state.db)
.await?;
if open >= MAX_OPEN_PREVIEWS {
return Err(ApiError::conflict(
"too_many_previews",
"Egyszerre legfeljebb három próba futhat. Várd meg, amíg valamelyik elkészül.",
));
}
let model = match kind {
Kind::Summary => &state.config.summary_model,
_ => &state.config.analysis_model,
};
let row: PreviewRow = sqlx::query_as(&format!(
"INSERT INTO prompt_previews (id, kind, chart_id, synastry_id, language, model, system, created_by) \
VALUES ($1, $2, $3, $4, $5, $6, $7, $8) RETURNING {PREVIEW_COLUMNS}"
))
.bind(Uuid::now_v7())
.bind(kind.as_str())
.bind(chart_id)
.bind(synastry_id)
.bind(&language)
.bind(model)
.bind(&system)
.bind(admin.id())
.fetch_one(&state.db)
.await?;
Ok((StatusCode::ACCEPTED, Json(row.view())))
}
pub async fn get_preview(
State(state): St,
AdminUser(admin): AdminUser,
WithRejection(Path(id), _): IdPath,
) -> ApiResult<Json<Value>> {
let row: Option<PreviewRow> =
sqlx::query_as(&format!("SELECT {PREVIEW_COLUMNS} FROM prompt_previews WHERE id = $1 AND created_by = $2"))
.bind(id)
.bind(admin.id())
.fetch_optional(&state.db)
.await?;
Ok(Json(row.ok_or(ApiError::NotFound("preview"))?.view()))
}
+706 -18
View File
@@ -115,8 +115,13 @@ struct Response {
impl TestApp {
async fn new(pool: PgPool) -> Self {
Self::with_config(pool, |_| {}).await
}
async fn with_config(pool: PgPool, change: impl FnOnce(&mut Config)) -> Self {
let fake = fake_services().await;
let config = Config::for_tests(String::new(), fake.clone(), format!("{fake}/jwks"));
let mut config = Config::for_tests(String::new(), fake.clone(), format!("{fake}/jwks"));
change(&mut config);
Self { router: routes::router(Arc::new(AppState::new(pool.clone(), config))), pool }
}
@@ -217,7 +222,7 @@ async fn register_login_verify_logout(pool: PgPool) {
let r = app.get("/v1/me", Some(&token)).await;
assert_eq!(r.status, StatusCode::OK);
assert_eq!(r.body["providers"], json!(["password"]));
assert_eq!(r.body["credits"], 2);
assert_eq!(r.body["analyses_left"], json!({"natal": 0, "synastry": 0}));
// e-mail verification through the queued e-mail's link
let url = app.outbox_url("anna@example.com", "verify_email").await;
@@ -336,10 +341,14 @@ async fn roles_and_admin_guard(pool: PgPool) {
app.call("PATCH", &format!("/v1/admin/users/{admin_id}"), Some(&admin), Some(json!({"roles": ["user"]}))).await;
assert_eq!(r.status, StatusCode::CONFLICT);
let r =
app.post(&format!("/v1/admin/users/{anna}/credits"), Some(&admin), json!({"delta": 5, "note": "bonus"})).await;
assert_eq!(r.status, StatusCode::CREATED);
assert_eq!(app.get("/v1/credits", Some(&user)).await.body["balance"], 7); // 2 monthly + 5
let grant = |unit: &str, delta: i32| json!({"unit": unit, "delta": delta, "note": "bonus"});
let r = app.post(&format!("/v1/admin/users/{anna}/credits"), Some(&admin), grant("natal", 5)).await;
assert_eq!((r.status, &r.body["analyses_left"]), (StatusCode::CREATED, &json!({"natal": 5, "synastry": 0})));
let r = app.post(&format!("/v1/admin/users/{anna}/credits"), Some(&admin), grant("chat", 5)).await;
assert_eq!(r.status, StatusCode::BAD_REQUEST);
let credits = app.get("/v1/credits", Some(&user)).await.body;
assert_eq!(credits["balance"], json!({"natal": 5, "synastry": 0}));
assert_eq!((credits["ledger"][0]["unit"].as_str(), &credits["ledger"][0]["delta"]), (Some("natal"), &json!(5)));
}
#[sqlx::test(migrator = "db::MIGRATOR")]
@@ -358,6 +367,25 @@ async fn charts_are_private(pool: PgPool) {
assert_eq!(list["charts"][0]["id"], other["id"]); // the new primary first
assert_eq!(list["charts"][1]["is_primary"], false);
// the same birth data again: the saved chart is reused, not calculated again
let r = app
.post(
"/v1/charts",
Some(&anna),
json!({"label": "Újra", "is_primary": true,
"birth": {"date": "1990-03-15", "time": "14:30", "country": "HU", "place": "Szeged"}}),
)
.await;
assert_eq!((r.status, r.body["id"].as_str(), &r.body["is_primary"]), (StatusCode::OK, Some(id), &json!(true)));
assert_eq!(app.get("/v1/charts", Some(&anna)).await.body["charts"].as_array().unwrap().len(), 2);
app.call(
"PATCH",
&format!("/v1/charts/{}", other["id"].as_str().unwrap()),
Some(&anna),
Some(json!({"is_primary": true})),
)
.await;
assert_eq!(app.get(&format!("/v1/charts/{id}"), Some(&bela)).await.status, StatusCode::NOT_FOUND);
assert_eq!(app.call("DELETE", &format!("/v1/charts/{id}"), Some(&bela), None).await.status, StatusCode::NOT_FOUND);
assert_eq!(app.get("/v1/charts/not-a-uuid", Some(&anna)).await.status, StatusCode::BAD_REQUEST);
@@ -372,6 +400,8 @@ async fn charts_are_private(pool: PgPool) {
.await;
assert_eq!((r.status, r.body["error"]["code"].as_str()), (StatusCode::NOT_FOUND, Some("place_not_found")));
// (the fourth change of the own chart; the limit is tested in birth_data_changes_are_limited)
sqlx::query("DELETE FROM birth_data_changes").execute(&app.pool).await.unwrap();
let r = app
.call("PATCH", &format!("/v1/charts/{id}"), Some(&anna), Some(json!({"label": "Én", "is_primary": true})))
.await;
@@ -432,31 +462,62 @@ async fn invitation_links_two_users(pool: PgPool) {
assert!(app.outbox_url("anna@example.com", "invite_accepted").await.ends_with(&synastry_id));
}
/// Gives `token`'s user analysis units (the admin endpoint is tested in `roles_and_admin_guard`).
async fn grant_units(app: &TestApp, token: &str, unit: &str, delta: i32) {
let id = app.get("/v1/me", Some(token)).await.body["user"]["id"].as_str().unwrap().to_string();
sqlx::query(
"INSERT INTO credit_ledger (id, user_id, unit, delta, reason) VALUES (gen_random_uuid(), $1::uuid, $2, $3, 'purchase')",
)
.bind(id)
.bind(unit)
.bind(delta)
.execute(&app.pool)
.await
.unwrap();
}
#[sqlx::test(migrator = "db::MIGRATOR")]
async fn analyses_spend_credits_and_reuse_results(pool: PgPool) {
async fn analyses_spend_units_and_reuse_results(pool: PgPool) {
let app = TestApp::new(pool.clone()).await;
let anna = app.register("anna@example.com", "Anna").await;
let chart = app.chart(&anna, "Saját", true, "1990-03-15").await;
let uri = format!("/v1/charts/{}/analyses", chart["id"].as_str().unwrap());
// saving the chart queued the free short summary
let list = app.get(&uri, Some(&anna)).await.body;
let summary = &list["analyses"][0];
assert_eq!(
(summary["kind"].as_str(), summary["status"].as_str(), summary["model"].as_str(), &summary["credits_charged"]),
(Some("summary"), Some("pending"), Some("anthropic/claude-summary"), &json!(0))
);
let r = app.call("POST", &format!("/v1/charts/{}/summary", chart["id"].as_str().unwrap()), Some(&anna), None).await;
assert_eq!((r.status, &r.body["id"]), (StatusCode::OK, &summary["id"]));
// the detailed analysis is paid: no unit, no analysis
let r = app.call("POST", &uri, Some(&anna), None).await;
assert_eq!(
(r.status, r.body["error"]["code"].as_str()),
(StatusCode::PAYMENT_REQUIRED, Some("insufficient_credits"))
);
grant_units(&app, &anna, "natal", 2).await;
let r = app.call("POST", &uri, Some(&anna), None).await;
assert_eq!(r.status, StatusCode::ACCEPTED, "{}", r.body);
assert_eq!((r.body["status"].as_str(), r.body["language"].as_str()), (Some("pending"), Some("hu")));
assert_eq!(
(r.body["status"].as_str(), r.body["language"].as_str(), r.body["model"].as_str(), &r.body["credits_charged"]),
(Some("pending"), Some("hu"), Some("anthropic/claude-test"), &json!(1))
);
let first = r.body["id"].as_str().unwrap().to_string();
assert_eq!(app.get("/v1/credits", Some(&anna)).await.body["balance"], 1);
assert_eq!(app.get("/v1/credits", Some(&anna)).await.body["balance"], json!({"natal": 1, "synastry": 0}));
// same request again: the same analysis, no charge
let r = app.call("POST", &uri, Some(&anna), None).await;
assert_eq!((r.status, r.body["id"].as_str()), (StatusCode::OK, Some(first.as_str())));
let r = app.post(&uri, Some(&anna), json!({"language": "en"})).await;
assert_eq!(r.status, StatusCode::ACCEPTED);
let r = app.post(&uri, Some(&anna), json!({"model": "anthropic/claude-test"})).await;
assert_eq!(
(r.status, r.body["error"]["code"].as_str()),
(StatusCode::PAYMENT_REQUIRED, Some("insufficient_credits"))
);
let r = app.post(&uri, Some(&anna), json!({"model": "unknown/model"})).await;
assert_eq!(r.status, StatusCode::BAD_REQUEST);
assert_eq!(app.get("/v1/credits", Some(&anna)).await.body["balance"], json!({"natal": 0, "synastry": 0}));
let r = app.post(&uri, Some(&anna), json!({"model": "anthropic/claude-other"})).await;
assert_eq!(r.status, StatusCode::BAD_REQUEST); // no model choice
// the worker finishes the first one; another user with the same birth data gets it for free
sqlx::query("UPDATE analyses SET status = 'done', content = $1, completed_at = now() WHERE id = $2::uuid")
@@ -471,10 +532,24 @@ async fn analyses_spend_credits_and_reuse_results(pool: PgPool) {
let r = app.call("POST", &format!("/v1/charts/{}/analyses", same["id"].as_str().unwrap()), Some(&bela), None).await;
assert_eq!(r.status, StatusCode::CREATED, "{}", r.body);
assert_eq!((r.body["status"].as_str(), &r.body["credits_charged"]), (Some("done"), &json!(0)));
assert_eq!(app.get("/v1/credits", Some(&bela)).await.body["balance"], 2);
assert_eq!(app.get(&format!("/v1/analyses/{first}"), Some(&bela)).await.status, StatusCode::NOT_FOUND);
assert_eq!(app.get(&uri, Some(&anna)).await.body["analyses"].as_array().unwrap().len(), 2);
assert_eq!(app.get(&uri, Some(&anna)).await.body["analyses"].as_array().unwrap().len(), 3); // 2 + summary
}
#[sqlx::test(migrator = "db::MIGRATOR")]
async fn password_login_can_be_disabled(pool: PgPool) {
let app = TestApp::with_config(pool, |c| c.password_login = false).await;
assert_eq!(app.get("/v1/config", None).await.body["password_login"], false);
let r = app
.post("/v1/auth/register", None, json!({"email": "anna@example.com", "password": "titkos-jelszo-123"}))
.await;
assert_eq!(r.status, StatusCode::FORBIDDEN);
let r =
app.post("/v1/auth/login", None, json!({"email": "anna@example.com", "password": "titkos-jelszo-123"})).await;
assert_eq!(r.status, StatusCode::FORBIDDEN);
let r = app.post("/v1/auth/password-reset", None, json!({"email": "anna@example.com"})).await;
assert_eq!(r.status, StatusCode::FORBIDDEN);
}
#[sqlx::test(migrator = "db::MIGRATOR")]
@@ -556,5 +631,618 @@ async fn public_config_and_health(pool: PgPool) {
assert_eq!(r.body["google_login"]["enabled"], true);
assert_eq!(r.body["google_login"]["client_id"], GOOGLE_CLIENT);
assert_eq!(r.body["locales"], json!(["hu", "en"]));
assert_eq!(r.body["analysis_model"], "anthropic/claude-test");
assert_eq!(r.body["summary_model"], "anthropic/claude-summary");
assert_eq!(app.get("/healthz", None).await.status, StatusCode::OK);
}
#[sqlx::test(migrator = "db::MIGRATOR")]
async fn synastry_analyses_use_synastry_units(pool: PgPool) {
let app = TestApp::new(pool).await;
let anna = app.register("anna@example.com", "Anna").await;
let own = app.chart(&anna, "Saját", true, "1990-03-15").await;
let other = app.chart(&anna, "Anya", false, "1950-03-01").await;
let r = app.post("/v1/synastries", Some(&anna), json!({"chart1_id": own["id"], "chart2_id": other["id"]})).await;
assert_eq!(r.status, StatusCode::CREATED, "{}", r.body);
let uri = format!("/v1/synastries/{}/analyses", r.body["id"].as_str().unwrap());
grant_units(&app, &anna, "natal", 1).await;
let r = app.call("POST", &uri, Some(&anna), None).await;
assert_eq!(r.status, StatusCode::PAYMENT_REQUIRED); // a natal unit does not pay for a synastry
grant_units(&app, &anna, "synastry", 1).await;
let r = app.call("POST", &uri, Some(&anna), None).await;
assert_eq!((r.status, r.body["kind"].as_str()), (StatusCode::ACCEPTED, Some("synastry")));
assert_eq!(app.get("/v1/credits", Some(&anna)).await.body["balance"], json!({"natal": 1, "synastry": 0}));
}
#[sqlx::test(migrator = "db::MIGRATOR")]
async fn birth_data_changes_are_limited(pool: PgPool) {
let app = TestApp::new(pool.clone()).await;
let anna = app.register("anna@example.com", "Anna").await;
assert_eq!(app.get("/v1/me", Some(&anna)).await.body["birth_change"]["limited"], json!(false));
// the first save and three corrections within the hour are free
let first = app.chart(&anna, "Saját", true, "1990-03-15").await;
for date in ["1990-03-16", "1990-03-17", "1990-03-18"] {
app.chart(&anna, "Saját", true, date).await;
}
// saving the current data again is not a change
let r = app
.post(
"/v1/charts",
Some(&anna),
json!({"label": "Saját", "is_primary": true,
"birth": {"date": "1990-03-18", "time": "14:30", "country": "HU", "place": "Szeged"}}),
)
.await;
assert_eq!(r.status, StatusCode::OK, "{}", r.body);
// the fourth correction: once a day from now on
let r = app
.post(
"/v1/charts",
Some(&anna),
json!({"label": "Saját", "is_primary": true,
"birth": {"date": "1990-03-19", "time": "14:30", "country": "HU", "place": "Szeged"}}),
)
.await;
assert_eq!(r.status, StatusCode::TOO_MANY_REQUESTS, "{}", r.body);
assert_eq!(r.body["error"]["code"], json!("birth_data_change_limit"));
let message = r.body["error"]["message"].as_str().unwrap();
assert!(message.starts_with("A rendszer csak napi egy módosítást engedélyez."), "{message}");
assert!(message.ends_with("óra múlva módosíthatod."), "{message}");
// switching back to an older chart is a change too
let r = app
.call(
"PATCH",
&format!("/v1/charts/{}", first["id"].as_str().unwrap()),
Some(&anna),
Some(json!({"is_primary": true})),
)
.await;
assert_eq!(r.status, StatusCode::TOO_MANY_REQUESTS);
// other people's charts are not limited
app.chart(&anna, "Béla", false, "1985-08-02").await;
let me = app.get("/v1/me", Some(&anna)).await.body;
assert_eq!(me["birth_change"]["limited"], json!(true));
assert!(me["birth_change"]["notice"].as_str().unwrap().contains("napi egy"));
// a day later it works again
sqlx::query("UPDATE birth_data_changes SET created_at = created_at - interval '25 hours'")
.execute(&pool)
.await
.unwrap();
app.chart(&anna, "Saját", true, "1990-03-19").await;
// admins are not limited
let admin = app.register("admin@example.com", "Admin").await;
for day in 10..16 {
app.chart(&admin, "Saját", true, &format!("1980-01-{day}")).await;
}
assert_eq!(app.get("/v1/me", Some(&admin)).await.body["birth_change"]["notice"], Value::Null);
}
#[sqlx::test(migrator = "db::MIGRATOR")]
async fn admins_get_free_analyses_and_mock_payments_add_units(pool: PgPool) {
let app = TestApp::new(pool).await;
let admin = app.register("admin@example.com", "Admin").await;
let chart = app.chart(&admin, "Saját", true, "1990-03-15").await;
let r =
app.call("POST", &format!("/v1/charts/{}/analyses", chart["id"].as_str().unwrap()), Some(&admin), None).await;
assert_eq!((r.status, &r.body["credits_charged"]), (StatusCode::ACCEPTED, &json!(0)), "{}", r.body);
// a user "pays", which adds a unit, then requests the analysis
let anna = app.register("anna@example.com", "Anna").await;
let chart = app.chart(&anna, "Saját", true, "1991-05-01").await;
let r = app.post("/v1/payments/mock", Some(&anna), json!({"unit": "natal"})).await;
assert_eq!(
(r.status, &r.body["analyses_left"]),
(StatusCode::OK, &json!({"natal": 1, "synastry": 0})),
"{}",
r.body
);
let r =
app.call("POST", &format!("/v1/charts/{}/analyses", chart["id"].as_str().unwrap()), Some(&anna), None).await;
assert_eq!((r.status, &r.body["credits_charged"]), (StatusCode::ACCEPTED, &json!(1)), "{}", r.body);
assert_eq!(app.get("/v1/credits", Some(&anna)).await.body["balance"], json!({"natal": 0, "synastry": 0}));
// without MOCK_PAYMENTS there is no such payment
let app = TestApp::with_config(app.pool.clone(), |c| c.mock_payments = false).await;
let r = app.post("/v1/payments/mock", Some(&anna), json!({"unit": "natal"})).await;
assert_eq!(r.status, StatusCode::NOT_FOUND);
}
#[sqlx::test(migrator = "db::MIGRATOR")]
async fn persons_use_package_slots(pool: PgPool) {
let app = TestApp::with_config(pool, |c| c.free_person_slots = 1).await;
let anna = app.register("anna@example.com", "Anna").await;
let own = app.chart(&anna, "Saját", true, "1990-03-15").await;
assert_eq!(own["kind"], "own");
let persons = |me: Value| me["persons"].clone();
assert_eq!(
persons(app.get("/v1/me", Some(&anna)).await.body),
json!({"used": 0, "limit": 1, "left": 1, "unlimited": false})
);
// the free slot, then the limit; deleting does not give the slot back
let first = app.chart(&anna, "Béla", false, "1985-08-02").await;
assert_eq!((&first["kind"], first["editable_until"].is_string()), (&json!("person"), true));
let new_person = |date: &str| json!({"label": "Cili", "birth": {"date": date, "time": "14:30", "country": "HU", "place": "Szeged"}});
let r = app.post("/v1/charts", Some(&anna), new_person("1986-01-01")).await;
assert_eq!((r.status, r.body["error"]["code"].as_str()), (StatusCode::CONFLICT, Some("person_limit_reached")));
assert_eq!(r.body["error"]["message"], crate::persons::LIMIT_MESSAGE);
let r = app.call("DELETE", &format!("/v1/charts/{}", first["id"].as_str().unwrap()), Some(&anna), None).await;
assert_eq!(r.status, StatusCode::NO_CONTENT);
assert_eq!(persons(app.get("/v1/me", Some(&anna)).await.body)["left"], 0);
// a person package adds five slots
let r = app.post("/v1/payments/mock", Some(&anna), json!({"package": "addon_persons"})).await;
assert_eq!(r.body["persons"], json!({"used": 1, "limit": 6, "left": 5, "unlimited": false}), "{}", r.body);
let second = app.chart(&anna, "Cili", false, "1986-01-01").await;
app.chart(&anna, "Dani", false, "1987-01-01").await;
assert_eq!(persons(app.get("/v1/me", Some(&anna)).await.body)["left"], 3);
// the unlimited package
let r = app.post("/v1/payments/mock", Some(&anna), json!({"package": "unlimited"})).await;
assert_eq!(r.body["persons"], json!({"used": 3, "limit": null, "left": null, "unlimited": true}));
app.chart(&anna, "Emma", false, "1988-01-01").await;
let list = app.get("/v1/charts", Some(&anna)).await.body;
let kinds: Vec<&str> = list["charts"].as_array().unwrap().iter().map(|c| c["kind"].as_str().unwrap()).collect();
assert_eq!(kinds, ["own", "person", "person", "person"]);
assert_eq!(list["charts"][1]["birth"]["date"], "1988-01-01");
// a person's birth data can be corrected within an hour, then it is locked
let id = second["id"].as_str().unwrap();
let corrected = json!({"birth": {"date": "1986-01-02", "time": "10:00", "country": "HU", "place": "Szeged"}});
let r = app.call("PATCH", &format!("/v1/charts/{id}"), Some(&anna), Some(corrected.clone())).await;
assert_eq!((r.status, &r.body["birth_data"]["date"]), (StatusCode::OK, &json!("1986-01-02")), "{}", r.body);
sqlx::query("UPDATE charts SET created_at = now() - interval '2 hours' WHERE id = $1::uuid")
.bind(id)
.execute(&app.pool)
.await
.unwrap();
let again = json!({"birth": {"date": "1986-01-03", "time": "10:00", "country": "HU", "place": "Szeged"}});
let r = app.call("PATCH", &format!("/v1/charts/{id}"), Some(&anna), Some(again)).await;
assert_eq!((r.status, r.body["error"]["code"].as_str()), (StatusCode::CONFLICT, Some("person_locked")));
let r =
app.call("PATCH", &format!("/v1/charts/{}", own["id"].as_str().unwrap()), Some(&anna), Some(corrected)).await;
assert_eq!(r.status, StatusCode::BAD_REQUEST);
// admins: no limit, corrections any time
let admin = app.register("admin@example.com", "Admin").await;
assert_eq!(persons(app.get("/v1/me", Some(&admin)).await.body)["unlimited"], true);
let p = app.chart(&admin, "Feri", false, "1970-01-01").await;
let pid = p["id"].as_str().unwrap();
sqlx::query("UPDATE charts SET created_at = now() - interval '2 days' WHERE id = $1::uuid")
.bind(pid)
.execute(&app.pool)
.await
.unwrap();
let corrected = json!({"birth": {"date": "1970-01-02", "time": "10:00", "country": "HU", "place": "Szeged"}});
let r = app.call("PATCH", &format!("/v1/charts/{pid}"), Some(&admin), Some(corrected)).await;
assert_eq!(r.status, StatusCode::OK, "{}", r.body);
}
#[sqlx::test(migrator = "db::MIGRATOR")]
async fn admins_edit_analysis_prompts(pool: PgPool) {
let app = TestApp::new(pool.clone()).await;
let admin = app.register("admin@example.com", "Admin").await;
let anna = app.register("anna@example.com", "Anna").await;
assert_eq!(app.get("/v1/admin/prompts", Some(&anna)).await.status, StatusCode::FORBIDDEN);
let r = app.get("/v1/admin/prompts", Some(&admin)).await;
assert_eq!(r.status, StatusCode::OK, "{}", r.body);
let prompts = r.body["prompts"].as_array().unwrap();
let keys: Vec<String> =
prompts.iter().map(|p| format!("{}/{}", p["kind"], p["language"]).replace('"', "")).collect();
assert_eq!(keys, ["summary/hu", "summary/en", "natal/hu", "natal/en", "synastry/hu", "synastry/en"]);
let natal = &prompts[2];
assert_eq!((&natal["custom"], &natal["system"]), (&json!(false), &natal["default"]));
assert!(natal["user_template"].as_str().unwrap().contains("{chart data}"));
let default = natal["default"].as_str().unwrap().to_string();
let put = |body: Value, uri: &'static str| app.call("PUT", uri, Some(&admin), Some(body));
assert_eq!(put(json!({"system": " "}), "/v1/admin/prompts/natal/hu").await.status, StatusCode::BAD_REQUEST);
assert_eq!(put(json!({"system": "x"}), "/v1/admin/prompts/composite/hu").await.status, StatusCode::NOT_FOUND);
assert_eq!(put(json!({"system": "x"}), "/v1/admin/prompts/natal/de").await.status, StatusCode::NOT_FOUND);
// saving the built-in text keeps the built-in prompt
let r = put(json!({"system": default}), "/v1/admin/prompts/natal/hu").await;
assert_eq!(
(r.status, &r.body["custom"], r.body["history"].as_array().unwrap().len()),
(StatusCode::OK, &json!(false), 0)
);
// an analysis written with the built-in prompt
let chart = app.chart(&anna, "Saját", true, "1990-03-15").await;
let uri = format!("/v1/charts/{}/analyses", chart["id"].as_str().unwrap());
grant_units(&app, &anna, "natal", 1).await;
let r = app.call("POST", &uri, Some(&anna), None).await;
assert_eq!((r.status, r.body["prompt_version"].as_str()), (StatusCode::ACCEPTED, Some("v1")));
let first = r.body["id"].as_str().unwrap().to_string();
sqlx::query("UPDATE analyses SET status = 'done', content = '{}', completed_at = now() WHERE id = $1::uuid")
.bind(&first)
.execute(&pool)
.await
.unwrap();
let r = put(json!({"system": "Saját szabályok.\r\n"}), "/v1/admin/prompts/natal/hu").await;
assert_eq!(
(&r.body["custom"], r.body["system"].as_str(), r.body["updated_by"].as_str()),
(&json!(true), Some("Saját szabályok."), Some("admin@example.com"))
);
let revision = r.body["history"][0]["id"].as_i64().unwrap();
let r = put(json!({"system": "Saját szabályok."}), "/v1/admin/prompts/natal/hu").await;
assert_eq!(r.body["history"].as_array().unwrap().len(), 1); // unchanged: no new revision
// the chart keeps its analysis; the same birth data elsewhere is written anew with the edited prompt
let r = app.call("POST", &uri, Some(&anna), None).await;
assert_eq!((r.status, r.body["id"].as_str()), (StatusCode::OK, Some(first.as_str())));
let bela = app.register("bela@example.com", "Béla").await;
let same = app.chart(&bela, "Saját", true, "1990-03-15").await;
grant_units(&app, &bela, "natal", 1).await;
let r = app.call("POST", &format!("/v1/charts/{}/analyses", same["id"].as_str().unwrap()), Some(&bela), None).await;
let expected = format!("v1-r{revision}");
assert_eq!((r.status, r.body["prompt_version"].as_str()), (StatusCode::ACCEPTED, Some(expected.as_str())));
// back to the built-in prompt
let r = put(json!({"system": null}), "/v1/admin/prompts/natal/hu").await;
assert_eq!((&r.body["custom"], r.body["system"].as_str()), (&json!(false), Some(default.as_str())));
assert_eq!(r.body["history"].as_array().unwrap().len(), 2);
}
/// Starts a summary prompt test run on `chart`.
async fn start_preview(app: &TestApp, chart: &Value, token: &str) -> Response {
let body = json!({"system": " Próba szabályok. ", "chart_id": chart["id"]});
app.call("POST", "/v1/admin/prompts/summary/hu/preview", Some(token), Some(body)).await
}
#[sqlx::test(migrator = "db::MIGRATOR")]
async fn admins_try_prompt_drafts_on_own_charts(pool: PgPool) {
let app = TestApp::new(pool.clone()).await;
let admin = app.register("admin@example.com", "Admin").await;
let anna = app.register("anna@example.com", "Anna").await;
let own = app.chart(&admin, "Saját", true, "1990-03-15").await;
let annas = app.chart(&anna, "Saját", true, "1991-05-01").await;
assert_eq!(start_preview(&app, &own, &anna).await.status, StatusCode::FORBIDDEN);
assert_eq!(start_preview(&app, &annas, &admin).await.status, StatusCode::NOT_FOUND); // only own charts
let r = start_preview(&app, &own, &admin).await;
assert_eq!(r.status, StatusCode::ACCEPTED, "{}", r.body);
assert_eq!(
(r.body["status"].as_str(), r.body["kind"].as_str(), r.body["model"].as_str()),
(Some("pending"), Some("summary"), Some("anthropic/claude-summary"))
);
let id = r.body["id"].as_str().unwrap().to_string();
let (system,): (String,) = sqlx::query_as("SELECT system FROM prompt_previews WHERE id = $1::uuid")
.bind(&id)
.fetch_one(&pool)
.await
.unwrap();
assert_eq!(system, "Próba szabályok.");
// nothing reaches the chart's analyses, and the saved prompt is unchanged
let r = app.get(&format!("/v1/charts/{}/analyses", own["id"].as_str().unwrap()), Some(&admin)).await;
assert!(
r.body["analyses"].as_array().unwrap().iter().all(|a| a["kind"] == "summary" && a["prompt_version"] == "v1")
);
assert_eq!(app.get("/v1/admin/prompts", Some(&admin)).await.body["prompts"][0]["custom"], json!(false));
let r = app.get(&format!("/v1/admin/previews/{id}"), Some(&admin)).await;
assert_eq!((r.status, r.body["status"].as_str()), (StatusCode::OK, Some("pending")));
assert_eq!(app.get(&format!("/v1/admin/previews/{id}"), Some(&anna)).await.status, StatusCode::FORBIDDEN);
// at most three at a time
start_preview(&app, &own, &admin).await;
start_preview(&app, &own, &admin).await;
let r = start_preview(&app, &own, &admin).await;
assert_eq!((r.status, r.body["error"]["code"].as_str()), (StatusCode::CONFLICT, Some("too_many_previews")));
let body = json!({"system": "Részletes próba.", "chart_id": own["id"]});
sqlx::query("UPDATE prompt_previews SET status = 'done'").execute(&pool).await.unwrap();
let r = app.call("POST", "/v1/admin/prompts/natal/hu/preview", Some(&admin), Some(body)).await;
assert_eq!((r.status, r.body["model"].as_str()), (StatusCode::ACCEPTED, Some("anthropic/claude-test")));
// a relationship analysis is tried on one of the admin's comparisons
let other = app.chart(&admin, "Béla", false, "1985-08-02").await;
let syn = app.post("/v1/synastries", Some(&admin), json!({"chart1_id": own["id"], "chart2_id": other["id"]})).await;
let uri = "/v1/admin/prompts/synastry/hu/preview";
let r = app.call("POST", uri, Some(&admin), Some(json!({"system": "Próba.", "chart_id": own["id"]}))).await;
assert_eq!(r.status, StatusCode::BAD_REQUEST);
let r = app.call("POST", uri, Some(&admin), Some(json!({"system": "Próba.", "synastry_id": syn.body["id"]}))).await;
assert_eq!(
(r.status, r.body["synastry_id"].as_str()),
(StatusCode::ACCEPTED, syn.body["id"].as_str()),
"{}",
r.body
);
}
#[sqlx::test(migrator = "db::MIGRATOR")]
async fn comparisons_with_persons(pool: PgPool) {
let app = TestApp::new(pool).await;
let anna = app.register("anna@example.com", "Anna").await;
let own = app.chart(&anna, "Saját", true, "1990-03-15").await;
let bela = app.chart(&anna, "Béla", false, "1985-08-02").await;
let compare = || app.post("/v1/synastries", Some(&anna), json!({"chart1_id": own["id"], "chart2_id": bela["id"]}));
let r = compare().await;
assert_eq!(r.status, StatusCode::CREATED, "{}", r.body);
let first = r.body["id"].as_str().unwrap().to_string();
assert_eq!((&r.body["chart1"]["is_primary"], &r.body["chart2"]["label"]), (&json!(true), &json!("Béla")));
// correcting the person removes the comparison that no longer matches
let uri = format!("/v1/charts/{}", bela["id"].as_str().unwrap());
let corrected = |date: &str| json!({"birth": {"date": date, "time": "10:00", "country": "HU", "place": "Szeged"}});
let r = app.call("PATCH", &uri, Some(&anna), Some(corrected("1985-08-03"))).await;
assert_eq!(r.status, StatusCode::OK, "{}", r.body);
assert_eq!(app.get(&format!("/v1/synastries/{first}"), Some(&anna)).await.status, StatusCode::NOT_FOUND);
// after a paid relationship analysis the person is fixed
let r = compare().await;
assert_eq!(r.status, StatusCode::CREATED);
let id = r.body["id"].as_str().unwrap();
grant_units(&app, &anna, "synastry", 1).await;
let r = app.call("POST", &format!("/v1/synastries/{id}/analyses"), Some(&anna), None).await;
assert_eq!(r.status, StatusCode::ACCEPTED, "{}", r.body);
let r = app.call("PATCH", &uri, Some(&anna), Some(corrected("1985-08-04"))).await;
assert_eq!((r.status, r.body["error"]["code"].as_str()), (StatusCode::CONFLICT, Some("person_analysed")));
assert_eq!(app.get("/v1/synastries", Some(&anna)).await.body["synastries"].as_array().unwrap().len(), 1);
}
/// An admin (or not) gives `user` a package.
async fn grant_package(app: &TestApp, token: &str, user: &str, package: &str) -> Response {
let body = json!({"package": package, "note": "ajándék"});
app.call("POST", &format!("/v1/admin/users/{user}/packages"), Some(token), Some(body)).await
}
#[sqlx::test(migrator = "db::MIGRATOR")]
async fn packages_grant_units_and_unlimited(pool: PgPool) {
let app = TestApp::new(pool.clone()).await;
let admin = app.register("admin@example.com", "Admin").await;
let anna = app.register("anna@example.com", "Anna").await;
let anna_id = app.get("/v1/me", Some(&anna)).await.body["user"]["id"].as_str().unwrap().to_string();
// the catalog is public
let r = app.get("/v1/packages", None).await;
let ids: Vec<&str> = r.body["packages"].as_array().unwrap().iter().map(|p| p["id"].as_str().unwrap()).collect();
assert_eq!(ids, ["single", "couple", "family", "unlimited", "addon_synastry", "addon_persons"]);
assert_eq!(
(&r.body["packages"][2]["badge"], &r.body["packages"][2]["per_analysis_huf"]),
(&json!("Legnépszerűbb"), &json!(1090))
);
// an admin gives a package as a gift
assert_eq!(grant_package(&app, &anna, &anna_id, "family").await.status, StatusCode::FORBIDDEN);
assert_eq!(grant_package(&app, &admin, &anna_id, "gold").await.status, StatusCode::NOT_FOUND);
let r = grant_package(&app, &admin, &anna_id, "family").await;
assert_eq!(
(r.status, &r.body["analyses_left"]),
(StatusCode::CREATED, &json!({"natal": 6, "synastry": 5})),
"{}",
r.body
);
let me = app.get("/v1/me", Some(&anna)).await.body;
assert_eq!((&me["persons"]["limit"], &me["unlimited_until"]), (&json!(10), &Value::Null)); // 5 free + 5
let (source, price): (String, i32) =
sqlx::query_as("SELECT source, price_huf FROM package_orders WHERE package = 'family'")
.fetch_one(&pool)
.await
.unwrap();
assert_eq!((source.as_str(), price), ("admin", 0));
// a (mock) purchase adds to it and records the price
let r = app.post("/v1/payments/mock", Some(&anna), json!({"package": "couple"})).await;
assert_eq!(r.body["analyses_left"], json!({"natal": 8, "synastry": 6}), "{}", r.body);
let (price,): (i32,) =
sqlx::query_as("SELECT price_huf FROM package_orders WHERE package = 'couple'").fetch_one(&pool).await.unwrap();
assert_eq!(price, 6990);
// unlimited: a year, and a second one extends it
let bela = app.register("bela@example.com", "Béla").await;
let bela_id = app.get("/v1/me", Some(&bela)).await.body["user"]["id"].as_str().unwrap().to_string();
grant_package(&app, &admin, &bela_id, "unlimited").await;
let r = grant_package(&app, &admin, &bela_id, "unlimited").await;
let until = time::OffsetDateTime::parse(
r.body["unlimited_until"].as_str().unwrap(),
&time::format_description::well_known::Rfc3339,
)
.unwrap();
let days = (until - time::OffsetDateTime::now_utc()).whole_days();
assert!((725..=733).contains(&days), "{days}");
assert_eq!(app.get("/v1/me", Some(&bela)).await.body["persons"]["unlimited"], true);
// analyses use no unit, up to the daily cap (3 in tests)
for (i, date) in ["1980-01-01", "1981-01-01", "1982-01-01"].into_iter().enumerate() {
let chart = app.chart(&bela, &format!("P{i}"), i == 0, date).await;
let r = app
.call("POST", &format!("/v1/charts/{}/analyses", chart["id"].as_str().unwrap()), Some(&bela), None)
.await;
assert_eq!((r.status, &r.body["credits_charged"]), (StatusCode::ACCEPTED, &json!(0)), "{}", r.body);
}
let fourth = app.chart(&bela, "P3", false, "1983-01-01").await;
let uri = format!("/v1/charts/{}/analyses", fourth["id"].as_str().unwrap());
let r = app.call("POST", &uri, Some(&bela), None).await;
assert_eq!((r.status, r.body["error"]["code"].as_str()), (StatusCode::TOO_MANY_REQUESTS, Some("fair_use_limit")));
// after it ends, units are needed again
sqlx::query("UPDATE entitlements SET expires_at = now() - interval '1 day'").execute(&pool).await.unwrap();
let r = app.call("POST", &uri, Some(&bela), None).await;
assert_eq!(r.status, StatusCode::PAYMENT_REQUIRED);
assert_eq!(app.get("/v1/me", Some(&bela)).await.body["unlimited_until"], Value::Null);
}
#[sqlx::test(migrator = "db::MIGRATOR")]
async fn renaming_a_person_keeps_chart_and_analyses(pool: PgPool) {
let app = TestApp::new(pool.clone()).await;
let anna = app.register("anna@example.com", "Anna").await;
let own = app.chart(&anna, "Saját", true, "1990-03-15").await;
let bela = app.chart(&anna, "Béla", false, "1985-08-02").await;
let id = bela["id"].as_str().unwrap();
let syn = app.post("/v1/synastries", Some(&anna), json!({"chart1_id": own["id"], "chart2_id": id})).await;
assert_eq!(syn.status, StatusCode::CREATED);
let summaries = || async {
let (n,): (i64,) = sqlx::query_as("SELECT count(*) FROM analyses WHERE chart_id = $1::uuid")
.bind(id)
.fetch_one(&pool)
.await
.unwrap();
n
};
assert_eq!(summaries().await, 1);
// the edit form sends the unchanged birth data with the new name
let same = json!({"label": "Béla bácsi",
"birth": {"date": "1985-08-02", "time": "14:30", "country": "HU", "place": "Szeged"}});
let r = app.call("PATCH", &format!("/v1/charts/{id}"), Some(&anna), Some(same.clone())).await;
assert_eq!(
(r.status, &r.body["label"], &r.body["chart_hash"]),
(StatusCode::OK, &json!("Béla bácsi"), &bela["chart_hash"])
);
assert_eq!(summaries().await, 1);
let r = app.get(&format!("/v1/synastries/{}", syn.body["id"].as_str().unwrap()), Some(&anna)).await;
assert_eq!(r.status, StatusCode::OK);
// after the correction window the name can still change
sqlx::query("UPDATE charts SET created_at = now() - interval '2 hours' WHERE id = $1::uuid")
.bind(id)
.execute(&pool)
.await
.unwrap();
let r = app.call("PATCH", &format!("/v1/charts/{id}"), Some(&anna), Some(json!({"label": "Béla"}))).await;
assert_eq!((r.status, &r.body["label"]), (StatusCode::OK, &json!("Béla")));
let r = app.call("PATCH", &format!("/v1/charts/{id}"), Some(&anna), Some(same)).await;
assert_eq!(r.status, StatusCode::OK, "{}", r.body);
}
async fn google_signup(app: &TestApp, sub: &str, email: &str, invite: Option<&str>) -> Response {
app.post(
"/v1/auth/google",
None,
json!({"id_token": google_token(sub, email, GOOGLE_CLIENT), "invite_token": invite}),
)
.await
}
fn invite_token(url: &str) -> String {
url.rsplit('/').next().unwrap().to_string()
}
#[sqlx::test(migrator = "db::MIGRATOR")]
async fn invitation_only_signup(pool: PgPool) {
let app = TestApp::with_config(pool.clone(), |c| c.signup_mode = crate::config::SignupMode::Invite).await;
assert_eq!(app.get("/v1/config", None).await.body["signup_mode"], "invite");
// nobody gets in uninvited, except the bootstrap admin
let r = google_signup(&app, "g-x", "stranger@gmail.com", None).await;
assert_eq!((r.status, r.body["error"]["code"].as_str()), (StatusCode::FORBIDDEN, Some("not_invited")));
let admin = app.register("admin@example.com", "Admin").await;
// an existing user (from before the invitation-only times) is not an admin
let user = {
let open = TestApp::new(pool.clone()).await;
open.register("anna@example.com", "Anna").await
};
// inviting: duplicates, invalid addresses and existing users are sorted out
let r = app
.post(
"/v1/admin/invitations",
Some(&admin),
json!({"emails": ["Guest@Example.com", "guest@example.com", "nope", "anna@example.com", "kata@example.com"],
"message": "Gyere, nézd meg!"}),
)
.await;
assert_eq!(r.status, StatusCode::CREATED, "{}", r.body);
let statuses: Vec<&str> =
r.body["results"].as_array().unwrap().iter().map(|x| x["status"].as_str().unwrap()).collect();
assert_eq!(statuses, ["invited", "invalid", "already_user", "invited"]);
let guest_url = r.body["results"][0]["url"].as_str().unwrap().to_string();
let guest_id = r.body["results"][0]["id"].as_str().unwrap().to_string();
let guest_token = invite_token(&guest_url);
let r = app.post("/v1/admin/invitations", Some(&admin), json!({"emails": ["guest@example.com"]})).await;
assert_eq!(r.body["results"][0]["status"], "already_invited");
let r = app
.post(
"/v1/admin/invitations",
Some(&admin),
json!({"emails": ["x@example.com"], "message": "nézd: www.spam.hu"}),
)
.await;
assert_eq!(r.status, StatusCode::BAD_REQUEST);
assert_eq!(app.get("/v1/admin/invitations", Some(&user)).await.status, StatusCode::FORBIDDEN);
// the e-mail and the landing page
let (payload,): (Value,) = sqlx::query_as(
"SELECT payload FROM email_outbox WHERE to_email = 'guest@example.com' AND template = 'invitation'",
)
.fetch_one(&pool)
.await
.unwrap();
assert_eq!(payload["url"], guest_url.as_str());
assert_eq!(payload["inviter_name"], "Admin");
assert!(
payload["unsubscribe_post_url"].as_str().unwrap().contains("/api/v1/public/invitations/unsubscribe?token=")
);
let r = app.get(&format!("/v1/public/invitations/{guest_token}"), None).await;
assert_eq!((r.body["inviter_name"].as_str(), r.body["status"].as_str()), (Some("Admin"), Some("pending")));
// a resend: not too soon, then with a new link; the old one keeps working
let r = app.post(&format!("/v1/admin/invitations/{guest_id}/resend"), Some(&admin), json!({})).await;
assert_eq!(r.body["error"]["code"], "resend_too_soon");
sqlx::query("UPDATE invitations SET last_sent_at = now() - interval '25 hours'").execute(&pool).await.unwrap();
let r = app.post(&format!("/v1/admin/invitations/{guest_id}/resend"), Some(&admin), json!({})).await;
assert_eq!(r.status, StatusCode::OK, "{}", r.body);
assert_ne!(r.body["url"], guest_url.as_str());
// the link lets in any Google account, once
let r = google_signup(&app, "g-1", "guests.other.account@gmail.com", Some(&guest_token)).await;
assert_eq!(r.status, StatusCode::CREATED, "{}", r.body);
let r = google_signup(&app, "g-2", "third@gmail.com", Some(&guest_token)).await;
assert_eq!(r.body["error"]["code"], "not_invited");
// the invited address itself gets in without the link
assert_eq!(google_signup(&app, "g-3", "kata@example.com", None).await.status, StatusCode::CREATED);
// revoked: no entry
let r = app
.post("/v1/admin/invitations", Some(&admin), json!({"emails": ["zoli@example.com", "mari@example.com"]}))
.await;
let zoli_id = r.body["results"][0]["id"].as_str().unwrap().to_string();
let mari_token = invite_token(r.body["results"][1]["url"].as_str().unwrap());
assert_eq!(
app.call("DELETE", &format!("/v1/admin/invitations/{zoli_id}"), Some(&admin), None).await.status,
StatusCode::NO_CONTENT
);
assert_eq!(google_signup(&app, "g-4", "zoli@example.com", None).await.status, StatusCode::FORBIDDEN);
// unsubscribing (one-click POST): the invitation closes and no new one can be sent
let r = app.call("POST", &format!("/v1/public/invitations/unsubscribe?token={mari_token}"), None, None).await;
assert_eq!(r.status, StatusCode::OK);
assert_eq!(google_signup(&app, "g-5", "mari@example.com", None).await.status, StatusCode::FORBIDDEN);
let r = app.post("/v1/admin/invitations", Some(&admin), json!({"emails": ["MARI@example.com"]})).await;
assert_eq!(r.body["results"][0]["status"], "opted_out");
// the waitlist: joining reveals nothing, an invited and accepted address leaves it
for email in ["wait@example.com", "anna@example.com"] {
let r = app.post("/v1/public/waitlist", None, json!({"email": email})).await;
assert_eq!(r.status, StatusCode::ACCEPTED);
}
let list = app.get("/v1/admin/invitations", Some(&admin)).await.body;
assert_eq!(list["waitlist"].as_array().unwrap().len(), 1);
let statuses: Vec<(&str, &str)> = list["invitations"]
.as_array()
.unwrap()
.iter()
.map(|i| (i["email"].as_str().unwrap(), i["status"].as_str().unwrap()))
.collect();
assert!(
statuses.contains(&("guest@example.com", "accepted")) && statuses.contains(&("zoli@example.com", "revoked"))
);
app.post("/v1/admin/invitations", Some(&admin), json!({"emails": ["wait@example.com"]})).await;
assert_eq!(google_signup(&app, "g-6", "wait@example.com", None).await.status, StatusCode::CREATED);
assert!(app.get("/v1/admin/invitations", Some(&admin)).await.body["waitlist"].as_array().unwrap().is_empty());
// preview and a test copy to the admin
let r =
app.post("/v1/admin/invitations/preview", Some(&admin), json!({"message": "Szia!", "send_to_me": true})).await;
assert_eq!(r.body["subject"], "Admin meghívott a Sorsfonalakra");
assert!(r.body["html"].as_str().unwrap().contains("Szia!") && r.body["text"].as_str().unwrap().contains("> Szia!"));
assert_eq!(app.outbox_url("admin@example.com", "invitation").await, "https://sorsfonalak.test/meghivo/minta");
}
+5
View File
@@ -0,0 +1,5 @@
node_modules
.next
*.tsbuildinfo
.env
.env.*
+4
View File
@@ -0,0 +1,4 @@
/node_modules/
/.next/
/next-env.d.ts
*.tsbuildinfo
+23
View File
@@ -0,0 +1,23 @@
# Next.js frontend (standalone output) on Node 22.
FROM node:22.23-alpine AS deps
WORKDIR /app
COPY package.json package-lock.json ./
RUN --mount=type=cache,target=/root/.npm,sharing=locked npm ci --no-audit --no-fund
FROM node:22.23-alpine AS build
WORKDIR /app
ENV NEXT_TELEMETRY_DISABLED=1
COPY --from=deps /app/node_modules ./node_modules
COPY . .
RUN npm run build
FROM node:22.23-alpine
WORKDIR /app
ENV NODE_ENV=production NEXT_TELEMETRY_DISABLED=1 PORT=3000 HOSTNAME=0.0.0.0
RUN addgroup -S app && adduser -S -G app app
COPY --from=build --chown=app:app /app/.next/standalone ./
COPY --from=build --chown=app:app /app/.next/static ./.next/static
USER app
EXPOSE 3000
HEALTHCHECK --interval=10s --timeout=3s --retries=5 CMD wget -qO- http://127.0.0.1:3000/healthz >/dev/null || exit 1
CMD ["node", "server.js"]
+75
View File
@@ -0,0 +1,75 @@
# Frontend
Next.js (App Router, TypeScript) webes felület. A compose-ban a **3001-es** porton fut, mert a dev szerveren a 3000-est más használja.
## Ami kész
- **Belépés** (`/belepes`): Google-fiókkal, a Google Identity Services gombbal. A kapott ID tokent a `POST /v1/auth/google` végpont ellenőrzi; az első belépéskor létrejön a fiók.
- **Profil** (`/profil`):
- fiókadatok: e-mail, belépési mód, szerepkörök, megmaradt elemzések;
- a megjelenített név és az elemzések nyelve szerkeszthető;
- **saját születési adatok**: dátum, idő (vagy „nem tudom”), ország és település helykeresővel. Mentéskor kiszámolja a képletet, és megmutatja a pozíciókat (bolygók, tengelyek, házcsúcsok).
- A javított adatokból új képlet lesz (a backend a születési adatot nem módosítja), és az lesz a saját képlet.
- Ha a megadott időpont az óraátállítás miatt kétszer is előfordult, a felület megkérdezi, melyikről van szó.
- **Összevetések** (`/osszevetesek`, szinasztria): a saját és a felvett személyek képletei közül bármelyik kettő összevethető; a személykártyán és a személy képletoldalán „Összevetés velem” gomb is van. Az összevetés oldala (`/osszevetesek/{id}`):
- kettős kör: belül az első fél bolygói és házai, kívül a második fél bolygói, középen a köztük lévő főfényszögek;
- a fényszögek jelleg szerint (harmonikus, feszültebb, együttállás);
- fülek: fizetős kapcsolati elemzés (`synastry` egység), a két fél közti fényszögmátrix, házátfedések, kompozit, részletes lista.
- **Admin** (`/admin`, csak `admin` szerepkörrel; másnak 404):
- felhasználók keresése;
- szerepkörök be- és kikapcsolása (felhasználó, prémium, VIP, szerző, admin);
- elemzések jóváírása típusonként (képlet, szinasztria);
- **Promptok** (`/admin/promptok`): a tömör összefoglaló, a részletes és a kapcsolati elemzés system promptja szerkeszthető, változatokkal; mentés előtt egy saját képleten vagy összevetésen kipróbálható.
- **Jogosultság:** a belépést nem igénylő oldalakon kívül minden oldal a szerveren ellenőrzi a munkamenetet; belépés nélkül a belépőoldalra irányít, majd vissza.
## Felépítés
- `src/app/api/v1/[...path]`: proxy a backend felé. A böngésző csak a frontend címét hívja, így a munkamenet-süti (`sf_session`, HttpOnly) a frontend domainjén él, és nem kell CORS.
- `src/app/api/geo/[kind]`: a horoscope-api ország- és helykeresője (`countries`, `places`). Más végpontot nem enged át.
- `src/lib/server.ts`: backend-hívás szerveroldalon a látogató munkamenetével (`getMe`, `requireMe`).
- `src/lib/api.ts`: backend-hívás a böngészőből.
- `src/lib/astro.ts`: magyar jegy- és bolygónevek, jelek, dátumformázás.
- A színek és betűk a design-vászonból jönnek (`src/app/globals.css`): éjkék háttér, arany kiemelés, Cormorant Garamond és Inter.
## Beállítás
| Változó | Alapérték | Mire |
|---|---|---|
| `BACKEND_URL` | `http://localhost:8081` | a backend belső címe |
| `HOROSCOPE_API_URL` | `http://localhost:8080` | a horoscope-api belső címe (helykereső) |
A Google kliens-azonosítót a frontend a backend `GET /v1/config` végpontjáról kapja, ezért a frontendnek nem kell külön beállítás.
## Google-belépés beállítása
1. A Google Cloud Console-ban (APIs & Services → Credentials) hozz létre egy **OAuth client ID**-t **Web application** típussal.
2. Az **Authorized JavaScript origins** listába vedd fel azokat a címeket, ahonnan a felületet megnyitod, például:
- `http://localhost:3001` (fejlesztés);
- később az éles domaint, `https://` előtaggal.
A Google csak `https://` vagy `localhost` címet fogad el. A dev szervert ezért SSH-alagúton keresztül nyisd meg: `ssh -L 3001:localhost:3001 dev`, utána a böngészőben `http://localhost:3001`.
3. A repó gyökerében lévő `.env` fájlba (nincs a gitben) írd be:
```
GOOGLE_CLIENT_IDS=<kliens-azonosító>.apps.googleusercontent.com
BOOTSTRAP_ADMIN_EMAILS=<a te Gmail-címed>
```
A `BOOTSTRAP_ADMIN_EMAILS` címek az első belépéskor admin szerepkört kapnak.
4. `docker compose up -d backend`
## Fejlesztés
```bash
cd services/frontend
npm ci
BACKEND_URL=http://localhost:8081 HOROSCOPE_API_URL=http://localhost:8080 npm run dev # http://localhost:3001
npm run typecheck
```
## Később
- interaktív radix SVG-komponens (ugyanaz rajzolja az OG-képet is);
- szinasztria, meghívók, elemzések kérése és megjelenítése;
- angol felület;
- további belépési módok (e-mail és jelszó, Facebook, Apple, passkey).
+9
View File
@@ -0,0 +1,9 @@
import type { NextConfig } from "next";
const config: NextConfig = {
// Small self-contained server for the container image.
output: "standalone",
poweredByHeader: false,
};
export default config;
+1023
View File
File diff suppressed because it is too large Load Diff
+23
View File
@@ -0,0 +1,23 @@
{
"name": "sorsfonalak-frontend",
"version": "0.1.0",
"private": true,
"scripts": {
"dev": "next dev -p 3001",
"build": "next build",
"start": "next start -p 3001",
"typecheck": "tsc --noEmit"
},
"dependencies": {
"next": "16.4.6",
"react": "19.3.1",
"react-dom": "19.3.1",
"server-only": "0.0.1"
},
"devDependencies": {
"@types/node": "22.20.5",
"@types/react": "19.3.0",
"@types/react-dom": "19.3.0",
"typescript": "5.9.3"
}
}
@@ -0,0 +1,223 @@
import type { Metadata } from "next";
import Link from "next/link";
import { Logo } from "@/components/SiteHeader";
import { OPERATOR, PRIVACY_UPDATED } from "@/lib/legal";
import { getMe } from "@/lib/server";
export const metadata: Metadata = {
title: "Adatvédelmi tájékoztató",
description: "Hogyan kezeli a Sorsfonalak a személyes adataidat.",
};
/** Privacy policy: public, also for visitors who are not logged in. */
export default async function PrivacyPage() {
const me = await getMe();
return (
<>
{!me && (
<header className="site-header">
<Logo />
</header>
)}
<main className="page legal">
<div className="page-head">
<h1>Adatvédelmi tájékoztató</h1>
<p className="muted">Hatályos: {PRIVACY_UPDATED}</p>
</div>
<section>
<h2>1. Ki kezeli az adataidat?</h2>
<p>
A Sorsfonalak szolgáltatás (sorsfonalak.hu) adatkezelője: <strong>{OPERATOR.name}</strong>, {OPERATOR.address}
{OPERATOR.registration ? `, ${OPERATOR.registration}` : ""}. Adatvédelmi kérdésekben itt érsz el minket:{" "}
<strong>{OPERATOR.email}</strong>.
</p>
</section>
<section>
<h2>2. Milyen adatokat kezelünk, és miért?</h2>
<table className="legal-table">
<thead>
<tr>
<th scope="col">Adat</th>
<th scope="col">Cél</th>
<th scope="col">Jogalap</th>
</tr>
</thead>
<tbody>
<tr>
<td>Google-fiókod neve, e-mail-címe és azonosítója (belépéskor a Google adja át)</td>
<td>Fiókod létrehozása, belépés, kapcsolattartás</td>
<td>Szerződés teljesítése (GDPR 6. cikk (1) b)</td>
</tr>
<tr>
<td>Megjelenített név, az elemzések nyelve</td>
<td>A szolgáltatás személyre szabása</td>
<td>Szerződés teljesítése</td>
</tr>
<tr>
<td>Születési adataid: dátum, időpont, hely</td>
<td>A születési képleted kiszámítása és az elemzések elkészítése</td>
<td>Szerződés teljesítése</td>
</tr>
<tr>
<td>Az általad felvett személyek neve és születési adatai</td>
<td>Az ő képletük és elemzésük elkészítése a kérésedre</td>
<td>Szerződés teljesítése; a felvételhez az érintett beleegyezése szükséges (lásd 4. pont)</td>
</tr>
<tr>
<td>A képletek és az elkészült elemzések</td>
<td>Hogy bármikor újra megnézhesd őket</td>
<td>Szerződés teljesítése</td>
</tr>
<tr>
<td>Vásárlásaid és felhasznált kereteid (elemzések, személyek)</td>
<td>A megvásárolt szolgáltatás nyújtása, elszámolás</td>
<td>Szerződés teljesítése; számviteli kötelezettség (6. cikk (1) c)</td>
</tr>
<tr>
<td>Meghívott e-mail-címe, a meghívó neve és személyes üzenete</td>
<td>A meghívó elküldése; amíg az oldal zártkörű, csak meghívottak regisztrálhatnak</td>
<td>Jogos érdek (6. cikk (1) f)</td>
</tr>
<tr>
<td>A várólistán megadott e-mail-cím</td>
<td>Értesítés, ha megnyílik az oldal, vagy meghívót küldünk</td>
<td>Hozzájárulás (6. cikk (1) a)</td>
</tr>
<tr>
<td>Azok a címek, amelyek leiratkoztak a meghívókról (csak a cím egyirányú lenyomata, hash-e)</td>
<td>Hogy ezekre a címekre ne küldjünk több meghívót</td>
<td>Jogos érdek (6. cikk (1) f)</td>
</tr>
<tr>
<td>IP-cím, böngésző adatai, a kérések ideje (szervernaplók)</td>
<td>Biztonság, hibakeresés, visszaélések kiszűrése</td>
<td>Jogos érdek (6. cikk (1) f)</td>
</tr>
</tbody>
</table>
<p>
Bankkártyaadatot nem kezelünk és nem tárolunk; a fizetést, amikor elindul, külső fizetési szolgáltató
végzi, akinek a neve itt lesz feltüntetve.
</p>
</section>
<section>
<h2>3. Az elemzések és a mesterséges intelligencia</h2>
<p>
A rövid összefoglalót és a részletes elemzést nagy nyelvi modell (mesterséges intelligencia) írja. A
modellhez <strong>csak a képlet csillagászati adatai</strong> jutnak el (a bolygók jegye, foka, háza és
fényszögei). Nevet, e-mail-címet, születési dátumot, időpontot vagy helyet nem küldünk el. Az elemzés
szórakoztató és önismereti célú szöveg, nem minősül egészségügyi, pénzügyi, jogi vagy más szakmai
tanácsnak.
</p>
</section>
<section>
<h2>4. Más emberek adatai</h2>
<p>
Ha valaki más (például társad vagy családtagod) születési adatait veszed fel, kérjük, csak az ő
beleegyezésével tedd. Az ő adatait kizárólag te látod; tőlünk senki más nem kapja meg. Az általad felvett
személyt bármikor törölheted, ezzel a képlete és az elemzései is törlődnek.
</p>
</section>
<section>
<h2>5. Kik férnek hozzá az adatokhoz? (adatfeldolgozók)</h2>
<ul>
<li>
<strong>DigitalOcean, LLC</strong> – a szerverek üzemeltetése; az adatok az Európai Unióban (Amszterdam)
vannak tárolva.
</li>
<li>
<strong>Cloudflare, Inc.</strong> – a forgalom továbbítása és a támadások elleni védelem; az oldal
letöltésekor kezeli az IP-címedet és a kérés adatait.
</li>
<li>
<strong>Google LLC</strong> – bejelentkezés Google-fiókkal.
</li>
<li>
<strong>Amazon Web Services EMEA SARL</strong> (Amazon SES) – a rendszerlevelek és a meghívók kézbesítése;
az Európai Unióban (Frankfurt).
</li>
<li>
<strong>OpenRouter, Inc.</strong> és az általa elért modellszolgáltató (jelenleg{" "}
<strong>Anthropic PBC</strong>) – az elemzések megírása, kizárólag a 3. pontban leírt csillagászati
adatokból.
</li>
</ul>
<p>
Ezek közül néhány szolgáltató az Egyesült Államokban működik. Az adattovábbítás az EU–USA adatvédelmi
keretrendszer (Data Privacy Framework) vagy az Európai Bizottság általános szerződési feltételei
(SCC) alapján történik.
</p>
</section>
<section>
<h2>6. Meddig őrizzük az adatokat?</h2>
<ul>
<li>Fiókod adatait, képleteidet és elemzéseidet a fiókod törléséig.</li>
<li>A biztonsági mentésekből a törölt adatok legkésőbb 14 nap után tűnnek el.</li>
<li>A szervernaplókat legfeljebb 30 napig őrizzük.</li>
<li>
Az el nem fogadott meghívókat a lejáratuk vagy visszavonásuk után 30 nappal töröljük. A meghívólevelekben
bármikor leiratkozhatsz.
</li>
<li>A várólistán megadott címet a regisztrációdig, vagy amíg nem kéred a törlését.</li>
<li>A számlázáshoz szükséges adatokat a számviteli törvény szerinti ideig (8 évig) őrizzük.</li>
</ul>
</section>
<section>
<h2>7. Sütik</h2>
<p>
Csak egy, a működéshez feltétlenül szükséges sütit használunk (<code>sf_session</code>), amely belépve
tart. Reklám- vagy követő sütiket, illetve látogatottságmérőt nem használunk.
</p>
</section>
<section>
<h2>8. A jogaid</h2>
<ul>
<li>
<strong>Hozzáférés és adathordozhatóság:</strong> a <Link href="/profil#adataim">Profil</Link> oldalon
egy kattintással letöltheted minden adatodat.
</li>
<li>
<strong>Helyesbítés:</strong> a nevedet és a születési adataidat a Profil oldalon módosíthatod.
</li>
<li>
<strong>Törlés:</strong> a fiókodat és minden adatodat a Profil oldalon törölheted.
</li>
<li>
<strong>Korlátozás és tiltakozás:</strong> a fenti e-mail-címen kérheted.
</li>
</ul>
<p>
Kérésedre legkésőbb egy hónapon belül válaszolunk. Ha úgy érzed, megsértettük a jogaidat, panaszt tehetsz
a Nemzeti Adatvédelmi és Információszabadság Hatóságnál (NAIH, 1055 Budapest, Falk Miksa utca 9–11.,{" "}
<a href="https://naih.hu" target="_blank" rel="noopener noreferrer">
naih.hu
</a>
), vagy bírósághoz fordulhatsz.
</p>
</section>
<section>
<h2>9. Korhatár</h2>
<p>A szolgáltatást 16 éven felüliek használhatják.</p>
</section>
<section>
<h2>10. Változások</h2>
<p>
Ha a tájékoztató lényegesen változik, a belépéskor vagy e-mailben jelezzük. A mindenkori változat ezen az
oldalon olvasható.
</p>
</section>
</main>
</>
);
}
@@ -0,0 +1,297 @@
"use client";
import { useCallback, useEffect, useState } from "react";
import { huf, usePackages } from "@/components/PackageCards";
import { api, errorText } from "@/lib/api";
import { ROLE_LABELS, formatDate } from "@/lib/astro";
import type { AdminUser, Package, Role } from "@/lib/types";
const EDITABLE_ROLES: Role[] = ["user", "creator", "admin"];
const UNITS: { value: "natal" | "synastry"; label: string }[] = [
{ value: "natal", label: "képlet" },
{ value: "synastry", label: "szinasztria" },
];
export function AdminUsers({ selfId }: { selfId: string }) {
const [query, setQuery] = useState("");
const [users, setUsers] = useState<AdminUser[] | null>(null);
const [error, setError] = useState<string | null>(null);
const packages = usePackages() ?? [];
const load = useCallback(async (q: string) => {
try {
const data = await api<{ users: AdminUser[] }>(`/admin/users?q=${encodeURIComponent(q)}`);
setUsers(data.users);
setError(null);
} catch (e) {
setError(errorText(e));
}
}, []);
useEffect(() => {
const t = setTimeout(() => load(query.trim()), 250);
return () => clearTimeout(t);
}, [query, load]);
return (
<section className="card" aria-label="Felhasználók listája">
<div className="field" style={{ maxWidth: 420 }}>
<label htmlFor="user-search">Keresés név vagy e-mail alapján</label>
<input
id="user-search"
className="inp"
type="search"
value={query}
onChange={(e) => setQuery(e.target.value)}
placeholder="pl. anna@"
/>
</div>
{error && (
<p className="msg msg-error" role="alert">
{error}
</p>
)}
{users === null ? (
<p className="muted">Betöltés…</p>
) : users.length === 0 ? (
<p className="muted">Nincs találat.</p>
) : (
<div className="table-wrap">
<table>
<thead>
<tr>
<th scope="col">Felhasználó</th>
<th scope="col">Szerepkörök</th>
<th scope="col">Részletes elemzések</th>
<th scope="col">Csomag</th>
<th scope="col">Képletek</th>
<th scope="col">Regisztrált</th>
<th scope="col">Utoljára belépett</th>
</tr>
</thead>
<tbody>
{users.map((u) => (
<UserRow
key={u.id}
user={u}
isSelf={u.id === selfId}
packages={packages}
onChange={(next) => setUsers((list) => list?.map((x) => (x.id === next.id ? next : x)) ?? null)}
/>
))}
</tbody>
</table>
</div>
)}
</section>
);
}
function UserRow({
user,
isSelf,
packages,
onChange,
}: {
user: AdminUser;
isSelf: boolean;
packages: Package[];
onChange: (u: AdminUser) => void;
}) {
const [status, setStatus] = useState<{ ok: boolean; text: string } | null>(null);
const [busy, setBusy] = useState(false);
const [delta, setDelta] = useState("");
const [unit, setUnit] = useState<"natal" | "synastry">("natal");
async function toggleRole(role: Role, on: boolean) {
const roles = on ? [...user.roles, role] : user.roles.filter((r) => r !== role);
if (roles.length === 0) return setStatus({ ok: false, text: "Legalább egy szerepkör kell." });
setBusy(true);
setStatus(null);
try {
const res = await api<{ roles: Role[] }>(`/admin/users/${user.id}`, { method: "PATCH", body: { roles } });
onChange({ ...user, roles: res.roles });
} catch (e) {
setStatus({ ok: false, text: errorText(e) });
} finally {
setBusy(false);
}
}
async function grant(e: React.FormEvent) {
e.preventDefault();
const n = Number.parseInt(delta, 10);
if (!Number.isFinite(n) || n === 0) return setStatus({ ok: false, text: "Adj meg egy nem nulla egész számot." });
setBusy(true);
setStatus(null);
try {
const res = await api<{ analyses_left: AdminUser["analyses_left"] }>(`/admin/users/${user.id}/credits`, {
body: { unit, delta: n, note: "admin" },
});
onChange({ ...user, analyses_left: res.analyses_left });
setDelta("");
const label = UNITS.find((u) => u.value === unit)?.label;
setStatus({ ok: true, text: `${n > 0 ? "+" : ""}${n} ${label}` });
} catch (e) {
setStatus({ ok: false, text: errorText(e) });
} finally {
setBusy(false);
}
}
return (
<tr>
<td>
<div>{user.display_name || <span className="muted">(nincs név)</span>}</div>
<div className="muted" style={{ fontSize: 13 }}>
{user.email}
{isSelf && " · te"}
</div>
</td>
<td>
<div className="row" style={{ gap: 4 }}>
{EDITABLE_ROLES.map((role) => {
const on = user.roles.includes(role);
const locked = isSelf && role === "admin";
return (
<label key={role} className="check" style={{ minHeight: 28, fontSize: 13, marginRight: 8 }}>
<input
type="checkbox"
checked={on}
disabled={busy || locked}
onChange={(e) => toggleRole(role, e.target.checked)}
title={locked ? "A saját admin szerepköröd nem veheted el." : undefined}
/>
{ROLE_LABELS[role]}
</label>
);
})}
</div>
</td>
<td>
<form onSubmit={grant} className="row" style={{ gap: 6, flexWrap: "nowrap" }}>
<span className="num" style={{ minWidth: 92, fontSize: 13 }}>
képlet {user.analyses_left.natal}
<br />
szinasztria {user.analyses_left.synastry}
</span>
<label className="sr-only" htmlFor={`unit-${user.id}`}>
Elemzés fajtája
</label>
<select
id={`unit-${user.id}`}
className="inp"
style={{ width: 118, minHeight: 36 }}
value={unit}
onChange={(e) => setUnit(e.target.value as "natal" | "synastry")}
>
{UNITS.map((u) => (
<option key={u.value} value={u.value}>
{u.label}
</option>
))}
</select>
<label className="sr-only" htmlFor={`delta-${user.id}`}>
Jóváírt darabszám
</label>
<input
id={`delta-${user.id}`}
className="inp"
style={{ width: 76, minHeight: 36 }}
inputMode="numeric"
placeholder="+1"
value={delta}
onChange={(e) => setDelta(e.target.value)}
/>
<button type="submit" className="btn btn-sm" disabled={busy || !delta}>
Jóváír
</button>
</form>
{status && (
<span className={status.ok ? "msg msg-ok" : "msg msg-error"} role="status">
{status.text}
</span>
)}
</td>
<td>
<PackageGrant user={user} packages={packages} onChange={onChange} />
</td>
<td className="num">{user.charts}</td>
<td className="num">{formatDate(user.created_at)}</td>
<td className="num">{formatDate(user.last_login_at, true)}</td>
</tr>
);
}
/** Gives the user a package from the catalog (a gift: nothing is paid). */
function PackageGrant({
user,
packages,
onChange,
}: {
user: AdminUser;
packages: Package[];
onChange: (u: AdminUser) => void;
}) {
const [id, setId] = useState("");
const [busy, setBusy] = useState(false);
const [status, setStatus] = useState<{ ok: boolean; text: string } | null>(null);
async function give(e: React.FormEvent) {
e.preventDefault();
const pkg = packages.find((p) => p.id === id);
if (!pkg) return;
setBusy(true);
setStatus(null);
try {
const res = await api<{ analyses_left: AdminUser["analyses_left"]; unlimited_until: string | null }>(
`/admin/users/${user.id}/packages`,
{ body: { package: pkg.id, note: "admin ajándék" } },
);
onChange({ ...user, analyses_left: res.analyses_left, unlimited_until: res.unlimited_until });
setStatus({ ok: true, text: `${pkg.name} kiosztva` });
setId("");
} catch (err) {
setStatus({ ok: false, text: errorText(err) });
} finally {
setBusy(false);
}
}
return (
<form onSubmit={give} className="field" style={{ gap: 6 }}>
{user.unlimited_until && (
<span className="badge badge-gold">Korlátlan {formatDate(user.unlimited_until).replace(/\.$/, "")}-ig</span>
)}
<div className="row" style={{ gap: 6, flexWrap: "nowrap" }}>
<label className="sr-only" htmlFor={`pkg-${user.id}`}>
Kiosztandó csomag
</label>
<select
id={`pkg-${user.id}`}
className="inp"
style={{ width: 190, minHeight: 36 }}
value={id}
onChange={(e) => setId(e.target.value)}
disabled={busy || packages.length === 0}
>
<option value="">Válassz csomagot…</option>
{packages.map((p) => (
<option key={p.id} value={p.id}>
{p.name} ({huf(p.price_huf)})
</option>
))}
</select>
<button type="submit" className="btn btn-sm" disabled={busy || !id}>
{busy ? "…" : "Kiosztás"}
</button>
</div>
{status && (
<span className={status.ok ? "msg msg-ok" : "msg msg-error"} role="status">
{status.text}
</span>
)}
</form>
);
}
@@ -0,0 +1,472 @@
"use client";
import { useCallback, useEffect, useState } from "react";
import { api, errorText } from "@/lib/api";
import { formatDate } from "@/lib/astro";
import type { AdminInvitation, InvitationResult, WaitlistEntry } from "@/lib/types";
const MAX_MESSAGE = 300;
const STATUS: Record<AdminInvitation["status"], string> = {
pending: "Függőben",
accepted: "Elfogadva",
expired: "Lejárt",
revoked: "Visszavonva",
};
const MAIL: Record<AdminInvitation["mail"], string> = {
sent: "Elküldve",
queued: "Sorban vár",
failed: "Sikertelen",
archived: "Elküldve (archív)",
};
const RESULT: Record<InvitationResult["status"], string> = {
invited: "meghívva",
invalid: "érvénytelen cím",
already_user: "már felhasználó",
already_invited: "már van élő meghívója (újraküldés a listában)",
opted_out: "leiratkozott a meghívókról",
};
interface ListData {
invitations: AdminInvitation[];
waitlist: WaitlistEntry[];
signup_mode: "invite" | "open";
}
function CopyLink({ url }: { url: string }) {
const [copied, setCopied] = useState(false);
return (
<button
type="button"
className="btn btn-sm btn-ghost"
onClick={async () => {
try {
await navigator.clipboard.writeText(url);
setCopied(true);
} catch {
window.prompt("A meghívólink:", url);
}
}}
>
{copied ? "Kimásolva" : "Link másolása"}
</button>
);
}
/** Addresses from free text: one per line, or separated by commas, semicolons or spaces. */
function parseEmails(text: string): string[] {
return text
.split(/[\s,;]+/)
.map((s) => s.trim())
.filter(Boolean);
}
export function AdminInvitations() {
const [data, setData] = useState<ListData | null>(null);
const [error, setError] = useState<string | null>(null);
const load = useCallback(async () => {
try {
setData(await api<ListData>("/admin/invitations"));
setError(null);
} catch (e) {
setError(errorText(e));
}
}, []);
useEffect(() => {
load();
}, [load]);
return (
<div className="field" style={{ gap: 24 }}>
{data?.signup_mode === "open" && (
<p className="msg" role="status">
A regisztráció most nyitott (<code>SIGNUP_MODE=open</code>): bárki beléphet, a meghívó csak értesítés.
</p>
)}
<InviteForm onSent={load} />
{error && (
<p className="msg msg-error" role="alert">
{error}
</p>
)}
{data && <InvitationList invitations={data.invitations} onChange={load} />}
{data && <WaitlistTable waitlist={data.waitlist} onChange={load} />}
</div>
);
}
function InviteForm({ onSent }: { onSent: () => Promise<void> }) {
const [emails, setEmails] = useState("");
const [message, setMessage] = useState("");
const [locale, setLocale] = useState("hu");
const [busy, setBusy] = useState(false);
const [error, setError] = useState<string | null>(null);
const [results, setResults] = useState<InvitationResult[] | null>(null);
const count = parseEmails(emails).length;
async function submit(e: React.FormEvent) {
e.preventDefault();
setBusy(true);
setError(null);
setResults(null);
try {
const res = await api<{ results: InvitationResult[] }>("/admin/invitations", {
body: { emails: parseEmails(emails), message: message.trim() || null, locale },
});
setResults(res.results);
if (res.results.some((r) => r.status === "invited")) setEmails("");
await onSent();
} catch (err) {
setError(errorText(err));
} finally {
setBusy(false);
}
}
return (
<section className="card field" style={{ gap: 16 }} aria-labelledby="invite-title">
<h2 id="invite-title" style={{ margin: 0 }}>
Új meghívó
</h2>
<form onSubmit={submit} className="field" style={{ gap: 14 }}>
<div className="field">
<label htmlFor="invite-emails">E-mail-címek</label>
<textarea
id="invite-emails"
className="inp"
rows={3}
required
value={emails}
onChange={(e) => setEmails(e.target.value)}
placeholder={"kata@pelda.hu\nbela@pelda.hu"}
/>
<span className="hint">Soronként egy, vagy vesszővel elválasztva; egyszerre legfeljebb 50.</span>
</div>
<div className="field">
<label htmlFor="invite-message">Személyes üzenet (nem kötelező)</label>
<textarea
id="invite-message"
className="inp"
rows={3}
maxLength={MAX_MESSAGE}
value={message}
onChange={(e) => setMessage(e.target.value)}
placeholder="Szia! Ezt nézd meg, szerintem tetszeni fog."
/>
<span className="hint">
{message.length}/{MAX_MESSAGE} karakter. Link nem lehet benne (spamszűrők miatt).
</span>
</div>
<div className="row" style={{ gap: 12, alignItems: "flex-end", flexWrap: "wrap" }}>
<div className="field" style={{ width: 160 }}>
<label htmlFor="invite-locale">A levél nyelve</label>
<select id="invite-locale" className="inp" value={locale} onChange={(e) => setLocale(e.target.value)}>
<option value="hu">magyar</option>
<option value="en">angol</option>
</select>
</div>
<button type="submit" className="btn btn-primary" disabled={busy || count === 0}>
{busy ? "Küldés…" : count > 1 ? `${count} meghívó küldése` : "Meghívó küldése"}
</button>
</div>
</form>
{error && (
<p className="msg msg-error" role="alert">
{error}
</p>
)}
{results && (
<ul className="invite-results" aria-label="Eredmény">
{results.map((r) => (
<li key={r.email}>
<span className={r.status === "invited" ? "msg-ok" : "muted"}>
{r.email}: {RESULT[r.status]}
</span>
{r.url && <CopyLink url={r.url} />}
</li>
))}
</ul>
)}
<MailPreview message={message} locale={locale} />
</section>
);
}
/** The invitation e-mail as the recipient sees it, and a test copy to the admin. */
function MailPreview({ message, locale }: { message: string; locale: string }) {
const [mail, setMail] = useState<{ subject: string; html: string; text: string } | null>(null);
const [view, setView] = useState<"html" | "text">("html");
const [busy, setBusy] = useState(false);
const [note, setNote] = useState<{ ok: boolean; text: string } | null>(null);
async function show(sendToMe: boolean) {
setBusy(true);
setNote(null);
try {
const res = await api<{ subject: string; html: string; text: string; sent_to: string | null }>(
"/admin/invitations/preview",
{ body: { message: message.trim() || null, locale, send_to_me: sendToMe } },
);
setMail(res);
if (res.sent_to) setNote({ ok: true, text: `Tesztlevél a sorban: ${res.sent_to}. A linkjei nem működnek.` });
} catch (e) {
setNote({ ok: false, text: errorText(e) });
} finally {
setBusy(false);
}
}
return (
<div className="field mail-preview" style={{ gap: 10 }}>
<div className="row" style={{ gap: 8, flexWrap: "wrap" }}>
<button type="button" className="btn btn-sm" onClick={() => show(false)} disabled={busy}>
{mail ? "Előnézet frissítése" : "Levél előnézete"}
</button>
<button type="button" className="btn btn-sm btn-ghost" onClick={() => show(true)} disabled={busy}>
Teszt küldése magamnak
</button>
</div>
{note && (
<p className={note.ok ? "msg msg-ok" : "msg msg-error"} role={note.ok ? "status" : "alert"}>
{note.text}
</p>
)}
{mail && (
<>
<p style={{ margin: 0 }}>
<span className="muted">Tárgy:</span> <strong>{mail.subject}</strong>
</p>
<div className="row" role="group" aria-label="Változat" style={{ gap: 4 }}>
{(["html", "text"] as const).map((v) => (
<button
key={v}
type="button"
className={view === v ? "btn btn-sm" : "btn btn-sm btn-ghost"}
aria-pressed={view === v}
onClick={() => setView(v)}
>
{v === "html" ? "HTML" : "Szöveges"}
</button>
))}
</div>
{view === "html" ? (
<iframe title="A levél HTML-változata" className="mail-frame" srcDoc={mail.html} sandbox="" />
) : (
<pre className="mail-text">{mail.text}</pre>
)}
</>
)}
</div>
);
}
function InvitationList({ invitations, onChange }: { invitations: AdminInvitation[]; onChange: () => Promise<void> }) {
return (
<section className="card" aria-labelledby="invitations-title">
<h2 id="invitations-title" style={{ marginTop: 0 }}>
Meghívók
</h2>
{invitations.length === 0 ? (
<p className="muted">Még nincs meghívó.</p>
) : (
<div className="table-wrap">
<table>
<thead>
<tr>
<th scope="col">Cím</th>
<th scope="col">Állapot</th>
<th scope="col">Levél</th>
<th scope="col">Küldve</th>
<th scope="col">Lejár</th>
<th scope="col">
<span className="sr-only">Műveletek</span>
</th>
</tr>
</thead>
<tbody>
{invitations.map((i) => (
<InvitationRow key={i.id} invitation={i} onChange={onChange} />
))}
</tbody>
</table>
</div>
)}
</section>
);
}
function InvitationRow({ invitation: i, onChange }: { invitation: AdminInvitation; onChange: () => Promise<void> }) {
const [busy, setBusy] = useState(false);
const [note, setNote] = useState<string | null>(null);
const [url, setUrl] = useState<string | null>(null);
async function act(kind: "resend" | "revoke") {
if (kind === "revoke" && !window.confirm(`Visszavonod a meghívót (${i.email})?`)) return;
setBusy(true);
setNote(null);
try {
if (kind === "resend") {
const res = await api<{ url: string }>(`/admin/invitations/${i.id}/resend`, { body: {} });
setUrl(res.url);
} else {
await api(`/admin/invitations/${i.id}`, { method: "DELETE" });
}
await onChange();
} catch (e) {
setNote(errorText(e));
} finally {
setBusy(false);
}
}
return (
<tr>
<td>
<div>{i.email}</div>
{i.message && (
<div className="hint invite-msg" title={i.message}>
„{i.message}”
</div>
)}
</td>
<td>
<span className={`badge invite-${i.status}`}>{STATUS[i.status]}</span>
{i.accepted_by && <div className="hint">{i.accepted_by}</div>}
</td>
<td>
<span className={i.mail === "failed" ? "msg-error" : i.mail === "queued" ? "muted" : undefined}>
{MAIL[i.mail]}
</span>
{i.mail_error && <div className="hint">{i.mail_error.slice(0, 120)}</div>}
</td>
<td className="num">
{formatDate(i.last_sent_at)}
{i.sent_count > 1 && <div className="hint">{i.sent_count}× küldve</div>}
</td>
<td className="num">{i.status === "pending" || i.status === "expired" ? formatDate(i.expires_at) : "–"}</td>
<td>
<div className="row" style={{ gap: 4, flexWrap: "nowrap", justifyContent: "flex-end" }}>
{url && <CopyLink url={url} />}
{i.can_resend && (
<button type="button" className="btn btn-sm" onClick={() => act("resend")} disabled={busy}>
Újraküldés
</button>
)}
{(i.status === "pending" || i.status === "expired") && (
<button type="button" className="btn btn-sm btn-ghost" onClick={() => act("revoke")} disabled={busy}>
Visszavonás
</button>
)}
</div>
{note && (
<div className="msg-error" role="alert" style={{ fontSize: 13 }}>
{note}
</div>
)}
</td>
</tr>
);
}
function WaitlistTable({ waitlist, onChange }: { waitlist: WaitlistEntry[]; onChange: () => Promise<void> }) {
const [busy, setBusy] = useState<string | null>(null);
const [note, setNote] = useState<string | null>(null);
async function invite(w: WaitlistEntry) {
setBusy(w.email);
setNote(null);
try {
const res = await api<{ results: InvitationResult[] }>("/admin/invitations", {
body: { emails: [w.email], locale: w.locale },
});
const r = res.results[0];
if (r && r.status !== "invited") setNote(`${r.email}: ${RESULT[r.status]}`);
await onChange();
} catch (e) {
setNote(errorText(e));
} finally {
setBusy(null);
}
}
async function remove(w: WaitlistEntry) {
setBusy(w.email);
setNote(null);
try {
await api(`/admin/waitlist/${encodeURIComponent(w.email)}`, { method: "DELETE" });
await onChange();
} catch (e) {
setNote(errorText(e));
} finally {
setBusy(null);
}
}
return (
<section className="card" aria-labelledby="waitlist-title">
<h2 id="waitlist-title" style={{ marginTop: 0 }}>
Várólista
</h2>
<p className="hint">Akik meghívó nélkül próbáltak belépni, és kérték, hogy szóljunk nekik.</p>
{note && (
<p className="msg msg-error" role="alert">
{note}
</p>
)}
{waitlist.length === 0 ? (
<p className="muted">Üres.</p>
) : (
<div className="table-wrap">
<table>
<thead>
<tr>
<th scope="col">Cím</th>
<th scope="col">Feliratkozott</th>
<th scope="col">Meghívó</th>
<th scope="col">
<span className="sr-only">Műveletek</span>
</th>
</tr>
</thead>
<tbody>
{waitlist.map((w) => (
<tr key={w.email}>
<td>{w.email}</td>
<td className="num">{formatDate(w.created_at)}</td>
<td>{w.invitation === "pending" ? "elküldve" : w.invitation === "accepted" ? "elfogadva" : "–"}</td>
<td>
<div className="row" style={{ gap: 4, flexWrap: "nowrap", justifyContent: "flex-end" }}>
{w.invitation === null && (
<button
type="button"
className="btn btn-sm"
onClick={() => invite(w)}
disabled={busy !== null}
>
Meghívás
</button>
)}
<button
type="button"
className="btn btn-sm btn-ghost"
onClick={() => remove(w)}
disabled={busy !== null}
>
Törlés
</button>
</div>
</td>
</tr>
))}
</tbody>
</table>
</div>
)}
</section>
);
}
@@ -0,0 +1,27 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { AdminNav } from "@/components/AdminNav";
import { requireMe } from "@/lib/server";
import { AdminInvitations } from "./AdminInvitations";
export const metadata: Metadata = { title: "Meghívók" };
export default async function AdminInvitationsPage() {
const me = await requireMe("/admin/meghivok");
if (!me.user.roles.includes("admin")) notFound();
return (
<main className="page" style={{ maxWidth: 1180 }}>
<AdminNav current="/admin/meghivok" />
<div className="page-head">
<h1>Meghívók</h1>
<p className="muted">
Az oldalra csak meglévő felhasználó vagy meghívott léphet be. A meghívó 30 napig érvényes, és a linkkel bármelyik
Google-fiókkal elfogadható.
</p>
</div>
<AdminInvitations />
</main>
);
}
+25
View File
@@ -0,0 +1,25 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { AdminNav } from "@/components/AdminNav";
import { requireMe } from "@/lib/server";
import { AdminUsers } from "./AdminUsers";
export const metadata: Metadata = { title: "Admin" };
export default async function AdminPage() {
const me = await requireMe("/admin");
// Non-admins see the same 404 as for a missing page.
if (!me.user.roles.includes("admin")) notFound();
return (
<main className="page" style={{ maxWidth: 1180 }}>
<AdminNav current="/admin" />
<div className="page-head">
<h1>Felhasználók</h1>
<p className="muted">Szerepkörök kezelése, csomagok kiosztása és elemzések jóváírása (ajándék, reklamáció).</p>
</div>
<AdminUsers selfId={me.user.id} />
</main>
);
}
@@ -0,0 +1,283 @@
"use client";
import { useEffect, useState } from "react";
import { Tabs } from "@/components/Tabs";
import { api, errorText } from "@/lib/api";
import { formatDate } from "@/lib/astro";
import type { AdminPrompt, ChartListItem, PromptKind } from "@/lib/types";
import { PromptTrial } from "./PromptTrial";
const KINDS: { kind: PromptKind; id: string; label: string; about: string }[] = [
{
kind: "summary",
id: "osszefoglalo",
label: "Tömör összefoglaló",
about: "Ingyenes, a képlet oldalán a „Röviden” blokk: egy cím és 3–4 mondat. Minden új képlethez magától elkészül.",
},
{
kind: "natal",
id: "reszletes",
label: "Részletes elemzés",
about: "Fizetős, hat fejezet, erősségek, kihívások és útravaló. Kérésre készül.",
},
{
kind: "synastry",
id: "kapcsolati",
label: "Kapcsolati elemzés",
about: "Fizetős összevetés-elemzés két képletről: öt fejezet, erősségek, kihívások és útravaló. Kérésre készül.",
},
];
const LANGUAGES: Record<string, string> = { hu: "Magyar", en: "Angol" };
export function AdminPrompts() {
const [prompts, setPrompts] = useState<AdminPrompt[] | null>(null);
const [charts, setCharts] = useState<ChartListItem[]>([]);
const [error, setError] = useState<string | null>(null);
useEffect(() => {
api<{ prompts: AdminPrompt[] }>("/admin/prompts")
.then((d) => setPrompts(d.prompts))
.catch((e) => setError(errorText(e)));
api<{ charts: ChartListItem[] }>("/charts")
.then((d) => setCharts(d.charts))
.catch(() => setCharts([]));
}, []);
if (error) {
return (
<p className="msg msg-error" role="alert">
{error}
</p>
);
}
if (!prompts) return <p className="muted">Betöltés…</p>;
const replace = (next: AdminPrompt) =>
setPrompts((all) => all?.map((p) => (p.kind === next.kind && p.language === next.language ? next : p)) ?? null);
return (
<section className="card">
<Tabs
label="Elemzésfajták"
tabs={KINDS.map((k) => ({
id: k.id,
label: k.label,
content: (
<KindPrompts
about={k.about}
prompts={prompts.filter((p) => p.kind === k.kind)}
charts={charts}
onSaved={replace}
/>
),
}))}
/>
</section>
);
}
function KindPrompts({
about,
prompts,
charts,
onSaved,
}: {
about: string;
prompts: AdminPrompt[];
charts: ChartListItem[];
onSaved: (p: AdminPrompt) => void;
}) {
const [language, setLanguage] = useState(prompts[0]?.language ?? "hu");
const prompt = prompts.find((p) => p.language === language) ?? prompts[0];
if (!prompt) return null;
return (
<div className="prompt-kind">
<div className="prompt-kind-head">
<p className="muted">{about}</p>
{prompts.length > 1 && (
<div className="field prompt-lang">
<label htmlFor={`lang-${prompt.kind}`}>Nyelv</label>
<select
id={`lang-${prompt.kind}`}
className="inp"
value={language}
onChange={(e) => setLanguage(e.target.value)}
>
{prompts.map((p) => (
<option key={p.language} value={p.language}>
{LANGUAGES[p.language] ?? p.language}
{p.custom ? " (szerkesztett)" : ""}
</option>
))}
</select>
</div>
)}
</div>
<PromptEditor key={`${prompt.kind}-${prompt.language}`} prompt={prompt} charts={charts} onSaved={onSaved} />
</div>
);
}
function PromptEditor({
prompt,
charts,
onSaved,
}: {
prompt: AdminPrompt;
charts: ChartListItem[];
onSaved: (p: AdminPrompt) => void;
}) {
const [draft, setDraft] = useState(prompt.system);
const [busy, setBusy] = useState(false);
const [error, setError] = useState<string | null>(null);
const [saved, setSaved] = useState(false);
const dirty = draft.trim() !== prompt.system.trim();
const id = `prompt-${prompt.kind}-${prompt.language}`;
useEffect(() => {
if (!dirty) return;
const warn = (e: BeforeUnloadEvent) => e.preventDefault();
window.addEventListener("beforeunload", warn);
return () => window.removeEventListener("beforeunload", warn);
}, [dirty]);
async function save(system: string | null) {
setBusy(true);
setError(null);
setSaved(false);
try {
const next = await api<AdminPrompt>(`/admin/prompts/${prompt.kind}/${prompt.language}`, {
method: "PUT",
body: { system },
});
onSaved(next);
setDraft(next.system);
setSaved(true);
} catch (e) {
setError(errorText(e));
} finally {
setBusy(false);
}
}
return (
<div className="prompt-editor">
<div className="prompt-status">
{prompt.custom ? (
<span className="badge badge-gold">Szerkesztett</span>
) : (
<span className="badge">Alapértelmezett</span>
)}
{prompt.updated_at && (
<span className="hint">
Utoljára mentve: {formatDate(prompt.updated_at, true)}
{prompt.updated_by ? ` · ${prompt.updated_by}` : ""}
</span>
)}
</div>
<div className="field">
<label htmlFor={id}>Utasítások a modellnek (system prompt)</label>
<textarea
id={id}
className="inp prompt-text"
value={draft}
onChange={(e) => {
setDraft(e.target.value);
setSaved(false);
}}
spellCheck={false}
rows={24}
/>
<span className="hint">
{draft.length.toLocaleString("hu-HU")} karakter
{dirty ? " · mentetlen változás" : ""}
</span>
</div>
{error && (
<p className="msg msg-error" role="alert">
{error}
</p>
)}
{saved && !dirty && (
<p className="msg msg-ok" role="status">
Elmentve. Az ezután kért elemzések már ezzel készülnek.
</p>
)}
<div className="form-actions">
<button type="button" className="btn btn-primary" onClick={() => save(draft)} disabled={busy || !dirty}>
{busy ? "Mentés…" : "Mentés"}
</button>
<button type="button" className="btn" onClick={() => setDraft(prompt.system)} disabled={busy || !dirty}>
Változások elvetése
</button>
{(prompt.custom || draft.trim() !== prompt.default.trim()) && (
<button
type="button"
className="btn btn-ghost"
onClick={() => setDraft(prompt.default)}
disabled={busy || draft.trim() === prompt.default.trim()}
>
Alapértelmezett szöveg betöltése
</button>
)}
</div>
<PromptTrial
kind={prompt.kind}
language={prompt.language}
draft={draft}
charts={charts}
onLoad={(system) => {
setDraft(system);
setSaved(false);
}}
/>
<details className="details">
<summary>Amit a modell ezen felül kap</summary>
<div className="prompt-extra">
<p className="hint">
Ezt a kód állítja össze, nem szerkeszthető. A <code>{"{chart data}"}</code> helyére a képlet pozíciói kerülnek
(név, dátum és hely nélkül). A válasz formáját (mezők, fejezetek) egy rögzített JSON-séma írja elő.
</p>
<pre className="prompt-pre">{prompt.user_template}</pre>
</div>
</details>
{prompt.history.length > 0 && (
<details className="details">
<summary>Korábbi változatok ({prompt.history.length})</summary>
<ul className="prompt-history">
{prompt.history.map((h, i) => (
<li key={h.id}>
<span>
{formatDate(h.created_at, true)}
{h.created_by ? ` · ${h.created_by}` : ""}
</span>
<span className="hint">
{i === 0 ? "érvényben · " : ""}
{h.custom ? `${(h.system ?? "").length.toLocaleString("hu-HU")} karakter` : "alapértelmezett"}
</span>
<button
type="button"
className="btn btn-sm"
onClick={() => setDraft(h.system ?? prompt.default)}
disabled={busy}
>
Betöltés
</button>
</li>
))}
</ul>
<p className="hint">A betöltött változat a szerkesztőbe kerül; a mentéssel lesz érvényes.</p>
</details>
)}
</div>
);
}
@@ -0,0 +1,240 @@
"use client";
import { useCallback, useEffect, useState } from "react";
import { AnalysisLoading } from "@/components/AnalysisLoading";
import { AnalysisView } from "@/components/AnalysisView";
import { api, errorText } from "@/lib/api";
import { formatDate } from "@/lib/astro";
import { listName } from "@/lib/synastry";
import type { ChartListItem, PromptKind, PromptPreview, SynastryListItem } from "@/lib/types";
const POLL_MS = 4000;
const MAX_POLLS = 150; // 10 minutes
interface Trial {
preview: PromptPreview;
/** The draft it was written with, to load it back. */
system: string;
}
/**
* Writes an analysis with the draft in the editor (saved or not) on one of
* the admin's charts. Nothing is stored with the chart.
*/
export function PromptTrial({
kind,
language,
draft,
charts,
onLoad,
}: {
kind: PromptKind;
language: string;
draft: string;
charts: ChartListItem[];
onLoad: (system: string) => void;
}) {
const synastry = kind === "synastry";
const [chartId, setChartId] = useState(charts.find((c) => c.is_primary)?.id ?? charts[0]?.id ?? "");
const [synastries, setSynastries] = useState<SynastryListItem[]>([]);
const [synastryId, setSynastryId] = useState("");
useEffect(() => {
if (!synastry) return;
api<{ synastries: SynastryListItem[] }>("/synastries")
.then((d) => {
const own = d.synastries.filter((s) => s.owned);
setSynastries(own);
setSynastryId((current) => current || own[0]?.id || "");
})
.catch(() => setSynastries([]));
}, [synastry]);
const targetId = synastry ? synastryId : chartId;
const comparisonName = (s: SynastryListItem) => `${listName(s.chart1, charts)} és ${listName(s.chart2, charts)}`;
const [trials, setTrials] = useState<Trial[]>([]);
const [busy, setBusy] = useState(false);
const [error, setError] = useState<string | null>(null);
const selectId = `trial-chart-${kind}-${language}`;
async function start() {
setBusy(true);
setError(null);
try {
const preview = await api<PromptPreview>(`/admin/prompts/${kind}/${language}/preview`, {
body: synastry ? { system: draft, synastry_id: synastryId } : { system: draft, chart_id: chartId },
});
setTrials((all) => [{ preview, system: draft }, ...all]);
} catch (e) {
setError(errorText(e));
} finally {
setBusy(false);
}
}
const update = useCallback(
(next: PromptPreview) =>
setTrials((all) => all.map((t) => (t.preview.id === next.id ? { ...t, preview: next } : t))),
[],
);
return (
<section className="prompt-trial" aria-labelledby={`${selectId}-title`}>
<div className="prompt-trial-head">
<h2 id={`${selectId}-title`}>Kipróbálás</h2>
<p className="hint">
A szerkesztőben lévő szöveggel (mentés nélkül is) megírja az elemzést egy saját{" "}
{synastry ? "összevetésedre" : "képletedre"}. Az eredmény nem kerül {synastry ? "az összevetéshez" : "a képlethez"},
csak itt látod. Valódi modellhívás, ezért költsége van.
</p>
</div>
{synastry && synastries.length === 0 ? (
<p className="muted">
Kipróbáláshoz előbb készíts egy összevetést az <a href="/osszevetesek">Összevetések</a> oldalon.
</p>
) : synastry ? (
<div className="prompt-trial-form">
<div className="field">
<label htmlFor={selectId}>Összevetés</label>
<select id={selectId} className="inp" value={synastryId} onChange={(e) => setSynastryId(e.target.value)}>
{synastries.map((s) => (
<option key={s.id} value={s.id}>
{comparisonName(s)}
</option>
))}
</select>
</div>
<button type="button" className="btn btn-primary" onClick={start} disabled={busy || !targetId || !draft.trim()}>
{busy ? "Indítás…" : "Kipróbálás"}
</button>
</div>
) : charts.length === 0 ? (
<p className="muted">Kipróbáláshoz előbb legyen legalább egy képleted.</p>
) : (
<div className="prompt-trial-form">
<div className="field">
<label htmlFor={selectId}>Képlet</label>
<select id={selectId} className="inp" value={chartId} onChange={(e) => setChartId(e.target.value)}>
{charts.map((c) => (
<option key={c.id} value={c.id}>
{c.is_primary ? `Én (${c.label})` : c.label}
{c.birth.time ? "" : " – idő nélkül"}
</option>
))}
</select>
</div>
<button type="button" className="btn btn-primary" onClick={start} disabled={busy || !chartId || !draft.trim()}>
{busy ? "Indítás…" : "Kipróbálás"}
</button>
</div>
)}
{error && (
<p className="msg msg-error" role="alert">
{error}
</p>
)}
{trials.map((t) => (
<TrialResult
key={t.preview.id}
trial={t}
chartLabel={
t.preview.synastry_id
? (() => {
const s = synastries.find((x) => x.id === t.preview.synastry_id);
return s ? comparisonName(s) : "Összevetés";
})()
: (charts.find((c) => c.id === t.preview.chart_id)?.label ?? "Képlet")
}
changed={t.system.trim() !== draft.trim()}
onUpdate={update}
onLoad={() => onLoad(t.system)}
/>
))}
</section>
);
}
function TrialResult({
trial,
chartLabel,
changed,
onUpdate,
onLoad,
}: {
trial: Trial;
chartLabel: string;
changed: boolean;
onUpdate: (p: PromptPreview) => void;
onLoad: () => void;
}) {
const p = trial.preview;
const waiting = p.status === "pending" || p.status === "running";
useEffect(() => {
if (!waiting) return;
let polls = 0;
let stopped = false;
let timer: ReturnType<typeof setTimeout> | undefined;
const tick = async () => {
try {
const next = await api<PromptPreview>(`/admin/previews/${p.id}`);
if (stopped) return;
onUpdate(next);
if (next.status === "done" || next.status === "failed") return;
} catch {
// try again on the next tick
}
if (++polls < MAX_POLLS) timer = setTimeout(tick, POLL_MS);
};
timer = setTimeout(tick, POLL_MS);
return () => {
stopped = true;
clearTimeout(timer);
};
}, [waiting, p.id, onUpdate]);
const meta = [
p.model_used ?? p.model,
p.seconds !== null ? `${p.seconds} mp` : null,
p.input_tokens !== null && p.output_tokens !== null
? `${p.input_tokens.toLocaleString("hu-HU")} + ${p.output_tokens.toLocaleString("hu-HU")} token`
: null,
p.cost_usd !== null ? `$${p.cost_usd.toFixed(4)}` : null,
].filter(Boolean);
return (
<article className="trial" aria-busy={waiting}>
<header className="trial-head">
<div>
<strong>{chartLabel}</strong>
<span className="hint"> · {formatDate(p.created_at, true)}</span>
</div>
{changed && (
<button type="button" className="btn btn-sm" onClick={onLoad}>
Ennek a szövegnek a betöltése
</button>
)}
</header>
{waiting ? (
<AnalysisLoading
compact
text={p.kind === "summary" ? "Készül az összefoglaló, kb. 10–30 másodperc." : "Készül az elemzés, kb. 1–3 perc."}
/>
) : p.status === "failed" ? (
<p className="msg msg-error" role="alert">
Nem sikerült: {p.error ?? "ismeretlen hiba"}
</p>
) : p.content ? (
p.kind === "summary" ? (
<div className="trial-summary">
<h3 className="summary-title">{p.content.title}</h3>
<p className="summary-text">{p.content.summary}</p>
</div>
) : (
<AnalysisView content={p.content} kind={p.kind === "synastry" ? "synastry" : "natal"} />
)
) : null}
{meta.length > 0 && !waiting && <p className="hint">{meta.join(" · ")}</p>}
</article>
);
}
@@ -0,0 +1,27 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { AdminNav } from "@/components/AdminNav";
import { requireMe } from "@/lib/server";
import { AdminPrompts } from "./AdminPrompts";
export const metadata: Metadata = { title: "Promptok" };
export default async function AdminPromptsPage() {
const me = await requireMe("/admin/promptok");
if (!me.user.roles.includes("admin")) notFound();
return (
<main className="page" style={{ maxWidth: 1180 }}>
<AdminNav current="/admin/promptok" />
<div className="page-head">
<h1>Promptok</h1>
<p className="muted">
Az elemzéseket író modell utasításai. A változás az ezután kért elemzésekre hat; a már elkészültek
változatlanok maradnak.
</p>
</div>
<AdminPrompts />
</main>
);
}
@@ -0,0 +1,23 @@
// Country list and place search for the birth data form (public data from
// the horoscope-api; only these two endpoints are passed through).
import type { NextRequest } from "next/server";
const HOROSCOPE_API_URL = (process.env.HOROSCOPE_API_URL ?? "http://localhost:8080").replace(/\/$/, "");
const ALLOWED = new Set(["countries", "places"]);
export async function GET(req: NextRequest, ctx: { params: Promise<{ kind: string }> }) {
const { kind } = await ctx.params;
if (!ALLOWED.has(kind)) return Response.json({ error: { code: "not_found", message: "not found" } }, { status: 404 });
try {
const res = await fetch(`${HOROSCOPE_API_URL}/v1/${kind}${req.nextUrl.search}`, {
// The country list rarely changes.
...(kind === "countries" ? { next: { revalidate: 86400 } } : { cache: "no-store" as const }),
});
return new Response(res.body, {
status: res.status,
headers: { "content-type": res.headers.get("content-type") ?? "application/json" },
});
} catch {
return Response.json({ error: { code: "unavailable", message: "A helykereső most nem érhető el." } }, { status: 502 });
}
}
@@ -0,0 +1,48 @@
// Forwards /api/v1/* to the backend, so the browser talks to one origin and
// the session cookie belongs to the frontend's host (no CORS needed).
import type { NextRequest } from "next/server";
import { BACKEND_URL } from "@/lib/server";
const REQUEST_HEADERS = ["accept", "accept-language", "authorization", "content-type", "cookie", "user-agent"];
// Hop-by-hop or re-computed by the runtime.
const SKIP_RESPONSE_HEADERS = new Set(["connection", "content-encoding", "content-length", "set-cookie", "transfer-encoding"]);
async function forward(req: NextRequest, ctx: { params: Promise<{ path: string[] }> }) {
const { path } = await ctx.params;
const target = `${BACKEND_URL}/v1/${path.map(encodeURIComponent).join("/")}${req.nextUrl.search}`;
const headers = new Headers();
for (const name of REQUEST_HEADERS) {
const value = req.headers.get(name);
if (value) headers.set(name, value);
}
const forwardedFor = req.headers.get("x-forwarded-for");
if (forwardedFor) headers.set("x-forwarded-for", forwardedFor);
let res: Response;
try {
res = await fetch(target, {
method: req.method,
headers,
body: req.method === "GET" || req.method === "HEAD" ? undefined : await req.arrayBuffer(),
redirect: "manual",
cache: "no-store",
});
} catch {
return Response.json({ error: { code: "backend_unavailable", message: "A szerver most nem érhető el." } }, { status: 502 });
}
const out = new Headers();
res.headers.forEach((value, name) => {
if (!SKIP_RESPONSE_HEADERS.has(name)) out.set(name, value);
});
for (const cookie of res.headers.getSetCookie()) out.append("set-cookie", cookie);
return new Response(res.body, { status: res.status, headers: out });
}
export const GET = forward;
export const POST = forward;
export const PATCH = forward;
export const PUT = forward;
export const DELETE = forward;
@@ -0,0 +1,135 @@
"use client";
import Script from "next/script";
import { useRouter } from "next/navigation";
import { useCallback, useEffect, useRef, useState } from "react";
import { Waitlist } from "@/components/Waitlist";
import { ApiError, api, errorText } from "@/lib/api";
/** Google's "G" mark (branding guidelines: unmodified, on the left of the label). */
function GoogleMark() {
return (
<svg width="20" height="20" viewBox="0 0 48 48" aria-hidden="true">
<path
fill="#EA4335"
d="M24 9.5c3.54 0 6.71 1.22 9.21 3.6l6.85-6.85C35.9 2.38 30.47 0 24 0 14.62 0 6.51 5.38 2.56 13.22l7.98 6.19C12.43 13.72 17.74 9.5 24 9.5z"
/>
<path
fill="#4285F4"
d="M46.98 24.55c0-1.57-.15-3.09-.38-4.55H24v9.02h12.94c-.58 2.96-2.26 5.48-4.78 7.18l7.73 6c4.51-4.18 7.09-10.36 7.09-17.65z"
/>
<path
fill="#FBBC05"
d="M10.53 28.59c-.48-1.45-.76-2.99-.76-4.59s.27-3.14.76-4.59l-7.98-6.19C.92 16.46 0 20.12 0 24c0 3.88.92 7.54 2.56 10.78l7.97-6.19z"
/>
<path
fill="#34A853"
d="M24 48c6.48 0 11.93-2.13 15.89-5.81l-7.73-6c-2.15 1.45-4.92 2.3-8.16 2.3-6.26 0-11.57-4.22-13.47-9.91l-7.98 6.19C6.51 42.62 14.62 48 24 48z"
/>
</svg>
);
}
/** The e-mail address inside Google's ID token (only for prefilling a form; the backend verifies the token). */
function tokenEmail(credential: string): string {
try {
const part = credential.split(".")[1].replace(/-/g, "+").replace(/_/g, "/");
const bytes = Uint8Array.from(atob(part), (c) => c.charCodeAt(0));
const email = JSON.parse(new TextDecoder().decode(bytes)).email;
return typeof email === "string" ? email : "";
} catch {
return "";
}
}
/**
* "Continue with Google" in the site's own button style. Google's real
* (rendered, invisible) button lies on top of it and receives the click, so
* the sign-in still returns an ID token.
*/
export function GoogleLogin({
clientId,
target,
inviteToken = null,
}: {
clientId: string;
target: string;
/** From an invitation link: lets in any Google account. */
inviteToken?: string | null;
}) {
const router = useRouter();
const slot = useRef<HTMLDivElement>(null);
const [ready, setReady] = useState(false);
const [error, setError] = useState<string | null>(null);
const [busy, setBusy] = useState(false);
/** Set when the address has no invitation: offer the waitlist for it. */
const [uninvited, setUninvited] = useState<string | null>(null);
const onCredential = useCallback(
async (response: GoogleCredentialResponse) => {
setBusy(true);
setError(null);
setUninvited(null);
try {
await api("/auth/google", { body: { id_token: response.credential, invite_token: inviteToken } });
router.replace(target);
router.refresh();
} catch (e) {
if (e instanceof ApiError && e.code === "not_invited") setUninvited(tokenEmail(response.credential));
else setError(errorText(e));
setBusy(false);
}
},
[router, target, inviteToken],
);
useEffect(() => {
const google = window.google;
if (!ready || !google || !slot.current) return;
google.accounts.id.initialize({ client_id: clientId, callback: onCredential, ux_mode: "popup", itp_support: true });
google.accounts.id.renderButton(slot.current, {
theme: "outline",
size: "large",
text: "continue_with",
shape: "rectangular",
locale: "hu",
width: Math.min(400, slot.current.clientWidth || 400),
});
}, [ready, clientId, onCredential]);
return (
<div className="field">
<Script
src="https://accounts.google.com/gsi/client"
strategy="afterInteractive"
onReady={() => setReady(true)}
onError={() => setError("Nem sikerült betölteni a Google-belépést. Ellenőrizd a hálózatot vagy a reklámblokkolót.")}
/>
<div className="social-login" data-ready={ready} aria-busy={busy}>
<span className="btn-social" aria-hidden="true">
<span className="btn-social-icon">
<GoogleMark />
</span>
{busy ? "Belépés…" : "Folytatás Google-fiókkal"}
</span>
<div ref={slot} className="gsi-overlay" />
</div>
{error && (
<p className="msg msg-error" role="alert">
{error}
</p>
)}
{uninvited !== null && (
<>
<p className="msg msg-error" role="alert">
{inviteToken
? "Ez a meghívó már nem érvényes, és ehhez a Google-fiókhoz sem tartozik másik."
: `A Sorsfonalak jelenleg meghívásos, és ${uninvited ? `a(z) ${uninvited} címhez` : "ehhez a fiókhoz"} nem tartozik meghívó. Ha kaptál meghívót egy másik címre, lépj be azzal a Google-fiókkal, vagy nyisd meg a levélben kapott linket.`}
</p>
<Waitlist email={uninvited} />
</>
)}
</div>
);
}
+137
View File
@@ -0,0 +1,137 @@
import type { Metadata } from "next";
import Link from "next/link";
import { redirect } from "next/navigation";
import { Logo } from "@/components/SiteHeader";
import { ZodiacWheel } from "@/components/ZodiacWheel";
import { BACKEND_URL, getMe } from "@/lib/server";
import { formatDate } from "@/lib/astro";
import type { InvitationLanding, PublicConfig } from "@/lib/types";
import { GoogleLogin } from "./GoogleLogin";
export const metadata: Metadata = { title: "Belépés" };
/** Only local paths, so the login cannot redirect to another site. */
function safeTarget(value: string | string[] | undefined): string {
const v = Array.isArray(value) ? value[0] : value;
return v && v.startsWith("/") && !v.startsWith("//") ? v : "/";
}
async function loadConfig(): Promise<PublicConfig | null> {
try {
const res = await fetch(`${BACKEND_URL}/v1/config`, { cache: "no-store" });
return res.ok ? ((await res.json()) as PublicConfig) : null;
} catch {
return null;
}
}
async function loadInvitation(token: string): Promise<InvitationLanding | null> {
try {
const res = await fetch(`${BACKEND_URL}/v1/public/invitations/${encodeURIComponent(token)}`, { cache: "no-store" });
return res.ok ? ((await res.json()) as InvitationLanding) : null;
} catch {
return null;
}
}
const CLOSED: Record<string, string> = {
accepted: "Ezt a meghívót már felhasználták. Ha a tiéd volt, egyszerűen lépj be ugyanazzal a Google-fiókkal.",
expired: "Ez a meghívó lejárt. Kérj újat attól, aki meghívott.",
revoked: "Ezt a meghívót visszavonták.",
};
/** The invitation the visitor came with: who sent it and what they wrote. */
function InvitationCard({ invitation }: { invitation: InvitationLanding | null }) {
if (!invitation) {
return (
<p className="msg msg-error" role="alert">
Ez a meghívólink érvénytelen. Ellenőrizd, hogy a teljes linket nyitottad-e meg a levélből.
</p>
);
}
if (invitation.status !== "pending") {
return (
<p className="msg msg-error" role="alert">
{CLOSED[invitation.status]}
</p>
);
}
return (
<div className="card invite-card">
<span className="eyebrow">Meghívó</span>
<p style={{ margin: 0 }}>
{invitation.inviter_name ? <strong>{invitation.inviter_name}</strong> : "Valaki"} meghívott a Sorsfonalakra.
</p>
{invitation.message && <blockquote className="invite-quote">{invitation.message}</blockquote>}
<p className="hint" style={{ margin: 0 }}>
Bármelyik Google-fiókoddal elfogadhatod. Érvényes: {formatDate(invitation.expires_at).replace(/\.$/, "")}-ig.
</p>
</div>
);
}
export default async function LoginPage({ searchParams }: { searchParams: Promise<Record<string, string | string[]>> }) {
const params = await searchParams;
const target = safeTarget(params.vissza);
if (await getMe()) redirect(target);
const rawToken = Array.isArray(params.meghivo) ? params.meghivo[0] : params.meghivo;
const inviteToken = rawToken && /^[A-Za-z0-9_-]{8,200}$/.test(rawToken) ? rawToken : null;
const [config, invitation] = await Promise.all([
loadConfig(),
inviteToken ? loadInvitation(inviteToken) : Promise.resolve(null),
]);
const clientId = config?.google_login.enabled ? config.google_login.client_id : null;
const inviteOnly = config?.signup_mode === "invite";
return (
<div className="auth">
<aside className="auth-aside">
<Logo />
<ZodiacWheel className="wheel" />
<div className="row" style={{ flexDirection: "column", alignItems: "flex-start", gap: 10, maxWidth: 460 }}>
<p className="tagline">Ahol a csillagok összekötnek.</p>
<p className="muted" style={{ fontSize: 16 }}>
Születési képlet, szinasztria és közösség – egy helyen.
</p>
</div>
</aside>
<main className="auth-main">
<div className="auth-box">
<div className="page-head">
<h1 style={{ fontSize: 44 }}>{rawToken ? "Meghívó" : "Belépés"}</h1>
<p className="muted">{rawToken ? "Lépj be, és már kezdheted is." : "Üdv újra! Lépj be a fiókodba."}</p>
</div>
{rawToken && <InvitationCard invitation={inviteToken ? invitation : null} />}
{config === null ? (
<p className="msg msg-error" role="alert">
A szerver most nem érhető el. Próbáld újra egy kicsit később.
</p>
) : clientId ? (
<GoogleLogin
clientId={clientId}
target={target}
inviteToken={invitation?.status === "pending" ? inviteToken : null}
/>
) : (
<p className="msg msg-error" role="alert">
A Google-belépés még nincs beállítva (a backend <code>GOOGLE_CLIENT_IDS</code> változója üres).
</p>
)}
<p className="auth-foot">
{rawToken
? "A fiókod az első belépéskor jön létre."
: inviteOnly
? "Az oldal jelenleg meghívásos: új fiók csak meghívóval jön létre."
: "Még nincs fiókod? Az első belépéskor létrejön."}
</p>
<p className="hint">
A belépéssel elfogadod, hogy a születési adataidat a képleted kiszámításához tároljuk. Bármikor törölheted
őket a profilodban. Részletek: <Link href="/adatvedelem">adatvédelmi tájékoztató</Link>.
</p>
</div>
</main>
</div>
);
}
@@ -0,0 +1,97 @@
import type { Metadata } from "next";
import { PackageCards } from "@/components/PackageCards";
import { formatDate } from "@/lib/astro";
import { backendGet, requireMe } from "@/lib/server";
import type { Package, PublicConfig } from "@/lib/types";
export const metadata: Metadata = { title: "Csomagok" };
const faq = (dailyLimit: number): [string, string][] => [
[
"Lejárnak a megvett elemzések?",
"Nem. A csomagokban kapott elemzések és személyhelyek addig megmaradnak, amíg fel nem használod őket. Csak a Korlátlan csomag szól egy évre.",
],
[
"Mi a különbség a képletelemzés és a kapcsolati elemzés között?",
"A képletelemzés egy ember születési képletét írja le hat fejezetben. A kapcsolati elemzés két képletet vet össze: mi vonz, hol súrlódtok, és mit ad a kapcsolat.",
],
[
"Mire kell a személyhely?",
"A saját képleted mellé felvett emberekhez (társ, gyerek, barát). Egy személy felvétele egy helyet használ; a képlete és a rövid összefoglalója ingyenes, a részletes elemzés külön jár.",
],
[
"Van korlát a Korlátlan csomagban?",
`Méltányos használat: naponta legfeljebb ${dailyLimit} új részletes elemzés kérhető. Ha még tart, egy újabb Korlátlan csomag a lejárathoz ad hozzá egy évet.`,
],
];
/** The packages: the main ladder, top-ups, and what the user has now. */
export default async function PackagesPage() {
const me = await requireMe("/csomagok");
const [catalog, config] = await Promise.all([
backendGet<{ packages: Package[] }>("/v1/packages"),
backendGet<PublicConfig>("/v1/config"),
]);
const packages = catalog?.packages ?? [];
const canPay = config?.mock_payments ?? false;
const left = me.analyses_left;
const slots = me.persons;
return (
<main className="page" style={{ maxWidth: 1180 }}>
<div className="page-head">
<h1>Csomagok</h1>
<p className="muted">
Minél többen vagytok, annál kevesebbe kerül egy elemzés. A megvett elemzések nem járnak le.
</p>
</div>
<section className="card holdings" aria-label="Amid most van">
<span className="eyebrow">Most</span>
{me.unlimited_until ? (
<p>
<strong>Korlátlan csomag</strong> {formatDate(me.unlimited_until).replace(/\.$/, "")}-ig.
</p>
) : (
<p>
<strong>{left.natal}</strong> képletelemzés · <strong>{left.synastry}</strong> kapcsolati elemzés ·{" "}
{slots.unlimited ? (
"korlátlan személy"
) : (
<>
<strong>{slots.left}</strong> szabad személyhely
</>
)}
</p>
)}
</section>
<PackageCards packages={packages} canPay={canPay} />
<section className="field" aria-labelledby="addon-title" style={{ gap: 12 }}>
<h2 id="addon-title">Kiegészítők</h2>
<p className="muted">Ha már van csomagod, és csak egy kicsi kell még.</p>
<PackageCards
packages={packages}
ids={packages.filter((p) => p.tier === "addon").map((p) => p.id)}
canPay={canPay}
compact
/>
</section>
<section className="card" aria-labelledby="faq-title">
<h2 id="faq-title">Gyakori kérdések</h2>
<dl className="faq">
{faq(config?.unlimited_daily_limit ?? 5).map(([q, a]) => (
<div key={q}>
<dt>{q}</dt>
<dd className="muted">{a}</dd>
</div>
))}
</dl>
<p className="hint">Az árak bruttó árak, az áfát tartalmazzák.</p>
</section>
</main>
);
}
+570
View File
@@ -0,0 +1,570 @@
/* Sorsfonalak – night sky with gold accents (from the design canvas). */
:root {
--bg: #0d1220;
--panel: #111729;
--panel-2: #0f1426;
--line: #1f2740;
--line-2: #2c3654;
--ink: #ece6d8;
--ink-2: #c9cfdc;
--muted: #a3abc0;
--gold: #d9b46a;
--gold-hover: #e6c482;
--gold-ink: #141a2c;
--danger: #f2a0a0;
--ok: #9fd8b0;
--harmonic: #7fb0e0;
--tense: #e38b8b;
--square: #f0a35e;
--p2: #c3a6f0; /* the second person of a comparison */
--radius: 10px;
--font-display: var(--font-cormorant), "Cormorant Garamond", Georgia, serif;
--font-body: var(--font-inter), Inter, system-ui, sans-serif;
--font-symbols: "Noto Sans Symbols", "Segoe UI Symbol", "DejaVu Sans", sans-serif;
color-scheme: dark;
}
* { box-sizing: border-box; }
html, body { margin: 0; }
body {
min-height: 100vh;
background: var(--bg);
color: var(--ink);
font: 400 15px/1.55 var(--font-body);
}
a { color: var(--gold); }
a:hover { color: var(--gold-hover); }
:focus-visible { outline: 2px solid var(--gold); outline-offset: 2px; }
h1, h2, h3 { font-family: var(--font-display); font-weight: 600; line-height: 1.1; margin: 0; }
h1 { font-size: 40px; }
h2 { font-size: 28px; }
h3 { font-size: 20px; }
p { margin: 0; }
.muted { color: var(--muted); }
.sym { font-family: var(--font-symbols); }
/* Header */
.site-header {
position: sticky; top: 0; z-index: 10;
display: flex; align-items: center; gap: 24px; flex-wrap: wrap;
padding: 12px 24px; background: rgba(13, 18, 32, 0.94);
border-bottom: 1px solid var(--line); backdrop-filter: blur(6px);
}
.logo { font-family: var(--font-display); font-size: 28px; font-weight: 600; color: var(--ink); text-decoration: none; letter-spacing: 0.3px; }
.logo span { color: var(--gold); }
.logo:hover { color: var(--ink); }
.nav { display: flex; gap: 4px; flex: 1; }
.nav a { color: var(--ink-2); text-decoration: none; padding: 10px 12px; border-radius: 8px; min-height: 44px; display: inline-flex; align-items: center; }
.nav a:hover, .nav a[aria-current="page"] { color: var(--gold); background: rgba(217, 180, 106, 0.08); }
.who { display: flex; align-items: center; gap: 12px; color: var(--muted); font-size: 14px; }
/* Layout */
.page { max-width: 960px; margin: 0 auto; padding: 32px 16px 64px; display: flex; flex-direction: column; gap: 24px; }
.page-head { display: flex; flex-direction: column; gap: 6px; }
.card { background: var(--panel); border: 1px solid var(--line); border-radius: 14px; padding: 24px; display: flex; flex-direction: column; gap: 18px; }
.card-head { display: flex; justify-content: space-between; align-items: baseline; gap: 12px; flex-wrap: wrap; }
.grid-2 { display: grid; grid-template-columns: repeat(auto-fit, minmax(240px, 1fr)); gap: 16px; }
.facts { display: grid; grid-template-columns: max-content 1fr; gap: 8px 20px; margin: 0; }
.facts dt { color: var(--muted); }
.facts dd { margin: 0; }
/* Forms */
.field { display: flex; flex-direction: column; gap: 8px; }
.field label, .label { font-size: 14px; font-weight: 500; }
.hint { font-size: 13px; color: var(--muted); }
.inp {
width: 100%; min-height: 48px; padding: 0 14px; border-radius: var(--radius);
border: 1px solid var(--line-2); background: var(--panel-2); color: var(--ink);
font: 400 15px var(--font-body);
}
select.inp { padding-right: 32px; }
.inp::placeholder { color: #8a93ab; }
.inp:focus { outline: none; border-color: var(--gold); box-shadow: 0 0 0 3px rgba(217, 180, 106, 0.25); }
.inp:disabled { opacity: 0.55; }
.check { display: flex; align-items: center; gap: 10px; font-size: 14px; color: var(--ink-2); min-height: 32px; cursor: pointer; }
.check input { width: 18px; height: 18px; accent-color: var(--gold); margin: 0; }
.row { display: flex; gap: 12px; flex-wrap: wrap; align-items: center; }
.form-actions { display: flex; gap: 12px; flex-wrap: wrap; align-items: center; }
.btn {
min-height: 44px; padding: 0 18px; border-radius: var(--radius); border: 1px solid var(--line-2);
background: transparent; color: var(--ink); font: 500 15px var(--font-body); cursor: pointer;
display: inline-flex; align-items: center; justify-content: center; gap: 8px; text-decoration: none;
}
.btn:hover { border-color: #5a6790; background: rgba(255, 255, 255, 0.03); color: var(--ink); }
.btn:disabled { opacity: 0.55; cursor: default; }
.btn-primary { background: var(--gold); border-color: var(--gold); color: var(--gold-ink); font-weight: 600; }
.btn-primary:hover { background: var(--gold-hover); border-color: var(--gold-hover); color: var(--gold-ink); }
.btn-ghost { border-color: transparent; color: var(--muted); padding: 0 12px; }
.btn-ghost:hover { color: var(--ink); border-color: transparent; }
.btn-sm { min-height: 36px; padding: 0 12px; font-size: 14px; }
.msg { font-size: 14px; }
.msg-error { color: var(--danger); }
.msg-ok { color: var(--ok); }
.badge {
display: inline-flex; align-items: center; min-height: 24px; padding: 0 10px; border-radius: 999px;
border: 1px solid var(--line-2); font-size: 12px; color: var(--ink-2); white-space: nowrap;
}
.badge-gold { border-color: rgba(217, 180, 106, 0.5); color: var(--gold); }
/* Place search */
.combo { position: relative; }
.combo-list {
position: absolute; z-index: 5; left: 0; right: 0; top: calc(100% + 4px); margin: 0; padding: 4px;
list-style: none; background: var(--panel-2); border: 1px solid var(--line-2); border-radius: var(--radius);
max-height: 280px; overflow-y: auto;
}
.combo-list button {
width: 100%; text-align: left; background: transparent; border: 0; color: var(--ink); cursor: pointer;
padding: 10px 12px; border-radius: 8px; font: inherit; min-height: 44px;
}
.combo-list button:hover, .combo-list button[aria-selected="true"] { background: rgba(217, 180, 106, 0.1); }
.combo-list small { color: var(--muted); }
/* Tables */
.table-wrap { overflow-x: auto; }
table { width: 100%; border-collapse: collapse; font-size: 14px; }
th, td { text-align: left; padding: 9px 10px; border-bottom: 1px solid var(--line); vertical-align: middle; }
th { color: var(--muted); font-weight: 500; font-size: 13px; }
td.num { font-variant-numeric: tabular-nums; white-space: nowrap; }
.retro { color: var(--gold); font-size: 12px; margin-left: 4px; }
/* Big three */
.big3 { display: grid; grid-template-columns: repeat(3, 1fr); gap: 12px; }
.big3 > div { background: var(--panel-2); border: 1px solid var(--line); border-radius: var(--radius); padding: 14px; display: flex; flex-direction: column; gap: 4px; }
.big3 .glyph { font-size: 26px; color: var(--gold); line-height: 1; }
.big3 strong { font-family: var(--font-display); font-size: 24px; font-weight: 600; }
/* Login */
.auth { min-height: 100vh; display: flex; flex-wrap: wrap; }
.auth-aside {
flex: 1 1 480px; min-height: 320px; background: var(--panel); border-right: 1px solid var(--line);
padding: 40px 48px; display: flex; flex-direction: column; justify-content: space-between; gap: 32px;
}
.auth-main { flex: 1 1 480px; display: flex; align-items: center; justify-content: center; padding: 48px 24px; }
.auth-box { width: 100%; max-width: 420px; display: flex; flex-direction: column; gap: 28px; }
.wheel { width: min(440px, 80%); aspect-ratio: 1; margin: 0 auto; }
.tagline { font-family: var(--font-display); font-size: 38px; font-weight: 600; line-height: 1.1; }
.auth-foot { font-size: 15px; color: var(--muted); text-align: center; }
/* Social login buttons; Google's own button lies invisibly on top (.gsi-overlay). */
.social-login { position: relative; }
.btn-social {
position: relative; width: 100%; min-height: 48px; padding: 0 52px;
display: flex; align-items: center; justify-content: center; gap: 12px;
border: 1px solid var(--line-2); border-radius: var(--radius); background: transparent;
color: var(--ink); font: 500 15px var(--font-body);
}
.btn-social-icon { position: absolute; left: 16px; top: 50%; margin-top: -10px; width: 20px; height: 20px; display: flex; }
.social-login:hover .btn-social { border-color: #5a6790; background: rgba(255, 255, 255, 0.03); }
.social-login:focus-within .btn-social { outline: 2px solid var(--gold); outline-offset: 2px; }
.social-login[data-ready="false"] .btn-social { opacity: 0.6; }
.gsi-overlay {
position: absolute; inset: 0; display: flex; align-items: center; justify-content: center;
opacity: 0.001; overflow: hidden; cursor: pointer;
}
.gsi-overlay > div, .gsi-overlay iframe { transform: scale(1.06, 1.2); }
/* Detailed analysis */
.analysis-card { display: flex; flex-direction: column; gap: 16px; }
.analysis-offer { padding: 8px 0 4px; }
.analysis-offer .offer-head { display: flex; flex-direction: column; gap: 8px; }
.analysis-offer p.muted { max-width: 64ch; line-height: 1.7; }
.analysis-offer .form-actions, .analysis-offer .pay-box { margin-top: 12px; }
.analysis-offer .form-actions { gap: 12px 16px; }
.analysis { display: flex; flex-direction: column; gap: 28px; }
.analysis-head { display: flex; flex-direction: column; gap: 12px; }
.analysis-head h2 { font-size: 34px; }
.analysis-lead { font-size: 17px; line-height: 1.7; color: var(--ink-2); font-style: italic; }
.analysis-section { display: flex; flex-direction: column; gap: 12px; }
.analysis-section h3 { font-size: 24px; color: var(--gold); }
.analysis-section p, .analysis-lists li { font-size: 16px; line-height: 1.75; color: var(--ink-2); }
.analysis strong { color: var(--ink); font-weight: 600; }
.analysis-lists { display: grid; grid-template-columns: repeat(auto-fit, minmax(260px, 1fr)); gap: 24px; }
.analysis-lists h3 { font-size: 22px; margin-bottom: 8px; }
.analysis-lists ul { margin: 0; padding-left: 20px; display: flex; flex-direction: column; gap: 8px; }
.analysis-advice { border-top: 1px solid var(--line); padding-top: 24px; }
/* Chart page */
.summary-card { gap: 10px; border-color: rgba(217, 180, 106, 0.35); }
.eyebrow { font-size: 12px; font-weight: 600; letter-spacing: 1.2px; text-transform: uppercase; color: var(--gold); }
.summary-title { font-size: 26px; }
.summary-text { font-size: 16px; line-height: 1.65; color: var(--ink-2); }
.summary-more {
margin-top: auto; padding-top: 14px; border-top: 1px solid var(--line); width: 100%;
color: var(--gold); font-weight: 500; text-decoration: none;
}
.summary-more:hover { text-decoration: underline; text-underline-offset: 3px; }
.summary-text strong { color: var(--ink); font-weight: 600; }
.skeleton { display: flex; flex-direction: column; gap: 8px; }
.skeleton span { height: 12px; border-radius: 6px; background: var(--line); animation: pulse 1.4s ease-in-out infinite; }
.skeleton span:last-child { width: 60%; }
@keyframes pulse { 50% { opacity: 0.45; } }
@media (prefers-reduced-motion: reduce) { .skeleton span { animation: none; } }
/* Loading while the LLM writes */
.loading { display: flex; align-items: center; gap: 24px; padding: 8px 0; }
.loading-wheel { width: 120px; height: 120px; flex: none; animation: spin 24s linear infinite; }
.loading-compact .loading-wheel { width: 64px; height: 64px; }
.loading-text { display: flex; flex-direction: column; gap: 6px; }
.loading-text strong { font-family: var(--font-display); font-size: 24px; font-weight: 600; }
.loading-text .muted { animation: pulse 2.4s ease-in-out infinite; }
@keyframes spin { to { transform: rotate(360deg); } }
@media (prefers-reduced-motion: reduce) { .loading-wheel, .loading-text .muted { animation: none; } }
@media (max-width: 640px) { .loading { flex-direction: column; text-align: center; } }
/* Payment step */
.pay-box { display: flex; flex-direction: column; gap: 16px; padding: 20px; border: 1px solid var(--line-2); border-radius: var(--radius); background: var(--panel-2); }
.pay-lead { margin: 0; }
.chart-layout { display: grid; grid-template-columns: minmax(0, 1.35fr) minmax(280px, 1fr); gap: 24px; align-items: stretch; }
.chart-side { gap: 16px; }
.chart-side .summary-card { flex: 1 1 auto; }
.chart-wheel-card { padding: 16px; gap: 10px; justify-content: center; }
.chart-wheel { width: 100%; height: auto; display: block; max-width: 680px; margin: 0 auto; }
.chart-layout .big3 {
grid-template-columns: repeat(3, 1fr); gap: 0; background: var(--panel); border: 1px solid var(--line); border-radius: 14px;
}
.chart-layout .big3 > div { background: none; border: 0; border-radius: 0; padding: 14px 16px; min-width: 0; }
.chart-layout .big3 > div + div { border-left: 1px solid var(--line); }
.chart-layout .big3 .glyph { font-size: 20px; }
.chart-layout .big3 strong { font-size: 21px; }
.chart-layout .big3 .muted { font-size: 13px; }
.wheel-legend { display: flex; flex-direction: column; align-items: center; gap: 4px; text-align: center; }
.wheel-legend-items { display: flex; flex-wrap: wrap; justify-content: center; gap: 4px 16px; }
.legend-item { display: inline-flex; align-items: center; gap: 6px; white-space: nowrap; }
.legend-line { display: inline-block; width: 24px; height: 2px; border-radius: 1px; }
.legend-trine { background: var(--harmonic); }
.legend-sextile { background: repeating-linear-gradient(90deg, var(--harmonic) 0 5px, transparent 5px 9px); }
.legend-square { background: var(--square); }
.legend-opposition { background: var(--tense); }
.aspect-tag { white-space: nowrap; }
/* Aspect grid */
.aspect-grid-wrap { overflow-x: auto; }
.aspect-grid { width: auto; border-collapse: collapse; font-size: 16px; }
.aspect-grid td, .aspect-grid th {
width: 30px; min-width: 30px; height: 30px; padding: 0; text-align: center; vertical-align: middle;
border: 1px solid var(--line); line-height: 1;
}
.aspect-grid th { color: var(--ink); font-weight: 400; font-size: 17px; background: var(--panel-2); }
.aspect-grid .grid-angle { font: 600 11px var(--font-body); color: var(--gold); letter-spacing: 0.3px; }
.aspect-grid td.corner { border: 0; background: none; }
.aspect-grid td.diag { background: var(--line); }
.aspect-grid tbody td:not(.diag):hover { background: var(--panel-2); }
.grid-legend { list-style: none; margin: 0; padding: 0; display: flex; flex-wrap: wrap; gap: 6px 18px; font-size: 14px; color: var(--ink-2); }
.grid-legend .sym { font-size: 17px; }
.asp-conjunction { color: var(--gold); }
.asp-trine, .asp-sextile { color: var(--harmonic); }
.asp-square { color: var(--square); }
.asp-opposition { color: var(--tense); }
.details > summary { cursor: pointer; color: var(--gold); min-height: 44px; display: flex; align-items: center; }
.details[open] > summary { margin-bottom: 8px; }
@media (max-width: 640px) {
.aspect-grid { font-size: 12px; }
.aspect-grid td, .aspect-grid th { width: 19px; min-width: 19px; height: 19px; }
.aspect-grid th { font-size: 13px; }
.aspect-grid .grid-angle { font-size: 8px; letter-spacing: 0; }
.chart-tabs { padding: 4px 12px 16px; }
}
.aspect-harmonic { color: var(--harmonic); }
.aspect-tense { color: var(--tense); }
.aspect-neutral { color: var(--gold); }
.w-ring { fill: none; stroke: var(--line-2); stroke-width: 1.2; }
.w-faint { stroke: var(--line); }
.w-inner { fill: var(--panel-2); }
.w-sign { stroke: var(--line-2); stroke-width: 1; }
.w-fire { fill: rgba(227, 139, 106, 0.09); }
.w-earth { fill: rgba(159, 216, 176, 0.07); }
.w-air { fill: rgba(217, 180, 106, 0.08); }
.w-water { fill: rgba(127, 176, 224, 0.09); }
.w-sign-glyph { fill: var(--gold); font-family: var(--font-symbols); font-size: 22px; }
.w-tick { stroke: var(--line-2); stroke-width: 1; }
.w-cusp { stroke: var(--line-2); stroke-width: 1; }
.w-axis { stroke: var(--gold); stroke-width: 1.8; }
.w-axis-label { fill: var(--gold); font: 600 14px var(--font-body); letter-spacing: 0.5px; }
.w-house-num { fill: var(--muted); font: 500 12px var(--font-body); }
.w-aspect { stroke-linecap: round; }
.w-asp-trine { stroke: var(--harmonic); }
.w-asp-sextile { stroke: var(--harmonic); stroke-dasharray: 5 4; }
.w-asp-square { stroke: var(--square); }
.w-asp-opposition { stroke: var(--tense); }
.w-point-tick { stroke: var(--ink); stroke-width: 1.6; }
.w-leader { stroke: var(--muted); stroke-width: 0.7; stroke-opacity: 0.6; }
.w-point-glyph { fill: var(--ink); font-family: var(--font-symbols); font-size: 22px; }
.w-point-deg { fill: var(--muted); font: 500 10.5px var(--font-body); }
.w-end { fill: var(--ink-2); }
.w-point-glyph, .w-point-deg, .w-house-num, .w-axis-label { paint-order: stroke; stroke: var(--panel); stroke-width: 4px; stroke-linejoin: round; }
.w-point:hover .w-point-glyph { fill: var(--gold); }
@media (max-width: 900px) {
.chart-layout { grid-template-columns: 1fr; }
}
@media (max-width: 640px) {
h1 { font-size: 32px; }
.site-header { padding: 10px 16px; gap: 12px; }
.nav { order: 3; flex-basis: 100%; }
.card { padding: 18px; }
.auth-aside { padding: 28px 20px; min-height: 0; }
.wheel { width: 60%; }
.big3 { grid-template-columns: 1fr; }
.chart-layout .big3 > div { padding: 12px 10px; }
.chart-layout .big3 strong { font-size: 18px; }
.chart-wheel-card { padding: 8px; }
}
.sr-only { position: absolute; width: 1px; height: 1px; padding: 0; margin: -1px; overflow: hidden; clip: rect(0, 0, 0, 0); white-space: nowrap; border: 0; }
/* Tabs */
.chart-tabs { padding-top: 8px; }
.tab-list { display: flex; gap: 4px; border-bottom: 1px solid var(--line); overflow-x: auto; scrollbar-width: none; }
.tab {
background: none; border: 0; border-bottom: 2px solid transparent; margin-bottom: -1px; padding: 12px 16px; min-height: 44px;
color: var(--muted); font: 500 15px var(--font-body); cursor: pointer; white-space: nowrap;
}
.tab:hover { color: var(--ink); }
.tab[aria-selected="true"] { color: var(--gold); border-bottom-color: var(--gold); }
.tab:focus-visible, .tab-panel:focus-visible { outline: 2px solid var(--gold); outline-offset: 2px; }
.tabs { scroll-margin-top: 88px; }
.tab-panel { padding-top: 20px; }
@media (max-width: 640px) { .tab { padding: 12px 10px; font-size: 14px; } .tabs { scroll-margin-top: 120px; } }
/* Charts list, persons */
.chart-cards { display: grid; grid-template-columns: repeat(auto-fill, minmax(240px, 1fr)); gap: 16px; }
.chart-card {
background: var(--panel); border: 1px solid var(--line); border-radius: 14px; display: flex; flex-direction: column;
transition: border-color 0.15s;
}
.chart-card:hover { border-color: var(--line-2); }
.chart-card-link, .chart-card-new { display: flex; flex-direction: column; gap: 6px; padding: 20px; color: inherit; text-decoration: none; flex: 1; }
.chart-card-name { font-family: var(--font-display); font-size: 24px; font-weight: 600; color: var(--ink); }
.chart-card-tag { margin: 0 20px 16px; font-size: 13px; color: var(--gold); }
.chart-card-new { border-style: dashed; justify-content: center; align-items: flex-start; min-height: 150px; }
.chart-card-new:hover { border-color: var(--gold); }
.chart-card-plus { font-size: 28px; line-height: 1; color: var(--gold); }
.sign-trio { display: flex; gap: 16px; margin-top: 8px; }
.sign-trio > span { display: inline-flex; align-items: baseline; gap: 4px; }
.sign-trio .sym:first-child, .trio-ac { color: var(--muted); font-size: 14px; }
.trio-ac { font: 600 11px var(--font-body); letter-spacing: 0.3px; }
.trio-sign { color: var(--gold); font-size: 20px; }
.person-actions { display: flex; flex-wrap: wrap; align-items: center; gap: 4px 6px; padding: 0 12px 12px; border-top: 1px solid var(--line); padding-top: 8px; margin: 0 8px; }
.btn-danger { border-color: var(--danger); color: var(--danger); }
.btn-danger:hover { background: rgba(242, 160, 160, 0.08); color: var(--danger); border-color: var(--danger); }
/* Chart switcher (the chart page title) */
.switcher { position: relative; align-self: flex-start; }
.switcher h1 { margin: 0; }
.switcher-button {
font: inherit; color: inherit; background: none; border: 0; padding: 0; cursor: pointer; text-align: left;
display: inline-flex; align-items: baseline; gap: 10px;
}
.switcher-button:hover .switcher-caret, .switcher-button[aria-expanded="true"] .switcher-caret { color: var(--gold); }
.switcher-button:focus-visible { outline: 2px solid var(--gold); outline-offset: 4px; border-radius: 4px; }
.switcher-caret { font-size: 0.55em; color: var(--muted); transition: color 0.15s; }
.switcher-menu {
position: absolute; z-index: 20; top: calc(100% + 8px); left: 0; min-width: 280px; max-width: min(360px, calc(100vw - 32px));
background: var(--panel); border: 1px solid var(--line-2); border-radius: 12px; box-shadow: 0 16px 40px rgba(0, 0, 0, 0.45);
padding: 6px; font-family: var(--font-body);
}
.switcher-menu ul { list-style: none; margin: 0; padding: 0; max-height: 320px; overflow-y: auto; }
.switcher-menu li a {
display: flex; justify-content: space-between; align-items: baseline; gap: 12px; padding: 10px 12px; min-height: 44px;
border-radius: 8px; color: var(--ink); text-decoration: none; font-size: 15px;
}
.switcher-menu li a strong { font-weight: 500; }
.switcher-menu li a .muted { font-size: 13px; white-space: nowrap; }
.switcher-menu li a:hover { background: var(--panel-2); }
.switcher-menu li a[aria-current="page"] { background: var(--panel-2); }
.switcher-menu li a[aria-current="page"] strong { color: var(--gold); }
.switcher-foot { display: flex; justify-content: space-between; gap: 12px; border-top: 1px solid var(--line); margin-top: 6px; padding: 10px 12px 6px; font-size: 14px; }
.switcher-foot a { color: var(--gold); text-decoration: none; }
.switcher-foot a:hover { text-decoration: underline; }
.persons-tile { position: relative; gap: 4px; padding: 16px 48px 16px 20px; color: inherit; text-decoration: none; transition: border-color 0.15s; }
.persons-tile:hover { border-color: var(--gold); }
.persons-tile strong { font-family: var(--font-display); font-size: 21px; font-weight: 600; }
.persons-tile .muted { font-size: 14px; }
.persons-tile-arrow { position: absolute; right: 20px; top: 50%; transform: translateY(-50%); color: var(--gold); font-size: 20px; }
/* Legal pages */
.legal { max-width: 820px; gap: 28px; }
.legal section { display: flex; flex-direction: column; gap: 10px; }
.legal h2 { font-size: 24px; }
.legal p, .legal li { line-height: 1.7; color: var(--ink-2); }
.legal ul { margin: 0; padding-left: 20px; display: flex; flex-direction: column; gap: 6px; }
.legal a { color: var(--gold); }
.legal-table td { vertical-align: top; line-height: 1.5; }
.danger-box { display: flex; flex-direction: column; gap: 12px; padding: 16px; border: 1px solid var(--danger); border-radius: var(--radius); }
/* Admin */
.admin-nav { display: flex; gap: 4px; border-bottom: 1px solid var(--line); margin-bottom: 4px; overflow-x: auto; }
.admin-nav a {
padding: 10px 14px; min-height: 44px; display: inline-flex; align-items: center; color: var(--muted);
text-decoration: none; border-bottom: 2px solid transparent; margin-bottom: -1px; white-space: nowrap;
}
.admin-nav a:hover { color: var(--ink); }
.admin-nav a[aria-current="page"] { color: var(--gold); border-bottom-color: var(--gold); }
.prompt-kind { display: flex; flex-direction: column; gap: 20px; }
.prompt-kind-head { display: flex; gap: 16px 24px; align-items: flex-end; justify-content: space-between; flex-wrap: wrap; }
.prompt-kind-head > p { flex: 1 1 360px; margin: 0; }
.prompt-lang { width: 200px; }
.prompt-editor { display: flex; flex-direction: column; gap: 16px; }
.prompt-status { display: flex; gap: 8px 12px; align-items: center; flex-wrap: wrap; }
.prompt-text {
min-height: 420px; padding: 12px 14px; resize: vertical; line-height: 1.55;
font: 400 13.5px/1.55 ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
}
.prompt-extra { display: flex; flex-direction: column; gap: 10px; }
.prompt-pre {
margin: 0; padding: 12px 14px; border: 1px solid var(--line); border-radius: var(--radius); background: var(--panel-2);
white-space: pre-wrap; overflow-wrap: anywhere; font: 400 13px/1.5 ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
color: var(--ink-2);
}
.prompt-history { list-style: none; margin: 0 0 8px; padding: 0; display: flex; flex-direction: column; }
.prompt-history li {
display: grid; grid-template-columns: 1fr auto auto; gap: 12px; align-items: center;
padding: 8px 0; border-bottom: 1px solid var(--line);
}
@media (max-width: 640px) {
.prompt-text { min-height: 320px; font-size: 13px; }
.prompt-lang { width: 100%; }
.prompt-history li { grid-template-columns: 1fr auto; }
.prompt-history li .hint { grid-column: 1; }
.prompt-history li .btn { grid-column: 2; grid-row: 1 / span 2; }
}
.prompt-trial {
display: flex; flex-direction: column; gap: 16px; padding: 20px; border: 1px solid var(--line);
border-radius: var(--radius); background: rgba(255, 255, 255, 0.015);
}
.prompt-trial-head { display: flex; flex-direction: column; gap: 6px; }
.prompt-trial-head h2 { font-size: 18px; margin: 0; }
.prompt-trial-head .hint { margin: 0; }
.prompt-trial-form { display: flex; gap: 12px; align-items: flex-end; flex-wrap: wrap; }
.prompt-trial-form .field { flex: 0 1 360px; }
.trial { display: flex; flex-direction: column; gap: 14px; padding-top: 16px; border-top: 1px solid var(--line); }
.trial-head { display: flex; gap: 8px 12px; align-items: center; justify-content: space-between; flex-wrap: wrap; }
.trial-summary { display: flex; flex-direction: column; gap: 8px; }
.trial-summary .summary-title, .trial-summary .summary-text { margin: 0; }
@media (max-width: 640px) {
.prompt-trial { padding: 16px; }
.prompt-trial-form .field { flex-basis: 100%; }
.prompt-trial-form .btn { width: 100%; }
}
/* Comparisons (synastry) */
.w-p2 .w-point-glyph { fill: var(--p2); }
.w-p2 .w-point-tick { stroke: var(--p2); }
.w-p2 .w-point:hover .w-point-glyph { fill: var(--gold); }
.w-end-p2 { fill: var(--p2); }
.w-p2-band { stroke-dasharray: 2 4; }
.legend-dot, .pair-dot { display: inline-block; width: 10px; height: 10px; border-radius: 50%; flex: none; }
.legend-p1 { background: var(--ink); }
.legend-p2 { background: var(--p2); }
.p2-text, .cross-grid th.p2-head { color: var(--p2); }
.cross-grid td.cross-corner { position: relative; min-width: 76px; height: 44px; font: 500 11px var(--font-body); color: var(--muted); }
.cross-col { position: absolute; top: 2px; right: 4px; color: var(--p2); white-space: nowrap; }
.cross-row { position: absolute; bottom: 2px; left: 2px; white-space: nowrap; }
.nature { display: flex; flex-direction: column; gap: 12px; }
.nature-bar { display: flex; gap: 3px; height: 10px; border-radius: 999px; overflow: hidden; }
.nature-bar-sm { height: 6px; margin-top: 4px; }
.nature-seg { flex-basis: 0; min-width: 4px; }
.nature-harmonious { background: var(--harmonic); }
.nature-challenging { background: var(--tense); }
.nature-neutral { background: var(--gold); }
.nature-list { margin: 0; display: flex; flex-direction: column; gap: 8px; }
.nature-list > div { display: grid; grid-template-columns: 128px 1fr; gap: 8px; align-items: baseline; }
.nature-list dt { display: inline-flex; align-items: center; gap: 8px; font-size: 14px; color: var(--ink-2); }
.nature-list dd { margin: 0; }
.nature-dot { width: 10px; height: 10px; border-radius: 50%; display: inline-block; }
.pair-card { gap: 4px; }
.pair-row {
display: grid; grid-template-columns: auto 1fr auto; gap: 12px; align-items: center; padding: 10px 0;
color: inherit; text-decoration: none; border-bottom: 1px solid var(--line);
}
.pair-row:last-child { border-bottom: 0; padding-bottom: 0; }
a.pair-row:hover strong { color: var(--gold); }
.pair-text { display: flex; flex-direction: column; gap: 2px; min-width: 0; }
.pair-text strong { font-family: var(--font-display); font-size: 21px; font-weight: 600; }
.compare-new { gap: 16px; }
.compare-form { display: grid; grid-template-columns: 1fr auto 1fr auto; gap: 12px; align-items: end; }
.compare-swap { font-size: 20px; padding: 0 10px; }
.compare-tile { gap: 6px; padding: 16px 20px; }
.compare-tile strong { font-family: var(--font-display); font-size: 21px; font-weight: 600; }
.compare-tile .muted { font-size: 14px; }
.compare-tile .form-actions { margin-top: 6px; }
.back-link { font-size: 14px; text-decoration: none; align-self: flex-start; }
@media (max-width: 640px) {
.compare-form { grid-template-columns: 1fr auto; }
.compare-form .field:first-child { grid-column: 1; }
.compare-swap { grid-column: 2; grid-row: 1 / span 2; align-self: center; }
.compare-form .field:nth-child(3) { grid-column: 1; }
.compare-form > .btn-primary { grid-column: 1 / -1; width: 100%; }
.nature-list > div { grid-template-columns: 1fr; gap: 2px; }
.nav { overflow-x: auto; scrollbar-width: none; }
.nav a { white-space: nowrap; padding: 10px 9px; }
.cross-grid td.cross-corner { min-width: 56px; font-size: 9px; }
}
/* Packages */
.pkg-grid { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: 16px; align-items: stretch; }
.pkg-grid-compact { grid-template-columns: repeat(auto-fit, minmax(210px, 1fr)); gap: 12px; }
.pkg {
position: relative; display: flex; flex-direction: column; gap: 10px; padding: 22px 20px 20px;
background: var(--panel); border: 1px solid var(--line-2); border-radius: var(--radius);
}
.pkg-grid-compact .pkg { padding: 18px 16px 16px; gap: 8px; background: var(--panel-2); }
.pkg-featured { border-color: var(--gold); box-shadow: 0 0 0 1px var(--gold), 0 12px 32px rgba(217, 180, 106, 0.12); }
.pkg-tags { display: flex; gap: 6px; min-height: 22px; flex-wrap: wrap; }
.pkg-badge, .pkg-save {
display: inline-flex; align-items: center; min-height: 22px; padding: 0 9px; border-radius: 999px;
font-size: 12px; font-weight: 600; letter-spacing: 0.3px;
}
.pkg-badge { background: var(--gold); color: var(--gold-ink); }
.pkg-save { border: 1px solid rgba(159, 216, 176, 0.5); color: var(--ok); }
.pkg-name { font-size: 26px; }
.pkg-grid-compact .pkg-name { font-size: 22px; }
.pkg-tagline { margin: 0; font-size: 14px; min-height: 42px; }
.pkg-price { display: flex; align-items: baseline; gap: 10px; flex-wrap: wrap; }
.pkg-price strong { font-family: var(--font-display); font-size: 32px; font-weight: 600; color: var(--ink); }
.pkg-grid-compact .pkg-price strong { font-size: 26px; }
.pkg-list { list-style: none; margin: 0; padding: 0; display: flex; flex-direction: column; gap: 6px; font-size: 14px; color: var(--ink-2); flex: 1; }
.pkg-list li { padding-left: 22px; position: relative; }
.pkg-list li::before { content: "✓"; position: absolute; left: 0; color: var(--gold); }
.pkg-per { margin: 0; }
.pkg-step { margin: 0; font-size: 13px; color: var(--gold); }
.pkg .btn { margin-top: 4px; width: 100%; }
.holdings { gap: 6px; padding: 16px 20px; }
.holdings p { margin: 0; color: var(--ink-2); }
.faq { margin: 0; display: flex; flex-direction: column; gap: 14px; }
.faq dt { font-weight: 600; margin-bottom: 4px; }
.faq dd { margin: 0; }
@media (max-width: 1000px) { .pkg-grid { grid-template-columns: repeat(2, minmax(0, 1fr)); } }
@media (max-width: 640px) {
.pkg-grid, .pkg-grid-compact { grid-template-columns: 1fr; }
.pkg-tagline { min-height: 0; }
}
/* Invitations */
.invite-card { display: flex; flex-direction: column; gap: 8px; }
.invite-quote {
margin: 0; padding: 2px 0 2px 14px; border-left: 3px solid var(--gold);
font-style: italic; white-space: pre-line; color: var(--ink);
}
.waitlist { display: flex; flex-direction: column; gap: 10px; }
.invite-results { margin: 0; padding: 0; list-style: none; display: flex; flex-direction: column; gap: 4px; }
.invite-results li { display: flex; align-items: center; gap: 8px; flex-wrap: wrap; }
.invite-msg { max-width: 280px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
.invite-accepted { border-color: color-mix(in srgb, var(--ok) 50%, transparent); color: var(--ok); }
.invite-pending { border-color: rgba(217, 180, 106, 0.5); color: var(--gold); }
.invite-expired, .invite-revoked { color: var(--muted); }
.mail-frame { width: 100%; height: 640px; border: 1px solid var(--line); border-radius: 8px; background: #f4f1ea; }
.mail-text {
margin: 0; padding: 16px; border: 1px solid var(--line); border-radius: 8px; max-height: 640px; overflow: auto;
white-space: pre-wrap; font-size: 13px; line-height: 1.5;
}
@@ -0,0 +1,4 @@
// Container health check.
export function GET() {
return Response.json({ status: "ok" });
}
@@ -0,0 +1,9 @@
import { redirect } from "next/navigation";
import { requireMe } from "@/lib/server";
// The user's own chart; without birth data the profile asks for it.
export default async function MyChart() {
const me = await requireMe("/keplet");
redirect(me.primary_chart_id ? `/kepletek/${me.primary_chart_id}` : "/profil#birth");
}
@@ -0,0 +1,29 @@
"use client";
import { useRouter } from "next/navigation";
import { BirthForm } from "@/app/profil/BirthForm";
import type { BirthData } from "@/lib/types";
export function EditPerson({
id,
name,
initial,
}: {
id: string;
name: string;
initial: BirthData & { placeName: string | null; region: string | null };
}) {
const router = useRouter();
return (
<BirthForm
initial={initial}
person={{ chartId: id, name }}
onCancel={() => router.push("/szemelyek")}
onSaved={() => {
router.push(`/kepletek/${id}`);
router.refresh();
}}
/>
);
}
@@ -0,0 +1,59 @@
"use client";
import { useRouter } from "next/navigation";
import { useState } from "react";
import { api, errorText } from "@/lib/api";
/** Changes only a person's name (any time; the chart and analyses stay). */
export function RenamePerson({ id, name }: { id: string; name: string }) {
const router = useRouter();
const [value, setValue] = useState(name);
const [busy, setBusy] = useState(false);
const [error, setError] = useState<string | null>(null);
async function save(e: React.FormEvent) {
e.preventDefault();
if (!value.trim()) return setError("Add meg a nevét.");
setBusy(true);
setError(null);
try {
await api(`/charts/${id}`, { method: "PATCH", body: { label: value.trim() } });
router.push(`/kepletek/${id}`);
router.refresh();
} catch (err) {
setError(errorText(err));
setBusy(false);
}
}
return (
<form onSubmit={save} className="field" style={{ gap: 16 }} noValidate>
<div className="field" style={{ maxWidth: 420 }}>
<label htmlFor="rename">Név</label>
<input
id="rename"
className="inp"
value={value}
maxLength={100}
autoComplete="off"
onChange={(e) => setValue(e.target.value)}
required
/>
</div>
{error && (
<p className="msg msg-error" role="alert">
{error}
</p>
)}
<div className="form-actions">
<button type="submit" className="btn btn-primary" disabled={busy || value.trim() === name}>
{busy ? "Mentés…" : "Név mentése"}
</button>
<button type="button" className="btn btn-ghost" onClick={() => router.push(`/kepletek/${id}`)} disabled={busy}>
Mégse
</button>
</div>
</form>
);
}
@@ -0,0 +1,54 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { backendGet, requireMe } from "@/lib/server";
import type { Chart } from "@/lib/types";
import { EditPerson } from "./EditPerson";
import { RenamePerson } from "./RenamePerson";
export const metadata: Metadata = { title: "Adatok javítása" };
const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
/** Correcting a person: name any time, birth data within an hour of adding them (admins any time). */
export default async function EditPersonPage({ params }: { params: Promise<{ id: string }> }) {
const { id } = await params;
const me = await requireMe(`/kepletek/${id}/javitas`);
if (!UUID.test(id)) notFound();
const chart = await backendGet<Chart>(`/v1/charts/${id}`);
if (!chart || chart.kind !== "person") notFound();
const editable =
me.user.roles.includes("admin") || (chart.editable_until !== null && Date.parse(chart.editable_until) > Date.now());
return (
<main className="page">
<div className="page-head">
<h1>{chart.label} adatai</h1>
<p className="muted">
{editable
? "Ha a születési adatokon változtatsz, újraszámoljuk a képletet és a rövid összefoglalót. A név módosítása a képletet és az elemzéseket nem érinti."
: "A név bármikor módosítható; a képlet és az elemzések maradnak."}
</p>
</div>
<section className="card" aria-label="Születési adatok">
{editable ? (
<EditPerson
id={id}
name={chart.label}
initial={{
...chart.birth_data,
placeName: chart.chart.location.place?.name ?? null,
region: chart.chart.location.place?.region ?? null,
}}
/>
) : (
<>
<RenamePerson id={id} name={chart.label} />
<p className="hint">A születési adatok csak a felvételt követő egy órán belül javíthatók.</p>
</>
)}
</section>
</main>
);
}
@@ -0,0 +1,194 @@
import type { Metadata } from "next";
import Link from "next/link";
import { notFound } from "next/navigation";
import { AspectGrid, AspectList, BigThree, PositionTables } from "@/components/ChartTables";
import { ChartSummary } from "@/components/ChartSummary";
import { ChartSwitcher } from "@/components/ChartSwitcher";
import { DetailedAnalysis } from "@/components/DetailedAnalysis";
import { ChartWheel, WheelLegend } from "@/components/ChartWheel";
import { CompareButton } from "@/components/CompareButton";
import { Tabs } from "@/components/Tabs";
import { ASPECTS, ELEMENTS, MODALITIES, MOON_PHASES, countryName, formatBirthDate, pointName } from "@/lib/astro";
import { backendGet, requireMe } from "@/lib/server";
import type { Analysis, Chart, ChartListItem, PublicConfig } from "@/lib/types";
export const metadata: Metadata = { title: "Képlet" };
const GRID_LEGEND = ["conjunction", "sextile", "square", "trine", "opposition"];
const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
/** One saved chart: the wheel and the tables, read from the database (not recalculated). */
export default async function ChartPage({ params }: { params: Promise<{ id: string }> }) {
const { id } = await params;
const me = await requireMe(`/kepletek/${id}`);
if (!UUID.test(id)) notFound();
const [chart, analyses, config, chartList] = await Promise.all([
backendGet<Chart>(`/v1/charts/${id}`),
backendGet<{ analyses: Analysis[] }>(`/v1/charts/${id}/analyses`),
backendGet<PublicConfig>("/v1/config"),
backendGet<{ charts: ChartListItem[] }>("/v1/charts"),
]);
const charts = chartList?.charts ?? [];
const persons = charts.filter((c) => c.kind === "person");
const own = charts.find((c) => c.is_primary) ?? null;
if (!chart) notFound();
const list = analyses?.analyses ?? [];
const summary = list.find((a) => a.kind === "summary" && a.status !== "failed") ?? null;
const natal = list.filter((a) => a.kind === "natal");
const detailed = natal.find((a) => a.status !== "failed") ?? natal[0] ?? null;
const result = chart.chart;
const timeKnown = chart.highlights.time_known;
const place = result.location.place;
const country = place?.country_code ?? chart.birth_data.country;
const elements = result.summary?.elements;
const modalities = result.summary?.modalities;
const phase = result.moon_phase;
return (
<main className="page" style={{ maxWidth: 1180 }}>
<div className="page-head">
<ChartSwitcher
title={chart.is_primary ? "Születési képletem" : chart.label}
currentId={chart.id}
own={own}
persons={persons}
canAdd={me.persons.left !== 0}
/>
<p className="muted">
{formatBirthDate(chart.birth_data.date)}
{timeKnown ? `, ${result.time.local.slice(11, 16)} (UTC${result.time.utc_offset}${result.time.dst ? ", nyári idő" : ""})` : ", ismeretlen időpont"}
{" · "}
{place?.name ?? chart.birth_data.place ?? "–"}
{country ? `, ${countryName(country)}` : ""}
</p>
</div>
<section className="chart-layout" aria-label="Képletrajz">
<div className="card chart-wheel-card">
<ChartWheel chart={result} timeKnown={timeKnown} />
<WheelLegend />
</div>
<div className="field chart-side">
<ChartSummary chartId={chart.id} initial={summary} detailedDone={detailed?.status === "done"} />
<BigThree chart={chart} />
{(elements || modalities || phase) && (
<div className="card" style={{ gap: 12 }}>
<dl className="facts">
{elements && (
<>
<dt>Elemek</dt>
<dd>
{Object.entries(elements)
.map(([k, v]) => `${ELEMENTS[k] ?? k} ${v.count}`)
.join(" · ")}
</dd>
</>
)}
{modalities && (
<>
<dt>Minőségek</dt>
<dd>
{Object.entries(modalities)
.map(([k, v]) => `${MODALITIES[k] ?? k} ${v.count}`)
.join(" · ")}
</dd>
</>
)}
{phase && (
<>
<dt>Holdfázis</dt>
<dd>
{MOON_PHASES[phase.phase] ?? phase.phase}, {Math.round(phase.illumination * 100)}%
</dd>
</>
)}
</dl>
{elements && (
<p className="hint">
Az elemek és minőségek a tíz bolygóból számolva:{" "}
{Object.entries(elements)
.filter(([, v]) => v.count > 0)
.map(([k, v]) => `${ELEMENTS[k] ?? k}: ${v.points.map(pointName).join(", ")}`)
.join("; ")}
.
</p>
)}
</div>
)}
{!chart.is_primary && own && (
<div className="card compare-tile">
<span className="eyebrow">Összevetés</span>
<strong>Te és {chart.label}</strong>
<span className="muted">Két képlet egy körön: mi vonz, hol súrlódtok, és mit ad a kapcsolat.</span>
<div className="form-actions">
<CompareButton chart1={own.id} chart2={chart.id} label="Összevetés velem" className="btn" />
</div>
</div>
)}
{chart.is_primary && (
<Link href="/szemelyek" className="card persons-tile">
<span className="eyebrow">Személyek</span>
<strong>
{persons.length > 0 ? `${persons.length} felvett személy` : "Társad, családod képlete"}
</strong>
<span className="muted">
{persons.length > 0
? persons.slice(0, 3).map((p) => p.label).join(", ") + (persons.length > 3 ? "…" : "")
: "Vedd fel őket, és nézd meg az ő képletüket és elemzésüket is."}
</span>
<span className="persons-tile-arrow" aria-hidden="true">
→
</span>
</Link>
)}
</div>
</section>
<section className="card chart-tabs" aria-label="Elemzés és táblázatok">
<Tabs
label="Képlet részletei"
tabs={[
{
id: "elemzes",
label: "Elemzés",
content: (
<DetailedAnalysis
target={{ kind: "natal", chartId: chart.id }}
initial={detailed}
left={me.analyses_left.natal}
isAdmin={me.user.roles.includes("admin")}
unlimited={me.unlimited_until !== null}
canPay={config?.mock_payments ?? false}
/>
),
},
{ id: "bolygok", label: "Bolygók", content: <PositionTables chart={chart} /> },
{
id: "matrix",
label: "Mátrix",
content: (
<div className="field" style={{ gap: 16 }}>
<AspectGrid chart={chart} />
<ul className="grid-legend" aria-label="Jelmagyarázat">
{GRID_LEGEND.map((k) => (
<li key={k}>
<span className={`sym asp asp-${k}`} aria-hidden="true">
{ASPECTS[k]?.glyph}
</span>{" "}
{ASPECTS[k]?.hu}
</li>
))}
</ul>
</div>
),
},
{ id: "reszletek", label: "Részletek", content: <AspectList chart={chart} /> },
]}
/>
</section>
</main>
);
}
@@ -0,0 +1,6 @@
import { redirect } from "next/navigation";
// The persons list moved to /szemelyek.
export default function ChartsIndex() {
redirect("/szemelyek");
}
+31
View File
@@ -0,0 +1,31 @@
import type { Metadata } from "next";
import { Cormorant_Garamond, Inter } from "next/font/google";
import { SiteHeader } from "@/components/SiteHeader";
import { getMe } from "@/lib/server";
import "./globals.css";
const cormorant = Cormorant_Garamond({
subsets: ["latin", "latin-ext"],
weight: ["500", "600"],
variable: "--font-cormorant",
});
const inter = Inter({ subsets: ["latin", "latin-ext"], variable: "--font-inter" });
export const metadata: Metadata = {
title: { default: "Sorsfonalak", template: "%s · Sorsfonalak" },
description: "Születési képlet, szinasztria és közösség – egy helyen.",
};
export default async function RootLayout({ children }: { children: React.ReactNode }) {
const me = await getMe();
return (
<html lang="hu" className={`${cormorant.variable} ${inter.variable}`}>
<body>
{me && <SiteHeader me={me} />}
{children}
</body>
</html>
);
}
@@ -0,0 +1,57 @@
"use client";
import { useState } from "react";
import { api, errorText } from "@/lib/api";
// A button, not an automatic request: link scanners of mail providers open
// every link, and they must not unsubscribe anyone.
export function Unsubscribe({ token }: { token: string | null }) {
const [state, setState] = useState<"idle" | "busy" | "done">("idle");
const [error, setError] = useState<string | null>(null);
if (!token) {
return (
<p className="msg msg-error" role="alert">
Hiányzik a link vége. Nyisd meg a teljes linket a levélből.
</p>
);
}
if (state === "done") {
return (
<p className="msg msg-ok" role="status">
Leiratkoztál: erre a címre nem küldünk több meghívót.
</p>
);
}
async function confirm() {
setState("busy");
setError(null);
try {
await api(`/public/invitations/unsubscribe?token=${encodeURIComponent(token!)}`, { method: "POST" });
setState("done");
} catch (e) {
setError(errorText(e));
setState("idle");
}
}
return (
<div className="card field" style={{ gap: 12 }}>
<p style={{ margin: 0 }}>
Ha leiratkozol, erre az e-mail-címre többé nem küldünk meghívót, és a mostani meghívód is érvényét veszti.
</p>
<div>
<button type="button" className="btn btn-primary" onClick={confirm} disabled={state === "busy"}>
{state === "busy" ? "Leiratkozás…" : "Leiratkozom"}
</button>
</div>
{error && (
<p className="msg msg-error" role="alert">
{error}
</p>
)}
</div>
);
}
@@ -0,0 +1,20 @@
import type { Metadata } from "next";
import { Unsubscribe } from "./Unsubscribe";
export const metadata: Metadata = { title: "Leiratkozás", robots: { index: false } };
/** "No more invitations", from the link in the footer of an invitation e-mail. */
export default async function UnsubscribePage({ searchParams }: { searchParams: Promise<Record<string, string | string[]>> }) {
const raw = (await searchParams).token;
const token = Array.isArray(raw) ? raw[0] : raw;
return (
<main className="page" style={{ maxWidth: 560 }}>
<div className="page-head">
<h1>Leiratkozás</h1>
<p className="muted">Nem kérsz több meghívót a Sorsfonalakra.</p>
</div>
<Unsubscribe token={token ?? null} />
</main>
);
}
@@ -0,0 +1,7 @@
import { redirect } from "next/navigation";
/** The link in the invitation e-mail: the login page shows the invitation. */
export default async function InvitationLink({ params }: { params: Promise<{ token: string }> }) {
const { token } = await params;
redirect(`/belepes?meghivo=${encodeURIComponent(token)}`);
}
+13
View File
@@ -0,0 +1,13 @@
import Link from "next/link";
export default function NotFound() {
return (
<main className="page" style={{ alignItems: "flex-start" }}>
<h1>Nincs ilyen oldal</h1>
<p className="muted">A keresett oldal nem létezik, vagy nincs hozzá jogosultságod.</p>
<Link href="/" className="btn">
Vissza a kezdőlapra
</Link>
</main>
);
}
@@ -0,0 +1,51 @@
"use client";
import { useRouter } from "next/navigation";
import { useState } from "react";
import { api, errorText } from "@/lib/api";
/** Deletes a comparison (and its analysis). */
export function ComparisonActions({ id, name }: { id: string; name: string }) {
const router = useRouter();
const [confirm, setConfirm] = useState(false);
const [busy, setBusy] = useState(false);
const [error, setError] = useState<string | null>(null);
async function remove() {
setBusy(true);
setError(null);
try {
await api(`/synastries/${id}`, { method: "DELETE" });
router.refresh();
} catch (e) {
setError(errorText(e));
setBusy(false);
}
}
return (
<div className="person-actions">
{confirm ? (
<>
<span className="hint">Törlöd a(z) {name} összevetést és az elemzését?</span>
<button type="button" className="btn btn-sm btn-danger" onClick={remove} disabled={busy}>
{busy ? "Törlés…" : "Igen, törlöm"}
</button>
<button type="button" className="btn btn-sm btn-ghost" onClick={() => setConfirm(false)} disabled={busy}>
Mégse
</button>
</>
) : (
<button type="button" className="btn btn-sm btn-ghost" onClick={() => setConfirm(true)}>
Törlés
</button>
)}
{error && (
<p className="msg msg-error" role="alert">
{error}
</p>
)}
</div>
);
}
@@ -0,0 +1,78 @@
"use client";
import Link from "next/link";
import { useState } from "react";
import { CompareButton } from "@/components/CompareButton";
import { sideName } from "@/lib/synastry";
import type { ChartListItem } from "@/lib/types";
/** Picks two of the user's charts to compare. */
export function NewComparison({ charts }: { charts: ChartListItem[] }) {
const own = charts.find((c) => c.is_primary);
const [first, setFirst] = useState(own?.id ?? charts[0]?.id ?? "");
const [second, setSecond] = useState(charts.find((c) => c.id !== (own?.id ?? charts[0]?.id))?.id ?? "");
if (charts.length < 2) {
return (
<section className="card compare-new" aria-labelledby="compare-title">
<h2 id="compare-title">Új összevetés</h2>
<p className="muted">
Összevetéshez legalább két képlet kell. Vedd fel társad, családtagod vagy barátod születési adatait, és nézd meg,
hogyan hatnak egymásra a képleteitek.
</p>
<div className="form-actions">
<Link href="/szemelyek/uj" className="btn btn-primary">
Új személy felvétele
</Link>
</div>
</section>
);
}
const option = (c: ChartListItem) => (
<option key={c.id} value={c.id}>
{sideName(c)}
{c.birth.time ? "" : " (idő nélkül)"}
</option>
);
const swap = () => {
setFirst(second);
setSecond(first);
};
return (
<section className="card compare-new" aria-labelledby="compare-title">
<h2 id="compare-title">Új összevetés</h2>
<div className="compare-form">
<div className="field">
<label htmlFor="compare-first">Első fél</label>
<select id="compare-first" className="inp" value={first} onChange={(e) => setFirst(e.target.value)}>
{charts.map(option)}
</select>
</div>
<button type="button" className="btn btn-ghost compare-swap" onClick={swap} aria-label="A két fél felcserélése">
⇄
</button>
<div className="field">
<label htmlFor="compare-second">Második fél</label>
<select id="compare-second" className="inp" value={second} onChange={(e) => setSecond(e.target.value)}>
{charts.map(option)}
</select>
</div>
{first && second && first !== second ? (
<CompareButton chart1={first} chart2={second} label="Összevetés" className="btn btn-primary" />
) : (
<button type="button" className="btn btn-primary" disabled>
Összevetés
</button>
)}
</div>
<p className="hint">
{first === second
? "Két különböző képletet válassz."
: "A körön az első fél képlete és házai vannak belül, a második fél bolygói kívül."}
</p>
</section>
);
}
@@ -0,0 +1,167 @@
import type { Metadata } from "next";
import Link from "next/link";
import { notFound } from "next/navigation";
import { SignTrio } from "@/components/ChartCard";
import { DetailedAnalysis } from "@/components/DetailedAnalysis";
import { CompositeTables, CrossGrid, HouseOverlays, InterAspectList, NatureBar } from "@/components/SynastryTables";
import { SynastryLegend, SynastryWheel } from "@/components/SynastryWheel";
import { Tabs } from "@/components/Tabs";
import { ASPECTS, formatBirthDate } from "@/lib/astro";
import { backendGet, requireMe } from "@/lib/server";
import { sideName, sideTimeKnown } from "@/lib/synastry";
import type { Analysis, ChartListItem, PublicConfig, Synastry, SynastrySide } from "@/lib/types";
export const metadata: Metadata = { title: "Összevetés" };
const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
const GRID_LEGEND = ["conjunction", "sextile", "square", "trine", "opposition"];
function Person({ side, which }: { side: SynastrySide; which: "p1" | "p2" }) {
const time = sideTimeKnown(side);
const birth = side.birth_data;
const name = sideName(side);
const body = (
<>
<span className={`pair-dot legend-${which}`} aria-hidden="true" />
<span className="pair-text">
<strong>{name}</strong>
{birth && (
<span className="hint">
{formatBirthDate(birth.date)}
{time && birth.time ? `, ${birth.time.slice(0, 5)}` : ", ismeretlen időpont"}
</span>
)}
</span>
{side.highlights && (
<SignTrio chart={{ highlights: { ...side.highlights, time_known: time } } as ChartListItem} />
)}
</>
);
return side.owned ? (
<Link href={`/kepletek/${side.id}`} className="pair-row">
{body}
</Link>
) : (
<div className="pair-row">{body}</div>
);
}
/** One comparison of two charts: the double wheel, the numbers, the analysis and the tables. */
export default async function ComparisonPage({ params }: { params: Promise<{ id: string }> }) {
const { id } = await params;
const me = await requireMe(`/osszevetesek/${id}`);
if (!UUID.test(id)) notFound();
const [synastry, analyses, config] = await Promise.all([
backendGet<Synastry>(`/v1/synastries/${id}`),
backendGet<{ analyses: Analysis[] }>(`/v1/synastries/${id}/analyses`),
backendGet<PublicConfig>("/v1/config"),
]);
if (!synastry) notFound();
const list = analyses?.analyses ?? [];
const detailed = list.find((a) => a.status !== "failed") ?? list[0] ?? null;
const { chart1, chart2 } = synastry;
const name1 = sideName(chart1);
const name2 = sideName(chart2);
const time1 = sideTimeKnown(chart1);
const time2 = sideTimeKnown(chart2);
const result = synastry.synastry;
const unknown = [!time1 && name1, !time2 && name2].filter(Boolean);
return (
<main className="page" style={{ maxWidth: 1180 }}>
<div className="page-head">
<Link href="/osszevetesek" className="back-link">
← Összevetések
</Link>
<h1>
{name1} és {name2}
</h1>
<p className="muted">Összevetés · két képlet egymásra vetítve</p>
</div>
<section className="chart-layout" aria-label="Kettős képletrajz">
<div className="card chart-wheel-card">
<SynastryWheel
chart1={chart1.chart}
chart2={chart2.chart}
time1={time1}
time2={time2}
aspects={result.aspects}
name1={name1}
name2={name2}
/>
<SynastryLegend name1={name1} name2={name2} time1={time1} />
</div>
<div className="field chart-side">
<div className="card pair-card">
<span className="eyebrow">A két fél</span>
<Person side={chart1} which="p1" />
<Person side={chart2} which="p2" />
</div>
<div className="card summary-card">
<span className="eyebrow">Számokban</span>
<h2 className="summary-title">{result.summary.aspect_count} fényszög köztetek</h2>
<NatureBar summary={result.summary} />
{unknown.length > 0 && (
<p className="hint">
{unknown.join(" és ")} születési ideje ismeretlen: az ő tengelyei és házai kimaradnak, a Hold helyzete
közelítő.
</p>
)}
</div>
</div>
</section>
<section className="card chart-tabs" aria-label="Elemzés és táblázatok">
<Tabs
label="Összevetés részletei"
tabs={[
{
id: "elemzes",
label: "Elemzés",
content: (
<DetailedAnalysis
target={{ kind: "synastry", synastryId: synastry.id }}
initial={detailed}
left={me.analyses_left.synastry}
isAdmin={me.user.roles.includes("admin")}
unlimited={me.unlimited_until !== null}
canPay={config?.mock_payments ?? false}
note={`Az elemzésben az első fél: ${name1}, a második fél: ${name2}.`}
/>
),
},
{
id: "fenyszogek",
label: "Fényszögek",
content: (
<div className="field" style={{ gap: 16 }}>
<CrossGrid synastry={synastry} name1={name1} name2={name2} />
<ul className="grid-legend" aria-label="Jelmagyarázat">
{GRID_LEGEND.map((k) => (
<li key={k}>
<span className={`sym asp asp-${k}`} aria-hidden="true">
{ASPECTS[k]?.glyph}
</span>{" "}
{ASPECTS[k]?.hu}
</li>
))}
</ul>
</div>
),
},
{ id: "hazak", label: "Házak", content: <HouseOverlays synastry={synastry} name1={name1} name2={name2} /> },
{ id: "kompozit", label: "Kompozit", content: <CompositeTables synastry={synastry} /> },
{
id: "reszletek",
label: "Részletek",
content: <InterAspectList synastry={synastry} name1={name1} name2={name2} />,
},
]}
/>
</section>
</main>
);
}
@@ -0,0 +1,71 @@
import type { Metadata } from "next";
import Link from "next/link";
import { formatDate } from "@/lib/astro";
import { backendGet, requireMe } from "@/lib/server";
import { listName } from "@/lib/synastry";
import type { ChartListItem, SynastryListItem } from "@/lib/types";
import { ComparisonActions } from "./ComparisonActions";
import { NewComparison } from "./NewComparison";
export const metadata: Metadata = { title: "Összevetések" };
/** The user's comparisons, and a form for a new one. */
export default async function ComparisonsPage() {
await requireMe("/osszevetesek");
const [chartList, synastryList] = await Promise.all([
backendGet<{ charts: ChartListItem[] }>("/v1/charts"),
backendGet<{ synastries: SynastryListItem[] }>("/v1/synastries"),
]);
const charts = chartList?.charts ?? [];
const synastries = synastryList?.synastries ?? [];
return (
<main className="page" style={{ maxWidth: 1080 }}>
<div className="page-head">
<h1>Összevetések</h1>
<p className="muted">
Két képlet egymásra vetítve: mi vonz, hol súrlódtok, és mit ad a kapcsolat. A saját és a felvett személyek
képletei közül bármelyik kettőt összevetheted.
</p>
</div>
<NewComparison charts={charts} />
{synastries.length > 0 && (
<section className="field" aria-labelledby="list-title" style={{ gap: 12 }}>
<h2 id="list-title">Korábbi összevetések</h2>
<div className="chart-cards">
{synastries.map((s) => {
const name = `${listName(s.chart1, charts)} és ${listName(s.chart2, charts)}`;
const n = s.summary?.by_nature;
const total = s.summary?.aspect_count || 1;
return (
<div key={s.id} className="chart-card">
<Link href={`/osszevetesek/${s.id}`} className="chart-card-link">
<strong className="chart-card-name">{name}</strong>
<span className="muted">{formatDate(s.created_at)}</span>
{n && (
<>
<span className="nature-bar nature-bar-sm" aria-hidden="true">
<span className="nature-seg nature-harmonious" style={{ flexGrow: n.harmonious / total }} />
<span className="nature-seg nature-challenging" style={{ flexGrow: n.challenging / total }} />
<span className="nature-seg nature-neutral" style={{ flexGrow: n.neutral / total }} />
</span>
<span className="hint">
{n.harmonious} harmonikus · {n.challenging} feszültebb · {n.neutral} együttállás
</span>
</>
)}
</Link>
{s.owned && <ComparisonActions id={s.id} name={name} />}
</div>
);
})}
</div>
</section>
)}
</main>
);
}
+10
View File
@@ -0,0 +1,10 @@
import { redirect } from "next/navigation";
import { getMe } from "@/lib/server";
// No home page yet: logged-in users go to their chart (or to the profile to enter
// their birth data), others to login.
export default async function Home() {
const me = await getMe();
redirect(!me ? "/belepes" : me.primary_chart_id ? "/keplet" : "/profil");
}
+73
View File
@@ -0,0 +1,73 @@
import type { Metadata } from "next";
import Link from "next/link";
import { AnalysisView } from "@/components/AnalysisView";
import { ChartWheel, WheelLegend } from "@/components/ChartWheel";
import { Rich } from "@/components/Rich";
import { Logo } from "@/components/SiteHeader";
import example from "@/content/pelda.json";
import { getMe } from "@/lib/server";
import type { AnalysisContent, ChartResult } from "@/lib/types";
export const metadata: Metadata = {
title: "Példaelemzés",
description: "Így néz ki egy részletes Sorsfonalak-elemzés: egy kitalált születési képlet teljes értelmezése.",
};
/** A full example analysis of a made-up chart, for visitors and free users. */
export default async function ExamplePage() {
const me = await getMe();
const chart = example.chart as unknown as ChartResult;
return (
<>
{!me && (
<header className="site-header">
<Logo />
</header>
)}
<main className="page" style={{ maxWidth: 1180 }}>
<div className="page-head">
<span className="eyebrow">Példaelemzés</span>
<h1>Így néz ki egy részletes elemzés</h1>
<p className="muted">
A képlet kitalált ({example.birth}). A saját képletednél ugyanígy készül: a rövid összefoglaló ingyenes, a
részletes elemzés fizetős.
</p>
</div>
<section className="chart-layout" aria-label="A példa képlete">
<div className="card chart-wheel-card">
<ChartWheel chart={chart} timeKnown />
<WheelLegend />
</div>
<div className="field" style={{ gap: 16 }}>
<section className="card summary-card" aria-labelledby="example-summary">
<span className="eyebrow">Röviden · ingyenes</span>
<h2 id="example-summary" className="summary-title">
{example.summary.title}
</h2>
<p className="summary-text">
<Rich text={example.summary.summary} />
</p>
</section>
<div className="card" style={{ gap: 12 }}>
<p>
{me ? "Nézd meg a saját képletedet és az ingyenes összefoglalódat." : "Lépj be Google-fiókkal, add meg a születési adataidat, és ingyen megkapod a saját rövid összefoglalódat."}
</p>
<div className="form-actions">
<Link href={me ? "/keplet" : "/belepes?vissza=/keplet"} className="btn btn-primary">
{me ? "A saját képletem" : "Belépés és saját képlet"}
</Link>
</div>
</div>
</div>
</section>
<section className="card analysis-card" aria-label="Részletes példaelemzés">
<span className="eyebrow">Részletes elemzés · fizetős</span>
<AnalysisView content={example.analysis as AnalysisContent} />
</section>
</main>
</>
);
}
@@ -0,0 +1,71 @@
"use client";
import { useState } from "react";
import { api, errorText } from "@/lib/api";
/** GDPR: download all data, delete the account. */
export function AccountData() {
const [confirm, setConfirm] = useState(false);
const [typed, setTyped] = useState("");
const [busy, setBusy] = useState(false);
const [error, setError] = useState<string | null>(null);
async function remove() {
setBusy(true);
setError(null);
try {
await api("/me", { method: "DELETE", body: { confirm: "DELETE" } });
window.location.href = "/belepes";
} catch (e) {
setError(errorText(e));
setBusy(false);
}
}
return (
<div className="field" style={{ gap: 16 }}>
<div className="form-actions">
<a href="/api/v1/me/export" className="btn" download>
Adataim letöltése
</a>
<span className="hint">Minden adatod egy JSON-fájlban: fiók, képletek, elemzések, vásárlások.</span>
</div>
{confirm ? (
<div className="danger-box">
<p>
A fiókod végleg törlődik a képleteiddel, a felvett személyekkel és az összes elemzéssel együtt. Ez nem
vonható vissza. A megerősítéshez írd be: <strong>TÖRLÉS</strong>
</p>
<input
className="inp"
style={{ maxWidth: 240 }}
value={typed}
onChange={(e) => setTyped(e.target.value)}
aria-label="Írd be: TÖRLÉS"
autoComplete="off"
/>
<div className="form-actions">
<button type="button" className="btn btn-danger" onClick={remove} disabled={busy || typed.trim() !== "TÖRLÉS"}>
{busy ? "Törlés…" : "Fiók végleges törlése"}
</button>
<button type="button" className="btn btn-ghost" onClick={() => setConfirm(false)} disabled={busy}>
Mégse
</button>
</div>
{error && (
<p className="msg msg-error" role="alert">
{error}
</p>
)}
</div>
) : (
<div className="form-actions">
<button type="button" className="btn btn-ghost" style={{ color: "var(--danger)" }} onClick={() => setConfirm(true)}>
Fiók törlése
</button>
</div>
)}
</div>
);
}
@@ -0,0 +1,105 @@
"use client";
import Link from "next/link";
import { useRouter } from "next/navigation";
import { useState } from "react";
import { countryName, formatBirthDate } from "@/lib/astro";
import type { BirthData } from "@/lib/types";
import { BirthForm } from "./BirthForm";
export interface SavedBirth {
birth: BirthData;
placeName: string | null;
region: string | null;
countryCode: string | null;
zone: string;
utcOffset: string;
dst: boolean;
}
/**
* Shows the saved birth data, or the form to enter or correct it. Saving opens
* the chart page. `notice`: the backend's text about the change limit, if any.
*/
export function BirthEditor({
chart,
chartId,
notice,
}: {
chart: SavedBirth | null;
chartId: string | null;
notice: string | null;
}) {
const router = useRouter();
const [editing, setEditing] = useState(chart === null);
if (editing || !chart) {
return (
<div className="field" style={{ gap: 16 }}>
{chart ? (
<p className="muted">
A javított adatokból új képlet készül, és az lesz a saját képleted. A régit a meglévő összevetések miatt
megtartjuk.
</p>
) : (
<p className="muted">
Add meg a születésed adatait. Ebből számoljuk a képletedet; a helyi időt és az akkori időzónát (nyári
időszámítást) a születési hely alapján magunk határozzuk meg.
</p>
)}
{chart && notice && <p className="msg">{notice}</p>}
<BirthForm
initial={chart ? { ...chart.birth, placeName: chart.placeName, region: chart.region } : null}
onCancel={chart ? () => setEditing(false) : undefined}
onSaved={(id) => router.push(`/kepletek/${id}`)}
/>
</div>
);
}
const { birth } = chart;
const country = chart.countryCode ?? birth.country;
return (
<div className="field">
<div className="card-head" style={{ alignItems: "flex-start" }}>
<dl className="facts">
<dt>Dátum</dt>
<dd>{formatBirthDate(birth.date)}</dd>
<dt>Időpont</dt>
<dd>
{birth.time ? (
<>
{birth.time.slice(0, 5)}{" "}
<span className="muted">
({chart.zone}, UTC{chart.utcOffset}
{chart.dst ? ", nyári idő" : ""})
</span>
</>
) : (
<span className="muted">ismeretlen</span>
)}
</dd>
<dt>Hely</dt>
<dd>
{chart.placeName ?? birth.place ?? "–"}
{chart.region && <span className="muted">, {chart.region}</span>}
{country && <span className="muted">, {countryName(country)}</span>}
</dd>
</dl>
<div className="row">
{chartId && (
<Link href={`/kepletek/${chartId}`} className="btn btn-primary">
Képlet megnyitása
</Link>
)}
<button type="button" className="btn" onClick={() => setEditing(true)}>
Adatok javítása
</button>
</div>
</div>
{notice && <p className="hint">{notice}</p>}
</div>
);
}
@@ -0,0 +1,358 @@
"use client";
import { useEffect, useId, useMemo, useRef, useState } from "react";
import { ApiError, api, errorText } from "@/lib/api";
import { countryName } from "@/lib/astro";
import type { BirthData, Country, Place } from "@/lib/types";
type Initial = (BirthData & { placeName: string | null; region: string | null }) | null;
type Ambiguity = "earlier" | "later";
const ERRORS: Record<string, string> = {
place_not_found: "Nem találjuk ezt a települést. Válassz a listából.",
nonexistent_local_time:
"Ez az időpont az óraátállítás miatt nem létezett ezen a napon (az órát előreállították). Ellenőrizd a születési időt.",
invalid_date: "Érvénytelen dátum.",
};
/** Someone else's chart: added with a name, or (with `chartId`) corrected. */
export type PersonTarget = { chartId?: string; name?: string };
export function BirthForm({
initial,
person,
onCancel,
onSaved,
}: {
initial: Initial;
/** Not given: the user's own birth data. */
person?: PersonTarget;
onCancel?: () => void;
onSaved: (chartId: string) => void;
}) {
const [name, setName] = useState(person?.name ?? "");
const [date, setDate] = useState(initial?.date ?? "");
const [time, setTime] = useState(initial?.time?.slice(0, 5) ?? "");
const [timeUnknown, setTimeUnknown] = useState(initial ? !initial.time : false);
const [country, setCountry] = useState(initial?.country ?? "HU");
const [place, setPlace] = useState<Place | null>(
initial?.geonames_id && initial.placeName
? {
geonames_id: initial.geonames_id,
name: initial.placeName,
region: initial.region,
population: null,
country_code: initial.country ?? "HU",
}
: null,
);
const [ambiguous, setAmbiguous] = useState(false);
const [ambiguity, setAmbiguity] = useState<Ambiguity>("earlier");
const [error, setError] = useState<string | null>(null);
const [busy, setBusy] = useState(false);
const today = useMemo(() => new Date().toISOString().slice(0, 10), []);
async function submit(e: React.FormEvent) {
e.preventDefault();
setError(null);
if (person && !name.trim()) return setError("Add meg a nevét.");
if (!date) return setError("Add meg a születési dátumot.");
if (!timeUnknown && !time) return setError("Add meg a születési időt, vagy jelöld, hogy nem tudod.");
if (!place) return setError("Válaszd ki a születési helyet a listából.");
setBusy(true);
try {
const birth = {
date,
...(timeUnknown ? {} : { time }),
country,
geonames_id: place.geonames_id,
...(ambiguous ? { ambiguous_time: ambiguity } : {}),
};
// Correcting a person: the birth data only when it changed, so a new
// name alone does not recalculate the chart or drop its analyses.
const birthChanged =
!initial ||
ambiguous ||
date !== initial.date ||
(timeUnknown ? null : time) !== (initial.time?.slice(0, 5) ?? null) ||
country !== (initial.country ?? "HU") ||
place.geonames_id !== initial.geonames_id;
const saved = person?.chartId
? await api<{ id: string }>(`/charts/${person.chartId}`, {
method: "PATCH",
body: birthChanged ? { label: name.trim(), birth } : { label: name.trim() },
})
: await api<{ id: string }>("/charts", {
body: person
? { label: name.trim(), is_primary: false, birth }
: { label: "Saját képlet", is_primary: true, birth },
});
onSaved(saved.id);
} catch (err) {
if (err instanceof ApiError && err.code === "ambiguous_local_time") {
setAmbiguous(true);
setError(
"Ez az időpont az óraátállítás miatt kétszer is előfordult ezen a napon. Válaszd ki, melyikben születtél, és mentsd újra.",
);
} else {
setError(err instanceof ApiError ? (ERRORS[err.code] ?? errorText(err)) : errorText(err));
}
} finally {
setBusy(false);
}
}
return (
<form onSubmit={submit} className="field" style={{ gap: 18 }} noValidate>
{person && (
<div className="field" style={{ maxWidth: 420 }}>
<label htmlFor="person-name">Név</label>
<input
id="person-name"
className="inp"
value={name}
maxLength={100}
autoComplete="off"
onChange={(e) => setName(e.target.value)}
required
/>
</div>
)}
<div className="grid-2">
<div className="field">
<label htmlFor="birth-date">Születési dátum</label>
<input
id="birth-date"
type="date"
className="inp"
min="1000-01-01"
max={today}
value={date}
onChange={(e) => setDate(e.target.value)}
required
/>
</div>
<div className="field">
<label htmlFor="birth-time">Születési idő (helyi idő)</label>
<input
id="birth-time"
type="time"
className="inp"
value={timeUnknown ? "" : time}
disabled={timeUnknown}
onChange={(e) => {
setTime(e.target.value);
setAmbiguous(false);
}}
/>
<label className="check">
<input type="checkbox" checked={timeUnknown} onChange={(e) => setTimeUnknown(e.target.checked)} />
Nem tudom a születési időt
</label>
</div>
</div>
<div className="grid-2">
<CountrySelect
value={country}
onChange={(c) => {
setCountry(c);
setPlace(null);
}}
/>
<PlaceSearch country={country} value={place} onChange={setPlace} />
</div>
{ambiguous && (
<fieldset className="field" style={{ border: 0, padding: 0, margin: 0 }}>
<legend className="label" style={{ marginBottom: 8 }}>
{person ? "Melyik időpontban született?" : "Melyik időpontban születtél?"}
</legend>
<label className="check">
<input type="radio" name="ambiguity" checked={ambiguity === "earlier"} onChange={() => setAmbiguity("earlier")} />
Az elsőben, még nyári időszámítás szerint
</label>
<label className="check">
<input type="radio" name="ambiguity" checked={ambiguity === "later"} onChange={() => setAmbiguity("later")} />
A másodikban, már téli időszámítás szerint
</label>
</fieldset>
)}
{error && (
<p className="msg msg-error" role="alert">
{error}
</p>
)}
<div className="form-actions">
<button type="submit" className="btn btn-primary" disabled={busy}>
{busy ? "Számolás…" : person?.chartId ? "Javítás mentése" : "Mentés és képlet számítása"}
</button>
{onCancel && (
<button type="button" className="btn btn-ghost" onClick={onCancel} disabled={busy}>
Mégse
</button>
)}
</div>
</form>
);
}
function CountrySelect({ value, onChange }: { value: string; onChange: (iso2: string) => void }) {
const [countries, setCountries] = useState<Country[]>([]);
useEffect(() => {
fetch("/api/geo/countries")
.then((r) => (r.ok ? r.json() : { countries: [] }))
.then((d: { countries: Country[] }) => {
const named = d.countries.map((c) => ({ iso2: c.iso2, name: countryName(c.iso2, c.name) }));
named.sort((a, b) => a.name.localeCompare(b.name, "hu"));
setCountries(named);
})
.catch(() => setCountries([]));
}, []);
return (
<div className="field">
<label htmlFor="birth-country">Ország</label>
<select id="birth-country" className="inp" value={value} onChange={(e) => onChange(e.target.value)}>
{countries.length === 0 && <option value={value}>{countryName(value)}</option>}
{countries.map((c) => (
<option key={c.iso2} value={c.iso2}>
{c.name}
</option>
))}
</select>
</div>
);
}
function PlaceSearch({
country,
value,
onChange,
}: {
country: string;
value: Place | null;
onChange: (p: Place | null) => void;
}) {
const listId = useId();
const [query, setQuery] = useState(value?.name ?? "");
const [results, setResults] = useState<Place[]>([]);
const [open, setOpen] = useState(false);
const [active, setActive] = useState(0);
const [loading, setLoading] = useState(false);
const seq = useRef(0);
// A new country starts a new search.
const firstCountry = useRef(country);
useEffect(() => {
if (country === firstCountry.current) return;
firstCountry.current = country;
setQuery("");
setResults([]);
}, [country]);
useEffect(() => {
const q = query.trim();
if (q.length < 2 || (value && value.name === query)) {
setResults([]);
return;
}
const id = ++seq.current;
setLoading(true);
const timer = setTimeout(async () => {
try {
const res = await fetch(`/api/geo/places?country=${country}&q=${encodeURIComponent(q)}&limit=8`);
const data = res.ok ? ((await res.json()) as { places: Place[] }) : { places: [] };
if (id === seq.current) {
setResults(data.places);
setActive(0);
setOpen(true);
}
} catch {
if (id === seq.current) setResults([]);
} finally {
if (id === seq.current) setLoading(false);
}
}, 250);
return () => clearTimeout(timer);
}, [query, country, value]);
function choose(p: Place) {
onChange(p);
setQuery(p.name);
setOpen(false);
}
function onKey(e: React.KeyboardEvent) {
if (!open || results.length === 0) return;
if (e.key === "ArrowDown") {
e.preventDefault();
setActive((a) => (a + 1) % results.length);
} else if (e.key === "ArrowUp") {
e.preventDefault();
setActive((a) => (a - 1 + results.length) % results.length);
} else if (e.key === "Enter") {
e.preventDefault();
choose(results[active]);
} else if (e.key === "Escape") {
setOpen(false);
}
}
const showList = open && results.length > 0;
return (
<div className="field">
<label htmlFor="birth-place">Település</label>
<div className="combo">
<input
id="birth-place"
className="inp"
role="combobox"
aria-expanded={showList}
aria-controls={listId}
aria-autocomplete="list"
aria-activedescendant={showList ? `${listId}-${active}` : undefined}
autoComplete="off"
placeholder="Kezdd el gépelni, pl. Szeged"
value={query}
onChange={(e) => {
setQuery(e.target.value);
if (value) onChange(null);
}}
onKeyDown={onKey}
onFocus={() => results.length > 0 && setOpen(true)}
onBlur={() => setTimeout(() => setOpen(false), 150)}
/>
{showList && (
<ul className="combo-list" id={listId} role="listbox">
{results.map((p, i) => (
<li key={p.geonames_id} role="presentation">
<button
type="button"
id={`${listId}-${i}`}
role="option"
aria-selected={i === active}
tabIndex={-1}
onMouseDown={(e) => e.preventDefault()}
onClick={() => choose(p)}
>
{p.name} {p.region && <small>· {p.region}</small>}
</button>
</li>
))}
</ul>
)}
</div>
<span className="hint" aria-live="polite">
{value
? `Kiválasztva: ${value.name}${value.region ? `, ${value.region}` : ""}`
: loading
? "Keresés…"
: query.trim().length >= 2 && results.length === 0
? "Nincs találat ebben az országban."
: "Válassz a listából."}
</span>
</div>
);
}
@@ -0,0 +1,62 @@
"use client";
import { useRouter } from "next/navigation";
import { useState } from "react";
import { api, errorText } from "@/lib/api";
export function ProfileForm({ displayName, locale }: { displayName: string; locale: string }) {
const router = useRouter();
const [name, setName] = useState(displayName);
const [lang, setLang] = useState(locale);
const [status, setStatus] = useState<{ ok: boolean; text: string } | null>(null);
const [busy, setBusy] = useState(false);
async function save(e: React.FormEvent) {
e.preventDefault();
setBusy(true);
setStatus(null);
try {
await api("/me", { method: "PATCH", body: { display_name: name.trim(), locale: lang } });
setStatus({ ok: true, text: "Elmentve." });
router.refresh();
} catch (err) {
setStatus({ ok: false, text: errorText(err) });
} finally {
setBusy(false);
}
}
return (
<form onSubmit={save} className="field" style={{ gap: 16 }}>
<div className="field">
<label htmlFor="display-name">Megjelenített név</label>
<input
id="display-name"
className="inp"
value={name}
maxLength={80}
autoComplete="name"
onChange={(e) => setName(e.target.value)}
/>
</div>
<div className="field">
<label htmlFor="locale">Az elemzések nyelve</label>
<select id="locale" className="inp" value={lang} onChange={(e) => setLang(e.target.value)}>
<option value="hu">Magyar</option>
<option value="en">English</option>
</select>
</div>
<div className="form-actions">
<button type="submit" className="btn btn-primary" disabled={busy}>
Mentés
</button>
{status && (
<span className={status.ok ? "msg msg-ok" : "msg msg-error"} role="status">
{status.text}
</span>
)}
</div>
</form>
);
}
+98
View File
@@ -0,0 +1,98 @@
import type { Metadata } from "next";
import Link from "next/link";
import { ROLE_LABELS, formatDate } from "@/lib/astro";
import { backendGet, requireMe } from "@/lib/server";
import type { Chart } from "@/lib/types";
import { AccountData } from "./AccountData";
import { BirthEditor } from "./BirthEditor";
import { ProfileForm } from "./ProfileForm";
export const metadata: Metadata = { title: "Profil" };
const PROVIDERS: Record<string, string> = { google: "Google", password: "E-mail és jelszó" };
export default async function ProfilePage() {
const me = await requireMe("/profil");
const chart = me.primary_chart_id ? await backendGet<Chart>(`/v1/charts/${me.primary_chart_id}`) : null;
const { user } = me;
return (
<main className="page">
<div className="page-head">
<h1>Profil</h1>
<p className="muted">A fiókod és a születési adataid.</p>
</div>
<section className="card" aria-labelledby="account">
<div className="card-head">
<h2 id="account">Fiók</h2>
<div className="row" style={{ gap: 6 }}>
{user.roles.map((r) => (
<span key={r} className={r === "user" ? "badge" : "badge badge-gold"}>
{ROLE_LABELS[r] ?? r}
</span>
))}
</div>
</div>
<div className="grid-2">
<dl className="facts">
<dt>E-mail</dt>
<dd>
{user.email} {user.email_verified && <span className="badge">megerősítve</span>}
</dd>
<dt>Belépés</dt>
<dd>{me.providers.map((p) => PROVIDERS[p] ?? p).join(", ") || "–"}</dd>
<dt>Részletes elemzések</dt>
<dd>
{me.unlimited_until
? `Korlátlan, ${formatDate(me.unlimited_until).replace(/\.$/, "")}-ig`
: `${me.analyses_left.natal} képlet, ${me.analyses_left.synastry} kapcsolati`}{" "}
· <Link href="/csomagok">Csomagok</Link>
</dd>
<dt>Személyek</dt>
<dd>
{me.persons.unlimited ? `${me.persons.used} felvéve, korlátlan` : `${me.persons.used} / ${me.persons.limit} hely`}
</dd>
<dt>Tag óta</dt>
<dd>{formatDate(user.created_at)}</dd>
</dl>
<ProfileForm displayName={user.display_name ?? ""} locale={user.locale} />
</div>
</section>
<section className="card" aria-labelledby="birth">
<div className="card-head">
<h2 id="birth">Születési adataim</h2>
{chart && !chart.highlights.time_known && <span className="badge">ismeretlen születési idő</span>}
</div>
<BirthEditor
chart={
chart
? {
birth: chart.birth_data,
placeName: chart.chart.location.place?.name ?? null,
region: chart.chart.location.place?.region ?? null,
countryCode: chart.chart.location.place?.country_code ?? chart.birth_data.country ?? null,
zone: chart.chart.time.zone,
utcOffset: chart.chart.time.utc_offset,
dst: chart.chart.time.dst,
}
: null
}
chartId={chart?.id ?? null}
notice={me.birth_change.notice}
/>
</section>
<section className="card" aria-labelledby="adataim">
<h2 id="adataim">Adataim</h2>
<p className="muted">
Hogyan kezeljük az adataidat: <Link href="/adatvedelem">adatvédelmi tájékoztató</Link>.
</p>
<AccountData />
</section>
</main>
);
}
@@ -0,0 +1,80 @@
import type { Metadata } from "next";
import Link from "next/link";
import { ChartCard } from "@/components/ChartCard";
import { PersonActions } from "@/components/PersonActions";
import { PersonPacks } from "@/components/PersonPacks";
import { backendGet, requireMe } from "@/lib/server";
import type { ChartListItem, PublicConfig } from "@/lib/types";
export const metadata: Metadata = { title: "Személyek" };
/** The persons the user added, with room for a new one. */
export default async function PersonsPage() {
const me = await requireMe("/szemelyek");
const [list, config] = await Promise.all([
backendGet<{ charts: ChartListItem[] }>("/v1/charts"),
backendGet<PublicConfig>("/v1/config"),
]);
const charts = list?.charts ?? [];
const persons = charts.filter((c) => c.kind === "person");
const ownId = charts.find((c) => c.is_primary)?.id ?? null;
const isAdmin = me.user.roles.includes("admin");
const slots = me.persons;
const full = slots.left === 0;
const now = Date.now();
return (
<main className="page" style={{ maxWidth: 1080 }}>
<div className="page-head">
<h1>Személyek</h1>
<p className="muted">
Társad, családtagjaid, barátaid képlete. Mindegyikhez kérhetsz részletes elemzést, összevetheted a sajátoddal,
és a képletoldal címére kattintva válthatsz köztük.
</p>
</div>
<div className="chart-cards">
{persons.map((p) => (
<ChartCard key={p.id} chart={p} title={p.label}>
<PersonActions
id={p.id}
name={p.label}
ownId={ownId}
editable={isAdmin || (p.editable_until !== null && Date.parse(p.editable_until) > now)}
/>
</ChartCard>
))}
{!full && (
<Link href="/szemelyek/uj" className="chart-card chart-card-new">
<span className="chart-card-plus" aria-hidden="true">
+
</span>
<strong className="chart-card-name">Új személy</strong>
<span className="muted">
{slots.unlimited ? "Korlátlan számú személy" : `Még ${slots.left} személyt vehetsz fel`}
</span>
</Link>
)}
</div>
{!slots.unlimited && (
<section className="card" aria-labelledby="slots-title">
<div className="card-head">
<h2 id="slots-title">Személyek</h2>
<span className="badge">
{slots.used} / {slots.limit} hely
</span>
</div>
<p className="muted">
{full
? "Elfogytak a helyeid. Újabb személyhez válassz csomagot."
: "A felvett személyek képletét és elemzéseit itt éred el. Egy törölt személy helye nem szabadul fel."}
</p>
<PersonPacks canPay={config?.mock_payments ?? false} />
</section>
)}
</main>
);
}
@@ -0,0 +1,17 @@
"use client";
import { useRouter } from "next/navigation";
import { BirthForm } from "@/app/profil/BirthForm";
export function NewPerson() {
const router = useRouter();
return (
<BirthForm
initial={null}
person={{}}
onCancel={() => router.push("/szemelyek")}
onSaved={(id) => router.push(`/kepletek/${id}`)}
/>
);
}
@@ -0,0 +1,40 @@
import type { Metadata } from "next";
import { PersonPacks } from "@/components/PersonPacks";
import { backendGet, requireMe } from "@/lib/server";
import type { PublicConfig } from "@/lib/types";
import { NewPerson } from "./NewPerson";
export const metadata: Metadata = { title: "Új személy" };
export default async function NewPersonPage() {
const me = await requireMe("/szemelyek/uj");
const config = await backendGet<PublicConfig>("/v1/config");
const slots = me.persons;
return (
<main className="page">
<div className="page-head">
<h1>Új személy</h1>
<p className="muted">
Társad, családtagod, barátod: a születési adataiból elkészül a képlete és egy rövid összefoglaló.
{!slots.unlimited && slots.left !== null && slots.left > 0 && ` Még ${slots.left} személyt vehetsz fel.`}
</p>
</div>
<section className="card" aria-label="Születési adatok">
{slots.left === 0 ? (
<>
<p className="muted">Elfogytak a helyeid. Újabb személyhez válassz csomagot.</p>
<PersonPacks canPay={config?.mock_payments ?? false} />
</>
) : (
<>
<NewPerson />
<p className="hint">Az adatokat a felvételt követő egy órán belül még javíthatod, utána nem módosíthatók.</p>
</>
)}
</section>
</main>
);
}
@@ -0,0 +1,20 @@
import Link from "next/link";
const PAGES = [
{ href: "/admin", label: "Felhasználók" },
{ href: "/admin/meghivok", label: "Meghívók" },
{ href: "/admin/promptok", label: "Promptok" },
];
/** Switches between the admin pages. */
export function AdminNav({ current }: { current: string }) {
return (
<nav className="admin-nav" aria-label="Admin oldalak">
{PAGES.map((p) => (
<Link key={p.href} href={p.href} aria-current={p.href === current ? "page" : undefined}>
{p.label}
</Link>
))}
</nav>
);
}
@@ -0,0 +1,30 @@
"use client";
import { useEffect, useState } from "react";
import { ZodiacWheel } from "./ZodiacWheel";
/** Slowly turning wheel with the elapsed time, while the LLM writes. */
export function AnalysisLoading({ title, text, compact = false }: { title?: string; text: string; compact?: boolean }) {
const [seconds, setSeconds] = useState(0);
useEffect(() => {
const t = setInterval(() => setSeconds((s) => s + 1), 1000);
return () => clearInterval(t);
}, []);
const elapsed = `${Math.floor(seconds / 60)}:${String(seconds % 60).padStart(2, "0")}`;
return (
<div className={compact ? "loading loading-compact" : "loading"}>
<ZodiacWheel className="loading-wheel" />
<div className="loading-text">
{title && <strong>{title}</strong>}
<p className="muted" role="status">
{text}
</p>
<p className="hint" aria-hidden="true">
{elapsed}
</p>
</div>
</div>
);
}
@@ -0,0 +1,62 @@
import type { AnalysisContent } from "@/lib/types";
import { Paragraphs, Rich } from "./Rich";
const NATAL_ORDER = ["personality", "emotions", "mind", "love", "work", "growth"];
const SYNASTRY_ORDER = ["attraction", "communication", "emotional_bond", "friction", "long_term"];
/** A finished detailed analysis (natal or synastry). */
export function AnalysisView({ content, kind = "natal" }: { content: AnalysisContent; kind?: "natal" | "synastry" }) {
const order = kind === "synastry" ? SYNASTRY_ORDER : NATAL_ORDER;
const sections = order.map((key) => content.sections?.[key]).filter((s) => s !== undefined);
return (
<article className="analysis">
<header className="analysis-head">
<h2>{content.title}</h2>
{content.summary && (
<p className="analysis-lead">
<Rich text={content.summary} />
</p>
)}
</header>
{sections.map((s, i) => (
<section key={i} className="analysis-section">
<h3>{s.title}</h3>
<Paragraphs text={s.body} />
</section>
))}
<div className="analysis-lists">
{content.strengths && content.strengths.length > 0 && (
<section>
<h3>Erősségek</h3>
<ul>
{content.strengths.map((t, i) => (
<li key={i}>
<Rich text={t} />
</li>
))}
</ul>
</section>
)}
{content.challenges && content.challenges.length > 0 && (
<section>
<h3>Kihívások</h3>
<ul>
{content.challenges.map((t, i) => (
<li key={i}>
<Rich text={t} />
</li>
))}
</ul>
</section>
)}
</div>
{content.advice && (
<section className="analysis-section analysis-advice">
<h3>Útravaló</h3>
<Paragraphs text={content.advice} />
</section>
)}
</article>
);
}
@@ -0,0 +1,43 @@
import Link from "next/link";
import { SIGNS, formatBirthDate } from "@/lib/astro";
import type { ChartListItem } from "@/lib/types";
/** Sun, Moon and Ascendant sign glyphs of a chart. */
export function SignTrio({ chart }: { chart: ChartListItem }) {
const h = chart.highlights;
const items: [string, string | null][] = [
["☉", h.sun],
["☽", h.moon],
["AC", h.time_known ? h.ascendant : null],
];
return (
<span className="sign-trio" aria-hidden="true">
{items.map(([k, sign]) => (
<span key={k}>
<span className={k === "AC" ? "trio-ac" : "sym"}>{k}</span>
<span className="sym trio-sign">{sign ? SIGNS[sign]?.glyph : "–"}</span>
</span>
))}
</span>
);
}
/** One chart in the list: name, birth date and place, the three main signs. */
export function ChartCard({ chart, title, children }: { chart: ChartListItem; title: string; children?: React.ReactNode }) {
const { birth } = chart;
return (
<div className="chart-card">
<Link href={`/kepletek/${chart.id}`} className="chart-card-link">
<strong className="chart-card-name">{title}</strong>
<span className="muted">
{formatBirthDate(birth.date)}
{birth.time ? `, ${birth.time.slice(0, 5)}` : ""}
{birth.place ? ` · ${birth.place}` : ""}
</span>
<SignTrio chart={chart} />
</Link>
{children}
</div>
);
}

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