From fef160584865fc97b9a142b413e4d987445cbcbd Mon Sep 17 00:00:00 2001 From: feco Date: Tue, 17 Nov 2026 11:03:55 +0000 Subject: [PATCH] Persons: other people's charts with package slots, list page, switcher - 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 Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL --- crates/db/migrations/0008_persons.sql | 30 +++++ deploy/docker-compose.yml | 2 + docker-compose.yml | 2 + services/backend/README.md | 9 +- services/backend/src/config.rs | 12 +- services/backend/src/credits.rs | 13 +- services/backend/src/main.rs | 1 + services/backend/src/persons.rs | 91 ++++++++++++++ services/backend/src/routes/account.rs | 2 + services/backend/src/routes/charts.rs | 116 +++++++++++++++--- services/backend/src/routes/mod.rs | 1 + services/backend/src/routes/payments.rs | 60 +++++++-- services/backend/src/tests.rs | 75 +++++++++++ services/frontend/src/app/globals.css | 58 +++++++++ .../app/kepletek/[id]/javitas/EditPerson.tsx | 29 +++++ .../src/app/kepletek/[id]/javitas/page.tsx | 54 ++++++++ .../frontend/src/app/kepletek/[id]/page.tsx | 15 ++- services/frontend/src/app/kepletek/page.tsx | 87 +++++++++++++ .../src/app/kepletek/uj/NewPerson.tsx | 17 +++ .../frontend/src/app/kepletek/uj/page.tsx | 40 ++++++ .../frontend/src/app/profil/BirthForm.tsx | 56 ++++++--- services/frontend/src/app/profil/page.tsx | 4 + .../frontend/src/components/ChartCard.tsx | 43 +++++++ .../frontend/src/components/ChartSwitcher.tsx | 93 ++++++++++++++ .../frontend/src/components/PersonActions.tsx | 59 +++++++++ .../frontend/src/components/PersonPacks.tsx | 64 ++++++++++ .../frontend/src/components/SiteHeader.tsx | 2 +- services/frontend/src/lib/types.ts | 27 ++++ 28 files changed, 1008 insertions(+), 54 deletions(-) create mode 100644 crates/db/migrations/0008_persons.sql create mode 100644 services/backend/src/persons.rs create mode 100644 services/frontend/src/app/kepletek/[id]/javitas/EditPerson.tsx create mode 100644 services/frontend/src/app/kepletek/[id]/javitas/page.tsx create mode 100644 services/frontend/src/app/kepletek/page.tsx create mode 100644 services/frontend/src/app/kepletek/uj/NewPerson.tsx create mode 100644 services/frontend/src/app/kepletek/uj/page.tsx create mode 100644 services/frontend/src/components/ChartCard.tsx create mode 100644 services/frontend/src/components/ChartSwitcher.tsx create mode 100644 services/frontend/src/components/PersonActions.tsx create mode 100644 services/frontend/src/components/PersonPacks.tsx diff --git a/crates/db/migrations/0008_persons.sql b/crates/db/migrations/0008_persons.sql new file mode 100644 index 0000000..cd08336 --- /dev/null +++ b/crates/db/migrations/0008_persons.sql @@ -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) +); diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index 90c9e85..393d7aa 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -87,6 +87,8 @@ services: 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} + PERSON_PACK_SIZE: ${PERSON_PACK_SIZE:-5} depends_on: postgres: condition: service_healthy diff --git a/docker-compose.yml b/docker-compose.yml index e4de700..3136b2b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -55,6 +55,8 @@ services: 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} + PERSON_PACK_SIZE: ${PERSON_PACK_SIZE:-5} depends_on: postgres: condition: service_healthy diff --git a/services/backend/README.md b/services/backend/README.md index 800b0a7..30b7363 100644 --- a/services/backend/README.md +++ b/services/backend/README.md @@ -14,14 +14,16 @@ Felhasználók, belépés, mentett születési képletek, szinasztriák és megh | `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` azonnal jóváír egy elemzési egységet (a compose-fájlokban egyelőre `true`) | +| `MOCK_PAYMENTS` | `false` | próbafizetés a Stripe bekötéséig: a `POST /v1/payments/mock` azonnal jóváír egy elemzési egységet (`{"unit": "natal"}`) vagy személycsomagot (`{"package": "persons"}` / `"persons_unlimited"`); a compose-fájlokban egyelőre `true` | +| `FREE_PERSON_SLOTS` | `0` | ennyi személyt vehet fel csomag nélkül egy felhasználó | +| `PERSON_PACK_SIZE` | `5` | ennyi személy van egy személycsomagban | | `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 | | `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` | `50` | ennyi képletet menthet egy felhasználó | +| `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 @@ -116,4 +118,5 @@ A [worker](../worker/README.md) kiküldi az e-maileket, megírja az elemzéseket ## 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. -- **Admin:** nincs módosítási korlát, és a részletes elemzés ingyenes (nem fogy egység). +- **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. Egységet a személycsomag ad (`PERSON_PACK_SIZE` darab), a korlátlan csomag az `entitlements` tábla `unlimited_persons` sora. 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`; részletes elemzés vagy szinasztria után sem. 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). diff --git a/services/backend/src/config.rs b/services/backend/src/config.rs index ae1d744..96536ea 100644 --- a/services/backend/src/config.rs +++ b/services/backend/src/config.rs @@ -45,8 +45,12 @@ pub struct Config { 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, + /// `PERSON_PACK_SIZE` (default 5): persons in one person package. + pub person_pack_size: i64, } fn var(name: &str) -> Option { @@ -99,7 +103,9 @@ impl Config { 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", 50)?, + max_charts_per_user: parsed("MAX_CHARTS_PER_USER", 1000)?, + free_person_slots: parsed("FREE_PERSON_SLOTS", 0)?, + person_pack_size: parsed("PERSON_PACK_SIZE", 5)?, }; if config.session_ttl_days < 1 { bail!("SESSION_TTL_DAYS must be at least 1"); @@ -128,6 +134,8 @@ impl Config { summary_model: "anthropic/claude-summary".into(), prompt_version: "v1".into(), max_charts_per_user: 50, + free_person_slots: 5, + person_pack_size: 5, } } } diff --git a/services/backend/src/credits.rs b/services/backend/src/credits.rs index 8189f99..a7e5abf 100644 --- a/services/backend/src/credits.rs +++ b/services/backend/src/credits.rs @@ -14,6 +14,8 @@ use crate::error::ApiError; pub enum Unit { Natal, Synastry, + /// A slot for adding a person (see [`crate::persons`]). + Person, } impl Unit { @@ -21,6 +23,7 @@ impl Unit { match self { Unit::Natal => "natal", Unit::Synastry => "synastry", + Unit::Person => "person", } } } @@ -30,6 +33,8 @@ impl Unit { 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 { @@ -37,6 +42,7 @@ impl Balance { match unit { Unit::Natal => self.natal, Unit::Synastry => self.synastry, + Unit::Person => self.person, } } @@ -46,15 +52,16 @@ impl Balance { } pub async fn balance(conn: &mut PgConnection, user_id: Uuid) -> Result { - let (natal, synastry): (i64, i64) = sqlx::query_as( + 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 = '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 }) + Ok(Balance { natal, synastry, person }) } /// Spends one unit inside the caller's transaction. The user row is locked diff --git a/services/backend/src/main.rs b/services/backend/src/main.rs index e06b226..dc2f9ec 100644 --- a/services/backend/src/main.rs +++ b/services/backend/src/main.rs @@ -13,6 +13,7 @@ mod config; mod credits; mod error; mod google; +mod persons; mod routes; #[cfg(test)] mod tests; diff --git a/services/backend/src/persons.rs b/services/backend/src/persons.rs new file mode 100644 index 0000000..5ba6228 --- /dev/null +++ b/services/backend/src/persons.rs @@ -0,0 +1,91 @@ +//! 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. An unlimited package +//! (`unlimited_persons` entitlement) 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 { + (!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 { + 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')", + ) + .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 +} diff --git a/services/backend/src/routes/account.rs b/services/backend/src/routes/account.rs index cb135a6..286fef8 100644 --- a/services/backend/src/routes/account.rs +++ b/services/backend/src/routes/account.rs @@ -31,12 +31,14 @@ pub async fn me(State(state): St, auth: AuthUser) -> ApiResult> { 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?; Ok(Json(json!({ "user": UserView::from(&auth.user), "providers": providers.into_iter().map(|(p,)| p).collect::>(), "primary_chart_id": primary.map(|(id,)| id), "analyses_left": balance.view(), "birth_change": birth_change, + "persons": persons.view(), }))) } diff --git a/services/backend/src/routes/charts.rs b/services/backend/src/routes/charts.rs index 30c8775..ce0c105 100644 --- a/services/backend/src/routes/charts.rs +++ b/services/backend/src/routes/charts.rs @@ -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; @@ -16,6 +17,7 @@ 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)] @@ -24,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, @@ -31,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. @@ -40,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, @@ -49,11 +56,23 @@ impl ChartRow { }) } + /// Until when a person's birth data can be corrected (admins: any time). + fn editable_until(&self) -> Option { + (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), }) @@ -140,12 +159,15 @@ pub async fn create( ) -> ApiResult<(StatusCode, Json)> { let label = clean_label(&req.label)?; let birth = clean_birth(req.birth)?; - let existing: Option = - sqlx::query_as(&format!("SELECT {CHART_COLUMNS} FROM charts WHERE owner_id = $1 AND birth_data = $2 LIMIT 1")) - .bind(auth.id()) - .bind(&birth) - .fetch_optional(&state.db) - .await?; + let kind = if req.is_primary { "own" } else { "person" }; + let existing: Option = 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?; @@ -175,6 +197,10 @@ pub async fn create( format!("at most {} charts can be saved", state.config.max_charts_per_user), )); } + 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?; @@ -185,13 +211,14 @@ 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) @@ -199,6 +226,8 @@ pub async fn create( .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; @@ -218,10 +247,14 @@ pub async fn get_one( pub struct UpdateChart { label: Option, is_primary: Option, + /// 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, } -/// 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, @@ -234,7 +267,22 @@ pub async fn update( None => chart.label.clone(), }; let is_primary = req.is_primary.unwrap_or(chart.is_primary); + let recalculated = match req.birth { + Some(birth) => Some(corrected_birth(&state, &auth, &chart, birth).await?), + None => None, + }; let mut tx = state.db.begin().await?; + if let Some((birth, result, hash)) = &recalculated { + // The old summary (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("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()) @@ -242,7 +290,8 @@ 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) @@ -253,9 +302,48 @@ pub async fn update( birth_changes::record(&mut tx, &auth, id).await?; } tx.commit().await?; + if recalculated.is_some() { + 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); + let (analysed, in_synastry): (bool, bool) = sqlx::query_as( + "SELECT EXISTS (SELECT 1 FROM analyses WHERE chart_id = $1 AND kind <> 'summary' AND status <> 'failed'), \ + EXISTS (SELECT 1 FROM synastries WHERE chart1_id = $1 OR chart2_id = $1)", + ) + .bind(chart.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 in_synastry { + return Err(ApiError::conflict( + "person_in_synastry", + "A személy szerepel egy összevetésben, 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, diff --git a/services/backend/src/routes/mod.rs b/services/backend/src/routes/mod.rs index 13c120b..382c8d9 100644 --- a/services/backend/src/routes/mod.rs +++ b/services/backend/src/routes/mod.rs @@ -122,6 +122,7 @@ async fn public_config(State(state): St) -> Json { "summary_model": c.summary_model, "password_login": c.password_login, "mock_payments": c.mock_payments, + "person_pack_size": c.person_pack_size, "password_min_length": crate::auth::MIN_PASSWORD_LEN, })) } diff --git a/services/backend/src/routes/payments.rs b/services/backend/src/routes/payments.rs index a3d16ae..9aa9acb 100644 --- a/services/backend/src/routes/payments.rs +++ b/services/backend/src/routes/payments.rs @@ -1,6 +1,6 @@ //! Payments. Until Stripe is connected, `MOCK_PAYMENTS=true` turns on a -//! stand-in: "paying" adds one analysis unit right away, so the paid flow can -//! be used end to end. +//! stand-in: "paying" grants what was bought right away (an analysis unit or +//! a person package), so the paid flow can be used end to end. use axum::Json; use axum::extract::State; @@ -13,14 +13,26 @@ use super::{Body, St}; use crate::auth::AuthUser; use crate::credits::{self, Unit}; use crate::error::{ApiError, ApiResult}; +use crate::persons; #[derive(Deserialize)] #[serde(deny_unknown_fields)] pub struct MockPayment { - unit: Unit, + /// One analysis unit. + unit: Option, + package: Option, } -/// Adds one unit of the given kind as a (pretend) purchase. +#[derive(Debug, Clone, Copy, Deserialize)] +#[serde(rename_all = "snake_case")] +pub enum Package { + /// `PERSON_PACK_SIZE` more persons. + Persons, + /// Any number of persons. + PersonsUnlimited, +} + +/// Grants an analysis unit or a person package as a (pretend) purchase. pub async fn mock( State(state): St, auth: AuthUser, @@ -29,16 +41,38 @@ pub async fn mock( if !state.config.mock_payments { return Err(ApiError::NotFound("payment method")); } + let (unit, delta) = match (req.unit, req.package) { + (Some(unit), None) => (Some(unit), 1), + (None, Some(Package::Persons)) => (Some(Unit::Person), state.config.person_pack_size), + (None, Some(Package::PersonsUnlimited)) => (None, 0), + _ => return Err(ApiError::BadRequest("give either unit or package".into())), + }; let mut tx = state.db.begin().await?; - sqlx::query( - "INSERT INTO credit_ledger (id, user_id, unit, delta, reason, note) VALUES ($1, $2, $3, 1, 'purchase', 'mock payment')", - ) - .bind(Uuid::now_v7()) - .bind(auth.id()) - .bind(req.unit.as_str()) - .execute(&mut *tx) - .await?; + match unit { + Some(unit) => { + sqlx::query( + "INSERT INTO credit_ledger (id, user_id, unit, delta, reason, note) \ + VALUES ($1, $2, $3, $4, 'purchase', 'mock payment')", + ) + .bind(Uuid::now_v7()) + .bind(auth.id()) + .bind(unit.as_str()) + .bind(delta as i32) + .execute(&mut *tx) + .await?; + } + None => { + sqlx::query( + "INSERT INTO entitlements (user_id, entitlement, note) VALUES ($1, 'unlimited_persons', 'mock payment') \ + ON CONFLICT DO NOTHING", + ) + .bind(auth.id()) + .execute(&mut *tx) + .await?; + } + } let balance = credits::balance(&mut tx, auth.id()).await?; + let persons = persons::slots(&mut tx, &auth, state.config.free_person_slots).await?; tx.commit().await?; - Ok(Json(json!({ "analyses_left": balance.view() }))) + Ok(Json(json!({ "analyses_left": balance.view(), "persons": persons.view() }))) } diff --git a/services/backend/src/tests.rs b/services/backend/src/tests.rs index d5b1c88..f985a86 100644 --- a/services/backend/src/tests.rs +++ b/services/backend/src/tests.rs @@ -752,3 +752,78 @@ async fn admins_get_free_analyses_and_mock_payments_add_units(pool: PgPool) { 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; + c.person_pack_size = 2; + }) + .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 package adds two slots + let r = app.post("/v1/payments/mock", Some(&anna), json!({"package": "persons"})).await; + assert_eq!(r.body["persons"], json!({"used": 1, "limit": 3, "left": 2, "unlimited": false}), "{}", r.body); + let second = app.chart(&anna, "Cili", false, "1986-01-01").await; + app.chart(&anna, "Dani", false, "1987-01-01").await; + let r = app.post("/v1/charts", Some(&anna), new_person("1988-01-01")).await; + assert_eq!(r.status, StatusCode::CONFLICT); + + // the unlimited package + let r = app.post("/v1/payments/mock", Some(&anna), json!({"package": "persons_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 r = app.call("PATCH", &format!("/v1/charts/{id}"), Some(&anna), Some(corrected.clone())).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); +} diff --git a/services/frontend/src/app/globals.css b/services/frontend/src/app/globals.css index 7826a50..fec995d 100644 --- a/services/frontend/src/app/globals.css +++ b/services/frontend/src/app/globals.css @@ -330,3 +330,61 @@ td.num { font-variant-numeric: tabular-nums; white-space: nowrap; } .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); } +.packs { display: grid; grid-template-columns: repeat(auto-fit, minmax(220px, 1fr)); gap: 12px; } +.pack { + display: flex; flex-direction: column; gap: 6px; align-items: flex-start; padding: 16px 18px; + background: var(--panel-2); border: 1px solid var(--line-2); border-radius: var(--radius); +} +.pack strong { font-family: var(--font-display); font-size: 22px; font-weight: 600; } +.pack .btn { margin-top: 8px; } + +/* 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; } diff --git a/services/frontend/src/app/kepletek/[id]/javitas/EditPerson.tsx b/services/frontend/src/app/kepletek/[id]/javitas/EditPerson.tsx new file mode 100644 index 0000000..bdbdd34 --- /dev/null +++ b/services/frontend/src/app/kepletek/[id]/javitas/EditPerson.tsx @@ -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 ( + router.push("/kepletek")} + onSaved={() => { + router.push(`/kepletek/${id}`); + router.refresh(); + }} + /> + ); +} diff --git a/services/frontend/src/app/kepletek/[id]/javitas/page.tsx b/services/frontend/src/app/kepletek/[id]/javitas/page.tsx new file mode 100644 index 0000000..19b43ff --- /dev/null +++ b/services/frontend/src/app/kepletek/[id]/javitas/page.tsx @@ -0,0 +1,54 @@ +import type { Metadata } from "next"; +import Link from "next/link"; +import { notFound } from "next/navigation"; + +import { backendGet, requireMe } from "@/lib/server"; +import type { Chart } from "@/lib/types"; + +import { EditPerson } from "./EditPerson"; + +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's 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(`/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 ( +
+
+

