diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index 5380da2..20d4a33 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -88,6 +88,9 @@ services: # Without the Stripe keys purchases are off; packages come from promo # codes and admins (MOCK_PAYMENTS=true: pretend purchases). MOCK_PAYMENTS: ${MOCK_PAYMENTS:-false} + # Stripe purchases for everyone (false: admins only, until the opening; + # with a test key always admins only). + PURCHASES_OPEN: ${PURCHASES_OPEN:-false} # Users inviting others ("Meghívom"): shown but off until the launch. USER_INVITES: ${USER_INVITES:-false} # A new user from a shared link earns the sharer an analysis: off until sign-up opens. diff --git a/docker-compose.yml b/docker-compose.yml index c037b26..43267c0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -55,6 +55,9 @@ services: PASSWORD_LOGIN: ${PASSWORD_LOGIN:-false} # Stand-in payment (adds an analysis unit at once) until Stripe is connected. MOCK_PAYMENTS: ${MOCK_PAYMENTS:-true} + # Stripe purchases for everyone (false: admins only, until the opening; + # with a test key always admins only). + PURCHASES_OPEN: ${PURCHASES_OPEN:-false} FREE_PERSON_SLOTS: ${FREE_PERSON_SLOTS:-0} # invite: new accounts need an invitation (admin page "Meghívók"); open: anyone. SIGNUP_MODE: ${SIGNUP_MODE:-invite} diff --git a/docs/brand/README.md b/docs/brand/README.md new file mode 100644 index 0000000..1d28a15 --- /dev/null +++ b/docs/brand/README.md @@ -0,0 +1,21 @@ +# Arculat + +- `sorsfonalak-ikon-512.png`: négyzetes ikon (512×512, sötét háttér, teljes kitöltés). +- `sorsfonalak-logo-sotet-hatterre.png`: logó átlátszó háttérrel, sötét felületre (1200×300). +- `sorsfonalak-logo-vilagos-hatterre.png`: ugyanez világos felületre. + +A jel forrása: `services/frontend/src/app/icon.svg`. + +## Színek + +| Szerep | Szín | +|---|---| +| Háttér | `#0d1220` | +| Panel | `#111729` | +| Arany (kiemelés, gombok) | `#d9b46a` | +| Arany, világos háttéren | `#a7802f` | +| Szöveg sötét háttéren | `#ece6d8` | +| Szöveg világos háttéren | `#1b2236` | +| Gomb felirata arany gombon | `#141a2c` | + +Stripe (Settings → Branding): Brand color `#0d1220`, Accent color `#d9b46a`, ikon és a sötét háttérre szánt logó. diff --git a/docs/brand/sorsfonalak-ikon-512.png b/docs/brand/sorsfonalak-ikon-512.png new file mode 100644 index 0000000..d765836 Binary files /dev/null and b/docs/brand/sorsfonalak-ikon-512.png differ diff --git a/docs/brand/sorsfonalak-logo-sotet-hatterre.png b/docs/brand/sorsfonalak-logo-sotet-hatterre.png new file mode 100644 index 0000000..e6b61f0 Binary files /dev/null and b/docs/brand/sorsfonalak-logo-sotet-hatterre.png differ diff --git a/docs/brand/sorsfonalak-logo-vilagos-hatterre.png b/docs/brand/sorsfonalak-logo-vilagos-hatterre.png new file mode 100644 index 0000000..86a1dbe Binary files /dev/null and b/docs/brand/sorsfonalak-logo-vilagos-hatterre.png differ diff --git a/docs/fizetes.md b/docs/fizetes.md index d3661b0..33bbf3c 100644 --- a/docs/fizetes.md +++ b/docs/fizetes.md @@ -22,8 +22,9 @@ STRIPE_SECRET_KEY=sk_test_... STRIPE_WEBHOOK_SECRET=whsec_... ``` -- **Teszt kulccsal (`sk_test_…`) csak az adminok vásárolhatnak**, a többieknek a gombok „Hamarosan” feliratúak maradnak; így senki nem jut csomaghoz a Stripe tesztkártyáival. Tesztkártya: `4242 4242 4242 4242`, bármilyen jövőbeli lejárat és CVC. -- Élő kulccsal (`sk_live_…`) mindenki vásárolhat. +- **A megnyitásig csak az adminok vásárolhatnak** (`PURCHASES_OPEN=false`, az alapértelmezés), a többieknek a gombok „Hamarosan” feliratúak; így senki nem ad meg valódi kártyát egy teszt- vagy félkész beállításnál. +- Teszt kulccsal (`sk_test_…`) `PURCHASES_OPEN=true` mellett is csak adminok vásárolhatnak (a Stripe tesztkártyáival senki nem jut csomaghoz). Tesztkártya: `4242 4242 4242 4242`, bármilyen jövőbeli lejárat és CVC. +- Élő kulccsal és `PURCHASES_OPEN=true` mellett mindenki vásárolhat (megnyitáskor, a `.env`-ben). - Kulcs nélkül nincs vásárlás (helyben a `MOCK_PAYMENTS=true` próbafizetés működik; a Stripe-kulcs ezt felülírja). A Stripe felületén: diff --git a/services/backend/src/config.rs b/services/backend/src/config.rs index ab6744d..996ed3b 100644 --- a/services/backend/src/config.rs +++ b/services/backend/src/config.rs @@ -46,8 +46,12 @@ pub struct Config { /// analysis unit at once, until Stripe is connected. pub mock_payments: bool, /// Stripe Checkout, when `STRIPE_SECRET_KEY` is set (it wins over - /// `MOCK_PAYMENTS`). With a test key only admins can buy. + /// `MOCK_PAYMENTS`). pub stripe: Option, + /// `PURCHASES_OPEN` (default `false`): everyone may buy through Stripe. + /// Until the opening only admins can (and with a test key always only + /// admins), so nobody types a real card into a test or unfinished setup. + pub purchases_open: bool, /// `USER_INVITES` (default `false`): users may invite others ("how /// compatible are we?" links, which also let the invitee sign up). Off /// until the launch; admins may always. @@ -166,6 +170,7 @@ impl Config { .trim_end_matches('/') .to_string(), }), + purchases_open: parsed("PURCHASES_OPEN", false)?, user_invites: parsed("USER_INVITES", false)?, referral_rewards: parsed("REFERRAL_REWARDS", false)?, google_client_ids: list("GOOGLE_CLIENT_IDS"), @@ -206,6 +211,7 @@ impl Config { password_login: true, mock_payments: true, stripe: None, + purchases_open: true, user_invites: true, referral_rewards: true, google_client_ids: vec!["test-client.apps.googleusercontent.com".into()], diff --git a/services/backend/src/routes/mod.rs b/services/backend/src/routes/mod.rs index 61030d2..f6a4fb1 100644 --- a/services/backend/src/routes/mod.rs +++ b/services/backend/src/routes/mod.rs @@ -165,8 +165,10 @@ async fn public_config(State(state): St) -> Json { "locales": c.supported_locales, "password_login": c.password_login, "mock_payments": payments::method(c) == Some("mock"), - // "stripe", "mock" or null; with a Stripe test key only admins can buy. + // "stripe", "mock" or null; Stripe purchases are for admins only + // until PURCHASES_OPEN (and always with a test key). "payments": payments::method(c), + "payments_admins_only": payments::admins_only(c), "payments_test": c.stripe.as_ref().is_some_and(|s| s.test_mode()), "user_invites": c.user_invites, "referral_rewards": c.referral_rewards, diff --git a/services/backend/src/routes/payments.rs b/services/backend/src/routes/payments.rs index bea3c18..4b85734 100644 --- a/services/backend/src/routes/payments.rs +++ b/services/backend/src/routes/payments.rs @@ -84,11 +84,17 @@ pub fn method(config: &crate::config::Config) -> Option<&'static str> { } } -/// Stripe, if this user may pay through it (with a test key: admins only, so -/// nobody gets packages with Stripe's test cards). +/// Only admins can buy through Stripe: until purchases open, and always with a +/// test key (nobody gets packages with Stripe's test cards, nobody types a +/// real card into a test page). +pub fn admins_only(config: &crate::config::Config) -> bool { + !config.purchases_open || config.stripe.as_ref().is_some_and(StripeConfig::test_mode) +} + +/// Stripe, if this user may pay through it. fn stripe_for<'a>(state: &'a AppState, auth: &AuthUser) -> Result<&'a StripeConfig, ApiError> { let config = state.config.stripe.as_ref().ok_or(ApiError::NotFound("payment method"))?; - if config.test_mode() && !auth.user.has_role(Role::Admin) { + if admins_only(&state.config) && !auth.user.has_role(Role::Admin) { return Err(ApiError::Forbidden("purchases are being tested; they open soon".into())); } Ok(config) diff --git a/services/backend/src/tests.rs b/services/backend/src/tests.rs index 6948038..2017f13 100644 --- a/services/backend/src/tests.rs +++ b/services/backend/src/tests.rs @@ -2375,6 +2375,7 @@ async fn stripe_test_mode_is_for_admins_only(pool: PgPool) { let r = app.get("/v1/config", None).await; assert_eq!(r.body["payments"], "stripe"); assert_eq!(r.body["payments_test"], true); + assert_eq!(r.body["payments_admins_only"], true); let anna = app.register("anna@example.com", "Anna").await; let r = app.post("/v1/payments/checkout", Some(&anna), json!({"package": "single"})).await; assert_eq!(r.status, StatusCode::FORBIDDEN); @@ -2383,3 +2384,20 @@ async fn stripe_test_mode_is_for_admins_only(pool: PgPool) { let r = app.post("/v1/payments/checkout", Some(&admin), json!({"package": "single"})).await; assert_eq!(r.body["error"]["code"], "payment_unavailable", "{}", r.body); } + +#[sqlx::test(migrator = "db::MIGRATOR")] +async fn stripe_purchases_wait_for_the_opening(pool: PgPool) { + let app = TestApp::with_config(pool, |c| { + with_stripe(c, "sk_live_fake"); + c.purchases_open = false; + }) + .await; + let r = app.get("/v1/config", None).await; + assert_eq!((&r.body["payments_test"], &r.body["payments_admins_only"]), (&json!(false), &json!(true))); + let anna = app.register("anna@example.com", "Anna").await; + let r = app.post("/v1/payments/checkout", Some(&anna), json!({"package": "single"})).await; + assert_eq!(r.status, StatusCode::FORBIDDEN); + let admin = app.register("admin@example.com", "Admin").await; + let r = app.post("/v1/payments/checkout", Some(&admin), json!({"package": "single"})).await; + assert_eq!(r.status, StatusCode::OK, "{}", r.body); +} diff --git a/services/frontend/src/lib/payments.ts b/services/frontend/src/lib/payments.ts index d88f371..946e4a1 100644 --- a/services/frontend/src/lib/payments.ts +++ b/services/frontend/src/lib/payments.ts @@ -1,9 +1,12 @@ import type { Me, PayMethod, PublicConfig } from "./types"; -/** How this user can buy packages (with a Stripe test key: admins only). */ +/** + * How this user can buy packages. Until purchases open (and with a Stripe + * test key) only admins can; everyone else sees "soon". + */ export function payMethod(config: PublicConfig | null | undefined, me: Me): PayMethod | null { if (config?.payments === "mock") return "mock"; if (config?.payments !== "stripe") return null; - if (!config.payments_test) return "stripe"; - return me.user.roles.includes("admin") ? "stripe_test" : null; + if (config.payments_admins_only && !me.user.roles.includes("admin")) return null; + return config.payments_test ? "stripe_test" : "stripe"; } diff --git a/services/frontend/src/lib/types.ts b/services/frontend/src/lib/types.ts index ce53995..bb1559b 100644 --- a/services/frontend/src/lib/types.ts +++ b/services/frontend/src/lib/types.ts @@ -94,7 +94,9 @@ export interface PublicConfig { mock_payments: boolean; /** How packages are paid: Stripe Checkout, the stand-in, or not at all. */ payments: "stripe" | "mock" | null; - /** Stripe has a test key: only admins can buy. */ + /** Only admins can buy through Stripe (until the opening, and with a test key). */ + payments_admins_only: boolean; + /** Stripe has a test key (test cards work, no real money). */ payments_test: boolean; /** "invite": new accounts need an invitation. */ signup_mode: "invite" | "open";