Compare commits
59
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9331573890 | ||
|
|
4b93dc42e8 | ||
|
|
4247f914ce | ||
|
|
a6ddfc6924 | ||
|
|
116e4747c2 | ||
|
|
8b8285b5d2 | ||
|
|
b41dc31f3e | ||
|
|
985b1e872d | ||
|
|
2eea1042a5 | ||
|
|
0cd880b418 | ||
|
|
a571abdb65 | ||
|
|
55048ed828 | ||
|
|
7d6a6c3d92 | ||
|
|
a63f8f9928 | ||
|
|
286ad14016 | ||
|
|
85aa3fc5b1 | ||
|
|
19e5badc07 | ||
|
|
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 |
@@ -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
|
||||||
|
|||||||
Generated
+33
@@ -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,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;
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
-- When the operator's Telegram notice about a paid checkout went out (the
|
||||||
|
-- worker's `notify` task). Earlier purchases count as notified.
|
||||||
|
ALTER TABLE stripe_checkouts ADD COLUMN notified_at timestamptz;
|
||||||
|
UPDATE stripe_checkouts SET notified_at = now() WHERE completed_at IS NOT NULL;
|
||||||
@@ -91,20 +91,36 @@ pub fn render(template: &str, locale: &str, payload: &Value) -> Result<Rendered,
|
|||||||
};
|
};
|
||||||
let content = match (template, lang) {
|
let content = match (template, lang) {
|
||||||
("verify_email", Lang::Hu) => Content::simple(
|
("verify_email", Lang::Hu) => Content::simple(
|
||||||
"Erősítsd meg az e-mail-címed".into(),
|
"Add meg a jelszavad".into(),
|
||||||
greeting(name(payload, "display_name")),
|
greeting(name(payload, "display_name")),
|
||||||
"Köszönjük, hogy regisztráltál a Sorsfonalakon! Az alábbi gombbal erősítsd meg az e-mail-címed.".into(),
|
"Köszönjük, hogy regisztráltál a Sorsfonalakon! Az alábbi gombbal megerősíted az e-mail-címed, és megadhatod a jelszavad. Utána már be is vagy lépve.".into(),
|
||||||
"E-mail-cím megerősítése",
|
"Jelszó megadása",
|
||||||
url,
|
url,
|
||||||
"A link 3 napig érvényes. Ha nem te regisztráltál, nyugodtan hagyd figyelmen kívül ezt a levelet.",
|
"A link 3 napig érvényes, és csak egyszer használható. Ha nem te regisztráltál, nyugodtan hagyd figyelmen kívül ezt a levelet.",
|
||||||
),
|
),
|
||||||
("verify_email", Lang::En) => Content::simple(
|
("verify_email", Lang::En) => Content::simple(
|
||||||
"Confirm your e-mail address".into(),
|
"Set your password".into(),
|
||||||
greeting(name(payload, "display_name")),
|
greeting(name(payload, "display_name")),
|
||||||
"Thanks for signing up for Sorsfonalak! Please confirm your e-mail address with the button below.".into(),
|
"Thanks for signing up for Sorsfonalak! The button below confirms your e-mail address and lets you set your password. You will be logged in right after.".into(),
|
||||||
"Confirm e-mail address",
|
"Set password",
|
||||||
url,
|
url,
|
||||||
"The link is valid for 3 days. If you did not sign up, you can safely ignore this e-mail.",
|
"The link is valid for 3 days and can be used once. If you did not sign up, you can safely ignore this e-mail.",
|
||||||
|
),
|
||||||
|
("account_exists", Lang::Hu) => Content::simple(
|
||||||
|
"Már van fiókod a Sorsfonalakon".into(),
|
||||||
|
greeting(name(payload, "display_name")),
|
||||||
|
"Ezzel az e-mail-címmel regisztrációt kezdtek a Sorsfonalakon, de neked már van fiókod. Beléphetsz úgy, ahogy eddig (például Google-lel), vagy az alábbi gombbal jelszót adhatsz meg.".into(),
|
||||||
|
"Jelszó megadása",
|
||||||
|
url,
|
||||||
|
"A link 1 óráig érvényes, és csak egyszer használható. Ha nem te voltál, hagyd figyelmen kívül ezt a levelet: a fiókod nem változik.",
|
||||||
|
),
|
||||||
|
("account_exists", Lang::En) => Content::simple(
|
||||||
|
"You already have a Sorsfonalak account".into(),
|
||||||
|
greeting(name(payload, "display_name")),
|
||||||
|
"Someone started signing up for Sorsfonalak with this e-mail address, but you already have an account. Log in as before (e.g. with Google), or set a password with the button below.".into(),
|
||||||
|
"Set password",
|
||||||
|
url,
|
||||||
|
"The link is valid for 1 hour and can be used once. If it was not you, ignore this e-mail: your account stays the same.",
|
||||||
),
|
),
|
||||||
("reset_password", Lang::Hu) => Content::simple(
|
("reset_password", Lang::Hu) => Content::simple(
|
||||||
"Új jelszó megadása".into(),
|
"Új jelszó megadása".into(),
|
||||||
@@ -160,6 +176,7 @@ 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)?,
|
("synastry_invite", _) => synastry_invite(lang, payload, url)?,
|
||||||
("waitlist_joined", _) => waitlist_joined(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))
|
||||||
@@ -284,6 +301,69 @@ 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.
|
/// 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> {
|
fn waitlist_joined(lang: Lang, payload: &Value, url: String) -> Result<Content, TemplateError> {
|
||||||
let unsubscribe_url = field(payload, "unsubscribe_url")?;
|
let unsubscribe_url = field(payload, "unsubscribe_url")?;
|
||||||
@@ -651,6 +731,24 @@ mod tests {
|
|||||||
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."));
|
||||||
|
|||||||
@@ -48,6 +48,27 @@ impl HoroscopeClient {
|
|||||||
self.post("/v1/forecast", request).await
|
self.post("/v1/forecast", request).await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// `GET /v1/countries`
|
||||||
|
pub async fn countries(&self) -> Result<Value, HoroscopeError> {
|
||||||
|
self.get("/v1/countries", &[]).await
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `GET /v1/places?country=&q=&limit=`
|
||||||
|
pub async fn places(&self, country: &str, query: &str, limit: u32) -> Result<Value, HoroscopeError> {
|
||||||
|
self.get("/v1/places", &[("country", country), ("q", query), ("limit", &limit.to_string())]).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn get(&self, path: &str, query: &[(&str, &str)]) -> Result<Value, HoroscopeError> {
|
||||||
|
let response = self
|
||||||
|
.http
|
||||||
|
.get(format!("{}{path}", self.base_url))
|
||||||
|
.query(query)
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.map_err(|e| HoroscopeError::Unavailable(e.to_string()))?;
|
||||||
|
Self::answer(response).await
|
||||||
|
}
|
||||||
|
|
||||||
async fn post(&self, path: &str, body: &Value) -> Result<Value, HoroscopeError> {
|
async fn post(&self, path: &str, body: &Value) -> Result<Value, HoroscopeError> {
|
||||||
let response = self
|
let response = self
|
||||||
.http
|
.http
|
||||||
@@ -56,6 +77,10 @@ impl HoroscopeClient {
|
|||||||
.send()
|
.send()
|
||||||
.await
|
.await
|
||||||
.map_err(|e| HoroscopeError::Unavailable(e.to_string()))?;
|
.map_err(|e| HoroscopeError::Unavailable(e.to_string()))?;
|
||||||
|
Self::answer(response).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn answer(response: reqwest::Response) -> Result<Value, HoroscopeError> {
|
||||||
let status = response.status();
|
let status = response.status();
|
||||||
let body: Value = response.json().await.map_err(|e| HoroscopeError::Unavailable(e.to_string()))?;
|
let body: Value = response.json().await.map_err(|e| HoroscopeError::Unavailable(e.to_string()))?;
|
||||||
if status.is_success() {
|
if status.is_success() {
|
||||||
|
|||||||
@@ -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"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -24,3 +24,11 @@ TAG=latest
|
|||||||
# worker-ai: analyses and answers written at the same time.
|
# worker-ai: analyses and answers written at the same time.
|
||||||
# QUICK_CONCURRENCY=2 # summaries and answers
|
# QUICK_CONCURRENCY=2 # summaries and answers
|
||||||
# ANALYSIS_CONCURRENCY=4 # detailed analyses and forecasts
|
# ANALYSIS_CONCURRENCY=4 # detailed analyses and forecasts
|
||||||
|
|
||||||
|
# Beszel monitoring agent (deploy/README.md): the hub's public key.
|
||||||
|
# COMPOSE_PROFILES=monitoring
|
||||||
|
# BESZEL_KEY=ssh-ed25519 AAAA...
|
||||||
|
|
||||||
|
# Purchase notices to Telegram (worker notify task); the bot token
|
||||||
|
# (TELEGRAM_BOT_TOKEN) goes to .env.secrets.
|
||||||
|
# TELEGRAM_CHAT_ID=123456789
|
||||||
|
|||||||
+7
-2
@@ -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} {
|
||||||
|
|||||||
+8
-3
@@ -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)
|
||||||
@@ -77,13 +77,18 @@ A Docker által kinyitott portokat az ufw magától nem szűri, ezért a 80-as
|
|||||||
- SSL/TLS mód: **Full (strict)**.
|
- SSL/TLS mód: **Full (strict)**.
|
||||||
- **Always Use HTTPS: ki.** A Let's Encrypt a Cloudflare-en át, sima HTTP-n ellenőrzi a domaint, a tanúsítvány megújításakor is. A HTTP→HTTPS átirányítást a Caddy maga végzi.
|
- **Always Use HTTPS: ki.** A Let's Encrypt a Cloudflare-en át, sima HTTP-n ellenőrzi a domaint, a tanúsítvány megújításakor is. A HTTP→HTTPS átirányítást a Caddy maga végzi.
|
||||||
- A Caddy a Cloudflare címtartományaiban megbízik, ezért a naplókban és a backendnél a látogató valódi IP-címe látszik (`CF-Connecting-IP`).
|
- A Caddy a Cloudflare címtartományaiban megbízik, ezért a naplókban és a backendnél a látogató valódi IP-címe látszik (`CF-Connecting-IP`).
|
||||||
|
- AI-robotok: Security → Settings → Bot traffic → *AI Crawler and Agent access policies*: **Training: Block**, **Search: Allow**, **Agents: Allow** (a részletek: `docs/megosztas.md`, Robotok). Bot Fight Mode: ki, mert a link-előnézeteket is elrontja.
|
||||||
|
|
||||||
A Google OAuth kliensnél a `https://sorsfonalak.hu` címet fel kell venni az engedélyezett JavaScript-források közé.
|
A Google OAuth kliensnél a `https://sorsfonalak.hu` címet fel kell venni az engedélyezett JavaScript-források közé.
|
||||||
|
|
||||||
## Ü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. Az otthoni TrueNAS naponta lehúzza (Rsync Task, Pull, SSH) a `nasbackup` felhasználóval, aki csak ezt a mappát olvashatja (`authorized_keys`: `command="/usr/bin/rrsync -ro /opt/sorsfonalak/backups",restrict`); a NAS-on a régi mentések is megmaradnak.
|
||||||
|
- Vásárlási értesítő: a `worker` `notify` feladata minden kifizetett vásárlásról egyszer szól Telegramon („🛒 Vásárlás: Páros csomag, 6 000 Ft”, a vevő adatai nélkül), a számlázástól függetlenül. Beállítás: `TELEGRAM_BOT_TOKEN` a `.env.secrets`-ben, `TELEGRAM_CHAT_ID` a `.env`-ben; ha bármelyik hiányzik, nincs értesítés.
|
||||||
|
- Monitorozás: a `beszel-agent` (Beszel, CPU/memória/lemez/konténerek) a NAS-on futó Beszel hubnak ad adatot, Tailscale-en át. Csak a szerver Tailscale-címén figyel (`100.69.226.118:45876`), az internet felé nem nyit portot; a hub kapcsolódik hozzá. Bekapcsolás a `.env`-ben: `COMPOSE_PROFILES=monitoring` és `BESZEL_KEY=<a hub nyilvános kulcsa>`, utána `docker compose up -d beszel-agent`. A hubban a rendszer címe `100.69.226.118`, port `45876`.
|
||||||
- Visszatöltés: `gunzip -c backups/sorsfonalak-<dátum>.sql.gz | docker compose exec -T postgres psql -U sorsfonalak sorsfonalak`
|
- Visszatöltés: `gunzip -c backups/sorsfonalak-<dátum>.sql.gz | docker compose exec -T postgres psql -U sorsfonalak sorsfonalak`
|
||||||
|
|||||||
@@ -81,13 +81,23 @@ 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}
|
||||||
# Purchases are off until real payments are connected; packages come
|
# Without the Stripe keys purchases are off; packages come from promo
|
||||||
# from promo codes and admins (MOCK_PAYMENTS=true: pretend purchases).
|
# codes and admins (MOCK_PAYMENTS=true: pretend purchases).
|
||||||
MOCK_PAYMENTS: ${MOCK_PAYMENTS:-false}
|
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.
|
# Users inviting others ("Meghívom"): shown but off until the launch.
|
||||||
USER_INVITES: ${USER_INVITES:-false}
|
USER_INVITES: ${USER_INVITES:-false}
|
||||||
# A new user from a shared link earns the sharer an analysis: off until sign-up opens.
|
# A new user from a shared link earns the sharer an analysis: off until sign-up opens.
|
||||||
@@ -95,12 +105,22 @@ services:
|
|||||||
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
|
||||||
|
|
||||||
@@ -109,12 +129,17 @@ 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,notify
|
||||||
|
# Purchase notices to Telegram; the bot token (TELEGRAM_BOT_TOKEN) is in .env.secrets.
|
||||||
|
TELEGRAM_CHAT_ID: ${TELEGRAM_CHAT_ID:-}
|
||||||
# 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
|
||||||
@@ -122,6 +147,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
|
||||||
|
|
||||||
@@ -135,6 +163,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
|
||||||
@@ -142,6 +175,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
|
||||||
|
|
||||||
@@ -162,7 +198,27 @@ services:
|
|||||||
logging: *logging
|
logging: *logging
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
|
# Beszel agent: CPU, memory, disk, network and per-container stats for the
|
||||||
|
# Beszel hub on the home NAS. Off unless COMPOSE_PROFILES=monitoring and
|
||||||
|
# BESZEL_KEY (the hub's public key) are in .env. It listens only on the
|
||||||
|
# server's Tailscale address, so nothing is opened to the internet.
|
||||||
|
beszel-agent:
|
||||||
|
image: henrygd/beszel-agent:0.21.2
|
||||||
|
profiles: [monitoring]
|
||||||
|
network_mode: host
|
||||||
|
environment:
|
||||||
|
KEY: ${BESZEL_KEY:-}
|
||||||
|
LISTEN: ${BESZEL_LISTEN:-100.69.226.118:45876}
|
||||||
|
volumes:
|
||||||
|
- beszel-agent:/var/lib/beszel-agent
|
||||||
|
- /var/run/docker.sock:/var/run/docker.sock:ro
|
||||||
|
logging: *logging
|
||||||
|
restart: unless-stopped
|
||||||
|
|
||||||
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:
|
||||||
|
beszel-agent:
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -78,6 +90,8 @@ services:
|
|||||||
SMTP_URL: ${SMTP_URL:-}
|
SMTP_URL: ${SMTP_URL:-}
|
||||||
MAIL_FROM: ${MAIL_FROM:-Sorsfonalak <noreply@sorsfonalak.local>}
|
MAIL_FROM: ${MAIL_FROM:-Sorsfonalak <noreply@sorsfonalak.local>}
|
||||||
PUBLIC_BASE_URL: ${PUBLIC_BASE_URL:-http://localhost:3001}
|
PUBLIC_BASE_URL: ${PUBLIC_BASE_URL:-http://localhost:3001}
|
||||||
|
# Purchase notices to Telegram (TELEGRAM_BOT_TOKEN in .env.secrets).
|
||||||
|
TELEGRAM_CHAT_ID: ${TELEGRAM_CHAT_ID:-}
|
||||||
# OPENROUTER_API_KEY (not in git); without it analyses stay pending.
|
# OPENROUTER_API_KEY (not in git); without it analyses stay pending.
|
||||||
env_file:
|
env_file:
|
||||||
- path: .env.secrets
|
- path: .env.secrets
|
||||||
|
|||||||
@@ -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ó.
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 18 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 26 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 26 KiB |
+8
-6
@@ -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 a fő csomagoknál pl. „Online tartalomszolgáltatás – Páros csomag”, a kiegészítőknél egységesen „Online tartalomszolgáltatás – kiegészítő 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 semleges: nem „asztrológiai”, és nem „jóslás” vagy „kártya” (a kártyajóslás a megjegyzésben „egyedi szöveges tartalom”), mert a szolgáltatás egy weboldal programmal előállított tartalma, nem személyes szakmai tanácsadás. A Stripe fizetési oldalán és nyugtáján a csomag neve és leírása áll, ott a „kártyajóslás” helyett „kártya” (`Package::checkout_text`). A Telegram-értesítő a kiegészítőknél a csomag azonosítóját is kiírja („kiegészítő csomag (addon_tarot)”). 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 kiegészítő neve „Online tartalomszolgáltatás – kiegészítő csomag”, a tétel leírásában „egyedi szöveges tartalom” szerepel (sem „jóslás”, sem „kártya”). A Stripe fizetési oldalán „+5 kártya”.
|
||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
# Levélküldés élesben: Amazon SES
|
# Levélküldés élesben: Amazon SES
|
||||||
|
|
||||||
Élesben most nincs levélküldő beállítva (`SMTP_URL` üres), így minden levél az `email_outbox` táblában vár. Amíg ez így van, a meghívót kézzel is továbbadhatod: az admin „Meghívók” oldala küldés után kiírja a linket („Link másolása”).
|
Élesben az Amazon SES küldi a leveleket (`noreply@sorsfonalak.hu`, eu-central-1, 2587-es port). Ha a küldés nincs beállítva (`SMTP_URL` és SES-kulcs nélkül), a levelek az `email_outbox` táblában várnak; a meghívót ilyenkor kézzel is továbbadhatod: az admin „Meghívók” oldala küldés után kiírja a linket („Link másolása”).
|
||||||
|
|
||||||
A meghívó a legkényesebb levéltípus, mert a címzett nem kérte. A spammappát elsősorban a feladó hírneve és a domain hitelesítése dönti el, a sablon csak ezután számít. Ezért kellenek a lenti lépések.
|
A meghívó a legkényesebb levéltípus, mert a címzett nem kérte. A spammappát elsősorban a feladó hírneve és a domain hitelesítése dönti el, a sablon csak ezután számít. Ezért kellenek a lenti lépések.
|
||||||
|
|
||||||
@@ -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:
|
||||||
|
|||||||
+7
-3
@@ -25,7 +25,7 @@ Egy kattintás önmagában semmit nem bizonyít, ezért kétféle jutalom van:
|
|||||||
|
|
||||||
**Új felhasználó:**
|
**Ú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.
|
- **Megjegyzés:** a megosztott oldal belépés linkje viszi a link kódját (`/belepes?ref=<slug>`), a böngészőben semmi nem tárolódik. A regisztráció (Google, Apple, e-mail) 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.
|
- **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.
|
- **`/v1/me`:** a `share_reward_granted` és a `referral_rewards` (`{earned, limit}`) mezők mutatják az állapotot.
|
||||||
|
|
||||||
@@ -33,8 +33,12 @@ Egy kattintás önmagában semmit nem bizonyít, ezért kétféle jutalom van:
|
|||||||
|
|
||||||
- **Az olvasás nem ír.** A megosztott tartalom lekérése (`GET /v1/public/shares/{slug}`) semmit nem ír az adatbázisba.
|
- **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.
|
- **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.
|
- **robots.txt** (`src/app/robots.ts`), három csoport:
|
||||||
- **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.
|
- **Tanító robotok: kitiltva.** Amelyek AI-modell tanításához gyűjtenek, vagy tanítóadatnak adják el a tartalmat (GPTBot, ClaudeBot, CCBot, Google-Extended, Applebot-Extended, Bytespider, meta-externalagent stb.), plusz a nehéz és itt haszontalan PetalBot és Scrapy. A Google-Extended csak a Gemini-tanítást tiltja, a Google-keresést és az AI-áttekintést nem érinti.
|
||||||
|
- **AI-keresők és -ügynökök: jöhetnek, legfeljebb 10 másodpercenként egy oldal** (`Crawl-delay: 10`, amelyik betartja). OAI-SearchBot, ChatGPT-User, Claude-SearchBot, Claude-User, PerplexityBot, Perplexity-User, DuckAssistBot stb. Ezek idézhetik az oldalt, és látogatót hozhatnak.
|
||||||
|
- **Mindenki más** (Googlebot, Bingbot, az előnézet-robotok: facebookexternalhit, Slackbot, WhatsApp, Twitterbot, LinkedInBot): jöhet, a belépés mögötti útvonalak kivételével.
|
||||||
|
- **Kis terhelés:** belépési süti nélkül a nyilvános oldalak nem hívják a backendet, a horoszkópszámítást pedig csak a böngészőben futó szkript indítja (IP-címenként óránként 30). Egy robotlátogatás így csak egy HTML-oldal előállítása.
|
||||||
|
- **Cloudflare:** a robots.txt-t be nem tartó robotokra a Security → Settings → Bot traffic → *AI Crawler and Agent access policies* való: **Training: Block**, **Search: Allow**, **Agents: Allow**. Ez az előnézet-robotokat nem érinti. A „Bot Fight Mode” viszont az előnézeteket is elronthatja, azt ne kapcsoljuk be.
|
||||||
|
|
||||||
## Előnézet (Facebook, Messenger, WhatsApp, LinkedIn, X)
|
## Előnézet (Facebook, Messenger, WhatsApp, LinkedIn, X)
|
||||||
|
|
||||||
|
|||||||
@@ -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 |
|
||||||
@@ -31,6 +32,11 @@ Felhasználók, belépés, mentett születési képletek, szinasztriák és megh
|
|||||||
|
|
||||||
- **Munkamenet:** véletlen token, HttpOnly + SameSite=Lax sütiben (`sf_session`). A belépési válasz törzsében is ott van, hogy nem böngészős kliens `Authorization: Bearer <token>` fejléccel küldhesse vissza. Az adatbázis csak a token SHA-256 hash-ét tárolja, így a munkamenet visszavonható (kijelentkezés, jelszócsere, fióktörlés).
|
- **Munkamenet:** véletlen token, HttpOnly + SameSite=Lax sütiben (`sf_session`). A belépési válasz törzsében is ott van, hogy nem böngészős kliens `Authorization: Bearer <token>` fejléccel küldhesse vissza. Az adatbázis csak a token SHA-256 hash-ét tárolja, így a munkamenet visszavonható (kijelentkezés, jelszócsere, fióktörlés).
|
||||||
- **E-mail + jelszó** (csak `PASSWORD_LOGIN=true` mellett; élesben csak közösségi belépés lesz, hogy ne lehessen tömegesen ingyenes fiókokat nyitni):
|
- **E-mail + jelszó** (csak `PASSWORD_LOGIN=true` mellett; élesben csak közösségi belépés lesz, hogy ne lehessen tömegesen ingyenes fiókokat nyitni):
|
||||||
|
- a regisztráció nem kér jelszót: a címre megy egy link (`verify_email`, 3 napig él), és jelszót csak ezen lehet megadni. Az elfelejtett jelszó linkje (`reset_password`, 1 óra) ugyanoda visz (`/jelszo?token=…`). Így jelszót csak az állíthat be, aki a postafiókot olvassa, és mindig ő maga választja: senki nem regisztrálhat más címére jelszót, ezért a Google- vagy Apple-fiók összekötése az azonos című fiókkal biztonságos;
|
||||||
|
- a link megnyitásakor a cím megerősítettnek számít, minden korábbi munkamenet megszűnik, és a felhasználó be is lép;
|
||||||
|
- már regisztrált címre a regisztráció ugyanúgy 202-t ad (nem derül ki, ki van regisztrálva), a tulajdonos pedig egy „Már van fiókod” levelet kap jelszómegadó linkkel (`account_exists`);
|
||||||
|
- jelszavas link címenként és fajtánként percenként egy, összesen óránként öt mehet ki;
|
||||||
|
- megerősítetlen címmel (a linkes regisztráció előtti fiók) nem lehet jelszóval belépni;
|
||||||
- a jelszó legalább 10 karakter, Argon2id hash-sel tárolva;
|
- a jelszó legalább 10 karakter, Argon2id hash-sel tárolva;
|
||||||
- címenként 15 percen belül 10 hibás próbálkozás után átmenetileg tiltás jár;
|
- címenként 15 percen belül 10 hibás próbálkozás után átmenetileg tiltás jár;
|
||||||
- ismeretlen címnél is ugyanannyi ideig tart a válasz.
|
- ismeretlen címnél is ugyanannyi ideig tart a válasz.
|
||||||
@@ -56,14 +62,14 @@ Felhasználók, belépés, mentett születési képletek, szinasztriák és megh
|
|||||||
|---|---|---|
|
|---|---|---|
|
||||||
| `GET /v1/config` | – | Google kliens-azonosító, `password_login`, `signup_mode`, nyelvek, elemző és összefoglaló modell |
|
| `GET /v1/config` | – | Google kliens-azonosító, `password_login`, `signup_mode`, nyelvek, elemző és összefoglaló modell |
|
||||||
| `GET /v1/packages` | – | a csomagkatalógus árral, tartalommal, megtakarítással, elemzésenkénti árral (lásd `docs/csomagok.md`) |
|
| `GET /v1/packages` | – | a csomagkatalógus árral, tartalommal, megtakarítással, elemzésenkénti árral (lásd `docs/csomagok.md`) |
|
||||||
| `POST /v1/auth/register` | – | `{email, password, display_name?, locale?, invite_token?}` → munkamenet; megerősítő e-mailt küld |
|
| `POST /v1/auth/register` | – | `{email, display_name?, locale?, invite_token?, referral?}` → 202; jelszómegadó linket küld |
|
||||||
| `POST /v1/auth/login` | – | `{email, password}` |
|
| `POST /v1/auth/login` | – | `{email, password}` |
|
||||||
| `POST /v1/auth/google` | – | `{id_token, invite_token?}`; `created: true`, ha most jött létre a fiók; meghívó nélkül 403 `not_invited` |
|
| `POST /v1/auth/google` | – | `{id_token, invite_token?}`; `created: true`, ha most jött létre a fiók; meghívó nélkül 403 `not_invited` |
|
||||||
| `POST /v1/auth/logout`, `/logout-all` | user | kijelentkezés erről, illetve minden eszközről |
|
| `POST /v1/auth/logout`, `/logout-all` | user | kijelentkezés erről, illetve minden eszközről |
|
||||||
| `POST /v1/auth/verify-email` | – | `{token}` az e-mailben kapott linkből |
|
|
||||||
| `POST /v1/auth/resend-verification` | user | |
|
|
||||||
| `POST /v1/auth/password-reset` | – | `{email}`; mindig 202 |
|
| `POST /v1/auth/password-reset` | – | `{email}`; mindig 202 |
|
||||||
| `POST /v1/auth/password-reset/confirm` | – | `{token, password}`; minden munkamenet megszűnik |
|
| `POST /v1/auth/set-password` | – | `{token, password}` a levélben kapott linkből (regisztráció vagy elfelejtett jelszó); a cím megerősítetté válik, minden más munkamenet megszűnik, és belép |
|
||||||
|
| `POST /v1/public/chart` | – | a nyilvános születési horoszkóp: `{date, time?, country, geonames_id, ambiguous_time?}` → a teljes képlet (`chart`), `highlights` és `uncertain` (idő nélkül a határ közeli Nap és Hold); csak számítás, AI nélkül, nem ment semmit; IP-címenként óránként 30 |
|
||||||
|
| `GET /v1/public/geo/countries`, `/v1/public/geo/places?country=&q=` | – | országlista és helykereső a nyilvános horoszkóphoz (a helykereső IP-címenként óránként 300 kérés) |
|
||||||
| `GET`/`PATCH`/`DELETE /v1/me` | user | profil (`display_name`, `locale`); törlés: `{confirm: "DELETE"}` |
|
| `GET`/`PATCH`/`DELETE /v1/me` | user | profil (`display_name`, `locale`); törlés: `{confirm: "DELETE"}` |
|
||||||
| `POST /v1/me/password` | user | `{current_password?, new_password}`; Google-fiókhoz jelszót is ad |
|
| `POST /v1/me/password` | user | `{current_password?, new_password}`; Google-fiókhoz jelszót is ad |
|
||||||
| `GET /v1/me/export` | user | GDPR: minden adat egy JSON-ban |
|
| `GET /v1/me/export` | user | GDPR: minden adat egy JSON-ban |
|
||||||
|
|||||||
@@ -186,7 +186,8 @@ pub static DUMMY_HASH: std::sync::LazyLock<String> = std::sync::LazyLock::new(||
|
|||||||
// --- brute-force protection ----------------------------------------------------------
|
// --- brute-force protection ----------------------------------------------------------
|
||||||
|
|
||||||
/// Counts failed logins per e-mail address in a sliding window (in memory,
|
/// Counts failed logins per e-mail address in a sliding window (in memory,
|
||||||
/// per backend instance).
|
/// per backend instance). Also counts the calls of public endpoints per
|
||||||
|
/// address ([`LoginLimiter::hit`]).
|
||||||
pub struct LoginLimiter {
|
pub struct LoginLimiter {
|
||||||
max_failures: u32,
|
max_failures: u32,
|
||||||
window: Duration,
|
window: Duration,
|
||||||
@@ -222,6 +223,14 @@ impl LoginLimiter {
|
|||||||
entry.0 += 1;
|
entry.0 += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Counts one use of a public endpoint (every call, not just failures):
|
||||||
|
/// 429 once `max_failures` calls were made in the window.
|
||||||
|
pub fn hit(&self, key: &str) -> Result<(), ApiError> {
|
||||||
|
self.check(key)?;
|
||||||
|
self.failed(key);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
pub fn succeeded(&self, key: &str) {
|
pub fn succeeded(&self, key: &str) {
|
||||||
self.failures.lock().expect("limiter lock").remove(key);
|
self.failures.lock().expect("limiter lock").remove(key);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -45,6 +45,23 @@ 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
|
/// `USER_INVITES` (default `false`): users may invite others ("how
|
||||||
/// compatible are we?" links, which also let the invitee sign up). Off
|
/// compatible are we?" links, which also let the invitee sign up). Off
|
||||||
/// until the launch; admins may always.
|
/// until the launch; admins may always.
|
||||||
@@ -58,6 +75,12 @@ pub struct Config {
|
|||||||
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>,
|
||||||
@@ -85,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())
|
||||||
}
|
}
|
||||||
@@ -127,11 +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)?,
|
user_invites: parsed("USER_INVITES", false)?,
|
||||||
referral_rewards: parsed("REFERRAL_REWARDS", 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()),
|
||||||
@@ -166,9 +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,
|
user_invites: true,
|
||||||
referral_rewards: 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,32 @@ 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,
|
||||||
|
/// The public sign calculator, per visitor address.
|
||||||
|
pub calculator_limiter: LoginLimiter,
|
||||||
|
/// The public place search (typing makes several calls), per visitor address.
|
||||||
|
pub places_limiter: LoginLimiter,
|
||||||
|
/// Share visits already counted (link and visitor address, for half an hour):
|
||||||
|
/// a reload is not a new visit, without storing anything in the browser.
|
||||||
|
pub share_visits: 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)),
|
||||||
|
calculator_limiter: LoginLimiter::new(30, Duration::from_secs(60 * 60)),
|
||||||
|
places_limiter: LoginLimiter::new(300, Duration::from_secs(60 * 60)),
|
||||||
|
share_visits: LoginLimiter::new(1, Duration::from_secs(30 * 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 +78,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,
|
||||||
@@ -186,6 +210,8 @@ pub enum Source {
|
|||||||
Mock,
|
Mock,
|
||||||
/// A redeemed promo code.
|
/// A redeemed promo code.
|
||||||
Promo,
|
Promo,
|
||||||
|
/// Paid through Stripe Checkout.
|
||||||
|
Stripe,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Source {
|
impl Source {
|
||||||
@@ -194,19 +220,75 @@ impl Source {
|
|||||||
Source::Admin => "admin",
|
Source::Admin => "admin",
|
||||||
Source::Mock => "mock",
|
Source::Mock => "mock",
|
||||||
Source::Promo => "promo",
|
Source::Promo => "promo",
|
||||||
|
Source::Stripe => "stripe",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Package {
|
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). Kept neutral: the main packages keep
|
||||||
|
/// their plain names, the add-ons share one name, and tarot readings are
|
||||||
|
/// listed as text content.
|
||||||
|
pub fn invoice_item(&self) -> (String, String) {
|
||||||
|
let name = match self.tier {
|
||||||
|
Tier::Main => format!("Online tartalomszolgáltatás – {} csomag", self.name),
|
||||||
|
Tier::Addon => "Online tartalomszolgáltatás – kiegészítő csomag".to_string(),
|
||||||
|
};
|
||||||
|
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, "egyedi szöveges tartalom"),
|
||||||
|
]
|
||||||
|
.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)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The name and description on Stripe's payment page and receipt: as on
|
||||||
|
/// the site, but tarot readings are called "kártya" there.
|
||||||
|
pub fn checkout_text(&self) -> (String, String) {
|
||||||
|
let plain = |s: &str| s.replace("kártyajóslás", "kártya");
|
||||||
|
(format!("Sorsfonalak – {}", plain(self.name)), plain(self.tagline))
|
||||||
|
}
|
||||||
|
|
||||||
/// What the package gives, unit by unit.
|
/// What the package gives, unit by unit.
|
||||||
pub fn contents(&self) -> [(Unit, i64); 5] {
|
pub fn contents(&self) -> [(Unit, i64); 6] {
|
||||||
[
|
[
|
||||||
(Unit::Natal, self.natal),
|
(Unit::Natal, self.natal),
|
||||||
(Unit::Synastry, self.synastry),
|
(Unit::Synastry, self.synastry),
|
||||||
(Unit::Forecast, self.forecast),
|
(Unit::Forecast, self.forecast),
|
||||||
(Unit::Person, self.persons),
|
(Unit::Person, self.persons),
|
||||||
(Unit::Question, self.questions),
|
(Unit::Question, self.questions),
|
||||||
|
(Unit::Tarot, self.tarot),
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -268,7 +350,7 @@ async fn record(
|
|||||||
let order = Uuid::now_v7();
|
let order = Uuid::now_v7();
|
||||||
let price = match source {
|
let price = match source {
|
||||||
Source::Admin | Source::Promo => 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) \
|
||||||
@@ -338,4 +420,33 @@ 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 egyedi szöveges tartalom. Digitális tartalom."
|
||||||
|
);
|
||||||
|
let (name, comment) = find("addon_persons").unwrap().invoice_item();
|
||||||
|
assert_eq!(name, "Online tartalomszolgáltatás – kiegészítő csomag");
|
||||||
|
assert!(comment.ends_with("tartalmaihoz: 5 további személy felvétele. Digitális tartalom."), "{comment}");
|
||||||
|
// No profession and no fortune-telling is implied.
|
||||||
|
for package in &CATALOG {
|
||||||
|
let item = format!("{:?}", package.invoice_item()).to_lowercase();
|
||||||
|
assert!(!item.contains("asztrol") && !item.contains("jóslás") && !item.contains("kártya"), "{item}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn stripe_says_kartya_instead_of_kartyajoslas() {
|
||||||
|
let (name, description) = find("addon_tarot").unwrap().checkout_text();
|
||||||
|
assert_eq!(name, "Sorsfonalak – +5 kártya");
|
||||||
|
assert_eq!(description, "Öt újabb kártya a saját kérdéseidre.");
|
||||||
|
assert_eq!(find("couple").unwrap().checkout_text().0, "Sorsfonalak – Páros");
|
||||||
|
assert!(CATALOG.iter().all(|p| !format!("{:?}", p.checkout_text()).contains("jóslás")));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,6 +35,10 @@ pub async fn me(State(state): St, auth: AuthUser) -> ApiResult<Json<Value>> {
|
|||||||
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 share_reward = super::shares::reward_granted(&state.db, auth.id()).await?;
|
||||||
let referrals = super::shares::referral_rewards(&mut conn, 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<_>>(),
|
||||||
@@ -47,6 +51,8 @@ pub async fn me(State(state): St, auth: AuthUser) -> ApiResult<Json<Value>> {
|
|||||||
"share_reward_granted": share_reward,
|
"share_reward_granted": share_reward,
|
||||||
// Natal analyses earned by bringing new users, and how many can be.
|
// Natal analyses earned by bringing new users, and how many can be.
|
||||||
"referral_rewards": { "earned": referrals, "limit": super::shares::REFERRAL_LIMIT },
|
"referral_rewards": { "earned": referrals, "limit": super::shares::REFERRAL_LIMIT },
|
||||||
|
// The "Számláim" menu shows up with the first invoice.
|
||||||
|
"invoice_count": invoices,
|
||||||
})))
|
})))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -179,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,
|
||||||
@@ -189,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()))
|
||||||
}
|
}
|
||||||
|
|||||||
+209
-107
@@ -1,5 +1,10 @@
|
|||||||
//! Registration and login: e-mail + password, Google; e-mail verification,
|
//! Registration and login: e-mail + password, Google, Apple; password links,
|
||||||
//! password reset, logout.
|
//! logout.
|
||||||
|
//!
|
||||||
|
//! A password can only be set through a link sent to the address (sign-up,
|
||||||
|
//! forgotten password), by whoever opens it. So every password account has a
|
||||||
|
//! confirmed address, and nobody can set a password for someone else's
|
||||||
|
//! address: linking a Google or Apple account with the same address is safe.
|
||||||
|
|
||||||
use axum::Json;
|
use axum::Json;
|
||||||
use axum::extract::State;
|
use axum::extract::State;
|
||||||
@@ -100,14 +105,14 @@ async fn issue_token(
|
|||||||
Ok(token)
|
Ok(token)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Uses a one-time token; returns its user.
|
/// Uses a one-time token of one of `purposes`; returns its user.
|
||||||
async fn consume_token(conn: &mut PgConnection, token: &str, purpose: &str) -> Result<Uuid, ApiError> {
|
async fn consume_token(conn: &mut PgConnection, token: &str, purposes: &[&str]) -> Result<Uuid, ApiError> {
|
||||||
let row: Option<(Uuid,)> = sqlx::query_as(
|
let row: Option<(Uuid,)> = sqlx::query_as(
|
||||||
"UPDATE auth_tokens SET used_at = now() \
|
"UPDATE auth_tokens SET used_at = now() \
|
||||||
WHERE token_hash = $1 AND purpose = $2 AND used_at IS NULL AND expires_at > now() RETURNING user_id",
|
WHERE token_hash = $1 AND purpose = ANY($2) AND used_at IS NULL AND expires_at > now() RETURNING user_id",
|
||||||
)
|
)
|
||||||
.bind(db::token_hash(token.trim()))
|
.bind(db::token_hash(token.trim()))
|
||||||
.bind(purpose)
|
.bind(purposes)
|
||||||
.fetch_optional(conn)
|
.fetch_optional(conn)
|
||||||
.await?;
|
.await?;
|
||||||
row.map(|(id,)| id).ok_or(ApiError::InvalidToken)
|
row.map(|(id,)| id).ok_or(ApiError::InvalidToken)
|
||||||
@@ -141,10 +146,44 @@ pub async fn queue_email_to(
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn queue_verification(state: &AppState, conn: &mut PgConnection, user: &User) -> Result<(), ApiError> {
|
/// The e-mails that carry a password link.
|
||||||
let token = issue_token(conn, user.id, "verify_email", VERIFY_EMAIL_TTL).await?;
|
const LINK_TEMPLATES: [&str; 3] = ["verify_email", "reset_password", "account_exists"];
|
||||||
let url = format!("{}/verify-email?token={token}", state.config.public_base_url);
|
|
||||||
queue_email(conn, user, "verify_email", json!({ "url": url, "display_name": user.display_name })).await
|
/// Whether another password link may go to `email` now: one per kind a
|
||||||
|
/// minute and five an hour, so the forms cannot flood a mailbox.
|
||||||
|
async fn may_send_link(conn: &mut PgConnection, email: &str, template: &str) -> Result<bool, ApiError> {
|
||||||
|
let (same_kind, total): (i64, i64) = sqlx::query_as(
|
||||||
|
"SELECT count(*) FILTER (WHERE template = $2 AND created_at > now() - interval '1 minute'), count(*) \
|
||||||
|
FROM email_outbox WHERE to_email = $1 AND template = ANY($3) AND created_at > now() - interval '1 hour'",
|
||||||
|
)
|
||||||
|
.bind(email)
|
||||||
|
.bind(template)
|
||||||
|
.bind(&LINK_TEMPLATES[..])
|
||||||
|
.fetch_one(conn)
|
||||||
|
.await?;
|
||||||
|
Ok(same_kind == 0 && total < 5)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Sends a link that sets the password: `verify_email` (sign-up, valid for 3
|
||||||
|
/// days), `reset_password` (forgotten password) or `account_exists` (sign-up
|
||||||
|
/// with an address that already has an account), the latter two for 1 hour.
|
||||||
|
async fn queue_password_link(
|
||||||
|
state: &AppState,
|
||||||
|
conn: &mut PgConnection,
|
||||||
|
user: &User,
|
||||||
|
template: &'static str,
|
||||||
|
) -> Result<(), ApiError> {
|
||||||
|
if !may_send_link(conn, &user.email, template).await? {
|
||||||
|
tracing::info!(user = %user.id, template, "password link not sent: one went out a moment ago");
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
let (purpose, ttl) = match template {
|
||||||
|
"verify_email" => ("verify_email", VERIFY_EMAIL_TTL),
|
||||||
|
_ => ("reset_password", RESET_PASSWORD_TTL),
|
||||||
|
};
|
||||||
|
let token = issue_token(conn, user.id, purpose, ttl).await?;
|
||||||
|
let url = format!("{}/jelszo?token={token}", state.config.public_base_url);
|
||||||
|
queue_email(conn, user, template, json!({ "url": url, "display_name": user.display_name })).await
|
||||||
}
|
}
|
||||||
|
|
||||||
fn login_response(
|
fn login_response(
|
||||||
@@ -165,7 +204,6 @@ fn login_response(
|
|||||||
#[serde(deny_unknown_fields)]
|
#[serde(deny_unknown_fields)]
|
||||||
pub struct RegisterRequest {
|
pub struct RegisterRequest {
|
||||||
email: String,
|
email: String,
|
||||||
password: String,
|
|
||||||
display_name: Option<String>,
|
display_name: Option<String>,
|
||||||
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.
|
||||||
@@ -183,57 +221,57 @@ pub fn password_login_enabled(state: &crate::AppState) -> Result<(), ApiError> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Sign-up with an e-mail address: no password yet, only a link to the
|
||||||
|
/// address, where the password is set. Answers 202 the same way whether or
|
||||||
|
/// not the address already has an account (that one gets a link to set a
|
||||||
|
/// password instead), so the form does not reveal who is registered.
|
||||||
pub async fn register(
|
pub async fn register(
|
||||||
State(state): St,
|
State(state): St,
|
||||||
headers: HeaderMap,
|
|
||||||
jar: CookieJar,
|
|
||||||
WithRejection(Json(req), _): Body<RegisterRequest>,
|
WithRejection(Json(req), _): Body<RegisterRequest>,
|
||||||
) -> ApiResult<impl IntoResponse> {
|
) -> ApiResult<impl IntoResponse> {
|
||||||
password_login_enabled(&state)?;
|
password_login_enabled(&state)?;
|
||||||
let email = normalize_email(&req.email)?;
|
let email = normalize_email(&req.email)?;
|
||||||
validate_password(&req.password)?;
|
|
||||||
let locale = validate_locale(&state, req.locale.as_deref())?;
|
let locale = validate_locale(&state, req.locale.as_deref())?;
|
||||||
let hash = hash_password(req.password).await?;
|
|
||||||
|
|
||||||
let mut tx = state.db.begin().await?;
|
let mut tx = state.db.begin().await?;
|
||||||
let exists: Option<(Uuid,)> =
|
let existing: Option<User> =
|
||||||
sqlx::query_as("SELECT id FROM users WHERE email = $1").bind(&email).fetch_optional(&mut *tx).await?;
|
sqlx::query_as(&format!("SELECT {USER_COLUMNS} FROM users WHERE email = $1 FOR UPDATE"))
|
||||||
if exists.is_some() {
|
.bind(&email)
|
||||||
return Err(ApiError::conflict("email_taken", "an account with this e-mail address already exists"));
|
.fetch_optional(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
match existing {
|
||||||
|
Some(user) if user.email_verified_at.is_none() => {
|
||||||
|
queue_password_link(&state, &mut tx, &user, "verify_email").await?;
|
||||||
|
}
|
||||||
|
Some(user) => queue_password_link(&state, &mut tx, &user, "account_exists").await?,
|
||||||
|
None => {
|
||||||
|
super::invitations::admit(&state, &mut tx, &email, req.invite_token.as_deref()).await?;
|
||||||
|
let user_id = Uuid::now_v7();
|
||||||
|
sqlx::query("INSERT INTO users (id, email, display_name, locale) VALUES ($1, $2, $3, $4)")
|
||||||
|
.bind(user_id)
|
||||||
|
.bind(&email)
|
||||||
|
.bind(clean_name(req.display_name))
|
||||||
|
.bind(&locale)
|
||||||
|
.execute(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
// Packages of invitations go to this account; only whoever opens
|
||||||
|
// the link in the mailbox can ever log in to it.
|
||||||
|
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 user = load_user(&mut tx, user_id).await?;
|
||||||
|
queue_password_link(&state, &mut tx, &user, "verify_email").await?;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
super::invitations::admit(&state, &mut tx, &email, req.invite_token.as_deref()).await?;
|
|
||||||
let user_id = Uuid::now_v7();
|
|
||||||
sqlx::query("INSERT INTO users (id, email, display_name, locale) VALUES ($1, $2, $3, $4)")
|
|
||||||
.bind(user_id)
|
|
||||||
.bind(&email)
|
|
||||||
.bind(clean_name(req.display_name))
|
|
||||||
.bind(&locale)
|
|
||||||
.execute(&mut *tx)
|
|
||||||
.await?;
|
|
||||||
sqlx::query("INSERT INTO auth_identities (id, user_id, provider, subject, password_hash, email) VALUES ($1, $2, 'password', $3, $4, $5)")
|
|
||||||
.bind(Uuid::now_v7())
|
|
||||||
.bind(user_id)
|
|
||||||
.bind(user_id.to_string())
|
|
||||||
.bind(hash)
|
|
||||||
.bind(&email)
|
|
||||||
.execute(&mut *tx)
|
|
||||||
.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?;
|
|
||||||
apply_bootstrap_admin(&state, &mut tx, &mut user).await?;
|
|
||||||
queue_verification(&state, &mut tx, &user).await?;
|
|
||||||
tx.commit().await?;
|
tx.commit().await?;
|
||||||
|
Ok((StatusCode::ACCEPTED, Json(json!({ "sent": true }))))
|
||||||
let session = create_session(&state.db, &state.config, user.id, user_agent(&headers)).await?;
|
|
||||||
Ok(login_response(&state, jar, &user, session, true))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
@@ -254,9 +292,12 @@ pub async fn login(
|
|||||||
let email = normalize_email(&req.email).map_err(|_| invalid())?;
|
let email = normalize_email(&req.email).map_err(|_| invalid())?;
|
||||||
state.login_limiter.check(&email)?;
|
state.login_limiter.check(&email)?;
|
||||||
|
|
||||||
|
// Passwords are set through e-mailed links, so every password account has
|
||||||
|
// a confirmed address; an unconfirmed one (made before that) cannot log in.
|
||||||
let row: Option<(Uuid, String)> = sqlx::query_as(
|
let row: Option<(Uuid, String)> = sqlx::query_as(
|
||||||
"SELECT u.id, i.password_hash FROM users u \
|
"SELECT u.id, i.password_hash FROM users u \
|
||||||
JOIN auth_identities i ON i.user_id = u.id AND i.provider = 'password' WHERE u.email = $1",
|
JOIN auth_identities i ON i.user_id = u.id AND i.provider = 'password' \
|
||||||
|
WHERE u.email = $1 AND u.email_verified_at IS NOT NULL",
|
||||||
)
|
)
|
||||||
.bind(&email)
|
.bind(&email)
|
||||||
.fetch_optional(&state.db)
|
.fetch_optional(&state.db)
|
||||||
@@ -307,20 +348,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?;
|
||||||
@@ -331,7 +430,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",
|
||||||
)
|
)
|
||||||
@@ -341,9 +457,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())
|
||||||
@@ -355,7 +471,7 @@ 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?;
|
||||||
@@ -363,21 +479,27 @@ pub async fn google(
|
|||||||
&mut tx,
|
&mut tx,
|
||||||
id,
|
id,
|
||||||
&email,
|
&email,
|
||||||
req.invite_token.as_deref(),
|
signup.invite_token.as_deref(),
|
||||||
state.config.free_person_slots,
|
state.config.free_person_slots,
|
||||||
)
|
)
|
||||||
.await?;
|
.await?;
|
||||||
super::shares::record_referral(&mut tx, state.config.referral_rewards, id, req.referral.as_deref())
|
super::shares::record_referral(
|
||||||
.await?;
|
&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)
|
||||||
@@ -386,11 +508,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 -------------------------------------------------------------------------------
|
||||||
@@ -406,34 +528,7 @@ pub async fn logout_all(State(state): St, auth: AuthUser, jar: CookieJar) -> Api
|
|||||||
Ok((StatusCode::NO_CONTENT, jar.add(removal_cookie(&state.config))))
|
Ok((StatusCode::NO_CONTENT, jar.add(removal_cookie(&state.config))))
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- e-mail verification and password reset ------------------------------------------------
|
// --- password links ---------------------------------------------------------------------
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
|
||||||
#[serde(deny_unknown_fields)]
|
|
||||||
pub struct TokenRequest {
|
|
||||||
token: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn verify_email(State(state): St, WithRejection(Json(req), _): Body<TokenRequest>) -> ApiResult<Json<Value>> {
|
|
||||||
let mut tx = state.db.begin().await?;
|
|
||||||
let user_id = consume_token(&mut tx, &req.token, "verify_email").await?;
|
|
||||||
sqlx::query("UPDATE users SET email_verified_at = COALESCE(email_verified_at, now()) WHERE id = $1")
|
|
||||||
.bind(user_id)
|
|
||||||
.execute(&mut *tx)
|
|
||||||
.await?;
|
|
||||||
tx.commit().await?;
|
|
||||||
Ok(Json(json!({ "verified": true })))
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn resend_verification(State(state): St, auth: AuthUser) -> ApiResult<StatusCode> {
|
|
||||||
if auth.user.email_verified_at.is_some() {
|
|
||||||
return Err(ApiError::conflict("already_verified", "the e-mail address is already verified"));
|
|
||||||
}
|
|
||||||
let mut tx = state.db.begin().await?;
|
|
||||||
queue_verification(&state, &mut tx, &auth.user).await?;
|
|
||||||
tx.commit().await?;
|
|
||||||
Ok(StatusCode::ACCEPTED)
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
#[serde(deny_unknown_fields)]
|
#[serde(deny_unknown_fields)]
|
||||||
@@ -441,7 +536,9 @@ pub struct ResetRequest {
|
|||||||
email: String,
|
email: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Always 202, so the response does not reveal whether the address is registered.
|
/// Forgotten password: a link to set a new one (also adds a password to a
|
||||||
|
/// Google or Apple account). Always 202, so the response does not reveal
|
||||||
|
/// whether the address is registered.
|
||||||
pub async fn request_password_reset(
|
pub async fn request_password_reset(
|
||||||
State(state): St,
|
State(state): St,
|
||||||
WithRejection(Json(req), _): Body<ResetRequest>,
|
WithRejection(Json(req), _): Body<ResetRequest>,
|
||||||
@@ -449,14 +546,12 @@ pub async fn request_password_reset(
|
|||||||
password_login_enabled(&state)?;
|
password_login_enabled(&state)?;
|
||||||
let Ok(email) = normalize_email(&req.email) else { return Ok(StatusCode::ACCEPTED) };
|
let Ok(email) = normalize_email(&req.email) else { return Ok(StatusCode::ACCEPTED) };
|
||||||
let mut tx = state.db.begin().await?;
|
let mut tx = state.db.begin().await?;
|
||||||
let user: Option<User> = sqlx::query_as(&format!("SELECT {USER_COLUMNS} FROM users WHERE email = $1"))
|
let user: Option<User> = sqlx::query_as(&format!("SELECT {USER_COLUMNS} FROM users WHERE email = $1 FOR UPDATE"))
|
||||||
.bind(&email)
|
.bind(&email)
|
||||||
.fetch_optional(&mut *tx)
|
.fetch_optional(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
if let Some(user) = user {
|
if let Some(user) = user {
|
||||||
let token = issue_token(&mut tx, user.id, "reset_password", RESET_PASSWORD_TTL).await?;
|
queue_password_link(&state, &mut tx, &user, "reset_password").await?;
|
||||||
let url = format!("{}/reset-password?token={token}", state.config.public_base_url);
|
|
||||||
queue_email(&mut tx, &user, "reset_password", json!({ "url": url, "display_name": user.display_name })).await?;
|
|
||||||
}
|
}
|
||||||
tx.commit().await?;
|
tx.commit().await?;
|
||||||
Ok(StatusCode::ACCEPTED)
|
Ok(StatusCode::ACCEPTED)
|
||||||
@@ -464,31 +559,38 @@ pub async fn request_password_reset(
|
|||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
#[serde(deny_unknown_fields)]
|
#[serde(deny_unknown_fields)]
|
||||||
pub struct ResetConfirmRequest {
|
pub struct SetPasswordRequest {
|
||||||
token: String,
|
token: String,
|
||||||
password: String,
|
password: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Sets a new password (adding the password login if the user had only
|
/// Sets the password with an e-mailed link (sign-up or forgotten password):
|
||||||
/// Google) and ends all sessions.
|
/// the address counts as confirmed, every other session ends, and this one
|
||||||
pub async fn confirm_password_reset(
|
/// is logged in.
|
||||||
|
pub async fn set_password_with_link(
|
||||||
State(state): St,
|
State(state): St,
|
||||||
WithRejection(Json(req), _): Body<ResetConfirmRequest>,
|
headers: HeaderMap,
|
||||||
) -> ApiResult<StatusCode> {
|
jar: CookieJar,
|
||||||
|
WithRejection(Json(req), _): Body<SetPasswordRequest>,
|
||||||
|
) -> ApiResult<impl IntoResponse> {
|
||||||
password_login_enabled(&state)?;
|
password_login_enabled(&state)?;
|
||||||
validate_password(&req.password)?;
|
validate_password(&req.password)?;
|
||||||
let hash = hash_password(req.password).await?;
|
let hash = hash_password(req.password).await?;
|
||||||
let mut tx = state.db.begin().await?;
|
let mut tx = state.db.begin().await?;
|
||||||
let user_id = consume_token(&mut tx, &req.token, "reset_password").await?;
|
let user_id = consume_token(&mut tx, &req.token, &["verify_email", "reset_password"]).await?;
|
||||||
set_password(&mut tx, user_id, &hash).await?;
|
set_password(&mut tx, user_id, &hash).await?;
|
||||||
// The link arrived in the mailbox, so the address is verified.
|
|
||||||
sqlx::query("UPDATE users SET email_verified_at = COALESCE(email_verified_at, now()) WHERE id = $1")
|
sqlx::query("UPDATE users SET email_verified_at = COALESCE(email_verified_at, now()) WHERE id = $1")
|
||||||
.bind(user_id)
|
.bind(user_id)
|
||||||
.execute(&mut *tx)
|
.execute(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
sqlx::query("DELETE FROM sessions WHERE user_id = $1").bind(user_id).execute(&mut *tx).await?;
|
sqlx::query("DELETE FROM sessions WHERE user_id = $1").bind(user_id).execute(&mut *tx).await?;
|
||||||
|
let mut user = load_user(&mut tx, user_id).await?;
|
||||||
|
apply_bootstrap_admin(&state, &mut tx, &mut user).await?;
|
||||||
tx.commit().await?;
|
tx.commit().await?;
|
||||||
Ok(StatusCode::NO_CONTENT)
|
state.login_limiter.succeeded(&user.email);
|
||||||
|
|
||||||
|
let session = create_session(&state.db, &state.config, user.id, user_agent(&headers)).await?;
|
||||||
|
Ok(login_response(&state, jar, &user, session, false))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Creates or replaces the password identity.
|
/// Creates or replaces the password identity.
|
||||||
|
|||||||
@@ -0,0 +1,117 @@
|
|||||||
|
//! The public birth chart (`/szuletesi-horoszkop`): the whole natal chart from
|
||||||
|
//! birth data, without an account, plus the country list and place search it
|
||||||
|
//! needs. A calculation only: no AI, nothing is stored. Each visitor address
|
||||||
|
//! may make a limited number of calculations and place searches an hour, so
|
||||||
|
//! the endpoints cannot serve as a free calculation service for other apps.
|
||||||
|
|
||||||
|
use axum::Json;
|
||||||
|
use axum::extract::{Query, State};
|
||||||
|
use axum::http::HeaderMap;
|
||||||
|
use axum_extra::extract::WithRejection;
|
||||||
|
use serde::Deserialize;
|
||||||
|
use serde_json::{Value, json};
|
||||||
|
|
||||||
|
use super::{Body, St, client_ip};
|
||||||
|
use crate::error::{ApiError, ApiResult};
|
||||||
|
use crate::views::chart_highlights;
|
||||||
|
|
||||||
|
/// The limiter key of the visitor (all unknown addresses share one).
|
||||||
|
fn visitor(headers: &HeaderMap) -> String {
|
||||||
|
client_ip(headers).map_or_else(|| "unknown".to_string(), |ip| format!("ip:{ip}"))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn valid_country(country: &str) -> bool {
|
||||||
|
country.len() == 2 && country.chars().all(|c| c.is_ascii_uppercase())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn countries(State(state): St) -> ApiResult<Json<Value>> {
|
||||||
|
Ok(Json(state.horoscope.countries().await?))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
pub struct PlacesQuery {
|
||||||
|
country: String,
|
||||||
|
q: String,
|
||||||
|
limit: Option<u32>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn places(
|
||||||
|
State(state): St,
|
||||||
|
headers: HeaderMap,
|
||||||
|
WithRejection(Query(query), _): WithRejection<Query<PlacesQuery>, ApiError>,
|
||||||
|
) -> ApiResult<Json<Value>> {
|
||||||
|
let q = query.q.trim();
|
||||||
|
if !valid_country(&query.country) || q.chars().count() < 2 || q.chars().count() > 80 {
|
||||||
|
return Err(ApiError::BadRequest("a country code and 2 to 80 characters of a place name are needed".into()));
|
||||||
|
}
|
||||||
|
state.places_limiter.hit(&visitor(&headers))?;
|
||||||
|
Ok(Json(state.horoscope.places(&query.country, q, query.limit.unwrap_or(8).min(10)).await?))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct ChartRequest {
|
||||||
|
date: String,
|
||||||
|
/// "HH:MM"; without it there is no Ascendant.
|
||||||
|
time: Option<String>,
|
||||||
|
country: String,
|
||||||
|
geonames_id: i64,
|
||||||
|
/// "earlier" or "later", for a time that occurred twice (clocks set back).
|
||||||
|
ambiguous_time: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Whether a point may have been in the neighbouring sign at the start or the
|
||||||
|
/// end of the birth day (when the birth time is unknown).
|
||||||
|
fn uncertain(point: &Value, default_speed: f64) -> bool {
|
||||||
|
let speed = point["speed"].as_f64().unwrap_or(default_speed).abs();
|
||||||
|
point["degree_in_sign"].as_f64().is_some_and(|d| d < speed / 2.0 || 30.0 - d < speed / 2.0)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The natal chart of the birth data, as the chart pages show it.
|
||||||
|
pub async fn chart(
|
||||||
|
State(state): St,
|
||||||
|
headers: HeaderMap,
|
||||||
|
WithRejection(Json(req), _): Body<ChartRequest>,
|
||||||
|
) -> ApiResult<Json<Value>> {
|
||||||
|
if !valid_country(&req.country) {
|
||||||
|
return Err(ApiError::BadRequest("invalid country code".into()));
|
||||||
|
}
|
||||||
|
if req.ambiguous_time.as_deref().is_some_and(|a| a != "earlier" && a != "later") {
|
||||||
|
return Err(ApiError::BadRequest("ambiguous_time is 'earlier' or 'later'".into()));
|
||||||
|
}
|
||||||
|
state.calculator_limiter.hit(&visitor(&headers))?;
|
||||||
|
let mut birth = json!({ "date": req.date, "country": req.country, "geonames_id": req.geonames_id });
|
||||||
|
if let Some(time) = &req.time {
|
||||||
|
birth["time"] = json!(time);
|
||||||
|
}
|
||||||
|
if let Some(ambiguous) = &req.ambiguous_time {
|
||||||
|
birth["ambiguous_time"] = json!(ambiguous);
|
||||||
|
}
|
||||||
|
let chart = state.horoscope.natal(&birth).await?;
|
||||||
|
let time_known = req.time.is_some();
|
||||||
|
let point = |id: &str| {
|
||||||
|
chart["points"]
|
||||||
|
.as_array()
|
||||||
|
.and_then(|points| points.iter().find(|p| p["id"] == id))
|
||||||
|
.cloned()
|
||||||
|
.unwrap_or(Value::Null)
|
||||||
|
};
|
||||||
|
let uncertain = json!({
|
||||||
|
"sun": !time_known && uncertain(&point("sun"), 1.0),
|
||||||
|
"moon": !time_known && uncertain(&point("moon"), 13.2),
|
||||||
|
});
|
||||||
|
Ok(Json(json!({ "highlights": chart_highlights(&chart), "uncertain": uncertain, "chart": chart })))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn signs_near_a_border_are_uncertain() {
|
||||||
|
assert!(uncertain(&json!({"degree_in_sign": 3.2, "speed": 12.6}), 13.2));
|
||||||
|
assert!(!uncertain(&json!({"degree_in_sign": 15.0, "speed": 12.6}), 13.2));
|
||||||
|
assert!(uncertain(&json!({"degree_in_sign": 29.8}), 1.0));
|
||||||
|
assert!(!uncertain(&json!({"degree_in_sign": 29.0}), 1.0));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -342,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)
|
||||||
|
|||||||
@@ -89,8 +89,8 @@ pub async fn mark_accepted(
|
|||||||
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)
|
||||||
@@ -603,10 +603,19 @@ 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?;
|
sqlx::query("DELETE FROM waitlist WHERE email = $1").bind(&email).execute(&mut *tx).await?;
|
||||||
@@ -630,12 +639,7 @@ pub async fn join_waitlist(
|
|||||||
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())?;
|
||||||
// Every sign-up sends an e-mail: a few per address, so the form cannot be used to flood someone.
|
// Every sign-up sends an e-mail: a few per address, so the form cannot be used to flood someone.
|
||||||
let ip = headers
|
let ip = super::client_ip(&headers).unwrap_or_else(|| "unknown".into());
|
||||||
.get("x-forwarded-for")
|
|
||||||
.and_then(|v| v.to_str().ok())
|
|
||||||
.and_then(|v| v.split(',').next())
|
|
||||||
.map(str::trim)
|
|
||||||
.unwrap_or("unknown");
|
|
||||||
let key = format!("waitlist:{ip}");
|
let key = format!("waitlist:{ip}");
|
||||||
state.login_limiter.check(&key)?;
|
state.login_limiter.check(&key)?;
|
||||||
let token = db::new_token();
|
let token = db::new_token();
|
||||||
|
|||||||
@@ -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, \
|
||||||
|
|||||||
@@ -9,19 +9,22 @@ mod account;
|
|||||||
mod admin;
|
mod admin;
|
||||||
mod analyses;
|
mod analyses;
|
||||||
mod auth;
|
mod auth;
|
||||||
|
mod calculator;
|
||||||
mod charts;
|
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 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;
|
||||||
|
|
||||||
@@ -34,8 +37,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;
|
||||||
@@ -56,6 +58,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))
|
||||||
@@ -65,18 +76,22 @@ 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/resend-verification", post(auth::resend_verification))
|
|
||||||
.route("/v1/auth/password-reset", post(auth::request_password_reset))
|
.route("/v1/auth/password-reset", post(auth::request_password_reset))
|
||||||
.route("/v1/auth/password-reset/confirm", post(auth::confirm_password_reset))
|
.route("/v1/auth/set-password", post(auth::set_password_with_link))
|
||||||
// own account (GDPR export and deletion included)
|
// own account (GDPR export and deletion included)
|
||||||
.route("/v1/me", get(account::me).patch(account::update_me).delete(account::delete_me))
|
.route("/v1/me", get(account::me).patch(account::update_me).delete(account::delete_me))
|
||||||
.route("/v1/me/password", post(account::change_password))
|
.route("/v1/me/password", post(account::change_password))
|
||||||
.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))
|
||||||
@@ -96,6 +111,8 @@ 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/promo-codes/redeem", post(promo::redeem))
|
||||||
.route("/v1/admin/promo-codes", get(promo::list).post(promo::create))
|
.route("/v1/admin/promo-codes", get(promo::list).post(promo::create))
|
||||||
@@ -109,6 +126,9 @@ pub fn router(state: Arc<AppState>) -> Router {
|
|||||||
.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))
|
||||||
.route("/v1/public/waitlist", post(invitations::join_waitlist))
|
.route("/v1/public/waitlist", post(invitations::join_waitlist))
|
||||||
|
.route("/v1/public/chart", post(calculator::chart))
|
||||||
|
.route("/v1/public/geo/countries", get(calculator::countries))
|
||||||
|
.route("/v1/public/geo/places", get(calculator::places))
|
||||||
// administration
|
// administration
|
||||||
.route("/v1/admin/users", get(admin::list_users))
|
.route("/v1/admin/users", get(admin::list_users))
|
||||||
.route("/v1/admin/users/{id}", patch(admin::update_user))
|
.route("/v1/admin/users/{id}", patch(admin::update_user))
|
||||||
@@ -132,11 +152,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)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -159,9 +176,19 @@ 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,
|
"user_invites": c.user_invites,
|
||||||
"referral_rewards": c.referral_rewards,
|
"referral_rewards": c.referral_rewards,
|
||||||
"signup_mode": c.signup_mode.as_str(),
|
"signup_mode": c.signup_mode.as_str(),
|
||||||
|
|||||||
@@ -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,284 @@ 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-22";
|
||||||
|
|
||||||
|
/// 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 (checkout_name, checkout_description) = package.checkout_text();
|
||||||
|
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]", &checkout_name),
|
||||||
|
field("line_items[0][price_data][product_data][description]", &checkout_description),
|
||||||
|
field("metadata[package]", package.id),
|
||||||
|
field("metadata[user_id]", &auth.id().to_string()),
|
||||||
|
field("payment_intent_data[description]", &checkout_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 })))
|
||||||
|
}
|
||||||
|
|||||||
@@ -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?;
|
||||||
|
|||||||
@@ -61,12 +61,7 @@ struct ShareRow {
|
|||||||
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, owner_ip_hash";
|
view_count, created_at, revoked_at, owner_ip_hash";
|
||||||
|
|
||||||
/// The visitor's address: the first `X-Forwarded-For` entry (Caddy writes it
|
use super::client_ip;
|
||||||
/// from Cloudflare's, the frontend passes it on).
|
|
||||||
fn client_ip(headers: &HeaderMap) -> Option<String> {
|
|
||||||
let first = headers.get("x-forwarded-for")?.to_str().ok()?.split(',').next()?.trim();
|
|
||||||
(!first.is_empty()).then(|| first.to_string())
|
|
||||||
}
|
|
||||||
|
|
||||||
/// An address salted with the slug, so the stored value says nothing by itself.
|
/// An address salted with the slug, so the stored value says nothing by itself.
|
||||||
fn ip_hash(slug: &str, ip: &str) -> Vec<u8> {
|
fn ip_hash(slug: &str, ip: &str) -> Vec<u8> {
|
||||||
@@ -231,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) })
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -330,6 +326,11 @@ pub async fn visit(
|
|||||||
if sharer || same_place || is_robot(user_agent(&headers).as_deref()) {
|
if sharer || same_place || is_robot(user_agent(&headers).as_deref()) {
|
||||||
return Ok(Json(json!({ "counted": false })));
|
return Ok(Json(json!({ "counted": false })));
|
||||||
}
|
}
|
||||||
|
// The same visitor again within half an hour (a reload, back and forth).
|
||||||
|
let visitor = format!("{}:{}", share.slug, client_ip(&headers).unwrap_or_default());
|
||||||
|
if state.share_visits.hit(&visitor).is_err() {
|
||||||
|
return Ok(Json(json!({ "counted": false })));
|
||||||
|
}
|
||||||
let mut tx = state.db.begin().await?;
|
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?;
|
sqlx::query("UPDATE shares SET view_count = view_count + 1 WHERE id = $1").bind(share.id).execute(&mut *tx).await?;
|
||||||
let rewarded = sqlx::query(
|
let rewarded = sqlx::query(
|
||||||
|
|||||||
@@ -469,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",
|
||||||
)
|
)
|
||||||
@@ -480,7 +480,17 @@ 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)
|
||||||
|
|||||||
@@ -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));
|
||||||
|
}
|
||||||
|
}
|
||||||
+777
-85
File diff suppressed because it is too large
Load Diff
@@ -2,25 +2,15 @@ import Link from "next/link";
|
|||||||
|
|
||||||
import { ChartWheel } from "@/components/ChartWheel";
|
import { ChartWheel } from "@/components/ChartWheel";
|
||||||
import { Rich } from "@/components/Rich";
|
import { Rich } from "@/components/Rich";
|
||||||
|
import { TarotCard, TarotCardBack } from "@/components/tarot/TarotCard";
|
||||||
import { Logo, PublicHeader } from "@/components/SiteHeader";
|
import { Logo, PublicHeader } from "@/components/SiteHeader";
|
||||||
import { Waitlist } from "@/components/Waitlist";
|
import { Waitlist } from "@/components/Waitlist";
|
||||||
import example from "@/content/pelda.json";
|
import example from "@/content/pelda.json";
|
||||||
|
import { tarotCard } from "@/lib/tarot";
|
||||||
import type { AnalysisContent, ChartResult } from "@/lib/types";
|
import type { AnalysisContent, ChartResult } from "@/lib/types";
|
||||||
|
|
||||||
// A quiet starfield, the same on every render.
|
/** The cards fanned out next to the tarot line (after a card back). */
|
||||||
const STARS = (() => {
|
const TAROT_CARDS = ["major-2", "major-17"].map((id) => tarotCard(id)).filter((c) => c !== undefined);
|
||||||
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"];
|
const MONTHS = ["márc", "ápr", "máj", "jún", "júl", "aug", "szept", "okt", "nov", "dec", "jan", "febr"];
|
||||||
|
|
||||||
@@ -63,11 +53,6 @@ export function Landing({ inviteOnly }: { inviteOnly: boolean }) {
|
|||||||
<PublicHeader onHome />
|
<PublicHeader onHome />
|
||||||
|
|
||||||
<section className="lp-hero">
|
<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-wrap lp-hero-grid">
|
||||||
<div className="lp-hero-text">
|
<div className="lp-hero-text">
|
||||||
<span className="eyebrow lp-rise lp-r1">Születési képlet · Éves előrejelzés · Kapcsolat</span>
|
<span className="eyebrow lp-rise lp-r1">Születési képlet · Éves előrejelzés · Kapcsolat</span>
|
||||||
@@ -81,8 +66,8 @@ export function Landing({ inviteOnly }: { inviteOnly: boolean }) {
|
|||||||
belőle. Megmutatjuk, mit hoz az éved, és mennyire illetek össze azzal, akit szeretsz.
|
belőle. Megmutatjuk, mit hoz az éved, és mennyire illetek össze azzal, akit szeretsz.
|
||||||
</p>
|
</p>
|
||||||
<p className="ai-line lp-ai-line lp-rise lp-r3">
|
<p className="ai-line lp-ai-line lp-rise lp-r3">
|
||||||
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 className="lp-actions lp-rise lp-r4">
|
<div className="lp-actions lp-rise lp-r4">
|
||||||
<Link href="/belepes" className="btn btn-primary lp-btn">
|
<Link href="/belepes" className="btn btn-primary lp-btn">
|
||||||
@@ -92,6 +77,10 @@ export function Landing({ inviteOnly }: { inviteOnly: boolean }) {
|
|||||||
Példaelemzés
|
Példaelemzés
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
|
<p className="lp-free-line lp-rise lp-r4">
|
||||||
|
<span className="lp-free-label">Ingyenes</span>
|
||||||
|
<Link href="/szuletesi-horoszkop">Nézd meg a születési horoszkópodat belépés nélkül →</Link>
|
||||||
|
</p>
|
||||||
<p className="hint lp-rise lp-r4">
|
<p className="hint lp-rise lp-r4">
|
||||||
{inviteOnly ? (
|
{inviteOnly ? (
|
||||||
<>
|
<>
|
||||||
@@ -132,12 +121,40 @@ export function Landing({ inviteOnly }: { inviteOnly: boolean }) {
|
|||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
<section className="lp-free-band" aria-labelledby="free-title">
|
||||||
|
<div className="lp-wrap">
|
||||||
|
<div className="lp-free-head">
|
||||||
|
<span className="lp-free-label">Ingyenes</span>
|
||||||
|
<h2 id="free-title" className="lp-free-title">
|
||||||
|
Belépés nélkül is kipróbálhatod
|
||||||
|
</h2>
|
||||||
|
</div>
|
||||||
|
<div className="lp-free-grid">
|
||||||
|
<Link href="/szuletesi-horoszkop" className="card lp-free-card">
|
||||||
|
<strong>Születési horoszkóp</strong>
|
||||||
|
<span className="muted">
|
||||||
|
A teljes képleted percre pontosan: képletrajz, aszcendens, holdjegy, bolygók a jegyekben és a házakban,
|
||||||
|
fényszögek.
|
||||||
|
</span>
|
||||||
|
<span className="lp-free-go">Elkészítem →</span>
|
||||||
|
</Link>
|
||||||
|
<Link href="/csillagjegyek" className="card lp-free-card">
|
||||||
|
<strong>A 12 csillagjegy</strong>
|
||||||
|
<span className="muted">
|
||||||
|
Milyen a jegyed napjegyként, holdjegyként és aszcendensként? Párkapcsolat, munka, és ami nem igaz róla.
|
||||||
|
</span>
|
||||||
|
<span className="lp-free-go">Megnézem →</span>
|
||||||
|
</Link>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
<section className="lp-band lp-why" aria-labelledby="why-title">
|
<section className="lp-band lp-why" aria-labelledby="why-title">
|
||||||
<div className="lp-wrap lp-stack">
|
<div className="lp-wrap lp-stack">
|
||||||
<div className="lp-intro">
|
<div className="lp-intro">
|
||||||
<span className="eyebrow">Miért más?</span>
|
<span className="eyebrow">Miért más?</span>
|
||||||
<h2 id="why-title" className="lp-h2">
|
<h2 id="why-title" className="lp-h2">
|
||||||
Egy asztrológus mélysége, töredék áron
|
Alapos elemzés, töredék áron
|
||||||
</h2>
|
</h2>
|
||||||
</div>
|
</div>
|
||||||
<ul className="lp-why-grid">
|
<ul className="lp-why-grid">
|
||||||
@@ -158,10 +175,10 @@ export function Landing({ inviteOnly }: { inviteOnly: boolean }) {
|
|||||||
<circle cx="12" cy="12" r="4" />
|
<circle cx="12" cy="12" r="4" />
|
||||||
<path d="M12 3v5M12 16v5M3 12h5M16 12h5" />
|
<path d="M12 3v5M12 16v5M3 12h5M16 12h5" />
|
||||||
</svg>
|
</svg>
|
||||||
<h3 className="lp-step-title">Asztrológusi mélység</h3>
|
<h3 className="lp-step-title">Az egész képletet olvassa</h3>
|
||||||
<p className="lp-small">
|
<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
|
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, ahogy egy tapasztalt asztrológus is tenné.
|
az év tranzitjaival együtt: nem egy-egy fényállást, hanem az összefüggéseket.
|
||||||
</p>
|
</p>
|
||||||
</li>
|
</li>
|
||||||
<li className="card lp-why-card">
|
<li className="card lp-why-card">
|
||||||
@@ -378,6 +395,28 @@ export function Landing({ inviteOnly }: { inviteOnly: boolean }) {
|
|||||||
</div>
|
</div>
|
||||||
</article>
|
</article>
|
||||||
</div>
|
</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>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
@@ -453,11 +492,12 @@ export function Landing({ inviteOnly }: { inviteOnly: boolean }) {
|
|||||||
<div className="lp-wrap lp-footer-inner">
|
<div className="lp-wrap lp-footer-inner">
|
||||||
<Logo />
|
<Logo />
|
||||||
<nav aria-label="Lábléc" className="lp-footer-nav">
|
<nav aria-label="Lábléc" className="lp-footer-nav">
|
||||||
|
<Link href="/szuletesi-horoszkop">Születési horoszkóp</Link>
|
||||||
|
<Link href="/csillagjegyek">Csillagjegyek</Link>
|
||||||
<Link href="/pelda">Példaelemzés</Link>
|
<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="/adatvedelem">Adatvédelem</Link>
|
||||||
<Link href="/privacy" lang="en">
|
|
||||||
Privacy Policy
|
|
||||||
</Link>
|
|
||||||
<Link href="/belepes">Belépés</Link>
|
<Link href="/belepes">Belépés</Link>
|
||||||
</nav>
|
</nav>
|
||||||
<span className="hint">© {new Date().getFullYear()} Sorsfonalak</span>
|
<span className="hint">© {new Date().getFullYear()} Sorsfonalak</span>
|
||||||
|
|||||||
@@ -1,13 +1,15 @@
|
|||||||
import type { Metadata } from "next";
|
import type { Metadata } from "next";
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
|
|
||||||
|
import { OperatorDetails } from "@/components/OperatorDetails";
|
||||||
import { PublicHeader } from "@/components/SiteHeader";
|
import { PublicHeader } from "@/components/SiteHeader";
|
||||||
import { OPERATOR, PRIVACY_UPDATED, operatorDetails } from "@/lib/legal";
|
import { OPERATOR, PRIVACY_UPDATED } from "@/lib/legal";
|
||||||
import { getMe } from "@/lib/server";
|
import { getMe } from "@/lib/server";
|
||||||
|
|
||||||
export const metadata: Metadata = {
|
export const metadata: Metadata = {
|
||||||
title: "Adatvédelmi tájékoztató",
|
title: "Adatvédelmi tájékoztató",
|
||||||
description: "Hogyan kezeli a Sorsfonalak a személyes adataidat.",
|
description: "Hogyan kezeli a Sorsfonalak a személyes adataidat.",
|
||||||
|
alternates: { canonical: "/adatvedelem", languages: { hu: "/adatvedelem", en: "/privacy" } },
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Privacy policy: public, also for visitors who are not logged in. */
|
/** Privacy policy: public, also for visitors who are not logged in. */
|
||||||
@@ -29,14 +31,8 @@ export default async function PrivacyPage() {
|
|||||||
<section>
|
<section>
|
||||||
<h2>1. Ki kezeli az adataidat?</h2>
|
<h2>1. Ki kezeli az adataidat?</h2>
|
||||||
<p>
|
<p>
|
||||||
{operatorDetails() ? (
|
A Sorsfonalak szolgáltatás (sorsfonalak.hu) adatkezelőjének adatai a tájékoztató végén, a 12. pontban
|
||||||
<>
|
vannak. Adatvédelmi és minden más kérdésben itt érsz el minket:{" "}
|
||||||
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}`}>
|
<a href={`mailto:${OPERATOR.email}`}>
|
||||||
<strong>{OPERATOR.email}</strong>
|
<strong>{OPERATOR.email}</strong>
|
||||||
</a>
|
</a>
|
||||||
@@ -57,10 +53,21 @@ 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>
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
E-mail-cím és jelszó, ha e-mail-címmel regisztrálsz (a jelszót nem tároljuk, csak egy sózott,
|
||||||
|
visszafejthetetlen lenyomatát, hash-ét)
|
||||||
|
</td>
|
||||||
|
<td>Belépés; a címre küldött linkkel igazolod, hogy a cím a tiéd, és ezzel adhatsz meg új jelszót</td>
|
||||||
|
<td>Szerződés teljesítése</td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Megjelenített név, az elemzések nyelve</td>
|
<td>Megjelenített név, az elemzések nyelve</td>
|
||||||
<td>A szolgáltatás személyre szabása</td>
|
<td>A szolgáltatás személyre szabása</td>
|
||||||
@@ -77,7 +84,9 @@ export default async function PrivacyPage() {
|
|||||||
<td>Szerződés teljesítése; a felvételhez az érintett beleegyezése szükséges (lásd 5. 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, az elkészült elemzések és kártyajóslások, a feltett kérdéseid és a rájuk adott válaszok
|
||||||
|
</td>
|
||||||
<td>Hogy bármikor újra megnézhesd őket</td>
|
<td>Hogy bármikor újra megnézhesd őket</td>
|
||||||
<td>Szerződés teljesítése</td>
|
<td>Szerződés teljesítése</td>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -86,6 +95,22 @@ 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>
|
||||||
|
<td>
|
||||||
|
Megosztott linkjeid: a link kódja, a megtekintések száma és annak az IP-címnek a sózott lenyomata
|
||||||
|
(hash-e), ahonnan a linket létrehoztad; ha valaki a linkedről regisztrál, hogy ki hozta
|
||||||
|
</td>
|
||||||
|
<td>A megosztás és a megosztásért járó ajándék; hogy a saját megtekintéseid ne számítsanak</td>
|
||||||
|
<td>Szerződés teljesítése; jogos érdek (6. cikk (1) f)</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>
|
||||||
@@ -110,8 +135,15 @@ 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>
|
||||||
|
<strong>Megosztott link:</strong> ha megosztasz egy képletet, a linken bárki, akinek elküldöd, látja a
|
||||||
|
képlet rajzát és a legfrissebb rövid összefoglalót. Nevet és születési adatot nem tesz közzé, a keresők nem
|
||||||
|
listázzák, és a linket bármikor visszavonhatod.
|
||||||
</p>
|
</p>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
@@ -158,16 +190,24 @@ export default async function PrivacyPage() {
|
|||||||
</a>{" "}
|
</a>{" "}
|
||||||
szabályzatnak, beleértve a „Limited Use” (korlátozott felhasználás) követelményeit.
|
szabályzatnak, beleértve a „Limited Use” (korlátozott felhasználás) követelményeit.
|
||||||
</p>
|
</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>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
<h2>4. Az elemzések és a mesterséges intelligencia</h2>
|
<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, a részletes elemzéseket, a kártyajóslást és a kérdésekre adott válaszokat nagy nyelvi
|
||||||
modellhez <strong>csak a képlet csillagászati adatai</strong> jutnak el (a bolygók jegye, foka, háza és
|
modell (mesterséges intelligencia) írja. A modellhez a <strong>képlet csillagászati adatai</strong> jutnak
|
||||||
fényszögei). Nevet, e-mail-címet, születési dátumot, időpontot vagy helyet nem küldünk el. Az elemzés
|
el (a bolygók jegye, foka, háza és fényszögei), kártyajóslásnál a kihúzott lapok, és ha kérdést teszel fel,
|
||||||
szórakoztató és önismereti célú szöveg, nem minősül egészségügyi, pénzügyi, jogi vagy más szakmai
|
a kérdésed szövege. Nevet, e-mail-címet, születési dátumot, időpontot vagy helyet nem küldünk el. Kérjük, a
|
||||||
tanácsnak.
|
kérdéseidbe se írj neveket vagy érzékeny adatot (például egészségügyi adatot). Az elemzés szórakoztató és
|
||||||
|
önismereti célú szöveg, nem minősül egészségügyi, pénzügyi, jogi vagy más szakmai tanácsnak.
|
||||||
</p>
|
</p>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
@@ -198,9 +238,17 @@ export default async function PrivacyPage() {
|
|||||||
<strong>Amazon Web Services EMEA SARL</strong> (Amazon SES) – a rendszerlevelek és a meghívók kézbesítése;
|
<strong>Amazon Web Services EMEA SARL</strong> (Amazon SES) – a rendszerlevelek és a meghívók kézbesítése;
|
||||||
az Európai Unióban (Frankfurt).
|
az Európai Unióban (Frankfurt).
|
||||||
</li>
|
</li>
|
||||||
|
<li>
|
||||||
|
<strong>Stripe Payments Europe, Ltd.</strong> (Írország) – a bankkártyás fizetés lebonyolítása és a
|
||||||
|
visszaélések kiszűrése; a kártyaadatokat csak a Stripe kezeli.
|
||||||
|
</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>
|
<li>
|
||||||
<strong>OpenRouter, Inc.</strong> és az általa elért mesterségesintelligencia-szolgáltatók – az elemzések
|
<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).
|
megírása, kizárólag a 4. pontban leírt adatokból (nevet, e-mail-címet és születési adatot nem kapnak).
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<p>
|
<p>
|
||||||
@@ -231,6 +279,14 @@ export default async function PrivacyPage() {
|
|||||||
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.
|
||||||
</p>
|
</p>
|
||||||
|
<p>
|
||||||
|
A belépés nélküli <Link href="/szuletesi-horoszkop">születési horoszkópnál</Link> a megadott születési adatokat
|
||||||
|
csak a számításhoz küldjük el, a szerveren nem tároljuk őket. Hogy oldalváltáskor ne vesszenek el, a
|
||||||
|
böngészőlap saját tárolójában maradnak (nem sütiben), és a lap bezárásakor maguktól törlődnek; az oldalon az
|
||||||
|
„Adatok törlése” gombbal előbb is törölheted őket. Ha ugyanabban a lapban regisztrálsz, a profilodban ezekkel
|
||||||
|
töltjük ki a születési adataidat. Ez a tárolás csak azt őrzi meg, amit te írtál be, ezért nem kell hozzá
|
||||||
|
külön hozzájárulás.
|
||||||
|
</p>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
@@ -272,6 +328,11 @@ export default async function PrivacyPage() {
|
|||||||
oldalon olvasható.
|
oldalon olvasható.
|
||||||
</p>
|
</p>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>12. Az adatkezelő adatai</h2>
|
||||||
|
<OperatorDetails />
|
||||||
|
</section>
|
||||||
</main>
|
</main>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -6,7 +6,16 @@ import type { NextRequest } from "next/server";
|
|||||||
import { BACKEND_URL } from "@/lib/server";
|
import { BACKEND_URL } from "@/lib/server";
|
||||||
import { SHARES_TAG } from "@/lib/share";
|
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"]);
|
||||||
|
|
||||||
@@ -19,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 {
|
||||||
|
|||||||
@@ -0,0 +1,158 @@
|
|||||||
|
import type { Metadata } from "next";
|
||||||
|
import Link from "next/link";
|
||||||
|
|
||||||
|
import { OperatorDetails } from "@/components/OperatorDetails";
|
||||||
|
import { PublicHeader } from "@/components/SiteHeader";
|
||||||
|
import { ARBITRATION_BOARD, OPERATOR, TERMS_UPDATED } 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ás</h2>
|
||||||
|
<p>
|
||||||
|
A sorsfonalak.hu weboldal és szolgáltatás (a továbbiakban: 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,
|
||||||
|
kártyajóslá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>2. Regisztráció</h2>
|
||||||
|
<p>
|
||||||
|
A szolgáltatás regisztrációval vehető igénybe (Google- vagy Apple-fiókkal, vagy e-mail-címmel és jelszóval),
|
||||||
|
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>3. 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 (6. 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>4. Á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>5. 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>6. 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>7. 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>8. 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>9. 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 ({ARBITRATION_BOARD.name},{" "}
|
||||||
|
{ARBITRATION_BOARD.address}, {ARBITRATION_BOARD.email},{" "}
|
||||||
|
<a href={ARBITRATION_BOARD.web}>{ARBITRATION_BOARD.web.replace("https://", "")}</a>), 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>10. 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és és a szolgáltatás nyelve magyar, a szerződésre a magyar jog irányadó.
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>11. A szolgáltató adatai</h2>
|
||||||
|
<OperatorDetails hosting />
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,144 @@
|
|||||||
|
"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,
|
||||||
|
referral = null,
|
||||||
|
}: {
|
||||||
|
clientId: string;
|
||||||
|
target: string;
|
||||||
|
inviteToken?: string | null;
|
||||||
|
/** The shared link the visitor came from (in the login link: `?ref=`), for the sharer's reward. */
|
||||||
|
referral?: 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 {
|
||||||
|
await api("/auth/apple", {
|
||||||
|
body: { id_token: response.authorization.id_token, name, invite_token: inviteToken, referral },
|
||||||
|
});
|
||||||
|
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>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -52,11 +52,14 @@ export function GoogleLogin({
|
|||||||
clientId,
|
clientId,
|
||||||
target,
|
target,
|
||||||
inviteToken = null,
|
inviteToken = null,
|
||||||
|
referral = null,
|
||||||
}: {
|
}: {
|
||||||
clientId: string;
|
clientId: string;
|
||||||
target: string;
|
target: string;
|
||||||
/** From an invitation link: lets in any Google account. */
|
/** From an invitation link: lets in any Google account. */
|
||||||
inviteToken?: string | null;
|
inviteToken?: string | null;
|
||||||
|
/** The shared link the visitor came from (in the login link: `?ref=`), for the sharer's reward. */
|
||||||
|
referral?: string | null;
|
||||||
}) {
|
}) {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const slot = useRef<HTMLDivElement>(null);
|
const slot = useRef<HTMLDivElement>(null);
|
||||||
@@ -72,18 +75,7 @@ export function GoogleLogin({
|
|||||||
setError(null);
|
setError(null);
|
||||||
setUninvited(null);
|
setUninvited(null);
|
||||||
try {
|
try {
|
||||||
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 } });
|
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) {
|
||||||
@@ -92,7 +84,7 @@ export function GoogleLogin({
|
|||||||
setBusy(false);
|
setBusy(false);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
[router, target, inviteToken],
|
[router, target, inviteToken, referral],
|
||||||
);
|
);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|||||||
@@ -0,0 +1,200 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useRouter } from "next/navigation";
|
||||||
|
import { useState } from "react";
|
||||||
|
|
||||||
|
import { Waitlist } from "@/components/Waitlist";
|
||||||
|
import { ApiError, api, errorText } from "@/lib/api";
|
||||||
|
|
||||||
|
type Mode = "login" | "register" | "forgot";
|
||||||
|
|
||||||
|
function loginError(e: unknown): string {
|
||||||
|
if (e instanceof ApiError) {
|
||||||
|
if (e.code === "invalid_credentials") return "Hibás e-mail-cím vagy jelszó.";
|
||||||
|
if (e.code === "too_many_requests") return "Túl sok sikertelen próbálkozás. Próbáld újra negyedóra múlva.";
|
||||||
|
}
|
||||||
|
return errorText(e);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* E-mail and password: login, sign-up and forgotten password. Sign-up asks
|
||||||
|
* no password: it is set through the link sent to the address, so nobody can
|
||||||
|
* set a password for someone else's address.
|
||||||
|
*/
|
||||||
|
export function PasswordLogin({
|
||||||
|
target,
|
||||||
|
inviteToken = null,
|
||||||
|
referral = null,
|
||||||
|
initialMode = "login",
|
||||||
|
}: {
|
||||||
|
target: string;
|
||||||
|
inviteToken?: string | null;
|
||||||
|
/** The shared link the visitor came from (in the login link: `?ref=`), for the sharer's reward. */
|
||||||
|
referral?: string | null;
|
||||||
|
initialMode?: Mode;
|
||||||
|
}) {
|
||||||
|
const router = useRouter();
|
||||||
|
const [mode, setMode] = useState<Mode>(initialMode);
|
||||||
|
const [email, setEmail] = useState("");
|
||||||
|
const [password, setPassword] = useState("");
|
||||||
|
const [name, setName] = useState("");
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const [sent, setSent] = useState<Mode | null>(null);
|
||||||
|
const [uninvited, setUninvited] = useState(false);
|
||||||
|
|
||||||
|
function switchTo(next: Mode) {
|
||||||
|
setMode(next);
|
||||||
|
setError(null);
|
||||||
|
setSent(null);
|
||||||
|
setUninvited(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function submit(e: React.FormEvent) {
|
||||||
|
e.preventDefault();
|
||||||
|
setBusy(true);
|
||||||
|
setError(null);
|
||||||
|
setUninvited(false);
|
||||||
|
try {
|
||||||
|
if (mode === "login") {
|
||||||
|
await api("/auth/login", { body: { email, password } });
|
||||||
|
router.replace(target);
|
||||||
|
router.refresh();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (mode === "register") {
|
||||||
|
await api("/auth/register", {
|
||||||
|
body: { email, display_name: name.trim() || null, locale: "hu", invite_token: inviteToken, referral },
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
await api("/auth/password-reset", { body: { email } });
|
||||||
|
}
|
||||||
|
setSent(mode);
|
||||||
|
} catch (err) {
|
||||||
|
if (err instanceof ApiError && err.code === "not_invited") setUninvited(true);
|
||||||
|
else setError(mode === "login" ? loginError(err) : errorText(err));
|
||||||
|
} finally {
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (sent) {
|
||||||
|
return (
|
||||||
|
<div className="field pw-sent" role="status">
|
||||||
|
<p className="msg msg-ok" style={{ margin: 0 }}>
|
||||||
|
{sent === "register"
|
||||||
|
? "Küldtünk egy levelet a(z) "
|
||||||
|
: "Ha ehhez a címhez tartozik fiók, küldtünk egy levelet a(z) "}
|
||||||
|
<strong>{email}</strong> címre. A benne lévő linkkel adhatod meg a jelszavad
|
||||||
|
{sent === "register" ? ", és utána már be is vagy lépve." : "."}
|
||||||
|
</p>
|
||||||
|
<p className="hint" style={{ margin: 0 }}>
|
||||||
|
Nem jött meg pár percen belül? Nézd meg a spam mappát is, vagy{" "}
|
||||||
|
<button type="button" className="link-btn" onClick={() => switchTo(sent)}>
|
||||||
|
próbáld újra
|
||||||
|
</button>
|
||||||
|
.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<form className="field pw-form" onSubmit={submit} style={{ gap: 14 }}>
|
||||||
|
{mode === "register" && (
|
||||||
|
<div className="field">
|
||||||
|
<label htmlFor="pw-name">Név (nem kötelező)</label>
|
||||||
|
<input
|
||||||
|
id="pw-name"
|
||||||
|
className="inp"
|
||||||
|
autoComplete="name"
|
||||||
|
maxLength={100}
|
||||||
|
value={name}
|
||||||
|
onChange={(e) => setName(e.target.value)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
<div className="field">
|
||||||
|
<label htmlFor="pw-email">E-mail-cím</label>
|
||||||
|
<input
|
||||||
|
id="pw-email"
|
||||||
|
className="inp"
|
||||||
|
type="email"
|
||||||
|
required
|
||||||
|
autoComplete={mode === "login" ? "username" : "email"}
|
||||||
|
value={email}
|
||||||
|
onChange={(e) => setEmail(e.target.value)}
|
||||||
|
placeholder="nev@pelda.hu"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
{mode === "login" && (
|
||||||
|
<div className="field">
|
||||||
|
<div className="pw-label-row">
|
||||||
|
<label htmlFor="pw-password">Jelszó</label>
|
||||||
|
<button type="button" className="link-btn" onClick={() => switchTo("forgot")}>
|
||||||
|
Elfelejtett jelszó?
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<input
|
||||||
|
id="pw-password"
|
||||||
|
className="inp"
|
||||||
|
type="password"
|
||||||
|
required
|
||||||
|
autoComplete="current-password"
|
||||||
|
value={password}
|
||||||
|
onChange={(e) => setPassword(e.target.value)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{mode === "register" && (
|
||||||
|
<p className="hint" style={{ margin: 0 }}>
|
||||||
|
A jelszavadat a levélben kapott linken adod meg. Így biztos, hogy a cím a tiéd.
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
{mode === "forgot" && (
|
||||||
|
<p className="hint" style={{ margin: 0 }}>
|
||||||
|
Küldünk egy linket, amellyel új jelszót adhatsz meg. Ha eddig Google- vagy Apple-fiókkal léptél be, így
|
||||||
|
jelszót is beállíthatsz.
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
<button type="submit" className="btn btn-primary" disabled={busy}>
|
||||||
|
{busy
|
||||||
|
? "Küldés…"
|
||||||
|
: mode === "login"
|
||||||
|
? "Belépés"
|
||||||
|
: mode === "register"
|
||||||
|
? "Regisztráció"
|
||||||
|
: "Link küldése"}
|
||||||
|
</button>
|
||||||
|
{error && (
|
||||||
|
<p className="msg msg-error" role="alert" style={{ margin: 0 }}>
|
||||||
|
{error}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
{uninvited && (
|
||||||
|
<>
|
||||||
|
<p className="msg msg-error" role="alert" style={{ margin: 0 }}>
|
||||||
|
{inviteToken
|
||||||
|
? "Ez a meghívó már nem érvényes, és ehhez a címhez sem tartozik másik."
|
||||||
|
: "A Sorsfonalak jelenleg meghívásos, és ehhez az e-mail-címhez nem tartozik meghívó. Ha kaptál meghívót, nyisd meg a levélben kapott linket."}
|
||||||
|
</p>
|
||||||
|
<Waitlist email={email} />
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
<p className="hint pw-switch" style={{ margin: 0 }}>
|
||||||
|
{mode === "login" ? (
|
||||||
|
<>
|
||||||
|
Még nincs fiókod?{" "}
|
||||||
|
<button type="button" className="link-btn" onClick={() => switchTo("register")}>
|
||||||
|
Regisztráció e-mail-címmel
|
||||||
|
</button>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<button type="button" className="link-btn" onClick={() => switchTo("login")}>
|
||||||
|
Vissza a belépéshez
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</p>
|
||||||
|
</form>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -8,14 +8,20 @@ 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";
|
||||||
|
import { PasswordLogin } from "./PasswordLogin";
|
||||||
|
|
||||||
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 +49,15 @@ 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,
|
||||||
|
password,
|
||||||
|
}: {
|
||||||
|
invitation: InvitationLanding | null;
|
||||||
|
apple: boolean;
|
||||||
|
password: boolean;
|
||||||
|
}) {
|
||||||
if (!invitation) {
|
if (!invitation) {
|
||||||
return (
|
return (
|
||||||
<p className="msg msg-error" role="alert">
|
<p className="msg msg-error" role="alert">
|
||||||
@@ -66,7 +80,9 @@ 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"}
|
||||||
|
{password ? ", vagy e-mail-címmel regisztrálva" : ""} elfogadhatod. Érvényes:{" "}
|
||||||
|
{formatDate(invitation.expires_at).replace(/\.$/, "")}-ig.
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
@@ -83,7 +99,15 @@ 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;
|
||||||
|
// The shared link that brought the visitor (from its login button), for the sharer's reward.
|
||||||
|
const rawRef = Array.isArray(params.ref) ? params.ref[0] : params.ref;
|
||||||
|
const referral = rawRef && /^[A-Za-z0-9_-]{4,64}$/.test(rawRef) ? rawRef : null;
|
||||||
const inviteOnly = config?.signup_mode === "invite";
|
const inviteOnly = config?.signup_mode === "invite";
|
||||||
|
const password = config?.password_login === true;
|
||||||
|
const mod = Array.isArray(params.mod) ? params.mod[0] : params.mod;
|
||||||
|
const initialMode = mod === "elfelejtett" ? "forgot" : mod === "regisztracio" || rawToken ? "register" : "login";
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="auth">
|
<div className="auth">
|
||||||
@@ -96,8 +120,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 +131,32 @@ 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} password={password} />
|
||||||
|
)}
|
||||||
{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 || password ? (
|
||||||
<GoogleLogin
|
<>
|
||||||
clientId={clientId}
|
{clientId && (
|
||||||
target={target}
|
<div className="field" style={{ gap: 12 }}>
|
||||||
inviteToken={invitation?.status === "pending" ? inviteToken : null}
|
<GoogleLogin clientId={clientId} target={target} inviteToken={pendingInvite} referral={referral} />
|
||||||
/>
|
{appleId && (
|
||||||
|
<AppleLogin clientId={appleId} target={target} inviteToken={pendingInvite} referral={referral} />
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{clientId && password && (
|
||||||
|
<div className="auth-or" role="separator">
|
||||||
|
<span>vagy</span>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{password && (
|
||||||
|
<PasswordLogin target={target} inviteToken={pendingInvite} referral={referral} initialMode={initialMode} />
|
||||||
|
)}
|
||||||
|
</>
|
||||||
) : (
|
) : (
|
||||||
<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).
|
||||||
@@ -128,11 +167,14 @@ export default async function LoginPage({ searchParams }: { searchParams: Promis
|
|||||||
? "A fiókod az első belépéskor jön létre."
|
? "A fiókod az első belépéskor jön létre."
|
||||||
: inviteOnly
|
: inviteOnly
|
||||||
? "Az oldal jelenleg meghívásos: új fiók csak meghívóval jön létre."
|
? "Az oldal jelenleg meghívásos: új fiók csak meghívóval jön létre."
|
||||||
: "Még nincs fiókod? Az első belépéskor létrejön."}
|
: password
|
||||||
|
? "Google- vagy Apple-fiókkal az első belépéskor létrejön a fiókod."
|
||||||
|
: "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,159 @@
|
|||||||
|
import type { Metadata } from "next";
|
||||||
|
import Link from "next/link";
|
||||||
|
import { notFound } from "next/navigation";
|
||||||
|
|
||||||
|
import { JsonLd, PublicFooter } from "@/components/PublicFooter";
|
||||||
|
import { PublicHeader } from "@/components/SiteHeader";
|
||||||
|
import { ZODIAC, ZODIAC_BY_SLUG } from "@/content/zodiac";
|
||||||
|
import { SIGNS } from "@/lib/astro";
|
||||||
|
import { getMe } from "@/lib/server";
|
||||||
|
import { siteUrl } from "@/lib/share";
|
||||||
|
|
||||||
|
export const dynamicParams = false;
|
||||||
|
|
||||||
|
export function generateStaticParams() {
|
||||||
|
return ZODIAC.map((z) => ({ jegy: z.slug }));
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function generateMetadata({ params }: { params: Promise<{ jegy: string }> }): Promise<Metadata> {
|
||||||
|
const z = ZODIAC_BY_SLUG.get((await params).jegy);
|
||||||
|
if (!z) return {};
|
||||||
|
return {
|
||||||
|
title: `${z.name} csillagjegy: ${z.name} Nap, Hold és aszcendens`,
|
||||||
|
description: `${z.name} (${z.dates}): milyen ${z.article} napjegyként, holdjegyként és aszcendensként, párkapcsolatban és munkában, és mi nem igaz róla.`,
|
||||||
|
alternates: { canonical: `/csillagjegyek/${z.slug}` },
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/** One sign: its facts, and what it means as Sun, Moon and Ascendant. */
|
||||||
|
export default async function SignPage({ params }: { params: Promise<{ jegy: string }> }) {
|
||||||
|
const z = ZODIAC_BY_SLUG.get((await params).jegy);
|
||||||
|
if (!z) notFound();
|
||||||
|
const me = await getMe();
|
||||||
|
const base = await siteUrl();
|
||||||
|
const index = ZODIAC.indexOf(z);
|
||||||
|
const prev = ZODIAC[(index + 11) % 12];
|
||||||
|
const next = ZODIAC[(index + 1) % 12];
|
||||||
|
const opposite = ZODIAC_BY_SLUG.get(z.opposite)!;
|
||||||
|
const glyph = SIGNS[z.id]?.glyph;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{!me && <PublicHeader current="csillagjegyek" />}
|
||||||
|
<main className="page sign-page" style={{ maxWidth: 880 }}>
|
||||||
|
<nav className="hint sign-crumbs" aria-label="Morzsamenü">
|
||||||
|
<Link href="/csillagjegyek">Csillagjegyek</Link> / {z.name}
|
||||||
|
</nav>
|
||||||
|
<div className="page-head sign-head">
|
||||||
|
<span className="sign-glyph" aria-hidden="true">
|
||||||
|
{glyph}
|
||||||
|
</span>
|
||||||
|
<div>
|
||||||
|
<h1>{z.name}</h1>
|
||||||
|
<p className="muted">{z.dates}</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<table className="sign-facts">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<th scope="row">Elem</th>
|
||||||
|
<td>{z.element}</td>
|
||||||
|
<th scope="row">Minőség</th>
|
||||||
|
<td>{z.modality}</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th scope="row">Uralkodó bolygó</th>
|
||||||
|
<td>{z.ruler}</td>
|
||||||
|
<th scope="row">Ellentétes jegy</th>
|
||||||
|
<td>
|
||||||
|
<Link href={`/csillagjegyek/${opposite.slug}`}>{opposite.name}</Link>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
<p className="sign-intro">{z.intro}</p>
|
||||||
|
<p className="hint">
|
||||||
|
A dátumok évről évre egy napot csúszhatnak. Ha a határ közelében születtél, az{" "}
|
||||||
|
<Link href="/szuletesi-horoszkop">ingyenes születési horoszkóp</Link> pontosan megmondja, melyik jegy a tiéd.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<section id="nap" className="sign-section">
|
||||||
|
<h2>{z.name} napjegy</h2>
|
||||||
|
<p>{z.sun}</p>
|
||||||
|
</section>
|
||||||
|
<section id="hold" className="sign-section">
|
||||||
|
<h2>Hold {z.inSign}</h2>
|
||||||
|
<p>{z.moon}</p>
|
||||||
|
</section>
|
||||||
|
<section id="aszcendens" className="sign-section">
|
||||||
|
<h2>{z.name} aszcendens</h2>
|
||||||
|
<p>{z.ascendant}</p>
|
||||||
|
</section>
|
||||||
|
<section className="sign-section">
|
||||||
|
<h2>Párkapcsolatban</h2>
|
||||||
|
<p>{z.love}</p>
|
||||||
|
</section>
|
||||||
|
<section className="sign-section">
|
||||||
|
<h2>Munkában</h2>
|
||||||
|
<p>{z.work}</p>
|
||||||
|
</section>
|
||||||
|
<section className="sign-section sign-myth">
|
||||||
|
<h2>Amit rosszul tudnak róla</h2>
|
||||||
|
<p>{z.myth}</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<div className="sign-traits">
|
||||||
|
<div>
|
||||||
|
<h2>Erősségek</h2>
|
||||||
|
<p>{z.strengths}</p>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<h2>Árnyoldalak</h2>
|
||||||
|
<p>{z.challenges}</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<aside className="card sign-cta">
|
||||||
|
<p style={{ margin: 0 }}>{z.offer}</p>
|
||||||
|
<div className="form-actions">
|
||||||
|
<Link href="/szuletesi-horoszkop" className="btn">
|
||||||
|
Ingyenes születési horoszkóp
|
||||||
|
</Link>
|
||||||
|
<Link href={me ? "/keplet" : "/belepes?mod=regisztracio&vissza=/profil"} className="btn btn-primary">
|
||||||
|
{me ? "A saját képletem" : "A teljes képletem ingyen"}
|
||||||
|
</Link>
|
||||||
|
</div>
|
||||||
|
</aside>
|
||||||
|
|
||||||
|
<nav className="sign-pager" aria-label="Többi jegy">
|
||||||
|
<Link href={`/csillagjegyek/${prev.slug}`}>← {prev.name}</Link>
|
||||||
|
<Link href="/csillagjegyek">Mind a 12 jegy</Link>
|
||||||
|
<Link href={`/csillagjegyek/${next.slug}`}>{next.name} →</Link>
|
||||||
|
</nav>
|
||||||
|
</main>
|
||||||
|
<PublicFooter />
|
||||||
|
<JsonLd
|
||||||
|
data={{
|
||||||
|
"@context": "https://schema.org",
|
||||||
|
"@type": "BreadcrumbList",
|
||||||
|
itemListElement: [
|
||||||
|
{
|
||||||
|
"@type": "ListItem",
|
||||||
|
position: 1,
|
||||||
|
name: "Csillagjegyek",
|
||||||
|
item: `${base}/csillagjegyek`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"@type": "ListItem",
|
||||||
|
position: 2,
|
||||||
|
name: z.name,
|
||||||
|
item: `${base}/csillagjegyek/${z.slug}`,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
import type { Metadata } from "next";
|
||||||
|
import Link from "next/link";
|
||||||
|
|
||||||
|
import { PublicFooter } from "@/components/PublicFooter";
|
||||||
|
import { PublicHeader } from "@/components/SiteHeader";
|
||||||
|
import { ZODIAC } from "@/content/zodiac";
|
||||||
|
import { SIGNS } from "@/lib/astro";
|
||||||
|
import { getMe } from "@/lib/server";
|
||||||
|
|
||||||
|
export const metadata: Metadata = {
|
||||||
|
title: "Csillagjegyek: mind a 12 jegy napjegyként, holdjegyként és aszcendensként",
|
||||||
|
description:
|
||||||
|
"A tizenkét csillagjegy dátumokkal, elemekkel és uralkodó bolygókkal: milyen egy jegy napjegyként, holdjegyként és aszcendensként.",
|
||||||
|
alternates: { canonical: "/csillagjegyek" },
|
||||||
|
};
|
||||||
|
|
||||||
|
/** The twelve signs. */
|
||||||
|
export default async function SignsPage() {
|
||||||
|
const me = await getMe();
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{!me && <PublicHeader current="csillagjegyek" />}
|
||||||
|
<main className="page" style={{ maxWidth: 1080 }}>
|
||||||
|
<div className="page-head">
|
||||||
|
<span className="eyebrow">Csillagjegyek</span>
|
||||||
|
<h1>A tizenkét csillagjegy</h1>
|
||||||
|
<p className="muted">
|
||||||
|
A „milyen jegy vagy?” kérdésre a legtöbben a napjegyükkel felelnek. Pedig a Hold és az aszcendens jegye
|
||||||
|
legalább ennyit elárul. Minden jegynél leírjuk, milyen napjegyként, holdjegyként és aszcendensként.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<ul className="sign-grid">
|
||||||
|
{ZODIAC.map((z) => (
|
||||||
|
<li key={z.slug}>
|
||||||
|
<Link href={`/csillagjegyek/${z.slug}`} className="card sign-tile">
|
||||||
|
<span className="sign-tile-glyph" aria-hidden="true">
|
||||||
|
{SIGNS[z.id]?.glyph}
|
||||||
|
</span>
|
||||||
|
<strong>{z.name}</strong>
|
||||||
|
<span className="hint">{z.dates}</span>
|
||||||
|
<span className="hint">
|
||||||
|
{z.element} · {z.modality}
|
||||||
|
</span>
|
||||||
|
</Link>
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
<div className="card sign-cta" style={{ marginTop: 32 }}>
|
||||||
|
<p style={{ margin: 0 }}>
|
||||||
|
Nem tudod, melyik jegyben áll a Holdad, vagy mi az aszcendensed? Az ingyenes születési horoszkóp a születési
|
||||||
|
adataidból kiszámolja, belépés nélkül.
|
||||||
|
</p>
|
||||||
|
<div className="form-actions">
|
||||||
|
<Link href="/szuletesi-horoszkop" className="btn btn-primary">
|
||||||
|
Ingyenes születési horoszkóp
|
||||||
|
</Link>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
<PublicFooter />
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,14 +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 { 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.",
|
||||||
@@ -25,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.",
|
||||||
@@ -39,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;
|
||||||
|
|
||||||
@@ -59,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"
|
||||||
) : (
|
) : (
|
||||||
@@ -79,6 +90,12 @@ export default async function PackagesPage() {
|
|||||||
<RedeemCode />
|
<RedeemCode />
|
||||||
</section>
|
</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 }}>
|
||||||
@@ -102,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>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -26,6 +26,10 @@
|
|||||||
|
|
||||||
* { box-sizing: border-box; }
|
* { box-sizing: border-box; }
|
||||||
html, body { margin: 0; }
|
html, body { margin: 0; }
|
||||||
|
/* The night sky behind everything (components/NightSky.tsx): drawn over the
|
||||||
|
page background, under all content, so anything with its own background
|
||||||
|
covers it. */
|
||||||
|
.night-sky { position: fixed; inset: 0; width: 100%; height: 100%; z-index: -1; pointer-events: none; }
|
||||||
body {
|
body {
|
||||||
min-height: 100vh;
|
min-height: 100vh;
|
||||||
overflow-x: clip; /* nothing may push the page sideways on a phone */
|
overflow-x: clip; /* nothing may push the page sideways on a phone */
|
||||||
@@ -64,6 +68,28 @@ p { margin: 0; }
|
|||||||
.nav a { color: var(--ink-2); text-decoration: none; padding: 10px 12px; border-radius: 8px; min-height: 44px; display: inline-flex; align-items: center; }
|
.nav a { 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;
|
||||||
@@ -176,6 +202,18 @@ td.num { font-variant-numeric: tabular-nums; white-space: nowrap; }
|
|||||||
.tagline { font-family: var(--font-display); font-size: 38px; font-weight: 600; line-height: 1.1; }
|
.tagline { font-family: var(--font-display); font-size: 38px; font-weight: 600; line-height: 1.1; }
|
||||||
.auth-foot { font-size: 15px; color: var(--muted); text-align: center; }
|
.auth-foot { font-size: 15px; color: var(--muted); text-align: center; }
|
||||||
|
|
||||||
|
/* E-mail and password next to the social buttons */
|
||||||
|
.auth-or { display: flex; align-items: center; gap: 14px; color: var(--muted); font-size: 13px; margin: -6px 0; }
|
||||||
|
.auth-or::before, .auth-or::after { content: ""; flex: 1; border-top: 1px solid var(--line); }
|
||||||
|
.pw-label-row { display: flex; align-items: baseline; justify-content: space-between; gap: 12px; }
|
||||||
|
.pw-switch { text-align: center; }
|
||||||
|
.link-btn {
|
||||||
|
background: none; border: 0; padding: 0; font: inherit; color: var(--gold); cursor: pointer;
|
||||||
|
text-decoration: underline; text-underline-offset: 2px;
|
||||||
|
}
|
||||||
|
.link-btn:hover { color: var(--gold-hover); }
|
||||||
|
.pw-label-row .link-btn { font-size: 13px; text-decoration: none; }
|
||||||
|
|
||||||
/* Social login buttons; Google's own button lies invisibly on top (.gsi-overlay). */
|
/* Social login buttons; Google's own button lies invisibly on top (.gsi-overlay). */
|
||||||
.social-login { position: relative; }
|
.social-login { position: relative; }
|
||||||
.btn-social {
|
.btn-social {
|
||||||
@@ -188,6 +226,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;
|
||||||
@@ -334,7 +377,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%; }
|
||||||
@@ -741,8 +785,6 @@ a.pair-row:hover strong { color: var(--gold); }
|
|||||||
.share-cta .btn { align-self: flex-start; }
|
.share-cta .btn { align-self: flex-start; }
|
||||||
|
|
||||||
/* Promo codes: redeeming (header, packages page, /bevaltas) and the admin page */
|
/* Promo codes: redeeming (header, packages page, /bevaltas) and the admin page */
|
||||||
.redeem-link { color: var(--ink-2); font-size: 13px; text-decoration: none; white-space: nowrap; }
|
|
||||||
.redeem-link:hover { color: var(--gold); text-decoration: underline; text-underline-offset: 3px; }
|
|
||||||
.redeem { display: flex; flex-direction: column; gap: 8px; }
|
.redeem { display: flex; flex-direction: column; gap: 8px; }
|
||||||
.redeem-row { display: flex; gap: 8px; flex-wrap: wrap; }
|
.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-input { flex: 1 1 220px; width: auto; font-family: ui-monospace, SFMono-Regular, Menlo, monospace; letter-spacing: 1.5px; text-transform: uppercase; }
|
||||||
@@ -782,6 +824,17 @@ a.pair-row:hover strong { color: var(--gold); }
|
|||||||
.lp-wrap { max-width: 1180px; margin: 0 auto; padding: 0 24px; }
|
.lp-wrap { max-width: 1180px; margin: 0 auto; padding: 0 24px; }
|
||||||
.lp-header { gap: 16px; }
|
.lp-header { gap: 16px; }
|
||||||
.lp-nav { flex: 1; }
|
.lp-nav { flex: 1; }
|
||||||
|
/* The free tools in the visitors' header, set apart from the paid sections. */
|
||||||
|
.lp-free { display: flex; align-items: center; gap: 2px; padding-left: 14px; border-left: 1px solid var(--line-2); }
|
||||||
|
.lp-free-label {
|
||||||
|
font-size: 11px; font-weight: 600; letter-spacing: 1px; text-transform: uppercase; color: var(--gold);
|
||||||
|
border: 1px solid rgba(217, 180, 106, 0.45); border-radius: 999px; padding: 2px 8px; margin-right: 6px; white-space: nowrap;
|
||||||
|
}
|
||||||
|
.lp-free a {
|
||||||
|
color: var(--ink); text-decoration: none; padding: 10px 10px; border-radius: 8px; min-height: 44px;
|
||||||
|
display: inline-flex; align-items: center; white-space: nowrap;
|
||||||
|
}
|
||||||
|
.lp-free a:hover, .lp-free a[aria-current="page"] { color: var(--gold); background: rgba(217, 180, 106, 0.08); }
|
||||||
.lp-hero { position: relative; overflow: hidden; }
|
.lp-hero { position: relative; overflow: hidden; }
|
||||||
.lp-stars { position: absolute; inset: 0; width: 100%; height: 100%; }
|
.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-star { fill: var(--ink); opacity: 0.25; animation: lp-twinkle 6s ease-in-out infinite; }
|
||||||
@@ -919,6 +972,10 @@ a.pair-row:hover strong { color: var(--gold); }
|
|||||||
.lp-pair { grid-template-columns: minmax(0, 1fr); justify-items: center; }
|
.lp-pair { grid-template-columns: minmax(0, 1fr); justify-items: center; }
|
||||||
.lp-rings { max-width: 200px; }
|
.lp-rings { max-width: 200px; }
|
||||||
.lp-nav { display: none; }
|
.lp-nav { display: none; }
|
||||||
|
/* On phones the free tools get their own row under the logo. */
|
||||||
|
.lp-header { flex-wrap: wrap; row-gap: 4px; }
|
||||||
|
.lp-free { order: 3; flex-basis: 100%; padding-left: 0; border-left: 0; overflow-x: auto; scrollbar-width: none; }
|
||||||
|
.lp-header > .btn { margin-left: auto; }
|
||||||
}
|
}
|
||||||
@media (prefers-reduced-motion: reduce) {
|
@media (prefers-reduced-motion: reduce) {
|
||||||
.lp *, .lp-orbit { animation: none !important; }
|
.lp *, .lp-orbit { animation: none !important; }
|
||||||
@@ -938,6 +995,28 @@ a.pair-row:hover strong { color: var(--gold); }
|
|||||||
.lp-why-card { gap: 12px; padding: 28px; }
|
.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; }
|
.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 */
|
/* 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-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 { height: 26px; width: auto; opacity: 0.65; transition: opacity 0.2s; }
|
||||||
@@ -948,3 +1027,184 @@ a.pair-row:hover strong { color: var(--gold); }
|
|||||||
/* Chart page: below the wheel and the summary, the facts and the next steps side by side */
|
/* 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 { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(300px, 100%), 1fr)); gap: 16px; align-items: stretch; }
|
||||||
.chart-extras > .card { margin: 0; }
|
.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; }
|
||||||
|
|
||||||
|
/* Public sign calculator (/aszcendens-kalkulator) */
|
||||||
|
.calc-form { margin-bottom: 8px; }
|
||||||
|
.calc-result { display: flex; flex-direction: column; gap: 16px; margin: 24px 0 8px; scroll-margin-top: 84px; }
|
||||||
|
.calc-signs { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(220px, 100%), 1fr)); gap: 16px; }
|
||||||
|
.calc-sign { display: flex; flex-direction: column; gap: 10px; }
|
||||||
|
.calc-sign-main { display: flex; align-items: baseline; gap: 10px; }
|
||||||
|
.calc-sign-main strong { font-family: var(--font-display); font-size: 30px; font-weight: 600; }
|
||||||
|
.calc-glyph { font-size: 30px; color: var(--gold); line-height: 1; }
|
||||||
|
.calc-sign-link { font-size: 14px; margin-top: auto; }
|
||||||
|
.calc-cta { display: flex; flex-direction: row; gap: 20px; align-items: center; justify-content: space-between; flex-wrap: wrap; }
|
||||||
|
.calc-cta > div { flex: 1 1 320px; }
|
||||||
|
.calc-explain, .calc-faq { margin-top: 48px; display: flex; flex-direction: column; gap: 14px; }
|
||||||
|
.calc-explain-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(220px, 100%), 1fr)); gap: 20px; }
|
||||||
|
.calc-explain h3 { font-size: 18px; margin: 0 0 6px; }
|
||||||
|
.calc-explain p { margin: 0; color: var(--ink-2); line-height: 1.6; }
|
||||||
|
.calc-faq-item { padding: 16px 20px; }
|
||||||
|
.calc-faq-item summary { cursor: pointer; font-weight: 600; }
|
||||||
|
.calc-faq-item p { margin: 10px 0 0; color: var(--ink-2); line-height: 1.6; }
|
||||||
|
|
||||||
|
/* Sign pages (/csillagjegyek) */
|
||||||
|
.sign-grid { list-style: none; margin: 0; padding: 0; display: grid; grid-template-columns: repeat(auto-fill, minmax(min(220px, 100%), 1fr)); gap: 16px; }
|
||||||
|
.sign-tile { display: flex; flex-direction: column; gap: 6px; text-decoration: none; color: var(--ink); height: 100%; }
|
||||||
|
.sign-tile:hover { border-color: #5a6790; color: var(--ink); }
|
||||||
|
.sign-tile strong { font-family: var(--font-display); font-size: 26px; font-weight: 600; }
|
||||||
|
.sign-tile-glyph { font-size: 28px; color: var(--gold); line-height: 1; }
|
||||||
|
.sign-crumbs { margin-bottom: 8px; }
|
||||||
|
.sign-crumbs a { color: var(--muted); }
|
||||||
|
.sign-head { flex-direction: row; align-items: center; gap: 20px; }
|
||||||
|
.sign-glyph { font-size: 64px; color: var(--gold); line-height: 1; }
|
||||||
|
.sign-facts { width: 100%; border-collapse: collapse; margin: 8px 0 24px; font-size: 15px; }
|
||||||
|
.sign-facts th, .sign-facts td { padding: 10px 12px; border-bottom: 1px solid var(--line); text-align: left; }
|
||||||
|
.sign-facts th { color: var(--muted); font-weight: 500; white-space: nowrap; }
|
||||||
|
.sign-intro { font-size: 18px; line-height: 1.65; }
|
||||||
|
.sign-section { margin-top: 32px; scroll-margin-top: 16px; }
|
||||||
|
.sign-section h2, .sign-traits h2 { font-size: 26px; margin: 0 0 10px; }
|
||||||
|
.sign-section p, .sign-traits p { line-height: 1.7; color: var(--ink-2); margin: 0; }
|
||||||
|
.sign-myth { border-left: 3px solid var(--gold); padding-left: 18px; }
|
||||||
|
.sign-traits { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(260px, 100%), 1fr)); gap: 24px; margin-top: 32px; }
|
||||||
|
.sign-cta { margin-top: 36px; display: flex; flex-direction: column; gap: 14px; }
|
||||||
|
.sign-pager { display: flex; justify-content: space-between; gap: 12px; flex-wrap: wrap; margin-top: 32px; font-size: 15px; }
|
||||||
|
@media (max-width: 640px) {
|
||||||
|
.sign-facts th, .sign-facts td { display: block; padding: 4px 0; border: 0; }
|
||||||
|
.sign-facts td { padding-bottom: 10px; border-bottom: 1px solid var(--line); }
|
||||||
|
.sign-glyph { font-size: 48px; }
|
||||||
|
}
|
||||||
|
|
||||||
|
/* The free tools on the home page, set apart from the paid sections */
|
||||||
|
.lp-free-line { display: flex; align-items: center; gap: 8px; flex-wrap: wrap; margin: 0; font-size: 15px; }
|
||||||
|
.lp-free-line .lp-free-label { margin-right: 0; }
|
||||||
|
.lp-free-band { border-top: 1px solid var(--line); border-bottom: 1px solid var(--line); background: var(--panel); padding: 36px 0; }
|
||||||
|
.lp-free-head { display: flex; align-items: center; gap: 12px; flex-wrap: wrap; margin-bottom: 18px; }
|
||||||
|
.lp-free-title { margin: 0; font-family: var(--font-display); font-size: 30px; font-weight: 600; }
|
||||||
|
.lp-free-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(300px, 100%), 1fr)); gap: 16px; }
|
||||||
|
.lp-free-card { display: flex; flex-direction: column; gap: 8px; text-decoration: none; color: var(--ink); border-color: rgba(217, 180, 106, 0.35); }
|
||||||
|
.lp-free-card:hover { border-color: var(--gold); color: var(--ink); }
|
||||||
|
.lp-free-card strong { font-family: var(--font-display); font-size: 24px; font-weight: 600; }
|
||||||
|
.lp-free-go { color: var(--gold); font-weight: 500; margin-top: auto; }
|
||||||
|
.calc-result-head { margin-top: 32px; }
|
||||||
|
.calc-links ul { list-style: none; margin: 0; padding: 0; display: flex; flex-direction: column; gap: 8px; }
|
||||||
|
.calc-links li { font-size: 15px; }
|
||||||
|
.calc-save { display: flex; flex-direction: column; gap: 10px; }
|
||||||
|
.calc-save .btn { align-self: flex-start; }
|
||||||
|
|||||||
@@ -0,0 +1,92 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import Link from "next/link";
|
||||||
|
import { useRouter } from "next/navigation";
|
||||||
|
import { useState } from "react";
|
||||||
|
|
||||||
|
import { ApiError, api, errorText } from "@/lib/api";
|
||||||
|
|
||||||
|
/** Sets the password with the e-mailed link's token; logs in on success. */
|
||||||
|
export function SetPasswordForm({ token, minLength }: { token: string; minLength: number }) {
|
||||||
|
const router = useRouter();
|
||||||
|
const [password, setPassword] = useState("");
|
||||||
|
const [again, setAgain] = useState("");
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const [expired, setExpired] = useState(false);
|
||||||
|
|
||||||
|
async function submit(e: React.FormEvent) {
|
||||||
|
e.preventDefault();
|
||||||
|
setError(null);
|
||||||
|
if (password.length < minLength) {
|
||||||
|
setError(`A jelszó legalább ${minLength} karakter legyen.`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (password !== again) {
|
||||||
|
setError("A két jelszó nem egyezik.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
setBusy(true);
|
||||||
|
try {
|
||||||
|
await api("/auth/set-password", { body: { token, password } });
|
||||||
|
router.replace("/");
|
||||||
|
router.refresh();
|
||||||
|
} catch (err) {
|
||||||
|
if (err instanceof ApiError && err.code === "invalid_token") setExpired(true);
|
||||||
|
else setError(errorText(err));
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (expired) {
|
||||||
|
return (
|
||||||
|
<div className="field" role="alert">
|
||||||
|
<p className="msg msg-error" style={{ margin: 0 }}>
|
||||||
|
Ez a link lejárt, vagy már felhasználták.
|
||||||
|
</p>
|
||||||
|
<p className="hint" style={{ margin: 0 }}>
|
||||||
|
A <Link href="/belepes?mod=elfelejtett">belépésnél</Link> az „Elfelejtett jelszó?” linkkel kérhetsz újat.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<form className="field" onSubmit={submit} style={{ gap: 14 }}>
|
||||||
|
<div className="field">
|
||||||
|
<label htmlFor="new-password">Új jelszó</label>
|
||||||
|
<input
|
||||||
|
id="new-password"
|
||||||
|
className="inp"
|
||||||
|
type="password"
|
||||||
|
required
|
||||||
|
minLength={minLength}
|
||||||
|
autoComplete="new-password"
|
||||||
|
value={password}
|
||||||
|
onChange={(e) => setPassword(e.target.value)}
|
||||||
|
/>
|
||||||
|
<span className="hint">Legalább {minLength} karakter.</span>
|
||||||
|
</div>
|
||||||
|
<div className="field">
|
||||||
|
<label htmlFor="new-password-again">Új jelszó még egyszer</label>
|
||||||
|
<input
|
||||||
|
id="new-password-again"
|
||||||
|
className="inp"
|
||||||
|
type="password"
|
||||||
|
required
|
||||||
|
autoComplete="new-password"
|
||||||
|
value={again}
|
||||||
|
onChange={(e) => setAgain(e.target.value)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<button type="submit" className="btn btn-primary" disabled={busy}>
|
||||||
|
{busy ? "Mentés…" : "Jelszó mentése és belépés"}
|
||||||
|
</button>
|
||||||
|
{error && (
|
||||||
|
<p className="msg msg-error" role="alert" style={{ margin: 0 }}>
|
||||||
|
{error}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</form>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
import type { Metadata } from "next";
|
||||||
|
import Link from "next/link";
|
||||||
|
|
||||||
|
import { Logo } from "@/components/SiteHeader";
|
||||||
|
import { BACKEND_URL } from "@/lib/server";
|
||||||
|
import type { PublicConfig } from "@/lib/types";
|
||||||
|
|
||||||
|
import { SetPasswordForm } from "./SetPasswordForm";
|
||||||
|
|
||||||
|
export const metadata: Metadata = { title: "Jelszó megadása", robots: { index: false } };
|
||||||
|
|
||||||
|
async function minLength(): Promise<number> {
|
||||||
|
try {
|
||||||
|
const res = await fetch(`${BACKEND_URL}/v1/config`, { cache: "no-store" });
|
||||||
|
if (res.ok) return ((await res.json()) as PublicConfig).password_min_length;
|
||||||
|
} catch {
|
||||||
|
// backend down: the form still works, the backend checks the length
|
||||||
|
}
|
||||||
|
return 10;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The page of the e-mailed password link (sign-up and forgotten password). */
|
||||||
|
export default async function SetPasswordPage({
|
||||||
|
searchParams,
|
||||||
|
}: {
|
||||||
|
searchParams: Promise<Record<string, string | string[]>>;
|
||||||
|
}) {
|
||||||
|
const params = await searchParams;
|
||||||
|
const raw = Array.isArray(params.token) ? params.token[0] : params.token;
|
||||||
|
const token = raw && /^[A-Za-z0-9_-]{8,200}$/.test(raw) ? raw : null;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="auth">
|
||||||
|
<main className="auth-main">
|
||||||
|
<div className="auth-box">
|
||||||
|
<Logo />
|
||||||
|
<div className="page-head">
|
||||||
|
<h1 style={{ fontSize: 40 }}>Jelszó megadása</h1>
|
||||||
|
<p className="muted">Add meg a jelszavad, amellyel ezentúl belépsz.</p>
|
||||||
|
</div>
|
||||||
|
{token ? (
|
||||||
|
<SetPasswordForm token={token} minLength={await minLength()} />
|
||||||
|
) : (
|
||||||
|
<p className="msg msg-error" role="alert">
|
||||||
|
Hiányos a link. Nyisd meg a teljes linket a levélből, vagy kérj újat a{" "}
|
||||||
|
<Link href="/belepes?mod=elfelejtett">belépésnél</Link>.
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -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>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -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";
|
||||||
|
|
||||||
@@ -181,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,8 +1,12 @@
|
|||||||
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 { NightSky } from "@/components/NightSky";
|
||||||
|
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";
|
||||||
|
import { siteUrl } from "@/lib/share";
|
||||||
|
|
||||||
import "./globals.css";
|
import "./globals.css";
|
||||||
|
|
||||||
@@ -13,18 +17,28 @@ const cormorant = Cormorant_Garamond({
|
|||||||
});
|
});
|
||||||
const inter = Inter({ subsets: ["latin", "latin-ext"], variable: "--font-inter" });
|
const inter = Inter({ subsets: ["latin", "latin-ext"], variable: "--font-inter" });
|
||||||
|
|
||||||
export const metadata: Metadata = {
|
export async function generateMetadata(): Promise<Metadata> {
|
||||||
title: { default: "Sorsfonalak", template: "%s · Sorsfonalak" },
|
return {
|
||||||
description: "Születési képlet, szinasztria és közösség – egy helyen.",
|
// Relative canonical and alternate addresses resolve against the site's address.
|
||||||
};
|
metadataBase: new URL(await siteUrl()),
|
||||||
|
title: { default: "Sorsfonalak", template: "%s · Sorsfonalak" },
|
||||||
|
description: "Születési képlet, szinasztria és közösség – egy helyen.",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
export default async function RootLayout({ children }: { children: React.ReactNode }) {
|
export default async function RootLayout({ children }: { children: React.ReactNode }) {
|
||||||
const me = await getMe();
|
const me = await getMe();
|
||||||
return (
|
return (
|
||||||
<html lang="hu" className={`${cormorant.variable} ${inter.variable}`}>
|
<html lang="hu" className={`${cormorant.variable} ${inter.variable}`}>
|
||||||
<body>
|
<body>
|
||||||
|
<NightSky />
|
||||||
{me && <SiteHeader me={me} />}
|
{me && <SiteHeader me={me} />}
|
||||||
{children}
|
{children}
|
||||||
|
{me && (
|
||||||
|
<Suspense fallback={null}>
|
||||||
|
<PaymentReturn />
|
||||||
|
</Suspense>
|
||||||
|
)}
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -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,6 +1,8 @@
|
|||||||
import type { Metadata } from "next";
|
import type { Metadata } from "next";
|
||||||
import { redirect } from "next/navigation";
|
import { redirect } from "next/navigation";
|
||||||
|
|
||||||
|
import { JsonLd } from "@/components/PublicFooter";
|
||||||
|
import { OPERATOR } from "@/lib/legal";
|
||||||
import { BACKEND_URL, getMe } from "@/lib/server";
|
import { BACKEND_URL, getMe } from "@/lib/server";
|
||||||
import { siteUrl } from "@/lib/share";
|
import { siteUrl } from "@/lib/share";
|
||||||
import type { PublicConfig } from "@/lib/types";
|
import type { PublicConfig } from "@/lib/types";
|
||||||
@@ -24,7 +26,7 @@ export async function generateMetadata(): Promise<Metadata> {
|
|||||||
return {
|
return {
|
||||||
title: { absolute: "Sorsfonalak – születési képlet, éves előrejelzés, kapcsolati összevetés" },
|
title: { absolute: "Sorsfonalak – születési képlet, éves előrejelzés, kapcsolati összevetés" },
|
||||||
description:
|
description:
|
||||||
"Percre pontos születési képlet és személyre szóló elemzés a legfejlettebb AI-modellekkel: egy tapasztalt asztrológushoz közelítő mélység, töredék áron. Éves előrejelzés és kapcsolati összevetés.",
|
"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}/` },
|
alternates: { canonical: `${base}/` },
|
||||||
openGraph: { type: "website", siteName: "Sorsfonalak", locale: "hu_HU", url: `${base}/`, title, description, images: [image] },
|
openGraph: { type: "website", siteName: "Sorsfonalak", locale: "hu_HU", url: `${base}/`, title, description, images: [image] },
|
||||||
twitter: { card: "summary_large_image", title, description, images: [image.url] },
|
twitter: { card: "summary_large_image", title, description, images: [image.url] },
|
||||||
@@ -44,5 +46,33 @@ async function signupMode(): Promise<PublicConfig["signup_mode"]> {
|
|||||||
export default async function Home() {
|
export default async function Home() {
|
||||||
const me = await getMe();
|
const me = await getMe();
|
||||||
if (me) redirect(me.primary_chart_id ? "/keplet" : "/profil");
|
if (me) redirect(me.primary_chart_id ? "/keplet" : "/profil");
|
||||||
return <Landing inviteOnly={(await signupMode()) !== "open"} />;
|
const base = await siteUrl();
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Landing inviteOnly={(await signupMode()) !== "open"} />
|
||||||
|
<JsonLd
|
||||||
|
data={{
|
||||||
|
"@context": "https://schema.org",
|
||||||
|
"@graph": [
|
||||||
|
{
|
||||||
|
"@type": "Organization",
|
||||||
|
"@id": `${base}/#organization`,
|
||||||
|
name: "Sorsfonalak",
|
||||||
|
url: `${base}/`,
|
||||||
|
logo: `${base}/apple-icon.png`,
|
||||||
|
email: OPERATOR.email,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"@type": "WebSite",
|
||||||
|
"@id": `${base}/#website`,
|
||||||
|
name: "Sorsfonalak",
|
||||||
|
url: `${base}/`,
|
||||||
|
inLanguage: "hu",
|
||||||
|
publisher: { "@id": `${base}/#organization` },
|
||||||
|
},
|
||||||
|
],
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,21 +1,28 @@
|
|||||||
import type { Metadata } from "next";
|
import type { Metadata } from "next";
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
|
|
||||||
|
import { OperatorDetails } from "@/components/OperatorDetails";
|
||||||
import { PublicHeader } from "@/components/SiteHeader";
|
import { PublicHeader } from "@/components/SiteHeader";
|
||||||
import { OPERATOR, PRIVACY_UPDATED_EN, operatorDetails } from "@/lib/legal";
|
import { OPERATOR, PRIVACY_UPDATED_EN } from "@/lib/legal";
|
||||||
import { getMe } from "@/lib/server";
|
import { getMe } from "@/lib/server";
|
||||||
|
|
||||||
export const metadata: Metadata = {
|
export const metadata: Metadata = {
|
||||||
title: "Privacy Policy",
|
title: "Privacy Policy",
|
||||||
description: "How Sorsfonalak handles your personal data, including the data received from your Google account.",
|
description: "How Sorsfonalak handles your personal data, including the data received from your Google account.",
|
||||||
|
alternates: { canonical: "/privacy", languages: { hu: "/adatvedelem", en: "/privacy" } },
|
||||||
};
|
};
|
||||||
|
|
||||||
const DATA: [string, string, string][] = [
|
const DATA: [string, string, string][] = [
|
||||||
[
|
[
|
||||||
"Your Google account's name, e-mail address and ID (passed on by Google when you sign in)",
|
"Your Google or Apple account's name, e-mail address and ID (passed on by Google or Apple when you sign in)",
|
||||||
"Creating your account, signing you in, contacting you",
|
"Creating your account, signing you in, contacting you",
|
||||||
"Performance of a contract (GDPR Art. 6(1)(b))",
|
"Performance of a contract (GDPR Art. 6(1)(b))",
|
||||||
],
|
],
|
||||||
|
[
|
||||||
|
"Your e-mail address and password, if you sign up with your e-mail address (we never store the password, only a salted one-way hash of it)",
|
||||||
|
"Signing in; the link sent to the address confirms that it is yours and lets you set a new password",
|
||||||
|
"Performance of a contract",
|
||||||
|
],
|
||||||
["Display name, the language of your readings", "Personalising the service", "Performance of a contract"],
|
["Display name, the language of your readings", "Personalising the service", "Performance of a contract"],
|
||||||
[
|
[
|
||||||
"Your birth data: date, time and place",
|
"Your birth data: date, time and place",
|
||||||
@@ -27,12 +34,26 @@ const DATA: [string, string, string][] = [
|
|||||||
"Their charts and readings, at your request",
|
"Their charts and readings, at your request",
|
||||||
"Performance of a contract; adding someone requires their consent (see section 5)",
|
"Performance of a contract; adding someone requires their consent (see section 5)",
|
||||||
],
|
],
|
||||||
["Your charts and finished readings", "So you can look at them again at any time", "Performance of a contract"],
|
[
|
||||||
|
"Your charts, finished readings and tarot readings, the questions you asked and their answers",
|
||||||
|
"So you can look at them again at any time",
|
||||||
|
"Performance of a contract",
|
||||||
|
],
|
||||||
[
|
[
|
||||||
"Your purchases and used allowances (readings, persons)",
|
"Your purchases and used allowances (readings, persons)",
|
||||||
"Providing the purchased service, accounting",
|
"Providing the purchased service, accounting",
|
||||||
"Performance of a contract; legal obligation (Art. 6(1)(c))",
|
"Performance of a contract; legal obligation (Art. 6(1)(c))",
|
||||||
],
|
],
|
||||||
|
[
|
||||||
|
"Your payments: Stripe's payment ID, the amount paid, your billing name, address and e-mail address, and for a company purchase the company name and tax number",
|
||||||
|
"Proof of payment, issuing the invoice",
|
||||||
|
"Performance of a contract; legal obligation (Art. 6(1)(c))",
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"Your shared links: the link's code, its view count and a salted hash of the IP address you created it from; if someone signs up from your link, who brought them",
|
||||||
|
"Making sharing work and the reward for sharing; not counting your own views",
|
||||||
|
"Performance of a contract; legitimate interest (Art. 6(1)(f))",
|
||||||
|
],
|
||||||
[
|
[
|
||||||
"An invitee's e-mail address, the inviter's name and personal message",
|
"An invitee's e-mail address, the inviter's name and personal message",
|
||||||
"Sending the invitation; while the site is invitation-only, only invitees can sign up",
|
"Sending the invitation; while the site is invitation-only, only invitees can sign up",
|
||||||
@@ -75,14 +96,8 @@ export default async function PrivacyPolicyPage() {
|
|||||||
<section>
|
<section>
|
||||||
<h2>1. Who is responsible for your data?</h2>
|
<h2>1. Who is responsible for your data?</h2>
|
||||||
<p>
|
<p>
|
||||||
{operatorDetails() ? (
|
The details of the controller of the Sorsfonalak service (sorsfonalak.hu) are at the end of this policy, in
|
||||||
<>
|
section 12. For any privacy or other question, contact us at{" "}
|
||||||
The controller of the Sorsfonalak service (sorsfonalak.hu) is <strong>{operatorDetails()}</strong>.{" "}
|
|
||||||
</>
|
|
||||||
) : (
|
|
||||||
"The controller of the Sorsfonalak service (sorsfonalak.hu) can be reached by e-mail. "
|
|
||||||
)}
|
|
||||||
For any privacy or other question, contact us at{" "}
|
|
||||||
<a href={`mailto:${OPERATOR.email}`}>
|
<a href={`mailto:${OPERATOR.email}`}>
|
||||||
<strong>{OPERATOR.email}</strong>
|
<strong>{OPERATOR.email}</strong>
|
||||||
</a>
|
</a>
|
||||||
@@ -113,8 +128,15 @@ export default async function PrivacyPolicyPage() {
|
|||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
<p>
|
<p>
|
||||||
We do not process or store card details; payments, once available, will be handled by an external payment
|
<strong>We do not process or store card details.</strong> Payments are made on Stripe's secure payment
|
||||||
provider, named here.
|
page: you give your card details directly to Stripe, and they never reach us. From Stripe we only receive
|
||||||
|
the payment's ID, the amount and your billing details, which we keep for the period required by
|
||||||
|
accounting law (8 years), even after your account is deleted.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
<strong>Shared links:</strong> if you share a chart, anyone you send the link to sees the chart drawing and
|
||||||
|
the latest short summary. It shows no name or birth data, search engines do not list it, and you can revoke
|
||||||
|
the link at any time.
|
||||||
</p>
|
</p>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
@@ -161,15 +183,25 @@ export default async function PrivacyPolicyPage() {
|
|||||||
</a>
|
</a>
|
||||||
, including the Limited Use requirements.
|
, including the Limited Use requirements.
|
||||||
</p>
|
</p>
|
||||||
|
<p>
|
||||||
|
<strong>Signing in with Apple:</strong> if you choose “Sign in with Apple”, Apple passes us your account's
|
||||||
|
unique ID and your e-mail address, and your name the first time. If you hide your address, we get an Apple
|
||||||
|
relay address (<code>…@privaterelay.appleid.com</code>) and Apple forwards our e-mails to you. We use these
|
||||||
|
for the same purposes and in the same way as the Google data. You can revoke access in your Apple ID settings
|
||||||
|
(Sign-In and Security › Sign in with Apple).
|
||||||
|
</p>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
<h2>4. Readings and artificial intelligence</h2>
|
<h2>4. Readings and artificial intelligence</h2>
|
||||||
<p>
|
<p>
|
||||||
The short summary and the detailed reading are written by a large language model (artificial intelligence).
|
The short summary, the detailed readings, tarot readings and the answers to your questions are written by a
|
||||||
Only the <strong>astronomical data of the chart</strong> reach the model (the signs, degrees, houses and
|
large language model (artificial intelligence). The model receives the{" "}
|
||||||
aspects of the planets). We never send your name, e-mail address, birth date, time or place. The readings are
|
<strong>astronomical data of the chart</strong> (the signs, degrees, houses and aspects of the planets), for
|
||||||
for entertainment and self-reflection and are not medical, financial, legal or other professional advice.
|
a tarot reading the cards drawn, and when you ask a question, its text. We never send your name, e-mail
|
||||||
|
address, birth date, time or place. Please do not write names or sensitive data (such as health data) into
|
||||||
|
your questions either. The readings are for entertainment and self-reflection and are not medical,
|
||||||
|
financial, legal or other professional advice.
|
||||||
</p>
|
</p>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
@@ -200,9 +232,17 @@ export default async function PrivacyPolicyPage() {
|
|||||||
<strong>Amazon Web Services EMEA SARL</strong> (Amazon SES): delivering service e-mails and invitations; in
|
<strong>Amazon Web Services EMEA SARL</strong> (Amazon SES): delivering service e-mails and invitations; in
|
||||||
the European Union (Frankfurt).
|
the European Union (Frankfurt).
|
||||||
</li>
|
</li>
|
||||||
|
<li>
|
||||||
|
<strong>Stripe Payments Europe, Ltd.</strong> (Ireland): processing card payments and preventing fraud;
|
||||||
|
only Stripe handles card details.
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<strong>Billingo Technologies Zrt.</strong> (Billingo): issuing, sending and keeping the invoices; it
|
||||||
|
receives your billing details (name, address, e-mail address, and for a company its name and tax number).
|
||||||
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<strong>OpenRouter, Inc.</strong> and the artificial intelligence providers it reaches: writing the readings,
|
<strong>OpenRouter, Inc.</strong> and the artificial intelligence providers it reaches: writing the readings,
|
||||||
only from the astronomical data described in section 4 (no personal data reaches them).
|
only from the data described in section 4 (they receive no name, e-mail address or birth data).
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<p>
|
<p>
|
||||||
@@ -232,6 +272,14 @@ export default async function PrivacyPolicyPage() {
|
|||||||
We use a single cookie that is strictly necessary for the service (<code>sf_session</code>), which keeps you
|
We use a single cookie that is strictly necessary for the service (<code>sf_session</code>), which keeps you
|
||||||
signed in. We use no advertising or tracking cookies and no analytics.
|
signed in. We use no advertising or tracking cookies and no analytics.
|
||||||
</p>
|
</p>
|
||||||
|
<p>
|
||||||
|
On the public birth chart page (no account needed), the birth data you enter are sent only for the
|
||||||
|
calculation and are not stored on our server. So that they are not lost when you move between pages, they
|
||||||
|
stay in the browser tab's own storage (not in a cookie) and are removed when you close the tab; the
|
||||||
|
page's “Adatok törlése” (delete data) button removes them earlier. If you sign up in the same tab, they
|
||||||
|
fill in the birth data on your profile. This storage only keeps what you typed, so it needs no separate
|
||||||
|
consent.
|
||||||
|
</p>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
@@ -274,6 +322,11 @@ export default async function PrivacyPolicyPage() {
|
|||||||
always on this page.
|
always on this page.
|
||||||
</p>
|
</p>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>12. Controller details</h2>
|
||||||
|
<OperatorDetails lang="en" />
|
||||||
|
</section>
|
||||||
</main>
|
</main>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import { useEffect, useId, useMemo, useRef, useState } from "react";
|
|||||||
|
|
||||||
import { ApiError, api, errorText } from "@/lib/api";
|
import { ApiError, api, errorText } from "@/lib/api";
|
||||||
import { countryName } from "@/lib/astro";
|
import { countryName } from "@/lib/astro";
|
||||||
|
import { BIRTH_DRAFT_KEY, type BirthDraft, MONTHS, composeDate, composeTime, daysIn } from "@/lib/birth";
|
||||||
import type { BirthData, Country, Place } from "@/lib/types";
|
import type { BirthData, Country, Place } from "@/lib/types";
|
||||||
|
|
||||||
type Initial = (BirthData & { placeName: string | null; region: string | null }) | null;
|
type Initial = (BirthData & { placeName: string | null; region: string | null }) | null;
|
||||||
@@ -32,8 +33,16 @@ export function BirthForm({
|
|||||||
onSaved: (chartId: string) => void;
|
onSaved: (chartId: string) => void;
|
||||||
}) {
|
}) {
|
||||||
const [name, setName] = useState(person?.name ?? "");
|
const [name, setName] = useState(person?.name ?? "");
|
||||||
const [date, setDate] = useState(initial?.date ?? "");
|
// Our own fields, not the browser's date and time inputs: those follow the
|
||||||
const [time, setTime] = useState(initial?.time?.slice(0, 5) ?? "");
|
// operating system's or the browser's region (US order, AM/PM in Safari).
|
||||||
|
const [year, setYear] = useState(initial?.date?.slice(0, 4) ?? "");
|
||||||
|
const [month, setMonth] = useState(initial?.date ? String(Number(initial.date.slice(5, 7))) : "");
|
||||||
|
const [day, setDay] = useState(initial?.date ? String(Number(initial.date.slice(8, 10))) : "");
|
||||||
|
const [hour, setHour] = useState(initial?.time?.slice(0, 2) ?? "");
|
||||||
|
const [minute, setMinute] = useState(initial?.time?.slice(3, 5) ?? "");
|
||||||
|
const minuteRef = useRef<HTMLInputElement>(null);
|
||||||
|
const date = composeDate(year, month, day) ?? "";
|
||||||
|
const time = composeTime(hour, minute) ?? "";
|
||||||
const [timeUnknown, setTimeUnknown] = useState(initial ? !initial.time : false);
|
const [timeUnknown, setTimeUnknown] = useState(initial ? !initial.time : false);
|
||||||
const [country, setCountry] = useState(initial?.country ?? "HU");
|
const [country, setCountry] = useState(initial?.country ?? "HU");
|
||||||
const [place, setPlace] = useState<Place | null>(
|
const [place, setPlace] = useState<Place | null>(
|
||||||
@@ -52,13 +61,47 @@ export function BirthForm({
|
|||||||
const [error, setError] = useState<string | null>(null);
|
const [error, setError] = useState<string | null>(null);
|
||||||
const [busy, setBusy] = useState(false);
|
const [busy, setBusy] = useState(false);
|
||||||
const today = useMemo(() => new Date().toISOString().slice(0, 10), []);
|
const today = useMemo(() => new Date().toISOString().slice(0, 10), []);
|
||||||
|
const [fromDraft, setFromDraft] = useState(false);
|
||||||
|
|
||||||
|
// The own birth data, not given yet: offer what the visitor typed into the
|
||||||
|
// public birth chart page before signing up.
|
||||||
|
useEffect(() => {
|
||||||
|
if (initial || person) return;
|
||||||
|
let draft: BirthDraft | null = null;
|
||||||
|
try {
|
||||||
|
draft = JSON.parse(sessionStorage.getItem(BIRTH_DRAFT_KEY) ?? "null");
|
||||||
|
} catch {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!draft || !/^\d{4}-\d{2}-\d{2}$/.test(draft.date) || !draft.geonames_id) return;
|
||||||
|
setYear(draft.date.slice(0, 4));
|
||||||
|
setMonth(String(Number(draft.date.slice(5, 7))));
|
||||||
|
setDay(String(Number(draft.date.slice(8, 10))));
|
||||||
|
if (draft.time) {
|
||||||
|
setHour(draft.time.slice(0, 2));
|
||||||
|
setMinute(draft.time.slice(3, 5));
|
||||||
|
}
|
||||||
|
setTimeUnknown(!draft.time);
|
||||||
|
setCountry(draft.country);
|
||||||
|
setPlace({
|
||||||
|
geonames_id: draft.geonames_id,
|
||||||
|
name: draft.placeName,
|
||||||
|
region: draft.region,
|
||||||
|
population: null,
|
||||||
|
country_code: draft.country,
|
||||||
|
});
|
||||||
|
setFromDraft(true);
|
||||||
|
}, [initial, person]);
|
||||||
|
|
||||||
async function submit(e: React.FormEvent) {
|
async function submit(e: React.FormEvent) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
setError(null);
|
setError(null);
|
||||||
if (person && !name.trim()) return setError("Add meg a nevét.");
|
if (person && !name.trim()) return setError("Add meg a nevét.");
|
||||||
if (!date) return setError("Add meg a születési dátumot.");
|
if (!year && !month && !day) return setError("Add meg a születési dátumot.");
|
||||||
if (!timeUnknown && !time) return setError("Add meg a születési időt, vagy jelöld, hogy nem tudod.");
|
if (!date) return setError("Ellenőrizd a dátumot: az év négy számjegy, és a nap legyen az adott hónapban.");
|
||||||
|
if (date > today) return setError("A születési dátum nem lehet a jövőben.");
|
||||||
|
if (!timeUnknown && !hour && !minute) return setError("Add meg a születési időt, vagy jelöld, hogy nem tudod.");
|
||||||
|
if (!timeUnknown && !time) return setError("Ellenőrizd az időt: óra 0–23, perc 0–59.");
|
||||||
if (!place) return setError("Válaszd ki a születési helyet a listából.");
|
if (!place) return setError("Válaszd ki a születési helyet a listából.");
|
||||||
setBusy(true);
|
setBusy(true);
|
||||||
try {
|
try {
|
||||||
@@ -88,6 +131,11 @@ export function BirthForm({
|
|||||||
? { label: name.trim(), is_primary: false, birth }
|
? { label: name.trim(), is_primary: false, birth }
|
||||||
: { label: "Saját képlet", is_primary: true, birth },
|
: { label: "Saját képlet", is_primary: true, birth },
|
||||||
});
|
});
|
||||||
|
try {
|
||||||
|
sessionStorage.removeItem(BIRTH_DRAFT_KEY);
|
||||||
|
} catch {
|
||||||
|
// storage blocked
|
||||||
|
}
|
||||||
onSaved(saved.id);
|
onSaved(saved.id);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
if (err instanceof ApiError && err.code === "ambiguous_local_time") {
|
if (err instanceof ApiError && err.code === "ambiguous_local_time") {
|
||||||
@@ -105,6 +153,11 @@ export function BirthForm({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<form onSubmit={submit} className="field" style={{ gap: 18 }} noValidate>
|
<form onSubmit={submit} className="field" style={{ gap: 18 }} noValidate>
|
||||||
|
{fromDraft && (
|
||||||
|
<p className="msg msg-ok" style={{ margin: 0 }}>
|
||||||
|
Áthoztuk az adatokat, amelyeket a születési horoszkópnál megadtál. Ellenőrizd, és mentsd el.
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
{person && (
|
{person && (
|
||||||
<div className="field" style={{ maxWidth: 420 }}>
|
<div className="field" style={{ maxWidth: 420 }}>
|
||||||
<label htmlFor="person-name">Név</label>
|
<label htmlFor="person-name">Név</label>
|
||||||
@@ -120,37 +173,106 @@ export function BirthForm({
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
<div className="grid-2">
|
<div className="grid-2">
|
||||||
<div className="field">
|
<fieldset className="field birth-fields">
|
||||||
<label htmlFor="birth-date">Születési dátum</label>
|
<legend className="label">Születési dátum</legend>
|
||||||
<input
|
<div className="birth-row">
|
||||||
id="birth-date"
|
<label className="sr-only" htmlFor="birth-year">
|
||||||
type="date"
|
Év
|
||||||
className="inp"
|
</label>
|
||||||
min="1000-01-01"
|
<input
|
||||||
max={today}
|
id="birth-year"
|
||||||
value={date}
|
className="inp birth-year"
|
||||||
onChange={(e) => setDate(e.target.value)}
|
inputMode="numeric"
|
||||||
required
|
autoComplete="bday-year"
|
||||||
/>
|
placeholder="év"
|
||||||
</div>
|
maxLength={4}
|
||||||
<div className="field">
|
value={year}
|
||||||
<label htmlFor="birth-time">Születési idő (helyi idő)</label>
|
onChange={(e) => setYear(e.target.value.replace(/\D/g, ""))}
|
||||||
<input
|
/>
|
||||||
id="birth-time"
|
<label className="sr-only" htmlFor="birth-month">
|
||||||
type="time"
|
Hónap
|
||||||
className="inp"
|
</label>
|
||||||
value={timeUnknown ? "" : time}
|
<select
|
||||||
disabled={timeUnknown}
|
id="birth-month"
|
||||||
onChange={(e) => {
|
className="inp birth-month"
|
||||||
setTime(e.target.value);
|
autoComplete="bday-month"
|
||||||
setAmbiguous(false);
|
value={month}
|
||||||
}}
|
onChange={(e) => setMonth(e.target.value)}
|
||||||
/>
|
>
|
||||||
|
<option value="">hónap</option>
|
||||||
|
{MONTHS.map((m, i) => (
|
||||||
|
<option key={m} value={i + 1}>
|
||||||
|
{m}
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
<label className="sr-only" htmlFor="birth-day">
|
||||||
|
Nap
|
||||||
|
</label>
|
||||||
|
<select
|
||||||
|
id="birth-day"
|
||||||
|
className="inp birth-day"
|
||||||
|
autoComplete="bday-day"
|
||||||
|
value={day}
|
||||||
|
onChange={(e) => setDay(e.target.value)}
|
||||||
|
>
|
||||||
|
<option value="">nap</option>
|
||||||
|
{Array.from({ length: month ? daysIn(Number(year), Number(month)) : 31 }, (_, i) => (
|
||||||
|
<option key={i + 1} value={i + 1}>
|
||||||
|
{i + 1}.
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</fieldset>
|
||||||
|
<fieldset className="field birth-fields">
|
||||||
|
<legend className="label">Születési idő (helyi idő)</legend>
|
||||||
|
<div className="birth-row">
|
||||||
|
<label className="sr-only" htmlFor="birth-hour">
|
||||||
|
Óra
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
id="birth-hour"
|
||||||
|
className="inp birth-time"
|
||||||
|
inputMode="numeric"
|
||||||
|
placeholder="óra"
|
||||||
|
maxLength={2}
|
||||||
|
value={timeUnknown ? "" : hour}
|
||||||
|
disabled={timeUnknown}
|
||||||
|
onChange={(e) => {
|
||||||
|
const v = e.target.value.replace(/\D/g, "");
|
||||||
|
setHour(v);
|
||||||
|
setAmbiguous(false);
|
||||||
|
// Two digits (or one that cannot start a valid hour): on to the minutes.
|
||||||
|
if (v.length === 2 || (v.length === 1 && Number(v) > 2)) minuteRef.current?.focus();
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<span className="birth-colon" aria-hidden="true">
|
||||||
|
:
|
||||||
|
</span>
|
||||||
|
<label className="sr-only" htmlFor="birth-minute">
|
||||||
|
Perc
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
id="birth-minute"
|
||||||
|
ref={minuteRef}
|
||||||
|
className="inp birth-time"
|
||||||
|
inputMode="numeric"
|
||||||
|
placeholder="perc"
|
||||||
|
maxLength={2}
|
||||||
|
value={timeUnknown ? "" : minute}
|
||||||
|
disabled={timeUnknown}
|
||||||
|
onChange={(e) => {
|
||||||
|
setMinute(e.target.value.replace(/\D/g, ""));
|
||||||
|
setAmbiguous(false);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
<label className="check">
|
<label className="check">
|
||||||
<input type="checkbox" checked={timeUnknown} onChange={(e) => setTimeUnknown(e.target.checked)} />
|
<input type="checkbox" checked={timeUnknown} onChange={(e) => setTimeUnknown(e.target.checked)} />
|
||||||
Nem tudom a születési időt
|
Nem tudom a születési időt
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</fieldset>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="grid-2">
|
<div className="grid-2">
|
||||||
@@ -199,10 +321,21 @@ export function BirthForm({
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function CountrySelect({ value, onChange }: { value: string; onChange: (iso2: string) => void }) {
|
/** Where the country list and the place search come from: logged-in users, or the public calculator. */
|
||||||
|
export type GeoBase = "/api/geo" | "/api/v1/public/geo";
|
||||||
|
|
||||||
|
export function CountrySelect({
|
||||||
|
value,
|
||||||
|
onChange,
|
||||||
|
geoBase = "/api/geo",
|
||||||
|
}: {
|
||||||
|
value: string;
|
||||||
|
onChange: (iso2: string) => void;
|
||||||
|
geoBase?: GeoBase;
|
||||||
|
}) {
|
||||||
const [countries, setCountries] = useState<Country[]>([]);
|
const [countries, setCountries] = useState<Country[]>([]);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
fetch("/api/geo/countries")
|
fetch(`${geoBase}/countries`)
|
||||||
.then((r) => (r.ok ? r.json() : { countries: [] }))
|
.then((r) => (r.ok ? r.json() : { countries: [] }))
|
||||||
.then((d: { countries: Country[] }) => {
|
.then((d: { countries: Country[] }) => {
|
||||||
const named = d.countries.map((c) => ({ iso2: c.iso2, name: countryName(c.iso2, c.name) }));
|
const named = d.countries.map((c) => ({ iso2: c.iso2, name: countryName(c.iso2, c.name) }));
|
||||||
@@ -210,7 +343,7 @@ export function CountrySelect({ value, onChange }: { value: string; onChange: (i
|
|||||||
setCountries(named);
|
setCountries(named);
|
||||||
})
|
})
|
||||||
.catch(() => setCountries([]));
|
.catch(() => setCountries([]));
|
||||||
}, []);
|
}, [geoBase]);
|
||||||
return (
|
return (
|
||||||
<div className="field">
|
<div className="field">
|
||||||
<label htmlFor="birth-country">Ország</label>
|
<label htmlFor="birth-country">Ország</label>
|
||||||
@@ -230,10 +363,12 @@ export function PlaceSearch({
|
|||||||
country,
|
country,
|
||||||
value,
|
value,
|
||||||
onChange,
|
onChange,
|
||||||
|
geoBase = "/api/geo",
|
||||||
}: {
|
}: {
|
||||||
country: string;
|
country: string;
|
||||||
value: Place | null;
|
value: Place | null;
|
||||||
onChange: (p: Place | null) => void;
|
onChange: (p: Place | null) => void;
|
||||||
|
geoBase?: GeoBase;
|
||||||
}) {
|
}) {
|
||||||
const listId = useId();
|
const listId = useId();
|
||||||
const [query, setQuery] = useState(value?.name ?? "");
|
const [query, setQuery] = useState(value?.name ?? "");
|
||||||
@@ -252,6 +387,11 @@ export function PlaceSearch({
|
|||||||
setResults([]);
|
setResults([]);
|
||||||
}, [country]);
|
}, [country]);
|
||||||
|
|
||||||
|
// A place set from outside (e.g. brought over from the public chart page) shows its name.
|
||||||
|
useEffect(() => {
|
||||||
|
if (value) setQuery((q) => (q === value.name ? q : value.name));
|
||||||
|
}, [value]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const q = query.trim();
|
const q = query.trim();
|
||||||
if (q.length < 2 || (value && value.name === query)) {
|
if (q.length < 2 || (value && value.name === query)) {
|
||||||
@@ -262,7 +402,7 @@ export function PlaceSearch({
|
|||||||
setLoading(true);
|
setLoading(true);
|
||||||
const timer = setTimeout(async () => {
|
const timer = setTimeout(async () => {
|
||||||
try {
|
try {
|
||||||
const res = await fetch(`/api/geo/places?country=${country}&q=${encodeURIComponent(q)}&limit=8`);
|
const res = await fetch(`${geoBase}/places?country=${country}&q=${encodeURIComponent(q)}&limit=8`);
|
||||||
const data = res.ok ? ((await res.json()) as { places: Place[] }) : { places: [] };
|
const data = res.ok ? ((await res.json()) as { places: Place[] }) : { places: [] };
|
||||||
if (id === seq.current) {
|
if (id === seq.current) {
|
||||||
setResults(data.places);
|
setResults(data.places);
|
||||||
@@ -276,7 +416,7 @@ export function PlaceSearch({
|
|||||||
}
|
}
|
||||||
}, 250);
|
}, 250);
|
||||||
return () => clearTimeout(timer);
|
return () => clearTimeout(timer);
|
||||||
}, [query, country, value]);
|
}, [query, country, value, geoBase]);
|
||||||
|
|
||||||
function choose(p: Place) {
|
function choose(p: Place) {
|
||||||
onChange(p);
|
onChange(p);
|
||||||
|
|||||||
@@ -2,27 +2,21 @@ import type { MetadataRoute } from "next";
|
|||||||
|
|
||||||
import { siteUrl } from "@/lib/share";
|
import { siteUrl } from "@/lib/share";
|
||||||
|
|
||||||
// AI crawlers that train models or answer from the site: they load pages
|
// Crawlers that collect content to train AI models, or to sell it as
|
||||||
// far more often than visitors do. Link preview robots (Facebook, Messenger,
|
// training data. They bring no visitors back, so they are shut out.
|
||||||
// Slack, WhatsApp, X, LinkedIn) stay allowed, they make the shared links work.
|
// Google-Extended and Applebot-Extended only opt out of training: Google
|
||||||
const AI_CRAWLERS = [
|
// Search (AI Overviews included) and Siri keep reading the site.
|
||||||
|
const TRAINING_CRAWLERS = [
|
||||||
"GPTBot",
|
"GPTBot",
|
||||||
"ChatGPT-User",
|
|
||||||
"OAI-SearchBot",
|
|
||||||
"ClaudeBot",
|
"ClaudeBot",
|
||||||
"Claude-User",
|
|
||||||
"Claude-SearchBot",
|
|
||||||
"anthropic-ai",
|
"anthropic-ai",
|
||||||
"CCBot",
|
"CCBot",
|
||||||
"Google-Extended",
|
"Google-Extended",
|
||||||
"GoogleOther",
|
"GoogleOther",
|
||||||
"Applebot-Extended",
|
"Applebot-Extended",
|
||||||
"PerplexityBot",
|
|
||||||
"Perplexity-User",
|
|
||||||
"Bytespider",
|
"Bytespider",
|
||||||
"Amazonbot",
|
"Amazonbot",
|
||||||
"meta-externalagent",
|
"meta-externalagent",
|
||||||
"meta-externalfetcher",
|
|
||||||
"FacebookBot",
|
"FacebookBot",
|
||||||
"cohere-ai",
|
"cohere-ai",
|
||||||
"cohere-training-data-crawler",
|
"cohere-training-data-crawler",
|
||||||
@@ -30,23 +24,46 @@ const AI_CRAWLERS = [
|
|||||||
"ImagesiftBot",
|
"ImagesiftBot",
|
||||||
"Omgilibot",
|
"Omgilibot",
|
||||||
"Omgili",
|
"Omgili",
|
||||||
"YouBot",
|
"Webzio-Extended",
|
||||||
"Timpibot",
|
"Timpibot",
|
||||||
"AI2Bot",
|
"AI2Bot",
|
||||||
"Ai2Bot-Dolma",
|
"Ai2Bot-Dolma",
|
||||||
"DuckAssistBot",
|
"PanguBot",
|
||||||
"MistralAI-User",
|
"Kangaroo Bot",
|
||||||
|
"img2dataset",
|
||||||
|
// Not training, but heavy and of no use here: Huawei's Petal search and
|
||||||
|
// Scrapy's default user agent.
|
||||||
"PetalBot",
|
"PetalBot",
|
||||||
"Scrapy",
|
"Scrapy",
|
||||||
];
|
];
|
||||||
|
|
||||||
|
// AI search engines and the fetchers that read a page when someone asks a
|
||||||
|
// chatbot about it. These can cite the site and send visitors, so they may
|
||||||
|
// come, but at most one page every few seconds (for those that honour it).
|
||||||
|
const AI_SEARCH = [
|
||||||
|
"OAI-SearchBot",
|
||||||
|
"ChatGPT-User",
|
||||||
|
"Claude-SearchBot",
|
||||||
|
"Claude-User",
|
||||||
|
"PerplexityBot",
|
||||||
|
"Perplexity-User",
|
||||||
|
"DuckAssistBot",
|
||||||
|
"MistralAI-User",
|
||||||
|
"meta-externalfetcher",
|
||||||
|
"YouBot",
|
||||||
|
];
|
||||||
|
|
||||||
|
// Logged-in pages redirect anyway; shared links carry noindex.
|
||||||
|
const PRIVATE = ["/api/", "/admin", "/profil", "/kepletek", "/osszevetesek", "/szemelyek", "/szamlak"];
|
||||||
|
|
||||||
export default async function robots(): Promise<MetadataRoute.Robots> {
|
export default async function robots(): Promise<MetadataRoute.Robots> {
|
||||||
return {
|
return {
|
||||||
sitemap: `${await siteUrl()}/sitemap.xml`,
|
sitemap: `${await siteUrl()}/sitemap.xml`,
|
||||||
rules: [
|
rules: [
|
||||||
{ userAgent: AI_CRAWLERS, disallow: "/" },
|
{ userAgent: TRAINING_CRAWLERS, disallow: "/" },
|
||||||
// Logged-in pages redirect anyway; shared links carry noindex.
|
// A crawler reads only its own group, so the private paths are repeated.
|
||||||
{ userAgent: "*", allow: "/", disallow: ["/api/", "/admin", "/profil", "/kepletek", "/osszevetesek", "/szemelyek"] },
|
{ userAgent: AI_SEARCH, allow: "/", disallow: PRIVATE, crawlDelay: 10 },
|
||||||
|
{ userAgent: "*", allow: "/", disallow: PRIVATE },
|
||||||
],
|
],
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -92,7 +92,7 @@ export default async function SharedChartPage({ params }: Props) {
|
|||||||
<p className="muted">
|
<p className="muted">
|
||||||
Add meg a születési adataidat, és megkapod a saját képletedet a rövid összefoglalóval együtt, ingyen.
|
Add meg a születési adataidat, és megkapod a saját képletedet a rövid összefoglalóval együtt, ingyen.
|
||||||
</p>
|
</p>
|
||||||
<Link href={me ? "/keplet" : "/belepes"} className="btn btn-primary">
|
<Link href={me ? "/keplet" : `/belepes?ref=${encodeURIComponent(slug)}`} className="btn btn-primary">
|
||||||
{me ? "A saját képletem" : "Elkészítem a sajátomat"}
|
{me ? "A saját képletem" : "Elkészítem a sajátomat"}
|
||||||
</Link>
|
</Link>
|
||||||
</section>
|
</section>
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import type { MetadataRoute } from "next";
|
import type { MetadataRoute } from "next";
|
||||||
|
|
||||||
|
import { ZODIAC } from "@/content/zodiac";
|
||||||
import { siteUrl } from "@/lib/share";
|
import { siteUrl } from "@/lib/share";
|
||||||
|
|
||||||
/** The public pages for search engines; everything else needs a login. */
|
/** The public pages for search engines; everything else needs a login. */
|
||||||
@@ -9,6 +10,11 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
|
|||||||
return [
|
return [
|
||||||
{ url: `${base}/`, changeFrequency: "weekly", priority: 1 },
|
{ url: `${base}/`, changeFrequency: "weekly", priority: 1 },
|
||||||
{ url: `${base}/pelda`, changeFrequency: "monthly", priority: 0.8 },
|
{ url: `${base}/pelda`, changeFrequency: "monthly", priority: 0.8 },
|
||||||
|
{ url: `${base}/kartyajoslas/pelda`, changeFrequency: "monthly", priority: 0.7 },
|
||||||
|
{ url: `${base}/szuletesi-horoszkop`, changeFrequency: "monthly", priority: 0.9 },
|
||||||
|
{ url: `${base}/csillagjegyek`, changeFrequency: "monthly", priority: 0.8 },
|
||||||
|
...ZODIAC.map((z) => ({ url: `${base}/csillagjegyek/${z.slug}`, changeFrequency: "monthly" as const, priority: 0.7 })),
|
||||||
|
{ url: `${base}/aszf`, changeFrequency: "yearly", priority: 0.2 },
|
||||||
{ url: `${base}/adatvedelem`, changeFrequency: "yearly", priority: 0.2, alternates: privacy },
|
{ url: `${base}/adatvedelem`, changeFrequency: "yearly", priority: 0.2, alternates: privacy },
|
||||||
{ url: `${base}/privacy`, changeFrequency: "yearly", priority: 0.2, alternates: privacy },
|
{ url: `${base}/privacy`, changeFrequency: "yearly", priority: 0.2, alternates: privacy },
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -0,0 +1,77 @@
|
|||||||
|
import type { Metadata } from "next";
|
||||||
|
import Link from "next/link";
|
||||||
|
|
||||||
|
import { backendGet, requireMe } from "@/lib/server";
|
||||||
|
import type { Invoice } from "@/lib/types";
|
||||||
|
|
||||||
|
export const metadata: Metadata = { title: "Számláim" };
|
||||||
|
|
||||||
|
const huf = (n: number) => `${n.toLocaleString("hu-HU")} Ft`;
|
||||||
|
const day = (iso: string) => new Date(iso).toLocaleDateString("hu-HU", { timeZone: "Europe/Budapest" });
|
||||||
|
|
||||||
|
/** The invoices of the user's purchases, with the PDF to download. */
|
||||||
|
export default async function InvoicesPage() {
|
||||||
|
await requireMe("/szamlak");
|
||||||
|
const invoices = (await backendGet<{ invoices: Invoice[] }>("/v1/invoices"))?.invoices ?? [];
|
||||||
|
|
||||||
|
return (
|
||||||
|
<main className="page" style={{ maxWidth: 900 }}>
|
||||||
|
<div className="page-head">
|
||||||
|
<h1>Számláim</h1>
|
||||||
|
<p className="muted">
|
||||||
|
A vásárlásaid számlái. A számlát e-mailben is elküldjük a fizetéskor megadott címre; itt bármikor újra
|
||||||
|
letöltheted.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{invoices.length === 0 ? (
|
||||||
|
<section className="card">
|
||||||
|
<p className="muted">
|
||||||
|
Még nincs számlád. Ha csomagot vásárolsz, a számlája itt jelenik meg. <Link href="/csomagok">Csomagok →</Link>
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
) : (
|
||||||
|
<section className="card">
|
||||||
|
<div className="table-wrap">
|
||||||
|
<table className="invoice-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Dátum</th>
|
||||||
|
<th>Számlaszám</th>
|
||||||
|
<th>Tétel</th>
|
||||||
|
<th className="num">Összeg</th>
|
||||||
|
<th>
|
||||||
|
<span className="sr-only">Letöltés</span>
|
||||||
|
</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{invoices.map((inv) => (
|
||||||
|
<tr key={inv.id}>
|
||||||
|
<td>{day(inv.invoice_date ?? inv.paid_at)}</td>
|
||||||
|
<td>{inv.invoice_number ?? "–"}</td>
|
||||||
|
<td>{inv.item}</td>
|
||||||
|
<td className="num">{huf(inv.gross_huf)}</td>
|
||||||
|
<td className="act">
|
||||||
|
{inv.ready ? (
|
||||||
|
<a className="btn btn-sm" href={`/api/v1/invoices/${inv.id}/pdf`} download>
|
||||||
|
PDF letöltése
|
||||||
|
</a>
|
||||||
|
) : (
|
||||||
|
<span className="hint">Készül…</span>
|
||||||
|
)}
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
))}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
<p className="hint">
|
||||||
|
A számlákat a Billingo állítja ki. Ha egy számla adatai hibásak (például a cégnév vagy az adószám), írj nekünk,
|
||||||
|
és helyesbítjük.
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
)}
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -5,6 +5,7 @@ import { ChartCard } from "@/components/ChartCard";
|
|||||||
import { PersonActions } from "@/components/PersonActions";
|
import { PersonActions } from "@/components/PersonActions";
|
||||||
import { PendingInvites } from "@/components/PendingInvites";
|
import { PendingInvites } from "@/components/PendingInvites";
|
||||||
import { PersonPacks } from "@/components/PersonPacks";
|
import { PersonPacks } from "@/components/PersonPacks";
|
||||||
|
import { payMethod } from "@/lib/payments";
|
||||||
import { backendGet, requireMe } from "@/lib/server";
|
import { backendGet, requireMe } from "@/lib/server";
|
||||||
import type { ChartListItem, PublicConfig } from "@/lib/types";
|
import type { ChartListItem, PublicConfig } from "@/lib/types";
|
||||||
|
|
||||||
@@ -102,7 +103,7 @@ export default async function PersonsPage() {
|
|||||||
? "Elfogytak a helyeid. Újabb személyhez válassz csomagot."
|
? "Elfogytak a helyeid. Újabb személyhez válassz csomagot."
|
||||||
: "A felvett személyek képletét és elemzéseit itt éred el. Egy törölt személy helye nem szabadul fel."}
|
: "A felvett személyek képletét és elemzéseit itt éred el. Egy törölt személy helye nem szabadul fel."}
|
||||||
</p>
|
</p>
|
||||||
<PersonPacks canPay={config?.mock_payments ?? false} />
|
<PersonPacks canPay={payMethod(config, me)} />
|
||||||
</section>
|
</section>
|
||||||
)}
|
)}
|
||||||
</main>
|
</main>
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import type { Metadata } from "next";
|
import type { Metadata } from "next";
|
||||||
|
|
||||||
import { PersonPacks } from "@/components/PersonPacks";
|
import { PersonPacks } from "@/components/PersonPacks";
|
||||||
|
import { payMethod } from "@/lib/payments";
|
||||||
import { backendGet, requireMe } from "@/lib/server";
|
import { backendGet, requireMe } from "@/lib/server";
|
||||||
import type { PublicConfig } from "@/lib/types";
|
import type { PublicConfig } from "@/lib/types";
|
||||||
|
|
||||||
@@ -31,7 +32,7 @@ export default async function NewPersonPage() {
|
|||||||
full={
|
full={
|
||||||
<>
|
<>
|
||||||
<p className="muted">Elfogytak a helyeid. Újabb személyhez válassz csomagot, vagy hívd meg.</p>
|
<p className="muted">Elfogytak a helyeid. Újabb személyhez válassz csomagot, vagy hívd meg.</p>
|
||||||
<PersonPacks canPay={config?.mock_payments ?? false} />
|
<PersonPacks canPay={payMethod(config, me)} />
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -0,0 +1,452 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import Link from "next/link";
|
||||||
|
import { useEffect, useMemo, useRef, useState } from "react";
|
||||||
|
|
||||||
|
import { CountrySelect, PlaceSearch } from "@/app/profil/BirthForm";
|
||||||
|
import { AspectGrid, AspectList, BigThree, PositionTables } from "@/components/ChartTables";
|
||||||
|
import { ChartWheel, WheelLegend } from "@/components/ChartWheel";
|
||||||
|
import { Tabs } from "@/components/Tabs";
|
||||||
|
import { ZODIAC_BY_ID } from "@/content/zodiac";
|
||||||
|
import { ApiError, api, errorText } from "@/lib/api";
|
||||||
|
import { ASPECTS, countryName, formatBirthDate } from "@/lib/astro";
|
||||||
|
import { BIRTH_DRAFT_KEY, MONTHS, type BirthDraft, composeDate, composeTime, daysIn } from "@/lib/birth";
|
||||||
|
import type { BirthData, Chart, ChartResult, Place } from "@/lib/types";
|
||||||
|
|
||||||
|
interface Result {
|
||||||
|
highlights: Chart["highlights"];
|
||||||
|
/** Without a birth time: the sign may have been the neighbouring one at the start or end of the day. */
|
||||||
|
uncertain: { sun: boolean; moon: boolean };
|
||||||
|
chart: ChartResult;
|
||||||
|
}
|
||||||
|
|
||||||
|
const ERRORS: Record<string, string> = {
|
||||||
|
place_not_found: "Nem találjuk ezt a települést. Válassz a listából.",
|
||||||
|
nonexistent_local_time:
|
||||||
|
"Ez az időpont az óraátállítás miatt nem létezett ezen a napon (az órát előreállították). Ellenőrizd a születési időt.",
|
||||||
|
invalid_date: "Érvénytelen dátum.",
|
||||||
|
too_many_requests: "Erről a címről most túl sok számítás érkezett. Próbáld újra egy óra múlva.",
|
||||||
|
};
|
||||||
|
|
||||||
|
const GRID_LEGEND = ["conjunction", "sextile", "square", "trine", "opposition"];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The calculated chart and the typed birth data, kept for this browser tab
|
||||||
|
* only (sessionStorage: not a cookie, gone when the tab is closed), so they
|
||||||
|
* are there again after visiting another page, and the profile can offer the
|
||||||
|
* birth data after signing up in the same tab. Storage that only keeps what
|
||||||
|
* the visitor typed, for the session, needs no consent. Nothing of this is
|
||||||
|
* stored on the server.
|
||||||
|
*/
|
||||||
|
const CHART_KEY = "sf_public_chart";
|
||||||
|
|
||||||
|
type Saved = { result: Result; birth: BirthData };
|
||||||
|
|
||||||
|
/** Links to the sign pages of the Sun, Moon and Ascendant. */
|
||||||
|
function SignLinks({ result }: { result: Result }) {
|
||||||
|
const links: [string, string | null, string, boolean][] = [
|
||||||
|
["Napjegy", result.highlights.sun, "nap", result.uncertain.sun],
|
||||||
|
["Holdjegy", result.highlights.moon, "hold", result.uncertain.moon],
|
||||||
|
["Aszcendens", result.highlights.time_known ? result.highlights.ascendant : null, "aszcendens", false],
|
||||||
|
];
|
||||||
|
return (
|
||||||
|
<div className="card calc-links">
|
||||||
|
<span className="eyebrow">Mit jelentenek?</span>
|
||||||
|
<ul>
|
||||||
|
{links.map(([label, sign, anchor, uncertain]) => {
|
||||||
|
const z = sign ? ZODIAC_BY_ID.get(sign) : undefined;
|
||||||
|
return (
|
||||||
|
<li key={anchor}>
|
||||||
|
{z ? (
|
||||||
|
<Link href={`/csillagjegyek/${z.slug}#${anchor}`}>
|
||||||
|
{label}: {z.name} →
|
||||||
|
</Link>
|
||||||
|
) : (
|
||||||
|
<span className="muted">{label}: pontos születési idő kell hozzá</span>
|
||||||
|
)}
|
||||||
|
{uncertain && <span className="hint"> (a születési idő nélkül a szomszédos jegy is lehet)</span>}
|
||||||
|
</li>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The calculated chart: the wheel and the tables of the chart pages, without the AI parts. */
|
||||||
|
function ChartView({ result, birth }: { result: Result; birth: BirthData }) {
|
||||||
|
const r = result.chart;
|
||||||
|
const timeKnown = result.highlights.time_known;
|
||||||
|
const chart: Chart = {
|
||||||
|
id: "",
|
||||||
|
label: "Születési horoszkóp",
|
||||||
|
is_primary: false,
|
||||||
|
kind: "person",
|
||||||
|
editable_until: null,
|
||||||
|
birth_data: birth,
|
||||||
|
highlights: result.highlights,
|
||||||
|
chart: r,
|
||||||
|
created_at: "",
|
||||||
|
};
|
||||||
|
const place = r.location.place;
|
||||||
|
const country = place?.country_code ?? birth.country;
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<div className="page-head calc-result-head">
|
||||||
|
<h2>A születési horoszkópod</h2>
|
||||||
|
<p className="muted">
|
||||||
|
{formatBirthDate(birth.date)}
|
||||||
|
{timeKnown
|
||||||
|
? `, ${r.time.local.slice(11, 16)} (UTC${r.time.utc_offset}${r.time.dst ? ", nyári idő" : ""})`
|
||||||
|
: ", ismeretlen időpont"}
|
||||||
|
{" · "}
|
||||||
|
{place?.name ?? "–"}
|
||||||
|
{country ? `, ${countryName(country)}` : ""}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<section className="chart-layout" aria-label="Képletrajz">
|
||||||
|
<div className="card chart-wheel-card">
|
||||||
|
<ChartWheel chart={r} timeKnown={timeKnown} />
|
||||||
|
<WheelLegend />
|
||||||
|
</div>
|
||||||
|
<div className="field chart-side">
|
||||||
|
<BigThree chart={chart} />
|
||||||
|
<SignLinks result={result} />
|
||||||
|
<div className="card calc-save">
|
||||||
|
<strong>A rövid összefoglalóhoz lépj be</strong>
|
||||||
|
<p className="muted" style={{ margin: 0 }}>
|
||||||
|
A képletedhez ingyen írunk egy rövid, személyre szabott összefoglalót, ehhez azonban be kell jelentkezned.
|
||||||
|
Belépés után a képleted is megmarad: a most megadott születési adataidat áthozzuk.
|
||||||
|
</p>
|
||||||
|
<Link href="/belepes?vissza=/profil" className="btn btn-primary">
|
||||||
|
Belépés és ingyenes összefoglaló
|
||||||
|
</Link>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
<section className="card chart-tabs" aria-label="A képlet részletei">
|
||||||
|
<Tabs
|
||||||
|
label="A képlet részletei"
|
||||||
|
tabs={[
|
||||||
|
{ id: "bolygok", label: "Bolygók", content: <PositionTables chart={chart} /> },
|
||||||
|
{
|
||||||
|
id: "matrix",
|
||||||
|
label: "Mátrix",
|
||||||
|
content: (
|
||||||
|
<div className="field" style={{ gap: 16 }}>
|
||||||
|
<AspectGrid chart={chart} />
|
||||||
|
<ul className="grid-legend" aria-label="Jelmagyarázat">
|
||||||
|
{GRID_LEGEND.map((k) => (
|
||||||
|
<li key={k}>
|
||||||
|
<span className={`sym asp asp-${k}`} aria-hidden="true">
|
||||||
|
{ASPECTS[k]?.glyph}
|
||||||
|
</span>{" "}
|
||||||
|
{ASPECTS[k]?.hu}
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
{ id: "reszletek", label: "Fényszögek", content: <AspectList chart={chart} /> },
|
||||||
|
]}
|
||||||
|
/>
|
||||||
|
</section>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The public birth chart: a calculation only, nothing is saved and no AI is used. */
|
||||||
|
export function PublicChart() {
|
||||||
|
const [year, setYear] = useState("");
|
||||||
|
const [month, setMonth] = useState("");
|
||||||
|
const [day, setDay] = useState("");
|
||||||
|
const [hour, setHour] = useState("");
|
||||||
|
const [minute, setMinute] = useState("");
|
||||||
|
const [timeUnknown, setTimeUnknown] = useState(false);
|
||||||
|
const [country, setCountry] = useState("HU");
|
||||||
|
const [place, setPlace] = useState<Place | null>(null);
|
||||||
|
const [ambiguous, setAmbiguous] = useState(false);
|
||||||
|
const [ambiguity, setAmbiguity] = useState<"earlier" | "later">("earlier");
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const [result, setResult] = useState<Saved | null>(null);
|
||||||
|
const [stored, setStored] = useState(false);
|
||||||
|
/** After a calculation (smooth) or on coming back (at once): show the drawn chart. */
|
||||||
|
const [reveal, setReveal] = useState<ScrollBehavior | null>(null);
|
||||||
|
const minuteRef = useRef<HTMLInputElement>(null);
|
||||||
|
const resultRef = useRef<HTMLDivElement>(null);
|
||||||
|
const today = useMemo(() => new Date().toISOString().slice(0, 10), []);
|
||||||
|
|
||||||
|
// Back on the page: the birth data typed earlier and, in this tab, the chart.
|
||||||
|
useEffect(() => {
|
||||||
|
let draft: BirthDraft | null = null;
|
||||||
|
let saved: Saved | null = null;
|
||||||
|
try {
|
||||||
|
draft = JSON.parse(sessionStorage.getItem(BIRTH_DRAFT_KEY) ?? "null");
|
||||||
|
saved = JSON.parse(sessionStorage.getItem(CHART_KEY) ?? "null");
|
||||||
|
} catch {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (draft && /^\d{4}-\d{2}-\d{2}$/.test(draft.date) && draft.geonames_id) {
|
||||||
|
setYear(draft.date.slice(0, 4));
|
||||||
|
setMonth(String(Number(draft.date.slice(5, 7))));
|
||||||
|
setDay(String(Number(draft.date.slice(8, 10))));
|
||||||
|
setHour(draft.time ? draft.time.slice(0, 2) : "");
|
||||||
|
setMinute(draft.time ? draft.time.slice(3, 5) : "");
|
||||||
|
setTimeUnknown(!draft.time);
|
||||||
|
setCountry(draft.country);
|
||||||
|
setPlace({
|
||||||
|
geonames_id: draft.geonames_id,
|
||||||
|
name: draft.placeName,
|
||||||
|
region: draft.region,
|
||||||
|
population: null,
|
||||||
|
country_code: draft.country,
|
||||||
|
});
|
||||||
|
setStored(true);
|
||||||
|
}
|
||||||
|
if (saved?.result?.chart && saved.birth?.date) {
|
||||||
|
setResult(saved);
|
||||||
|
setStored(true);
|
||||||
|
setReveal("instant");
|
||||||
|
}
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
// Scrolls to the drawn chart, once it is on the page. An old tab in the
|
||||||
|
// address (#bolygok) would pull the page down to the tables instead.
|
||||||
|
useEffect(() => {
|
||||||
|
if (!reveal || !result) return;
|
||||||
|
if (window.location.hash) history.replaceState(null, "", window.location.pathname + window.location.search);
|
||||||
|
resultRef.current?.scrollIntoView({ behavior: reveal, block: "start" });
|
||||||
|
setReveal(null);
|
||||||
|
}, [reveal, result]);
|
||||||
|
|
||||||
|
/** Forgets the birth data and the chart in this browser. */
|
||||||
|
function clear() {
|
||||||
|
try {
|
||||||
|
sessionStorage.removeItem(BIRTH_DRAFT_KEY);
|
||||||
|
sessionStorage.removeItem(CHART_KEY);
|
||||||
|
} catch {
|
||||||
|
// storage blocked
|
||||||
|
}
|
||||||
|
setYear("");
|
||||||
|
setMonth("");
|
||||||
|
setDay("");
|
||||||
|
setHour("");
|
||||||
|
setMinute("");
|
||||||
|
setTimeUnknown(false);
|
||||||
|
setCountry("HU");
|
||||||
|
setPlace(null);
|
||||||
|
setAmbiguous(false);
|
||||||
|
setResult(null);
|
||||||
|
setError(null);
|
||||||
|
setStored(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function submit(e: React.FormEvent) {
|
||||||
|
e.preventDefault();
|
||||||
|
setError(null);
|
||||||
|
const date = composeDate(year, month, day);
|
||||||
|
const time = composeTime(hour, minute);
|
||||||
|
if (!date) return setError("Ellenőrizd a dátumot: az év négy számjegy, és a nap legyen az adott hónapban.");
|
||||||
|
if (date > today) return setError("A születési dátum nem lehet a jövőben.");
|
||||||
|
if (!timeUnknown && !time)
|
||||||
|
return setError("Add meg a születési időt (óra 0–23, perc 0–59), vagy jelöld, hogy nem tudod.");
|
||||||
|
if (!place) return setError("Válaszd ki a születési helyet a listából.");
|
||||||
|
setBusy(true);
|
||||||
|
try {
|
||||||
|
const birth = {
|
||||||
|
date,
|
||||||
|
...(timeUnknown ? {} : { time }),
|
||||||
|
country,
|
||||||
|
geonames_id: place.geonames_id,
|
||||||
|
};
|
||||||
|
const r = await api<Result>("/public/chart", {
|
||||||
|
body: { ...birth, ...(ambiguous ? { ambiguous_time: ambiguity } : {}) },
|
||||||
|
});
|
||||||
|
setResult({ result: r, birth });
|
||||||
|
// Kept in this browser only: for coming back to the page, and for the profile after sign-up.
|
||||||
|
const draft: BirthDraft = { ...birth, time: birth.time ?? null, placeName: place.name, region: place.region };
|
||||||
|
try {
|
||||||
|
sessionStorage.setItem(BIRTH_DRAFT_KEY, JSON.stringify(draft));
|
||||||
|
sessionStorage.setItem(CHART_KEY, JSON.stringify({ result: r, birth }));
|
||||||
|
setStored(true);
|
||||||
|
} catch {
|
||||||
|
// storage blocked or full: the chart is still shown
|
||||||
|
}
|
||||||
|
setReveal("smooth");
|
||||||
|
} catch (err) {
|
||||||
|
if (err instanceof ApiError && err.code === "ambiguous_local_time") {
|
||||||
|
setAmbiguous(true);
|
||||||
|
setError(
|
||||||
|
"Ez az időpont az óraátállítás miatt kétszer is előfordult ezen a napon. Válaszd ki, melyikben születtél.",
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
setError(err instanceof ApiError ? (ERRORS[err.code] ?? errorText(err)) : errorText(err));
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<form onSubmit={submit} className="card field calc-form" style={{ gap: 18 }} noValidate>
|
||||||
|
<div className="grid-2">
|
||||||
|
<fieldset className="field birth-fields">
|
||||||
|
<legend className="label">Születési dátum</legend>
|
||||||
|
<div className="birth-row">
|
||||||
|
<label className="sr-only" htmlFor="calc-year">
|
||||||
|
Év
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
id="calc-year"
|
||||||
|
className="inp birth-year"
|
||||||
|
inputMode="numeric"
|
||||||
|
placeholder="év"
|
||||||
|
maxLength={4}
|
||||||
|
value={year}
|
||||||
|
onChange={(e) => setYear(e.target.value.replace(/\D/g, ""))}
|
||||||
|
/>
|
||||||
|
<label className="sr-only" htmlFor="calc-month">
|
||||||
|
Hónap
|
||||||
|
</label>
|
||||||
|
<select
|
||||||
|
id="calc-month"
|
||||||
|
className="inp birth-month"
|
||||||
|
value={month}
|
||||||
|
onChange={(e) => setMonth(e.target.value)}
|
||||||
|
>
|
||||||
|
<option value="">hónap</option>
|
||||||
|
{MONTHS.map((m, i) => (
|
||||||
|
<option key={m} value={i + 1}>
|
||||||
|
{m}
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
<label className="sr-only" htmlFor="calc-day">
|
||||||
|
Nap
|
||||||
|
</label>
|
||||||
|
<select id="calc-day" className="inp birth-day" value={day} onChange={(e) => setDay(e.target.value)}>
|
||||||
|
<option value="">nap</option>
|
||||||
|
{Array.from({ length: month ? daysIn(Number(year), Number(month)) : 31 }, (_, i) => (
|
||||||
|
<option key={i + 1} value={i + 1}>
|
||||||
|
{i + 1}.
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</fieldset>
|
||||||
|
<fieldset className="field birth-fields">
|
||||||
|
<legend className="label">Születési idő (helyi idő)</legend>
|
||||||
|
<div className="birth-row">
|
||||||
|
<label className="sr-only" htmlFor="calc-hour">
|
||||||
|
Óra
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
id="calc-hour"
|
||||||
|
className="inp birth-time"
|
||||||
|
inputMode="numeric"
|
||||||
|
placeholder="óra"
|
||||||
|
maxLength={2}
|
||||||
|
value={timeUnknown ? "" : hour}
|
||||||
|
disabled={timeUnknown}
|
||||||
|
onChange={(e) => {
|
||||||
|
const v = e.target.value.replace(/\D/g, "");
|
||||||
|
setHour(v);
|
||||||
|
setAmbiguous(false);
|
||||||
|
if (v.length === 2 || (v.length === 1 && Number(v) > 2)) minuteRef.current?.focus();
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<span className="birth-colon" aria-hidden="true">
|
||||||
|
:
|
||||||
|
</span>
|
||||||
|
<label className="sr-only" htmlFor="calc-minute">
|
||||||
|
Perc
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
id="calc-minute"
|
||||||
|
ref={minuteRef}
|
||||||
|
className="inp birth-time"
|
||||||
|
inputMode="numeric"
|
||||||
|
placeholder="perc"
|
||||||
|
maxLength={2}
|
||||||
|
value={timeUnknown ? "" : minute}
|
||||||
|
disabled={timeUnknown}
|
||||||
|
onChange={(e) => {
|
||||||
|
setMinute(e.target.value.replace(/\D/g, ""));
|
||||||
|
setAmbiguous(false);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<label className="check">
|
||||||
|
<input type="checkbox" checked={timeUnknown} onChange={(e) => setTimeUnknown(e.target.checked)} />
|
||||||
|
Nem tudom a születési időt
|
||||||
|
</label>
|
||||||
|
</fieldset>
|
||||||
|
</div>
|
||||||
|
<div className="grid-2">
|
||||||
|
<CountrySelect
|
||||||
|
value={country}
|
||||||
|
geoBase="/api/v1/public/geo"
|
||||||
|
onChange={(c) => {
|
||||||
|
setCountry(c);
|
||||||
|
setPlace(null);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<PlaceSearch country={country} value={place} onChange={setPlace} geoBase="/api/v1/public/geo" />
|
||||||
|
</div>
|
||||||
|
{ambiguous && (
|
||||||
|
<fieldset className="field" style={{ border: 0, padding: 0, margin: 0 }}>
|
||||||
|
<legend className="label" style={{ marginBottom: 8 }}>
|
||||||
|
Melyik időpontban születtél?
|
||||||
|
</legend>
|
||||||
|
<label className="check">
|
||||||
|
<input
|
||||||
|
type="radio"
|
||||||
|
name="calc-ambiguity"
|
||||||
|
checked={ambiguity === "earlier"}
|
||||||
|
onChange={() => setAmbiguity("earlier")}
|
||||||
|
/>
|
||||||
|
Az elsőben, még nyári időszámítás szerint
|
||||||
|
</label>
|
||||||
|
<label className="check">
|
||||||
|
<input
|
||||||
|
type="radio"
|
||||||
|
name="calc-ambiguity"
|
||||||
|
checked={ambiguity === "later"}
|
||||||
|
onChange={() => setAmbiguity("later")}
|
||||||
|
/>
|
||||||
|
A másodikban, már téli időszámítás szerint
|
||||||
|
</label>
|
||||||
|
</fieldset>
|
||||||
|
)}
|
||||||
|
{error && (
|
||||||
|
<p className="msg msg-error" role="alert" style={{ margin: 0 }}>
|
||||||
|
{error}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
<div className="form-actions">
|
||||||
|
<button type="submit" className="btn btn-primary" disabled={busy}>
|
||||||
|
{busy ? "Számolás…" : "Elkészítem a horoszkópom"}
|
||||||
|
</button>
|
||||||
|
{stored && (
|
||||||
|
<button type="button" className="btn btn-ghost btn-sm" onClick={clear}>
|
||||||
|
Adatok törlése
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<p className="hint" style={{ margin: 0 }}>
|
||||||
|
Ingyenes, belépés nélkül. Az adataidat a szerveren nem tároljuk: csak ebben a böngészőlapban maradnak meg,
|
||||||
|
hogy oldalváltáskor ne vesszenek el, és a lap bezárásakor törlődnek.
|
||||||
|
</p>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
{result && (
|
||||||
|
<section ref={resultRef} className="calc-result" aria-live="polite" aria-label="A születési horoszkópod">
|
||||||
|
<ChartView result={result.result} birth={result.birth} />
|
||||||
|
</section>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,110 @@
|
|||||||
|
import type { Metadata } from "next";
|
||||||
|
import Link from "next/link";
|
||||||
|
|
||||||
|
import { JsonLd, PublicFooter } from "@/components/PublicFooter";
|
||||||
|
import { PublicHeader } from "@/components/SiteHeader";
|
||||||
|
import { getMe } from "@/lib/server";
|
||||||
|
import { siteUrl } from "@/lib/share";
|
||||||
|
|
||||||
|
import { PublicChart } from "./PublicChart";
|
||||||
|
|
||||||
|
export const metadata: Metadata = {
|
||||||
|
title: "Ingyenes születési horoszkóp: képletrajz, aszcendens, holdjegy",
|
||||||
|
description:
|
||||||
|
"Készítsd el ingyen, belépés nélkül a születési horoszkópodat: képletrajz, aszcendens, holdjegy, a bolygók jegyekben és házakban, fényszögek.",
|
||||||
|
alternates: { canonical: "/szuletesi-horoszkop" },
|
||||||
|
};
|
||||||
|
|
||||||
|
const FAQ: [string, string][] = [
|
||||||
|
[
|
||||||
|
"Mit mutat a születési horoszkóp?",
|
||||||
|
"A születési horoszkóp (más néven születési képlet vagy radix) az égbolt térképe a születésed pillanatában: hol állt a Nap, a Hold és a nyolc bolygó az állatövben, melyik házban, és milyen szöget zártak be egymással. A képletrajz és a táblázatok ezt mutatják.",
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"Mi az aszcendens?",
|
||||||
|
"Az aszcendens az az állatövi jegy, amely a születésed pillanatában a keleti horizonton emelkedett. Azt mutatja, hogyan lépsz be egy új helyzetbe, milyen első benyomást keltesz, és milyen szemüvegen át nézed a világot. A házak rendszere is innen indul.",
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"Miért kell hozzá a pontos születési idő?",
|
||||||
|
"A horizonton nagyjából két óránként vált a jegy, ezért az aszcendens és a házak pár perc alatt is eltolódhatnak. Születési idő nélkül a bolygók jegyei kiderülnek, de aszcendens és házak nincsenek. A pontos időt a születési anyakönyvi kivonaton vagy a kórházi zárójelentésen gyakran megtalálod.",
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"Mi a holdjegy?",
|
||||||
|
"A holdjegy az a jegy, amelyben a Hold a születésedkor állt. Az érzelmi reakcióidról, a biztonságigényedről és arról szól, mi nyugtat meg. A Hold körülbelül két és fél naponta lép új jegybe, ezért a holdjegy sokszor születési idő nélkül is kiderül.",
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"Miben más ez, mint a napilapok horoszkópja?",
|
||||||
|
"A napilapok csak a napjegyet nézik, ami egy hónapnyi születésnapra ugyanaz. A születési képlet ezzel szemben percre és helyre pontos: két ember, aki ugyanazon a napon született, más órában vagy más városban, egészen más képletet kap.",
|
||||||
|
],
|
||||||
|
];
|
||||||
|
|
||||||
|
/** The public birth chart: no login, no AI, nothing saved. */
|
||||||
|
export default async function BirthChartPage() {
|
||||||
|
const me = await getMe();
|
||||||
|
const base = await siteUrl();
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{!me && <PublicHeader current="horoszkop" />}
|
||||||
|
<main className="page calc-page" style={{ maxWidth: 1180 }}>
|
||||||
|
<div className="page-head">
|
||||||
|
<span className="eyebrow">Ingyenes, belépés nélkül</span>
|
||||||
|
<h1>Születési horoszkóp</h1>
|
||||||
|
<p className="muted" style={{ maxWidth: 760 }}>
|
||||||
|
Add meg, mikor és hol születtél, és percre pontosan kiszámoljuk a képletedet: a képletrajzot, az aszcendenst
|
||||||
|
és a holdjegyet, a bolygókat a jegyekben és a házakban, és a köztük lévő fényszögeket.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<PublicChart />
|
||||||
|
|
||||||
|
<section className="calc-explain" aria-labelledby="calc-explain-title">
|
||||||
|
<h2 id="calc-explain-title">Nap, Hold, aszcendens: a három legfontosabb pont</h2>
|
||||||
|
<div className="calc-explain-grid">
|
||||||
|
<div>
|
||||||
|
<h3>Napjegy</h3>
|
||||||
|
<p>
|
||||||
|
Az alapvető jellemed, az, ami felé tartasz. Ezt kérdezik, amikor azt mondják: „Te milyen jegy vagy?”
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<h3>Holdjegy</h3>
|
||||||
|
<p>Az érzelmeid és a megszokásaid. Az, ahogyan otthon, fáradtan, a szeretteid között vagy.</p>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<h3>Aszcendens</h3>
|
||||||
|
<p>Az első benyomás és a reflexeid. Sokan erre ismernek rá először, mert kívülről ez látszik.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<p>
|
||||||
|
Ha a három különböző jegyben áll, az teljesen természetes: ezért érzed úgy, hogy a napilapok horoszkópja
|
||||||
|
csak részben illik rád. A jegyek részletes leírását a <Link href="/csillagjegyek">csillagjegyek</Link>{" "}
|
||||||
|
oldalán találod.
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section className="calc-faq" aria-labelledby="calc-faq-title">
|
||||||
|
<h2 id="calc-faq-title">Gyakori kérdések</h2>
|
||||||
|
{FAQ.map(([q, a]) => (
|
||||||
|
<details key={q} className="card calc-faq-item">
|
||||||
|
<summary>{q}</summary>
|
||||||
|
<p>{a}</p>
|
||||||
|
</details>
|
||||||
|
))}
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
<PublicFooter />
|
||||||
|
<JsonLd
|
||||||
|
data={{
|
||||||
|
"@context": "https://schema.org",
|
||||||
|
"@type": "FAQPage",
|
||||||
|
url: `${base}/szuletesi-horoszkop`,
|
||||||
|
mainEntity: FAQ.map(([q, a]) => ({
|
||||||
|
"@type": "Question",
|
||||||
|
name: q,
|
||||||
|
acceptedAnswer: { "@type": "Answer", text: a },
|
||||||
|
})),
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,16 +1,17 @@
|
|||||||
/** Shown where people decide: the analyses are written by top AI models (never named: a business secret). */
|
/** Shown where people decide: the analyses are written by top AI models (never named: a business secret). */
|
||||||
export const AI_SHORT =
|
export const AI_SHORT =
|
||||||
"A legfejlettebb AI-modellek írják: egy tapasztalt asztrológus írásos elemzéséhez közelítő mélység, töredék áron.";
|
"A legfejlettebb AI-modellek írják a képleted pontos adataiból: alapos, személyre szabott elemzés percek alatt, egy személyes konzultáció árának töredékéért.";
|
||||||
|
|
||||||
/** A highlighted note on the analysis quality. */
|
/** A highlighted note on the analysis quality. */
|
||||||
export function AiNote() {
|
export function AiNote() {
|
||||||
return (
|
return (
|
||||||
<section className="card ai-note" aria-labelledby="ai-note-title">
|
<section className="card ai-note" aria-labelledby="ai-note-title">
|
||||||
<span className="eyebrow">Az elemzésekről</span>
|
<span className="eyebrow">Az elemzésekről</span>
|
||||||
<h2 id="ai-note-title">Profi mélység, töredék áron</h2>
|
<h2 id="ai-note-title">Alapos elemzés, töredék áron</h2>
|
||||||
<p className="muted">
|
<p className="muted">
|
||||||
Az elemzéseket a legfejlettebb AI-modellek írják, a képleted pontos pozícióiból. Részletességben és
|
Az elemzéseket a legfejlettebb AI-modellek írják, a képleted csillagászati pontosságú adataiból. Részletes,
|
||||||
árnyaltságban megközelítik egy tapasztalt asztrológus írásos elemzését, annak az árnak a töredékéért.
|
személyre szabott szöveget kapsz percek alatt, egy személyes konzultáció árának töredékéért, és amit nem értesz,
|
||||||
|
arra rá is kérdezhetsz.
|
||||||
</p>
|
</p>
|
||||||
</section>
|
</section>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import Link from "next/link";
|
|||||||
import { useCallback, useEffect, useState } from "react";
|
import { useCallback, useEffect, useState } from "react";
|
||||||
|
|
||||||
import { api, ApiError, errorText } from "@/lib/api";
|
import { api, ApiError, errorText } from "@/lib/api";
|
||||||
import type { Question, UnitBalance } from "@/lib/types";
|
import type { PayMethod, Question, UnitBalance } from "@/lib/types";
|
||||||
|
|
||||||
import { AnalysisLoading } from "./AnalysisLoading";
|
import { AnalysisLoading } from "./AnalysisLoading";
|
||||||
import { PackageChooser } from "./PackageCards";
|
import { PackageChooser } from "./PackageCards";
|
||||||
@@ -49,7 +49,7 @@ export function AnalysisQuestions({
|
|||||||
analysisId: string;
|
analysisId: string;
|
||||||
left: number;
|
left: number;
|
||||||
isAdmin: boolean;
|
isAdmin: boolean;
|
||||||
canPay: boolean;
|
canPay: PayMethod | null;
|
||||||
/** What the analysis is about: the heading and the example question follow it. */
|
/** What the analysis is about: the heading and the example question follow it. */
|
||||||
about: "natal" | "synastry" | "forecast";
|
about: "natal" | "synastry" | "forecast";
|
||||||
}) {
|
}) {
|
||||||
@@ -132,7 +132,7 @@ export function AnalysisQuestions({
|
|||||||
setBuying(false);
|
setBuying(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
const canAsk = isAdmin || left > 0;
|
const canAsk = left > 0;
|
||||||
return (
|
return (
|
||||||
<section className="questions" aria-labelledby={`${fieldId}-title`}>
|
<section className="questions" aria-labelledby={`${fieldId}-title`}>
|
||||||
<h3 id={`${fieldId}-title`}>{TEXTS[about].title}</h3>
|
<h3 id={`${fieldId}-title`}>{TEXTS[about].title}</h3>
|
||||||
@@ -196,11 +196,7 @@ export function AnalysisQuestions({
|
|||||||
{busy ? "Küldés…" : "Kérdés küldése"}
|
{busy ? "Küldés…" : "Kérdés küldése"}
|
||||||
</button>
|
</button>
|
||||||
<span className="hint">
|
<span className="hint">
|
||||||
{waiting
|
{waiting ? "Várd meg az előző válaszát." : `Még ${left} kérdésed van.`}{" "}
|
||||||
? "Várd meg az előző válaszát."
|
|
||||||
: isAdmin
|
|
||||||
? "Adminként ingyenes."
|
|
||||||
: `Még ${left} kérdésed van.`}{" "}
|
|
||||||
{text.length > MAX_CHARS - 100 && `${text.length}/${MAX_CHARS}`}
|
{text.length > MAX_CHARS - 100 && `${text.length}/${MAX_CHARS}`}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import Link from "next/link";
|
|||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
|
|
||||||
import { api, errorText } from "@/lib/api";
|
import { api, errorText } from "@/lib/api";
|
||||||
import type { Analysis } from "@/lib/types";
|
import type { Analysis, PayMethod } from "@/lib/types";
|
||||||
|
|
||||||
import { AI_SHORT } from "./AiNote";
|
import { AI_SHORT } from "./AiNote";
|
||||||
import { AnalysisLoading } from "./AnalysisLoading";
|
import { AnalysisLoading } from "./AnalysisLoading";
|
||||||
@@ -96,8 +96,8 @@ export function DetailedAnalysis({
|
|||||||
initial: Analysis | null;
|
initial: Analysis | null;
|
||||||
left: number;
|
left: number;
|
||||||
isAdmin: boolean;
|
isAdmin: boolean;
|
||||||
/** The stand-in payment is on (MOCK_PAYMENTS). */
|
/** How the user can buy a package (null: purchases are off). */
|
||||||
canPay: boolean;
|
canPay: PayMethod | null;
|
||||||
/** Shown above a finished analysis (e.g. who is the first and the second person). */
|
/** Shown above a finished analysis (e.g. who is the first and the second person). */
|
||||||
note?: string;
|
note?: string;
|
||||||
/** Questions left; given where questions can be asked. */
|
/** Questions left; given where questions can be asked. */
|
||||||
@@ -198,7 +198,7 @@ export function DetailedAnalysis({
|
|||||||
<div className="msg msg-error" role="alert">
|
<div className="msg msg-error" role="alert">
|
||||||
<p style={{ margin: 0 }}>
|
<p style={{ margin: 0 }}>
|
||||||
Az elemzés többszöri próbálkozás után sem készült el.
|
Az elemzés többszöri próbálkozás után sem készült el.
|
||||||
{isAdmin || analysis.credits_charged === 0
|
{analysis.credits_charged === 0
|
||||||
? " Próbáld újra."
|
? " Próbáld újra."
|
||||||
: " A felhasznált egységet visszaadtuk, így ingyen újra kérheted."}
|
: " A felhasznált egységet visszaadtuk, így ingyen újra kérheted."}
|
||||||
</p>
|
</p>
|
||||||
@@ -211,14 +211,7 @@ export function DetailedAnalysis({
|
|||||||
</p>
|
</p>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{isAdmin ? (
|
{left > 0 ? (
|
||||||
<div className="form-actions">
|
|
||||||
<button type="button" className="btn btn-primary" onClick={start} disabled={busy}>
|
|
||||||
{busy ? "Indítás…" : `${t.item} készítése`}
|
|
||||||
</button>
|
|
||||||
<span className="hint">Adminként ingyenes.</span>
|
|
||||||
</div>
|
|
||||||
) : left > 0 ? (
|
|
||||||
step === "confirm" ? (
|
step === "confirm" ? (
|
||||||
<div className="form-actions">
|
<div className="form-actions">
|
||||||
<button type="button" className="btn btn-primary" onClick={start} disabled={busy}>
|
<button type="button" className="btn btn-primary" onClick={start} disabled={busy}>
|
||||||
@@ -245,7 +238,11 @@ export function DetailedAnalysis({
|
|||||||
step === "pay" ? (
|
step === "pay" ? (
|
||||||
<div className="pay-box">
|
<div className="pay-box">
|
||||||
<p className="pay-lead">
|
<p className="pay-lead">
|
||||||
Válassz csomagot. A vásárlás után az elemzés azonnal elindul, a maradék elemzések pedig nem járnak le.
|
Válassz csomagot.{" "}
|
||||||
|
{canPay === "mock"
|
||||||
|
? "A vásárlás után az elemzés azonnal elindul"
|
||||||
|
: "A fizetés után visszajössz ide, és rögtön elindíthatod az elemzést"}
|
||||||
|
, a maradék elemzések pedig nem járnak le.
|
||||||
</p>
|
</p>
|
||||||
<PackageChooser ids={t.packages} canPay={canPay} onBought={start} />
|
<PackageChooser ids={t.packages} canPay={canPay} onBought={start} />
|
||||||
<div className="form-actions">
|
<div className="form-actions">
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { useState } from "react";
|
|||||||
|
|
||||||
import { api } from "@/lib/api";
|
import { api } from "@/lib/api";
|
||||||
|
|
||||||
export function LogoutButton() {
|
export function LogoutButton({ className = "btn btn-sm", role }: { className?: string; role?: "menuitem" }) {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const [busy, setBusy] = useState(false);
|
const [busy, setBusy] = useState(false);
|
||||||
async function logout() {
|
async function logout() {
|
||||||
@@ -20,7 +20,7 @@ export function LogoutButton() {
|
|||||||
router.refresh();
|
router.refresh();
|
||||||
}
|
}
|
||||||
return (
|
return (
|
||||||
<button type="button" className="btn btn-sm" onClick={logout} disabled={busy}>
|
<button type="button" className={className} role={role} onClick={logout} disabled={busy}>
|
||||||
Kilépés
|
Kilépés
|
||||||
</button>
|
</button>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -0,0 +1,143 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useEffect, useRef } from "react";
|
||||||
|
|
||||||
|
/** The meteor's colour (warm gold, like the site's accent) and its head. */
|
||||||
|
const TINT = [236, 205, 140];
|
||||||
|
/** On average one meteor this often (seconds); each gap is 50–150% of it. */
|
||||||
|
const EVERY = 6;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The site's background: faint twinkling stars and, every few seconds, a
|
||||||
|
* shooting star. A fixed canvas behind all content, so anything with its own
|
||||||
|
* background (bands, cards, the header) covers it and the meteor passes
|
||||||
|
* under them. With "reduce motion" set, only still stars are drawn.
|
||||||
|
*/
|
||||||
|
export function NightSky() {
|
||||||
|
const ref = useRef<HTMLCanvasElement>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const canvas = ref.current;
|
||||||
|
const ctx = canvas?.getContext("2d");
|
||||||
|
if (!canvas || !ctx) return;
|
||||||
|
const reduced = window.matchMedia("(prefers-reduced-motion: reduce)").matches;
|
||||||
|
|
||||||
|
type Star = { x: number; y: number; r: number; base: number; phase: number; rate: number };
|
||||||
|
type Meteor = { x: number; y: number; dx: number; dy: number; len: number; life: number; span: number; width: number };
|
||||||
|
let w = 0;
|
||||||
|
let h = 0;
|
||||||
|
let stars: Star[] = [];
|
||||||
|
const meteors: Meteor[] = [];
|
||||||
|
|
||||||
|
function resize() {
|
||||||
|
const dpr = Math.min(window.devicePixelRatio || 1, 2);
|
||||||
|
w = canvas!.clientWidth;
|
||||||
|
h = canvas!.clientHeight;
|
||||||
|
canvas!.width = Math.round(w * dpr);
|
||||||
|
canvas!.height = Math.round(h * dpr);
|
||||||
|
ctx!.setTransform(dpr, 0, 0, dpr, 0, 0);
|
||||||
|
// About one star per 9000 px².
|
||||||
|
stars = Array.from({ length: Math.round((w * h) / 9000) }, () => ({
|
||||||
|
x: Math.random() * w,
|
||||||
|
y: Math.random() * h,
|
||||||
|
r: Math.random() < 0.85 ? 0.5 + Math.random() * 0.7 : 1.1 + Math.random() * 0.6,
|
||||||
|
base: 0.12 + Math.random() * 0.3,
|
||||||
|
phase: Math.random() * Math.PI * 2,
|
||||||
|
rate: 0.4 + Math.random() * 0.9,
|
||||||
|
}));
|
||||||
|
if (reduced) drawStars(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Enters in the upper part of the screen and falls down and to the left at a shallow angle. */
|
||||||
|
function spawn() {
|
||||||
|
const angle = ((200 + Math.random() * 18) * Math.PI) / 180;
|
||||||
|
const speed = (w > 700 ? 900 : 620) * (0.85 + Math.random() * 0.3);
|
||||||
|
meteors.push({
|
||||||
|
x: w * (0.35 + Math.random() * 0.75),
|
||||||
|
y: -20 + Math.random() * h * 0.35,
|
||||||
|
dx: Math.cos(angle) * speed,
|
||||||
|
dy: -Math.sin(angle) * speed,
|
||||||
|
len: (w > 700 ? 190 : 130) * (0.8 + Math.random() * 0.5),
|
||||||
|
life: 0,
|
||||||
|
span: 0.75 + Math.random() * 0.45,
|
||||||
|
width: 1.2 + Math.random() * 0.8,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function drawStars(t: number) {
|
||||||
|
ctx!.clearRect(0, 0, w, h);
|
||||||
|
ctx!.fillStyle = "#ece6d8";
|
||||||
|
for (const s of stars) {
|
||||||
|
ctx!.globalAlpha = Math.max(0.04, reduced ? s.base : s.base + Math.sin(t * s.rate + s.phase) * 0.12);
|
||||||
|
ctx!.beginPath();
|
||||||
|
ctx!.arc(s.x, s.y, s.r, 0, Math.PI * 2);
|
||||||
|
ctx!.fill();
|
||||||
|
}
|
||||||
|
ctx!.globalAlpha = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
function drawMeteor(m: Meteor) {
|
||||||
|
const p = m.life / m.span;
|
||||||
|
// Fades in fast, burns, then fades out.
|
||||||
|
const fade = p < 0.15 ? p / 0.15 : p > 0.7 ? Math.max(0, (1 - p) / 0.3) : 1;
|
||||||
|
const [r, g, b] = TINT;
|
||||||
|
const norm = Math.hypot(m.dx, m.dy);
|
||||||
|
const tx = m.x - (m.dx / norm) * m.len;
|
||||||
|
const ty = m.y - (m.dy / norm) * m.len;
|
||||||
|
const tail = ctx!.createLinearGradient(m.x, m.y, tx, ty);
|
||||||
|
tail.addColorStop(0, `rgba(255, 250, 235, ${0.95 * fade})`);
|
||||||
|
tail.addColorStop(0.12, `rgba(${r}, ${g}, ${b}, ${0.75 * fade})`);
|
||||||
|
tail.addColorStop(1, `rgba(${r}, ${g}, ${b}, 0)`);
|
||||||
|
ctx!.strokeStyle = tail;
|
||||||
|
ctx!.lineWidth = m.width;
|
||||||
|
ctx!.lineCap = "round";
|
||||||
|
ctx!.beginPath();
|
||||||
|
ctx!.moveTo(m.x, m.y);
|
||||||
|
ctx!.lineTo(tx, ty);
|
||||||
|
ctx!.stroke();
|
||||||
|
const glow = ctx!.createRadialGradient(m.x, m.y, 0, m.x, m.y, 9);
|
||||||
|
glow.addColorStop(0, `rgba(255, 252, 240, ${0.9 * fade})`);
|
||||||
|
glow.addColorStop(0.4, `rgba(${r}, ${g}, ${b}, ${0.35 * fade})`);
|
||||||
|
glow.addColorStop(1, `rgba(${r}, ${g}, ${b}, 0)`);
|
||||||
|
ctx!.fillStyle = glow;
|
||||||
|
ctx!.beginPath();
|
||||||
|
ctx!.arc(m.x, m.y, 9, 0, Math.PI * 2);
|
||||||
|
ctx!.fill();
|
||||||
|
}
|
||||||
|
|
||||||
|
window.addEventListener("resize", resize);
|
||||||
|
resize();
|
||||||
|
if (reduced) return () => window.removeEventListener("resize", resize);
|
||||||
|
|
||||||
|
let next = 1.5;
|
||||||
|
let last = performance.now();
|
||||||
|
let raf = 0;
|
||||||
|
const frame = (now: number) => {
|
||||||
|
// A hidden tab gets no frames; a long gap is not a burst of meteors.
|
||||||
|
const dt = Math.min((now - last) / 1000, 0.05);
|
||||||
|
last = now;
|
||||||
|
drawStars(now / 1000);
|
||||||
|
next -= dt;
|
||||||
|
if (next <= 0) {
|
||||||
|
spawn();
|
||||||
|
next = EVERY * (0.5 + Math.random());
|
||||||
|
}
|
||||||
|
for (let i = meteors.length - 1; i >= 0; i--) {
|
||||||
|
const m = meteors[i];
|
||||||
|
m.life += dt;
|
||||||
|
m.x += m.dx * dt;
|
||||||
|
m.y += m.dy * dt;
|
||||||
|
if (m.life >= m.span) meteors.splice(i, 1);
|
||||||
|
else drawMeteor(m);
|
||||||
|
}
|
||||||
|
raf = requestAnimationFrame(frame);
|
||||||
|
};
|
||||||
|
raf = requestAnimationFrame(frame);
|
||||||
|
return () => {
|
||||||
|
cancelAnimationFrame(raf);
|
||||||
|
window.removeEventListener("resize", resize);
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
return <canvas ref={ref} className="night-sky" aria-hidden="true" />;
|
||||||
|
}
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
import { OPERATOR } from "@/lib/legal";
|
||||||
|
|
||||||
|
/** The operator's identifying details: a plain list in the last section of the legal pages. */
|
||||||
|
export function OperatorDetails({ lang = "hu", hosting = false }: { lang?: "hu" | "en"; hosting?: boolean }) {
|
||||||
|
const en = lang === "en";
|
||||||
|
const name =
|
||||||
|
OPERATOR.name &&
|
||||||
|
(OPERATOR.soleTrader ? `${OPERATOR.name} ${en ? "(sole proprietor)" : "egyéni vállalkozó"}` : OPERATOR.name);
|
||||||
|
const rows: [string, React.ReactNode][] = [
|
||||||
|
[en ? "Name" : "Név", name],
|
||||||
|
[en ? "Registered address" : "Székhely", OPERATOR.address],
|
||||||
|
[en ? "Registration number" : "Nyilvántartási szám", OPERATOR.registrationNumber],
|
||||||
|
[en ? "Tax number" : "Adószám", OPERATOR.taxNumber],
|
||||||
|
["E-mail", <a href={`mailto:${OPERATOR.email}`}>{OPERATOR.email}</a>],
|
||||||
|
];
|
||||||
|
if (hosting) {
|
||||||
|
rows.push([
|
||||||
|
en ? "Hosting provider" : "Tárhelyszolgáltató",
|
||||||
|
en
|
||||||
|
? "DigitalOcean, LLC (digitalocean.com); the data is stored in the European Union (Amsterdam)"
|
||||||
|
: "DigitalOcean, LLC (digitalocean.com); az adatok az Európai Unióban (Amszterdam) vannak tárolva",
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
<ul>
|
||||||
|
{rows
|
||||||
|
.filter(([, value]) => value)
|
||||||
|
.map(([label, value]) => (
|
||||||
|
<li key={label}>
|
||||||
|
{label}: {value}
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -5,7 +5,7 @@ import { useRouter } from "next/navigation";
|
|||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
|
|
||||||
import { api, errorText } from "@/lib/api";
|
import { api, errorText } from "@/lib/api";
|
||||||
import type { Package } from "@/lib/types";
|
import type { Package, PayMethod, PublicConfig } from "@/lib/types";
|
||||||
|
|
||||||
export const huf = (n: number) => `${n.toLocaleString("hu-HU")} Ft`;
|
export const huf = (n: number) => `${n.toLocaleString("hu-HU")} Ft`;
|
||||||
|
|
||||||
@@ -17,13 +17,15 @@ export function contents(p: Package): string[] {
|
|||||||
if (p.forecast) lines.push(`${p.forecast} éves előrejelzés`);
|
if (p.forecast) lines.push(`${p.forecast} éves előrejelzés`);
|
||||||
if (p.persons) lines.push(`${p.persons} személy felvétele`);
|
if (p.persons) lines.push(`${p.persons} személy felvétele`);
|
||||||
if (p.questions) lines.push(`${p.questions} kérdés az elemzéseidről`);
|
if (p.questions) lines.push(`${p.questions} kérdés az elemzéseidről`);
|
||||||
|
if (p.tarot) lines.push(`${p.tarot} kártyajóslás`);
|
||||||
return lines;
|
return lines;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Package cards with a buy button. Bigger packages show what they save and
|
* Package cards with a buy button. Bigger packages show what they save and
|
||||||
* how little more they cost than the previous one. Until Stripe is connected
|
* how little more they cost than the previous one. With Stripe the button
|
||||||
* the payment is a stand-in (MOCK_PAYMENTS) that grants the package at once.
|
* goes to Stripe's payment page and comes back to this page (PaymentReturn
|
||||||
|
* shows the result); the stand-in payment (MOCK_PAYMENTS) grants at once.
|
||||||
*/
|
*/
|
||||||
export function PackageCards({
|
export function PackageCards({
|
||||||
packages,
|
packages,
|
||||||
@@ -35,15 +37,34 @@ export function PackageCards({
|
|||||||
packages: Package[];
|
packages: Package[];
|
||||||
/** Which packages, in this order (default: the main ladder). */
|
/** Which packages, in this order (default: the main ladder). */
|
||||||
ids?: string[];
|
ids?: string[];
|
||||||
canPay: boolean;
|
/** How the user can pay (null: purchases are off, the buttons say "soon"). */
|
||||||
|
canPay: PayMethod | null;
|
||||||
compact?: boolean;
|
compact?: boolean;
|
||||||
/** After a purchase (default: reload the page data). */
|
/** After a stand-in purchase (default: reload the page data). */
|
||||||
onBought?: (p: Package) => Promise<void> | void;
|
onBought?: (p: Package) => Promise<void> | void;
|
||||||
}) {
|
}) {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const [busy, setBusy] = useState<string | null>(null);
|
const [busy, setBusy] = useState<string | null>(null);
|
||||||
const [error, setError] = useState<string | null>(null);
|
const [error, setError] = useState<string | null>(null);
|
||||||
const [done, setDone] = useState<string | null>(null);
|
const [done, setDone] = useState<string | null>(null);
|
||||||
|
// Back from Stripe's page (the browser may restore this page as it was).
|
||||||
|
useEffect(() => {
|
||||||
|
const reset = (e: PageTransitionEvent) => {
|
||||||
|
if (e.persisted) setBusy(null);
|
||||||
|
};
|
||||||
|
window.addEventListener("pageshow", reset);
|
||||||
|
return () => window.removeEventListener("pageshow", reset);
|
||||||
|
}, []);
|
||||||
|
// Whether Stripe's page asks for the ÁSZF and the withdrawal waiver
|
||||||
|
// (TERMS_CONSENT, off until the opening).
|
||||||
|
const stripe = canPay === "stripe" || canPay === "stripe_test";
|
||||||
|
const [termsConsent, setTermsConsent] = useState(false);
|
||||||
|
useEffect(() => {
|
||||||
|
if (!stripe) return;
|
||||||
|
api<PublicConfig>("/config")
|
||||||
|
.then((c) => setTermsConsent(c.terms_consent === true))
|
||||||
|
.catch(() => {});
|
||||||
|
}, [stripe]);
|
||||||
const shown = ids
|
const shown = ids
|
||||||
? ids.map((id) => packages.find((p) => p.id === id)).filter((p): p is Package => p !== undefined)
|
? ids.map((id) => packages.find((p) => p.id === id)).filter((p): p is Package => p !== undefined)
|
||||||
: packages.filter((p) => p.tier === "main");
|
: packages.filter((p) => p.tier === "main");
|
||||||
@@ -53,15 +74,22 @@ export function PackageCards({
|
|||||||
setError(null);
|
setError(null);
|
||||||
setDone(null);
|
setDone(null);
|
||||||
try {
|
try {
|
||||||
|
if (canPay === "stripe" || canPay === "stripe_test") {
|
||||||
|
const { url } = await api<{ url: string }>("/payments/checkout", {
|
||||||
|
body: { package: p.id, return_path: window.location.pathname },
|
||||||
|
});
|
||||||
|
window.location.assign(url);
|
||||||
|
return;
|
||||||
|
}
|
||||||
await api("/payments/mock", { body: { package: p.id } });
|
await api("/payments/mock", { body: { package: p.id } });
|
||||||
if (onBought) await onBought(p);
|
if (onBought) await onBought(p);
|
||||||
else {
|
else {
|
||||||
setDone(p.name);
|
setDone(p.name);
|
||||||
router.refresh();
|
router.refresh();
|
||||||
}
|
}
|
||||||
|
setBusy(null);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
setError(errorText(e));
|
setError(errorText(e));
|
||||||
} finally {
|
|
||||||
setBusy(null);
|
setBusy(null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -110,7 +138,7 @@ export function PackageCards({
|
|||||||
onClick={() => buy(p)}
|
onClick={() => buy(p)}
|
||||||
disabled={busy !== null}
|
disabled={busy !== null}
|
||||||
>
|
>
|
||||||
{busy === p.id ? "Fizetés…" : "Megveszem"}
|
{busy === p.id ? (canPay === "mock" ? "Fizetés…" : "Átirányítás…") : "Megveszem"}
|
||||||
</button>
|
</button>
|
||||||
) : (
|
) : (
|
||||||
<button type="button" className="btn" disabled>
|
<button type="button" className="btn" disabled>
|
||||||
@@ -131,7 +159,26 @@ export function PackageCards({
|
|||||||
A(z) {done} csomag jóváírva.
|
A(z) {done} csomag jóváírva.
|
||||||
</p>
|
</p>
|
||||||
)}
|
)}
|
||||||
{canPay && <p className="hint">Tesztüzem: a fizetés még nincs bekötve, a gomb nem terhel semmit.</p>}
|
{canPay === "mock" && <p className="hint">Tesztüzem: a fizetés még nincs bekötve, a gomb nem terhel semmit.</p>}
|
||||||
|
{stripe && (
|
||||||
|
<p className="hint">
|
||||||
|
<span aria-hidden="true">🔒</span> A fizetés a Stripe biztonságos oldalán történik (bankkártya, Apple Pay,
|
||||||
|
Google Pay). A kártyaadataidat közvetlenül a Stripe-nak adod meg: mi nem látjuk és nem tároljuk őket.
|
||||||
|
{termsConsent && (
|
||||||
|
<>
|
||||||
|
{" "}
|
||||||
|
A csomagot azonnal megkapod, ezért a fizetésnél kéred a teljesítés megkezdését, és ezzel lemondasz a 14
|
||||||
|
napos elállási jogról. <Link href="/aszf">ÁSZF</Link>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
{canPay === "stripe_test" && (
|
||||||
|
<p className="hint">
|
||||||
|
Stripe tesztmód (csak adminoknak látszik): kártyaszám 4242 4242 4242 4242, bármilyen jövőbeli lejárat és CVC.
|
||||||
|
Valódi pénz nem mozdul.
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -154,7 +201,7 @@ export function PackageChooser({
|
|||||||
onBought,
|
onBought,
|
||||||
}: {
|
}: {
|
||||||
ids: string[];
|
ids: string[];
|
||||||
canPay: boolean;
|
canPay: PayMethod | null;
|
||||||
onBought?: (p: Package) => Promise<void> | void;
|
onBought?: (p: Package) => Promise<void> | void;
|
||||||
}) {
|
}) {
|
||||||
const packages = usePackages();
|
const packages = usePackages();
|
||||||
|
|||||||
@@ -0,0 +1,90 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { usePathname, useRouter, useSearchParams } from "next/navigation";
|
||||||
|
import { useEffect, useState } from "react";
|
||||||
|
|
||||||
|
import { api, errorText } from "@/lib/api";
|
||||||
|
|
||||||
|
type Notice = { kind: "wait" | "ok" | "info" | "error"; text: string };
|
||||||
|
|
||||||
|
const POLLS = 20;
|
||||||
|
const POLL_MS = 2000;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Back from Stripe's payment page (`?fizetes=<session>` or
|
||||||
|
* `?fizetes=megszakitva`): waits until the payment is confirmed, then shows
|
||||||
|
* it and reloads the page data. Lives in the layout, so it works on every
|
||||||
|
* page a purchase can start from.
|
||||||
|
*/
|
||||||
|
export function PaymentReturn() {
|
||||||
|
const params = useSearchParams();
|
||||||
|
const pathname = usePathname();
|
||||||
|
const router = useRouter();
|
||||||
|
const value = params.get("fizetes");
|
||||||
|
const [notice, setNotice] = useState<Notice | null>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!value) return;
|
||||||
|
// A reload should not show it again.
|
||||||
|
const clean = () => {
|
||||||
|
const rest = new URLSearchParams(window.location.search);
|
||||||
|
rest.delete("fizetes");
|
||||||
|
router.replace(rest.size ? `${pathname}?${rest}` : pathname, { scroll: false });
|
||||||
|
};
|
||||||
|
if (value === "megszakitva") {
|
||||||
|
setNotice({ kind: "info", text: "A fizetés megszakadt, nem terheltünk semmit." });
|
||||||
|
clean();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let stopped = false;
|
||||||
|
setNotice({ kind: "wait", text: "A fizetés visszaigazolására várunk…" });
|
||||||
|
(async () => {
|
||||||
|
for (let i = 0; i < POLLS && !stopped; i++) {
|
||||||
|
try {
|
||||||
|
const r = await api<{ status: string; name: string | null }>(
|
||||||
|
`/payments/checkout/${encodeURIComponent(value)}`,
|
||||||
|
);
|
||||||
|
if (stopped) return;
|
||||||
|
if (r.status === "paid") {
|
||||||
|
setNotice({ kind: "ok", text: `Köszönjük! Jóváírtuk: ${r.name ?? "a csomagod"}.` });
|
||||||
|
clean();
|
||||||
|
router.refresh();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (r.status === "expired") {
|
||||||
|
setNotice({ kind: "info", text: "A fizetési oldal lejárt, nem terheltünk semmit." });
|
||||||
|
clean();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
if (!stopped) setNotice({ kind: "error", text: errorText(e) });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
await new Promise((resolve) => setTimeout(resolve, POLL_MS));
|
||||||
|
}
|
||||||
|
if (!stopped)
|
||||||
|
setNotice({
|
||||||
|
kind: "error",
|
||||||
|
text: "A Stripe még nem igazolta vissza a fizetést. Pár perc múlva frissítsd az oldalt: ha a pénz levonódott, a csomag megérkezik.",
|
||||||
|
});
|
||||||
|
})();
|
||||||
|
return () => {
|
||||||
|
stopped = true;
|
||||||
|
};
|
||||||
|
}, [value, pathname, router]);
|
||||||
|
|
||||||
|
if (!notice) return null;
|
||||||
|
const cls = notice.kind === "ok" ? "msg msg-ok" : notice.kind === "error" ? "msg msg-error" : "msg";
|
||||||
|
return (
|
||||||
|
<div className="pay-return" role={notice.kind === "error" ? "alert" : "status"}>
|
||||||
|
<p className={cls}>
|
||||||
|
<span>{notice.text}</span>
|
||||||
|
{notice.kind !== "wait" && (
|
||||||
|
<button type="button" className="btn btn-sm btn-ghost" onClick={() => setNotice(null)} aria-label="Bezárás">
|
||||||
|
×
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user