Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cf4d419e52 | ||
|
|
d63cdf737a | ||
|
|
810de0cb24 | ||
|
|
4676f7860f | ||
|
|
e68f7407f3 | ||
|
|
1b768d558d | ||
|
|
ad436f786c | ||
|
|
16c40864bb | ||
|
|
a2649fddeb | ||
|
|
ffb6060cfa | ||
|
|
09fc1e62c7 | ||
|
|
f69f76a05a | ||
|
|
5071589bf9 | ||
|
|
cd2eb02d3d | ||
|
|
43e22e6768 | ||
|
|
1a75dec59a | ||
|
|
7f6f05150e | ||
|
|
b0e1270246 | ||
|
|
663ceaca16 | ||
|
|
2e2e4b113d | ||
|
|
22d2484cab | ||
|
|
b0fc547b73 | ||
|
|
54af54cd39 | ||
|
|
1af7415add | ||
|
|
e326095f3f | ||
|
|
71177f749c | ||
|
|
ac5e7fa4fd | ||
|
|
bbfa5b28c3 | ||
|
|
e741f9b491 | ||
|
|
ba11eda64c | ||
|
|
e4905ec5f1 | ||
|
|
f578e84b3f | ||
|
|
76bc965537 | ||
|
|
174ec31351 | ||
|
|
184f19e1f2 | ||
|
|
27ecdf386e | ||
|
|
4338a35202 | ||
|
|
2a0830fda0 | ||
|
|
e530e78c54 | ||
|
|
5e633b959d | ||
|
|
d9e71ed349 | ||
|
|
42a982010d | ||
|
|
a4df094191 | ||
|
|
55101f8637 | ||
|
|
15c88fc6be | ||
|
|
50cf334045 | ||
|
|
ddca7acbd4 | ||
|
|
55f5a1ac60 | ||
|
|
fd655952b6 | ||
|
|
f10e5fdb69 | ||
|
|
b672b1cefa | ||
|
|
61db4a9723 | ||
|
|
f7a8a3d6e0 | ||
|
|
f2953dd18f | ||
|
|
1af55d3b05 | ||
|
|
aee6bec940 | ||
|
|
0c4274d87b | ||
|
|
b88a88b225 | ||
|
|
4a2a84b36f | ||
|
|
a4173f90b6 | ||
|
|
3944c6a4b0 | ||
|
|
1ab693175e | ||
|
|
2b7866d4c5 | ||
|
|
a352e359c4 | ||
|
|
0e3eaee735 | ||
|
|
8e1205359d | ||
|
|
dad16fe463 | ||
|
|
4f09aac3f5 | ||
|
|
7b23d71526 | ||
|
|
054fb930f5 | ||
|
|
d9ca806d50 | ||
|
|
19df36369c | ||
|
|
f037522052 | ||
|
|
c7600608d3 |
@@ -134,7 +134,8 @@ jobs:
|
|||||||
docker images "$IMAGE_PREFIX-$svc" --format '{{.Repository}}:{{.Tag}}' | xargs -r docker rmi >/dev/null 2>&1 || true
|
docker images "$IMAGE_PREFIX-$svc" --format '{{.Repository}}:{{.Tag}}' | xargs -r docker rmi >/dev/null 2>&1 || true
|
||||||
done
|
done
|
||||||
docker image prune -f >/dev/null
|
docker image prune -f >/dev/null
|
||||||
docker builder prune -af --filter until=72h >/dev/null || true
|
# A size cap, not an age: a busy day builds tens of gigabytes.
|
||||||
|
docker builder prune -af --max-used-space 10GB >/dev/null || true
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
needs: build
|
needs: build
|
||||||
|
|||||||
@@ -170,10 +170,12 @@ dependencies = [
|
|||||||
"axum-extra",
|
"axum-extra",
|
||||||
"db",
|
"db",
|
||||||
"email-templates",
|
"email-templates",
|
||||||
|
"hmac",
|
||||||
"horoscope-client",
|
"horoscope-client",
|
||||||
"http-body-util",
|
"http-body-util",
|
||||||
"jsonwebtoken",
|
"jsonwebtoken",
|
||||||
"password-hash",
|
"password-hash",
|
||||||
|
"rand 0.9.5",
|
||||||
"reqwest",
|
"reqwest",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
@@ -335,6 +337,15 @@ version = "2.5.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "217698eaf96b4a3f0bc4f3662aaa55bdf913cd54d7204591faa790070c6d0853"
|
checksum = "217698eaf96b4a3f0bc4f3662aaa55bdf913cd54d7204591faa790070c6d0853"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "crossbeam-channel"
|
||||||
|
version = "0.5.17"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "98b0cc327b5bc766e7fda9c9260cc0fa81b43a8e240440422dff70788e3f9ef1"
|
||||||
|
dependencies = [
|
||||||
|
"crossbeam-utils",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "crossbeam-queue"
|
name = "crossbeam-queue"
|
||||||
version = "0.3.14"
|
version = "0.3.14"
|
||||||
@@ -1851,8 +1862,11 @@ name = "service-kit"
|
|||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
|
"http",
|
||||||
"tokio",
|
"tokio",
|
||||||
|
"tower-http",
|
||||||
"tracing",
|
"tracing",
|
||||||
|
"tracing-appender",
|
||||||
"tracing-subscriber",
|
"tracing-subscriber",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -2195,6 +2209,12 @@ dependencies = [
|
|||||||
"cc",
|
"cc",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "symlink"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "a7973cce6668464ea31f176d85b13c7ab3bba2cb3b77a2ed26abd7801688010a"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "syn"
|
name = "syn"
|
||||||
version = "2.0.119"
|
version = "2.0.119"
|
||||||
@@ -2419,6 +2439,19 @@ dependencies = [
|
|||||||
"tracing-core",
|
"tracing-core",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tracing-appender"
|
||||||
|
version = "0.2.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "050686193eb999b4bb3bc2acfa891a13da00f79734704c4b8b4ef1a10b368a3c"
|
||||||
|
dependencies = [
|
||||||
|
"crossbeam-channel",
|
||||||
|
"symlink",
|
||||||
|
"thiserror",
|
||||||
|
"time",
|
||||||
|
"tracing-subscriber",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tracing-attributes"
|
name = "tracing-attributes"
|
||||||
version = "0.1.31"
|
version = "0.1.31"
|
||||||
|
|||||||
@@ -53,6 +53,7 @@ tokio = { version = "1", features = ["macros", "rt-multi-thread", "net", "signal
|
|||||||
tower-http = { version = "0.6", features = ["trace", "cors"] }
|
tower-http = { version = "0.6", features = ["trace", "cors"] }
|
||||||
tracing = "0.1"
|
tracing = "0.1"
|
||||||
tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }
|
tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }
|
||||||
|
tracing-appender = "0.2"
|
||||||
|
|
||||||
[profile.release]
|
[profile.release]
|
||||||
lto = "thin"
|
lto = "thin"
|
||||||
|
|||||||
@@ -8,6 +8,9 @@
|
|||||||
|
|
||||||
use serde_json::{Value, json};
|
use serde_json::{Value, json};
|
||||||
|
|
||||||
|
pub mod tarot;
|
||||||
|
pub use tarot::{Reading as TarotReading, TAROT_QUESTION_MAX_CHARS, build_tarot, tarot_schema};
|
||||||
|
|
||||||
/// Matches the backend's `ANALYSIS_PROMPT_VERSION` (part of the cache key).
|
/// Matches the backend's `ANALYSIS_PROMPT_VERSION` (part of the cache key).
|
||||||
pub const PROMPT_VERSION: &str = "v3";
|
pub const PROMPT_VERSION: &str = "v3";
|
||||||
|
|
||||||
@@ -316,7 +319,7 @@ például a Szaturnusz-visszatérés vagy az Uránusz-szembenállás: nevezd is
|
|||||||
- Ha nincs szolár képlet (ismeretlen születési idő), az évet a tranzitokra és a progressziókra építsd, és ne említs \
|
- Ha nincs szolár képlet (ismeretlen születési idő), az évet a tranzitokra és a progressziókra építsd, és ne említs \
|
||||||
házakat, Aszcendenst és MC-t.";
|
házakat, Aszcendenst és MC-t.";
|
||||||
|
|
||||||
const HUNGARIAN_TERMS: &str = "
|
pub(crate) const HUNGARIAN_TERMS: &str = "
|
||||||
|
|
||||||
Nyelvhelyesség és szakszavak:
|
Nyelvhelyesség és szakszavak:
|
||||||
- Ügyelj a helyes toldalékokra és a magánhangzó-illeszkedésre; magyar idézőjelet („…”) és nagykötőjelet (–) használj.
|
- Ügyelj a helyes toldalékokra és a magánhangzó-illeszkedésre; magyar idézőjelet („…”) és nagykötőjelet (–) használj.
|
||||||
@@ -341,7 +344,13 @@ felett”), progresszió (a progresszív Hold), profekció, az év ura, napfogya
|
|||||||
Szaturnusz-visszatérés.
|
Szaturnusz-visszatérés.
|
||||||
- A dátumokat magyarosan írd: „március 12.”, „március 12-től április 30-ig”, „2027 januárja”.";
|
- A dátumokat magyarosan írd: „március 12.”, „március 12-től április 30-ig”, „2027 januárja”.";
|
||||||
|
|
||||||
fn language_name(language: &str) -> &'static str {
|
/// "cancer" → "Cancer".
|
||||||
|
pub(crate) fn capitalize(s: &str) -> String {
|
||||||
|
let mut chars = s.chars();
|
||||||
|
chars.next().map(|c| c.to_uppercase().chain(chars).collect()).unwrap_or_default()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn language_name(language: &str) -> &'static str {
|
||||||
match language {
|
match language {
|
||||||
"hu" => "Hungarian",
|
"hu" => "Hungarian",
|
||||||
_ => "English",
|
_ => "English",
|
||||||
|
|||||||
@@ -0,0 +1,467 @@
|
|||||||
|
//! Tarot readings: the deck, the spreads, the prompt and the answer schema.
|
||||||
|
//!
|
||||||
|
//! The backend draws the cards and stores them with the question (the
|
||||||
|
//! `tarot` column of the analysis, see [`Reading`]); the worker writes the
|
||||||
|
//! reading with the model of the detailed analyses.
|
||||||
|
|
||||||
|
use std::sync::OnceLock;
|
||||||
|
|
||||||
|
use serde_json::{Value, json};
|
||||||
|
|
||||||
|
use crate::{HUNGARIAN_TERMS, Prompt};
|
||||||
|
|
||||||
|
/// The 78 cards, shared with the frontend (which draws them from the same file).
|
||||||
|
const DECK_JSON: &str = include_str!("../../../services/frontend/src/content/tarot-deck.json");
|
||||||
|
|
||||||
|
/// Longest question, in characters.
|
||||||
|
pub const TAROT_QUESTION_MAX_CHARS: usize = 300;
|
||||||
|
|
||||||
|
/// A card of the deck (the fields the prompt and the views need).
|
||||||
|
#[derive(Debug, Clone)]
|
||||||
|
pub struct Card {
|
||||||
|
pub id: String,
|
||||||
|
pub name_hu: String,
|
||||||
|
pub name_en: String,
|
||||||
|
pub element: String,
|
||||||
|
pub astro: String,
|
||||||
|
pub keywords: Vec<String>,
|
||||||
|
pub upright: String,
|
||||||
|
pub reversed: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn deck() -> &'static [Card] {
|
||||||
|
static DECK: OnceLock<Vec<Card>> = OnceLock::new();
|
||||||
|
DECK.get_or_init(|| {
|
||||||
|
let raw: Vec<Value> = serde_json::from_str(DECK_JSON).expect("tarot-deck.json is valid JSON");
|
||||||
|
let text = |c: &Value, k: &str| c[k].as_str().unwrap_or_default().to_string();
|
||||||
|
raw.iter()
|
||||||
|
.map(|c| Card {
|
||||||
|
id: text(c, "id"),
|
||||||
|
name_hu: text(c, "nameHu"),
|
||||||
|
name_en: text(c, "nameEn"),
|
||||||
|
element: text(c, "element"),
|
||||||
|
astro: text(c, "astroRuler"),
|
||||||
|
keywords: c["keywords"]
|
||||||
|
.as_array()
|
||||||
|
.into_iter()
|
||||||
|
.flatten()
|
||||||
|
.filter_map(Value::as_str)
|
||||||
|
.map(str::to_string)
|
||||||
|
.collect(),
|
||||||
|
upright: text(c, "upright"),
|
||||||
|
reversed: text(c, "reversed"),
|
||||||
|
})
|
||||||
|
.collect()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn card(id: &str) -> Option<&'static Card> {
|
||||||
|
deck().iter().find(|c| c.id == id)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A place in a spread.
|
||||||
|
#[derive(Debug, Clone, Copy)]
|
||||||
|
pub struct Position {
|
||||||
|
pub title: &'static str,
|
||||||
|
/// What the card in this place tells about.
|
||||||
|
pub about: &'static str,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Copy)]
|
||||||
|
pub struct Spread {
|
||||||
|
pub id: &'static str,
|
||||||
|
pub name: &'static str,
|
||||||
|
pub positions: &'static [Position],
|
||||||
|
}
|
||||||
|
|
||||||
|
pub const SPREADS: [Spread; 3] = [
|
||||||
|
Spread {
|
||||||
|
id: "daily",
|
||||||
|
name: "Napi iránymutatás",
|
||||||
|
positions: &[Position {
|
||||||
|
title: "A nap üzenete",
|
||||||
|
about: "Mire hangolódj ma, és milyen minőség támogat leginkább.",
|
||||||
|
}],
|
||||||
|
},
|
||||||
|
Spread {
|
||||||
|
id: "trinity",
|
||||||
|
name: "Sorsfonalak hármas",
|
||||||
|
positions: &[
|
||||||
|
Position { title: "Gyökér és előzmény", about: "Honnan ered a mostani helyzet energiája." },
|
||||||
|
Position { title: "Jelenlegi fókusz", about: "Mi zajlik most a felszínen és a mélyben." },
|
||||||
|
Position { title: "Kibontakozás", about: "Merre tart a folyamat, ha tudatosan együttműködsz vele." },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
Spread {
|
||||||
|
id: "astro_cross",
|
||||||
|
name: "Képlet-kereszt",
|
||||||
|
positions: &[
|
||||||
|
Position { title: "Központi téma", about: "A kérdés szíve és a jelenlegi sorspont." },
|
||||||
|
Position {
|
||||||
|
title: "Hold-mélység (belső)", about: "Tudattalan érzelmi mozgatórugók és megérzések."
|
||||||
|
},
|
||||||
|
Position {
|
||||||
|
title: "Nap-tér (tudatos)", about: "Amire már rálátsz, és ami felé az akaratod irányul."
|
||||||
|
},
|
||||||
|
Position {
|
||||||
|
title: "Kvadrát (kihívás)", about: "A súrlódás, amely cselekvésre és növekedésre hív."
|
||||||
|
},
|
||||||
|
Position {
|
||||||
|
title: "Aszcendens (útmutatás)", about: "A legtisztább következő lépés kifelé és előre."
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
pub fn spread(id: &str) -> Option<&'static Spread> {
|
||||||
|
SPREADS.iter().find(|s| s.id == id)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// What the reading is about: it steers how the cards are read.
|
||||||
|
#[derive(Debug, Clone, Copy)]
|
||||||
|
pub struct Topic {
|
||||||
|
pub id: &'static str,
|
||||||
|
pub name: &'static str,
|
||||||
|
/// The instruction for the model (Hungarian, English).
|
||||||
|
pub focus: (&'static str, &'static str),
|
||||||
|
}
|
||||||
|
|
||||||
|
pub const TOPICS: [Topic; 4] = [
|
||||||
|
Topic {
|
||||||
|
id: "general",
|
||||||
|
name: "Általános",
|
||||||
|
focus: (
|
||||||
|
"Általános jóslás: az olvasó élete egészére vonatkoztasd a lapokat.",
|
||||||
|
"A general reading: relate the cards to the reader's life as a whole.",
|
||||||
|
),
|
||||||
|
},
|
||||||
|
Topic {
|
||||||
|
id: "love",
|
||||||
|
name: "Párkapcsolat",
|
||||||
|
focus: (
|
||||||
|
"Párkapcsolati jóslás: minden lapot a szerelem, a vonzalom, a közelség, a bizalom és a kommunikáció \
|
||||||
|
szemszögéből olvass, akár van kapcsolata az olvasónak, akár keres. Ne feltételezd a partner nemét, és ne \
|
||||||
|
jósolj szakítást, hűtlenséget vagy azt, hogy valaki biztosan visszatér.",
|
||||||
|
"A relationship reading: read every card through love, attraction, closeness, trust and communication, \
|
||||||
|
whether the reader is in a relationship or looking for one. Do not assume the partner's gender, and do \
|
||||||
|
not predict a break-up, infidelity or that someone will surely come back.",
|
||||||
|
),
|
||||||
|
},
|
||||||
|
Topic {
|
||||||
|
id: "work",
|
||||||
|
name: "Munka és hivatás",
|
||||||
|
focus: (
|
||||||
|
"Munka és hivatás: a lapokat a munka, a hivatás, a tanulás, a munkahelyi kapcsolatok és a fejlődés \
|
||||||
|
szemszögéből olvasd. Ne adj pénzügyi vagy jogi tanácsot, és ne jósolj elbocsátást vagy anyagi \
|
||||||
|
nyereséget, veszteséget.",
|
||||||
|
"Work and calling: read the cards through work, vocation, learning, relationships at work and growth. \
|
||||||
|
Give no financial or legal advice, and do not predict dismissal or financial gains or losses.",
|
||||||
|
),
|
||||||
|
},
|
||||||
|
Topic {
|
||||||
|
id: "self",
|
||||||
|
name: "Önismeret",
|
||||||
|
focus: (
|
||||||
|
"Önismeret: a lapokat a belső világ, az érzelmek, a minták és a lelki fejlődés szemszögéből olvasd; a \
|
||||||
|
külső események helyett arra figyelj, mit tanulhat az olvasó önmagáról.",
|
||||||
|
"Self-knowledge: read the cards through the inner world, feelings, patterns and inner growth; rather \
|
||||||
|
than outer events, focus on what the reader can learn about themselves.",
|
||||||
|
),
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
/// A topic by id (`None`, and readings from before topics: general).
|
||||||
|
pub fn topic(id: Option<&str>) -> Option<&'static Topic> {
|
||||||
|
match id {
|
||||||
|
None => TOPICS.first(),
|
||||||
|
Some(id) => TOPICS.iter().find(|t| t.id == id),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The Hungarian name of a zodiac sign as the charts store it ("cancer").
|
||||||
|
pub fn sign_hu(sign: &str) -> &'static str {
|
||||||
|
match sign.to_ascii_lowercase().as_str() {
|
||||||
|
"aries" => "Kos",
|
||||||
|
"taurus" => "Bika",
|
||||||
|
"gemini" => "Ikrek",
|
||||||
|
"cancer" => "Rák",
|
||||||
|
"leo" => "Oroszlán",
|
||||||
|
"virgo" => "Szűz",
|
||||||
|
"libra" => "Mérleg",
|
||||||
|
"scorpio" => "Skorpió",
|
||||||
|
"sagittarius" => "Nyilas",
|
||||||
|
"capricorn" => "Bak",
|
||||||
|
"aquarius" => "Vízöntő",
|
||||||
|
"pisces" => "Halak",
|
||||||
|
_ => "?",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// What a reading is written from (the `tarot` column of the analysis):
|
||||||
|
/// `{"spread": "trinity", "question": "…" | null, "cards": [{"card": "major-2",
|
||||||
|
/// "reversed": false}, …], "sun": "cancer", "moon": "pisces", "ascendant": "aries" | null}`.
|
||||||
|
/// The cards are in the order of the spread's positions.
|
||||||
|
pub struct Reading<'a> {
|
||||||
|
pub spread: &'static Spread,
|
||||||
|
pub topic: &'static Topic,
|
||||||
|
pub question: Option<&'a str>,
|
||||||
|
/// (card, reversed) per position.
|
||||||
|
pub cards: Vec<(&'static Card, bool)>,
|
||||||
|
pub sun: Option<&'a str>,
|
||||||
|
pub moon: Option<&'a str>,
|
||||||
|
pub ascendant: Option<&'a str>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'a> Reading<'a> {
|
||||||
|
pub fn parse(value: &'a Value) -> Result<Self, String> {
|
||||||
|
let spread_id = value["spread"].as_str().unwrap_or_default();
|
||||||
|
let spread = spread(spread_id).ok_or_else(|| format!("unknown spread '{spread_id}'"))?;
|
||||||
|
let cards = value["cards"]
|
||||||
|
.as_array()
|
||||||
|
.ok_or("no cards")?
|
||||||
|
.iter()
|
||||||
|
.map(|c| {
|
||||||
|
let id = c["card"].as_str().unwrap_or_default();
|
||||||
|
card(id)
|
||||||
|
.map(|card| (card, c["reversed"].as_bool().unwrap_or(false)))
|
||||||
|
.ok_or_else(|| format!("unknown card '{id}'"))
|
||||||
|
})
|
||||||
|
.collect::<Result<Vec<_>, _>>()?;
|
||||||
|
if cards.len() != spread.positions.len() {
|
||||||
|
return Err(format!("{} cards for a spread of {}", cards.len(), spread.positions.len()));
|
||||||
|
}
|
||||||
|
let text = |k: &str| value[k].as_str().map(str::trim).filter(|s| !s.is_empty());
|
||||||
|
Ok(Self {
|
||||||
|
spread,
|
||||||
|
topic: topic(text("topic")).ok_or("unknown topic")?,
|
||||||
|
question: text("question"),
|
||||||
|
cards,
|
||||||
|
sun: text("sun"),
|
||||||
|
moon: text("moon"),
|
||||||
|
ascendant: text("ascendant"),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The JSON schema of a reading (strict mode: every property required).
|
||||||
|
pub fn tarot_schema() -> Value {
|
||||||
|
json!({
|
||||||
|
"type": "object",
|
||||||
|
"additionalProperties": false,
|
||||||
|
"required": ["title", "summary", "cards", "synthesis", "advice"],
|
||||||
|
"properties": {
|
||||||
|
"title": {"type": "string", "description": "Short, evocative title for this reading (at most 8 words)"},
|
||||||
|
"summary": {"type": "string", "description": "2-3 sentences: the heart of the answer"},
|
||||||
|
"cards": {
|
||||||
|
"type": "array",
|
||||||
|
"description": "One item per card, in the order of the positions",
|
||||||
|
"items": {
|
||||||
|
"type": "object",
|
||||||
|
"additionalProperties": false,
|
||||||
|
"required": ["body"],
|
||||||
|
"properties": {
|
||||||
|
"body": {"type": "string", "description": "1-2 paragraphs about this card in its position"}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"synthesis": {"type": "string", "description": "How the cards read together, 1-3 paragraphs separated by a blank line"},
|
||||||
|
"advice": {"type": "string", "description": "A closing, encouraging paragraph with one or two concrete steps"}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Words of the whole reading, by the number of cards.
|
||||||
|
fn length(cards: usize) -> (usize, usize) {
|
||||||
|
match cards {
|
||||||
|
1 => (250, 400),
|
||||||
|
2..=3 => (450, 700),
|
||||||
|
_ => (650, 950),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn hungarian_system(cards: usize) -> String {
|
||||||
|
let (min, max) = length(cards);
|
||||||
|
format!(
|
||||||
|
"Tapasztalt, empatikus, lélektani szemléletű tarot-olvasó vagy, aki az asztrológiát is ismeri. A Sorsfonalak \
|
||||||
|
alkalmazás számára személyes kártyajóslást írsz egy kirakásról, amelyet az olvasó kérdésére húzott.
|
||||||
|
|
||||||
|
Magyarul írj, természetes, igényes magyarsággal, ahogy egy magyar anyanyelvű szerző írna: a szöveg ne hasson fordításnak.
|
||||||
|
|
||||||
|
Szabályok:
|
||||||
|
- Csak a megadott lapokat értelmezd, a megadott pozíciókban és állásban (álló vagy fordított). A lapok alapjelentése \
|
||||||
|
kiindulópont: a saját tudásod a lapok hagyományos szimbolikájáról (Rider–Waite) kiegészítheti, de ne mondjon neki ellent.
|
||||||
|
- Minden lapot a pozíciója fényében olvass, és mindig a kérdésre vonatkoztasd. Ha nincs kérdés, az olvasó jelenlegi \
|
||||||
|
életszakaszáról szólj általánosan.
|
||||||
|
- A lapok együtt mesélnek: mutasd meg, hogyan kapcsolódnak egymáshoz (ismétlődő elemek, színek, nagy árkánumok \
|
||||||
|
súlya, az álló és fordított lapok aránya).
|
||||||
|
- Az olvasó Napját, Holdját és Aszcendensét (ha meg van adva) egy-két helyen, finoman kapcsold a lapokhoz, például a \
|
||||||
|
lapok elemén vagy asztrológiai megfelelésén keresztül; ne írj belőle horoszkópot.
|
||||||
|
- Közvetlenül az olvasóhoz szólj, tegező formában (egyes szám második személyben, „te”).
|
||||||
|
- A tarot tükör, nem ítélet: lehetőségekről, hajlamokról és választásokról írj, soha ne biztos jövőbeli eseményekről. \
|
||||||
|
Ne jósolj betegséget, halált, balesetet, terhességet, válást vagy pénzügyi nyereséget és veszteséget, és ne adj orvosi, \
|
||||||
|
jogi vagy pénzügyi tanácsot. Ha a kérdés ilyesmire irányul, a lelki oldalára válaszolj, és jelezd, hogy a konkrét \
|
||||||
|
döntéshez szakember kell.
|
||||||
|
- Hangnem: meleg, őszinte, megerősítő és konkrét; a nehéz lapoknál is mutasd meg a kiutat. Kerüld a közhelyeket és a \
|
||||||
|
töltelékszöveget.
|
||||||
|
- A szövegek egyszerű bekezdések, üres sorral elválasztva, címsor és felsorolás nélkül; **félkövért** takarékosan \
|
||||||
|
használhatsz. A lapok nevét a magyar nevükön írd.
|
||||||
|
- Terjedelem: az egész jóslás kb. {min}–{max} szó.
|
||||||
|
- Egyetlen, a megadott sémának megfelelő JSON-objektummal válaszolj, semmi mással; a „cards” tömbben pontosan annyi \
|
||||||
|
elem legyen, ahány lap van, a pozíciók sorrendjében.{HUNGARIAN_TERMS}"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn english_system(language: &str, cards: usize) -> String {
|
||||||
|
let (min, max) = length(cards);
|
||||||
|
format!(
|
||||||
|
"You are an experienced, empathetic tarot reader with a psychological approach who also knows astrology. You \
|
||||||
|
write a personal tarot reading for the Sorsfonalak app about a spread the reader drew for their question.
|
||||||
|
|
||||||
|
Write in {language}.
|
||||||
|
|
||||||
|
Rules:
|
||||||
|
- Read only the given cards, in their positions and orientation (upright or reversed). The base meanings are the \
|
||||||
|
starting point; your knowledge of the traditional (Rider-Waite) symbolism may add to them but must not contradict them.
|
||||||
|
- Read each card in the light of its position and always relate it to the question. Without a question, speak about \
|
||||||
|
the reader's present phase of life.
|
||||||
|
- Show how the cards tell one story together (recurring elements and suits, the weight of the major arcana, upright \
|
||||||
|
versus reversed cards).
|
||||||
|
- Link the reader's Sun, Moon and Ascendant (when given) to the cards once or twice, gently, e.g. through the cards' \
|
||||||
|
elements or astrological correspondences; do not write a horoscope.
|
||||||
|
- Address the reader directly, in the second person.
|
||||||
|
- Tarot is a mirror, not a verdict: write about possibilities, tendencies and choices, never certain future events. \
|
||||||
|
Do not predict illness, death, accidents, pregnancy, divorce or financial gains and losses, and give no medical, legal \
|
||||||
|
or financial advice; if the question asks for that, answer its emotional side and say a professional is needed for the \
|
||||||
|
decision itself.
|
||||||
|
- Tone: warm, honest, encouraging and specific; show the way forward even with hard cards. Avoid clichés and filler.
|
||||||
|
- Plain paragraphs separated by a blank line, no headings or lists; use **bold** sparingly.
|
||||||
|
- Length: about {min}-{max} words in all.
|
||||||
|
- Answer with a single JSON object matching the schema and nothing else; the \"cards\" array has exactly one item per \
|
||||||
|
card, in the order of the positions.",
|
||||||
|
language = crate::language_name(language),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The prompt of a reading.
|
||||||
|
pub fn build_tarot(language: &str, reading: &Reading) -> Prompt {
|
||||||
|
let hu = language == "hu";
|
||||||
|
let mut user = String::new();
|
||||||
|
let none = if hu { "nincs megadva" } else { "not given" };
|
||||||
|
user.push_str(&format!(
|
||||||
|
"{}: {}. {}\n\n",
|
||||||
|
if hu { "Téma" } else { "Topic" },
|
||||||
|
reading.topic.name,
|
||||||
|
if hu { reading.topic.focus.0 } else { reading.topic.focus.1 },
|
||||||
|
));
|
||||||
|
match reading.question {
|
||||||
|
Some(q) => user.push_str(&format!("{}: {}\n\n", if hu { "A kérdés" } else { "The question" }, q.trim())),
|
||||||
|
None => user.push_str(if hu {
|
||||||
|
"Nincs konkrét kérdés: az olvasó a témában a jelenlegi életszakaszára kér útmutatást.\n\n"
|
||||||
|
} else {
|
||||||
|
"No specific question: the reader asks for guidance on the topic in their present phase of life.\n\n"
|
||||||
|
}),
|
||||||
|
}
|
||||||
|
let sign = |s: Option<&str>| {
|
||||||
|
s.map_or(none.to_string(), |s| if hu { sign_hu(s).to_string() } else { crate::capitalize(s) })
|
||||||
|
};
|
||||||
|
user.push_str(&format!(
|
||||||
|
"{}: {} {}, {} {}, {} {}\n\n",
|
||||||
|
if hu { "Az olvasó képlete" } else { "The reader's chart" },
|
||||||
|
if hu { "Nap:" } else { "Sun:" },
|
||||||
|
sign(reading.sun),
|
||||||
|
if hu { "Hold:" } else { "Moon:" },
|
||||||
|
sign(reading.moon),
|
||||||
|
if hu { "Aszcendens:" } else { "Ascendant:" },
|
||||||
|
sign(reading.ascendant),
|
||||||
|
));
|
||||||
|
user.push_str(&format!(
|
||||||
|
"{}: {} ({} {})\n",
|
||||||
|
if hu { "Kirakás" } else { "Spread" },
|
||||||
|
reading.spread.name,
|
||||||
|
reading.cards.len(),
|
||||||
|
if hu { "lap" } else { "cards" },
|
||||||
|
));
|
||||||
|
for (i, (position, (card, reversed))) in reading.spread.positions.iter().zip(&reading.cards).enumerate() {
|
||||||
|
let orientation = match (hu, reversed) {
|
||||||
|
(true, true) => "fordított",
|
||||||
|
(true, false) => "álló",
|
||||||
|
(false, true) => "reversed",
|
||||||
|
(false, false) => "upright",
|
||||||
|
};
|
||||||
|
user.push_str(&format!(
|
||||||
|
"\n{n}. {title} ({about})\n {name} ({en}), {orientation}\n {kw}: {keywords}\n {el}: {element}; {astro_label}: {astro}\n {meaning_label}: {meaning}\n",
|
||||||
|
n = i + 1,
|
||||||
|
title = position.title,
|
||||||
|
about = position.about,
|
||||||
|
name = card.name_hu,
|
||||||
|
en = card.name_en,
|
||||||
|
kw = if hu { "Kulcsszavak" } else { "Keywords" },
|
||||||
|
keywords = card.keywords.join(", "),
|
||||||
|
el = if hu { "Elem" } else { "Element" },
|
||||||
|
element = card.element,
|
||||||
|
astro_label = if hu { "Asztrológiai megfelelés" } else { "Astrological correspondence" },
|
||||||
|
astro = card.astro,
|
||||||
|
meaning_label = if hu { "Alapjelentés ebben az állásban" } else { "Base meaning in this orientation (Hungarian)" },
|
||||||
|
meaning = if *reversed { &card.reversed } else { &card.upright },
|
||||||
|
));
|
||||||
|
}
|
||||||
|
user.push_str(if hu { "\nMost írd meg a jóslást." } else { "\nWrite the reading now." });
|
||||||
|
Prompt {
|
||||||
|
system: if hu { hungarian_system(reading.cards.len()) } else { english_system(language, reading.cards.len()) },
|
||||||
|
user,
|
||||||
|
schema_name: "tarot_reading",
|
||||||
|
schema: tarot_schema(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn the_deck_has_78_distinct_cards_with_meanings() {
|
||||||
|
let deck = deck();
|
||||||
|
assert_eq!(deck.len(), 78);
|
||||||
|
let mut ids: Vec<&str> = deck.iter().map(|c| c.id.as_str()).collect();
|
||||||
|
ids.sort_unstable();
|
||||||
|
ids.dedup();
|
||||||
|
assert_eq!(ids.len(), 78);
|
||||||
|
assert!(deck.iter().all(|c| !c.name_hu.is_empty() && !c.upright.is_empty() && !c.reversed.is_empty()));
|
||||||
|
assert_eq!(card("major-2").unwrap().name_hu, "A Főpapnő");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn readings_parse_and_build_a_prompt() {
|
||||||
|
let value = json!({"spread": "trinity", "question": "Merre induljak tovább?",
|
||||||
|
"cards": [{"card": "major-0", "reversed": false}, {"card": "cups-3", "reversed": true},
|
||||||
|
{"card": "major-17", "reversed": false}],
|
||||||
|
"sun": "cancer", "moon": "pisces", "ascendant": null});
|
||||||
|
let reading = Reading::parse(&value).unwrap();
|
||||||
|
let prompt = build_tarot("hu", &reading);
|
||||||
|
// Readings without a topic (the first ones) are general.
|
||||||
|
assert!(prompt.user.starts_with("Téma: Általános."));
|
||||||
|
assert!(prompt.user.contains("A kérdés: Merre induljak tovább?"));
|
||||||
|
assert!(prompt.user.contains("Nap: Rák, Hold: Halak, Aszcendens: nincs megadva"));
|
||||||
|
assert!(prompt.user.contains("2. Jelenlegi fókusz"));
|
||||||
|
assert!(prompt.user.contains("fordított"));
|
||||||
|
assert!(prompt.user.contains(&card("cups-3").unwrap().reversed));
|
||||||
|
assert!(prompt.system.contains("650") || prompt.system.contains("450"));
|
||||||
|
assert_eq!(prompt.schema["required"][2], "cards");
|
||||||
|
|
||||||
|
let english = build_tarot("en", &reading);
|
||||||
|
assert!(english.user.contains("Sun: Cancer") && english.system.contains("English"));
|
||||||
|
|
||||||
|
let mut love = value.clone();
|
||||||
|
love["topic"] = json!("love");
|
||||||
|
let prompt = build_tarot("hu", &Reading::parse(&love).unwrap());
|
||||||
|
assert!(
|
||||||
|
prompt.user.starts_with("Téma: Párkapcsolat.") && prompt.user.contains("Ne feltételezd a partner nemét")
|
||||||
|
);
|
||||||
|
love["topic"] = json!("pénz");
|
||||||
|
assert!(Reading::parse(&love).is_err());
|
||||||
|
|
||||||
|
let wrong = json!({"spread": "daily", "cards": [{"card": "major-0"}, {"card": "major-1"}]});
|
||||||
|
assert!(Reading::parse(&wrong).is_err());
|
||||||
|
assert!(Reading::parse(&json!({"spread": "daily", "cards": [{"card": "nincs"}]})).is_err());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
-- A free natal analysis, once per user, when someone else first opens a link
|
||||||
|
-- they shared (counted from the share page in the visitor's browser, so link
|
||||||
|
-- preview robots do not count).
|
||||||
|
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',
|
||||||
|
'question', 'share_reward'));
|
||||||
|
CREATE UNIQUE INDEX credit_ledger_share_reward_once ON credit_ledger (user_id) WHERE reason = 'share_reward';
|
||||||
|
|
||||||
|
-- Hash of the sharer's address when the link was made (salted with the slug):
|
||||||
|
-- a visit from there is the sharer, not someone else.
|
||||||
|
ALTER TABLE shares ADD COLUMN owner_ip_hash bytea;
|
||||||
|
|
||||||
|
COMMENT ON COLUMN shares.view_count IS 'visits by people (the share page reports them), robots excluded';
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
-- Promo codes: an admin makes them for a package, a user redeems one once
|
||||||
|
-- and gets the package (a `package_orders` row with source `promo`).
|
||||||
|
CREATE TABLE promo_codes (
|
||||||
|
id uuid PRIMARY KEY,
|
||||||
|
-- Upper case, without separators (shown in groups of four).
|
||||||
|
code text NOT NULL UNIQUE CHECK (code ~ '^[2-9A-HJKMNP-Z]{8,32}$'),
|
||||||
|
package text NOT NULL,
|
||||||
|
-- Who it is for or which campaign (admin only).
|
||||||
|
note text,
|
||||||
|
created_by uuid REFERENCES users (id) ON DELETE SET NULL,
|
||||||
|
created_at timestamptz NOT NULL DEFAULT now(),
|
||||||
|
redeemed_by uuid REFERENCES users (id) ON DELETE SET NULL,
|
||||||
|
redeemed_at timestamptz,
|
||||||
|
order_id uuid REFERENCES package_orders (id) ON DELETE SET NULL,
|
||||||
|
-- An unused code can be withdrawn.
|
||||||
|
revoked_at timestamptz,
|
||||||
|
CHECK (redeemed_at IS NULL OR revoked_at IS NULL)
|
||||||
|
);
|
||||||
|
CREATE INDEX promo_codes_created_idx ON promo_codes (created_at DESC);
|
||||||
|
|
||||||
|
ALTER TABLE package_orders DROP CONSTRAINT package_orders_source_check;
|
||||||
|
ALTER TABLE package_orders ADD CONSTRAINT package_orders_source_check
|
||||||
|
CHECK (source IN ('admin', 'mock', 'stripe', 'promo'));
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
-- An invitation can come with a package: a promo code made with it, sent in
|
||||||
|
-- the e-mail and redeemed by itself when the invitee signs up.
|
||||||
|
ALTER TABLE promo_codes ADD COLUMN invitation_id uuid UNIQUE REFERENCES invitations (id) ON DELETE SET NULL;
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
-- "How compatible are we?" invitations from the new person page: who it is
|
||||||
|
-- for (the inviter's own name for them) and, if the inviter asked us to
|
||||||
|
-- e-mail it, the address.
|
||||||
|
ALTER TABLE synastry_invites
|
||||||
|
ADD COLUMN label text CHECK (char_length(label) <= 80),
|
||||||
|
ADD COLUMN invitee_email text;
|
||||||
|
CREATE INDEX synastry_invites_emailed_idx ON synastry_invites (inviter_id, created_at) WHERE invitee_email IS NOT NULL;
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
-- The link in the waitlist confirmation e-mail that takes the address off
|
||||||
|
-- the list (only its hash is kept).
|
||||||
|
ALTER TABLE waitlist ADD COLUMN token_hash bytea UNIQUE;
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
-- Sharing pays in two steps: the first visit of a shared link earns a
|
||||||
|
-- question (`share_reward`, see shares.rs), and someone who signs up from a
|
||||||
|
-- shared link and makes their own chart earns the sharer a natal analysis
|
||||||
|
-- (`referral_reward`, at most three per user).
|
||||||
|
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',
|
||||||
|
'question', 'share_reward', 'referral_reward'));
|
||||||
|
|
||||||
|
-- Who came through whose shared link (one row per new user).
|
||||||
|
CREATE TABLE referrals (
|
||||||
|
user_id uuid PRIMARY KEY REFERENCES users (id) ON DELETE CASCADE,
|
||||||
|
referrer_id uuid NOT NULL REFERENCES users (id) ON DELETE CASCADE,
|
||||||
|
share_id uuid REFERENCES shares (id) ON DELETE SET NULL,
|
||||||
|
created_at timestamptz NOT NULL DEFAULT now(),
|
||||||
|
-- Set when the new user made their own chart (rewarded or over the limit).
|
||||||
|
rewarded_at timestamptz
|
||||||
|
);
|
||||||
|
CREATE INDEX referrals_referrer_idx ON referrals (referrer_id);
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
-- Stripe Checkout sessions started from the package cards. The package is
|
||||||
|
-- granted once, when the payment is confirmed (webhook, or the return page
|
||||||
|
-- asking Stripe), and the session id keeps that from happening twice.
|
||||||
|
CREATE TABLE stripe_checkouts (
|
||||||
|
-- Stripe's Checkout Session id (cs_test_… / cs_live_…).
|
||||||
|
id text PRIMARY KEY,
|
||||||
|
user_id uuid NOT NULL REFERENCES users ON DELETE CASCADE,
|
||||||
|
package text NOT NULL,
|
||||||
|
price_huf integer NOT NULL CHECK (price_huf > 0),
|
||||||
|
live boolean NOT NULL,
|
||||||
|
created_at timestamptz NOT NULL DEFAULT now(),
|
||||||
|
completed_at timestamptz,
|
||||||
|
order_id uuid REFERENCES package_orders ON DELETE SET NULL
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX stripe_checkouts_user_idx ON stripe_checkouts (user_id, created_at DESC);
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
-- What a confirmed payment keeps for the invoice, and the invoices issued in
|
||||||
|
-- Billingo by the worker. Card details never reach us: only what Stripe
|
||||||
|
-- reports about the payment and the buyer's billing details.
|
||||||
|
|
||||||
|
-- Payments outlive a deleted account: the accounting law asks for 8 years.
|
||||||
|
ALTER TABLE stripe_checkouts ALTER COLUMN user_id DROP NOT NULL;
|
||||||
|
ALTER TABLE stripe_checkouts DROP CONSTRAINT stripe_checkouts_user_id_fkey;
|
||||||
|
ALTER TABLE stripe_checkouts ADD CONSTRAINT stripe_checkouts_user_id_fkey
|
||||||
|
FOREIGN KEY (user_id) REFERENCES users ON DELETE SET NULL;
|
||||||
|
|
||||||
|
ALTER TABLE stripe_checkouts
|
||||||
|
ADD COLUMN payment_intent text,
|
||||||
|
-- What Stripe charged, in forints.
|
||||||
|
ADD COLUMN amount_huf integer,
|
||||||
|
-- Stripe's customer_details as it came: name, e-mail, address, and for a
|
||||||
|
-- company its name and tax ids.
|
||||||
|
ADD COLUMN customer jsonb;
|
||||||
|
|
||||||
|
-- One invoice per paid checkout. Every invoice detail is kept here (the buyer
|
||||||
|
-- and the item as invoiced, Billingo's whole answer); the PDF itself is
|
||||||
|
-- fetched from Billingo when downloaded.
|
||||||
|
CREATE TABLE invoices (
|
||||||
|
id uuid PRIMARY KEY,
|
||||||
|
checkout_id text NOT NULL UNIQUE REFERENCES stripe_checkouts ON DELETE RESTRICT,
|
||||||
|
user_id uuid REFERENCES users ON DELETE SET NULL,
|
||||||
|
-- pending → issued; failed after the last retry (an admin looks at it).
|
||||||
|
status text NOT NULL DEFAULT 'pending' CHECK (status IN ('pending', 'issued', 'failed')),
|
||||||
|
attempts integer NOT NULL DEFAULT 0,
|
||||||
|
next_attempt_at timestamptz NOT NULL DEFAULT now(),
|
||||||
|
last_error text,
|
||||||
|
-- The buyer as invoiced.
|
||||||
|
buyer_name text NOT NULL,
|
||||||
|
buyer_email text,
|
||||||
|
buyer_country text NOT NULL,
|
||||||
|
buyer_post_code text NOT NULL,
|
||||||
|
buyer_city text NOT NULL,
|
||||||
|
buyer_address text NOT NULL,
|
||||||
|
-- Billingo's partner tax type: HAS_TAX_NUMBER, NO_TAX_NUMBER or FOREIGN.
|
||||||
|
buyer_tax_type text NOT NULL CHECK (buyer_tax_type IN ('HAS_TAX_NUMBER', 'NO_TAX_NUMBER', 'FOREIGN')),
|
||||||
|
buyer_tax_number text,
|
||||||
|
-- The single item. vat_rate is Billingo's VAT value: AAM (alanyi
|
||||||
|
-- adómentes: net = gross, no VAT) or a rate like 27%.
|
||||||
|
item_name text NOT NULL,
|
||||||
|
gross_huf integer NOT NULL CHECK (gross_huf > 0),
|
||||||
|
net_huf integer NOT NULL,
|
||||||
|
vat_huf integer NOT NULL,
|
||||||
|
vat_rate text NOT NULL DEFAULT 'AAM',
|
||||||
|
payment_method text NOT NULL DEFAULT 'online_bankcard',
|
||||||
|
-- From Billingo.
|
||||||
|
billingo_partner_id bigint,
|
||||||
|
billingo_document_id bigint UNIQUE,
|
||||||
|
invoice_number text,
|
||||||
|
invoice_date date,
|
||||||
|
fulfillment_date date,
|
||||||
|
due_date date,
|
||||||
|
document jsonb,
|
||||||
|
-- When Billingo e-mailed it to the buyer.
|
||||||
|
sent_at timestamptz,
|
||||||
|
created_at timestamptz NOT NULL DEFAULT now(),
|
||||||
|
issued_at timestamptz
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX invoices_user_idx ON invoices (user_id, created_at DESC);
|
||||||
|
CREATE INDEX invoices_due_idx ON invoices (next_attempt_at) WHERE status = 'pending';
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
-- The invoice item must identify the service (Áfa tv. 169. § e): what the
|
||||||
|
-- package contains goes under the item, and the unit is "csomag".
|
||||||
|
ALTER TABLE invoices
|
||||||
|
ADD COLUMN item_comment text,
|
||||||
|
ADD COLUMN item_unit text NOT NULL DEFAULT 'csomag';
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
-- The buyer accepted the terms (ÁSZF) and asked for immediate delivery, giving
|
||||||
|
-- up the 14-day withdrawal right, on Stripe's payment page: when, and which
|
||||||
|
-- version of the terms. Kept as the proof of the consent.
|
||||||
|
ALTER TABLE stripe_checkouts
|
||||||
|
ADD COLUMN terms_accepted_at timestamptz,
|
||||||
|
ADD COLUMN terms_version text;
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
-- Tarot readings: a `tarot` analysis (stored with the other analyses, so
|
||||||
|
-- the worker, retries, fallback and refunds work the same) holds the spread,
|
||||||
|
-- the question, the cards drawn by the server and the reader's Sun, Moon and
|
||||||
|
-- Ascendant in `tarot`. Each reading uses one `tarot` unit.
|
||||||
|
ALTER TABLE analyses DROP CONSTRAINT analyses_kind_check;
|
||||||
|
ALTER TABLE analyses ADD CONSTRAINT analyses_kind_check
|
||||||
|
CHECK (kind IN ('natal', 'synastry', 'summary', 'forecast', 'tarot'));
|
||||||
|
ALTER TABLE analyses ADD COLUMN tarot jsonb;
|
||||||
|
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 AND forecast_id IS NULL)
|
||||||
|
OR (kind = 'synastry' AND synastry_id IS NOT NULL AND chart_id IS NULL AND forecast_id IS NULL)
|
||||||
|
OR (kind = 'forecast' AND forecast_id IS NOT NULL AND chart_id IS NULL AND synastry_id IS NULL)
|
||||||
|
OR (kind = 'tarot' AND tarot IS NOT NULL AND chart_id IS NULL AND synastry_id IS NULL AND forecast_id IS NULL)
|
||||||
|
);
|
||||||
|
|
||||||
|
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', 'forecast', 'person', 'question', 'tarot'));
|
||||||
|
|
||||||
|
CREATE INDEX analyses_tarot_idx ON analyses (requested_by, created_at DESC) WHERE kind = 'tarot';
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
-- When the worker asked Billingo for the invoice. Set before the request: if
|
||||||
|
-- the answer is lost (a timeout after Billingo made it), the next attempt
|
||||||
|
-- looks the invoice up instead of making a second one.
|
||||||
|
ALTER TABLE invoices ADD COLUMN document_requested_at timestamptz;
|
||||||
@@ -104,6 +104,15 @@ pub fn random_token(bytes: usize) -> String {
|
|||||||
URL_SAFE_NO_PAD.encode(buf)
|
URL_SAFE_NO_PAD.encode(buf)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Letters and digits that cannot be mixed up when typed (no 0/O, 1/I/L).
|
||||||
|
pub const CODE_ALPHABET: &[u8] = b"23456789ABCDEFGHJKMNPQRSTUVWXYZ";
|
||||||
|
|
||||||
|
/// A random code of `len` characters from [`CODE_ALPHABET`] (about 5 bits each).
|
||||||
|
pub fn random_code(len: usize) -> String {
|
||||||
|
let mut rng = rand::rng();
|
||||||
|
(0..len).map(|_| CODE_ALPHABET[rand::Rng::random_range(&mut rng, 0..CODE_ALPHABET.len())] as char).collect()
|
||||||
|
}
|
||||||
|
|
||||||
/// Stored form of a secret token.
|
/// Stored form of a secret token.
|
||||||
pub fn token_hash(token: &str) -> Vec<u8> {
|
pub fn token_hash(token: &str) -> Vec<u8> {
|
||||||
Sha256::digest(token.as_bytes()).to_vec()
|
Sha256::digest(token.as_bytes()).to_vec()
|
||||||
|
|||||||
@@ -158,6 +158,9 @@ pub fn render(template: &str, locale: &str, payload: &Value) -> Result<Rendered,
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
("invitation", _) => invitation(lang, payload, url)?,
|
("invitation", _) => invitation(lang, payload, url)?,
|
||||||
|
("synastry_invite", _) => synastry_invite(lang, payload, url)?,
|
||||||
|
("waitlist_joined", _) => waitlist_joined(lang, payload, url)?,
|
||||||
|
("purchase_confirmation", _) => purchase_confirmation(lang, payload, url)?,
|
||||||
_ => return Err(TemplateError::UnknownTemplate(template.to_owned())),
|
_ => return Err(TemplateError::UnknownTemplate(template.to_owned())),
|
||||||
};
|
};
|
||||||
Ok(content.render(lang))
|
Ok(content.render(lang))
|
||||||
@@ -173,6 +176,26 @@ fn invitation(lang: Lang, payload: &Value, url: String) -> Result<Content, Templ
|
|||||||
let until_hu = until.trim_end_matches('.');
|
let until_hu = until.trim_end_matches('.');
|
||||||
let unsubscribe_url = field(payload, "unsubscribe_url")?;
|
let unsubscribe_url = field(payload, "unsubscribe_url")?;
|
||||||
let unsubscribe_post_url = field(payload, "unsubscribe_post_url")?;
|
let unsubscribe_post_url = field(payload, "unsubscribe_post_url")?;
|
||||||
|
// A package that comes with the invitation, and its promo code.
|
||||||
|
let gift = name(payload, "package_name").zip(
|
||||||
|
payload["promo_code"]
|
||||||
|
.as_str()
|
||||||
|
.map(|c| c.chars().filter(|c| c.is_ascii_alphanumeric() || *c == '-').take(40).collect::<String>())
|
||||||
|
.filter(|c| !c.is_empty()),
|
||||||
|
);
|
||||||
|
let gift_line = |hu: bool| {
|
||||||
|
gift.as_ref().map(|(package, code)| {
|
||||||
|
if hu {
|
||||||
|
format!(
|
||||||
|
" Ajándékba egy „{package}” csomagot is kapsz: a regisztrációval magától jóváíródik. Ha mégis kellene, a promókódod: {code}."
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
format!(
|
||||||
|
" You also get the “{package}” package as a gift: it is added when you sign up. Should you need it, your promo code is {code}."
|
||||||
|
)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
};
|
||||||
Ok(match lang {
|
Ok(match lang {
|
||||||
Lang::Hu => Content {
|
Lang::Hu => Content {
|
||||||
subject: match &inviter {
|
subject: match &inviter {
|
||||||
@@ -188,7 +211,7 @@ fn invitation(lang: Lang, payload: &Value, url: String) -> Result<Content, Templ
|
|||||||
None => {
|
None => {
|
||||||
"Meghívót kaptál a Sorsfonalakra. Az oldal egyelőre zártkörű: csak meghívóval lehet belépni.".into()
|
"Meghívót kaptál a Sorsfonalakra. Az oldal egyelőre zártkörű: csak meghívóval lehet belépni.".into()
|
||||||
}
|
}
|
||||||
},
|
} + &gift_line(true).unwrap_or_default(),
|
||||||
quote: message,
|
quote: message,
|
||||||
points: Some((
|
points: Some((
|
||||||
"Mit találsz ott?",
|
"Mit találsz ott?",
|
||||||
@@ -226,7 +249,7 @@ fn invitation(lang: Lang, payload: &Value, url: String) -> Result<Content, Templ
|
|||||||
intro: match &inviter {
|
intro: match &inviter {
|
||||||
Some(n) => format!("{n} invited you to Sorsfonalak. The site is invitation-only for now."),
|
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(),
|
None => "You are invited to Sorsfonalak. The site is invitation-only for now.".into(),
|
||||||
},
|
} + &gift_line(false).unwrap_or_default(),
|
||||||
quote: message,
|
quote: message,
|
||||||
points: Some((
|
points: Some((
|
||||||
"What you will find there:",
|
"What you will find there:",
|
||||||
@@ -262,6 +285,192 @@ fn name(payload: &Value, field: &str) -> Option<String> {
|
|||||||
(!name.is_empty()).then(|| name.to_owned())
|
(!name.is_empty()).then(|| name.to_owned())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The confirmation of a purchase: what was bought, and that the buyer asked
|
||||||
|
/// for immediate delivery and so gave up the 14-day withdrawal right (the
|
||||||
|
/// confirmation 45/2014. Korm. rendelet 29. § asks for).
|
||||||
|
fn purchase_confirmation(lang: Lang, payload: &Value, url: String) -> Result<Content, TemplateError> {
|
||||||
|
let package = name(payload, "package_name").ok_or(TemplateError::MissingField("package_name"))?;
|
||||||
|
let amount = field(payload, "amount")?;
|
||||||
|
let contents =
|
||||||
|
payload["contents"].as_str().map(|c| c.chars().filter(|c| !c.is_control()).take(300).collect::<String>());
|
||||||
|
let paid_on =
|
||||||
|
payload["paid_on"].as_str().and_then(|d| date(lang, d)).ok_or(TemplateError::MissingField("paid_on"))?;
|
||||||
|
let terms_url = field(payload, "terms_url")?;
|
||||||
|
let invoices_url = field(payload, "invoices_url")?;
|
||||||
|
let greeting = |hu: bool| match (hu, name(payload, "display_name")) {
|
||||||
|
(true, Some(n)) => format!("Szia {n}!"),
|
||||||
|
(true, None) => "Szia!".to_owned(),
|
||||||
|
(false, Some(n)) => format!("Hi {n},"),
|
||||||
|
(false, None) => "Hi,".to_owned(),
|
||||||
|
};
|
||||||
|
Ok(match lang {
|
||||||
|
Lang::Hu => Content {
|
||||||
|
subject: format!("Köszönjük a vásárlást: {package}"),
|
||||||
|
preheader: Some(format!("A(z) {package} csomag a tiéd.")),
|
||||||
|
greeting: greeting(true),
|
||||||
|
intro: format!(
|
||||||
|
"Megkaptuk a fizetésed ({amount}, {paid_on}), és jóváírtuk a(z) „{package}” csomagot.{}",
|
||||||
|
contents.map(|c| format!(" Tartalma: {c}.")).unwrap_or_default()
|
||||||
|
),
|
||||||
|
quote: Some(
|
||||||
|
"A fizetés előtt kérted a szolgáltatás azonnali megkezdését, és tudomásul vetted, hogy ezzel elveszíted a 14 napos elállási jogodat. A csomagot ennek megfelelően azonnal teljesítettük."
|
||||||
|
.into(),
|
||||||
|
),
|
||||||
|
points: None,
|
||||||
|
button: "Megnézem a csomagjaimat",
|
||||||
|
url,
|
||||||
|
note: format!(
|
||||||
|
"A számlát külön e-mailben küldjük, és a Számláim oldalon is letöltheted: {invoices_url}. A vásárlás feltételei (ÁSZF): {terms_url}. Ha valami nem működik, írj nekünk az info@sorsfonalak.hu címre."
|
||||||
|
),
|
||||||
|
reason: Some("Ezt a levelet a vásárlásod visszaigazolásaként kaptad.".into()),
|
||||||
|
unsubscribe: None,
|
||||||
|
unsubscribe_post_url: None,
|
||||||
|
},
|
||||||
|
Lang::En => Content {
|
||||||
|
subject: format!("Thank you for your purchase: {package}"),
|
||||||
|
preheader: Some(format!("The {package} package is yours.")),
|
||||||
|
greeting: greeting(false),
|
||||||
|
intro: format!("We received your payment ({amount}, {paid_on}) and added the “{package}” package to your account."),
|
||||||
|
quote: Some(
|
||||||
|
"Before paying you asked us to start the service at once and acknowledged that you thereby lose your 14-day right of withdrawal. The package was delivered at once accordingly."
|
||||||
|
.into(),
|
||||||
|
),
|
||||||
|
points: None,
|
||||||
|
button: "See my packages",
|
||||||
|
url,
|
||||||
|
note: format!(
|
||||||
|
"The invoice comes in a separate e-mail and can be downloaded on the Invoices page: {invoices_url}. Terms of purchase (ÁSZF): {terms_url}. If something does not work, write to info@sorsfonalak.hu."
|
||||||
|
),
|
||||||
|
reason: Some("You got this e-mail as the confirmation of your purchase.".into()),
|
||||||
|
unsubscribe: None,
|
||||||
|
unsubscribe_post_url: None,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The confirmation of a waitlist sign-up, with the link that takes the address off the list.
|
||||||
|
fn waitlist_joined(lang: Lang, payload: &Value, url: String) -> Result<Content, TemplateError> {
|
||||||
|
let unsubscribe_url = field(payload, "unsubscribe_url")?;
|
||||||
|
let unsubscribe_post_url = field(payload, "unsubscribe_post_url")?;
|
||||||
|
Ok(match lang {
|
||||||
|
Lang::Hu => Content {
|
||||||
|
subject: "Felírtunk a Sorsfonalak várólistájára".into(),
|
||||||
|
preheader: Some("Amint bejuthatsz, ide írunk.".into()),
|
||||||
|
greeting: "Szia!".into(),
|
||||||
|
intro: "Köszönjük, hogy kíváncsi vagy a Sorsfonalakra! Az oldal egyelőre zártkörű, de felírtunk a várólistára: amint bejuthatsz, erre a címre írunk."
|
||||||
|
.into(),
|
||||||
|
quote: None,
|
||||||
|
points: Some((
|
||||||
|
"Mi vár rád?",
|
||||||
|
vec![
|
||||||
|
"a születési képleted percre pontosan kiszámolva és megrajzolva, egy rövid elemzéssel,",
|
||||||
|
"részletes elemzés, éves előrejelzés és kapcsolati összevetés azokkal, akiket szeretsz.",
|
||||||
|
],
|
||||||
|
)),
|
||||||
|
button: "Körülnézek",
|
||||||
|
url,
|
||||||
|
note: "Ha nem te iratkoztál fel, vagy meggondoltad magad, a lenti linkkel törölheted a címed a listáról.".into(),
|
||||||
|
reason: Some("Ezt a levelet azért kaptad, mert ezt a címet megadták a Sorsfonalak várólistáján.".into()),
|
||||||
|
unsubscribe: Some(("Leiratkozás a várólistáról", unsubscribe_url)),
|
||||||
|
unsubscribe_post_url: Some(unsubscribe_post_url),
|
||||||
|
},
|
||||||
|
Lang::En => Content {
|
||||||
|
subject: "You are on the Sorsfonalak waitlist".into(),
|
||||||
|
preheader: Some("We will write as soon as you can get in.".into()),
|
||||||
|
greeting: "Hi,".into(),
|
||||||
|
intro: "Thanks for your interest in Sorsfonalak! The site is invitation-only for now, but you are on the waitlist: we will write to this address as soon as you can get in."
|
||||||
|
.into(),
|
||||||
|
quote: None,
|
||||||
|
points: Some((
|
||||||
|
"What awaits you:",
|
||||||
|
vec![
|
||||||
|
"your birth chart, calculated to the minute and drawn, with a short reading,",
|
||||||
|
"detailed readings, a yearly forecast and comparisons with the people you love.",
|
||||||
|
],
|
||||||
|
)),
|
||||||
|
button: "Take a look",
|
||||||
|
url,
|
||||||
|
note: "If it was not you, or you changed your mind, the link below takes your address off the list.".into(),
|
||||||
|
reason: Some("You got this e-mail because this address was entered on the Sorsfonalak waitlist.".into()),
|
||||||
|
unsubscribe: Some(("Leave the waitlist", unsubscribe_url)),
|
||||||
|
unsubscribe_post_url: Some(unsubscribe_post_url),
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A user invites someone to compare their charts ("how compatible are we?").
|
||||||
|
fn synastry_invite(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"))?;
|
||||||
|
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 => {
|
||||||
|
let who = inviter.clone().unwrap_or_else(|| "Valaki".into());
|
||||||
|
Content {
|
||||||
|
subject: format!("{who} kíváncsi, mennyire illetek össze"),
|
||||||
|
preheader: Some(format!(
|
||||||
|
"Születési képletek összevetése a Sorsfonalakon. A meghívó {until_hu}-ig érvényes."
|
||||||
|
)),
|
||||||
|
greeting: "Szia!".into(),
|
||||||
|
intro: format!(
|
||||||
|
"{who} szeretné összevetni a születési képleteteket a Sorsfonalakon, és megnézni, mennyire illetek össze."
|
||||||
|
),
|
||||||
|
quote: message,
|
||||||
|
points: Some((
|
||||||
|
"Mit kapsz?",
|
||||||
|
vec![
|
||||||
|
"a saját születési képleted kiszámolva és megrajzolva, egy rövid elemzéssel, ingyen,",
|
||||||
|
"a kettőtök összevetését: hol erős és hol kényes a kapcsolatotok.",
|
||||||
|
],
|
||||||
|
)),
|
||||||
|
button: "Megnézem",
|
||||||
|
url,
|
||||||
|
note: format!(
|
||||||
|
"A meghívó {until_hu}-ig érvényes. Google-fiókkal lépsz be. A születési adataidat {who} nem látja, csak az összevetést."
|
||||||
|
),
|
||||||
|
reason: Some(format!(
|
||||||
|
"Ezt a levelet azért kaptad, mert {who} megadta az e-mail-címed a Sorsfonalakon."
|
||||||
|
)),
|
||||||
|
unsubscribe: Some(("Nem kérek több meghívót", unsubscribe_url)),
|
||||||
|
unsubscribe_post_url: Some(unsubscribe_post_url),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Lang::En => {
|
||||||
|
let who = inviter.clone().unwrap_or_else(|| "Someone".into());
|
||||||
|
Content {
|
||||||
|
subject: format!("{who} wonders how well you match"),
|
||||||
|
preheader: Some(format!(
|
||||||
|
"Comparing birth charts on Sorsfonalak. The invitation is valid until {until}."
|
||||||
|
)),
|
||||||
|
greeting: "Hi,".into(),
|
||||||
|
intro: format!(
|
||||||
|
"{who} would like to compare your birth charts on Sorsfonalak and see how well you match."
|
||||||
|
),
|
||||||
|
quote: message,
|
||||||
|
points: Some((
|
||||||
|
"What you get:",
|
||||||
|
vec![
|
||||||
|
"your own birth chart, calculated and drawn, with a short reading, for free,",
|
||||||
|
"the comparison of the two of you: where your relationship is strong and where it is delicate.",
|
||||||
|
],
|
||||||
|
)),
|
||||||
|
button: "Take a look",
|
||||||
|
url,
|
||||||
|
note: format!(
|
||||||
|
"The invitation is valid until {until}. You sign in with Google. {who} does not see your birth data, only the comparison."
|
||||||
|
),
|
||||||
|
reason: Some(format!("You got this e-mail because {who} entered your address on Sorsfonalak.")),
|
||||||
|
unsubscribe: Some(("No more invitations, please", unsubscribe_url)),
|
||||||
|
unsubscribe_post_url: Some(unsubscribe_post_url),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
/// The personal message of an invitation: line breaks kept, other control characters dropped.
|
/// The personal message of an invitation: line breaks kept, other control characters dropped.
|
||||||
fn message(payload: &Value) -> Option<String> {
|
fn message(payload: &Value) -> Option<String> {
|
||||||
let text: String =
|
let text: String =
|
||||||
@@ -445,6 +654,31 @@ mod tests {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn waitlist_confirmation_has_the_leave_link() {
|
||||||
|
let hu = render("waitlist_joined", "hu", &invitation_payload()).unwrap();
|
||||||
|
assert_eq!(hu.subject, "Felírtunk a Sorsfonalak várólistájára");
|
||||||
|
assert!(
|
||||||
|
hu.text.contains("Leiratkozás a várólistáról: https://sorsfonalak.test/leiratkozas?token=abc"),
|
||||||
|
"{}",
|
||||||
|
hu.text
|
||||||
|
);
|
||||||
|
assert!(hu.unsubscribe_post_url.is_some());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn synastry_invite_names_the_inviter() {
|
||||||
|
let hu = render("synastry_invite", "hu", &invitation_payload()).unwrap();
|
||||||
|
assert_eq!(hu.subject, "Kata kíváncsi, mennyire illetek össze");
|
||||||
|
assert!(hu.text.contains("> Gyere, nézd meg!"));
|
||||||
|
assert!(hu.text.contains("A meghívó 2026. december 17-ig érvényes."));
|
||||||
|
assert!(hu.html.contains(r#"href="https://sorsfonalak.test/meghivo/abc""#));
|
||||||
|
assert!(hu.text.contains("Nem kérek több meghívót"));
|
||||||
|
let mut anonymous = invitation_payload();
|
||||||
|
anonymous["inviter_name"] = Value::Null;
|
||||||
|
assert_eq!(render("synastry_invite", "en", &anonymous).unwrap().subject, "Someone wonders how well you match");
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn invitation_has_both_parts() {
|
fn invitation_has_both_parts() {
|
||||||
let hu = render("invitation", "hu", &invitation_payload()).unwrap();
|
let hu = render("invitation", "hu", &invitation_payload()).unwrap();
|
||||||
@@ -468,11 +702,37 @@ mod tests {
|
|||||||
assert!(en.text.contains("valid until 17 December 2026") && !en.text.contains("> "));
|
assert!(en.text.contains("valid until 17 December 2026") && !en.text.contains("> "));
|
||||||
assert!(!en.html.contains("border-left"));
|
assert!(!en.html.contains("border-left"));
|
||||||
|
|
||||||
|
let mut gift = invitation_payload();
|
||||||
|
gift["package_name"] = json!("Páros");
|
||||||
|
gift["promo_code"] = json!("ABCD-EFGH-JKLM");
|
||||||
|
let hu = render("invitation", "hu", &gift).unwrap();
|
||||||
|
assert!(hu.text.contains("Ajándékba egy „Páros” csomagot is kapsz"), "{}", hu.text);
|
||||||
|
assert!(hu.html.contains("ABCD-EFGH-JKLM"));
|
||||||
|
assert!(!render("invitation", "hu", &invitation_payload()).unwrap().text.contains("Ajándék"));
|
||||||
|
|
||||||
let mut broken = invitation_payload();
|
let mut broken = invitation_payload();
|
||||||
broken["unsubscribe_url"] = Value::Null;
|
broken["unsubscribe_url"] = Value::Null;
|
||||||
assert_eq!(render("invitation", "hu", &broken), Err(TemplateError::MissingField("unsubscribe_url")));
|
assert_eq!(render("invitation", "hu", &broken), Err(TemplateError::MissingField("unsubscribe_url")));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn purchase_confirmations_confirm_the_waiver() {
|
||||||
|
let payload = serde_json::json!({
|
||||||
|
"url": "https://sorsfonalak.hu/csomagok", "display_name": "Anna", "package_name": "Páros",
|
||||||
|
"contents": "2 részletes képletelemzés, 1 kapcsolati elemzés", "amount": "6\u{a0}000\u{a0}Ft",
|
||||||
|
"paid_on": "2026-11-20", "terms_url": "https://sorsfonalak.hu/aszf", "invoices_url": "https://sorsfonalak.hu/szamlak"
|
||||||
|
});
|
||||||
|
let hu = render("purchase_confirmation", "hu", &payload).unwrap();
|
||||||
|
assert_eq!(hu.subject, "Köszönjük a vásárlást: Páros");
|
||||||
|
assert!(hu.text.contains("2026. november 20.") && hu.text.contains("Tartalma: 2 részletes képletelemzés"));
|
||||||
|
assert!(hu.text.contains("elveszíted a 14 napos elállási jogodat"));
|
||||||
|
assert!(hu.text.contains("https://sorsfonalak.hu/aszf") && hu.text.contains("https://sorsfonalak.hu/szamlak"));
|
||||||
|
let en = render("purchase_confirmation", "en", &payload).unwrap();
|
||||||
|
assert!(en.text.contains("right of withdrawal"));
|
||||||
|
let missing = serde_json::json!({"url": "u", "package_name": "Páros"});
|
||||||
|
assert_eq!(render("purchase_confirmation", "hu", &missing), Err(TemplateError::MissingField("amount")));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn dates() {
|
fn dates() {
|
||||||
assert_eq!(date(Lang::Hu, "2027-01-05").as_deref(), Some("2027. január 5."));
|
assert_eq!(date(Lang::Hu, "2027-01-05").as_deref(), Some("2027. január 5."));
|
||||||
|
|||||||
@@ -11,3 +11,6 @@ anyhow.workspace = true
|
|||||||
tokio.workspace = true
|
tokio.workspace = true
|
||||||
tracing.workspace = true
|
tracing.workspace = true
|
||||||
tracing-subscriber.workspace = true
|
tracing-subscriber.workspace = true
|
||||||
|
tracing-appender.workspace = true
|
||||||
|
tower-http.workspace = true
|
||||||
|
http = "1"
|
||||||
|
|||||||
@@ -3,24 +3,215 @@
|
|||||||
//! Environment:
|
//! Environment:
|
||||||
//! * `BIND_ADDR` listen address (each service has its own default)
|
//! * `BIND_ADDR` listen address (each service has its own default)
|
||||||
//! * `LOG_FORMAT` `text` (default) or `json`; `RUST_LOG` sets the level
|
//! * `LOG_FORMAT` `text` (default) or `json`; `RUST_LOG` sets the level
|
||||||
|
//! * `LOG_DIR` also write the log there, as JSON, one file a UTC day
|
||||||
|
//! (`<LOG_NAME>/<LOG_NAME>.YYYY-MM-DD.log`), keeping `LOG_KEEP_DAYS`
|
||||||
|
//! (default 30) files of at most `LOG_MAX_DAY_MB` (default 50) each
|
||||||
|
//! * `LOG_NAME` the folder and file name (default: the service's name)
|
||||||
|
|
||||||
use std::net::SocketAddr;
|
use std::net::SocketAddr;
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
use anyhow::Context;
|
use anyhow::Context;
|
||||||
|
|
||||||
/// Initializes `tracing` from `RUST_LOG` and `LOG_FORMAT`.
|
/// Days of log files kept in `LOG_DIR` by default.
|
||||||
pub fn init_logging() {
|
const LOG_KEEP_DAYS: usize = 30;
|
||||||
use tracing_subscriber::EnvFilter;
|
/// At most this many megabytes of log a day per service by default.
|
||||||
let filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info,tower_http=info"));
|
const LOG_MAX_DAY_MB: u64 = 50;
|
||||||
let builder = tracing_subscriber::fmt().with_env_filter(filter);
|
|
||||||
|
/// Keeps the background log writer alive: hold it until `main` returns, so
|
||||||
|
/// the last lines reach the file.
|
||||||
|
#[must_use = "the log files stop being written when this is dropped"]
|
||||||
|
pub struct LogGuard(#[allow(dead_code)] Option<tracing_appender::non_blocking::WorkerGuard>);
|
||||||
|
|
||||||
|
/// Logging for a one-off command: the console only, never the log files.
|
||||||
|
pub fn init_console_logging() {
|
||||||
|
use tracing_subscriber::layer::SubscriberExt;
|
||||||
|
use tracing_subscriber::util::SubscriberInitExt;
|
||||||
|
tracing_subscriber::registry().with(env_filter()).with(console_layer()).init();
|
||||||
|
}
|
||||||
|
|
||||||
|
fn env_filter() -> tracing_subscriber::EnvFilter {
|
||||||
|
tracing_subscriber::EnvFilter::try_from_default_env()
|
||||||
|
.unwrap_or_else(|_| tracing_subscriber::EnvFilter::new("info,tower_http=info"))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn console_layer<S>() -> Box<dyn tracing_subscriber::Layer<S> + Send + Sync>
|
||||||
|
where
|
||||||
|
S: tracing::Subscriber + for<'a> tracing_subscriber::registry::LookupSpan<'a>,
|
||||||
|
{
|
||||||
|
use tracing_subscriber::{Layer, fmt};
|
||||||
if std::env::var("LOG_FORMAT").is_ok_and(|f| f.eq_ignore_ascii_case("json")) {
|
if std::env::var("LOG_FORMAT").is_ok_and(|f| f.eq_ignore_ascii_case("json")) {
|
||||||
builder.json().init();
|
fmt::layer().json().boxed()
|
||||||
} else {
|
} else {
|
||||||
builder.init();
|
fmt::layer().boxed()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// A whole number from the environment; a value that is not one is reported.
|
||||||
|
fn env_number<T: std::str::FromStr>(name: &str, default: T, problems: &mut Vec<String>) -> T {
|
||||||
|
match std::env::var(name) {
|
||||||
|
Ok(raw) if !raw.trim().is_empty() => raw.trim().parse().unwrap_or_else(|_| {
|
||||||
|
problems.push(format!("{name}={raw} is not a whole number; using the default"));
|
||||||
|
default
|
||||||
|
}),
|
||||||
|
_ => default,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Initializes `tracing` from `RUST_LOG` and `LOG_FORMAT`, and the log files
|
||||||
|
/// in `LOG_DIR`, so the log outlives the container: each service writes its
|
||||||
|
/// own folder `LOG_DIR/<name>/` (`<name>` = `LOG_NAME`, else `name`), one
|
||||||
|
/// file a UTC day, keeping `LOG_KEEP_DAYS` files (at least 2), at most
|
||||||
|
/// `LOG_MAX_DAY_MB` megabytes a day.
|
||||||
|
pub fn init_logging(name: &str) -> LogGuard {
|
||||||
|
use tracing_subscriber::layer::SubscriberExt;
|
||||||
|
use tracing_subscriber::util::SubscriberInitExt;
|
||||||
|
use tracing_subscriber::{Layer, fmt};
|
||||||
|
|
||||||
|
let mut problems = Vec::new();
|
||||||
|
let mut guard = None;
|
||||||
|
let file = std::env::var("LOG_DIR").ok().filter(|d| !d.trim().is_empty()).and_then(|dir| {
|
||||||
|
let name = std::env::var("LOG_NAME").ok().filter(|n| !n.trim().is_empty()).unwrap_or_else(|| name.to_string());
|
||||||
|
let keep: usize = env_number("LOG_KEEP_DAYS", LOG_KEEP_DAYS, &mut problems);
|
||||||
|
if keep < 2 {
|
||||||
|
problems.push(format!("LOG_KEEP_DAYS={keep} would delete today's file on a restart; keeping 2 days"));
|
||||||
|
}
|
||||||
|
let max_mb: u64 = env_number("LOG_MAX_DAY_MB", LOG_MAX_DAY_MB, &mut problems);
|
||||||
|
// Its own folder: the old-file cleanup takes every file whose name
|
||||||
|
// starts with the prefix ("worker" would take "worker-ai" files too).
|
||||||
|
let folder = std::path::Path::new(&dir).join(&name);
|
||||||
|
let appender = std::fs::create_dir_all(&folder).map_err(|e| e.to_string()).and_then(|()| {
|
||||||
|
tracing_appender::rolling::Builder::new()
|
||||||
|
.rotation(tracing_appender::rolling::Rotation::DAILY)
|
||||||
|
.filename_prefix(&name)
|
||||||
|
.filename_suffix("log")
|
||||||
|
.max_log_files(keep.max(2))
|
||||||
|
.build(&folder)
|
||||||
|
.map_err(|e| e.to_string())
|
||||||
|
});
|
||||||
|
match appender {
|
||||||
|
Ok(appender) => {
|
||||||
|
let (writer, g) = tracing_appender::non_blocking(DailyCap::new(appender, max_mb.max(1) * 1024 * 1024));
|
||||||
|
guard = Some(g);
|
||||||
|
Some(fmt::layer().json().with_ansi(false).with_writer(writer).boxed())
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
problems
|
||||||
|
.push(format!("cannot write the log files in {}: {e}; logging to stdout only", folder.display()));
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
tracing_subscriber::registry().with(env_filter()).with(console_layer()).with(file).init();
|
||||||
|
for problem in problems {
|
||||||
|
tracing::warn!("{problem}");
|
||||||
|
}
|
||||||
|
LogGuard(guard)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A daily size limit in front of the log file: past `limit` bytes in a UTC
|
||||||
|
/// day the rest of that day's lines are dropped (after one note saying so),
|
||||||
|
/// so a log storm cannot fill the disk.
|
||||||
|
struct DailyCap<W> {
|
||||||
|
inner: W,
|
||||||
|
limit: u64,
|
||||||
|
day: u64,
|
||||||
|
written: u64,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<W> DailyCap<W> {
|
||||||
|
fn new(inner: W, limit: u64) -> Self {
|
||||||
|
Self { inner, limit, day: utc_day(), written: 0 }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn utc_day() -> u64 {
|
||||||
|
std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).map_or(0, |d| d.as_secs() / 86_400)
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<W: std::io::Write> std::io::Write for DailyCap<W> {
|
||||||
|
fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
|
||||||
|
let today = utc_day();
|
||||||
|
if today != self.day {
|
||||||
|
self.day = today;
|
||||||
|
self.written = 0;
|
||||||
|
}
|
||||||
|
if self.written >= self.limit {
|
||||||
|
return Ok(buf.len());
|
||||||
|
}
|
||||||
|
self.written += buf.len() as u64;
|
||||||
|
if self.written >= self.limit {
|
||||||
|
let note = format!(
|
||||||
|
"{{\"level\":\"WARN\",\"fields\":{{\"message\":\"daily log limit of {} MB reached; the rest of today is only on stdout\"}}}}\n",
|
||||||
|
self.limit / 1024 / 1024
|
||||||
|
);
|
||||||
|
self.inner.write_all(buf)?;
|
||||||
|
self.inner.write_all(note.as_bytes())?;
|
||||||
|
return Ok(buf.len());
|
||||||
|
}
|
||||||
|
self.inner.write(buf)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn flush(&mut self) -> std::io::Result<()> {
|
||||||
|
self.inner.flush()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The request log of an HTTP service (`TraceLayer::make_span_with` and
|
||||||
|
/// `on_response`): the Docker health check stays out of it unless it fails,
|
||||||
|
/// and e-mail addresses and tokens in the path are masked (the log is kept).
|
||||||
|
#[derive(Debug, Clone, Copy, Default)]
|
||||||
|
pub struct RequestLog;
|
||||||
|
|
||||||
|
impl<B> tower_http::trace::MakeSpan<B> for RequestLog {
|
||||||
|
fn make_span(&mut self, request: &http::Request<B>) -> tracing::Span {
|
||||||
|
let path = request.uri().path();
|
||||||
|
if path == "/healthz" {
|
||||||
|
return tracing::Span::none();
|
||||||
|
}
|
||||||
|
tracing::info_span!("request", method = %request.method(), path = %masked_path(path))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<B> tower_http::trace::OnResponse<B> for RequestLog {
|
||||||
|
fn on_response(self, response: &http::Response<B>, latency: Duration, span: &tracing::Span) {
|
||||||
|
// A health check (no span) that went well is not logged.
|
||||||
|
if span.is_none() && response.status().is_success() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let ms = latency.as_millis() as u64;
|
||||||
|
let status = response.status().as_u16();
|
||||||
|
if span.is_none() {
|
||||||
|
tracing::warn!(path = "/healthz", status, latency_ms = ms, "health check failed");
|
||||||
|
} else {
|
||||||
|
tracing::info!(status, latency_ms = ms, "finished processing request");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The path with secrets masked: a segment holding an e-mail address, and a
|
||||||
|
/// long one that is not a UUID (share slugs, invitation tokens). Queries are
|
||||||
|
/// never logged.
|
||||||
|
pub fn masked_path(path: &str) -> String {
|
||||||
|
let uuid = |s: &str| {
|
||||||
|
s.len() == 36
|
||||||
|
&& s.char_indices()
|
||||||
|
.all(|(i, c)| if [8, 13, 18, 23].contains(&i) { c == '-' } else { c.is_ascii_hexdigit() })
|
||||||
|
};
|
||||||
|
path.split('/')
|
||||||
|
.map(|segment| {
|
||||||
|
if segment.contains('@') || segment.contains("%40") {
|
||||||
|
":email"
|
||||||
|
} else if segment.len() >= 12 && !uuid(segment) {
|
||||||
|
":token"
|
||||||
|
} else {
|
||||||
|
segment
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
.join("/")
|
||||||
|
}
|
||||||
|
|
||||||
/// Listen address from `BIND_ADDR`, or `default`.
|
/// Listen address from `BIND_ADDR`, or `default`.
|
||||||
pub fn bind_addr(default: &str) -> anyhow::Result<SocketAddr> {
|
pub fn bind_addr(default: &str) -> anyhow::Result<SocketAddr> {
|
||||||
let raw = std::env::var("BIND_ADDR").unwrap_or_else(|_| default.into());
|
let raw = std::env::var("BIND_ADDR").unwrap_or_else(|_| default.into());
|
||||||
@@ -62,3 +253,34 @@ pub async fn shutdown_signal() {
|
|||||||
}
|
}
|
||||||
tracing::info!("shutting down");
|
tracing::info!("shutting down");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use std::io::Write;
|
||||||
|
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn secrets_in_paths_are_masked() {
|
||||||
|
assert_eq!(masked_path("/v1/admin/waitlist/anna%40example.com"), "/v1/admin/waitlist/:email");
|
||||||
|
assert_eq!(masked_path("/v1/public/shares/Ab3dEf6hIj9kLm2n/visit"), "/v1/public/shares/:token/visit");
|
||||||
|
assert_eq!(masked_path("/v1/public/invites/k3jh4k5j6h7k8j9h0k1j2h3k"), "/v1/public/invites/:token");
|
||||||
|
let id = "01a1f960-96cb-765f-899a-4d76b45b236e";
|
||||||
|
assert_eq!(masked_path(&format!("/v1/tarot/readings/{id}")), format!("/v1/tarot/readings/{id}"));
|
||||||
|
assert_eq!(masked_path("/v1/admin/prompts/forecast/hu"), "/v1/admin/prompts/forecast/hu");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn the_daily_cap_drops_the_rest_of_the_day() {
|
||||||
|
let mut cap = DailyCap::new(Vec::new(), 10);
|
||||||
|
cap.write_all(b"12345\n").unwrap();
|
||||||
|
cap.write_all(b"67890\n").unwrap();
|
||||||
|
cap.write_all(b"dropped\n").unwrap();
|
||||||
|
let text = String::from_utf8(cap.inner.clone()).unwrap();
|
||||||
|
assert!(text.starts_with("12345\n67890\n") && text.contains("daily log limit") && !text.contains("dropped"));
|
||||||
|
// A new day starts again.
|
||||||
|
cap.day -= 1;
|
||||||
|
cap.write_all(b"next\n").unwrap();
|
||||||
|
assert!(String::from_utf8(cap.inner).unwrap().ends_with("next\n"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -4,7 +4,8 @@
|
|||||||
{
|
{
|
||||||
servers {
|
servers {
|
||||||
# Cloudflare ranges (https://www.cloudflare.com/ips): the visitor's
|
# Cloudflare ranges (https://www.cloudflare.com/ips): the visitor's
|
||||||
# address is taken from CF-Connecting-IP and passed on in X-Forwarded-For.
|
# address ({client_ip}) is taken from CF-Connecting-IP, only when the
|
||||||
|
# request comes from Cloudflare.
|
||||||
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
|
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
|
client_ip_headers CF-Connecting-IP
|
||||||
}
|
}
|
||||||
@@ -14,7 +15,11 @@
|
|||||||
# No basic auth any more: the site is open, and new accounts need an
|
# No basic auth any more: the site is open, and new accounts need an
|
||||||
# invitation (SIGNUP_MODE=invite in the backend).
|
# invitation (SIGNUP_MODE=invite in the backend).
|
||||||
encode zstd gzip
|
encode zstd gzip
|
||||||
reverse_proxy frontend:3000
|
reverse_proxy frontend:3000 {
|
||||||
|
# The address the backend trusts (rate limits, share visits); it
|
||||||
|
# overwrites whatever the browser sent in this header.
|
||||||
|
header_up X-Real-IP {client_ip}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
www.{$DOMAIN} {
|
www.{$DOMAIN} {
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ A Docker által kinyitott portokat az ufw magától nem szűri, ezért a 80-as
|
|||||||
`deploy` felhasználóként, a `/opt/sorsfonalak` mappában:
|
`deploy` felhasználóként, a `/opt/sorsfonalak` mappában:
|
||||||
|
|
||||||
- `.env`: az itteni `.env.example` kitöltve.
|
- `.env`: az itteni `.env.example` kitöltve.
|
||||||
- `.env.secrets`: `OPENROUTER_API_KEY=...`.
|
- `.env.secrets`: `OPENROUTER_API_KEY=...`, a levélküldés adatai, és ha van, `STRIPE_SECRET_KEY` / `STRIPE_WEBHOOK_SECRET` és `BILLINGO_API_KEY` (`docs/fizetes.md`).
|
||||||
- `docker login registry.sagifer.com` egy `read:package` jogú tokennel. Amíg a `sagifer` fiók nyilvános, erre nincs szükség.
|
- `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)
|
### Cloudflare (sorsfonalak.hu)
|
||||||
@@ -82,7 +82,9 @@ A Google OAuth kliensnél a `https://sorsfonalak.hu` címet fel kell venni az en
|
|||||||
|
|
||||||
## Üzemeltetés
|
## Üzemeltetés
|
||||||
|
|
||||||
- Naplók: `docker compose logs -f backend worker worker-ai`
|
- Naplók élőben: `docker compose logs -f backend worker worker-ai` (ez a konténer újraindításáig/cseréjéig él).
|
||||||
|
- Naplók utólag: a backend és a két worker JSON-sorokat ír a `logs` volume-ba is, szolgáltatásonként külön mappába, UTC-nap szerint új fájlba (`backend/backend.2026-11-20.log`, `worker/…`, `worker-ai/…`; a nap magyar idő szerint hajnali 1-2 órakor fordul). 30 napig maradnak meg, naponta legfeljebb 50 MB (`LOG_KEEP_DAYS`, `LOG_MAX_DAY_MB`, `LOG_DIR`, `LOG_NAME`); a kérések útvonalában az e-mail-címek és a tokenek maszkolva vannak. A fájlok helye: `docker volume inspect -f '{{.Mountpoint}}' sorsfonalak_logs`, például `grep -h '"level":"ERROR"' /var/lib/docker/volumes/sorsfonalak_logs/_data/backend/*.log | tail`. A Docker 30 másodpercenkénti `/healthz` ellenőrzése csak akkor kerül a naplóba, ha hibás.
|
||||||
|
- Deploy és futó feladatok: leállításkor a worker nem vesz fel újat, a futókat befejezi (`SHUTDOWN_DRAIN_SECS`: `worker` 40 s, `worker-ai` 270 s, `stop_grace_period` 1, illetve 5 perc); ami addig nem készül el, visszakerül a sorba, a próbálkozás nem számít. Ha éppen elemzés készül, a deploy ennyivel tovább tarthat.
|
||||||
- A worker két konténerben fut, ugyanabból az image-ből: a `worker` küldi az e-maileket és takarít (`WORKER_TASKS=email,cleanup`, ide kerülnek a további háttérfeladatok is), a `worker-ai` írja az elemzéseket és a válaszokat (`WORKER_TASKS=analyses`, gyors és lassú sáv). A sávok mérete a szerver `.env` fájljában állítható (`QUICK_CONCURRENCY`, `ANALYSIS_CONCURRENCY`).
|
- A worker két konténerben fut, ugyanabból az image-ből: a `worker` küldi az e-maileket és takarít (`WORKER_TASKS=email,cleanup`, ide kerülnek a további háttérfeladatok is), a `worker-ai` írja az elemzéseket és a válaszokat (`WORKER_TASKS=analyses`, gyors és lassú sáv). A sávok mérete a szerver `.env` fájljában állítható (`QUICK_CONCURRENCY`, `ANALYSIS_CONCURRENCY`).
|
||||||
- Visszaállás korábbi verzióra: `.env`-ben `TAG=<régebbi hash>`, utána `docker compose up -d`
|
- 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).
|
- 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).
|
||||||
|
|||||||
@@ -81,21 +81,46 @@ services:
|
|||||||
HOROSCOPE_API_URL: http://horoscope-api:8080
|
HOROSCOPE_API_URL: http://horoscope-api:8080
|
||||||
PUBLIC_BASE_URL: https://${DOMAIN}
|
PUBLIC_BASE_URL: https://${DOMAIN}
|
||||||
GOOGLE_CLIENT_IDS: ${GOOGLE_CLIENT_IDS:-}
|
GOOGLE_CLIENT_IDS: ${GOOGLE_CLIENT_IDS:-}
|
||||||
|
# Sign in with Apple: the Services ID (e.g. hu.sorsfonalak.web); empty: off.
|
||||||
|
APPLE_CLIENT_IDS: ${APPLE_CLIENT_IDS:-}
|
||||||
BOOTSTRAP_ADMIN_EMAILS: ${BOOTSTRAP_ADMIN_EMAILS:-}
|
BOOTSTRAP_ADMIN_EMAILS: ${BOOTSTRAP_ADMIN_EMAILS:-}
|
||||||
ANALYSIS_MODEL: ${ANALYSIS_MODEL:-}
|
ANALYSIS_MODEL: ${ANALYSIS_MODEL:-}
|
||||||
SUMMARY_MODEL: ${SUMMARY_MODEL:-}
|
SUMMARY_MODEL: ${SUMMARY_MODEL:-}
|
||||||
PASSWORD_LOGIN: ${PASSWORD_LOGIN:-false}
|
PASSWORD_LOGIN: ${PASSWORD_LOGIN:-false}
|
||||||
# Stand-in payment (adds an analysis unit at once) until Stripe is connected.
|
# Without the Stripe keys purchases are off; packages come from promo
|
||||||
MOCK_PAYMENTS: ${MOCK_PAYMENTS:-true}
|
# 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}
|
||||||
|
# Buyers accept the ÁSZF on Stripe's page (needs the terms URL in
|
||||||
|
# Stripe's Public details): off until the opening.
|
||||||
|
TERMS_CONSENT: ${TERMS_CONSENT:-false}
|
||||||
|
# VAT on the invoices: AAM (alanyi adómentes) or a rate like 27%.
|
||||||
|
INVOICE_VAT: ${INVOICE_VAT:-AAM}
|
||||||
|
# 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.
|
||||||
|
REFERRAL_REWARDS: ${REFERRAL_REWARDS:-false}
|
||||||
FREE_PERSON_SLOTS: ${FREE_PERSON_SLOTS:-0}
|
FREE_PERSON_SLOTS: ${FREE_PERSON_SLOTS:-0}
|
||||||
# invite: new accounts need an invitation (admin page "Meghívók"); open: anyone.
|
# invite: new accounts need an invitation (admin page "Meghívók"); open: anyone.
|
||||||
SIGNUP_MODE: ${SIGNUP_MODE:-invite}
|
SIGNUP_MODE: ${SIGNUP_MODE:-invite}
|
||||||
|
# The log also goes to the logs volume, one file a day, kept 30 days
|
||||||
|
# (deploy/README.md: Logs).
|
||||||
|
LOG_DIR: /logs
|
||||||
|
# STRIPE_SECRET_KEY and STRIPE_WEBHOOK_SECRET (docs/fizetes.md): with them
|
||||||
|
# packages can be bought (a test key: by admins only).
|
||||||
|
env_file:
|
||||||
|
- path: .env.secrets
|
||||||
|
required: false
|
||||||
depends_on:
|
depends_on:
|
||||||
postgres:
|
postgres:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
horoscope-api:
|
horoscope-api:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
read_only: true
|
read_only: true
|
||||||
|
volumes:
|
||||||
|
- logs:/logs
|
||||||
logging: *logging
|
logging: *logging
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
@@ -104,12 +129,15 @@ services:
|
|||||||
image: ${REGISTRY_PREFIX:-registry.sagifer.com/sagifer/sorsfonalak}-worker:${TAG:-latest}
|
image: ${REGISTRY_PREFIX:-registry.sagifer.com/sagifer/sorsfonalak}-worker:${TAG:-latest}
|
||||||
environment:
|
environment:
|
||||||
DATABASE_URL: postgres://sorsfonalak:${POSTGRES_PASSWORD}@postgres:5432/sorsfonalak
|
DATABASE_URL: postgres://sorsfonalak:${POSTGRES_PASSWORD}@postgres:5432/sorsfonalak
|
||||||
WORKER_TASKS: email,cleanup
|
WORKER_TASKS: email,cleanup,invoices
|
||||||
# SMTP_URL or the SES credentials come from .env.secrets (docs/levelkuldes.md);
|
# SMTP_URL or the SES credentials come from .env.secrets (docs/levelkuldes.md);
|
||||||
# listing them here with an empty default would override that file.
|
# listing them here with an empty default would override that file.
|
||||||
SES_REGION: ${SES_REGION:-eu-central-1}
|
SES_REGION: ${SES_REGION:-eu-central-1}
|
||||||
MAIL_FROM: ${MAIL_FROM:-Sorsfonalak <hello@sorsfonalak.hu>}
|
MAIL_FROM: ${MAIL_FROM:-Sorsfonalak <noreply@sorsfonalak.hu>}
|
||||||
PUBLIC_BASE_URL: https://${DOMAIN}
|
PUBLIC_BASE_URL: https://${DOMAIN}
|
||||||
|
LOG_DIR: /logs
|
||||||
|
# On a deploy the e-mails and invoices being sent finish first.
|
||||||
|
SHUTDOWN_DRAIN_SECS: 40
|
||||||
env_file:
|
env_file:
|
||||||
- path: .env.secrets
|
- path: .env.secrets
|
||||||
required: false
|
required: false
|
||||||
@@ -117,6 +145,9 @@ services:
|
|||||||
postgres:
|
postgres:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
read_only: true
|
read_only: true
|
||||||
|
volumes:
|
||||||
|
- logs:/logs
|
||||||
|
stop_grace_period: 1m
|
||||||
logging: *logging
|
logging: *logging
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
@@ -130,6 +161,11 @@ services:
|
|||||||
QUICK_CONCURRENCY: ${QUICK_CONCURRENCY:-2}
|
QUICK_CONCURRENCY: ${QUICK_CONCURRENCY:-2}
|
||||||
ANALYSIS_CONCURRENCY: ${ANALYSIS_CONCURRENCY:-4}
|
ANALYSIS_CONCURRENCY: ${ANALYSIS_CONCURRENCY:-4}
|
||||||
PUBLIC_BASE_URL: https://${DOMAIN}
|
PUBLIC_BASE_URL: https://${DOMAIN}
|
||||||
|
LOG_DIR: /logs
|
||||||
|
LOG_NAME: worker-ai
|
||||||
|
# On a deploy the analyses being written finish first (a detailed one
|
||||||
|
# takes a few minutes); what is not done by then goes back to the queue.
|
||||||
|
SHUTDOWN_DRAIN_SECS: 270
|
||||||
env_file:
|
env_file:
|
||||||
- path: .env.secrets
|
- path: .env.secrets
|
||||||
required: false
|
required: false
|
||||||
@@ -137,6 +173,9 @@ services:
|
|||||||
postgres:
|
postgres:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
read_only: true
|
read_only: true
|
||||||
|
volumes:
|
||||||
|
- logs:/logs
|
||||||
|
stop_grace_period: 5m
|
||||||
logging: *logging
|
logging: *logging
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
@@ -145,6 +184,8 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
BACKEND_URL: http://backend:8081
|
BACKEND_URL: http://backend:8081
|
||||||
HOROSCOPE_API_URL: http://horoscope-api:8080
|
HOROSCOPE_API_URL: http://horoscope-api:8080
|
||||||
|
# Absolute links of the share previews (og:image).
|
||||||
|
PUBLIC_BASE_URL: https://${DOMAIN}
|
||||||
depends_on:
|
depends_on:
|
||||||
backend:
|
backend:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
@@ -157,5 +198,7 @@ services:
|
|||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
pgdata:
|
pgdata:
|
||||||
|
# Backend and worker logs (backend.YYYY-MM-DD.log, worker…, worker-ai…).
|
||||||
|
logs:
|
||||||
caddy-data:
|
caddy-data:
|
||||||
caddy-config:
|
caddy-config:
|
||||||
|
|||||||
@@ -46,6 +46,7 @@ services:
|
|||||||
# Plain HTTP in development; leave the default (true) in production.
|
# Plain HTTP in development; leave the default (true) in production.
|
||||||
COOKIE_SECURE: ${COOKIE_SECURE:-false}
|
COOKIE_SECURE: ${COOKIE_SECURE:-false}
|
||||||
GOOGLE_CLIENT_IDS: ${GOOGLE_CLIENT_IDS:-}
|
GOOGLE_CLIENT_IDS: ${GOOGLE_CLIENT_IDS:-}
|
||||||
|
APPLE_CLIENT_IDS: ${APPLE_CLIENT_IDS:-}
|
||||||
BOOTSTRAP_ADMIN_EMAILS: ${BOOTSTRAP_ADMIN_EMAILS:-}
|
BOOTSTRAP_ADMIN_EMAILS: ${BOOTSTRAP_ADMIN_EMAILS:-}
|
||||||
# Paid detailed analyses (empty: anthropic/claude-opus-5.5).
|
# Paid detailed analyses (empty: anthropic/claude-opus-5.5).
|
||||||
ANALYSIS_MODEL: ${ANALYSIS_MODEL:-}
|
ANALYSIS_MODEL: ${ANALYSIS_MODEL:-}
|
||||||
@@ -55,9 +56,20 @@ services:
|
|||||||
PASSWORD_LOGIN: ${PASSWORD_LOGIN:-false}
|
PASSWORD_LOGIN: ${PASSWORD_LOGIN:-false}
|
||||||
# Stand-in payment (adds an analysis unit at once) until Stripe is connected.
|
# Stand-in payment (adds an analysis unit at once) until Stripe is connected.
|
||||||
MOCK_PAYMENTS: ${MOCK_PAYMENTS:-true}
|
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}
|
||||||
|
TERMS_CONSENT: ${TERMS_CONSENT:-false}
|
||||||
|
# VAT on the invoices: AAM (alanyi adómentes) or a rate like 27%.
|
||||||
|
INVOICE_VAT: ${INVOICE_VAT:-AAM}
|
||||||
FREE_PERSON_SLOTS: ${FREE_PERSON_SLOTS:-0}
|
FREE_PERSON_SLOTS: ${FREE_PERSON_SLOTS:-0}
|
||||||
# invite: new accounts need an invitation (admin page "Meghívók"); open: anyone.
|
# invite: new accounts need an invitation (admin page "Meghívók"); open: anyone.
|
||||||
SIGNUP_MODE: ${SIGNUP_MODE:-invite}
|
SIGNUP_MODE: ${SIGNUP_MODE:-invite}
|
||||||
|
# STRIPE_SECRET_KEY / STRIPE_WEBHOOK_SECRET (test keys; docs/fizetes.md).
|
||||||
|
# With them Stripe replaces the stand-in payment.
|
||||||
|
env_file:
|
||||||
|
- path: .env.secrets
|
||||||
|
required: false
|
||||||
depends_on:
|
depends_on:
|
||||||
postgres:
|
postgres:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
|||||||
@@ -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ó.
|
||||||
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 26 KiB |
|
After Width: | Height: | Size: 26 KiB |
@@ -4,24 +4,27 @@ A katalógus a kódban van: `services/backend/src/packages.rs` (`CATALOG`). Ár-
|
|||||||
|
|
||||||
## Költség
|
## Költség
|
||||||
|
|
||||||
Egy részletes képletelemzés és egy kapcsolati elemzés is kb. **$0,21 (≈ 80 Ft)** Opus 5.5-tel, az éves előrejelzés a hosszabb adatsor miatt valamivel több; 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).
|
Egy részletes képletelemzés és egy kapcsolati elemzés is kb. **$0,21 (≈ 80 Ft)** Opus 5.5-tel, az éves előrejelzés a hosszabb adatsor miatt valamivel több; a rövid összefoglaló kb. $0,01. A fizetési szolgáltató díja kb. 1,5% + 85 Ft tranzakciónként. Az árak végső árak: alanyi adómentesek vagyunk (`INVOICE_VAT=AAM`), áfát nem számítunk fel; ha átlépjük az alanyi adómentesség határát, `INVOICE_VAT=27%`, és az árak bruttóként értendők.
|
||||||
|
|
||||||
## A lépcső
|
## A lépcső
|
||||||
|
|
||||||
| Csomag | Tartalom | Ár | Elemzésenként | Külön megvéve | Megtakarítás |
|
| Csomag | Tartalom | Ár | Elemzésenként | Külön megvéve | Megtakarítás |
|
||||||
|---|---|---|---|---|---|
|
|---|---|---|---|---|---|
|
||||||
| Egy elemzés | 1 képletelemzés, 3 kérdés | 2 000 Ft | 2 000 Ft | – | – |
|
| Egy elemzés | 1 képletelemzés, 3 kérdés, 2 kártyajóslás | 2 000 Ft | 2 000 Ft | – | – |
|
||||||
| Páros | 2 képletelemzés, 2 éves előrejelzés, 1 kapcsolati, 1 személy, 3 kérdés | 6 000 Ft | 1 200 Ft | 11 800 Ft | 49% |
|
| Páros | 2 képletelemzés, 2 éves előrejelzés, 1 kapcsolati, 1 személy, 3 kérdés, 5 kártyajóslás | 6 000 Ft | 1 200 Ft | 11 800 Ft | 49% |
|
||||||
| **Család** (Legnépszerűbb) | 6 képletelemzés, 6 éves előrejelzés, 5 kapcsolati, 5 személy, 3 kérdés | 11 000 Ft | 647 Ft | 41 000 Ft | 73% |
|
| **Család** (Legnépszerűbb) | 6 képletelemzés, 6 éves előrejelzés, 5 kapcsolati, 5 személy, 3 kérdés, 10 kártyajóslás | 11 000 Ft | 647 Ft | 41 000 Ft | 73% |
|
||||||
| +1 kapcsolati elemzés | kiegészítő | 2 500 Ft | | | |
|
| +1 kapcsolati elemzés | kiegészítő | 2 500 Ft | | | |
|
||||||
| +1 éves előrejelzés | kiegészítő | 2 500 Ft | | | |
|
| +1 éves előrejelzés | kiegészítő | 2 500 Ft | | | |
|
||||||
| +5 személy | kiegészítő | 1 500 Ft | | | |
|
| +5 személy | kiegészítő | 1 500 Ft | | | |
|
||||||
| +5 kérdés | kiegészítő | 1 000 Ft | | | |
|
| +5 kérdés | kiegészítő | 1 000 Ft | | | |
|
||||||
|
| +5 kártyajóslás | kiegészítő | 1 000 Ft | | | |
|
||||||
|
|
||||||
A „külön megvéve” ár egységárakból jön: képletelemzés 2 000 Ft, kapcsolati elemzés 2 500 Ft, éves előrejelzés 2 500 Ft, személy 300 Ft (`NATAL_PRICE`, `SYNASTRY_PRICE`, `FORECAST_PRICE`, `PERSON_PRICE`).
|
A „külön megvéve” ár egységárakból jön: képletelemzés 2 000 Ft, kapcsolati elemzés 2 500 Ft, éves előrejelzés 2 500 Ft, személy 300 Ft (`NATAL_PRICE`, `SYNASTRY_PRICE`, `FORECAST_PRICE`, `PERSON_PRICE`).
|
||||||
|
|
||||||
A kérdések (2026 novembere óta) minden csomagban ráadásként járnak (`QUESTIONS_INCLUDED` = 3), a „külön megvéve” árban és a megtakarításban nem szerepelnek. Egy kérdés a kész képletelemzésre vagy éves előrejelzésre vonatkozik, a választ ugyanaz a modell írja, amelyik az elemzést (legfeljebb 250 szó); költsége kb. $0,04–0,07 (15–25 Ft). Részletek: `docs/kerdesek.md`.
|
A kérdések (2026 novembere óta) minden csomagban ráadásként járnak (`QUESTIONS_INCLUDED` = 3), a „külön megvéve” árban és a megtakarításban nem szerepelnek. Egy kérdés a kész képletelemzésre vagy éves előrejelzésre vonatkozik, a választ ugyanaz a modell írja, amelyik az elemzést (legfeljebb 250 szó); költsége kb. $0,04–0,07 (15–25 Ft). Részletek: `docs/kerdesek.md`.
|
||||||
|
|
||||||
|
A kártyajóslások (2026 novembere óta) szintén ráadásként járnak (Egy elemzés 2, Páros 5, Család 10), a megtakarításban nem szerepelnek. Részletek: `docs/kartyajoslas.md`.
|
||||||
|
|
||||||
Az éves előrejelzés (2026 novembere óta) a Páros és a Család csomagban mindenkinek benne van; külön megvéve drágább, mint egy képletelemzés. Az Egy elemzés csomag változatlanul egy képletelemzés 2 000 Ft-ért. Részletek: `docs/elorejelzes.md`.
|
Az éves előrejelzés (2026 novembere óta) a Páros és a Család csomagban mindenkinek benne van; külön megvéve drágább, mint egy képletelemzés. Az Egy elemzés csomag változatlanul egy képletelemzés 2 000 Ft-ért. Részletek: `docs/elorejelzes.md`.
|
||||||
|
|
||||||
## Miért így (a nagyobb felé terelés)
|
## Miért így (a nagyobb felé terelés)
|
||||||
@@ -39,7 +42,6 @@ Az éves előrejelzés (2026 novembere óta) a Páros és a Család csomagban mi
|
|||||||
|
|
||||||
## Későbbre
|
## 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).
|
- 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.
|
- 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.
|
- Számlázás (NAV Online Számla) a vásárlásokhoz. A fizetés a Stripe-on megy: [fizetes.md](fizetes.md).
|
||||||
|
|||||||
@@ -0,0 +1,88 @@
|
|||||||
|
# Fizetés (Stripe)
|
||||||
|
|
||||||
|
A csomagokat a Stripe Checkout fizetési oldalán lehet megvenni. A csomagok neve, tartalma és ára a `services/backend/src/packages.rs`-ben van; minden fizetés ezekkel indul, a Stripe-ban nem kell termékeket felvenni.
|
||||||
|
|
||||||
|
## Menete
|
||||||
|
|
||||||
|
1. A „Megveszem” gomb a `POST /v1/payments/checkout` végpontot hívja (`package`, `return_path`: az oldal, ahonnan indult).
|
||||||
|
2. A backend létrehoz egy Checkout Sessiont (bruttó ár forintban, a csomag neve, a felhasználó e-mail-címe, kötelező számlázási cím), elmenti a `stripe_checkouts` táblába, és visszaadja a fizetési oldal címét.
|
||||||
|
3. Fizetés után a Stripe visszaküld ugyanarra az oldalra `?fizetes=<session id>` paraméterrel (megszakításkor `?fizetes=megszakitva`). A `PaymentReturn` komponens a `GET /v1/payments/checkout/{id}` végpontot kérdezi, amíg a fizetés be nem igazolódik.
|
||||||
|
4. A csomagot a backend akkor adja meg, amikor a Stripe igazolja a fizetést:
|
||||||
|
- a webhook (`POST /api/v1/payments/stripe/webhook`, aláírással ellenőrizve), vagy
|
||||||
|
- ha a webhook még nem jött meg (vagy helyben nincs beállítva), a visszatérő oldal kérdésére a backend maga kérdezi meg a Stripe-ot.
|
||||||
|
|
||||||
|
A session id miatt egy fizetés csak egyszer ír jóvá (`package_orders.source = 'stripe'`).
|
||||||
|
|
||||||
|
## ÁSZF és elállási jog
|
||||||
|
|
||||||
|
**A megnyitásig ki van kapcsolva** (`TERMS_CONSENT=false`, az alapértelmezés): a Stripe nem kéri az elfogadást, a csomagkártyák nem írnak az elállási jogról, és visszaigazoló e-mail sem megy. Bekapcsolva (`TERMS_CONSENT=true` a `.env`-ben, a backend újraindításával) minden vásárlásnál a Stripe fizetési oldalán kötelező bepipálni: „Elfogadom az ÁSZF-et, kérem a szolgáltatás azonnali megkezdését, és tudomásul veszem, hogy ezzel elveszítem a 14 napos elállási jogomat.” (`consent_collection[terms_of_service]=required` és `custom_text[terms_of_service_acceptance]`). Digitális tartalomnál így szűnik meg az elállási jog (45/2014. Korm. rendelet 29. §). Ehhez **a Stripe felületén meg kell adni az ÁSZF címét** (Settings → Business → Public details → Terms of service: `https://sorsfonalak.hu/aszf`), különben a Stripe nem indítja el a fizetést.
|
||||||
|
|
||||||
|
Az elfogadás idejét és az ÁSZF változatát (`TERMS_VERSION`, a frontend `TERMS_UPDATED`-jével együtt kell léptetni) a `stripe_checkouts` sor őrzi (`terms_accepted_at`, `terms_version`). Elfogadott ÁSZF esetén fizetés után a backend visszaigazoló e-mailt küld (`purchase_confirmation`): a csomag, az összeg, a dátum és a lemondás az elállási jogról; ez a rendelet szerinti visszaigazolás.
|
||||||
|
|
||||||
|
Az ÁSZF az `/aszf` oldalon van (`services/frontend/src/app/aszf/page.tsx`); a céges adatok a `lib/legal.ts`-ből jönnek. Megnyitás előtt jogásszal át kell nézetni.
|
||||||
|
|
||||||
|
## Mit tárolunk
|
||||||
|
|
||||||
|
Bankkártyaadatot soha: a vásárló a Stripe oldalán adja meg, hozzánk nem jut el. A `stripe_checkouts` sorban a fizetés igazolásakor eltároljuk:
|
||||||
|
|
||||||
|
- a Stripe fizetés azonosítóját (`payment_intent`) és a ténylegesen fizetett összeget (`amount_huf`; ha eltér az ártól, hibát naplózunk),
|
||||||
|
- a vevő számlázási adatait (`customer`: a Stripe `customer_details` objektuma: név, e-mail, cím, céges vásárlásnál `business_name` és `tax_ids`, pl. `hu_tin` / `eu_vat`).
|
||||||
|
|
||||||
|
A fizetési oldal kötelezően bekéri a számlázási címet, és felkínálja a céges vásárlást (cégnév, adószám; `tax_id_collection`).
|
||||||
|
|
||||||
|
A sorok a fiók törlése után is megmaradnak (`user_id` → NULL), mert a számviteli törvény 8 évig megőrzést ír elő; ilyenkor csomag már nem jár, de a számla elkészül.
|
||||||
|
|
||||||
|
## Számla
|
||||||
|
|
||||||
|
Fizetéskor a backend egy `invoices` sort is létrehoz a számla minden adatával: a vevő (név, e-mail, ország, irányítószám, város, cím, Billingo-adótípus: `HAS_TAX_NUMBER` / `NO_TAX_NUMBER` / `FOREIGN`, adószám) és a tétel (név, végösszeg, nettó, áfa, áfakód). Az áfakód az `INVOICE_VAT` (a backend `.env`-je): alapból `AAM` (alanyi adómentes: nettó = végösszeg, áfa 0, a számla megjegyzésében „Alanyi adómentes.”), vagy egy kulcs, pl. `27%`. A tétel a törvény szerint azonosítja a szolgáltatást (Áfa tv. 169. § e): megnevezése pl. „Online tartalomszolgáltatás – Páros csomag”, egysége `csomag`, megjegyzése a tartalom („Hozzáférés a sorsfonalak.hu szoftveresen előállított, személyre szabott szöveges tartalmaihoz: 2 képletelemzés, … Digitális tartalom.”; `Package::invoice_item`). Szándékosan nem „asztrológiai”: a szolgáltatás egy weboldal programmal előállított tartalma, nem személyes szakmai tanácsadás. Cégnél a `business_name` és a magyar adószám (`hu_tin`, ennek híján `eu_vat`) kerül a számlára.
|
||||||
|
|
||||||
|
Minden igazolt fizetéshez készül számla, a teszt módúakhoz (`sk_test_…`) is: így a teljes folyamat próbálható egy teszt Billingo-fiókkal. Éles Billingo-fiók mellett ezért prodon már ne legyen teszt Stripe-kulcs (a kettőt megnyitáskor együtt kell élesre cserélni).
|
||||||
|
|
||||||
|
A worker `invoices` feladata (`WORKER_TASKS`, prodon a `worker` konténerben) a Billingo API v3-mal:
|
||||||
|
|
||||||
|
1. létrehozza a partnert (`POST /partners`),
|
||||||
|
2. kiállítja a számlát (`POST /documents`: `type=invoice`, `paid=true`, `electronic=true`, `payment_method=online_bankcard`, bruttó egységár, teljesítés = a fizetés napja magyar idő szerint),
|
||||||
|
3. e-mailben elküldi a vevőnek (`POST /documents/{id}/send`).
|
||||||
|
|
||||||
|
Minden lépés eredményét elmenti a következő előtt, így újrapróbáláskor ott folytatja, ahol abbamaradt, és nem állít ki két számlát. A Billingo teljes válasza a `document` oszlopba kerül (a PDF nem: azt letöltéskor a backend kéri le, `GET /documents/{id}/download`). Hibánál növekvő várakozással újrapróbál (`MAX_INVOICE_ATTEMPTS`, alapból 10, kb. egy nap), utána `failed` lesz, és a `last_error` mondja meg, mi a baj.
|
||||||
|
|
||||||
|
A felhasználó a **Számláim** oldalon (`/szamlak`; a menüpont az első számlával jelenik meg) töltheti le a számláit.
|
||||||
|
|
||||||
|
Beállítás (`.env.secrets`, a backend és a worker is olvassa):
|
||||||
|
|
||||||
|
```
|
||||||
|
BILLINGO_API_KEY=...
|
||||||
|
```
|
||||||
|
|
||||||
|
A számlatömb alapból a fiók első számlatömbje; másikhoz `BILLINGO_BLOCK_ID` a `.env`-ben vagy a `.env.secrets`-ben.
|
||||||
|
|
||||||
|
## Beállítás
|
||||||
|
|
||||||
|
A kulcsok a `.env.secrets` fájlba kerülnek (helyben a repó gyökerében, a szerveren a `/opt/sorsfonalak` mappában), git-be soha:
|
||||||
|
|
||||||
|
```
|
||||||
|
STRIPE_SECRET_KEY=sk_test_...
|
||||||
|
STRIPE_WEBHOOK_SECRET=whsec_...
|
||||||
|
```
|
||||||
|
|
||||||
|
- **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:
|
||||||
|
|
||||||
|
1. **Developers → API keys**: a Secret key → `STRIPE_SECRET_KEY`.
|
||||||
|
2. **Developers → Webhooks → Add endpoint**: `https://sorsfonalak.hu/api/v1/payments/stripe/webhook`, események: `checkout.session.completed` és `checkout.session.async_payment_succeeded`. A Signing secret → `STRIPE_WEBHOOK_SECRET`. Teszt és élő módban külön végpontot kell felvenni, külön titokkal.
|
||||||
|
3. **Settings → Branding**: logó, színek (a fizetési oldal kinézete).
|
||||||
|
4. **Settings → Payment methods**: bankkártya, Apple Pay, Google Pay.
|
||||||
|
|
||||||
|
A kulcsok módosítása után a backendet újra kell indítani (`docker compose up -d backend`).
|
||||||
|
|
||||||
|
Helyben a webhook nem ér el a géphez; nem is kell, mert a visszatérő oldal a Stripe-tól kérdezi le a fizetést. Ha mégis próbálni kell: `stripe listen --forward-to localhost:3001/api/v1/payments/stripe/webhook`.
|
||||||
|
|
||||||
|
## Megnyitás előtt
|
||||||
|
|
||||||
|
- A Stripe-fiók aktiválása (céges adatok, bankszámla), élő kulcsok és élő webhook.
|
||||||
|
- Az első éles számlát nézd át a Billingóban (vevő, adószám, áfa, teljesítési dátum). A Stripe nyugtája nem magyar számla: a Stripe felületén a Customer emails → Successful payments legyen kikapcsolva.
|
||||||
|
- Visszatérítés: egyelőre a Stripe felületén, a csomagot pedig az admin oldalon kell kézzel csökkenteni.
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
# Kártyajóslás
|
||||||
|
|
||||||
|
A `/kartyajoslas` oldalon a felhasználó témát (Általános, Párkapcsolat, Munka és hivatás, Önismeret; a téma szerinti olvasási szempont a promptba kerül, `TOPICS`) és kirakást választ, opcionálisan kérdést ír (legfeljebb 300 karakter), és a legyezőbe terített, lefordított pakliból kiválasztja a lapokat. Ezután a lapok sorban felfordulnak, és elkészül a személyre szabott jóslás. A korábbi jóslások ugyanitt listázódnak, egyenként a `/kartyajoslas/{id}` oldalon nyithatók meg. A nyilvános példaoldal (`/kartyajoslas/pelda`) két előre megírt jóslást mutat fülekkel, egy munkáról (3 lap) és egy párkapcsolatról (Képlet-kereszt, 5 lap). Mindkettőnél animáció játssza le a húzást: lapválasztás a legyezőből, kirakás, felfordítás, végül megjelenik a szöveg (`src/components/tarot/TarotDemo.tsx`, a szövegek: `src/content/tarot-pelda.json`). Mozgáscsökkentő beállításnál rögtön a végállapot látszik.
|
||||||
|
|
||||||
|
## Működés
|
||||||
|
|
||||||
|
- **A lapokat a szerver húzza** (`POST /v1/tarot/readings`, `services/backend/src/routes/tarot.rs`): megkeveri a 78 lapot, kiveszi a kirakáshoz kellő számút, mindegyik 28% eséllyel fordított. A legyezőből választás csak a pillanatot választja ki, így nem lehet ingyen újrahúzni, amíg tetsző lap nem jön.
|
||||||
|
- **Tárolás:** a jóslás egy `tarot` fajtájú sor az `analyses` táblában, a kirakással, a kérdéssel, a lapokkal és az olvasó Napjának, Holdjának és Aszcendensének jegyével (a saját képletéből, az Aszcendenst csak ismert születési időnél) a `tarot` oszlopban (migráció: 0031). Képlethez nem kötődik, ezért az újraszámolás nem törli, fióktörléskor viszont törlődik.
|
||||||
|
- **Egység:** egy jóslás egy `tarot` egységet használ, a kirakás méretétől függetlenül. Egyszerre egy jóslás készülhet. A sikertelen jóslás egysége visszajár (a worker, mint az elemzéseknél).
|
||||||
|
- **Modell:** ugyanaz, amelyik a részletes elemzéseket írja (admin felületen az „elemzés” funkció modellje és tartaléka); külön modellbeállítása nincs. A worker a gyors sávban írja (`Lane::Quick`), hogy ne várjon a hosszú elemzések mögött.
|
||||||
|
- **Prompt:** `crates/analysis-prompt/src/tarot.rs`. A modell a lapok alapjelentését (a pakli JSON-ból), a pozíciókat, a kérdést és a három jegyet kapja; válasza: cím, összefoglaló, laponként egy-két bekezdés, a lapok együtt, útravaló. A rendszerprompt az adminon nem szerkeszthető (első kör).
|
||||||
|
- **Pakli:** `services/frontend/src/content/tarot-deck.json`, ezt a Rust-crate is beolvassa (`include_str!`), így a felület és a prompt ugyanazokat a neveket és jelentéseket használja. A lapok rajza: `src/components/tarot/TarotCard.tsx` (a `../tarot` tervezőstúdió „Égi Asztrolábium” változata).
|
||||||
|
- **Admin:** a jóslás az elemzésekhez hasonlóan újraíratható (`/v1/admin/analyses/{id}/regenerate`), az egységek az admin felhasználólistán adhatók („kártyajóslás”).
|
||||||
|
|
||||||
|
## Csomagok
|
||||||
|
|
||||||
|
Egy elemzés: 2, Páros: 5, Család: 10 jóslás; külön: „+5 kártyajóslás” 1 000 Ft. A számlán a tétel leírásában „kártyaértelmezés” szerepel (nem „jóslás”).
|
||||||
@@ -68,7 +68,7 @@ A droplet saját tűzfala (`sorsfonalak-fw`, DigitalOcean → Networking → Fir
|
|||||||
|
|
||||||
## 6. Indítás
|
## 6. Indítás
|
||||||
|
|
||||||
- A `.env` fájlban opcionális: `MAIL_FROM=Sorsfonalak <hello@sorsfonalak.hu>` (ez az alapérték is).
|
- A `.env` fájlban opcionális: `MAIL_FROM=Sorsfonalak <noreply@sorsfonalak.hu>` (élesben ez van beállítva, és ez a deploy compose alapértéke is). Az Apple „Email Communication” beállításában ugyanez a cím van regisztrálva: ha változik, ott is át kell írni, különben az Apple-továbbítócímekre nem érkeznek meg a levelek.
|
||||||
- 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 …`.
|
- 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;`.
|
- 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:
|
- Hibaüzenetek a naplóban:
|
||||||
|
|||||||
@@ -0,0 +1,62 @@
|
|||||||
|
# Megosztás
|
||||||
|
|
||||||
|
A képletoldalon, a rövid összefoglaló alatt van a **Megosztás** gomb. Ez egy nyilvános linket ad (`/s/<kód>`), amelyen a képlet rajza és a legfrissebb rövid összefoglaló látszik. Név és születési adatok nem kerülnek rá.
|
||||||
|
|
||||||
|
- **Ugyanaz a link:** ha ugyanazt a képletet újra megosztod, a már nyitott link jön vissza (`POST /v1/shares`: új linknél 201, meglévőnél 200).
|
||||||
|
- **Visszavonás:** a „Link visszavonása” gomb után az oldal és a kép is 404-et ad.
|
||||||
|
- **Keresők:** az oldal `noindex`, a keresők nem listázzák.
|
||||||
|
|
||||||
|
## Jutalom a megosztásért
|
||||||
|
|
||||||
|
Egy kattintás önmagában semmit nem bizonyít, ezért kétféle jutalom van:
|
||||||
|
|
||||||
|
- **Ajándék kérdés (megtekintésért):** felhasználónként **egyszer** +1 kérdés, amikor valaki más először megnyitja a megosztott linkjét. A gomb apró betűvel: „+1 ajándék kérdés, ha valaki megnézi”.
|
||||||
|
- **Ajándék képletelemzés (új felhasználóért):** +1 képletelemzés, ha valaki a megosztott linkről regisztrál és elkészíti a saját képletét. Felhasználónként legfeljebb 3 (`REFERRAL_LIMIT`). Az élesítésig ki van kapcsolva (`REFERRAL_REWARDS=false`), mert meghívásos regisztrációnál a linkről úgysem lehet regisztrálni.
|
||||||
|
|
||||||
|
**Megtekintés számolása:**
|
||||||
|
|
||||||
|
- **A böngésző jelez:** a megosztott oldal betöltése után maga a látogató böngészője jelzi a látogatást (`POST /v1/public/shares/{slug}/visit`). Az előnézet-robotok nem futtatják az oldal szkriptjét, így ők nem számítanak.
|
||||||
|
- **Ami nem számít:**
|
||||||
|
- robotnak látszó vagy hiányzó böngészőazonosító;
|
||||||
|
- a belépett tulajdonos;
|
||||||
|
- látogatás arról az IP-címről, ahonnan a linket létrehozták. A cím a sluggal sózva, hash-ként van tárolva (`shares.owner_ip_hash`).
|
||||||
|
- **Számláló:** a `shares.view_count` csak ezeket a valódi látogatásokat számolja.
|
||||||
|
- **Jutalom egyszer:** a `share_reward` sor egyedi indexszel felhasználónként egyszer jöhet létre.
|
||||||
|
|
||||||
|
**Új felhasználó:**
|
||||||
|
|
||||||
|
- **Megjegyzés:** a megosztott oldal a böngészőben megjegyzi a link kódját (`localStorage` `sf_ref`). A Google-regisztráció elküldi (`referral`), és a backend a `referrals` táblába írja, hogy kit ki hozott. Saját link, visszavont link vagy kikapcsolt jutalom esetén nem írja be.
|
||||||
|
- **Jutalom:** amikor az új felhasználó elkészíti a saját képletét, a megosztó +1 képletelemzést kap (`referral_reward`), ha még nem érte el a hármat. Új felhasználónként egyszer.
|
||||||
|
- **`/v1/me`:** a `share_reward_granted` és a `referral_rewards` (`{earned, limit}`) mezők mutatják az állapotot.
|
||||||
|
|
||||||
|
## Robotok
|
||||||
|
|
||||||
|
- **Az olvasás nem ír.** A megosztott tartalom lekérése (`GET /v1/public/shares/{slug}`) semmit nem ír az adatbázisba.
|
||||||
|
- **Gyorsítótár:** a frontend 5 percig tartja (`fetch` `revalidate: 300`, `shares` tag), így a sűrűn visszatérő robotok el sem jutnak a backendig. Visszavonáskor az `/api/v1` proxy azonnal törli a taget.
|
||||||
|
- **robots.txt** (`src/app/robots.ts`): kitiltja az ismert AI-robotokat (GPTBot, ClaudeBot, CCBot, PerplexityBot, Bytespider, meta-externalagent stb.). Az előnézet-robotok (facebookexternalhit, Slackbot, WhatsApp, Twitterbot, LinkedInBot) engedélyezve maradnak.
|
||||||
|
- **Cloudflare:** a robots.txt-t be nem tartó robotokra a Cloudflare „Block AI bots” beállítása való (Security → Bots). Ez az előnézet-robotokat nem tiltja le. A „Bot Fight Mode” viszont az előnézeteket is elronthatja, azt ne kapcsoljuk be.
|
||||||
|
|
||||||
|
## Előnézet (Facebook, Messenger, WhatsApp, LinkedIn, X)
|
||||||
|
|
||||||
|
Az oldal `og:` és `twitter:` meta tagjei:
|
||||||
|
|
||||||
|
| Tag | Tartalom |
|
||||||
|
|---|---|
|
||||||
|
| cím | az összefoglaló címe |
|
||||||
|
| leírás | az összefoglaló első ~200 karaktere |
|
||||||
|
| kép | `/s/<kód>/kep/<verzió>.png` |
|
||||||
|
|
||||||
|
A kép egy 1200×630-as PNG. A Next.js beépített képgenerálója (`next/og`) készíti kérésre, a következőkkel:
|
||||||
|
|
||||||
|
- a radix (`src/lib/wheelSvg.ts`; ugyanaz a `<ChartWheel>`, mint az oldalon, beégetett színekkel);
|
||||||
|
- a cím és a szöveg eleje;
|
||||||
|
- a Nap, a Hold és az Aszcendens jegye.
|
||||||
|
|
||||||
|
Működése:
|
||||||
|
|
||||||
|
- **Betűtípusok:** a `src/assets/og` mappából olvassa őket. Hiányzó karakter miatt soha nem tölt le fontot az internetről, mert a nem betű, szám vagy írásjel karaktereket kiszűri.
|
||||||
|
- **Verzió:** a fájlnévben lévő verzió az összefoglaló azonosítójából és elkészültének idejéből készül. Ha az összefoglaló újragenerálódik, új címet kap a kép, és a Facebook újra letölti.
|
||||||
|
- **Gyorsítótár:** `Cache-Control: public, max-age=3600, s-maxage=86400`. A Cloudflare egy napig tartja, így egy visszavont link képe legfeljebb egy napig marad ott. A Facebook a saját példányát a saját szabályai szerint tartja meg, nagyjából 30 napig.
|
||||||
|
- **Frissítés kézzel:** a Facebook megosztás-ellenőrzőjében (Sharing Debugger) a „Scrape Again” gombbal.
|
||||||
|
|
||||||
|
A frontend a `PUBLIC_BASE_URL` alapján írja az abszolút címeket; élesben ez `https://${DOMAIN}`.
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
# Promókódok
|
||||||
|
|
||||||
|
Amíg a fizetés nincs bekötve, a csomagokat promókóddal (és admin ajándékkal) lehet megkapni. Élesben a vásárlás ki van kapcsolva: a `MOCK_PAYMENTS` alapértéke a `deploy/docker-compose.yml`-ben `false`. A csomagkártyákon ilyenkor „Hamarosan” felirat áll.
|
||||||
|
|
||||||
|
## Admin: Admin → Promókódok
|
||||||
|
|
||||||
|
- **Kódkészítés:**
|
||||||
|
- Csomag (a fő csomagok és a kiegészítők közül), darab (1–500) és egy megjegyzés: kinek szól, melyik kampány.
|
||||||
|
- Az elkészült kódok egy listában jelennek meg, a „Mind másolása” gombbal kimásolhatók.
|
||||||
|
- A kód formája `ABCD-EFGH-JKLM`: 12 karakter, összetéveszthető betűk és számok nélkül (nincs 0/O, 1/I/L).
|
||||||
|
- **Lista:**
|
||||||
|
- Szűrhető állapotra: **fel nem használt** (ez az alapértelmezés), beváltott, visszavont, mind.
|
||||||
|
- Szűrhető csomagra, és kereshető kódrészletre, megjegyzésre vagy a beváltó e-mail-címére.
|
||||||
|
- A beváltott kódnál látszik, ki és mikor váltotta be.
|
||||||
|
- **Visszavonás:** fel nem használt kódot vissza lehet vonni. Utána nem váltható be.
|
||||||
|
|
||||||
|
## Felhasználó: beváltás
|
||||||
|
|
||||||
|
- **Hol lehet beváltani:**
|
||||||
|
- a fejléc „Kód beváltása” linkje (`/bevaltas`);
|
||||||
|
- a Csomagok oldal „Van promókódod?” doboza;
|
||||||
|
- a részletes elemzés ajánlata és a kérdés-válasz rész is ide vezet, ha nincs felhasználható egység.
|
||||||
|
- **Kitöltött link:** a `sorsfonalak.hu/bevaltas?kod=ABCD-EFGH-JKLM` link kitöltve nyitja meg a kódot. Aki nincs belépve, a belépés után ide tér vissza. Elég ezt a linket elküldeni a meghívottaknak.
|
||||||
|
- **Beírás:** a kód kis- vagy nagybetűvel, kötőjellel vagy anélkül is beírható.
|
||||||
|
- **Beváltás = feltöltés:** a kód nem hozzáad, hanem **feltölti** az egyenleget a csomag szintjéig. Minden egységnél (képletelemzés, kapcsolati elemzés, előrejelzés, kérdés, szabad személyhely) az új egyenleg a csomag mennyisége lesz, ha addig kevesebb volt.
|
||||||
|
- Ami elhasznált belőle, visszajön; ami ennél több van (például vett hozzá), megmarad.
|
||||||
|
- Példa: a „Páros” csomag 2 képletelemzést ad. Ha valakinek 0 maradt, 2 lesz; ha 5 van, 5 marad.
|
||||||
|
- Ha a felhasználónak már mindenből megvan a csomag mennyisége, a kódot nem váltjuk be (megmarad későbbre), és ezt üzenetben meg is mondjuk.
|
||||||
|
- Könyvelés: egy `package_orders` sor `promo` forrással, 0 Ft-tal, és `credit_ledger` sorok csak a ténylegesen hozzáadott mennyiségekkel. A válaszban az `added` mező mondja meg, mi került hozzá.
|
||||||
|
- **Egyszer:** egy kód egyszer váltható be. A „már felhasználták”, „már nem érvényes” és „nincs ilyen kód” esetekre külön üzenet van.
|
||||||
|
- **Találgatás ellen:** 10 sikertelen próbálkozás után a felhasználó negyed óráig nem próbálkozhat.
|
||||||
|
|
||||||
|
## Meghívó csomaggal
|
||||||
|
|
||||||
|
Az Admin → Meghívók oldalon az „Ajándék csomag” választóval minden meghívott kap egy promókódot a választott csomagra (megjegyzés: „meghívó: <cím>”).
|
||||||
|
|
||||||
|
- **A levélben** benne van a csomag neve és a kód. A levél előnézete is mutatja (minta kóddal).
|
||||||
|
- **Regisztrációkor** a kód magától beváltódik, ugyanazzal a feltöltéssel, mint a kézi beváltásnál. Ha mégsem, a kód kézzel is beváltható.
|
||||||
|
- **Újraküldéskor** a levélben ugyanaz a kód marad.
|
||||||
|
- **Visszavonás:** a meghívó visszavonása a még fel nem használt kódot is visszavonja.
|
||||||
|
- **A meghívók listájában** látszik a csomag, és hogy beváltották-e.
|
||||||
|
- **A várólistán lévőket** is csomaggal lehet meghívni: a „Várólista” táblázat fölötti választóval a „Meghívás” gomb azzal a csomaggal küldi a meghívót.
|
||||||
|
|
||||||
|
## Várólista
|
||||||
|
|
||||||
|
- **Visszaigazolás:** aki feliratkozik, egyszer kap egy visszaigazoló levelet (`waitlist_joined`), benne leiratkozó linkkel.
|
||||||
|
- **Leiratkozás:** a link leveszi a címet a listáról, és felveszi a „nem kér levelet” listára, így meghívót sem küldünk oda többet.
|
||||||
|
- **Korlát:** IP-címenként 15 percen belül legfeljebb 10 levél megy ki, hogy az űrlappal ne lehessen mások postafiókját elárasztani. A lista legfeljebb 10 000 cím.
|
||||||
|
|
||||||
|
## API
|
||||||
|
|
||||||
|
| Végpont | Ki | Mit csinál |
|
||||||
|
|---|---|---|
|
||||||
|
| `POST /v1/admin/promo-codes` `{package, count, note?}` | admin | kódok készítése |
|
||||||
|
| `GET /v1/admin/promo-codes?status=unused\|used\|revoked\|all&package=&q=&limit=&offset=` | admin | lista |
|
||||||
|
| `POST /v1/admin/promo-codes/{id}/revoke` | admin | visszavonás |
|
||||||
|
| `POST /v1/promo-codes/redeem` `{code}` | belépett felhasználó | beváltás (feltöltés); a válaszban az új egyenleg, a csomag és az `added` |
|
||||||
|
| `POST /v1/admin/invitations` `{emails, message?, locale?, package?}` | admin | meghívó, opcionálisan csomaggal |
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
# Személy meghívása
|
||||||
|
|
||||||
|
Az „Új személy” oldalon két lehetőség van:
|
||||||
|
|
||||||
|
- **Adatok megadása:** a felhasználó maga írja be a születési adatokat. Ez egy személyhelyet használ, ahogy eddig.
|
||||||
|
- **Meghívom:** egy „Mennyire illünk össze?” meghívó (`synastry_invites`). A meghívott a saját adatait adja meg. Személyhely nem kell hozzá, és akkor is működik, ha a helyek elfogytak.
|
||||||
|
|
||||||
|
**Az élesítésig ki van kapcsolva:** a „Meghívom” lehetőség és a Személyek oldal „Hívd meg, akit szeretsz” kártyája látszik, de „Hamarosan” felirattal le van tiltva. A backend `invites_disabled` hibával utasítja el. Bekapcsolás: `USER_INVITES=true` a szerver `.env` fájljában. Az adminok a kapcsolótól függetlenül meghívhatnak, hogy ki tudják próbálni.
|
||||||
|
|
||||||
|
## Menete
|
||||||
|
|
||||||
|
1. **A meghívó elkészül.** A meghívó megadhatja, kinek szól (ezt csak ő látja), a meghívott e-mail-címét (nem kötelező) és egy üzenetet (legfeljebb 300 karakter, link nélkül). A link `/meghivas/<kód>`, 14 napig érvényes. Megosztható másolással, a telefon megosztás menüjével, WhatsAppon vagy Facebookon.
|
||||||
|
2. **Levél** (`synastry_invite` sablon), ha e-mail-cím is van:
|
||||||
|
- naponta legfeljebb 10 levél felhasználónként, a többi meghívó csak linkkel megy;
|
||||||
|
- aki leiratkozott a meghívókról, nem kap levelet (a link ilyenkor is működik);
|
||||||
|
- a levél alján leiratkozó link van, ugyanaz a végpont, mint az oldalmeghívóknál.
|
||||||
|
3. **A meghívott a linkről érkezik.**
|
||||||
|
- Belép Google-lal. Meghívásos regisztrációnál a link kódja engedi be.
|
||||||
|
- Ha még nincs képlete, megadja a születési adatait, és rögtön elkészül az összevetés (`POST /v1/invites/accept`).
|
||||||
|
- Az összevetés oldalára jut.
|
||||||
|
4. **A meghívó értesítést kap** (`invite_accepted`, a link az `/osszevetesek/<id>` oldalra visz). A Személyek oldalon a „Meghívóid” listában látszanak a függő meghívók (visszavonhatók) és az elmúlt 30 nap elfogadott meghívói.
|
||||||
|
|
||||||
|
## Ki mit fizet
|
||||||
|
|
||||||
|
| Mi | Ár |
|
||||||
|
|---|---|
|
||||||
|
| A meghívott képlete és rövid összefoglalója | ingyen, mint mindenkinek |
|
||||||
|
| Az összevetés rajza és táblázatai | ingyen |
|
||||||
|
| Kapcsolati elemzés | 1 kapcsolati egység, annak, aki elindítja; mindketten látják, és mindketten kérdezhetnek róla |
|
||||||
|
| A meghívott részletes képletelemzése | csak ha ő kéri, a saját egységéből |
|
||||||
|
|
||||||
|
A meghívó a meghívott születési adatait nem látja, csak a bolygóállásokat és az összevetést.
|
||||||
@@ -10,6 +10,8 @@ publish.workspace = true
|
|||||||
db.workspace = true
|
db.workspace = true
|
||||||
analysis-prompt.workspace = true
|
analysis-prompt.workspace = true
|
||||||
email-templates.workspace = true
|
email-templates.workspace = true
|
||||||
|
hmac.workspace = true
|
||||||
|
rand.workspace = true
|
||||||
horoscope-client.workspace = true
|
horoscope-client.workspace = true
|
||||||
service-kit.workspace = true
|
service-kit.workspace = true
|
||||||
anyhow.workspace = true
|
anyhow.workspace = true
|
||||||
|
|||||||
@@ -16,10 +16,13 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked \
|
|||||||
--mount=type=cache,target=/app/target,sharing=locked \
|
--mount=type=cache,target=/app/target,sharing=locked \
|
||||||
cargo build --release --locked -p backend \
|
cargo build --release --locked -p backend \
|
||||||
&& cp target/release/backend /backend
|
&& cp target/release/backend /backend
|
||||||
|
# The log directory (LOG_DIR); a volume mounted here takes over its owner.
|
||||||
|
RUN mkdir /logs
|
||||||
|
|
||||||
# --- 2. runtime: the binary only (TLS roots are compiled in via webpki-roots) ---
|
# --- 2. runtime: the binary only (TLS roots are compiled in via webpki-roots) ---
|
||||||
FROM scratch
|
FROM scratch
|
||||||
COPY --from=build /backend /backend
|
COPY --from=build /backend /backend
|
||||||
|
COPY --from=build --chown=65532:65532 /logs /logs
|
||||||
ENV BIND_ADDR=0.0.0.0:8081 \
|
ENV BIND_ADDR=0.0.0.0:8081 \
|
||||||
LOG_FORMAT=json \
|
LOG_FORMAT=json \
|
||||||
RUST_LOG=info
|
RUST_LOG=info
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ Felhasználók, belépés, mentett születési képletek, szinasztriák és megh
|
|||||||
| `FREE_PERSON_SLOTS` | `0` | ennyi személyt vehet fel csomag nélkül egy felhasználó |
|
| `FREE_PERSON_SLOTS` | `0` | ennyi személyt vehet fel csomag nélkül egy felhasználó |
|
||||||
| `SIGNUP_MODE` | `invite` | `invite`: új fiók csak meghívóval jön létre (403 `not_invited`); `open`: bárki regisztrálhat |
|
| `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 |
|
| `GOOGLE_CLIENT_IDS` | – | Google OAuth kliens-azonosító(k); üresen a Google-belépés ki van kapcsolva |
|
||||||
|
| `APPLE_CLIENT_IDS` | – | Sign in with Apple: a Services ID(k) vesszővel elválasztva (pl. `hu.sorsfonalak.web`), az ID token `aud` mezője ezek egyike kell legyen; üresen az Apple-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) |
|
| `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 |
|
| `SUPPORTED_LOCALES` | `hu,en` | felület- és elemzésnyelvek; az első az alapértelmezett |
|
||||||
| `ANALYSIS_MODEL` | `anthropic/claude-opus-5.5` | az elemzések, előrejelzések és válaszok alapmodellje, és a tartalék, ha a választott modell hibára fut |
|
| `ANALYSIS_MODEL` | `anthropic/claude-opus-5.5` | az elemzések, előrejelzések és válaszok alapmodellje, és a tartalék, ha a választott modell hibára fut |
|
||||||
|
|||||||
@@ -45,11 +45,42 @@ pub struct Config {
|
|||||||
/// `MOCK_PAYMENTS` (default `false`): a stand-in payment that adds an
|
/// `MOCK_PAYMENTS` (default `false`): a stand-in payment that adds an
|
||||||
/// analysis unit at once, until Stripe is connected.
|
/// analysis unit at once, until Stripe is connected.
|
||||||
pub mock_payments: bool,
|
pub mock_payments: bool,
|
||||||
|
/// Stripe Checkout, when `STRIPE_SECRET_KEY` is set (it wins over
|
||||||
|
/// `MOCK_PAYMENTS`).
|
||||||
|
pub stripe: Option<StripeConfig>,
|
||||||
|
/// `INVOICE_VAT` (default `AAM`, alanyi adómentes; or e.g. `27%`).
|
||||||
|
pub invoice_vat: crate::invoices::Vat,
|
||||||
|
/// `BILLINGO_API_KEY`: downloading invoices (the worker issues them).
|
||||||
|
pub billingo_api_key: Option<String>,
|
||||||
|
/// `BILLINGO_API_URL` (default `https://api.billingo.hu/v3`).
|
||||||
|
pub billingo_api_url: String,
|
||||||
|
/// `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,
|
||||||
|
/// `TERMS_CONSENT` (default `false`): Stripe's payment page asks every
|
||||||
|
/// buyer to accept the ÁSZF and give up the withdrawal right. Needs the
|
||||||
|
/// terms URL in Stripe's Public details; off until the opening.
|
||||||
|
pub terms_consent: 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.
|
||||||
|
pub user_invites: bool,
|
||||||
|
/// `REFERRAL_REWARDS` (default `false`): someone who signs up from a
|
||||||
|
/// shared link and makes their own chart earns the sharer a natal
|
||||||
|
/// analysis (at most three). Off until sign-up opens.
|
||||||
|
pub referral_rewards: bool,
|
||||||
/// `GOOGLE_CLIENT_IDS`: comma-separated OAuth client ids accepted as the
|
/// `GOOGLE_CLIENT_IDS`: comma-separated OAuth client ids accepted as the
|
||||||
/// ID token audience; empty disables Google login.
|
/// ID token audience; empty disables Google login.
|
||||||
pub google_client_ids: Vec<String>,
|
pub google_client_ids: Vec<String>,
|
||||||
/// `GOOGLE_JWKS_URL` (default Google's certificate endpoint).
|
/// `GOOGLE_JWKS_URL` (default Google's certificate endpoint).
|
||||||
pub google_jwks_url: String,
|
pub google_jwks_url: String,
|
||||||
|
/// `APPLE_CLIENT_IDS`: comma-separated Services IDs (e.g.
|
||||||
|
/// `hu.sorsfonalak.web`) accepted as the ID token audience; empty
|
||||||
|
/// disables Sign in with Apple.
|
||||||
|
pub apple_client_ids: Vec<String>,
|
||||||
|
/// `APPLE_JWKS_URL` (default Apple's key endpoint).
|
||||||
|
pub apple_jwks_url: String,
|
||||||
/// `BOOTSTRAP_ADMIN_EMAILS`: these users get the admin role when they
|
/// `BOOTSTRAP_ADMIN_EMAILS`: these users get the admin role when they
|
||||||
/// register or log in (to create the first administrator).
|
/// register or log in (to create the first administrator).
|
||||||
pub bootstrap_admin_emails: Vec<String>,
|
pub bootstrap_admin_emails: Vec<String>,
|
||||||
@@ -77,6 +108,34 @@ pub struct Config {
|
|||||||
pub signup_mode: SignupMode,
|
pub signup_mode: SignupMode,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// `STRIPE_SECRET_KEY` (`sk_test_…` or `sk_live_…`), `STRIPE_WEBHOOK_SECRET`
|
||||||
|
/// (`whsec_…`, from the webhook endpoint in the Stripe dashboard) and
|
||||||
|
/// `STRIPE_API_URL` (default `https://api.stripe.com`, tests change it).
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct StripeConfig {
|
||||||
|
pub secret_key: String,
|
||||||
|
pub webhook_secret: Option<String>,
|
||||||
|
pub api_url: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl StripeConfig {
|
||||||
|
/// A test-mode key: no real money moves.
|
||||||
|
pub fn test_mode(&self) -> bool {
|
||||||
|
self.secret_key.starts_with("sk_test_") || self.secret_key.starts_with("rk_test_")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The keys stay out of logs.
|
||||||
|
impl std::fmt::Debug for StripeConfig {
|
||||||
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
|
f.debug_struct("StripeConfig")
|
||||||
|
.field("test_mode", &self.test_mode())
|
||||||
|
.field("webhook_secret", &self.webhook_secret.is_some())
|
||||||
|
.field("api_url", &self.api_url)
|
||||||
|
.finish()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn var(name: &str) -> Option<String> {
|
fn var(name: &str) -> Option<String> {
|
||||||
std::env::var(name).ok().map(|v| v.trim().to_string()).filter(|v| !v.is_empty())
|
std::env::var(name).ok().map(|v| v.trim().to_string()).filter(|v| !v.is_empty())
|
||||||
}
|
}
|
||||||
@@ -119,9 +178,33 @@ impl Config {
|
|||||||
session_ttl_days: parsed("SESSION_TTL_DAYS", 30)?,
|
session_ttl_days: parsed("SESSION_TTL_DAYS", 30)?,
|
||||||
password_login: parsed("PASSWORD_LOGIN", false)?,
|
password_login: parsed("PASSWORD_LOGIN", false)?,
|
||||||
mock_payments: parsed("MOCK_PAYMENTS", false)?,
|
mock_payments: parsed("MOCK_PAYMENTS", false)?,
|
||||||
|
stripe: var("STRIPE_SECRET_KEY").map(|secret_key| StripeConfig {
|
||||||
|
secret_key,
|
||||||
|
webhook_secret: var("STRIPE_WEBHOOK_SECRET"),
|
||||||
|
api_url: var("STRIPE_API_URL")
|
||||||
|
.unwrap_or_else(|| "https://api.stripe.com".into())
|
||||||
|
.trim_end_matches('/')
|
||||||
|
.to_string(),
|
||||||
|
}),
|
||||||
|
invoice_vat: match var("INVOICE_VAT") {
|
||||||
|
None => crate::invoices::Vat::Exempt,
|
||||||
|
Some(raw) => crate::invoices::Vat::parse(&raw)
|
||||||
|
.with_context(|| format!("invalid INVOICE_VAT '{raw}': use AAM or a rate like 27%"))?,
|
||||||
|
},
|
||||||
|
billingo_api_key: var("BILLINGO_API_KEY"),
|
||||||
|
billingo_api_url: var("BILLINGO_API_URL")
|
||||||
|
.unwrap_or_else(|| "https://api.billingo.hu/v3".into())
|
||||||
|
.trim_end_matches('/')
|
||||||
|
.to_string(),
|
||||||
|
purchases_open: parsed("PURCHASES_OPEN", false)?,
|
||||||
|
terms_consent: parsed("TERMS_CONSENT", false)?,
|
||||||
|
user_invites: parsed("USER_INVITES", false)?,
|
||||||
|
referral_rewards: parsed("REFERRAL_REWARDS", false)?,
|
||||||
google_client_ids: list("GOOGLE_CLIENT_IDS"),
|
google_client_ids: list("GOOGLE_CLIENT_IDS"),
|
||||||
google_jwks_url: var("GOOGLE_JWKS_URL")
|
google_jwks_url: var("GOOGLE_JWKS_URL")
|
||||||
.unwrap_or_else(|| "https://www.googleapis.com/oauth2/v3/certs".into()),
|
.unwrap_or_else(|| "https://www.googleapis.com/oauth2/v3/certs".into()),
|
||||||
|
apple_client_ids: list("APPLE_CLIENT_IDS"),
|
||||||
|
apple_jwks_url: var("APPLE_JWKS_URL").unwrap_or_else(|| "https://appleid.apple.com/auth/keys".into()),
|
||||||
bootstrap_admin_emails: list("BOOTSTRAP_ADMIN_EMAILS").into_iter().map(|e| e.to_lowercase()).collect(),
|
bootstrap_admin_emails: list("BOOTSTRAP_ADMIN_EMAILS").into_iter().map(|e| e.to_lowercase()).collect(),
|
||||||
supported_locales,
|
supported_locales,
|
||||||
analysis_model: var("ANALYSIS_MODEL").unwrap_or_else(|| "anthropic/claude-opus-5.5".into()),
|
analysis_model: var("ANALYSIS_MODEL").unwrap_or_else(|| "anthropic/claude-opus-5.5".into()),
|
||||||
@@ -156,7 +239,17 @@ impl Config {
|
|||||||
session_ttl_days: 30,
|
session_ttl_days: 30,
|
||||||
password_login: true,
|
password_login: true,
|
||||||
mock_payments: true,
|
mock_payments: true,
|
||||||
|
stripe: None,
|
||||||
|
invoice_vat: crate::invoices::Vat::Exempt,
|
||||||
|
billingo_api_key: Some("billingo-fake".into()),
|
||||||
|
billingo_api_url: format!("{horoscope_api_url}/billingo"),
|
||||||
|
purchases_open: true,
|
||||||
|
terms_consent: true,
|
||||||
|
user_invites: true,
|
||||||
|
referral_rewards: true,
|
||||||
google_client_ids: vec!["test-client.apps.googleusercontent.com".into()],
|
google_client_ids: vec!["test-client.apps.googleusercontent.com".into()],
|
||||||
|
apple_client_ids: vec!["hu.sorsfonalak.test".into()],
|
||||||
|
apple_jwks_url: google_jwks_url.clone(),
|
||||||
google_jwks_url,
|
google_jwks_url,
|
||||||
bootstrap_admin_emails: vec!["admin@example.com".into()],
|
bootstrap_admin_emails: vec!["admin@example.com".into()],
|
||||||
supported_locales: vec!["hu".into(), "en".into()],
|
supported_locales: vec!["hu".into(), "en".into()],
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
//! Analysis units: a detailed natal analysis uses one `natal` unit, a
|
//! Analysis units: a detailed natal analysis uses one `natal` unit, a
|
||||||
//! synastry analysis one `synastry` unit, a yearly forecast one `forecast`
|
//! synastry analysis one `synastry` unit, a yearly forecast one `forecast`
|
||||||
//! unit, a question about an analysis one `question` unit. Units come from
|
//! unit, a question about an analysis one `question` unit, a tarot reading one
|
||||||
//! purchases or an admin; a failed analysis or answer gives its unit back
|
//! `tarot` unit. Units come from purchases or an admin; a failed analysis or
|
||||||
//! (the worker does that).
|
//! answer gives its unit back (the worker does that).
|
||||||
|
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use serde_json::{Value, json};
|
use serde_json::{Value, json};
|
||||||
@@ -22,6 +22,8 @@ pub enum Unit {
|
|||||||
Person,
|
Person,
|
||||||
/// A question about a finished analysis (see `routes::questions`).
|
/// A question about a finished analysis (see `routes::questions`).
|
||||||
Question,
|
Question,
|
||||||
|
/// A tarot reading (see `routes::tarot`).
|
||||||
|
Tarot,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Unit {
|
impl Unit {
|
||||||
@@ -32,6 +34,7 @@ impl Unit {
|
|||||||
Unit::Forecast => "forecast",
|
Unit::Forecast => "forecast",
|
||||||
Unit::Person => "person",
|
Unit::Person => "person",
|
||||||
Unit::Question => "question",
|
Unit::Question => "question",
|
||||||
|
Unit::Tarot => "tarot",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -45,6 +48,7 @@ pub struct Balance {
|
|||||||
/// Bought person slots (not the slots left; see [`crate::persons::slots`]).
|
/// Bought person slots (not the slots left; see [`crate::persons::slots`]).
|
||||||
pub person: i64,
|
pub person: i64,
|
||||||
pub question: i64,
|
pub question: i64,
|
||||||
|
pub tarot: i64,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Balance {
|
impl Balance {
|
||||||
@@ -55,27 +59,32 @@ impl Balance {
|
|||||||
Unit::Forecast => self.forecast,
|
Unit::Forecast => self.forecast,
|
||||||
Unit::Person => self.person,
|
Unit::Person => self.person,
|
||||||
Unit::Question => self.question,
|
Unit::Question => self.question,
|
||||||
|
Unit::Tarot => self.tarot,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn view(self) -> Value {
|
pub fn view(self) -> Value {
|
||||||
json!({ "natal": self.natal, "synastry": self.synastry, "forecast": self.forecast, "question": self.question })
|
json!({
|
||||||
|
"natal": self.natal, "synastry": self.synastry, "forecast": self.forecast, "question": self.question,
|
||||||
|
"tarot": self.tarot,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn balance(conn: &mut PgConnection, user_id: Uuid) -> Result<Balance, ApiError> {
|
pub async fn balance(conn: &mut PgConnection, user_id: Uuid) -> Result<Balance, ApiError> {
|
||||||
let (natal, synastry, forecast, person, question): (i64, i64, i64, i64, i64) = sqlx::query_as(
|
let (natal, synastry, forecast, person, question, tarot): (i64, i64, i64, i64, i64, i64) = sqlx::query_as(
|
||||||
"SELECT COALESCE(SUM(delta) FILTER (WHERE unit = 'natal'), 0)::bigint, \
|
"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 = 'forecast'), 0)::bigint, \
|
COALESCE(SUM(delta) FILTER (WHERE unit = 'forecast'), 0)::bigint, \
|
||||||
COALESCE(SUM(delta) FILTER (WHERE unit = 'person' AND reason <> 'person'), 0)::bigint, \
|
COALESCE(SUM(delta) FILTER (WHERE unit = 'person' AND reason <> 'person'), 0)::bigint, \
|
||||||
COALESCE(SUM(delta) FILTER (WHERE unit = 'question'), 0)::bigint \
|
COALESCE(SUM(delta) FILTER (WHERE unit = 'question'), 0)::bigint, \
|
||||||
|
COALESCE(SUM(delta) FILTER (WHERE unit = 'tarot'), 0)::bigint \
|
||||||
FROM credit_ledger WHERE user_id = $1",
|
FROM credit_ledger WHERE user_id = $1",
|
||||||
)
|
)
|
||||||
.bind(user_id)
|
.bind(user_id)
|
||||||
.fetch_one(conn)
|
.fetch_one(conn)
|
||||||
.await?;
|
.await?;
|
||||||
Ok(Balance { natal, synastry, forecast, person, question })
|
Ok(Balance { natal, synastry, forecast, person, question, tarot })
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Spends one unit inside the caller's transaction. The user row is locked
|
/// Spends one unit inside the caller's transaction. The user row is locked
|
||||||
|
|||||||
@@ -1,107 +0,0 @@
|
|||||||
//! Google Sign-In: verification of Google ID tokens.
|
|
||||||
//!
|
|
||||||
//! The frontend obtains an ID token with Google Identity Services (button or
|
|
||||||
//! One Tap) and posts it to `POST /v1/auth/google`. The token is a JWT signed
|
|
||||||
//! by Google; it is verified here against Google's published keys (JWKS,
|
|
||||||
//! cached), the configured client ids (audience) and the issuer.
|
|
||||||
|
|
||||||
use std::time::{Duration, Instant};
|
|
||||||
|
|
||||||
use jsonwebtoken::{Algorithm, DecodingKey, Validation, decode, decode_header};
|
|
||||||
use serde::Deserialize;
|
|
||||||
use tokio::sync::RwLock;
|
|
||||||
|
|
||||||
use crate::error::ApiError;
|
|
||||||
|
|
||||||
const ISSUERS: [&str; 2] = ["accounts.google.com", "https://accounts.google.com"];
|
|
||||||
const JWKS_MAX_AGE: Duration = Duration::from_secs(3600);
|
|
||||||
|
|
||||||
#[derive(Debug, Deserialize)]
|
|
||||||
pub struct GoogleClaims {
|
|
||||||
/// Stable Google account id.
|
|
||||||
pub sub: String,
|
|
||||||
pub email: Option<String>,
|
|
||||||
#[serde(default)]
|
|
||||||
pub email_verified: bool,
|
|
||||||
pub name: Option<String>,
|
|
||||||
pub locale: Option<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Deserialize)]
|
|
||||||
struct Jwk {
|
|
||||||
kid: String,
|
|
||||||
n: String,
|
|
||||||
e: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Deserialize)]
|
|
||||||
struct JwkSet {
|
|
||||||
keys: Vec<Jwk>,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct GoogleVerifier {
|
|
||||||
client_ids: Vec<String>,
|
|
||||||
jwks_url: String,
|
|
||||||
http: reqwest::Client,
|
|
||||||
cache: RwLock<Option<(Instant, Vec<Jwk>)>>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl GoogleVerifier {
|
|
||||||
pub fn new(client_ids: Vec<String>, jwks_url: String) -> Self {
|
|
||||||
let http = reqwest::Client::builder().timeout(Duration::from_secs(10)).build().expect("static configuration");
|
|
||||||
Self { client_ids, jwks_url, http, cache: RwLock::new(None) }
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn enabled(&self) -> bool {
|
|
||||||
!self.client_ids.is_empty()
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn fetch_keys(&self) -> Result<Vec<Jwk>, ApiError> {
|
|
||||||
let set: JwkSet = self
|
|
||||||
.http
|
|
||||||
.get(&self.jwks_url)
|
|
||||||
.send()
|
|
||||||
.await
|
|
||||||
.and_then(|r| r.error_for_status())
|
|
||||||
.map_err(|e| ApiError::Internal(format!("fetching Google keys: {e}")))?
|
|
||||||
.json()
|
|
||||||
.await
|
|
||||||
.map_err(|e| ApiError::Internal(format!("parsing Google keys: {e}")))?;
|
|
||||||
Ok(set.keys)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The key with `kid`; the key set is refetched when it is stale or the
|
|
||||||
/// key is unknown (Google rotates its keys).
|
|
||||||
async fn key(&self, kid: &str) -> Result<Jwk, ApiError> {
|
|
||||||
if let Some((fetched, keys)) = self.cache.read().await.as_ref()
|
|
||||||
&& fetched.elapsed() < JWKS_MAX_AGE
|
|
||||||
&& let Some(k) = keys.iter().find(|k| k.kid == kid)
|
|
||||||
{
|
|
||||||
return Ok(k.clone());
|
|
||||||
}
|
|
||||||
let keys = self.fetch_keys().await?;
|
|
||||||
let found = keys.iter().find(|k| k.kid == kid).cloned();
|
|
||||||
*self.cache.write().await = Some((Instant::now(), keys));
|
|
||||||
found.ok_or_else(|| ApiError::InvalidCredentials("the Google token is signed with an unknown key".into()))
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn verify(&self, id_token: &str) -> Result<GoogleClaims, ApiError> {
|
|
||||||
if !self.enabled() {
|
|
||||||
return Err(ApiError::Forbidden("Google login is not configured".into()));
|
|
||||||
}
|
|
||||||
let invalid =
|
|
||||||
|e: jsonwebtoken::errors::Error| ApiError::InvalidCredentials(format!("invalid Google token: {e}"));
|
|
||||||
let header = decode_header(id_token).map_err(invalid)?;
|
|
||||||
if header.alg != Algorithm::RS256 {
|
|
||||||
return Err(ApiError::InvalidCredentials("invalid Google token: unexpected algorithm".into()));
|
|
||||||
}
|
|
||||||
let kid = header.kid.ok_or_else(|| ApiError::InvalidCredentials("invalid Google token: no key id".into()))?;
|
|
||||||
let jwk = self.key(&kid).await?;
|
|
||||||
let key = DecodingKey::from_rsa_components(&jwk.n, &jwk.e).map_err(invalid)?;
|
|
||||||
let mut validation = Validation::new(Algorithm::RS256);
|
|
||||||
validation.set_audience(&self.client_ids);
|
|
||||||
validation.set_issuer(&ISSUERS);
|
|
||||||
validation.set_required_spec_claims(&["exp", "iss", "aud", "sub"]);
|
|
||||||
Ok(decode::<GoogleClaims>(id_token, &key, &validation).map_err(invalid)?.claims)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,194 @@
|
|||||||
|
//! Invoices of the Stripe payments. When a payment is confirmed, an invoice
|
||||||
|
//! row is queued with the buyer and the item as they go on the invoice; the
|
||||||
|
//! worker issues it in Billingo (`services/worker/src/invoices.rs`). Users
|
||||||
|
//! download the PDF through the backend, which fetches it from Billingo.
|
||||||
|
|
||||||
|
use serde_json::Value;
|
||||||
|
use sqlx::PgConnection;
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
use crate::error::ApiError;
|
||||||
|
|
||||||
|
/// The VAT on the invoices (`INVOICE_VAT`): `AAM` (alanyi adómentes, subject
|
||||||
|
/// to the small business exemption: no VAT, net = gross) or a rate like `27%`.
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
|
pub enum Vat {
|
||||||
|
Exempt,
|
||||||
|
Percent(i64),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Vat {
|
||||||
|
pub fn parse(raw: &str) -> Option<Self> {
|
||||||
|
match raw.trim() {
|
||||||
|
"AAM" => Some(Vat::Exempt),
|
||||||
|
rate => rate.strip_suffix('%')?.trim().parse().ok().filter(|p| (1..=27).contains(p)).map(Vat::Percent),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Billingo's VAT value.
|
||||||
|
pub fn code(self) -> String {
|
||||||
|
match self {
|
||||||
|
Vat::Exempt => "AAM".into(),
|
||||||
|
Vat::Percent(p) => format!("{p}%"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Net and VAT parts of a gross price (rounded to forints, as Billingo does).
|
||||||
|
pub fn split(self, gross: i64) -> (i64, i64) {
|
||||||
|
match self {
|
||||||
|
Vat::Exempt => (gross, 0),
|
||||||
|
Vat::Percent(p) => {
|
||||||
|
let net = (gross * 200 + 100 + p) / (200 + 2 * p);
|
||||||
|
(net, gross - net)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The buyer as invoiced, from Stripe's `customer_details`.
|
||||||
|
#[derive(Debug, PartialEq, Eq)]
|
||||||
|
pub struct Buyer {
|
||||||
|
pub name: String,
|
||||||
|
pub email: Option<String>,
|
||||||
|
pub country: String,
|
||||||
|
pub post_code: String,
|
||||||
|
pub city: String,
|
||||||
|
pub address: String,
|
||||||
|
/// Billingo's partner tax type: `HAS_TAX_NUMBER`, `NO_TAX_NUMBER` or `FOREIGN`.
|
||||||
|
pub tax_type: &'static str,
|
||||||
|
pub tax_number: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn text(v: &Value) -> Option<String> {
|
||||||
|
v.as_str().map(str::trim).filter(|s| !s.is_empty()).map(str::to_string)
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Buyer {
|
||||||
|
/// A company ("buying as a business") gives its name and tax id: a
|
||||||
|
/// Hungarian tax number (`hu_tin`) is preferred to an EU VAT number. A
|
||||||
|
/// Hungarian company with only an EU VAT number (`HU12345678`) is invoiced
|
||||||
|
/// without a tax type number: Billingo takes only the full domestic
|
||||||
|
/// number (`12345678-1-23`) for HAS_TAX_NUMBER; the EU number still goes
|
||||||
|
/// on the invoice, in its comment (the worker adds it).
|
||||||
|
pub fn from_stripe(details: &Value, fallback_email: Option<&str>) -> Self {
|
||||||
|
let address = &details["address"];
|
||||||
|
let tax_ids = details["tax_ids"].as_array().map(Vec::as_slice).unwrap_or_default();
|
||||||
|
let tax_id = |kind: &str| tax_ids.iter().find(|t| t["type"] == kind).and_then(|t| text(&t["value"]));
|
||||||
|
let tax_number = tax_id("hu_tin").or_else(|| tax_id("eu_vat"));
|
||||||
|
let country = text(&address["country"]).unwrap_or_else(|| "HU".into()).to_uppercase();
|
||||||
|
let tax_type = match (&tax_number, country.as_str()) {
|
||||||
|
(_, c) if c != "HU" => "FOREIGN",
|
||||||
|
(Some(_), _) if tax_id("hu_tin").is_some() => "HAS_TAX_NUMBER",
|
||||||
|
_ => "NO_TAX_NUMBER",
|
||||||
|
};
|
||||||
|
let street = [text(&address["line1"]), text(&address["line2"])].into_iter().flatten().collect::<Vec<_>>();
|
||||||
|
Self {
|
||||||
|
name: text(&details["business_name"])
|
||||||
|
.filter(|_| tax_number.is_some())
|
||||||
|
.or_else(|| text(&details["name"]))
|
||||||
|
.unwrap_or_else(|| "Vevő".into()),
|
||||||
|
email: text(&details["email"]).or_else(|| fallback_email.map(str::to_string)),
|
||||||
|
country,
|
||||||
|
post_code: text(&address["postal_code"]).unwrap_or_default(),
|
||||||
|
city: text(&address["city"]).unwrap_or_default(),
|
||||||
|
address: street.join(", "),
|
||||||
|
tax_type,
|
||||||
|
tax_number,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Queues the invoice of a paid checkout, inside the caller's transaction.
|
||||||
|
pub async fn queue(
|
||||||
|
tx: &mut PgConnection,
|
||||||
|
checkout_id: &str,
|
||||||
|
user_id: Option<Uuid>,
|
||||||
|
buyer: &Buyer,
|
||||||
|
(item_name, item_comment): (&str, &str),
|
||||||
|
gross_huf: i64,
|
||||||
|
vat: Vat,
|
||||||
|
) -> Result<Uuid, ApiError> {
|
||||||
|
let id = Uuid::now_v7();
|
||||||
|
let (net, vat_huf) = vat.split(gross_huf);
|
||||||
|
sqlx::query(
|
||||||
|
"INSERT INTO invoices (id, checkout_id, user_id, buyer_name, buyer_email, buyer_country, buyer_post_code, \
|
||||||
|
buyer_city, buyer_address, buyer_tax_type, buyer_tax_number, item_name, gross_huf, net_huf, vat_huf, vat_rate, \
|
||||||
|
item_comment) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17) \
|
||||||
|
ON CONFLICT (checkout_id) DO NOTHING",
|
||||||
|
)
|
||||||
|
.bind(id)
|
||||||
|
.bind(checkout_id)
|
||||||
|
.bind(user_id)
|
||||||
|
.bind(&buyer.name)
|
||||||
|
.bind(&buyer.email)
|
||||||
|
.bind(&buyer.country)
|
||||||
|
.bind(&buyer.post_code)
|
||||||
|
.bind(&buyer.city)
|
||||||
|
.bind(&buyer.address)
|
||||||
|
.bind(buyer.tax_type)
|
||||||
|
.bind(&buyer.tax_number)
|
||||||
|
.bind(item_name)
|
||||||
|
.bind(gross_huf as i32)
|
||||||
|
.bind(net as i32)
|
||||||
|
.bind(vat_huf as i32)
|
||||||
|
.bind(vat.code())
|
||||||
|
.bind(item_comment)
|
||||||
|
.execute(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
Ok(id)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use serde_json::json;
|
||||||
|
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn gross_prices_split_into_net_and_vat() {
|
||||||
|
let vat = Vat::parse("27%").unwrap();
|
||||||
|
assert_eq!(vat.split(2000), (1575, 425));
|
||||||
|
assert_eq!(vat.split(6000), (4724, 1276));
|
||||||
|
assert_eq!(vat.split(127), (100, 27));
|
||||||
|
assert_eq!(vat.code(), "27%");
|
||||||
|
// Alanyi adómentes: no VAT at all.
|
||||||
|
assert_eq!(Vat::parse("AAM"), Some(Vat::Exempt));
|
||||||
|
assert_eq!(Vat::Exempt.split(6000), (6000, 0));
|
||||||
|
assert_eq!(Vat::parse("huszonhét"), None);
|
||||||
|
assert_eq!(Vat::parse("99%"), None);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn buyers_from_stripe() {
|
||||||
|
let person = Buyer::from_stripe(
|
||||||
|
&json!({"name": "Kovács Anna", "email": "anna@example.com",
|
||||||
|
"address": {"line1": "Fő utca 1.", "line2": "2/3", "postal_code": "6720", "city": "Szeged", "country": "HU"},
|
||||||
|
"tax_ids": []}),
|
||||||
|
None,
|
||||||
|
);
|
||||||
|
assert_eq!(person.name, "Kovács Anna");
|
||||||
|
assert_eq!(person.address, "Fő utca 1., 2/3");
|
||||||
|
assert_eq!((person.tax_type, person.tax_number), ("NO_TAX_NUMBER", None));
|
||||||
|
|
||||||
|
let company = Buyer::from_stripe(
|
||||||
|
&json!({"name": "Kovács Anna", "business_name": "Csillag Kft.",
|
||||||
|
"address": {"line1": "Kossuth tér 2.", "postal_code": "1055", "city": "Budapest", "country": "HU"},
|
||||||
|
"tax_ids": [{"type": "eu_vat", "value": "HU12345678"}, {"type": "hu_tin", "value": "12345678-1-23"}]}),
|
||||||
|
Some("anna@example.com"),
|
||||||
|
);
|
||||||
|
assert_eq!(company.name, "Csillag Kft.");
|
||||||
|
assert_eq!(company.email.as_deref(), Some("anna@example.com"));
|
||||||
|
assert_eq!((company.tax_type, company.tax_number.as_deref()), ("HAS_TAX_NUMBER", Some("12345678-1-23")));
|
||||||
|
|
||||||
|
let eu_only = Buyer::from_stripe(
|
||||||
|
&json!({"name": "Kovács Anna", "business_name": "Csillag Kft.", "address": {"country": "HU"},
|
||||||
|
"tax_ids": [{"type": "eu_vat", "value": "HU12345678"}]}),
|
||||||
|
None,
|
||||||
|
);
|
||||||
|
assert_eq!(eu_only.name, "Csillag Kft.");
|
||||||
|
assert_eq!((eu_only.tax_type, eu_only.tax_number.as_deref()), ("NO_TAX_NUMBER", Some("HU12345678")));
|
||||||
|
|
||||||
|
let abroad = Buyer::from_stripe(&json!({"name": "Anna", "address": {"country": "at"}}), None);
|
||||||
|
assert_eq!((abroad.country.as_str(), abroad.tax_type), ("AT", "FOREIGN"));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -12,11 +12,13 @@ mod birth_changes;
|
|||||||
mod config;
|
mod config;
|
||||||
mod credits;
|
mod credits;
|
||||||
mod error;
|
mod error;
|
||||||
mod google;
|
mod invoices;
|
||||||
mod models;
|
mod models;
|
||||||
|
mod oidc;
|
||||||
mod packages;
|
mod packages;
|
||||||
mod persons;
|
mod persons;
|
||||||
mod routes;
|
mod routes;
|
||||||
|
mod stripe;
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests;
|
mod tests;
|
||||||
mod views;
|
mod views;
|
||||||
@@ -30,7 +32,7 @@ use sqlx::PgPool;
|
|||||||
|
|
||||||
use crate::auth::LoginLimiter;
|
use crate::auth::LoginLimiter;
|
||||||
use crate::config::Config;
|
use crate::config::Config;
|
||||||
use crate::google::GoogleVerifier;
|
use crate::oidc::IdTokenVerifier;
|
||||||
|
|
||||||
const DEFAULT_BIND_ADDR: &str = "0.0.0.0:8081";
|
const DEFAULT_BIND_ADDR: &str = "0.0.0.0:8081";
|
||||||
|
|
||||||
@@ -38,18 +40,22 @@ pub struct AppState {
|
|||||||
pub db: PgPool,
|
pub db: PgPool,
|
||||||
pub config: Config,
|
pub config: Config,
|
||||||
pub horoscope: HoroscopeClient,
|
pub horoscope: HoroscopeClient,
|
||||||
pub google: GoogleVerifier,
|
pub google: IdTokenVerifier,
|
||||||
|
pub apple: IdTokenVerifier,
|
||||||
pub login_limiter: LoginLimiter,
|
pub login_limiter: LoginLimiter,
|
||||||
pub models: models::Catalog,
|
pub models: models::Catalog,
|
||||||
|
pub stripe: stripe::Client,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl AppState {
|
impl AppState {
|
||||||
pub fn new(db: PgPool, config: Config) -> Self {
|
pub fn new(db: PgPool, config: Config) -> Self {
|
||||||
Self {
|
Self {
|
||||||
horoscope: HoroscopeClient::new(&config.horoscope_api_url),
|
horoscope: HoroscopeClient::new(&config.horoscope_api_url),
|
||||||
google: GoogleVerifier::new(config.google_client_ids.clone(), config.google_jwks_url.clone()),
|
google: IdTokenVerifier::google(config.google_client_ids.clone(), config.google_jwks_url.clone()),
|
||||||
|
apple: IdTokenVerifier::apple(config.apple_client_ids.clone(), config.apple_jwks_url.clone()),
|
||||||
login_limiter: LoginLimiter::new(10, Duration::from_secs(15 * 60)),
|
login_limiter: LoginLimiter::new(10, Duration::from_secs(15 * 60)),
|
||||||
models: models::Catalog::new(&config.openrouter_models_url),
|
models: models::Catalog::new(&config.openrouter_models_url),
|
||||||
|
stripe: stripe::Client::default(),
|
||||||
db,
|
db,
|
||||||
config,
|
config,
|
||||||
}
|
}
|
||||||
@@ -62,12 +68,13 @@ async fn main() -> anyhow::Result<()> {
|
|||||||
if std::env::args().nth(1).as_deref() == Some("healthcheck") {
|
if std::env::args().nth(1).as_deref() == Some("healthcheck") {
|
||||||
return service_kit::healthcheck(addr);
|
return service_kit::healthcheck(addr);
|
||||||
}
|
}
|
||||||
service_kit::init_logging();
|
let _log = service_kit::init_logging("backend");
|
||||||
let config = Config::from_env()?;
|
let config = Config::from_env()?;
|
||||||
let pool = db::connect(&config.database_url).await.context("connecting to the database")?;
|
let pool = db::connect(&config.database_url).await.context("connecting to the database")?;
|
||||||
db::migrate(&pool).await.context("running database migrations")?;
|
db::migrate(&pool).await.context("running database migrations")?;
|
||||||
tracing::info!(
|
tracing::info!(
|
||||||
google_login = !config.google_client_ids.is_empty(),
|
google_login = !config.google_client_ids.is_empty(),
|
||||||
|
apple_login = !config.apple_client_ids.is_empty(),
|
||||||
horoscope_api = %config.horoscope_api_url,
|
horoscope_api = %config.horoscope_api_url,
|
||||||
"database ready"
|
"database ready"
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -0,0 +1,139 @@
|
|||||||
|
//! Sign-in with Google and Apple: verification of their ID tokens.
|
||||||
|
//!
|
||||||
|
//! The frontend obtains an ID token (Google Identity Services, or Sign in with
|
||||||
|
//! Apple JS) and posts it to `POST /v1/auth/google` / `/v1/auth/apple`. The
|
||||||
|
//! token is a JWT signed by the provider; it is verified here against the
|
||||||
|
//! provider's published keys (JWKS, cached), the configured client ids
|
||||||
|
//! (audience: Google client ids, Apple Services IDs) and the issuer.
|
||||||
|
|
||||||
|
use std::time::{Duration, Instant};
|
||||||
|
|
||||||
|
use jsonwebtoken::{Algorithm, DecodingKey, Validation, decode, decode_header};
|
||||||
|
use serde::Deserialize;
|
||||||
|
use tokio::sync::RwLock;
|
||||||
|
|
||||||
|
use crate::error::ApiError;
|
||||||
|
|
||||||
|
const GOOGLE_ISSUERS: &[&str] = &["accounts.google.com", "https://accounts.google.com"];
|
||||||
|
const APPLE_ISSUERS: &[&str] = &["https://appleid.apple.com"];
|
||||||
|
const JWKS_MAX_AGE: Duration = Duration::from_secs(3600);
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize)]
|
||||||
|
pub struct IdClaims {
|
||||||
|
/// Stable account id at the provider.
|
||||||
|
pub sub: String,
|
||||||
|
pub email: Option<String>,
|
||||||
|
/// Apple sends it as a string ("true").
|
||||||
|
#[serde(default, deserialize_with = "flexible_bool")]
|
||||||
|
pub email_verified: bool,
|
||||||
|
/// Google only; Apple gives the name to the frontend, at the first sign-in.
|
||||||
|
pub name: Option<String>,
|
||||||
|
pub locale: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn flexible_bool<'de, D: serde::Deserializer<'de>>(d: D) -> Result<bool, D::Error> {
|
||||||
|
Ok(match serde_json::Value::deserialize(d)? {
|
||||||
|
serde_json::Value::Bool(b) => b,
|
||||||
|
serde_json::Value::String(s) => s == "true",
|
||||||
|
_ => false,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Deserialize)]
|
||||||
|
struct Jwk {
|
||||||
|
kid: String,
|
||||||
|
n: String,
|
||||||
|
e: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize)]
|
||||||
|
struct JwkSet {
|
||||||
|
keys: Vec<Jwk>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct IdTokenVerifier {
|
||||||
|
/// "Google" or "Apple", for messages.
|
||||||
|
provider: &'static str,
|
||||||
|
issuers: &'static [&'static str],
|
||||||
|
client_ids: Vec<String>,
|
||||||
|
jwks_url: String,
|
||||||
|
http: reqwest::Client,
|
||||||
|
cache: RwLock<Option<(Instant, Vec<Jwk>)>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl IdTokenVerifier {
|
||||||
|
fn new(
|
||||||
|
provider: &'static str,
|
||||||
|
issuers: &'static [&'static str],
|
||||||
|
client_ids: Vec<String>,
|
||||||
|
jwks_url: String,
|
||||||
|
) -> Self {
|
||||||
|
let http = reqwest::Client::builder().timeout(Duration::from_secs(10)).build().expect("static configuration");
|
||||||
|
Self { provider, issuers, client_ids, jwks_url, http, cache: RwLock::new(None) }
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn google(client_ids: Vec<String>, jwks_url: String) -> Self {
|
||||||
|
Self::new("Google", GOOGLE_ISSUERS, client_ids, jwks_url)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn apple(client_ids: Vec<String>, jwks_url: String) -> Self {
|
||||||
|
Self::new("Apple", APPLE_ISSUERS, client_ids, jwks_url)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn enabled(&self) -> bool {
|
||||||
|
!self.client_ids.is_empty()
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn fetch_keys(&self) -> Result<Vec<Jwk>, ApiError> {
|
||||||
|
let set: JwkSet = self
|
||||||
|
.http
|
||||||
|
.get(&self.jwks_url)
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.and_then(|r| r.error_for_status())
|
||||||
|
.map_err(|e| ApiError::Internal(format!("fetching {} keys: {e}", self.provider)))?
|
||||||
|
.json()
|
||||||
|
.await
|
||||||
|
.map_err(|e| ApiError::Internal(format!("parsing {} keys: {e}", self.provider)))?;
|
||||||
|
Ok(set.keys)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The key with `kid`; the key set is refetched when it is stale or the
|
||||||
|
/// key is unknown (the providers rotate their keys).
|
||||||
|
async fn key(&self, kid: &str) -> Result<Jwk, ApiError> {
|
||||||
|
if let Some((fetched, keys)) = self.cache.read().await.as_ref()
|
||||||
|
&& fetched.elapsed() < JWKS_MAX_AGE
|
||||||
|
&& let Some(k) = keys.iter().find(|k| k.kid == kid)
|
||||||
|
{
|
||||||
|
return Ok(k.clone());
|
||||||
|
}
|
||||||
|
let keys = self.fetch_keys().await?;
|
||||||
|
let found = keys.iter().find(|k| k.kid == kid).cloned();
|
||||||
|
*self.cache.write().await = Some((Instant::now(), keys));
|
||||||
|
found.ok_or_else(|| {
|
||||||
|
ApiError::InvalidCredentials(format!("the {} token is signed with an unknown key", self.provider))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn verify(&self, id_token: &str) -> Result<IdClaims, ApiError> {
|
||||||
|
let provider = self.provider;
|
||||||
|
if !self.enabled() {
|
||||||
|
return Err(ApiError::Forbidden(format!("{provider} login is not configured")));
|
||||||
|
}
|
||||||
|
let invalid =
|
||||||
|
|e: jsonwebtoken::errors::Error| ApiError::InvalidCredentials(format!("invalid {provider} token: {e}"));
|
||||||
|
let header = decode_header(id_token).map_err(invalid)?;
|
||||||
|
if header.alg != Algorithm::RS256 {
|
||||||
|
return Err(ApiError::InvalidCredentials(format!("invalid {provider} token: unexpected algorithm")));
|
||||||
|
}
|
||||||
|
let kid =
|
||||||
|
header.kid.ok_or_else(|| ApiError::InvalidCredentials(format!("invalid {provider} token: no key id")))?;
|
||||||
|
let jwk = self.key(&kid).await?;
|
||||||
|
let key = DecodingKey::from_rsa_components(&jwk.n, &jwk.e).map_err(invalid)?;
|
||||||
|
let mut validation = Validation::new(Algorithm::RS256);
|
||||||
|
validation.set_audience(&self.client_ids);
|
||||||
|
validation.set_issuer(self.issuers);
|
||||||
|
validation.set_required_spec_claims(&["exp", "iss", "aud", "sub"]);
|
||||||
|
Ok(decode::<IdClaims>(id_token, &key, &validation).map_err(invalid)?.claims)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -37,7 +37,7 @@ pub struct Package {
|
|||||||
pub name: &'static str,
|
pub name: &'static str,
|
||||||
pub tagline: &'static str,
|
pub tagline: &'static str,
|
||||||
pub tier: Tier,
|
pub tier: Tier,
|
||||||
/// Gross price (27% VAT included).
|
/// The price paid (with VAT if `INVOICE_VAT` is a rate; none under AAM).
|
||||||
pub price_huf: i64,
|
pub price_huf: i64,
|
||||||
pub natal: i64,
|
pub natal: i64,
|
||||||
pub synastry: i64,
|
pub synastry: i64,
|
||||||
@@ -45,11 +45,13 @@ pub struct Package {
|
|||||||
pub persons: i64,
|
pub persons: i64,
|
||||||
/// Questions about the user's analyses and forecasts.
|
/// Questions about the user's analyses and forecasts.
|
||||||
pub questions: i64,
|
pub questions: i64,
|
||||||
|
/// Tarot readings.
|
||||||
|
pub tarot: i64,
|
||||||
/// Badge on the card ("Legnépszerűbb").
|
/// Badge on the card ("Legnépszerűbb").
|
||||||
pub badge: Option<&'static str>,
|
pub badge: Option<&'static str>,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub const CATALOG: [Package; 7] = [
|
pub const CATALOG: [Package; 8] = [
|
||||||
Package {
|
Package {
|
||||||
id: "single",
|
id: "single",
|
||||||
name: "Egy elemzés",
|
name: "Egy elemzés",
|
||||||
@@ -61,6 +63,7 @@ pub const CATALOG: [Package; 7] = [
|
|||||||
forecast: 0,
|
forecast: 0,
|
||||||
persons: 0,
|
persons: 0,
|
||||||
questions: QUESTIONS_INCLUDED,
|
questions: QUESTIONS_INCLUDED,
|
||||||
|
tarot: 2,
|
||||||
badge: None,
|
badge: None,
|
||||||
},
|
},
|
||||||
Package {
|
Package {
|
||||||
@@ -74,6 +77,7 @@ pub const CATALOG: [Package; 7] = [
|
|||||||
forecast: 2,
|
forecast: 2,
|
||||||
persons: 1,
|
persons: 1,
|
||||||
questions: QUESTIONS_INCLUDED,
|
questions: QUESTIONS_INCLUDED,
|
||||||
|
tarot: 5,
|
||||||
badge: None,
|
badge: None,
|
||||||
},
|
},
|
||||||
Package {
|
Package {
|
||||||
@@ -87,6 +91,7 @@ pub const CATALOG: [Package; 7] = [
|
|||||||
forecast: 6,
|
forecast: 6,
|
||||||
persons: 5,
|
persons: 5,
|
||||||
questions: QUESTIONS_INCLUDED,
|
questions: QUESTIONS_INCLUDED,
|
||||||
|
tarot: 10,
|
||||||
badge: Some("Legnépszerűbb"),
|
badge: Some("Legnépszerűbb"),
|
||||||
},
|
},
|
||||||
Package {
|
Package {
|
||||||
@@ -100,6 +105,7 @@ pub const CATALOG: [Package; 7] = [
|
|||||||
forecast: 0,
|
forecast: 0,
|
||||||
persons: 0,
|
persons: 0,
|
||||||
questions: 0,
|
questions: 0,
|
||||||
|
tarot: 0,
|
||||||
badge: None,
|
badge: None,
|
||||||
},
|
},
|
||||||
Package {
|
Package {
|
||||||
@@ -113,6 +119,7 @@ pub const CATALOG: [Package; 7] = [
|
|||||||
forecast: 1,
|
forecast: 1,
|
||||||
persons: 0,
|
persons: 0,
|
||||||
questions: 0,
|
questions: 0,
|
||||||
|
tarot: 0,
|
||||||
badge: None,
|
badge: None,
|
||||||
},
|
},
|
||||||
Package {
|
Package {
|
||||||
@@ -126,6 +133,7 @@ pub const CATALOG: [Package; 7] = [
|
|||||||
forecast: 0,
|
forecast: 0,
|
||||||
persons: 5,
|
persons: 5,
|
||||||
questions: 0,
|
questions: 0,
|
||||||
|
tarot: 0,
|
||||||
badge: None,
|
badge: None,
|
||||||
},
|
},
|
||||||
Package {
|
Package {
|
||||||
@@ -139,6 +147,21 @@ pub const CATALOG: [Package; 7] = [
|
|||||||
forecast: 0,
|
forecast: 0,
|
||||||
persons: 0,
|
persons: 0,
|
||||||
questions: 5,
|
questions: 5,
|
||||||
|
tarot: 0,
|
||||||
|
badge: None,
|
||||||
|
},
|
||||||
|
Package {
|
||||||
|
id: "addon_tarot",
|
||||||
|
name: "+5 kártyajóslás",
|
||||||
|
tagline: "Öt újabb kártyajóslás a saját kérdéseidre.",
|
||||||
|
tier: Tier::Addon,
|
||||||
|
price_huf: 1_000,
|
||||||
|
natal: 0,
|
||||||
|
synastry: 0,
|
||||||
|
forecast: 0,
|
||||||
|
persons: 0,
|
||||||
|
questions: 0,
|
||||||
|
tarot: 5,
|
||||||
badge: None,
|
badge: None,
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
@@ -171,6 +194,7 @@ impl Package {
|
|||||||
"forecast": self.forecast,
|
"forecast": self.forecast,
|
||||||
"persons": self.persons,
|
"persons": self.persons,
|
||||||
"questions": self.questions,
|
"questions": self.questions,
|
||||||
|
"tarot": self.tarot,
|
||||||
"badge": self.badge,
|
"badge": self.badge,
|
||||||
"list_price_huf": list,
|
"list_price_huf": list,
|
||||||
"savings_percent": savings,
|
"savings_percent": savings,
|
||||||
@@ -184,6 +208,10 @@ impl Package {
|
|||||||
pub enum Source {
|
pub enum Source {
|
||||||
Admin,
|
Admin,
|
||||||
Mock,
|
Mock,
|
||||||
|
/// A redeemed promo code.
|
||||||
|
Promo,
|
||||||
|
/// Paid through Stripe Checkout.
|
||||||
|
Stripe,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Source {
|
impl Source {
|
||||||
@@ -191,11 +219,72 @@ impl Source {
|
|||||||
match self {
|
match self {
|
||||||
Source::Admin => "admin",
|
Source::Admin => "admin",
|
||||||
Source::Mock => "mock",
|
Source::Mock => "mock",
|
||||||
|
Source::Promo => "promo",
|
||||||
|
Source::Stripe => "stripe",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Records an order and gives its contents, inside the caller's transaction.
|
impl Package {
|
||||||
|
/// What the package gives, as a phrase: "2 részletes képletelemzés, 1 kapcsolati elemzés, …".
|
||||||
|
pub fn contents_text(&self) -> String {
|
||||||
|
[
|
||||||
|
(self.natal, "részletes képletelemzés"),
|
||||||
|
(self.synastry, "kapcsolati elemzés"),
|
||||||
|
(self.forecast, "éves előrejelzés"),
|
||||||
|
(self.persons, "személyhely"),
|
||||||
|
(self.questions, "kérdés"),
|
||||||
|
(self.tarot, "kártyajóslás"),
|
||||||
|
]
|
||||||
|
.into_iter()
|
||||||
|
.filter(|&(n, _)| n > 0)
|
||||||
|
.map(|(n, what)| format!("{n} {what}"))
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
.join(", ")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The invoice item: a name that says what the service is (online,
|
||||||
|
/// software-made content; no profession implied), and what the package
|
||||||
|
/// contains (Áfa tv. 169. § e).
|
||||||
|
pub fn invoice_item(&self) -> (String, String) {
|
||||||
|
let name = match self.tier {
|
||||||
|
Tier::Main => format!("Online tartalomszolgáltatás – {} csomag", self.name),
|
||||||
|
Tier::Addon => format!("Online tartalomszolgáltatás – {} kiegészítő", self.name),
|
||||||
|
};
|
||||||
|
let lines: Vec<String> = [
|
||||||
|
(self.natal, "képletelemzés"),
|
||||||
|
(self.synastry, "kapcsolati elemzés"),
|
||||||
|
(self.forecast, "éves előrejelzés"),
|
||||||
|
(self.persons, "további személy felvétele"),
|
||||||
|
(self.questions, "kérdés"),
|
||||||
|
(self.tarot, "kártyaértelmezés"),
|
||||||
|
]
|
||||||
|
.into_iter()
|
||||||
|
.filter(|&(n, _)| n > 0)
|
||||||
|
.map(|(n, what)| format!("{n} {what}"))
|
||||||
|
.collect();
|
||||||
|
let comment = format!(
|
||||||
|
"Hozzáférés a sorsfonalak.hu szoftveresen előállított, személyre szabott szöveges tartalmaihoz: {}. \
|
||||||
|
Digitális tartalom.",
|
||||||
|
lines.join(", ")
|
||||||
|
);
|
||||||
|
(name, comment)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// What the package gives, unit by unit.
|
||||||
|
pub fn contents(&self) -> [(Unit, i64); 6] {
|
||||||
|
[
|
||||||
|
(Unit::Natal, self.natal),
|
||||||
|
(Unit::Synastry, self.synastry),
|
||||||
|
(Unit::Forecast, self.forecast),
|
||||||
|
(Unit::Person, self.persons),
|
||||||
|
(Unit::Question, self.questions),
|
||||||
|
(Unit::Tarot, self.tarot),
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Records an order and adds its contents, inside the caller's transaction.
|
||||||
pub async fn grant(
|
pub async fn grant(
|
||||||
tx: &mut PgConnection,
|
tx: &mut PgConnection,
|
||||||
user_id: Uuid,
|
user_id: Uuid,
|
||||||
@@ -203,11 +292,56 @@ pub async fn grant(
|
|||||||
source: Source,
|
source: Source,
|
||||||
created_by: Option<Uuid>,
|
created_by: Option<Uuid>,
|
||||||
note: Option<&str>,
|
note: Option<&str>,
|
||||||
|
) -> Result<Uuid, ApiError> {
|
||||||
|
record(tx, user_id, package, source, created_by, note, &package.contents()).await
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Fills the user's units up to what the package gives (promo codes): a unit
|
||||||
|
/// below the package's amount is raised to it, used units come back, more
|
||||||
|
/// than that stays as it is. `persons_left` is the free person slots now
|
||||||
|
/// (`None`: unlimited, nothing to add). Returns the order and what was added
|
||||||
|
/// (nothing at all: no order is recorded).
|
||||||
|
pub async fn top_up(
|
||||||
|
tx: &mut PgConnection,
|
||||||
|
user_id: Uuid,
|
||||||
|
package: &Package,
|
||||||
|
persons_left: Option<i64>,
|
||||||
|
note: Option<&str>,
|
||||||
|
) -> Result<Option<(Uuid, Vec<(Unit, i64)>)>, ApiError> {
|
||||||
|
sqlx::query("SELECT id FROM users WHERE id = $1 FOR UPDATE").bind(user_id).execute(&mut *tx).await?;
|
||||||
|
let balance = crate::credits::balance(tx, user_id).await?;
|
||||||
|
let added: Vec<(Unit, i64)> = package
|
||||||
|
.contents()
|
||||||
|
.into_iter()
|
||||||
|
.map(|(unit, n)| {
|
||||||
|
let have = match unit {
|
||||||
|
Unit::Person => persons_left.unwrap_or(i64::MAX),
|
||||||
|
unit => balance.of(unit),
|
||||||
|
};
|
||||||
|
(unit, (n - have).max(0))
|
||||||
|
})
|
||||||
|
.filter(|&(_, n)| n > 0)
|
||||||
|
.collect();
|
||||||
|
if added.is_empty() {
|
||||||
|
return Ok(None);
|
||||||
|
}
|
||||||
|
let order = record(tx, user_id, package, Source::Promo, None, note, &added).await?;
|
||||||
|
Ok(Some((order, added)))
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn record(
|
||||||
|
tx: &mut PgConnection,
|
||||||
|
user_id: Uuid,
|
||||||
|
package: &Package,
|
||||||
|
source: Source,
|
||||||
|
created_by: Option<Uuid>,
|
||||||
|
note: Option<&str>,
|
||||||
|
contents: &[(Unit, i64)],
|
||||||
) -> Result<Uuid, ApiError> {
|
) -> Result<Uuid, ApiError> {
|
||||||
let order = Uuid::now_v7();
|
let order = Uuid::now_v7();
|
||||||
let price = match source {
|
let price = match source {
|
||||||
Source::Admin => 0,
|
Source::Admin | Source::Promo => 0,
|
||||||
Source::Mock => package.price_huf,
|
Source::Mock | Source::Stripe => package.price_huf,
|
||||||
};
|
};
|
||||||
sqlx::query(
|
sqlx::query(
|
||||||
"INSERT INTO package_orders (id, user_id, package, source, price_huf, note, created_by) \
|
"INSERT INTO package_orders (id, user_id, package, source, price_huf, note, created_by) \
|
||||||
@@ -222,14 +356,7 @@ pub async fn grant(
|
|||||||
.bind(created_by)
|
.bind(created_by)
|
||||||
.execute(&mut *tx)
|
.execute(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
let contents = [
|
for &(unit, n) in contents {
|
||||||
(Unit::Natal, package.natal),
|
|
||||||
(Unit::Synastry, package.synastry),
|
|
||||||
(Unit::Forecast, package.forecast),
|
|
||||||
(Unit::Person, package.persons),
|
|
||||||
(Unit::Question, package.questions),
|
|
||||||
];
|
|
||||||
for (unit, n) in contents {
|
|
||||||
if n == 0 {
|
if n == 0 {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -284,4 +411,21 @@ mod tests {
|
|||||||
assert!(CATALOG.iter().filter(|p| p.tier == Tier::Main).all(|p| p.questions == QUESTIONS_INCLUDED));
|
assert!(CATALOG.iter().filter(|p| p.tier == Tier::Main).all(|p| p.questions == QUESTIONS_INCLUDED));
|
||||||
assert_eq!(find("addon_questions").unwrap().questions, 5);
|
assert_eq!(find("addon_questions").unwrap().questions, 5);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn invoice_items_say_what_was_bought() {
|
||||||
|
let (name, comment) = find("couple").unwrap().invoice_item();
|
||||||
|
assert_eq!(name, "Online tartalomszolgáltatás – Páros csomag");
|
||||||
|
assert_eq!(
|
||||||
|
comment,
|
||||||
|
"Hozzáférés a sorsfonalak.hu szoftveresen előállított, személyre szabott szöveges tartalmaihoz: \
|
||||||
|
2 képletelemzés, 1 kapcsolati elemzés, 2 éves előrejelzés, 1 további személy felvétele, 3 kérdés, \
|
||||||
|
5 kártyaértelmezés. Digitális tartalom."
|
||||||
|
);
|
||||||
|
let (name, comment) = find("addon_persons").unwrap().invoice_item();
|
||||||
|
assert_eq!(name, "Online tartalomszolgáltatás – +5 személy kiegészítő");
|
||||||
|
assert!(comment.ends_with("tartalmaihoz: 5 további személy felvétele. Digitális tartalom."), "{comment}");
|
||||||
|
// No profession is implied.
|
||||||
|
assert!(CATALOG.iter().all(|p| !format!("{:?}", p.invoice_item()).to_lowercase().contains("asztrol")));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -62,6 +62,20 @@ pub async fn slots(conn: &mut PgConnection, auth: &AuthUser, free: i64) -> Resul
|
|||||||
Ok(Slots { used, granted: free + bought, unlimited: entitled || auth.user.has_role(Role::Admin) })
|
Ok(Slots { used, granted: free + bought, unlimited: entitled || auth.user.has_role(Role::Admin) })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The free person slots of a user without unlimited slots (for topping up).
|
||||||
|
pub async fn left(conn: &mut PgConnection, user_id: Uuid, free: i64) -> Result<i64, ApiError> {
|
||||||
|
let (used, bought): (i64, i64) = 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')",
|
||||||
|
)
|
||||||
|
.bind(user_id)
|
||||||
|
.fetch_one(conn)
|
||||||
|
.await?;
|
||||||
|
Ok((free + bought - used).max(0))
|
||||||
|
}
|
||||||
|
|
||||||
/// Fails when no slot is left (a quick check before calculating a chart).
|
/// 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> {
|
pub async fn check(conn: &mut PgConnection, auth: &AuthUser, free: i64) -> Result<(), ApiError> {
|
||||||
if slots(conn, auth, free).await?.left() == Some(0) {
|
if slots(conn, auth, free).await?.left() == Some(0) {
|
||||||
|
|||||||
@@ -33,6 +33,12 @@ pub async fn me(State(state): St, auth: AuthUser) -> ApiResult<Json<Value>> {
|
|||||||
let birth_change = crate::birth_changes::view(&mut conn, &auth).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 persons = crate::persons::slots(&mut conn, &auth, state.config.free_person_slots).await?;
|
||||||
let package = crate::packages::current(&mut conn, auth.id()).await?;
|
let package = crate::packages::current(&mut conn, auth.id()).await?;
|
||||||
|
let share_reward = super::shares::reward_granted(&state.db, auth.id()).await?;
|
||||||
|
let referrals = super::shares::referral_rewards(&mut conn, auth.id()).await?;
|
||||||
|
let (invoices,): (i64,) = sqlx::query_as("SELECT count(*) FROM invoices WHERE user_id = $1")
|
||||||
|
.bind(auth.id())
|
||||||
|
.fetch_one(&mut *conn)
|
||||||
|
.await?;
|
||||||
Ok(Json(json!({
|
Ok(Json(json!({
|
||||||
"user": UserView::from(&auth.user),
|
"user": UserView::from(&auth.user),
|
||||||
"providers": providers.into_iter().map(|(p,)| p).collect::<Vec<_>>(),
|
"providers": providers.into_iter().map(|(p,)| p).collect::<Vec<_>>(),
|
||||||
@@ -41,6 +47,12 @@ pub async fn me(State(state): St, auth: AuthUser) -> ApiResult<Json<Value>> {
|
|||||||
"birth_change": birth_change,
|
"birth_change": birth_change,
|
||||||
"persons": persons.view(),
|
"persons": persons.view(),
|
||||||
"package": package.map(|(p, since)| json!({ "id": p.id, "name": p.name, "since": rfc3339(since) })),
|
"package": package.map(|(p, since)| json!({ "id": p.id, "name": p.name, "since": rfc3339(since) })),
|
||||||
|
// The free question for a shared link is used up (once per user).
|
||||||
|
"share_reward_granted": share_reward,
|
||||||
|
// Natal analyses earned by bringing new users, and how many can be.
|
||||||
|
"referral_rewards": { "earned": referrals, "limit": super::shares::REFERRAL_LIMIT },
|
||||||
|
// The "Számláim" menu shows up with the first invoice.
|
||||||
|
"invoice_count": invoices,
|
||||||
})))
|
})))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -173,7 +185,7 @@ pub struct DeleteMe {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// GDPR: deletes the account and everything that belongs to it (charts,
|
/// GDPR: deletes the account and everything that belongs to it (charts,
|
||||||
/// synastries using them, analyses, shares, sessions, credits).
|
/// synastries using them, analyses, tarot readings, shares, sessions, credits).
|
||||||
pub async fn delete_me(
|
pub async fn delete_me(
|
||||||
State(state): St,
|
State(state): St,
|
||||||
auth: AuthUser,
|
auth: AuthUser,
|
||||||
@@ -183,7 +195,14 @@ pub async fn delete_me(
|
|||||||
if req.confirm != "DELETE" {
|
if req.confirm != "DELETE" {
|
||||||
return Err(ApiError::BadRequest("set confirm to \"DELETE\" to delete the account".into()));
|
return Err(ApiError::BadRequest("set confirm to \"DELETE\" to delete the account".into()));
|
||||||
}
|
}
|
||||||
sqlx::query("DELETE FROM users WHERE id = $1").bind(auth.id()).execute(&state.db).await?;
|
let mut tx = state.db.begin().await?;
|
||||||
|
// Tarot readings belong to no chart: they go with the account.
|
||||||
|
sqlx::query("DELETE FROM analyses WHERE kind = 'tarot' AND requested_by = $1")
|
||||||
|
.bind(auth.id())
|
||||||
|
.execute(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
sqlx::query("DELETE FROM users WHERE id = $1").bind(auth.id()).execute(&mut *tx).await?;
|
||||||
|
tx.commit().await?;
|
||||||
tracing::info!(user = %auth.id(), "account deleted");
|
tracing::info!(user = %auth.id(), "account deleted");
|
||||||
Ok((StatusCode::NO_CONTENT, jar.add(removal_cookie(&state.config))))
|
Ok((StatusCode::NO_CONTENT, jar.add(removal_cookie(&state.config))))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,6 +46,7 @@ pub async fn list_users(
|
|||||||
i64,
|
i64,
|
||||||
i64,
|
i64,
|
||||||
i64,
|
i64,
|
||||||
|
i64,
|
||||||
);
|
);
|
||||||
let rows: Vec<Row> = sqlx::query_as(
|
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 u.id, u.email, u.display_name, u.roles, u.email_verified_at IS NOT NULL, u.created_at, u.last_login_at, \
|
||||||
@@ -53,7 +54,8 @@ pub async fn list_users(
|
|||||||
(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 = 'natal'), \
|
||||||
(SELECT COALESCE(SUM(delta), 0)::bigint FROM credit_ledger l WHERE l.user_id = u.id AND l.unit = 'synastry'), \
|
(SELECT COALESCE(SUM(delta), 0)::bigint FROM credit_ledger l WHERE l.user_id = u.id AND l.unit = 'synastry'), \
|
||||||
(SELECT COALESCE(SUM(delta), 0)::bigint FROM credit_ledger l WHERE l.user_id = u.id AND l.unit = 'forecast'), \
|
(SELECT COALESCE(SUM(delta), 0)::bigint FROM credit_ledger l WHERE l.user_id = u.id AND l.unit = 'forecast'), \
|
||||||
(SELECT COALESCE(SUM(delta), 0)::bigint FROM credit_ledger l WHERE l.user_id = u.id AND l.unit = 'question') \
|
(SELECT COALESCE(SUM(delta), 0)::bigint FROM credit_ledger l WHERE l.user_id = u.id AND l.unit = 'question'), \
|
||||||
|
(SELECT COALESCE(SUM(delta), 0)::bigint FROM credit_ledger l WHERE l.user_id = u.id AND l.unit = 'tarot') \
|
||||||
FROM users u \
|
FROM users u \
|
||||||
WHERE $1::text IS NULL OR u.email ILIKE $1 OR u.display_name ILIKE $1 \
|
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",
|
ORDER BY u.created_at DESC LIMIT $2 OFFSET $3",
|
||||||
@@ -65,12 +67,14 @@ pub async fn list_users(
|
|||||||
.await?;
|
.await?;
|
||||||
let users: Vec<Value> = rows
|
let users: Vec<Value> = rows
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.map(|(id, email, name, roles, verified, created, last_login, charts, natal, synastry, forecast, question)| {
|
.map(|(id, email, name, roles, verified, created, last_login, charts, natal, synastry, forecast, question, tarot)| {
|
||||||
json!({
|
json!({
|
||||||
"id": id, "email": email, "display_name": name, "roles": roles, "email_verified": verified,
|
"id": id, "email": email, "display_name": name, "roles": roles, "email_verified": verified,
|
||||||
"created_at": rfc3339(created), "last_login_at": rfc3339_opt(last_login),
|
"created_at": rfc3339(created), "last_login_at": rfc3339_opt(last_login),
|
||||||
"charts": charts,
|
"charts": charts,
|
||||||
"analyses_left": {"natal": natal, "synastry": synastry, "forecast": forecast, "question": question},
|
"analyses_left": {
|
||||||
|
"natal": natal, "synastry": synastry, "forecast": forecast, "question": question, "tarot": tarot,
|
||||||
|
},
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
.collect();
|
.collect();
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ use crate::auth::AuthUser;
|
|||||||
use crate::credits::{self, Unit};
|
use crate::credits::{self, Unit};
|
||||||
use crate::error::{ApiError, ApiResult};
|
use crate::error::{ApiError, ApiResult};
|
||||||
use crate::views::{rfc3339, rfc3339_opt, sha256_hex};
|
use crate::views::{rfc3339, rfc3339_opt, sha256_hex};
|
||||||
use db::Role;
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, sqlx::FromRow)]
|
#[derive(Debug, Clone, sqlx::FromRow)]
|
||||||
/// An analysis as users see it; the model is left out on purpose (a business secret).
|
/// An analysis as users see it; the model is left out on purpose (a business secret).
|
||||||
@@ -136,10 +135,8 @@ async fn request(
|
|||||||
req: AnalysisRequest,
|
req: AnalysisRequest,
|
||||||
) -> ApiResult<(StatusCode, Json<Value>)> {
|
) -> ApiResult<(StatusCode, Json<Value>)> {
|
||||||
let language = validate_locale(state, Some(req.language.as_deref().unwrap_or(&auth.user.locale)))?;
|
let language = validate_locale(state, Some(req.language.as_deref().unwrap_or(&auth.user.locale)))?;
|
||||||
// Admins use no unit.
|
// Admins use units too (they can add more on the admin page).
|
||||||
let admin = auth.user.has_role(Role::Admin);
|
|
||||||
let unit = match target {
|
let unit = match target {
|
||||||
_ if admin => None,
|
|
||||||
Target::Synastry { .. } => Some(Unit::Synastry),
|
Target::Synastry { .. } => Some(Unit::Synastry),
|
||||||
Target::Forecast { .. } => Some(Unit::Forecast),
|
Target::Forecast { .. } => Some(Unit::Forecast),
|
||||||
_ => Some(Unit::Natal),
|
_ => Some(Unit::Natal),
|
||||||
@@ -186,6 +183,11 @@ pub(super) async fn queue(
|
|||||||
let (model, fallback) = &crate::models::models_for(state, Kind::parse(kind).expect("known kind")).await?;
|
let (model, fallback) = &crate::models::models_for(state, Kind::parse(kind).expect("known kind")).await?;
|
||||||
let (cache_key, prompt_version) = &versions(state, kind, hash, model, language).await?;
|
let (cache_key, prompt_version) = &versions(state, kind, hash, model, language).await?;
|
||||||
|
|
||||||
|
// One request at a time per user (a double click must not queue and pay
|
||||||
|
// for the same analysis twice): the user row is locked until commit.
|
||||||
|
let mut tx = state.db.begin().await?;
|
||||||
|
sqlx::query("SELECT id FROM users WHERE id = $1 FOR UPDATE").bind(user).execute(&mut *tx).await?;
|
||||||
|
|
||||||
// Already requested for this chart/synastry: return it.
|
// Already requested for this chart/synastry: return it.
|
||||||
let existing: Option<AnalysisRow> = sqlx::query_as(&format!(
|
let existing: Option<AnalysisRow> = sqlx::query_as(&format!(
|
||||||
"SELECT {ANALYSIS_COLUMNS} FROM analyses \
|
"SELECT {ANALYSIS_COLUMNS} FROM analyses \
|
||||||
@@ -196,7 +198,7 @@ pub(super) async fn queue(
|
|||||||
.bind(synastry_id)
|
.bind(synastry_id)
|
||||||
.bind(cache_key)
|
.bind(cache_key)
|
||||||
.bind(forecast_id)
|
.bind(forecast_id)
|
||||||
.fetch_optional(&state.db)
|
.fetch_optional(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
if let Some(row) = existing {
|
if let Some(row) = existing {
|
||||||
return Ok((StatusCode::OK, row));
|
return Ok((StatusCode::OK, row));
|
||||||
@@ -217,7 +219,7 @@ pub(super) async fn queue(
|
|||||||
)
|
)
|
||||||
.bind(cache_key)
|
.bind(cache_key)
|
||||||
.bind(prompt_version)
|
.bind(prompt_version)
|
||||||
.fetch_optional(&state.db)
|
.fetch_optional(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
if let Some((content, input_tokens, output_tokens)) = cached {
|
if let Some((content, input_tokens, output_tokens)) = cached {
|
||||||
let row: AnalysisRow = sqlx::query_as(&insert)
|
let row: AnalysisRow = sqlx::query_as(&insert)
|
||||||
@@ -238,13 +240,13 @@ pub(super) async fn queue(
|
|||||||
.bind(OffsetDateTime::now_utc())
|
.bind(OffsetDateTime::now_utc())
|
||||||
.bind(forecast_id)
|
.bind(forecast_id)
|
||||||
.bind(fallback)
|
.bind(fallback)
|
||||||
.fetch_one(&state.db)
|
.fetch_one(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
|
tx.commit().await?;
|
||||||
return Ok((StatusCode::CREATED, row));
|
return Ok((StatusCode::CREATED, row));
|
||||||
}
|
}
|
||||||
|
|
||||||
// New analysis: spend a unit and queue it for the worker.
|
// 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)
|
let row: AnalysisRow = sqlx::query_as(&insert)
|
||||||
.bind(id)
|
.bind(id)
|
||||||
.bind(kind)
|
.bind(kind)
|
||||||
@@ -389,11 +391,18 @@ pub async fn regenerate(
|
|||||||
if row.status == "pending" || row.status == "running" {
|
if row.status == "pending" || row.status == "running" {
|
||||||
return Err(ApiError::conflict("analysis_in_progress", "Ez az elemzés éppen készül."));
|
return Err(ApiError::conflict("analysis_in_progress", "Ez az elemzés éppen készül."));
|
||||||
}
|
}
|
||||||
let kind = Kind::parse(&row.kind).ok_or_else(|| ApiError::Internal(format!("unknown kind {}", row.kind)))?;
|
let (kind, model, fallback, cache_key, prompt_version) = if row.kind == "tarot" {
|
||||||
let hash = target_hash(&state.db, &row).await?;
|
// A tarot reading: the analysis model, the same cards, never cached.
|
||||||
let hash = hash.ok_or(ApiError::NotFound("analysis"))?;
|
let (model, fallback) = crate::models::models_for(&state, Kind::Natal).await?;
|
||||||
let (model, fallback) = crate::models::models_for(&state, kind).await?;
|
("tarot", model, fallback, format!("tarot|{id}"), state.config.prompt_version.clone())
|
||||||
let (cache_key, prompt_version) = versions(&state, kind.as_str(), &hash, &model, &row.language).await?;
|
} else {
|
||||||
|
let kind = Kind::parse(&row.kind).ok_or_else(|| ApiError::Internal(format!("unknown kind {}", row.kind)))?;
|
||||||
|
let hash = target_hash(&state.db, &row).await?;
|
||||||
|
let hash = hash.ok_or(ApiError::NotFound("analysis"))?;
|
||||||
|
let (model, fallback) = crate::models::models_for(&state, kind).await?;
|
||||||
|
let (cache_key, prompt_version) = versions(&state, kind.as_str(), &hash, &model, &row.language).await?;
|
||||||
|
(kind.as_str(), model, fallback, cache_key, prompt_version)
|
||||||
|
};
|
||||||
let mut tx = state.db.begin().await?;
|
let mut tx = state.db.begin().await?;
|
||||||
let row: AnalysisRow = sqlx::query_as(&format!(
|
let row: AnalysisRow = sqlx::query_as(&format!(
|
||||||
"UPDATE analyses SET status = 'pending', content = NULL, error = NULL, model_used = NULL, \
|
"UPDATE analyses SET status = 'pending', content = NULL, error = NULL, model_used = NULL, \
|
||||||
@@ -413,6 +422,6 @@ pub async fn regenerate(
|
|||||||
// Wakes the worker, as a new analysis does.
|
// Wakes the worker, as a new analysis does.
|
||||||
sqlx::query("SELECT pg_notify('analyses', '')").execute(&mut *tx).await?;
|
sqlx::query("SELECT pg_notify('analyses', '')").execute(&mut *tx).await?;
|
||||||
tx.commit().await?;
|
tx.commit().await?;
|
||||||
tracing::info!(%id, kind = kind.as_str(), "analysis regenerated");
|
tracing::info!(%id, kind, "analysis regenerated");
|
||||||
Ok(Json(row.view()))
|
Ok(Json(row.view()))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -170,6 +170,8 @@ pub struct RegisterRequest {
|
|||||||
locale: Option<String>,
|
locale: Option<String>,
|
||||||
/// The invitation link's token, while sign-up needs an invitation.
|
/// The invitation link's token, while sign-up needs an invitation.
|
||||||
invite_token: Option<String>,
|
invite_token: Option<String>,
|
||||||
|
/// The slug of the shared link the visitor came from.
|
||||||
|
referral: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Password endpoints answer 403 while `PASSWORD_LOGIN` is off.
|
/// Password endpoints answer 403 while `PASSWORD_LOGIN` is off.
|
||||||
@@ -216,7 +218,15 @@ pub async fn register(
|
|||||||
.bind(&email)
|
.bind(&email)
|
||||||
.execute(&mut *tx)
|
.execute(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
super::invitations::mark_accepted(&mut tx, user_id, &email, req.invite_token.as_deref()).await?;
|
super::invitations::mark_accepted(
|
||||||
|
&mut tx,
|
||||||
|
user_id,
|
||||||
|
&email,
|
||||||
|
req.invite_token.as_deref(),
|
||||||
|
state.config.free_person_slots,
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
super::shares::record_referral(&mut tx, state.config.referral_rewards, user_id, req.referral.as_deref()).await?;
|
||||||
let mut user = load_user(&mut tx, user_id).await?;
|
let mut user = load_user(&mut tx, user_id).await?;
|
||||||
apply_bootstrap_admin(&state, &mut tx, &mut user).await?;
|
apply_bootstrap_admin(&state, &mut tx, &mut user).await?;
|
||||||
queue_verification(&state, &mut tx, &user).await?;
|
queue_verification(&state, &mut tx, &user).await?;
|
||||||
@@ -284,6 +294,8 @@ pub struct GoogleRequest {
|
|||||||
id_token: String,
|
id_token: String,
|
||||||
/// The invitation link's token, while sign-up needs an invitation.
|
/// The invitation link's token, while sign-up needs an invitation.
|
||||||
invite_token: Option<String>,
|
invite_token: Option<String>,
|
||||||
|
/// The slug of the shared link the visitor came from.
|
||||||
|
referral: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Logs in with Google. An unknown Google account is linked to the existing
|
/// Logs in with Google. An unknown Google account is linked to the existing
|
||||||
@@ -295,20 +307,78 @@ pub async fn google(
|
|||||||
WithRejection(Json(req), _): Body<GoogleRequest>,
|
WithRejection(Json(req), _): Body<GoogleRequest>,
|
||||||
) -> ApiResult<impl IntoResponse> {
|
) -> ApiResult<impl IntoResponse> {
|
||||||
let claims = state.google.verify(&req.id_token).await?;
|
let claims = state.google.verify(&req.id_token).await?;
|
||||||
|
let signup = Signup {
|
||||||
|
name: claims.name.clone(),
|
||||||
|
locale: claims.locale.clone(),
|
||||||
|
invite_token: req.invite_token,
|
||||||
|
referral: req.referral,
|
||||||
|
};
|
||||||
|
social_login(&state, headers, jar, "google", claims, signup).await
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- Apple ------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct AppleRequest {
|
||||||
|
/// ID token (JWT) from Sign in with Apple JS.
|
||||||
|
id_token: String,
|
||||||
|
/// The name Apple gives the page at the first sign-in only (it is not in
|
||||||
|
/// the token): used when the account is created.
|
||||||
|
name: Option<String>,
|
||||||
|
invite_token: Option<String>,
|
||||||
|
referral: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Logs in with Apple, like [`google`]. The address may be an Apple relay
|
||||||
|
/// (`…@privaterelay.appleid.com`), which forwards our e-mails.
|
||||||
|
pub async fn apple(
|
||||||
|
State(state): St,
|
||||||
|
headers: HeaderMap,
|
||||||
|
jar: CookieJar,
|
||||||
|
WithRejection(Json(req), _): Body<AppleRequest>,
|
||||||
|
) -> ApiResult<impl IntoResponse> {
|
||||||
|
let claims = state.apple.verify(&req.id_token).await?;
|
||||||
|
let signup = Signup { name: req.name, locale: None, invite_token: req.invite_token, referral: req.referral };
|
||||||
|
social_login(&state, headers, jar, "apple", claims, signup).await
|
||||||
|
}
|
||||||
|
|
||||||
|
/// What a new account starts with.
|
||||||
|
struct Signup {
|
||||||
|
name: Option<String>,
|
||||||
|
locale: Option<String>,
|
||||||
|
invite_token: Option<String>,
|
||||||
|
referral: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Logs in with a verified provider identity: the linked user, else the user
|
||||||
|
/// with the same (provider-verified) e-mail address, else a new user.
|
||||||
|
async fn social_login(
|
||||||
|
state: &AppState,
|
||||||
|
headers: HeaderMap,
|
||||||
|
jar: CookieJar,
|
||||||
|
provider: &'static str,
|
||||||
|
claims: crate::oidc::IdClaims,
|
||||||
|
signup: Signup,
|
||||||
|
) -> ApiResult<impl IntoResponse + use<>> {
|
||||||
let email = match (claims.email.as_deref(), claims.email_verified) {
|
let email = match (claims.email.as_deref(), claims.email_verified) {
|
||||||
(Some(e), true) => normalize_email(e)?,
|
(Some(e), true) => normalize_email(e)?,
|
||||||
_ => return Err(ApiError::InvalidCredentials("the Google account has no verified e-mail address".into())),
|
_ => {
|
||||||
|
return Err(ApiError::InvalidCredentials(format!("the {provider} account has no verified e-mail address")));
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut tx = state.db.begin().await?;
|
let mut tx = state.db.begin().await?;
|
||||||
let linked: Option<(Uuid,)> =
|
let linked: Option<(Uuid,)> =
|
||||||
sqlx::query_as("SELECT user_id FROM auth_identities WHERE provider = 'google' AND subject = $1")
|
sqlx::query_as("SELECT user_id FROM auth_identities WHERE provider = $1 AND subject = $2")
|
||||||
|
.bind(provider)
|
||||||
.bind(&claims.sub)
|
.bind(&claims.sub)
|
||||||
.fetch_optional(&mut *tx)
|
.fetch_optional(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
let (user_id, created) = match linked {
|
let (user_id, created) = match linked {
|
||||||
Some((id,)) => {
|
Some((id,)) => {
|
||||||
sqlx::query("UPDATE auth_identities SET last_used_at = now() WHERE provider = 'google' AND subject = $1")
|
sqlx::query("UPDATE auth_identities SET last_used_at = now() WHERE provider = $1 AND subject = $2")
|
||||||
|
.bind(provider)
|
||||||
.bind(&claims.sub)
|
.bind(&claims.sub)
|
||||||
.execute(&mut *tx)
|
.execute(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
@@ -319,7 +389,24 @@ pub async fn google(
|
|||||||
sqlx::query_as("SELECT id FROM users WHERE email = $1").bind(&email).fetch_optional(&mut *tx).await?;
|
sqlx::query_as("SELECT id FROM users WHERE email = $1").bind(&email).fetch_optional(&mut *tx).await?;
|
||||||
let (id, created) = match existing {
|
let (id, created) = match existing {
|
||||||
Some((id,)) => {
|
Some((id,)) => {
|
||||||
// Google has verified the address, so it counts as verified here too.
|
// An account whose address was never confirmed may have
|
||||||
|
// been made by someone else with this address: its
|
||||||
|
// password and sessions go, the provider has proven who
|
||||||
|
// owns the address.
|
||||||
|
let unverified: bool =
|
||||||
|
sqlx::query_scalar("SELECT email_verified_at IS NULL FROM users WHERE id = $1 FOR UPDATE")
|
||||||
|
.bind(id)
|
||||||
|
.fetch_one(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
if unverified {
|
||||||
|
sqlx::query("DELETE FROM auth_identities WHERE user_id = $1 AND provider = 'password'")
|
||||||
|
.bind(id)
|
||||||
|
.execute(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
sqlx::query("DELETE FROM sessions WHERE user_id = $1").bind(id).execute(&mut *tx).await?;
|
||||||
|
tracing::warn!(user = %id, provider, "unconfirmed password account taken over by its address's owner");
|
||||||
|
}
|
||||||
|
// The provider has verified the address, so it counts as verified here too.
|
||||||
sqlx::query(
|
sqlx::query(
|
||||||
"UPDATE users SET email_verified_at = COALESCE(email_verified_at, now()) WHERE id = $1",
|
"UPDATE users SET email_verified_at = COALESCE(email_verified_at, now()) WHERE id = $1",
|
||||||
)
|
)
|
||||||
@@ -329,9 +416,9 @@ pub async fn google(
|
|||||||
(id, false)
|
(id, false)
|
||||||
}
|
}
|
||||||
None => {
|
None => {
|
||||||
super::invitations::admit(&state, &mut tx, &email, req.invite_token.as_deref()).await?;
|
super::invitations::admit(state, &mut tx, &email, signup.invite_token.as_deref()).await?;
|
||||||
let id = Uuid::now_v7();
|
let id = Uuid::now_v7();
|
||||||
let locale = claims
|
let locale = signup
|
||||||
.locale
|
.locale
|
||||||
.as_deref()
|
.as_deref()
|
||||||
.and_then(|l| l.split(['-', '_']).next())
|
.and_then(|l| l.split(['-', '_']).next())
|
||||||
@@ -343,20 +430,35 @@ pub async fn google(
|
|||||||
)
|
)
|
||||||
.bind(id)
|
.bind(id)
|
||||||
.bind(&email)
|
.bind(&email)
|
||||||
.bind(clean_name(claims.name.clone()))
|
.bind(clean_name(signup.name))
|
||||||
.bind(locale)
|
.bind(locale)
|
||||||
.execute(&mut *tx)
|
.execute(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
super::invitations::mark_accepted(&mut tx, id, &email, req.invite_token.as_deref()).await?;
|
super::invitations::mark_accepted(
|
||||||
|
&mut tx,
|
||||||
|
id,
|
||||||
|
&email,
|
||||||
|
signup.invite_token.as_deref(),
|
||||||
|
state.config.free_person_slots,
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
super::shares::record_referral(
|
||||||
|
&mut tx,
|
||||||
|
state.config.referral_rewards,
|
||||||
|
id,
|
||||||
|
signup.referral.as_deref(),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
(id, true)
|
(id, true)
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
sqlx::query(
|
sqlx::query(
|
||||||
"INSERT INTO auth_identities (id, user_id, provider, subject, email, last_used_at) \
|
"INSERT INTO auth_identities (id, user_id, provider, subject, email, last_used_at) \
|
||||||
VALUES ($1, $2, 'google', $3, $4, now())",
|
VALUES ($1, $2, $3, $4, $5, now())",
|
||||||
)
|
)
|
||||||
.bind(Uuid::now_v7())
|
.bind(Uuid::now_v7())
|
||||||
.bind(id)
|
.bind(id)
|
||||||
|
.bind(provider)
|
||||||
.bind(&claims.sub)
|
.bind(&claims.sub)
|
||||||
.bind(&email)
|
.bind(&email)
|
||||||
.execute(&mut *tx)
|
.execute(&mut *tx)
|
||||||
@@ -365,11 +467,11 @@ pub async fn google(
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
let mut user = load_user(&mut tx, user_id).await?;
|
let mut user = load_user(&mut tx, user_id).await?;
|
||||||
apply_bootstrap_admin(&state, &mut tx, &mut user).await?;
|
apply_bootstrap_admin(state, &mut tx, &mut user).await?;
|
||||||
tx.commit().await?;
|
tx.commit().await?;
|
||||||
|
|
||||||
let session = create_session(&state.db, &state.config, user.id, user_agent(&headers)).await?;
|
let session = create_session(&state.db, &state.config, user.id, user_agent(&headers)).await?;
|
||||||
Ok(login_response(&state, jar, &user, session, created))
|
Ok(login_response(state, jar, &user, session, created))
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- logout -------------------------------------------------------------------------------
|
// --- logout -------------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -184,6 +184,7 @@ pub async fn create(
|
|||||||
birth_changes::record(&mut tx, &auth, row.id).await?;
|
birth_changes::record(&mut tx, &auth, row.id).await?;
|
||||||
tx.commit().await?;
|
tx.commit().await?;
|
||||||
queue_summary(&state, &auth, &row).await;
|
queue_summary(&state, &auth, &row).await;
|
||||||
|
super::shares::reward_referral(&state, auth.id()).await?;
|
||||||
return Ok((StatusCode::OK, Json(row.owner_view())));
|
return Ok((StatusCode::OK, Json(row.owner_view())));
|
||||||
}
|
}
|
||||||
queue_summary(&state, &auth, &chart).await;
|
queue_summary(&state, &auth, &chart).await;
|
||||||
@@ -231,6 +232,9 @@ pub async fn create(
|
|||||||
}
|
}
|
||||||
tx.commit().await?;
|
tx.commit().await?;
|
||||||
queue_summary(&state, &auth, &row).await;
|
queue_summary(&state, &auth, &row).await;
|
||||||
|
if row.is_primary {
|
||||||
|
super::shares::reward_referral(&state, auth.id()).await?;
|
||||||
|
}
|
||||||
Ok((StatusCode::CREATED, Json(row.owner_view())))
|
Ok((StatusCode::CREATED, Json(row.owner_view())))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -338,7 +342,9 @@ async fn corrected_birth(
|
|||||||
let (analysed, foreign_synastry): (bool, bool) = sqlx::query_as(
|
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') \
|
"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 \
|
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'), \
|
WHERE (s.chart1_id = $1 OR s.chart2_id = $1) AND a.status <> 'failed') \
|
||||||
|
OR EXISTS (SELECT 1 FROM analyses a JOIN forecasts f ON f.id = a.forecast_id \
|
||||||
|
WHERE f.chart_id = $1 AND a.status <> 'failed'), \
|
||||||
EXISTS (SELECT 1 FROM synastries WHERE (chart1_id = $1 OR chart2_id = $1) AND owner_id <> $2)",
|
EXISTS (SELECT 1 FROM synastries WHERE (chart1_id = $1 OR chart2_id = $1) AND owner_id <> $2)",
|
||||||
)
|
)
|
||||||
.bind(chart.id)
|
.bind(chart.id)
|
||||||
|
|||||||
@@ -7,6 +7,10 @@
|
|||||||
//!
|
//!
|
||||||
//! People who asked for no more invitations are kept as the hash of their
|
//! People who asked for no more invitations are kept as the hash of their
|
||||||
//! address. People without an invitation can join the waitlist.
|
//! address. People without an invitation can join the waitlist.
|
||||||
|
//!
|
||||||
|
//! An invitation can come with a package: a promo code is made with it, the
|
||||||
|
//! e-mail shows it with its redeem link, and it is redeemed by itself when
|
||||||
|
//! the invitee signs up (revoking the invitation withdraws it).
|
||||||
|
|
||||||
use axum::Json;
|
use axum::Json;
|
||||||
use axum::extract::{Path, Query, State};
|
use axum::extract::{Path, Query, State};
|
||||||
@@ -24,8 +28,12 @@ use crate::AppState;
|
|||||||
use crate::auth::AdminUser;
|
use crate::auth::AdminUser;
|
||||||
use crate::config::SignupMode;
|
use crate::config::SignupMode;
|
||||||
use crate::error::{ApiError, ApiResult};
|
use crate::error::{ApiError, ApiResult};
|
||||||
|
use crate::packages;
|
||||||
use crate::views::{rfc3339, rfc3339_opt};
|
use crate::views::{rfc3339, rfc3339_opt};
|
||||||
|
|
||||||
|
/// The package of an invitation, as shown in its e-mail: (code as shown, package name).
|
||||||
|
type Gift = (String, &'static str);
|
||||||
|
|
||||||
pub const INVITATION_TTL: time::Duration = time::Duration::days(30);
|
pub const INVITATION_TTL: time::Duration = time::Duration::days(30);
|
||||||
/// A resend is possible this often, and at most this many sendings in all.
|
/// A resend is possible this often, and at most this many sendings in all.
|
||||||
const RESEND_GAP: time::Duration = time::Duration::hours(24);
|
const RESEND_GAP: time::Duration = time::Duration::hours(24);
|
||||||
@@ -68,18 +76,21 @@ pub async fn admit(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// After a new account is created: its invitations count as accepted, and it leaves the waitlist.
|
/// After a new account is created: its invitations count as accepted, it
|
||||||
|
/// leaves the waitlist, and the packages of those invitations are redeemed
|
||||||
|
/// (`free_slots`: the person slots everyone gets).
|
||||||
pub async fn mark_accepted(
|
pub async fn mark_accepted(
|
||||||
conn: &mut PgConnection,
|
conn: &mut PgConnection,
|
||||||
user_id: Uuid,
|
user_id: Uuid,
|
||||||
email: &str,
|
email: &str,
|
||||||
token: Option<&str>,
|
token: Option<&str>,
|
||||||
|
free_slots: i64,
|
||||||
) -> Result<(), ApiError> {
|
) -> Result<(), ApiError> {
|
||||||
let hash = token.map(|t| db::token_hash(t.trim()));
|
let hash = token.map(|t| db::token_hash(t.trim()));
|
||||||
sqlx::query(
|
sqlx::query(
|
||||||
"UPDATE invitations SET accepted_at = now(), accepted_by = $1 \
|
"UPDATE invitations SET accepted_at = now(), accepted_by = $1 \
|
||||||
WHERE accepted_at IS NULL AND revoked_at IS NULL \
|
WHERE accepted_at IS NULL AND revoked_at IS NULL AND expires_at > now() \
|
||||||
AND (email = $2 OR (expires_at > now() AND id IN (SELECT invitation_id FROM invitation_tokens WHERE token_hash = $3)))",
|
AND (email = $2 OR id IN (SELECT invitation_id FROM invitation_tokens WHERE token_hash = $3))",
|
||||||
)
|
)
|
||||||
.bind(user_id)
|
.bind(user_id)
|
||||||
.bind(email)
|
.bind(email)
|
||||||
@@ -87,12 +98,36 @@ pub async fn mark_accepted(
|
|||||||
.execute(&mut *conn)
|
.execute(&mut *conn)
|
||||||
.await?;
|
.await?;
|
||||||
sqlx::query("DELETE FROM waitlist WHERE email = $1").bind(email).execute(&mut *conn).await?;
|
sqlx::query("DELETE FROM waitlist WHERE email = $1").bind(email).execute(&mut *conn).await?;
|
||||||
|
let codes: Vec<(Uuid, String, String)> = sqlx::query_as(
|
||||||
|
"SELECT p.id, p.code, p.package FROM promo_codes p JOIN invitations i ON i.id = p.invitation_id \
|
||||||
|
WHERE i.accepted_by = $1 AND p.redeemed_at IS NULL AND p.revoked_at IS NULL FOR UPDATE OF p",
|
||||||
|
)
|
||||||
|
.bind(user_id)
|
||||||
|
.fetch_all(&mut *conn)
|
||||||
|
.await?;
|
||||||
|
for (id, code, package) in codes {
|
||||||
|
let Some(package) = packages::find(&package) else { continue };
|
||||||
|
let persons_left = crate::persons::left(conn, user_id, free_slots).await?;
|
||||||
|
super::promo::redeem_code(conn, id, &code, package, user_id, Some(persons_left)).await?;
|
||||||
|
tracing::info!(user = %user_id, package = package.id, "invitation package redeemed");
|
||||||
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The open promo code of an invitation, for its e-mail.
|
||||||
|
async fn gift_of(conn: &mut PgConnection, invitation_id: Uuid) -> Result<Option<Gift>, sqlx::Error> {
|
||||||
|
let row: Option<(String, String)> = sqlx::query_as(
|
||||||
|
"SELECT code, package FROM promo_codes WHERE invitation_id = $1 AND redeemed_at IS NULL AND revoked_at IS NULL",
|
||||||
|
)
|
||||||
|
.bind(invitation_id)
|
||||||
|
.fetch_optional(conn)
|
||||||
|
.await?;
|
||||||
|
Ok(row.and_then(|(code, package)| packages::find(&package).map(|p| (super::promo::display(&code), p.name))))
|
||||||
|
}
|
||||||
|
|
||||||
// --- sending ---------------------------------------------------------------------------------
|
// --- sending ---------------------------------------------------------------------------------
|
||||||
|
|
||||||
fn clean_message(message: Option<String>) -> Result<Option<String>, ApiError> {
|
pub(super) 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 {
|
let Some(message) = message.map(|m| m.replace("\r\n", "\n").trim().to_owned()).filter(|m| !m.is_empty()) else {
|
||||||
return Ok(None);
|
return Ok(None);
|
||||||
};
|
};
|
||||||
@@ -107,7 +142,7 @@ fn clean_message(message: Option<String>) -> Result<Option<String>, ApiError> {
|
|||||||
Ok(Some(message))
|
Ok(Some(message))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn links(state: &AppState, token: &str) -> (String, String, String) {
|
pub(super) fn links(state: &AppState, token: &str) -> (String, String, String) {
|
||||||
let base = &state.config.public_base_url;
|
let base = &state.config.public_base_url;
|
||||||
(
|
(
|
||||||
format!("{base}/meghivo/{token}"),
|
format!("{base}/meghivo/{token}"),
|
||||||
@@ -122,9 +157,14 @@ fn payload(
|
|||||||
inviter: Option<&str>,
|
inviter: Option<&str>,
|
||||||
message: Option<&str>,
|
message: Option<&str>,
|
||||||
expires: OffsetDateTime,
|
expires: OffsetDateTime,
|
||||||
|
gift: Option<&Gift>,
|
||||||
) -> Value {
|
) -> Value {
|
||||||
let (url, unsubscribe_url, unsubscribe_post_url) = links(state, token);
|
let (url, unsubscribe_url, unsubscribe_post_url) = links(state, token);
|
||||||
|
let base = &state.config.public_base_url;
|
||||||
json!({
|
json!({
|
||||||
|
"package_name": gift.map(|g| g.1),
|
||||||
|
"promo_code": gift.map(|g| g.0.as_str()),
|
||||||
|
"redeem_url": gift.map(|g| format!("{base}/bevaltas?kod={}", g.0)),
|
||||||
"url": url,
|
"url": url,
|
||||||
"unsubscribe_url": unsubscribe_url,
|
"unsubscribe_url": unsubscribe_url,
|
||||||
"unsubscribe_post_url": unsubscribe_post_url,
|
"unsubscribe_post_url": unsubscribe_post_url,
|
||||||
@@ -145,6 +185,7 @@ async fn send(
|
|||||||
inviter: Option<&str>,
|
inviter: Option<&str>,
|
||||||
message: Option<&str>,
|
message: Option<&str>,
|
||||||
expires: OffsetDateTime,
|
expires: OffsetDateTime,
|
||||||
|
gift: Option<&Gift>,
|
||||||
) -> Result<String, ApiError> {
|
) -> Result<String, ApiError> {
|
||||||
let token = db::new_token();
|
let token = db::new_token();
|
||||||
sqlx::query("INSERT INTO invitation_tokens (token_hash, invitation_id) VALUES ($1, $2)")
|
sqlx::query("INSERT INTO invitation_tokens (token_hash, invitation_id) VALUES ($1, $2)")
|
||||||
@@ -152,13 +193,13 @@ async fn send(
|
|||||||
.bind(id)
|
.bind(id)
|
||||||
.execute(&mut *conn)
|
.execute(&mut *conn)
|
||||||
.await?;
|
.await?;
|
||||||
let payload = payload(state, &token, inviter, message, expires);
|
let payload = payload(state, &token, inviter, message, expires, gift);
|
||||||
let url = payload["url"].as_str().unwrap_or_default().to_owned();
|
let url = payload["url"].as_str().unwrap_or_default().to_owned();
|
||||||
queue_email_to(conn, None, email, "invitation", locale, payload).await?;
|
queue_email_to(conn, None, email, "invitation", locale, payload).await?;
|
||||||
Ok(url)
|
Ok(url)
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn opted_out(conn: &mut PgConnection, email: &str) -> Result<bool, ApiError> {
|
pub(super) 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)")
|
Ok(sqlx::query_scalar("SELECT EXISTS (SELECT 1 FROM email_optouts WHERE email_hash = $1)")
|
||||||
.bind(db::token_hash(email))
|
.bind(db::token_hash(email))
|
||||||
.fetch_one(conn)
|
.fetch_one(conn)
|
||||||
@@ -173,6 +214,8 @@ pub struct CreateInvitations {
|
|||||||
emails: Vec<String>,
|
emails: Vec<String>,
|
||||||
message: Option<String>,
|
message: Option<String>,
|
||||||
locale: Option<String>,
|
locale: Option<String>,
|
||||||
|
/// A package from the catalog the invitees get (as a promo code).
|
||||||
|
package: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Invites a list of addresses. Each gets a result: `invited` (with the
|
/// Invites a list of addresses. Each gets a result: `invited` (with the
|
||||||
@@ -188,6 +231,10 @@ pub async fn create(
|
|||||||
}
|
}
|
||||||
let message = clean_message(req.message)?;
|
let message = clean_message(req.message)?;
|
||||||
let locale = validate_locale(&state, req.locale.as_deref())?;
|
let locale = validate_locale(&state, req.locale.as_deref())?;
|
||||||
|
let package = match req.package.as_deref().filter(|p| !p.is_empty()) {
|
||||||
|
Some(id) => Some(packages::find(id).ok_or(ApiError::NotFound("package"))?),
|
||||||
|
None => None,
|
||||||
|
};
|
||||||
let inviter = admin.user.display_name.clone();
|
let inviter = admin.user.display_name.clone();
|
||||||
let mut results = Vec::new();
|
let mut results = Vec::new();
|
||||||
let mut seen = std::collections::HashSet::new();
|
let mut seen = std::collections::HashSet::new();
|
||||||
@@ -240,8 +287,20 @@ pub async fn create(
|
|||||||
results.push(json!({ "email": email, "status": "already_invited" }));
|
results.push(json!({ "email": email, "status": "already_invited" }));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
let url = send(&state, &mut tx, id, &email, &locale, inviter.as_deref(), message.as_deref(), expires).await?;
|
let gift = match package {
|
||||||
results.push(json!({ "email": email, "status": "invited", "id": id, "url": url }));
|
Some(p) => {
|
||||||
|
let note = format!("meghívó: {email}");
|
||||||
|
let code = super::promo::new_code(&mut tx, p.id, Some(¬e), Some(admin.id()), Some(id)).await?;
|
||||||
|
Some((super::promo::display(&code), p.name))
|
||||||
|
}
|
||||||
|
None => None,
|
||||||
|
};
|
||||||
|
let url =
|
||||||
|
send(&state, &mut tx, id, &email, &locale, inviter.as_deref(), message.as_deref(), expires, gift.as_ref())
|
||||||
|
.await?;
|
||||||
|
results.push(json!({
|
||||||
|
"email": email, "status": "invited", "id": id, "url": url, "promo_code": gift.as_ref().map(|g| &g.0),
|
||||||
|
}));
|
||||||
}
|
}
|
||||||
tx.commit().await?;
|
tx.commit().await?;
|
||||||
Ok((StatusCode::CREATED, Json(json!({ "results": results }))))
|
Ok((StatusCode::CREATED, Json(json!({ "results": results }))))
|
||||||
@@ -265,6 +324,9 @@ struct Row {
|
|||||||
mail_sent_at: Option<OffsetDateTime>,
|
mail_sent_at: Option<OffsetDateTime>,
|
||||||
mail_failed_at: Option<OffsetDateTime>,
|
mail_failed_at: Option<OffsetDateTime>,
|
||||||
mail_error: Option<String>,
|
mail_error: Option<String>,
|
||||||
|
promo_code: Option<String>,
|
||||||
|
promo_package: Option<String>,
|
||||||
|
promo_redeemed_at: Option<OffsetDateTime>,
|
||||||
}
|
}
|
||||||
|
|
||||||
fn status(accepted: Option<OffsetDateTime>, revoked: Option<OffsetDateTime>, expires: OffsetDateTime) -> &'static str {
|
fn status(accepted: Option<OffsetDateTime>, revoked: Option<OffsetDateTime>, expires: OffsetDateTime) -> &'static str {
|
||||||
@@ -285,8 +347,10 @@ pub async fn list(State(state): St, _admin: AdminUser) -> ApiResult<Json<Value>>
|
|||||||
"SELECT i.id, i.email, i.message, i.locale, i.created_at, i.expires_at, i.sent_count, i.last_sent_at, \
|
"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, \
|
i.accepted_at, i.revoked_at, inv.display_name AS invited_by_name, \
|
||||||
coalesce(acc.display_name, acc.email) AS accepted_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 \
|
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, \
|
||||||
|
pc.code AS promo_code, pc.package AS promo_package, pc.redeemed_at AS promo_redeemed_at \
|
||||||
FROM invitations i \
|
FROM invitations i \
|
||||||
|
LEFT JOIN promo_codes pc ON pc.invitation_id = i.id \
|
||||||
LEFT JOIN users inv ON inv.id = i.invited_by \
|
LEFT JOIN users inv ON inv.id = i.invited_by \
|
||||||
LEFT JOIN users acc ON acc.id = i.accepted_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 \
|
LEFT JOIN LATERAL (SELECT created_at, sent_at, failed_at, last_error FROM email_outbox \
|
||||||
@@ -318,6 +382,12 @@ pub async fn list(State(state): St, _admin: AdminUser) -> ApiResult<Json<Value>>
|
|||||||
"accepted_at": rfc3339_opt(r.accepted_at), "accepted_by": r.accepted_by_name,
|
"accepted_at": rfc3339_opt(r.accepted_at), "accepted_by": r.accepted_by_name,
|
||||||
"invited_by": r.invited_by_name,
|
"invited_by": r.invited_by_name,
|
||||||
"mail": mail, "mail_error": r.mail_error, "can_resend": can_resend,
|
"mail": mail, "mail_error": r.mail_error, "can_resend": can_resend,
|
||||||
|
"package": r.promo_package.as_deref().map(|p| json!({
|
||||||
|
"id": p,
|
||||||
|
"name": packages::find(p).map(|p| p.name),
|
||||||
|
"code": r.promo_code.as_deref().map(super::promo::display),
|
||||||
|
"redeemed_at": rfc3339_opt(r.promo_redeemed_at),
|
||||||
|
})),
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
.collect();
|
.collect();
|
||||||
@@ -391,22 +461,34 @@ pub async fn resend(
|
|||||||
.execute(&mut *tx)
|
.execute(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
let inviter = admin.user.display_name.clone();
|
let inviter = admin.user.display_name.clone();
|
||||||
let url = send(&state, &mut tx, id, &email, &locale, inviter.as_deref(), message.as_deref(), expires).await?;
|
let gift = gift_of(&mut tx, id).await?;
|
||||||
|
let url =
|
||||||
|
send(&state, &mut tx, id, &email, &locale, inviter.as_deref(), message.as_deref(), expires, gift.as_ref())
|
||||||
|
.await?;
|
||||||
tx.commit().await?;
|
tx.commit().await?;
|
||||||
Ok(Json(json!({ "id": id, "url": url, "expires_at": rfc3339(expires) })))
|
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> {
|
pub async fn revoke(State(state): St, _admin: AdminUser, WithRejection(Path(id), _): IdPath) -> ApiResult<StatusCode> {
|
||||||
|
let mut tx = state.db.begin().await?;
|
||||||
let done = sqlx::query(
|
let done = sqlx::query(
|
||||||
"UPDATE invitations SET revoked_at = now() WHERE id = $1 AND accepted_at IS NULL AND revoked_at IS NULL",
|
"UPDATE invitations SET revoked_at = now() WHERE id = $1 AND accepted_at IS NULL AND revoked_at IS NULL",
|
||||||
)
|
)
|
||||||
.bind(id)
|
.bind(id)
|
||||||
.execute(&state.db)
|
.execute(&mut *tx)
|
||||||
.await?
|
.await?
|
||||||
.rows_affected();
|
.rows_affected();
|
||||||
if done == 0 {
|
if done == 0 {
|
||||||
return Err(ApiError::NotFound("open invitation"));
|
return Err(ApiError::NotFound("open invitation"));
|
||||||
}
|
}
|
||||||
|
// Its package goes with it.
|
||||||
|
sqlx::query(
|
||||||
|
"UPDATE promo_codes SET revoked_at = now() WHERE invitation_id = $1 AND redeemed_at IS NULL AND revoked_at IS NULL",
|
||||||
|
)
|
||||||
|
.bind(id)
|
||||||
|
.execute(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
tx.commit().await?;
|
||||||
Ok(StatusCode::NO_CONTENT)
|
Ok(StatusCode::NO_CONTENT)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -427,6 +509,8 @@ pub struct PreviewRequest {
|
|||||||
/// Also send it to the admin's own address.
|
/// Also send it to the admin's own address.
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
send_to_me: bool,
|
send_to_me: bool,
|
||||||
|
/// Show it with this package (a sample code).
|
||||||
|
package: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The invitation e-mail with sample links (they lead nowhere), and
|
/// The invitation e-mail with sample links (they lead nowhere), and
|
||||||
@@ -438,12 +522,17 @@ pub async fn preview(
|
|||||||
) -> ApiResult<Json<Value>> {
|
) -> ApiResult<Json<Value>> {
|
||||||
let message = clean_message(req.message)?;
|
let message = clean_message(req.message)?;
|
||||||
let locale = validate_locale(&state, req.locale.as_deref())?;
|
let locale = validate_locale(&state, req.locale.as_deref())?;
|
||||||
|
let gift = match req.package.as_deref().filter(|p| !p.is_empty()) {
|
||||||
|
Some(id) => Some(("MINT-AKOD-XXXX".to_string(), packages::find(id).ok_or(ApiError::NotFound("package"))?.name)),
|
||||||
|
None => None,
|
||||||
|
};
|
||||||
let payload = payload(
|
let payload = payload(
|
||||||
&state,
|
&state,
|
||||||
"minta",
|
"minta",
|
||||||
admin.user.display_name.as_deref(),
|
admin.user.display_name.as_deref(),
|
||||||
message.as_deref(),
|
message.as_deref(),
|
||||||
OffsetDateTime::now_utc() + INVITATION_TTL,
|
OffsetDateTime::now_utc() + INVITATION_TTL,
|
||||||
|
gift.as_ref(),
|
||||||
);
|
);
|
||||||
let mail = email_templates::render("invitation", &locale, &payload)
|
let mail = email_templates::render("invitation", &locale, &payload)
|
||||||
.map_err(|e| ApiError::Internal(format!("invitation template: {e}")))?;
|
.map_err(|e| ApiError::Internal(format!("invitation template: {e}")))?;
|
||||||
@@ -498,8 +587,13 @@ pub async fn unsubscribe(
|
|||||||
WithRejection(Query(q), _): WithRejection<Query<TokenQuery>, ApiError>,
|
WithRejection(Query(q), _): WithRejection<Query<TokenQuery>, ApiError>,
|
||||||
) -> ApiResult<Json<Value>> {
|
) -> ApiResult<Json<Value>> {
|
||||||
let mut tx = state.db.begin().await?;
|
let mut tx = state.db.begin().await?;
|
||||||
|
// The link of a site invitation, of a "how compatible are we?" one a user
|
||||||
|
// had us e-mail, or of the waitlist confirmation.
|
||||||
let email: Option<String> = sqlx::query_scalar(
|
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",
|
"SELECT i.email FROM invitation_tokens t JOIN invitations i ON i.id = t.invitation_id WHERE t.token_hash = $1 \
|
||||||
|
UNION ALL SELECT invitee_email FROM synastry_invites WHERE token_hash = $1 AND invitee_email IS NOT NULL \
|
||||||
|
UNION ALL SELECT email FROM waitlist WHERE token_hash = $1 \
|
||||||
|
LIMIT 1",
|
||||||
)
|
)
|
||||||
.bind(db::token_hash(q.token.trim()))
|
.bind(db::token_hash(q.token.trim()))
|
||||||
.fetch_optional(&mut *tx)
|
.fetch_optional(&mut *tx)
|
||||||
@@ -509,12 +603,22 @@ pub async fn unsubscribe(
|
|||||||
.bind(db::token_hash(&email))
|
.bind(db::token_hash(&email))
|
||||||
.execute(&mut *tx)
|
.execute(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
sqlx::query(
|
let revoked: Vec<Uuid> = sqlx::query_scalar(
|
||||||
"UPDATE invitations SET revoked_at = now() WHERE email = $1 AND accepted_at IS NULL AND revoked_at IS NULL",
|
"UPDATE invitations SET revoked_at = now() WHERE email = $1 AND accepted_at IS NULL AND revoked_at IS NULL \
|
||||||
|
RETURNING id",
|
||||||
)
|
)
|
||||||
.bind(&email)
|
.bind(&email)
|
||||||
|
.fetch_all(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
// Their packages go with them, as when an admin revokes an invitation.
|
||||||
|
sqlx::query(
|
||||||
|
"UPDATE promo_codes SET revoked_at = now() \
|
||||||
|
WHERE invitation_id = ANY($1) AND redeemed_at IS NULL AND revoked_at IS NULL",
|
||||||
|
)
|
||||||
|
.bind(&revoked)
|
||||||
.execute(&mut *tx)
|
.execute(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
|
sqlx::query("DELETE FROM waitlist WHERE email = $1").bind(&email).execute(&mut *tx).await?;
|
||||||
tx.commit().await?;
|
tx.commit().await?;
|
||||||
Ok(Json(json!({ "unsubscribed": true })))
|
Ok(Json(json!({ "unsubscribed": true })))
|
||||||
}
|
}
|
||||||
@@ -529,19 +633,41 @@ pub struct WaitlistRequest {
|
|||||||
/// Joins the waitlist. Always answers the same, so it does not reveal who has an account.
|
/// Joins the waitlist. Always answers the same, so it does not reveal who has an account.
|
||||||
pub async fn join_waitlist(
|
pub async fn join_waitlist(
|
||||||
State(state): St,
|
State(state): St,
|
||||||
|
headers: axum::http::HeaderMap,
|
||||||
WithRejection(Json(req), _): Body<WaitlistRequest>,
|
WithRejection(Json(req), _): Body<WaitlistRequest>,
|
||||||
) -> ApiResult<(StatusCode, Json<Value>)> {
|
) -> ApiResult<(StatusCode, Json<Value>)> {
|
||||||
let email = normalize_email(&req.email)?;
|
let email = normalize_email(&req.email)?;
|
||||||
let locale = validate_locale(&state, req.locale.as_deref())?;
|
let locale = validate_locale(&state, req.locale.as_deref())?;
|
||||||
sqlx::query(
|
// Every sign-up sends an e-mail: a few per address, so the form cannot be used to flood someone.
|
||||||
"INSERT INTO waitlist (email, locale) SELECT $1, $2 \
|
let ip = super::client_ip(&headers).unwrap_or_else(|| "unknown".into());
|
||||||
|
let key = format!("waitlist:{ip}");
|
||||||
|
state.login_limiter.check(&key)?;
|
||||||
|
let token = db::new_token();
|
||||||
|
let mut tx = state.db.begin().await?;
|
||||||
|
let added = sqlx::query(
|
||||||
|
"INSERT INTO waitlist (email, locale, token_hash) SELECT $1, $2, $3 \
|
||||||
WHERE NOT EXISTS (SELECT 1 FROM users WHERE email = $1) \
|
WHERE NOT EXISTS (SELECT 1 FROM users WHERE email = $1) \
|
||||||
AND (SELECT count(*) FROM waitlist) < 10000 \
|
AND (SELECT count(*) FROM waitlist) < 10000 \
|
||||||
ON CONFLICT DO NOTHING",
|
ON CONFLICT DO NOTHING",
|
||||||
)
|
)
|
||||||
.bind(&email)
|
.bind(&email)
|
||||||
.bind(&locale)
|
.bind(&locale)
|
||||||
.execute(&state.db)
|
.bind(db::token_hash(&token))
|
||||||
.await?;
|
.execute(&mut *tx)
|
||||||
|
.await?
|
||||||
|
.rows_affected()
|
||||||
|
== 1;
|
||||||
|
// A confirmation, once, unless the address asked for no more mail from us.
|
||||||
|
if added && !opted_out(&mut tx, &email).await? {
|
||||||
|
let (_, unsubscribe_url, unsubscribe_post_url) = links(&state, &token);
|
||||||
|
let payload = json!({
|
||||||
|
"url": state.config.public_base_url,
|
||||||
|
"unsubscribe_url": unsubscribe_url,
|
||||||
|
"unsubscribe_post_url": unsubscribe_post_url,
|
||||||
|
});
|
||||||
|
queue_email_to(&mut tx, None, &email, "waitlist_joined", &locale, payload).await?;
|
||||||
|
state.login_limiter.failed(&key);
|
||||||
|
}
|
||||||
|
tx.commit().await?;
|
||||||
Ok((StatusCode::ACCEPTED, Json(json!({ "ok": true }))))
|
Ok((StatusCode::ACCEPTED, Json(json!({ "ok": true }))))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,100 @@
|
|||||||
|
//! The user's invoices: the list, and the PDF fetched from Billingo on
|
||||||
|
//! download (we keep every invoice detail, but not the PDF itself).
|
||||||
|
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
|
use axum::Json;
|
||||||
|
use axum::extract::{Path, State};
|
||||||
|
use axum::http::{HeaderValue, header};
|
||||||
|
use axum::response::{IntoResponse, Response};
|
||||||
|
use axum_extra::extract::WithRejection;
|
||||||
|
use serde_json::{Value, json};
|
||||||
|
use time::{Date, OffsetDateTime};
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
use super::{IdPath, St};
|
||||||
|
use crate::auth::AuthUser;
|
||||||
|
use crate::error::{ApiError, ApiResult};
|
||||||
|
|
||||||
|
type Row = (Uuid, String, Option<String>, Option<Date>, String, i32, OffsetDateTime);
|
||||||
|
|
||||||
|
/// The user's invoices, newest first. Until Billingo has issued one it is
|
||||||
|
/// shown as being prepared.
|
||||||
|
pub async fn list(State(state): St, auth: AuthUser) -> ApiResult<Json<Value>> {
|
||||||
|
let rows: Vec<Row> = sqlx::query_as(
|
||||||
|
"SELECT id, status, invoice_number, invoice_date, item_name, gross_huf, created_at FROM invoices \
|
||||||
|
WHERE user_id = $1 ORDER BY created_at DESC",
|
||||||
|
)
|
||||||
|
.bind(auth.id())
|
||||||
|
.fetch_all(&state.db)
|
||||||
|
.await?;
|
||||||
|
let invoices: Vec<Value> = rows
|
||||||
|
.into_iter()
|
||||||
|
.map(|(id, status, number, date, item, gross, created_at)| {
|
||||||
|
json!({
|
||||||
|
"id": id,
|
||||||
|
"ready": status == "issued",
|
||||||
|
"invoice_number": number,
|
||||||
|
"invoice_date": date.map(|d| d.to_string()),
|
||||||
|
"item": item,
|
||||||
|
"gross_huf": gross,
|
||||||
|
"paid_at": created_at.format(&time::format_description::well_known::Rfc3339).ok(),
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
Ok(Json(json!({ "invoices": invoices })))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The invoice's PDF, from Billingo.
|
||||||
|
pub async fn pdf(State(state): St, auth: AuthUser, WithRejection(Path(id), _): IdPath) -> ApiResult<Response> {
|
||||||
|
let row: Option<(i64, Option<String>)> = sqlx::query_as(
|
||||||
|
"SELECT billingo_document_id, invoice_number FROM invoices \
|
||||||
|
WHERE id = $1 AND user_id = $2 AND status = 'issued' AND billingo_document_id IS NOT NULL",
|
||||||
|
)
|
||||||
|
.bind(id)
|
||||||
|
.bind(auth.id())
|
||||||
|
.fetch_optional(&state.db)
|
||||||
|
.await?;
|
||||||
|
let (document, number) = row.ok_or(ApiError::NotFound("invoice"))?;
|
||||||
|
let unavailable = |detail: String| {
|
||||||
|
tracing::error!(error = %detail, invoice = %id, "invoice download failed");
|
||||||
|
ApiError::conflict("invoice_unavailable", "A számla letöltése most nem sikerült. Próbáld újra pár perc múlva.")
|
||||||
|
};
|
||||||
|
let key =
|
||||||
|
state.config.billingo_api_key.as_deref().ok_or_else(|| unavailable("BILLINGO_API_KEY is not set".into()))?;
|
||||||
|
let http = reqwest::Client::builder().timeout(Duration::from_secs(30)).build().expect("static configuration");
|
||||||
|
let res = http
|
||||||
|
.get(format!("{}/documents/{document}/download", state.config.billingo_api_url))
|
||||||
|
.header("X-API-KEY", key)
|
||||||
|
.header("Accept", "application/pdf")
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.map_err(|e| unavailable(e.to_string()))?;
|
||||||
|
let is_pdf = res
|
||||||
|
.headers()
|
||||||
|
.get(header::CONTENT_TYPE)
|
||||||
|
.and_then(|v| v.to_str().ok())
|
||||||
|
.is_some_and(|t| t.starts_with("application/pdf"));
|
||||||
|
if !res.status().is_success() || !is_pdf {
|
||||||
|
let status = res.status();
|
||||||
|
let body = res.text().await.unwrap_or_default();
|
||||||
|
return Err(unavailable(format!("HTTP {status}: {}", body.chars().take(300).collect::<String>())));
|
||||||
|
}
|
||||||
|
let bytes = res.bytes().await.map_err(|e| unavailable(e.to_string()))?;
|
||||||
|
let name: String = number
|
||||||
|
.unwrap_or_else(|| document.to_string())
|
||||||
|
.chars()
|
||||||
|
.map(|c| if c.is_ascii_alphanumeric() || c == '-' { c } else { '-' })
|
||||||
|
.collect();
|
||||||
|
let disposition = HeaderValue::from_str(&format!("attachment; filename=\"szamla-{name}.pdf\""))
|
||||||
|
.unwrap_or_else(|_| HeaderValue::from_static("attachment; filename=\"szamla.pdf\""));
|
||||||
|
Ok((
|
||||||
|
[
|
||||||
|
(header::CONTENT_TYPE, HeaderValue::from_static("application/pdf")),
|
||||||
|
(header::CONTENT_DISPOSITION, disposition),
|
||||||
|
(header::CACHE_CONTROL, HeaderValue::from_static("private, no-store")),
|
||||||
|
],
|
||||||
|
bytes,
|
||||||
|
)
|
||||||
|
.into_response())
|
||||||
|
}
|
||||||
@@ -122,9 +122,16 @@ pub async fn restart(
|
|||||||
.rows_affected()
|
.rows_affected()
|
||||||
} else {
|
} else {
|
||||||
let Some(row) = find_analysis(&state.db, id).await? else { continue };
|
let Some(row) = find_analysis(&state.db, id).await? else { continue };
|
||||||
let Some(hash) = target_hash(&state.db, &row).await? else { continue };
|
let (model, fallback, cache_key, prompt_version) = if kind == "tarot" {
|
||||||
let (model, fallback) = models_for(&state, Kind::parse(&kind).unwrap_or(Kind::Natal)).await?;
|
// A tarot reading: the analysis model, the same cards, never cached.
|
||||||
let (cache_key, prompt_version) = versions(&state, &kind, &hash, &model, &row.language).await?;
|
let (model, fallback) = models_for(&state, Kind::Natal).await?;
|
||||||
|
(model, fallback, format!("tarot|{id}"), state.config.prompt_version.clone())
|
||||||
|
} else {
|
||||||
|
let Some(hash) = target_hash(&state.db, &row).await? else { continue };
|
||||||
|
let (model, fallback) = models_for(&state, Kind::parse(&kind).unwrap_or(Kind::Natal)).await?;
|
||||||
|
let (cache_key, prompt_version) = versions(&state, &kind, &hash, &model, &row.language).await?;
|
||||||
|
(model, fallback, cache_key, prompt_version)
|
||||||
|
};
|
||||||
sqlx::query(
|
sqlx::query(
|
||||||
"UPDATE analyses SET status = 'pending', model = $2, fallback_model = $3, on_fallback = false, \
|
"UPDATE analyses SET status = 'pending', model = $2, fallback_model = $3, on_fallback = false, \
|
||||||
cache_key = $4, prompt_version = $5, attempts = 0, next_attempt_at = now(), started_at = NULL, \
|
cache_key = $4, prompt_version = $5, attempts = 0, next_attempt_at = now(), started_at = NULL, \
|
||||||
|
|||||||
@@ -13,14 +13,17 @@ mod charts;
|
|||||||
mod errors;
|
mod errors;
|
||||||
mod forecasts;
|
mod forecasts;
|
||||||
mod invitations;
|
mod invitations;
|
||||||
|
mod invoices_user;
|
||||||
mod jobs;
|
mod jobs;
|
||||||
mod models;
|
mod models;
|
||||||
mod payments;
|
pub(crate) mod payments;
|
||||||
|
mod promo;
|
||||||
mod prompts;
|
mod prompts;
|
||||||
mod questions;
|
mod questions;
|
||||||
mod recalculate;
|
mod recalculate;
|
||||||
mod shares;
|
mod shares;
|
||||||
mod synastries;
|
mod synastries;
|
||||||
|
mod tarot;
|
||||||
|
|
||||||
pub use recalculate::run as recalculate;
|
pub use recalculate::run as recalculate;
|
||||||
|
|
||||||
@@ -33,8 +36,7 @@ use axum::{Json, Router};
|
|||||||
use axum_extra::extract::WithRejection;
|
use axum_extra::extract::WithRejection;
|
||||||
use serde_json::{Value, json};
|
use serde_json::{Value, json};
|
||||||
use tower_http::cors::{AllowOrigin, CorsLayer};
|
use tower_http::cors::{AllowOrigin, CorsLayer};
|
||||||
use tower_http::trace::{DefaultMakeSpan, DefaultOnResponse, TraceLayer};
|
use tower_http::trace::TraceLayer;
|
||||||
use tracing::Level;
|
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
|
|
||||||
use crate::AppState;
|
use crate::AppState;
|
||||||
@@ -55,6 +57,15 @@ where
|
|||||||
serde::Deserialize::deserialize(d).map(Some)
|
serde::Deserialize::deserialize(d).map(Some)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The visitor's address from `X-Real-IP`: Caddy sets it (overwriting what
|
||||||
|
/// the browser sent) from Cloudflare's `CF-Connecting-IP`, trusted only from
|
||||||
|
/// Cloudflare's ranges, and the frontend's proxy passes it on. Not
|
||||||
|
/// `X-Forwarded-For`, whose first entry the browser can write.
|
||||||
|
pub(crate) fn client_ip(headers: &axum::http::HeaderMap) -> Option<String> {
|
||||||
|
let ip = headers.get("x-real-ip")?.to_str().ok()?.trim();
|
||||||
|
(!ip.is_empty()).then(|| ip.to_string())
|
||||||
|
}
|
||||||
|
|
||||||
pub fn router(state: Arc<AppState>) -> Router {
|
pub fn router(state: Arc<AppState>) -> Router {
|
||||||
Router::new()
|
Router::new()
|
||||||
.route("/healthz", get(health))
|
.route("/healthz", get(health))
|
||||||
@@ -64,6 +75,7 @@ pub fn router(state: Arc<AppState>) -> Router {
|
|||||||
.route("/v1/auth/register", post(auth::register))
|
.route("/v1/auth/register", post(auth::register))
|
||||||
.route("/v1/auth/login", post(auth::login))
|
.route("/v1/auth/login", post(auth::login))
|
||||||
.route("/v1/auth/google", post(auth::google))
|
.route("/v1/auth/google", post(auth::google))
|
||||||
|
.route("/v1/auth/apple", post(auth::apple))
|
||||||
.route("/v1/auth/logout", post(auth::logout))
|
.route("/v1/auth/logout", post(auth::logout))
|
||||||
.route("/v1/auth/logout-all", post(auth::logout_all))
|
.route("/v1/auth/logout-all", post(auth::logout_all))
|
||||||
.route("/v1/auth/verify-email", post(auth::verify_email))
|
.route("/v1/auth/verify-email", post(auth::verify_email))
|
||||||
@@ -76,6 +88,11 @@ pub fn router(state: Arc<AppState>) -> Router {
|
|||||||
.route("/v1/me/export", get(account::export))
|
.route("/v1/me/export", get(account::export))
|
||||||
.route("/v1/credits", get(account::credits))
|
.route("/v1/credits", get(account::credits))
|
||||||
.route("/v1/payments/mock", post(payments::mock))
|
.route("/v1/payments/mock", post(payments::mock))
|
||||||
|
.route("/v1/payments/checkout", post(payments::checkout))
|
||||||
|
.route("/v1/payments/checkout/{id}", get(payments::checkout_status))
|
||||||
|
.route("/v1/payments/stripe/webhook", post(payments::stripe_webhook))
|
||||||
|
.route("/v1/invoices", get(invoices_user::list))
|
||||||
|
.route("/v1/invoices/{id}/pdf", get(invoices_user::pdf))
|
||||||
// charts
|
// charts
|
||||||
.route("/v1/charts", get(charts::list).post(charts::create))
|
.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}", get(charts::get_one).patch(charts::update).delete(charts::remove))
|
||||||
@@ -95,11 +112,17 @@ pub fn router(state: Arc<AppState>) -> Router {
|
|||||||
.route("/v1/analyses/{id}", get(analyses::get_one))
|
.route("/v1/analyses/{id}", get(analyses::get_one))
|
||||||
.route("/v1/analyses/{id}/questions", get(questions::list).post(questions::ask))
|
.route("/v1/analyses/{id}/questions", get(questions::list).post(questions::ask))
|
||||||
.route("/v1/questions/{id}", get(questions::get_one))
|
.route("/v1/questions/{id}", get(questions::get_one))
|
||||||
|
.route("/v1/tarot/readings", get(tarot::list).post(tarot::create))
|
||||||
|
.route("/v1/tarot/readings/{id}", get(tarot::get_one))
|
||||||
// sharing
|
// sharing
|
||||||
|
.route("/v1/promo-codes/redeem", post(promo::redeem))
|
||||||
|
.route("/v1/admin/promo-codes", get(promo::list).post(promo::create))
|
||||||
|
.route("/v1/admin/promo-codes/{id}/revoke", post(promo::revoke))
|
||||||
.route("/v1/shares", get(shares::list).post(shares::create))
|
.route("/v1/shares", get(shares::list).post(shares::create))
|
||||||
.route("/v1/shares/{id}", delete(shares::revoke))
|
.route("/v1/shares/{id}", delete(shares::revoke))
|
||||||
// public, no login
|
// public, no login
|
||||||
.route("/v1/public/shares/{slug}", get(shares::public_view))
|
.route("/v1/public/shares/{slug}", get(shares::public_view))
|
||||||
|
.route("/v1/public/shares/{slug}/visit", post(shares::visit))
|
||||||
.route("/v1/public/invites/{token}", get(synastries::public_invite))
|
.route("/v1/public/invites/{token}", get(synastries::public_invite))
|
||||||
.route("/v1/public/invitations/unsubscribe", post(invitations::unsubscribe))
|
.route("/v1/public/invitations/unsubscribe", post(invitations::unsubscribe))
|
||||||
.route("/v1/public/invitations/{token}", get(invitations::public_view))
|
.route("/v1/public/invitations/{token}", get(invitations::public_view))
|
||||||
@@ -127,11 +150,8 @@ pub fn router(state: Arc<AppState>) -> Router {
|
|||||||
.route("/v1/admin/analyses/{id}/regenerate", post(analyses::regenerate))
|
.route("/v1/admin/analyses/{id}/regenerate", post(analyses::regenerate))
|
||||||
.route("/v1/admin/questions/{id}/regenerate", post(questions::regenerate))
|
.route("/v1/admin/questions/{id}/regenerate", post(questions::regenerate))
|
||||||
.layer(cors(&state.config.cors_allowed_origins))
|
.layer(cors(&state.config.cors_allowed_origins))
|
||||||
.layer(
|
// The request log: masked paths, health checks only when they fail.
|
||||||
TraceLayer::new_for_http()
|
.layer(TraceLayer::new_for_http().make_span_with(service_kit::RequestLog).on_response(service_kit::RequestLog))
|
||||||
.make_span_with(DefaultMakeSpan::new().level(Level::INFO))
|
|
||||||
.on_response(DefaultOnResponse::new().level(Level::INFO)),
|
|
||||||
)
|
|
||||||
.with_state(state)
|
.with_state(state)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -154,9 +174,21 @@ async fn public_config(State(state): St) -> Json<Value> {
|
|||||||
let c = &state.config;
|
let c = &state.config;
|
||||||
Json(json!({
|
Json(json!({
|
||||||
"google_login": { "enabled": state.google.enabled(), "client_id": c.google_client_ids.first() },
|
"google_login": { "enabled": state.google.enabled(), "client_id": c.google_client_ids.first() },
|
||||||
|
"apple_login": { "enabled": state.apple.enabled(), "client_id": c.apple_client_ids.first() },
|
||||||
"locales": c.supported_locales,
|
"locales": c.supported_locales,
|
||||||
"password_login": c.password_login,
|
"password_login": c.password_login,
|
||||||
"mock_payments": c.mock_payments,
|
"mock_payments": payments::method(c) == Some("mock"),
|
||||||
|
// "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()),
|
||||||
|
// "AAM" (alanyi adómentes: the prices carry no VAT) or a rate like "27%".
|
||||||
|
"vat": c.invoice_vat.code(),
|
||||||
|
// Buyers accept the ÁSZF on Stripe's page (off until the opening).
|
||||||
|
"terms_consent": c.terms_consent,
|
||||||
|
"user_invites": c.user_invites,
|
||||||
|
"referral_rewards": c.referral_rewards,
|
||||||
"signup_mode": c.signup_mode.as_str(),
|
"signup_mode": c.signup_mode.as_str(),
|
||||||
"password_min_length": crate::auth::MIN_PASSWORD_LEN,
|
"password_min_length": crate::auth::MIN_PASSWORD_LEN,
|
||||||
}))
|
}))
|
||||||
|
|||||||
@@ -1,19 +1,27 @@
|
|||||||
//! Packages and payments. Until Stripe is connected, `MOCK_PAYMENTS=true`
|
//! Packages and payments. With `STRIPE_SECRET_KEY` a package is paid on
|
||||||
//! turns on a stand-in: "paying" grants the package right away, so the paid
|
//! Stripe's hosted Checkout page and granted when Stripe confirms the payment
|
||||||
//! flow can be used end to end.
|
//! (webhook, or the return page asking). Without it `MOCK_PAYMENTS=true`
|
||||||
|
//! turns on a stand-in: "paying" grants the package right away.
|
||||||
|
|
||||||
use axum::Json;
|
use axum::Json;
|
||||||
use axum::extract::State;
|
use axum::body::Bytes;
|
||||||
|
use axum::extract::{Path, State};
|
||||||
|
use axum::http::HeaderMap;
|
||||||
use axum_extra::extract::WithRejection;
|
use axum_extra::extract::WithRejection;
|
||||||
|
use db::Role;
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use serde_json::{Value, json};
|
use serde_json::{Value, json};
|
||||||
|
use time::OffsetDateTime;
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
use super::{Body, St};
|
use super::{Body, St};
|
||||||
|
use crate::AppState;
|
||||||
use crate::auth::AuthUser;
|
use crate::auth::AuthUser;
|
||||||
|
use crate::config::StripeConfig;
|
||||||
use crate::credits::{self, Unit};
|
use crate::credits::{self, Unit};
|
||||||
use crate::error::{ApiError, ApiResult};
|
use crate::error::{ApiError, ApiResult};
|
||||||
use crate::packages::{self, CATALOG, Source};
|
use crate::packages::{self, CATALOG, Source};
|
||||||
use crate::persons;
|
use crate::{invoices, persons, stripe};
|
||||||
|
|
||||||
/// The package catalog (public).
|
/// The package catalog (public).
|
||||||
pub async fn catalog() -> Json<Value> {
|
pub async fn catalog() -> Json<Value> {
|
||||||
@@ -46,7 +54,7 @@ pub async fn mock(
|
|||||||
auth: AuthUser,
|
auth: AuthUser,
|
||||||
WithRejection(Json(req), _): Body<MockPayment>,
|
WithRejection(Json(req), _): Body<MockPayment>,
|
||||||
) -> ApiResult<Json<Value>> {
|
) -> ApiResult<Json<Value>> {
|
||||||
if !state.config.mock_payments {
|
if !state.config.mock_payments || state.config.stripe.is_some() {
|
||||||
return Err(ApiError::NotFound("payment method"));
|
return Err(ApiError::NotFound("payment method"));
|
||||||
}
|
}
|
||||||
let id = match (req.package.as_deref(), req.unit) {
|
let id = match (req.package.as_deref(), req.unit) {
|
||||||
@@ -56,6 +64,7 @@ pub async fn mock(
|
|||||||
(None, Some(Unit::Forecast)) => "addon_forecast",
|
(None, Some(Unit::Forecast)) => "addon_forecast",
|
||||||
(None, Some(Unit::Person)) => "addon_persons",
|
(None, Some(Unit::Person)) => "addon_persons",
|
||||||
(None, Some(Unit::Question)) => "addon_questions",
|
(None, Some(Unit::Question)) => "addon_questions",
|
||||||
|
(None, Some(Unit::Tarot)) => "addon_tarot",
|
||||||
_ => return Err(ApiError::BadRequest("give either package or unit".into())),
|
_ => return Err(ApiError::BadRequest("give either package or unit".into())),
|
||||||
};
|
};
|
||||||
let package = packages::find(id).ok_or(ApiError::NotFound("package"))?;
|
let package = packages::find(id).ok_or(ApiError::NotFound("package"))?;
|
||||||
@@ -65,3 +74,283 @@ pub async fn mock(
|
|||||||
tracing::info!(user = %auth.id(), package = package.id, "mock payment");
|
tracing::info!(user = %auth.id(), package = package.id, "mock payment");
|
||||||
Ok(Json(holdings(&state, &auth).await?))
|
Ok(Json(holdings(&state, &auth).await?))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// How the frontend should offer purchases: `"stripe"`, `"mock"` or `None`
|
||||||
|
/// (no purchases).
|
||||||
|
pub fn method(config: &crate::config::Config) -> Option<&'static str> {
|
||||||
|
match (&config.stripe, config.mock_payments) {
|
||||||
|
(Some(_), _) => Some("stripe"),
|
||||||
|
(None, true) => Some("mock"),
|
||||||
|
(None, false) => None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The terms (ÁSZF) version a purchase accepts; the frontend's `TERMS_UPDATED`.
|
||||||
|
pub const TERMS_VERSION: &str = "2026-11-20";
|
||||||
|
|
||||||
|
/// 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 admins_only(&state.config) && !auth.user.has_role(Role::Admin) {
|
||||||
|
return Err(ApiError::Forbidden("purchases are being tested; they open soon".into()));
|
||||||
|
}
|
||||||
|
Ok(config)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The page to come back to after paying: a plain path of this site, without
|
||||||
|
/// its query (anything else: the packages page).
|
||||||
|
fn return_path(path: Option<&str>) -> String {
|
||||||
|
let path = path.unwrap_or("").split(['?', '#']).next().unwrap_or("");
|
||||||
|
let plain = path.starts_with('/')
|
||||||
|
&& !path.starts_with("//")
|
||||||
|
&& path.len() <= 200
|
||||||
|
&& path.chars().all(|c| c.is_ascii_alphanumeric() || "/-_.".contains(c));
|
||||||
|
if plain { path.to_string() } else { "/csomagok".to_string() }
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct CheckoutRequest {
|
||||||
|
package: String,
|
||||||
|
/// The page the purchase started on (default: the packages page).
|
||||||
|
return_path: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Starts paying for a package: returns the address of Stripe's payment page.
|
||||||
|
pub async fn checkout(
|
||||||
|
State(state): St,
|
||||||
|
auth: AuthUser,
|
||||||
|
WithRejection(Json(req), _): Body<CheckoutRequest>,
|
||||||
|
) -> ApiResult<Json<Value>> {
|
||||||
|
let config = stripe_for(&state, &auth)?;
|
||||||
|
let package = packages::find(&req.package).ok_or(ApiError::NotFound("package"))?;
|
||||||
|
let back = format!("{}{}", state.config.public_base_url, return_path(req.return_path.as_deref()));
|
||||||
|
let field = |k: &str, v: &str| (k.to_string(), v.to_string());
|
||||||
|
let mut form = vec![
|
||||||
|
field("mode", "payment"),
|
||||||
|
field("locale", "hu"),
|
||||||
|
field("client_reference_id", &auth.id().to_string()),
|
||||||
|
field("customer_email", &auth.user.email),
|
||||||
|
// Name and address go on the invoice; a company also gives its name
|
||||||
|
// and tax number ("I'm buying as a business").
|
||||||
|
field("billing_address_collection", "required"),
|
||||||
|
field("tax_id_collection[enabled]", "true"),
|
||||||
|
field("customer_creation", "always"),
|
||||||
|
field("line_items[0][quantity]", "1"),
|
||||||
|
field("line_items[0][price_data][currency]", "huf"),
|
||||||
|
// Stripe counts forints in fillér.
|
||||||
|
field("line_items[0][price_data][unit_amount]", &(package.price_huf * 100).to_string()),
|
||||||
|
field("line_items[0][price_data][product_data][name]", &format!("Sorsfonalak – {}", package.name)),
|
||||||
|
field("line_items[0][price_data][product_data][description]", package.tagline),
|
||||||
|
field("metadata[package]", package.id),
|
||||||
|
field("metadata[user_id]", &auth.id().to_string()),
|
||||||
|
field("payment_intent_data[description]", &format!("Sorsfonalak – {}", package.name)),
|
||||||
|
field("payment_intent_data[metadata][package]", package.id),
|
||||||
|
field("success_url", &format!("{back}?fizetes={{CHECKOUT_SESSION_ID}}")),
|
||||||
|
field("cancel_url", &format!("{back}?fizetes=megszakitva")),
|
||||||
|
];
|
||||||
|
if state.config.terms_consent {
|
||||||
|
// Every purchase accepts the terms and asks for immediate delivery,
|
||||||
|
// giving up the 14-day withdrawal right (45/2014. Korm. rendelet 29. §).
|
||||||
|
// Stripe needs the terms URL in its dashboard (Public details) for this.
|
||||||
|
form.push(field("consent_collection[terms_of_service]", "required"));
|
||||||
|
form.push(field(
|
||||||
|
"custom_text[terms_of_service_acceptance][message]",
|
||||||
|
&format!(
|
||||||
|
"Elfogadom az [ÁSZF-et]({}/aszf), kérem a szolgáltatás azonnali megkezdését, és tudomásul veszem, \
|
||||||
|
hogy ezzel elveszítem a 14 napos elállási jogomat.",
|
||||||
|
state.config.public_base_url
|
||||||
|
),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
let session = state.stripe.create_session(config, &form).await?;
|
||||||
|
let url = session.url.ok_or_else(|| ApiError::Internal(format!("checkout session {} has no url", session.id)))?;
|
||||||
|
sqlx::query("INSERT INTO stripe_checkouts (id, user_id, package, price_huf, live) VALUES ($1, $2, $3, $4, $5)")
|
||||||
|
.bind(&session.id)
|
||||||
|
.bind(auth.id())
|
||||||
|
.bind(package.id)
|
||||||
|
.bind(package.price_huf as i32)
|
||||||
|
.bind(!config.test_mode())
|
||||||
|
.execute(&state.db)
|
||||||
|
.await?;
|
||||||
|
tracing::info!(user = %auth.id(), package = package.id, session = %session.id, "checkout started");
|
||||||
|
Ok(Json(json!({ "url": url })))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Records a paid session (what was charged, the buyer's billing details),
|
||||||
|
/// grants its package and queues the invoice, once. `false`: not our session.
|
||||||
|
async fn complete(state: &AppState, session: &stripe::Session) -> Result<bool, ApiError> {
|
||||||
|
let mut tx = state.db.begin().await?;
|
||||||
|
type Checkout = (Option<Uuid>, String, i32, Option<OffsetDateTime>);
|
||||||
|
let row: Option<Checkout> = sqlx::query_as(
|
||||||
|
"SELECT user_id, package, price_huf, completed_at FROM stripe_checkouts WHERE id = $1 FOR UPDATE",
|
||||||
|
)
|
||||||
|
.bind(&session.id)
|
||||||
|
.fetch_optional(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
let Some((user_id, package_id, price_huf, completed_at)) = row else { return Ok(false) };
|
||||||
|
if completed_at.is_some() {
|
||||||
|
return Ok(true);
|
||||||
|
}
|
||||||
|
let amount_huf = session.amount_total.map(|minor| minor / 100);
|
||||||
|
if amount_huf != Some(i64::from(price_huf)) || session.currency.as_deref() != Some("huf") {
|
||||||
|
tracing::error!(session = %session.id, ?amount_huf, currency = ?session.currency, price_huf, "paid amount differs from the price");
|
||||||
|
}
|
||||||
|
let package =
|
||||||
|
packages::find(&package_id).ok_or_else(|| ApiError::Internal(format!("unknown package {package_id}")))?;
|
||||||
|
// A deleted account still gets its invoice, but no package.
|
||||||
|
let order = match user_id {
|
||||||
|
Some(user_id) => {
|
||||||
|
let note = format!("Stripe {}", session.id);
|
||||||
|
Some(packages::grant(&mut tx, user_id, package, Source::Stripe, Some(user_id), Some(¬e)).await?)
|
||||||
|
}
|
||||||
|
None => None,
|
||||||
|
};
|
||||||
|
if state.config.terms_consent && !session.terms_accepted() {
|
||||||
|
tracing::warn!(session = %session.id, "paid without the terms consent");
|
||||||
|
}
|
||||||
|
sqlx::query(
|
||||||
|
"UPDATE stripe_checkouts SET completed_at = now(), order_id = $2, payment_intent = $3, amount_huf = $4, \
|
||||||
|
customer = $5, terms_accepted_at = CASE WHEN $6 THEN now() END, terms_version = CASE WHEN $6 THEN $7 END \
|
||||||
|
WHERE id = $1",
|
||||||
|
)
|
||||||
|
.bind(&session.id)
|
||||||
|
.bind(order)
|
||||||
|
.bind(&session.payment_intent)
|
||||||
|
.bind(amount_huf.map(|a| a as i32))
|
||||||
|
.bind(&session.customer_details)
|
||||||
|
.bind(session.terms_accepted())
|
||||||
|
.bind(TERMS_VERSION)
|
||||||
|
.execute(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
// The confirmation confirms the withdrawal waiver: only when it was given.
|
||||||
|
if session.terms_accepted() {
|
||||||
|
confirm_by_email(&mut tx, state, session, user_id, package, amount_huf.unwrap_or(i64::from(price_huf))).await?;
|
||||||
|
}
|
||||||
|
let buyer = invoices::Buyer::from_stripe(session.customer_details.as_ref().unwrap_or(&Value::Null), None);
|
||||||
|
let (item, comment) = package.invoice_item();
|
||||||
|
let gross = amount_huf.unwrap_or(i64::from(price_huf));
|
||||||
|
invoices::queue(&mut tx, &session.id, user_id, &buyer, (&item, &comment), gross, state.config.invoice_vat).await?;
|
||||||
|
tx.commit().await?;
|
||||||
|
tracing::info!(user = ?user_id, package = %package_id, session = %session.id, "package paid");
|
||||||
|
Ok(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The purchase confirmation (the "visszaigazolás" of the withdrawal waiver):
|
||||||
|
/// to the account's address, or Stripe's if the account is gone.
|
||||||
|
async fn confirm_by_email(
|
||||||
|
tx: &mut sqlx::PgConnection,
|
||||||
|
state: &AppState,
|
||||||
|
session: &stripe::Session,
|
||||||
|
user_id: Option<Uuid>,
|
||||||
|
package: &packages::Package,
|
||||||
|
amount_huf: i64,
|
||||||
|
) -> Result<(), ApiError> {
|
||||||
|
let account: Option<(String, String, Option<String>)> = match user_id {
|
||||||
|
Some(id) => {
|
||||||
|
sqlx::query_as("SELECT email, locale, display_name FROM users WHERE id = $1")
|
||||||
|
.bind(id)
|
||||||
|
.fetch_optional(&mut *tx)
|
||||||
|
.await?
|
||||||
|
}
|
||||||
|
None => None,
|
||||||
|
};
|
||||||
|
let stripe_email = session.customer_details.as_ref().and_then(|c| c["email"].as_str()).map(str::to_string);
|
||||||
|
let (to, locale, name) = match account {
|
||||||
|
Some((email, locale, name)) => (email, locale, name),
|
||||||
|
None => match stripe_email {
|
||||||
|
Some(email) => (email, "hu".to_string(), None),
|
||||||
|
None => return Ok(()),
|
||||||
|
},
|
||||||
|
};
|
||||||
|
let base = &state.config.public_base_url;
|
||||||
|
let payload = json!({
|
||||||
|
"url": format!("{base}/csomagok"),
|
||||||
|
"display_name": name,
|
||||||
|
"package_name": package.name,
|
||||||
|
"contents": package.contents_text(),
|
||||||
|
"amount": format_huf(amount_huf),
|
||||||
|
"paid_on": OffsetDateTime::now_utc().date().to_string(),
|
||||||
|
"terms_url": format!("{base}/aszf"),
|
||||||
|
"invoices_url": format!("{base}/szamlak"),
|
||||||
|
});
|
||||||
|
super::auth::queue_email_to(tx, user_id, &to, "purchase_confirmation", &locale, payload).await
|
||||||
|
}
|
||||||
|
|
||||||
|
/// "6 000 Ft"
|
||||||
|
fn format_huf(amount: i64) -> String {
|
||||||
|
let digits = amount.to_string();
|
||||||
|
let mut out = String::new();
|
||||||
|
for (i, c) in digits.chars().enumerate() {
|
||||||
|
if i > 0 && (digits.len() - i).is_multiple_of(3) {
|
||||||
|
out.push('\u{a0}');
|
||||||
|
}
|
||||||
|
out.push(c);
|
||||||
|
}
|
||||||
|
format!("{out}\u{a0}Ft")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Where a payment stands (the return page asks until it is paid). If the
|
||||||
|
/// webhook has not arrived yet, Stripe is asked directly.
|
||||||
|
pub async fn checkout_status(
|
||||||
|
State(state): St,
|
||||||
|
auth: AuthUser,
|
||||||
|
WithRejection(Path(id), _): WithRejection<Path<String>, ApiError>,
|
||||||
|
) -> ApiResult<Json<Value>> {
|
||||||
|
let row: Option<(String, Option<OffsetDateTime>)> =
|
||||||
|
sqlx::query_as("SELECT package, completed_at FROM stripe_checkouts WHERE id = $1 AND user_id = $2")
|
||||||
|
.bind(&id)
|
||||||
|
.bind(auth.id())
|
||||||
|
.fetch_optional(&state.db)
|
||||||
|
.await?;
|
||||||
|
let (package_id, completed_at) = row.ok_or(ApiError::NotFound("payment"))?;
|
||||||
|
let mut status = if completed_at.is_some() { "paid" } else { "pending" };
|
||||||
|
if let (None, Some(config)) = (completed_at, &state.config.stripe) {
|
||||||
|
let session = state.stripe.get_session(config, &id).await?;
|
||||||
|
if session.paid() {
|
||||||
|
complete(&state, &session).await?;
|
||||||
|
status = "paid";
|
||||||
|
} else if session.status.as_deref() == Some("expired") {
|
||||||
|
status = "expired";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(Json(json!({
|
||||||
|
"status": status,
|
||||||
|
"package": package_id,
|
||||||
|
"name": packages::find(&package_id).map(|p| p.name),
|
||||||
|
})))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Stripe's webhook (Developers → Webhooks; event `checkout.session.completed`,
|
||||||
|
/// for delayed methods also `checkout.session.async_payment_succeeded`).
|
||||||
|
pub async fn stripe_webhook(State(state): St, headers: HeaderMap, body: Bytes) -> ApiResult<Json<Value>> {
|
||||||
|
let secret = state
|
||||||
|
.config
|
||||||
|
.stripe
|
||||||
|
.as_ref()
|
||||||
|
.and_then(|c| c.webhook_secret.as_deref())
|
||||||
|
.ok_or(ApiError::NotFound("payment method"))?;
|
||||||
|
let signature = headers.get("stripe-signature").and_then(|v| v.to_str().ok()).unwrap_or("");
|
||||||
|
let now = OffsetDateTime::now_utc().unix_timestamp();
|
||||||
|
if !stripe::verify_signature(secret, signature, &body, now) {
|
||||||
|
tracing::warn!("stripe webhook with a bad signature");
|
||||||
|
return Err(ApiError::BadRequest("invalid signature".into()));
|
||||||
|
}
|
||||||
|
let mut event: Value = serde_json::from_slice(&body).map_err(|e| ApiError::BadRequest(e.to_string()))?;
|
||||||
|
let kind = event["type"].as_str().unwrap_or_default();
|
||||||
|
if matches!(kind, "checkout.session.completed" | "checkout.session.async_payment_succeeded") {
|
||||||
|
let session: stripe::Session = serde_json::from_value(event["data"]["object"].take())
|
||||||
|
.map_err(|e| ApiError::BadRequest(format!("checkout session: {e}")))?;
|
||||||
|
if session.paid() && !complete(&state, &session).await? {
|
||||||
|
tracing::warn!(session = %session.id, "stripe webhook for a session we did not start");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(Json(json!({ "received": true })))
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,277 @@
|
|||||||
|
//! Promo codes. An admin makes a batch for one package (or one comes with an
|
||||||
|
//! invitation); a logged-in user redeems a code once. Redeeming fills the
|
||||||
|
//! user's units up to the package's amounts (used ones come back, more than
|
||||||
|
//! that stays), recorded as an order with source `promo`. Unused codes can be
|
||||||
|
//! withdrawn. Failed redemptions are rate limited per user, so codes cannot
|
||||||
|
//! be guessed.
|
||||||
|
|
||||||
|
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 time::OffsetDateTime;
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
use super::payments::holdings;
|
||||||
|
use super::{Body, IdPath, St};
|
||||||
|
use crate::auth::{AdminUser, AuthUser};
|
||||||
|
use crate::credits::Unit;
|
||||||
|
use crate::error::{ApiError, ApiResult};
|
||||||
|
use crate::packages;
|
||||||
|
use crate::views::{rfc3339, rfc3339_opt};
|
||||||
|
|
||||||
|
/// Characters of a code (12 × ~5 bits: not guessable within the rate limit).
|
||||||
|
const CODE_LEN: usize = 12;
|
||||||
|
const MAX_BATCH: i64 = 500;
|
||||||
|
|
||||||
|
/// `ABCD-EFGH-JKLM`: the stored code in groups of four.
|
||||||
|
pub(super) fn display(code: &str) -> String {
|
||||||
|
code.as_bytes().chunks(4).map(|c| String::from_utf8_lossy(c).into_owned()).collect::<Vec<_>>().join("-")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// What the user typed, as stored: upper case, without spaces and dashes.
|
||||||
|
fn normalize(input: &str) -> String {
|
||||||
|
input.chars().filter(|c| c.is_ascii_alphanumeric()).map(|c| c.to_ascii_uppercase()).collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Makes one code for a package inside the caller's transaction; returns the stored code.
|
||||||
|
pub(super) async fn new_code(
|
||||||
|
tx: &mut sqlx::PgConnection,
|
||||||
|
package: &str,
|
||||||
|
note: Option<&str>,
|
||||||
|
created_by: Option<Uuid>,
|
||||||
|
invitation_id: Option<Uuid>,
|
||||||
|
) -> Result<String, sqlx::Error> {
|
||||||
|
loop {
|
||||||
|
let code = db::random_code(CODE_LEN);
|
||||||
|
// A clash is practically impossible; another code is drawn if it happens.
|
||||||
|
let inserted = sqlx::query(
|
||||||
|
"INSERT INTO promo_codes (id, code, package, note, created_by, invitation_id) \
|
||||||
|
VALUES ($1, $2, $3, $4, $5, $6) ON CONFLICT (code) DO NOTHING",
|
||||||
|
)
|
||||||
|
.bind(Uuid::now_v7())
|
||||||
|
.bind(&code)
|
||||||
|
.bind(package)
|
||||||
|
.bind(note)
|
||||||
|
.bind(created_by)
|
||||||
|
.bind(invitation_id)
|
||||||
|
.execute(&mut *tx)
|
||||||
|
.await?
|
||||||
|
.rows_affected();
|
||||||
|
if inserted == 1 {
|
||||||
|
return Ok(code);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Redeems an open code for the user inside the caller's transaction (the
|
||||||
|
/// code row must be locked). Returns what was added; `None`: the user already
|
||||||
|
/// has everything the package gives, the code stays open.
|
||||||
|
pub(super) async fn redeem_code(
|
||||||
|
tx: &mut sqlx::PgConnection,
|
||||||
|
code_id: Uuid,
|
||||||
|
code: &str,
|
||||||
|
package: &packages::Package,
|
||||||
|
user_id: Uuid,
|
||||||
|
persons_left: Option<i64>,
|
||||||
|
) -> Result<Option<Vec<(Unit, i64)>>, ApiError> {
|
||||||
|
let note = format!("promo code {}", display(code));
|
||||||
|
let Some((order, added)) = packages::top_up(tx, user_id, package, persons_left, Some(¬e)).await? else {
|
||||||
|
return Ok(None);
|
||||||
|
};
|
||||||
|
sqlx::query("UPDATE promo_codes SET redeemed_by = $2, redeemed_at = now(), order_id = $3 WHERE id = $1")
|
||||||
|
.bind(code_id)
|
||||||
|
.bind(user_id)
|
||||||
|
.bind(order)
|
||||||
|
.execute(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
Ok(Some(added))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct NewCodes {
|
||||||
|
package: String,
|
||||||
|
count: i64,
|
||||||
|
note: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Admin: makes `count` new codes for a package.
|
||||||
|
pub async fn create(
|
||||||
|
State(state): St,
|
||||||
|
admin: AdminUser,
|
||||||
|
WithRejection(Json(req), _): Body<NewCodes>,
|
||||||
|
) -> ApiResult<(StatusCode, Json<Value>)> {
|
||||||
|
let package = packages::find(&req.package).ok_or(ApiError::NotFound("package"))?;
|
||||||
|
if !(1..=MAX_BATCH).contains(&req.count) {
|
||||||
|
return Err(ApiError::BadRequest(format!("count must be 1 to {MAX_BATCH}")));
|
||||||
|
}
|
||||||
|
let note = req.note.map(|n| n.trim().chars().take(200).collect::<String>()).filter(|n| !n.is_empty());
|
||||||
|
let mut tx = state.db.begin().await?;
|
||||||
|
let mut codes = Vec::new();
|
||||||
|
for _ in 0..req.count {
|
||||||
|
codes.push(display(&new_code(&mut tx, package.id, note.as_deref(), Some(admin.0.id()), None).await?));
|
||||||
|
}
|
||||||
|
tx.commit().await?;
|
||||||
|
tracing::info!(admin = %admin.0.id(), package = package.id, count = codes.len(), "promo codes created");
|
||||||
|
Ok((StatusCode::CREATED, Json(json!({ "package": package.id, "note": note, "codes": codes }))))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct CodeQuery {
|
||||||
|
/// `unused` (default), `used`, `revoked` or `all`.
|
||||||
|
status: Option<String>,
|
||||||
|
package: Option<String>,
|
||||||
|
/// Part of the code, the note or the redeemer's e-mail.
|
||||||
|
q: Option<String>,
|
||||||
|
limit: Option<i64>,
|
||||||
|
offset: Option<i64>,
|
||||||
|
}
|
||||||
|
|
||||||
|
type Row = (
|
||||||
|
Uuid,
|
||||||
|
String,
|
||||||
|
String,
|
||||||
|
Option<String>,
|
||||||
|
OffsetDateTime,
|
||||||
|
Option<OffsetDateTime>,
|
||||||
|
Option<OffsetDateTime>,
|
||||||
|
Option<String>,
|
||||||
|
Option<String>,
|
||||||
|
);
|
||||||
|
|
||||||
|
/// Admin: the codes, newest first, filtered.
|
||||||
|
pub async fn list(
|
||||||
|
State(state): St,
|
||||||
|
_admin: AdminUser,
|
||||||
|
WithRejection(Query(query), _): WithRejection<Query<CodeQuery>, ApiError>,
|
||||||
|
) -> ApiResult<Json<Value>> {
|
||||||
|
let status = query.status.as_deref().unwrap_or("unused");
|
||||||
|
let condition = match status {
|
||||||
|
"unused" => "p.redeemed_at IS NULL AND p.revoked_at IS NULL",
|
||||||
|
"used" => "p.redeemed_at IS NOT NULL",
|
||||||
|
"revoked" => "p.revoked_at IS NOT NULL",
|
||||||
|
"all" => "true",
|
||||||
|
other => return Err(ApiError::BadRequest(format!("unknown status '{other}'"))),
|
||||||
|
};
|
||||||
|
let limit = query.limit.unwrap_or(100).clamp(1, 500);
|
||||||
|
let offset = query.offset.unwrap_or(0).max(0);
|
||||||
|
let package = query.package.filter(|p| !p.is_empty());
|
||||||
|
let search = query.q.map(|q| q.trim().to_string()).filter(|q| !q.is_empty());
|
||||||
|
// A code is searched for without its dashes.
|
||||||
|
let code_search = search.as_deref().map(normalize).filter(|c| !c.is_empty());
|
||||||
|
let filter = format!(
|
||||||
|
"FROM promo_codes p LEFT JOIN users u ON u.id = p.redeemed_by \
|
||||||
|
WHERE {condition} AND ($1::text IS NULL OR p.package = $1) \
|
||||||
|
AND ($2::text IS NULL OR p.note ILIKE '%' || $2 || '%' OR u.email ILIKE '%' || $2 || '%' \
|
||||||
|
OR ($3::text IS NOT NULL AND p.code LIKE '%' || $3 || '%'))"
|
||||||
|
);
|
||||||
|
let rows: Vec<Row> = sqlx::query_as(&format!(
|
||||||
|
"SELECT p.id, p.code, p.package, p.note, p.created_at, p.redeemed_at, p.revoked_at, u.email, u.display_name \
|
||||||
|
{filter} ORDER BY p.created_at DESC, p.id DESC LIMIT $4 OFFSET $5"
|
||||||
|
))
|
||||||
|
.bind(&package)
|
||||||
|
.bind(&search)
|
||||||
|
.bind(&code_search)
|
||||||
|
.bind(limit)
|
||||||
|
.bind(offset)
|
||||||
|
.fetch_all(&state.db)
|
||||||
|
.await?;
|
||||||
|
let total: i64 = sqlx::query_scalar(&format!("SELECT count(*) {filter}"))
|
||||||
|
.bind(&package)
|
||||||
|
.bind(&search)
|
||||||
|
.bind(&code_search)
|
||||||
|
.fetch_one(&state.db)
|
||||||
|
.await?;
|
||||||
|
let codes: Vec<Value> = rows
|
||||||
|
.into_iter()
|
||||||
|
.map(|(id, code, package, note, created, redeemed, revoked, email, name)| {
|
||||||
|
json!({
|
||||||
|
"id": id,
|
||||||
|
"code": display(&code),
|
||||||
|
"package": package,
|
||||||
|
"package_name": packages::find(&package).map(|p| p.name),
|
||||||
|
"note": note,
|
||||||
|
"created_at": rfc3339(created),
|
||||||
|
"redeemed_at": rfc3339_opt(redeemed),
|
||||||
|
"revoked_at": rfc3339_opt(revoked),
|
||||||
|
"redeemed_by": email.map(|e| json!({ "email": e, "name": name })),
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
Ok(Json(json!({ "codes": codes, "total": total, "status": status, "limit": limit, "offset": offset })))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Admin: withdraws an unused code.
|
||||||
|
pub async fn revoke(State(state): St, _admin: AdminUser, WithRejection(Path(id), _): IdPath) -> ApiResult<StatusCode> {
|
||||||
|
let result = sqlx::query(
|
||||||
|
"UPDATE promo_codes SET revoked_at = now() WHERE id = $1 AND redeemed_at IS NULL AND revoked_at IS NULL",
|
||||||
|
)
|
||||||
|
.bind(id)
|
||||||
|
.execute(&state.db)
|
||||||
|
.await?;
|
||||||
|
if result.rows_affected() == 0 {
|
||||||
|
return Err(ApiError::conflict("promo_not_open", "Csak fel nem használt kódot lehet visszavonni."));
|
||||||
|
}
|
||||||
|
Ok(StatusCode::NO_CONTENT)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct Redeem {
|
||||||
|
code: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Redeems a code: the user gets its package. One use per code.
|
||||||
|
pub async fn redeem(
|
||||||
|
State(state): St,
|
||||||
|
auth: AuthUser,
|
||||||
|
WithRejection(Json(req), _): Body<Redeem>,
|
||||||
|
) -> ApiResult<Json<Value>> {
|
||||||
|
let key = format!("promo:{}", auth.id());
|
||||||
|
state.login_limiter.check(&key)?;
|
||||||
|
let code = normalize(&req.code);
|
||||||
|
let mut tx = state.db.begin().await?;
|
||||||
|
let found: Option<(Uuid, String, Option<OffsetDateTime>, Option<OffsetDateTime>)> =
|
||||||
|
sqlx::query_as("SELECT id, package, redeemed_at, revoked_at FROM promo_codes WHERE code = $1 FOR UPDATE")
|
||||||
|
.bind(&code)
|
||||||
|
.fetch_optional(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
let (id, package_id) = match found {
|
||||||
|
Some((id, package, None, None)) => (id, package),
|
||||||
|
Some((_, _, Some(_), _)) => {
|
||||||
|
state.login_limiter.failed(&key);
|
||||||
|
return Err(ApiError::conflict("promo_used", "Ezt a kódot már felhasználták."));
|
||||||
|
}
|
||||||
|
Some((_, _, _, Some(_))) => {
|
||||||
|
state.login_limiter.failed(&key);
|
||||||
|
return Err(ApiError::conflict("promo_revoked", "Ez a kód már nem érvényes."));
|
||||||
|
}
|
||||||
|
None => {
|
||||||
|
state.login_limiter.failed(&key);
|
||||||
|
return Err(ApiError::conflict("promo_unknown", "Nincs ilyen kód. Ellenőrizd, hogy pontosan írtad-e be."));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let package = packages::find(&package_id).ok_or(ApiError::NotFound("package"))?;
|
||||||
|
sqlx::query("SELECT id FROM users WHERE id = $1 FOR UPDATE").bind(auth.id()).execute(&mut *tx).await?;
|
||||||
|
let persons_left = crate::persons::slots(&mut tx, &auth, state.config.free_person_slots).await?.left();
|
||||||
|
let Some(added) = redeem_code(&mut tx, id, &code, package, auth.id(), persons_left).await? else {
|
||||||
|
return Err(ApiError::conflict(
|
||||||
|
"promo_nothing_to_add",
|
||||||
|
format!(
|
||||||
|
"Most is megvan minden, amit ez a kód adna ({}), ezért nem váltottuk be. Tedd el későbbre.",
|
||||||
|
package.name
|
||||||
|
),
|
||||||
|
));
|
||||||
|
};
|
||||||
|
tx.commit().await?;
|
||||||
|
state.login_limiter.succeeded(&key);
|
||||||
|
tracing::info!(user = %auth.id(), package = package.id, "promo code redeemed");
|
||||||
|
let mut body = holdings(&state, &auth).await?;
|
||||||
|
body["package"] = json!({ "id": package.id, "name": package.name });
|
||||||
|
body["added"] = added.iter().map(|(unit, n)| (unit.as_str().to_string(), json!(n))).collect();
|
||||||
|
Ok(Json(body))
|
||||||
|
}
|
||||||
@@ -9,7 +9,6 @@ use axum::Json;
|
|||||||
use axum::extract::{Path, State};
|
use axum::extract::{Path, State};
|
||||||
use axum::http::StatusCode;
|
use axum::http::StatusCode;
|
||||||
use axum_extra::extract::WithRejection;
|
use axum_extra::extract::WithRejection;
|
||||||
use db::Role;
|
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use serde_json::{Value, json};
|
use serde_json::{Value, json};
|
||||||
use sqlx::PgPool;
|
use sqlx::PgPool;
|
||||||
@@ -145,7 +144,6 @@ pub async fn ask(
|
|||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
let admin = auth.user.has_role(Role::Admin);
|
|
||||||
let (model, fallback, prompt_version) = model_and_version(&state, &analysis.language).await?;
|
let (model, fallback, prompt_version) = model_and_version(&state, &analysis.language).await?;
|
||||||
let question_id = Uuid::now_v7();
|
let question_id = Uuid::now_v7();
|
||||||
let mut tx = state.db.begin().await?;
|
let mut tx = state.db.begin().await?;
|
||||||
@@ -161,13 +159,12 @@ pub async fn ask(
|
|||||||
.bind(&analysis.language)
|
.bind(&analysis.language)
|
||||||
.bind(&model)
|
.bind(&model)
|
||||||
.bind(&prompt_version)
|
.bind(&prompt_version)
|
||||||
.bind(i32::from(!admin))
|
.bind(1i32)
|
||||||
.bind(&fallback)
|
.bind(&fallback)
|
||||||
.fetch_one(&mut *tx)
|
.fetch_one(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
if !admin {
|
// Admins use questions too (they can add more on the admin page).
|
||||||
credits::spend_question(&mut tx, auth.id(), question_id).await?;
|
credits::spend_question(&mut tx, auth.id(), question_id).await?;
|
||||||
}
|
|
||||||
tx.commit().await?;
|
tx.commit().await?;
|
||||||
Ok((StatusCode::ACCEPTED, Json(row.view())))
|
Ok((StatusCode::ACCEPTED, Json(row.view())))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
//! `backend recalculate`: after a change in the calculation, recalculates
|
//! `backend recalculate`: after a change in the calculation, recalculates
|
||||||
//! every stored chart, comparison and forecast with the horoscope service,
|
//! every stored chart, comparison and forecast with the horoscope service,
|
||||||
//! then deletes all analyses and queues them again: a short summary and a
|
//! then deletes all analyses (but the tarot readings) and queues them again: a short summary and a
|
||||||
//! detailed analysis for every chart, one analysis for every comparison and
|
//! detailed analysis for every chart, one analysis for every comparison and
|
||||||
//! every forecast. Nobody is charged; each analysis is requested in the name
|
//! every forecast. Nobody is charged; each analysis is requested in the name
|
||||||
//! of the owner, in the owner's language.
|
//! of the owner, in the owner's language.
|
||||||
@@ -90,7 +90,8 @@ pub async fn run(state: &AppState) -> anyhow::Result<()> {
|
|||||||
}
|
}
|
||||||
tracing::info!(count = forecast_hashes.len(), "forecasts recalculated");
|
tracing::info!(count = forecast_hashes.len(), "forecasts recalculated");
|
||||||
|
|
||||||
let deleted = sqlx::query("DELETE FROM analyses").execute(db).await?.rows_affected();
|
// Tarot readings depend on no calculation: they stay.
|
||||||
|
let deleted = sqlx::query("DELETE FROM analyses WHERE kind <> 'tarot'").execute(db).await?.rows_affected();
|
||||||
let mut queued = 0;
|
let mut queued = 0;
|
||||||
for c in &charts {
|
for c in &charts {
|
||||||
let language = locale(db, c.owner_id).await?;
|
let language = locale(db, c.owner_id).await?;
|
||||||
|
|||||||
@@ -1,13 +1,26 @@
|
|||||||
//! Public sharing links. Creating and revoking a link needs login; opening
|
//! Public sharing links. Creating and revoking a link needs login; opening
|
||||||
//! one (`GET /v1/public/shares/{slug}`) does not. The public view never
|
//! one (`GET /v1/public/shares/{slug}`) does not. The public view never
|
||||||
//! contains birth data unless the owner allowed it for their own chart.
|
//! contains birth data unless the owner allowed it for their own chart.
|
||||||
|
//! A shared chart comes with its newest short summary (the share page and
|
||||||
|
//! its preview image show both). Sharing the same thing again returns the
|
||||||
|
//! link that is already open.
|
||||||
|
//!
|
||||||
|
//! Reading a share writes nothing, so robots cost no database writes. The
|
||||||
|
//! share page reports a visit from the visitor's browser
|
||||||
|
//! (`POST /v1/public/shares/{slug}/visit`): it is counted unless it comes
|
||||||
|
//! from a robot or from the sharer (logged in, or from the address the link
|
||||||
|
//! was made at). The sharer's first such visit earns one free question, once
|
||||||
|
//! per user: a click proves little. A natal analysis is earned by bringing a
|
||||||
|
//! new user (`REFERRAL_REWARDS`): someone who signs up from a shared link and
|
||||||
|
//! makes their own chart, at most [`REFERRAL_LIMIT`] times.
|
||||||
|
|
||||||
use axum::Json;
|
use axum::Json;
|
||||||
use axum::extract::{Path, State};
|
use axum::extract::{Path, State};
|
||||||
use axum::http::StatusCode;
|
use axum::http::{HeaderMap, StatusCode};
|
||||||
use axum_extra::extract::WithRejection;
|
use axum_extra::extract::WithRejection;
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use serde_json::{Value, json};
|
use serde_json::{Value, json};
|
||||||
|
use sha2::{Digest, Sha256};
|
||||||
use sqlx::PgPool;
|
use sqlx::PgPool;
|
||||||
use time::OffsetDateTime;
|
use time::OffsetDateTime;
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
@@ -16,7 +29,7 @@ use super::analyses::{can_see, find_analysis};
|
|||||||
use super::charts::{ChartRow, find_chart, owned_chart};
|
use super::charts::{ChartRow, find_chart, owned_chart};
|
||||||
use super::synastries::{VisibleSynastry, load_synastry, visible_synastry};
|
use super::synastries::{VisibleSynastry, load_synastry, visible_synastry};
|
||||||
use super::{Body, IdPath, St};
|
use super::{Body, IdPath, St};
|
||||||
use crate::auth::AuthUser;
|
use crate::auth::{AuthUser, user_agent};
|
||||||
use crate::error::{ApiError, ApiResult};
|
use crate::error::{ApiError, ApiResult};
|
||||||
use crate::views::{public_chart, rfc3339, rfc3339_opt};
|
use crate::views::{public_chart, rfc3339, rfc3339_opt};
|
||||||
|
|
||||||
@@ -42,10 +55,48 @@ struct ShareRow {
|
|||||||
view_count: i64,
|
view_count: i64,
|
||||||
created_at: OffsetDateTime,
|
created_at: OffsetDateTime,
|
||||||
revoked_at: Option<OffsetDateTime>,
|
revoked_at: Option<OffsetDateTime>,
|
||||||
|
owner_ip_hash: Option<Vec<u8>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
const SHARE_COLUMNS: &str = "id, owner_id, slug, kind, chart_id, synastry_id, analysis_id, title, show_birth_data, \
|
const SHARE_COLUMNS: &str = "id, owner_id, slug, kind, chart_id, synastry_id, analysis_id, title, show_birth_data, \
|
||||||
view_count, created_at, revoked_at";
|
view_count, created_at, revoked_at, owner_ip_hash";
|
||||||
|
|
||||||
|
use super::client_ip;
|
||||||
|
|
||||||
|
/// An address salted with the slug, so the stored value says nothing by itself.
|
||||||
|
fn ip_hash(slug: &str, ip: &str) -> Vec<u8> {
|
||||||
|
Sha256::digest(format!("{slug}:{ip}").as_bytes()).to_vec()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Link preview robots, crawlers and scripts (they do not run the page's
|
||||||
|
/// script anyway; this also stops a direct call).
|
||||||
|
fn is_robot(user_agent: Option<&str>) -> bool {
|
||||||
|
const MARKS: [&str; 16] = [
|
||||||
|
"bot",
|
||||||
|
"crawl",
|
||||||
|
"spider",
|
||||||
|
"slurp",
|
||||||
|
"facebookexternalhit",
|
||||||
|
"preview",
|
||||||
|
"fetch",
|
||||||
|
"curl",
|
||||||
|
"wget",
|
||||||
|
"python",
|
||||||
|
"headless",
|
||||||
|
"http-client",
|
||||||
|
"okhttp",
|
||||||
|
"java/",
|
||||||
|
"go-http",
|
||||||
|
"scrapy",
|
||||||
|
];
|
||||||
|
match user_agent {
|
||||||
|
Some(ua) if !ua.trim().is_empty() => {
|
||||||
|
let ua = ua.to_lowercase();
|
||||||
|
MARKS.iter().any(|m| ua.contains(m))
|
||||||
|
}
|
||||||
|
_ => true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// 96 random bits, 16 URL-safe characters.
|
/// 96 random bits, 16 URL-safe characters.
|
||||||
fn new_slug() -> String {
|
fn new_slug() -> String {
|
||||||
@@ -86,6 +137,7 @@ pub struct CreateShare {
|
|||||||
pub async fn create(
|
pub async fn create(
|
||||||
State(state): St,
|
State(state): St,
|
||||||
auth: AuthUser,
|
auth: AuthUser,
|
||||||
|
headers: HeaderMap,
|
||||||
WithRejection(Json(req), _): Body<CreateShare>,
|
WithRejection(Json(req), _): Body<CreateShare>,
|
||||||
) -> ApiResult<(StatusCode, Json<Value>)> {
|
) -> ApiResult<(StatusCode, Json<Value>)> {
|
||||||
let (chart_id, synastry_id, analysis_id, kind) = match req.kind {
|
let (chart_id, synastry_id, analysis_id, kind) = match req.kind {
|
||||||
@@ -109,19 +161,40 @@ pub async fn create(
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
let title = req.title.map(|t| t.trim().chars().take(120).collect::<String>()).filter(|t| !t.is_empty());
|
let title = req.title.map(|t| t.trim().chars().take(120).collect::<String>()).filter(|t| !t.is_empty());
|
||||||
|
let open: Option<ShareRow> = sqlx::query_as(&format!(
|
||||||
|
"SELECT {SHARE_COLUMNS} FROM shares WHERE owner_id = $1 AND kind = $2 AND revoked_at IS NULL \
|
||||||
|
AND chart_id IS NOT DISTINCT FROM $3 AND synastry_id IS NOT DISTINCT FROM $4 \
|
||||||
|
AND analysis_id IS NOT DISTINCT FROM $5 AND title IS NOT DISTINCT FROM $6 AND show_birth_data = $7 \
|
||||||
|
ORDER BY created_at DESC LIMIT 1"
|
||||||
|
))
|
||||||
|
.bind(auth.id())
|
||||||
|
.bind(kind)
|
||||||
|
.bind(chart_id)
|
||||||
|
.bind(synastry_id)
|
||||||
|
.bind(analysis_id)
|
||||||
|
.bind(&title)
|
||||||
|
.bind(req.show_birth_data)
|
||||||
|
.fetch_optional(&state.db)
|
||||||
|
.await?;
|
||||||
|
if let Some(row) = open {
|
||||||
|
return Ok((StatusCode::OK, Json(row.view(&state.config.public_base_url))));
|
||||||
|
}
|
||||||
|
let slug = new_slug();
|
||||||
let row: ShareRow = sqlx::query_as(&format!(
|
let row: ShareRow = sqlx::query_as(&format!(
|
||||||
"INSERT INTO shares (id, owner_id, slug, kind, chart_id, synastry_id, analysis_id, title, show_birth_data) \
|
"INSERT INTO shares (id, owner_id, slug, kind, chart_id, synastry_id, analysis_id, title, show_birth_data, \
|
||||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9) RETURNING {SHARE_COLUMNS}"
|
owner_ip_hash) \
|
||||||
|
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) RETURNING {SHARE_COLUMNS}"
|
||||||
))
|
))
|
||||||
.bind(Uuid::now_v7())
|
.bind(Uuid::now_v7())
|
||||||
.bind(auth.id())
|
.bind(auth.id())
|
||||||
.bind(new_slug())
|
.bind(&slug)
|
||||||
.bind(kind)
|
.bind(kind)
|
||||||
.bind(chart_id)
|
.bind(chart_id)
|
||||||
.bind(synastry_id)
|
.bind(synastry_id)
|
||||||
.bind(analysis_id)
|
.bind(analysis_id)
|
||||||
.bind(title)
|
.bind(title)
|
||||||
.bind(req.show_birth_data)
|
.bind(req.show_birth_data)
|
||||||
|
.bind(client_ip(&headers).map(|ip| ip_hash(&slug, &ip)))
|
||||||
.fetch_one(&state.db)
|
.fetch_one(&state.db)
|
||||||
.await?;
|
.await?;
|
||||||
Ok((StatusCode::CREATED, Json(row.view(&state.config.public_base_url))))
|
Ok((StatusCode::CREATED, Json(row.view(&state.config.public_base_url))))
|
||||||
@@ -153,8 +226,9 @@ pub async fn revoke(State(state): St, auth: AuthUser, WithRejection(Path(id), _)
|
|||||||
// --- public view -------------------------------------------------------------------------------
|
// --- public view -------------------------------------------------------------------------------
|
||||||
|
|
||||||
fn public_chart_block(chart: &ChartRow, share: &ShareRow) -> Value {
|
fn public_chart_block(chart: &ChartRow, share: &ShareRow) -> Value {
|
||||||
// Birth data only of the sharer's own chart, never of a partner's.
|
// Birth data only of the sharer's own chart, never of a partner's or of a
|
||||||
let show = share.show_birth_data && chart.owner_id == share.owner_id;
|
// person they added (that is someone else's data).
|
||||||
|
let show = share.show_birth_data && chart.owner_id == share.owner_id && chart.kind == "own";
|
||||||
json!({ "label": chart.label, "chart": public_chart(&chart.result, show) })
|
json!({ "label": chart.label, "chart": public_chart(&chart.result, show) })
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -175,6 +249,7 @@ async fn public_body(db: &PgPool, share: &ShareRow) -> Result<Value, ApiError> {
|
|||||||
if let Some(chart_id) = share.chart_id {
|
if let Some(chart_id) = share.chart_id {
|
||||||
let chart = find_chart(db, chart_id).await?.ok_or(ApiError::NotFound("share"))?;
|
let chart = find_chart(db, chart_id).await?.ok_or(ApiError::NotFound("share"))?;
|
||||||
body["chart"] = public_chart_block(&chart, share);
|
body["chart"] = public_chart_block(&chart, share);
|
||||||
|
body["summary"] = latest_summary(db, chart_id).await?;
|
||||||
} else if let Some(synastry_id) = share.synastry_id {
|
} else if let Some(synastry_id) = share.synastry_id {
|
||||||
let s = load_synastry(db, synastry_id).await?.ok_or(ApiError::NotFound("share"))?;
|
let s = load_synastry(db, synastry_id).await?.ok_or(ApiError::NotFound("share"))?;
|
||||||
body["synastry"] = public_synastry_block(&s, share);
|
body["synastry"] = public_synastry_block(&s, share);
|
||||||
@@ -198,14 +273,149 @@ async fn public_body(db: &PgPool, share: &ShareRow) -> Result<Value, ApiError> {
|
|||||||
Ok(body)
|
Ok(body)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Public: the shared content for the share page and its OG image.
|
/// The newest finished short summary of a chart (`null` if none).
|
||||||
|
async fn latest_summary(db: &PgPool, chart_id: Uuid) -> Result<Value, sqlx::Error> {
|
||||||
|
type Row = (Uuid, String, Option<Value>, Option<OffsetDateTime>);
|
||||||
|
let row: Option<Row> = sqlx::query_as(
|
||||||
|
"SELECT id, language, content, completed_at FROM analyses \
|
||||||
|
WHERE chart_id = $1 AND kind = 'summary' AND status = 'done' ORDER BY completed_at DESC LIMIT 1",
|
||||||
|
)
|
||||||
|
.bind(chart_id)
|
||||||
|
.fetch_optional(db)
|
||||||
|
.await?;
|
||||||
|
Ok(match row {
|
||||||
|
Some((id, language, content, completed_at)) => json!({
|
||||||
|
"id": id,
|
||||||
|
"language": language,
|
||||||
|
"title": content.as_ref().and_then(|c| c["title"].as_str()),
|
||||||
|
"summary": content.as_ref().and_then(|c| c["summary"].as_str()),
|
||||||
|
"completed_at": rfc3339_opt(completed_at),
|
||||||
|
}),
|
||||||
|
None => Value::Null,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn open_share(db: &PgPool, slug: &str) -> Result<ShareRow, ApiError> {
|
||||||
|
sqlx::query_as(&format!("SELECT {SHARE_COLUMNS} FROM shares WHERE slug = $1 AND revoked_at IS NULL"))
|
||||||
|
.bind(slug.trim())
|
||||||
|
.fetch_optional(db)
|
||||||
|
.await?
|
||||||
|
.ok_or(ApiError::NotFound("share"))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Public: the shared content for the share page and its OG image (read only).
|
||||||
pub async fn public_view(State(state): St, Path(slug): Path<String>) -> ApiResult<Json<Value>> {
|
pub async fn public_view(State(state): St, Path(slug): Path<String>) -> ApiResult<Json<Value>> {
|
||||||
let share: ShareRow = sqlx::query_as(&format!(
|
let share = open_share(&state.db, &slug).await?;
|
||||||
"UPDATE shares SET view_count = view_count + 1 WHERE slug = $1 AND revoked_at IS NULL RETURNING {SHARE_COLUMNS}"
|
|
||||||
))
|
|
||||||
.bind(slug.trim())
|
|
||||||
.fetch_optional(&state.db)
|
|
||||||
.await?
|
|
||||||
.ok_or(ApiError::NotFound("share"))?;
|
|
||||||
Ok(Json(public_body(&state.db, &share).await?))
|
Ok(Json(public_body(&state.db, &share).await?))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Public: the share page reports that someone opened it. Counted unless a
|
||||||
|
/// robot or the sharer; the sharer's first counted visit ever earns the reward.
|
||||||
|
pub async fn visit(
|
||||||
|
State(state): St,
|
||||||
|
auth: Result<AuthUser, ApiError>,
|
||||||
|
headers: HeaderMap,
|
||||||
|
Path(slug): Path<String>,
|
||||||
|
) -> ApiResult<Json<Value>> {
|
||||||
|
let share = open_share(&state.db, &slug).await?;
|
||||||
|
let sharer = auth.as_ref().is_ok_and(|a| a.id() == share.owner_id);
|
||||||
|
let same_place = match (client_ip(&headers), &share.owner_ip_hash) {
|
||||||
|
(Some(ip), Some(hash)) => ip_hash(&share.slug, &ip) == *hash,
|
||||||
|
_ => false,
|
||||||
|
};
|
||||||
|
if sharer || same_place || is_robot(user_agent(&headers).as_deref()) {
|
||||||
|
return Ok(Json(json!({ "counted": false })));
|
||||||
|
}
|
||||||
|
let mut tx = state.db.begin().await?;
|
||||||
|
sqlx::query("UPDATE shares SET view_count = view_count + 1 WHERE id = $1").bind(share.id).execute(&mut *tx).await?;
|
||||||
|
let rewarded = sqlx::query(
|
||||||
|
"INSERT INTO credit_ledger (id, user_id, unit, delta, reason, note) \
|
||||||
|
VALUES ($1, $2, 'question', 1, 'share_reward', $3) ON CONFLICT DO NOTHING",
|
||||||
|
)
|
||||||
|
.bind(Uuid::now_v7())
|
||||||
|
.bind(share.owner_id)
|
||||||
|
.bind(format!("first visit of share {}", share.id))
|
||||||
|
.execute(&mut *tx)
|
||||||
|
.await?
|
||||||
|
.rows_affected()
|
||||||
|
== 1;
|
||||||
|
tx.commit().await?;
|
||||||
|
if rewarded {
|
||||||
|
tracing::info!(share = %share.id, "share reward granted");
|
||||||
|
}
|
||||||
|
Ok(Json(json!({ "counted": true })))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Natal analyses a user can earn by bringing new users through shared links.
|
||||||
|
pub const REFERRAL_LIMIT: i64 = 3;
|
||||||
|
|
||||||
|
/// A new user came from a shared link (`slug`): remembered for the reward,
|
||||||
|
/// unless rewards are off, the link is unknown or revoked, or it is their own.
|
||||||
|
pub(super) async fn record_referral(
|
||||||
|
conn: &mut sqlx::PgConnection,
|
||||||
|
enabled: bool,
|
||||||
|
user_id: Uuid,
|
||||||
|
slug: Option<&str>,
|
||||||
|
) -> Result<(), sqlx::Error> {
|
||||||
|
let Some(slug) = slug.map(str::trim).filter(|s| enabled && !s.is_empty()) else {
|
||||||
|
return Ok(());
|
||||||
|
};
|
||||||
|
sqlx::query(
|
||||||
|
"INSERT INTO referrals (user_id, referrer_id, share_id) \
|
||||||
|
SELECT $1, owner_id, id FROM shares WHERE slug = $2 AND revoked_at IS NULL AND owner_id <> $1 \
|
||||||
|
ON CONFLICT DO NOTHING",
|
||||||
|
)
|
||||||
|
.bind(user_id)
|
||||||
|
.bind(slug)
|
||||||
|
.execute(conn)
|
||||||
|
.await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The new user made their own chart: the sharer who brought them gets a
|
||||||
|
/// natal analysis, while under the limit. Runs once per new user.
|
||||||
|
pub(super) async fn reward_referral(state: &crate::AppState, user_id: Uuid) -> Result<(), ApiError> {
|
||||||
|
if !state.config.referral_rewards {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
let mut tx = state.db.begin().await?;
|
||||||
|
let referrer: Option<Uuid> =
|
||||||
|
sqlx::query_scalar("SELECT referrer_id FROM referrals WHERE user_id = $1 AND rewarded_at IS NULL FOR UPDATE")
|
||||||
|
.bind(user_id)
|
||||||
|
.fetch_optional(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
let Some(referrer) = referrer else { return Ok(()) };
|
||||||
|
sqlx::query("SELECT id FROM users WHERE id = $1 FOR UPDATE").bind(referrer).execute(&mut *tx).await?;
|
||||||
|
let earned = referral_rewards(&mut tx, referrer).await?;
|
||||||
|
if earned < REFERRAL_LIMIT {
|
||||||
|
sqlx::query(
|
||||||
|
"INSERT INTO credit_ledger (id, user_id, unit, delta, reason, note) \
|
||||||
|
VALUES ($1, $2, 'natal', 1, 'referral_reward', $3)",
|
||||||
|
)
|
||||||
|
.bind(Uuid::now_v7())
|
||||||
|
.bind(referrer)
|
||||||
|
.bind(format!("new user {user_id} from a shared link"))
|
||||||
|
.execute(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
tracing::info!(referrer = %referrer, user = %user_id, "referral reward granted");
|
||||||
|
}
|
||||||
|
sqlx::query("UPDATE referrals SET rewarded_at = now() WHERE user_id = $1").bind(user_id).execute(&mut *tx).await?;
|
||||||
|
tx.commit().await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Natal analyses the user has earned by bringing new users.
|
||||||
|
pub async fn referral_rewards(conn: &mut sqlx::PgConnection, user_id: Uuid) -> Result<i64, sqlx::Error> {
|
||||||
|
sqlx::query_scalar("SELECT count(*) FROM credit_ledger WHERE user_id = $1 AND reason = 'referral_reward'")
|
||||||
|
.bind(user_id)
|
||||||
|
.fetch_one(conn)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Whether the user has already received the reward for sharing.
|
||||||
|
pub async fn reward_granted(db: &PgPool, user_id: Uuid) -> Result<bool, sqlx::Error> {
|
||||||
|
sqlx::query_scalar("SELECT EXISTS (SELECT 1 FROM credit_ledger WHERE user_id = $1 AND reason = 'share_reward')")
|
||||||
|
.bind(user_id)
|
||||||
|
.fetch_one(db)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|||||||
@@ -24,6 +24,8 @@ use crate::error::{ApiError, ApiResult};
|
|||||||
use crate::views::{public_chart, rfc3339, rfc3339_opt, synastry_hash};
|
use crate::views::{public_chart, rfc3339, rfc3339_opt, synastry_hash};
|
||||||
|
|
||||||
const INVITE_TTL: time::Duration = time::Duration::days(14);
|
const INVITE_TTL: time::Duration = time::Duration::days(14);
|
||||||
|
/// Invitations a user may have us e-mail in a day (the rest go by link).
|
||||||
|
const EMAILED_PER_DAY: i64 = 10;
|
||||||
|
|
||||||
#[derive(Debug, Clone, sqlx::FromRow)]
|
#[derive(Debug, Clone, sqlx::FromRow)]
|
||||||
pub struct SynastryRow {
|
pub struct SynastryRow {
|
||||||
@@ -238,6 +240,10 @@ pub struct CreateInvite {
|
|||||||
/// Defaults to the user's primary chart.
|
/// Defaults to the user's primary chart.
|
||||||
chart_id: Option<Uuid>,
|
chart_id: Option<Uuid>,
|
||||||
message: Option<String>,
|
message: Option<String>,
|
||||||
|
/// Who it is for, as the inviter calls them (only the inviter sees it).
|
||||||
|
label: Option<String>,
|
||||||
|
/// Have us e-mail the invitation to this address.
|
||||||
|
email: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn chart_or_primary(db: &PgPool, chart_id: Option<Uuid>, user: Uuid) -> Result<ChartRow, ApiError> {
|
async fn chart_or_primary(db: &PgPool, chart_id: Option<Uuid>, user: Uuid) -> Result<ChartRow, ApiError> {
|
||||||
@@ -254,14 +260,61 @@ pub async fn create_invite(
|
|||||||
auth: AuthUser,
|
auth: AuthUser,
|
||||||
WithRejection(Json(req), _): Body<CreateInvite>,
|
WithRejection(Json(req), _): Body<CreateInvite>,
|
||||||
) -> ApiResult<(StatusCode, Json<Value>)> {
|
) -> ApiResult<(StatusCode, Json<Value>)> {
|
||||||
|
if !state.config.user_invites && !auth.user.has_role(db::Role::Admin) {
|
||||||
|
return Err(ApiError::conflict("invites_disabled", "A meghívás hamarosan indul."));
|
||||||
|
}
|
||||||
let chart = chart_or_primary(&state.db, req.chart_id, auth.id()).await?;
|
let chart = chart_or_primary(&state.db, req.chart_id, auth.id()).await?;
|
||||||
let message = req.message.map(|m| m.trim().chars().take(500).collect::<String>()).filter(|m| !m.is_empty());
|
// No links: the message may go out in an e-mail from our domain.
|
||||||
|
let message = super::invitations::clean_message(req.message)?;
|
||||||
|
let label = req.label.map(|l| l.trim().chars().take(80).collect::<String>()).filter(|l| !l.is_empty());
|
||||||
|
let email = match req.email.as_deref().map(str::trim).filter(|e| !e.is_empty()) {
|
||||||
|
Some(raw) => Some(super::auth::normalize_email(raw)?),
|
||||||
|
None => None,
|
||||||
|
};
|
||||||
let token = db::new_token();
|
let token = db::new_token();
|
||||||
let id = Uuid::now_v7();
|
let id = Uuid::now_v7();
|
||||||
let expires_at = OffsetDateTime::now_utc() + INVITE_TTL;
|
let expires_at = OffsetDateTime::now_utc() + INVITE_TTL;
|
||||||
|
let url = format!("{}/meghivas/{token}", state.config.public_base_url);
|
||||||
|
let mut tx = state.db.begin().await?;
|
||||||
|
let mut emailed = false;
|
||||||
|
if let Some(to) = &email {
|
||||||
|
if *to == auth.user.email {
|
||||||
|
return Err(ApiError::BadRequest("Saját magadat nem hívhatod meg.".into()));
|
||||||
|
}
|
||||||
|
let today: i64 = sqlx::query_scalar(
|
||||||
|
"SELECT count(*) FROM synastry_invites WHERE inviter_id = $1 AND invitee_email IS NOT NULL \
|
||||||
|
AND created_at > now() - interval '1 day'",
|
||||||
|
)
|
||||||
|
.bind(auth.id())
|
||||||
|
.fetch_one(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
if today >= EMAILED_PER_DAY {
|
||||||
|
return Err(ApiError::conflict(
|
||||||
|
"invite_mail_limit",
|
||||||
|
format!(
|
||||||
|
"Naponta legfeljebb {EMAILED_PER_DAY} meghívót küldünk ki levélben. A linket továbbra is elküldheted."
|
||||||
|
),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
// Someone who asked for no more invitations gets none; the link still works.
|
||||||
|
if !super::invitations::opted_out(&mut tx, to).await? {
|
||||||
|
let (_, unsubscribe_url, unsubscribe_post_url) = super::invitations::links(&state, &token);
|
||||||
|
let payload = json!({
|
||||||
|
"url": url,
|
||||||
|
"inviter_name": auth.user.display_name,
|
||||||
|
"message": message,
|
||||||
|
"expires_on": expires_at.date().to_string(),
|
||||||
|
"unsubscribe_url": unsubscribe_url,
|
||||||
|
"unsubscribe_post_url": unsubscribe_post_url,
|
||||||
|
});
|
||||||
|
super::auth::queue_email_to(&mut tx, None, to, "synastry_invite", &auth.user.locale, payload).await?;
|
||||||
|
emailed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
sqlx::query(
|
sqlx::query(
|
||||||
"INSERT INTO synastry_invites (id, inviter_id, inviter_chart_id, token_hash, message, expires_at) \
|
"INSERT INTO synastry_invites (id, inviter_id, inviter_chart_id, token_hash, message, expires_at, label, \
|
||||||
VALUES ($1, $2, $3, $4, $5, $6)",
|
invitee_email) \
|
||||||
|
VALUES ($1, $2, $3, $4, $5, $6, $7, $8)",
|
||||||
)
|
)
|
||||||
.bind(id)
|
.bind(id)
|
||||||
.bind(auth.id())
|
.bind(auth.id())
|
||||||
@@ -269,16 +322,22 @@ pub async fn create_invite(
|
|||||||
.bind(db::token_hash(&token))
|
.bind(db::token_hash(&token))
|
||||||
.bind(&message)
|
.bind(&message)
|
||||||
.bind(expires_at)
|
.bind(expires_at)
|
||||||
.execute(&state.db)
|
.bind(&label)
|
||||||
|
.bind(&email)
|
||||||
|
.execute(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
|
tx.commit().await?;
|
||||||
Ok((
|
Ok((
|
||||||
StatusCode::CREATED,
|
StatusCode::CREATED,
|
||||||
Json(json!({
|
Json(json!({
|
||||||
"id": id,
|
"id": id,
|
||||||
"token": token,
|
"token": token,
|
||||||
"url": format!("{}/invite/{token}", state.config.public_base_url),
|
"url": url,
|
||||||
"chart_id": chart.id,
|
"chart_id": chart.id,
|
||||||
"message": message,
|
"message": message,
|
||||||
|
"label": label,
|
||||||
|
"email": email,
|
||||||
|
"emailed": emailed,
|
||||||
"expires_at": rfc3339(expires_at),
|
"expires_at": rfc3339(expires_at),
|
||||||
})),
|
})),
|
||||||
))
|
))
|
||||||
@@ -304,10 +363,12 @@ pub async fn list_invites(State(state): St, auth: AuthUser) -> ApiResult<Json<Va
|
|||||||
Option<OffsetDateTime>,
|
Option<OffsetDateTime>,
|
||||||
Option<Uuid>,
|
Option<Uuid>,
|
||||||
Option<String>,
|
Option<String>,
|
||||||
|
Option<String>,
|
||||||
|
Option<String>,
|
||||||
);
|
);
|
||||||
let rows: Vec<Row> = sqlx::query_as(
|
let rows: Vec<Row> = sqlx::query_as(
|
||||||
"SELECT i.id, i.inviter_chart_id, i.message, i.created_at, i.expires_at, i.accepted_at, i.synastry_id, \
|
"SELECT i.id, i.inviter_chart_id, i.message, i.created_at, i.expires_at, i.accepted_at, i.synastry_id, \
|
||||||
u.display_name \
|
u.display_name, i.label, i.invitee_email \
|
||||||
FROM synastry_invites i LEFT JOIN users u ON u.id = i.accepted_by \
|
FROM synastry_invites i LEFT JOIN users u ON u.id = i.accepted_by \
|
||||||
WHERE i.inviter_id = $1 ORDER BY i.created_at DESC",
|
WHERE i.inviter_id = $1 ORDER BY i.created_at DESC",
|
||||||
)
|
)
|
||||||
@@ -316,9 +377,9 @@ pub async fn list_invites(State(state): St, auth: AuthUser) -> ApiResult<Json<Va
|
|||||||
.await?;
|
.await?;
|
||||||
let list: Vec<Value> = rows
|
let list: Vec<Value> = rows
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.map(|(id, chart_id, message, created, expires, accepted, synastry_id, accepted_by)| {
|
.map(|(id, chart_id, message, created, expires, accepted, synastry_id, accepted_by, label, email)| {
|
||||||
json!({
|
json!({
|
||||||
"id": id, "chart_id": chart_id, "message": message,
|
"id": id, "chart_id": chart_id, "message": message, "label": label, "email": email,
|
||||||
"status": invite_status(accepted, expires),
|
"status": invite_status(accepted, expires),
|
||||||
"created_at": rfc3339(created), "expires_at": rfc3339(expires),
|
"created_at": rfc3339(created), "expires_at": rfc3339(expires),
|
||||||
"accepted_at": rfc3339_opt(accepted), "accepted_by": accepted_by, "synastry_id": synastry_id,
|
"accepted_at": rfc3339_opt(accepted), "accepted_by": accepted_by, "synastry_id": synastry_id,
|
||||||
@@ -408,10 +469,10 @@ pub async fn accept_invite(
|
|||||||
let my_chart = chart_or_primary(&state.db, req.chart_id, auth.id()).await?;
|
let my_chart = chart_or_primary(&state.db, req.chart_id, auth.id()).await?;
|
||||||
let inviter_chart =
|
let inviter_chart =
|
||||||
find_chart(&state.db, invite.inviter_chart_id).await?.ok_or(ApiError::NotFound("invitation"))?;
|
find_chart(&state.db, invite.inviter_chart_id).await?.ok_or(ApiError::NotFound("invitation"))?;
|
||||||
let (row, _) = compute_synastry(&state, invite.inviter_id, &inviter_chart, &my_chart).await?;
|
let (row, created) = compute_synastry(&state, invite.inviter_id, &inviter_chart, &my_chart).await?;
|
||||||
|
|
||||||
let mut tx = state.db.begin().await?;
|
let mut tx = state.db.begin().await?;
|
||||||
sqlx::query(
|
let accepted = sqlx::query(
|
||||||
"UPDATE synastry_invites SET accepted_at = now(), accepted_by = $1, synastry_id = $2 \
|
"UPDATE synastry_invites SET accepted_at = now(), accepted_by = $1, synastry_id = $2 \
|
||||||
WHERE id = $3 AND accepted_at IS NULL",
|
WHERE id = $3 AND accepted_at IS NULL",
|
||||||
)
|
)
|
||||||
@@ -419,13 +480,23 @@ pub async fn accept_invite(
|
|||||||
.bind(row.id)
|
.bind(row.id)
|
||||||
.bind(invite.id)
|
.bind(invite.id)
|
||||||
.execute(&mut *tx)
|
.execute(&mut *tx)
|
||||||
.await?;
|
.await?
|
||||||
|
.rows_affected();
|
||||||
|
if accepted == 0 {
|
||||||
|
// Someone else accepted it at the same moment: the comparison made
|
||||||
|
// for this attempt goes, the link is used up.
|
||||||
|
drop(tx);
|
||||||
|
if created {
|
||||||
|
sqlx::query("DELETE FROM synastries WHERE id = $1").bind(row.id).execute(&state.db).await?;
|
||||||
|
}
|
||||||
|
return Err(ApiError::Gone("this invitation has already been accepted".into()));
|
||||||
|
}
|
||||||
let inviter: Option<db::User> = sqlx::query_as(&format!("SELECT {USER_COLUMNS} FROM users WHERE id = $1"))
|
let inviter: Option<db::User> = sqlx::query_as(&format!("SELECT {USER_COLUMNS} FROM users WHERE id = $1"))
|
||||||
.bind(invite.inviter_id)
|
.bind(invite.inviter_id)
|
||||||
.fetch_optional(&mut *tx)
|
.fetch_optional(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
if let Some(inviter) = inviter {
|
if let Some(inviter) = inviter {
|
||||||
let url = format!("{}/synastry/{}", state.config.public_base_url, row.id);
|
let url = format!("{}/osszevetesek/{}", state.config.public_base_url, row.id);
|
||||||
super::auth::queue_email(
|
super::auth::queue_email(
|
||||||
&mut tx,
|
&mut tx,
|
||||||
&inviter,
|
&inviter,
|
||||||
|
|||||||
@@ -0,0 +1,218 @@
|
|||||||
|
//! Tarot readings. The server shuffles and draws the cards (so nobody can
|
||||||
|
//! draw again for free until a card they like comes), stores them with the
|
||||||
|
//! question as a `tarot` analysis and spends one `tarot` unit; the worker
|
||||||
|
//! writes the reading with the model of the detailed analyses. A failed
|
||||||
|
//! reading gives its unit back.
|
||||||
|
|
||||||
|
use analysis_prompt::tarot::{self, Spread};
|
||||||
|
use analysis_prompt::{Kind, TAROT_QUESTION_MAX_CHARS};
|
||||||
|
use axum::Json;
|
||||||
|
use axum::extract::{Path, State};
|
||||||
|
use axum::http::StatusCode;
|
||||||
|
use axum_extra::extract::WithRejection;
|
||||||
|
use rand::seq::SliceRandom;
|
||||||
|
use rand::{Rng, rng};
|
||||||
|
use serde::Deserialize;
|
||||||
|
use serde_json::{Value, json};
|
||||||
|
use time::OffsetDateTime;
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
use super::{Body, IdPath, St};
|
||||||
|
use crate::auth::AuthUser;
|
||||||
|
use crate::credits::{self, Unit};
|
||||||
|
use crate::error::{ApiError, ApiResult};
|
||||||
|
use crate::views::{rfc3339, rfc3339_opt};
|
||||||
|
|
||||||
|
/// How often a card comes up reversed.
|
||||||
|
const REVERSED_SHARE: f64 = 0.28;
|
||||||
|
/// The readings listed on the page, newest first.
|
||||||
|
const LIST_LIMIT: i64 = 100;
|
||||||
|
|
||||||
|
#[derive(Debug, sqlx::FromRow)]
|
||||||
|
pub struct ReadingRow {
|
||||||
|
pub id: Uuid,
|
||||||
|
pub status: String,
|
||||||
|
pub tarot: Value,
|
||||||
|
pub content: Option<Value>,
|
||||||
|
pub error: Option<String>,
|
||||||
|
pub credits_charged: i32,
|
||||||
|
pub attempts: i32,
|
||||||
|
pub created_at: OffsetDateTime,
|
||||||
|
pub completed_at: Option<OffsetDateTime>,
|
||||||
|
}
|
||||||
|
|
||||||
|
const COLUMNS: &str = "id, status, tarot, content, error, credits_charged, attempts, created_at, completed_at";
|
||||||
|
|
||||||
|
impl ReadingRow {
|
||||||
|
/// The reading as users see it: the cards with their positions (the model
|
||||||
|
/// and the reader's signs are left out).
|
||||||
|
pub fn view(&self) -> Value {
|
||||||
|
let spread = tarot::spread(self.tarot["spread"].as_str().unwrap_or_default());
|
||||||
|
let positions = spread.map(|s| s.positions).unwrap_or_default();
|
||||||
|
let cards: Vec<Value> = self.tarot["cards"]
|
||||||
|
.as_array()
|
||||||
|
.into_iter()
|
||||||
|
.flatten()
|
||||||
|
.enumerate()
|
||||||
|
.map(|(i, c)| {
|
||||||
|
let position = positions.get(i);
|
||||||
|
json!({
|
||||||
|
"card": c["card"],
|
||||||
|
"reversed": c["reversed"],
|
||||||
|
"position": position.map(|p| p.title),
|
||||||
|
"about": position.map(|p| p.about),
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
json!({
|
||||||
|
"id": self.id,
|
||||||
|
"status": self.status,
|
||||||
|
"spread": self.tarot["spread"],
|
||||||
|
"spread_name": spread.map(|s| s.name),
|
||||||
|
"topic": tarot::topic(self.tarot["topic"].as_str()).map(|t| t.id),
|
||||||
|
"topic_name": tarot::topic(self.tarot["topic"].as_str()).map(|t| t.name),
|
||||||
|
"question": self.tarot["question"],
|
||||||
|
"cards": cards,
|
||||||
|
"content": self.content,
|
||||||
|
"error": self.error,
|
||||||
|
"credits_charged": self.credits_charged,
|
||||||
|
"attempts": self.attempts,
|
||||||
|
"created_at": rfc3339(self.created_at),
|
||||||
|
"completed_at": rfc3339_opt(self.completed_at),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Shuffles the deck and draws one card per position.
|
||||||
|
fn draw(spread: &Spread) -> Vec<Value> {
|
||||||
|
let mut rng = rng();
|
||||||
|
let mut ids: Vec<&str> = tarot::deck().iter().map(|c| c.id.as_str()).collect();
|
||||||
|
ids.shuffle(&mut rng);
|
||||||
|
ids.into_iter()
|
||||||
|
.take(spread.positions.len())
|
||||||
|
.map(|id| json!({ "card": id, "reversed": rng.random_bool(REVERSED_SHARE) }))
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The Sun, Moon and Ascendant signs of the user's own chart (the Ascendant
|
||||||
|
/// only with a known birth time).
|
||||||
|
async fn big_three(
|
||||||
|
state: &crate::AppState,
|
||||||
|
user: Uuid,
|
||||||
|
) -> Result<(Option<String>, Option<String>, Option<String>), ApiError> {
|
||||||
|
let chart: Option<Value> = sqlx::query_scalar(
|
||||||
|
"SELECT result FROM charts WHERE owner_id = $1 AND kind = 'own' ORDER BY is_primary DESC, created_at LIMIT 1",
|
||||||
|
)
|
||||||
|
.bind(user)
|
||||||
|
.fetch_optional(&state.db)
|
||||||
|
.await?;
|
||||||
|
let Some(chart) = chart else { return Ok((None, None, None)) };
|
||||||
|
let sign_of = |id: &str| {
|
||||||
|
chart["points"]
|
||||||
|
.as_array()
|
||||||
|
.into_iter()
|
||||||
|
.flatten()
|
||||||
|
.find(|p| p["id"] == id)
|
||||||
|
.and_then(|p| p["sign"].as_str())
|
||||||
|
.map(str::to_string)
|
||||||
|
};
|
||||||
|
let time_known = chart["time"]["time_known"].as_bool().unwrap_or(false);
|
||||||
|
let ascendant = chart["angles"]["ascendant"]["sign"].as_str().filter(|_| time_known).map(str::to_string);
|
||||||
|
Ok((sign_of("sun"), sign_of("moon"), ascendant))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn list(State(state): St, auth: AuthUser) -> ApiResult<Json<Value>> {
|
||||||
|
let rows: Vec<ReadingRow> = sqlx::query_as(&format!(
|
||||||
|
"SELECT {COLUMNS} FROM analyses WHERE kind = 'tarot' AND requested_by = $1 ORDER BY created_at DESC LIMIT $2"
|
||||||
|
))
|
||||||
|
.bind(auth.id())
|
||||||
|
.bind(LIST_LIMIT)
|
||||||
|
.fetch_all(&state.db)
|
||||||
|
.await?;
|
||||||
|
let left = credits::balance(&mut *state.db.acquire().await?, auth.id()).await?.tarot;
|
||||||
|
Ok(Json(json!({ "readings": rows.iter().map(ReadingRow::view).collect::<Vec<_>>(), "left": left })))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_one(State(state): St, auth: AuthUser, WithRejection(Path(id), _): IdPath) -> ApiResult<Json<Value>> {
|
||||||
|
let row: ReadingRow = sqlx::query_as(&format!(
|
||||||
|
"SELECT {COLUMNS} FROM analyses WHERE id = $1 AND kind = 'tarot' AND requested_by = $2"
|
||||||
|
))
|
||||||
|
.bind(id)
|
||||||
|
.bind(auth.id())
|
||||||
|
.fetch_optional(&state.db)
|
||||||
|
.await?
|
||||||
|
.ok_or(ApiError::NotFound("reading"))?;
|
||||||
|
Ok(Json(row.view()))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct NewReading {
|
||||||
|
spread: String,
|
||||||
|
/// `general` (the default), `love`, `work` or `self`.
|
||||||
|
topic: Option<String>,
|
||||||
|
question: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Draws the cards and queues the reading (one `tarot` unit).
|
||||||
|
pub async fn create(
|
||||||
|
State(state): St,
|
||||||
|
auth: AuthUser,
|
||||||
|
WithRejection(Json(req), _): Body<NewReading>,
|
||||||
|
) -> ApiResult<(StatusCode, Json<Value>)> {
|
||||||
|
let spread = tarot::spread(&req.spread).ok_or_else(|| ApiError::BadRequest("unknown spread".into()))?;
|
||||||
|
let topic = tarot::topic(req.topic.as_deref()).ok_or_else(|| ApiError::BadRequest("unknown topic".into()))?;
|
||||||
|
let question = req.question.map(|q| q.trim().replace("\r\n", "\n")).filter(|q| !q.is_empty());
|
||||||
|
if question.as_ref().is_some_and(|q| q.chars().count() > TAROT_QUESTION_MAX_CHARS) {
|
||||||
|
return Err(ApiError::BadRequest(format!(
|
||||||
|
"the question is at most {TAROT_QUESTION_MAX_CHARS} characters long"
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
let open: bool = sqlx::query_scalar(
|
||||||
|
"SELECT EXISTS (SELECT 1 FROM analyses WHERE kind = 'tarot' AND requested_by = $1 \
|
||||||
|
AND status IN ('pending', 'running'))",
|
||||||
|
)
|
||||||
|
.bind(auth.id())
|
||||||
|
.fetch_one(&state.db)
|
||||||
|
.await?;
|
||||||
|
if open {
|
||||||
|
return Err(ApiError::conflict(
|
||||||
|
"tarot_in_progress",
|
||||||
|
"Az előző jóslásod még készül. Várd meg, és utána húzz újra.",
|
||||||
|
));
|
||||||
|
}
|
||||||
|
let (sun, moon, ascendant) = big_three(&state, auth.id()).await?;
|
||||||
|
let reading = json!({
|
||||||
|
"spread": spread.id,
|
||||||
|
"topic": topic.id,
|
||||||
|
"question": question,
|
||||||
|
"cards": draw(spread),
|
||||||
|
"sun": sun,
|
||||||
|
"moon": moon,
|
||||||
|
"ascendant": ascendant,
|
||||||
|
});
|
||||||
|
// The model of the detailed analyses writes the readings too.
|
||||||
|
let (model, fallback) = crate::models::models_for(&state, Kind::Natal).await?;
|
||||||
|
let language = super::auth::validate_locale(&state, Some(&auth.user.locale))?;
|
||||||
|
let id = Uuid::now_v7();
|
||||||
|
let mut tx = state.db.begin().await?;
|
||||||
|
let row: ReadingRow = sqlx::query_as(&format!(
|
||||||
|
"INSERT INTO analyses (id, kind, requested_by, language, model, prompt_version, cache_key, status, \
|
||||||
|
credits_charged, fallback_model, tarot) \
|
||||||
|
VALUES ($1, 'tarot', $2, $3, $4, $5, $6, 'pending', 1, $7, $8) RETURNING {COLUMNS}"
|
||||||
|
))
|
||||||
|
.bind(id)
|
||||||
|
.bind(auth.id())
|
||||||
|
.bind(&language)
|
||||||
|
.bind(&model)
|
||||||
|
.bind(&state.config.prompt_version)
|
||||||
|
.bind(format!("tarot|{id}"))
|
||||||
|
.bind(&fallback)
|
||||||
|
.bind(&reading)
|
||||||
|
.fetch_one(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
credits::spend(&mut tx, auth.id(), Unit::Tarot, id).await?;
|
||||||
|
tx.commit().await?;
|
||||||
|
tracing::info!(user = %auth.id(), %id, spread = spread.id, "tarot reading queued");
|
||||||
|
Ok((StatusCode::ACCEPTED, Json(row.view())))
|
||||||
|
}
|
||||||
@@ -0,0 +1,179 @@
|
|||||||
|
//! The little of Stripe's API we use: Checkout Sessions (a hosted payment
|
||||||
|
//! page for one package) and webhook signature checking. The package catalog
|
||||||
|
//! stays in `packages.rs`; each session carries its name and price, so no
|
||||||
|
//! products have to be kept in the Stripe dashboard.
|
||||||
|
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
|
use hmac::{Hmac, Mac};
|
||||||
|
use serde::Deserialize;
|
||||||
|
use serde_json::Value;
|
||||||
|
use sha2::Sha256;
|
||||||
|
|
||||||
|
use crate::config::StripeConfig;
|
||||||
|
use crate::error::ApiError;
|
||||||
|
|
||||||
|
/// How old a webhook signature may be (Stripe's own libraries use 5 minutes).
|
||||||
|
const SIGNATURE_TOLERANCE: i64 = 300;
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize)]
|
||||||
|
pub struct Session {
|
||||||
|
pub id: String,
|
||||||
|
/// The payment page (only while the session is open).
|
||||||
|
pub url: Option<String>,
|
||||||
|
/// `paid`, `unpaid` or `no_payment_required`.
|
||||||
|
pub payment_status: String,
|
||||||
|
/// `open`, `complete` or `expired`.
|
||||||
|
pub status: Option<String>,
|
||||||
|
/// In the smallest unit (fillér for forints).
|
||||||
|
#[serde(default)]
|
||||||
|
pub amount_total: Option<i64>,
|
||||||
|
#[serde(default)]
|
||||||
|
pub currency: Option<String>,
|
||||||
|
/// The PaymentIntent's id.
|
||||||
|
#[serde(default)]
|
||||||
|
pub payment_intent: Option<String>,
|
||||||
|
/// Name, e-mail, billing address; for a company its name and tax ids.
|
||||||
|
#[serde(default)]
|
||||||
|
pub customer_details: Option<Value>,
|
||||||
|
/// `{"terms_of_service": "accepted"}` once the buyer ticked the terms box.
|
||||||
|
#[serde(default)]
|
||||||
|
pub consent: Option<Value>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Session {
|
||||||
|
/// The buyer accepted the terms (and gave up the withdrawal right).
|
||||||
|
pub fn terms_accepted(&self) -> bool {
|
||||||
|
self.consent.as_ref().is_some_and(|c| c["terms_of_service"] == "accepted")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Session {
|
||||||
|
pub fn paid(&self) -> bool {
|
||||||
|
self.payment_status == "paid"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct Client {
|
||||||
|
http: reqwest::Client,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for Client {
|
||||||
|
fn default() -> Self {
|
||||||
|
let http = reqwest::Client::builder().timeout(Duration::from_secs(20)).build().expect("static configuration");
|
||||||
|
Self { http }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// What the user sees when Stripe cannot be reached.
|
||||||
|
fn unavailable(detail: String) -> ApiError {
|
||||||
|
tracing::error!(error = %detail, "stripe request failed");
|
||||||
|
ApiError::Limited {
|
||||||
|
code: "payment_unavailable",
|
||||||
|
message: "A fizetési oldal most nem érhető el. Próbáld újra pár perc múlva.".into(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Client {
|
||||||
|
/// Creates a Checkout Session from form fields (Stripe's API takes
|
||||||
|
/// `application/x-www-form-urlencoded` with `a[b][c]` keys).
|
||||||
|
pub async fn create_session(&self, config: &StripeConfig, form: &[(String, String)]) -> Result<Session, ApiError> {
|
||||||
|
let res = self
|
||||||
|
.http
|
||||||
|
.post(format!("{}/v1/checkout/sessions", config.api_url))
|
||||||
|
.bearer_auth(&config.secret_key)
|
||||||
|
.form(form)
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.map_err(|e| unavailable(e.to_string()))?;
|
||||||
|
Self::session(res).await
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_session(&self, config: &StripeConfig, id: &str) -> Result<Session, ApiError> {
|
||||||
|
let res = self
|
||||||
|
.http
|
||||||
|
.get(format!("{}/v1/checkout/sessions/{id}", config.api_url))
|
||||||
|
.bearer_auth(&config.secret_key)
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.map_err(|e| unavailable(e.to_string()))?;
|
||||||
|
Self::session(res).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn session(res: reqwest::Response) -> Result<Session, ApiError> {
|
||||||
|
let status = res.status();
|
||||||
|
if !status.is_success() {
|
||||||
|
let body = res.text().await.unwrap_or_default();
|
||||||
|
return Err(unavailable(format!("HTTP {status}: {}", body.chars().take(500).collect::<String>())));
|
||||||
|
}
|
||||||
|
res.json().await.map_err(|e| unavailable(format!("unexpected response: {e}")))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Checks a `Stripe-Signature` header (`t=…,v1=…[,v1=…]`): an HMAC-SHA256 of
|
||||||
|
/// `"{t}.{body}"` with the endpoint's signing secret, at most five minutes old.
|
||||||
|
pub fn verify_signature(secret: &str, header: &str, body: &[u8], now: i64) -> bool {
|
||||||
|
let mut timestamp = None;
|
||||||
|
let mut signatures = Vec::new();
|
||||||
|
for part in header.split(',') {
|
||||||
|
match part.trim().split_once('=') {
|
||||||
|
Some(("t", v)) => timestamp = v.parse::<i64>().ok(),
|
||||||
|
Some(("v1", v)) => signatures.push(v),
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let Some(timestamp) = timestamp else { return false };
|
||||||
|
if (now - timestamp).abs() > SIGNATURE_TOLERANCE {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
let mut mac = Hmac::<Sha256>::new_from_slice(secret.as_bytes()).expect("HMAC takes any key length");
|
||||||
|
mac.update(timestamp.to_string().as_bytes());
|
||||||
|
mac.update(b".");
|
||||||
|
mac.update(body);
|
||||||
|
let expected = mac.finalize().into_bytes();
|
||||||
|
signatures.iter().any(|s| decode_hex(s).is_some_and(|sig| constant_time_eq(&sig, &expected)))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The signature header for a body, as Stripe would send it (tests).
|
||||||
|
#[cfg(test)]
|
||||||
|
pub fn sign(secret: &str, body: &[u8], timestamp: i64) -> String {
|
||||||
|
let mut mac = Hmac::<Sha256>::new_from_slice(secret.as_bytes()).unwrap();
|
||||||
|
mac.update(format!("{timestamp}.").as_bytes());
|
||||||
|
mac.update(body);
|
||||||
|
let hex: String = mac.finalize().into_bytes().iter().map(|b| format!("{b:02x}")).collect();
|
||||||
|
format!("t={timestamp},v1={hex}")
|
||||||
|
}
|
||||||
|
|
||||||
|
fn decode_hex(s: &str) -> Option<Vec<u8>> {
|
||||||
|
if !s.len().is_multiple_of(2) {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
(0..s.len()).step_by(2).map(|i| u8::from_str_radix(s.get(i..i + 2)?, 16).ok()).collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn constant_time_eq(a: &[u8], b: &[u8]) -> bool {
|
||||||
|
a.len() == b.len() && a.iter().zip(b).fold(0u8, |acc, (x, y)| acc | (x ^ y)) == 0
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn signatures_are_checked() {
|
||||||
|
let body = br#"{"id":"evt_1"}"#;
|
||||||
|
let now = 1_800_000_000;
|
||||||
|
let header = sign("whsec_test", body, now);
|
||||||
|
assert!(verify_signature("whsec_test", &header, body, now));
|
||||||
|
assert!(verify_signature("whsec_test", &header, body, now + 299));
|
||||||
|
// Another secret, a changed body, an old or missing timestamp.
|
||||||
|
assert!(!verify_signature("whsec_other", &header, body, now));
|
||||||
|
assert!(!verify_signature("whsec_test", &header, br#"{"id":"evt_2"}"#, now));
|
||||||
|
assert!(!verify_signature("whsec_test", &header, body, now + 301));
|
||||||
|
assert!(!verify_signature("whsec_test", header.split_once(',').unwrap().1, body, now));
|
||||||
|
// One good signature among others (during a secret rotation) is enough.
|
||||||
|
let rotated = format!("{header},v1=00ff");
|
||||||
|
assert!(verify_signature("whsec_test", &rotated, body, now));
|
||||||
|
assert!(!verify_signature("whsec_test", "t=1800000000,v1=zz", body, now));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<!-- BEGIN:nextjs-agent-rules -->
|
||||||
|
|
||||||
|
## This is NOT the Next.js you know
|
||||||
|
|
||||||
|
This version has breaking changes — APIs, conventions, and file structure may all differ from your training data. Read the relevant guide in `node_modules/next/dist/docs/` (resolved from this file's directory; in monorepos the `next` package may not be visible from the repo root) before writing any code. Heed deprecation notices.
|
||||||
|
|
||||||
|
This block is written and re-added by `next dev` — verify at `node_modules/next/dist/server/lib/generate-agent-files.js`. Removing it from a diff only re-creates the uncommitted change; committing it with your work keeps the tree clean.
|
||||||
|
|
||||||
|
<!-- END:nextjs-agent-rules -->
|
||||||
@@ -17,6 +17,7 @@ ENV NODE_ENV=production NEXT_TELEMETRY_DISABLED=1 PORT=3000 HOSTNAME=0.0.0.0
|
|||||||
RUN addgroup -S app && adduser -S -G app app
|
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/standalone ./
|
||||||
COPY --from=build --chown=app:app /app/.next/static ./.next/static
|
COPY --from=build --chown=app:app /app/.next/static ./.next/static
|
||||||
|
COPY --from=build --chown=app:app /app/public ./public
|
||||||
USER app
|
USER app
|
||||||
EXPOSE 3000
|
EXPOSE 3000
|
||||||
HEALTHCHECK --interval=10s --timeout=3s --retries=5 CMD wget -qO- http://127.0.0.1:3000/healthz >/dev/null || exit 1
|
HEALTHCHECK --interval=10s --timeout=3s --retries=5 CMD wget -qO- http://127.0.0.1:3000/healthz >/dev/null || exit 1
|
||||||
|
|||||||
@@ -4,6 +4,11 @@ const config: NextConfig = {
|
|||||||
// Small self-contained server for the container image.
|
// Small self-contained server for the container image.
|
||||||
output: "standalone",
|
output: "standalone",
|
||||||
poweredByHeader: false,
|
poweredByHeader: false,
|
||||||
|
// The fonts of the share preview images are read from disk at run time.
|
||||||
|
outputFileTracingIncludes: {
|
||||||
|
"/s/[slug]/kep/[file]": ["./src/assets/og/*.ttf"],
|
||||||
|
"/kep/fooldal.png": ["./src/assets/og/*.ttf"],
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
export default config;
|
export default config;
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
<svg width="104" height="34" viewBox="0 0 104 34" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" d="M29.4607 14.8836C29.4938 14.7064 29.5289 14.547 29.5631 14.4093L31.9385 4.67302C32.6172 2.05391 34.1442 0.516602 36.9155 0.516602C39.0646 0.516602 40.7048 1.94003 40.7048 3.93284C40.7048 5.58402 40.0261 7.12132 38.4425 8.82944L32.536 15.3314C31.9953 17.9568 33.3006 18.7935 34.7098 18.7935C37.4511 18.7935 39.171 16.5816 39.8689 14.7002C39.8994 14.5988 39.9328 14.5016 39.9696 14.4093L42.4015 4.67302C43.0802 2.05391 44.6072 0.516602 47.3785 0.516602C49.5276 0.516602 51.1678 1.94003 51.1678 3.93284C51.1678 5.58402 50.4891 7.12132 48.9055 8.82944L43.0004 15.3301C42.4728 17.9565 43.9568 18.7935 45.908 18.7935C47.8202 18.7935 49.6854 17.7475 50.5536 15.0039L52.0161 9.11413H55.4095L53.7128 15.8897C53.2604 17.7116 53.7694 18.7935 55.1833 18.7935C56.88 18.7935 57.5587 18.281 58.2374 15.548L59.0292 12.2457C59.6513 9.62656 61.2349 8.88638 63.7799 8.88638H67.1168C69.4356 8.88638 71.1889 10.8222 70.6233 13.1567L68.4742 21.8681H65.0807L67.2299 13.2705C67.4561 12.4165 67.1168 11.961 66.2684 11.961H63.6668C62.9882 11.961 62.5923 12.3026 62.4226 12.9289L61.2914 17.6547C60.6693 20.16 58.8595 21.8681 55.9186 21.8681H55.1833C53.4448 21.8681 51.9867 21.0542 51.1429 19.566C50.0152 20.8083 48.3105 21.8681 45.6252 21.8681C42.9145 21.8681 41.2907 20.6535 40.4395 19.142C39.1534 20.5894 37.2944 21.8681 34.7098 21.8681C32.3016 21.8681 30.9188 21.0235 30.1547 19.8824C29.0995 21.0343 27.5991 21.8681 25.4345 21.8681C23.0591 21.8681 19.6091 20.6724 21.023 15.0356L22.4935 9.11413H25.8869L24.2468 15.3772C23.6247 17.7116 24.5296 18.7935 26.1697 18.7935C28.254 18.7935 29.1046 16.4012 29.4607 14.8836ZM44.2588 10.2033L46.417 7.2352C47.6613 5.52708 48.0572 5.01464 48.0572 4.50221C48.0572 3.98977 47.6047 3.59121 47.0957 3.59121C46.3605 3.59121 45.7949 4.04671 45.4556 5.35627L44.2588 10.2033ZM33.796 10.2033L35.954 7.2352C37.1983 5.52708 37.5942 5.01464 37.5942 4.50221C37.5942 3.98977 37.1417 3.59121 36.6327 3.59121C35.8975 3.59121 35.3319 4.04671 34.9926 5.35627L33.796 10.2033ZM15.9782 11.1631C18.0006 12.0669 18.478 13.5535 18.478 15.3203C18.478 18.9643 15.4805 22.0958 10.1641 22.0958H7.44942C2.35931 22.0958 -1.20376 19.4767 0.379826 13.2705L2.35931 5.24239C3.49045 1.19985 3.99946 0.687413 9.03301 0.687413H13.1617C16.7813 0.687413 19.5526 2.28166 19.5526 5.98258C19.5526 7.81584 18.6593 9.93522 15.9782 11.1631ZM11.6912 12.5873H7.78876L8.58055 9.51269H11.5781C14.6887 9.51269 16.046 8.43088 16.046 6.3242C16.046 4.38833 14.9149 3.76202 12.3699 3.76202H8.75023C6.31828 3.76202 6.14862 3.8759 5.58305 6.15339L3.66012 13.6691C2.86832 16.9145 4.28224 19.0212 8.07154 19.0212H10.1076C13.6141 19.0212 14.9715 17.3131 14.9715 15.3772C14.9715 13.4414 14.2928 12.5873 11.6912 12.5873ZM80.5422 21.4649C79.6628 21.8561 78.5543 22.1528 77.0142 22.1528C73.9036 22.1528 71.1889 19.3059 71.9807 15.2064C72.7159 11.5055 75.7134 8.88638 79.5593 8.88638C83.5748 8.88638 86.0633 11.961 85.1018 15.7188L81.6519 29.156C80.8035 32.2306 79.1634 33.4833 76.7314 33.4833C73.6774 33.4833 72.0938 31.2627 72.7159 28.6436C73.5168 25.6211 76.7518 24.0694 80.5422 21.4649ZM77.6929 19.0212C79.8421 19.0212 81.1429 17.8255 81.6519 15.3203C81.9912 13.3844 80.9732 12.0749 79.1068 12.0749C77.0142 12.0749 75.8265 13.4983 75.4872 15.3203C74.9782 17.4839 76.0528 19.0212 77.6929 19.0212ZM79.6843 25.0346C77.7302 27.0126 76.4967 28.1005 76.2224 28.9283C75.9397 29.7254 76.5052 30.3517 77.0708 30.3517C77.6929 30.3517 78.2019 29.8962 78.6544 28.5297L79.6843 25.0346ZM98.2207 10.3098H103.2V13.0428H99.6895C99.8564 13.8619 99.8632 14.7655 99.6935 15.7188C99.0714 19.5906 96.0173 22.1528 92.0018 22.1528C87.9862 22.1528 85.724 19.4198 86.5723 15.2064C87.3076 11.6194 90.4182 8.88638 94.3206 8.88638C95.954 8.88638 97.2808 9.41515 98.2207 10.3098ZM92.2846 19.0212C94.1509 19.0212 95.7345 18.2241 96.2435 15.3203C96.5829 13.3844 95.7345 12.0749 93.755 12.0749C91.719 12.0749 90.4182 13.4983 90.0223 15.3203C89.5698 17.4839 90.6444 19.0212 92.2846 19.0212ZM25.1517 7.12132C23.7943 7.12132 22.7197 6.03951 22.7197 4.67302C22.7197 3.30653 23.7943 2.22472 25.1517 2.22472C26.509 2.22472 27.5836 3.30653 27.5836 4.67302C27.5836 6.03951 26.509 7.12132 25.1517 7.12132ZM54.6743 7.12132C53.3169 7.12132 52.2424 6.03951 52.2424 4.67302C52.2424 3.30653 53.3169 2.22472 54.6743 2.22472C56.0317 2.22472 57.1063 3.30653 57.1063 4.67302C57.1063 6.03951 56.0317 7.12132 54.6743 7.12132Z" fill="white"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 4.4 KiB |
@@ -0,0 +1 @@
|
|||||||
|
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" style="enable-background:new 0 0 468 222.5;" xml:space="preserve" viewBox="54 36 360.02 149.84"> <style type="text/css"> .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;} </style> <g> <path class="st0" d="M414,113.4c0-25.6-12.4-45.8-36.1-45.8c-23.8,0-38.2,20.2-38.2,45.6c0,30.1,17,45.3,41.4,45.3 c11.9,0,20.9-2.7,27.7-6.5v-20c-6.8,3.4-14.6,5.5-24.5,5.5c-9.7,0-18.3-3.4-19.4-15.2h48.9C413.8,121,414,115.8,414,113.4z M364.6,103.9c0-11.3,6.9-16,13.2-16c6.1,0,12.6,4.7,12.6,16H364.6z"></path> <path class="st0" d="M301.1,67.6c-9.8,0-16.1,4.6-19.6,7.8l-1.3-6.2h-22v116.6l25-5.3l0.1-28.3c3.6,2.6,8.9,6.3,17.7,6.3 c17.9,0,34.2-14.4,34.2-46.1C335.1,83.4,318.6,67.6,301.1,67.6z M295.1,136.5c-5.9,0-9.4-2.1-11.8-4.7l-0.1-37.1 c2.6-2.9,6.2-4.9,11.9-4.9c9.1,0,15.4,10.2,15.4,23.3C310.5,126.5,304.3,136.5,295.1,136.5z"></path> <polygon class="st0" points="223.8,61.7 248.9,56.3 248.9,36 223.8,41.3 "></polygon> <rect x="223.8" y="69.3" class="st0" width="25.1" height="87.5"></rect> <path class="st0" d="M196.9,76.7l-1.6-7.4h-21.6v87.5h25V97.5c5.9-7.7,15.9-6.3,19-5.2v-23C214.5,68.1,202.8,65.9,196.9,76.7z"></path> <path class="st0" d="M146.9,47.6l-24.4,5.2l-0.1,80.1c0,14.8,11.1,25.7,25.9,25.7c8.2,0,14.2-1.5,17.5-3.3V135 c-3.2,1.3-19,5.9-19-8.9V90.6h19V69.3h-19L146.9,47.6z"></path> <path class="st0" d="M79.3,94.7c0-3.9,3.2-5.4,8.5-5.4c7.6,0,17.2,2.3,24.8,6.4V72.2c-8.3-3.3-16.5-4.6-24.8-4.6 C67.5,67.6,54,78.2,54,95.9c0,27.6,38,23.2,38,35.1c0,4.6-4,6.1-9.6,6.1c-8.3,0-18.9-3.4-27.3-8v23.8c9.3,4,18.7,5.7,27.3,5.7 c20.8,0,35.1-10.3,35.1-28.2C117.4,100.6,79.3,105.9,79.3,94.7z"></path> </g> </svg>
|
||||||
|
After Width: | Height: | Size: 1.7 KiB |
@@ -0,0 +1,494 @@
|
|||||||
|
import Link from "next/link";
|
||||||
|
|
||||||
|
import { ChartWheel } from "@/components/ChartWheel";
|
||||||
|
import { Rich } from "@/components/Rich";
|
||||||
|
import { TarotCard, TarotCardBack } from "@/components/tarot/TarotCard";
|
||||||
|
import { Logo, PublicHeader } from "@/components/SiteHeader";
|
||||||
|
import { Waitlist } from "@/components/Waitlist";
|
||||||
|
import example from "@/content/pelda.json";
|
||||||
|
import { tarotCard } from "@/lib/tarot";
|
||||||
|
import type { AnalysisContent, ChartResult } from "@/lib/types";
|
||||||
|
|
||||||
|
/** The cards fanned out next to the tarot line (after a card back). */
|
||||||
|
const TAROT_CARDS = ["major-2", "major-17"].map((id) => tarotCard(id)).filter((c) => c !== undefined);
|
||||||
|
|
||||||
|
// A quiet starfield, the same on every render.
|
||||||
|
const STARS = (() => {
|
||||||
|
let seed = 7;
|
||||||
|
const rnd = () => {
|
||||||
|
seed = (seed * 9301 + 49297) % 233280;
|
||||||
|
return seed / 233280;
|
||||||
|
};
|
||||||
|
return Array.from({ length: 70 }, (_, i) => ({
|
||||||
|
x: (rnd() * 1000).toFixed(1),
|
||||||
|
y: (rnd() * 600).toFixed(1),
|
||||||
|
r: (0.6 + rnd() * 1.4).toFixed(1),
|
||||||
|
t: i % 5,
|
||||||
|
}));
|
||||||
|
})();
|
||||||
|
|
||||||
|
const MONTHS = ["márc", "ápr", "máj", "jún", "júl", "aug", "szept", "okt", "nov", "dec", "jan", "febr"];
|
||||||
|
|
||||||
|
/** Points of a ring of the comparison picture. */
|
||||||
|
function ring(r: number, degrees: number[]) {
|
||||||
|
return degrees.map((d) => {
|
||||||
|
const a = (d * Math.PI) / 180;
|
||||||
|
return { x: 110 + r * Math.cos(a), y: 110 - r * Math.sin(a) };
|
||||||
|
});
|
||||||
|
}
|
||||||
|
const YOU = ring(72, [15, 70, 128, 190, 236, 300, 338]);
|
||||||
|
const THEM = ring(100, [40, 95, 150, 205, 262, 318, 355]);
|
||||||
|
const LINKS: [number, number, string][] = [
|
||||||
|
[0, 0, "var(--harmonic)"],
|
||||||
|
[2, 4, "var(--tense)"],
|
||||||
|
[4, 5, "var(--harmonic)"],
|
||||||
|
[5, 2, "var(--gold)"],
|
||||||
|
];
|
||||||
|
|
||||||
|
// Sample lines of a forecast timeline (illustration, marked as such).
|
||||||
|
const EVENTS = [
|
||||||
|
{ date: "ápr. 9.", glyph: "♃\uFE0E", tone: "harmonic", text: "Jupiter trigon Nap: kinyíló lehetőségek" },
|
||||||
|
{ date: "júl. 22.", glyph: "♄\uFE0E", tone: "tense", text: "Szaturnusz kvadrát Hold: érzelmi számvetés" },
|
||||||
|
{ date: "okt. 14.", glyph: "☉\uFE0E", tone: "neutral", text: "Napfogyatkozás a 10. házban: hivatás" },
|
||||||
|
];
|
||||||
|
|
||||||
|
const CHAPTERS = ["Személyiség", "Érzelmek", "Gondolkodás", "Szerelem", "Hivatás", "Fejlődés"];
|
||||||
|
const SYNASTRY_TOPICS = ["Vonzás", "Kommunikáció", "Érzelmi kötődés", "Súrlódások", "Hosszú táv"];
|
||||||
|
|
||||||
|
/** The home page for visitors: what the site does, shown on the example chart. */
|
||||||
|
export function Landing({ inviteOnly }: { inviteOnly: boolean }) {
|
||||||
|
const chart = example.chart as unknown as ChartResult;
|
||||||
|
const analysis = example.analysis as AnalysisContent;
|
||||||
|
const sections = ["emotions", "love"].map((k) => analysis.sections?.[k]).filter((s) => s !== undefined);
|
||||||
|
const lead = (analysis.summary ?? "").split(/(?<=\.)\s/)[0];
|
||||||
|
const signIn = inviteOnly ? "Belépés meghívóval" : "Elkészítem a képletem";
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="lp">
|
||||||
|
<PublicHeader onHome />
|
||||||
|
|
||||||
|
<section className="lp-hero">
|
||||||
|
<svg className="lp-stars" aria-hidden="true" viewBox="0 0 1000 600" preserveAspectRatio="xMidYMid slice">
|
||||||
|
{STARS.map((s, i) => (
|
||||||
|
<circle key={i} cx={s.x} cy={s.y} r={s.r} className={`lp-star lp-t${s.t}`} />
|
||||||
|
))}
|
||||||
|
</svg>
|
||||||
|
<div className="lp-wrap lp-hero-grid">
|
||||||
|
<div className="lp-hero-text">
|
||||||
|
<span className="eyebrow lp-rise lp-r1">Születési képlet · Éves előrejelzés · Kapcsolat</span>
|
||||||
|
<h1 className="lp-title lp-rise lp-r2">
|
||||||
|
Ahol a csillagok
|
||||||
|
<br />
|
||||||
|
összekötnek.
|
||||||
|
</h1>
|
||||||
|
<p className="lp-lead lp-rise lp-r3">
|
||||||
|
Add meg, mikor és hol születtél: percre pontosan kiszámoljuk a képletedet, és személyre szóló elemzést írunk
|
||||||
|
belőle. Megmutatjuk, mit hoz az éved, és mennyire illetek össze azzal, akit szeretsz.
|
||||||
|
</p>
|
||||||
|
<p className="ai-line lp-ai-line lp-rise lp-r3">
|
||||||
|
Részletes, személyre szóló elemzések a legfejlettebb AI-modellekkel: percek alatt, egy személyes konzultáció
|
||||||
|
árának töredékéért.
|
||||||
|
</p>
|
||||||
|
<div className="lp-actions lp-rise lp-r4">
|
||||||
|
<Link href="/belepes" className="btn btn-primary lp-btn">
|
||||||
|
{signIn}
|
||||||
|
</Link>
|
||||||
|
<Link href="/pelda" className="btn lp-btn">
|
||||||
|
Példaelemzés
|
||||||
|
</Link>
|
||||||
|
</div>
|
||||||
|
<p className="hint lp-rise lp-r4">
|
||||||
|
{inviteOnly ? (
|
||||||
|
<>
|
||||||
|
Az oldal egyelőre meghívásos: meghívóval, Google-fiókkal lépsz be. Ha még nincs meghívód,{" "}
|
||||||
|
<a href="#varolista">iratkozz fel a várólistára</a>.
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
"A képlet és a rövid összefoglaló ingyenes. Google-fiókkal lépsz be."
|
||||||
|
)}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<figure className="lp-figure">
|
||||||
|
<div className="lp-wheel">
|
||||||
|
<svg className="lp-orbit" aria-hidden="true" viewBox="0 0 680 680">
|
||||||
|
<circle cx="340" cy="340" r="334" />
|
||||||
|
<circle cx="340" cy="6" r="3" className="lp-orbit-dot" />
|
||||||
|
<circle cx="674" cy="340" r="2" className="lp-orbit-dot" />
|
||||||
|
<circle cx="104" cy="576" r="2.4" className="lp-orbit-dot" />
|
||||||
|
</svg>
|
||||||
|
<ChartWheel chart={chart} timeKnown title="Példa születési képlet" />
|
||||||
|
</div>
|
||||||
|
<figcaption className="lp-caption">
|
||||||
|
<span className="share-trio">
|
||||||
|
<span>
|
||||||
|
<span className="sym">☉︎</span> Nap Halak
|
||||||
|
</span>
|
||||||
|
<span>
|
||||||
|
<span className="sym">☽︎</span> Hold Skorpió
|
||||||
|
</span>
|
||||||
|
<span>
|
||||||
|
<span className="lp-asc">ASC</span> Oroszlán
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
<span className="hint">Példa: egy kitalált képlet · {example.birth}</span>
|
||||||
|
</figcaption>
|
||||||
|
</figure>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section className="lp-band lp-why" aria-labelledby="why-title">
|
||||||
|
<div className="lp-wrap lp-stack">
|
||||||
|
<div className="lp-intro">
|
||||||
|
<span className="eyebrow">Miért más?</span>
|
||||||
|
<h2 id="why-title" className="lp-h2">
|
||||||
|
Alapos elemzés, töredék áron
|
||||||
|
</h2>
|
||||||
|
</div>
|
||||||
|
<ul className="lp-why-grid">
|
||||||
|
<li className="card lp-why-card">
|
||||||
|
<svg aria-hidden="true" viewBox="0 0 24 24" className="lp-why-icon">
|
||||||
|
<path d="M12 3l1.8 4.6L18.5 9l-4.7 1.6L12 15l-1.8-4.4L5.5 9l4.7-1.4z" />
|
||||||
|
<path d="M18 15l.9 2.1L21 18l-2.1.9L18 21l-.9-2.1L15 18l2.1-.9z" />
|
||||||
|
</svg>
|
||||||
|
<h3 className="lp-step-title">A legfejlettebb AI-modellek</h3>
|
||||||
|
<p className="lp-small">
|
||||||
|
Az elemzéseket a legújabb, legnagyobb nyelvi modellek írják, a te képleted pontosan kiszámolt adataiból. Nem
|
||||||
|
sablonszövegekből rakjuk össze: minden mondat a te képletedről szól.
|
||||||
|
</p>
|
||||||
|
</li>
|
||||||
|
<li className="card lp-why-card">
|
||||||
|
<svg aria-hidden="true" viewBox="0 0 24 24" className="lp-why-icon">
|
||||||
|
<circle cx="12" cy="12" r="9" />
|
||||||
|
<circle cx="12" cy="12" r="4" />
|
||||||
|
<path d="M12 3v5M12 16v5M3 12h5M16 12h5" />
|
||||||
|
</svg>
|
||||||
|
<h3 className="lp-step-title">Az egész képletet olvassa</h3>
|
||||||
|
<p className="lp-small">
|
||||||
|
A bolygókat jegyükben, házukban, fényszögeikben és uralkodóik láncolatában olvassa, a holdcsomópontokkal és
|
||||||
|
az év tranzitjaival együtt: nem egy-egy fényállást, hanem az összefüggéseket.
|
||||||
|
</p>
|
||||||
|
</li>
|
||||||
|
<li className="card lp-why-card">
|
||||||
|
<svg aria-hidden="true" viewBox="0 0 24 24" className="lp-why-icon">
|
||||||
|
<path d="M4 7h16M4 12h10M4 17h6" />
|
||||||
|
<path d="M17 14l3 3-3 3" />
|
||||||
|
</svg>
|
||||||
|
<h3 className="lp-step-title">Töredék áron, azonnal</h3>
|
||||||
|
<p className="lp-small">
|
||||||
|
Egy személyes asztrológiai konzultáció ára sokszorosa egy részletes elemzésnek, és napokat kell rá várni. Itt
|
||||||
|
percek alatt kész, és amit nem értesz, rá is kérdezhetsz.
|
||||||
|
</p>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section className="lp-band lp-alt">
|
||||||
|
<div className="lp-wrap lp-two">
|
||||||
|
<div className="lp-intro">
|
||||||
|
<span className="eyebrow">Első lépés</span>
|
||||||
|
<h2 className="lp-h2">Pár mondat, ami rólad szól</h2>
|
||||||
|
<p className="lp-text">
|
||||||
|
A képleted mellé rögtön kapsz egy rövid összefoglalót: mi adja a képleted gerincét, hol feszül, és miben vagy
|
||||||
|
igazán erős. Ingyen, a belépés után azonnal.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<article className="card summary-card lp-float">
|
||||||
|
<span className="eyebrow">Röviden · ingyenes</span>
|
||||||
|
<h3 className="summary-title">{example.summary.title}</h3>
|
||||||
|
<p className="summary-text">
|
||||||
|
<Rich text={example.summary.summary} />
|
||||||
|
</p>
|
||||||
|
</article>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section id="elemzes" className="lp-band">
|
||||||
|
<div className="lp-wrap lp-stack">
|
||||||
|
<div className="lp-intro">
|
||||||
|
<span className="eyebrow">Részletes elemzés</span>
|
||||||
|
<h2 className="lp-h2">Ha mélyebbre mennél</h2>
|
||||||
|
<p className="lp-text">
|
||||||
|
Hat fejezet a személyiségedről, az érzelmeidről, a gondolkodásodról, a szerelemről, a hivatásodról és a
|
||||||
|
fejlődésed irányáról. A végén erősségek, kihívások és útravaló, és ha kérdésed van, rá is kérdezhetsz.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div className="lp-analysis-grid">
|
||||||
|
<article className="card lp-paper">
|
||||||
|
<header className="analysis-head">
|
||||||
|
<h3 className="lp-paper-title">{analysis.title}</h3>
|
||||||
|
<p className="analysis-lead">{lead}</p>
|
||||||
|
</header>
|
||||||
|
<div className="lp-excerpts">
|
||||||
|
{sections.map((s) => (
|
||||||
|
<section key={s.title} className="analysis-section lp-fade">
|
||||||
|
<h4 className="lp-excerpt-title">{s.title}</h4>
|
||||||
|
<p className="summary-text">
|
||||||
|
<Rich text={s.body.split(/\n\s*\n/)[0]} />
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<div className="lp-paper-foot">
|
||||||
|
<span className="hint">Részlet egy kitalált képlet teljes elemzéséből</span>
|
||||||
|
<Link href="/pelda">Elolvasom a teljes példaelemzést →</Link>
|
||||||
|
</div>
|
||||||
|
</article>
|
||||||
|
<aside className="lp-aside">
|
||||||
|
<div className="card lp-side-card">
|
||||||
|
<h3 className="lp-h3">Erősségek</h3>
|
||||||
|
<ul className="lp-list">
|
||||||
|
{(analysis.strengths ?? []).slice(0, 2).map((t) => (
|
||||||
|
<li key={t}>
|
||||||
|
<Rich text={t} />
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<div className="card lp-side-card">
|
||||||
|
<h3 className="lp-h3">Kérdezz rá</h3>
|
||||||
|
<p className="lp-small">
|
||||||
|
Ami nem világos, vagy amire kíváncsi vagy, megkérdezheted: a válasz a képletedből és az elemzésedből
|
||||||
|
születik.
|
||||||
|
</p>
|
||||||
|
<p className="lp-question">„Mit jelent nekem a Hold–Vénusz kvadrát a párkapcsolatban?”</p>
|
||||||
|
</div>
|
||||||
|
</aside>
|
||||||
|
</div>
|
||||||
|
<div className="lp-chips">
|
||||||
|
{CHAPTERS.map((c) => (
|
||||||
|
<span key={c} className="lp-chip">
|
||||||
|
{c}
|
||||||
|
</span>
|
||||||
|
))}
|
||||||
|
<span className="lp-chip lp-chip-gold">Útravaló</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section className="lp-band lp-alt">
|
||||||
|
<div className="lp-wrap lp-stack">
|
||||||
|
<div className="lp-intro">
|
||||||
|
<span className="eyebrow">Nemcsak a képleted</span>
|
||||||
|
<h2 className="lp-h2">Mit hoz az éved, és kivel illetek össze?</h2>
|
||||||
|
</div>
|
||||||
|
<div className="lp-features">
|
||||||
|
<article id="elorejelzes" className="card lp-feature">
|
||||||
|
<div className="lp-feature-head">
|
||||||
|
<span className="eyebrow">Éves előrejelzés</span>
|
||||||
|
<h3 className="lp-feature-title">Egy év, hónapról hónapra</h3>
|
||||||
|
<p className="lp-text">
|
||||||
|
Szolár képlet, tranzitok pontos dátumokkal és progresszió: születésnaptól születésnapig, hogy tudd, mikor
|
||||||
|
mire érdemes figyelni.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div className="lp-panel">
|
||||||
|
<svg aria-hidden="true" viewBox="0 0 440 70" className="lp-timeline">
|
||||||
|
<line x1="10" y1="40" x2="430" y2="40" className="lp-tl-track" />
|
||||||
|
<line x1="10" y1="40" x2="150" y2="40" className="lp-tl-done" />
|
||||||
|
{MONTHS.map((m, i) => {
|
||||||
|
const x = 10 + (i * 420) / 11;
|
||||||
|
return (
|
||||||
|
<g key={m}>
|
||||||
|
<line x1={x} y1="34" x2={x} y2="46" className="lp-tl-track" />
|
||||||
|
<text x={x} y="64" className="lp-tl-month">
|
||||||
|
{m}
|
||||||
|
</text>
|
||||||
|
</g>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
<circle cx="88" cy="40" r="6" fill="var(--harmonic)" />
|
||||||
|
<circle cx="228" cy="40" r="6" fill="var(--square)" />
|
||||||
|
<circle cx="340" cy="40" r="6" fill="var(--gold)" />
|
||||||
|
<circle cx="150" cy="40" r="5" fill="var(--gold)" className="lp-pulse" />
|
||||||
|
<circle cx="150" cy="40" r="3.5" fill="var(--ink)" />
|
||||||
|
<text x="150" y="20" className="lp-tl-now">
|
||||||
|
most
|
||||||
|
</text>
|
||||||
|
</svg>
|
||||||
|
<ol className="lp-events">
|
||||||
|
{EVENTS.map((e) => (
|
||||||
|
<li key={e.date} className={`timeline-item tone-${e.tone}`}>
|
||||||
|
<span className="timeline-date">{e.date}</span>
|
||||||
|
<span className="timeline-glyph sym" aria-hidden="true">
|
||||||
|
{e.glyph}
|
||||||
|
</span>
|
||||||
|
<span className="timeline-text">{e.text}</span>
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ol>
|
||||||
|
<span className="hint">Minta az idővonalból</span>
|
||||||
|
</div>
|
||||||
|
</article>
|
||||||
|
|
||||||
|
<article id="osszevetes" className="card lp-feature">
|
||||||
|
<div className="lp-feature-head">
|
||||||
|
<span className="eyebrow">Kapcsolati összevetés</span>
|
||||||
|
<h3 className="lp-feature-title">Mennyire illetek össze?</h3>
|
||||||
|
<p className="lp-text">
|
||||||
|
Két képlet egymásra vetítve. Hívd meg, akit szeretsz: ő megadja a saját adatait, és együtt nézitek meg,
|
||||||
|
hol erős és hol kényes a kapcsolatotok.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div className="lp-panel lp-pair">
|
||||||
|
<svg aria-hidden="true" viewBox="0 0 220 220" className="lp-rings">
|
||||||
|
<circle cx="110" cy="110" r="100" className="lp-ring" />
|
||||||
|
<circle cx="110" cy="110" r="72" className="lp-ring" />
|
||||||
|
<circle cx="110" cy="110" r="44" className="lp-ring lp-ring-core" />
|
||||||
|
<g className="lp-spin-back">
|
||||||
|
{THEM.map((p, i) => (
|
||||||
|
<circle key={i} cx={p.x} cy={p.y} r="5" fill="var(--p2)" />
|
||||||
|
))}
|
||||||
|
</g>
|
||||||
|
<g className="lp-spin">
|
||||||
|
{YOU.map((p, i) => (
|
||||||
|
<circle key={i} cx={p.x} cy={p.y} r="5" fill="var(--ink)" />
|
||||||
|
))}
|
||||||
|
</g>
|
||||||
|
{LINKS.map(([a, b, color]) => (
|
||||||
|
<line
|
||||||
|
key={`${a}-${b}`}
|
||||||
|
x1={YOU[a].x}
|
||||||
|
y1={YOU[a].y}
|
||||||
|
x2={THEM[b].x}
|
||||||
|
y2={THEM[b].y}
|
||||||
|
stroke={color}
|
||||||
|
strokeWidth="1.4"
|
||||||
|
strokeOpacity="0.75"
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
</svg>
|
||||||
|
<div className="lp-pair-legend">
|
||||||
|
<span className="pair-text-row">
|
||||||
|
<span className="legend-dot legend-p1" /> Te
|
||||||
|
</span>
|
||||||
|
<span className="pair-text-row p2-text">
|
||||||
|
<span className="legend-dot legend-p2" /> Ő
|
||||||
|
</span>
|
||||||
|
<span className="nature-bar" aria-hidden="true">
|
||||||
|
<span className="nature-seg nature-harmonious" style={{ flexGrow: 5 }} />
|
||||||
|
<span className="nature-seg nature-challenging" style={{ flexGrow: 3 }} />
|
||||||
|
<span className="nature-seg nature-neutral" style={{ flexGrow: 2 }} />
|
||||||
|
</span>
|
||||||
|
<span className="hint">harmonikus · feszült · semleges fényszögek</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="lp-chips">
|
||||||
|
{SYNASTRY_TOPICS.map((c) => (
|
||||||
|
<span key={c} className="lp-chip">
|
||||||
|
{c}
|
||||||
|
</span>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</article>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<article className="card lp-tarot" aria-labelledby="tarot-title">
|
||||||
|
<div className="lp-tarot-cards" aria-hidden="true">
|
||||||
|
<TarotCardBack />
|
||||||
|
{TAROT_CARDS.map((card) => (
|
||||||
|
<TarotCard key={card.id} card={card} />
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<div className="lp-tarot-text">
|
||||||
|
<span className="eyebrow">Kártyajóslás is</span>
|
||||||
|
<h3 id="tarot-title" className="lp-tarot-title">
|
||||||
|
Egy kérdés, néhány lap
|
||||||
|
</h3>
|
||||||
|
<p className="lp-small">
|
||||||
|
Húzz lapot egy konkrét kérdésre: a kirakásodra és a képleted Napjára, Holdjára, Aszcendensére személyre
|
||||||
|
szabott értelmezés készül. Néhány jóslás minden csomagban benne van.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<Link href="/kartyajoslas/pelda" className="lp-tarot-link">
|
||||||
|
Példajóslás →
|
||||||
|
</Link>
|
||||||
|
</article>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section className="lp-band">
|
||||||
|
<div className="lp-wrap lp-stack">
|
||||||
|
<h2 className="lp-h2 lp-center">Így működik</h2>
|
||||||
|
<ol className="lp-steps">
|
||||||
|
<li className="card">
|
||||||
|
<span className="lp-step-n">1</span>
|
||||||
|
<h3 className="lp-step-title">Belépsz, és megadod az adataidat</h3>
|
||||||
|
<p className="lp-small">
|
||||||
|
{inviteOnly ? "Meghívóval, Google-fiókkal lépsz be" : "Google-fiókkal lépsz be"}, aztán megadod a születésed
|
||||||
|
dátumát, idejét és helyét. Ha az időpontot nem tudod, akkor is kiszámoljuk, ami kiszámolható.
|
||||||
|
</p>
|
||||||
|
</li>
|
||||||
|
<li className="card">
|
||||||
|
<span className="lp-step-n">2</span>
|
||||||
|
<h3 className="lp-step-title">Kész a képleted, ingyen</h3>
|
||||||
|
<p className="lp-small">
|
||||||
|
Megrajzolt radix, bolygóállások, házak, fényszögek és egy rövid, személyre szóló összefoglaló.
|
||||||
|
</p>
|
||||||
|
</li>
|
||||||
|
<li className="card">
|
||||||
|
<span className="lp-step-n">3</span>
|
||||||
|
<h3 className="lp-step-title">Ha többet szeretnél</h3>
|
||||||
|
<p className="lp-small">
|
||||||
|
Részletes elemzés, éves előrejelzés, kapcsolati összevetés, és kérdések, amikre a saját képleted felel.
|
||||||
|
</p>
|
||||||
|
</li>
|
||||||
|
</ol>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section id="varolista" className="lp-band lp-final">
|
||||||
|
<div className="lp-wrap lp-final-inner">
|
||||||
|
<svg aria-hidden="true" viewBox="0 0 120 120" className="lp-spin lp-emblem">
|
||||||
|
<circle cx="60" cy="60" r="54" className="lp-emblem-outer" />
|
||||||
|
<circle cx="60" cy="60" r="40" className="lp-ring" />
|
||||||
|
<circle cx="60" cy="6" r="4" fill="var(--gold)" />
|
||||||
|
<circle cx="100" cy="88" r="3" fill="var(--ink)" />
|
||||||
|
<circle cx="24" cy="92" r="2.5" fill="var(--p2)" />
|
||||||
|
</svg>
|
||||||
|
<h2 className="lp-h2">Kíváncsi vagy, mit mutat a te képleted?</h2>
|
||||||
|
<p className="lp-text">
|
||||||
|
{inviteOnly
|
||||||
|
? "Egyelőre meghívással lehet csatlakozni. Ha kaptál meghívót, lépj be a Google-fiókoddal. Ha még nem, írd fel magad, és szólunk."
|
||||||
|
: "Két perc, és ott a képleted a rövid összefoglalóval együtt."}
|
||||||
|
</p>
|
||||||
|
<Link href="/belepes" className="btn btn-primary lp-btn lp-btn-big">
|
||||||
|
{signIn}
|
||||||
|
</Link>
|
||||||
|
{inviteOnly && (
|
||||||
|
<div className="lp-waitlist">
|
||||||
|
<Waitlist />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
<p className="hint lp-disclaimer">
|
||||||
|
Az elemzéseket mesterséges intelligencia írja a pontosan kiszámolt képlet alapján. Tájékoztató jellegűek, nem
|
||||||
|
helyettesítenek szakmai tanácsot.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<footer className="lp-footer">
|
||||||
|
<div className="lp-wrap lp-partners">
|
||||||
|
<span className="hint">Fizetés</span>
|
||||||
|
{/* eslint-disable-next-line @next/next/no-img-element */}
|
||||||
|
<img src="/logos/stripe.svg" alt="Stripe" width="62" height="26" className="lp-partner" />
|
||||||
|
<span className="hint">Számlázás</span>
|
||||||
|
{/* eslint-disable-next-line @next/next/no-img-element */}
|
||||||
|
<img src="/logos/billingo.svg" alt="Billingo" width="80" height="26" className="lp-partner" />
|
||||||
|
</div>
|
||||||
|
<div className="lp-wrap lp-footer-inner">
|
||||||
|
<Logo />
|
||||||
|
<nav aria-label="Lábléc" className="lp-footer-nav">
|
||||||
|
<Link href="/pelda">Példaelemzés</Link>
|
||||||
|
<Link href="/kartyajoslas/pelda">Példajóslás</Link>
|
||||||
|
<Link href="/aszf">ÁSZF</Link>
|
||||||
|
<Link href="/adatvedelem">Adatvédelem</Link>
|
||||||
|
<Link href="/belepes">Belépés</Link>
|
||||||
|
</nav>
|
||||||
|
<span className="hint">© {new Date().getFullYear()} Sorsfonalak</span>
|
||||||
|
</div>
|
||||||
|
</footer>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
import type { Metadata } from "next";
|
import type { Metadata } from "next";
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
|
|
||||||
import { Logo } from "@/components/SiteHeader";
|
import { PublicHeader } from "@/components/SiteHeader";
|
||||||
import { OPERATOR, PRIVACY_UPDATED } from "@/lib/legal";
|
import { OPERATOR, PRIVACY_UPDATED, operatorDetails } from "@/lib/legal";
|
||||||
import { getMe } from "@/lib/server";
|
import { getMe } from "@/lib/server";
|
||||||
|
|
||||||
export const metadata: Metadata = {
|
export const metadata: Metadata = {
|
||||||
@@ -16,22 +16,31 @@ export default async function PrivacyPage() {
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{!me && (
|
{!me && (
|
||||||
<header className="site-header">
|
<PublicHeader />
|
||||||
<Logo />
|
|
||||||
</header>
|
|
||||||
)}
|
)}
|
||||||
<main className="page legal">
|
<main className="page legal">
|
||||||
<div className="page-head">
|
<div className="page-head">
|
||||||
<h1>Adatvédelmi tájékoztató</h1>
|
<h1>Adatvédelmi tájékoztató</h1>
|
||||||
<p className="muted">Hatályos: {PRIVACY_UPDATED}</p>
|
<p className="muted">
|
||||||
|
Hatályos: {PRIVACY_UPDATED} · <Link href="/privacy" lang="en">English version</Link>
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
<h2>1. Ki kezeli az adataidat?</h2>
|
<h2>1. Ki kezeli az adataidat?</h2>
|
||||||
<p>
|
<p>
|
||||||
A Sorsfonalak szolgáltatás (sorsfonalak.hu) adatkezelője: <strong>{OPERATOR.name}</strong>, {OPERATOR.address}
|
{operatorDetails() ? (
|
||||||
{OPERATOR.registration ? `, ${OPERATOR.registration}` : ""}. Adatvédelmi kérdésekben itt érsz el minket:{" "}
|
<>
|
||||||
<strong>{OPERATOR.email}</strong>.
|
A Sorsfonalak szolgáltatás (sorsfonalak.hu) adatkezelője: <strong>{operatorDetails()}</strong>.{" "}
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
"A Sorsfonalak szolgáltatás (sorsfonalak.hu) adatkezelőjét e-mailben éred el. "
|
||||||
|
)}
|
||||||
|
Adatvédelmi és minden más kérdésben itt érsz el minket:{" "}
|
||||||
|
<a href={`mailto:${OPERATOR.email}`}>
|
||||||
|
<strong>{OPERATOR.email}</strong>
|
||||||
|
</a>
|
||||||
|
.
|
||||||
</p>
|
</p>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
@@ -48,7 +57,10 @@ export default async function PrivacyPage() {
|
|||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Google-fiókod neve, e-mail-címe és azonosítója (belépéskor a Google adja át)</td>
|
<td>
|
||||||
|
Google- vagy Apple-fiókod neve, e-mail-címe és azonosítója (belépéskor a Google, illetve az Apple adja
|
||||||
|
át)
|
||||||
|
</td>
|
||||||
<td>Fiókod létrehozása, belépés, kapcsolattartás</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>
|
<td>Szerződés teljesítése (GDPR 6. cikk (1) b)</td>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -65,7 +77,7 @@ export default async function PrivacyPage() {
|
|||||||
<tr>
|
<tr>
|
||||||
<td>Az általad felvett személyek neve és születési adatai</td>
|
<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>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>
|
<td>Szerződés teljesítése; a felvételhez az érintett beleegyezése szükséges (lásd 5. pont)</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>A képletek és az elkészült elemzések</td>
|
<td>A képletek és az elkészült elemzések</td>
|
||||||
@@ -77,6 +89,14 @@ export default async function PrivacyPage() {
|
|||||||
<td>A megvásárolt szolgáltatás nyújtása, elszámolás</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>
|
<td>Szerződés teljesítése; számviteli kötelezettség (6. cikk (1) c)</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
Fizetéseid adatai: a Stripe fizetési azonosítója, a fizetett összeg, a számlázási neved, címed és
|
||||||
|
e-mail-címed, céges vásárlásnál a cégnév és az adószám
|
||||||
|
</td>
|
||||||
|
<td>A fizetés igazolása, a számla kiállítása</td>
|
||||||
|
<td>Szerződés teljesítése; számviteli kötelezettség (6. cikk (1) c)</td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Meghívott e-mail-címe, a meghívó neve és személyes üzenete</td>
|
<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>A meghívó elküldése; amíg az oldal zártkörű, csak meghívottak regisztrálhatnak</td>
|
||||||
@@ -101,13 +121,67 @@ export default async function PrivacyPage() {
|
|||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
<p>
|
<p>
|
||||||
Bankkártyaadatot nem kezelünk és nem tárolunk; a fizetést, amikor elindul, külső fizetési szolgáltató
|
<strong>Bankkártyaadatot nem kezelünk és nem tárolunk.</strong> A fizetés a Stripe biztonságos fizetési
|
||||||
végzi, akinek a neve itt lesz feltüntetve.
|
oldalán történik: a kártyaadataidat közvetlenül a Stripe-nak adod meg, hozzánk nem jutnak el. A Stripe-tól
|
||||||
|
csak a fizetés azonosítóját, összegét és a számlázási adataidat kapjuk meg. Ezeket a fiókod törlése után is
|
||||||
|
megőrizzük a számviteli törvény szerinti ideig (8 évig).
|
||||||
</p>
|
</p>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
<h2>3. Az elemzések és a mesterséges intelligencia</h2>
|
<h2>3. A Google-fiókodból kapott adatok</h2>
|
||||||
|
<p>
|
||||||
|
A belépéshez a „Bejelentkezés Google-fiókkal” szolgáltatást használjuk, az <code>openid</code>,{" "}
|
||||||
|
<code>email</code> és <code>profile</code> engedélyekkel. Belépéskor a Google ezeket adja át nekünk:
|
||||||
|
</p>
|
||||||
|
<ul>
|
||||||
|
<li>a Google-fiókod egyedi azonosítóját,</li>
|
||||||
|
<li>az e-mail-címedet és azt, hogy a Google igazolta-e,</li>
|
||||||
|
<li>a nevedet,</li>
|
||||||
|
<li>a nyelvi beállításodat.</li>
|
||||||
|
</ul>
|
||||||
|
<p>
|
||||||
|
<strong>Mire használjuk:</strong> a fiókod létrehozására és arra, hogy belépéskor felismerjünk; az
|
||||||
|
e-mail-címedet a rendszerlevelekhez (például ha elkészült egy elemzésed vagy elfogadták a meghívódat); a
|
||||||
|
nevedet a megjelenítéshez; a nyelvet az oldal és az elemzések nyelvéhez.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
<strong>Amit nem teszünk:</strong> más Google-adatodhoz (Gmail, Drive, naptár, névjegyek, fényképek) nem férünk
|
||||||
|
hozzá, és a nevedben semmilyen Google-szolgáltatást nem használunk. A Google-től kapott adatokat nem adjuk el,
|
||||||
|
nem használjuk hirdetésre vagy profilalkotásra, nem adjuk át harmadik félnek (kivéve a tárolást és a
|
||||||
|
levélküldést végző adatfeldolgozókat, lásd 6. pont), és a mesterséges intelligenciának sem küldjük el.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
<strong>Meddig és hogyan törölheted:</strong> a fiókod törléséig őrizzük. A fiókodat és minden adatodat a{" "}
|
||||||
|
<Link href="/profil#adataim">Profil</Link> oldalon bármikor törölheted. A Sorsfonalak hozzáférését a
|
||||||
|
Google-fiókodban is visszavonhatod:{" "}
|
||||||
|
<a href="https://myaccount.google.com/permissions" target="_blank" rel="noopener noreferrer">
|
||||||
|
myaccount.google.com/permissions
|
||||||
|
</a>
|
||||||
|
.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
A Google API-kból kapott adatok felhasználása és továbbítása megfelel a{" "}
|
||||||
|
<a
|
||||||
|
href="https://developers.google.com/terms/api-services-user-data-policy"
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
>
|
||||||
|
Google API Services User Data Policy
|
||||||
|
</a>{" "}
|
||||||
|
szabályzatnak, beleértve a „Limited Use” (korlátozott felhasználás) követelményeit.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
<strong>Belépés Apple-fiókkal:</strong> ha az „Apple-bejelentkezést” választod, az Apple a fiókod egyedi
|
||||||
|
azonosítóját és az e-mail-címedet adja át, az első belépéskor a nevedet is. Ha az e-mail-címedet elrejted,
|
||||||
|
egy Apple-továbbítócímet kapunk (<code>…@privaterelay.appleid.com</code>): az erre küldött leveleinket az Apple
|
||||||
|
továbbítja hozzád. Ezeket ugyanarra és ugyanúgy használjuk, mint a Google-adatokat. A hozzáférést az Apple ID
|
||||||
|
beállításaidban vonhatod vissza (Bejelentkezés és biztonság › Bejelentkezés az Apple-lel).
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>4. Az elemzések és a mesterséges intelligencia</h2>
|
||||||
<p>
|
<p>
|
||||||
A rövid összefoglalót és a részletes elemzést nagy nyelvi modell (mesterséges intelligencia) írja. A
|
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
|
modellhez <strong>csak a képlet csillagászati adatai</strong> jutnak el (a bolygók jegye, foka, háza és
|
||||||
@@ -118,7 +192,7 @@ export default async function PrivacyPage() {
|
|||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
<h2>4. Más emberek adatai</h2>
|
<h2>5. Más emberek adatai</h2>
|
||||||
<p>
|
<p>
|
||||||
Ha valaki más (például társad vagy családtagod) születési adatait veszed fel, kérjük, csak az ő
|
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
|
beleegyezésével tedd. Az ő adatait kizárólag te látod; tőlünk senki más nem kapja meg. Az általad felvett
|
||||||
@@ -127,7 +201,7 @@ export default async function PrivacyPage() {
|
|||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
<h2>5. Kik férnek hozzá az adatokhoz? (adatfeldolgozók)</h2>
|
<h2>6. Kik férnek hozzá az adatokhoz? (adatfeldolgozók)</h2>
|
||||||
<ul>
|
<ul>
|
||||||
<li>
|
<li>
|
||||||
<strong>DigitalOcean, LLC</strong> – a szerverek üzemeltetése; az adatok az Európai Unióban (Amszterdam)
|
<strong>DigitalOcean, LLC</strong> – a szerverek üzemeltetése; az adatok az Európai Unióban (Amszterdam)
|
||||||
@@ -145,9 +219,16 @@ export default async function PrivacyPage() {
|
|||||||
az Európai Unióban (Frankfurt).
|
az Európai Unióban (Frankfurt).
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<strong>OpenRouter, Inc.</strong> és az általa elért modellszolgáltató (jelenleg{" "}
|
<strong>Stripe Payments Europe, Ltd.</strong> (Írország) – a bankkártyás fizetés lebonyolítása és a
|
||||||
<strong>Anthropic PBC</strong>) – az elemzések megírása, kizárólag a 3. pontban leírt csillagászati
|
visszaélések kiszűrése; a kártyaadatokat csak a Stripe kezeli.
|
||||||
adatokból.
|
</li>
|
||||||
|
<li>
|
||||||
|
<strong>Billingo Technologies Zrt.</strong> (Billingo) – a számlák kiállítása, megküldése és megőrzése; a
|
||||||
|
számlázási adataidat (név, cím, e-mail-cím, céges vásárlásnál cégnév és adószám) kapja meg.
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<strong>OpenRouter, Inc.</strong> és az általa elért mesterségesintelligencia-szolgáltatók – az elemzések
|
||||||
|
megírása, kizárólag a 4. pontban leírt csillagászati adatokból (személyes adat nem jut el hozzájuk).
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<p>
|
<p>
|
||||||
@@ -158,7 +239,7 @@ export default async function PrivacyPage() {
|
|||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
<h2>6. Meddig őrizzük az adatokat?</h2>
|
<h2>7. Meddig őrizzük az adatokat?</h2>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Fiókod adatait, képleteidet és elemzéseidet a fiókod törléséig.</li>
|
<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 biztonsági mentésekből a törölt adatok legkésőbb 14 nap után tűnnek el.</li>
|
||||||
@@ -173,7 +254,7 @@ export default async function PrivacyPage() {
|
|||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
<h2>7. Sütik</h2>
|
<h2>8. Sütik</h2>
|
||||||
<p>
|
<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
|
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.
|
tart. Reklám- vagy követő sütiket, illetve látogatottságmérőt nem használunk.
|
||||||
@@ -181,7 +262,7 @@ export default async function PrivacyPage() {
|
|||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
<h2>8. A jogaid</h2>
|
<h2>9. A jogaid</h2>
|
||||||
<ul>
|
<ul>
|
||||||
<li>
|
<li>
|
||||||
<strong>Hozzáférés és adathordozhatóság:</strong> a <Link href="/profil#adataim">Profil</Link> oldalon
|
<strong>Hozzáférés és adathordozhatóság:</strong> a <Link href="/profil#adataim">Profil</Link> oldalon
|
||||||
@@ -208,12 +289,12 @@ export default async function PrivacyPage() {
|
|||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
<h2>9. Korhatár</h2>
|
<h2>10. Korhatár</h2>
|
||||||
<p>A szolgáltatást 16 éven felüliek használhatják.</p>
|
<p>A szolgáltatást 16 éven felüliek használhatják.</p>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
<h2>10. Változások</h2>
|
<h2>11. Változások</h2>
|
||||||
<p>
|
<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
|
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ó.
|
oldalon olvasható.
|
||||||
|
|||||||
@@ -8,13 +8,14 @@ import { ROLE_LABELS, formatDate } from "@/lib/astro";
|
|||||||
import type { AdminUser, Package, Role } from "@/lib/types";
|
import type { AdminUser, Package, Role } from "@/lib/types";
|
||||||
|
|
||||||
const EDITABLE_ROLES: Role[] = ["user", "creator", "admin"];
|
const EDITABLE_ROLES: Role[] = ["user", "creator", "admin"];
|
||||||
type UnitKind = "natal" | "synastry" | "forecast" | "question";
|
type UnitKind = "natal" | "synastry" | "forecast" | "question" | "tarot";
|
||||||
|
|
||||||
const UNITS: { value: UnitKind; label: string }[] = [
|
const UNITS: { value: UnitKind; label: string }[] = [
|
||||||
{ value: "natal", label: "képlet" },
|
{ value: "natal", label: "képlet" },
|
||||||
{ value: "synastry", label: "szinasztria" },
|
{ value: "synastry", label: "szinasztria" },
|
||||||
{ value: "forecast", label: "előrejelzés" },
|
{ value: "forecast", label: "előrejelzés" },
|
||||||
{ value: "question", label: "kérdés" },
|
{ value: "question", label: "kérdés" },
|
||||||
|
{ value: "tarot", label: "kártyajóslás" },
|
||||||
];
|
];
|
||||||
|
|
||||||
export function AdminUsers({ selfId }: { selfId: string }) {
|
export function AdminUsers({ selfId }: { selfId: string }) {
|
||||||
@@ -183,6 +184,8 @@ function UserRow({
|
|||||||
előrejelzés {user.analyses_left.forecast ?? 0}
|
előrejelzés {user.analyses_left.forecast ?? 0}
|
||||||
<br />
|
<br />
|
||||||
kérdés {user.analyses_left.question ?? 0}
|
kérdés {user.analyses_left.question ?? 0}
|
||||||
|
<br />
|
||||||
|
jóslás {user.analyses_left.tarot ?? 0}
|
||||||
</span>
|
</span>
|
||||||
<label className="sr-only" htmlFor={`unit-${user.id}`}>
|
<label className="sr-only" htmlFor={`unit-${user.id}`}>
|
||||||
Elemzés fajtája
|
Elemzés fajtája
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
import { useCallback, useEffect, useState } from "react";
|
import { useCallback, useEffect, useState } from "react";
|
||||||
|
|
||||||
|
import { usePackages } from "@/components/PackageCards";
|
||||||
import { api, errorText } from "@/lib/api";
|
import { api, errorText } from "@/lib/api";
|
||||||
import { formatDate } from "@/lib/astro";
|
import { formatDate } from "@/lib/astro";
|
||||||
import type { AdminInvitation, InvitationResult, WaitlistEntry } from "@/lib/types";
|
import type { AdminInvitation, InvitationResult, WaitlistEntry } from "@/lib/types";
|
||||||
@@ -104,6 +105,8 @@ function InviteForm({ onSent }: { onSent: () => Promise<void> }) {
|
|||||||
const [emails, setEmails] = useState("");
|
const [emails, setEmails] = useState("");
|
||||||
const [message, setMessage] = useState("");
|
const [message, setMessage] = useState("");
|
||||||
const [locale, setLocale] = useState("hu");
|
const [locale, setLocale] = useState("hu");
|
||||||
|
const [pkg, setPkg] = useState("");
|
||||||
|
const packages = usePackages();
|
||||||
const [busy, setBusy] = useState(false);
|
const [busy, setBusy] = useState(false);
|
||||||
const [error, setError] = useState<string | null>(null);
|
const [error, setError] = useState<string | null>(null);
|
||||||
const [results, setResults] = useState<InvitationResult[] | null>(null);
|
const [results, setResults] = useState<InvitationResult[] | null>(null);
|
||||||
@@ -116,7 +119,7 @@ function InviteForm({ onSent }: { onSent: () => Promise<void> }) {
|
|||||||
setResults(null);
|
setResults(null);
|
||||||
try {
|
try {
|
||||||
const res = await api<{ results: InvitationResult[] }>("/admin/invitations", {
|
const res = await api<{ results: InvitationResult[] }>("/admin/invitations", {
|
||||||
body: { emails: parseEmails(emails), message: message.trim() || null, locale },
|
body: { emails: parseEmails(emails), message: message.trim() || null, locale, package: pkg || null },
|
||||||
});
|
});
|
||||||
setResults(res.results);
|
setResults(res.results);
|
||||||
if (res.results.some((r) => r.status === "invited")) setEmails("");
|
if (res.results.some((r) => r.status === "invited")) setEmails("");
|
||||||
@@ -163,6 +166,17 @@ function InviteForm({ onSent }: { onSent: () => Promise<void> }) {
|
|||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div className="row" style={{ gap: 12, alignItems: "flex-end", flexWrap: "wrap" }}>
|
<div className="row" style={{ gap: 12, alignItems: "flex-end", flexWrap: "wrap" }}>
|
||||||
|
<div className="field" style={{ minWidth: 220 }}>
|
||||||
|
<label htmlFor="invite-package">Ajándék csomag</label>
|
||||||
|
<select id="invite-package" className="inp" value={pkg} onChange={(e) => setPkg(e.target.value)}>
|
||||||
|
<option value="">nincs</option>
|
||||||
|
{(packages ?? []).map((p) => (
|
||||||
|
<option key={p.id} value={p.id}>
|
||||||
|
{p.name}
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
<div className="field" style={{ width: 160 }}>
|
<div className="field" style={{ width: 160 }}>
|
||||||
<label htmlFor="invite-locale">A levél nyelve</label>
|
<label htmlFor="invite-locale">A levél nyelve</label>
|
||||||
<select id="invite-locale" className="inp" value={locale} onChange={(e) => setLocale(e.target.value)}>
|
<select id="invite-locale" className="inp" value={locale} onChange={(e) => setLocale(e.target.value)}>
|
||||||
@@ -175,6 +189,12 @@ function InviteForm({ onSent }: { onSent: () => Promise<void> }) {
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
{pkg && (
|
||||||
|
<p className="hint" style={{ margin: 0 }}>
|
||||||
|
Minden meghívott kap egy promókódot erre a csomagra. A levélben benne lesz, és a regisztrációkor magától
|
||||||
|
beváltódik. A meghívó visszavonása a kódot is visszavonja.
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
{error && (
|
{error && (
|
||||||
<p className="msg msg-error" role="alert">
|
<p className="msg msg-error" role="alert">
|
||||||
{error}
|
{error}
|
||||||
@@ -187,18 +207,19 @@ function InviteForm({ onSent }: { onSent: () => Promise<void> }) {
|
|||||||
<span className={r.status === "invited" ? "msg-ok" : "muted"}>
|
<span className={r.status === "invited" ? "msg-ok" : "muted"}>
|
||||||
{r.email}: {RESULT[r.status]}
|
{r.email}: {RESULT[r.status]}
|
||||||
</span>
|
</span>
|
||||||
|
{r.promo_code && <code className="promo-code">{r.promo_code}</code>}
|
||||||
{r.url && <CopyLink url={r.url} />}
|
{r.url && <CopyLink url={r.url} />}
|
||||||
</li>
|
</li>
|
||||||
))}
|
))}
|
||||||
</ul>
|
</ul>
|
||||||
)}
|
)}
|
||||||
<MailPreview message={message} locale={locale} />
|
<MailPreview message={message} locale={locale} pkg={pkg} />
|
||||||
</section>
|
</section>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** The invitation e-mail as the recipient sees it, and a test copy to the admin. */
|
/** The invitation e-mail as the recipient sees it, and a test copy to the admin. */
|
||||||
function MailPreview({ message, locale }: { message: string; locale: string }) {
|
function MailPreview({ message, locale, pkg }: { message: string; locale: string; pkg: string }) {
|
||||||
const [mail, setMail] = useState<{ subject: string; html: string; text: string } | null>(null);
|
const [mail, setMail] = useState<{ subject: string; html: string; text: string } | null>(null);
|
||||||
const [view, setView] = useState<"html" | "text">("html");
|
const [view, setView] = useState<"html" | "text">("html");
|
||||||
const [busy, setBusy] = useState(false);
|
const [busy, setBusy] = useState(false);
|
||||||
@@ -210,7 +231,7 @@ function MailPreview({ message, locale }: { message: string; locale: string }) {
|
|||||||
try {
|
try {
|
||||||
const res = await api<{ subject: string; html: string; text: string; sent_to: string | null }>(
|
const res = await api<{ subject: string; html: string; text: string; sent_to: string | null }>(
|
||||||
"/admin/invitations/preview",
|
"/admin/invitations/preview",
|
||||||
{ body: { message: message.trim() || null, locale, send_to_me: sendToMe } },
|
{ body: { message: message.trim() || null, locale, send_to_me: sendToMe, package: pkg || null } },
|
||||||
);
|
);
|
||||||
setMail(res);
|
setMail(res);
|
||||||
if (res.sent_to) setNote({ ok: true, text: `Tesztlevél a sorban: ${res.sent_to}. A linkjei nem működnek.` });
|
if (res.sent_to) setNote({ ok: true, text: `Tesztlevél a sorban: ${res.sent_to}. A linkjei nem működnek.` });
|
||||||
@@ -337,6 +358,12 @@ function InvitationRow({ invitation: i, onChange }: { invitation: AdminInvitatio
|
|||||||
<td>
|
<td>
|
||||||
<span className={`badge invite-${i.status}`}>{STATUS[i.status]}</span>
|
<span className={`badge invite-${i.status}`}>{STATUS[i.status]}</span>
|
||||||
{i.accepted_by && <div className="hint">{i.accepted_by}</div>}
|
{i.accepted_by && <div className="hint">{i.accepted_by}</div>}
|
||||||
|
{i.package && (
|
||||||
|
<div className="hint" title={i.package.code ?? undefined}>
|
||||||
|
Ajándék: {i.package.name ?? i.package.id}
|
||||||
|
{i.package.redeemed_at ? " (beváltva)" : ""}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<span className={i.mail === "failed" ? "msg-error" : i.mail === "queued" ? "muted" : undefined}>
|
<span className={i.mail === "failed" ? "msg-error" : i.mail === "queued" ? "muted" : undefined}>
|
||||||
@@ -376,13 +403,15 @@ function InvitationRow({ invitation: i, onChange }: { invitation: AdminInvitatio
|
|||||||
function WaitlistTable({ waitlist, onChange }: { waitlist: WaitlistEntry[]; onChange: () => Promise<void> }) {
|
function WaitlistTable({ waitlist, onChange }: { waitlist: WaitlistEntry[]; onChange: () => Promise<void> }) {
|
||||||
const [busy, setBusy] = useState<string | null>(null);
|
const [busy, setBusy] = useState<string | null>(null);
|
||||||
const [note, setNote] = useState<string | null>(null);
|
const [note, setNote] = useState<string | null>(null);
|
||||||
|
const [pkg, setPkg] = useState("");
|
||||||
|
const packages = usePackages();
|
||||||
|
|
||||||
async function invite(w: WaitlistEntry) {
|
async function invite(w: WaitlistEntry) {
|
||||||
setBusy(w.email);
|
setBusy(w.email);
|
||||||
setNote(null);
|
setNote(null);
|
||||||
try {
|
try {
|
||||||
const res = await api<{ results: InvitationResult[] }>("/admin/invitations", {
|
const res = await api<{ results: InvitationResult[] }>("/admin/invitations", {
|
||||||
body: { emails: [w.email], locale: w.locale },
|
body: { emails: [w.email], locale: w.locale, package: pkg || null },
|
||||||
});
|
});
|
||||||
const r = res.results[0];
|
const r = res.results[0];
|
||||||
if (r && r.status !== "invited") setNote(`${r.email}: ${RESULT[r.status]}`);
|
if (r && r.status !== "invited") setNote(`${r.email}: ${RESULT[r.status]}`);
|
||||||
@@ -413,6 +442,20 @@ function WaitlistTable({ waitlist, onChange }: { waitlist: WaitlistEntry[]; onCh
|
|||||||
Várólista
|
Várólista
|
||||||
</h2>
|
</h2>
|
||||||
<p className="hint">Akik meghívó nélkül próbáltak belépni, és kérték, hogy szóljunk nekik.</p>
|
<p className="hint">Akik meghívó nélkül próbáltak belépni, és kérték, hogy szóljunk nekik.</p>
|
||||||
|
{waitlist.some((w) => w.invitation === null) && (
|
||||||
|
<div className="field" style={{ maxWidth: 320 }}>
|
||||||
|
<label htmlFor="waitlist-package">Ajándék csomag a meghívottaknak</label>
|
||||||
|
<select id="waitlist-package" className="inp" value={pkg} onChange={(e) => setPkg(e.target.value)}>
|
||||||
|
<option value="">nincs</option>
|
||||||
|
{(packages ?? []).map((p) => (
|
||||||
|
<option key={p.id} value={p.id}>
|
||||||
|
{p.name}
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
<span className="hint">A „Meghívás” gomb ezzel a csomaggal küldi a meghívót; a regisztrációkor magától jóváíródik.</span>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
{note && (
|
{note && (
|
||||||
<p className="msg msg-error" role="alert">
|
<p className="msg msg-error" role="alert">
|
||||||
{note}
|
{note}
|
||||||
|
|||||||
@@ -0,0 +1,285 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useCallback, useEffect, useState } from "react";
|
||||||
|
|
||||||
|
import { api, errorText } from "@/lib/api";
|
||||||
|
import { formatDate } from "@/lib/astro";
|
||||||
|
import type { Package, PromoCode } from "@/lib/types";
|
||||||
|
|
||||||
|
const PAGE = 100;
|
||||||
|
|
||||||
|
const STATUSES: Record<string, string> = {
|
||||||
|
unused: "fel nem használt",
|
||||||
|
used: "beváltott",
|
||||||
|
revoked: "visszavont",
|
||||||
|
all: "mind",
|
||||||
|
};
|
||||||
|
|
||||||
|
interface Page {
|
||||||
|
codes: PromoCode[];
|
||||||
|
total: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Making promo codes and the filtered list of them. */
|
||||||
|
export function PromoCodes({ packages }: { packages: Package[] }) {
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<NewCodes packages={packages} />
|
||||||
|
<CodeList packages={packages} />
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function NewCodes({ packages }: { packages: Package[] }) {
|
||||||
|
const [pkg, setPkg] = useState(packages.find((p) => p.id === "single")?.id ?? packages[0]?.id ?? "");
|
||||||
|
const [count, setCount] = useState(1);
|
||||||
|
const [note, setNote] = useState("");
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const [made, setMade] = useState<{ codes: string[]; package: string } | null>(null);
|
||||||
|
const [copied, setCopied] = useState(false);
|
||||||
|
|
||||||
|
async function create(e: React.FormEvent) {
|
||||||
|
e.preventDefault();
|
||||||
|
setBusy(true);
|
||||||
|
setError(null);
|
||||||
|
try {
|
||||||
|
const r = await api<{ codes: string[]; package: string }>("/admin/promo-codes", {
|
||||||
|
body: { package: pkg, count, note: note || null },
|
||||||
|
});
|
||||||
|
setMade(r);
|
||||||
|
setCopied(false);
|
||||||
|
window.dispatchEvent(new Event("promo-codes-changed"));
|
||||||
|
} catch (err) {
|
||||||
|
setError(errorText(err));
|
||||||
|
} finally {
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function copy() {
|
||||||
|
if (!made) return;
|
||||||
|
await navigator.clipboard.writeText(made.codes.join("\n"));
|
||||||
|
setCopied(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<section className="card" aria-labelledby="new-codes" style={{ gap: 14 }}>
|
||||||
|
<h2 id="new-codes">Új kódok</h2>
|
||||||
|
<form className="promo-form" onSubmit={create}>
|
||||||
|
<div className="field">
|
||||||
|
<label htmlFor="promo-package">Csomag</label>
|
||||||
|
<select id="promo-package" className="inp" value={pkg} onChange={(e) => setPkg(e.target.value)}>
|
||||||
|
{packages.map((p) => (
|
||||||
|
<option key={p.id} value={p.id}>
|
||||||
|
{p.name} ({p.tier === "main" ? "csomag" : "kiegészítő"})
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div className="field">
|
||||||
|
<label htmlFor="promo-count">Darab</label>
|
||||||
|
<input
|
||||||
|
id="promo-count"
|
||||||
|
className="inp"
|
||||||
|
type="number"
|
||||||
|
min={1}
|
||||||
|
max={500}
|
||||||
|
value={count}
|
||||||
|
onChange={(e) => setCount(Math.max(1, Math.min(500, Number(e.target.value) || 1)))}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="field promo-note">
|
||||||
|
<label htmlFor="promo-note">Megjegyzés (kinek, melyik kampány)</label>
|
||||||
|
<input
|
||||||
|
id="promo-note"
|
||||||
|
className="inp"
|
||||||
|
value={note}
|
||||||
|
maxLength={200}
|
||||||
|
onChange={(e) => setNote(e.target.value)}
|
||||||
|
placeholder="pl. meghívottak, első kör"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<button type="submit" className="btn btn-primary" disabled={busy || !pkg}>
|
||||||
|
{busy ? "Készül…" : "Kódok készítése"}
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
{error && (
|
||||||
|
<p className="msg msg-error" role="alert">
|
||||||
|
{error}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
{made && (
|
||||||
|
<div className="promo-made">
|
||||||
|
<p className="msg msg-ok" role="status">
|
||||||
|
{made.codes.length} új kód: {packages.find((p) => p.id === made.package)?.name ?? made.package}
|
||||||
|
</p>
|
||||||
|
<textarea className="inp promo-codes" readOnly rows={Math.min(made.codes.length, 10)} value={made.codes.join("\n")} />
|
||||||
|
<button type="button" className="btn btn-sm" onClick={copy}>
|
||||||
|
{copied ? "Kimásolva" : "Mind másolása"}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</section>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function CodeList({ packages }: { packages: Package[] }) {
|
||||||
|
const [status, setStatus] = useState("unused");
|
||||||
|
const [pkg, setPkg] = useState("");
|
||||||
|
const [q, setQ] = useState("");
|
||||||
|
const [query, setQuery] = useState("");
|
||||||
|
const [codes, setCodes] = useState<PromoCode[] | null>(null);
|
||||||
|
const [total, setTotal] = useState(0);
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
|
||||||
|
const load = useCallback(
|
||||||
|
async (offset: number) => {
|
||||||
|
setBusy(true);
|
||||||
|
setError(null);
|
||||||
|
const params = new URLSearchParams({ status, limit: String(PAGE), offset: String(offset) });
|
||||||
|
if (pkg) params.set("package", pkg);
|
||||||
|
if (query) params.set("q", query);
|
||||||
|
try {
|
||||||
|
const page = await api<Page>(`/admin/promo-codes?${params}`);
|
||||||
|
setCodes((all) => (offset === 0 ? page.codes : [...(all ?? []), ...page.codes]));
|
||||||
|
setTotal(page.total);
|
||||||
|
} catch (e) {
|
||||||
|
setError(errorText(e));
|
||||||
|
} finally {
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[status, pkg, query],
|
||||||
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
load(0);
|
||||||
|
const reload = () => load(0);
|
||||||
|
window.addEventListener("promo-codes-changed", reload);
|
||||||
|
return () => window.removeEventListener("promo-codes-changed", reload);
|
||||||
|
}, [load]);
|
||||||
|
|
||||||
|
// Searching after a short pause in typing.
|
||||||
|
useEffect(() => {
|
||||||
|
const t = setTimeout(() => setQuery(q.trim()), 300);
|
||||||
|
return () => clearTimeout(t);
|
||||||
|
}, [q]);
|
||||||
|
|
||||||
|
async function revoke(c: PromoCode) {
|
||||||
|
if (!window.confirm(`Visszavonod a(z) ${c.code} kódot? Utána nem váltható be.`)) return;
|
||||||
|
try {
|
||||||
|
await api(`/admin/promo-codes/${c.id}/revoke`, { body: {} });
|
||||||
|
load(0);
|
||||||
|
} catch (e) {
|
||||||
|
setError(errorText(e));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<section className="card" aria-labelledby="code-list" style={{ gap: 12 }}>
|
||||||
|
<h2 id="code-list">Kódok</h2>
|
||||||
|
<div className="row" style={{ gap: 12, alignItems: "flex-end" }}>
|
||||||
|
<div className="field">
|
||||||
|
<label htmlFor="code-status">Állapot</label>
|
||||||
|
<select id="code-status" className="inp" value={status} onChange={(e) => setStatus(e.target.value)}>
|
||||||
|
{Object.entries(STATUSES).map(([v, l]) => (
|
||||||
|
<option key={v} value={v}>
|
||||||
|
{l}
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div className="field">
|
||||||
|
<label htmlFor="code-package">Csomag</label>
|
||||||
|
<select id="code-package" className="inp" value={pkg} onChange={(e) => setPkg(e.target.value)}>
|
||||||
|
<option value="">mind</option>
|
||||||
|
{packages.map((p) => (
|
||||||
|
<option key={p.id} value={p.id}>
|
||||||
|
{p.name}
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div className="field" style={{ flex: "1 1 220px" }}>
|
||||||
|
<label htmlFor="code-search">Keresés</label>
|
||||||
|
<input
|
||||||
|
id="code-search"
|
||||||
|
className="inp"
|
||||||
|
type="search"
|
||||||
|
value={q}
|
||||||
|
onChange={(e) => setQ(e.target.value)}
|
||||||
|
placeholder="kód, megjegyzés vagy e-mail"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<p className="hint" style={{ margin: 0 }}>
|
||||||
|
{total} kód
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
{error && (
|
||||||
|
<p className="msg msg-error" role="alert">
|
||||||
|
{error}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
{codes === null ? (
|
||||||
|
<p className="muted">Betöltés…</p>
|
||||||
|
) : codes.length === 0 ? (
|
||||||
|
<p className="muted">Nincs ilyen kód.</p>
|
||||||
|
) : (
|
||||||
|
<div className="table-wrap">
|
||||||
|
<table className="promo-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Kód</th>
|
||||||
|
<th>Csomag</th>
|
||||||
|
<th>Megjegyzés</th>
|
||||||
|
<th>Készült</th>
|
||||||
|
<th>Állapot</th>
|
||||||
|
<th />
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{codes.map((c) => (
|
||||||
|
<tr key={c.id}>
|
||||||
|
<td>
|
||||||
|
<code className="promo-code">{c.code}</code>
|
||||||
|
</td>
|
||||||
|
<td>{c.package_name ?? c.package}</td>
|
||||||
|
<td>{c.note ?? <span className="muted">–</span>}</td>
|
||||||
|
<td className="num">{formatDate(c.created_at)}</td>
|
||||||
|
<td>
|
||||||
|
{c.redeemed_at ? (
|
||||||
|
<>
|
||||||
|
beváltva {formatDate(c.redeemed_at, true)}
|
||||||
|
{c.redeemed_by && (
|
||||||
|
<span className="hint">{c.redeemed_by.name ? `${c.redeemed_by.name} · ` : ""}{c.redeemed_by.email}</span>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
) : c.revoked_at ? (
|
||||||
|
<span className="muted">visszavonva {formatDate(c.revoked_at)}</span>
|
||||||
|
) : (
|
||||||
|
<span className="promo-open">szabad</span>
|
||||||
|
)}
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
{!c.redeemed_at && !c.revoked_at && (
|
||||||
|
<button type="button" className="btn btn-sm btn-ghost" onClick={() => revoke(c)}>
|
||||||
|
Visszavonás
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
))}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{codes && codes.length < total && (
|
||||||
|
<button type="button" className="btn btn-sm" onClick={() => load(codes.length)} disabled={busy}>
|
||||||
|
{busy ? "Betöltés…" : "Továbbiak"}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</section>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
import type { Metadata } from "next";
|
||||||
|
import { notFound } from "next/navigation";
|
||||||
|
|
||||||
|
import { AdminNav } from "@/components/AdminNav";
|
||||||
|
import { backendGet, requireMe } from "@/lib/server";
|
||||||
|
import type { Package } from "@/lib/types";
|
||||||
|
|
||||||
|
import { PromoCodes } from "./PromoCodes";
|
||||||
|
|
||||||
|
export const metadata: Metadata = { title: "Promókódok" };
|
||||||
|
|
||||||
|
export default async function AdminPromoPage() {
|
||||||
|
const me = await requireMe("/admin/promokodok");
|
||||||
|
if (!me.user.roles.includes("admin")) notFound();
|
||||||
|
const catalog = await backendGet<{ packages: Package[] }>("/v1/packages");
|
||||||
|
return (
|
||||||
|
<main className="page" style={{ maxWidth: 1180 }}>
|
||||||
|
<AdminNav current="/admin/promokodok" />
|
||||||
|
<div className="page-head">
|
||||||
|
<h1>Promókódok</h1>
|
||||||
|
<p className="muted">
|
||||||
|
Egy kód egy csomagot ad, és egyszer váltható be a „Kód beváltása” oldalon (a fejlécben). A beváltó link:
|
||||||
|
sorsfonalak.hu/bevaltas?kod=KÓD — ezt elég elküldeni, belépés után kitöltve várja.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<PromoCodes packages={catalog?.packages ?? []} />
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,10 +1,21 @@
|
|||||||
// Forwards /api/v1/* to the backend, so the browser talks to one origin and
|
// 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).
|
// the session cookie belongs to the frontend's host (no CORS needed).
|
||||||
|
import { revalidateTag } from "next/cache";
|
||||||
import type { NextRequest } from "next/server";
|
import type { NextRequest } from "next/server";
|
||||||
|
|
||||||
import { BACKEND_URL } from "@/lib/server";
|
import { BACKEND_URL } from "@/lib/server";
|
||||||
|
import { SHARES_TAG } from "@/lib/share";
|
||||||
|
|
||||||
const REQUEST_HEADERS = ["accept", "accept-language", "authorization", "content-type", "cookie", "user-agent"];
|
// stripe-signature: Stripe's webhook (the body is passed on byte for byte).
|
||||||
|
const REQUEST_HEADERS = [
|
||||||
|
"accept",
|
||||||
|
"accept-language",
|
||||||
|
"authorization",
|
||||||
|
"content-type",
|
||||||
|
"cookie",
|
||||||
|
"stripe-signature",
|
||||||
|
"user-agent",
|
||||||
|
];
|
||||||
// Hop-by-hop or re-computed by the runtime.
|
// Hop-by-hop or re-computed by the runtime.
|
||||||
const SKIP_RESPONSE_HEADERS = new Set(["connection", "content-encoding", "content-length", "set-cookie", "transfer-encoding"]);
|
const SKIP_RESPONSE_HEADERS = new Set(["connection", "content-encoding", "content-length", "set-cookie", "transfer-encoding"]);
|
||||||
|
|
||||||
@@ -17,8 +28,10 @@ async function forward(req: NextRequest, ctx: { params: Promise<{ path: string[]
|
|||||||
const value = req.headers.get(name);
|
const value = req.headers.get(name);
|
||||||
if (value) headers.set(name, value);
|
if (value) headers.set(name, value);
|
||||||
}
|
}
|
||||||
const forwardedFor = req.headers.get("x-forwarded-for");
|
// The visitor's address as Caddy set it (from Cloudflare's CF-Connecting-IP,
|
||||||
if (forwardedFor) headers.set("x-forwarded-for", forwardedFor);
|
// overwriting any the browser sent).
|
||||||
|
const realIp = req.headers.get("x-real-ip");
|
||||||
|
if (realIp) headers.set("x-real-ip", realIp);
|
||||||
|
|
||||||
let res: Response;
|
let res: Response;
|
||||||
try {
|
try {
|
||||||
@@ -38,6 +51,8 @@ async function forward(req: NextRequest, ctx: { params: Promise<{ path: string[]
|
|||||||
if (!SKIP_RESPONSE_HEADERS.has(name)) out.set(name, value);
|
if (!SKIP_RESPONSE_HEADERS.has(name)) out.set(name, value);
|
||||||
});
|
});
|
||||||
for (const cookie of res.headers.getSetCookie()) out.append("set-cookie", cookie);
|
for (const cookie of res.headers.getSetCookie()) out.append("set-cookie", cookie);
|
||||||
|
// A revoked link must disappear at once from the cached share pages.
|
||||||
|
if (req.method === "DELETE" && path[0] === "shares" && res.ok) revalidateTag(SHARES_TAG, { expire: 0 });
|
||||||
return new Response(res.body, { status: res.status, headers: out });
|
return new Response(res.body, { status: res.status, headers: out });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
|
After Width: | Height: | Size: 5.1 KiB |
@@ -0,0 +1,168 @@
|
|||||||
|
import type { Metadata } from "next";
|
||||||
|
import Link from "next/link";
|
||||||
|
|
||||||
|
import { PublicHeader } from "@/components/SiteHeader";
|
||||||
|
import { OPERATOR, TERMS_UPDATED, operatorDetails } from "@/lib/legal";
|
||||||
|
import { getMe } from "@/lib/server";
|
||||||
|
|
||||||
|
export const metadata: Metadata = {
|
||||||
|
title: "Általános szerződési feltételek",
|
||||||
|
description: "A Sorsfonalak használatának és a csomagok vásárlásának feltételei.",
|
||||||
|
};
|
||||||
|
|
||||||
|
/** The terms of service (ÁSZF); every purchase accepts them on Stripe's payment page. */
|
||||||
|
export default async function TermsPage() {
|
||||||
|
const me = await getMe();
|
||||||
|
const email = (
|
||||||
|
<a href={`mailto:${OPERATOR.email}`}>
|
||||||
|
<strong>{OPERATOR.email}</strong>
|
||||||
|
</a>
|
||||||
|
);
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{!me && <PublicHeader />}
|
||||||
|
<main className="page legal">
|
||||||
|
<div className="page-head">
|
||||||
|
<h1>Általános szerződési feltételek</h1>
|
||||||
|
<p className="muted">Hatályos: {TERMS_UPDATED}</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>1. A szolgáltató</h2>
|
||||||
|
<p>
|
||||||
|
{operatorDetails() ? (
|
||||||
|
<>
|
||||||
|
A sorsfonalak.hu weboldalt és szolgáltatást (a továbbiakban: Sorsfonalak) a(z){" "}
|
||||||
|
<strong>{operatorDetails()}</strong> nyújtja.
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
"A sorsfonalak.hu weboldalt és szolgáltatást (a továbbiakban: Sorsfonalak) üzemeltető szolgáltató adatai a vállalkozás bejegyzése után itt szerepelnek."
|
||||||
|
)}{" "}
|
||||||
|
Elérhetőség: {email}. A szolgáltatás nyelve magyar.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
Tárhelyszolgáltató: DigitalOcean, LLC (digitalocean.com); az adatok az Európai Unióban (Amszterdam)
|
||||||
|
vannak tárolva.
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>2. A szolgáltatás</h2>
|
||||||
|
<p>
|
||||||
|
A Sorsfonalak online tartalomszolgáltatás. A megadott születési adatokból kiszámítja és megrajzolja a
|
||||||
|
születési képletet, és ingyenes rövid összefoglalót ad. Csomagok vásárlásával a felhasználó szoftveresen
|
||||||
|
(mesterséges intelligenciával) előállított, személyre szabott szöveges tartalmakat kérhet: részletes
|
||||||
|
képletelemzést, kapcsolati elemzést, éves előrejelzést és kérdésekre adott válaszokat, valamint további
|
||||||
|
személyeket vehet fel.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
A tartalmak szórakoztató és önismereti célúak. Nem minősülnek orvosi, pszichológiai, pénzügyi, jogi vagy
|
||||||
|
más szakmai tanácsnak, és nem személyes tanácsadás. A szoftveresen előállított szövegek tévedhetnek; a
|
||||||
|
rájuk alapozott döntésekért a felhasználó felel.
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>3. Regisztráció</h2>
|
||||||
|
<p>
|
||||||
|
A szolgáltatás Google-fiókkal vehető igénybe, 16 éven felülieknek. Amíg az oldal meghívásos, új fiók csak
|
||||||
|
meghívóval jön létre. A felhasználó felel azért, hogy a megadott adatok (köztük mások születési adatai) az
|
||||||
|
érintettek hozzájárulásával kerüljenek a rendszerbe. Az adatkezelésről az{" "}
|
||||||
|
<Link href="/adatvedelem">adatvédelmi tájékoztató</Link> szól.
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>4. A vásárlás menete</h2>
|
||||||
|
<ol>
|
||||||
|
<li>A felhasználó a Csomagok oldalon (vagy egy elemzésnél) kiválasztja a csomagot, és a „Megveszem” gombra kattint.</li>
|
||||||
|
<li>
|
||||||
|
A Stripe biztonságos fizetési oldalán megadja a számlázási adatait (cégként a cégnevet és az adószámot
|
||||||
|
is) és a fizetési adatokat. Az adatokat a fizetés előtt ott javíthatja.
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
A fizetés előtt elfogadja ezt az ÁSZF-et, kéri a szolgáltatás azonnali megkezdését, és tudomásul veszi,
|
||||||
|
hogy ezzel elveszíti az elállási jogát (7. pont).
|
||||||
|
</li>
|
||||||
|
<li>A fizetéssel a szerződés létrejön. A csomagot azonnal jóváírjuk, és e-mailben visszaigazoljuk.</li>
|
||||||
|
</ol>
|
||||||
|
<p>
|
||||||
|
A szerződés elektronikus úton jön létre, írásba foglalt szerződésnek nem minősül, külön nem iktatjuk. A
|
||||||
|
vásárlás adatai és a számlák a fiókban (Számláim) bármikor elérhetők. Magatartási kódexnek nem vetjük alá
|
||||||
|
magunkat.
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>5. Árak, fizetés, számla</h2>
|
||||||
|
<p>
|
||||||
|
Az árak forintban értendő végső árak. Alanyi adómentesek vagyunk, áfát nem számítunk fel. Az árak
|
||||||
|
változhatnak; a vásárláskor látott ár érvényes.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
A fizetést a Stripe (Stripe Payments Europe, Ltd.) bonyolítja bankkártyával, Apple Payjel vagy Google
|
||||||
|
Payjel. A kártyaadatokat csak a Stripe kezeli, hozzánk nem jutnak el. A számlát a Billingo rendszerével
|
||||||
|
állítjuk ki, e-mailben küldjük, és a fiókban is letölthető.
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>6. Teljesítés</h2>
|
||||||
|
<p>
|
||||||
|
A csomag egységei (elemzések, előrejelzések, kérdések, személyhelyek) a fizetés igazolása után azonnal a
|
||||||
|
fiókban vannak. Nem járnak le, nem ruházhatók át, és pénzre nem válthatók vissza. Egy elemzés elkészítése
|
||||||
|
általában néhány perc.
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>7. Elállási jog</h2>
|
||||||
|
<p>
|
||||||
|
Online vásárlásnál a fogyasztót alapesetben 14 napos, indoklás nélküli elállási jog illeti meg. Nem tárgyi
|
||||||
|
adathordozón nyújtott digitális tartalomnál és szolgáltatásnál ez megszűnik, ha a teljesítés a fogyasztó
|
||||||
|
kifejezett, előzetes kérésére kezdődik meg, a fogyasztó tudomásul veszi, hogy ezzel elveszíti az elállási
|
||||||
|
jogát, és erről visszaigazolást kap (45/2014. (II. 26.) Korm. rendelet 29. § (1) bekezdés). A Sorsfonalak
|
||||||
|
csomagjait azonnal teljesítjük: a fizetési oldalon ezt kéri a vásárló, és a visszaigazoló e-mailben ezt
|
||||||
|
megerősítjük, ezért a vásárlástól elállni nem lehet.
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>8. Hibás teljesítés</h2>
|
||||||
|
<p>
|
||||||
|
Ha a szolgáltatás nem működik megfelelően, a jogszabályok szerinti jogok megilletnek (Ptk.; 373/2021. (VI.
|
||||||
|
30.) Korm. rendelet). Ha egy kért elemzés többszöri próbálkozás után sem készül el, a felhasznált egységet
|
||||||
|
magától visszaadjuk. Más hibát a {email} címen jelezz: kijavítjuk, vagy ha ez nem lehetséges (például a
|
||||||
|
szolgáltatás tartósan nem érhető el), a fel nem használt részt visszafizetjük a fizetéskor használt módon.
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>9. A fiók megszüntetése</h2>
|
||||||
|
<p>
|
||||||
|
A fiók a Profil oldalon bármikor törölhető. A fel nem használt egységek ezzel megszűnnek; ezekért
|
||||||
|
visszatérítés nem jár, kivéve, ha a törlést a szolgáltatás hibája tette szükségessé. A jogszabálysértő
|
||||||
|
vagy a szolgáltatással visszaélő felhasználó fiókját felfüggeszthetjük vagy megszüntethetjük.
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>10. Panaszkezelés, jogorvoslat</h2>
|
||||||
|
<p>
|
||||||
|
Panaszt a {email} címen tehetsz; 30 napon belül írásban válaszolunk. Ha a panaszt nem rendezzük, a
|
||||||
|
szolgáltató székhelye szerint illetékes békéltető testülethez fordulhatsz, panaszt tehetsz a
|
||||||
|
fogyasztóvédelmi hatóságnál (a lakóhelyed szerinti kormányhivatal), vagy bírósághoz fordulhatsz.
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>11. Egyéb</h2>
|
||||||
|
<p>
|
||||||
|
Az ÁSZF módosítása a módosítás után kötött vásárlásokra vonatkozik; a lényeges változásokat az oldalon
|
||||||
|
jelezzük. A szerződésre a magyar jog irányadó.
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,152 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import Script from "next/script";
|
||||||
|
import { useRouter } from "next/navigation";
|
||||||
|
import { useState } from "react";
|
||||||
|
|
||||||
|
import { Waitlist } from "@/components/Waitlist";
|
||||||
|
import { ApiError, api, errorText } from "@/lib/api";
|
||||||
|
|
||||||
|
/** The part of Sign in with Apple JS (appleid.auth.js) we use. */
|
||||||
|
interface AppleSignInResponse {
|
||||||
|
authorization: { id_token: string; code: string; state?: string };
|
||||||
|
/** Only at the first sign-in of this Apple ID on the site. */
|
||||||
|
user?: { email?: string; name?: { firstName?: string; lastName?: string } };
|
||||||
|
}
|
||||||
|
|
||||||
|
declare global {
|
||||||
|
interface Window {
|
||||||
|
AppleID?: {
|
||||||
|
auth: {
|
||||||
|
init(options: { clientId: string; scope: string; redirectURI: string; state?: string; usePopup: boolean }): void;
|
||||||
|
signIn(): Promise<AppleSignInResponse>;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Apple's logo (Sign in with Apple guidelines: the logo left of the label). */
|
||||||
|
function AppleMark() {
|
||||||
|
return (
|
||||||
|
<svg width="18" height="20" viewBox="0 0 17 20" aria-hidden="true" fill="currentColor">
|
||||||
|
<path d="M13.77 10.62c-.02-2.2 1.8-3.26 1.88-3.31-1.03-1.5-2.62-1.7-3.18-1.73-1.35-.14-2.64.8-3.33.8-.69 0-1.74-.78-2.86-.76-1.47.02-2.83.86-3.59 2.17-1.53 2.65-.39 6.57 1.1 8.72.73 1.05 1.6 2.23 2.73 2.19 1.1-.04 1.51-.71 2.84-.71 1.32 0 1.7.71 2.86.69 1.18-.02 1.93-1.07 2.65-2.12.84-1.22 1.18-2.4 1.2-2.46-.03-.01-2.29-.88-2.3-3.48zM11.6 4.17c.6-.73 1.01-1.75.9-2.76-.87.04-1.92.58-2.54 1.31-.56.65-1.05 1.69-.92 2.68.97.08 1.96-.49 2.56-1.23z" />
|
||||||
|
</svg>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The e-mail address inside Apple's ID token (only for the waitlist form; the backend verifies the token). */
|
||||||
|
function tokenEmail(idToken: string): string {
|
||||||
|
try {
|
||||||
|
const part = idToken.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 Apple": Apple's sign-in opens in a popup and returns an ID
|
||||||
|
* token, which the backend verifies. Apple gives the name only at the first
|
||||||
|
* sign-in, so it is sent along then (Hungarian order: family name first).
|
||||||
|
*/
|
||||||
|
export function AppleLogin({
|
||||||
|
clientId,
|
||||||
|
target,
|
||||||
|
inviteToken = null,
|
||||||
|
}: {
|
||||||
|
clientId: string;
|
||||||
|
target: string;
|
||||||
|
inviteToken?: string | null;
|
||||||
|
}) {
|
||||||
|
const router = useRouter();
|
||||||
|
const [ready, setReady] = useState(false);
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const [uninvited, setUninvited] = useState<string | null>(null);
|
||||||
|
|
||||||
|
function loaded() {
|
||||||
|
window.AppleID?.auth.init({
|
||||||
|
clientId,
|
||||||
|
scope: "name email",
|
||||||
|
redirectURI: `${window.location.origin}/belepes`,
|
||||||
|
usePopup: true,
|
||||||
|
});
|
||||||
|
setReady(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function signIn() {
|
||||||
|
const apple = window.AppleID;
|
||||||
|
if (!apple) return;
|
||||||
|
setError(null);
|
||||||
|
setUninvited(null);
|
||||||
|
let response: AppleSignInResponse;
|
||||||
|
try {
|
||||||
|
response = await apple.auth.signIn();
|
||||||
|
} catch (e) {
|
||||||
|
// Closing the popup is not an error worth showing.
|
||||||
|
const code = (e as { error?: string } | null)?.error;
|
||||||
|
if (code !== "popup_closed_by_user" && code !== "user_cancelled_authorize") {
|
||||||
|
setError("Az Apple-belépés nem sikerült. Próbáld újra.");
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
setBusy(true);
|
||||||
|
const name = [response.user?.name?.lastName, response.user?.name?.firstName].filter(Boolean).join(" ") || null;
|
||||||
|
try {
|
||||||
|
let referral: string | null = null;
|
||||||
|
try {
|
||||||
|
referral = localStorage.getItem("sf_ref");
|
||||||
|
} catch {
|
||||||
|
// storage blocked
|
||||||
|
}
|
||||||
|
await api("/auth/apple", {
|
||||||
|
body: { id_token: response.authorization.id_token, name, invite_token: inviteToken, referral },
|
||||||
|
});
|
||||||
|
try {
|
||||||
|
localStorage.removeItem("sf_ref");
|
||||||
|
} catch {
|
||||||
|
// storage blocked
|
||||||
|
}
|
||||||
|
router.replace(target);
|
||||||
|
router.refresh();
|
||||||
|
} catch (e) {
|
||||||
|
if (e instanceof ApiError && e.code === "not_invited") setUninvited(tokenEmail(response.authorization.id_token));
|
||||||
|
else setError(errorText(e));
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="field">
|
||||||
|
<Script
|
||||||
|
src="https://appleid.cdn-apple.com/appleauth/static/jsapi/appleid/1/hu_HU/appleid.auth.js"
|
||||||
|
strategy="afterInteractive"
|
||||||
|
onReady={loaded}
|
||||||
|
onError={() => setError("Nem sikerült betölteni az Apple-belépést. Ellenőrizd a hálózatot vagy a reklámblokkolót.")}
|
||||||
|
/>
|
||||||
|
<button type="button" className="btn-social btn-apple" onClick={signIn} disabled={!ready || busy}>
|
||||||
|
<span className="btn-social-icon">
|
||||||
|
<AppleMark />
|
||||||
|
</span>
|
||||||
|
{busy ? "Belépés…" : "Folytatás Apple-fiókkal"}
|
||||||
|
</button>
|
||||||
|
{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 az Apple-fiókhoz sem tartozik másik."
|
||||||
|
: "A Sorsfonalak jelenleg meghívásos, és ehhez az Apple-fiókhoz nem tartozik meghívó. Ha kaptál meghívót, nyisd meg a levélben kapott linket, vagy lépj be azzal a fiókkal, amelynek a címére a meghívó szólt."}
|
||||||
|
</p>
|
||||||
|
<Waitlist email={uninvited.endsWith("@privaterelay.appleid.com") ? "" : uninvited} />
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -72,7 +72,18 @@ export function GoogleLogin({
|
|||||||
setError(null);
|
setError(null);
|
||||||
setUninvited(null);
|
setUninvited(null);
|
||||||
try {
|
try {
|
||||||
await api("/auth/google", { body: { id_token: response.credential, invite_token: inviteToken } });
|
let referral: string | null = null;
|
||||||
|
try {
|
||||||
|
referral = localStorage.getItem("sf_ref");
|
||||||
|
} catch {
|
||||||
|
// storage blocked
|
||||||
|
}
|
||||||
|
await api("/auth/google", { body: { id_token: response.credential, invite_token: inviteToken, referral } });
|
||||||
|
try {
|
||||||
|
localStorage.removeItem("sf_ref");
|
||||||
|
} catch {
|
||||||
|
// storage blocked
|
||||||
|
}
|
||||||
router.replace(target);
|
router.replace(target);
|
||||||
router.refresh();
|
router.refresh();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
|||||||
@@ -8,14 +8,19 @@ import { BACKEND_URL, getMe } from "@/lib/server";
|
|||||||
import { formatDate } from "@/lib/astro";
|
import { formatDate } from "@/lib/astro";
|
||||||
import type { InvitationLanding, PublicConfig } from "@/lib/types";
|
import type { InvitationLanding, PublicConfig } from "@/lib/types";
|
||||||
|
|
||||||
|
import { AppleLogin } from "./AppleLogin";
|
||||||
import { GoogleLogin } from "./GoogleLogin";
|
import { GoogleLogin } from "./GoogleLogin";
|
||||||
|
|
||||||
export const metadata: Metadata = { title: "Belépés" };
|
export const metadata: Metadata = { title: "Belépés" };
|
||||||
|
|
||||||
/** Only local paths, so the login cannot redirect to another site. */
|
/**
|
||||||
|
* Only local paths, so the login cannot redirect to another site: one leading
|
||||||
|
* slash, no backslash (browsers read "/\\evil.com" as "//evil.com") and no
|
||||||
|
* control characters.
|
||||||
|
*/
|
||||||
function safeTarget(value: string | string[] | undefined): string {
|
function safeTarget(value: string | string[] | undefined): string {
|
||||||
const v = Array.isArray(value) ? value[0] : value;
|
const v = Array.isArray(value) ? value[0] : value;
|
||||||
return v && v.startsWith("/") && !v.startsWith("//") ? v : "/";
|
return v && /^\/(?![/\\])[^\\\u0000-\u001f]*$/.test(v) ? v : "/";
|
||||||
}
|
}
|
||||||
|
|
||||||
async function loadConfig(): Promise<PublicConfig | null> {
|
async function loadConfig(): Promise<PublicConfig | null> {
|
||||||
@@ -43,7 +48,7 @@ const CLOSED: Record<string, string> = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
/** The invitation the visitor came with: who sent it and what they wrote. */
|
/** The invitation the visitor came with: who sent it and what they wrote. */
|
||||||
function InvitationCard({ invitation }: { invitation: InvitationLanding | null }) {
|
function InvitationCard({ invitation, apple }: { invitation: InvitationLanding | null; apple: boolean }) {
|
||||||
if (!invitation) {
|
if (!invitation) {
|
||||||
return (
|
return (
|
||||||
<p className="msg msg-error" role="alert">
|
<p className="msg msg-error" role="alert">
|
||||||
@@ -66,7 +71,7 @@ function InvitationCard({ invitation }: { invitation: InvitationLanding | null }
|
|||||||
</p>
|
</p>
|
||||||
{invitation.message && <blockquote className="invite-quote">{invitation.message}</blockquote>}
|
{invitation.message && <blockquote className="invite-quote">{invitation.message}</blockquote>}
|
||||||
<p className="hint" style={{ margin: 0 }}>
|
<p className="hint" style={{ margin: 0 }}>
|
||||||
Bármelyik Google-fiókoddal elfogadhatod. Érvényes: {formatDate(invitation.expires_at).replace(/\.$/, "")}-ig.
|
Bármelyik {apple ? "Google- vagy Apple-fiókoddal" : "Google-fiókoddal"} elfogadhatod. Érvényes: {formatDate(invitation.expires_at).replace(/\.$/, "")}-ig.
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
@@ -83,6 +88,8 @@ export default async function LoginPage({ searchParams }: { searchParams: Promis
|
|||||||
inviteToken ? loadInvitation(inviteToken) : Promise.resolve(null),
|
inviteToken ? loadInvitation(inviteToken) : Promise.resolve(null),
|
||||||
]);
|
]);
|
||||||
const clientId = config?.google_login.enabled ? config.google_login.client_id : null;
|
const clientId = config?.google_login.enabled ? config.google_login.client_id : null;
|
||||||
|
const appleId = config?.apple_login?.enabled ? config.apple_login.client_id : null;
|
||||||
|
const pendingInvite = invitation?.status === "pending" ? inviteToken : null;
|
||||||
const inviteOnly = config?.signup_mode === "invite";
|
const inviteOnly = config?.signup_mode === "invite";
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -96,8 +103,8 @@ export default async function LoginPage({ searchParams }: { searchParams: Promis
|
|||||||
Születési képlet, szinasztria és közösség – egy helyen.
|
Születési képlet, szinasztria és közösség – egy helyen.
|
||||||
</p>
|
</p>
|
||||||
<p className="ai-line" style={{ fontSize: 15 }}>
|
<p className="ai-line" style={{ fontSize: 15 }}>
|
||||||
Részletes elemzések a legfejlettebb AI-modellekkel: egy tapasztalt asztrológushoz közelítő mélység, töredék
|
Részletes, személyre szóló elemzések a legfejlettebb AI-modellekkel: percek alatt, egy személyes konzultáció
|
||||||
áron.
|
árának töredékéért.
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</aside>
|
</aside>
|
||||||
@@ -107,17 +114,16 @@ export default async function LoginPage({ searchParams }: { searchParams: Promis
|
|||||||
<h1 style={{ fontSize: 44 }}>{rawToken ? "Meghívó" : "Belépés"}</h1>
|
<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>
|
<p className="muted">{rawToken ? "Lépj be, és már kezdheted is." : "Üdv újra! Lépj be a fiókodba."}</p>
|
||||||
</div>
|
</div>
|
||||||
{rawToken && <InvitationCard invitation={inviteToken ? invitation : null} />}
|
{rawToken && <InvitationCard invitation={inviteToken ? invitation : null} apple={appleId !== null} />}
|
||||||
{config === null ? (
|
{config === null ? (
|
||||||
<p className="msg msg-error" role="alert">
|
<p className="msg msg-error" role="alert">
|
||||||
A szerver most nem érhető el. Próbáld újra egy kicsit később.
|
A szerver most nem érhető el. Próbáld újra egy kicsit később.
|
||||||
</p>
|
</p>
|
||||||
) : clientId ? (
|
) : clientId ? (
|
||||||
<GoogleLogin
|
<div className="field" style={{ gap: 12 }}>
|
||||||
clientId={clientId}
|
<GoogleLogin clientId={clientId} target={target} inviteToken={pendingInvite} />
|
||||||
target={target}
|
{appleId && <AppleLogin clientId={appleId} target={target} inviteToken={pendingInvite} />}
|
||||||
inviteToken={invitation?.status === "pending" ? inviteToken : null}
|
</div>
|
||||||
/>
|
|
||||||
) : (
|
) : (
|
||||||
<p className="msg msg-error" role="alert">
|
<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).
|
A Google-belépés még nincs beállítva (a backend <code>GOOGLE_CLIENT_IDS</code> változója üres).
|
||||||
@@ -131,8 +137,9 @@ export default async function LoginPage({ searchParams }: { searchParams: Promis
|
|||||||
: "Még nincs fiókod? Az első belépéskor létrejön."}
|
: "Még nincs fiókod? Az első belépéskor létrejön."}
|
||||||
</p>
|
</p>
|
||||||
<p className="hint">
|
<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
|
A belépéssel elfogadod az <Link href="/aszf">általános szerződési feltételeket</Link>, és hogy a születési
|
||||||
őket a profilodban. Részletek: <Link href="/adatvedelem">adatvédelmi tájékoztató</Link>.
|
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>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</main>
|
</main>
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
import type { Metadata } from "next";
|
||||||
|
|
||||||
|
import { RedeemCode } from "@/components/RedeemCode";
|
||||||
|
import { requireMe } from "@/lib/server";
|
||||||
|
|
||||||
|
export const metadata: Metadata = { title: "Promókód beváltása", robots: { index: false } };
|
||||||
|
|
||||||
|
type Props = { searchParams: Promise<{ kod?: string }> };
|
||||||
|
|
||||||
|
/** Redeeming a promo code; `?kod=` fills it in (links in invitations). */
|
||||||
|
export default async function RedeemPage({ searchParams }: Props) {
|
||||||
|
const { kod } = await searchParams;
|
||||||
|
await requireMe(kod ? `/bevaltas?kod=${encodeURIComponent(kod)}` : "/bevaltas");
|
||||||
|
return (
|
||||||
|
<main className="page" style={{ maxWidth: 640 }}>
|
||||||
|
<div className="page-head">
|
||||||
|
<span className="eyebrow">Promókód</span>
|
||||||
|
<h1>Promókód beváltása</h1>
|
||||||
|
<p className="muted">
|
||||||
|
Írd be a kapott kódot. Az egyenlegedet azonnal feltöltjük a csomag szintjéig: amit már elhasználtál belőle,
|
||||||
|
visszakapod, ami ennél több van, megmarad. Egy kód egyszer váltható be.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<section className="card">
|
||||||
|
<RedeemCode initial={kod ?? ""} />
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,13 +1,20 @@
|
|||||||
import type { Metadata } from "next";
|
import type { Metadata } from "next";
|
||||||
|
import Link from "next/link";
|
||||||
|
|
||||||
import { AiNote } from "@/components/AiNote";
|
import { AiNote } from "@/components/AiNote";
|
||||||
import { PackageCards } from "@/components/PackageCards";
|
import { PackageCards } from "@/components/PackageCards";
|
||||||
|
import { RedeemCode } from "@/components/RedeemCode";
|
||||||
|
import { payMethod } from "@/lib/payments";
|
||||||
import { backendGet, requireMe } from "@/lib/server";
|
import { backendGet, requireMe } from "@/lib/server";
|
||||||
import type { Package, PublicConfig } from "@/lib/types";
|
import type { Package, PublicConfig } from "@/lib/types";
|
||||||
|
|
||||||
export const metadata: Metadata = { title: "Csomagok" };
|
export const metadata: Metadata = { title: "Csomagok" };
|
||||||
|
|
||||||
const FAQ: [string, string][] = [
|
const FAQ: [string, string][] = [
|
||||||
|
[
|
||||||
|
"Biztonságos a fizetés?",
|
||||||
|
"Igen. A fizetés a Stripe biztonságos fizetési oldalán történik, bankkártyával, Apple Payjel vagy Google Payjel. A kártyaadataidat közvetlenül a Stripe-nak adod meg: hozzánk nem jutnak el, és nem is tároljuk őket. Cégként is vásárolhatsz, ilyenkor a cégnevet és az adószámot is megadhatod a számlához.",
|
||||||
|
],
|
||||||
[
|
[
|
||||||
"Lejárnak a megvett elemzések?",
|
"Lejárnak a megvett elemzések?",
|
||||||
"Nem. A csomagokban kapott elemzések és személyhelyek addig megmaradnak, amíg fel nem használod őket.",
|
"Nem. A csomagokban kapott elemzések és személyhelyek addig megmaradnak, amíg fel nem használod őket.",
|
||||||
@@ -24,6 +31,10 @@ const FAQ: [string, string][] = [
|
|||||||
"Mit jelent a kérdés?",
|
"Mit jelent a kérdés?",
|
||||||
"A kész képletelemzésed, kapcsolati elemzésed vagy éves előrejelzésed alatt kérdezhetsz róla, például hogy mit jelent egy fényszög a munkádra nézve, mire figyeljetek egy kapcsolatban, vagy mire figyelj egy időszakban. A válasz a képleted és az elemzés alapján készül, legfeljebb 250 szóban. Minden csomagban 3 kérdés van, és külön is vehetsz még.",
|
"A kész képletelemzésed, kapcsolati elemzésed vagy éves előrejelzésed alatt kérdezhetsz róla, például hogy mit jelent egy fényszög a munkádra nézve, mire figyeljetek egy kapcsolatban, vagy mire figyelj egy időszakban. A válasz a képleted és az elemzés alapján készül, legfeljebb 250 szóban. Minden csomagban 3 kérdés van, és külön is vehetsz még.",
|
||||||
],
|
],
|
||||||
|
[
|
||||||
|
"Mi a kártyajóslás?",
|
||||||
|
"Kérdezel, kiválasztasz egy kirakást (1, 3 vagy 5 lap), és húzol a megkevert pakliból. A kihúzott lapokra, a kérdésedre és a képleted Napjára, Holdjára és Aszcendensére személyre szabott értelmezés készül. Egy jóslás egyet használ, a kirakás méretétől függetlenül. A csomagokban van néhány, és külön is vehetsz ötöt egyben.",
|
||||||
|
],
|
||||||
[
|
[
|
||||||
"Mire kell a személyhely?",
|
"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.",
|
"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.",
|
||||||
@@ -38,7 +49,7 @@ export default async function PackagesPage() {
|
|||||||
backendGet<PublicConfig>("/v1/config"),
|
backendGet<PublicConfig>("/v1/config"),
|
||||||
]);
|
]);
|
||||||
const packages = catalog?.packages ?? [];
|
const packages = catalog?.packages ?? [];
|
||||||
const canPay = config?.mock_payments ?? false;
|
const canPay = payMethod(config, me);
|
||||||
const left = me.analyses_left;
|
const left = me.analyses_left;
|
||||||
const slots = me.persons;
|
const slots = me.persons;
|
||||||
|
|
||||||
@@ -58,6 +69,7 @@ export default async function PackagesPage() {
|
|||||||
<p>
|
<p>
|
||||||
<strong>{left.natal}</strong> képletelemzés · <strong>{left.synastry}</strong> kapcsolati elemzés ·{" "}
|
<strong>{left.natal}</strong> képletelemzés · <strong>{left.synastry}</strong> kapcsolati elemzés ·{" "}
|
||||||
<strong>{left.forecast}</strong> éves előrejelzés · <strong>{left.question ?? 0}</strong> kérdés ·{" "}
|
<strong>{left.forecast}</strong> éves előrejelzés · <strong>{left.question ?? 0}</strong> kérdés ·{" "}
|
||||||
|
<strong>{left.tarot ?? 0}</strong> kártyajóslás ·{" "}
|
||||||
{slots.unlimited ? (
|
{slots.unlimited ? (
|
||||||
"korlátlan személy"
|
"korlátlan személy"
|
||||||
) : (
|
) : (
|
||||||
@@ -68,6 +80,22 @@ export default async function PackagesPage() {
|
|||||||
</p>
|
</p>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
<section className="card redeem-card" aria-labelledby="redeem-title">
|
||||||
|
<h2 id="redeem-title">Van promókódod?</h2>
|
||||||
|
<p className="muted">
|
||||||
|
{canPay
|
||||||
|
? "Váltsd be itt: a hozzá tartozó csomag azonnal a tiéd."
|
||||||
|
: "A csomagok hamarosan megvásárolhatók. Addig promókóddal juthatsz hozzájuk: a hozzá tartozó csomag azonnal a tiéd."}
|
||||||
|
</p>
|
||||||
|
<RedeemCode />
|
||||||
|
</section>
|
||||||
|
|
||||||
|
{me.invoice_count > 0 && (
|
||||||
|
<p className="hint">
|
||||||
|
A korábbi vásárlásaid számlái: <Link href="/szamlak">Számláim →</Link>
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
|
||||||
<PackageCards packages={packages} canPay={canPay} />
|
<PackageCards packages={packages} canPay={canPay} />
|
||||||
|
|
||||||
<section className="field" aria-labelledby="addon-title" style={{ gap: 12 }}>
|
<section className="field" aria-labelledby="addon-title" style={{ gap: 12 }}>
|
||||||
@@ -91,7 +119,11 @@ export default async function PackagesPage() {
|
|||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
</dl>
|
</dl>
|
||||||
<p className="hint">Az árak bruttó árak, az áfát tartalmazzák.</p>
|
<p className="hint">
|
||||||
|
{config?.vat === "AAM" || !config
|
||||||
|
? "Az árak végső árak: alanyi adómentesek vagyunk, áfát nem számítunk fel."
|
||||||
|
: `Az árak bruttó árak, a ${config.vat} áfát tartalmazzák.`}
|
||||||
|
</p>
|
||||||
</section>
|
</section>
|
||||||
</main>
|
</main>
|
||||||
);
|
);
|
||||||
|
|||||||
|
After Width: | Height: | Size: 3.2 KiB |
@@ -52,13 +52,40 @@ p { margin: 0; }
|
|||||||
padding: 12px 24px; background: rgba(13, 18, 32, 0.94);
|
padding: 12px 24px; background: rgba(13, 18, 32, 0.94);
|
||||||
border-bottom: 1px solid var(--line); backdrop-filter: blur(6px);
|
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 {
|
||||||
.logo span { color: var(--gold); }
|
display: inline-flex; align-items: center; gap: 9px;
|
||||||
|
font-family: var(--font-display); font-size: 28px; font-weight: 600; color: var(--ink); text-decoration: none; letter-spacing: 0.3px;
|
||||||
|
}
|
||||||
|
.logo-word span { color: var(--gold); }
|
||||||
|
.logo-mark { width: 1.15em; height: 1.15em; flex: none; color: var(--gold); }
|
||||||
|
.logo-star { fill: var(--ink); }
|
||||||
.logo:hover { color: var(--ink); }
|
.logo:hover { color: var(--ink); }
|
||||||
.nav { display: flex; gap: 4px; flex: 1; }
|
.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 { 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); }
|
.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; }
|
.who { display: flex; align-items: center; gap: 12px; color: var(--muted); font-size: 14px; }
|
||||||
|
.user-menu { position: relative; }
|
||||||
|
.who-name {
|
||||||
|
display: inline-flex; align-items: center; gap: 6px; min-height: 40px; padding: 0 10px; cursor: pointer;
|
||||||
|
border: 1px solid var(--line-2); border-radius: 999px; background: none; color: var(--ink-2); font: inherit; font-size: 14px;
|
||||||
|
}
|
||||||
|
.who-name:hover, .who-name[aria-expanded="true"] { color: var(--gold); border-color: #5a6790; }
|
||||||
|
.who-chevron { width: 14px; height: 14px; flex: none; fill: none; stroke: currentColor; stroke-width: 2; stroke-linecap: round; stroke-linejoin: round; }
|
||||||
|
.who-name[aria-expanded="true"] .who-chevron { transform: rotate(180deg); }
|
||||||
|
.user-menu-list {
|
||||||
|
position: absolute; right: 0; top: calc(100% + 8px); z-index: 30; min-width: 200px; padding: 6px;
|
||||||
|
display: flex; flex-direction: column; background: var(--panel); border: 1px solid var(--line-2); border-radius: 12px;
|
||||||
|
box-shadow: 0 16px 40px rgba(0, 0, 0, 0.45);
|
||||||
|
}
|
||||||
|
.user-menu-item {
|
||||||
|
display: flex; align-items: center; min-height: 40px; padding: 0 12px; border: 0; border-radius: 8px; background: none;
|
||||||
|
color: var(--ink); font: inherit; font-size: 14px; text-align: left; text-decoration: none; cursor: pointer;
|
||||||
|
}
|
||||||
|
.user-menu-item:hover, .user-menu-item:focus-visible { background: rgba(255, 255, 255, 0.05); color: var(--gold); }
|
||||||
|
.user-menu-item[aria-current="page"] { color: var(--gold); }
|
||||||
|
.user-menu-logout { border-top: 1px solid var(--line); border-radius: 0 0 8px 8px; margin-top: 4px; padding-top: 2px; color: var(--muted); }
|
||||||
|
.who-name-text { max-width: 220px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
||||||
|
.who-icon { width: 18px; height: 18px; flex: none; fill: none; stroke: currentColor; stroke-width: 1.6; stroke-linecap: round; }
|
||||||
.pkg-pill {
|
.pkg-pill {
|
||||||
display: inline-flex; align-items: center; gap: 6px; min-height: 32px; padding: 0 12px; border-radius: 999px;
|
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;
|
border: 1px solid rgba(217, 180, 106, 0.5); color: var(--gold); text-decoration: none; font-size: 13px; white-space: nowrap;
|
||||||
@@ -87,7 +114,19 @@ p { margin: 0; }
|
|||||||
border: 1px solid var(--line-2); background: var(--panel-2); color: var(--ink);
|
border: 1px solid var(--line-2); background: var(--panel-2); color: var(--ink);
|
||||||
font: 400 15px var(--font-body);
|
font: 400 15px var(--font-body);
|
||||||
}
|
}
|
||||||
select.inp { padding-right: 32px; text-overflow: ellipsis; }
|
/* Our own chevron, so the text starts where it does in the other fields */
|
||||||
|
select.inp {
|
||||||
|
appearance: none; -webkit-appearance: none; cursor: pointer; text-overflow: ellipsis;
|
||||||
|
padding: 0 42px 0 14px;
|
||||||
|
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cpath d='M4 6l4 4 4-4' fill='none' stroke='%23a3abc0' stroke-width='1.8' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E");
|
||||||
|
background-repeat: no-repeat; background-position: right 14px center; background-size: 16px;
|
||||||
|
}
|
||||||
|
select.inp:focus { background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cpath d='M4 6l4 4 4-4' fill='none' stroke='%23d9b46a' stroke-width='1.8' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E"); }
|
||||||
|
select.inp option { background: var(--panel-2); color: var(--ink); }
|
||||||
|
/* Multi-line fields: room above and below the text too */
|
||||||
|
textarea.inp { padding: 12px 14px; line-height: 1.55; min-height: 96px; resize: vertical; }
|
||||||
|
/* A button beside input fields is as tall as they are */
|
||||||
|
.row > .btn:not(.btn-sm), .redeem-row > .btn { min-height: 48px; }
|
||||||
.inp::placeholder { color: #8a93ab; }
|
.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:focus { outline: none; border-color: var(--gold); box-shadow: 0 0 0 3px rgba(217, 180, 106, 0.25); }
|
||||||
.inp:disabled { opacity: 0.55; }
|
.inp:disabled { opacity: 0.55; }
|
||||||
@@ -171,6 +210,11 @@ td.num { font-variant-numeric: tabular-nums; white-space: nowrap; }
|
|||||||
.social-login:hover .btn-social { border-color: #5a6790; background: rgba(255, 255, 255, 0.03); }
|
.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:focus-within .btn-social { outline: 2px solid var(--gold); outline-offset: 2px; }
|
||||||
.social-login[data-ready="false"] .btn-social { opacity: 0.6; }
|
.social-login[data-ready="false"] .btn-social { opacity: 0.6; }
|
||||||
|
/* Sign in with Apple: Apple's white button style. */
|
||||||
|
.btn-apple { background: #fff; border-color: #fff; color: #000; cursor: pointer; }
|
||||||
|
.btn-apple:hover:not(:disabled) { background: #e8e8ed; border-color: #e8e8ed; }
|
||||||
|
.btn-apple:focus-visible { outline: 2px solid var(--gold); outline-offset: 2px; }
|
||||||
|
.btn-apple:disabled { opacity: 0.6; cursor: default; }
|
||||||
.gsi-overlay {
|
.gsi-overlay {
|
||||||
position: absolute; inset: 0; display: flex; align-items: center; justify-content: center;
|
position: absolute; inset: 0; display: flex; align-items: center; justify-content: center;
|
||||||
opacity: 0.001; overflow: hidden; cursor: pointer;
|
opacity: 0.001; overflow: hidden; cursor: pointer;
|
||||||
@@ -317,7 +361,8 @@ td.num { font-variant-numeric: tabular-nums; white-space: nowrap; }
|
|||||||
h1 { font-size: 32px; }
|
h1 { font-size: 32px; }
|
||||||
.site-header { padding: 10px 16px; gap: 12px; }
|
.site-header { padding: 10px 16px; gap: 12px; }
|
||||||
.nav { order: 3; flex-basis: 100%; }
|
.nav { order: 3; flex-basis: 100%; }
|
||||||
.who-name { display: none; }
|
.who-name-text { max-width: 120px; }
|
||||||
|
.who { margin-left: auto; }
|
||||||
.card { padding: 18px; }
|
.card { padding: 18px; }
|
||||||
.auth-aside { padding: 28px 20px; min-height: 0; }
|
.auth-aside { padding: 28px 20px; min-height: 0; }
|
||||||
.wheel { width: 60%; }
|
.wheel { width: 60%; }
|
||||||
@@ -695,3 +740,377 @@ a.pair-row:hover strong { color: var(--gold); }
|
|||||||
.site-header { gap: 8px 12px; }
|
.site-header { gap: 8px 12px; }
|
||||||
.logo { font-size: 25px; }
|
.logo { font-size: 25px; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Sharing a chart (summary card) and the public share page */
|
||||||
|
.share { display: flex; flex-direction: column; gap: 10px; align-items: stretch; }
|
||||||
|
.share-button {
|
||||||
|
display: flex; align-items: center; gap: 14px; width: 100%; padding: 12px 16px; text-align: left; cursor: pointer;
|
||||||
|
border: 1px solid rgba(217, 180, 106, 0.55); border-radius: 12px; color: var(--ink); font: inherit;
|
||||||
|
background: linear-gradient(135deg, rgba(217, 180, 106, 0.14), rgba(217, 180, 106, 0.03));
|
||||||
|
transition: border-color 0.15s, background 0.15s;
|
||||||
|
}
|
||||||
|
.share-button:hover { border-color: var(--gold); background: linear-gradient(135deg, rgba(217, 180, 106, 0.22), rgba(217, 180, 106, 0.06)); }
|
||||||
|
.share-button:disabled { opacity: 0.7; cursor: default; }
|
||||||
|
.share-icon {
|
||||||
|
flex: none; width: 40px; height: 40px; border-radius: 50%; display: inline-flex; align-items: center; justify-content: center;
|
||||||
|
background: var(--gold); color: var(--gold-ink);
|
||||||
|
}
|
||||||
|
.share-button-text { display: flex; flex-direction: column; gap: 2px; min-width: 0; }
|
||||||
|
.share-button-text strong { font-family: var(--font-display); font-size: 21px; font-weight: 600; line-height: 1.15; }
|
||||||
|
.share-button-text small { font-size: 12.5px; color: var(--gold); }
|
||||||
|
.share-fine { margin: 0; font-size: 12.5px; color: var(--muted); line-height: 1.5; }
|
||||||
|
.share-open { align-items: stretch; padding: 14px; border: 1px solid var(--line-2); border-radius: var(--radius); background: var(--panel-2); }
|
||||||
|
.share-link { display: flex; gap: 8px; }
|
||||||
|
.share-link .inp { min-height: 36px; font-size: 14px; }
|
||||||
|
.share-trio { display: flex; flex-wrap: wrap; gap: 6px 18px; color: var(--ink-2); font-size: 14px; }
|
||||||
|
.share-trio .sym { color: var(--gold); }
|
||||||
|
.share-cta { gap: 12px; }
|
||||||
|
.share-cta h2 { font-size: 24px; }
|
||||||
|
.share-cta .btn { align-self: flex-start; }
|
||||||
|
|
||||||
|
/* Promo codes: redeeming (header, packages page, /bevaltas) and the admin page */
|
||||||
|
.redeem { display: flex; flex-direction: column; gap: 8px; }
|
||||||
|
.redeem-row { display: flex; gap: 8px; flex-wrap: wrap; }
|
||||||
|
.redeem-input { flex: 1 1 220px; width: auto; font-family: ui-monospace, SFMono-Regular, Menlo, monospace; letter-spacing: 1.5px; text-transform: uppercase; }
|
||||||
|
.redeem-card { gap: 10px; border-color: rgba(217, 180, 106, 0.35); }
|
||||||
|
.redeem-card h2 { font-size: 24px; }
|
||||||
|
.promo-form { display: grid; grid-template-columns: minmax(0, 1.4fr) 110px minmax(0, 2fr) auto; gap: 12px; align-items: end; }
|
||||||
|
.promo-made { display: flex; flex-direction: column; gap: 8px; align-items: flex-start; }
|
||||||
|
.promo-codes { min-height: 0; padding: 10px 14px; font-family: ui-monospace, SFMono-Regular, Menlo, monospace; line-height: 1.6; resize: vertical; }
|
||||||
|
.promo-code { font-size: 14px; letter-spacing: 1px; white-space: nowrap; }
|
||||||
|
.promo-table td { vertical-align: top; }
|
||||||
|
.promo-table td .hint { display: block; }
|
||||||
|
.promo-open { color: var(--ok); }
|
||||||
|
@media (max-width: 760px) {
|
||||||
|
.promo-form { grid-template-columns: minmax(0, 1fr) 100px; }
|
||||||
|
.promo-form .promo-note, .promo-form .btn { grid-column: 1 / -1; }
|
||||||
|
}
|
||||||
|
@media (max-width: 640px) { .who { flex-wrap: wrap; gap: 8px 12px; } }
|
||||||
|
|
||||||
|
/* New person: typed-in data or an invitation */
|
||||||
|
.mode-switch { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(240px, 100%), 1fr)); gap: 10px; }
|
||||||
|
.mode-option {
|
||||||
|
display: flex; flex-direction: column; gap: 4px; padding: 14px 16px; text-align: left; cursor: pointer; font: inherit;
|
||||||
|
color: var(--ink); background: var(--panel-2); border: 1px solid var(--line-2); border-radius: 12px;
|
||||||
|
}
|
||||||
|
.mode-option strong { font-family: var(--font-display); font-size: 21px; font-weight: 600; }
|
||||||
|
.mode-option span { font-size: 13.5px; color: var(--muted); line-height: 1.45; }
|
||||||
|
.mode-option:hover { border-color: #5a6790; }
|
||||||
|
.mode-option[aria-selected="true"] { border-color: var(--gold); background: rgba(217, 180, 106, 0.08); }
|
||||||
|
.mode-option[aria-selected="true"] strong { color: var(--gold); }
|
||||||
|
.invite-list { list-style: none; margin: 0; padding: 0; display: flex; flex-direction: column; gap: 8px; }
|
||||||
|
.invite-list li { display: flex; flex-wrap: wrap; align-items: center; gap: 6px 14px; padding: 10px 0; border-bottom: 1px solid var(--line); }
|
||||||
|
.invite-list li:last-child { border-bottom: 0; }
|
||||||
|
.invite-who { display: flex; flex-direction: column; min-width: 0; flex: 1 1 180px; }
|
||||||
|
|
||||||
|
/* Home page for visitors (src/app/Landing.tsx) */
|
||||||
|
.lp { overflow-x: clip; }
|
||||||
|
.lp-wrap { max-width: 1180px; margin: 0 auto; padding: 0 24px; }
|
||||||
|
.lp-header { gap: 16px; }
|
||||||
|
.lp-nav { flex: 1; }
|
||||||
|
.lp-hero { position: relative; overflow: hidden; }
|
||||||
|
.lp-stars { position: absolute; inset: 0; width: 100%; height: 100%; }
|
||||||
|
.lp-star { fill: var(--ink); opacity: 0.25; animation: lp-twinkle 6s ease-in-out infinite; }
|
||||||
|
.lp-t1 { animation-delay: 1s; animation-duration: 7s; }
|
||||||
|
.lp-t2 { animation-delay: 2.4s; animation-duration: 5s; }
|
||||||
|
.lp-t3 { animation-delay: 3.1s; animation-duration: 8s; }
|
||||||
|
.lp-t4 { animation-delay: 0.6s; animation-duration: 9s; }
|
||||||
|
.lp-hero-grid {
|
||||||
|
position: relative; padding-top: 72px; padding-bottom: 88px;
|
||||||
|
display: grid; grid-template-columns: repeat(auto-fit, minmax(min(440px, 100%), 1fr)); gap: 48px; align-items: center;
|
||||||
|
}
|
||||||
|
.lp-hero-text { display: flex; flex-direction: column; gap: 24px; min-width: 0; }
|
||||||
|
.lp-hero-text .eyebrow { font-size: 13px; letter-spacing: 2px; }
|
||||||
|
.lp-title { font-size: clamp(44px, 6vw, 76px); line-height: 1.02; letter-spacing: -0.5px; }
|
||||||
|
.lp-lead { font-size: 19px; line-height: 1.65; color: var(--ink-2); max-width: 540px; }
|
||||||
|
.lp-actions { display: flex; gap: 12px; flex-wrap: wrap; align-items: center; }
|
||||||
|
.lp-btn { min-height: 48px; padding: 0 22px; transition: transform 0.2s, background 0.2s, border-color 0.2s; }
|
||||||
|
.lp-btn:hover { transform: translateY(-1px); }
|
||||||
|
.lp-btn-big { min-height: 52px; padding: 0 28px; font-size: 16px; }
|
||||||
|
.lp-figure { margin: 0; display: flex; flex-direction: column; align-items: center; gap: 14px; min-width: 0; }
|
||||||
|
.lp-wheel {
|
||||||
|
position: relative; width: 100%; max-width: 560px; border-radius: 50%;
|
||||||
|
background: radial-gradient(closest-side, rgba(217, 180, 106, 0.07), transparent 72%);
|
||||||
|
}
|
||||||
|
.lp-wheel .chart-wheel { position: relative; }
|
||||||
|
.lp-orbit { position: absolute; inset: 0; width: 100%; height: 100%; animation: lp-spin 240s linear infinite; }
|
||||||
|
.lp-orbit circle { fill: none; stroke: var(--gold); stroke-opacity: 0.18; stroke-width: 1; stroke-dasharray: 2 10; }
|
||||||
|
.lp-orbit .lp-orbit-dot { fill: var(--gold); stroke: none; opacity: 0.55; }
|
||||||
|
/* the wheel comes alive: planets one by one, then the aspect lines */
|
||||||
|
.lp-wheel .w-point { opacity: 0; animation: lp-fade 0.9s ease-out forwards; }
|
||||||
|
.lp-wheel .w-point:nth-last-of-type(13) { animation-delay: 0.3s; }
|
||||||
|
.lp-wheel .w-point:nth-last-of-type(12) { animation-delay: 0.42s; }
|
||||||
|
.lp-wheel .w-point:nth-last-of-type(11) { animation-delay: 0.54s; }
|
||||||
|
.lp-wheel .w-point:nth-last-of-type(10) { animation-delay: 0.66s; }
|
||||||
|
.lp-wheel .w-point:nth-last-of-type(9) { animation-delay: 0.78s; }
|
||||||
|
.lp-wheel .w-point:nth-last-of-type(8) { animation-delay: 0.9s; }
|
||||||
|
.lp-wheel .w-point:nth-last-of-type(7) { animation-delay: 1.02s; }
|
||||||
|
.lp-wheel .w-point:nth-last-of-type(6) { animation-delay: 1.14s; }
|
||||||
|
.lp-wheel .w-point:nth-last-of-type(5) { animation-delay: 1.26s; }
|
||||||
|
.lp-wheel .w-point:nth-last-of-type(4) { animation-delay: 1.38s; }
|
||||||
|
.lp-wheel .w-point:nth-last-of-type(3) { animation-delay: 1.5s; }
|
||||||
|
.lp-wheel .w-point:nth-last-of-type(2) { animation-delay: 1.62s; }
|
||||||
|
.lp-wheel .w-point:nth-last-of-type(1) { animation-delay: 1.74s; }
|
||||||
|
.lp-wheel .w-aspect { stroke-dasharray: 300; stroke-dashoffset: 300; animation: lp-draw 1.8s cubic-bezier(0.4, 0, 0.2, 1) 1.6s forwards; }
|
||||||
|
.lp-wheel .w-aspect.w-asp-sextile { stroke-dasharray: 5 4; stroke-dashoffset: 0; opacity: 0; animation: lp-fade 1.2s ease-out 2.2s forwards; }
|
||||||
|
.lp-caption { display: flex; flex-direction: column; align-items: center; gap: 6px; text-align: center; }
|
||||||
|
.lp-caption .share-trio { justify-content: center; font-size: 15px; }
|
||||||
|
.lp-asc { color: var(--gold); font-weight: 600; font-size: 12px; letter-spacing: 0.5px; }
|
||||||
|
.lp-rise { opacity: 0; transform: translateY(14px); animation: lp-rise 0.9s cubic-bezier(0.2, 0.7, 0.2, 1) forwards; }
|
||||||
|
.lp-r1 { animation-delay: 0.1s; } .lp-r2 { animation-delay: 0.25s; } .lp-r3 { animation-delay: 0.4s; } .lp-r4 { animation-delay: 0.55s; }
|
||||||
|
|
||||||
|
.lp-band { border-top: 1px solid var(--line); padding: 96px 0; }
|
||||||
|
.lp-alt { background: var(--panel-2); }
|
||||||
|
.lp-two { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(380px, 100%), 1fr)); gap: 48px; align-items: center; }
|
||||||
|
.lp-stack { display: flex; flex-direction: column; gap: 40px; }
|
||||||
|
.lp-intro { display: flex; flex-direction: column; gap: 14px; max-width: 720px; }
|
||||||
|
.lp-intro .eyebrow { font-size: 13px; letter-spacing: 2px; }
|
||||||
|
.lp-h2 { font-size: clamp(34px, 4vw, 52px); line-height: 1.06; }
|
||||||
|
.lp-h3 { font-size: 24px; }
|
||||||
|
.lp-center { text-align: center; }
|
||||||
|
.lp-text { font-size: 17px; color: var(--ink-2); line-height: 1.65; }
|
||||||
|
.lp-small { font-size: 15px; color: var(--ink-2); line-height: 1.6; }
|
||||||
|
.lp-float { padding: 32px; box-shadow: 0 30px 80px rgba(0, 0, 0, 0.35); animation: lp-float 9s ease-in-out infinite; }
|
||||||
|
.lp-float .summary-title { font-size: 32px; }
|
||||||
|
|
||||||
|
.lp-analysis-grid { display: grid; grid-template-columns: minmax(0, 2fr) minmax(0, 1fr); gap: 24px; align-items: start; }
|
||||||
|
.lp-paper { padding: 36px; gap: 22px; }
|
||||||
|
.lp-paper-title { font-size: 36px; line-height: 1.08; }
|
||||||
|
.lp-excerpts { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(280px, 100%), 1fr)); gap: 28px; }
|
||||||
|
.lp-fade { max-height: 270px; overflow: hidden; -webkit-mask-image: linear-gradient(#000 55%, transparent); mask-image: linear-gradient(#000 55%, transparent); }
|
||||||
|
.lp-excerpt-title { font-family: var(--font-display); font-size: 24px; font-weight: 600; color: var(--gold); line-height: 1.15; margin: 0; }
|
||||||
|
.lp-paper-foot { display: flex; gap: 16px; flex-wrap: wrap; align-items: center; justify-content: space-between; border-top: 1px solid var(--line); padding-top: 20px; }
|
||||||
|
.lp-paper-foot a { font-weight: 600; text-decoration: none; }
|
||||||
|
.lp-aside { display: flex; flex-direction: column; gap: 20px; min-width: 0; }
|
||||||
|
.lp-side-card { gap: 12px; }
|
||||||
|
.lp-list { margin: 0; padding-left: 18px; display: flex; flex-direction: column; gap: 10px; font-size: 15px; line-height: 1.6; color: var(--ink-2); }
|
||||||
|
.lp-question { margin: 0; padding: 12px 14px; border-radius: var(--radius); background: var(--panel-2); border: 1px solid var(--line-2); font-size: 14px; }
|
||||||
|
.lp-chips { display: flex; gap: 8px; flex-wrap: wrap; }
|
||||||
|
.lp-chip { padding: 6px 14px; border-radius: 999px; border: 1px solid var(--line-2); font-size: 14px; color: var(--ink-2); }
|
||||||
|
.lp-chip-gold { border-color: rgba(217, 180, 106, 0.5); color: var(--gold); }
|
||||||
|
|
||||||
|
.lp-features { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(420px, 100%), 1fr)); gap: 24px; }
|
||||||
|
.lp-feature { padding: 32px; gap: 20px; }
|
||||||
|
.lp-feature-head { display: flex; flex-direction: column; gap: 10px; }
|
||||||
|
.lp-feature-title { font-size: 32px; line-height: 1.1; }
|
||||||
|
.lp-panel { background: var(--panel-2); border: 1px solid var(--line); border-radius: 12px; padding: 20px; display: flex; flex-direction: column; gap: 14px; }
|
||||||
|
.lp-timeline { width: 100%; height: auto; display: block; }
|
||||||
|
.lp-tl-track { stroke: var(--line-2); stroke-width: 2; }
|
||||||
|
.lp-tl-done { stroke: var(--gold); stroke-width: 2; }
|
||||||
|
.lp-tl-month { fill: var(--muted); font: 400 10px var(--font-body); text-anchor: middle; }
|
||||||
|
.lp-tl-now { fill: var(--ink); font: 600 11px var(--font-body); text-anchor: middle; }
|
||||||
|
.lp-pulse { transform-box: fill-box; transform-origin: center; animation: lp-pulse 2.6s ease-in-out infinite; }
|
||||||
|
.lp-events { list-style: none; margin: 0; padding: 0; display: flex; flex-direction: column; gap: 6px; font-size: 14.5px; }
|
||||||
|
.lp-pair { display: grid; grid-template-columns: minmax(0, 200px) minmax(0, 1fr); gap: 20px; align-items: center; }
|
||||||
|
.lp-rings { width: 100%; height: auto; display: block; }
|
||||||
|
.lp-ring { fill: none; stroke: var(--line-2); stroke-width: 1; }
|
||||||
|
.lp-ring-core { fill: var(--panel); stroke: var(--line); }
|
||||||
|
.lp-spin { transform-box: fill-box; transform-origin: center; animation: lp-spin 120s linear infinite; }
|
||||||
|
.lp-spin-back { transform-box: fill-box; transform-origin: center; animation: lp-spin 160s linear infinite reverse; }
|
||||||
|
.lp-pair-legend { display: flex; flex-direction: column; gap: 10px; min-width: 0; }
|
||||||
|
.pair-text-row { display: flex; align-items: center; gap: 8px; font-size: 14px; color: var(--ink-2); }
|
||||||
|
.pair-text-row.p2-text { color: var(--p2); }
|
||||||
|
.lp-pair .nature-bar { margin-top: 6px; height: 8px; }
|
||||||
|
|
||||||
|
.lp-steps { list-style: none; margin: 0; padding: 0; display: grid; grid-template-columns: repeat(auto-fit, minmax(min(280px, 100%), 1fr)); gap: 24px; }
|
||||||
|
.lp-steps .card { gap: 12px; padding: 28px; }
|
||||||
|
.lp-step-n { font-family: var(--font-display); font-size: 44px; font-weight: 600; line-height: 1; color: var(--gold); }
|
||||||
|
.lp-step-title { font-family: var(--font-body); font-size: 18px; font-weight: 600; line-height: 1.3; }
|
||||||
|
|
||||||
|
.lp-final { background: radial-gradient(ellipse at 50% 0%, rgba(217, 180, 106, 0.12), transparent 60%), var(--bg); padding: 104px 0; }
|
||||||
|
.lp-final-inner { max-width: 820px; display: flex; flex-direction: column; align-items: center; gap: 22px; text-align: center; }
|
||||||
|
.lp-emblem { width: 88px; height: 88px; }
|
||||||
|
.lp-emblem-outer { fill: none; stroke: var(--gold); stroke-opacity: 0.5; stroke-width: 1; }
|
||||||
|
.lp-waitlist { width: 100%; max-width: 520px; text-align: left; }
|
||||||
|
.lp-disclaimer { max-width: 560px; }
|
||||||
|
.lp-footer { border-top: 1px solid var(--line); padding: 28px 0; }
|
||||||
|
.lp-footer-inner { display: flex; gap: 16px; flex-wrap: wrap; align-items: center; justify-content: space-between; }
|
||||||
|
.lp-footer-nav { display: flex; gap: 18px; flex-wrap: wrap; font-size: 14px; }
|
||||||
|
.lp-footer-nav a { color: var(--muted); text-decoration: none; }
|
||||||
|
.lp-footer-nav a:hover { color: var(--gold); }
|
||||||
|
|
||||||
|
@keyframes lp-twinkle { 0%, 100% { opacity: 0.15; } 50% { opacity: 0.7; } }
|
||||||
|
@keyframes lp-fade { to { opacity: 1; } }
|
||||||
|
@keyframes lp-draw { to { stroke-dashoffset: 0; } }
|
||||||
|
@keyframes lp-spin { to { transform: rotate(360deg); } }
|
||||||
|
@keyframes lp-rise { to { opacity: 1; transform: none; } }
|
||||||
|
@keyframes lp-float { 0%, 100% { transform: translateY(0); } 50% { transform: translateY(-8px); } }
|
||||||
|
@keyframes lp-pulse { 0%, 100% { transform: scale(1); opacity: 0.9; } 50% { transform: scale(1.6); opacity: 0.2; } }
|
||||||
|
@media (max-width: 900px) { .lp-analysis-grid { grid-template-columns: minmax(0, 1fr); } }
|
||||||
|
@media (max-width: 640px) {
|
||||||
|
.lp-band { padding: 64px 0; }
|
||||||
|
.lp-hero-grid { padding-top: 40px; padding-bottom: 56px; gap: 32px; }
|
||||||
|
.lp-wrap { padding: 0 16px; }
|
||||||
|
.lp-paper, .lp-feature { padding: 22px; }
|
||||||
|
.lp-pair { grid-template-columns: minmax(0, 1fr); justify-items: center; }
|
||||||
|
.lp-rings { max-width: 200px; }
|
||||||
|
.lp-nav { display: none; }
|
||||||
|
}
|
||||||
|
@media (prefers-reduced-motion: reduce) {
|
||||||
|
.lp *, .lp-orbit { animation: none !important; }
|
||||||
|
.lp-rise, .lp-wheel .w-point { opacity: 1; transform: none; }
|
||||||
|
.lp-wheel .w-aspect { stroke-dashoffset: 0; }
|
||||||
|
.lp-wheel .w-aspect.w-asp-sextile { opacity: 1; }
|
||||||
|
}
|
||||||
|
|
||||||
|
.mode-option:disabled { cursor: not-allowed; opacity: 0.75; }
|
||||||
|
.mode-option:disabled:hover { border-color: var(--line-2); }
|
||||||
|
.mode-soon { margin-left: 8px; vertical-align: middle; font-family: var(--font-body); font-size: 11px; }
|
||||||
|
.invite-soon .btn:disabled { cursor: not-allowed; }
|
||||||
|
|
||||||
|
/* Home page: the AI line and "why it is different" */
|
||||||
|
.lp-ai-line { font-size: 16px; max-width: 540px; }
|
||||||
|
.lp-why-grid { list-style: none; margin: 0; padding: 0; display: grid; grid-template-columns: repeat(auto-fit, minmax(min(280px, 100%), 1fr)); gap: 24px; }
|
||||||
|
.lp-why-card { gap: 12px; padding: 28px; }
|
||||||
|
.lp-why-icon { width: 36px; height: 36px; fill: none; stroke: var(--gold); stroke-width: 1.4; stroke-linecap: round; stroke-linejoin: round; }
|
||||||
|
|
||||||
|
/* Home page: tarot, a quiet line under the yearly forecast and the comparison */
|
||||||
|
.lp-tarot { flex-direction: row; align-items: center; gap: 32px; padding: 22px 32px; margin-top: -16px; }
|
||||||
|
.lp-tarot-cards { position: relative; width: 132px; height: 112px; flex: none; }
|
||||||
|
.lp-tarot-cards .tarot-card { position: absolute; top: 12px; width: 56px; border-radius: 5px; box-shadow: 0 6px 16px rgba(0, 0, 0, 0.4); }
|
||||||
|
.lp-tarot-cards .tarot-card:nth-child(1) { left: 4px; transform: rotate(-11deg); }
|
||||||
|
.lp-tarot-cards .tarot-card:nth-child(2) { left: 38px; top: 4px; }
|
||||||
|
.lp-tarot-cards .tarot-card:nth-child(3) { left: 72px; transform: rotate(11deg); }
|
||||||
|
.lp-tarot-text { display: flex; flex-direction: column; gap: 6px; flex: 1 1 auto; min-width: 0; }
|
||||||
|
.lp-tarot-text .lp-small { max-width: 640px; }
|
||||||
|
.lp-tarot-title { font-size: 24px; line-height: 1.15; }
|
||||||
|
.lp-tarot-link { flex: none; font-size: 14px; font-weight: 500; white-space: nowrap; }
|
||||||
|
@media (max-width: 720px) {
|
||||||
|
.lp-tarot { flex-wrap: wrap; gap: 14px 16px; padding: 22px; }
|
||||||
|
.lp-tarot-cards { width: 104px; height: 88px; }
|
||||||
|
.lp-tarot-cards .tarot-card { width: 44px; top: 10px; }
|
||||||
|
.lp-tarot-cards .tarot-card:nth-child(1) { left: 2px; }
|
||||||
|
.lp-tarot-cards .tarot-card:nth-child(2) { left: 30px; top: 3px; }
|
||||||
|
.lp-tarot-cards .tarot-card:nth-child(3) { left: 58px; }
|
||||||
|
.lp-tarot-text { flex: 1 1 100%; }
|
||||||
|
.lp-tarot-link { flex-basis: 100%; min-height: 44px; display: inline-flex; align-items: center; }
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Home page footer: payment and invoicing partners */
|
||||||
|
.lp-partners { display: flex; flex-wrap: wrap; align-items: center; justify-content: center; gap: 10px 16px; padding-bottom: 20px; margin-bottom: 20px; border-bottom: 1px solid var(--line); }
|
||||||
|
.lp-partner { height: 26px; width: auto; opacity: 0.65; transition: opacity 0.2s; }
|
||||||
|
.lp-partner:hover { opacity: 1; }
|
||||||
|
.lp-partners .hint + .lp-partner { margin-right: 18px; }
|
||||||
|
.lp-partners .lp-partner:last-child { margin-right: 0; }
|
||||||
|
|
||||||
|
/* Chart page: below the wheel and the summary, the facts and the next steps side by side */
|
||||||
|
.chart-extras { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(300px, 100%), 1fr)); gap: 16px; align-items: stretch; }
|
||||||
|
.chart-extras > .card { margin: 0; }
|
||||||
|
|
||||||
|
/* Back from Stripe: the payment's result at the bottom of the screen. */
|
||||||
|
.pay-return { position: fixed; left: 50%; bottom: 20px; transform: translateX(-50%); z-index: 60; width: min(560px, calc(100% - 32px)); }
|
||||||
|
.pay-return .msg {
|
||||||
|
display: flex; align-items: center; justify-content: space-between; gap: 12px; margin: 0; padding: 14px 16px;
|
||||||
|
background: var(--panel-2); border: 1px solid var(--line); border-radius: 14px; box-shadow: 0 12px 40px rgba(0, 0, 0, 0.45);
|
||||||
|
}
|
||||||
|
.pay-return .msg-ok { border-color: color-mix(in srgb, var(--ok) 55%, var(--line)); }
|
||||||
|
.pay-return .msg-error { border-color: color-mix(in srgb, var(--danger) 55%, var(--line)); }
|
||||||
|
|
||||||
|
/* Számláim */
|
||||||
|
.invoice-table th.num, .invoice-table td.num { text-align: right; }
|
||||||
|
.invoice-table td.act { text-align: right; white-space: nowrap; }
|
||||||
|
@media (max-width: 640px) {
|
||||||
|
.invoice-table th:nth-child(3), .invoice-table td:nth-child(3) { display: none; }
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Kártyajóslás */
|
||||||
|
.tarot { display: flex; flex-direction: column; gap: 24px; }
|
||||||
|
.tarot-card { display: block; width: 100%; height: auto; border-radius: 9px; user-select: none; }
|
||||||
|
.tarot-card-sm { width: 120px; flex: none; box-shadow: 0 10px 28px rgba(0, 0, 0, 0.35); }
|
||||||
|
.tarot-card-xs { width: 30px; border-radius: 4px; }
|
||||||
|
.tarot-question { font-family: var(--font-display); font-size: 20px; font-style: italic; color: var(--ink-2); }
|
||||||
|
|
||||||
|
.tarot-spreads { border: 0; margin: 0; padding: 0; display: grid; grid-template-columns: repeat(auto-fit, minmax(min(220px, 100%), 1fr)); gap: 10px; }
|
||||||
|
.tarot-spreads legend { margin-bottom: 8px; }
|
||||||
|
.tarot-spread {
|
||||||
|
display: flex; flex-direction: column; gap: 4px; padding: 14px 16px; cursor: pointer;
|
||||||
|
border: 1px solid var(--line-2); border-radius: var(--radius); background: var(--panel-2); transition: border-color 0.15s;
|
||||||
|
}
|
||||||
|
.tarot-spread:hover { border-color: #5a6790; }
|
||||||
|
.tarot-spread.is-active { border-color: var(--gold); box-shadow: 0 0 0 1px var(--gold) inset; }
|
||||||
|
.tarot-spread:has(input:focus-visible) { outline: 2px solid var(--gold); outline-offset: 2px; }
|
||||||
|
.tarot-topics { border: 0; margin: 0; padding: 0; display: flex; flex-wrap: wrap; gap: 8px; }
|
||||||
|
.tarot-topics legend { margin-bottom: 8px; }
|
||||||
|
.tarot-topic {
|
||||||
|
display: inline-flex; align-items: center; min-height: 38px; padding: 0 16px; cursor: pointer; font-size: 14px;
|
||||||
|
border: 1px solid var(--line-2); border-radius: 999px; background: var(--panel-2); color: var(--ink-2);
|
||||||
|
}
|
||||||
|
.tarot-topic:hover { border-color: #5a6790; }
|
||||||
|
.tarot-topic.is-active { border-color: var(--gold); color: var(--gold); background: rgba(217, 180, 106, 0.08); }
|
||||||
|
.tarot-topic:has(input:focus-visible) { outline: 2px solid var(--gold); outline-offset: 2px; }
|
||||||
|
.tarot-spread-name { font-family: var(--font-display); font-size: 20px; font-weight: 600; }
|
||||||
|
|
||||||
|
.tarot-stage { align-items: stretch; }
|
||||||
|
.tarot-stage-head { display: flex; flex-direction: column; gap: 6px; text-align: center; align-items: center; }
|
||||||
|
.tarot-slots { list-style: none; margin: 8px 0 0; padding: 0; display: flex; flex-wrap: wrap; justify-content: center; gap: 18px 20px; }
|
||||||
|
.tarot-slot { width: 132px; display: flex; flex-direction: column; align-items: center; gap: 6px; text-align: center; }
|
||||||
|
.tarot-slots[data-count="5"] .tarot-slot { width: 118px; }
|
||||||
|
.tarot-slot-title { font-size: 13px; font-weight: 600; color: var(--gold); line-height: 1.3; }
|
||||||
|
.tarot-slot-empty { width: 100%; aspect-ratio: 3 / 5; border: 1px dashed var(--line-2); border-radius: 9px; }
|
||||||
|
|
||||||
|
.tarot-flip { width: 100%; aspect-ratio: 3 / 5; perspective: 900px; }
|
||||||
|
.tarot-flip-inner { position: relative; width: 100%; height: 100%; transform-style: preserve-3d; transition: transform 0.75s cubic-bezier(0.3, 0.7, 0.3, 1); animation: tarot-land 0.35s ease-out; }
|
||||||
|
.tarot-flip.is-flipped .tarot-flip-inner { transform: rotateY(180deg); }
|
||||||
|
.tarot-face { position: absolute; inset: 0; backface-visibility: hidden; -webkit-backface-visibility: hidden; box-shadow: 0 10px 28px rgba(0, 0, 0, 0.35); }
|
||||||
|
.tarot-front { transform: rotateY(180deg); }
|
||||||
|
@keyframes tarot-land { from { transform: translateY(-18px); opacity: 0; } to { transform: none; opacity: 1; } }
|
||||||
|
|
||||||
|
/* The shuffled deck, fanned out: each card turns around a point far below. */
|
||||||
|
.tarot-fan { --w: 64px; --step: 4.2deg; position: relative; height: calc(var(--w) * 3.5); margin: 12px auto 0; width: 100%; max-width: 560px; overflow: visible; }
|
||||||
|
.tarot-fan-card {
|
||||||
|
position: absolute; left: calc(50% - var(--w) / 2); top: 12px; width: var(--w); padding: 0; border: 0; background: none; cursor: pointer;
|
||||||
|
transform-origin: 50% 330%; transform: rotate(calc(var(--i) * var(--step))); transition: transform 0.2s ease, opacity 0.25s ease;
|
||||||
|
}
|
||||||
|
.tarot-fan-card .tarot-card { box-shadow: 0 6px 16px rgba(0, 0, 0, 0.4); }
|
||||||
|
.tarot-fan-card:hover:not(:disabled), .tarot-fan-card:focus-visible { transform: rotate(calc(var(--i) * var(--step))) translateY(-14px); }
|
||||||
|
.tarot-fan-card.is-picked { opacity: 0; transform: rotate(calc(var(--i) * var(--step))) translateY(-60px); cursor: default; }
|
||||||
|
.tarot-fan-card { animation: tarot-deal 0.7s cubic-bezier(0.3, 0.7, 0.3, 1) backwards; }
|
||||||
|
@keyframes tarot-deal { from { transform: rotate(0deg); } }
|
||||||
|
span.tarot-fan-card { cursor: default; }
|
||||||
|
.tarot-fan-card.is-lifted { transform: rotate(calc(var(--i) * var(--step))) translateY(-26px); }
|
||||||
|
.tarot-fan-card.is-lifted .tarot-card { box-shadow: 0 0 0 1px var(--gold), 0 10px 26px rgba(217, 180, 106, 0.35); }
|
||||||
|
|
||||||
|
/* The example page: a reading played from the deck to the text. */
|
||||||
|
.tarot-demo { display: flex; flex-direction: column; gap: 18px; padding-top: 8px; }
|
||||||
|
.tarot-demo-status { text-align: center; min-height: 36px; display: flex; align-items: center; justify-content: center; }
|
||||||
|
.tarot-demo-text { max-height: 0; overflow: hidden; opacity: 0; transform: translateY(16px); }
|
||||||
|
.tarot-demo-text.is-shown { max-height: none; overflow: visible; opacity: 1; transform: none; transition: opacity 0.8s ease, transform 0.8s ease; }
|
||||||
|
|
||||||
|
.tarot-result { display: flex; flex-direction: column; gap: 28px; }
|
||||||
|
.tarot-result-head { display: flex; flex-direction: column; gap: 10px; }
|
||||||
|
.tarot-summary { font-size: 17px; color: var(--ink-2); }
|
||||||
|
.tarot-card-texts { list-style: none; margin: 0; padding: 0; display: flex; flex-direction: column; gap: 28px; }
|
||||||
|
.tarot-card-text { display: flex; gap: 22px; align-items: flex-start; }
|
||||||
|
.tarot-card-text-body { display: flex; flex-direction: column; gap: 10px; min-width: 0; }
|
||||||
|
.tarot-synthesis, .tarot-advice { display: flex; flex-direction: column; gap: 10px; border-top: 1px solid var(--line); padding-top: 22px; }
|
||||||
|
.tarot-advice h3 { color: var(--gold); }
|
||||||
|
|
||||||
|
.tarot-history { list-style: none; margin: 0; padding: 0; display: flex; flex-direction: column; }
|
||||||
|
.tarot-history li + li { border-top: 1px solid var(--line); }
|
||||||
|
.tarot-history-row { display: flex; gap: 14px; align-items: center; padding: 12px 0; color: var(--ink); text-decoration: none; }
|
||||||
|
.tarot-history-row:hover strong { color: var(--gold); }
|
||||||
|
.tarot-history-cards { display: flex; gap: 3px; flex: none; }
|
||||||
|
.tarot-history-text { display: flex; flex-direction: column; gap: 2px; min-width: 0; }
|
||||||
|
|
||||||
|
@media (max-width: 640px) {
|
||||||
|
.tarot-fan { --w: 46px; --step: 4deg; }
|
||||||
|
.tarot-slot { width: calc((100% - 40px) / 3); }
|
||||||
|
.tarot-slots[data-count="1"] .tarot-slot { width: 46%; }
|
||||||
|
.tarot-slots[data-count="5"] .tarot-slot { width: calc((100% - 40px) / 3); }
|
||||||
|
.tarot-card-text { flex-direction: column; align-items: center; }
|
||||||
|
.tarot-card-text-body { align-self: stretch; }
|
||||||
|
.tarot-history-cards .tarot-card-xs:nth-child(n + 4) { display: none; }
|
||||||
|
}
|
||||||
|
@media (prefers-reduced-motion: reduce) {
|
||||||
|
.tarot-flip-inner, .tarot-fan-card, .tarot-demo-text { transition: none; animation: none; }
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Birth date and time: our own Hungarian fields (not the browser's date and time inputs) */
|
||||||
|
.birth-fields { border: 0; margin: 0; padding: 0; min-width: 0; }
|
||||||
|
.birth-fields legend { padding: 0; margin-bottom: 8px; }
|
||||||
|
.birth-row { display: flex; align-items: center; gap: 8px; }
|
||||||
|
.birth-year { width: 5.5em; flex: none; }
|
||||||
|
.birth-month { flex: 1 1 auto; min-width: 0; }
|
||||||
|
.birth-day { width: 5.2em; flex: none; }
|
||||||
|
.birth-time { width: 4.4em; flex: none; text-align: center; }
|
||||||
|
.birth-colon { color: var(--muted); font-weight: 600; }
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<rect width="64" height="64" rx="14" fill="#0d1220"/>
|
||||||
|
<g transform="translate(6 6) scale(0.8125)" fill="none" stroke="#d9b46a" stroke-width="4.5" stroke-linecap="round">
|
||||||
|
<circle cx="32" cy="32" r="23"/>
|
||||||
|
<path d="M10 46 C 24 45, 29 23, 44 18"/>
|
||||||
|
<path d="M18 33.5 L36 33.5" stroke-width="4.2"/>
|
||||||
|
<path d="M49 6 L51.8 13.2 L59 16 L51.8 18.8 L49 26 L46.2 18.8 L39 16 L46.2 13.2 Z" fill="#ece6d8" stroke="none"/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 502 B |
@@ -0,0 +1,36 @@
|
|||||||
|
import type { Metadata } from "next";
|
||||||
|
import Link from "next/link";
|
||||||
|
import { notFound } from "next/navigation";
|
||||||
|
|
||||||
|
import { TarotLive } from "@/components/tarot/TarotLive";
|
||||||
|
import { backendGet, requireMe } from "@/lib/server";
|
||||||
|
import type { TarotReading } from "@/lib/tarot";
|
||||||
|
|
||||||
|
export const metadata: Metadata = { title: "Kártyajóslás" };
|
||||||
|
|
||||||
|
const day = (iso: string) =>
|
||||||
|
new Date(iso).toLocaleDateString("hu-HU", { timeZone: "Europe/Budapest", year: "numeric", month: "long", day: "numeric" });
|
||||||
|
|
||||||
|
/** One of the user's readings. */
|
||||||
|
export default async function TarotReadingPage({ params }: { params: Promise<{ id: string }> }) {
|
||||||
|
const { id } = await params;
|
||||||
|
const me = await requireMe(`/kartyajoslas/${id}`);
|
||||||
|
const reading = await backendGet<TarotReading>(`/v1/tarot/readings/${encodeURIComponent(id)}`);
|
||||||
|
if (!reading) notFound();
|
||||||
|
return (
|
||||||
|
<main className="page" style={{ maxWidth: 1040 }}>
|
||||||
|
<div className="page-head">
|
||||||
|
<Link href="/kartyajoslas" className="hint">
|
||||||
|
← Kártyajóslás
|
||||||
|
</Link>
|
||||||
|
<span className="eyebrow">
|
||||||
|
{reading.topic_name ? `${reading.topic_name} · ` : ""}
|
||||||
|
{reading.spread_name} · {day(reading.created_at)}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<section className="card">
|
||||||
|
<TarotLive key={reading.id} initial={reading} isAdmin={me.user.roles.includes("admin")} />
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
import type { Metadata } from "next";
|
||||||
|
import Link from "next/link";
|
||||||
|
|
||||||
|
import { TarotTable } from "@/components/tarot/TarotTable";
|
||||||
|
import { payMethod } from "@/lib/payments";
|
||||||
|
import { backendGet, requireMe } from "@/lib/server";
|
||||||
|
import type { TarotReading } from "@/lib/tarot";
|
||||||
|
import type { PublicConfig } from "@/lib/types";
|
||||||
|
|
||||||
|
export const metadata: Metadata = { title: "Kártyajóslás" };
|
||||||
|
|
||||||
|
/** Tarot readings written for the user's own question. */
|
||||||
|
export default async function TarotPage() {
|
||||||
|
const me = await requireMe("/kartyajoslas");
|
||||||
|
const [data, config] = await Promise.all([
|
||||||
|
backendGet<{ readings: TarotReading[]; left: number }>("/v1/tarot/readings"),
|
||||||
|
backendGet<PublicConfig>("/v1/config"),
|
||||||
|
]);
|
||||||
|
return (
|
||||||
|
<main className="page" style={{ maxWidth: 1040 }}>
|
||||||
|
<div className="page-head">
|
||||||
|
<span className="eyebrow">Tarot</span>
|
||||||
|
<h1>Kártyajóslás</h1>
|
||||||
|
<p className="muted">
|
||||||
|
Kérdezz, húzz lapot, és a kirakásod alapján személyre szabott jóslást kapsz. A lapok értelmezéséhez a képleted
|
||||||
|
Napja, Holdja és Aszcendense is hozzájárul. <Link href="/kartyajoslas/pelda">Példajóslás →</Link>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<TarotTable
|
||||||
|
readings={data?.readings ?? []}
|
||||||
|
left={data?.left ?? me.analyses_left.tarot ?? 0}
|
||||||
|
isAdmin={me.user.roles.includes("admin")}
|
||||||
|
canPay={payMethod(config, me)}
|
||||||
|
/>
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
import type { Metadata } from "next";
|
||||||
|
import Link from "next/link";
|
||||||
|
|
||||||
|
import { PublicHeader } from "@/components/SiteHeader";
|
||||||
|
import { TarotDemo, type TarotExample } from "@/components/tarot/TarotDemo";
|
||||||
|
import data from "@/content/tarot-pelda.json";
|
||||||
|
import { getMe } from "@/lib/server";
|
||||||
|
|
||||||
|
export const metadata: Metadata = {
|
||||||
|
title: "Példajóslás",
|
||||||
|
description:
|
||||||
|
"Így néz ki egy Sorsfonalak-kártyajóslás: lapválasztás a pakliból, kirakás és személyre szabott értelmezés, munkáról és párkapcsolatról.",
|
||||||
|
};
|
||||||
|
|
||||||
|
/** A full example tarot reading for a made-up question, for visitors and users without readings. */
|
||||||
|
export default async function TarotExamplePage() {
|
||||||
|
const me = await getMe();
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{!me && <PublicHeader />}
|
||||||
|
<main className="page" style={{ maxWidth: 1040 }}>
|
||||||
|
<div className="page-head">
|
||||||
|
<span className="eyebrow">Példajóslás</span>
|
||||||
|
<h1>Így néz ki egy kártyajóslás</h1>
|
||||||
|
<p className="muted">
|
||||||
|
Két kitalált kérdés, két kirakás: nézd meg, hogyan választ a pakliból, hogyan fordulnak fel a lapok, és mit
|
||||||
|
mondanak együtt. A saját jóslásod a te kérdésedre, a te lapjaidra és a képletedre készül.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<TarotDemo examples={data.examples as TarotExample[]} />
|
||||||
|
<section className="card" style={{ gap: 12 }}>
|
||||||
|
<p>
|
||||||
|
{me
|
||||||
|
? "Kérdezz te is: húzz lapot a saját kérdésedre."
|
||||||
|
: "Lépj be, és a csomagodban lévő jóslásokkal a saját kérdéseidre húzhatsz lapot."}
|
||||||
|
</p>
|
||||||
|
<div className="form-actions">
|
||||||
|
<Link href={me ? "/kartyajoslas" : "/belepes?vissza=/kartyajoslas"} className="btn btn-primary">
|
||||||
|
{me ? "Saját jóslás" : "Belépés"}
|
||||||
|
</Link>
|
||||||
|
<Link href="/csomagok" className="btn btn-ghost">
|
||||||
|
Csomagok
|
||||||
|
</Link>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
// The link preview image of the home page (og:image), drawn from the example
|
||||||
|
// chart. The page links it with a version (?v=…), so a new design is fetched
|
||||||
|
// again; until then it is kept long.
|
||||||
|
import example from "@/content/pelda.json";
|
||||||
|
import { chartCard } from "@/lib/ogCard";
|
||||||
|
import type { ChartResult } from "@/lib/types";
|
||||||
|
|
||||||
|
export async function GET() {
|
||||||
|
return chartCard({
|
||||||
|
chart: example.chart as unknown as ChartResult,
|
||||||
|
timeKnown: true,
|
||||||
|
eyebrow: "KÉPLET · ELŐREJELZÉS · KAPCSOLAT",
|
||||||
|
title: "Ahol a csillagok összekötnek.",
|
||||||
|
text: "Percre pontos születési képlet és személyre szóló elemzés. Mit hoz az éved, és mennyire illetek össze azzal, akit szeretsz?",
|
||||||
|
lines: [
|
||||||
|
{ glyph: "☉", label: "Képletelemzés" },
|
||||||
|
{ glyph: "♃", label: "Éves előrejelzés" },
|
||||||
|
{ glyph: "♀", label: "Kapcsolati összevetés" },
|
||||||
|
],
|
||||||
|
cacheControl: "public, max-age=86400, s-maxage=604800",
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -6,6 +6,7 @@ import { ChartWheel } from "@/components/ChartWheel";
|
|||||||
import { DetailedAnalysis } from "@/components/DetailedAnalysis";
|
import { DetailedAnalysis } from "@/components/DetailedAnalysis";
|
||||||
import { ForecastKeys, ForecastTimeline, ForecastTransits, longDay } from "@/components/ForecastViews";
|
import { ForecastKeys, ForecastTimeline, ForecastTransits, longDay } from "@/components/ForecastViews";
|
||||||
import { Tabs } from "@/components/Tabs";
|
import { Tabs } from "@/components/Tabs";
|
||||||
|
import { payMethod } from "@/lib/payments";
|
||||||
import { backendGet, requireMe } from "@/lib/server";
|
import { backendGet, requireMe } from "@/lib/server";
|
||||||
import type { Analysis, Chart, ForecastDetail, ForecastList, PublicConfig } from "@/lib/types";
|
import type { Analysis, Chart, ForecastDetail, ForecastList, PublicConfig } from "@/lib/types";
|
||||||
|
|
||||||
@@ -134,7 +135,7 @@ export default async function ForecastPage({
|
|||||||
initial={detailed}
|
initial={detailed}
|
||||||
left={me.analyses_left.forecast}
|
left={me.analyses_left.forecast}
|
||||||
isAdmin={me.user.roles.includes("admin")}
|
isAdmin={me.user.roles.includes("admin")}
|
||||||
canPay={config?.mock_payments ?? false}
|
canPay={payMethod(config, me)}
|
||||||
questionsLeft={me.analyses_left.question ?? 0}
|
questionsLeft={me.analyses_left.question ?? 0}
|
||||||
/>
|
/>
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import { ChartWheel, WheelLegend } from "@/components/ChartWheel";
|
|||||||
import { CompareButton } from "@/components/CompareButton";
|
import { CompareButton } from "@/components/CompareButton";
|
||||||
import { Tabs } from "@/components/Tabs";
|
import { Tabs } from "@/components/Tabs";
|
||||||
import { ASPECTS, ELEMENTS, MODALITIES, MOON_PHASES, countryName, formatBirthDate, pointName } from "@/lib/astro";
|
import { ASPECTS, ELEMENTS, MODALITIES, MOON_PHASES, countryName, formatBirthDate, pointName } from "@/lib/astro";
|
||||||
|
import { payMethod } from "@/lib/payments";
|
||||||
import { backendGet, requireMe } from "@/lib/server";
|
import { backendGet, requireMe } from "@/lib/server";
|
||||||
import type { Analysis, Chart, ChartListItem, PublicConfig } from "@/lib/types";
|
import type { Analysis, Chart, ChartListItem, PublicConfig } from "@/lib/types";
|
||||||
|
|
||||||
@@ -77,89 +78,95 @@ export default async function ChartPage({ params }: { params: Promise<{ id: stri
|
|||||||
initial={summary}
|
initial={summary}
|
||||||
detailedDone={detailed?.status === "done"}
|
detailedDone={detailed?.status === "done"}
|
||||||
isAdmin={me.user.roles.includes("admin")}
|
isAdmin={me.user.roles.includes("admin")}
|
||||||
|
shareRewardGranted={me.share_reward_granted}
|
||||||
|
referralOpen={config?.referral_rewards ?? false}
|
||||||
|
referralsLeft={me.referral_rewards.limit - me.referral_rewards.earned}
|
||||||
/>
|
/>
|
||||||
<BigThree chart={chart} />
|
<BigThree chart={chart} />
|
||||||
{(elements || modalities || phase) && (
|
</div>
|
||||||
<div className="card" style={{ gap: 12 }}>
|
</section>
|
||||||
<dl className="facts">
|
|
||||||
{elements && (
|
<section className="chart-extras" aria-label="A képlet összegzése és továbblépés">
|
||||||
<>
|
{(elements || modalities || phase) && (
|
||||||
<dt>Elemek</dt>
|
<div className="card" style={{ gap: 12 }}>
|
||||||
<dd>
|
<dl className="facts">
|
||||||
{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 && (
|
{elements && (
|
||||||
<p className="hint">
|
<>
|
||||||
Az elemek és minőségek a tíz bolygóból számolva:{" "}
|
<dt>Elemek</dt>
|
||||||
{Object.entries(elements)
|
<dd>
|
||||||
.filter(([, v]) => v.count > 0)
|
{Object.entries(elements)
|
||||||
.map(([k, v]) => `${ELEMENTS[k] ?? k}: ${v.points.map(pointName).join(", ")}`)
|
.map(([k, v]) => `${ELEMENTS[k] ?? k} ${v.count}`)
|
||||||
.join("; ")}
|
.join(" · ")}
|
||||||
.
|
</dd>
|
||||||
</p>
|
</>
|
||||||
)}
|
)}
|
||||||
|
{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>
|
||||||
|
)}
|
||||||
|
<Link href={`/kepletek/${chart.id}/elorejelzes`} className="card persons-tile">
|
||||||
|
<span className="eyebrow">Éves előrejelzés</span>
|
||||||
|
<strong>{chart.is_primary ? "Mit hoz az éved?" : `Mit hoz ${chart.label} éve?`}</strong>
|
||||||
|
<span className="muted">
|
||||||
|
Szolár képlet, tranzitok pontos dátumokkal, progresszió: egy év születésnaptól születésnapig.
|
||||||
|
</span>
|
||||||
|
<span className="persons-tile-arrow" aria-hidden="true">
|
||||||
|
→
|
||||||
|
</span>
|
||||||
|
</Link>
|
||||||
|
{!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>
|
||||||
)}
|
</div>
|
||||||
<Link href={`/kepletek/${chart.id}/elorejelzes`} className="card persons-tile">
|
)}
|
||||||
<span className="eyebrow">Éves előrejelzés</span>
|
{chart.is_primary && (
|
||||||
<strong>{chart.is_primary ? "Mit hoz az éved?" : `Mit hoz ${chart.label} éve?`}</strong>
|
<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">
|
<span className="muted">
|
||||||
Szolár képlet, tranzitok pontos dátumokkal, progresszió: egy év születésnaptól születésnapig.
|
{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>
|
||||||
<span className="persons-tile-arrow" aria-hidden="true">
|
<span className="persons-tile-arrow" aria-hidden="true">
|
||||||
→
|
→
|
||||||
</span>
|
</span>
|
||||||
</Link>
|
</Link>
|
||||||
{!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>
|
||||||
|
|
||||||
<section className="card chart-tabs" aria-label="Elemzés és táblázatok">
|
<section className="card chart-tabs" aria-label="Elemzés és táblázatok">
|
||||||
@@ -175,7 +182,7 @@ export default async function ChartPage({ params }: { params: Promise<{ id: stri
|
|||||||
initial={detailed}
|
initial={detailed}
|
||||||
left={me.analyses_left.natal}
|
left={me.analyses_left.natal}
|
||||||
isAdmin={me.user.roles.includes("admin")}
|
isAdmin={me.user.roles.includes("admin")}
|
||||||
canPay={config?.mock_payments ?? false}
|
canPay={payMethod(config, me)}
|
||||||
questionsLeft={me.analyses_left.question ?? 0}
|
questionsLeft={me.analyses_left.question ?? 0}
|
||||||
/>
|
/>
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
import type { Metadata } from "next";
|
import type { Metadata } from "next";
|
||||||
import { Cormorant_Garamond, Inter } from "next/font/google";
|
import { Cormorant_Garamond, Inter } from "next/font/google";
|
||||||
|
import { Suspense } from "react";
|
||||||
|
|
||||||
|
import { PaymentReturn } from "@/components/PaymentReturn";
|
||||||
import { SiteHeader } from "@/components/SiteHeader";
|
import { SiteHeader } from "@/components/SiteHeader";
|
||||||
import { getMe } from "@/lib/server";
|
import { getMe } from "@/lib/server";
|
||||||
|
|
||||||
@@ -25,6 +27,11 @@ export default async function RootLayout({ children }: { children: React.ReactNo
|
|||||||
<body>
|
<body>
|
||||||
{me && <SiteHeader me={me} />}
|
{me && <SiteHeader me={me} />}
|
||||||
{children}
|
{children}
|
||||||
|
{me && (
|
||||||
|
<Suspense fallback={null}>
|
||||||
|
<PaymentReturn />
|
||||||
|
</Suspense>
|
||||||
|
)}
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ export function Unsubscribe({ token }: { token: string | null }) {
|
|||||||
if (state === "done") {
|
if (state === "done") {
|
||||||
return (
|
return (
|
||||||
<p className="msg msg-ok" role="status">
|
<p className="msg msg-ok" role="status">
|
||||||
Leiratkoztál: erre a címre nem küldünk több meghívót.
|
Leiratkoztál: erre a címre nem küldünk több meghívót, és levettük a várólistáról.
|
||||||
</p>
|
</p>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -40,7 +40,8 @@ export function Unsubscribe({ token }: { token: string | null }) {
|
|||||||
return (
|
return (
|
||||||
<div className="card field" style={{ gap: 12 }}>
|
<div className="card field" style={{ gap: 12 }}>
|
||||||
<p style={{ margin: 0 }}>
|
<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.
|
Ha leiratkozol, erre az e-mail-címre többé nem küldünk meghívót, levesszük a várólistáról, és a mostani meghívód
|
||||||
|
is érvényét veszti.
|
||||||
</p>
|
</p>
|
||||||
<div>
|
<div>
|
||||||
<button type="button" className="btn btn-primary" onClick={confirm} disabled={state === "busy"}>
|
<button type="button" className="btn btn-primary" onClick={confirm} disabled={state === "busy"}>
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ export default async function UnsubscribePage({ searchParams }: { searchParams:
|
|||||||
<main className="page" style={{ maxWidth: 560 }}>
|
<main className="page" style={{ maxWidth: 560 }}>
|
||||||
<div className="page-head">
|
<div className="page-head">
|
||||||
<h1>Leiratkozás</h1>
|
<h1>Leiratkozás</h1>
|
||||||
<p className="muted">Nem kérsz több meghívót a Sorsfonalakra.</p>
|
<p className="muted">Nem kérsz több levelet és meghívót a Sorsfonalakról.</p>
|
||||||
</div>
|
</div>
|
||||||
<Unsubscribe token={token ?? null} />
|
<Unsubscribe token={token ?? null} />
|
||||||
</main>
|
</main>
|
||||||
|
|||||||
@@ -0,0 +1,63 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useRouter } from "next/navigation";
|
||||||
|
import { useState } from "react";
|
||||||
|
|
||||||
|
import { BirthForm } from "@/app/profil/BirthForm";
|
||||||
|
import { api, errorText } from "@/lib/api";
|
||||||
|
|
||||||
|
/** The logged-in invitee: gives their own birth data if needed, then the comparison is made. */
|
||||||
|
export function AcceptInvite({ token, hasOwnChart }: { token: string; hasOwnChart: boolean }) {
|
||||||
|
const router = useRouter();
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const [needsChart, setNeedsChart] = useState(!hasOwnChart);
|
||||||
|
|
||||||
|
async function accept() {
|
||||||
|
setBusy(true);
|
||||||
|
setError(null);
|
||||||
|
try {
|
||||||
|
const s = await api<{ id: string }>("/invites/accept", { body: { token } });
|
||||||
|
router.push(`/osszevetesek/${s.id}`);
|
||||||
|
router.refresh();
|
||||||
|
} catch (e) {
|
||||||
|
setError(errorText(e));
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (needsChart) {
|
||||||
|
return (
|
||||||
|
<div className="field" style={{ gap: 12 }}>
|
||||||
|
<p>Add meg a születési adataidat: ebből készül a képleted, és ezt vetjük össze.</p>
|
||||||
|
<BirthForm
|
||||||
|
initial={null}
|
||||||
|
onSaved={() => {
|
||||||
|
setNeedsChart(false);
|
||||||
|
accept();
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
{error && (
|
||||||
|
<p className="msg msg-error" role="alert">
|
||||||
|
{error}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
<div className="field" style={{ gap: 12 }}>
|
||||||
|
<p>A saját képleteddel vetjük össze.</p>
|
||||||
|
<div className="form-actions">
|
||||||
|
<button type="button" className="btn btn-primary" onClick={accept} disabled={busy}>
|
||||||
|
{busy ? "Készül az összevetés…" : "Összevetés elkészítése"}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
{error && (
|
||||||
|
<p className="msg msg-error" role="alert">
|
||||||
|
{error}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
import type { Metadata } from "next";
|
||||||
|
import Link from "next/link";
|
||||||
|
|
||||||
|
import { GoogleLogin } from "@/app/belepes/GoogleLogin";
|
||||||
|
import { PublicHeader } from "@/components/SiteHeader";
|
||||||
|
import { formatDate } from "@/lib/astro";
|
||||||
|
import { BACKEND_URL, getMe } from "@/lib/server";
|
||||||
|
import type { PersonInviteLanding, PublicConfig } from "@/lib/types";
|
||||||
|
|
||||||
|
import { AcceptInvite } from "./AcceptInvite";
|
||||||
|
|
||||||
|
export const metadata: Metadata = {
|
||||||
|
title: "Mennyire illünk össze?",
|
||||||
|
description: "Meghívó a születési képletek összevetésére a Sorsfonalakon.",
|
||||||
|
robots: { index: false },
|
||||||
|
};
|
||||||
|
|
||||||
|
const TOKEN = /^[A-Za-z0-9_-]{8,200}$/;
|
||||||
|
|
||||||
|
async function load<T>(path: string): Promise<T | null> {
|
||||||
|
try {
|
||||||
|
const res = await fetch(`${BACKEND_URL}${path}`, { cache: "no-store" });
|
||||||
|
return res.ok ? ((await res.json()) as T) : null;
|
||||||
|
} catch {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** A "how compatible are we?" link: who invites, login, own birth data, then the comparison. */
|
||||||
|
export default async function PersonInvitePage({ params }: { params: Promise<{ token: string }> }) {
|
||||||
|
const { token } = await params;
|
||||||
|
const valid = TOKEN.test(token);
|
||||||
|
const [invite, config, me] = await Promise.all([
|
||||||
|
valid ? load<PersonInviteLanding>(`/v1/public/invites/${token}`) : Promise.resolve(null),
|
||||||
|
load<PublicConfig>("/v1/config"),
|
||||||
|
getMe(),
|
||||||
|
]);
|
||||||
|
const who = invite?.inviter_name ?? "Valaki";
|
||||||
|
const clientId = config?.google_login.enabled ? config.google_login.client_id : null;
|
||||||
|
|
||||||
|
let body: React.ReactNode;
|
||||||
|
if (!invite) {
|
||||||
|
body = <p className="msg msg-error">Ez a meghívólink érvénytelen. Ellenőrizd, hogy a teljes linket nyitottad-e meg.</p>;
|
||||||
|
} else if (invite.status === "accepted") {
|
||||||
|
body = (
|
||||||
|
<p className="muted">
|
||||||
|
Ezt a meghívót már elfogadták. {me ? <Link href="/osszevetesek">Az összevetéseid itt vannak.</Link> : null}
|
||||||
|
</p>
|
||||||
|
);
|
||||||
|
} else if (invite.status === "expired") {
|
||||||
|
body = <p className="msg msg-error">Ez a meghívó lejárt vagy visszavonták. Kérj újat attól, aki küldte.</p>;
|
||||||
|
} else if (!me) {
|
||||||
|
body = clientId ? (
|
||||||
|
<>
|
||||||
|
<GoogleLogin clientId={clientId} target={`/meghivas/${token}`} inviteToken={token} />
|
||||||
|
<p className="hint">A fiókod az első belépéskor jön létre, bármelyik Google-fiókoddal.</p>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<p className="msg msg-error">A belépés most nem érhető el. Próbáld újra később.</p>
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
body = <AcceptInvite token={token} hasOwnChart={me.primary_chart_id !== null} />;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{!me && (
|
||||||
|
<PublicHeader />
|
||||||
|
)}
|
||||||
|
<main className="page" style={{ maxWidth: 720 }}>
|
||||||
|
<div className="page-head">
|
||||||
|
<span className="eyebrow">Meghívó</span>
|
||||||
|
<h1>Mennyire illetek össze?</h1>
|
||||||
|
{invite && (
|
||||||
|
<p className="muted">
|
||||||
|
<strong>{who}</strong> szeretné összevetni a születési képleteteket.
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
{invite?.message && <blockquote className="invite-quote">{invite.message}</blockquote>}
|
||||||
|
<section className="card" style={{ gap: 14 }}>
|
||||||
|
{body}
|
||||||
|
{invite?.status === "pending" && (
|
||||||
|
<p className="hint">
|
||||||
|
A saját képletedet és egy rövid elemzést ingyen kapsz. {who} az összevetést látja, a születési adataidat nem.
|
||||||
|
A meghívó {formatDate(invite.expires_at).replace(/\.$/, "")}-ig érvényes.
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -8,6 +8,7 @@ import { CompositeTables, CrossGrid, HouseOverlays, InterAspectList, NatureBar }
|
|||||||
import { SynastryLegend, SynastryWheel } from "@/components/SynastryWheel";
|
import { SynastryLegend, SynastryWheel } from "@/components/SynastryWheel";
|
||||||
import { Tabs } from "@/components/Tabs";
|
import { Tabs } from "@/components/Tabs";
|
||||||
import { ASPECTS, formatBirthDate } from "@/lib/astro";
|
import { ASPECTS, formatBirthDate } from "@/lib/astro";
|
||||||
|
import { payMethod } from "@/lib/payments";
|
||||||
import { backendGet, requireMe } from "@/lib/server";
|
import { backendGet, requireMe } from "@/lib/server";
|
||||||
import { sideName, sideTimeKnown } from "@/lib/synastry";
|
import { sideName, sideTimeKnown } from "@/lib/synastry";
|
||||||
import type { Analysis, ChartListItem, PublicConfig, Synastry, SynastrySide } from "@/lib/types";
|
import type { Analysis, ChartListItem, PublicConfig, Synastry, SynastrySide } from "@/lib/types";
|
||||||
@@ -127,7 +128,7 @@ export default async function ComparisonPage({ params }: { params: Promise<{ id:
|
|||||||
initial={detailed}
|
initial={detailed}
|
||||||
left={me.analyses_left.synastry}
|
left={me.analyses_left.synastry}
|
||||||
isAdmin={me.user.roles.includes("admin")}
|
isAdmin={me.user.roles.includes("admin")}
|
||||||
canPay={config?.mock_payments ?? false}
|
canPay={payMethod(config, me)}
|
||||||
note={`Az elemzésben az első fél: ${name1}, a második fél: ${name2}.`}
|
note={`Az elemzésben az első fél: ${name1}, a második fél: ${name2}.`}
|
||||||
questionsLeft={me.analyses_left.question ?? 0}
|
questionsLeft={me.analyses_left.question ?? 0}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -1,10 +1,48 @@
|
|||||||
|
import type { Metadata } from "next";
|
||||||
import { redirect } from "next/navigation";
|
import { redirect } from "next/navigation";
|
||||||
|
|
||||||
import { getMe } from "@/lib/server";
|
import { BACKEND_URL, getMe } from "@/lib/server";
|
||||||
|
import { siteUrl } from "@/lib/share";
|
||||||
|
import type { PublicConfig } from "@/lib/types";
|
||||||
|
|
||||||
// No home page yet: logged-in users go to their chart (or to the profile to enter
|
import { Landing } from "./Landing";
|
||||||
// their birth data), others to login.
|
|
||||||
|
/** Bumped when the preview image changes, so Facebook and co. fetch it again. */
|
||||||
|
const PREVIEW_VERSION = 1;
|
||||||
|
|
||||||
|
export async function generateMetadata(): Promise<Metadata> {
|
||||||
|
const base = await siteUrl();
|
||||||
|
const title = "Sorsfonalak – ahol a csillagok összekötnek";
|
||||||
|
const description =
|
||||||
|
"Születési képlet, részletes elemzés, éves előrejelzés és kapcsolati összevetés a legfejlettebb AI-modellekkel, töredék áron.";
|
||||||
|
const image = {
|
||||||
|
url: `${base}/kep/fooldal.png?v=${PREVIEW_VERSION}`,
|
||||||
|
width: 1200,
|
||||||
|
height: 630,
|
||||||
|
alt: "Egy példa születési képlet a Sorsfonalakon",
|
||||||
|
};
|
||||||
|
return {
|
||||||
|
title: { absolute: "Sorsfonalak – születési képlet, éves előrejelzés, kapcsolati összevetés" },
|
||||||
|
description:
|
||||||
|
"Percre pontos születési képlet és személyre szóló elemzés a legfejlettebb AI-modellekkel, percek alatt és töredék áron. Éves előrejelzés, kapcsolati összevetés és kártyajóslás.",
|
||||||
|
alternates: { canonical: `${base}/` },
|
||||||
|
openGraph: { type: "website", siteName: "Sorsfonalak", locale: "hu_HU", url: `${base}/`, title, description, images: [image] },
|
||||||
|
twitter: { card: "summary_large_image", title, description, images: [image.url] },
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async function signupMode(): Promise<PublicConfig["signup_mode"]> {
|
||||||
|
try {
|
||||||
|
const res = await fetch(`${BACKEND_URL}/v1/config`, { next: { revalidate: 300 } });
|
||||||
|
return res.ok ? ((await res.json()) as PublicConfig).signup_mode : "invite";
|
||||||
|
} catch {
|
||||||
|
return "invite";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Visitors get the home page; logged-in users go to their chart (or to the profile for their birth data). */
|
||||||
export default async function Home() {
|
export default async function Home() {
|
||||||
const me = await getMe();
|
const me = await getMe();
|
||||||
redirect(!me ? "/belepes" : me.primary_chart_id ? "/keplet" : "/profil");
|
if (me) redirect(me.primary_chart_id ? "/keplet" : "/profil");
|
||||||
|
return <Landing inviteOnly={(await signupMode()) !== "open"} />;
|
||||||
}
|
}
|
||||||
|
|||||||