{chart.label} adatai

+

+ A javítás után újraszámoljuk a képletet és a rövid összefoglalót. +

+
+
+ {editable ? ( + + ) : ( + <> +

A személy születési adatai csak a felvételt követő egy órán belül javíthatók.

+ + Vissza a képlethez + + + )} +
+
+ ); +} diff --git a/services/frontend/src/app/kepletek/[id]/page.tsx b/services/frontend/src/app/kepletek/[id]/page.tsx index 405d890..3f02e38 100644 --- a/services/frontend/src/app/kepletek/[id]/page.tsx +++ b/services/frontend/src/app/kepletek/[id]/page.tsx @@ -3,12 +3,13 @@ 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 { 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, PublicConfig } from "@/lib/types"; +import type { Analysis, Chart, ChartListItem, PublicConfig } from "@/lib/types"; export const metadata: Metadata = { title: "Képlet" }; @@ -21,11 +22,13 @@ export default async function ChartPage({ params }: { params: Promise<{ id: stri const { id } = await params; const me = await requireMe(`/kepletek/${id}`); if (!UUID.test(id)) notFound(); - const [chart, analyses, config] = await Promise.all([ + const [chart, analyses, config, chartList] = await Promise.all([ backendGet(`/v1/charts/${id}`), backendGet<{ analyses: Analysis[] }>(`/v1/charts/${id}/analyses`), backendGet("/v1/config"), + backendGet<{ charts: ChartListItem[] }>("/v1/charts"), ]); + const charts = chartList?.charts ?? []; if (!chart) notFound(); const list = analyses?.analyses ?? []; const summary = list.find((a) => a.kind === "summary" && a.status !== "failed") ?? null; @@ -43,7 +46,13 @@ export default async function ChartPage({ params }: { params: Promise<{ id: stri return (
-

{chart.is_primary ? "Születési képletem" : chart.label}

+ c.is_primary) ?? null} + persons={charts.filter((c) => c.kind === "person")} + canAdd={me.persons.left !== 0} + />

{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"} diff --git a/services/frontend/src/app/kepletek/page.tsx b/services/frontend/src/app/kepletek/page.tsx new file mode 100644 index 0000000..bb1e684 --- /dev/null +++ b/services/frontend/src/app/kepletek/page.tsx @@ -0,0 +1,87 @@ +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: "Képletek" }; + +/** The user's own chart and the persons they added, with room for a new one. */ +export default async function ChartsPage() { + const me = await requireMe("/kepletek"); + const [list, config] = await Promise.all([ + backendGet<{ charts: ChartListItem[] }>("/v1/charts"), + backendGet("/v1/config"), + ]); + const charts = list?.charts ?? []; + const own = charts.find((c) => c.is_primary); + const persons = charts.filter((c) => c.kind === "person"); + const isAdmin = me.user.roles.includes("admin"); + const slots = me.persons; + const full = slots.left === 0; + const now = Date.now(); + + return ( +

+
+

Képletek

+

A saját képleted és azoké, akiket felvettél: mindegyikhez kérhetsz részletes elemzést.

+
+ +
+ {own ? ( + + Saját képletem + + ) : ( + + Én + Add meg a születési adataidat a profilodban. + + )} + + {persons.map((p) => ( + + now)} + /> + + ))} + + {!full && ( + + + Új személy + + {slots.unlimited ? "Korlátlan számú személy" : `Még ${slots.left} személyt vehetsz fel`} + + + )} +
+ + {!slots.unlimited && ( +
+
+

Személyek

+ + {slots.used} / {slots.limit} hely + +
+

+ {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."} +

+ +
+ )} +
+ ); +} diff --git a/services/frontend/src/app/kepletek/uj/NewPerson.tsx b/services/frontend/src/app/kepletek/uj/NewPerson.tsx new file mode 100644 index 0000000..7b29214 --- /dev/null +++ b/services/frontend/src/app/kepletek/uj/NewPerson.tsx @@ -0,0 +1,17 @@ +"use client"; + +import { useRouter } from "next/navigation"; + +import { BirthForm } from "@/app/profil/BirthForm"; + +export function NewPerson() { + const router = useRouter(); + return ( + router.push("/kepletek")} + onSaved={(id) => router.push(`/kepletek/${id}`)} + /> + ); +} diff --git a/services/frontend/src/app/kepletek/uj/page.tsx b/services/frontend/src/app/kepletek/uj/page.tsx new file mode 100644 index 0000000..3b06128 --- /dev/null +++ b/services/frontend/src/app/kepletek/uj/page.tsx @@ -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("/kepletek/uj"); + const config = await backendGet("/v1/config"); + const slots = me.persons; + + return ( +
+
+

Új személy

+

+ 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.`} +

+
+
+ {slots.left === 0 ? ( + <> +

Elfogytak a helyeid. Újabb személyhez válassz csomagot.

+ + + ) : ( + <> + +

Az adatokat a felvételt követő egy órán belül még javíthatod, utána nem módosíthatók.

+ + )} +
+
+ ); +} diff --git a/services/frontend/src/app/profil/BirthForm.tsx b/services/frontend/src/app/profil/BirthForm.tsx index 9e869b6..fe1647d 100644 --- a/services/frontend/src/app/profil/BirthForm.tsx +++ b/services/frontend/src/app/profil/BirthForm.tsx @@ -16,15 +16,22 @@ const ERRORS: Record = { 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); @@ -49,24 +56,29 @@ export function BirthForm({ 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 saved = await api<{ id: string }>("/charts", { - body: { - label: "Saját képlet", - is_primary: true, - birth: { - date, - ...(timeUnknown ? {} : { time }), - country, - geonames_id: place.geonames_id, - ...(ambiguous ? { ambiguous_time: ambiguity } : {}), - }, - }, - }); + const birth = { + date, + ...(timeUnknown ? {} : { time }), + country, + geonames_id: place.geonames_id, + ...(ambiguous ? { ambiguous_time: ambiguity } : {}), + }; + const saved = person?.chartId + ? await api<{ id: string }>(`/charts/${person.chartId}`, { + method: "PATCH", + body: { label: name.trim(), birth }, + }) + : 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") { @@ -84,6 +96,20 @@ export function BirthForm({ return (
+ {person && ( +
+ + setName(e.target.value)} + required + /> +
+ )}
@@ -132,7 +158,7 @@ export function BirthForm({ {ambiguous && (
- Melyik időpontban születtél? + {person ? "Melyik időpontban született?" : "Melyik időpontban születtél?"}