From 742b88183b4c0e09b5cc4baa7a8d34d3ca9b6f9c Mon Sep 17 00:00:00 2001 From: feco Date: Tue, 17 Nov 2026 19:24:52 +0000 Subject: [PATCH] Header shows the user's package and what is left of it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - /v1/me: `package` = the running unlimited package, or the latest main package bought or given (top-ups do not count; an ended unlimited not) - header badge: "Család · 11 elemzés", "Korlátlan · 2027. november 17-ig", "Páros · elfogyott"; links to the packages page, details in the tooltip Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL --- services/backend/src/packages.rs | 20 ++++++++++ services/backend/src/routes/account.rs | 2 + services/backend/src/tests.rs | 6 +++ services/frontend/src/app/globals.css | 9 +++++ .../frontend/src/components/SiteHeader.tsx | 39 ++++++++++++++++++- services/frontend/src/lib/types.ts | 2 + 6 files changed, 77 insertions(+), 1 deletion(-) diff --git a/services/backend/src/packages.rs b/services/backend/src/packages.rs index 9d6ffe2..e79ee10 100644 --- a/services/backend/src/packages.rs +++ b/services/backend/src/packages.rs @@ -248,6 +248,26 @@ pub async fn unlimited_until(conn: &mut PgConnection, user_id: Uuid) -> Result, +) -> Result, ApiError> { + let orders: Vec<(String, OffsetDateTime)> = + sqlx::query_as("SELECT package, created_at FROM package_orders WHERE user_id = $1 ORDER BY created_at DESC") + .bind(user_id) + .fetch_all(conn) + .await?; + Ok(orders.into_iter().find_map(|(id, at)| { + let p = find(&id).filter(|p| p.tier == Tier::Main)?; + // While an unlimited package runs, only that is shown; an ended one never. + (p.unlimited_months.is_some() == unlimited_until.is_some()).then_some((p, at)) + })) +} + /// 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( diff --git a/services/backend/src/routes/account.rs b/services/backend/src/routes/account.rs index 5f74b32..2498f93 100644 --- a/services/backend/src/routes/account.rs +++ b/services/backend/src/routes/account.rs @@ -33,6 +33,7 @@ pub async fn me(State(state): St, auth: AuthUser) -> ApiResult> { 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?; + let package = crate::packages::current(&mut conn, auth.id(), unlimited).await?; Ok(Json(json!({ "user": UserView::from(&auth.user), "providers": providers.into_iter().map(|(p,)| p).collect::>(), @@ -41,6 +42,7 @@ pub async fn me(State(state): St, auth: AuthUser) -> ApiResult> { "birth_change": birth_change, "persons": persons.view(), "unlimited_until": rfc3339_opt(unlimited), + "package": package.map(|(p, since)| json!({ "id": p.id, "name": p.name, "since": rfc3339(since) })), }))) } diff --git a/services/backend/src/tests.rs b/services/backend/src/tests.rs index 0371b35..705e516 100644 --- a/services/backend/src/tests.rs +++ b/services/backend/src/tests.rs @@ -1000,6 +1000,7 @@ async fn packages_grant_units_and_unlimited(pool: PgPool) { 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(); + assert_eq!(app.get("/v1/me", Some(&anna)).await.body["package"], Value::Null); // the catalog is public let r = app.get("/v1/packages", None).await; @@ -1035,6 +1036,9 @@ async fn packages_grant_units_and_unlimited(pool: PgPool) { let (price,): (i32,) = sqlx::query_as("SELECT price_huf FROM package_orders WHERE package = 'couple'").fetch_one(&pool).await.unwrap(); assert_eq!(price, 6990); + // the header shows the latest main package; a top-up does not change it + app.post("/v1/payments/mock", Some(&anna), json!({"package": "addon_persons"})).await; + assert_eq!(app.get("/v1/me", Some(&anna)).await.body["package"]["name"], "Páros"); // unlimited: a year, and a second one extends it let bela = app.register("bela@example.com", "Béla").await; @@ -1049,6 +1053,7 @@ async fn packages_grant_units_and_unlimited(pool: PgPool) { 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); + assert_eq!(app.get("/v1/me", Some(&bela)).await.body["package"]["id"], "unlimited"); // 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() { @@ -1068,6 +1073,7 @@ async fn packages_grant_units_and_unlimited(pool: PgPool) { 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); + assert_eq!(app.get("/v1/me", Some(&bela)).await.body["package"], Value::Null); // ended } #[sqlx::test(migrator = "db::MIGRATOR")] diff --git a/services/frontend/src/app/globals.css b/services/frontend/src/app/globals.css index 193c567..08fc404 100644 --- a/services/frontend/src/app/globals.css +++ b/services/frontend/src/app/globals.css @@ -57,6 +57,14 @@ p { margin: 0; } .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; } +.pkg-pill { + display: inline-flex; align-items: center; gap: 6px; min-height: 32px; padding: 0 12px; border-radius: 999px; + border: 1px solid rgba(217, 180, 106, 0.5); color: var(--gold); text-decoration: none; font-size: 13px; white-space: nowrap; +} +.pkg-pill:hover { background: rgba(217, 180, 106, 0.08); color: var(--gold); } +.pkg-pill-detail { color: var(--muted); } +.pkg-pill-detail::before { content: "·"; margin-right: 6px; } +.pkg-pill-empty { border-color: var(--line-2); color: var(--ink-2); } /* Layout */ .page { max-width: 960px; margin: 0 auto; padding: 32px 16px 64px; display: flex; flex-direction: column; gap: 24px; } @@ -307,6 +315,7 @@ td.num { font-variant-numeric: tabular-nums; white-space: nowrap; } h1 { font-size: 32px; } .site-header { padding: 10px 16px; gap: 12px; } .nav { order: 3; flex-basis: 100%; } + .who-name { display: none; } .card { padding: 18px; } .auth-aside { padding: 28px 20px; min-height: 0; } .wheel { width: 60%; } diff --git a/services/frontend/src/components/SiteHeader.tsx b/services/frontend/src/components/SiteHeader.tsx index 13d399f..3929f41 100644 --- a/services/frontend/src/components/SiteHeader.tsx +++ b/services/frontend/src/components/SiteHeader.tsx @@ -1,5 +1,6 @@ import Link from "next/link"; +import { formatDate } from "@/lib/astro"; import type { Me } from "@/lib/types"; import { LogoutButton } from "./LogoutButton"; @@ -13,6 +14,41 @@ export function Logo() { ); } +/** The user's package and what is left of it; leads to the packages page. */ +function PackageBadge({ me }: { me: Me }) { + const { natal, synastry } = me.analyses_left; + const left = natal + synastry; + let name: string; + let detail: string | null; + if (me.unlimited_until) { + name = "Korlátlan"; + detail = `${formatDate(me.unlimited_until).replace(/\.$/, "")}-ig`; + } else if (me.package) { + name = me.package.name; + detail = left > 0 ? `${left} elemzés` : "elfogyott"; + } else if (left > 0) { + name = `${left} elemzés`; + detail = null; + } else { + return null; + } + const units = me.unlimited_until + ? "Korlátlan elemzés és összevetés" + : `Képletelemzés: ${natal}, kapcsolati elemzés: ${synastry}`; + const empty = !me.unlimited_until && left === 0; + return ( + + {name} + {detail && {detail}} + + ); +} + export function SiteHeader({ me }: { me: Me }) { const links = [ { href: "/keplet", label: "Képletem" }, @@ -27,7 +63,8 @@ export function SiteHeader({ me }: { me: Me }) {
- {me.user.display_name || me.user.email} + + {me.user.display_name || me.user.email}
diff --git a/services/frontend/src/lib/types.ts b/services/frontend/src/lib/types.ts index 8bf5fda..05a6be0 100644 --- a/services/frontend/src/lib/types.ts +++ b/services/frontend/src/lib/types.ts @@ -21,6 +21,8 @@ export interface Me { persons: PersonSlots; /** The unlimited package runs until then (null: none). */ unlimited_until: string | null; + /** The running unlimited package, or the latest main package bought or given (null: none). */ + package: { id: string; name: string; since: string } | null; } /** A package from the catalog (`GET /v1/packages`). */ -- 2.54.0