Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
174ec31351 | ||
|
|
184f19e1f2 | ||
|
|
27ecdf386e | ||
|
|
4338a35202 | ||
|
|
2a0830fda0 | ||
|
|
e530e78c54 | ||
|
|
5e633b959d | ||
|
|
d9e71ed349 | ||
|
|
42a982010d | ||
|
|
a4df094191 | ||
|
|
55101f8637 | ||
|
|
15c88fc6be | ||
|
|
50cf334045 | ||
|
|
ddca7acbd4 | ||
|
|
55f5a1ac60 | ||
|
|
fd655952b6 | ||
|
|
f10e5fdb69 | ||
|
|
b672b1cefa | ||
|
|
61db4a9723 | ||
|
|
f7a8a3d6e0 | ||
|
|
f2953dd18f | ||
|
|
1af55d3b05 | ||
|
|
aee6bec940 | ||
|
|
0c4274d87b | ||
|
|
b88a88b225 | ||
|
|
4a2a84b36f | ||
|
|
a4173f90b6 | ||
|
|
3944c6a4b0 | ||
|
|
1ab693175e | ||
|
|
2b7866d4c5 | ||
|
|
a352e359c4 | ||
|
|
0e3eaee735 | ||
|
|
8e1205359d | ||
|
|
dad16fe463 | ||
|
|
4f09aac3f5 | ||
|
|
7b23d71526 | ||
|
|
054fb930f5 | ||
|
|
d9ca806d50 | ||
|
|
19df36369c | ||
|
|
f037522052 | ||
|
|
c7600608d3 | ||
|
|
e476117c77 | ||
|
|
da533e8fa9 | ||
|
|
bc0227042b | ||
|
|
d758f5bf12 | ||
|
|
d46cd7a445 | ||
|
|
8b2c4310ba | ||
|
|
029a001ca6 | ||
|
|
02e4e225f0 | ||
|
|
cf2fb9d454 | ||
|
|
b5743ec7d1 | ||
|
|
1c24b9a23f | ||
|
|
769b4791ae | ||
|
|
86758cf848 | ||
|
|
5af08ab689 |
@@ -170,6 +170,7 @@ dependencies = [
|
|||||||
"axum-extra",
|
"axum-extra",
|
||||||
"db",
|
"db",
|
||||||
"email-templates",
|
"email-templates",
|
||||||
|
"hmac",
|
||||||
"horoscope-client",
|
"horoscope-client",
|
||||||
"http-body-util",
|
"http-body-util",
|
||||||
"jsonwebtoken",
|
"jsonwebtoken",
|
||||||
|
|||||||
@@ -462,8 +462,8 @@ fn question_system(language: &str) -> String {
|
|||||||
if language == "hu" {
|
if language == "hu" {
|
||||||
let mut text = format!(
|
let mut text = format!(
|
||||||
"Tapasztalt, empatikus, lélektani szemléletű asztrológus vagy a Sorsfonalak alkalmazásban. Az olvasó már \
|
"Tapasztalt, empatikus, lélektani szemléletű asztrológus vagy a Sorsfonalak alkalmazásban. Az olvasó már \
|
||||||
megkapta a részletes elemzését (születési képletelemzést vagy éves előrejelzést), és most kérdez róla. Válaszolj a \
|
megkapta a részletes elemzését (születési képletelemzést, kapcsolati elemzést vagy éves előrejelzést), és most kérdez \
|
||||||
kérdésére.
|
róla. Válaszolj a kérdésére.
|
||||||
|
|
||||||
Szabályok:
|
Szabályok:
|
||||||
- A válasz a megadott képletadatokon és az elemzésen alapuljon. Ne találj ki pozíciót, fényszöget, házat vagy dátumot, \
|
- A válasz a megadott képletadatokon és az elemzésen alapuljon. Ne találj ki pozíciót, fényszöget, házat vagy dátumot, \
|
||||||
@@ -471,8 +471,10 @@ amely nincs az adatok között. Ha a kérdésre az adatok alapján nem lehet fel
|
|||||||
amit a képlet erről mutat.
|
amit a képlet erről mutat.
|
||||||
- Maradj összhangban az elemzéssel. Ha a kérdés olyan részletre vonatkozik, amelyet az elemzés nem tárgyalt, a \
|
- Maradj összhangban az elemzéssel. Ha a kérdés olyan részletre vonatkozik, amelyet az elemzés nem tárgyalt, a \
|
||||||
képletadatokból egészítsd ki.
|
képletadatokból egészítsd ki.
|
||||||
- Közvetlenül a kérdezőhöz szólj, tegező formában. Ha a kérdés két ember kapcsolatáról szól, csak abból beszélj, amit \
|
- Közvetlenül a kérdezőhöz szólj, tegező formában. Kapcsolati elemzésnél (két képlet összevetése) a kérdező az egyik \
|
||||||
az adatok mutatnak.
|
fél: ha a kérdésből nem derül ki, melyik, beszélj kettejükhöz („ti”, „kettőtök”). A feleket az adatokban Person 1 és \
|
||||||
|
Person 2 jelöli, a szövegben „az első fél” és „a második fél”. Ne feltételezd a nemüket és a kapcsolat jellegét, és \
|
||||||
|
csak abból beszélj, amit az adatok mutatnak.
|
||||||
- Hangnem: meleg, őszinte, megerősítő és konkrét. Ne légy fatalista: ne jósolj betegséget, halált, balesetet, \
|
- Hangnem: meleg, őszinte, megerősítő és konkrét. Ne légy fatalista: ne jósolj betegséget, halált, balesetet, \
|
||||||
terhességet vagy biztos eseményeket, és ne adj orvosi, jogi vagy pénzügyi tanácsot. Ha ilyet kérdeznek, kedvesen \
|
terhességet vagy biztos eseményeket, és ne adj orvosi, jogi vagy pénzügyi tanácsot. Ha ilyet kérdeznek, kedvesen \
|
||||||
tereld a választ arra, amit az asztrológia valóban mutat: hajlamokra, időszakokra, lehetőségekre.
|
tereld a választ arra, amit az asztrológia valóban mutat: hajlamokra, időszakokra, lehetőségekre.
|
||||||
@@ -490,7 +492,8 @@ használhatsz.
|
|||||||
}
|
}
|
||||||
format!(
|
format!(
|
||||||
"You are an experienced, warm and psychologically minded astrologer in the Sorsfonalak app. The reader has \
|
"You are an experienced, warm and psychologically minded astrologer in the Sorsfonalak app. The reader has \
|
||||||
received their detailed analysis (a natal chart interpretation or a yearly forecast) and now asks a question about it. \
|
received their detailed analysis (a natal chart interpretation, a relationship analysis or a yearly forecast) and now \
|
||||||
|
asks a question about it. \
|
||||||
Answer it.
|
Answer it.
|
||||||
|
|
||||||
Write in {lang}.
|
Write in {lang}.
|
||||||
@@ -499,7 +502,9 @@ Rules:
|
|||||||
- Base the answer on the chart data and the analysis given. Never invent positions, aspects, houses or dates that are \
|
- Base the answer on the chart data and the analysis given. Never invent positions, aspects, houses or dates that are \
|
||||||
not listed. If the data cannot answer the question, say so honestly and describe what the chart does show about it.
|
not listed. If the data cannot answer the question, say so honestly and describe what the chart does show about it.
|
||||||
- Stay consistent with the analysis; fill in details it did not cover from the chart data.
|
- Stay consistent with the analysis; fill in details it did not cover from the chart data.
|
||||||
- Speak to the reader directly, in the informal second person.
|
- Speak to the reader directly, in the informal second person. On a relationship analysis the reader is one of the \
|
||||||
|
two people (Person 1 and Person 2 in the data); when it is unclear which, speak to both. Do not assume their genders \
|
||||||
|
or the type of relationship.
|
||||||
- Tone: warm, honest, empowering and concrete. Not fatalistic: no predictions of illness, death, accidents, pregnancy \
|
- Tone: warm, honest, empowering and concrete. Not fatalistic: no predictions of illness, death, accidents, pregnancy \
|
||||||
or certain events, and no medical, legal or financial advice; if asked, turn gently to what astrology does show \
|
or certain events, and no medical, legal or financial advice; if asked, turn gently to what astrology does show \
|
||||||
(tendencies, periods, opportunities).
|
(tendencies, periods, opportunities).
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
-- One model for all analyses (natal, synastry, forecast) and a separate one
|
||||||
|
-- for answering questions; the short summary keeps its own.
|
||||||
|
ALTER TABLE model_settings DROP CONSTRAINT model_settings_kind_check;
|
||||||
|
INSERT INTO model_settings (kind, model, updated_by, updated_at)
|
||||||
|
SELECT 'analysis', model, updated_by, updated_at FROM model_settings
|
||||||
|
WHERE kind IN ('natal', 'synastry', 'forecast') ORDER BY updated_at DESC LIMIT 1;
|
||||||
|
DELETE FROM model_settings WHERE kind IN ('natal', 'synastry', 'forecast');
|
||||||
|
ALTER TABLE model_settings ADD CONSTRAINT model_settings_kind_check
|
||||||
|
CHECK (kind IN ('summary', 'analysis', 'question'));
|
||||||
|
|
||||||
|
-- When the chosen model fails, the default model takes over (`on_fallback`).
|
||||||
|
-- NULL: the chosen model is the default, there is nothing to fall back to.
|
||||||
|
ALTER TABLE analyses
|
||||||
|
ADD COLUMN fallback_model text,
|
||||||
|
ADD COLUMN on_fallback boolean NOT NULL DEFAULT false;
|
||||||
|
ALTER TABLE questions
|
||||||
|
ADD COLUMN fallback_model text,
|
||||||
|
ADD COLUMN on_fallback boolean NOT NULL DEFAULT false;
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
-- Every failed attempt of an analysis, an answer or a prompt test run, for the
|
||||||
|
-- admin error log. No foreign keys: the log outlives deleted items. Kept for
|
||||||
|
-- 90 days (worker cleanup).
|
||||||
|
CREATE TABLE generation_errors (
|
||||||
|
id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
|
||||||
|
created_at timestamptz NOT NULL DEFAULT now(),
|
||||||
|
source text NOT NULL CHECK (source IN ('analysis', 'question', 'preview')),
|
||||||
|
item_id uuid NOT NULL,
|
||||||
|
kind text NOT NULL,
|
||||||
|
model text NOT NULL,
|
||||||
|
attempt integer NOT NULL,
|
||||||
|
-- What happened next: tried again, the default model took over, or gave up.
|
||||||
|
outcome text NOT NULL CHECK (outcome IN ('retry', 'fallback', 'failed')),
|
||||||
|
error text NOT NULL,
|
||||||
|
seconds integer
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX generation_errors_created_idx ON generation_errors (created_at DESC);
|
||||||
|
CREATE INDEX generation_errors_item_idx ON generation_errors (item_id);
|
||||||
|
|
||||||
|
-- When the current text was asked for (a regeneration or an admin restart
|
||||||
|
-- sets it again): the waiting page counts from here.
|
||||||
|
ALTER TABLE analyses ADD COLUMN requested_at timestamptz NOT NULL DEFAULT now();
|
||||||
|
UPDATE analyses SET requested_at = created_at;
|
||||||
|
ALTER TABLE questions ADD COLUMN requested_at timestamptz NOT NULL DEFAULT now();
|
||||||
|
UPDATE questions SET requested_at = created_at;
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
-- A free natal analysis, once per user, when someone else first opens a link
|
||||||
|
-- they shared (counted from the share page in the visitor's browser, so link
|
||||||
|
-- preview robots do not count).
|
||||||
|
ALTER TABLE credit_ledger DROP CONSTRAINT credit_ledger_reason_check;
|
||||||
|
ALTER TABLE credit_ledger ADD CONSTRAINT credit_ledger_reason_check
|
||||||
|
CHECK (reason IN ('monthly_grant', 'analysis', 'chat', 'refund', 'admin_adjust', 'purchase', 'person', 'package',
|
||||||
|
'question', 'share_reward'));
|
||||||
|
CREATE UNIQUE INDEX credit_ledger_share_reward_once ON credit_ledger (user_id) WHERE reason = 'share_reward';
|
||||||
|
|
||||||
|
-- Hash of the sharer's address when the link was made (salted with the slug):
|
||||||
|
-- a visit from there is the sharer, not someone else.
|
||||||
|
ALTER TABLE shares ADD COLUMN owner_ip_hash bytea;
|
||||||
|
|
||||||
|
COMMENT ON COLUMN shares.view_count IS 'visits by people (the share page reports them), robots excluded';
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
-- Promo codes: an admin makes them for a package, a user redeems one once
|
||||||
|
-- and gets the package (a `package_orders` row with source `promo`).
|
||||||
|
CREATE TABLE promo_codes (
|
||||||
|
id uuid PRIMARY KEY,
|
||||||
|
-- Upper case, without separators (shown in groups of four).
|
||||||
|
code text NOT NULL UNIQUE CHECK (code ~ '^[2-9A-HJKMNP-Z]{8,32}$'),
|
||||||
|
package text NOT NULL,
|
||||||
|
-- Who it is for or which campaign (admin only).
|
||||||
|
note text,
|
||||||
|
created_by uuid REFERENCES users (id) ON DELETE SET NULL,
|
||||||
|
created_at timestamptz NOT NULL DEFAULT now(),
|
||||||
|
redeemed_by uuid REFERENCES users (id) ON DELETE SET NULL,
|
||||||
|
redeemed_at timestamptz,
|
||||||
|
order_id uuid REFERENCES package_orders (id) ON DELETE SET NULL,
|
||||||
|
-- An unused code can be withdrawn.
|
||||||
|
revoked_at timestamptz,
|
||||||
|
CHECK (redeemed_at IS NULL OR revoked_at IS NULL)
|
||||||
|
);
|
||||||
|
CREATE INDEX promo_codes_created_idx ON promo_codes (created_at DESC);
|
||||||
|
|
||||||
|
ALTER TABLE package_orders DROP CONSTRAINT package_orders_source_check;
|
||||||
|
ALTER TABLE package_orders ADD CONSTRAINT package_orders_source_check
|
||||||
|
CHECK (source IN ('admin', 'mock', 'stripe', 'promo'));
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
-- An invitation can come with a package: a promo code made with it, sent in
|
||||||
|
-- the e-mail and redeemed by itself when the invitee signs up.
|
||||||
|
ALTER TABLE promo_codes ADD COLUMN invitation_id uuid UNIQUE REFERENCES invitations (id) ON DELETE SET NULL;
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
-- "How compatible are we?" invitations from the new person page: who it is
|
||||||
|
-- for (the inviter's own name for them) and, if the inviter asked us to
|
||||||
|
-- e-mail it, the address.
|
||||||
|
ALTER TABLE synastry_invites
|
||||||
|
ADD COLUMN label text CHECK (char_length(label) <= 80),
|
||||||
|
ADD COLUMN invitee_email text;
|
||||||
|
CREATE INDEX synastry_invites_emailed_idx ON synastry_invites (inviter_id, created_at) WHERE invitee_email IS NOT NULL;
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
-- The link in the waitlist confirmation e-mail that takes the address off
|
||||||
|
-- the list (only its hash is kept).
|
||||||
|
ALTER TABLE waitlist ADD COLUMN token_hash bytea UNIQUE;
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
-- Sharing pays in two steps: the first visit of a shared link earns a
|
||||||
|
-- question (`share_reward`, see shares.rs), and someone who signs up from a
|
||||||
|
-- shared link and makes their own chart earns the sharer a natal analysis
|
||||||
|
-- (`referral_reward`, at most three per user).
|
||||||
|
ALTER TABLE credit_ledger DROP CONSTRAINT credit_ledger_reason_check;
|
||||||
|
ALTER TABLE credit_ledger ADD CONSTRAINT credit_ledger_reason_check
|
||||||
|
CHECK (reason IN ('monthly_grant', 'analysis', 'chat', 'refund', 'admin_adjust', 'purchase', 'person', 'package',
|
||||||
|
'question', 'share_reward', 'referral_reward'));
|
||||||
|
|
||||||
|
-- Who came through whose shared link (one row per new user).
|
||||||
|
CREATE TABLE referrals (
|
||||||
|
user_id uuid PRIMARY KEY REFERENCES users (id) ON DELETE CASCADE,
|
||||||
|
referrer_id uuid NOT NULL REFERENCES users (id) ON DELETE CASCADE,
|
||||||
|
share_id uuid REFERENCES shares (id) ON DELETE SET NULL,
|
||||||
|
created_at timestamptz NOT NULL DEFAULT now(),
|
||||||
|
-- Set when the new user made their own chart (rewarded or over the limit).
|
||||||
|
rewarded_at timestamptz
|
||||||
|
);
|
||||||
|
CREATE INDEX referrals_referrer_idx ON referrals (referrer_id);
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
-- Stripe Checkout sessions started from the package cards. The package is
|
||||||
|
-- granted once, when the payment is confirmed (webhook, or the return page
|
||||||
|
-- asking Stripe), and the session id keeps that from happening twice.
|
||||||
|
CREATE TABLE stripe_checkouts (
|
||||||
|
-- Stripe's Checkout Session id (cs_test_… / cs_live_…).
|
||||||
|
id text PRIMARY KEY,
|
||||||
|
user_id uuid NOT NULL REFERENCES users ON DELETE CASCADE,
|
||||||
|
package text NOT NULL,
|
||||||
|
price_huf integer NOT NULL CHECK (price_huf > 0),
|
||||||
|
live boolean NOT NULL,
|
||||||
|
created_at timestamptz NOT NULL DEFAULT now(),
|
||||||
|
completed_at timestamptz,
|
||||||
|
order_id uuid REFERENCES package_orders ON DELETE SET NULL
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX stripe_checkouts_user_idx ON stripe_checkouts (user_id, created_at DESC);
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
-- What a confirmed payment keeps for the invoice, and the invoices issued in
|
||||||
|
-- Billingo by the worker. Card details never reach us: only what Stripe
|
||||||
|
-- reports about the payment and the buyer's billing details.
|
||||||
|
|
||||||
|
-- Payments outlive a deleted account: the accounting law asks for 8 years.
|
||||||
|
ALTER TABLE stripe_checkouts ALTER COLUMN user_id DROP NOT NULL;
|
||||||
|
ALTER TABLE stripe_checkouts DROP CONSTRAINT stripe_checkouts_user_id_fkey;
|
||||||
|
ALTER TABLE stripe_checkouts ADD CONSTRAINT stripe_checkouts_user_id_fkey
|
||||||
|
FOREIGN KEY (user_id) REFERENCES users ON DELETE SET NULL;
|
||||||
|
|
||||||
|
ALTER TABLE stripe_checkouts
|
||||||
|
ADD COLUMN payment_intent text,
|
||||||
|
-- What Stripe charged, in forints.
|
||||||
|
ADD COLUMN amount_huf integer,
|
||||||
|
-- Stripe's customer_details as it came: name, e-mail, address, and for a
|
||||||
|
-- company its name and tax ids.
|
||||||
|
ADD COLUMN customer jsonb;
|
||||||
|
|
||||||
|
-- One invoice per paid checkout. Every invoice detail is kept here (the buyer
|
||||||
|
-- and the item as invoiced, Billingo's whole answer); the PDF itself is
|
||||||
|
-- fetched from Billingo when downloaded.
|
||||||
|
CREATE TABLE invoices (
|
||||||
|
id uuid PRIMARY KEY,
|
||||||
|
checkout_id text NOT NULL UNIQUE REFERENCES stripe_checkouts ON DELETE RESTRICT,
|
||||||
|
user_id uuid REFERENCES users ON DELETE SET NULL,
|
||||||
|
-- pending → issued; failed after the last retry (an admin looks at it).
|
||||||
|
status text NOT NULL DEFAULT 'pending' CHECK (status IN ('pending', 'issued', 'failed')),
|
||||||
|
attempts integer NOT NULL DEFAULT 0,
|
||||||
|
next_attempt_at timestamptz NOT NULL DEFAULT now(),
|
||||||
|
last_error text,
|
||||||
|
-- The buyer as invoiced.
|
||||||
|
buyer_name text NOT NULL,
|
||||||
|
buyer_email text,
|
||||||
|
buyer_country text NOT NULL,
|
||||||
|
buyer_post_code text NOT NULL,
|
||||||
|
buyer_city text NOT NULL,
|
||||||
|
buyer_address text NOT NULL,
|
||||||
|
-- Billingo's partner tax type: HAS_TAX_NUMBER, NO_TAX_NUMBER or FOREIGN.
|
||||||
|
buyer_tax_type text NOT NULL CHECK (buyer_tax_type IN ('HAS_TAX_NUMBER', 'NO_TAX_NUMBER', 'FOREIGN')),
|
||||||
|
buyer_tax_number text,
|
||||||
|
-- The single item. vat_rate is Billingo's VAT value: AAM (alanyi
|
||||||
|
-- adómentes: net = gross, no VAT) or a rate like 27%.
|
||||||
|
item_name text NOT NULL,
|
||||||
|
gross_huf integer NOT NULL CHECK (gross_huf > 0),
|
||||||
|
net_huf integer NOT NULL,
|
||||||
|
vat_huf integer NOT NULL,
|
||||||
|
vat_rate text NOT NULL DEFAULT 'AAM',
|
||||||
|
payment_method text NOT NULL DEFAULT 'online_bankcard',
|
||||||
|
-- From Billingo.
|
||||||
|
billingo_partner_id bigint,
|
||||||
|
billingo_document_id bigint UNIQUE,
|
||||||
|
invoice_number text,
|
||||||
|
invoice_date date,
|
||||||
|
fulfillment_date date,
|
||||||
|
due_date date,
|
||||||
|
document jsonb,
|
||||||
|
-- When Billingo e-mailed it to the buyer.
|
||||||
|
sent_at timestamptz,
|
||||||
|
created_at timestamptz NOT NULL DEFAULT now(),
|
||||||
|
issued_at timestamptz
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX invoices_user_idx ON invoices (user_id, created_at DESC);
|
||||||
|
CREATE INDEX invoices_due_idx ON invoices (next_attempt_at) WHERE status = 'pending';
|
||||||
@@ -104,6 +104,15 @@ pub fn random_token(bytes: usize) -> String {
|
|||||||
URL_SAFE_NO_PAD.encode(buf)
|
URL_SAFE_NO_PAD.encode(buf)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Letters and digits that cannot be mixed up when typed (no 0/O, 1/I/L).
|
||||||
|
pub const CODE_ALPHABET: &[u8] = b"23456789ABCDEFGHJKMNPQRSTUVWXYZ";
|
||||||
|
|
||||||
|
/// A random code of `len` characters from [`CODE_ALPHABET`] (about 5 bits each).
|
||||||
|
pub fn random_code(len: usize) -> String {
|
||||||
|
let mut rng = rand::rng();
|
||||||
|
(0..len).map(|_| CODE_ALPHABET[rand::Rng::random_range(&mut rng, 0..CODE_ALPHABET.len())] as char).collect()
|
||||||
|
}
|
||||||
|
|
||||||
/// Stored form of a secret token.
|
/// Stored form of a secret token.
|
||||||
pub fn token_hash(token: &str) -> Vec<u8> {
|
pub fn token_hash(token: &str) -> Vec<u8> {
|
||||||
Sha256::digest(token.as_bytes()).to_vec()
|
Sha256::digest(token.as_bytes()).to_vec()
|
||||||
|
|||||||
@@ -158,6 +158,8 @@ pub fn render(template: &str, locale: &str, payload: &Value) -> Result<Rendered,
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
("invitation", _) => invitation(lang, payload, url)?,
|
("invitation", _) => invitation(lang, payload, url)?,
|
||||||
|
("synastry_invite", _) => synastry_invite(lang, payload, url)?,
|
||||||
|
("waitlist_joined", _) => waitlist_joined(lang, payload, url)?,
|
||||||
_ => return Err(TemplateError::UnknownTemplate(template.to_owned())),
|
_ => return Err(TemplateError::UnknownTemplate(template.to_owned())),
|
||||||
};
|
};
|
||||||
Ok(content.render(lang))
|
Ok(content.render(lang))
|
||||||
@@ -173,6 +175,26 @@ fn invitation(lang: Lang, payload: &Value, url: String) -> Result<Content, Templ
|
|||||||
let until_hu = until.trim_end_matches('.');
|
let until_hu = until.trim_end_matches('.');
|
||||||
let unsubscribe_url = field(payload, "unsubscribe_url")?;
|
let unsubscribe_url = field(payload, "unsubscribe_url")?;
|
||||||
let unsubscribe_post_url = field(payload, "unsubscribe_post_url")?;
|
let unsubscribe_post_url = field(payload, "unsubscribe_post_url")?;
|
||||||
|
// A package that comes with the invitation, and its promo code.
|
||||||
|
let gift = name(payload, "package_name").zip(
|
||||||
|
payload["promo_code"]
|
||||||
|
.as_str()
|
||||||
|
.map(|c| c.chars().filter(|c| c.is_ascii_alphanumeric() || *c == '-').take(40).collect::<String>())
|
||||||
|
.filter(|c| !c.is_empty()),
|
||||||
|
);
|
||||||
|
let gift_line = |hu: bool| {
|
||||||
|
gift.as_ref().map(|(package, code)| {
|
||||||
|
if hu {
|
||||||
|
format!(
|
||||||
|
" Ajándékba egy „{package}” csomagot is kapsz: a regisztrációval magától jóváíródik. Ha mégis kellene, a promókódod: {code}."
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
format!(
|
||||||
|
" You also get the “{package}” package as a gift: it is added when you sign up. Should you need it, your promo code is {code}."
|
||||||
|
)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
};
|
||||||
Ok(match lang {
|
Ok(match lang {
|
||||||
Lang::Hu => Content {
|
Lang::Hu => Content {
|
||||||
subject: match &inviter {
|
subject: match &inviter {
|
||||||
@@ -188,7 +210,7 @@ fn invitation(lang: Lang, payload: &Value, url: String) -> Result<Content, Templ
|
|||||||
None => {
|
None => {
|
||||||
"Meghívót kaptál a Sorsfonalakra. Az oldal egyelőre zártkörű: csak meghívóval lehet belépni.".into()
|
"Meghívót kaptál a Sorsfonalakra. Az oldal egyelőre zártkörű: csak meghívóval lehet belépni.".into()
|
||||||
}
|
}
|
||||||
},
|
} + &gift_line(true).unwrap_or_default(),
|
||||||
quote: message,
|
quote: message,
|
||||||
points: Some((
|
points: Some((
|
||||||
"Mit találsz ott?",
|
"Mit találsz ott?",
|
||||||
@@ -226,7 +248,7 @@ fn invitation(lang: Lang, payload: &Value, url: String) -> Result<Content, Templ
|
|||||||
intro: match &inviter {
|
intro: match &inviter {
|
||||||
Some(n) => format!("{n} invited you to Sorsfonalak. The site is invitation-only for now."),
|
Some(n) => format!("{n} invited you to Sorsfonalak. The site is invitation-only for now."),
|
||||||
None => "You are invited to Sorsfonalak. The site is invitation-only for now.".into(),
|
None => "You are invited to Sorsfonalak. The site is invitation-only for now.".into(),
|
||||||
},
|
} + &gift_line(false).unwrap_or_default(),
|
||||||
quote: message,
|
quote: message,
|
||||||
points: Some((
|
points: Some((
|
||||||
"What you will find there:",
|
"What you will find there:",
|
||||||
@@ -262,6 +284,129 @@ 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 waitlist sign-up, with the link that takes the address off the list.
|
||||||
|
fn waitlist_joined(lang: Lang, payload: &Value, url: String) -> Result<Content, TemplateError> {
|
||||||
|
let unsubscribe_url = field(payload, "unsubscribe_url")?;
|
||||||
|
let unsubscribe_post_url = field(payload, "unsubscribe_post_url")?;
|
||||||
|
Ok(match lang {
|
||||||
|
Lang::Hu => Content {
|
||||||
|
subject: "Felírtunk a Sorsfonalak várólistájára".into(),
|
||||||
|
preheader: Some("Amint bejuthatsz, ide írunk.".into()),
|
||||||
|
greeting: "Szia!".into(),
|
||||||
|
intro: "Köszönjük, hogy kíváncsi vagy a Sorsfonalakra! Az oldal egyelőre zártkörű, de felírtunk a várólistára: amint bejuthatsz, erre a címre írunk."
|
||||||
|
.into(),
|
||||||
|
quote: None,
|
||||||
|
points: Some((
|
||||||
|
"Mi vár rád?",
|
||||||
|
vec![
|
||||||
|
"a születési képleted percre pontosan kiszámolva és megrajzolva, egy rövid elemzéssel,",
|
||||||
|
"részletes elemzés, éves előrejelzés és kapcsolati összevetés azokkal, akiket szeretsz.",
|
||||||
|
],
|
||||||
|
)),
|
||||||
|
button: "Körülnézek",
|
||||||
|
url,
|
||||||
|
note: "Ha nem te iratkoztál fel, vagy meggondoltad magad, a lenti linkkel törölheted a címed a listáról.".into(),
|
||||||
|
reason: Some("Ezt a levelet azért kaptad, mert ezt a címet megadták a Sorsfonalak várólistáján.".into()),
|
||||||
|
unsubscribe: Some(("Leiratkozás a várólistáról", unsubscribe_url)),
|
||||||
|
unsubscribe_post_url: Some(unsubscribe_post_url),
|
||||||
|
},
|
||||||
|
Lang::En => Content {
|
||||||
|
subject: "You are on the Sorsfonalak waitlist".into(),
|
||||||
|
preheader: Some("We will write as soon as you can get in.".into()),
|
||||||
|
greeting: "Hi,".into(),
|
||||||
|
intro: "Thanks for your interest in Sorsfonalak! The site is invitation-only for now, but you are on the waitlist: we will write to this address as soon as you can get in."
|
||||||
|
.into(),
|
||||||
|
quote: None,
|
||||||
|
points: Some((
|
||||||
|
"What awaits you:",
|
||||||
|
vec![
|
||||||
|
"your birth chart, calculated to the minute and drawn, with a short reading,",
|
||||||
|
"detailed readings, a yearly forecast and comparisons with the people you love.",
|
||||||
|
],
|
||||||
|
)),
|
||||||
|
button: "Take a look",
|
||||||
|
url,
|
||||||
|
note: "If it was not you, or you changed your mind, the link below takes your address off the list.".into(),
|
||||||
|
reason: Some("You got this e-mail because this address was entered on the Sorsfonalak waitlist.".into()),
|
||||||
|
unsubscribe: Some(("Leave the waitlist", unsubscribe_url)),
|
||||||
|
unsubscribe_post_url: Some(unsubscribe_post_url),
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A user invites someone to compare their charts ("how compatible are we?").
|
||||||
|
fn synastry_invite(lang: Lang, payload: &Value, url: String) -> Result<Content, TemplateError> {
|
||||||
|
let inviter = name(payload, "inviter_name");
|
||||||
|
let message = message(payload);
|
||||||
|
let until =
|
||||||
|
payload["expires_on"].as_str().and_then(|d| date(lang, d)).ok_or(TemplateError::MissingField("expires_on"))?;
|
||||||
|
let until_hu = until.trim_end_matches('.');
|
||||||
|
let unsubscribe_url = field(payload, "unsubscribe_url")?;
|
||||||
|
let unsubscribe_post_url = field(payload, "unsubscribe_post_url")?;
|
||||||
|
Ok(match lang {
|
||||||
|
Lang::Hu => {
|
||||||
|
let who = inviter.clone().unwrap_or_else(|| "Valaki".into());
|
||||||
|
Content {
|
||||||
|
subject: format!("{who} kíváncsi, mennyire illetek össze"),
|
||||||
|
preheader: Some(format!(
|
||||||
|
"Születési képletek összevetése a Sorsfonalakon. A meghívó {until_hu}-ig érvényes."
|
||||||
|
)),
|
||||||
|
greeting: "Szia!".into(),
|
||||||
|
intro: format!(
|
||||||
|
"{who} szeretné összevetni a születési képleteteket a Sorsfonalakon, és megnézni, mennyire illetek össze."
|
||||||
|
),
|
||||||
|
quote: message,
|
||||||
|
points: Some((
|
||||||
|
"Mit kapsz?",
|
||||||
|
vec![
|
||||||
|
"a saját születési képleted kiszámolva és megrajzolva, egy rövid elemzéssel, ingyen,",
|
||||||
|
"a kettőtök összevetését: hol erős és hol kényes a kapcsolatotok.",
|
||||||
|
],
|
||||||
|
)),
|
||||||
|
button: "Megnézem",
|
||||||
|
url,
|
||||||
|
note: format!(
|
||||||
|
"A meghívó {until_hu}-ig érvényes. Google-fiókkal lépsz be. A születési adataidat {who} nem látja, csak az összevetést."
|
||||||
|
),
|
||||||
|
reason: Some(format!(
|
||||||
|
"Ezt a levelet azért kaptad, mert {who} megadta az e-mail-címed a Sorsfonalakon."
|
||||||
|
)),
|
||||||
|
unsubscribe: Some(("Nem kérek több meghívót", unsubscribe_url)),
|
||||||
|
unsubscribe_post_url: Some(unsubscribe_post_url),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Lang::En => {
|
||||||
|
let who = inviter.clone().unwrap_or_else(|| "Someone".into());
|
||||||
|
Content {
|
||||||
|
subject: format!("{who} wonders how well you match"),
|
||||||
|
preheader: Some(format!(
|
||||||
|
"Comparing birth charts on Sorsfonalak. The invitation is valid until {until}."
|
||||||
|
)),
|
||||||
|
greeting: "Hi,".into(),
|
||||||
|
intro: format!(
|
||||||
|
"{who} would like to compare your birth charts on Sorsfonalak and see how well you match."
|
||||||
|
),
|
||||||
|
quote: message,
|
||||||
|
points: Some((
|
||||||
|
"What you get:",
|
||||||
|
vec![
|
||||||
|
"your own birth chart, calculated and drawn, with a short reading, for free,",
|
||||||
|
"the comparison of the two of you: where your relationship is strong and where it is delicate.",
|
||||||
|
],
|
||||||
|
)),
|
||||||
|
button: "Take a look",
|
||||||
|
url,
|
||||||
|
note: format!(
|
||||||
|
"The invitation is valid until {until}. You sign in with Google. {who} does not see your birth data, only the comparison."
|
||||||
|
),
|
||||||
|
reason: Some(format!("You got this e-mail because {who} entered your address on Sorsfonalak.")),
|
||||||
|
unsubscribe: Some(("No more invitations, please", unsubscribe_url)),
|
||||||
|
unsubscribe_post_url: Some(unsubscribe_post_url),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
/// The personal message of an invitation: line breaks kept, other control characters dropped.
|
/// The personal message of an invitation: line breaks kept, other control characters dropped.
|
||||||
fn message(payload: &Value) -> Option<String> {
|
fn message(payload: &Value) -> Option<String> {
|
||||||
let text: String =
|
let text: String =
|
||||||
@@ -445,6 +590,31 @@ mod tests {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn waitlist_confirmation_has_the_leave_link() {
|
||||||
|
let hu = render("waitlist_joined", "hu", &invitation_payload()).unwrap();
|
||||||
|
assert_eq!(hu.subject, "Felírtunk a Sorsfonalak várólistájára");
|
||||||
|
assert!(
|
||||||
|
hu.text.contains("Leiratkozás a várólistáról: https://sorsfonalak.test/leiratkozas?token=abc"),
|
||||||
|
"{}",
|
||||||
|
hu.text
|
||||||
|
);
|
||||||
|
assert!(hu.unsubscribe_post_url.is_some());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn synastry_invite_names_the_inviter() {
|
||||||
|
let hu = render("synastry_invite", "hu", &invitation_payload()).unwrap();
|
||||||
|
assert_eq!(hu.subject, "Kata kíváncsi, mennyire illetek össze");
|
||||||
|
assert!(hu.text.contains("> Gyere, nézd meg!"));
|
||||||
|
assert!(hu.text.contains("A meghívó 2026. december 17-ig érvényes."));
|
||||||
|
assert!(hu.html.contains(r#"href="https://sorsfonalak.test/meghivo/abc""#));
|
||||||
|
assert!(hu.text.contains("Nem kérek több meghívót"));
|
||||||
|
let mut anonymous = invitation_payload();
|
||||||
|
anonymous["inviter_name"] = Value::Null;
|
||||||
|
assert_eq!(render("synastry_invite", "en", &anonymous).unwrap().subject, "Someone wonders how well you match");
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn invitation_has_both_parts() {
|
fn invitation_has_both_parts() {
|
||||||
let hu = render("invitation", "hu", &invitation_payload()).unwrap();
|
let hu = render("invitation", "hu", &invitation_payload()).unwrap();
|
||||||
@@ -468,6 +638,14 @@ mod tests {
|
|||||||
assert!(en.text.contains("valid until 17 December 2026") && !en.text.contains("> "));
|
assert!(en.text.contains("valid until 17 December 2026") && !en.text.contains("> "));
|
||||||
assert!(!en.html.contains("border-left"));
|
assert!(!en.html.contains("border-left"));
|
||||||
|
|
||||||
|
let mut gift = invitation_payload();
|
||||||
|
gift["package_name"] = json!("Páros");
|
||||||
|
gift["promo_code"] = json!("ABCD-EFGH-JKLM");
|
||||||
|
let hu = render("invitation", "hu", &gift).unwrap();
|
||||||
|
assert!(hu.text.contains("Ajándékba egy „Páros” csomagot is kapsz"), "{}", hu.text);
|
||||||
|
assert!(hu.html.contains("ABCD-EFGH-JKLM"));
|
||||||
|
assert!(!render("invitation", "hu", &invitation_payload()).unwrap().text.contains("Ajándék"));
|
||||||
|
|
||||||
let mut broken = invitation_payload();
|
let mut broken = invitation_payload();
|
||||||
broken["unsubscribe_url"] = Value::Null;
|
broken["unsubscribe_url"] = Value::Null;
|
||||||
assert_eq!(render("invitation", "hu", &broken), Err(TemplateError::MissingField("unsubscribe_url")));
|
assert_eq!(render("invitation", "hu", &broken), Err(TemplateError::MissingField("unsubscribe_url")));
|
||||||
|
|||||||
@@ -20,3 +20,7 @@ SIGNUP_MODE=invite
|
|||||||
|
|
||||||
# Image version; every deployment rewrites it
|
# Image version; every deployment rewrites it
|
||||||
TAG=latest
|
TAG=latest
|
||||||
|
|
||||||
|
# worker-ai: analyses and answers written at the same time.
|
||||||
|
# QUICK_CONCURRENCY=2 # summaries and answers
|
||||||
|
# ANALYSIS_CONCURRENCY=4 # detailed analyses and forecasts
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ A Docker által kinyitott portokat az ufw magától nem szűri, ezért a 80-as
|
|||||||
`deploy` felhasználóként, a `/opt/sorsfonalak` mappában:
|
`deploy` felhasználóként, a `/opt/sorsfonalak` mappában:
|
||||||
|
|
||||||
- `.env`: az itteni `.env.example` kitöltve.
|
- `.env`: az itteni `.env.example` kitöltve.
|
||||||
- `.env.secrets`: `OPENROUTER_API_KEY=...`.
|
- `.env.secrets`: `OPENROUTER_API_KEY=...`, a levélküldés adatai, és ha van, `STRIPE_SECRET_KEY` / `STRIPE_WEBHOOK_SECRET` és `BILLINGO_API_KEY` (`docs/fizetes.md`).
|
||||||
- `docker login registry.sagifer.com` egy `read:package` jogú tokennel. Amíg a `sagifer` fiók nyilvános, erre nincs szükség.
|
- `docker login registry.sagifer.com` egy `read:package` jogú tokennel. Amíg a `sagifer` fiók nyilvános, erre nincs szükség.
|
||||||
|
|
||||||
### Cloudflare (sorsfonalak.hu)
|
### Cloudflare (sorsfonalak.hu)
|
||||||
@@ -82,7 +82,8 @@ A Google OAuth kliensnél a `https://sorsfonalak.hu` címet fel kell venni az en
|
|||||||
|
|
||||||
## Üzemeltetés
|
## Üzemeltetés
|
||||||
|
|
||||||
- Naplók: `docker compose logs -f backend worker`
|
- Naplók: `docker compose logs -f backend worker worker-ai`
|
||||||
|
- A worker két konténerben fut, ugyanabból az image-ből: a `worker` küldi az e-maileket és takarít (`WORKER_TASKS=email,cleanup`, ide kerülnek a további háttérfeladatok is), a `worker-ai` írja az elemzéseket és a válaszokat (`WORKER_TASKS=analyses`, gyors és lassú sáv). A sávok mérete a szerver `.env` fájljában állítható (`QUICK_CONCURRENCY`, `ANALYSIS_CONCURRENCY`).
|
||||||
- Visszaállás korábbi verzióra: `.env`-ben `TAG=<régebbi hash>`, utána `docker compose up -d`
|
- Visszaállás korábbi verzióra: `.env`-ben `TAG=<régebbi hash>`, utána `docker compose up -d`
|
||||||
- Mentés: naponta egy `pg_dump` a `/opt/sorsfonalak/backups` mappába, 14 napig megmarad. A mentéseket érdemes a szerverről is elvinni (DigitalOcean backup, vagy `rsync` otthonra).
|
- Mentés: naponta egy `pg_dump` a `/opt/sorsfonalak/backups` mappába, 14 napig megmarad. A mentéseket érdemes a szerverről is elvinni (DigitalOcean backup, vagy `rsync` otthonra).
|
||||||
- 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`
|
||||||
|
|||||||
@@ -85,11 +85,26 @@ services:
|
|||||||
ANALYSIS_MODEL: ${ANALYSIS_MODEL:-}
|
ANALYSIS_MODEL: ${ANALYSIS_MODEL:-}
|
||||||
SUMMARY_MODEL: ${SUMMARY_MODEL:-}
|
SUMMARY_MODEL: ${SUMMARY_MODEL:-}
|
||||||
PASSWORD_LOGIN: ${PASSWORD_LOGIN:-false}
|
PASSWORD_LOGIN: ${PASSWORD_LOGIN:-false}
|
||||||
# Stand-in payment (adds an analysis unit at once) until Stripe is connected.
|
# Without the Stripe keys purchases are off; packages come from promo
|
||||||
MOCK_PAYMENTS: ${MOCK_PAYMENTS:-true}
|
# codes and admins (MOCK_PAYMENTS=true: pretend purchases).
|
||||||
|
MOCK_PAYMENTS: ${MOCK_PAYMENTS:-false}
|
||||||
|
# Stripe purchases for everyone (false: admins only, until the opening;
|
||||||
|
# with a test key always admins only).
|
||||||
|
PURCHASES_OPEN: ${PURCHASES_OPEN:-false}
|
||||||
|
# VAT on the invoices: AAM (alanyi adómentes) or a rate like 27%.
|
||||||
|
INVOICE_VAT: ${INVOICE_VAT:-AAM}
|
||||||
|
# Users inviting others ("Meghívom"): shown but off until the launch.
|
||||||
|
USER_INVITES: ${USER_INVITES:-false}
|
||||||
|
# A new user from a shared link earns the sharer an analysis: off until sign-up opens.
|
||||||
|
REFERRAL_REWARDS: ${REFERRAL_REWARDS:-false}
|
||||||
FREE_PERSON_SLOTS: ${FREE_PERSON_SLOTS:-0}
|
FREE_PERSON_SLOTS: ${FREE_PERSON_SLOTS:-0}
|
||||||
# invite: new accounts need an invitation (admin page "Meghívók"); open: anyone.
|
# invite: new accounts need an invitation (admin page "Meghívók"); open: anyone.
|
||||||
SIGNUP_MODE: ${SIGNUP_MODE:-invite}
|
SIGNUP_MODE: ${SIGNUP_MODE:-invite}
|
||||||
|
# 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
|
||||||
@@ -99,10 +114,12 @@ services:
|
|||||||
logging: *logging
|
logging: *logging
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
|
# E-mail delivery, cleanup and the other background jobs.
|
||||||
worker:
|
worker:
|
||||||
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,invoices
|
||||||
# SMTP_URL or the SES credentials come from .env.secrets (docs/levelkuldes.md);
|
# SMTP_URL or the SES credentials come from .env.secrets (docs/levelkuldes.md);
|
||||||
# listing them here with an empty default would override that file.
|
# listing them here with an empty default would override that file.
|
||||||
SES_REGION: ${SES_REGION:-eu-central-1}
|
SES_REGION: ${SES_REGION:-eu-central-1}
|
||||||
@@ -118,11 +135,33 @@ services:
|
|||||||
logging: *logging
|
logging: *logging
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
|
# The same image writing the analyses and answers (quick and slow lane);
|
||||||
|
# OPENROUTER_API_KEY comes from .env.secrets.
|
||||||
|
worker-ai:
|
||||||
|
image: ${REGISTRY_PREFIX:-registry.sagifer.com/sagifer/sorsfonalak}-worker:${TAG:-latest}
|
||||||
|
environment:
|
||||||
|
DATABASE_URL: postgres://sorsfonalak:${POSTGRES_PASSWORD}@postgres:5432/sorsfonalak
|
||||||
|
WORKER_TASKS: analyses
|
||||||
|
QUICK_CONCURRENCY: ${QUICK_CONCURRENCY:-2}
|
||||||
|
ANALYSIS_CONCURRENCY: ${ANALYSIS_CONCURRENCY:-4}
|
||||||
|
PUBLIC_BASE_URL: https://${DOMAIN}
|
||||||
|
env_file:
|
||||||
|
- path: .env.secrets
|
||||||
|
required: false
|
||||||
|
depends_on:
|
||||||
|
postgres:
|
||||||
|
condition: service_healthy
|
||||||
|
read_only: true
|
||||||
|
logging: *logging
|
||||||
|
restart: unless-stopped
|
||||||
|
|
||||||
frontend:
|
frontend:
|
||||||
image: ${REGISTRY_PREFIX:-registry.sagifer.com/sagifer/sorsfonalak}-frontend:${TAG:-latest}
|
image: ${REGISTRY_PREFIX:-registry.sagifer.com/sagifer/sorsfonalak}-frontend:${TAG:-latest}
|
||||||
environment:
|
environment:
|
||||||
BACKEND_URL: http://backend:8081
|
BACKEND_URL: http://backend:8081
|
||||||
HOROSCOPE_API_URL: http://horoscope-api:8080
|
HOROSCOPE_API_URL: http://horoscope-api:8080
|
||||||
|
# Absolute links of the share previews (og:image).
|
||||||
|
PUBLIC_BASE_URL: https://${DOMAIN}
|
||||||
depends_on:
|
depends_on:
|
||||||
backend:
|
backend:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
|||||||
@@ -55,9 +55,19 @@ 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}
|
||||||
|
# VAT on the invoices: AAM (alanyi adómentes) or a rate like 27%.
|
||||||
|
INVOICE_VAT: ${INVOICE_VAT:-AAM}
|
||||||
FREE_PERSON_SLOTS: ${FREE_PERSON_SLOTS:-0}
|
FREE_PERSON_SLOTS: ${FREE_PERSON_SLOTS:-0}
|
||||||
# invite: new accounts need an invitation (admin page "Meghívók"); open: anyone.
|
# invite: new accounts need an invitation (admin page "Meghívók"); open: anyone.
|
||||||
SIGNUP_MODE: ${SIGNUP_MODE:-invite}
|
SIGNUP_MODE: ${SIGNUP_MODE:-invite}
|
||||||
|
# STRIPE_SECRET_KEY / STRIPE_WEBHOOK_SECRET (test keys; docs/fizetes.md).
|
||||||
|
# With them Stripe replaces the stand-in payment.
|
||||||
|
env_file:
|
||||||
|
- path: .env.secrets
|
||||||
|
required: false
|
||||||
depends_on:
|
depends_on:
|
||||||
postgres:
|
postgres:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
# Arculat
|
||||||
|
|
||||||
|
- `sorsfonalak-ikon-512.png`: négyzetes ikon (512×512, sötét háttér, teljes kitöltés).
|
||||||
|
- `sorsfonalak-logo-sotet-hatterre.png`: logó átlátszó háttérrel, sötét felületre (1200×300).
|
||||||
|
- `sorsfonalak-logo-vilagos-hatterre.png`: ugyanez világos felületre.
|
||||||
|
|
||||||
|
A jel forrása: `services/frontend/src/app/icon.svg`.
|
||||||
|
|
||||||
|
## Színek
|
||||||
|
|
||||||
|
| Szerep | Szín |
|
||||||
|
|---|---|
|
||||||
|
| Háttér | `#0d1220` |
|
||||||
|
| Panel | `#111729` |
|
||||||
|
| Arany (kiemelés, gombok) | `#d9b46a` |
|
||||||
|
| Arany, világos háttéren | `#a7802f` |
|
||||||
|
| Szöveg sötét háttéren | `#ece6d8` |
|
||||||
|
| Szöveg világos háttéren | `#1b2236` |
|
||||||
|
| Gomb felirata arany gombon | `#141a2c` |
|
||||||
|
|
||||||
|
Stripe (Settings → Branding): Brand color `#0d1220`, Accent color `#d9b46a`, ikon és a sötét háttérre szánt logó.
|
||||||
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 26 KiB |
|
After Width: | Height: | Size: 26 KiB |
@@ -4,7 +4,7 @@ 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ő
|
||||||
|
|
||||||
@@ -39,7 +39,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,78 @@
|
|||||||
|
# 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'`).
|
||||||
|
|
||||||
|
## 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%`. 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.
|
||||||
|
|
||||||
|
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.
|
||||||
@@ -1,13 +1,14 @@
|
|||||||
# Kérdések az elemzésekről
|
# Kérdések az elemzésekről
|
||||||
|
|
||||||
A kész részletes képletelemzés és éves előrejelzés alatt a felhasználó kérdezhet róla („Kérdezz az elemzésedről”). Minden kérdés egy `question` egységet használ; minden csomagban 3 jár, és külön is vehető (+5 kérdés, 1 000 Ft). Admin ingyen kérdez.
|
A kész részletes képletelemzés, kapcsolati elemzés és éves előrejelzés alatt a felhasználó kérdezhet róla („Kérdezz az elemzésedről”). Minden kérdés egy `question` egységet használ; minden csomagban 3 jár, és külön is vehető (+5 kérdés, 1 000 Ft). Admin ingyen kérdez.
|
||||||
|
|
||||||
## Hogyan készül a válasz
|
## Hogyan készül a válasz
|
||||||
|
|
||||||
- **Modell:** ugyanaz, amelyik az elemzést írta (`analyses.model`), nem a Modellek oldalon beállított.
|
- **Modell:** a Modellek oldalon külön beállítható kérdés-válasz modell (alapból Opus 5.5). Ha a választott modell hibára fut, az alapmodell válaszol (tartalék).
|
||||||
- **Amit a modell kap:** a képlet tömör adatsorát (előrejelzésnél az év adatait is), magát az elemzést, az ugyanerre az elemzésre feltett korábbi legfeljebb 6 kérdést a válasszal, és az új kérdést. Születési dátum, hely, idő és név nem megy ki.
|
- **Amit a modell kap:** a képlet tömör adatsorát (kapcsolati elemzésnél mindkét képletet és az összevetést, előrejelzésnél az év adatait is), magát az elemzést, az ugyanerre az elemzésre feltett korábbi legfeljebb 6 kérdést a válasszal, és az új kérdést. Születési dátum, hely, idő és név nem megy ki.
|
||||||
- **Prompt:** az admin felületen szerkeszthető (Promptok → Kérdés-válasz). A szóhatár (`QUESTION_MAX_WORDS` = 250) a felhasználói üzenetben is benne van, így a prompt átírásától sem vész el. A kérdés legfeljebb 600 karakter.
|
- **Prompt:** az admin felületen szerkeszthető (Promptok → Kérdés-válasz). A szóhatár (`QUESTION_MAX_WORDS` = 250) a felhasználói üzenetben is benne van, így a prompt átírásától sem vész el. A kérdés legfeljebb 600 karakter.
|
||||||
- **Szabályok:** csak a képletből és az elemzésből válaszol, nem jósol betegséget, halált, balesetet, terhességet vagy biztos eseményt, nem ad orvosi, jogi, pénzügyi tanácsot; a nem asztrológiai kérdést udvariasan elhárítja; a kérdésben lévő utasításokat nem követi.
|
- **Szabályok:** csak a képletből és az elemzésből válaszol, nem jósol betegséget, halált, balesetet, terhességet vagy biztos eseményt, nem ad orvosi, jogi, pénzügyi tanácsot; a nem asztrológiai kérdést udvariasan elhárítja; a kérdésben lévő utasításokat nem követi.
|
||||||
|
- **Kapcsolati elemzés:** az összevetés mindkét tagja kérdezhet (a saját kérdéseiből), és mindketten látják a kérdéseket és a válaszokat.
|
||||||
- **Egyszerre egy:** amíg egy kérdésre készül a válasz, újabb nem tehető fel ugyanarra az elemzésre (így a válaszok egymásra épülnek).
|
- **Egyszerre egy:** amíg egy kérdésre készül a válasz, újabb nem tehető fel ugyanarra az elemzésre (így a válaszok egymásra épülnek).
|
||||||
- **Hiba:** a worker újrapróbálja, mint az elemzéseket; végleges hibánál a kérdést visszaadja (egyszer).
|
- **Hiba:** a worker újrapróbálja, mint az elemzéseket; végleges hibánál a kérdést visszaadja (egyszer).
|
||||||
- **Újragenerálás:** admin a válasz melletti ↻ gombbal újraírathatja (díjmentesen).
|
- **Újragenerálás:** admin a válasz melletti ↻ gombbal újraírathatja (díjmentesen).
|
||||||
|
|||||||
@@ -0,0 +1,62 @@
|
|||||||
|
# Megosztás
|
||||||
|
|
||||||
|
A képletoldalon, a rövid összefoglaló alatt van a **Megosztás** gomb. Ez egy nyilvános linket ad (`/s/<kód>`), amelyen a képlet rajza és a legfrissebb rövid összefoglaló látszik. Név és születési adatok nem kerülnek rá.
|
||||||
|
|
||||||
|
- **Ugyanaz a link:** ha ugyanazt a képletet újra megosztod, a már nyitott link jön vissza (`POST /v1/shares`: új linknél 201, meglévőnél 200).
|
||||||
|
- **Visszavonás:** a „Link visszavonása” gomb után az oldal és a kép is 404-et ad.
|
||||||
|
- **Keresők:** az oldal `noindex`, a keresők nem listázzák.
|
||||||
|
|
||||||
|
## Jutalom a megosztásért
|
||||||
|
|
||||||
|
Egy kattintás önmagában semmit nem bizonyít, ezért kétféle jutalom van:
|
||||||
|
|
||||||
|
- **Ajándék kérdés (megtekintésért):** felhasználónként **egyszer** +1 kérdés, amikor valaki más először megnyitja a megosztott linkjét. A gomb apró betűvel: „+1 ajándék kérdés, ha valaki megnézi”.
|
||||||
|
- **Ajándék képletelemzés (új felhasználóért):** +1 képletelemzés, ha valaki a megosztott linkről regisztrál és elkészíti a saját képletét. Felhasználónként legfeljebb 3 (`REFERRAL_LIMIT`). Az élesítésig ki van kapcsolva (`REFERRAL_REWARDS=false`), mert meghívásos regisztrációnál a linkről úgysem lehet regisztrálni.
|
||||||
|
|
||||||
|
**Megtekintés számolása:**
|
||||||
|
|
||||||
|
- **A böngésző jelez:** a megosztott oldal betöltése után maga a látogató böngészője jelzi a látogatást (`POST /v1/public/shares/{slug}/visit`). Az előnézet-robotok nem futtatják az oldal szkriptjét, így ők nem számítanak.
|
||||||
|
- **Ami nem számít:**
|
||||||
|
- robotnak látszó vagy hiányzó böngészőazonosító;
|
||||||
|
- a belépett tulajdonos;
|
||||||
|
- látogatás arról az IP-címről, ahonnan a linket létrehozták. A cím a sluggal sózva, hash-ként van tárolva (`shares.owner_ip_hash`).
|
||||||
|
- **Számláló:** a `shares.view_count` csak ezeket a valódi látogatásokat számolja.
|
||||||
|
- **Jutalom egyszer:** a `share_reward` sor egyedi indexszel felhasználónként egyszer jöhet létre.
|
||||||
|
|
||||||
|
**Új felhasználó:**
|
||||||
|
|
||||||
|
- **Megjegyzés:** a megosztott oldal a böngészőben megjegyzi a link kódját (`localStorage` `sf_ref`). A Google-regisztráció elküldi (`referral`), és a backend a `referrals` táblába írja, hogy kit ki hozott. Saját link, visszavont link vagy kikapcsolt jutalom esetén nem írja be.
|
||||||
|
- **Jutalom:** amikor az új felhasználó elkészíti a saját képletét, a megosztó +1 képletelemzést kap (`referral_reward`), ha még nem érte el a hármat. Új felhasználónként egyszer.
|
||||||
|
- **`/v1/me`:** a `share_reward_granted` és a `referral_rewards` (`{earned, limit}`) mezők mutatják az állapotot.
|
||||||
|
|
||||||
|
## Robotok
|
||||||
|
|
||||||
|
- **Az olvasás nem ír.** A megosztott tartalom lekérése (`GET /v1/public/shares/{slug}`) semmit nem ír az adatbázisba.
|
||||||
|
- **Gyorsítótár:** a frontend 5 percig tartja (`fetch` `revalidate: 300`, `shares` tag), így a sűrűn visszatérő robotok el sem jutnak a backendig. Visszavonáskor az `/api/v1` proxy azonnal törli a taget.
|
||||||
|
- **robots.txt** (`src/app/robots.ts`): kitiltja az ismert AI-robotokat (GPTBot, ClaudeBot, CCBot, PerplexityBot, Bytespider, meta-externalagent stb.). Az előnézet-robotok (facebookexternalhit, Slackbot, WhatsApp, Twitterbot, LinkedInBot) engedélyezve maradnak.
|
||||||
|
- **Cloudflare:** a robots.txt-t be nem tartó robotokra a Cloudflare „Block AI bots” beállítása való (Security → Bots). Ez az előnézet-robotokat nem tiltja le. A „Bot Fight Mode” viszont az előnézeteket is elronthatja, azt ne kapcsoljuk be.
|
||||||
|
|
||||||
|
## Előnézet (Facebook, Messenger, WhatsApp, LinkedIn, X)
|
||||||
|
|
||||||
|
Az oldal `og:` és `twitter:` meta tagjei:
|
||||||
|
|
||||||
|
| Tag | Tartalom |
|
||||||
|
|---|---|
|
||||||
|
| cím | az összefoglaló címe |
|
||||||
|
| leírás | az összefoglaló első ~200 karaktere |
|
||||||
|
| kép | `/s/<kód>/kep/<verzió>.png` |
|
||||||
|
|
||||||
|
A kép egy 1200×630-as PNG. A Next.js beépített képgenerálója (`next/og`) készíti kérésre, a következőkkel:
|
||||||
|
|
||||||
|
- a radix (`src/lib/wheelSvg.ts`; ugyanaz a `<ChartWheel>`, mint az oldalon, beégetett színekkel);
|
||||||
|
- a cím és a szöveg eleje;
|
||||||
|
- a Nap, a Hold és az Aszcendens jegye.
|
||||||
|
|
||||||
|
Működése:
|
||||||
|
|
||||||
|
- **Betűtípusok:** a `src/assets/og` mappából olvassa őket. Hiányzó karakter miatt soha nem tölt le fontot az internetről, mert a nem betű, szám vagy írásjel karaktereket kiszűri.
|
||||||
|
- **Verzió:** a fájlnévben lévő verzió az összefoglaló azonosítójából és elkészültének idejéből készül. Ha az összefoglaló újragenerálódik, új címet kap a kép, és a Facebook újra letölti.
|
||||||
|
- **Gyorsítótár:** `Cache-Control: public, max-age=3600, s-maxage=86400`. A Cloudflare egy napig tartja, így egy visszavont link képe legfeljebb egy napig marad ott. A Facebook a saját példányát a saját szabályai szerint tartja meg, nagyjából 30 napig.
|
||||||
|
- **Frissítés kézzel:** a Facebook megosztás-ellenőrzőjében (Sharing Debugger) a „Scrape Again” gombbal.
|
||||||
|
|
||||||
|
A frontend a `PUBLIC_BASE_URL` alapján írja az abszolút címeket; élesben ez `https://${DOMAIN}`.
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
# Promókódok
|
||||||
|
|
||||||
|
Amíg a fizetés nincs bekötve, a csomagokat promókóddal (és admin ajándékkal) lehet megkapni. Élesben a vásárlás ki van kapcsolva: a `MOCK_PAYMENTS` alapértéke a `deploy/docker-compose.yml`-ben `false`. A csomagkártyákon ilyenkor „Hamarosan” felirat áll.
|
||||||
|
|
||||||
|
## Admin: Admin → Promókódok
|
||||||
|
|
||||||
|
- **Kódkészítés:**
|
||||||
|
- Csomag (a fő csomagok és a kiegészítők közül), darab (1–500) és egy megjegyzés: kinek szól, melyik kampány.
|
||||||
|
- Az elkészült kódok egy listában jelennek meg, a „Mind másolása” gombbal kimásolhatók.
|
||||||
|
- A kód formája `ABCD-EFGH-JKLM`: 12 karakter, összetéveszthető betűk és számok nélkül (nincs 0/O, 1/I/L).
|
||||||
|
- **Lista:**
|
||||||
|
- Szűrhető állapotra: **fel nem használt** (ez az alapértelmezés), beváltott, visszavont, mind.
|
||||||
|
- Szűrhető csomagra, és kereshető kódrészletre, megjegyzésre vagy a beváltó e-mail-címére.
|
||||||
|
- A beváltott kódnál látszik, ki és mikor váltotta be.
|
||||||
|
- **Visszavonás:** fel nem használt kódot vissza lehet vonni. Utána nem váltható be.
|
||||||
|
|
||||||
|
## Felhasználó: beváltás
|
||||||
|
|
||||||
|
- **Hol lehet beváltani:**
|
||||||
|
- a fejléc „Kód beváltása” linkje (`/bevaltas`);
|
||||||
|
- a Csomagok oldal „Van promókódod?” doboza;
|
||||||
|
- a részletes elemzés ajánlata és a kérdés-válasz rész is ide vezet, ha nincs felhasználható egység.
|
||||||
|
- **Kitöltött link:** a `sorsfonalak.hu/bevaltas?kod=ABCD-EFGH-JKLM` link kitöltve nyitja meg a kódot. Aki nincs belépve, a belépés után ide tér vissza. Elég ezt a linket elküldeni a meghívottaknak.
|
||||||
|
- **Beírás:** a kód kis- vagy nagybetűvel, kötőjellel vagy anélkül is beírható.
|
||||||
|
- **Beváltás = feltöltés:** a kód nem hozzáad, hanem **feltölti** az egyenleget a csomag szintjéig. Minden egységnél (képletelemzés, kapcsolati elemzés, előrejelzés, kérdés, szabad személyhely) az új egyenleg a csomag mennyisége lesz, ha addig kevesebb volt.
|
||||||
|
- Ami elhasznált belőle, visszajön; ami ennél több van (például vett hozzá), megmarad.
|
||||||
|
- Példa: a „Páros” csomag 2 képletelemzést ad. Ha valakinek 0 maradt, 2 lesz; ha 5 van, 5 marad.
|
||||||
|
- Ha a felhasználónak már mindenből megvan a csomag mennyisége, a kódot nem váltjuk be (megmarad későbbre), és ezt üzenetben meg is mondjuk.
|
||||||
|
- Könyvelés: egy `package_orders` sor `promo` forrással, 0 Ft-tal, és `credit_ledger` sorok csak a ténylegesen hozzáadott mennyiségekkel. A válaszban az `added` mező mondja meg, mi került hozzá.
|
||||||
|
- **Egyszer:** egy kód egyszer váltható be. A „már felhasználták”, „már nem érvényes” és „nincs ilyen kód” esetekre külön üzenet van.
|
||||||
|
- **Találgatás ellen:** 10 sikertelen próbálkozás után a felhasználó negyed óráig nem próbálkozhat.
|
||||||
|
|
||||||
|
## Meghívó csomaggal
|
||||||
|
|
||||||
|
Az Admin → Meghívók oldalon az „Ajándék csomag” választóval minden meghívott kap egy promókódot a választott csomagra (megjegyzés: „meghívó: <cím>”).
|
||||||
|
|
||||||
|
- **A levélben** benne van a csomag neve és a kód. A levél előnézete is mutatja (minta kóddal).
|
||||||
|
- **Regisztrációkor** a kód magától beváltódik, ugyanazzal a feltöltéssel, mint a kézi beváltásnál. Ha mégsem, a kód kézzel is beváltható.
|
||||||
|
- **Újraküldéskor** a levélben ugyanaz a kód marad.
|
||||||
|
- **Visszavonás:** a meghívó visszavonása a még fel nem használt kódot is visszavonja.
|
||||||
|
- **A meghívók listájában** látszik a csomag, és hogy beváltották-e.
|
||||||
|
- **A várólistán lévőket** is csomaggal lehet meghívni: a „Várólista” táblázat fölötti választóval a „Meghívás” gomb azzal a csomaggal küldi a meghívót.
|
||||||
|
|
||||||
|
## Várólista
|
||||||
|
|
||||||
|
- **Visszaigazolás:** aki feliratkozik, egyszer kap egy visszaigazoló levelet (`waitlist_joined`), benne leiratkozó linkkel.
|
||||||
|
- **Leiratkozás:** a link leveszi a címet a listáról, és felveszi a „nem kér levelet” listára, így meghívót sem küldünk oda többet.
|
||||||
|
- **Korlát:** IP-címenként 15 percen belül legfeljebb 10 levél megy ki, hogy az űrlappal ne lehessen mások postafiókját elárasztani. A lista legfeljebb 10 000 cím.
|
||||||
|
|
||||||
|
## API
|
||||||
|
|
||||||
|
| Végpont | Ki | Mit csinál |
|
||||||
|
|---|---|---|
|
||||||
|
| `POST /v1/admin/promo-codes` `{package, count, note?}` | admin | kódok készítése |
|
||||||
|
| `GET /v1/admin/promo-codes?status=unused\|used\|revoked\|all&package=&q=&limit=&offset=` | admin | lista |
|
||||||
|
| `POST /v1/admin/promo-codes/{id}/revoke` | admin | visszavonás |
|
||||||
|
| `POST /v1/promo-codes/redeem` `{code}` | belépett felhasználó | beváltás (feltöltés); a válaszban az új egyenleg, a csomag és az `added` |
|
||||||
|
| `POST /v1/admin/invitations` `{emails, message?, locale?, package?}` | admin | meghívó, opcionálisan csomaggal |
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
# Személy meghívása
|
||||||
|
|
||||||
|
Az „Új személy” oldalon két lehetőség van:
|
||||||
|
|
||||||
|
- **Adatok megadása:** a felhasználó maga írja be a születési adatokat. Ez egy személyhelyet használ, ahogy eddig.
|
||||||
|
- **Meghívom:** egy „Mennyire illünk össze?” meghívó (`synastry_invites`). A meghívott a saját adatait adja meg. Személyhely nem kell hozzá, és akkor is működik, ha a helyek elfogytak.
|
||||||
|
|
||||||
|
**Az élesítésig ki van kapcsolva:** a „Meghívom” lehetőség és a Személyek oldal „Hívd meg, akit szeretsz” kártyája látszik, de „Hamarosan” felirattal le van tiltva. A backend `invites_disabled` hibával utasítja el. Bekapcsolás: `USER_INVITES=true` a szerver `.env` fájljában. Az adminok a kapcsolótól függetlenül meghívhatnak, hogy ki tudják próbálni.
|
||||||
|
|
||||||
|
## Menete
|
||||||
|
|
||||||
|
1. **A meghívó elkészül.** A meghívó megadhatja, kinek szól (ezt csak ő látja), a meghívott e-mail-címét (nem kötelező) és egy üzenetet (legfeljebb 300 karakter, link nélkül). A link `/meghivas/<kód>`, 14 napig érvényes. Megosztható másolással, a telefon megosztás menüjével, WhatsAppon vagy Facebookon.
|
||||||
|
2. **Levél** (`synastry_invite` sablon), ha e-mail-cím is van:
|
||||||
|
- naponta legfeljebb 10 levél felhasználónként, a többi meghívó csak linkkel megy;
|
||||||
|
- aki leiratkozott a meghívókról, nem kap levelet (a link ilyenkor is működik);
|
||||||
|
- a levél alján leiratkozó link van, ugyanaz a végpont, mint az oldalmeghívóknál.
|
||||||
|
3. **A meghívott a linkről érkezik.**
|
||||||
|
- Belép Google-lal. Meghívásos regisztrációnál a link kódja engedi be.
|
||||||
|
- Ha még nincs képlete, megadja a születési adatait, és rögtön elkészül az összevetés (`POST /v1/invites/accept`).
|
||||||
|
- Az összevetés oldalára jut.
|
||||||
|
4. **A meghívó értesítést kap** (`invite_accepted`, a link az `/osszevetesek/<id>` oldalra visz). A Személyek oldalon a „Meghívóid” listában látszanak a függő meghívók (visszavonhatók) és az elmúlt 30 nap elfogadott meghívói.
|
||||||
|
|
||||||
|
## Ki mit fizet
|
||||||
|
|
||||||
|
| Mi | Ár |
|
||||||
|
|---|---|
|
||||||
|
| A meghívott képlete és rövid összefoglalója | ingyen, mint mindenkinek |
|
||||||
|
| Az összevetés rajza és táblázatai | ingyen |
|
||||||
|
| Kapcsolati elemzés | 1 kapcsolati egység, annak, aki elindítja; mindketten látják, és mindketten kérdezhetnek róla |
|
||||||
|
| A meghívott részletes képletelemzése | csak ha ő kéri, a saját egységéből |
|
||||||
|
|
||||||
|
A meghívó a meghívott születési adatait nem látja, csak a bolygóállásokat és az összevetést.
|
||||||
@@ -10,6 +10,7 @@ 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
|
||||||
horoscope-client.workspace = true
|
horoscope-client.workspace = true
|
||||||
service-kit.workspace = true
|
service-kit.workspace = true
|
||||||
anyhow.workspace = true
|
anyhow.workspace = true
|
||||||
|
|||||||
@@ -20,8 +20,8 @@ Felhasználók, belépés, mentett születési képletek, szinasztriák és megh
|
|||||||
| `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 |
|
||||||
| `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` | alapból ez írja a fizetős részletes elemzéseket (az admin felületen funkciónként felülírható) |
|
| `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 |
|
||||||
| `SUMMARY_MODEL` | `anthropic/claude-sonnet-5.5` | alapból ez írja minden mentett képlet ingyenes rövid összefoglalóját (kb. 1 cent darabonként) |
|
| `SUMMARY_MODEL` | `anthropic/claude-opus-5.5` | a rövid összefoglaló alapmodellje (az admin felületen olcsóbbra állítható) |
|
||||||
| `OPENROUTER_MODELS_URL` | `https://openrouter.ai/api/v1/models` | az admin modellválasztó listája árakkal (óránként egyszer kérdezi le) |
|
| `OPENROUTER_MODELS_URL` | `https://openrouter.ai/api/v1/models` | az admin modellválasztó listája árakkal (óránként egyszer kérdezi le) |
|
||||||
| `ANALYSIS_PROMPT_VERSION` | `v3` | a prompt verziója (az elemzés-gyorsítótár kulcsának része) |
|
| `ANALYSIS_PROMPT_VERSION` | `v3` | a prompt verziója (az elemzés-gyorsítótár kulcsának része) |
|
||||||
| `MAX_CHARTS_PER_USER` | `1000` | biztonsági felső korlát a képletek számára |
|
| `MAX_CHARTS_PER_USER` | `1000` | biztonsági felső korlát a képletek számára |
|
||||||
@@ -125,7 +125,10 @@ Hibák formátuma: `{"error": {"code", "message"}}`. A születési adatok hibái
|
|||||||
|
|
||||||
- **Ingyenes rész:** minden mentett képlethez elkészül egy rövid összefoglaló (`summary`, `SUMMARY_MODEL`), ezért nem kell fizetni.
|
- **Ingyenes rész:** minden mentett képlethez elkészül egy rövid összefoglaló (`summary`, `SUMMARY_MODEL`), ezért nem kell fizetni.
|
||||||
- **Fizetős rész:** a részletes elemzés darabra megy. A képletelemzés egy `natal`, a szinasztria-elemzés egy `synastry` egységet von le (`credit_ledger.unit`). Az egységek csomagvásárlásból (Stripe, később) vagy admin jóváírásból jönnek. Havi ingyenes keret nincs.
|
- **Fizetős rész:** a részletes elemzés darabra megy. A képletelemzés egy `natal`, a szinasztria-elemzés egy `synastry` egységet von le (`credit_ledger.unit`). Az egységek csomagvásárlásból (Stripe, később) vagy admin jóváírásból jönnek. Havi ingyenes keret nincs.
|
||||||
- **Modell:** funkciónként (összefoglaló, képletelemzés, kapcsolati elemzés, előrejelzés) az admin felületen választható az OpenRouter listájából (`model_settings` tábla); ha nincs beállítva, az `ANALYSIS_MODEL` / `SUMMARY_MODEL` (alapból Opus 5.5, a 2026-11-es összevetés legjobbja, lásd `services/worker/README.md`). Csak kötött JSON-választ adó modell választható. A kliens nem választ modellt, és a modell neve felhasználónak sehol nem jelenik meg.
|
- **Modell:** három beállítás az admin felületen, az OpenRouter listájából (`model_settings` tábla): az elemzések és az éves előrejelzés (képlet-, kapcsolati elemzés, előrejelzés) közös modellje, a kérdés-válasz modellje és a rövid összefoglalóé. Ha nincs beállítva, az `ANALYSIS_MODEL` / `SUMMARY_MODEL` (alapból mindkettő Opus 5.5, a 2026-11-es összevetés legjobbja, lásd `services/worker/README.md`). Csak kötött JSON-választ adó modell választható. A kliens nem választ modellt, és a modell neve felhasználónak sehol nem jelenik meg.
|
||||||
|
- **Tartalék:** ha a választott modell kétszer hibára fut (végleges hibánál egyszer), a worker az alapmodellel próbálja tovább (`fallback_model`, `on_fallback`); csak ha az is elbukik, jár vissza az egység. A Modellek oldal mutatja, hány szövegnél kellett az elmúlt 30 napban.
|
||||||
|
- **Hibanapló:** a worker minden sikertelen próbálkozást a `generation_errors` táblába ír (mi, melyik modell, hányadik kísérlet, mi lett: újrapróbálás, tartalék vagy végleges hiba, mennyi ideig tartott); az admin Hibanapló oldala mutatja (`GET /v1/admin/errors?source=&outcome=`), 90 napig őrizzük. A felhasználó a várakozó oldalon látja, ha az előző próbálkozás nem sikerült és újrapróbáljuk; a számláló a kérés idejétől (`requested_at`) mér.
|
||||||
|
- **Futó generálások:** a Modellek oldalon látszik minden készülő és sorban álló elemzés és válasz, a modelljével és azzal, amivel most indulna; újraindításkor a jelenlegi beállítással indul újra (`GET /v1/admin/jobs`, `POST /v1/admin/jobs/restart`). Minden kísérlet `started_at` értéke a „jegye”: az újraindítás törli, így a workerben még futó régi kísérlet nem írhatja felül az újat, és a worker 10 másodpercen belül eldobja.
|
||||||
- **Újragenerálás:** admin minden elemzést egyenként újraírathat (`POST /v1/admin/analyses/{id}/regenerate`): ugyanaz a sor (az azonosító és a megosztások maradnak), a jelenlegi prompttal és modellel, egységlevonás nélkül.
|
- **Újragenerálás:** admin minden elemzést egyenként újraírathat (`POST /v1/admin/analyses/{id}/regenerate`): ugyanaz a sor (az azonosító és a megosztások maradnak), a jelenlegi prompttal és modellel, egységlevonás nélkül.
|
||||||
- **Újraszámolás:** számítási változás után a `backend recalculate` parancs minden mentett képletet, összevetést és előrejelzést újraszámol, majd minden elemzést újra sorba állít (egységlevonás nélkül).
|
- **Újraszámolás:** számítási változás után a `backend recalculate` parancs minden mentett képletet, összevetést és előrejelzést újraszámol, majd minden elemzést újra sorba állít (egységlevonás nélkül).
|
||||||
- **Kérés:** a `POST .../analyses` (`{language?}`) létrehoz egy `pending` elemzést, és levon egy egységet; a szöveget a worker írja meg, általában 1–2 perc alatt. A kliens a `GET /v1/analyses/{id}` végponton kérdezi le az állapotát. Ha nincs egység, 402 `insufficient_credits` a válasz (`unit`, `balance` részletekkel). Hiba esetén a worker visszaadja az egységet.
|
- **Kérés:** a `POST .../analyses` (`{language?}`) létrehoz egy `pending` elemzést, és levon egy egységet; a szöveget a worker írja meg, általában 1–2 perc alatt. A kliens a `GET /v1/analyses/{id}` végponton kérdezi le az állapotát. Ha nincs egység, 402 `insufficient_credits` a válasz (`unit`, `balance` részletekkel). Hiba esetén a worker visszaadja az egységet.
|
||||||
|
|||||||
@@ -45,6 +45,27 @@ 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,
|
||||||
|
/// `USER_INVITES` (default `false`): users may invite others ("how
|
||||||
|
/// compatible are we?" links, which also let the invitee sign up). Off
|
||||||
|
/// until the launch; admins may always.
|
||||||
|
pub user_invites: bool,
|
||||||
|
/// `REFERRAL_REWARDS` (default `false`): someone who signs up from a
|
||||||
|
/// shared link and makes their own chart earns the sharer a natal
|
||||||
|
/// analysis (at most three). Off until sign-up opens.
|
||||||
|
pub referral_rewards: bool,
|
||||||
/// `GOOGLE_CLIENT_IDS`: comma-separated OAuth client ids accepted as the
|
/// `GOOGLE_CLIENT_IDS`: comma-separated OAuth client ids accepted as the
|
||||||
/// ID token audience; empty disables Google login.
|
/// ID token audience; empty disables Google login.
|
||||||
pub google_client_ids: Vec<String>,
|
pub google_client_ids: Vec<String>,
|
||||||
@@ -55,11 +76,13 @@ pub struct Config {
|
|||||||
pub bootstrap_admin_emails: Vec<String>,
|
pub bootstrap_admin_emails: Vec<String>,
|
||||||
/// `SUPPORTED_LOCALES` (default `hu,en`); the first is the default.
|
/// `SUPPORTED_LOCALES` (default `hu,en`); the first is the default.
|
||||||
pub supported_locales: Vec<String>,
|
pub supported_locales: Vec<String>,
|
||||||
/// `ANALYSIS_MODEL`: writes the paid detailed analyses (default
|
/// `ANALYSIS_MODEL`: the default model of the analyses, forecasts and
|
||||||
|
/// answers, and the fallback when a chosen model fails (default
|
||||||
/// `anthropic/claude-opus-5.5`, the best of the 2026-11 comparison).
|
/// `anthropic/claude-opus-5.5`, the best of the 2026-11 comparison).
|
||||||
pub analysis_model: String,
|
pub analysis_model: String,
|
||||||
/// `SUMMARY_MODEL`: writes the free short summary of every saved chart
|
/// `SUMMARY_MODEL`: the default model of the free short summary of every
|
||||||
/// (default `anthropic/claude-sonnet-5.5`, about 1 US cent each).
|
/// saved chart (default `anthropic/claude-opus-5.5`; the admin page can
|
||||||
|
/// choose a cheaper one).
|
||||||
pub summary_model: String,
|
pub summary_model: String,
|
||||||
/// `OPENROUTER_MODELS_URL` (default `https://openrouter.ai/api/v1/models`):
|
/// `OPENROUTER_MODELS_URL` (default `https://openrouter.ai/api/v1/models`):
|
||||||
/// the model list with prices for the admin page.
|
/// the model list with prices for the admin page.
|
||||||
@@ -75,6 +98,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())
|
||||||
}
|
}
|
||||||
@@ -117,13 +168,34 @@ 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)?,
|
||||||
|
user_invites: parsed("USER_INVITES", false)?,
|
||||||
|
referral_rewards: parsed("REFERRAL_REWARDS", false)?,
|
||||||
google_client_ids: list("GOOGLE_CLIENT_IDS"),
|
google_client_ids: list("GOOGLE_CLIENT_IDS"),
|
||||||
google_jwks_url: var("GOOGLE_JWKS_URL")
|
google_jwks_url: var("GOOGLE_JWKS_URL")
|
||||||
.unwrap_or_else(|| "https://www.googleapis.com/oauth2/v3/certs".into()),
|
.unwrap_or_else(|| "https://www.googleapis.com/oauth2/v3/certs".into()),
|
||||||
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()),
|
||||||
summary_model: var("SUMMARY_MODEL").unwrap_or_else(|| "anthropic/claude-sonnet-5.5".into()),
|
summary_model: var("SUMMARY_MODEL").unwrap_or_else(|| "anthropic/claude-opus-5.5".into()),
|
||||||
openrouter_models_url: var("OPENROUTER_MODELS_URL")
|
openrouter_models_url: var("OPENROUTER_MODELS_URL")
|
||||||
.unwrap_or_else(|| "https://openrouter.ai/api/v1/models".into()),
|
.unwrap_or_else(|| "https://openrouter.ai/api/v1/models".into()),
|
||||||
prompt_version: var("ANALYSIS_PROMPT_VERSION").unwrap_or_else(|| "v3".into()),
|
prompt_version: var("ANALYSIS_PROMPT_VERSION").unwrap_or_else(|| "v3".into()),
|
||||||
@@ -154,6 +226,13 @@ 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,
|
||||||
|
user_invites: true,
|
||||||
|
referral_rewards: true,
|
||||||
google_client_ids: vec!["test-client.apps.googleusercontent.com".into()],
|
google_client_ids: vec!["test-client.apps.googleusercontent.com".into()],
|
||||||
google_jwks_url,
|
google_jwks_url,
|
||||||
bootstrap_admin_emails: vec!["admin@example.com".into()],
|
bootstrap_admin_emails: vec!["admin@example.com".into()],
|
||||||
|
|||||||
@@ -0,0 +1,181 @@
|
|||||||
|
//! 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.
|
||||||
|
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(_), _) => "HAS_TAX_NUMBER",
|
||||||
|
(None, _) => "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: &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) \
|
||||||
|
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16) \
|
||||||
|
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())
|
||||||
|
.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 abroad = Buyer::from_stripe(&json!({"name": "Anna", "address": {"country": "at"}}), None);
|
||||||
|
assert_eq!((abroad.country.as_str(), abroad.tax_type), ("AT", "FOREIGN"));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -13,10 +13,12 @@ mod config;
|
|||||||
mod credits;
|
mod credits;
|
||||||
mod error;
|
mod error;
|
||||||
mod google;
|
mod google;
|
||||||
|
mod invoices;
|
||||||
mod models;
|
mod models;
|
||||||
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;
|
||||||
@@ -41,6 +43,7 @@ pub struct AppState {
|
|||||||
pub google: GoogleVerifier,
|
pub google: GoogleVerifier,
|
||||||
pub login_limiter: LoginLimiter,
|
pub login_limiter: LoginLimiter,
|
||||||
pub models: models::Catalog,
|
pub models: models::Catalog,
|
||||||
|
pub stripe: stripe::Client,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl AppState {
|
impl AppState {
|
||||||
@@ -50,6 +53,7 @@ impl AppState {
|
|||||||
google: GoogleVerifier::new(config.google_client_ids.clone(), config.google_jwks_url.clone()),
|
google: GoogleVerifier::new(config.google_client_ids.clone(), config.google_jwks_url.clone()),
|
||||||
login_limiter: LoginLimiter::new(10, Duration::from_secs(15 * 60)),
|
login_limiter: LoginLimiter::new(10, Duration::from_secs(15 * 60)),
|
||||||
models: models::Catalog::new(&config.openrouter_models_url),
|
models: models::Catalog::new(&config.openrouter_models_url),
|
||||||
|
stripe: stripe::Client::default(),
|
||||||
db,
|
db,
|
||||||
config,
|
config,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,8 +2,9 @@
|
|||||||
//! offers (with prices) for the admin page.
|
//! offers (with prices) for the admin page.
|
||||||
//!
|
//!
|
||||||
//! The choice is in `model_settings`; without a row the configured default
|
//! The choice is in `model_settings`; without a row the configured default
|
||||||
//! is used (`SUMMARY_MODEL` for the short summary, `ANALYSIS_MODEL` else).
|
//! is used (`SUMMARY_MODEL` for the short summary, `ANALYSIS_MODEL` else,
|
||||||
//! The model is never shown to users (a business secret).
|
//! both Opus 5.5 by default). When the chosen model fails, the worker falls
|
||||||
|
//! back to the default. The model is never shown to users (a business secret).
|
||||||
|
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use std::time::{Duration, Instant};
|
use std::time::{Duration, Instant};
|
||||||
@@ -18,21 +19,66 @@ use crate::AppState;
|
|||||||
/// The OpenRouter list is fetched at most this often.
|
/// The OpenRouter list is fetched at most this often.
|
||||||
const CATALOG_TTL: Duration = Duration::from_secs(3600);
|
const CATALOG_TTL: Duration = Duration::from_secs(3600);
|
||||||
|
|
||||||
/// The configured default model of a kind.
|
/// The model settings of the admin page: one model writes all analyses and
|
||||||
pub fn default_model(state: &AppState, kind: Kind) -> &str {
|
/// forecasts, another the answers to questions, a third the short summary.
|
||||||
match kind {
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
Kind::Summary => &state.config.summary_model,
|
pub enum Function {
|
||||||
_ => &state.config.analysis_model,
|
Summary,
|
||||||
|
Analysis,
|
||||||
|
Question,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Function {
|
||||||
|
pub const ALL: [Function; 3] = [Function::Summary, Function::Analysis, Function::Question];
|
||||||
|
|
||||||
|
pub fn key(self) -> &'static str {
|
||||||
|
match self {
|
||||||
|
Function::Summary => "summary",
|
||||||
|
Function::Analysis => "analysis",
|
||||||
|
Function::Question => "question",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn parse(key: &str) -> Option<Function> {
|
||||||
|
Function::ALL.into_iter().find(|f| f.key() == key)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn of(kind: Kind) -> Function {
|
||||||
|
match kind {
|
||||||
|
Kind::Summary => Function::Summary,
|
||||||
|
Kind::Question => Function::Question,
|
||||||
|
Kind::Natal | Kind::Synastry | Kind::Forecast => Function::Analysis,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The model new analyses of this kind are written with.
|
/// The configured default model of a function; also the fallback when the
|
||||||
pub async fn model_for(state: &AppState, kind: Kind) -> Result<String, sqlx::Error> {
|
/// chosen model fails.
|
||||||
|
pub fn default_model(state: &AppState, function: Function) -> &str {
|
||||||
|
match function {
|
||||||
|
Function::Summary => &state.config.summary_model,
|
||||||
|
Function::Analysis | Function::Question => &state.config.analysis_model,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The model new texts of this kind are written with, and the fallback model
|
||||||
|
/// (`None` when the chosen model is the default).
|
||||||
|
pub async fn models_for(state: &AppState, kind: Kind) -> Result<(String, Option<String>), sqlx::Error> {
|
||||||
|
let function = Function::of(kind);
|
||||||
let chosen: Option<String> = sqlx::query_scalar("SELECT model FROM model_settings WHERE kind = $1")
|
let chosen: Option<String> = sqlx::query_scalar("SELECT model FROM model_settings WHERE kind = $1")
|
||||||
.bind(kind.as_str())
|
.bind(function.key())
|
||||||
.fetch_optional(&state.db)
|
.fetch_optional(&state.db)
|
||||||
.await?;
|
.await?;
|
||||||
Ok(chosen.unwrap_or_else(|| default_model(state, kind).to_owned()))
|
let default = default_model(state, function);
|
||||||
|
Ok(match chosen {
|
||||||
|
Some(model) if model != default => (model, Some(default.to_owned())),
|
||||||
|
_ => (default.to_owned(), None),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The model new texts of this kind are written with.
|
||||||
|
pub async fn model_for(state: &AppState, kind: Kind) -> Result<String, sqlx::Error> {
|
||||||
|
Ok(models_for(state, kind).await?.0)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// One model OpenRouter offers, with its price in USD per million tokens.
|
/// One model OpenRouter offers, with its price in USD per million tokens.
|
||||||
|
|||||||
@@ -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,
|
||||||
@@ -184,6 +184,10 @@ impl Package {
|
|||||||
pub enum Source {
|
pub enum Source {
|
||||||
Admin,
|
Admin,
|
||||||
Mock,
|
Mock,
|
||||||
|
/// A redeemed promo code.
|
||||||
|
Promo,
|
||||||
|
/// Paid through Stripe Checkout.
|
||||||
|
Stripe,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Source {
|
impl Source {
|
||||||
@@ -191,11 +195,26 @@ impl Source {
|
|||||||
match self {
|
match self {
|
||||||
Source::Admin => "admin",
|
Source::Admin => "admin",
|
||||||
Source::Mock => "mock",
|
Source::Mock => "mock",
|
||||||
|
Source::Promo => "promo",
|
||||||
|
Source::Stripe => "stripe",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Records an order and gives its contents, inside the caller's transaction.
|
impl Package {
|
||||||
|
/// What the package gives, unit by unit.
|
||||||
|
pub fn contents(&self) -> [(Unit, i64); 5] {
|
||||||
|
[
|
||||||
|
(Unit::Natal, self.natal),
|
||||||
|
(Unit::Synastry, self.synastry),
|
||||||
|
(Unit::Forecast, self.forecast),
|
||||||
|
(Unit::Person, self.persons),
|
||||||
|
(Unit::Question, self.questions),
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Records an order and adds its contents, inside the caller's transaction.
|
||||||
pub async fn grant(
|
pub async fn grant(
|
||||||
tx: &mut PgConnection,
|
tx: &mut PgConnection,
|
||||||
user_id: Uuid,
|
user_id: Uuid,
|
||||||
@@ -203,11 +222,56 @@ pub async fn grant(
|
|||||||
source: Source,
|
source: Source,
|
||||||
created_by: Option<Uuid>,
|
created_by: Option<Uuid>,
|
||||||
note: Option<&str>,
|
note: Option<&str>,
|
||||||
|
) -> Result<Uuid, ApiError> {
|
||||||
|
record(tx, user_id, package, source, created_by, note, &package.contents()).await
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Fills the user's units up to what the package gives (promo codes): a unit
|
||||||
|
/// below the package's amount is raised to it, used units come back, more
|
||||||
|
/// than that stays as it is. `persons_left` is the free person slots now
|
||||||
|
/// (`None`: unlimited, nothing to add). Returns the order and what was added
|
||||||
|
/// (nothing at all: no order is recorded).
|
||||||
|
pub async fn top_up(
|
||||||
|
tx: &mut PgConnection,
|
||||||
|
user_id: Uuid,
|
||||||
|
package: &Package,
|
||||||
|
persons_left: Option<i64>,
|
||||||
|
note: Option<&str>,
|
||||||
|
) -> Result<Option<(Uuid, Vec<(Unit, i64)>)>, ApiError> {
|
||||||
|
sqlx::query("SELECT id FROM users WHERE id = $1 FOR UPDATE").bind(user_id).execute(&mut *tx).await?;
|
||||||
|
let balance = crate::credits::balance(tx, user_id).await?;
|
||||||
|
let added: Vec<(Unit, i64)> = package
|
||||||
|
.contents()
|
||||||
|
.into_iter()
|
||||||
|
.map(|(unit, n)| {
|
||||||
|
let have = match unit {
|
||||||
|
Unit::Person => persons_left.unwrap_or(i64::MAX),
|
||||||
|
unit => balance.of(unit),
|
||||||
|
};
|
||||||
|
(unit, (n - have).max(0))
|
||||||
|
})
|
||||||
|
.filter(|&(_, n)| n > 0)
|
||||||
|
.collect();
|
||||||
|
if added.is_empty() {
|
||||||
|
return Ok(None);
|
||||||
|
}
|
||||||
|
let order = record(tx, user_id, package, Source::Promo, None, note, &added).await?;
|
||||||
|
Ok(Some((order, added)))
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn record(
|
||||||
|
tx: &mut PgConnection,
|
||||||
|
user_id: Uuid,
|
||||||
|
package: &Package,
|
||||||
|
source: Source,
|
||||||
|
created_by: Option<Uuid>,
|
||||||
|
note: Option<&str>,
|
||||||
|
contents: &[(Unit, i64)],
|
||||||
) -> Result<Uuid, ApiError> {
|
) -> Result<Uuid, ApiError> {
|
||||||
let order = Uuid::now_v7();
|
let order = Uuid::now_v7();
|
||||||
let price = match source {
|
let price = match source {
|
||||||
Source::Admin => 0,
|
Source::Admin | Source::Promo => 0,
|
||||||
Source::Mock => package.price_huf,
|
Source::Mock | Source::Stripe => package.price_huf,
|
||||||
};
|
};
|
||||||
sqlx::query(
|
sqlx::query(
|
||||||
"INSERT INTO package_orders (id, user_id, package, source, price_huf, note, created_by) \
|
"INSERT INTO package_orders (id, user_id, package, source, price_huf, note, created_by) \
|
||||||
@@ -222,14 +286,7 @@ pub async fn grant(
|
|||||||
.bind(created_by)
|
.bind(created_by)
|
||||||
.execute(&mut *tx)
|
.execute(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
let contents = [
|
for &(unit, n) in contents {
|
||||||
(Unit::Natal, package.natal),
|
|
||||||
(Unit::Synastry, package.synastry),
|
|
||||||
(Unit::Forecast, package.forecast),
|
|
||||||
(Unit::Person, package.persons),
|
|
||||||
(Unit::Question, package.questions),
|
|
||||||
];
|
|
||||||
for (unit, n) in contents {
|
|
||||||
if n == 0 {
|
if n == 0 {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -62,6 +62,20 @@ pub async fn slots(conn: &mut PgConnection, auth: &AuthUser, free: i64) -> Resul
|
|||||||
Ok(Slots { used, granted: free + bought, unlimited: entitled || auth.user.has_role(Role::Admin) })
|
Ok(Slots { used, granted: free + bought, unlimited: entitled || auth.user.has_role(Role::Admin) })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The free person slots of a user without unlimited slots (for topping up).
|
||||||
|
pub async fn left(conn: &mut PgConnection, user_id: Uuid, free: i64) -> Result<i64, ApiError> {
|
||||||
|
let (used, bought): (i64, i64) = sqlx::query_as(
|
||||||
|
"SELECT \
|
||||||
|
(SELECT COUNT(*) FROM credit_ledger WHERE user_id = $1 AND unit = 'person' AND reason = 'person'), \
|
||||||
|
(SELECT COALESCE(SUM(delta), 0)::bigint FROM credit_ledger \
|
||||||
|
WHERE user_id = $1 AND unit = 'person' AND reason <> 'person')",
|
||||||
|
)
|
||||||
|
.bind(user_id)
|
||||||
|
.fetch_one(conn)
|
||||||
|
.await?;
|
||||||
|
Ok((free + bought - used).max(0))
|
||||||
|
}
|
||||||
|
|
||||||
/// Fails when no slot is left (a quick check before calculating a chart).
|
/// Fails when no slot is left (a quick check before calculating a chart).
|
||||||
pub async fn check(conn: &mut PgConnection, auth: &AuthUser, free: i64) -> Result<(), ApiError> {
|
pub async fn check(conn: &mut PgConnection, auth: &AuthUser, free: i64) -> Result<(), ApiError> {
|
||||||
if slots(conn, auth, free).await?.left() == Some(0) {
|
if slots(conn, auth, free).await?.left() == Some(0) {
|
||||||
|
|||||||
@@ -33,6 +33,12 @@ pub async fn me(State(state): St, auth: AuthUser) -> ApiResult<Json<Value>> {
|
|||||||
let birth_change = crate::birth_changes::view(&mut conn, &auth).await?;
|
let birth_change = crate::birth_changes::view(&mut conn, &auth).await?;
|
||||||
let persons = crate::persons::slots(&mut conn, &auth, state.config.free_person_slots).await?;
|
let persons = crate::persons::slots(&mut conn, &auth, state.config.free_person_slots).await?;
|
||||||
let package = crate::packages::current(&mut conn, auth.id()).await?;
|
let package = crate::packages::current(&mut conn, auth.id()).await?;
|
||||||
|
let share_reward = super::shares::reward_granted(&state.db, auth.id()).await?;
|
||||||
|
let referrals = super::shares::referral_rewards(&mut conn, auth.id()).await?;
|
||||||
|
let (invoices,): (i64,) = sqlx::query_as("SELECT count(*) FROM invoices WHERE user_id = $1")
|
||||||
|
.bind(auth.id())
|
||||||
|
.fetch_one(&mut *conn)
|
||||||
|
.await?;
|
||||||
Ok(Json(json!({
|
Ok(Json(json!({
|
||||||
"user": UserView::from(&auth.user),
|
"user": UserView::from(&auth.user),
|
||||||
"providers": providers.into_iter().map(|(p,)| p).collect::<Vec<_>>(),
|
"providers": providers.into_iter().map(|(p,)| p).collect::<Vec<_>>(),
|
||||||
@@ -41,6 +47,12 @@ pub async fn me(State(state): St, auth: AuthUser) -> ApiResult<Json<Value>> {
|
|||||||
"birth_change": birth_change,
|
"birth_change": birth_change,
|
||||||
"persons": persons.view(),
|
"persons": persons.view(),
|
||||||
"package": package.map(|(p, since)| json!({ "id": p.id, "name": p.name, "since": rfc3339(since) })),
|
"package": package.map(|(p, since)| json!({ "id": p.id, "name": p.name, "since": rfc3339(since) })),
|
||||||
|
// The free question for a shared link is used up (once per user).
|
||||||
|
"share_reward_granted": share_reward,
|
||||||
|
// Natal analyses earned by bringing new users, and how many can be.
|
||||||
|
"referral_rewards": { "earned": referrals, "limit": super::shares::REFERRAL_LIMIT },
|
||||||
|
// The "Számláim" menu shows up with the first invoice.
|
||||||
|
"invoice_count": invoices,
|
||||||
})))
|
})))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -49,11 +49,16 @@ pub struct AnalysisRow {
|
|||||||
pub credits_charged: i32,
|
pub credits_charged: i32,
|
||||||
pub created_at: OffsetDateTime,
|
pub created_at: OffsetDateTime,
|
||||||
pub completed_at: Option<OffsetDateTime>,
|
pub completed_at: Option<OffsetDateTime>,
|
||||||
|
/// Attempts so far; above 1 the page says it is being tried again.
|
||||||
|
pub attempts: i32,
|
||||||
|
pub next_attempt_at: OffsetDateTime,
|
||||||
|
/// When the current text was asked for (set again by a regeneration).
|
||||||
|
pub requested_at: OffsetDateTime,
|
||||||
}
|
}
|
||||||
|
|
||||||
const ANALYSIS_COLUMNS: &str = "id, kind, chart_id, synastry_id, forecast_id, language, prompt_version, status, \
|
const ANALYSIS_COLUMNS: &str = "id, kind, chart_id, synastry_id, forecast_id, language, prompt_version, status, \
|
||||||
content, error, \
|
content, error, \
|
||||||
credits_charged, created_at, completed_at";
|
credits_charged, created_at, completed_at, attempts, next_attempt_at, requested_at";
|
||||||
|
|
||||||
impl AnalysisRow {
|
impl AnalysisRow {
|
||||||
pub fn view(&self) -> Value {
|
pub fn view(&self) -> Value {
|
||||||
@@ -71,6 +76,9 @@ impl AnalysisRow {
|
|||||||
"credits_charged": self.credits_charged,
|
"credits_charged": self.credits_charged,
|
||||||
"created_at": rfc3339(self.created_at),
|
"created_at": rfc3339(self.created_at),
|
||||||
"completed_at": rfc3339_opt(self.completed_at),
|
"completed_at": rfc3339_opt(self.completed_at),
|
||||||
|
"attempts": self.attempts,
|
||||||
|
"next_attempt_at": rfc3339(self.next_attempt_at),
|
||||||
|
"requested_at": rfc3339(self.requested_at),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -146,7 +154,7 @@ async fn request(
|
|||||||
/// The cache key and the prompt version of a new analysis. The cache key leaves
|
/// The cache key and the prompt version of a new analysis. The cache key leaves
|
||||||
/// out the admin-edited prompt revision, so a chart keeps its analysis when the
|
/// out the admin-edited prompt revision, so a chart keeps its analysis when the
|
||||||
/// prompt changes; copying from another chart needs the same revision.
|
/// prompt changes; copying from another chart needs the same revision.
|
||||||
async fn versions(
|
pub(super) async fn versions(
|
||||||
state: &AppState,
|
state: &AppState,
|
||||||
kind: &str,
|
kind: &str,
|
||||||
hash: &str,
|
hash: &str,
|
||||||
@@ -175,7 +183,7 @@ pub(super) async fn queue(
|
|||||||
Target::Synastry { synastry_id, hash } => ("synastry", hash, None, Some(*synastry_id), None),
|
Target::Synastry { synastry_id, hash } => ("synastry", hash, None, Some(*synastry_id), None),
|
||||||
Target::Forecast { forecast_id, hash } => ("forecast", hash, None, None, Some(*forecast_id)),
|
Target::Forecast { forecast_id, hash } => ("forecast", hash, None, None, Some(*forecast_id)),
|
||||||
};
|
};
|
||||||
let model = &crate::models::model_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?;
|
||||||
|
|
||||||
// Already requested for this chart/synastry: return it.
|
// Already requested for this chart/synastry: return it.
|
||||||
@@ -197,8 +205,8 @@ pub(super) async fn queue(
|
|||||||
let insert = format!(
|
let insert = format!(
|
||||||
"INSERT INTO analyses (id, kind, chart_id, synastry_id, requested_by, language, model, prompt_version, \
|
"INSERT INTO analyses (id, kind, chart_id, synastry_id, requested_by, language, model, prompt_version, \
|
||||||
cache_key, status, content, input_tokens, output_tokens, credits_charged, completed_at, \
|
cache_key, status, content, input_tokens, output_tokens, credits_charged, completed_at, \
|
||||||
forecast_id) \
|
forecast_id, fallback_model) \
|
||||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16) RETURNING {ANALYSIS_COLUMNS}"
|
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17) RETURNING {ANALYSIS_COLUMNS}"
|
||||||
);
|
);
|
||||||
let id = Uuid::now_v7();
|
let id = Uuid::now_v7();
|
||||||
|
|
||||||
@@ -229,6 +237,7 @@ pub(super) async fn queue(
|
|||||||
.bind(0)
|
.bind(0)
|
||||||
.bind(OffsetDateTime::now_utc())
|
.bind(OffsetDateTime::now_utc())
|
||||||
.bind(forecast_id)
|
.bind(forecast_id)
|
||||||
|
.bind(fallback)
|
||||||
.fetch_one(&state.db)
|
.fetch_one(&state.db)
|
||||||
.await?;
|
.await?;
|
||||||
return Ok((StatusCode::CREATED, row));
|
return Ok((StatusCode::CREATED, row));
|
||||||
@@ -253,6 +262,7 @@ pub(super) async fn queue(
|
|||||||
.bind(i32::from(unit.is_some()))
|
.bind(i32::from(unit.is_some()))
|
||||||
.bind(None::<OffsetDateTime>)
|
.bind(None::<OffsetDateTime>)
|
||||||
.bind(forecast_id)
|
.bind(forecast_id)
|
||||||
|
.bind(fallback)
|
||||||
.fetch_one(&mut *tx)
|
.fetch_one(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
if let Some(unit) = unit {
|
if let Some(unit) = unit {
|
||||||
@@ -357,6 +367,17 @@ pub async fn request_for_forecast(
|
|||||||
request(&state, &auth, Target::Forecast { forecast_id: forecast.id, hash: forecast.forecast_hash }, req).await
|
request(&state, &auth, Target::Forecast { forecast_id: forecast.id, hash: forecast.forecast_hash }, req).await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The hash of what the analysis is about (chart, comparison or forecast),
|
||||||
|
/// part of its cache key; `None` when that was deleted.
|
||||||
|
pub(super) async fn target_hash(db: &PgPool, row: &AnalysisRow) -> Result<Option<String>, sqlx::Error> {
|
||||||
|
let (query, id) = match row.kind.as_str() {
|
||||||
|
"synastry" => ("SELECT synastry_hash FROM synastries WHERE id = $1", row.synastry_id),
|
||||||
|
"forecast" => ("SELECT forecast_hash FROM forecasts WHERE id = $1", row.forecast_id),
|
||||||
|
_ => ("SELECT chart_hash FROM charts WHERE id = $1", row.chart_id),
|
||||||
|
};
|
||||||
|
sqlx::query_scalar(query).bind(id).fetch_optional(db).await
|
||||||
|
}
|
||||||
|
|
||||||
/// Admin: writes an analysis again in place (same id, so links stay), with the
|
/// Admin: writes an analysis again in place (same id, so links stay), with the
|
||||||
/// current prompt and model. Nobody is charged.
|
/// current prompt and model. Nobody is charged.
|
||||||
pub async fn regenerate(
|
pub async fn regenerate(
|
||||||
@@ -369,41 +390,23 @@ pub async fn regenerate(
|
|||||||
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 = Kind::parse(&row.kind).ok_or_else(|| ApiError::Internal(format!("unknown kind {}", row.kind)))?;
|
||||||
let hash: Option<String> = match kind {
|
let hash = target_hash(&state.db, &row).await?;
|
||||||
Kind::Question => None,
|
|
||||||
Kind::Natal | Kind::Summary => {
|
|
||||||
sqlx::query_scalar("SELECT chart_hash FROM charts WHERE id = $1")
|
|
||||||
.bind(row.chart_id)
|
|
||||||
.fetch_optional(&state.db)
|
|
||||||
.await?
|
|
||||||
}
|
|
||||||
Kind::Synastry => {
|
|
||||||
sqlx::query_scalar("SELECT synastry_hash FROM synastries WHERE id = $1")
|
|
||||||
.bind(row.synastry_id)
|
|
||||||
.fetch_optional(&state.db)
|
|
||||||
.await?
|
|
||||||
}
|
|
||||||
Kind::Forecast => {
|
|
||||||
sqlx::query_scalar("SELECT forecast_hash FROM forecasts WHERE id = $1")
|
|
||||||
.bind(row.forecast_id)
|
|
||||||
.fetch_optional(&state.db)
|
|
||||||
.await?
|
|
||||||
}
|
|
||||||
};
|
|
||||||
let hash = hash.ok_or(ApiError::NotFound("analysis"))?;
|
let hash = hash.ok_or(ApiError::NotFound("analysis"))?;
|
||||||
let model = crate::models::model_for(&state, kind).await?;
|
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?;
|
let (cache_key, prompt_version) = versions(&state, kind.as_str(), &hash, &model, &row.language).await?;
|
||||||
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, \
|
||||||
input_tokens = NULL, output_tokens = NULL, cost_usd = NULL, attempts = 0, next_attempt_at = now(), \
|
input_tokens = NULL, output_tokens = NULL, cost_usd = NULL, attempts = 0, next_attempt_at = now(), \
|
||||||
started_at = NULL, completed_at = NULL, model = $2, prompt_version = $3, cache_key = $4 \
|
started_at = NULL, completed_at = NULL, model = $2, prompt_version = $3, cache_key = $4, \
|
||||||
|
fallback_model = $5, on_fallback = false, requested_at = now() \
|
||||||
WHERE id = $1 AND status IN ('done', 'failed') RETURNING {ANALYSIS_COLUMNS}"
|
WHERE id = $1 AND status IN ('done', 'failed') RETURNING {ANALYSIS_COLUMNS}"
|
||||||
))
|
))
|
||||||
.bind(id)
|
.bind(id)
|
||||||
.bind(&model)
|
.bind(&model)
|
||||||
.bind(&prompt_version)
|
.bind(&prompt_version)
|
||||||
.bind(&cache_key)
|
.bind(&cache_key)
|
||||||
|
.bind(&fallback)
|
||||||
.fetch_optional(&mut *tx)
|
.fetch_optional(&mut *tx)
|
||||||
.await?
|
.await?
|
||||||
.ok_or_else(|| ApiError::conflict("analysis_in_progress", "Ez az elemzés éppen készül."))?;
|
.ok_or_else(|| ApiError::conflict("analysis_in_progress", "Ez az elemzés éppen készül."))?;
|
||||||
|
|||||||
@@ -170,6 +170,8 @@ pub struct RegisterRequest {
|
|||||||
locale: Option<String>,
|
locale: Option<String>,
|
||||||
/// The invitation link's token, while sign-up needs an invitation.
|
/// The invitation link's token, while sign-up needs an invitation.
|
||||||
invite_token: Option<String>,
|
invite_token: Option<String>,
|
||||||
|
/// The slug of the shared link the visitor came from.
|
||||||
|
referral: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Password endpoints answer 403 while `PASSWORD_LOGIN` is off.
|
/// Password endpoints answer 403 while `PASSWORD_LOGIN` is off.
|
||||||
@@ -216,7 +218,15 @@ pub async fn register(
|
|||||||
.bind(&email)
|
.bind(&email)
|
||||||
.execute(&mut *tx)
|
.execute(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
super::invitations::mark_accepted(&mut tx, user_id, &email, req.invite_token.as_deref()).await?;
|
super::invitations::mark_accepted(
|
||||||
|
&mut tx,
|
||||||
|
user_id,
|
||||||
|
&email,
|
||||||
|
req.invite_token.as_deref(),
|
||||||
|
state.config.free_person_slots,
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
super::shares::record_referral(&mut tx, state.config.referral_rewards, user_id, req.referral.as_deref()).await?;
|
||||||
let mut user = load_user(&mut tx, user_id).await?;
|
let mut user = load_user(&mut tx, user_id).await?;
|
||||||
apply_bootstrap_admin(&state, &mut tx, &mut user).await?;
|
apply_bootstrap_admin(&state, &mut tx, &mut user).await?;
|
||||||
queue_verification(&state, &mut tx, &user).await?;
|
queue_verification(&state, &mut tx, &user).await?;
|
||||||
@@ -284,6 +294,8 @@ pub struct GoogleRequest {
|
|||||||
id_token: String,
|
id_token: String,
|
||||||
/// The invitation link's token, while sign-up needs an invitation.
|
/// The invitation link's token, while sign-up needs an invitation.
|
||||||
invite_token: Option<String>,
|
invite_token: Option<String>,
|
||||||
|
/// The slug of the shared link the visitor came from.
|
||||||
|
referral: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Logs in with Google. An unknown Google account is linked to the existing
|
/// Logs in with Google. An unknown Google account is linked to the existing
|
||||||
@@ -347,7 +359,16 @@ pub async fn google(
|
|||||||
.bind(locale)
|
.bind(locale)
|
||||||
.execute(&mut *tx)
|
.execute(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
super::invitations::mark_accepted(&mut tx, id, &email, req.invite_token.as_deref()).await?;
|
super::invitations::mark_accepted(
|
||||||
|
&mut tx,
|
||||||
|
id,
|
||||||
|
&email,
|
||||||
|
req.invite_token.as_deref(),
|
||||||
|
state.config.free_person_slots,
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
super::shares::record_referral(&mut tx, state.config.referral_rewards, id, req.referral.as_deref())
|
||||||
|
.await?;
|
||||||
(id, true)
|
(id, true)
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -184,6 +184,7 @@ pub async fn create(
|
|||||||
birth_changes::record(&mut tx, &auth, row.id).await?;
|
birth_changes::record(&mut tx, &auth, row.id).await?;
|
||||||
tx.commit().await?;
|
tx.commit().await?;
|
||||||
queue_summary(&state, &auth, &row).await;
|
queue_summary(&state, &auth, &row).await;
|
||||||
|
super::shares::reward_referral(&state, auth.id()).await?;
|
||||||
return Ok((StatusCode::OK, Json(row.owner_view())));
|
return Ok((StatusCode::OK, Json(row.owner_view())));
|
||||||
}
|
}
|
||||||
queue_summary(&state, &auth, &chart).await;
|
queue_summary(&state, &auth, &chart).await;
|
||||||
@@ -231,6 +232,9 @@ pub async fn create(
|
|||||||
}
|
}
|
||||||
tx.commit().await?;
|
tx.commit().await?;
|
||||||
queue_summary(&state, &auth, &row).await;
|
queue_summary(&state, &auth, &row).await;
|
||||||
|
if row.is_primary {
|
||||||
|
super::shares::reward_referral(&state, auth.id()).await?;
|
||||||
|
}
|
||||||
Ok((StatusCode::CREATED, Json(row.owner_view())))
|
Ok((StatusCode::CREATED, Json(row.owner_view())))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,73 @@
|
|||||||
|
//! Admin: the error log of the analyses, answers and prompt test runs (every
|
||||||
|
//! failed attempt, written by the worker), newest first.
|
||||||
|
|
||||||
|
use axum::Json;
|
||||||
|
use axum::extract::{Query, State};
|
||||||
|
use axum_extra::extract::WithRejection;
|
||||||
|
use serde::Deserialize;
|
||||||
|
use serde_json::{Value, json};
|
||||||
|
use time::OffsetDateTime;
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
use super::St;
|
||||||
|
use crate::auth::AdminUser;
|
||||||
|
use crate::error::{ApiError, ApiResult};
|
||||||
|
use crate::views::rfc3339;
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct ErrorQuery {
|
||||||
|
limit: Option<i64>,
|
||||||
|
offset: Option<i64>,
|
||||||
|
/// `analysis`, `question` or `preview`.
|
||||||
|
source: Option<String>,
|
||||||
|
/// `retry`, `fallback` or `failed`.
|
||||||
|
outcome: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
type Row = (i64, OffsetDateTime, String, Uuid, String, String, i32, String, String, Option<i32>, Option<String>);
|
||||||
|
|
||||||
|
pub async fn list(
|
||||||
|
State(state): St,
|
||||||
|
_admin: AdminUser,
|
||||||
|
WithRejection(Query(query), _): WithRejection<Query<ErrorQuery>, ApiError>,
|
||||||
|
) -> ApiResult<Json<Value>> {
|
||||||
|
let limit = query.limit.unwrap_or(100).clamp(1, 500);
|
||||||
|
let offset = query.offset.unwrap_or(0).max(0);
|
||||||
|
// Whose text it was: the requester of the analysis or the asker.
|
||||||
|
let rows: Vec<Row> = sqlx::query_as(
|
||||||
|
"SELECT e.id, e.created_at, e.source, e.item_id, e.kind, e.model, e.attempt, e.outcome, e.error, e.seconds, \
|
||||||
|
u.email \
|
||||||
|
FROM generation_errors e \
|
||||||
|
LEFT JOIN analyses a ON e.source = 'analysis' AND a.id = e.item_id \
|
||||||
|
LEFT JOIN questions q ON e.source = 'question' AND q.id = e.item_id \
|
||||||
|
LEFT JOIN prompt_previews p ON e.source = 'preview' AND p.id = e.item_id \
|
||||||
|
LEFT JOIN users u ON u.id = coalesce(a.requested_by, q.asked_by, p.created_by) \
|
||||||
|
WHERE ($1::text IS NULL OR e.source = $1) AND ($2::text IS NULL OR e.outcome = $2) \
|
||||||
|
ORDER BY e.id DESC LIMIT $3 OFFSET $4",
|
||||||
|
)
|
||||||
|
.bind(&query.source)
|
||||||
|
.bind(&query.outcome)
|
||||||
|
.bind(limit)
|
||||||
|
.bind(offset)
|
||||||
|
.fetch_all(&state.db)
|
||||||
|
.await?;
|
||||||
|
let (total, last_day): (i64, i64) = sqlx::query_as(
|
||||||
|
"SELECT count(*), count(*) FILTER (WHERE created_at > now() - interval '1 day') FROM generation_errors \
|
||||||
|
WHERE ($1::text IS NULL OR source = $1) AND ($2::text IS NULL OR outcome = $2)",
|
||||||
|
)
|
||||||
|
.bind(&query.source)
|
||||||
|
.bind(&query.outcome)
|
||||||
|
.fetch_one(&state.db)
|
||||||
|
.await?;
|
||||||
|
let errors: Vec<Value> = rows
|
||||||
|
.into_iter()
|
||||||
|
.map(|(id, at, source, item, kind, model, attempt, outcome, error, seconds, email)| {
|
||||||
|
json!({
|
||||||
|
"id": id, "created_at": rfc3339(at), "source": source, "item_id": item, "kind": kind, "model": model,
|
||||||
|
"attempt": attempt, "outcome": outcome, "error": error, "seconds": seconds, "user": email,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
Ok(Json(json!({ "errors": errors, "total": total, "last_day": last_day, "limit": limit, "offset": offset })))
|
||||||
|
}
|
||||||
@@ -7,6 +7,10 @@
|
|||||||
//!
|
//!
|
||||||
//! People who asked for no more invitations are kept as the hash of their
|
//! People who asked for no more invitations are kept as the hash of their
|
||||||
//! address. People without an invitation can join the waitlist.
|
//! address. People without an invitation can join the waitlist.
|
||||||
|
//!
|
||||||
|
//! An invitation can come with a package: a promo code is made with it, the
|
||||||
|
//! e-mail shows it with its redeem link, and it is redeemed by itself when
|
||||||
|
//! the invitee signs up (revoking the invitation withdraws it).
|
||||||
|
|
||||||
use axum::Json;
|
use axum::Json;
|
||||||
use axum::extract::{Path, Query, State};
|
use axum::extract::{Path, Query, State};
|
||||||
@@ -24,8 +28,12 @@ use crate::AppState;
|
|||||||
use crate::auth::AdminUser;
|
use crate::auth::AdminUser;
|
||||||
use crate::config::SignupMode;
|
use crate::config::SignupMode;
|
||||||
use crate::error::{ApiError, ApiResult};
|
use crate::error::{ApiError, ApiResult};
|
||||||
|
use crate::packages;
|
||||||
use crate::views::{rfc3339, rfc3339_opt};
|
use crate::views::{rfc3339, rfc3339_opt};
|
||||||
|
|
||||||
|
/// The package of an invitation, as shown in its e-mail: (code as shown, package name).
|
||||||
|
type Gift = (String, &'static str);
|
||||||
|
|
||||||
pub const INVITATION_TTL: time::Duration = time::Duration::days(30);
|
pub const INVITATION_TTL: time::Duration = time::Duration::days(30);
|
||||||
/// A resend is possible this often, and at most this many sendings in all.
|
/// A resend is possible this often, and at most this many sendings in all.
|
||||||
const RESEND_GAP: time::Duration = time::Duration::hours(24);
|
const RESEND_GAP: time::Duration = time::Duration::hours(24);
|
||||||
@@ -68,12 +76,15 @@ pub async fn admit(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// After a new account is created: its invitations count as accepted, and it leaves the waitlist.
|
/// After a new account is created: its invitations count as accepted, it
|
||||||
|
/// leaves the waitlist, and the packages of those invitations are redeemed
|
||||||
|
/// (`free_slots`: the person slots everyone gets).
|
||||||
pub async fn mark_accepted(
|
pub async fn mark_accepted(
|
||||||
conn: &mut PgConnection,
|
conn: &mut PgConnection,
|
||||||
user_id: Uuid,
|
user_id: Uuid,
|
||||||
email: &str,
|
email: &str,
|
||||||
token: Option<&str>,
|
token: Option<&str>,
|
||||||
|
free_slots: i64,
|
||||||
) -> Result<(), ApiError> {
|
) -> Result<(), ApiError> {
|
||||||
let hash = token.map(|t| db::token_hash(t.trim()));
|
let hash = token.map(|t| db::token_hash(t.trim()));
|
||||||
sqlx::query(
|
sqlx::query(
|
||||||
@@ -87,12 +98,36 @@ pub async fn mark_accepted(
|
|||||||
.execute(&mut *conn)
|
.execute(&mut *conn)
|
||||||
.await?;
|
.await?;
|
||||||
sqlx::query("DELETE FROM waitlist WHERE email = $1").bind(email).execute(&mut *conn).await?;
|
sqlx::query("DELETE FROM waitlist WHERE email = $1").bind(email).execute(&mut *conn).await?;
|
||||||
|
let codes: Vec<(Uuid, String, String)> = sqlx::query_as(
|
||||||
|
"SELECT p.id, p.code, p.package FROM promo_codes p JOIN invitations i ON i.id = p.invitation_id \
|
||||||
|
WHERE i.accepted_by = $1 AND p.redeemed_at IS NULL AND p.revoked_at IS NULL FOR UPDATE OF p",
|
||||||
|
)
|
||||||
|
.bind(user_id)
|
||||||
|
.fetch_all(&mut *conn)
|
||||||
|
.await?;
|
||||||
|
for (id, code, package) in codes {
|
||||||
|
let Some(package) = packages::find(&package) else { continue };
|
||||||
|
let persons_left = crate::persons::left(conn, user_id, free_slots).await?;
|
||||||
|
super::promo::redeem_code(conn, id, &code, package, user_id, Some(persons_left)).await?;
|
||||||
|
tracing::info!(user = %user_id, package = package.id, "invitation package redeemed");
|
||||||
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The open promo code of an invitation, for its e-mail.
|
||||||
|
async fn gift_of(conn: &mut PgConnection, invitation_id: Uuid) -> Result<Option<Gift>, sqlx::Error> {
|
||||||
|
let row: Option<(String, String)> = sqlx::query_as(
|
||||||
|
"SELECT code, package FROM promo_codes WHERE invitation_id = $1 AND redeemed_at IS NULL AND revoked_at IS NULL",
|
||||||
|
)
|
||||||
|
.bind(invitation_id)
|
||||||
|
.fetch_optional(conn)
|
||||||
|
.await?;
|
||||||
|
Ok(row.and_then(|(code, package)| packages::find(&package).map(|p| (super::promo::display(&code), p.name))))
|
||||||
|
}
|
||||||
|
|
||||||
// --- sending ---------------------------------------------------------------------------------
|
// --- sending ---------------------------------------------------------------------------------
|
||||||
|
|
||||||
fn clean_message(message: Option<String>) -> Result<Option<String>, ApiError> {
|
pub(super) fn clean_message(message: Option<String>) -> Result<Option<String>, ApiError> {
|
||||||
let Some(message) = message.map(|m| m.replace("\r\n", "\n").trim().to_owned()).filter(|m| !m.is_empty()) else {
|
let Some(message) = message.map(|m| m.replace("\r\n", "\n").trim().to_owned()).filter(|m| !m.is_empty()) else {
|
||||||
return Ok(None);
|
return Ok(None);
|
||||||
};
|
};
|
||||||
@@ -107,7 +142,7 @@ fn clean_message(message: Option<String>) -> Result<Option<String>, ApiError> {
|
|||||||
Ok(Some(message))
|
Ok(Some(message))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn links(state: &AppState, token: &str) -> (String, String, String) {
|
pub(super) fn links(state: &AppState, token: &str) -> (String, String, String) {
|
||||||
let base = &state.config.public_base_url;
|
let base = &state.config.public_base_url;
|
||||||
(
|
(
|
||||||
format!("{base}/meghivo/{token}"),
|
format!("{base}/meghivo/{token}"),
|
||||||
@@ -122,9 +157,14 @@ fn payload(
|
|||||||
inviter: Option<&str>,
|
inviter: Option<&str>,
|
||||||
message: Option<&str>,
|
message: Option<&str>,
|
||||||
expires: OffsetDateTime,
|
expires: OffsetDateTime,
|
||||||
|
gift: Option<&Gift>,
|
||||||
) -> Value {
|
) -> Value {
|
||||||
let (url, unsubscribe_url, unsubscribe_post_url) = links(state, token);
|
let (url, unsubscribe_url, unsubscribe_post_url) = links(state, token);
|
||||||
|
let base = &state.config.public_base_url;
|
||||||
json!({
|
json!({
|
||||||
|
"package_name": gift.map(|g| g.1),
|
||||||
|
"promo_code": gift.map(|g| g.0.as_str()),
|
||||||
|
"redeem_url": gift.map(|g| format!("{base}/bevaltas?kod={}", g.0)),
|
||||||
"url": url,
|
"url": url,
|
||||||
"unsubscribe_url": unsubscribe_url,
|
"unsubscribe_url": unsubscribe_url,
|
||||||
"unsubscribe_post_url": unsubscribe_post_url,
|
"unsubscribe_post_url": unsubscribe_post_url,
|
||||||
@@ -145,6 +185,7 @@ async fn send(
|
|||||||
inviter: Option<&str>,
|
inviter: Option<&str>,
|
||||||
message: Option<&str>,
|
message: Option<&str>,
|
||||||
expires: OffsetDateTime,
|
expires: OffsetDateTime,
|
||||||
|
gift: Option<&Gift>,
|
||||||
) -> Result<String, ApiError> {
|
) -> Result<String, ApiError> {
|
||||||
let token = db::new_token();
|
let token = db::new_token();
|
||||||
sqlx::query("INSERT INTO invitation_tokens (token_hash, invitation_id) VALUES ($1, $2)")
|
sqlx::query("INSERT INTO invitation_tokens (token_hash, invitation_id) VALUES ($1, $2)")
|
||||||
@@ -152,13 +193,13 @@ async fn send(
|
|||||||
.bind(id)
|
.bind(id)
|
||||||
.execute(&mut *conn)
|
.execute(&mut *conn)
|
||||||
.await?;
|
.await?;
|
||||||
let payload = payload(state, &token, inviter, message, expires);
|
let payload = payload(state, &token, inviter, message, expires, gift);
|
||||||
let url = payload["url"].as_str().unwrap_or_default().to_owned();
|
let url = payload["url"].as_str().unwrap_or_default().to_owned();
|
||||||
queue_email_to(conn, None, email, "invitation", locale, payload).await?;
|
queue_email_to(conn, None, email, "invitation", locale, payload).await?;
|
||||||
Ok(url)
|
Ok(url)
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn opted_out(conn: &mut PgConnection, email: &str) -> Result<bool, ApiError> {
|
pub(super) async fn opted_out(conn: &mut PgConnection, email: &str) -> Result<bool, ApiError> {
|
||||||
Ok(sqlx::query_scalar("SELECT EXISTS (SELECT 1 FROM email_optouts WHERE email_hash = $1)")
|
Ok(sqlx::query_scalar("SELECT EXISTS (SELECT 1 FROM email_optouts WHERE email_hash = $1)")
|
||||||
.bind(db::token_hash(email))
|
.bind(db::token_hash(email))
|
||||||
.fetch_one(conn)
|
.fetch_one(conn)
|
||||||
@@ -173,6 +214,8 @@ pub struct CreateInvitations {
|
|||||||
emails: Vec<String>,
|
emails: Vec<String>,
|
||||||
message: Option<String>,
|
message: Option<String>,
|
||||||
locale: Option<String>,
|
locale: Option<String>,
|
||||||
|
/// A package from the catalog the invitees get (as a promo code).
|
||||||
|
package: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Invites a list of addresses. Each gets a result: `invited` (with the
|
/// Invites a list of addresses. Each gets a result: `invited` (with the
|
||||||
@@ -188,6 +231,10 @@ pub async fn create(
|
|||||||
}
|
}
|
||||||
let message = clean_message(req.message)?;
|
let message = clean_message(req.message)?;
|
||||||
let locale = validate_locale(&state, req.locale.as_deref())?;
|
let locale = validate_locale(&state, req.locale.as_deref())?;
|
||||||
|
let package = match req.package.as_deref().filter(|p| !p.is_empty()) {
|
||||||
|
Some(id) => Some(packages::find(id).ok_or(ApiError::NotFound("package"))?),
|
||||||
|
None => None,
|
||||||
|
};
|
||||||
let inviter = admin.user.display_name.clone();
|
let inviter = admin.user.display_name.clone();
|
||||||
let mut results = Vec::new();
|
let mut results = Vec::new();
|
||||||
let mut seen = std::collections::HashSet::new();
|
let mut seen = std::collections::HashSet::new();
|
||||||
@@ -240,8 +287,20 @@ pub async fn create(
|
|||||||
results.push(json!({ "email": email, "status": "already_invited" }));
|
results.push(json!({ "email": email, "status": "already_invited" }));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
let url = send(&state, &mut tx, id, &email, &locale, inviter.as_deref(), message.as_deref(), expires).await?;
|
let gift = match package {
|
||||||
results.push(json!({ "email": email, "status": "invited", "id": id, "url": url }));
|
Some(p) => {
|
||||||
|
let note = format!("meghívó: {email}");
|
||||||
|
let code = super::promo::new_code(&mut tx, p.id, Some(¬e), Some(admin.id()), Some(id)).await?;
|
||||||
|
Some((super::promo::display(&code), p.name))
|
||||||
|
}
|
||||||
|
None => None,
|
||||||
|
};
|
||||||
|
let url =
|
||||||
|
send(&state, &mut tx, id, &email, &locale, inviter.as_deref(), message.as_deref(), expires, gift.as_ref())
|
||||||
|
.await?;
|
||||||
|
results.push(json!({
|
||||||
|
"email": email, "status": "invited", "id": id, "url": url, "promo_code": gift.as_ref().map(|g| &g.0),
|
||||||
|
}));
|
||||||
}
|
}
|
||||||
tx.commit().await?;
|
tx.commit().await?;
|
||||||
Ok((StatusCode::CREATED, Json(json!({ "results": results }))))
|
Ok((StatusCode::CREATED, Json(json!({ "results": results }))))
|
||||||
@@ -265,6 +324,9 @@ struct Row {
|
|||||||
mail_sent_at: Option<OffsetDateTime>,
|
mail_sent_at: Option<OffsetDateTime>,
|
||||||
mail_failed_at: Option<OffsetDateTime>,
|
mail_failed_at: Option<OffsetDateTime>,
|
||||||
mail_error: Option<String>,
|
mail_error: Option<String>,
|
||||||
|
promo_code: Option<String>,
|
||||||
|
promo_package: Option<String>,
|
||||||
|
promo_redeemed_at: Option<OffsetDateTime>,
|
||||||
}
|
}
|
||||||
|
|
||||||
fn status(accepted: Option<OffsetDateTime>, revoked: Option<OffsetDateTime>, expires: OffsetDateTime) -> &'static str {
|
fn status(accepted: Option<OffsetDateTime>, revoked: Option<OffsetDateTime>, expires: OffsetDateTime) -> &'static str {
|
||||||
@@ -285,8 +347,10 @@ pub async fn list(State(state): St, _admin: AdminUser) -> ApiResult<Json<Value>>
|
|||||||
"SELECT i.id, i.email, i.message, i.locale, i.created_at, i.expires_at, i.sent_count, i.last_sent_at, \
|
"SELECT i.id, i.email, i.message, i.locale, i.created_at, i.expires_at, i.sent_count, i.last_sent_at, \
|
||||||
i.accepted_at, i.revoked_at, inv.display_name AS invited_by_name, \
|
i.accepted_at, i.revoked_at, inv.display_name AS invited_by_name, \
|
||||||
coalesce(acc.display_name, acc.email) AS accepted_by_name, \
|
coalesce(acc.display_name, acc.email) AS accepted_by_name, \
|
||||||
m.created_at AS mail_created_at, m.sent_at AS mail_sent_at, m.failed_at AS mail_failed_at, m.last_error AS mail_error \
|
m.created_at AS mail_created_at, m.sent_at AS mail_sent_at, m.failed_at AS mail_failed_at, m.last_error AS mail_error, \
|
||||||
|
pc.code AS promo_code, pc.package AS promo_package, pc.redeemed_at AS promo_redeemed_at \
|
||||||
FROM invitations i \
|
FROM invitations i \
|
||||||
|
LEFT JOIN promo_codes pc ON pc.invitation_id = i.id \
|
||||||
LEFT JOIN users inv ON inv.id = i.invited_by \
|
LEFT JOIN users inv ON inv.id = i.invited_by \
|
||||||
LEFT JOIN users acc ON acc.id = i.accepted_by \
|
LEFT JOIN users acc ON acc.id = i.accepted_by \
|
||||||
LEFT JOIN LATERAL (SELECT created_at, sent_at, failed_at, last_error FROM email_outbox \
|
LEFT JOIN LATERAL (SELECT created_at, sent_at, failed_at, last_error FROM email_outbox \
|
||||||
@@ -318,6 +382,12 @@ pub async fn list(State(state): St, _admin: AdminUser) -> ApiResult<Json<Value>>
|
|||||||
"accepted_at": rfc3339_opt(r.accepted_at), "accepted_by": r.accepted_by_name,
|
"accepted_at": rfc3339_opt(r.accepted_at), "accepted_by": r.accepted_by_name,
|
||||||
"invited_by": r.invited_by_name,
|
"invited_by": r.invited_by_name,
|
||||||
"mail": mail, "mail_error": r.mail_error, "can_resend": can_resend,
|
"mail": mail, "mail_error": r.mail_error, "can_resend": can_resend,
|
||||||
|
"package": r.promo_package.as_deref().map(|p| json!({
|
||||||
|
"id": p,
|
||||||
|
"name": packages::find(p).map(|p| p.name),
|
||||||
|
"code": r.promo_code.as_deref().map(super::promo::display),
|
||||||
|
"redeemed_at": rfc3339_opt(r.promo_redeemed_at),
|
||||||
|
})),
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
.collect();
|
.collect();
|
||||||
@@ -391,22 +461,34 @@ pub async fn resend(
|
|||||||
.execute(&mut *tx)
|
.execute(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
let inviter = admin.user.display_name.clone();
|
let inviter = admin.user.display_name.clone();
|
||||||
let url = send(&state, &mut tx, id, &email, &locale, inviter.as_deref(), message.as_deref(), expires).await?;
|
let gift = gift_of(&mut tx, id).await?;
|
||||||
|
let url =
|
||||||
|
send(&state, &mut tx, id, &email, &locale, inviter.as_deref(), message.as_deref(), expires, gift.as_ref())
|
||||||
|
.await?;
|
||||||
tx.commit().await?;
|
tx.commit().await?;
|
||||||
Ok(Json(json!({ "id": id, "url": url, "expires_at": rfc3339(expires) })))
|
Ok(Json(json!({ "id": id, "url": url, "expires_at": rfc3339(expires) })))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn revoke(State(state): St, _admin: AdminUser, WithRejection(Path(id), _): IdPath) -> ApiResult<StatusCode> {
|
pub async fn revoke(State(state): St, _admin: AdminUser, WithRejection(Path(id), _): IdPath) -> ApiResult<StatusCode> {
|
||||||
|
let mut tx = state.db.begin().await?;
|
||||||
let done = sqlx::query(
|
let done = sqlx::query(
|
||||||
"UPDATE invitations SET revoked_at = now() WHERE id = $1 AND accepted_at IS NULL AND revoked_at IS NULL",
|
"UPDATE invitations SET revoked_at = now() WHERE id = $1 AND accepted_at IS NULL AND revoked_at IS NULL",
|
||||||
)
|
)
|
||||||
.bind(id)
|
.bind(id)
|
||||||
.execute(&state.db)
|
.execute(&mut *tx)
|
||||||
.await?
|
.await?
|
||||||
.rows_affected();
|
.rows_affected();
|
||||||
if done == 0 {
|
if done == 0 {
|
||||||
return Err(ApiError::NotFound("open invitation"));
|
return Err(ApiError::NotFound("open invitation"));
|
||||||
}
|
}
|
||||||
|
// Its package goes with it.
|
||||||
|
sqlx::query(
|
||||||
|
"UPDATE promo_codes SET revoked_at = now() WHERE invitation_id = $1 AND redeemed_at IS NULL AND revoked_at IS NULL",
|
||||||
|
)
|
||||||
|
.bind(id)
|
||||||
|
.execute(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
tx.commit().await?;
|
||||||
Ok(StatusCode::NO_CONTENT)
|
Ok(StatusCode::NO_CONTENT)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -427,6 +509,8 @@ pub struct PreviewRequest {
|
|||||||
/// Also send it to the admin's own address.
|
/// Also send it to the admin's own address.
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
send_to_me: bool,
|
send_to_me: bool,
|
||||||
|
/// Show it with this package (a sample code).
|
||||||
|
package: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The invitation e-mail with sample links (they lead nowhere), and
|
/// The invitation e-mail with sample links (they lead nowhere), and
|
||||||
@@ -438,12 +522,17 @@ pub async fn preview(
|
|||||||
) -> ApiResult<Json<Value>> {
|
) -> ApiResult<Json<Value>> {
|
||||||
let message = clean_message(req.message)?;
|
let message = clean_message(req.message)?;
|
||||||
let locale = validate_locale(&state, req.locale.as_deref())?;
|
let locale = validate_locale(&state, req.locale.as_deref())?;
|
||||||
|
let gift = match req.package.as_deref().filter(|p| !p.is_empty()) {
|
||||||
|
Some(id) => Some(("MINT-AKOD-XXXX".to_string(), packages::find(id).ok_or(ApiError::NotFound("package"))?.name)),
|
||||||
|
None => None,
|
||||||
|
};
|
||||||
let payload = payload(
|
let payload = payload(
|
||||||
&state,
|
&state,
|
||||||
"minta",
|
"minta",
|
||||||
admin.user.display_name.as_deref(),
|
admin.user.display_name.as_deref(),
|
||||||
message.as_deref(),
|
message.as_deref(),
|
||||||
OffsetDateTime::now_utc() + INVITATION_TTL,
|
OffsetDateTime::now_utc() + INVITATION_TTL,
|
||||||
|
gift.as_ref(),
|
||||||
);
|
);
|
||||||
let mail = email_templates::render("invitation", &locale, &payload)
|
let mail = email_templates::render("invitation", &locale, &payload)
|
||||||
.map_err(|e| ApiError::Internal(format!("invitation template: {e}")))?;
|
.map_err(|e| ApiError::Internal(format!("invitation template: {e}")))?;
|
||||||
@@ -498,8 +587,13 @@ pub async fn unsubscribe(
|
|||||||
WithRejection(Query(q), _): WithRejection<Query<TokenQuery>, ApiError>,
|
WithRejection(Query(q), _): WithRejection<Query<TokenQuery>, ApiError>,
|
||||||
) -> ApiResult<Json<Value>> {
|
) -> ApiResult<Json<Value>> {
|
||||||
let mut tx = state.db.begin().await?;
|
let mut tx = state.db.begin().await?;
|
||||||
|
// The link of a site invitation, of a "how compatible are we?" one a user
|
||||||
|
// had us e-mail, or of the waitlist confirmation.
|
||||||
let email: Option<String> = sqlx::query_scalar(
|
let email: Option<String> = sqlx::query_scalar(
|
||||||
"SELECT i.email FROM invitation_tokens t JOIN invitations i ON i.id = t.invitation_id WHERE t.token_hash = $1",
|
"SELECT i.email FROM invitation_tokens t JOIN invitations i ON i.id = t.invitation_id WHERE t.token_hash = $1 \
|
||||||
|
UNION ALL SELECT invitee_email FROM synastry_invites WHERE token_hash = $1 AND invitee_email IS NOT NULL \
|
||||||
|
UNION ALL SELECT email FROM waitlist WHERE token_hash = $1 \
|
||||||
|
LIMIT 1",
|
||||||
)
|
)
|
||||||
.bind(db::token_hash(q.token.trim()))
|
.bind(db::token_hash(q.token.trim()))
|
||||||
.fetch_optional(&mut *tx)
|
.fetch_optional(&mut *tx)
|
||||||
@@ -515,6 +609,7 @@ pub async fn unsubscribe(
|
|||||||
.bind(&email)
|
.bind(&email)
|
||||||
.execute(&mut *tx)
|
.execute(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
|
sqlx::query("DELETE FROM waitlist WHERE email = $1").bind(&email).execute(&mut *tx).await?;
|
||||||
tx.commit().await?;
|
tx.commit().await?;
|
||||||
Ok(Json(json!({ "unsubscribed": true })))
|
Ok(Json(json!({ "unsubscribed": true })))
|
||||||
}
|
}
|
||||||
@@ -529,19 +624,46 @@ pub struct WaitlistRequest {
|
|||||||
/// Joins the waitlist. Always answers the same, so it does not reveal who has an account.
|
/// Joins the waitlist. Always answers the same, so it does not reveal who has an account.
|
||||||
pub async fn join_waitlist(
|
pub async fn join_waitlist(
|
||||||
State(state): St,
|
State(state): St,
|
||||||
|
headers: axum::http::HeaderMap,
|
||||||
WithRejection(Json(req), _): Body<WaitlistRequest>,
|
WithRejection(Json(req), _): Body<WaitlistRequest>,
|
||||||
) -> ApiResult<(StatusCode, Json<Value>)> {
|
) -> ApiResult<(StatusCode, Json<Value>)> {
|
||||||
let email = normalize_email(&req.email)?;
|
let email = normalize_email(&req.email)?;
|
||||||
let locale = validate_locale(&state, req.locale.as_deref())?;
|
let locale = validate_locale(&state, req.locale.as_deref())?;
|
||||||
sqlx::query(
|
// Every sign-up sends an e-mail: a few per address, so the form cannot be used to flood someone.
|
||||||
"INSERT INTO waitlist (email, locale) SELECT $1, $2 \
|
let ip = headers
|
||||||
|
.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}");
|
||||||
|
state.login_limiter.check(&key)?;
|
||||||
|
let token = db::new_token();
|
||||||
|
let mut tx = state.db.begin().await?;
|
||||||
|
let added = sqlx::query(
|
||||||
|
"INSERT INTO waitlist (email, locale, token_hash) SELECT $1, $2, $3 \
|
||||||
WHERE NOT EXISTS (SELECT 1 FROM users WHERE email = $1) \
|
WHERE NOT EXISTS (SELECT 1 FROM users WHERE email = $1) \
|
||||||
AND (SELECT count(*) FROM waitlist) < 10000 \
|
AND (SELECT count(*) FROM waitlist) < 10000 \
|
||||||
ON CONFLICT DO NOTHING",
|
ON CONFLICT DO NOTHING",
|
||||||
)
|
)
|
||||||
.bind(&email)
|
.bind(&email)
|
||||||
.bind(&locale)
|
.bind(&locale)
|
||||||
.execute(&state.db)
|
.bind(db::token_hash(&token))
|
||||||
.await?;
|
.execute(&mut *tx)
|
||||||
|
.await?
|
||||||
|
.rows_affected()
|
||||||
|
== 1;
|
||||||
|
// A confirmation, once, unless the address asked for no more mail from us.
|
||||||
|
if added && !opted_out(&mut tx, &email).await? {
|
||||||
|
let (_, unsubscribe_url, unsubscribe_post_url) = links(&state, &token);
|
||||||
|
let payload = json!({
|
||||||
|
"url": state.config.public_base_url,
|
||||||
|
"unsubscribe_url": unsubscribe_url,
|
||||||
|
"unsubscribe_post_url": unsubscribe_post_url,
|
||||||
|
});
|
||||||
|
queue_email_to(&mut tx, None, &email, "waitlist_joined", &locale, payload).await?;
|
||||||
|
state.login_limiter.failed(&key);
|
||||||
|
}
|
||||||
|
tx.commit().await?;
|
||||||
Ok((StatusCode::ACCEPTED, Json(json!({ "ok": true }))))
|
Ok((StatusCode::ACCEPTED, Json(json!({ "ok": true }))))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,100 @@
|
|||||||
|
//! The user's invoices: the list, and the PDF fetched from Billingo on
|
||||||
|
//! download (we keep every invoice detail, but not the PDF itself).
|
||||||
|
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
|
use axum::Json;
|
||||||
|
use axum::extract::{Path, State};
|
||||||
|
use axum::http::{HeaderValue, header};
|
||||||
|
use axum::response::{IntoResponse, Response};
|
||||||
|
use axum_extra::extract::WithRejection;
|
||||||
|
use serde_json::{Value, json};
|
||||||
|
use time::{Date, OffsetDateTime};
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
use super::{IdPath, St};
|
||||||
|
use crate::auth::AuthUser;
|
||||||
|
use crate::error::{ApiError, ApiResult};
|
||||||
|
|
||||||
|
type Row = (Uuid, String, Option<String>, Option<Date>, String, i32, OffsetDateTime);
|
||||||
|
|
||||||
|
/// The user's invoices, newest first. Until Billingo has issued one it is
|
||||||
|
/// shown as being prepared.
|
||||||
|
pub async fn list(State(state): St, auth: AuthUser) -> ApiResult<Json<Value>> {
|
||||||
|
let rows: Vec<Row> = sqlx::query_as(
|
||||||
|
"SELECT id, status, invoice_number, invoice_date, item_name, gross_huf, created_at FROM invoices \
|
||||||
|
WHERE user_id = $1 ORDER BY created_at DESC",
|
||||||
|
)
|
||||||
|
.bind(auth.id())
|
||||||
|
.fetch_all(&state.db)
|
||||||
|
.await?;
|
||||||
|
let invoices: Vec<Value> = rows
|
||||||
|
.into_iter()
|
||||||
|
.map(|(id, status, number, date, item, gross, created_at)| {
|
||||||
|
json!({
|
||||||
|
"id": id,
|
||||||
|
"ready": status == "issued",
|
||||||
|
"invoice_number": number,
|
||||||
|
"invoice_date": date.map(|d| d.to_string()),
|
||||||
|
"item": item,
|
||||||
|
"gross_huf": gross,
|
||||||
|
"paid_at": created_at.format(&time::format_description::well_known::Rfc3339).ok(),
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
Ok(Json(json!({ "invoices": invoices })))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The invoice's PDF, from Billingo.
|
||||||
|
pub async fn pdf(State(state): St, auth: AuthUser, WithRejection(Path(id), _): IdPath) -> ApiResult<Response> {
|
||||||
|
let row: Option<(i64, Option<String>)> = sqlx::query_as(
|
||||||
|
"SELECT billingo_document_id, invoice_number FROM invoices \
|
||||||
|
WHERE id = $1 AND user_id = $2 AND status = 'issued' AND billingo_document_id IS NOT NULL",
|
||||||
|
)
|
||||||
|
.bind(id)
|
||||||
|
.bind(auth.id())
|
||||||
|
.fetch_optional(&state.db)
|
||||||
|
.await?;
|
||||||
|
let (document, number) = row.ok_or(ApiError::NotFound("invoice"))?;
|
||||||
|
let unavailable = |detail: String| {
|
||||||
|
tracing::error!(error = %detail, invoice = %id, "invoice download failed");
|
||||||
|
ApiError::conflict("invoice_unavailable", "A számla letöltése most nem sikerült. Próbáld újra pár perc múlva.")
|
||||||
|
};
|
||||||
|
let key =
|
||||||
|
state.config.billingo_api_key.as_deref().ok_or_else(|| unavailable("BILLINGO_API_KEY is not set".into()))?;
|
||||||
|
let http = reqwest::Client::builder().timeout(Duration::from_secs(30)).build().expect("static configuration");
|
||||||
|
let res = http
|
||||||
|
.get(format!("{}/documents/{document}/download", state.config.billingo_api_url))
|
||||||
|
.header("X-API-KEY", key)
|
||||||
|
.header("Accept", "application/pdf")
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.map_err(|e| unavailable(e.to_string()))?;
|
||||||
|
let is_pdf = res
|
||||||
|
.headers()
|
||||||
|
.get(header::CONTENT_TYPE)
|
||||||
|
.and_then(|v| v.to_str().ok())
|
||||||
|
.is_some_and(|t| t.starts_with("application/pdf"));
|
||||||
|
if !res.status().is_success() || !is_pdf {
|
||||||
|
let status = res.status();
|
||||||
|
let body = res.text().await.unwrap_or_default();
|
||||||
|
return Err(unavailable(format!("HTTP {status}: {}", body.chars().take(300).collect::<String>())));
|
||||||
|
}
|
||||||
|
let bytes = res.bytes().await.map_err(|e| unavailable(e.to_string()))?;
|
||||||
|
let name: String = number
|
||||||
|
.unwrap_or_else(|| document.to_string())
|
||||||
|
.chars()
|
||||||
|
.map(|c| if c.is_ascii_alphanumeric() || c == '-' { c } else { '-' })
|
||||||
|
.collect();
|
||||||
|
let disposition = HeaderValue::from_str(&format!("attachment; filename=\"szamla-{name}.pdf\""))
|
||||||
|
.unwrap_or_else(|_| HeaderValue::from_static("attachment; filename=\"szamla.pdf\""));
|
||||||
|
Ok((
|
||||||
|
[
|
||||||
|
(header::CONTENT_TYPE, HeaderValue::from_static("application/pdf")),
|
||||||
|
(header::CONTENT_DISPOSITION, disposition),
|
||||||
|
(header::CACHE_CONTROL, HeaderValue::from_static("private, no-store")),
|
||||||
|
],
|
||||||
|
bytes,
|
||||||
|
)
|
||||||
|
.into_response())
|
||||||
|
}
|
||||||
@@ -0,0 +1,150 @@
|
|||||||
|
//! Admin: the analyses and answers being written or waiting in the queue,
|
||||||
|
//! and restarting them with the models set now (e.g. after switching away
|
||||||
|
//! from a slow model). A restarted attempt that is still running in the
|
||||||
|
//! worker is dropped there and cannot overwrite the new one.
|
||||||
|
|
||||||
|
use std::collections::HashMap;
|
||||||
|
|
||||||
|
use analysis_prompt::Kind;
|
||||||
|
use axum::Json;
|
||||||
|
use axum::extract::State;
|
||||||
|
use axum_extra::extract::WithRejection;
|
||||||
|
use serde::Deserialize;
|
||||||
|
use serde_json::{Value, json};
|
||||||
|
use time::OffsetDateTime;
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
use super::analyses::{find_analysis, target_hash, versions};
|
||||||
|
use super::{Body, St};
|
||||||
|
use crate::AppState;
|
||||||
|
use crate::auth::AdminUser;
|
||||||
|
use crate::error::ApiResult;
|
||||||
|
use crate::models::{Function, models_for};
|
||||||
|
use crate::views::{rfc3339, rfc3339_opt};
|
||||||
|
|
||||||
|
type JobRow = (
|
||||||
|
Uuid,
|
||||||
|
String,
|
||||||
|
String,
|
||||||
|
String,
|
||||||
|
Option<String>,
|
||||||
|
bool,
|
||||||
|
i32,
|
||||||
|
Option<OffsetDateTime>,
|
||||||
|
OffsetDateTime,
|
||||||
|
OffsetDateTime,
|
||||||
|
Option<String>,
|
||||||
|
);
|
||||||
|
|
||||||
|
const COLUMNS: &str =
|
||||||
|
"id, kind, status, model, fallback_model, on_fallback, attempts, started_at, created_at, next_attempt_at, error";
|
||||||
|
|
||||||
|
async fn open_jobs(state: &AppState) -> Result<Vec<(&'static str, JobRow)>, sqlx::Error> {
|
||||||
|
let analyses: Vec<JobRow> = sqlx::query_as(&format!(
|
||||||
|
"SELECT {COLUMNS} FROM analyses WHERE status IN ('pending', 'running') ORDER BY created_at"
|
||||||
|
))
|
||||||
|
.fetch_all(&state.db)
|
||||||
|
.await?;
|
||||||
|
let questions: Vec<JobRow> = sqlx::query_as(
|
||||||
|
"SELECT id, 'question', status, model, fallback_model, on_fallback, attempts, started_at, created_at, \
|
||||||
|
next_attempt_at, error \
|
||||||
|
FROM questions WHERE status IN ('pending', 'running') ORDER BY created_at",
|
||||||
|
)
|
||||||
|
.fetch_all(&state.db)
|
||||||
|
.await?;
|
||||||
|
Ok(analyses.into_iter().map(|r| ("analysis", r)).chain(questions.into_iter().map(|r| ("question", r))).collect())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn list(State(state): St, _admin: AdminUser) -> ApiResult<Json<Value>> {
|
||||||
|
Ok(Json(json!({ "jobs": views(&state).await? })))
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn views(state: &AppState) -> Result<Vec<Value>, sqlx::Error> {
|
||||||
|
// The models a restart would use, per function.
|
||||||
|
let mut next: HashMap<&'static str, (String, Option<String>)> = HashMap::new();
|
||||||
|
for (function, kind) in
|
||||||
|
[(Function::Summary, Kind::Summary), (Function::Analysis, Kind::Natal), (Function::Question, Kind::Question)]
|
||||||
|
{
|
||||||
|
next.insert(function.key(), models_for(state, kind).await?);
|
||||||
|
}
|
||||||
|
Ok(open_jobs(state)
|
||||||
|
.await?
|
||||||
|
.into_iter()
|
||||||
|
.map(|(table, (id, kind, status, model, fallback, on_fallback, attempts, started, created, due, error))| {
|
||||||
|
let function = Function::of(Kind::parse(&kind).unwrap_or(Kind::Natal)).key();
|
||||||
|
let (next_model, next_fallback) = &next[function];
|
||||||
|
let active = if on_fallback { fallback.clone().unwrap_or_else(|| model.clone()) } else { model.clone() };
|
||||||
|
json!({
|
||||||
|
"id": id, "type": table, "kind": kind, "status": status, "model": active, "on_fallback": on_fallback,
|
||||||
|
"next_model": next_model, "next_fallback": next_fallback, "attempts": attempts,
|
||||||
|
"started_at": rfc3339_opt(started), "created_at": rfc3339(created), "next_attempt_at": rfc3339(due),
|
||||||
|
"error": error,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.collect())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct Restart {
|
||||||
|
/// The jobs to restart; all open ones when missing.
|
||||||
|
ids: Option<Vec<Uuid>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn restart(
|
||||||
|
State(state): St,
|
||||||
|
AdminUser(admin): AdminUser,
|
||||||
|
WithRejection(Json(req), _): Body<Restart>,
|
||||||
|
) -> ApiResult<Json<Value>> {
|
||||||
|
let mut restarted = 0;
|
||||||
|
for (table, (id, kind, ..)) in open_jobs(&state).await? {
|
||||||
|
if req.ids.as_ref().is_some_and(|ids| !ids.contains(&id)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let done = if table == "question" {
|
||||||
|
let language: String = sqlx::query_scalar("SELECT language FROM questions WHERE id = $1")
|
||||||
|
.bind(id)
|
||||||
|
.fetch_one(&state.db)
|
||||||
|
.await?;
|
||||||
|
let (model, fallback, prompt_version) = super::questions::model_and_version(&state, &language).await?;
|
||||||
|
sqlx::query(
|
||||||
|
"UPDATE questions SET status = 'pending', model = $2, fallback_model = $3, on_fallback = false, \
|
||||||
|
prompt_version = $4, attempts = 0, next_attempt_at = now(), started_at = NULL, error = NULL, \
|
||||||
|
requested_at = now() \
|
||||||
|
WHERE id = $1 AND status IN ('pending', 'running')",
|
||||||
|
)
|
||||||
|
.bind(id)
|
||||||
|
.bind(&model)
|
||||||
|
.bind(&fallback)
|
||||||
|
.bind(&prompt_version)
|
||||||
|
.execute(&state.db)
|
||||||
|
.await?
|
||||||
|
.rows_affected()
|
||||||
|
} else {
|
||||||
|
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) = models_for(&state, Kind::parse(&kind).unwrap_or(Kind::Natal)).await?;
|
||||||
|
let (cache_key, prompt_version) = versions(&state, &kind, &hash, &model, &row.language).await?;
|
||||||
|
sqlx::query(
|
||||||
|
"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, \
|
||||||
|
error = NULL, requested_at = now() \
|
||||||
|
WHERE id = $1 AND status IN ('pending', 'running')",
|
||||||
|
)
|
||||||
|
.bind(id)
|
||||||
|
.bind(&model)
|
||||||
|
.bind(&fallback)
|
||||||
|
.bind(&cache_key)
|
||||||
|
.bind(&prompt_version)
|
||||||
|
.execute(&state.db)
|
||||||
|
.await?
|
||||||
|
.rows_affected()
|
||||||
|
};
|
||||||
|
restarted += done;
|
||||||
|
}
|
||||||
|
if restarted > 0 {
|
||||||
|
sqlx::query("SELECT pg_notify('analyses', '')").execute(&state.db).await?;
|
||||||
|
}
|
||||||
|
tracing::info!(admin = %admin.id(), restarted, "generations restarted");
|
||||||
|
Ok(Json(json!({ "restarted": restarted, "jobs": views(&state).await? })))
|
||||||
|
}
|
||||||
@@ -10,10 +10,14 @@ mod admin;
|
|||||||
mod analyses;
|
mod analyses;
|
||||||
mod auth;
|
mod auth;
|
||||||
mod charts;
|
mod charts;
|
||||||
|
mod errors;
|
||||||
mod forecasts;
|
mod forecasts;
|
||||||
mod invitations;
|
mod invitations;
|
||||||
|
mod invoices_user;
|
||||||
|
mod jobs;
|
||||||
mod models;
|
mod models;
|
||||||
mod payments;
|
mod payments;
|
||||||
|
mod promo;
|
||||||
mod prompts;
|
mod prompts;
|
||||||
mod questions;
|
mod questions;
|
||||||
mod recalculate;
|
mod recalculate;
|
||||||
@@ -74,6 +78,11 @@ pub fn router(state: Arc<AppState>) -> Router {
|
|||||||
.route("/v1/me/export", get(account::export))
|
.route("/v1/me/export", get(account::export))
|
||||||
.route("/v1/credits", get(account::credits))
|
.route("/v1/credits", get(account::credits))
|
||||||
.route("/v1/payments/mock", post(payments::mock))
|
.route("/v1/payments/mock", post(payments::mock))
|
||||||
|
.route("/v1/payments/checkout", post(payments::checkout))
|
||||||
|
.route("/v1/payments/checkout/{id}", get(payments::checkout_status))
|
||||||
|
.route("/v1/payments/stripe/webhook", post(payments::stripe_webhook))
|
||||||
|
.route("/v1/invoices", get(invoices_user::list))
|
||||||
|
.route("/v1/invoices/{id}/pdf", get(invoices_user::pdf))
|
||||||
// charts
|
// charts
|
||||||
.route("/v1/charts", get(charts::list).post(charts::create))
|
.route("/v1/charts", get(charts::list).post(charts::create))
|
||||||
.route("/v1/charts/{id}", get(charts::get_one).patch(charts::update).delete(charts::remove))
|
.route("/v1/charts/{id}", get(charts::get_one).patch(charts::update).delete(charts::remove))
|
||||||
@@ -94,10 +103,14 @@ pub fn router(state: Arc<AppState>) -> Router {
|
|||||||
.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))
|
||||||
// sharing
|
// sharing
|
||||||
|
.route("/v1/promo-codes/redeem", post(promo::redeem))
|
||||||
|
.route("/v1/admin/promo-codes", get(promo::list).post(promo::create))
|
||||||
|
.route("/v1/admin/promo-codes/{id}/revoke", post(promo::revoke))
|
||||||
.route("/v1/shares", get(shares::list).post(shares::create))
|
.route("/v1/shares", get(shares::list).post(shares::create))
|
||||||
.route("/v1/shares/{id}", delete(shares::revoke))
|
.route("/v1/shares/{id}", delete(shares::revoke))
|
||||||
// public, no login
|
// public, no login
|
||||||
.route("/v1/public/shares/{slug}", get(shares::public_view))
|
.route("/v1/public/shares/{slug}", get(shares::public_view))
|
||||||
|
.route("/v1/public/shares/{slug}/visit", post(shares::visit))
|
||||||
.route("/v1/public/invites/{token}", get(synastries::public_invite))
|
.route("/v1/public/invites/{token}", get(synastries::public_invite))
|
||||||
.route("/v1/public/invitations/unsubscribe", post(invitations::unsubscribe))
|
.route("/v1/public/invitations/unsubscribe", post(invitations::unsubscribe))
|
||||||
.route("/v1/public/invitations/{token}", get(invitations::public_view))
|
.route("/v1/public/invitations/{token}", get(invitations::public_view))
|
||||||
@@ -116,6 +129,9 @@ pub fn router(state: Arc<AppState>) -> Router {
|
|||||||
.route("/v1/admin/prompts/{kind}/{language}", axum::routing::put(prompts::save))
|
.route("/v1/admin/prompts/{kind}/{language}", axum::routing::put(prompts::save))
|
||||||
.route("/v1/admin/prompts/{kind}/{language}/preview", post(prompts::start_preview))
|
.route("/v1/admin/prompts/{kind}/{language}/preview", post(prompts::start_preview))
|
||||||
.route("/v1/admin/previews/{id}", get(prompts::get_preview))
|
.route("/v1/admin/previews/{id}", get(prompts::get_preview))
|
||||||
|
.route("/v1/admin/errors", get(errors::list))
|
||||||
|
.route("/v1/admin/jobs", get(jobs::list))
|
||||||
|
.route("/v1/admin/jobs/restart", post(jobs::restart))
|
||||||
.route("/v1/admin/models", get(models::list))
|
.route("/v1/admin/models", get(models::list))
|
||||||
.route("/v1/admin/models/catalog", get(models::catalog))
|
.route("/v1/admin/models/catalog", get(models::catalog))
|
||||||
.route("/v1/admin/models/{kind}", axum::routing::put(models::save))
|
.route("/v1/admin/models/{kind}", axum::routing::put(models::save))
|
||||||
@@ -151,7 +167,16 @@ async fn public_config(State(state): St) -> Json<Value> {
|
|||||||
"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() },
|
||||||
"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(),
|
||||||
|
"user_invites": c.user_invites,
|
||||||
|
"referral_rewards": c.referral_rewards,
|
||||||
"signup_mode": c.signup_mode.as_str(),
|
"signup_mode": c.signup_mode.as_str(),
|
||||||
"password_min_length": crate::auth::MIN_PASSWORD_LEN,
|
"password_min_length": crate::auth::MIN_PASSWORD_LEN,
|
||||||
}))
|
}))
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
//! Admin: which model writes which kind of analysis, chosen from the models
|
//! Admin: which model writes the analyses and forecasts, the answers to
|
||||||
//! OpenRouter offers. A change applies to analyses requested after it.
|
//! questions and the short summary, chosen from the models OpenRouter offers.
|
||||||
|
//! A change applies to texts requested after it.
|
||||||
|
|
||||||
use analysis_prompt::Kind;
|
|
||||||
use axum::Json;
|
use axum::Json;
|
||||||
use axum::extract::{Path, State};
|
use axum::extract::{Path, State};
|
||||||
use axum_extra::extract::WithRejection;
|
use axum_extra::extract::WithRejection;
|
||||||
@@ -13,7 +13,7 @@ use super::{Body, St};
|
|||||||
use crate::AppState;
|
use crate::AppState;
|
||||||
use crate::auth::AdminUser;
|
use crate::auth::AdminUser;
|
||||||
use crate::error::{ApiError, ApiResult};
|
use crate::error::{ApiError, ApiResult};
|
||||||
use crate::models::default_model;
|
use crate::models::{Function, default_model};
|
||||||
use crate::views::rfc3339;
|
use crate::views::rfc3339;
|
||||||
|
|
||||||
fn catalog_error(e: String) -> ApiError {
|
fn catalog_error(e: String) -> ApiError {
|
||||||
@@ -23,27 +23,38 @@ fn catalog_error(e: String) -> ApiError {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn entry(state: &AppState, kind: Kind) -> Result<Value, sqlx::Error> {
|
async fn entry(state: &AppState, function: Function) -> Result<Value, sqlx::Error> {
|
||||||
let chosen: Option<(String, OffsetDateTime, Option<String>)> = sqlx::query_as(
|
let chosen: Option<(String, OffsetDateTime, Option<String>)> = sqlx::query_as(
|
||||||
"SELECT m.model, m.updated_at, u.email FROM model_settings m LEFT JOIN users u ON u.id = m.updated_by \
|
"SELECT m.model, m.updated_at, u.email FROM model_settings m LEFT JOIN users u ON u.id = m.updated_by \
|
||||||
WHERE m.kind = $1",
|
WHERE m.kind = $1",
|
||||||
)
|
)
|
||||||
.bind(kind.as_str())
|
.bind(function.key())
|
||||||
.fetch_optional(&state.db)
|
.fetch_optional(&state.db)
|
||||||
.await?;
|
.await?;
|
||||||
// Typical size of this kind of analysis, from the latest ones: for the cost estimate.
|
// Typical size of the latest texts, for the cost estimate, and how often
|
||||||
let (input, output, samples): (Option<f64>, Option<f64>, i64) = sqlx::query_as(
|
// the default model had to take over in the last 30 days.
|
||||||
|
let (table, kinds) = match function {
|
||||||
|
Function::Summary => ("analyses", "kind = 'summary'"),
|
||||||
|
Function::Analysis => ("analyses", "kind IN ('natal', 'synastry', 'forecast')"),
|
||||||
|
Function::Question => ("questions", "true"),
|
||||||
|
};
|
||||||
|
let (input, output, samples): (Option<f64>, Option<f64>, i64) = sqlx::query_as(&format!(
|
||||||
"SELECT avg(input_tokens)::float8, avg(output_tokens)::float8, count(*) FROM ( \
|
"SELECT avg(input_tokens)::float8, avg(output_tokens)::float8, count(*) FROM ( \
|
||||||
SELECT input_tokens, output_tokens FROM analyses \
|
SELECT input_tokens, output_tokens FROM {table} \
|
||||||
WHERE kind = $1 AND status = 'done' AND input_tokens IS NOT NULL AND output_tokens IS NOT NULL \
|
WHERE {kinds} AND status = 'done' AND input_tokens IS NOT NULL AND output_tokens IS NOT NULL \
|
||||||
ORDER BY completed_at DESC LIMIT 50) recent",
|
ORDER BY completed_at DESC LIMIT 50) recent"
|
||||||
)
|
))
|
||||||
.bind(kind.as_str())
|
|
||||||
.fetch_one(&state.db)
|
.fetch_one(&state.db)
|
||||||
.await?;
|
.await?;
|
||||||
let default = default_model(state, kind);
|
let (fallbacks, finished): (i64, i64) = sqlx::query_as(&format!(
|
||||||
|
"SELECT count(*) FILTER (WHERE on_fallback), count(*) FROM {table} \
|
||||||
|
WHERE {kinds} AND status IN ('done', 'failed') AND completed_at > now() - interval '30 days'"
|
||||||
|
))
|
||||||
|
.fetch_one(&state.db)
|
||||||
|
.await?;
|
||||||
|
let default = default_model(state, function);
|
||||||
Ok(json!({
|
Ok(json!({
|
||||||
"kind": kind.as_str(),
|
"kind": function.key(),
|
||||||
"model": chosen.as_ref().map_or(default, |c| c.0.as_str()),
|
"model": chosen.as_ref().map_or(default, |c| c.0.as_str()),
|
||||||
"default": default,
|
"default": default,
|
||||||
"custom": chosen.is_some(),
|
"custom": chosen.is_some(),
|
||||||
@@ -52,13 +63,15 @@ async fn entry(state: &AppState, kind: Kind) -> Result<Value, sqlx::Error> {
|
|||||||
"avg_input_tokens": input,
|
"avg_input_tokens": input,
|
||||||
"avg_output_tokens": output,
|
"avg_output_tokens": output,
|
||||||
"samples": samples,
|
"samples": samples,
|
||||||
|
"fallbacks_30d": fallbacks,
|
||||||
|
"finished_30d": finished,
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn list(State(state): St, _admin: AdminUser) -> ApiResult<Json<Value>> {
|
pub async fn list(State(state): St, _admin: AdminUser) -> ApiResult<Json<Value>> {
|
||||||
let mut functions = Vec::new();
|
let mut functions = Vec::new();
|
||||||
for kind in Kind::ANALYSES {
|
for function in Function::ALL {
|
||||||
functions.push(entry(&state, kind).await?);
|
functions.push(entry(&state, function).await?);
|
||||||
}
|
}
|
||||||
Ok(Json(json!({ "functions": functions })))
|
Ok(Json(json!({ "functions": functions })))
|
||||||
}
|
}
|
||||||
@@ -81,9 +94,9 @@ pub async fn save(
|
|||||||
WithRejection(Path(kind), _): WithRejection<Path<String>, ApiError>,
|
WithRejection(Path(kind), _): WithRejection<Path<String>, ApiError>,
|
||||||
WithRejection(Json(req), _): Body<SaveModel>,
|
WithRejection(Json(req), _): Body<SaveModel>,
|
||||||
) -> ApiResult<Json<Value>> {
|
) -> ApiResult<Json<Value>> {
|
||||||
let kind = Kind::parse(&kind).ok_or(ApiError::NotFound("function"))?;
|
let function = Function::parse(&kind).ok_or(ApiError::NotFound("function"))?;
|
||||||
match req.model.as_deref().map(str::trim) {
|
match req.model.as_deref().map(str::trim) {
|
||||||
Some(model) if model != default_model(&state, kind) => {
|
Some(model) if model != default_model(&state, function) => {
|
||||||
let models = state.models.models().await.map_err(catalog_error)?;
|
let models = state.models.models().await.map_err(catalog_error)?;
|
||||||
if !models.iter().any(|m| m.id == model) {
|
if !models.iter().any(|m| m.id == model) {
|
||||||
return Err(ApiError::BadRequest(format!(
|
return Err(ApiError::BadRequest(format!(
|
||||||
@@ -95,16 +108,16 @@ pub async fn save(
|
|||||||
ON CONFLICT (kind) DO UPDATE SET model = EXCLUDED.model, updated_by = EXCLUDED.updated_by, \
|
ON CONFLICT (kind) DO UPDATE SET model = EXCLUDED.model, updated_by = EXCLUDED.updated_by, \
|
||||||
updated_at = now()",
|
updated_at = now()",
|
||||||
)
|
)
|
||||||
.bind(kind.as_str())
|
.bind(function.key())
|
||||||
.bind(model)
|
.bind(model)
|
||||||
.bind(admin.id())
|
.bind(admin.id())
|
||||||
.execute(&state.db)
|
.execute(&state.db)
|
||||||
.await?;
|
.await?;
|
||||||
}
|
}
|
||||||
_ => {
|
_ => {
|
||||||
sqlx::query("DELETE FROM model_settings WHERE kind = $1").bind(kind.as_str()).execute(&state.db).await?;
|
sqlx::query("DELETE FROM model_settings WHERE kind = $1").bind(function.key()).execute(&state.db).await?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
tracing::info!(admin = %admin.id(), kind = kind.as_str(), "analysis model changed");
|
tracing::info!(admin = %admin.id(), function = function.key(), "model changed");
|
||||||
Ok(Json(entry(&state, kind).await?))
|
Ok(Json(entry(&state, function).await?))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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) {
|
||||||
@@ -65,3 +73,201 @@ 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,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Only admins can buy through Stripe: until purchases open, and always with a
|
||||||
|
/// test key (nobody gets packages with Stripe's test cards, nobody types a
|
||||||
|
/// real card into a test page).
|
||||||
|
pub fn admins_only(config: &crate::config::Config) -> bool {
|
||||||
|
!config.purchases_open || config.stripe.as_ref().is_some_and(StripeConfig::test_mode)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Stripe, if this user may pay through it.
|
||||||
|
fn stripe_for<'a>(state: &'a AppState, auth: &AuthUser) -> Result<&'a StripeConfig, ApiError> {
|
||||||
|
let config = state.config.stripe.as_ref().ok_or(ApiError::NotFound("payment method"))?;
|
||||||
|
if admins_only(&state.config) && !auth.user.has_role(Role::Admin) {
|
||||||
|
return Err(ApiError::Forbidden("purchases are being tested; they open soon".into()));
|
||||||
|
}
|
||||||
|
Ok(config)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The page to come back to after paying: a plain path of this site, without
|
||||||
|
/// its query (anything else: the packages page).
|
||||||
|
fn return_path(path: Option<&str>) -> String {
|
||||||
|
let path = path.unwrap_or("").split(['?', '#']).next().unwrap_or("");
|
||||||
|
let plain = path.starts_with('/')
|
||||||
|
&& !path.starts_with("//")
|
||||||
|
&& path.len() <= 200
|
||||||
|
&& path.chars().all(|c| c.is_ascii_alphanumeric() || "/-_.".contains(c));
|
||||||
|
if plain { path.to_string() } else { "/csomagok".to_string() }
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct CheckoutRequest {
|
||||||
|
package: String,
|
||||||
|
/// The page the purchase started on (default: the packages page).
|
||||||
|
return_path: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Starts paying for a package: returns the address of Stripe's payment page.
|
||||||
|
pub async fn checkout(
|
||||||
|
State(state): St,
|
||||||
|
auth: AuthUser,
|
||||||
|
WithRejection(Json(req), _): Body<CheckoutRequest>,
|
||||||
|
) -> ApiResult<Json<Value>> {
|
||||||
|
let config = stripe_for(&state, &auth)?;
|
||||||
|
let package = packages::find(&req.package).ok_or(ApiError::NotFound("package"))?;
|
||||||
|
let back = format!("{}{}", state.config.public_base_url, return_path(req.return_path.as_deref()));
|
||||||
|
let field = |k: &str, v: &str| (k.to_string(), v.to_string());
|
||||||
|
let form = vec![
|
||||||
|
field("mode", "payment"),
|
||||||
|
field("locale", "hu"),
|
||||||
|
field("client_reference_id", &auth.id().to_string()),
|
||||||
|
field("customer_email", &auth.user.email),
|
||||||
|
// Name and address go on the invoice; a company also gives its name
|
||||||
|
// and tax number ("I'm buying as a business").
|
||||||
|
field("billing_address_collection", "required"),
|
||||||
|
field("tax_id_collection[enabled]", "true"),
|
||||||
|
field("customer_creation", "always"),
|
||||||
|
field("line_items[0][quantity]", "1"),
|
||||||
|
field("line_items[0][price_data][currency]", "huf"),
|
||||||
|
// Stripe counts forints in fillér.
|
||||||
|
field("line_items[0][price_data][unit_amount]", &(package.price_huf * 100).to_string()),
|
||||||
|
field("line_items[0][price_data][product_data][name]", &format!("Sorsfonalak – {}", package.name)),
|
||||||
|
field("line_items[0][price_data][product_data][description]", package.tagline),
|
||||||
|
field("metadata[package]", package.id),
|
||||||
|
field("metadata[user_id]", &auth.id().to_string()),
|
||||||
|
field("payment_intent_data[description]", &format!("Sorsfonalak – {}", package.name)),
|
||||||
|
field("payment_intent_data[metadata][package]", package.id),
|
||||||
|
field("success_url", &format!("{back}?fizetes={{CHECKOUT_SESSION_ID}}")),
|
||||||
|
field("cancel_url", &format!("{back}?fizetes=megszakitva")),
|
||||||
|
];
|
||||||
|
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?;
|
||||||
|
let row: Option<(Option<Uuid>, String, i32, Option<OffsetDateTime>)> = 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,
|
||||||
|
};
|
||||||
|
sqlx::query(
|
||||||
|
"UPDATE stripe_checkouts SET completed_at = now(), order_id = $2, payment_intent = $3, amount_huf = $4, \
|
||||||
|
customer = $5 WHERE id = $1",
|
||||||
|
)
|
||||||
|
.bind(&session.id)
|
||||||
|
.bind(order)
|
||||||
|
.bind(&session.payment_intent)
|
||||||
|
.bind(amount_huf.map(|a| a as i32))
|
||||||
|
.bind(&session.customer_details)
|
||||||
|
.execute(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
let buyer = invoices::Buyer::from_stripe(session.customer_details.as_ref().unwrap_or(&Value::Null), None);
|
||||||
|
let item = format!("Sorsfonalak – {}", package.name);
|
||||||
|
let gross = amount_huf.unwrap_or(i64::from(price_huf));
|
||||||
|
invoices::queue(&mut tx, &session.id, user_id, &buyer, &item, gross, state.config.invoice_vat).await?;
|
||||||
|
tx.commit().await?;
|
||||||
|
tracing::info!(user = ?user_id, package = %package_id, session = %session.id, "package paid");
|
||||||
|
Ok(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Where a payment stands (the return page asks until it is paid). If the
|
||||||
|
/// webhook has not arrived yet, Stripe is asked directly.
|
||||||
|
pub async fn checkout_status(
|
||||||
|
State(state): St,
|
||||||
|
auth: AuthUser,
|
||||||
|
WithRejection(Path(id), _): WithRejection<Path<String>, ApiError>,
|
||||||
|
) -> ApiResult<Json<Value>> {
|
||||||
|
let row: Option<(String, Option<OffsetDateTime>)> =
|
||||||
|
sqlx::query_as("SELECT package, completed_at FROM stripe_checkouts WHERE id = $1 AND user_id = $2")
|
||||||
|
.bind(&id)
|
||||||
|
.bind(auth.id())
|
||||||
|
.fetch_optional(&state.db)
|
||||||
|
.await?;
|
||||||
|
let (package_id, completed_at) = row.ok_or(ApiError::NotFound("payment"))?;
|
||||||
|
let mut status = if completed_at.is_some() { "paid" } else { "pending" };
|
||||||
|
if let (None, Some(config)) = (completed_at, &state.config.stripe) {
|
||||||
|
let session = state.stripe.get_session(config, &id).await?;
|
||||||
|
if session.paid() {
|
||||||
|
complete(&state, &session).await?;
|
||||||
|
status = "paid";
|
||||||
|
} else if session.status.as_deref() == Some("expired") {
|
||||||
|
status = "expired";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(Json(json!({
|
||||||
|
"status": status,
|
||||||
|
"package": package_id,
|
||||||
|
"name": packages::find(&package_id).map(|p| p.name),
|
||||||
|
})))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Stripe's webhook (Developers → Webhooks; event `checkout.session.completed`,
|
||||||
|
/// for delayed methods also `checkout.session.async_payment_succeeded`).
|
||||||
|
pub async fn stripe_webhook(State(state): St, headers: HeaderMap, body: Bytes) -> ApiResult<Json<Value>> {
|
||||||
|
let secret = state
|
||||||
|
.config
|
||||||
|
.stripe
|
||||||
|
.as_ref()
|
||||||
|
.and_then(|c| c.webhook_secret.as_deref())
|
||||||
|
.ok_or(ApiError::NotFound("payment method"))?;
|
||||||
|
let signature = headers.get("stripe-signature").and_then(|v| v.to_str().ok()).unwrap_or("");
|
||||||
|
let now = OffsetDateTime::now_utc().unix_timestamp();
|
||||||
|
if !stripe::verify_signature(secret, signature, &body, now) {
|
||||||
|
tracing::warn!("stripe webhook with a bad signature");
|
||||||
|
return Err(ApiError::BadRequest("invalid signature".into()));
|
||||||
|
}
|
||||||
|
let mut event: Value = serde_json::from_slice(&body).map_err(|e| ApiError::BadRequest(e.to_string()))?;
|
||||||
|
let kind = event["type"].as_str().unwrap_or_default();
|
||||||
|
if matches!(kind, "checkout.session.completed" | "checkout.session.async_payment_succeeded") {
|
||||||
|
let session: stripe::Session = serde_json::from_value(event["data"]["object"].take())
|
||||||
|
.map_err(|e| ApiError::BadRequest(format!("checkout session: {e}")))?;
|
||||||
|
if session.paid() && !complete(&state, &session).await? {
|
||||||
|
tracing::warn!(session = %session.id, "stripe webhook for a session we did not start");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(Json(json!({ "received": true })))
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,277 @@
|
|||||||
|
//! Promo codes. An admin makes a batch for one package (or one comes with an
|
||||||
|
//! invitation); a logged-in user redeems a code once. Redeeming fills the
|
||||||
|
//! user's units up to the package's amounts (used ones come back, more than
|
||||||
|
//! that stays), recorded as an order with source `promo`. Unused codes can be
|
||||||
|
//! withdrawn. Failed redemptions are rate limited per user, so codes cannot
|
||||||
|
//! be guessed.
|
||||||
|
|
||||||
|
use axum::Json;
|
||||||
|
use axum::extract::{Path, Query, State};
|
||||||
|
use axum::http::StatusCode;
|
||||||
|
use axum_extra::extract::WithRejection;
|
||||||
|
use serde::Deserialize;
|
||||||
|
use serde_json::{Value, json};
|
||||||
|
use time::OffsetDateTime;
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
use super::payments::holdings;
|
||||||
|
use super::{Body, IdPath, St};
|
||||||
|
use crate::auth::{AdminUser, AuthUser};
|
||||||
|
use crate::credits::Unit;
|
||||||
|
use crate::error::{ApiError, ApiResult};
|
||||||
|
use crate::packages;
|
||||||
|
use crate::views::{rfc3339, rfc3339_opt};
|
||||||
|
|
||||||
|
/// Characters of a code (12 × ~5 bits: not guessable within the rate limit).
|
||||||
|
const CODE_LEN: usize = 12;
|
||||||
|
const MAX_BATCH: i64 = 500;
|
||||||
|
|
||||||
|
/// `ABCD-EFGH-JKLM`: the stored code in groups of four.
|
||||||
|
pub(super) fn display(code: &str) -> String {
|
||||||
|
code.as_bytes().chunks(4).map(|c| String::from_utf8_lossy(c).into_owned()).collect::<Vec<_>>().join("-")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// What the user typed, as stored: upper case, without spaces and dashes.
|
||||||
|
fn normalize(input: &str) -> String {
|
||||||
|
input.chars().filter(|c| c.is_ascii_alphanumeric()).map(|c| c.to_ascii_uppercase()).collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Makes one code for a package inside the caller's transaction; returns the stored code.
|
||||||
|
pub(super) async fn new_code(
|
||||||
|
tx: &mut sqlx::PgConnection,
|
||||||
|
package: &str,
|
||||||
|
note: Option<&str>,
|
||||||
|
created_by: Option<Uuid>,
|
||||||
|
invitation_id: Option<Uuid>,
|
||||||
|
) -> Result<String, sqlx::Error> {
|
||||||
|
loop {
|
||||||
|
let code = db::random_code(CODE_LEN);
|
||||||
|
// A clash is practically impossible; another code is drawn if it happens.
|
||||||
|
let inserted = sqlx::query(
|
||||||
|
"INSERT INTO promo_codes (id, code, package, note, created_by, invitation_id) \
|
||||||
|
VALUES ($1, $2, $3, $4, $5, $6) ON CONFLICT (code) DO NOTHING",
|
||||||
|
)
|
||||||
|
.bind(Uuid::now_v7())
|
||||||
|
.bind(&code)
|
||||||
|
.bind(package)
|
||||||
|
.bind(note)
|
||||||
|
.bind(created_by)
|
||||||
|
.bind(invitation_id)
|
||||||
|
.execute(&mut *tx)
|
||||||
|
.await?
|
||||||
|
.rows_affected();
|
||||||
|
if inserted == 1 {
|
||||||
|
return Ok(code);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Redeems an open code for the user inside the caller's transaction (the
|
||||||
|
/// code row must be locked). Returns what was added; `None`: the user already
|
||||||
|
/// has everything the package gives, the code stays open.
|
||||||
|
pub(super) async fn redeem_code(
|
||||||
|
tx: &mut sqlx::PgConnection,
|
||||||
|
code_id: Uuid,
|
||||||
|
code: &str,
|
||||||
|
package: &packages::Package,
|
||||||
|
user_id: Uuid,
|
||||||
|
persons_left: Option<i64>,
|
||||||
|
) -> Result<Option<Vec<(Unit, i64)>>, ApiError> {
|
||||||
|
let note = format!("promo code {}", display(code));
|
||||||
|
let Some((order, added)) = packages::top_up(tx, user_id, package, persons_left, Some(¬e)).await? else {
|
||||||
|
return Ok(None);
|
||||||
|
};
|
||||||
|
sqlx::query("UPDATE promo_codes SET redeemed_by = $2, redeemed_at = now(), order_id = $3 WHERE id = $1")
|
||||||
|
.bind(code_id)
|
||||||
|
.bind(user_id)
|
||||||
|
.bind(order)
|
||||||
|
.execute(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
Ok(Some(added))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct NewCodes {
|
||||||
|
package: String,
|
||||||
|
count: i64,
|
||||||
|
note: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Admin: makes `count` new codes for a package.
|
||||||
|
pub async fn create(
|
||||||
|
State(state): St,
|
||||||
|
admin: AdminUser,
|
||||||
|
WithRejection(Json(req), _): Body<NewCodes>,
|
||||||
|
) -> ApiResult<(StatusCode, Json<Value>)> {
|
||||||
|
let package = packages::find(&req.package).ok_or(ApiError::NotFound("package"))?;
|
||||||
|
if !(1..=MAX_BATCH).contains(&req.count) {
|
||||||
|
return Err(ApiError::BadRequest(format!("count must be 1 to {MAX_BATCH}")));
|
||||||
|
}
|
||||||
|
let note = req.note.map(|n| n.trim().chars().take(200).collect::<String>()).filter(|n| !n.is_empty());
|
||||||
|
let mut tx = state.db.begin().await?;
|
||||||
|
let mut codes = Vec::new();
|
||||||
|
for _ in 0..req.count {
|
||||||
|
codes.push(display(&new_code(&mut tx, package.id, note.as_deref(), Some(admin.0.id()), None).await?));
|
||||||
|
}
|
||||||
|
tx.commit().await?;
|
||||||
|
tracing::info!(admin = %admin.0.id(), package = package.id, count = codes.len(), "promo codes created");
|
||||||
|
Ok((StatusCode::CREATED, Json(json!({ "package": package.id, "note": note, "codes": codes }))))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct CodeQuery {
|
||||||
|
/// `unused` (default), `used`, `revoked` or `all`.
|
||||||
|
status: Option<String>,
|
||||||
|
package: Option<String>,
|
||||||
|
/// Part of the code, the note or the redeemer's e-mail.
|
||||||
|
q: Option<String>,
|
||||||
|
limit: Option<i64>,
|
||||||
|
offset: Option<i64>,
|
||||||
|
}
|
||||||
|
|
||||||
|
type Row = (
|
||||||
|
Uuid,
|
||||||
|
String,
|
||||||
|
String,
|
||||||
|
Option<String>,
|
||||||
|
OffsetDateTime,
|
||||||
|
Option<OffsetDateTime>,
|
||||||
|
Option<OffsetDateTime>,
|
||||||
|
Option<String>,
|
||||||
|
Option<String>,
|
||||||
|
);
|
||||||
|
|
||||||
|
/// Admin: the codes, newest first, filtered.
|
||||||
|
pub async fn list(
|
||||||
|
State(state): St,
|
||||||
|
_admin: AdminUser,
|
||||||
|
WithRejection(Query(query), _): WithRejection<Query<CodeQuery>, ApiError>,
|
||||||
|
) -> ApiResult<Json<Value>> {
|
||||||
|
let status = query.status.as_deref().unwrap_or("unused");
|
||||||
|
let condition = match status {
|
||||||
|
"unused" => "p.redeemed_at IS NULL AND p.revoked_at IS NULL",
|
||||||
|
"used" => "p.redeemed_at IS NOT NULL",
|
||||||
|
"revoked" => "p.revoked_at IS NOT NULL",
|
||||||
|
"all" => "true",
|
||||||
|
other => return Err(ApiError::BadRequest(format!("unknown status '{other}'"))),
|
||||||
|
};
|
||||||
|
let limit = query.limit.unwrap_or(100).clamp(1, 500);
|
||||||
|
let offset = query.offset.unwrap_or(0).max(0);
|
||||||
|
let package = query.package.filter(|p| !p.is_empty());
|
||||||
|
let search = query.q.map(|q| q.trim().to_string()).filter(|q| !q.is_empty());
|
||||||
|
// A code is searched for without its dashes.
|
||||||
|
let code_search = search.as_deref().map(normalize).filter(|c| !c.is_empty());
|
||||||
|
let filter = format!(
|
||||||
|
"FROM promo_codes p LEFT JOIN users u ON u.id = p.redeemed_by \
|
||||||
|
WHERE {condition} AND ($1::text IS NULL OR p.package = $1) \
|
||||||
|
AND ($2::text IS NULL OR p.note ILIKE '%' || $2 || '%' OR u.email ILIKE '%' || $2 || '%' \
|
||||||
|
OR ($3::text IS NOT NULL AND p.code LIKE '%' || $3 || '%'))"
|
||||||
|
);
|
||||||
|
let rows: Vec<Row> = sqlx::query_as(&format!(
|
||||||
|
"SELECT p.id, p.code, p.package, p.note, p.created_at, p.redeemed_at, p.revoked_at, u.email, u.display_name \
|
||||||
|
{filter} ORDER BY p.created_at DESC, p.id DESC LIMIT $4 OFFSET $5"
|
||||||
|
))
|
||||||
|
.bind(&package)
|
||||||
|
.bind(&search)
|
||||||
|
.bind(&code_search)
|
||||||
|
.bind(limit)
|
||||||
|
.bind(offset)
|
||||||
|
.fetch_all(&state.db)
|
||||||
|
.await?;
|
||||||
|
let total: i64 = sqlx::query_scalar(&format!("SELECT count(*) {filter}"))
|
||||||
|
.bind(&package)
|
||||||
|
.bind(&search)
|
||||||
|
.bind(&code_search)
|
||||||
|
.fetch_one(&state.db)
|
||||||
|
.await?;
|
||||||
|
let codes: Vec<Value> = rows
|
||||||
|
.into_iter()
|
||||||
|
.map(|(id, code, package, note, created, redeemed, revoked, email, name)| {
|
||||||
|
json!({
|
||||||
|
"id": id,
|
||||||
|
"code": display(&code),
|
||||||
|
"package": package,
|
||||||
|
"package_name": packages::find(&package).map(|p| p.name),
|
||||||
|
"note": note,
|
||||||
|
"created_at": rfc3339(created),
|
||||||
|
"redeemed_at": rfc3339_opt(redeemed),
|
||||||
|
"revoked_at": rfc3339_opt(revoked),
|
||||||
|
"redeemed_by": email.map(|e| json!({ "email": e, "name": name })),
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
Ok(Json(json!({ "codes": codes, "total": total, "status": status, "limit": limit, "offset": offset })))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Admin: withdraws an unused code.
|
||||||
|
pub async fn revoke(State(state): St, _admin: AdminUser, WithRejection(Path(id), _): IdPath) -> ApiResult<StatusCode> {
|
||||||
|
let result = sqlx::query(
|
||||||
|
"UPDATE promo_codes SET revoked_at = now() WHERE id = $1 AND redeemed_at IS NULL AND revoked_at IS NULL",
|
||||||
|
)
|
||||||
|
.bind(id)
|
||||||
|
.execute(&state.db)
|
||||||
|
.await?;
|
||||||
|
if result.rows_affected() == 0 {
|
||||||
|
return Err(ApiError::conflict("promo_not_open", "Csak fel nem használt kódot lehet visszavonni."));
|
||||||
|
}
|
||||||
|
Ok(StatusCode::NO_CONTENT)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct Redeem {
|
||||||
|
code: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Redeems a code: the user gets its package. One use per code.
|
||||||
|
pub async fn redeem(
|
||||||
|
State(state): St,
|
||||||
|
auth: AuthUser,
|
||||||
|
WithRejection(Json(req), _): Body<Redeem>,
|
||||||
|
) -> ApiResult<Json<Value>> {
|
||||||
|
let key = format!("promo:{}", auth.id());
|
||||||
|
state.login_limiter.check(&key)?;
|
||||||
|
let code = normalize(&req.code);
|
||||||
|
let mut tx = state.db.begin().await?;
|
||||||
|
let found: Option<(Uuid, String, Option<OffsetDateTime>, Option<OffsetDateTime>)> =
|
||||||
|
sqlx::query_as("SELECT id, package, redeemed_at, revoked_at FROM promo_codes WHERE code = $1 FOR UPDATE")
|
||||||
|
.bind(&code)
|
||||||
|
.fetch_optional(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
let (id, package_id) = match found {
|
||||||
|
Some((id, package, None, None)) => (id, package),
|
||||||
|
Some((_, _, Some(_), _)) => {
|
||||||
|
state.login_limiter.failed(&key);
|
||||||
|
return Err(ApiError::conflict("promo_used", "Ezt a kódot már felhasználták."));
|
||||||
|
}
|
||||||
|
Some((_, _, _, Some(_))) => {
|
||||||
|
state.login_limiter.failed(&key);
|
||||||
|
return Err(ApiError::conflict("promo_revoked", "Ez a kód már nem érvényes."));
|
||||||
|
}
|
||||||
|
None => {
|
||||||
|
state.login_limiter.failed(&key);
|
||||||
|
return Err(ApiError::conflict("promo_unknown", "Nincs ilyen kód. Ellenőrizd, hogy pontosan írtad-e be."));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let package = packages::find(&package_id).ok_or(ApiError::NotFound("package"))?;
|
||||||
|
sqlx::query("SELECT id FROM users WHERE id = $1 FOR UPDATE").bind(auth.id()).execute(&mut *tx).await?;
|
||||||
|
let persons_left = crate::persons::slots(&mut tx, &auth, state.config.free_person_slots).await?.left();
|
||||||
|
let Some(added) = redeem_code(&mut tx, id, &code, package, auth.id(), persons_left).await? else {
|
||||||
|
return Err(ApiError::conflict(
|
||||||
|
"promo_nothing_to_add",
|
||||||
|
format!(
|
||||||
|
"Most is megvan minden, amit ez a kód adna ({}), ezért nem váltottuk be. Tedd el későbbre.",
|
||||||
|
package.name
|
||||||
|
),
|
||||||
|
));
|
||||||
|
};
|
||||||
|
tx.commit().await?;
|
||||||
|
state.login_limiter.succeeded(&key);
|
||||||
|
tracing::info!(user = %auth.id(), package = package.id, "promo code redeemed");
|
||||||
|
let mut body = holdings(&state, &auth).await?;
|
||||||
|
body["package"] = json!({ "id": package.id, "name": package.name });
|
||||||
|
body["added"] = added.iter().map(|(unit, n)| (unit.as_str().to_string(), json!(n))).collect();
|
||||||
|
Ok(Json(body))
|
||||||
|
}
|
||||||
@@ -1,7 +1,8 @@
|
|||||||
//! Questions about a finished detailed analysis: a natal chart analysis or a
|
//! Questions about a finished detailed analysis: a natal chart analysis, a
|
||||||
//! yearly forecast. Each question uses a `question` unit (admins ask for
|
//! relationship (synastry) analysis or a yearly forecast. On a comparison both
|
||||||
//! free). The worker answers with the model that wrote the analysis, seeing
|
//! people see the questions and answers. Each question uses a `question` unit (admins ask for
|
||||||
//! the chart data, the analysis and the earlier questions about it.
|
//! free). The worker answers with the question model of the admin page,
|
||||||
|
//! seeing the chart data, the analysis and the earlier questions about it.
|
||||||
|
|
||||||
use analysis_prompt::{Kind, QUESTION_MAX_CHARS};
|
use analysis_prompt::{Kind, QUESTION_MAX_CHARS};
|
||||||
use axum::Json;
|
use axum::Json;
|
||||||
@@ -23,7 +24,7 @@ use crate::error::{ApiError, ApiResult};
|
|||||||
use crate::views::{rfc3339, rfc3339_opt};
|
use crate::views::{rfc3339, rfc3339_opt};
|
||||||
|
|
||||||
/// The analyses that can be asked about.
|
/// The analyses that can be asked about.
|
||||||
const ASKABLE: [&str; 2] = ["natal", "forecast"];
|
const ASKABLE: [&str; 3] = ["natal", "synastry", "forecast"];
|
||||||
/// A safety cap per analysis.
|
/// A safety cap per analysis.
|
||||||
const MAX_PER_ANALYSIS: i64 = 100;
|
const MAX_PER_ANALYSIS: i64 = 100;
|
||||||
|
|
||||||
@@ -39,10 +40,13 @@ pub struct QuestionRow {
|
|||||||
pub credits_charged: i32,
|
pub credits_charged: i32,
|
||||||
pub created_at: OffsetDateTime,
|
pub created_at: OffsetDateTime,
|
||||||
pub completed_at: Option<OffsetDateTime>,
|
pub completed_at: Option<OffsetDateTime>,
|
||||||
|
pub attempts: i32,
|
||||||
|
pub next_attempt_at: OffsetDateTime,
|
||||||
|
pub requested_at: OffsetDateTime,
|
||||||
}
|
}
|
||||||
|
|
||||||
const QUESTION_COLUMNS: &str =
|
const QUESTION_COLUMNS: &str = "id, analysis_id, question, status, answer, error, credits_charged, created_at, \
|
||||||
"id, analysis_id, question, status, answer, error, credits_charged, created_at, completed_at";
|
completed_at, attempts, next_attempt_at, requested_at";
|
||||||
|
|
||||||
impl QuestionRow {
|
impl QuestionRow {
|
||||||
pub fn view(&self) -> Value {
|
pub fn view(&self) -> Value {
|
||||||
@@ -56,6 +60,9 @@ impl QuestionRow {
|
|||||||
"credits_charged": self.credits_charged,
|
"credits_charged": self.credits_charged,
|
||||||
"created_at": rfc3339(self.created_at),
|
"created_at": rfc3339(self.created_at),
|
||||||
"completed_at": rfc3339_opt(self.completed_at),
|
"completed_at": rfc3339_opt(self.completed_at),
|
||||||
|
"attempts": self.attempts,
|
||||||
|
"next_attempt_at": rfc3339(self.next_attempt_at),
|
||||||
|
"requested_at": rfc3339(self.requested_at),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -64,21 +71,19 @@ async fn find_question(db: &PgPool, id: Uuid) -> Result<Option<QuestionRow>, sql
|
|||||||
sqlx::query_as(&format!("SELECT {QUESTION_COLUMNS} FROM questions WHERE id = $1")).bind(id).fetch_optional(db).await
|
sqlx::query_as(&format!("SELECT {QUESTION_COLUMNS} FROM questions WHERE id = $1")).bind(id).fetch_optional(db).await
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The model of the analysis (questions are answered by the same model) and
|
/// The question model (and its fallback) and the version of the question
|
||||||
/// the prompt version of the question prompt in force.
|
/// prompt in force.
|
||||||
async fn model_and_version(
|
pub(super) async fn model_and_version(
|
||||||
state: &crate::AppState,
|
state: &crate::AppState,
|
||||||
analysis_id: Uuid,
|
|
||||||
language: &str,
|
language: &str,
|
||||||
) -> Result<(String, String), sqlx::Error> {
|
) -> Result<(String, Option<String>, String), sqlx::Error> {
|
||||||
let model: String =
|
let (model, fallback) = crate::models::models_for(state, Kind::Question).await?;
|
||||||
sqlx::query_scalar("SELECT model FROM analyses WHERE id = $1").bind(analysis_id).fetch_one(&state.db).await?;
|
|
||||||
let base = &state.config.prompt_version;
|
let base = &state.config.prompt_version;
|
||||||
let version = match super::prompts::current_revision(&state.db, Kind::Question.as_str(), language).await? {
|
let version = match super::prompts::current_revision(&state.db, Kind::Question.as_str(), language).await? {
|
||||||
Some(id) => format!("{base}-r{id}"),
|
Some(id) => format!("{base}-r{id}"),
|
||||||
None => base.clone(),
|
None => base.clone(),
|
||||||
};
|
};
|
||||||
Ok((model, version))
|
Ok((model, fallback, version))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn list(State(state): St, auth: AuthUser, WithRejection(Path(id), _): IdPath) -> ApiResult<Json<Value>> {
|
pub async fn list(State(state): St, auth: AuthUser, WithRejection(Path(id), _): IdPath) -> ApiResult<Json<Value>> {
|
||||||
@@ -111,7 +116,7 @@ pub async fn ask(
|
|||||||
return Err(ApiError::NotFound("analysis"));
|
return Err(ApiError::NotFound("analysis"));
|
||||||
}
|
}
|
||||||
if !ASKABLE.contains(&analysis.kind.as_str()) {
|
if !ASKABLE.contains(&analysis.kind.as_str()) {
|
||||||
return Err(ApiError::BadRequest("questions can be asked about a natal analysis or a forecast".into()));
|
return Err(ApiError::BadRequest("questions can be asked about a detailed analysis or a forecast".into()));
|
||||||
}
|
}
|
||||||
if analysis.status != "done" {
|
if analysis.status != "done" {
|
||||||
return Err(ApiError::conflict("analysis_not_ready", "Az elemzés még nem készült el."));
|
return Err(ApiError::conflict("analysis_not_ready", "Az elemzés még nem készült el."));
|
||||||
@@ -141,12 +146,13 @@ pub async fn ask(
|
|||||||
}
|
}
|
||||||
|
|
||||||
let admin = auth.user.has_role(Role::Admin);
|
let admin = auth.user.has_role(Role::Admin);
|
||||||
let (model, prompt_version) = model_and_version(&state, id, &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?;
|
||||||
let row: QuestionRow = sqlx::query_as(&format!(
|
let row: QuestionRow = sqlx::query_as(&format!(
|
||||||
"INSERT INTO questions (id, analysis_id, asked_by, question, language, model, prompt_version, credits_charged) \
|
"INSERT INTO questions (id, analysis_id, asked_by, question, language, model, prompt_version, credits_charged, \
|
||||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8) RETURNING {QUESTION_COLUMNS}"
|
fallback_model) \
|
||||||
|
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9) RETURNING {QUESTION_COLUMNS}"
|
||||||
))
|
))
|
||||||
.bind(question_id)
|
.bind(question_id)
|
||||||
.bind(id)
|
.bind(id)
|
||||||
@@ -156,6 +162,7 @@ pub async fn ask(
|
|||||||
.bind(&model)
|
.bind(&model)
|
||||||
.bind(&prompt_version)
|
.bind(&prompt_version)
|
||||||
.bind(i32::from(!admin))
|
.bind(i32::from(!admin))
|
||||||
|
.bind(&fallback)
|
||||||
.fetch_one(&mut *tx)
|
.fetch_one(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
if !admin {
|
if !admin {
|
||||||
@@ -175,26 +182,30 @@ pub async fn get_one(State(state): St, auth: AuthUser, WithRejection(Path(id), _
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Admin: answers a question again in place, with the current question prompt
|
/// Admin: answers a question again in place, with the current question prompt
|
||||||
/// and the analysis's model. Nobody is charged.
|
/// and model. Nobody is charged.
|
||||||
pub async fn regenerate(
|
pub async fn regenerate(
|
||||||
State(state): St,
|
State(state): St,
|
||||||
_admin: AdminUser,
|
_admin: AdminUser,
|
||||||
WithRejection(Path(id), _): IdPath,
|
WithRejection(Path(id), _): IdPath,
|
||||||
) -> ApiResult<Json<Value>> {
|
) -> ApiResult<Json<Value>> {
|
||||||
let row = find_question(&state.db, id).await?.ok_or(ApiError::NotFound("question"))?;
|
let language: String = sqlx::query_scalar("SELECT language FROM questions WHERE id = $1")
|
||||||
let language: String =
|
.bind(id)
|
||||||
sqlx::query_scalar("SELECT language FROM questions WHERE id = $1").bind(id).fetch_one(&state.db).await?;
|
.fetch_optional(&state.db)
|
||||||
let (model, prompt_version) = model_and_version(&state, row.analysis_id, &language).await?;
|
.await?
|
||||||
|
.ok_or(ApiError::NotFound("question"))?;
|
||||||
|
let (model, fallback, prompt_version) = model_and_version(&state, &language).await?;
|
||||||
let mut tx = state.db.begin().await?;
|
let mut tx = state.db.begin().await?;
|
||||||
let row: QuestionRow = sqlx::query_as(&format!(
|
let row: QuestionRow = sqlx::query_as(&format!(
|
||||||
"UPDATE questions SET status = 'pending', answer = NULL, error = NULL, model_used = NULL, input_tokens = NULL, \
|
"UPDATE questions SET status = 'pending', answer = NULL, error = NULL, model_used = NULL, input_tokens = NULL, \
|
||||||
output_tokens = NULL, cost_usd = NULL, attempts = 0, next_attempt_at = now(), started_at = NULL, \
|
output_tokens = NULL, cost_usd = NULL, attempts = 0, next_attempt_at = now(), started_at = NULL, \
|
||||||
completed_at = NULL, model = $2, prompt_version = $3 \
|
completed_at = NULL, model = $2, prompt_version = $3, fallback_model = $4, on_fallback = false, \
|
||||||
|
requested_at = now() \
|
||||||
WHERE id = $1 AND status IN ('done', 'failed') RETURNING {QUESTION_COLUMNS}"
|
WHERE id = $1 AND status IN ('done', 'failed') RETURNING {QUESTION_COLUMNS}"
|
||||||
))
|
))
|
||||||
.bind(id)
|
.bind(id)
|
||||||
.bind(&model)
|
.bind(&model)
|
||||||
.bind(&prompt_version)
|
.bind(&prompt_version)
|
||||||
|
.bind(&fallback)
|
||||||
.fetch_optional(&mut *tx)
|
.fetch_optional(&mut *tx)
|
||||||
.await?
|
.await?
|
||||||
.ok_or_else(|| ApiError::conflict("question_in_progress", "Erre a kérdésre éppen készül a válasz."))?;
|
.ok_or_else(|| ApiError::conflict("question_in_progress", "Erre a kérdésre éppen készül a válasz."))?;
|
||||||
|
|||||||
@@ -1,13 +1,26 @@
|
|||||||
//! Public sharing links. Creating and revoking a link needs login; opening
|
//! Public sharing links. Creating and revoking a link needs login; opening
|
||||||
//! one (`GET /v1/public/shares/{slug}`) does not. The public view never
|
//! one (`GET /v1/public/shares/{slug}`) does not. The public view never
|
||||||
//! contains birth data unless the owner allowed it for their own chart.
|
//! contains birth data unless the owner allowed it for their own chart.
|
||||||
|
//! A shared chart comes with its newest short summary (the share page and
|
||||||
|
//! its preview image show both). Sharing the same thing again returns the
|
||||||
|
//! link that is already open.
|
||||||
|
//!
|
||||||
|
//! Reading a share writes nothing, so robots cost no database writes. The
|
||||||
|
//! share page reports a visit from the visitor's browser
|
||||||
|
//! (`POST /v1/public/shares/{slug}/visit`): it is counted unless it comes
|
||||||
|
//! from a robot or from the sharer (logged in, or from the address the link
|
||||||
|
//! was made at). The sharer's first such visit earns one free question, once
|
||||||
|
//! per user: a click proves little. A natal analysis is earned by bringing a
|
||||||
|
//! new user (`REFERRAL_REWARDS`): someone who signs up from a shared link and
|
||||||
|
//! makes their own chart, at most [`REFERRAL_LIMIT`] times.
|
||||||
|
|
||||||
use axum::Json;
|
use axum::Json;
|
||||||
use axum::extract::{Path, State};
|
use axum::extract::{Path, State};
|
||||||
use axum::http::StatusCode;
|
use axum::http::{HeaderMap, StatusCode};
|
||||||
use axum_extra::extract::WithRejection;
|
use axum_extra::extract::WithRejection;
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use serde_json::{Value, json};
|
use serde_json::{Value, json};
|
||||||
|
use sha2::{Digest, Sha256};
|
||||||
use sqlx::PgPool;
|
use sqlx::PgPool;
|
||||||
use time::OffsetDateTime;
|
use time::OffsetDateTime;
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
@@ -16,7 +29,7 @@ use super::analyses::{can_see, find_analysis};
|
|||||||
use super::charts::{ChartRow, find_chart, owned_chart};
|
use super::charts::{ChartRow, find_chart, owned_chart};
|
||||||
use super::synastries::{VisibleSynastry, load_synastry, visible_synastry};
|
use super::synastries::{VisibleSynastry, load_synastry, visible_synastry};
|
||||||
use super::{Body, IdPath, St};
|
use super::{Body, IdPath, St};
|
||||||
use crate::auth::AuthUser;
|
use crate::auth::{AuthUser, user_agent};
|
||||||
use crate::error::{ApiError, ApiResult};
|
use crate::error::{ApiError, ApiResult};
|
||||||
use crate::views::{public_chart, rfc3339, rfc3339_opt};
|
use crate::views::{public_chart, rfc3339, rfc3339_opt};
|
||||||
|
|
||||||
@@ -42,10 +55,53 @@ struct ShareRow {
|
|||||||
view_count: i64,
|
view_count: i64,
|
||||||
created_at: OffsetDateTime,
|
created_at: OffsetDateTime,
|
||||||
revoked_at: Option<OffsetDateTime>,
|
revoked_at: Option<OffsetDateTime>,
|
||||||
|
owner_ip_hash: Option<Vec<u8>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
const SHARE_COLUMNS: &str = "id, owner_id, slug, kind, chart_id, synastry_id, analysis_id, title, show_birth_data, \
|
const SHARE_COLUMNS: &str = "id, owner_id, slug, kind, chart_id, synastry_id, analysis_id, title, show_birth_data, \
|
||||||
view_count, created_at, revoked_at";
|
view_count, created_at, revoked_at, owner_ip_hash";
|
||||||
|
|
||||||
|
/// The visitor's address: the first `X-Forwarded-For` entry (Caddy writes it
|
||||||
|
/// 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.
|
||||||
|
fn ip_hash(slug: &str, ip: &str) -> Vec<u8> {
|
||||||
|
Sha256::digest(format!("{slug}:{ip}").as_bytes()).to_vec()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Link preview robots, crawlers and scripts (they do not run the page's
|
||||||
|
/// script anyway; this also stops a direct call).
|
||||||
|
fn is_robot(user_agent: Option<&str>) -> bool {
|
||||||
|
const MARKS: [&str; 16] = [
|
||||||
|
"bot",
|
||||||
|
"crawl",
|
||||||
|
"spider",
|
||||||
|
"slurp",
|
||||||
|
"facebookexternalhit",
|
||||||
|
"preview",
|
||||||
|
"fetch",
|
||||||
|
"curl",
|
||||||
|
"wget",
|
||||||
|
"python",
|
||||||
|
"headless",
|
||||||
|
"http-client",
|
||||||
|
"okhttp",
|
||||||
|
"java/",
|
||||||
|
"go-http",
|
||||||
|
"scrapy",
|
||||||
|
];
|
||||||
|
match user_agent {
|
||||||
|
Some(ua) if !ua.trim().is_empty() => {
|
||||||
|
let ua = ua.to_lowercase();
|
||||||
|
MARKS.iter().any(|m| ua.contains(m))
|
||||||
|
}
|
||||||
|
_ => true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// 96 random bits, 16 URL-safe characters.
|
/// 96 random bits, 16 URL-safe characters.
|
||||||
fn new_slug() -> String {
|
fn new_slug() -> String {
|
||||||
@@ -86,6 +142,7 @@ pub struct CreateShare {
|
|||||||
pub async fn create(
|
pub async fn create(
|
||||||
State(state): St,
|
State(state): St,
|
||||||
auth: AuthUser,
|
auth: AuthUser,
|
||||||
|
headers: HeaderMap,
|
||||||
WithRejection(Json(req), _): Body<CreateShare>,
|
WithRejection(Json(req), _): Body<CreateShare>,
|
||||||
) -> ApiResult<(StatusCode, Json<Value>)> {
|
) -> ApiResult<(StatusCode, Json<Value>)> {
|
||||||
let (chart_id, synastry_id, analysis_id, kind) = match req.kind {
|
let (chart_id, synastry_id, analysis_id, kind) = match req.kind {
|
||||||
@@ -109,19 +166,40 @@ pub async fn create(
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
let title = req.title.map(|t| t.trim().chars().take(120).collect::<String>()).filter(|t| !t.is_empty());
|
let title = req.title.map(|t| t.trim().chars().take(120).collect::<String>()).filter(|t| !t.is_empty());
|
||||||
|
let open: Option<ShareRow> = sqlx::query_as(&format!(
|
||||||
|
"SELECT {SHARE_COLUMNS} FROM shares WHERE owner_id = $1 AND kind = $2 AND revoked_at IS NULL \
|
||||||
|
AND chart_id IS NOT DISTINCT FROM $3 AND synastry_id IS NOT DISTINCT FROM $4 \
|
||||||
|
AND analysis_id IS NOT DISTINCT FROM $5 AND title IS NOT DISTINCT FROM $6 AND show_birth_data = $7 \
|
||||||
|
ORDER BY created_at DESC LIMIT 1"
|
||||||
|
))
|
||||||
|
.bind(auth.id())
|
||||||
|
.bind(kind)
|
||||||
|
.bind(chart_id)
|
||||||
|
.bind(synastry_id)
|
||||||
|
.bind(analysis_id)
|
||||||
|
.bind(&title)
|
||||||
|
.bind(req.show_birth_data)
|
||||||
|
.fetch_optional(&state.db)
|
||||||
|
.await?;
|
||||||
|
if let Some(row) = open {
|
||||||
|
return Ok((StatusCode::OK, Json(row.view(&state.config.public_base_url))));
|
||||||
|
}
|
||||||
|
let slug = new_slug();
|
||||||
let row: ShareRow = sqlx::query_as(&format!(
|
let row: ShareRow = sqlx::query_as(&format!(
|
||||||
"INSERT INTO shares (id, owner_id, slug, kind, chart_id, synastry_id, analysis_id, title, show_birth_data) \
|
"INSERT INTO shares (id, owner_id, slug, kind, chart_id, synastry_id, analysis_id, title, show_birth_data, \
|
||||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9) RETURNING {SHARE_COLUMNS}"
|
owner_ip_hash) \
|
||||||
|
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) RETURNING {SHARE_COLUMNS}"
|
||||||
))
|
))
|
||||||
.bind(Uuid::now_v7())
|
.bind(Uuid::now_v7())
|
||||||
.bind(auth.id())
|
.bind(auth.id())
|
||||||
.bind(new_slug())
|
.bind(&slug)
|
||||||
.bind(kind)
|
.bind(kind)
|
||||||
.bind(chart_id)
|
.bind(chart_id)
|
||||||
.bind(synastry_id)
|
.bind(synastry_id)
|
||||||
.bind(analysis_id)
|
.bind(analysis_id)
|
||||||
.bind(title)
|
.bind(title)
|
||||||
.bind(req.show_birth_data)
|
.bind(req.show_birth_data)
|
||||||
|
.bind(client_ip(&headers).map(|ip| ip_hash(&slug, &ip)))
|
||||||
.fetch_one(&state.db)
|
.fetch_one(&state.db)
|
||||||
.await?;
|
.await?;
|
||||||
Ok((StatusCode::CREATED, Json(row.view(&state.config.public_base_url))))
|
Ok((StatusCode::CREATED, Json(row.view(&state.config.public_base_url))))
|
||||||
@@ -175,6 +253,7 @@ async fn public_body(db: &PgPool, share: &ShareRow) -> Result<Value, ApiError> {
|
|||||||
if let Some(chart_id) = share.chart_id {
|
if let Some(chart_id) = share.chart_id {
|
||||||
let chart = find_chart(db, chart_id).await?.ok_or(ApiError::NotFound("share"))?;
|
let chart = find_chart(db, chart_id).await?.ok_or(ApiError::NotFound("share"))?;
|
||||||
body["chart"] = public_chart_block(&chart, share);
|
body["chart"] = public_chart_block(&chart, share);
|
||||||
|
body["summary"] = latest_summary(db, chart_id).await?;
|
||||||
} else if let Some(synastry_id) = share.synastry_id {
|
} else if let Some(synastry_id) = share.synastry_id {
|
||||||
let s = load_synastry(db, synastry_id).await?.ok_or(ApiError::NotFound("share"))?;
|
let s = load_synastry(db, synastry_id).await?.ok_or(ApiError::NotFound("share"))?;
|
||||||
body["synastry"] = public_synastry_block(&s, share);
|
body["synastry"] = public_synastry_block(&s, share);
|
||||||
@@ -198,14 +277,149 @@ async fn public_body(db: &PgPool, share: &ShareRow) -> Result<Value, ApiError> {
|
|||||||
Ok(body)
|
Ok(body)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Public: the shared content for the share page and its OG image.
|
/// The newest finished short summary of a chart (`null` if none).
|
||||||
|
async fn latest_summary(db: &PgPool, chart_id: Uuid) -> Result<Value, sqlx::Error> {
|
||||||
|
type Row = (Uuid, String, Option<Value>, Option<OffsetDateTime>);
|
||||||
|
let row: Option<Row> = sqlx::query_as(
|
||||||
|
"SELECT id, language, content, completed_at FROM analyses \
|
||||||
|
WHERE chart_id = $1 AND kind = 'summary' AND status = 'done' ORDER BY completed_at DESC LIMIT 1",
|
||||||
|
)
|
||||||
|
.bind(chart_id)
|
||||||
|
.fetch_optional(db)
|
||||||
|
.await?;
|
||||||
|
Ok(match row {
|
||||||
|
Some((id, language, content, completed_at)) => json!({
|
||||||
|
"id": id,
|
||||||
|
"language": language,
|
||||||
|
"title": content.as_ref().and_then(|c| c["title"].as_str()),
|
||||||
|
"summary": content.as_ref().and_then(|c| c["summary"].as_str()),
|
||||||
|
"completed_at": rfc3339_opt(completed_at),
|
||||||
|
}),
|
||||||
|
None => Value::Null,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn open_share(db: &PgPool, slug: &str) -> Result<ShareRow, ApiError> {
|
||||||
|
sqlx::query_as(&format!("SELECT {SHARE_COLUMNS} FROM shares WHERE slug = $1 AND revoked_at IS NULL"))
|
||||||
|
.bind(slug.trim())
|
||||||
|
.fetch_optional(db)
|
||||||
|
.await?
|
||||||
|
.ok_or(ApiError::NotFound("share"))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Public: the shared content for the share page and its OG image (read only).
|
||||||
pub async fn public_view(State(state): St, Path(slug): Path<String>) -> ApiResult<Json<Value>> {
|
pub async fn public_view(State(state): St, Path(slug): Path<String>) -> ApiResult<Json<Value>> {
|
||||||
let share: ShareRow = sqlx::query_as(&format!(
|
let share = open_share(&state.db, &slug).await?;
|
||||||
"UPDATE shares SET view_count = view_count + 1 WHERE slug = $1 AND revoked_at IS NULL RETURNING {SHARE_COLUMNS}"
|
|
||||||
))
|
|
||||||
.bind(slug.trim())
|
|
||||||
.fetch_optional(&state.db)
|
|
||||||
.await?
|
|
||||||
.ok_or(ApiError::NotFound("share"))?;
|
|
||||||
Ok(Json(public_body(&state.db, &share).await?))
|
Ok(Json(public_body(&state.db, &share).await?))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Public: the share page reports that someone opened it. Counted unless a
|
||||||
|
/// robot or the sharer; the sharer's first counted visit ever earns the reward.
|
||||||
|
pub async fn visit(
|
||||||
|
State(state): St,
|
||||||
|
auth: Result<AuthUser, ApiError>,
|
||||||
|
headers: HeaderMap,
|
||||||
|
Path(slug): Path<String>,
|
||||||
|
) -> ApiResult<Json<Value>> {
|
||||||
|
let share = open_share(&state.db, &slug).await?;
|
||||||
|
let sharer = auth.as_ref().is_ok_and(|a| a.id() == share.owner_id);
|
||||||
|
let same_place = match (client_ip(&headers), &share.owner_ip_hash) {
|
||||||
|
(Some(ip), Some(hash)) => ip_hash(&share.slug, &ip) == *hash,
|
||||||
|
_ => false,
|
||||||
|
};
|
||||||
|
if sharer || same_place || is_robot(user_agent(&headers).as_deref()) {
|
||||||
|
return Ok(Json(json!({ "counted": false })));
|
||||||
|
}
|
||||||
|
let mut tx = state.db.begin().await?;
|
||||||
|
sqlx::query("UPDATE shares SET view_count = view_count + 1 WHERE id = $1").bind(share.id).execute(&mut *tx).await?;
|
||||||
|
let rewarded = sqlx::query(
|
||||||
|
"INSERT INTO credit_ledger (id, user_id, unit, delta, reason, note) \
|
||||||
|
VALUES ($1, $2, 'question', 1, 'share_reward', $3) ON CONFLICT DO NOTHING",
|
||||||
|
)
|
||||||
|
.bind(Uuid::now_v7())
|
||||||
|
.bind(share.owner_id)
|
||||||
|
.bind(format!("first visit of share {}", share.id))
|
||||||
|
.execute(&mut *tx)
|
||||||
|
.await?
|
||||||
|
.rows_affected()
|
||||||
|
== 1;
|
||||||
|
tx.commit().await?;
|
||||||
|
if rewarded {
|
||||||
|
tracing::info!(share = %share.id, "share reward granted");
|
||||||
|
}
|
||||||
|
Ok(Json(json!({ "counted": true })))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Natal analyses a user can earn by bringing new users through shared links.
|
||||||
|
pub const REFERRAL_LIMIT: i64 = 3;
|
||||||
|
|
||||||
|
/// A new user came from a shared link (`slug`): remembered for the reward,
|
||||||
|
/// unless rewards are off, the link is unknown or revoked, or it is their own.
|
||||||
|
pub(super) async fn record_referral(
|
||||||
|
conn: &mut sqlx::PgConnection,
|
||||||
|
enabled: bool,
|
||||||
|
user_id: Uuid,
|
||||||
|
slug: Option<&str>,
|
||||||
|
) -> Result<(), sqlx::Error> {
|
||||||
|
let Some(slug) = slug.map(str::trim).filter(|s| enabled && !s.is_empty()) else {
|
||||||
|
return Ok(());
|
||||||
|
};
|
||||||
|
sqlx::query(
|
||||||
|
"INSERT INTO referrals (user_id, referrer_id, share_id) \
|
||||||
|
SELECT $1, owner_id, id FROM shares WHERE slug = $2 AND revoked_at IS NULL AND owner_id <> $1 \
|
||||||
|
ON CONFLICT DO NOTHING",
|
||||||
|
)
|
||||||
|
.bind(user_id)
|
||||||
|
.bind(slug)
|
||||||
|
.execute(conn)
|
||||||
|
.await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The new user made their own chart: the sharer who brought them gets a
|
||||||
|
/// natal analysis, while under the limit. Runs once per new user.
|
||||||
|
pub(super) async fn reward_referral(state: &crate::AppState, user_id: Uuid) -> Result<(), ApiError> {
|
||||||
|
if !state.config.referral_rewards {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
let mut tx = state.db.begin().await?;
|
||||||
|
let referrer: Option<Uuid> =
|
||||||
|
sqlx::query_scalar("SELECT referrer_id FROM referrals WHERE user_id = $1 AND rewarded_at IS NULL FOR UPDATE")
|
||||||
|
.bind(user_id)
|
||||||
|
.fetch_optional(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
let Some(referrer) = referrer else { return Ok(()) };
|
||||||
|
sqlx::query("SELECT id FROM users WHERE id = $1 FOR UPDATE").bind(referrer).execute(&mut *tx).await?;
|
||||||
|
let earned = referral_rewards(&mut tx, referrer).await?;
|
||||||
|
if earned < REFERRAL_LIMIT {
|
||||||
|
sqlx::query(
|
||||||
|
"INSERT INTO credit_ledger (id, user_id, unit, delta, reason, note) \
|
||||||
|
VALUES ($1, $2, 'natal', 1, 'referral_reward', $3)",
|
||||||
|
)
|
||||||
|
.bind(Uuid::now_v7())
|
||||||
|
.bind(referrer)
|
||||||
|
.bind(format!("new user {user_id} from a shared link"))
|
||||||
|
.execute(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
tracing::info!(referrer = %referrer, user = %user_id, "referral reward granted");
|
||||||
|
}
|
||||||
|
sqlx::query("UPDATE referrals SET rewarded_at = now() WHERE user_id = $1").bind(user_id).execute(&mut *tx).await?;
|
||||||
|
tx.commit().await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Natal analyses the user has earned by bringing new users.
|
||||||
|
pub async fn referral_rewards(conn: &mut sqlx::PgConnection, user_id: Uuid) -> Result<i64, sqlx::Error> {
|
||||||
|
sqlx::query_scalar("SELECT count(*) FROM credit_ledger WHERE user_id = $1 AND reason = 'referral_reward'")
|
||||||
|
.bind(user_id)
|
||||||
|
.fetch_one(conn)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Whether the user has already received the reward for sharing.
|
||||||
|
pub async fn reward_granted(db: &PgPool, user_id: Uuid) -> Result<bool, sqlx::Error> {
|
||||||
|
sqlx::query_scalar("SELECT EXISTS (SELECT 1 FROM credit_ledger WHERE user_id = $1 AND reason = 'share_reward')")
|
||||||
|
.bind(user_id)
|
||||||
|
.fetch_one(db)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|||||||
@@ -24,6 +24,8 @@ use crate::error::{ApiError, ApiResult};
|
|||||||
use crate::views::{public_chart, rfc3339, rfc3339_opt, synastry_hash};
|
use crate::views::{public_chart, rfc3339, rfc3339_opt, synastry_hash};
|
||||||
|
|
||||||
const INVITE_TTL: time::Duration = time::Duration::days(14);
|
const INVITE_TTL: time::Duration = time::Duration::days(14);
|
||||||
|
/// Invitations a user may have us e-mail in a day (the rest go by link).
|
||||||
|
const EMAILED_PER_DAY: i64 = 10;
|
||||||
|
|
||||||
#[derive(Debug, Clone, sqlx::FromRow)]
|
#[derive(Debug, Clone, sqlx::FromRow)]
|
||||||
pub struct SynastryRow {
|
pub struct SynastryRow {
|
||||||
@@ -238,6 +240,10 @@ pub struct CreateInvite {
|
|||||||
/// Defaults to the user's primary chart.
|
/// Defaults to the user's primary chart.
|
||||||
chart_id: Option<Uuid>,
|
chart_id: Option<Uuid>,
|
||||||
message: Option<String>,
|
message: Option<String>,
|
||||||
|
/// Who it is for, as the inviter calls them (only the inviter sees it).
|
||||||
|
label: Option<String>,
|
||||||
|
/// Have us e-mail the invitation to this address.
|
||||||
|
email: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn chart_or_primary(db: &PgPool, chart_id: Option<Uuid>, user: Uuid) -> Result<ChartRow, ApiError> {
|
async fn chart_or_primary(db: &PgPool, chart_id: Option<Uuid>, user: Uuid) -> Result<ChartRow, ApiError> {
|
||||||
@@ -254,14 +260,61 @@ pub async fn create_invite(
|
|||||||
auth: AuthUser,
|
auth: AuthUser,
|
||||||
WithRejection(Json(req), _): Body<CreateInvite>,
|
WithRejection(Json(req), _): Body<CreateInvite>,
|
||||||
) -> ApiResult<(StatusCode, Json<Value>)> {
|
) -> ApiResult<(StatusCode, Json<Value>)> {
|
||||||
|
if !state.config.user_invites && !auth.user.has_role(db::Role::Admin) {
|
||||||
|
return Err(ApiError::conflict("invites_disabled", "A meghívás hamarosan indul."));
|
||||||
|
}
|
||||||
let chart = chart_or_primary(&state.db, req.chart_id, auth.id()).await?;
|
let chart = chart_or_primary(&state.db, req.chart_id, auth.id()).await?;
|
||||||
let message = req.message.map(|m| m.trim().chars().take(500).collect::<String>()).filter(|m| !m.is_empty());
|
// No links: the message may go out in an e-mail from our domain.
|
||||||
|
let message = super::invitations::clean_message(req.message)?;
|
||||||
|
let label = req.label.map(|l| l.trim().chars().take(80).collect::<String>()).filter(|l| !l.is_empty());
|
||||||
|
let email = match req.email.as_deref().map(str::trim).filter(|e| !e.is_empty()) {
|
||||||
|
Some(raw) => Some(super::auth::normalize_email(raw)?),
|
||||||
|
None => None,
|
||||||
|
};
|
||||||
let token = db::new_token();
|
let token = db::new_token();
|
||||||
let id = Uuid::now_v7();
|
let id = Uuid::now_v7();
|
||||||
let expires_at = OffsetDateTime::now_utc() + INVITE_TTL;
|
let expires_at = OffsetDateTime::now_utc() + INVITE_TTL;
|
||||||
|
let url = format!("{}/meghivas/{token}", state.config.public_base_url);
|
||||||
|
let mut tx = state.db.begin().await?;
|
||||||
|
let mut emailed = false;
|
||||||
|
if let Some(to) = &email {
|
||||||
|
if *to == auth.user.email {
|
||||||
|
return Err(ApiError::BadRequest("Saját magadat nem hívhatod meg.".into()));
|
||||||
|
}
|
||||||
|
let today: i64 = sqlx::query_scalar(
|
||||||
|
"SELECT count(*) FROM synastry_invites WHERE inviter_id = $1 AND invitee_email IS NOT NULL \
|
||||||
|
AND created_at > now() - interval '1 day'",
|
||||||
|
)
|
||||||
|
.bind(auth.id())
|
||||||
|
.fetch_one(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
if today >= EMAILED_PER_DAY {
|
||||||
|
return Err(ApiError::conflict(
|
||||||
|
"invite_mail_limit",
|
||||||
|
format!(
|
||||||
|
"Naponta legfeljebb {EMAILED_PER_DAY} meghívót küldünk ki levélben. A linket továbbra is elküldheted."
|
||||||
|
),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
// Someone who asked for no more invitations gets none; the link still works.
|
||||||
|
if !super::invitations::opted_out(&mut tx, to).await? {
|
||||||
|
let (_, unsubscribe_url, unsubscribe_post_url) = super::invitations::links(&state, &token);
|
||||||
|
let payload = json!({
|
||||||
|
"url": url,
|
||||||
|
"inviter_name": auth.user.display_name,
|
||||||
|
"message": message,
|
||||||
|
"expires_on": expires_at.date().to_string(),
|
||||||
|
"unsubscribe_url": unsubscribe_url,
|
||||||
|
"unsubscribe_post_url": unsubscribe_post_url,
|
||||||
|
});
|
||||||
|
super::auth::queue_email_to(&mut tx, None, to, "synastry_invite", &auth.user.locale, payload).await?;
|
||||||
|
emailed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
sqlx::query(
|
sqlx::query(
|
||||||
"INSERT INTO synastry_invites (id, inviter_id, inviter_chart_id, token_hash, message, expires_at) \
|
"INSERT INTO synastry_invites (id, inviter_id, inviter_chart_id, token_hash, message, expires_at, label, \
|
||||||
VALUES ($1, $2, $3, $4, $5, $6)",
|
invitee_email) \
|
||||||
|
VALUES ($1, $2, $3, $4, $5, $6, $7, $8)",
|
||||||
)
|
)
|
||||||
.bind(id)
|
.bind(id)
|
||||||
.bind(auth.id())
|
.bind(auth.id())
|
||||||
@@ -269,16 +322,22 @@ pub async fn create_invite(
|
|||||||
.bind(db::token_hash(&token))
|
.bind(db::token_hash(&token))
|
||||||
.bind(&message)
|
.bind(&message)
|
||||||
.bind(expires_at)
|
.bind(expires_at)
|
||||||
.execute(&state.db)
|
.bind(&label)
|
||||||
|
.bind(&email)
|
||||||
|
.execute(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
|
tx.commit().await?;
|
||||||
Ok((
|
Ok((
|
||||||
StatusCode::CREATED,
|
StatusCode::CREATED,
|
||||||
Json(json!({
|
Json(json!({
|
||||||
"id": id,
|
"id": id,
|
||||||
"token": token,
|
"token": token,
|
||||||
"url": format!("{}/invite/{token}", state.config.public_base_url),
|
"url": url,
|
||||||
"chart_id": chart.id,
|
"chart_id": chart.id,
|
||||||
"message": message,
|
"message": message,
|
||||||
|
"label": label,
|
||||||
|
"email": email,
|
||||||
|
"emailed": emailed,
|
||||||
"expires_at": rfc3339(expires_at),
|
"expires_at": rfc3339(expires_at),
|
||||||
})),
|
})),
|
||||||
))
|
))
|
||||||
@@ -304,10 +363,12 @@ pub async fn list_invites(State(state): St, auth: AuthUser) -> ApiResult<Json<Va
|
|||||||
Option<OffsetDateTime>,
|
Option<OffsetDateTime>,
|
||||||
Option<Uuid>,
|
Option<Uuid>,
|
||||||
Option<String>,
|
Option<String>,
|
||||||
|
Option<String>,
|
||||||
|
Option<String>,
|
||||||
);
|
);
|
||||||
let rows: Vec<Row> = sqlx::query_as(
|
let rows: Vec<Row> = sqlx::query_as(
|
||||||
"SELECT i.id, i.inviter_chart_id, i.message, i.created_at, i.expires_at, i.accepted_at, i.synastry_id, \
|
"SELECT i.id, i.inviter_chart_id, i.message, i.created_at, i.expires_at, i.accepted_at, i.synastry_id, \
|
||||||
u.display_name \
|
u.display_name, i.label, i.invitee_email \
|
||||||
FROM synastry_invites i LEFT JOIN users u ON u.id = i.accepted_by \
|
FROM synastry_invites i LEFT JOIN users u ON u.id = i.accepted_by \
|
||||||
WHERE i.inviter_id = $1 ORDER BY i.created_at DESC",
|
WHERE i.inviter_id = $1 ORDER BY i.created_at DESC",
|
||||||
)
|
)
|
||||||
@@ -316,9 +377,9 @@ pub async fn list_invites(State(state): St, auth: AuthUser) -> ApiResult<Json<Va
|
|||||||
.await?;
|
.await?;
|
||||||
let list: Vec<Value> = rows
|
let list: Vec<Value> = rows
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.map(|(id, chart_id, message, created, expires, accepted, synastry_id, accepted_by)| {
|
.map(|(id, chart_id, message, created, expires, accepted, synastry_id, accepted_by, label, email)| {
|
||||||
json!({
|
json!({
|
||||||
"id": id, "chart_id": chart_id, "message": message,
|
"id": id, "chart_id": chart_id, "message": message, "label": label, "email": email,
|
||||||
"status": invite_status(accepted, expires),
|
"status": invite_status(accepted, expires),
|
||||||
"created_at": rfc3339(created), "expires_at": rfc3339(expires),
|
"created_at": rfc3339(created), "expires_at": rfc3339(expires),
|
||||||
"accepted_at": rfc3339_opt(accepted), "accepted_by": accepted_by, "synastry_id": synastry_id,
|
"accepted_at": rfc3339_opt(accepted), "accepted_by": accepted_by, "synastry_id": synastry_id,
|
||||||
@@ -425,7 +486,7 @@ pub async fn accept_invite(
|
|||||||
.fetch_optional(&mut *tx)
|
.fetch_optional(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
if let Some(inviter) = inviter {
|
if let Some(inviter) = inviter {
|
||||||
let url = format!("{}/synastry/{}", state.config.public_base_url, row.id);
|
let url = format!("{}/osszevetesek/{}", state.config.public_base_url, row.id);
|
||||||
super::auth::queue_email(
|
super::auth::queue_email(
|
||||||
&mut tx,
|
&mut tx,
|
||||||
&inviter,
|
&inviter,
|
||||||
|
|||||||
@@ -0,0 +1,169 @@
|
|||||||
|
//! 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>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Session {
|
||||||
|
pub fn paid(&self) -> bool {
|
||||||
|
self.payment_status == "paid"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct Client {
|
||||||
|
http: reqwest::Client,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for Client {
|
||||||
|
fn default() -> Self {
|
||||||
|
let http = reqwest::Client::builder().timeout(Duration::from_secs(20)).build().expect("static configuration");
|
||||||
|
Self { http }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// What the user sees when Stripe cannot be reached.
|
||||||
|
fn unavailable(detail: String) -> ApiError {
|
||||||
|
tracing::error!(error = %detail, "stripe request failed");
|
||||||
|
ApiError::Limited {
|
||||||
|
code: "payment_unavailable",
|
||||||
|
message: "A fizetési oldal most nem érhető el. Próbáld újra pár perc múlva.".into(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Client {
|
||||||
|
/// Creates a Checkout Session from form fields (Stripe's API takes
|
||||||
|
/// `application/x-www-form-urlencoded` with `a[b][c]` keys).
|
||||||
|
pub async fn create_session(&self, config: &StripeConfig, form: &[(String, String)]) -> Result<Session, ApiError> {
|
||||||
|
let res = self
|
||||||
|
.http
|
||||||
|
.post(format!("{}/v1/checkout/sessions", config.api_url))
|
||||||
|
.bearer_auth(&config.secret_key)
|
||||||
|
.form(form)
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.map_err(|e| unavailable(e.to_string()))?;
|
||||||
|
Self::session(res).await
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_session(&self, config: &StripeConfig, id: &str) -> Result<Session, ApiError> {
|
||||||
|
let res = self
|
||||||
|
.http
|
||||||
|
.get(format!("{}/v1/checkout/sessions/{id}", config.api_url))
|
||||||
|
.bearer_auth(&config.secret_key)
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.map_err(|e| unavailable(e.to_string()))?;
|
||||||
|
Self::session(res).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn session(res: reqwest::Response) -> Result<Session, ApiError> {
|
||||||
|
let status = res.status();
|
||||||
|
if !status.is_success() {
|
||||||
|
let body = res.text().await.unwrap_or_default();
|
||||||
|
return Err(unavailable(format!("HTTP {status}: {}", body.chars().take(500).collect::<String>())));
|
||||||
|
}
|
||||||
|
res.json().await.map_err(|e| unavailable(format!("unexpected response: {e}")))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Checks a `Stripe-Signature` header (`t=…,v1=…[,v1=…]`): an HMAC-SHA256 of
|
||||||
|
/// `"{t}.{body}"` with the endpoint's signing secret, at most five minutes old.
|
||||||
|
pub fn verify_signature(secret: &str, header: &str, body: &[u8], now: i64) -> bool {
|
||||||
|
let mut timestamp = None;
|
||||||
|
let mut signatures = Vec::new();
|
||||||
|
for part in header.split(',') {
|
||||||
|
match part.trim().split_once('=') {
|
||||||
|
Some(("t", v)) => timestamp = v.parse::<i64>().ok(),
|
||||||
|
Some(("v1", v)) => signatures.push(v),
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let Some(timestamp) = timestamp else { return false };
|
||||||
|
if (now - timestamp).abs() > SIGNATURE_TOLERANCE {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
let mut mac = Hmac::<Sha256>::new_from_slice(secret.as_bytes()).expect("HMAC takes any key length");
|
||||||
|
mac.update(timestamp.to_string().as_bytes());
|
||||||
|
mac.update(b".");
|
||||||
|
mac.update(body);
|
||||||
|
let expected = mac.finalize().into_bytes();
|
||||||
|
signatures.iter().any(|s| decode_hex(s).is_some_and(|sig| constant_time_eq(&sig, &expected)))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The signature header for a body, as Stripe would send it (tests).
|
||||||
|
#[cfg(test)]
|
||||||
|
pub fn sign(secret: &str, body: &[u8], timestamp: i64) -> String {
|
||||||
|
let mut mac = Hmac::<Sha256>::new_from_slice(secret.as_bytes()).unwrap();
|
||||||
|
mac.update(format!("{timestamp}.").as_bytes());
|
||||||
|
mac.update(body);
|
||||||
|
let hex: String = mac.finalize().into_bytes().iter().map(|b| format!("{b:02x}")).collect();
|
||||||
|
format!("t={timestamp},v1={hex}")
|
||||||
|
}
|
||||||
|
|
||||||
|
fn decode_hex(s: &str) -> Option<Vec<u8>> {
|
||||||
|
if !s.len().is_multiple_of(2) {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
(0..s.len()).step_by(2).map(|i| u8::from_str_radix(s.get(i..i + 2)?, 16).ok()).collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn constant_time_eq(a: &[u8], b: &[u8]) -> bool {
|
||||||
|
a.len() == b.len() && a.iter().zip(b).fold(0u8, |acc, (x, y)| acc | (x ^ y)) == 0
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn signatures_are_checked() {
|
||||||
|
let body = br#"{"id":"evt_1"}"#;
|
||||||
|
let now = 1_800_000_000;
|
||||||
|
let header = sign("whsec_test", body, now);
|
||||||
|
assert!(verify_signature("whsec_test", &header, body, now));
|
||||||
|
assert!(verify_signature("whsec_test", &header, body, now + 299));
|
||||||
|
// Another secret, a changed body, an old or missing timestamp.
|
||||||
|
assert!(!verify_signature("whsec_other", &header, body, now));
|
||||||
|
assert!(!verify_signature("whsec_test", &header, br#"{"id":"evt_2"}"#, now));
|
||||||
|
assert!(!verify_signature("whsec_test", &header, body, now + 301));
|
||||||
|
assert!(!verify_signature("whsec_test", header.split_once(',').unwrap().1, body, now));
|
||||||
|
// One good signature among others (during a secret rotation) is enough.
|
||||||
|
let rotated = format!("{header},v1=00ff");
|
||||||
|
assert!(verify_signature("whsec_test", &rotated, body, now));
|
||||||
|
assert!(!verify_signature("whsec_test", "t=1800000000,v1=zz", body, now));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<!-- BEGIN:nextjs-agent-rules -->
|
||||||
|
|
||||||
|
## This is NOT the Next.js you know
|
||||||
|
|
||||||
|
This version has breaking changes — APIs, conventions, and file structure may all differ from your training data. Read the relevant guide in `node_modules/next/dist/docs/` (resolved from this file's directory; in monorepos the `next` package may not be visible from the repo root) before writing any code. Heed deprecation notices.
|
||||||
|
|
||||||
|
This block is written and re-added by `next dev` — verify at `node_modules/next/dist/server/lib/generate-agent-files.js`. Removing it from a diff only re-creates the uncommitted change; committing it with your work keeps the tree clean.
|
||||||
|
|
||||||
|
<!-- END:nextjs-agent-rules -->
|
||||||
@@ -17,6 +17,7 @@ ENV NODE_ENV=production NEXT_TELEMETRY_DISABLED=1 PORT=3000 HOSTNAME=0.0.0.0
|
|||||||
RUN addgroup -S app && adduser -S -G app app
|
RUN addgroup -S app && adduser -S -G app app
|
||||||
COPY --from=build --chown=app:app /app/.next/standalone ./
|
COPY --from=build --chown=app:app /app/.next/standalone ./
|
||||||
COPY --from=build --chown=app:app /app/.next/static ./.next/static
|
COPY --from=build --chown=app:app /app/.next/static ./.next/static
|
||||||
|
COPY --from=build --chown=app:app /app/public ./public
|
||||||
USER app
|
USER app
|
||||||
EXPOSE 3000
|
EXPOSE 3000
|
||||||
HEALTHCHECK --interval=10s --timeout=3s --retries=5 CMD wget -qO- http://127.0.0.1:3000/healthz >/dev/null || exit 1
|
HEALTHCHECK --interval=10s --timeout=3s --retries=5 CMD wget -qO- http://127.0.0.1:3000/healthz >/dev/null || exit 1
|
||||||
|
|||||||
@@ -4,6 +4,11 @@ const config: NextConfig = {
|
|||||||
// Small self-contained server for the container image.
|
// Small self-contained server for the container image.
|
||||||
output: "standalone",
|
output: "standalone",
|
||||||
poweredByHeader: false,
|
poweredByHeader: false,
|
||||||
|
// The fonts of the share preview images are read from disk at run time.
|
||||||
|
outputFileTracingIncludes: {
|
||||||
|
"/s/[slug]/kep/[file]": ["./src/assets/og/*.ttf"],
|
||||||
|
"/kep/fooldal.png": ["./src/assets/og/*.ttf"],
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
export default config;
|
export default config;
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
<svg width="104" height="34" viewBox="0 0 104 34" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" d="M29.4607 14.8836C29.4938 14.7064 29.5289 14.547 29.5631 14.4093L31.9385 4.67302C32.6172 2.05391 34.1442 0.516602 36.9155 0.516602C39.0646 0.516602 40.7048 1.94003 40.7048 3.93284C40.7048 5.58402 40.0261 7.12132 38.4425 8.82944L32.536 15.3314C31.9953 17.9568 33.3006 18.7935 34.7098 18.7935C37.4511 18.7935 39.171 16.5816 39.8689 14.7002C39.8994 14.5988 39.9328 14.5016 39.9696 14.4093L42.4015 4.67302C43.0802 2.05391 44.6072 0.516602 47.3785 0.516602C49.5276 0.516602 51.1678 1.94003 51.1678 3.93284C51.1678 5.58402 50.4891 7.12132 48.9055 8.82944L43.0004 15.3301C42.4728 17.9565 43.9568 18.7935 45.908 18.7935C47.8202 18.7935 49.6854 17.7475 50.5536 15.0039L52.0161 9.11413H55.4095L53.7128 15.8897C53.2604 17.7116 53.7694 18.7935 55.1833 18.7935C56.88 18.7935 57.5587 18.281 58.2374 15.548L59.0292 12.2457C59.6513 9.62656 61.2349 8.88638 63.7799 8.88638H67.1168C69.4356 8.88638 71.1889 10.8222 70.6233 13.1567L68.4742 21.8681H65.0807L67.2299 13.2705C67.4561 12.4165 67.1168 11.961 66.2684 11.961H63.6668C62.9882 11.961 62.5923 12.3026 62.4226 12.9289L61.2914 17.6547C60.6693 20.16 58.8595 21.8681 55.9186 21.8681H55.1833C53.4448 21.8681 51.9867 21.0542 51.1429 19.566C50.0152 20.8083 48.3105 21.8681 45.6252 21.8681C42.9145 21.8681 41.2907 20.6535 40.4395 19.142C39.1534 20.5894 37.2944 21.8681 34.7098 21.8681C32.3016 21.8681 30.9188 21.0235 30.1547 19.8824C29.0995 21.0343 27.5991 21.8681 25.4345 21.8681C23.0591 21.8681 19.6091 20.6724 21.023 15.0356L22.4935 9.11413H25.8869L24.2468 15.3772C23.6247 17.7116 24.5296 18.7935 26.1697 18.7935C28.254 18.7935 29.1046 16.4012 29.4607 14.8836ZM44.2588 10.2033L46.417 7.2352C47.6613 5.52708 48.0572 5.01464 48.0572 4.50221C48.0572 3.98977 47.6047 3.59121 47.0957 3.59121C46.3605 3.59121 45.7949 4.04671 45.4556 5.35627L44.2588 10.2033ZM33.796 10.2033L35.954 7.2352C37.1983 5.52708 37.5942 5.01464 37.5942 4.50221C37.5942 3.98977 37.1417 3.59121 36.6327 3.59121C35.8975 3.59121 35.3319 4.04671 34.9926 5.35627L33.796 10.2033ZM15.9782 11.1631C18.0006 12.0669 18.478 13.5535 18.478 15.3203C18.478 18.9643 15.4805 22.0958 10.1641 22.0958H7.44942C2.35931 22.0958 -1.20376 19.4767 0.379826 13.2705L2.35931 5.24239C3.49045 1.19985 3.99946 0.687413 9.03301 0.687413H13.1617C16.7813 0.687413 19.5526 2.28166 19.5526 5.98258C19.5526 7.81584 18.6593 9.93522 15.9782 11.1631ZM11.6912 12.5873H7.78876L8.58055 9.51269H11.5781C14.6887 9.51269 16.046 8.43088 16.046 6.3242C16.046 4.38833 14.9149 3.76202 12.3699 3.76202H8.75023C6.31828 3.76202 6.14862 3.8759 5.58305 6.15339L3.66012 13.6691C2.86832 16.9145 4.28224 19.0212 8.07154 19.0212H10.1076C13.6141 19.0212 14.9715 17.3131 14.9715 15.3772C14.9715 13.4414 14.2928 12.5873 11.6912 12.5873ZM80.5422 21.4649C79.6628 21.8561 78.5543 22.1528 77.0142 22.1528C73.9036 22.1528 71.1889 19.3059 71.9807 15.2064C72.7159 11.5055 75.7134 8.88638 79.5593 8.88638C83.5748 8.88638 86.0633 11.961 85.1018 15.7188L81.6519 29.156C80.8035 32.2306 79.1634 33.4833 76.7314 33.4833C73.6774 33.4833 72.0938 31.2627 72.7159 28.6436C73.5168 25.6211 76.7518 24.0694 80.5422 21.4649ZM77.6929 19.0212C79.8421 19.0212 81.1429 17.8255 81.6519 15.3203C81.9912 13.3844 80.9732 12.0749 79.1068 12.0749C77.0142 12.0749 75.8265 13.4983 75.4872 15.3203C74.9782 17.4839 76.0528 19.0212 77.6929 19.0212ZM79.6843 25.0346C77.7302 27.0126 76.4967 28.1005 76.2224 28.9283C75.9397 29.7254 76.5052 30.3517 77.0708 30.3517C77.6929 30.3517 78.2019 29.8962 78.6544 28.5297L79.6843 25.0346ZM98.2207 10.3098H103.2V13.0428H99.6895C99.8564 13.8619 99.8632 14.7655 99.6935 15.7188C99.0714 19.5906 96.0173 22.1528 92.0018 22.1528C87.9862 22.1528 85.724 19.4198 86.5723 15.2064C87.3076 11.6194 90.4182 8.88638 94.3206 8.88638C95.954 8.88638 97.2808 9.41515 98.2207 10.3098ZM92.2846 19.0212C94.1509 19.0212 95.7345 18.2241 96.2435 15.3203C96.5829 13.3844 95.7345 12.0749 93.755 12.0749C91.719 12.0749 90.4182 13.4983 90.0223 15.3203C89.5698 17.4839 90.6444 19.0212 92.2846 19.0212ZM25.1517 7.12132C23.7943 7.12132 22.7197 6.03951 22.7197 4.67302C22.7197 3.30653 23.7943 2.22472 25.1517 2.22472C26.509 2.22472 27.5836 3.30653 27.5836 4.67302C27.5836 6.03951 26.509 7.12132 25.1517 7.12132ZM54.6743 7.12132C53.3169 7.12132 52.2424 6.03951 52.2424 4.67302C52.2424 3.30653 53.3169 2.22472 54.6743 2.22472C56.0317 2.22472 57.1063 3.30653 57.1063 4.67302C57.1063 6.03951 56.0317 7.12132 54.6743 7.12132Z" fill="white"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 4.4 KiB |
@@ -0,0 +1 @@
|
|||||||
|
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" style="enable-background:new 0 0 468 222.5;" xml:space="preserve" viewBox="54 36 360.02 149.84"> <style type="text/css"> .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;} </style> <g> <path class="st0" d="M414,113.4c0-25.6-12.4-45.8-36.1-45.8c-23.8,0-38.2,20.2-38.2,45.6c0,30.1,17,45.3,41.4,45.3 c11.9,0,20.9-2.7,27.7-6.5v-20c-6.8,3.4-14.6,5.5-24.5,5.5c-9.7,0-18.3-3.4-19.4-15.2h48.9C413.8,121,414,115.8,414,113.4z M364.6,103.9c0-11.3,6.9-16,13.2-16c6.1,0,12.6,4.7,12.6,16H364.6z"></path> <path class="st0" d="M301.1,67.6c-9.8,0-16.1,4.6-19.6,7.8l-1.3-6.2h-22v116.6l25-5.3l0.1-28.3c3.6,2.6,8.9,6.3,17.7,6.3 c17.9,0,34.2-14.4,34.2-46.1C335.1,83.4,318.6,67.6,301.1,67.6z M295.1,136.5c-5.9,0-9.4-2.1-11.8-4.7l-0.1-37.1 c2.6-2.9,6.2-4.9,11.9-4.9c9.1,0,15.4,10.2,15.4,23.3C310.5,126.5,304.3,136.5,295.1,136.5z"></path> <polygon class="st0" points="223.8,61.7 248.9,56.3 248.9,36 223.8,41.3 "></polygon> <rect x="223.8" y="69.3" class="st0" width="25.1" height="87.5"></rect> <path class="st0" d="M196.9,76.7l-1.6-7.4h-21.6v87.5h25V97.5c5.9-7.7,15.9-6.3,19-5.2v-23C214.5,68.1,202.8,65.9,196.9,76.7z"></path> <path class="st0" d="M146.9,47.6l-24.4,5.2l-0.1,80.1c0,14.8,11.1,25.7,25.9,25.7c8.2,0,14.2-1.5,17.5-3.3V135 c-3.2,1.3-19,5.9-19-8.9V90.6h19V69.3h-19L146.9,47.6z"></path> <path class="st0" d="M79.3,94.7c0-3.9,3.2-5.4,8.5-5.4c7.6,0,17.2,2.3,24.8,6.4V72.2c-8.3-3.3-16.5-4.6-24.8-4.6 C67.5,67.6,54,78.2,54,95.9c0,27.6,38,23.2,38,35.1c0,4.6-4,6.1-9.6,6.1c-8.3,0-18.9-3.4-27.3-8v23.8c9.3,4,18.7,5.7,27.3,5.7 c20.8,0,35.1-10.3,35.1-28.2C117.4,100.6,79.3,105.9,79.3,94.7z"></path> </g> </svg>
|
||||||
|
After Width: | Height: | Size: 1.7 KiB |
@@ -0,0 +1,468 @@
|
|||||||
|
import Link from "next/link";
|
||||||
|
|
||||||
|
import { ChartWheel } from "@/components/ChartWheel";
|
||||||
|
import { Rich } from "@/components/Rich";
|
||||||
|
import { Logo, PublicHeader } from "@/components/SiteHeader";
|
||||||
|
import { Waitlist } from "@/components/Waitlist";
|
||||||
|
import example from "@/content/pelda.json";
|
||||||
|
import type { AnalysisContent, ChartResult } from "@/lib/types";
|
||||||
|
|
||||||
|
// A quiet starfield, the same on every render.
|
||||||
|
const STARS = (() => {
|
||||||
|
let seed = 7;
|
||||||
|
const rnd = () => {
|
||||||
|
seed = (seed * 9301 + 49297) % 233280;
|
||||||
|
return seed / 233280;
|
||||||
|
};
|
||||||
|
return Array.from({ length: 70 }, (_, i) => ({
|
||||||
|
x: (rnd() * 1000).toFixed(1),
|
||||||
|
y: (rnd() * 600).toFixed(1),
|
||||||
|
r: (0.6 + rnd() * 1.4).toFixed(1),
|
||||||
|
t: i % 5,
|
||||||
|
}));
|
||||||
|
})();
|
||||||
|
|
||||||
|
const MONTHS = ["márc", "ápr", "máj", "jún", "júl", "aug", "szept", "okt", "nov", "dec", "jan", "febr"];
|
||||||
|
|
||||||
|
/** Points of a ring of the comparison picture. */
|
||||||
|
function ring(r: number, degrees: number[]) {
|
||||||
|
return degrees.map((d) => {
|
||||||
|
const a = (d * Math.PI) / 180;
|
||||||
|
return { x: 110 + r * Math.cos(a), y: 110 - r * Math.sin(a) };
|
||||||
|
});
|
||||||
|
}
|
||||||
|
const YOU = ring(72, [15, 70, 128, 190, 236, 300, 338]);
|
||||||
|
const THEM = ring(100, [40, 95, 150, 205, 262, 318, 355]);
|
||||||
|
const LINKS: [number, number, string][] = [
|
||||||
|
[0, 0, "var(--harmonic)"],
|
||||||
|
[2, 4, "var(--tense)"],
|
||||||
|
[4, 5, "var(--harmonic)"],
|
||||||
|
[5, 2, "var(--gold)"],
|
||||||
|
];
|
||||||
|
|
||||||
|
// Sample lines of a forecast timeline (illustration, marked as such).
|
||||||
|
const EVENTS = [
|
||||||
|
{ date: "ápr. 9.", glyph: "♃\uFE0E", tone: "harmonic", text: "Jupiter trigon Nap: kinyíló lehetőségek" },
|
||||||
|
{ date: "júl. 22.", glyph: "♄\uFE0E", tone: "tense", text: "Szaturnusz kvadrát Hold: érzelmi számvetés" },
|
||||||
|
{ date: "okt. 14.", glyph: "☉\uFE0E", tone: "neutral", text: "Napfogyatkozás a 10. házban: hivatás" },
|
||||||
|
];
|
||||||
|
|
||||||
|
const CHAPTERS = ["Személyiség", "Érzelmek", "Gondolkodás", "Szerelem", "Hivatás", "Fejlődés"];
|
||||||
|
const SYNASTRY_TOPICS = ["Vonzás", "Kommunikáció", "Érzelmi kötődés", "Súrlódások", "Hosszú táv"];
|
||||||
|
|
||||||
|
/** The home page for visitors: what the site does, shown on the example chart. */
|
||||||
|
export function Landing({ inviteOnly }: { inviteOnly: boolean }) {
|
||||||
|
const chart = example.chart as unknown as ChartResult;
|
||||||
|
const analysis = example.analysis as AnalysisContent;
|
||||||
|
const sections = ["emotions", "love"].map((k) => analysis.sections?.[k]).filter((s) => s !== undefined);
|
||||||
|
const lead = (analysis.summary ?? "").split(/(?<=\.)\s/)[0];
|
||||||
|
const signIn = inviteOnly ? "Belépés meghívóval" : "Elkészítem a képletem";
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="lp">
|
||||||
|
<PublicHeader onHome />
|
||||||
|
|
||||||
|
<section className="lp-hero">
|
||||||
|
<svg className="lp-stars" aria-hidden="true" viewBox="0 0 1000 600" preserveAspectRatio="xMidYMid slice">
|
||||||
|
{STARS.map((s, i) => (
|
||||||
|
<circle key={i} cx={s.x} cy={s.y} r={s.r} className={`lp-star lp-t${s.t}`} />
|
||||||
|
))}
|
||||||
|
</svg>
|
||||||
|
<div className="lp-wrap lp-hero-grid">
|
||||||
|
<div className="lp-hero-text">
|
||||||
|
<span className="eyebrow lp-rise lp-r1">Születési képlet · Éves előrejelzés · Kapcsolat</span>
|
||||||
|
<h1 className="lp-title lp-rise lp-r2">
|
||||||
|
Ahol a csillagok
|
||||||
|
<br />
|
||||||
|
összekötnek.
|
||||||
|
</h1>
|
||||||
|
<p className="lp-lead lp-rise lp-r3">
|
||||||
|
Add meg, mikor és hol születtél: percre pontosan kiszámoljuk a képletedet, és személyre szóló elemzést írunk
|
||||||
|
belőle. Megmutatjuk, mit hoz az éved, és mennyire illetek össze azzal, akit szeretsz.
|
||||||
|
</p>
|
||||||
|
<p className="ai-line lp-ai-line lp-rise lp-r3">
|
||||||
|
Részletes elemzések a legfejlettebb AI-modellekkel: egy tapasztalt asztrológushoz közelítő mélység, töredék
|
||||||
|
áron.
|
||||||
|
</p>
|
||||||
|
<div className="lp-actions lp-rise lp-r4">
|
||||||
|
<Link href="/belepes" className="btn btn-primary lp-btn">
|
||||||
|
{signIn}
|
||||||
|
</Link>
|
||||||
|
<Link href="/pelda" className="btn lp-btn">
|
||||||
|
Példaelemzés
|
||||||
|
</Link>
|
||||||
|
</div>
|
||||||
|
<p className="hint lp-rise lp-r4">
|
||||||
|
{inviteOnly ? (
|
||||||
|
<>
|
||||||
|
Az oldal egyelőre meghívásos: meghívóval, Google-fiókkal lépsz be. Ha még nincs meghívód,{" "}
|
||||||
|
<a href="#varolista">iratkozz fel a várólistára</a>.
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
"A képlet és a rövid összefoglaló ingyenes. Google-fiókkal lépsz be."
|
||||||
|
)}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<figure className="lp-figure">
|
||||||
|
<div className="lp-wheel">
|
||||||
|
<svg className="lp-orbit" aria-hidden="true" viewBox="0 0 680 680">
|
||||||
|
<circle cx="340" cy="340" r="334" />
|
||||||
|
<circle cx="340" cy="6" r="3" className="lp-orbit-dot" />
|
||||||
|
<circle cx="674" cy="340" r="2" className="lp-orbit-dot" />
|
||||||
|
<circle cx="104" cy="576" r="2.4" className="lp-orbit-dot" />
|
||||||
|
</svg>
|
||||||
|
<ChartWheel chart={chart} timeKnown title="Példa születési képlet" />
|
||||||
|
</div>
|
||||||
|
<figcaption className="lp-caption">
|
||||||
|
<span className="share-trio">
|
||||||
|
<span>
|
||||||
|
<span className="sym">☉︎</span> Nap Halak
|
||||||
|
</span>
|
||||||
|
<span>
|
||||||
|
<span className="sym">☽︎</span> Hold Skorpió
|
||||||
|
</span>
|
||||||
|
<span>
|
||||||
|
<span className="lp-asc">ASC</span> Oroszlán
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
<span className="hint">Példa: egy kitalált képlet · {example.birth}</span>
|
||||||
|
</figcaption>
|
||||||
|
</figure>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section className="lp-band lp-why" aria-labelledby="why-title">
|
||||||
|
<div className="lp-wrap lp-stack">
|
||||||
|
<div className="lp-intro">
|
||||||
|
<span className="eyebrow">Miért más?</span>
|
||||||
|
<h2 id="why-title" className="lp-h2">
|
||||||
|
Egy asztrológus mélysége, töredék áron
|
||||||
|
</h2>
|
||||||
|
</div>
|
||||||
|
<ul className="lp-why-grid">
|
||||||
|
<li className="card lp-why-card">
|
||||||
|
<svg aria-hidden="true" viewBox="0 0 24 24" className="lp-why-icon">
|
||||||
|
<path d="M12 3l1.8 4.6L18.5 9l-4.7 1.6L12 15l-1.8-4.4L5.5 9l4.7-1.4z" />
|
||||||
|
<path d="M18 15l.9 2.1L21 18l-2.1.9L18 21l-.9-2.1L15 18l2.1-.9z" />
|
||||||
|
</svg>
|
||||||
|
<h3 className="lp-step-title">A legfejlettebb AI-modellek</h3>
|
||||||
|
<p className="lp-small">
|
||||||
|
Az elemzéseket a legújabb, legnagyobb nyelvi modellek írják, a te képleted pontosan kiszámolt adataiból. Nem
|
||||||
|
sablonszövegekből rakjuk össze: minden mondat a te képletedről szól.
|
||||||
|
</p>
|
||||||
|
</li>
|
||||||
|
<li className="card lp-why-card">
|
||||||
|
<svg aria-hidden="true" viewBox="0 0 24 24" className="lp-why-icon">
|
||||||
|
<circle cx="12" cy="12" r="9" />
|
||||||
|
<circle cx="12" cy="12" r="4" />
|
||||||
|
<path d="M12 3v5M12 16v5M3 12h5M16 12h5" />
|
||||||
|
</svg>
|
||||||
|
<h3 className="lp-step-title">Asztrológusi mélység</h3>
|
||||||
|
<p className="lp-small">
|
||||||
|
A bolygókat jegyükben, házukban, fényszögeikben és uralkodóik láncolatában olvassa, a holdcsomópontokkal és
|
||||||
|
az év tranzitjaival együtt, ahogy egy tapasztalt asztrológus is tenné.
|
||||||
|
</p>
|
||||||
|
</li>
|
||||||
|
<li className="card lp-why-card">
|
||||||
|
<svg aria-hidden="true" viewBox="0 0 24 24" className="lp-why-icon">
|
||||||
|
<path d="M4 7h16M4 12h10M4 17h6" />
|
||||||
|
<path d="M17 14l3 3-3 3" />
|
||||||
|
</svg>
|
||||||
|
<h3 className="lp-step-title">Töredék áron, azonnal</h3>
|
||||||
|
<p className="lp-small">
|
||||||
|
Egy személyes asztrológiai konzultáció ára sokszorosa egy részletes elemzésnek, és napokat kell rá várni. Itt
|
||||||
|
percek alatt kész, és amit nem értesz, rá is kérdezhetsz.
|
||||||
|
</p>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section className="lp-band lp-alt">
|
||||||
|
<div className="lp-wrap lp-two">
|
||||||
|
<div className="lp-intro">
|
||||||
|
<span className="eyebrow">Első lépés</span>
|
||||||
|
<h2 className="lp-h2">Pár mondat, ami rólad szól</h2>
|
||||||
|
<p className="lp-text">
|
||||||
|
A képleted mellé rögtön kapsz egy rövid összefoglalót: mi adja a képleted gerincét, hol feszül, és miben vagy
|
||||||
|
igazán erős. Ingyen, a belépés után azonnal.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<article className="card summary-card lp-float">
|
||||||
|
<span className="eyebrow">Röviden · ingyenes</span>
|
||||||
|
<h3 className="summary-title">{example.summary.title}</h3>
|
||||||
|
<p className="summary-text">
|
||||||
|
<Rich text={example.summary.summary} />
|
||||||
|
</p>
|
||||||
|
</article>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section id="elemzes" className="lp-band">
|
||||||
|
<div className="lp-wrap lp-stack">
|
||||||
|
<div className="lp-intro">
|
||||||
|
<span className="eyebrow">Részletes elemzés</span>
|
||||||
|
<h2 className="lp-h2">Ha mélyebbre mennél</h2>
|
||||||
|
<p className="lp-text">
|
||||||
|
Hat fejezet a személyiségedről, az érzelmeidről, a gondolkodásodról, a szerelemről, a hivatásodról és a
|
||||||
|
fejlődésed irányáról. A végén erősségek, kihívások és útravaló, és ha kérdésed van, rá is kérdezhetsz.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div className="lp-analysis-grid">
|
||||||
|
<article className="card lp-paper">
|
||||||
|
<header className="analysis-head">
|
||||||
|
<h3 className="lp-paper-title">{analysis.title}</h3>
|
||||||
|
<p className="analysis-lead">{lead}</p>
|
||||||
|
</header>
|
||||||
|
<div className="lp-excerpts">
|
||||||
|
{sections.map((s) => (
|
||||||
|
<section key={s.title} className="analysis-section lp-fade">
|
||||||
|
<h4 className="lp-excerpt-title">{s.title}</h4>
|
||||||
|
<p className="summary-text">
|
||||||
|
<Rich text={s.body.split(/\n\s*\n/)[0]} />
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<div className="lp-paper-foot">
|
||||||
|
<span className="hint">Részlet egy kitalált képlet teljes elemzéséből</span>
|
||||||
|
<Link href="/pelda">Elolvasom a teljes példaelemzést →</Link>
|
||||||
|
</div>
|
||||||
|
</article>
|
||||||
|
<aside className="lp-aside">
|
||||||
|
<div className="card lp-side-card">
|
||||||
|
<h3 className="lp-h3">Erősségek</h3>
|
||||||
|
<ul className="lp-list">
|
||||||
|
{(analysis.strengths ?? []).slice(0, 2).map((t) => (
|
||||||
|
<li key={t}>
|
||||||
|
<Rich text={t} />
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<div className="card lp-side-card">
|
||||||
|
<h3 className="lp-h3">Kérdezz rá</h3>
|
||||||
|
<p className="lp-small">
|
||||||
|
Ami nem világos, vagy amire kíváncsi vagy, megkérdezheted: a válasz a képletedből és az elemzésedből
|
||||||
|
születik.
|
||||||
|
</p>
|
||||||
|
<p className="lp-question">„Mit jelent nekem a Hold–Vénusz kvadrát a párkapcsolatban?”</p>
|
||||||
|
</div>
|
||||||
|
</aside>
|
||||||
|
</div>
|
||||||
|
<div className="lp-chips">
|
||||||
|
{CHAPTERS.map((c) => (
|
||||||
|
<span key={c} className="lp-chip">
|
||||||
|
{c}
|
||||||
|
</span>
|
||||||
|
))}
|
||||||
|
<span className="lp-chip lp-chip-gold">Útravaló</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section className="lp-band lp-alt">
|
||||||
|
<div className="lp-wrap lp-stack">
|
||||||
|
<div className="lp-intro">
|
||||||
|
<span className="eyebrow">Nemcsak a képleted</span>
|
||||||
|
<h2 className="lp-h2">Mit hoz az éved, és kivel illetek össze?</h2>
|
||||||
|
</div>
|
||||||
|
<div className="lp-features">
|
||||||
|
<article id="elorejelzes" className="card lp-feature">
|
||||||
|
<div className="lp-feature-head">
|
||||||
|
<span className="eyebrow">Éves előrejelzés</span>
|
||||||
|
<h3 className="lp-feature-title">Egy év, hónapról hónapra</h3>
|
||||||
|
<p className="lp-text">
|
||||||
|
Szolár képlet, tranzitok pontos dátumokkal és progresszió: születésnaptól születésnapig, hogy tudd, mikor
|
||||||
|
mire érdemes figyelni.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div className="lp-panel">
|
||||||
|
<svg aria-hidden="true" viewBox="0 0 440 70" className="lp-timeline">
|
||||||
|
<line x1="10" y1="40" x2="430" y2="40" className="lp-tl-track" />
|
||||||
|
<line x1="10" y1="40" x2="150" y2="40" className="lp-tl-done" />
|
||||||
|
{MONTHS.map((m, i) => {
|
||||||
|
const x = 10 + (i * 420) / 11;
|
||||||
|
return (
|
||||||
|
<g key={m}>
|
||||||
|
<line x1={x} y1="34" x2={x} y2="46" className="lp-tl-track" />
|
||||||
|
<text x={x} y="64" className="lp-tl-month">
|
||||||
|
{m}
|
||||||
|
</text>
|
||||||
|
</g>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
<circle cx="88" cy="40" r="6" fill="var(--harmonic)" />
|
||||||
|
<circle cx="228" cy="40" r="6" fill="var(--square)" />
|
||||||
|
<circle cx="340" cy="40" r="6" fill="var(--gold)" />
|
||||||
|
<circle cx="150" cy="40" r="5" fill="var(--gold)" className="lp-pulse" />
|
||||||
|
<circle cx="150" cy="40" r="3.5" fill="var(--ink)" />
|
||||||
|
<text x="150" y="20" className="lp-tl-now">
|
||||||
|
most
|
||||||
|
</text>
|
||||||
|
</svg>
|
||||||
|
<ol className="lp-events">
|
||||||
|
{EVENTS.map((e) => (
|
||||||
|
<li key={e.date} className={`timeline-item tone-${e.tone}`}>
|
||||||
|
<span className="timeline-date">{e.date}</span>
|
||||||
|
<span className="timeline-glyph sym" aria-hidden="true">
|
||||||
|
{e.glyph}
|
||||||
|
</span>
|
||||||
|
<span className="timeline-text">{e.text}</span>
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ol>
|
||||||
|
<span className="hint">Minta az idővonalból</span>
|
||||||
|
</div>
|
||||||
|
</article>
|
||||||
|
|
||||||
|
<article id="osszevetes" className="card lp-feature">
|
||||||
|
<div className="lp-feature-head">
|
||||||
|
<span className="eyebrow">Kapcsolati összevetés</span>
|
||||||
|
<h3 className="lp-feature-title">Mennyire illetek össze?</h3>
|
||||||
|
<p className="lp-text">
|
||||||
|
Két képlet egymásra vetítve. Hívd meg, akit szeretsz: ő megadja a saját adatait, és együtt nézitek meg,
|
||||||
|
hol erős és hol kényes a kapcsolatotok.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div className="lp-panel lp-pair">
|
||||||
|
<svg aria-hidden="true" viewBox="0 0 220 220" className="lp-rings">
|
||||||
|
<circle cx="110" cy="110" r="100" className="lp-ring" />
|
||||||
|
<circle cx="110" cy="110" r="72" className="lp-ring" />
|
||||||
|
<circle cx="110" cy="110" r="44" className="lp-ring lp-ring-core" />
|
||||||
|
<g className="lp-spin-back">
|
||||||
|
{THEM.map((p, i) => (
|
||||||
|
<circle key={i} cx={p.x} cy={p.y} r="5" fill="var(--p2)" />
|
||||||
|
))}
|
||||||
|
</g>
|
||||||
|
<g className="lp-spin">
|
||||||
|
{YOU.map((p, i) => (
|
||||||
|
<circle key={i} cx={p.x} cy={p.y} r="5" fill="var(--ink)" />
|
||||||
|
))}
|
||||||
|
</g>
|
||||||
|
{LINKS.map(([a, b, color]) => (
|
||||||
|
<line
|
||||||
|
key={`${a}-${b}`}
|
||||||
|
x1={YOU[a].x}
|
||||||
|
y1={YOU[a].y}
|
||||||
|
x2={THEM[b].x}
|
||||||
|
y2={THEM[b].y}
|
||||||
|
stroke={color}
|
||||||
|
strokeWidth="1.4"
|
||||||
|
strokeOpacity="0.75"
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
</svg>
|
||||||
|
<div className="lp-pair-legend">
|
||||||
|
<span className="pair-text-row">
|
||||||
|
<span className="legend-dot legend-p1" /> Te
|
||||||
|
</span>
|
||||||
|
<span className="pair-text-row p2-text">
|
||||||
|
<span className="legend-dot legend-p2" /> Ő
|
||||||
|
</span>
|
||||||
|
<span className="nature-bar" aria-hidden="true">
|
||||||
|
<span className="nature-seg nature-harmonious" style={{ flexGrow: 5 }} />
|
||||||
|
<span className="nature-seg nature-challenging" style={{ flexGrow: 3 }} />
|
||||||
|
<span className="nature-seg nature-neutral" style={{ flexGrow: 2 }} />
|
||||||
|
</span>
|
||||||
|
<span className="hint">harmonikus · feszült · semleges fényszögek</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="lp-chips">
|
||||||
|
{SYNASTRY_TOPICS.map((c) => (
|
||||||
|
<span key={c} className="lp-chip">
|
||||||
|
{c}
|
||||||
|
</span>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</article>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section className="lp-band">
|
||||||
|
<div className="lp-wrap lp-stack">
|
||||||
|
<h2 className="lp-h2 lp-center">Így működik</h2>
|
||||||
|
<ol className="lp-steps">
|
||||||
|
<li className="card">
|
||||||
|
<span className="lp-step-n">1</span>
|
||||||
|
<h3 className="lp-step-title">Belépsz, és megadod az adataidat</h3>
|
||||||
|
<p className="lp-small">
|
||||||
|
{inviteOnly ? "Meghívóval, Google-fiókkal lépsz be" : "Google-fiókkal lépsz be"}, aztán megadod a születésed
|
||||||
|
dátumát, idejét és helyét. Ha az időpontot nem tudod, akkor is kiszámoljuk, ami kiszámolható.
|
||||||
|
</p>
|
||||||
|
</li>
|
||||||
|
<li className="card">
|
||||||
|
<span className="lp-step-n">2</span>
|
||||||
|
<h3 className="lp-step-title">Kész a képleted, ingyen</h3>
|
||||||
|
<p className="lp-small">
|
||||||
|
Megrajzolt radix, bolygóállások, házak, fényszögek és egy rövid, személyre szóló összefoglaló.
|
||||||
|
</p>
|
||||||
|
</li>
|
||||||
|
<li className="card">
|
||||||
|
<span className="lp-step-n">3</span>
|
||||||
|
<h3 className="lp-step-title">Ha többet szeretnél</h3>
|
||||||
|
<p className="lp-small">
|
||||||
|
Részletes elemzés, éves előrejelzés, kapcsolati összevetés, és kérdések, amikre a saját képleted felel.
|
||||||
|
</p>
|
||||||
|
</li>
|
||||||
|
</ol>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section id="varolista" className="lp-band lp-final">
|
||||||
|
<div className="lp-wrap lp-final-inner">
|
||||||
|
<svg aria-hidden="true" viewBox="0 0 120 120" className="lp-spin lp-emblem">
|
||||||
|
<circle cx="60" cy="60" r="54" className="lp-emblem-outer" />
|
||||||
|
<circle cx="60" cy="60" r="40" className="lp-ring" />
|
||||||
|
<circle cx="60" cy="6" r="4" fill="var(--gold)" />
|
||||||
|
<circle cx="100" cy="88" r="3" fill="var(--ink)" />
|
||||||
|
<circle cx="24" cy="92" r="2.5" fill="var(--p2)" />
|
||||||
|
</svg>
|
||||||
|
<h2 className="lp-h2">Kíváncsi vagy, mit mutat a te képleted?</h2>
|
||||||
|
<p className="lp-text">
|
||||||
|
{inviteOnly
|
||||||
|
? "Egyelőre meghívással lehet csatlakozni. Ha kaptál meghívót, lépj be a Google-fiókoddal. Ha még nem, írd fel magad, és szólunk."
|
||||||
|
: "Két perc, és ott a képleted a rövid összefoglalóval együtt."}
|
||||||
|
</p>
|
||||||
|
<Link href="/belepes" className="btn btn-primary lp-btn lp-btn-big">
|
||||||
|
{signIn}
|
||||||
|
</Link>
|
||||||
|
{inviteOnly && (
|
||||||
|
<div className="lp-waitlist">
|
||||||
|
<Waitlist />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
<p className="hint lp-disclaimer">
|
||||||
|
Az elemzéseket mesterséges intelligencia írja a pontosan kiszámolt képlet alapján. Tájékoztató jellegűek, nem
|
||||||
|
helyettesítenek szakmai tanácsot.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<footer className="lp-footer">
|
||||||
|
<div className="lp-wrap lp-partners">
|
||||||
|
<span className="hint">Fizetés</span>
|
||||||
|
{/* eslint-disable-next-line @next/next/no-img-element */}
|
||||||
|
<img src="/logos/stripe.svg" alt="Stripe" width="62" height="26" className="lp-partner" />
|
||||||
|
<span className="hint">Számlázás</span>
|
||||||
|
{/* eslint-disable-next-line @next/next/no-img-element */}
|
||||||
|
<img src="/logos/billingo.svg" alt="Billingo" width="80" height="26" className="lp-partner" />
|
||||||
|
</div>
|
||||||
|
<div className="lp-wrap lp-footer-inner">
|
||||||
|
<Logo />
|
||||||
|
<nav aria-label="Lábléc" className="lp-footer-nav">
|
||||||
|
<Link href="/pelda">Példaelemzés</Link>
|
||||||
|
<Link href="/adatvedelem">Adatvédelem</Link>
|
||||||
|
<Link href="/privacy" lang="en">
|
||||||
|
Privacy Policy
|
||||||
|
</Link>
|
||||||
|
<Link href="/belepes">Belépés</Link>
|
||||||
|
</nav>
|
||||||
|
<span className="hint">© {new Date().getFullYear()} Sorsfonalak</span>
|
||||||
|
</div>
|
||||||
|
</footer>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
import type { Metadata } from "next";
|
import type { Metadata } from "next";
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
|
|
||||||
import { Logo } from "@/components/SiteHeader";
|
import { PublicHeader } from "@/components/SiteHeader";
|
||||||
import { OPERATOR, PRIVACY_UPDATED } from "@/lib/legal";
|
import { OPERATOR, PRIVACY_UPDATED, operatorDetails } from "@/lib/legal";
|
||||||
import { getMe } from "@/lib/server";
|
import { getMe } from "@/lib/server";
|
||||||
|
|
||||||
export const metadata: Metadata = {
|
export const metadata: Metadata = {
|
||||||
@@ -16,96 +16,162 @@ export default async function PrivacyPage() {
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{!me && (
|
{!me && (
|
||||||
<header className="site-header">
|
<PublicHeader />
|
||||||
<Logo />
|
|
||||||
</header>
|
|
||||||
)}
|
)}
|
||||||
<main className="page legal">
|
<main className="page legal">
|
||||||
<div className="page-head">
|
<div className="page-head">
|
||||||
<h1>Adatvédelmi tájékoztató</h1>
|
<h1>Adatvédelmi tájékoztató</h1>
|
||||||
<p className="muted">Hatályos: {PRIVACY_UPDATED}</p>
|
<p className="muted">
|
||||||
|
Hatályos: {PRIVACY_UPDATED} · <Link href="/privacy" lang="en">English version</Link>
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
<h2>1. Ki kezeli az adataidat?</h2>
|
<h2>1. Ki kezeli az adataidat?</h2>
|
||||||
<p>
|
<p>
|
||||||
A Sorsfonalak szolgáltatás (sorsfonalak.hu) adatkezelője: <strong>{OPERATOR.name}</strong>, {OPERATOR.address}
|
{operatorDetails() ? (
|
||||||
{OPERATOR.registration ? `, ${OPERATOR.registration}` : ""}. Adatvédelmi kérdésekben itt érsz el minket:{" "}
|
<>
|
||||||
<strong>{OPERATOR.email}</strong>.
|
A Sorsfonalak szolgáltatás (sorsfonalak.hu) adatkezelője: <strong>{operatorDetails()}</strong>.{" "}
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
"A Sorsfonalak szolgáltatás (sorsfonalak.hu) adatkezelőjét e-mailben éred el. "
|
||||||
|
)}
|
||||||
|
Adatvédelmi és minden más kérdésben itt érsz el minket:{" "}
|
||||||
|
<a href={`mailto:${OPERATOR.email}`}>
|
||||||
|
<strong>{OPERATOR.email}</strong>
|
||||||
|
</a>
|
||||||
|
.
|
||||||
</p>
|
</p>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
<h2>2. Milyen adatokat kezelünk, és miért?</h2>
|
<h2>2. Milyen adatokat kezelünk, és miért?</h2>
|
||||||
<table className="legal-table">
|
<div className="table-wrap">
|
||||||
<thead>
|
<table className="legal-table">
|
||||||
<tr>
|
<thead>
|
||||||
<th scope="col">Adat</th>
|
<tr>
|
||||||
<th scope="col">Cél</th>
|
<th scope="col">Adat</th>
|
||||||
<th scope="col">Jogalap</th>
|
<th scope="col">Cél</th>
|
||||||
</tr>
|
<th scope="col">Jogalap</th>
|
||||||
</thead>
|
</tr>
|
||||||
<tbody>
|
</thead>
|
||||||
<tr>
|
<tbody>
|
||||||
<td>Google-fiókod neve, e-mail-címe és azonosítója (belépéskor a Google adja át)</td>
|
<tr>
|
||||||
<td>Fiókod létrehozása, belépés, kapcsolattartás</td>
|
<td>Google-fiókod neve, e-mail-címe és azonosítója (belépéskor a Google adja át)</td>
|
||||||
<td>Szerződés teljesítése (GDPR 6. cikk (1) b)</td>
|
<td>Fiókod létrehozása, belépés, kapcsolattartás</td>
|
||||||
</tr>
|
<td>Szerződés teljesítése (GDPR 6. cikk (1) b)</td>
|
||||||
<tr>
|
</tr>
|
||||||
<td>Megjelenített név, az elemzések nyelve</td>
|
<tr>
|
||||||
<td>A szolgáltatás személyre szabása</td>
|
<td>Megjelenített név, az elemzések nyelve</td>
|
||||||
<td>Szerződés teljesítése</td>
|
<td>A szolgáltatás személyre szabása</td>
|
||||||
</tr>
|
<td>Szerződés teljesítése</td>
|
||||||
<tr>
|
</tr>
|
||||||
<td>Születési adataid: dátum, időpont, hely</td>
|
<tr>
|
||||||
<td>A születési képleted kiszámítása és az elemzések elkészítése</td>
|
<td>Születési adataid: dátum, időpont, hely</td>
|
||||||
<td>Szerződés teljesítése</td>
|
<td>A születési képleted kiszámítása és az elemzések elkészítése</td>
|
||||||
</tr>
|
<td>Szerződés teljesítése</td>
|
||||||
<tr>
|
</tr>
|
||||||
<td>Az általad felvett személyek neve és születési adatai</td>
|
<tr>
|
||||||
<td>Az ő képletük és elemzésük elkészítése a kérésedre</td>
|
<td>Az általad felvett személyek neve és születési adatai</td>
|
||||||
<td>Szerződés teljesítése; a felvételhez az érintett beleegyezése szükséges (lásd 4. pont)</td>
|
<td>Az ő képletük és elemzésük elkészítése a kérésedre</td>
|
||||||
</tr>
|
<td>Szerződés teljesítése; a felvételhez az érintett beleegyezése szükséges (lásd 5. pont)</td>
|
||||||
<tr>
|
</tr>
|
||||||
<td>A képletek és az elkészült elemzések</td>
|
<tr>
|
||||||
<td>Hogy bármikor újra megnézhesd őket</td>
|
<td>A képletek és az elkészült elemzések</td>
|
||||||
<td>Szerződés teljesítése</td>
|
<td>Hogy bármikor újra megnézhesd őket</td>
|
||||||
</tr>
|
<td>Szerződés teljesítése</td>
|
||||||
<tr>
|
</tr>
|
||||||
<td>Vásárlásaid és felhasznált kereteid (elemzések, személyek)</td>
|
<tr>
|
||||||
<td>A megvásárolt szolgáltatás nyújtása, elszámolás</td>
|
<td>Vásárlásaid és felhasznált kereteid (elemzések, személyek)</td>
|
||||||
<td>Szerződés teljesítése; számviteli kötelezettség (6. cikk (1) c)</td>
|
<td>A megvásárolt szolgáltatás nyújtása, elszámolás</td>
|
||||||
</tr>
|
<td>Szerződés teljesítése; számviteli kötelezettség (6. cikk (1) c)</td>
|
||||||
<tr>
|
</tr>
|
||||||
<td>Meghívott e-mail-címe, a meghívó neve és személyes üzenete</td>
|
<tr>
|
||||||
<td>A meghívó elküldése; amíg az oldal zártkörű, csak meghívottak regisztrálhatnak</td>
|
<td>
|
||||||
<td>Jogos érdek (6. cikk (1) f)</td>
|
Fizetéseid adatai: a Stripe fizetési azonosítója, a fizetett összeg, a számlázási neved, címed és
|
||||||
</tr>
|
e-mail-címed, céges vásárlásnál a cégnév és az adószám
|
||||||
<tr>
|
</td>
|
||||||
<td>A várólistán megadott e-mail-cím</td>
|
<td>A fizetés igazolása, a számla kiállítása</td>
|
||||||
<td>Értesítés, ha megnyílik az oldal, vagy meghívót küldünk</td>
|
<td>Szerződés teljesítése; számviteli kötelezettség (6. cikk (1) c)</td>
|
||||||
<td>Hozzájárulás (6. cikk (1) a)</td>
|
</tr>
|
||||||
</tr>
|
<tr>
|
||||||
<tr>
|
<td>Meghívott e-mail-címe, a meghívó neve és személyes üzenete</td>
|
||||||
<td>Azok a címek, amelyek leiratkoztak a meghívókról (csak a cím egyirányú lenyomata, hash-e)</td>
|
<td>A meghívó elküldése; amíg az oldal zártkörű, csak meghívottak regisztrálhatnak</td>
|
||||||
<td>Hogy ezekre a címekre ne küldjünk több meghívót</td>
|
<td>Jogos érdek (6. cikk (1) f)</td>
|
||||||
<td>Jogos érdek (6. cikk (1) f)</td>
|
</tr>
|
||||||
</tr>
|
<tr>
|
||||||
<tr>
|
<td>A várólistán megadott e-mail-cím</td>
|
||||||
<td>IP-cím, böngésző adatai, a kérések ideje (szervernaplók)</td>
|
<td>Értesítés, ha megnyílik az oldal, vagy meghívót küldünk</td>
|
||||||
<td>Biztonság, hibakeresés, visszaélések kiszűrése</td>
|
<td>Hozzájárulás (6. cikk (1) a)</td>
|
||||||
<td>Jogos érdek (6. cikk (1) f)</td>
|
</tr>
|
||||||
</tr>
|
<tr>
|
||||||
</tbody>
|
<td>Azok a címek, amelyek leiratkoztak a meghívókról (csak a cím egyirányú lenyomata, hash-e)</td>
|
||||||
</table>
|
<td>Hogy ezekre a címekre ne küldjünk több meghívót</td>
|
||||||
|
<td>Jogos érdek (6. cikk (1) f)</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>IP-cím, böngésző adatai, a kérések ideje (szervernaplók)</td>
|
||||||
|
<td>Biztonság, hibakeresés, visszaélések kiszűrése</td>
|
||||||
|
<td>Jogos érdek (6. cikk (1) f)</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
<p>
|
<p>
|
||||||
Bankkártyaadatot nem kezelünk és nem tárolunk; a fizetést, amikor elindul, külső fizetési szolgáltató
|
<strong>Bankkártyaadatot nem kezelünk és nem tárolunk.</strong> A fizetés a Stripe biztonságos fizetési
|
||||||
végzi, akinek a neve itt lesz feltüntetve.
|
oldalán történik: a kártyaadataidat közvetlenül a Stripe-nak adod meg, hozzánk nem jutnak el. A Stripe-tól
|
||||||
|
csak a fizetés azonosítóját, összegét és a számlázási adataidat kapjuk meg. Ezeket a fiókod törlése után is
|
||||||
|
megőrizzük a számviteli törvény szerinti ideig (8 évig).
|
||||||
</p>
|
</p>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
<h2>3. Az elemzések és a mesterséges intelligencia</h2>
|
<h2>3. A Google-fiókodból kapott adatok</h2>
|
||||||
|
<p>
|
||||||
|
A belépéshez a „Bejelentkezés Google-fiókkal” szolgáltatást használjuk, az <code>openid</code>,{" "}
|
||||||
|
<code>email</code> és <code>profile</code> engedélyekkel. Belépéskor a Google ezeket adja át nekünk:
|
||||||
|
</p>
|
||||||
|
<ul>
|
||||||
|
<li>a Google-fiókod egyedi azonosítóját,</li>
|
||||||
|
<li>az e-mail-címedet és azt, hogy a Google igazolta-e,</li>
|
||||||
|
<li>a nevedet,</li>
|
||||||
|
<li>a nyelvi beállításodat.</li>
|
||||||
|
</ul>
|
||||||
|
<p>
|
||||||
|
<strong>Mire használjuk:</strong> a fiókod létrehozására és arra, hogy belépéskor felismerjünk; az
|
||||||
|
e-mail-címedet a rendszerlevelekhez (például ha elkészült egy elemzésed vagy elfogadták a meghívódat); a
|
||||||
|
nevedet a megjelenítéshez; a nyelvet az oldal és az elemzések nyelvéhez.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
<strong>Amit nem teszünk:</strong> más Google-adatodhoz (Gmail, Drive, naptár, névjegyek, fényképek) nem férünk
|
||||||
|
hozzá, és a nevedben semmilyen Google-szolgáltatást nem használunk. A Google-től kapott adatokat nem adjuk el,
|
||||||
|
nem használjuk hirdetésre vagy profilalkotásra, nem adjuk át harmadik félnek (kivéve a tárolást és a
|
||||||
|
levélküldést végző adatfeldolgozókat, lásd 6. pont), és a mesterséges intelligenciának sem küldjük el.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
<strong>Meddig és hogyan törölheted:</strong> a fiókod törléséig őrizzük. A fiókodat és minden adatodat a{" "}
|
||||||
|
<Link href="/profil#adataim">Profil</Link> oldalon bármikor törölheted. A Sorsfonalak hozzáférését a
|
||||||
|
Google-fiókodban is visszavonhatod:{" "}
|
||||||
|
<a href="https://myaccount.google.com/permissions" target="_blank" rel="noopener noreferrer">
|
||||||
|
myaccount.google.com/permissions
|
||||||
|
</a>
|
||||||
|
.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
A Google API-kból kapott adatok felhasználása és továbbítása megfelel a{" "}
|
||||||
|
<a
|
||||||
|
href="https://developers.google.com/terms/api-services-user-data-policy"
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
>
|
||||||
|
Google API Services User Data Policy
|
||||||
|
</a>{" "}
|
||||||
|
szabályzatnak, beleértve a „Limited Use” (korlátozott felhasználás) követelményeit.
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>4. Az elemzések és a mesterséges intelligencia</h2>
|
||||||
<p>
|
<p>
|
||||||
A rövid összefoglalót és a részletes elemzést nagy nyelvi modell (mesterséges intelligencia) írja. A
|
A rövid összefoglalót és a részletes elemzést nagy nyelvi modell (mesterséges intelligencia) írja. A
|
||||||
modellhez <strong>csak a képlet csillagászati adatai</strong> jutnak el (a bolygók jegye, foka, háza és
|
modellhez <strong>csak a képlet csillagászati adatai</strong> jutnak el (a bolygók jegye, foka, háza és
|
||||||
@@ -116,7 +182,7 @@ export default async function PrivacyPage() {
|
|||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
<h2>4. Más emberek adatai</h2>
|
<h2>5. Más emberek adatai</h2>
|
||||||
<p>
|
<p>
|
||||||
Ha valaki más (például társad vagy családtagod) születési adatait veszed fel, kérjük, csak az ő
|
Ha valaki más (például társad vagy családtagod) születési adatait veszed fel, kérjük, csak az ő
|
||||||
beleegyezésével tedd. Az ő adatait kizárólag te látod; tőlünk senki más nem kapja meg. Az általad felvett
|
beleegyezésével tedd. Az ő adatait kizárólag te látod; tőlünk senki más nem kapja meg. Az általad felvett
|
||||||
@@ -125,7 +191,7 @@ export default async function PrivacyPage() {
|
|||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
<h2>5. Kik férnek hozzá az adatokhoz? (adatfeldolgozók)</h2>
|
<h2>6. Kik férnek hozzá az adatokhoz? (adatfeldolgozók)</h2>
|
||||||
<ul>
|
<ul>
|
||||||
<li>
|
<li>
|
||||||
<strong>DigitalOcean, LLC</strong> – a szerverek üzemeltetése; az adatok az Európai Unióban (Amszterdam)
|
<strong>DigitalOcean, LLC</strong> – a szerverek üzemeltetése; az adatok az Európai Unióban (Amszterdam)
|
||||||
@@ -143,9 +209,16 @@ export default async function PrivacyPage() {
|
|||||||
az Európai Unióban (Frankfurt).
|
az Európai Unióban (Frankfurt).
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<strong>OpenRouter, Inc.</strong> és az általa elért modellszolgáltató (jelenleg{" "}
|
<strong>Stripe Payments Europe, Ltd.</strong> (Írország) – a bankkártyás fizetés lebonyolítása és a
|
||||||
<strong>Anthropic PBC</strong>) – az elemzések megírása, kizárólag a 3. pontban leírt csillagászati
|
visszaélések kiszűrése; a kártyaadatokat csak a Stripe kezeli.
|
||||||
adatokból.
|
</li>
|
||||||
|
<li>
|
||||||
|
<strong>Billingo Technologies Zrt.</strong> (Billingo) – a számlák kiállítása, megküldése és megőrzése; a
|
||||||
|
számlázási adataidat (név, cím, e-mail-cím, céges vásárlásnál cégnév és adószám) kapja meg.
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<strong>OpenRouter, Inc.</strong> és az általa elért mesterségesintelligencia-szolgáltatók – az elemzések
|
||||||
|
megírása, kizárólag a 4. pontban leírt csillagászati adatokból (személyes adat nem jut el hozzájuk).
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<p>
|
<p>
|
||||||
@@ -156,7 +229,7 @@ export default async function PrivacyPage() {
|
|||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
<h2>6. Meddig őrizzük az adatokat?</h2>
|
<h2>7. Meddig őrizzük az adatokat?</h2>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Fiókod adatait, képleteidet és elemzéseidet a fiókod törléséig.</li>
|
<li>Fiókod adatait, képleteidet és elemzéseidet a fiókod törléséig.</li>
|
||||||
<li>A biztonsági mentésekből a törölt adatok legkésőbb 14 nap után tűnnek el.</li>
|
<li>A biztonsági mentésekből a törölt adatok legkésőbb 14 nap után tűnnek el.</li>
|
||||||
@@ -171,7 +244,7 @@ export default async function PrivacyPage() {
|
|||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
<h2>7. Sütik</h2>
|
<h2>8. Sütik</h2>
|
||||||
<p>
|
<p>
|
||||||
Csak egy, a működéshez feltétlenül szükséges sütit használunk (<code>sf_session</code>), amely belépve
|
Csak egy, a működéshez feltétlenül szükséges sütit használunk (<code>sf_session</code>), amely belépve
|
||||||
tart. Reklám- vagy követő sütiket, illetve látogatottságmérőt nem használunk.
|
tart. Reklám- vagy követő sütiket, illetve látogatottságmérőt nem használunk.
|
||||||
@@ -179,7 +252,7 @@ export default async function PrivacyPage() {
|
|||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
<h2>8. A jogaid</h2>
|
<h2>9. A jogaid</h2>
|
||||||
<ul>
|
<ul>
|
||||||
<li>
|
<li>
|
||||||
<strong>Hozzáférés és adathordozhatóság:</strong> a <Link href="/profil#adataim">Profil</Link> oldalon
|
<strong>Hozzáférés és adathordozhatóság:</strong> a <Link href="/profil#adataim">Profil</Link> oldalon
|
||||||
@@ -206,12 +279,12 @@ export default async function PrivacyPage() {
|
|||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
<h2>9. Korhatár</h2>
|
<h2>10. Korhatár</h2>
|
||||||
<p>A szolgáltatást 16 éven felüliek használhatják.</p>
|
<p>A szolgáltatást 16 éven felüliek használhatják.</p>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section>
|
<section>
|
||||||
<h2>10. Változások</h2>
|
<h2>11. Változások</h2>
|
||||||
<p>
|
<p>
|
||||||
Ha a tájékoztató lényegesen változik, a belépéskor vagy e-mailben jelezzük. A mindenkori változat ezen az
|
Ha a tájékoztató lényegesen változik, a belépéskor vagy e-mailben jelezzük. A mindenkori változat ezen az
|
||||||
oldalon olvasható.
|
oldalon olvasható.
|
||||||
|
|||||||
@@ -0,0 +1,155 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useCallback, useEffect, useState } from "react";
|
||||||
|
|
||||||
|
import { api, errorText } from "@/lib/api";
|
||||||
|
import { formatDate } from "@/lib/astro";
|
||||||
|
import type { GenerationError } from "@/lib/types";
|
||||||
|
|
||||||
|
const PAGE = 100;
|
||||||
|
|
||||||
|
const SOURCES: Record<string, string> = { analysis: "Elemzés", question: "Kérdés-válasz", preview: "Prompt-próba" };
|
||||||
|
const KINDS: Record<string, string> = {
|
||||||
|
summary: "összefoglaló",
|
||||||
|
natal: "képletelemzés",
|
||||||
|
synastry: "kapcsolati",
|
||||||
|
forecast: "előrejelzés",
|
||||||
|
question: "válasz",
|
||||||
|
};
|
||||||
|
const OUTCOMES: Record<GenerationError["outcome"], { label: string; tone: string }> = {
|
||||||
|
retry: { label: "újrapróbálva", tone: "neutral" },
|
||||||
|
fallback: { label: "tartalék modell vette át", tone: "neutral" },
|
||||||
|
failed: { label: "végleg sikertelen", tone: "tense" },
|
||||||
|
};
|
||||||
|
|
||||||
|
interface Page {
|
||||||
|
errors: GenerationError[];
|
||||||
|
total: number;
|
||||||
|
last_day: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The admin error log with filters and paging. */
|
||||||
|
export function ErrorLog() {
|
||||||
|
const [source, setSource] = useState("");
|
||||||
|
const [outcome, setOutcome] = useState("");
|
||||||
|
const [errors, setErrors] = useState<GenerationError[] | null>(null);
|
||||||
|
const [total, setTotal] = useState(0);
|
||||||
|
const [lastDay, setLastDay] = useState(0);
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
|
||||||
|
const load = useCallback(
|
||||||
|
async (offset: number) => {
|
||||||
|
setBusy(true);
|
||||||
|
setError(null);
|
||||||
|
const params = new URLSearchParams({ limit: String(PAGE), offset: String(offset) });
|
||||||
|
if (source) params.set("source", source);
|
||||||
|
if (outcome) params.set("outcome", outcome);
|
||||||
|
try {
|
||||||
|
const page = await api<Page>(`/admin/errors?${params}`);
|
||||||
|
setErrors((all) => (offset === 0 ? page.errors : [...(all ?? []), ...page.errors]));
|
||||||
|
setTotal(page.total);
|
||||||
|
setLastDay(page.last_day);
|
||||||
|
} catch (e) {
|
||||||
|
setError(errorText(e));
|
||||||
|
} finally {
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[source, outcome],
|
||||||
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
load(0);
|
||||||
|
}, [load]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<section className="card" style={{ gap: 12 }}>
|
||||||
|
<div className="row" style={{ gap: 12, flexWrap: "wrap", alignItems: "flex-end" }}>
|
||||||
|
<div className="field">
|
||||||
|
<label htmlFor="error-source">Mi</label>
|
||||||
|
<select id="error-source" className="inp" value={source} onChange={(e) => setSource(e.target.value)}>
|
||||||
|
<option value="">mind</option>
|
||||||
|
{Object.entries(SOURCES).map(([v, l]) => (
|
||||||
|
<option key={v} value={v}>
|
||||||
|
{l}
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div className="field">
|
||||||
|
<label htmlFor="error-outcome">Következmény</label>
|
||||||
|
<select id="error-outcome" className="inp" value={outcome} onChange={(e) => setOutcome(e.target.value)}>
|
||||||
|
<option value="">mind</option>
|
||||||
|
{Object.entries(OUTCOMES).map(([v, o]) => (
|
||||||
|
<option key={v} value={v}>
|
||||||
|
{o.label}
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<p className="hint" style={{ margin: 0 }}>
|
||||||
|
{total} bejegyzés, ebből {lastDay} az elmúlt 24 órában
|
||||||
|
</p>
|
||||||
|
<button type="button" className="btn btn-sm btn-ghost" onClick={() => load(0)} disabled={busy}>
|
||||||
|
Frissítés
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
{error && (
|
||||||
|
<p className="msg msg-error" role="alert">
|
||||||
|
{error}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
{errors === null ? (
|
||||||
|
<p className="muted">Betöltés…</p>
|
||||||
|
) : errors.length === 0 ? (
|
||||||
|
<p className="muted">Nincs hiba. 🎉</p>
|
||||||
|
) : (
|
||||||
|
<div className="table-wrap">
|
||||||
|
<table className="error-log">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Időpont</th>
|
||||||
|
<th>Mi</th>
|
||||||
|
<th>Modell</th>
|
||||||
|
<th>Kísérlet</th>
|
||||||
|
<th>Következmény</th>
|
||||||
|
<th>Hiba</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{errors.map((e) => (
|
||||||
|
<tr key={e.id}>
|
||||||
|
<td className="num">{formatDate(e.created_at, true)}</td>
|
||||||
|
<td>
|
||||||
|
{SOURCES[e.source] ?? e.source}
|
||||||
|
{e.source !== "question" && ` (${KINDS[e.kind] ?? e.kind})`}
|
||||||
|
{e.user && <span className="hint">{e.user}</span>}
|
||||||
|
<code className="hint" title={e.item_id}>
|
||||||
|
{e.item_id.slice(0, 8)}
|
||||||
|
</code>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<code>{e.model}</code>
|
||||||
|
</td>
|
||||||
|
<td className="num">
|
||||||
|
{e.attempt}.{e.seconds !== null && <span className="hint">{e.seconds} mp</span>}
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<span className={`outcome tone-${OUTCOMES[e.outcome].tone}`}>{OUTCOMES[e.outcome].label}</span>
|
||||||
|
</td>
|
||||||
|
<td className="error-text">{e.error}</td>
|
||||||
|
</tr>
|
||||||
|
))}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{errors && errors.length < total && (
|
||||||
|
<button type="button" className="btn btn-sm" onClick={() => load(errors.length)} disabled={busy}>
|
||||||
|
{busy ? "Betöltés…" : "Régebbiek"}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</section>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
import type { Metadata } from "next";
|
||||||
|
import { notFound } from "next/navigation";
|
||||||
|
|
||||||
|
import { AdminNav } from "@/components/AdminNav";
|
||||||
|
import { requireMe } from "@/lib/server";
|
||||||
|
|
||||||
|
import { ErrorLog } from "./ErrorLog";
|
||||||
|
|
||||||
|
export const metadata: Metadata = { title: "Hibanapló" };
|
||||||
|
|
||||||
|
export default async function AdminErrorsPage() {
|
||||||
|
const me = await requireMe("/admin/hibak");
|
||||||
|
if (!me.user.roles.includes("admin")) notFound();
|
||||||
|
return (
|
||||||
|
<main className="page" style={{ maxWidth: 1180 }}>
|
||||||
|
<AdminNav current="/admin/hibak" />
|
||||||
|
<div className="page-head">
|
||||||
|
<h1>Hibanapló</h1>
|
||||||
|
<p className="muted">
|
||||||
|
Az elemzések, válaszok és prompt-próbák minden sikertelen próbálkozása, a legújabb elöl. A worker írja; 90 napig
|
||||||
|
őrizzük.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<ErrorLog />
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
import { useCallback, useEffect, useState } from "react";
|
import { useCallback, useEffect, useState } from "react";
|
||||||
|
|
||||||
|
import { usePackages } from "@/components/PackageCards";
|
||||||
import { api, errorText } from "@/lib/api";
|
import { api, errorText } from "@/lib/api";
|
||||||
import { formatDate } from "@/lib/astro";
|
import { formatDate } from "@/lib/astro";
|
||||||
import type { AdminInvitation, InvitationResult, WaitlistEntry } from "@/lib/types";
|
import type { AdminInvitation, InvitationResult, WaitlistEntry } from "@/lib/types";
|
||||||
@@ -104,6 +105,8 @@ function InviteForm({ onSent }: { onSent: () => Promise<void> }) {
|
|||||||
const [emails, setEmails] = useState("");
|
const [emails, setEmails] = useState("");
|
||||||
const [message, setMessage] = useState("");
|
const [message, setMessage] = useState("");
|
||||||
const [locale, setLocale] = useState("hu");
|
const [locale, setLocale] = useState("hu");
|
||||||
|
const [pkg, setPkg] = useState("");
|
||||||
|
const packages = usePackages();
|
||||||
const [busy, setBusy] = useState(false);
|
const [busy, setBusy] = useState(false);
|
||||||
const [error, setError] = useState<string | null>(null);
|
const [error, setError] = useState<string | null>(null);
|
||||||
const [results, setResults] = useState<InvitationResult[] | null>(null);
|
const [results, setResults] = useState<InvitationResult[] | null>(null);
|
||||||
@@ -116,7 +119,7 @@ function InviteForm({ onSent }: { onSent: () => Promise<void> }) {
|
|||||||
setResults(null);
|
setResults(null);
|
||||||
try {
|
try {
|
||||||
const res = await api<{ results: InvitationResult[] }>("/admin/invitations", {
|
const res = await api<{ results: InvitationResult[] }>("/admin/invitations", {
|
||||||
body: { emails: parseEmails(emails), message: message.trim() || null, locale },
|
body: { emails: parseEmails(emails), message: message.trim() || null, locale, package: pkg || null },
|
||||||
});
|
});
|
||||||
setResults(res.results);
|
setResults(res.results);
|
||||||
if (res.results.some((r) => r.status === "invited")) setEmails("");
|
if (res.results.some((r) => r.status === "invited")) setEmails("");
|
||||||
@@ -163,6 +166,17 @@ function InviteForm({ onSent }: { onSent: () => Promise<void> }) {
|
|||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div className="row" style={{ gap: 12, alignItems: "flex-end", flexWrap: "wrap" }}>
|
<div className="row" style={{ gap: 12, alignItems: "flex-end", flexWrap: "wrap" }}>
|
||||||
|
<div className="field" style={{ minWidth: 220 }}>
|
||||||
|
<label htmlFor="invite-package">Ajándék csomag</label>
|
||||||
|
<select id="invite-package" className="inp" value={pkg} onChange={(e) => setPkg(e.target.value)}>
|
||||||
|
<option value="">nincs</option>
|
||||||
|
{(packages ?? []).map((p) => (
|
||||||
|
<option key={p.id} value={p.id}>
|
||||||
|
{p.name}
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
<div className="field" style={{ width: 160 }}>
|
<div className="field" style={{ width: 160 }}>
|
||||||
<label htmlFor="invite-locale">A levél nyelve</label>
|
<label htmlFor="invite-locale">A levél nyelve</label>
|
||||||
<select id="invite-locale" className="inp" value={locale} onChange={(e) => setLocale(e.target.value)}>
|
<select id="invite-locale" className="inp" value={locale} onChange={(e) => setLocale(e.target.value)}>
|
||||||
@@ -175,6 +189,12 @@ function InviteForm({ onSent }: { onSent: () => Promise<void> }) {
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
{pkg && (
|
||||||
|
<p className="hint" style={{ margin: 0 }}>
|
||||||
|
Minden meghívott kap egy promókódot erre a csomagra. A levélben benne lesz, és a regisztrációkor magától
|
||||||
|
beváltódik. A meghívó visszavonása a kódot is visszavonja.
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
{error && (
|
{error && (
|
||||||
<p className="msg msg-error" role="alert">
|
<p className="msg msg-error" role="alert">
|
||||||
{error}
|
{error}
|
||||||
@@ -187,18 +207,19 @@ function InviteForm({ onSent }: { onSent: () => Promise<void> }) {
|
|||||||
<span className={r.status === "invited" ? "msg-ok" : "muted"}>
|
<span className={r.status === "invited" ? "msg-ok" : "muted"}>
|
||||||
{r.email}: {RESULT[r.status]}
|
{r.email}: {RESULT[r.status]}
|
||||||
</span>
|
</span>
|
||||||
|
{r.promo_code && <code className="promo-code">{r.promo_code}</code>}
|
||||||
{r.url && <CopyLink url={r.url} />}
|
{r.url && <CopyLink url={r.url} />}
|
||||||
</li>
|
</li>
|
||||||
))}
|
))}
|
||||||
</ul>
|
</ul>
|
||||||
)}
|
)}
|
||||||
<MailPreview message={message} locale={locale} />
|
<MailPreview message={message} locale={locale} pkg={pkg} />
|
||||||
</section>
|
</section>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** The invitation e-mail as the recipient sees it, and a test copy to the admin. */
|
/** The invitation e-mail as the recipient sees it, and a test copy to the admin. */
|
||||||
function MailPreview({ message, locale }: { message: string; locale: string }) {
|
function MailPreview({ message, locale, pkg }: { message: string; locale: string; pkg: string }) {
|
||||||
const [mail, setMail] = useState<{ subject: string; html: string; text: string } | null>(null);
|
const [mail, setMail] = useState<{ subject: string; html: string; text: string } | null>(null);
|
||||||
const [view, setView] = useState<"html" | "text">("html");
|
const [view, setView] = useState<"html" | "text">("html");
|
||||||
const [busy, setBusy] = useState(false);
|
const [busy, setBusy] = useState(false);
|
||||||
@@ -210,7 +231,7 @@ function MailPreview({ message, locale }: { message: string; locale: string }) {
|
|||||||
try {
|
try {
|
||||||
const res = await api<{ subject: string; html: string; text: string; sent_to: string | null }>(
|
const res = await api<{ subject: string; html: string; text: string; sent_to: string | null }>(
|
||||||
"/admin/invitations/preview",
|
"/admin/invitations/preview",
|
||||||
{ body: { message: message.trim() || null, locale, send_to_me: sendToMe } },
|
{ body: { message: message.trim() || null, locale, send_to_me: sendToMe, package: pkg || null } },
|
||||||
);
|
);
|
||||||
setMail(res);
|
setMail(res);
|
||||||
if (res.sent_to) setNote({ ok: true, text: `Tesztlevél a sorban: ${res.sent_to}. A linkjei nem működnek.` });
|
if (res.sent_to) setNote({ ok: true, text: `Tesztlevél a sorban: ${res.sent_to}. A linkjei nem működnek.` });
|
||||||
@@ -337,6 +358,12 @@ function InvitationRow({ invitation: i, onChange }: { invitation: AdminInvitatio
|
|||||||
<td>
|
<td>
|
||||||
<span className={`badge invite-${i.status}`}>{STATUS[i.status]}</span>
|
<span className={`badge invite-${i.status}`}>{STATUS[i.status]}</span>
|
||||||
{i.accepted_by && <div className="hint">{i.accepted_by}</div>}
|
{i.accepted_by && <div className="hint">{i.accepted_by}</div>}
|
||||||
|
{i.package && (
|
||||||
|
<div className="hint" title={i.package.code ?? undefined}>
|
||||||
|
Ajándék: {i.package.name ?? i.package.id}
|
||||||
|
{i.package.redeemed_at ? " (beváltva)" : ""}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<span className={i.mail === "failed" ? "msg-error" : i.mail === "queued" ? "muted" : undefined}>
|
<span className={i.mail === "failed" ? "msg-error" : i.mail === "queued" ? "muted" : undefined}>
|
||||||
@@ -376,13 +403,15 @@ function InvitationRow({ invitation: i, onChange }: { invitation: AdminInvitatio
|
|||||||
function WaitlistTable({ waitlist, onChange }: { waitlist: WaitlistEntry[]; onChange: () => Promise<void> }) {
|
function WaitlistTable({ waitlist, onChange }: { waitlist: WaitlistEntry[]; onChange: () => Promise<void> }) {
|
||||||
const [busy, setBusy] = useState<string | null>(null);
|
const [busy, setBusy] = useState<string | null>(null);
|
||||||
const [note, setNote] = useState<string | null>(null);
|
const [note, setNote] = useState<string | null>(null);
|
||||||
|
const [pkg, setPkg] = useState("");
|
||||||
|
const packages = usePackages();
|
||||||
|
|
||||||
async function invite(w: WaitlistEntry) {
|
async function invite(w: WaitlistEntry) {
|
||||||
setBusy(w.email);
|
setBusy(w.email);
|
||||||
setNote(null);
|
setNote(null);
|
||||||
try {
|
try {
|
||||||
const res = await api<{ results: InvitationResult[] }>("/admin/invitations", {
|
const res = await api<{ results: InvitationResult[] }>("/admin/invitations", {
|
||||||
body: { emails: [w.email], locale: w.locale },
|
body: { emails: [w.email], locale: w.locale, package: pkg || null },
|
||||||
});
|
});
|
||||||
const r = res.results[0];
|
const r = res.results[0];
|
||||||
if (r && r.status !== "invited") setNote(`${r.email}: ${RESULT[r.status]}`);
|
if (r && r.status !== "invited") setNote(`${r.email}: ${RESULT[r.status]}`);
|
||||||
@@ -413,6 +442,20 @@ function WaitlistTable({ waitlist, onChange }: { waitlist: WaitlistEntry[]; onCh
|
|||||||
Várólista
|
Várólista
|
||||||
</h2>
|
</h2>
|
||||||
<p className="hint">Akik meghívó nélkül próbáltak belépni, és kérték, hogy szóljunk nekik.</p>
|
<p className="hint">Akik meghívó nélkül próbáltak belépni, és kérték, hogy szóljunk nekik.</p>
|
||||||
|
{waitlist.some((w) => w.invitation === null) && (
|
||||||
|
<div className="field" style={{ maxWidth: 320 }}>
|
||||||
|
<label htmlFor="waitlist-package">Ajándék csomag a meghívottaknak</label>
|
||||||
|
<select id="waitlist-package" className="inp" value={pkg} onChange={(e) => setPkg(e.target.value)}>
|
||||||
|
<option value="">nincs</option>
|
||||||
|
{(packages ?? []).map((p) => (
|
||||||
|
<option key={p.id} value={p.id}>
|
||||||
|
{p.name}
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
<span className="hint">A „Meghívás” gomb ezzel a csomaggal küldi a meghívót; a regisztrációkor magától jóváíródik.</span>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
{note && (
|
{note && (
|
||||||
<p className="msg msg-error" role="alert">
|
<p className="msg msg-error" role="alert">
|
||||||
{note}
|
{note}
|
||||||
|
|||||||
@@ -4,13 +4,17 @@ import { useEffect, useMemo, useState } from "react";
|
|||||||
|
|
||||||
import { api, errorText } from "@/lib/api";
|
import { api, errorText } from "@/lib/api";
|
||||||
import { formatDate } from "@/lib/astro";
|
import { formatDate } from "@/lib/astro";
|
||||||
import type { CatalogModel, ModelFunction, PromptKind } from "@/lib/types";
|
import type { CatalogModel, ModelFunction } from "@/lib/types";
|
||||||
|
|
||||||
const LABELS: Record<Exclude<PromptKind, "question">, { title: string; about: string }> = {
|
import { RunningJobs } from "./RunningJobs";
|
||||||
|
|
||||||
|
const LABELS: Record<ModelFunction["kind"], { title: string; about: string }> = {
|
||||||
summary: { title: "Tömör összefoglaló", about: "Ingyenes, minden új képlethez magától elkészül. Olcsó, gyors modell elég." },
|
summary: { title: "Tömör összefoglaló", about: "Ingyenes, minden új képlethez magától elkészül. Olcsó, gyors modell elég." },
|
||||||
natal: { title: "Részletes képletelemzés", about: "Fizetős, hat fejezet." },
|
analysis: {
|
||||||
synastry: { title: "Kapcsolati elemzés", about: "Fizetős, öt fejezet két képletről." },
|
title: "Elemzések és éves előrejelzés",
|
||||||
forecast: { title: "Éves előrejelzés", about: "Fizetős, öt fejezet, a leghosszabb adatsorral." },
|
about: "Fizetős szövegek: részletes képletelemzés, kapcsolati elemzés és éves előrejelzés.",
|
||||||
|
},
|
||||||
|
question: { title: "Kérdés-válasz", about: "A kész elemzésekre és előrejelzésekre feltett kérdések válasza (legfeljebb 250 szó)." },
|
||||||
};
|
};
|
||||||
|
|
||||||
/** How many models the picker lists at once (narrow it with the search). */
|
/** How many models the picker lists at once (narrow it with the search). */
|
||||||
@@ -58,11 +62,13 @@ export function AdminModels() {
|
|||||||
</p>
|
</p>
|
||||||
)}
|
)}
|
||||||
<p className="hint">
|
<p className="hint">
|
||||||
Az elemzésekre feltett kérdésekre mindig ugyanaz a modell válaszol, amelyik az adott elemzést írta.
|
Tartalék: ha a választott modell kétszer hibára fut (vagy egyszer végleges hibával), az alapértelmezett modell írja
|
||||||
|
meg a szöveget. Csak ha az is elbukik, kapja vissza a felhasználó az egységét.
|
||||||
</p>
|
</p>
|
||||||
{functions.map((f) => (
|
{functions.map((f) => (
|
||||||
<FunctionModel key={f.kind} fn={f} catalog={catalog} onSaved={replace} />
|
<FunctionModel key={f.kind} fn={f} catalog={catalog} onSaved={replace} />
|
||||||
))}
|
))}
|
||||||
|
<RunningJobs />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -82,7 +88,7 @@ function FunctionModel({
|
|||||||
const [error, setError] = useState<string | null>(null);
|
const [error, setError] = useState<string | null>(null);
|
||||||
const current = catalog?.find((m) => m.id === fn.model);
|
const current = catalog?.find((m) => m.id === fn.model);
|
||||||
const cost = estimate(fn, current);
|
const cost = estimate(fn, current);
|
||||||
const label = LABELS[fn.kind as keyof typeof LABELS];
|
const label = LABELS[fn.kind];
|
||||||
const searchId = `model-search-${fn.kind}`;
|
const searchId = `model-search-${fn.kind}`;
|
||||||
|
|
||||||
const matches = useMemo(() => {
|
const matches = useMemo(() => {
|
||||||
@@ -134,6 +140,11 @@ function FunctionModel({
|
|||||||
? `Módosítva: ${fn.updated_at ? formatDate(fn.updated_at, true) : ""}${fn.updated_by ? `, ${fn.updated_by}` : ""}`
|
? `Módosítva: ${fn.updated_at ? formatDate(fn.updated_at, true) : ""}${fn.updated_by ? `, ${fn.updated_by}` : ""}`
|
||||||
: "Alapértelmezett"}
|
: "Alapértelmezett"}
|
||||||
</span>
|
</span>
|
||||||
|
{fn.custom && (
|
||||||
|
<span className={fn.fallbacks_30d > 0 ? "hint warn" : "hint"}>
|
||||||
|
Tartalék: {fn.default} · az elmúlt 30 napban {fn.fallbacks_30d} / {fn.finished_30d} szövegnél kellett
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="form-actions">
|
<div className="form-actions">
|
||||||
|
|||||||
@@ -0,0 +1,138 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useCallback, useEffect, useState } from "react";
|
||||||
|
|
||||||
|
import { api, errorText } from "@/lib/api";
|
||||||
|
import type { AdminJob } from "@/lib/types";
|
||||||
|
|
||||||
|
const KINDS: Record<AdminJob["kind"], string> = {
|
||||||
|
summary: "Összefoglaló",
|
||||||
|
natal: "Képletelemzés",
|
||||||
|
synastry: "Kapcsolati elemzés",
|
||||||
|
forecast: "Éves előrejelzés",
|
||||||
|
question: "Kérdés-válasz",
|
||||||
|
};
|
||||||
|
|
||||||
|
const REFRESH_MS = 10_000;
|
||||||
|
|
||||||
|
function since(iso: string): string {
|
||||||
|
const minutes = Math.max(0, Math.round((Date.now() - new Date(iso).getTime()) / 60_000));
|
||||||
|
return minutes < 1 ? "most" : `${minutes} perce`;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Analyses and answers being written or waiting. A restart starts them again
|
||||||
|
* with the models set now; an attempt still running is dropped by the worker.
|
||||||
|
*/
|
||||||
|
export function RunningJobs() {
|
||||||
|
const [jobs, setJobs] = useState<AdminJob[] | null>(null);
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
const [asking, setAsking] = useState(false);
|
||||||
|
const [message, setMessage] = useState<string | null>(null);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
|
||||||
|
const load = useCallback(() => {
|
||||||
|
api<{ jobs: AdminJob[] }>("/admin/jobs")
|
||||||
|
.then((d) => setJobs(d.jobs))
|
||||||
|
.catch((e) => setError(errorText(e)));
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
load();
|
||||||
|
const timer = setInterval(load, REFRESH_MS);
|
||||||
|
return () => clearInterval(timer);
|
||||||
|
}, [load]);
|
||||||
|
|
||||||
|
async function restart(ids?: string[]) {
|
||||||
|
setBusy(true);
|
||||||
|
setError(null);
|
||||||
|
setMessage(null);
|
||||||
|
try {
|
||||||
|
const r = await api<{ restarted: number; jobs: AdminJob[] }>("/admin/jobs/restart", { body: ids ? { ids } : {} });
|
||||||
|
setJobs(r.jobs);
|
||||||
|
setMessage(r.restarted > 0 ? `${r.restarted} generálás újraindítva.` : "Nem volt mit újraindítani.");
|
||||||
|
setAsking(false);
|
||||||
|
} catch (e) {
|
||||||
|
setError(errorText(e));
|
||||||
|
} finally {
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const changed = (jobs ?? []).filter((j) => j.model !== j.next_model).length;
|
||||||
|
return (
|
||||||
|
<section className="card model-card" aria-labelledby="jobs-title">
|
||||||
|
<div className="model-head">
|
||||||
|
<div>
|
||||||
|
<h2 id="jobs-title">Futó generálások</h2>
|
||||||
|
<p className="hint">
|
||||||
|
Az éppen készülő és a sorban álló elemzések és válaszok. Újraindításkor mindegyik azzal a modellel indul újra,
|
||||||
|
ami most be van állítva; a még futó régi kérést a worker eldobja. Senkitől nem von le újabb egységet.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
{jobs && jobs.length > 0 && (
|
||||||
|
<div className="regenerate">
|
||||||
|
{asking ? (
|
||||||
|
<>
|
||||||
|
<span className="hint">
|
||||||
|
{jobs.length} generálás indul újra{changed > 0 ? `, ebből ${changed} másik modellel` : ""}.
|
||||||
|
</span>
|
||||||
|
<button type="button" className="btn btn-sm" onClick={() => restart()} disabled={busy}>
|
||||||
|
{busy ? "Újraindítás…" : "Igen, mind"}
|
||||||
|
</button>
|
||||||
|
<button type="button" className="btn btn-sm btn-ghost" onClick={() => setAsking(false)} disabled={busy}>
|
||||||
|
Mégse
|
||||||
|
</button>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<button type="button" className="btn btn-sm" onClick={() => setAsking(true)}>
|
||||||
|
↻ Mind újraindítása ({jobs.length})
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
{message && (
|
||||||
|
<p className="msg" role="status">
|
||||||
|
{message}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
{error && (
|
||||||
|
<p className="msg msg-error" role="alert">
|
||||||
|
{error}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
{jobs === null ? (
|
||||||
|
<p className="muted">Betöltés…</p>
|
||||||
|
) : jobs.length === 0 ? (
|
||||||
|
<p className="muted">Most semmi nem készül és semmi nem vár a sorban.</p>
|
||||||
|
) : (
|
||||||
|
<ul className="model-options">
|
||||||
|
{jobs.map((j) => (
|
||||||
|
<li key={j.id} className="job-row">
|
||||||
|
<span>
|
||||||
|
<strong>{KINDS[j.kind]}</strong>
|
||||||
|
<span className="hint">
|
||||||
|
{j.status === "running" && j.started_at
|
||||||
|
? `fut, ${since(j.started_at)} indult`
|
||||||
|
: `vár (kérve ${since(j.created_at)})`}
|
||||||
|
{j.attempts > 0 ? ` · ${j.attempts}. kísérlet` : ""}
|
||||||
|
{j.on_fallback ? " · tartalék modellel" : ""}
|
||||||
|
</span>
|
||||||
|
{j.error && <span className="hint">utolsó hiba: {j.error}</span>}
|
||||||
|
</span>
|
||||||
|
<span className="model-price">
|
||||||
|
<code>{j.model}</code>
|
||||||
|
{j.model !== j.next_model ? <strong>→ {j.next_model}</strong> : <span>újraindítva is ez</span>}
|
||||||
|
</span>
|
||||||
|
<button type="button" className="btn btn-sm btn-ghost" onClick={() => restart([j.id])} disabled={busy}>
|
||||||
|
↻
|
||||||
|
<span className="sr-only"> Újraindítás</span>
|
||||||
|
</button>
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
)}
|
||||||
|
</section>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,285 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useCallback, useEffect, useState } from "react";
|
||||||
|
|
||||||
|
import { api, errorText } from "@/lib/api";
|
||||||
|
import { formatDate } from "@/lib/astro";
|
||||||
|
import type { Package, PromoCode } from "@/lib/types";
|
||||||
|
|
||||||
|
const PAGE = 100;
|
||||||
|
|
||||||
|
const STATUSES: Record<string, string> = {
|
||||||
|
unused: "fel nem használt",
|
||||||
|
used: "beváltott",
|
||||||
|
revoked: "visszavont",
|
||||||
|
all: "mind",
|
||||||
|
};
|
||||||
|
|
||||||
|
interface Page {
|
||||||
|
codes: PromoCode[];
|
||||||
|
total: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Making promo codes and the filtered list of them. */
|
||||||
|
export function PromoCodes({ packages }: { packages: Package[] }) {
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<NewCodes packages={packages} />
|
||||||
|
<CodeList packages={packages} />
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function NewCodes({ packages }: { packages: Package[] }) {
|
||||||
|
const [pkg, setPkg] = useState(packages.find((p) => p.id === "single")?.id ?? packages[0]?.id ?? "");
|
||||||
|
const [count, setCount] = useState(1);
|
||||||
|
const [note, setNote] = useState("");
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const [made, setMade] = useState<{ codes: string[]; package: string } | null>(null);
|
||||||
|
const [copied, setCopied] = useState(false);
|
||||||
|
|
||||||
|
async function create(e: React.FormEvent) {
|
||||||
|
e.preventDefault();
|
||||||
|
setBusy(true);
|
||||||
|
setError(null);
|
||||||
|
try {
|
||||||
|
const r = await api<{ codes: string[]; package: string }>("/admin/promo-codes", {
|
||||||
|
body: { package: pkg, count, note: note || null },
|
||||||
|
});
|
||||||
|
setMade(r);
|
||||||
|
setCopied(false);
|
||||||
|
window.dispatchEvent(new Event("promo-codes-changed"));
|
||||||
|
} catch (err) {
|
||||||
|
setError(errorText(err));
|
||||||
|
} finally {
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function copy() {
|
||||||
|
if (!made) return;
|
||||||
|
await navigator.clipboard.writeText(made.codes.join("\n"));
|
||||||
|
setCopied(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<section className="card" aria-labelledby="new-codes" style={{ gap: 14 }}>
|
||||||
|
<h2 id="new-codes">Új kódok</h2>
|
||||||
|
<form className="promo-form" onSubmit={create}>
|
||||||
|
<div className="field">
|
||||||
|
<label htmlFor="promo-package">Csomag</label>
|
||||||
|
<select id="promo-package" className="inp" value={pkg} onChange={(e) => setPkg(e.target.value)}>
|
||||||
|
{packages.map((p) => (
|
||||||
|
<option key={p.id} value={p.id}>
|
||||||
|
{p.name} ({p.tier === "main" ? "csomag" : "kiegészítő"})
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div className="field">
|
||||||
|
<label htmlFor="promo-count">Darab</label>
|
||||||
|
<input
|
||||||
|
id="promo-count"
|
||||||
|
className="inp"
|
||||||
|
type="number"
|
||||||
|
min={1}
|
||||||
|
max={500}
|
||||||
|
value={count}
|
||||||
|
onChange={(e) => setCount(Math.max(1, Math.min(500, Number(e.target.value) || 1)))}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="field promo-note">
|
||||||
|
<label htmlFor="promo-note">Megjegyzés (kinek, melyik kampány)</label>
|
||||||
|
<input
|
||||||
|
id="promo-note"
|
||||||
|
className="inp"
|
||||||
|
value={note}
|
||||||
|
maxLength={200}
|
||||||
|
onChange={(e) => setNote(e.target.value)}
|
||||||
|
placeholder="pl. meghívottak, első kör"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<button type="submit" className="btn btn-primary" disabled={busy || !pkg}>
|
||||||
|
{busy ? "Készül…" : "Kódok készítése"}
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
{error && (
|
||||||
|
<p className="msg msg-error" role="alert">
|
||||||
|
{error}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
{made && (
|
||||||
|
<div className="promo-made">
|
||||||
|
<p className="msg msg-ok" role="status">
|
||||||
|
{made.codes.length} új kód: {packages.find((p) => p.id === made.package)?.name ?? made.package}
|
||||||
|
</p>
|
||||||
|
<textarea className="inp promo-codes" readOnly rows={Math.min(made.codes.length, 10)} value={made.codes.join("\n")} />
|
||||||
|
<button type="button" className="btn btn-sm" onClick={copy}>
|
||||||
|
{copied ? "Kimásolva" : "Mind másolása"}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</section>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function CodeList({ packages }: { packages: Package[] }) {
|
||||||
|
const [status, setStatus] = useState("unused");
|
||||||
|
const [pkg, setPkg] = useState("");
|
||||||
|
const [q, setQ] = useState("");
|
||||||
|
const [query, setQuery] = useState("");
|
||||||
|
const [codes, setCodes] = useState<PromoCode[] | null>(null);
|
||||||
|
const [total, setTotal] = useState(0);
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
|
||||||
|
const load = useCallback(
|
||||||
|
async (offset: number) => {
|
||||||
|
setBusy(true);
|
||||||
|
setError(null);
|
||||||
|
const params = new URLSearchParams({ status, limit: String(PAGE), offset: String(offset) });
|
||||||
|
if (pkg) params.set("package", pkg);
|
||||||
|
if (query) params.set("q", query);
|
||||||
|
try {
|
||||||
|
const page = await api<Page>(`/admin/promo-codes?${params}`);
|
||||||
|
setCodes((all) => (offset === 0 ? page.codes : [...(all ?? []), ...page.codes]));
|
||||||
|
setTotal(page.total);
|
||||||
|
} catch (e) {
|
||||||
|
setError(errorText(e));
|
||||||
|
} finally {
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[status, pkg, query],
|
||||||
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
load(0);
|
||||||
|
const reload = () => load(0);
|
||||||
|
window.addEventListener("promo-codes-changed", reload);
|
||||||
|
return () => window.removeEventListener("promo-codes-changed", reload);
|
||||||
|
}, [load]);
|
||||||
|
|
||||||
|
// Searching after a short pause in typing.
|
||||||
|
useEffect(() => {
|
||||||
|
const t = setTimeout(() => setQuery(q.trim()), 300);
|
||||||
|
return () => clearTimeout(t);
|
||||||
|
}, [q]);
|
||||||
|
|
||||||
|
async function revoke(c: PromoCode) {
|
||||||
|
if (!window.confirm(`Visszavonod a(z) ${c.code} kódot? Utána nem váltható be.`)) return;
|
||||||
|
try {
|
||||||
|
await api(`/admin/promo-codes/${c.id}/revoke`, { body: {} });
|
||||||
|
load(0);
|
||||||
|
} catch (e) {
|
||||||
|
setError(errorText(e));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<section className="card" aria-labelledby="code-list" style={{ gap: 12 }}>
|
||||||
|
<h2 id="code-list">Kódok</h2>
|
||||||
|
<div className="row" style={{ gap: 12, alignItems: "flex-end" }}>
|
||||||
|
<div className="field">
|
||||||
|
<label htmlFor="code-status">Állapot</label>
|
||||||
|
<select id="code-status" className="inp" value={status} onChange={(e) => setStatus(e.target.value)}>
|
||||||
|
{Object.entries(STATUSES).map(([v, l]) => (
|
||||||
|
<option key={v} value={v}>
|
||||||
|
{l}
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div className="field">
|
||||||
|
<label htmlFor="code-package">Csomag</label>
|
||||||
|
<select id="code-package" className="inp" value={pkg} onChange={(e) => setPkg(e.target.value)}>
|
||||||
|
<option value="">mind</option>
|
||||||
|
{packages.map((p) => (
|
||||||
|
<option key={p.id} value={p.id}>
|
||||||
|
{p.name}
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div className="field" style={{ flex: "1 1 220px" }}>
|
||||||
|
<label htmlFor="code-search">Keresés</label>
|
||||||
|
<input
|
||||||
|
id="code-search"
|
||||||
|
className="inp"
|
||||||
|
type="search"
|
||||||
|
value={q}
|
||||||
|
onChange={(e) => setQ(e.target.value)}
|
||||||
|
placeholder="kód, megjegyzés vagy e-mail"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<p className="hint" style={{ margin: 0 }}>
|
||||||
|
{total} kód
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
{error && (
|
||||||
|
<p className="msg msg-error" role="alert">
|
||||||
|
{error}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
{codes === null ? (
|
||||||
|
<p className="muted">Betöltés…</p>
|
||||||
|
) : codes.length === 0 ? (
|
||||||
|
<p className="muted">Nincs ilyen kód.</p>
|
||||||
|
) : (
|
||||||
|
<div className="table-wrap">
|
||||||
|
<table className="promo-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Kód</th>
|
||||||
|
<th>Csomag</th>
|
||||||
|
<th>Megjegyzés</th>
|
||||||
|
<th>Készült</th>
|
||||||
|
<th>Állapot</th>
|
||||||
|
<th />
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{codes.map((c) => (
|
||||||
|
<tr key={c.id}>
|
||||||
|
<td>
|
||||||
|
<code className="promo-code">{c.code}</code>
|
||||||
|
</td>
|
||||||
|
<td>{c.package_name ?? c.package}</td>
|
||||||
|
<td>{c.note ?? <span className="muted">–</span>}</td>
|
||||||
|
<td className="num">{formatDate(c.created_at)}</td>
|
||||||
|
<td>
|
||||||
|
{c.redeemed_at ? (
|
||||||
|
<>
|
||||||
|
beváltva {formatDate(c.redeemed_at, true)}
|
||||||
|
{c.redeemed_by && (
|
||||||
|
<span className="hint">{c.redeemed_by.name ? `${c.redeemed_by.name} · ` : ""}{c.redeemed_by.email}</span>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
) : c.revoked_at ? (
|
||||||
|
<span className="muted">visszavonva {formatDate(c.revoked_at)}</span>
|
||||||
|
) : (
|
||||||
|
<span className="promo-open">szabad</span>
|
||||||
|
)}
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
{!c.redeemed_at && !c.revoked_at && (
|
||||||
|
<button type="button" className="btn btn-sm btn-ghost" onClick={() => revoke(c)}>
|
||||||
|
Visszavonás
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
))}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{codes && codes.length < total && (
|
||||||
|
<button type="button" className="btn btn-sm" onClick={() => load(codes.length)} disabled={busy}>
|
||||||
|
{busy ? "Betöltés…" : "Továbbiak"}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</section>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
import type { Metadata } from "next";
|
||||||
|
import { notFound } from "next/navigation";
|
||||||
|
|
||||||
|
import { AdminNav } from "@/components/AdminNav";
|
||||||
|
import { backendGet, requireMe } from "@/lib/server";
|
||||||
|
import type { Package } from "@/lib/types";
|
||||||
|
|
||||||
|
import { PromoCodes } from "./PromoCodes";
|
||||||
|
|
||||||
|
export const metadata: Metadata = { title: "Promókódok" };
|
||||||
|
|
||||||
|
export default async function AdminPromoPage() {
|
||||||
|
const me = await requireMe("/admin/promokodok");
|
||||||
|
if (!me.user.roles.includes("admin")) notFound();
|
||||||
|
const catalog = await backendGet<{ packages: Package[] }>("/v1/packages");
|
||||||
|
return (
|
||||||
|
<main className="page" style={{ maxWidth: 1180 }}>
|
||||||
|
<AdminNav current="/admin/promokodok" />
|
||||||
|
<div className="page-head">
|
||||||
|
<h1>Promókódok</h1>
|
||||||
|
<p className="muted">
|
||||||
|
Egy kód egy csomagot ad, és egyszer váltható be a „Kód beváltása” oldalon (a fejlécben). A beváltó link:
|
||||||
|
sorsfonalak.hu/bevaltas?kod=KÓD — ezt elég elküldeni, belépés után kitöltve várja.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<PromoCodes packages={catalog?.packages ?? []} />
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -40,7 +40,7 @@ const KINDS: { kind: PromptKind; id: string; label: string; about: string }[] =
|
|||||||
id: "kerdesek",
|
id: "kerdesek",
|
||||||
label: "Kérdés-válasz",
|
label: "Kérdés-válasz",
|
||||||
about:
|
about:
|
||||||
"A kész képletelemzésre vagy előrejelzésre feltett kérdések válasza (legfeljebb 250 szó). A modell kapja a képlet adatait, az elemzést és a korábbi kérdéseket; ugyanaz a modell válaszol, amelyik az elemzést írta.",
|
"A kész képletelemzésre, kapcsolati elemzésre vagy előrejelzésre feltett kérdések válasza (legfeljebb 250 szó). A modell kapja a képlet adatait, az elemzést és a korábbi kérdéseket; a Modellek oldalon beállított kérdés-válasz modell válaszol.",
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,21 @@
|
|||||||
// Forwards /api/v1/* to the backend, so the browser talks to one origin and
|
// Forwards /api/v1/* to the backend, so the browser talks to one origin and
|
||||||
// the session cookie belongs to the frontend's host (no CORS needed).
|
// the session cookie belongs to the frontend's host (no CORS needed).
|
||||||
|
import { revalidateTag } from "next/cache";
|
||||||
import type { NextRequest } from "next/server";
|
import type { NextRequest } from "next/server";
|
||||||
|
|
||||||
import { BACKEND_URL } from "@/lib/server";
|
import { BACKEND_URL } from "@/lib/server";
|
||||||
|
import { SHARES_TAG } from "@/lib/share";
|
||||||
|
|
||||||
const REQUEST_HEADERS = ["accept", "accept-language", "authorization", "content-type", "cookie", "user-agent"];
|
// stripe-signature: Stripe's webhook (the body is passed on byte for byte).
|
||||||
|
const REQUEST_HEADERS = [
|
||||||
|
"accept",
|
||||||
|
"accept-language",
|
||||||
|
"authorization",
|
||||||
|
"content-type",
|
||||||
|
"cookie",
|
||||||
|
"stripe-signature",
|
||||||
|
"user-agent",
|
||||||
|
];
|
||||||
// Hop-by-hop or re-computed by the runtime.
|
// Hop-by-hop or re-computed by the runtime.
|
||||||
const SKIP_RESPONSE_HEADERS = new Set(["connection", "content-encoding", "content-length", "set-cookie", "transfer-encoding"]);
|
const SKIP_RESPONSE_HEADERS = new Set(["connection", "content-encoding", "content-length", "set-cookie", "transfer-encoding"]);
|
||||||
|
|
||||||
@@ -38,6 +49,8 @@ async function forward(req: NextRequest, ctx: { params: Promise<{ path: string[]
|
|||||||
if (!SKIP_RESPONSE_HEADERS.has(name)) out.set(name, value);
|
if (!SKIP_RESPONSE_HEADERS.has(name)) out.set(name, value);
|
||||||
});
|
});
|
||||||
for (const cookie of res.headers.getSetCookie()) out.append("set-cookie", cookie);
|
for (const cookie of res.headers.getSetCookie()) out.append("set-cookie", cookie);
|
||||||
|
// A revoked link must disappear at once from the cached share pages.
|
||||||
|
if (req.method === "DELETE" && path[0] === "shares" && res.ok) revalidateTag(SHARES_TAG, { expire: 0 });
|
||||||
return new Response(res.body, { status: res.status, headers: out });
|
return new Response(res.body, { status: res.status, headers: out });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
|
After Width: | Height: | Size: 5.1 KiB |
@@ -72,7 +72,18 @@ export function GoogleLogin({
|
|||||||
setError(null);
|
setError(null);
|
||||||
setUninvited(null);
|
setUninvited(null);
|
||||||
try {
|
try {
|
||||||
await api("/auth/google", { body: { id_token: response.credential, invite_token: inviteToken } });
|
let referral: string | null = null;
|
||||||
|
try {
|
||||||
|
referral = localStorage.getItem("sf_ref");
|
||||||
|
} catch {
|
||||||
|
// storage blocked
|
||||||
|
}
|
||||||
|
await api("/auth/google", { body: { id_token: response.credential, invite_token: inviteToken, referral } });
|
||||||
|
try {
|
||||||
|
localStorage.removeItem("sf_ref");
|
||||||
|
} catch {
|
||||||
|
// storage blocked
|
||||||
|
}
|
||||||
router.replace(target);
|
router.replace(target);
|
||||||
router.refresh();
|
router.refresh();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
import type { Metadata } from "next";
|
||||||
|
|
||||||
|
import { RedeemCode } from "@/components/RedeemCode";
|
||||||
|
import { requireMe } from "@/lib/server";
|
||||||
|
|
||||||
|
export const metadata: Metadata = { title: "Promókód beváltása", robots: { index: false } };
|
||||||
|
|
||||||
|
type Props = { searchParams: Promise<{ kod?: string }> };
|
||||||
|
|
||||||
|
/** Redeeming a promo code; `?kod=` fills it in (links in invitations). */
|
||||||
|
export default async function RedeemPage({ searchParams }: Props) {
|
||||||
|
const { kod } = await searchParams;
|
||||||
|
await requireMe(kod ? `/bevaltas?kod=${encodeURIComponent(kod)}` : "/bevaltas");
|
||||||
|
return (
|
||||||
|
<main className="page" style={{ maxWidth: 640 }}>
|
||||||
|
<div className="page-head">
|
||||||
|
<span className="eyebrow">Promókód</span>
|
||||||
|
<h1>Promókód beváltása</h1>
|
||||||
|
<p className="muted">
|
||||||
|
Írd be a kapott kódot. Az egyenlegedet azonnal feltöltjük a csomag szintjéig: amit már elhasználtál belőle,
|
||||||
|
visszakapod, ami ennél több van, megmarad. Egy kód egyszer váltható be.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<section className="card">
|
||||||
|
<RedeemCode initial={kod ?? ""} />
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,13 +1,20 @@
|
|||||||
import type { Metadata } from "next";
|
import type { Metadata } from "next";
|
||||||
|
import Link from "next/link";
|
||||||
|
|
||||||
import { AiNote } from "@/components/AiNote";
|
import { AiNote } from "@/components/AiNote";
|
||||||
import { PackageCards } from "@/components/PackageCards";
|
import { PackageCards } from "@/components/PackageCards";
|
||||||
|
import { RedeemCode } from "@/components/RedeemCode";
|
||||||
|
import { payMethod } from "@/lib/payments";
|
||||||
import { backendGet, requireMe } from "@/lib/server";
|
import { backendGet, requireMe } from "@/lib/server";
|
||||||
import type { Package, PublicConfig } from "@/lib/types";
|
import type { Package, PublicConfig } from "@/lib/types";
|
||||||
|
|
||||||
export const metadata: Metadata = { title: "Csomagok" };
|
export const metadata: Metadata = { title: "Csomagok" };
|
||||||
|
|
||||||
const FAQ: [string, string][] = [
|
const FAQ: [string, string][] = [
|
||||||
|
[
|
||||||
|
"Biztonságos a fizetés?",
|
||||||
|
"Igen. A fizetés a Stripe biztonságos fizetési oldalán történik, bankkártyával, Apple Payjel vagy Google Payjel. A kártyaadataidat közvetlenül a Stripe-nak adod meg: hozzánk nem jutnak el, és nem is tároljuk őket. Cégként is vásárolhatsz, ilyenkor a cégnevet és az adószámot is megadhatod a számlához.",
|
||||||
|
],
|
||||||
[
|
[
|
||||||
"Lejárnak a megvett elemzések?",
|
"Lejárnak a megvett elemzések?",
|
||||||
"Nem. A csomagokban kapott elemzések és személyhelyek addig megmaradnak, amíg fel nem használod őket.",
|
"Nem. A csomagokban kapott elemzések és személyhelyek addig megmaradnak, amíg fel nem használod őket.",
|
||||||
@@ -22,7 +29,7 @@ const FAQ: [string, string][] = [
|
|||||||
],
|
],
|
||||||
[
|
[
|
||||||
"Mit jelent a kérdés?",
|
"Mit jelent a kérdés?",
|
||||||
"A kész részletes képletelemzé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, vagy mire figyelj egy időszakban. A választ ugyanaz a modell írja, amelyik az elemzést, a képleted és az elemzés alapján, 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.",
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
"Mire kell a személyhely?",
|
"Mire kell a személyhely?",
|
||||||
@@ -38,7 +45,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;
|
||||||
|
|
||||||
@@ -68,6 +75,22 @@ export default async function PackagesPage() {
|
|||||||
</p>
|
</p>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
<section className="card redeem-card" aria-labelledby="redeem-title">
|
||||||
|
<h2 id="redeem-title">Van promókódod?</h2>
|
||||||
|
<p className="muted">
|
||||||
|
{canPay
|
||||||
|
? "Váltsd be itt: a hozzá tartozó csomag azonnal a tiéd."
|
||||||
|
: "A csomagok hamarosan megvásárolhatók. Addig promókóddal juthatsz hozzájuk: a hozzá tartozó csomag azonnal a tiéd."}
|
||||||
|
</p>
|
||||||
|
<RedeemCode />
|
||||||
|
</section>
|
||||||
|
|
||||||
|
{me.invoice_count > 0 && (
|
||||||
|
<p className="hint">
|
||||||
|
A korábbi vásárlásaid számlái: <Link href="/szamlak">Számláim →</Link>
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
|
||||||
<PackageCards packages={packages} canPay={canPay} />
|
<PackageCards packages={packages} canPay={canPay} />
|
||||||
|
|
||||||
<section className="field" aria-labelledby="addon-title" style={{ gap: 12 }}>
|
<section className="field" aria-labelledby="addon-title" style={{ gap: 12 }}>
|
||||||
@@ -91,7 +114,11 @@ export default async function PackagesPage() {
|
|||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
</dl>
|
</dl>
|
||||||
<p className="hint">Az árak bruttó árak, az áfát tartalmazzák.</p>
|
<p className="hint">
|
||||||
|
{config?.vat === "AAM" || !config
|
||||||
|
? "Az árak végső árak: alanyi adómentesek vagyunk, áfát nem számítunk fel."
|
||||||
|
: `Az árak bruttó árak, a ${config.vat} áfát tartalmazzák.`}
|
||||||
|
</p>
|
||||||
</section>
|
</section>
|
||||||
</main>
|
</main>
|
||||||
);
|
);
|
||||||
|
|||||||
|
After Width: | Height: | Size: 3.2 KiB |
@@ -28,6 +28,8 @@
|
|||||||
html, body { margin: 0; }
|
html, body { margin: 0; }
|
||||||
body {
|
body {
|
||||||
min-height: 100vh;
|
min-height: 100vh;
|
||||||
|
overflow-x: clip; /* nothing may push the page sideways on a phone */
|
||||||
|
overflow-wrap: break-word;
|
||||||
background: var(--bg);
|
background: var(--bg);
|
||||||
color: var(--ink);
|
color: var(--ink);
|
||||||
font: 400 15px/1.55 var(--font-body);
|
font: 400 15px/1.55 var(--font-body);
|
||||||
@@ -50,8 +52,13 @@ p { margin: 0; }
|
|||||||
padding: 12px 24px; background: rgba(13, 18, 32, 0.94);
|
padding: 12px 24px; background: rgba(13, 18, 32, 0.94);
|
||||||
border-bottom: 1px solid var(--line); backdrop-filter: blur(6px);
|
border-bottom: 1px solid var(--line); backdrop-filter: blur(6px);
|
||||||
}
|
}
|
||||||
.logo { font-family: var(--font-display); font-size: 28px; font-weight: 600; color: var(--ink); text-decoration: none; letter-spacing: 0.3px; }
|
.logo {
|
||||||
.logo span { color: var(--gold); }
|
display: inline-flex; align-items: center; gap: 9px;
|
||||||
|
font-family: var(--font-display); font-size: 28px; font-weight: 600; color: var(--ink); text-decoration: none; letter-spacing: 0.3px;
|
||||||
|
}
|
||||||
|
.logo-word span { color: var(--gold); }
|
||||||
|
.logo-mark { width: 1.15em; height: 1.15em; flex: none; color: var(--gold); }
|
||||||
|
.logo-star { fill: var(--ink); }
|
||||||
.logo:hover { color: var(--ink); }
|
.logo:hover { color: var(--ink); }
|
||||||
.nav { display: flex; gap: 4px; flex: 1; }
|
.nav { display: flex; gap: 4px; flex: 1; }
|
||||||
.nav a { color: var(--ink-2); text-decoration: none; padding: 10px 12px; border-radius: 8px; min-height: 44px; display: inline-flex; align-items: center; }
|
.nav a { color: var(--ink-2); text-decoration: none; padding: 10px 12px; border-radius: 8px; min-height: 44px; display: inline-flex; align-items: center; }
|
||||||
@@ -71,8 +78,8 @@ p { margin: 0; }
|
|||||||
.page-head { display: flex; flex-direction: column; gap: 6px; }
|
.page-head { display: flex; flex-direction: column; gap: 6px; }
|
||||||
.card { background: var(--panel); border: 1px solid var(--line); border-radius: 14px; padding: 24px; display: flex; flex-direction: column; gap: 18px; }
|
.card { background: var(--panel); border: 1px solid var(--line); border-radius: 14px; padding: 24px; display: flex; flex-direction: column; gap: 18px; }
|
||||||
.card-head { display: flex; justify-content: space-between; align-items: baseline; gap: 12px; flex-wrap: wrap; }
|
.card-head { display: flex; justify-content: space-between; align-items: baseline; gap: 12px; flex-wrap: wrap; }
|
||||||
.grid-2 { display: grid; grid-template-columns: repeat(auto-fit, minmax(240px, 1fr)); gap: 16px; }
|
.grid-2 { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(240px, 100%), 1fr)); gap: 16px; }
|
||||||
.facts { display: grid; grid-template-columns: max-content 1fr; gap: 8px 20px; margin: 0; }
|
.facts { display: grid; grid-template-columns: max-content minmax(0, 1fr); gap: 8px 20px; margin: 0; }
|
||||||
.facts dt { color: var(--muted); }
|
.facts dt { color: var(--muted); }
|
||||||
.facts dd { margin: 0; }
|
.facts dd { margin: 0; }
|
||||||
|
|
||||||
@@ -81,11 +88,23 @@ p { margin: 0; }
|
|||||||
.field label, .label { font-size: 14px; font-weight: 500; }
|
.field label, .label { font-size: 14px; font-weight: 500; }
|
||||||
.hint { font-size: 13px; color: var(--muted); }
|
.hint { font-size: 13px; color: var(--muted); }
|
||||||
.inp {
|
.inp {
|
||||||
width: 100%; min-height: 48px; padding: 0 14px; border-radius: var(--radius);
|
width: 100%; min-width: 0; max-width: 100%; min-height: 48px; padding: 0 14px; border-radius: var(--radius);
|
||||||
border: 1px solid var(--line-2); background: var(--panel-2); color: var(--ink);
|
border: 1px solid var(--line-2); background: var(--panel-2); color: var(--ink);
|
||||||
font: 400 15px var(--font-body);
|
font: 400 15px var(--font-body);
|
||||||
}
|
}
|
||||||
select.inp { padding-right: 32px; }
|
/* Our own chevron, so the text starts where it does in the other fields */
|
||||||
|
select.inp {
|
||||||
|
appearance: none; -webkit-appearance: none; cursor: pointer; text-overflow: ellipsis;
|
||||||
|
padding: 0 42px 0 14px;
|
||||||
|
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cpath d='M4 6l4 4 4-4' fill='none' stroke='%23a3abc0' stroke-width='1.8' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E");
|
||||||
|
background-repeat: no-repeat; background-position: right 14px center; background-size: 16px;
|
||||||
|
}
|
||||||
|
select.inp:focus { background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cpath d='M4 6l4 4 4-4' fill='none' stroke='%23d9b46a' stroke-width='1.8' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E"); }
|
||||||
|
select.inp option { background: var(--panel-2); color: var(--ink); }
|
||||||
|
/* Multi-line fields: room above and below the text too */
|
||||||
|
textarea.inp { padding: 12px 14px; line-height: 1.55; min-height: 96px; resize: vertical; }
|
||||||
|
/* A button beside input fields is as tall as they are */
|
||||||
|
.row > .btn:not(.btn-sm), .redeem-row > .btn { min-height: 48px; }
|
||||||
.inp::placeholder { color: #8a93ab; }
|
.inp::placeholder { color: #8a93ab; }
|
||||||
.inp:focus { outline: none; border-color: var(--gold); box-shadow: 0 0 0 3px rgba(217, 180, 106, 0.25); }
|
.inp:focus { outline: none; border-color: var(--gold); box-shadow: 0 0 0 3px rgba(217, 180, 106, 0.25); }
|
||||||
.inp:disabled { opacity: 0.55; }
|
.inp:disabled { opacity: 0.55; }
|
||||||
@@ -190,7 +209,7 @@ td.num { font-variant-numeric: tabular-nums; white-space: nowrap; }
|
|||||||
.analysis-section h3 { font-size: 24px; color: var(--gold); }
|
.analysis-section h3 { font-size: 24px; color: var(--gold); }
|
||||||
.analysis-section p, .analysis-lists li { font-size: 16px; line-height: 1.75; color: var(--ink-2); }
|
.analysis-section p, .analysis-lists li { font-size: 16px; line-height: 1.75; color: var(--ink-2); }
|
||||||
.analysis strong { color: var(--ink); font-weight: 600; }
|
.analysis strong { color: var(--ink); font-weight: 600; }
|
||||||
.analysis-lists { display: grid; grid-template-columns: repeat(auto-fit, minmax(260px, 1fr)); gap: 24px; }
|
.analysis-lists { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(260px, 100%), 1fr)); gap: 24px; }
|
||||||
.analysis-lists h3 { font-size: 22px; margin-bottom: 8px; }
|
.analysis-lists h3 { font-size: 22px; margin-bottom: 8px; }
|
||||||
.analysis-lists ul { margin: 0; padding-left: 20px; display: flex; flex-direction: column; gap: 8px; }
|
.analysis-lists ul { margin: 0; padding-left: 20px; display: flex; flex-direction: column; gap: 8px; }
|
||||||
.analysis-advice { border-top: 1px solid var(--line); padding-top: 24px; }
|
.analysis-advice { border-top: 1px solid var(--line); padding-top: 24px; }
|
||||||
@@ -308,7 +327,7 @@ td.num { font-variant-numeric: tabular-nums; white-space: nowrap; }
|
|||||||
.w-point:hover .w-point-glyph { fill: var(--gold); }
|
.w-point:hover .w-point-glyph { fill: var(--gold); }
|
||||||
|
|
||||||
@media (max-width: 900px) {
|
@media (max-width: 900px) {
|
||||||
.chart-layout { grid-template-columns: 1fr; }
|
.chart-layout { grid-template-columns: minmax(0, 1fr); }
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (max-width: 640px) {
|
@media (max-width: 640px) {
|
||||||
@@ -342,7 +361,7 @@ td.num { font-variant-numeric: tabular-nums; white-space: nowrap; }
|
|||||||
@media (max-width: 640px) { .tab { padding: 12px 10px; font-size: 14px; } .tabs { scroll-margin-top: 120px; } }
|
@media (max-width: 640px) { .tab { padding: 12px 10px; font-size: 14px; } .tabs { scroll-margin-top: 120px; } }
|
||||||
|
|
||||||
/* Charts list, persons */
|
/* Charts list, persons */
|
||||||
.chart-cards { display: grid; grid-template-columns: repeat(auto-fill, minmax(240px, 1fr)); gap: 16px; }
|
.chart-cards { display: grid; grid-template-columns: repeat(auto-fill, minmax(min(240px, 100%), 1fr)); gap: 16px; }
|
||||||
.chart-card {
|
.chart-card {
|
||||||
background: var(--panel); border: 1px solid var(--line); border-radius: 14px; display: flex; flex-direction: column;
|
background: var(--panel); border: 1px solid var(--line); border-radius: 14px; display: flex; flex-direction: column;
|
||||||
transition: border-color 0.15s;
|
transition: border-color 0.15s;
|
||||||
@@ -485,14 +504,14 @@ td.num { font-variant-numeric: tabular-nums; white-space: nowrap; }
|
|||||||
.nature-challenging { background: var(--tense); }
|
.nature-challenging { background: var(--tense); }
|
||||||
.nature-neutral { background: var(--gold); }
|
.nature-neutral { background: var(--gold); }
|
||||||
.nature-list { margin: 0; display: flex; flex-direction: column; gap: 8px; }
|
.nature-list { margin: 0; display: flex; flex-direction: column; gap: 8px; }
|
||||||
.nature-list > div { display: grid; grid-template-columns: 128px 1fr; gap: 8px; align-items: baseline; }
|
.nature-list > div { display: grid; grid-template-columns: 128px minmax(0, 1fr); gap: 8px; align-items: baseline; }
|
||||||
.nature-list dt { display: inline-flex; align-items: center; gap: 8px; font-size: 14px; color: var(--ink-2); }
|
.nature-list dt { display: inline-flex; align-items: center; gap: 8px; font-size: 14px; color: var(--ink-2); }
|
||||||
.nature-list dd { margin: 0; }
|
.nature-list dd { margin: 0; }
|
||||||
.nature-dot { width: 10px; height: 10px; border-radius: 50%; display: inline-block; }
|
.nature-dot { width: 10px; height: 10px; border-radius: 50%; display: inline-block; }
|
||||||
|
|
||||||
.pair-card { gap: 4px; }
|
.pair-card { gap: 4px; }
|
||||||
.pair-row {
|
.pair-row {
|
||||||
display: grid; grid-template-columns: auto 1fr auto; gap: 12px; align-items: center; padding: 10px 0;
|
display: grid; grid-template-columns: auto minmax(0, 1fr) auto; gap: 12px; align-items: center; padding: 10px 0;
|
||||||
color: inherit; text-decoration: none; border-bottom: 1px solid var(--line);
|
color: inherit; text-decoration: none; border-bottom: 1px solid var(--line);
|
||||||
}
|
}
|
||||||
.pair-row:last-child { border-bottom: 0; padding-bottom: 0; }
|
.pair-row:last-child { border-bottom: 0; padding-bottom: 0; }
|
||||||
@@ -501,7 +520,7 @@ a.pair-row:hover strong { color: var(--gold); }
|
|||||||
.pair-text strong { font-family: var(--font-display); font-size: 21px; font-weight: 600; }
|
.pair-text strong { font-family: var(--font-display); font-size: 21px; font-weight: 600; }
|
||||||
|
|
||||||
.compare-new { gap: 16px; }
|
.compare-new { gap: 16px; }
|
||||||
.compare-form { display: grid; grid-template-columns: 1fr auto 1fr auto; gap: 12px; align-items: end; }
|
.compare-form { display: grid; grid-template-columns: minmax(0, 1fr) auto minmax(0, 1fr) auto; gap: 12px; align-items: end; }
|
||||||
.compare-swap { font-size: 20px; padding: 0 10px; }
|
.compare-swap { font-size: 20px; padding: 0 10px; }
|
||||||
.compare-tile { gap: 6px; padding: 16px 20px; }
|
.compare-tile { gap: 6px; padding: 16px 20px; }
|
||||||
.compare-tile strong { font-family: var(--font-display); font-size: 21px; font-weight: 600; }
|
.compare-tile strong { font-family: var(--font-display); font-size: 21px; font-weight: 600; }
|
||||||
@@ -509,12 +528,12 @@ a.pair-row:hover strong { color: var(--gold); }
|
|||||||
.compare-tile .form-actions { margin-top: 6px; }
|
.compare-tile .form-actions { margin-top: 6px; }
|
||||||
.back-link { font-size: 14px; text-decoration: none; align-self: flex-start; }
|
.back-link { font-size: 14px; text-decoration: none; align-self: flex-start; }
|
||||||
@media (max-width: 640px) {
|
@media (max-width: 640px) {
|
||||||
.compare-form { grid-template-columns: 1fr auto; }
|
.compare-form { grid-template-columns: minmax(0, 1fr) auto; }
|
||||||
.compare-form .field:first-child { grid-column: 1; }
|
.compare-form .field:first-child { grid-column: 1; }
|
||||||
.compare-swap { grid-column: 2; grid-row: 1 / span 2; align-self: center; }
|
.compare-swap { grid-column: 2; grid-row: 1 / span 2; align-self: center; }
|
||||||
.compare-form .field:nth-child(3) { grid-column: 1; }
|
.compare-form .field:nth-child(3) { grid-column: 1; }
|
||||||
.compare-form > .btn-primary { grid-column: 1 / -1; width: 100%; }
|
.compare-form > .btn-primary { grid-column: 1 / -1; width: 100%; }
|
||||||
.nature-list > div { grid-template-columns: 1fr; gap: 2px; }
|
.nature-list > div { grid-template-columns: minmax(0, 1fr); gap: 2px; }
|
||||||
.nav { overflow-x: auto; scrollbar-width: none; }
|
.nav { overflow-x: auto; scrollbar-width: none; }
|
||||||
.nav a { white-space: nowrap; padding: 10px 9px; }
|
.nav a { white-space: nowrap; padding: 10px 9px; }
|
||||||
.cross-grid td.cross-corner { min-width: 56px; font-size: 9px; }
|
.cross-grid td.cross-corner { min-width: 56px; font-size: 9px; }
|
||||||
@@ -522,7 +541,7 @@ a.pair-row:hover strong { color: var(--gold); }
|
|||||||
|
|
||||||
/* Packages */
|
/* Packages */
|
||||||
.pkg-grid { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: 16px; align-items: stretch; }
|
.pkg-grid { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: 16px; align-items: stretch; }
|
||||||
.pkg-grid-compact { grid-template-columns: repeat(auto-fit, minmax(210px, 1fr)); gap: 12px; }
|
.pkg-grid-compact { grid-template-columns: repeat(auto-fit, minmax(min(210px, 100%), 1fr)); gap: 12px; }
|
||||||
.pkg {
|
.pkg {
|
||||||
position: relative; display: flex; flex-direction: column; gap: 10px; padding: 22px 20px 20px;
|
position: relative; display: flex; flex-direction: column; gap: 10px; padding: 22px 20px 20px;
|
||||||
background: var(--panel); border: 1px solid var(--line-2); border-radius: var(--radius);
|
background: var(--panel); border: 1px solid var(--line-2); border-radius: var(--radius);
|
||||||
@@ -589,7 +608,7 @@ a.pair-row:hover strong { color: var(--gold); }
|
|||||||
.timeline-month h3 { font-size: 20px; margin: 0 0 8px; text-transform: capitalize; }
|
.timeline-month h3 { font-size: 20px; margin: 0 0 8px; text-transform: capitalize; }
|
||||||
.timeline-month ol, .transit-list { margin: 0; padding: 0; list-style: none; display: flex; flex-direction: column; gap: 6px; }
|
.timeline-month ol, .transit-list { margin: 0; padding: 0; list-style: none; display: flex; flex-direction: column; gap: 6px; }
|
||||||
.timeline-item {
|
.timeline-item {
|
||||||
display: grid; grid-template-columns: 64px 56px 1fr; gap: 10px; align-items: baseline;
|
display: grid; grid-template-columns: 64px 56px minmax(0, 1fr); gap: 10px; align-items: baseline;
|
||||||
padding: 8px 12px; border-left: 3px solid var(--line); border-radius: 4px; background: rgba(255, 255, 255, 0.02);
|
padding: 8px 12px; border-left: 3px solid var(--line); border-radius: 4px; background: rgba(255, 255, 255, 0.02);
|
||||||
}
|
}
|
||||||
.timeline-date { color: var(--muted); font-variant-numeric: tabular-nums; white-space: nowrap; }
|
.timeline-date { color: var(--muted); font-variant-numeric: tabular-nums; white-space: nowrap; }
|
||||||
@@ -599,15 +618,15 @@ a.pair-row:hover strong { color: var(--gold); }
|
|||||||
.timeline-item.tone-harmonic, .transit-list .tone-harmonic { border-left-color: var(--harmonic); }
|
.timeline-item.tone-harmonic, .transit-list .tone-harmonic { border-left-color: var(--harmonic); }
|
||||||
.timeline-item.tone-neutral, .transit-list .tone-neutral { border-left-color: var(--gold); }
|
.timeline-item.tone-neutral, .transit-list .tone-neutral { border-left-color: var(--gold); }
|
||||||
.transit-list li {
|
.transit-list li {
|
||||||
display: grid; grid-template-columns: 72px 1fr; gap: 10px; align-items: baseline;
|
display: grid; grid-template-columns: 72px minmax(0, 1fr); gap: 10px; align-items: baseline;
|
||||||
padding: 8px 12px; border-left: 3px solid var(--line); border-radius: 4px;
|
padding: 8px 12px; border-left: 3px solid var(--line); border-radius: 4px;
|
||||||
}
|
}
|
||||||
.transit-list li > span:last-child { display: flex; flex-direction: column; gap: 2px; }
|
.transit-list li > span:last-child { display: flex; flex-direction: column; gap: 2px; min-width: 0; }
|
||||||
.transit-list .sym { font-size: 17px; color: var(--gold); white-space: nowrap; }
|
.transit-list .sym { font-size: 17px; color: var(--gold); white-space: nowrap; }
|
||||||
.transit-list .pill { align-self: flex-start; font-size: 12px; padding: 1px 8px; border: 1px solid var(--gold); border-radius: 999px; color: var(--gold); }
|
.transit-list .pill { align-self: flex-start; font-size: 12px; padding: 1px 8px; border: 1px solid var(--gold); border-radius: 999px; color: var(--gold); }
|
||||||
.plain-list { margin: 8px 0 12px; padding-left: 18px; display: flex; flex-direction: column; gap: 4px; }
|
.plain-list { margin: 8px 0 12px; padding-left: 18px; display: flex; flex-direction: column; gap: 4px; }
|
||||||
@media (max-width: 560px) {
|
@media (max-width: 560px) {
|
||||||
.timeline-item { grid-template-columns: 52px 1fr; }
|
.timeline-item { grid-template-columns: 52px minmax(0, 1fr); }
|
||||||
.timeline-glyph { display: none; }
|
.timeline-glyph { display: none; }
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -638,8 +657,310 @@ a.pair-row:hover strong { color: var(--gold); }
|
|||||||
.questions { display: flex; flex-direction: column; gap: 14px; margin-top: 28px; padding-top: 22px; border-top: 1px solid var(--line); }
|
.questions { display: flex; flex-direction: column; gap: 14px; margin-top: 28px; padding-top: 22px; border-top: 1px solid var(--line); }
|
||||||
.questions h3 { margin: 0; }
|
.questions h3 { margin: 0; }
|
||||||
.qa { display: flex; flex-direction: column; gap: 8px; padding: 14px 16px; border: 1px solid var(--line); border-radius: 12px; }
|
.qa { display: flex; flex-direction: column; gap: 8px; padding: 14px 16px; border: 1px solid var(--line); border-radius: 12px; }
|
||||||
.qa-question { margin: 0; display: flex; flex-direction: column; gap: 2px; font-weight: 600; white-space: pre-wrap; }
|
.qa-question { margin: 0; display: flex; flex-direction: column; gap: 2px; font-weight: 600; white-space: pre-wrap; overflow-wrap: anywhere; }
|
||||||
.qa-answer { display: flex; flex-direction: column; gap: 6px; }
|
.qa-answer { display: flex; flex-direction: column; gap: 6px; }
|
||||||
.qa-answer p { margin: 0 0 8px; }
|
.qa-answer p { margin: 0 0 8px; }
|
||||||
.qa-form { display: flex; flex-direction: column; gap: 8px; }
|
.qa-form { display: flex; flex-direction: column; gap: 8px; }
|
||||||
.qa-form textarea { resize: vertical; min-height: 84px; }
|
.qa-form textarea { resize: vertical; min-height: 84px; }
|
||||||
|
.hint.warn { color: var(--gold); }
|
||||||
|
.job-row { display: grid; grid-template-columns: minmax(0, 1fr) auto auto; gap: 12px; align-items: center; padding: 8px 12px; border: 1px solid var(--line); border-radius: 8px; }
|
||||||
|
.job-row > span:first-child { display: flex; flex-direction: column; min-width: 0; }
|
||||||
|
@media (max-width: 640px) { .job-row { grid-template-columns: minmax(0, 1fr) auto; } .job-row .model-price { grid-column: 1 / -1; align-items: flex-start; } }
|
||||||
|
.retry-notice { display: flex; flex-direction: column; gap: 4px; }
|
||||||
|
.retry-notice p { margin: 0; }
|
||||||
|
|
||||||
|
/* admin: error log */
|
||||||
|
.error-log { width: 100%; border-collapse: collapse; font-size: 14px; }
|
||||||
|
.error-log th, .error-log td { text-align: left; vertical-align: top; padding: 8px 10px; border-bottom: 1px solid var(--line); }
|
||||||
|
.error-log td > .hint, .error-log td > code { display: block; }
|
||||||
|
.error-log .error-text { overflow-wrap: anywhere; max-width: 460px; }
|
||||||
|
.error-log .outcome { white-space: nowrap; }
|
||||||
|
.error-log .outcome.tone-tense { color: var(--tense); font-weight: 600; }
|
||||||
|
|
||||||
|
/* Generated text (summaries, analyses, answers): justified, with hyphenation so
|
||||||
|
narrow screens get no wide gaps. The last line of a paragraph stays ragged. */
|
||||||
|
.analysis-lead, .analysis-section p, .analysis-lists li, .summary-text, .qa-answer p {
|
||||||
|
text-align: justify;
|
||||||
|
hyphens: auto;
|
||||||
|
-webkit-hyphens: auto;
|
||||||
|
hyphenate-limit-chars: 7 3 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Phones: tighter spacing, smaller headings, no sideways scrolling */
|
||||||
|
@media (max-width: 640px) {
|
||||||
|
.page { padding: 20px 14px 48px; gap: 18px; }
|
||||||
|
.card { padding: 16px; gap: 14px; }
|
||||||
|
h2 { font-size: 24px; }
|
||||||
|
.analysis { gap: 22px; }
|
||||||
|
.analysis-head h2 { font-size: 28px; }
|
||||||
|
.analysis-section h3 { font-size: 21px; }
|
||||||
|
.analysis-lists h3 { font-size: 20px; }
|
||||||
|
.analysis-lead { font-size: 16px; line-height: 1.65; }
|
||||||
|
.analysis-section p, .analysis-lists li, .summary-text { font-size: 15.5px; line-height: 1.7; }
|
||||||
|
.analysis-lists ul { padding-left: 18px; }
|
||||||
|
.summary-title { font-size: 23px; }
|
||||||
|
.questions { margin-top: 22px; padding-top: 18px; }
|
||||||
|
.qa { padding: 12px; }
|
||||||
|
.pay-box { padding: 16px; }
|
||||||
|
.loading-wheel { width: 96px; height: 96px; }
|
||||||
|
.tagline { font-size: 32px; }
|
||||||
|
}
|
||||||
|
@media (max-width: 480px) {
|
||||||
|
/* label above value: the label column would squeeze the values */
|
||||||
|
.facts { grid-template-columns: minmax(0, 1fr); gap: 2px; }
|
||||||
|
.facts dd + dt { margin-top: 8px; }
|
||||||
|
.site-header { gap: 8px 12px; }
|
||||||
|
.logo { font-size: 25px; }
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Sharing a chart (summary card) and the public share page */
|
||||||
|
.share { display: flex; flex-direction: column; gap: 10px; align-items: stretch; }
|
||||||
|
.share-button {
|
||||||
|
display: flex; align-items: center; gap: 14px; width: 100%; padding: 12px 16px; text-align: left; cursor: pointer;
|
||||||
|
border: 1px solid rgba(217, 180, 106, 0.55); border-radius: 12px; color: var(--ink); font: inherit;
|
||||||
|
background: linear-gradient(135deg, rgba(217, 180, 106, 0.14), rgba(217, 180, 106, 0.03));
|
||||||
|
transition: border-color 0.15s, background 0.15s;
|
||||||
|
}
|
||||||
|
.share-button:hover { border-color: var(--gold); background: linear-gradient(135deg, rgba(217, 180, 106, 0.22), rgba(217, 180, 106, 0.06)); }
|
||||||
|
.share-button:disabled { opacity: 0.7; cursor: default; }
|
||||||
|
.share-icon {
|
||||||
|
flex: none; width: 40px; height: 40px; border-radius: 50%; display: inline-flex; align-items: center; justify-content: center;
|
||||||
|
background: var(--gold); color: var(--gold-ink);
|
||||||
|
}
|
||||||
|
.share-button-text { display: flex; flex-direction: column; gap: 2px; min-width: 0; }
|
||||||
|
.share-button-text strong { font-family: var(--font-display); font-size: 21px; font-weight: 600; line-height: 1.15; }
|
||||||
|
.share-button-text small { font-size: 12.5px; color: var(--gold); }
|
||||||
|
.share-fine { margin: 0; font-size: 12.5px; color: var(--muted); line-height: 1.5; }
|
||||||
|
.share-open { align-items: stretch; padding: 14px; border: 1px solid var(--line-2); border-radius: var(--radius); background: var(--panel-2); }
|
||||||
|
.share-link { display: flex; gap: 8px; }
|
||||||
|
.share-link .inp { min-height: 36px; font-size: 14px; }
|
||||||
|
.share-trio { display: flex; flex-wrap: wrap; gap: 6px 18px; color: var(--ink-2); font-size: 14px; }
|
||||||
|
.share-trio .sym { color: var(--gold); }
|
||||||
|
.share-cta { gap: 12px; }
|
||||||
|
.share-cta h2 { font-size: 24px; }
|
||||||
|
.share-cta .btn { align-self: flex-start; }
|
||||||
|
|
||||||
|
/* Promo codes: redeeming (header, packages page, /bevaltas) and the admin page */
|
||||||
|
.redeem-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-row { display: flex; gap: 8px; flex-wrap: wrap; }
|
||||||
|
.redeem-input { flex: 1 1 220px; width: auto; font-family: ui-monospace, SFMono-Regular, Menlo, monospace; letter-spacing: 1.5px; text-transform: uppercase; }
|
||||||
|
.redeem-card { gap: 10px; border-color: rgba(217, 180, 106, 0.35); }
|
||||||
|
.redeem-card h2 { font-size: 24px; }
|
||||||
|
.promo-form { display: grid; grid-template-columns: minmax(0, 1.4fr) 110px minmax(0, 2fr) auto; gap: 12px; align-items: end; }
|
||||||
|
.promo-made { display: flex; flex-direction: column; gap: 8px; align-items: flex-start; }
|
||||||
|
.promo-codes { min-height: 0; padding: 10px 14px; font-family: ui-monospace, SFMono-Regular, Menlo, monospace; line-height: 1.6; resize: vertical; }
|
||||||
|
.promo-code { font-size: 14px; letter-spacing: 1px; white-space: nowrap; }
|
||||||
|
.promo-table td { vertical-align: top; }
|
||||||
|
.promo-table td .hint { display: block; }
|
||||||
|
.promo-open { color: var(--ok); }
|
||||||
|
@media (max-width: 760px) {
|
||||||
|
.promo-form { grid-template-columns: minmax(0, 1fr) 100px; }
|
||||||
|
.promo-form .promo-note, .promo-form .btn { grid-column: 1 / -1; }
|
||||||
|
}
|
||||||
|
@media (max-width: 640px) { .who { flex-wrap: wrap; gap: 8px 12px; } }
|
||||||
|
|
||||||
|
/* New person: typed-in data or an invitation */
|
||||||
|
.mode-switch { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(240px, 100%), 1fr)); gap: 10px; }
|
||||||
|
.mode-option {
|
||||||
|
display: flex; flex-direction: column; gap: 4px; padding: 14px 16px; text-align: left; cursor: pointer; font: inherit;
|
||||||
|
color: var(--ink); background: var(--panel-2); border: 1px solid var(--line-2); border-radius: 12px;
|
||||||
|
}
|
||||||
|
.mode-option strong { font-family: var(--font-display); font-size: 21px; font-weight: 600; }
|
||||||
|
.mode-option span { font-size: 13.5px; color: var(--muted); line-height: 1.45; }
|
||||||
|
.mode-option:hover { border-color: #5a6790; }
|
||||||
|
.mode-option[aria-selected="true"] { border-color: var(--gold); background: rgba(217, 180, 106, 0.08); }
|
||||||
|
.mode-option[aria-selected="true"] strong { color: var(--gold); }
|
||||||
|
.invite-list { list-style: none; margin: 0; padding: 0; display: flex; flex-direction: column; gap: 8px; }
|
||||||
|
.invite-list li { display: flex; flex-wrap: wrap; align-items: center; gap: 6px 14px; padding: 10px 0; border-bottom: 1px solid var(--line); }
|
||||||
|
.invite-list li:last-child { border-bottom: 0; }
|
||||||
|
.invite-who { display: flex; flex-direction: column; min-width: 0; flex: 1 1 180px; }
|
||||||
|
|
||||||
|
/* Home page for visitors (src/app/Landing.tsx) */
|
||||||
|
.lp { overflow-x: clip; }
|
||||||
|
.lp-wrap { max-width: 1180px; margin: 0 auto; padding: 0 24px; }
|
||||||
|
.lp-header { gap: 16px; }
|
||||||
|
.lp-nav { flex: 1; }
|
||||||
|
.lp-hero { position: relative; overflow: hidden; }
|
||||||
|
.lp-stars { position: absolute; inset: 0; width: 100%; height: 100%; }
|
||||||
|
.lp-star { fill: var(--ink); opacity: 0.25; animation: lp-twinkle 6s ease-in-out infinite; }
|
||||||
|
.lp-t1 { animation-delay: 1s; animation-duration: 7s; }
|
||||||
|
.lp-t2 { animation-delay: 2.4s; animation-duration: 5s; }
|
||||||
|
.lp-t3 { animation-delay: 3.1s; animation-duration: 8s; }
|
||||||
|
.lp-t4 { animation-delay: 0.6s; animation-duration: 9s; }
|
||||||
|
.lp-hero-grid {
|
||||||
|
position: relative; padding-top: 72px; padding-bottom: 88px;
|
||||||
|
display: grid; grid-template-columns: repeat(auto-fit, minmax(min(440px, 100%), 1fr)); gap: 48px; align-items: center;
|
||||||
|
}
|
||||||
|
.lp-hero-text { display: flex; flex-direction: column; gap: 24px; min-width: 0; }
|
||||||
|
.lp-hero-text .eyebrow { font-size: 13px; letter-spacing: 2px; }
|
||||||
|
.lp-title { font-size: clamp(44px, 6vw, 76px); line-height: 1.02; letter-spacing: -0.5px; }
|
||||||
|
.lp-lead { font-size: 19px; line-height: 1.65; color: var(--ink-2); max-width: 540px; }
|
||||||
|
.lp-actions { display: flex; gap: 12px; flex-wrap: wrap; align-items: center; }
|
||||||
|
.lp-btn { min-height: 48px; padding: 0 22px; transition: transform 0.2s, background 0.2s, border-color 0.2s; }
|
||||||
|
.lp-btn:hover { transform: translateY(-1px); }
|
||||||
|
.lp-btn-big { min-height: 52px; padding: 0 28px; font-size: 16px; }
|
||||||
|
.lp-figure { margin: 0; display: flex; flex-direction: column; align-items: center; gap: 14px; min-width: 0; }
|
||||||
|
.lp-wheel {
|
||||||
|
position: relative; width: 100%; max-width: 560px; border-radius: 50%;
|
||||||
|
background: radial-gradient(closest-side, rgba(217, 180, 106, 0.07), transparent 72%);
|
||||||
|
}
|
||||||
|
.lp-wheel .chart-wheel { position: relative; }
|
||||||
|
.lp-orbit { position: absolute; inset: 0; width: 100%; height: 100%; animation: lp-spin 240s linear infinite; }
|
||||||
|
.lp-orbit circle { fill: none; stroke: var(--gold); stroke-opacity: 0.18; stroke-width: 1; stroke-dasharray: 2 10; }
|
||||||
|
.lp-orbit .lp-orbit-dot { fill: var(--gold); stroke: none; opacity: 0.55; }
|
||||||
|
/* the wheel comes alive: planets one by one, then the aspect lines */
|
||||||
|
.lp-wheel .w-point { opacity: 0; animation: lp-fade 0.9s ease-out forwards; }
|
||||||
|
.lp-wheel .w-point:nth-last-of-type(13) { animation-delay: 0.3s; }
|
||||||
|
.lp-wheel .w-point:nth-last-of-type(12) { animation-delay: 0.42s; }
|
||||||
|
.lp-wheel .w-point:nth-last-of-type(11) { animation-delay: 0.54s; }
|
||||||
|
.lp-wheel .w-point:nth-last-of-type(10) { animation-delay: 0.66s; }
|
||||||
|
.lp-wheel .w-point:nth-last-of-type(9) { animation-delay: 0.78s; }
|
||||||
|
.lp-wheel .w-point:nth-last-of-type(8) { animation-delay: 0.9s; }
|
||||||
|
.lp-wheel .w-point:nth-last-of-type(7) { animation-delay: 1.02s; }
|
||||||
|
.lp-wheel .w-point:nth-last-of-type(6) { animation-delay: 1.14s; }
|
||||||
|
.lp-wheel .w-point:nth-last-of-type(5) { animation-delay: 1.26s; }
|
||||||
|
.lp-wheel .w-point:nth-last-of-type(4) { animation-delay: 1.38s; }
|
||||||
|
.lp-wheel .w-point:nth-last-of-type(3) { animation-delay: 1.5s; }
|
||||||
|
.lp-wheel .w-point:nth-last-of-type(2) { animation-delay: 1.62s; }
|
||||||
|
.lp-wheel .w-point:nth-last-of-type(1) { animation-delay: 1.74s; }
|
||||||
|
.lp-wheel .w-aspect { stroke-dasharray: 300; stroke-dashoffset: 300; animation: lp-draw 1.8s cubic-bezier(0.4, 0, 0.2, 1) 1.6s forwards; }
|
||||||
|
.lp-wheel .w-aspect.w-asp-sextile { stroke-dasharray: 5 4; stroke-dashoffset: 0; opacity: 0; animation: lp-fade 1.2s ease-out 2.2s forwards; }
|
||||||
|
.lp-caption { display: flex; flex-direction: column; align-items: center; gap: 6px; text-align: center; }
|
||||||
|
.lp-caption .share-trio { justify-content: center; font-size: 15px; }
|
||||||
|
.lp-asc { color: var(--gold); font-weight: 600; font-size: 12px; letter-spacing: 0.5px; }
|
||||||
|
.lp-rise { opacity: 0; transform: translateY(14px); animation: lp-rise 0.9s cubic-bezier(0.2, 0.7, 0.2, 1) forwards; }
|
||||||
|
.lp-r1 { animation-delay: 0.1s; } .lp-r2 { animation-delay: 0.25s; } .lp-r3 { animation-delay: 0.4s; } .lp-r4 { animation-delay: 0.55s; }
|
||||||
|
|
||||||
|
.lp-band { border-top: 1px solid var(--line); padding: 96px 0; }
|
||||||
|
.lp-alt { background: var(--panel-2); }
|
||||||
|
.lp-two { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(380px, 100%), 1fr)); gap: 48px; align-items: center; }
|
||||||
|
.lp-stack { display: flex; flex-direction: column; gap: 40px; }
|
||||||
|
.lp-intro { display: flex; flex-direction: column; gap: 14px; max-width: 720px; }
|
||||||
|
.lp-intro .eyebrow { font-size: 13px; letter-spacing: 2px; }
|
||||||
|
.lp-h2 { font-size: clamp(34px, 4vw, 52px); line-height: 1.06; }
|
||||||
|
.lp-h3 { font-size: 24px; }
|
||||||
|
.lp-center { text-align: center; }
|
||||||
|
.lp-text { font-size: 17px; color: var(--ink-2); line-height: 1.65; }
|
||||||
|
.lp-small { font-size: 15px; color: var(--ink-2); line-height: 1.6; }
|
||||||
|
.lp-float { padding: 32px; box-shadow: 0 30px 80px rgba(0, 0, 0, 0.35); animation: lp-float 9s ease-in-out infinite; }
|
||||||
|
.lp-float .summary-title { font-size: 32px; }
|
||||||
|
|
||||||
|
.lp-analysis-grid { display: grid; grid-template-columns: minmax(0, 2fr) minmax(0, 1fr); gap: 24px; align-items: start; }
|
||||||
|
.lp-paper { padding: 36px; gap: 22px; }
|
||||||
|
.lp-paper-title { font-size: 36px; line-height: 1.08; }
|
||||||
|
.lp-excerpts { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(280px, 100%), 1fr)); gap: 28px; }
|
||||||
|
.lp-fade { max-height: 270px; overflow: hidden; -webkit-mask-image: linear-gradient(#000 55%, transparent); mask-image: linear-gradient(#000 55%, transparent); }
|
||||||
|
.lp-excerpt-title { font-family: var(--font-display); font-size: 24px; font-weight: 600; color: var(--gold); line-height: 1.15; margin: 0; }
|
||||||
|
.lp-paper-foot { display: flex; gap: 16px; flex-wrap: wrap; align-items: center; justify-content: space-between; border-top: 1px solid var(--line); padding-top: 20px; }
|
||||||
|
.lp-paper-foot a { font-weight: 600; text-decoration: none; }
|
||||||
|
.lp-aside { display: flex; flex-direction: column; gap: 20px; min-width: 0; }
|
||||||
|
.lp-side-card { gap: 12px; }
|
||||||
|
.lp-list { margin: 0; padding-left: 18px; display: flex; flex-direction: column; gap: 10px; font-size: 15px; line-height: 1.6; color: var(--ink-2); }
|
||||||
|
.lp-question { margin: 0; padding: 12px 14px; border-radius: var(--radius); background: var(--panel-2); border: 1px solid var(--line-2); font-size: 14px; }
|
||||||
|
.lp-chips { display: flex; gap: 8px; flex-wrap: wrap; }
|
||||||
|
.lp-chip { padding: 6px 14px; border-radius: 999px; border: 1px solid var(--line-2); font-size: 14px; color: var(--ink-2); }
|
||||||
|
.lp-chip-gold { border-color: rgba(217, 180, 106, 0.5); color: var(--gold); }
|
||||||
|
|
||||||
|
.lp-features { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(420px, 100%), 1fr)); gap: 24px; }
|
||||||
|
.lp-feature { padding: 32px; gap: 20px; }
|
||||||
|
.lp-feature-head { display: flex; flex-direction: column; gap: 10px; }
|
||||||
|
.lp-feature-title { font-size: 32px; line-height: 1.1; }
|
||||||
|
.lp-panel { background: var(--panel-2); border: 1px solid var(--line); border-radius: 12px; padding: 20px; display: flex; flex-direction: column; gap: 14px; }
|
||||||
|
.lp-timeline { width: 100%; height: auto; display: block; }
|
||||||
|
.lp-tl-track { stroke: var(--line-2); stroke-width: 2; }
|
||||||
|
.lp-tl-done { stroke: var(--gold); stroke-width: 2; }
|
||||||
|
.lp-tl-month { fill: var(--muted); font: 400 10px var(--font-body); text-anchor: middle; }
|
||||||
|
.lp-tl-now { fill: var(--ink); font: 600 11px var(--font-body); text-anchor: middle; }
|
||||||
|
.lp-pulse { transform-box: fill-box; transform-origin: center; animation: lp-pulse 2.6s ease-in-out infinite; }
|
||||||
|
.lp-events { list-style: none; margin: 0; padding: 0; display: flex; flex-direction: column; gap: 6px; font-size: 14.5px; }
|
||||||
|
.lp-pair { display: grid; grid-template-columns: minmax(0, 200px) minmax(0, 1fr); gap: 20px; align-items: center; }
|
||||||
|
.lp-rings { width: 100%; height: auto; display: block; }
|
||||||
|
.lp-ring { fill: none; stroke: var(--line-2); stroke-width: 1; }
|
||||||
|
.lp-ring-core { fill: var(--panel); stroke: var(--line); }
|
||||||
|
.lp-spin { transform-box: fill-box; transform-origin: center; animation: lp-spin 120s linear infinite; }
|
||||||
|
.lp-spin-back { transform-box: fill-box; transform-origin: center; animation: lp-spin 160s linear infinite reverse; }
|
||||||
|
.lp-pair-legend { display: flex; flex-direction: column; gap: 10px; min-width: 0; }
|
||||||
|
.pair-text-row { display: flex; align-items: center; gap: 8px; font-size: 14px; color: var(--ink-2); }
|
||||||
|
.pair-text-row.p2-text { color: var(--p2); }
|
||||||
|
.lp-pair .nature-bar { margin-top: 6px; height: 8px; }
|
||||||
|
|
||||||
|
.lp-steps { list-style: none; margin: 0; padding: 0; display: grid; grid-template-columns: repeat(auto-fit, minmax(min(280px, 100%), 1fr)); gap: 24px; }
|
||||||
|
.lp-steps .card { gap: 12px; padding: 28px; }
|
||||||
|
.lp-step-n { font-family: var(--font-display); font-size: 44px; font-weight: 600; line-height: 1; color: var(--gold); }
|
||||||
|
.lp-step-title { font-family: var(--font-body); font-size: 18px; font-weight: 600; line-height: 1.3; }
|
||||||
|
|
||||||
|
.lp-final { background: radial-gradient(ellipse at 50% 0%, rgba(217, 180, 106, 0.12), transparent 60%), var(--bg); padding: 104px 0; }
|
||||||
|
.lp-final-inner { max-width: 820px; display: flex; flex-direction: column; align-items: center; gap: 22px; text-align: center; }
|
||||||
|
.lp-emblem { width: 88px; height: 88px; }
|
||||||
|
.lp-emblem-outer { fill: none; stroke: var(--gold); stroke-opacity: 0.5; stroke-width: 1; }
|
||||||
|
.lp-waitlist { width: 100%; max-width: 520px; text-align: left; }
|
||||||
|
.lp-disclaimer { max-width: 560px; }
|
||||||
|
.lp-footer { border-top: 1px solid var(--line); padding: 28px 0; }
|
||||||
|
.lp-footer-inner { display: flex; gap: 16px; flex-wrap: wrap; align-items: center; justify-content: space-between; }
|
||||||
|
.lp-footer-nav { display: flex; gap: 18px; flex-wrap: wrap; font-size: 14px; }
|
||||||
|
.lp-footer-nav a { color: var(--muted); text-decoration: none; }
|
||||||
|
.lp-footer-nav a:hover { color: var(--gold); }
|
||||||
|
|
||||||
|
@keyframes lp-twinkle { 0%, 100% { opacity: 0.15; } 50% { opacity: 0.7; } }
|
||||||
|
@keyframes lp-fade { to { opacity: 1; } }
|
||||||
|
@keyframes lp-draw { to { stroke-dashoffset: 0; } }
|
||||||
|
@keyframes lp-spin { to { transform: rotate(360deg); } }
|
||||||
|
@keyframes lp-rise { to { opacity: 1; transform: none; } }
|
||||||
|
@keyframes lp-float { 0%, 100% { transform: translateY(0); } 50% { transform: translateY(-8px); } }
|
||||||
|
@keyframes lp-pulse { 0%, 100% { transform: scale(1); opacity: 0.9; } 50% { transform: scale(1.6); opacity: 0.2; } }
|
||||||
|
@media (max-width: 900px) { .lp-analysis-grid { grid-template-columns: minmax(0, 1fr); } }
|
||||||
|
@media (max-width: 640px) {
|
||||||
|
.lp-band { padding: 64px 0; }
|
||||||
|
.lp-hero-grid { padding-top: 40px; padding-bottom: 56px; gap: 32px; }
|
||||||
|
.lp-wrap { padding: 0 16px; }
|
||||||
|
.lp-paper, .lp-feature { padding: 22px; }
|
||||||
|
.lp-pair { grid-template-columns: minmax(0, 1fr); justify-items: center; }
|
||||||
|
.lp-rings { max-width: 200px; }
|
||||||
|
.lp-nav { display: none; }
|
||||||
|
}
|
||||||
|
@media (prefers-reduced-motion: reduce) {
|
||||||
|
.lp *, .lp-orbit { animation: none !important; }
|
||||||
|
.lp-rise, .lp-wheel .w-point { opacity: 1; transform: none; }
|
||||||
|
.lp-wheel .w-aspect { stroke-dashoffset: 0; }
|
||||||
|
.lp-wheel .w-aspect.w-asp-sextile { opacity: 1; }
|
||||||
|
}
|
||||||
|
|
||||||
|
.mode-option:disabled { cursor: not-allowed; opacity: 0.75; }
|
||||||
|
.mode-option:disabled:hover { border-color: var(--line-2); }
|
||||||
|
.mode-soon { margin-left: 8px; vertical-align: middle; font-family: var(--font-body); font-size: 11px; }
|
||||||
|
.invite-soon .btn:disabled { cursor: not-allowed; }
|
||||||
|
|
||||||
|
/* Home page: the AI line and "why it is different" */
|
||||||
|
.lp-ai-line { font-size: 16px; max-width: 540px; }
|
||||||
|
.lp-why-grid { list-style: none; margin: 0; padding: 0; display: grid; grid-template-columns: repeat(auto-fit, minmax(min(280px, 100%), 1fr)); gap: 24px; }
|
||||||
|
.lp-why-card { gap: 12px; padding: 28px; }
|
||||||
|
.lp-why-icon { width: 36px; height: 36px; fill: none; stroke: var(--gold); stroke-width: 1.4; stroke-linecap: round; stroke-linejoin: round; }
|
||||||
|
|
||||||
|
/* Home page footer: payment and invoicing partners */
|
||||||
|
.lp-partners { display: flex; flex-wrap: wrap; align-items: center; justify-content: center; gap: 10px 16px; padding-bottom: 20px; margin-bottom: 20px; border-bottom: 1px solid var(--line); }
|
||||||
|
.lp-partner { height: 26px; width: auto; opacity: 0.65; transition: opacity 0.2s; }
|
||||||
|
.lp-partner:hover { opacity: 1; }
|
||||||
|
.lp-partners .hint + .lp-partner { margin-right: 18px; }
|
||||||
|
.lp-partners .lp-partner:last-child { margin-right: 0; }
|
||||||
|
|
||||||
|
/* Chart page: below the wheel and the summary, the facts and the next steps side by side */
|
||||||
|
.chart-extras { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(300px, 100%), 1fr)); gap: 16px; align-items: stretch; }
|
||||||
|
.chart-extras > .card { margin: 0; }
|
||||||
|
|
||||||
|
/* Back from Stripe: the payment's result at the bottom of the screen. */
|
||||||
|
.pay-return { position: fixed; left: 50%; bottom: 20px; transform: translateX(-50%); z-index: 60; width: min(560px, calc(100% - 32px)); }
|
||||||
|
.pay-return .msg {
|
||||||
|
display: flex; align-items: center; justify-content: space-between; gap: 12px; margin: 0; padding: 14px 16px;
|
||||||
|
background: var(--panel-2); border: 1px solid var(--line); border-radius: 14px; box-shadow: 0 12px 40px rgba(0, 0, 0, 0.45);
|
||||||
|
}
|
||||||
|
.pay-return .msg-ok { border-color: color-mix(in srgb, var(--ok) 55%, var(--line)); }
|
||||||
|
.pay-return .msg-error { border-color: color-mix(in srgb, var(--danger) 55%, var(--line)); }
|
||||||
|
|
||||||
|
/* Számláim */
|
||||||
|
.invoice-table th.num, .invoice-table td.num { text-align: right; }
|
||||||
|
.invoice-table td.act { text-align: right; white-space: nowrap; }
|
||||||
|
@media (max-width: 640px) {
|
||||||
|
.invoice-table th:nth-child(3), .invoice-table td:nth-child(3) { display: none; }
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
|
||||||
|
<rect width="64" height="64" rx="14" fill="#0d1220"/>
|
||||||
|
<g transform="translate(6 6) scale(0.8125)" fill="none" stroke="#d9b46a" stroke-width="4.5" stroke-linecap="round">
|
||||||
|
<circle cx="32" cy="32" r="23"/>
|
||||||
|
<path d="M10 46 C 24 45, 29 23, 44 18"/>
|
||||||
|
<path d="M18 33.5 L36 33.5" stroke-width="4.2"/>
|
||||||
|
<path d="M49 6 L51.8 13.2 L59 16 L51.8 18.8 L49 26 L46.2 18.8 L39 16 L46.2 13.2 Z" fill="#ece6d8" stroke="none"/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 502 B |
@@ -0,0 +1,22 @@
|
|||||||
|
// The link preview image of the home page (og:image), drawn from the example
|
||||||
|
// chart. The page links it with a version (?v=…), so a new design is fetched
|
||||||
|
// again; until then it is kept long.
|
||||||
|
import example from "@/content/pelda.json";
|
||||||
|
import { chartCard } from "@/lib/ogCard";
|
||||||
|
import type { ChartResult } from "@/lib/types";
|
||||||
|
|
||||||
|
export async function GET() {
|
||||||
|
return chartCard({
|
||||||
|
chart: example.chart as unknown as ChartResult,
|
||||||
|
timeKnown: true,
|
||||||
|
eyebrow: "KÉPLET · ELŐREJELZÉS · KAPCSOLAT",
|
||||||
|
title: "Ahol a csillagok összekötnek.",
|
||||||
|
text: "Percre pontos születési képlet és személyre szóló elemzés. Mit hoz az éved, és mennyire illetek össze azzal, akit szeretsz?",
|
||||||
|
lines: [
|
||||||
|
{ glyph: "☉", label: "Képletelemzés" },
|
||||||
|
{ glyph: "♃", label: "Éves előrejelzés" },
|
||||||
|
{ glyph: "♀", label: "Kapcsolati összevetés" },
|
||||||
|
],
|
||||||
|
cacheControl: "public, max-age=86400, s-maxage=604800",
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -6,6 +6,7 @@ import { ChartWheel } from "@/components/ChartWheel";
|
|||||||
import { DetailedAnalysis } from "@/components/DetailedAnalysis";
|
import { DetailedAnalysis } from "@/components/DetailedAnalysis";
|
||||||
import { ForecastKeys, ForecastTimeline, ForecastTransits, longDay } from "@/components/ForecastViews";
|
import { ForecastKeys, ForecastTimeline, ForecastTransits, longDay } from "@/components/ForecastViews";
|
||||||
import { Tabs } from "@/components/Tabs";
|
import { Tabs } from "@/components/Tabs";
|
||||||
|
import { payMethod } from "@/lib/payments";
|
||||||
import { backendGet, requireMe } from "@/lib/server";
|
import { backendGet, requireMe } from "@/lib/server";
|
||||||
import type { Analysis, Chart, ForecastDetail, ForecastList, PublicConfig } from "@/lib/types";
|
import type { Analysis, Chart, ForecastDetail, ForecastList, PublicConfig } from "@/lib/types";
|
||||||
|
|
||||||
@@ -134,7 +135,7 @@ export default async function ForecastPage({
|
|||||||
initial={detailed}
|
initial={detailed}
|
||||||
left={me.analyses_left.forecast}
|
left={me.analyses_left.forecast}
|
||||||
isAdmin={me.user.roles.includes("admin")}
|
isAdmin={me.user.roles.includes("admin")}
|
||||||
canPay={config?.mock_payments ?? false}
|
canPay={payMethod(config, me)}
|
||||||
questionsLeft={me.analyses_left.question ?? 0}
|
questionsLeft={me.analyses_left.question ?? 0}
|
||||||
/>
|
/>
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import { ChartWheel, WheelLegend } from "@/components/ChartWheel";
|
|||||||
import { CompareButton } from "@/components/CompareButton";
|
import { CompareButton } from "@/components/CompareButton";
|
||||||
import { Tabs } from "@/components/Tabs";
|
import { Tabs } from "@/components/Tabs";
|
||||||
import { ASPECTS, ELEMENTS, MODALITIES, MOON_PHASES, countryName, formatBirthDate, pointName } from "@/lib/astro";
|
import { ASPECTS, ELEMENTS, MODALITIES, MOON_PHASES, countryName, formatBirthDate, pointName } from "@/lib/astro";
|
||||||
|
import { payMethod } from "@/lib/payments";
|
||||||
import { backendGet, requireMe } from "@/lib/server";
|
import { backendGet, requireMe } from "@/lib/server";
|
||||||
import type { Analysis, Chart, ChartListItem, PublicConfig } from "@/lib/types";
|
import type { Analysis, Chart, ChartListItem, PublicConfig } from "@/lib/types";
|
||||||
|
|
||||||
@@ -77,89 +78,95 @@ export default async function ChartPage({ params }: { params: Promise<{ id: stri
|
|||||||
initial={summary}
|
initial={summary}
|
||||||
detailedDone={detailed?.status === "done"}
|
detailedDone={detailed?.status === "done"}
|
||||||
isAdmin={me.user.roles.includes("admin")}
|
isAdmin={me.user.roles.includes("admin")}
|
||||||
|
shareRewardGranted={me.share_reward_granted}
|
||||||
|
referralOpen={config?.referral_rewards ?? false}
|
||||||
|
referralsLeft={me.referral_rewards.limit - me.referral_rewards.earned}
|
||||||
/>
|
/>
|
||||||
<BigThree chart={chart} />
|
<BigThree chart={chart} />
|
||||||
{(elements || modalities || phase) && (
|
</div>
|
||||||
<div className="card" style={{ gap: 12 }}>
|
</section>
|
||||||
<dl className="facts">
|
|
||||||
{elements && (
|
<section className="chart-extras" aria-label="A képlet összegzése és továbblépés">
|
||||||
<>
|
{(elements || modalities || phase) && (
|
||||||
<dt>Elemek</dt>
|
<div className="card" style={{ gap: 12 }}>
|
||||||
<dd>
|
<dl className="facts">
|
||||||
{Object.entries(elements)
|
|
||||||
.map(([k, v]) => `${ELEMENTS[k] ?? k} ${v.count}`)
|
|
||||||
.join(" · ")}
|
|
||||||
</dd>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
{modalities && (
|
|
||||||
<>
|
|
||||||
<dt>Minőségek</dt>
|
|
||||||
<dd>
|
|
||||||
{Object.entries(modalities)
|
|
||||||
.map(([k, v]) => `${MODALITIES[k] ?? k} ${v.count}`)
|
|
||||||
.join(" · ")}
|
|
||||||
</dd>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
{phase && (
|
|
||||||
<>
|
|
||||||
<dt>Holdfázis</dt>
|
|
||||||
<dd>
|
|
||||||
{MOON_PHASES[phase.phase] ?? phase.phase}, {Math.round(phase.illumination * 100)}%
|
|
||||||
</dd>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
</dl>
|
|
||||||
{elements && (
|
{elements && (
|
||||||
<p className="hint">
|
<>
|
||||||
Az elemek és minőségek a tíz bolygóból számolva:{" "}
|
<dt>Elemek</dt>
|
||||||
{Object.entries(elements)
|
<dd>
|
||||||
.filter(([, v]) => v.count > 0)
|
{Object.entries(elements)
|
||||||
.map(([k, v]) => `${ELEMENTS[k] ?? k}: ${v.points.map(pointName).join(", ")}`)
|
.map(([k, v]) => `${ELEMENTS[k] ?? k} ${v.count}`)
|
||||||
.join("; ")}
|
.join(" · ")}
|
||||||
.
|
</dd>
|
||||||
</p>
|
</>
|
||||||
)}
|
)}
|
||||||
|
{modalities && (
|
||||||
|
<>
|
||||||
|
<dt>Minőségek</dt>
|
||||||
|
<dd>
|
||||||
|
{Object.entries(modalities)
|
||||||
|
.map(([k, v]) => `${MODALITIES[k] ?? k} ${v.count}`)
|
||||||
|
.join(" · ")}
|
||||||
|
</dd>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
{phase && (
|
||||||
|
<>
|
||||||
|
<dt>Holdfázis</dt>
|
||||||
|
<dd>
|
||||||
|
{MOON_PHASES[phase.phase] ?? phase.phase}, {Math.round(phase.illumination * 100)}%
|
||||||
|
</dd>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</dl>
|
||||||
|
{elements && (
|
||||||
|
<p className="hint">
|
||||||
|
Az elemek és minőségek a tíz bolygóból számolva:{" "}
|
||||||
|
{Object.entries(elements)
|
||||||
|
.filter(([, v]) => v.count > 0)
|
||||||
|
.map(([k, v]) => `${ELEMENTS[k] ?? k}: ${v.points.map(pointName).join(", ")}`)
|
||||||
|
.join("; ")}
|
||||||
|
.
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
<Link href={`/kepletek/${chart.id}/elorejelzes`} className="card persons-tile">
|
||||||
|
<span className="eyebrow">Éves előrejelzés</span>
|
||||||
|
<strong>{chart.is_primary ? "Mit hoz az éved?" : `Mit hoz ${chart.label} éve?`}</strong>
|
||||||
|
<span className="muted">
|
||||||
|
Szolár képlet, tranzitok pontos dátumokkal, progresszió: egy év születésnaptól születésnapig.
|
||||||
|
</span>
|
||||||
|
<span className="persons-tile-arrow" aria-hidden="true">
|
||||||
|
→
|
||||||
|
</span>
|
||||||
|
</Link>
|
||||||
|
{!chart.is_primary && own && (
|
||||||
|
<div className="card compare-tile">
|
||||||
|
<span className="eyebrow">Összevetés</span>
|
||||||
|
<strong>Te és {chart.label}</strong>
|
||||||
|
<span className="muted">Két képlet egy körön: mi vonz, hol súrlódtok, és mit ad a kapcsolat.</span>
|
||||||
|
<div className="form-actions">
|
||||||
|
<CompareButton chart1={own.id} chart2={chart.id} label="Összevetés velem" className="btn" />
|
||||||
</div>
|
</div>
|
||||||
)}
|
</div>
|
||||||
<Link href={`/kepletek/${chart.id}/elorejelzes`} className="card persons-tile">
|
)}
|
||||||
<span className="eyebrow">Éves előrejelzés</span>
|
{chart.is_primary && (
|
||||||
<strong>{chart.is_primary ? "Mit hoz az éved?" : `Mit hoz ${chart.label} éve?`}</strong>
|
<Link href="/szemelyek" className="card persons-tile">
|
||||||
|
<span className="eyebrow">Személyek</span>
|
||||||
|
<strong>
|
||||||
|
{persons.length > 0 ? `${persons.length} felvett személy` : "Társad, családod képlete"}
|
||||||
|
</strong>
|
||||||
<span className="muted">
|
<span className="muted">
|
||||||
Szolár képlet, tranzitok pontos dátumokkal, progresszió: egy év születésnaptól születésnapig.
|
{persons.length > 0
|
||||||
|
? persons.slice(0, 3).map((p) => p.label).join(", ") + (persons.length > 3 ? "…" : "")
|
||||||
|
: "Vedd fel őket, és nézd meg az ő képletüket és elemzésüket is."}
|
||||||
</span>
|
</span>
|
||||||
<span className="persons-tile-arrow" aria-hidden="true">
|
<span className="persons-tile-arrow" aria-hidden="true">
|
||||||
→
|
→
|
||||||
</span>
|
</span>
|
||||||
</Link>
|
</Link>
|
||||||
{!chart.is_primary && own && (
|
)}
|
||||||
<div className="card compare-tile">
|
|
||||||
<span className="eyebrow">Összevetés</span>
|
|
||||||
<strong>Te és {chart.label}</strong>
|
|
||||||
<span className="muted">Két képlet egy körön: mi vonz, hol súrlódtok, és mit ad a kapcsolat.</span>
|
|
||||||
<div className="form-actions">
|
|
||||||
<CompareButton chart1={own.id} chart2={chart.id} label="Összevetés velem" className="btn" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
{chart.is_primary && (
|
|
||||||
<Link href="/szemelyek" className="card persons-tile">
|
|
||||||
<span className="eyebrow">Személyek</span>
|
|
||||||
<strong>
|
|
||||||
{persons.length > 0 ? `${persons.length} felvett személy` : "Társad, családod képlete"}
|
|
||||||
</strong>
|
|
||||||
<span className="muted">
|
|
||||||
{persons.length > 0
|
|
||||||
? persons.slice(0, 3).map((p) => p.label).join(", ") + (persons.length > 3 ? "…" : "")
|
|
||||||
: "Vedd fel őket, és nézd meg az ő képletüket és elemzésüket is."}
|
|
||||||
</span>
|
|
||||||
<span className="persons-tile-arrow" aria-hidden="true">
|
|
||||||
→
|
|
||||||
</span>
|
|
||||||
</Link>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section className="card chart-tabs" aria-label="Elemzés és táblázatok">
|
<section className="card chart-tabs" aria-label="Elemzés és táblázatok">
|
||||||
@@ -175,7 +182,7 @@ export default async function ChartPage({ params }: { params: Promise<{ id: stri
|
|||||||
initial={detailed}
|
initial={detailed}
|
||||||
left={me.analyses_left.natal}
|
left={me.analyses_left.natal}
|
||||||
isAdmin={me.user.roles.includes("admin")}
|
isAdmin={me.user.roles.includes("admin")}
|
||||||
canPay={config?.mock_payments ?? false}
|
canPay={payMethod(config, me)}
|
||||||
questionsLeft={me.analyses_left.question ?? 0}
|
questionsLeft={me.analyses_left.question ?? 0}
|
||||||
/>
|
/>
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
import type { Metadata } from "next";
|
import type { Metadata } from "next";
|
||||||
import { Cormorant_Garamond, Inter } from "next/font/google";
|
import { Cormorant_Garamond, Inter } from "next/font/google";
|
||||||
|
import { Suspense } from "react";
|
||||||
|
|
||||||
|
import { PaymentReturn } from "@/components/PaymentReturn";
|
||||||
import { SiteHeader } from "@/components/SiteHeader";
|
import { SiteHeader } from "@/components/SiteHeader";
|
||||||
import { getMe } from "@/lib/server";
|
import { getMe } from "@/lib/server";
|
||||||
|
|
||||||
@@ -25,6 +27,11 @@ export default async function RootLayout({ children }: { children: React.ReactNo
|
|||||||
<body>
|
<body>
|
||||||
{me && <SiteHeader me={me} />}
|
{me && <SiteHeader me={me} />}
|
||||||
{children}
|
{children}
|
||||||
|
{me && (
|
||||||
|
<Suspense fallback={null}>
|
||||||
|
<PaymentReturn />
|
||||||
|
</Suspense>
|
||||||
|
)}
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ export function Unsubscribe({ token }: { token: string | null }) {
|
|||||||
if (state === "done") {
|
if (state === "done") {
|
||||||
return (
|
return (
|
||||||
<p className="msg msg-ok" role="status">
|
<p className="msg msg-ok" role="status">
|
||||||
Leiratkoztál: erre a címre nem küldünk több meghívót.
|
Leiratkoztál: erre a címre nem küldünk több meghívót, és levettük a várólistáról.
|
||||||
</p>
|
</p>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -40,7 +40,8 @@ export function Unsubscribe({ token }: { token: string | null }) {
|
|||||||
return (
|
return (
|
||||||
<div className="card field" style={{ gap: 12 }}>
|
<div className="card field" style={{ gap: 12 }}>
|
||||||
<p style={{ margin: 0 }}>
|
<p style={{ margin: 0 }}>
|
||||||
Ha leiratkozol, erre az e-mail-címre többé nem küldünk meghívót, és a mostani meghívód is érvényét veszti.
|
Ha leiratkozol, erre az e-mail-címre többé nem küldünk meghívót, levesszük a várólistáról, és a mostani meghívód
|
||||||
|
is érvényét veszti.
|
||||||
</p>
|
</p>
|
||||||
<div>
|
<div>
|
||||||
<button type="button" className="btn btn-primary" onClick={confirm} disabled={state === "busy"}>
|
<button type="button" className="btn btn-primary" onClick={confirm} disabled={state === "busy"}>
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ export default async function UnsubscribePage({ searchParams }: { searchParams:
|
|||||||
<main className="page" style={{ maxWidth: 560 }}>
|
<main className="page" style={{ maxWidth: 560 }}>
|
||||||
<div className="page-head">
|
<div className="page-head">
|
||||||
<h1>Leiratkozás</h1>
|
<h1>Leiratkozás</h1>
|
||||||
<p className="muted">Nem kérsz több meghívót a Sorsfonalakra.</p>
|
<p className="muted">Nem kérsz több levelet és meghívót a Sorsfonalakról.</p>
|
||||||
</div>
|
</div>
|
||||||
<Unsubscribe token={token ?? null} />
|
<Unsubscribe token={token ?? null} />
|
||||||
</main>
|
</main>
|
||||||
|
|||||||
@@ -0,0 +1,63 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useRouter } from "next/navigation";
|
||||||
|
import { useState } from "react";
|
||||||
|
|
||||||
|
import { BirthForm } from "@/app/profil/BirthForm";
|
||||||
|
import { api, errorText } from "@/lib/api";
|
||||||
|
|
||||||
|
/** The logged-in invitee: gives their own birth data if needed, then the comparison is made. */
|
||||||
|
export function AcceptInvite({ token, hasOwnChart }: { token: string; hasOwnChart: boolean }) {
|
||||||
|
const router = useRouter();
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const [needsChart, setNeedsChart] = useState(!hasOwnChart);
|
||||||
|
|
||||||
|
async function accept() {
|
||||||
|
setBusy(true);
|
||||||
|
setError(null);
|
||||||
|
try {
|
||||||
|
const s = await api<{ id: string }>("/invites/accept", { body: { token } });
|
||||||
|
router.push(`/osszevetesek/${s.id}`);
|
||||||
|
router.refresh();
|
||||||
|
} catch (e) {
|
||||||
|
setError(errorText(e));
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (needsChart) {
|
||||||
|
return (
|
||||||
|
<div className="field" style={{ gap: 12 }}>
|
||||||
|
<p>Add meg a születési adataidat: ebből készül a képleted, és ezt vetjük össze.</p>
|
||||||
|
<BirthForm
|
||||||
|
initial={null}
|
||||||
|
onSaved={() => {
|
||||||
|
setNeedsChart(false);
|
||||||
|
accept();
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
{error && (
|
||||||
|
<p className="msg msg-error" role="alert">
|
||||||
|
{error}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
<div className="field" style={{ gap: 12 }}>
|
||||||
|
<p>A saját képleteddel vetjük össze.</p>
|
||||||
|
<div className="form-actions">
|
||||||
|
<button type="button" className="btn btn-primary" onClick={accept} disabled={busy}>
|
||||||
|
{busy ? "Készül az összevetés…" : "Összevetés elkészítése"}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
{error && (
|
||||||
|
<p className="msg msg-error" role="alert">
|
||||||
|
{error}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
import type { Metadata } from "next";
|
||||||
|
import Link from "next/link";
|
||||||
|
|
||||||
|
import { GoogleLogin } from "@/app/belepes/GoogleLogin";
|
||||||
|
import { PublicHeader } from "@/components/SiteHeader";
|
||||||
|
import { formatDate } from "@/lib/astro";
|
||||||
|
import { BACKEND_URL, getMe } from "@/lib/server";
|
||||||
|
import type { PersonInviteLanding, PublicConfig } from "@/lib/types";
|
||||||
|
|
||||||
|
import { AcceptInvite } from "./AcceptInvite";
|
||||||
|
|
||||||
|
export const metadata: Metadata = {
|
||||||
|
title: "Mennyire illünk össze?",
|
||||||
|
description: "Meghívó a születési képletek összevetésére a Sorsfonalakon.",
|
||||||
|
robots: { index: false },
|
||||||
|
};
|
||||||
|
|
||||||
|
const TOKEN = /^[A-Za-z0-9_-]{8,200}$/;
|
||||||
|
|
||||||
|
async function load<T>(path: string): Promise<T | null> {
|
||||||
|
try {
|
||||||
|
const res = await fetch(`${BACKEND_URL}${path}`, { cache: "no-store" });
|
||||||
|
return res.ok ? ((await res.json()) as T) : null;
|
||||||
|
} catch {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** A "how compatible are we?" link: who invites, login, own birth data, then the comparison. */
|
||||||
|
export default async function PersonInvitePage({ params }: { params: Promise<{ token: string }> }) {
|
||||||
|
const { token } = await params;
|
||||||
|
const valid = TOKEN.test(token);
|
||||||
|
const [invite, config, me] = await Promise.all([
|
||||||
|
valid ? load<PersonInviteLanding>(`/v1/public/invites/${token}`) : Promise.resolve(null),
|
||||||
|
load<PublicConfig>("/v1/config"),
|
||||||
|
getMe(),
|
||||||
|
]);
|
||||||
|
const who = invite?.inviter_name ?? "Valaki";
|
||||||
|
const clientId = config?.google_login.enabled ? config.google_login.client_id : null;
|
||||||
|
|
||||||
|
let body: React.ReactNode;
|
||||||
|
if (!invite) {
|
||||||
|
body = <p className="msg msg-error">Ez a meghívólink érvénytelen. Ellenőrizd, hogy a teljes linket nyitottad-e meg.</p>;
|
||||||
|
} else if (invite.status === "accepted") {
|
||||||
|
body = (
|
||||||
|
<p className="muted">
|
||||||
|
Ezt a meghívót már elfogadták. {me ? <Link href="/osszevetesek">Az összevetéseid itt vannak.</Link> : null}
|
||||||
|
</p>
|
||||||
|
);
|
||||||
|
} else if (invite.status === "expired") {
|
||||||
|
body = <p className="msg msg-error">Ez a meghívó lejárt vagy visszavonták. Kérj újat attól, aki küldte.</p>;
|
||||||
|
} else if (!me) {
|
||||||
|
body = clientId ? (
|
||||||
|
<>
|
||||||
|
<GoogleLogin clientId={clientId} target={`/meghivas/${token}`} inviteToken={token} />
|
||||||
|
<p className="hint">A fiókod az első belépéskor jön létre, bármelyik Google-fiókoddal.</p>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<p className="msg msg-error">A belépés most nem érhető el. Próbáld újra később.</p>
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
body = <AcceptInvite token={token} hasOwnChart={me.primary_chart_id !== null} />;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{!me && (
|
||||||
|
<PublicHeader />
|
||||||
|
)}
|
||||||
|
<main className="page" style={{ maxWidth: 720 }}>
|
||||||
|
<div className="page-head">
|
||||||
|
<span className="eyebrow">Meghívó</span>
|
||||||
|
<h1>Mennyire illetek össze?</h1>
|
||||||
|
{invite && (
|
||||||
|
<p className="muted">
|
||||||
|
<strong>{who}</strong> szeretné összevetni a születési képleteteket.
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
{invite?.message && <blockquote className="invite-quote">{invite.message}</blockquote>}
|
||||||
|
<section className="card" style={{ gap: 14 }}>
|
||||||
|
{body}
|
||||||
|
{invite?.status === "pending" && (
|
||||||
|
<p className="hint">
|
||||||
|
A saját képletedet és egy rövid elemzést ingyen kapsz. {who} az összevetést látja, a születési adataidat nem.
|
||||||
|
A meghívó {formatDate(invite.expires_at).replace(/\.$/, "")}-ig érvényes.
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -8,6 +8,7 @@ import { CompositeTables, CrossGrid, HouseOverlays, InterAspectList, NatureBar }
|
|||||||
import { SynastryLegend, SynastryWheel } from "@/components/SynastryWheel";
|
import { SynastryLegend, SynastryWheel } from "@/components/SynastryWheel";
|
||||||
import { Tabs } from "@/components/Tabs";
|
import { Tabs } from "@/components/Tabs";
|
||||||
import { ASPECTS, formatBirthDate } from "@/lib/astro";
|
import { ASPECTS, formatBirthDate } from "@/lib/astro";
|
||||||
|
import { payMethod } from "@/lib/payments";
|
||||||
import { backendGet, requireMe } from "@/lib/server";
|
import { backendGet, requireMe } from "@/lib/server";
|
||||||
import { sideName, sideTimeKnown } from "@/lib/synastry";
|
import { sideName, sideTimeKnown } from "@/lib/synastry";
|
||||||
import type { Analysis, ChartListItem, PublicConfig, Synastry, SynastrySide } from "@/lib/types";
|
import type { Analysis, ChartListItem, PublicConfig, Synastry, SynastrySide } from "@/lib/types";
|
||||||
@@ -127,8 +128,9 @@ 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}
|
||||||
/>
|
/>
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,10 +1,48 @@
|
|||||||
|
import type { Metadata } from "next";
|
||||||
import { redirect } from "next/navigation";
|
import { redirect } from "next/navigation";
|
||||||
|
|
||||||
import { getMe } from "@/lib/server";
|
import { BACKEND_URL, getMe } from "@/lib/server";
|
||||||
|
import { siteUrl } from "@/lib/share";
|
||||||
|
import type { PublicConfig } from "@/lib/types";
|
||||||
|
|
||||||
// No home page yet: logged-in users go to their chart (or to the profile to enter
|
import { Landing } from "./Landing";
|
||||||
// their birth data), others to login.
|
|
||||||
|
/** Bumped when the preview image changes, so Facebook and co. fetch it again. */
|
||||||
|
const PREVIEW_VERSION = 1;
|
||||||
|
|
||||||
|
export async function generateMetadata(): Promise<Metadata> {
|
||||||
|
const base = await siteUrl();
|
||||||
|
const title = "Sorsfonalak – ahol a csillagok összekötnek";
|
||||||
|
const description =
|
||||||
|
"Születési képlet, részletes elemzés, éves előrejelzés és kapcsolati összevetés a legfejlettebb AI-modellekkel, töredék áron.";
|
||||||
|
const image = {
|
||||||
|
url: `${base}/kep/fooldal.png?v=${PREVIEW_VERSION}`,
|
||||||
|
width: 1200,
|
||||||
|
height: 630,
|
||||||
|
alt: "Egy példa születési képlet a Sorsfonalakon",
|
||||||
|
};
|
||||||
|
return {
|
||||||
|
title: { absolute: "Sorsfonalak – születési képlet, éves előrejelzés, kapcsolati összevetés" },
|
||||||
|
description:
|
||||||
|
"Percre pontos születési képlet és személyre szóló elemzés a legfejlettebb AI-modellekkel: egy tapasztalt asztrológushoz közelítő mélység, töredék áron. Éves előrejelzés és kapcsolati összevetés.",
|
||||||
|
alternates: { canonical: `${base}/` },
|
||||||
|
openGraph: { type: "website", siteName: "Sorsfonalak", locale: "hu_HU", url: `${base}/`, title, description, images: [image] },
|
||||||
|
twitter: { card: "summary_large_image", title, description, images: [image.url] },
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async function signupMode(): Promise<PublicConfig["signup_mode"]> {
|
||||||
|
try {
|
||||||
|
const res = await fetch(`${BACKEND_URL}/v1/config`, { next: { revalidate: 300 } });
|
||||||
|
return res.ok ? ((await res.json()) as PublicConfig).signup_mode : "invite";
|
||||||
|
} catch {
|
||||||
|
return "invite";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Visitors get the home page; logged-in users go to their chart (or to the profile for their birth data). */
|
||||||
export default async function Home() {
|
export default async function Home() {
|
||||||
const me = await getMe();
|
const me = await getMe();
|
||||||
redirect(!me ? "/belepes" : me.primary_chart_id ? "/keplet" : "/profil");
|
if (me) redirect(me.primary_chart_id ? "/keplet" : "/profil");
|
||||||
|
return <Landing inviteOnly={(await signupMode()) !== "open"} />;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import Link from "next/link";
|
|||||||
import { AnalysisView } from "@/components/AnalysisView";
|
import { AnalysisView } from "@/components/AnalysisView";
|
||||||
import { ChartWheel, WheelLegend } from "@/components/ChartWheel";
|
import { ChartWheel, WheelLegend } from "@/components/ChartWheel";
|
||||||
import { Rich } from "@/components/Rich";
|
import { Rich } from "@/components/Rich";
|
||||||
import { Logo } from "@/components/SiteHeader";
|
import { PublicHeader } from "@/components/SiteHeader";
|
||||||
import example from "@/content/pelda.json";
|
import example from "@/content/pelda.json";
|
||||||
import { getMe } from "@/lib/server";
|
import { getMe } from "@/lib/server";
|
||||||
import type { AnalysisContent, ChartResult } from "@/lib/types";
|
import type { AnalysisContent, ChartResult } from "@/lib/types";
|
||||||
@@ -21,9 +21,7 @@ export default async function ExamplePage() {
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{!me && (
|
{!me && (
|
||||||
<header className="site-header">
|
<PublicHeader current="pelda" />
|
||||||
<Logo />
|
|
||||||
</header>
|
|
||||||
)}
|
)}
|
||||||
<main className="page" style={{ maxWidth: 1180 }}>
|
<main className="page" style={{ maxWidth: 1180 }}>
|
||||||
<div className="page-head">
|
<div className="page-head">
|
||||||
|
|||||||
@@ -0,0 +1,295 @@
|
|||||||
|
import type { Metadata } from "next";
|
||||||
|
import Link from "next/link";
|
||||||
|
|
||||||
|
import { PublicHeader } from "@/components/SiteHeader";
|
||||||
|
import { OPERATOR, PRIVACY_UPDATED_EN, operatorDetails } from "@/lib/legal";
|
||||||
|
import { getMe } from "@/lib/server";
|
||||||
|
|
||||||
|
export const metadata: Metadata = {
|
||||||
|
title: "Privacy Policy",
|
||||||
|
description: "How Sorsfonalak handles your personal data, including the data received from your Google account.",
|
||||||
|
};
|
||||||
|
|
||||||
|
const DATA: [string, string, string][] = [
|
||||||
|
[
|
||||||
|
"Your Google account's name, e-mail address and ID (passed on by Google when you sign in)",
|
||||||
|
"Creating your account, signing you in, contacting you",
|
||||||
|
"Performance of a contract (GDPR Art. 6(1)(b))",
|
||||||
|
],
|
||||||
|
["Display name, the language of your readings", "Personalising the service", "Performance of a contract"],
|
||||||
|
[
|
||||||
|
"Your birth data: date, time and place",
|
||||||
|
"Calculating your birth chart and writing your readings",
|
||||||
|
"Performance of a contract",
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"Names and birth data of the people you add",
|
||||||
|
"Their charts and readings, at your request",
|
||||||
|
"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 purchases and used allowances (readings, persons)",
|
||||||
|
"Providing the purchased service, accounting",
|
||||||
|
"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))",
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"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",
|
||||||
|
"Legitimate interest (Art. 6(1)(f))",
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"The e-mail address given on the waitlist",
|
||||||
|
"Telling you when the site opens or an invitation is sent",
|
||||||
|
"Consent (Art. 6(1)(a))",
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"Addresses that opted out of invitations (only a one-way hash of the address)",
|
||||||
|
"Not sending further invitations to them",
|
||||||
|
"Legitimate interest (Art. 6(1)(f))",
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"IP address, browser details, request times (server logs)",
|
||||||
|
"Security, troubleshooting, preventing abuse",
|
||||||
|
"Legitimate interest (Art. 6(1)(f))",
|
||||||
|
],
|
||||||
|
];
|
||||||
|
|
||||||
|
/** The privacy policy in English (the Hungarian one at /adatvedelem is the same in content). */
|
||||||
|
export default async function PrivacyPolicyPage() {
|
||||||
|
const me = await getMe();
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{!me && <PublicHeader />}
|
||||||
|
<main className="page legal" lang="en">
|
||||||
|
<div className="page-head">
|
||||||
|
<h1>Privacy Policy</h1>
|
||||||
|
<p className="muted">
|
||||||
|
Effective: {PRIVACY_UPDATED_EN} ·{" "}
|
||||||
|
<Link href="/adatvedelem" lang="hu">
|
||||||
|
Magyar változat
|
||||||
|
</Link>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>1. Who is responsible for your data?</h2>
|
||||||
|
<p>
|
||||||
|
{operatorDetails() ? (
|
||||||
|
<>
|
||||||
|
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}`}>
|
||||||
|
<strong>{OPERATOR.email}</strong>
|
||||||
|
</a>
|
||||||
|
.
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>2. What data we process and why</h2>
|
||||||
|
<div className="table-wrap">
|
||||||
|
<table className="legal-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Data</th>
|
||||||
|
<th>Purpose</th>
|
||||||
|
<th>Legal basis</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{DATA.map(([data, purpose, basis]) => (
|
||||||
|
<tr key={data}>
|
||||||
|
<td>{data}</td>
|
||||||
|
<td>{purpose}</td>
|
||||||
|
<td>{basis}</td>
|
||||||
|
</tr>
|
||||||
|
))}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
<p>
|
||||||
|
<strong>We do not process or store card details.</strong> Payments are made on Stripe's secure payment
|
||||||
|
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>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>3. Data we receive from your Google account</h2>
|
||||||
|
<p>
|
||||||
|
We use “Sign in with Google” with the <code>openid</code>, <code>email</code> and <code>profile</code>{" "}
|
||||||
|
scopes. When you sign in, Google passes us:
|
||||||
|
</p>
|
||||||
|
<ul>
|
||||||
|
<li>your Google account's unique ID,</li>
|
||||||
|
<li>your e-mail address and whether Google has verified it,</li>
|
||||||
|
<li>your name,</li>
|
||||||
|
<li>your language setting.</li>
|
||||||
|
</ul>
|
||||||
|
<p>
|
||||||
|
<strong>How we use it:</strong> to create your account and recognise you when you sign in; your e-mail address
|
||||||
|
for service e-mails (for example when a reading is ready or an invitation was accepted); your name for display;
|
||||||
|
your language for the language of the site and your readings.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
<strong>What we do not do:</strong> we have no access to any other Google data (Gmail, Drive, Calendar,
|
||||||
|
contacts, photos), and we do not use any Google service on your behalf. We do not sell the data received from
|
||||||
|
Google, do not use it for advertising or profiling, do not share it with third parties (except the processors
|
||||||
|
that store it and send e-mails, see section 6), and do not send it to artificial intelligence.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
<strong>Retention and deletion:</strong> we keep it until you delete your account. You can delete your account
|
||||||
|
and all your data at any time on the <Link href="/profil#adataim">Profile</Link> page, and revoke
|
||||||
|
Sorsfonalak's access in your Google account at{" "}
|
||||||
|
<a href="https://myaccount.google.com/permissions" target="_blank" rel="noopener noreferrer">
|
||||||
|
myaccount.google.com/permissions
|
||||||
|
</a>
|
||||||
|
.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
Sorsfonalak's use and transfer of information received from Google APIs adheres to the{" "}
|
||||||
|
<a
|
||||||
|
href="https://developers.google.com/terms/api-services-user-data-policy"
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
>
|
||||||
|
Google API Services User Data Policy
|
||||||
|
</a>
|
||||||
|
, including the Limited Use requirements.
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>4. Readings and artificial intelligence</h2>
|
||||||
|
<p>
|
||||||
|
The short summary and the detailed reading are written by a large language model (artificial intelligence).
|
||||||
|
Only the <strong>astronomical data of the chart</strong> reach the model (the signs, degrees, houses and
|
||||||
|
aspects of the planets). We never send your name, e-mail address, birth date, time or place. The readings are
|
||||||
|
for entertainment and self-reflection and are not medical, financial, legal or other professional advice.
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>5. Other people's data</h2>
|
||||||
|
<p>
|
||||||
|
If you add someone else's birth data (for example your partner's or a family member's), please
|
||||||
|
do so only with their consent. Only you see their data; nobody else receives it from us. You can delete a
|
||||||
|
person you added at any time, which also deletes their chart and readings.
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>6. Who has access to the data (processors)</h2>
|
||||||
|
<ul>
|
||||||
|
<li>
|
||||||
|
<strong>DigitalOcean, LLC</strong>: hosting the servers; the data is stored in the European Union
|
||||||
|
(Amsterdam).
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<strong>Cloudflare, Inc.</strong>: delivering traffic and protecting against attacks; processes your IP
|
||||||
|
address and request data when the site loads.
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<strong>Google LLC</strong>: signing in with a Google account.
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<strong>Amazon Web Services EMEA SARL</strong> (Amazon SES): delivering service e-mails and invitations; in
|
||||||
|
the European Union (Frankfurt).
|
||||||
|
</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>
|
||||||
|
<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).
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<p>
|
||||||
|
Some of these providers operate in the United States. Transfers are based on the EU–US Data Privacy Framework
|
||||||
|
or the European Commission's Standard Contractual Clauses (SCC).
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>7. How long we keep data</h2>
|
||||||
|
<ul>
|
||||||
|
<li>Your account data, charts and readings: until you delete your account.</li>
|
||||||
|
<li>Deleted data disappears from backups within 14 days.</li>
|
||||||
|
<li>Server logs: at most 30 days.</li>
|
||||||
|
<li>
|
||||||
|
Invitations not accepted: deleted 30 days after they expire or are revoked. Every invitation e-mail has an
|
||||||
|
unsubscribe link.
|
||||||
|
</li>
|
||||||
|
<li>Waitlist addresses: until you sign up, or until you ask us to delete them.</li>
|
||||||
|
<li>Data needed for invoicing: for the period required by accounting law (8 years).</li>
|
||||||
|
</ul>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>8. Cookies</h2>
|
||||||
|
<p>
|
||||||
|
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.
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>9. Your rights</h2>
|
||||||
|
<ul>
|
||||||
|
<li>
|
||||||
|
<strong>Access and portability:</strong> download all your data with one click on the{" "}
|
||||||
|
<Link href="/profil#adataim">Profile</Link> page.
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<strong>Rectification:</strong> change your name and birth data on the Profile page.
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<strong>Erasure:</strong> delete your account and all your data on the Profile page.
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<strong>Restriction and objection:</strong> ask us at the e-mail address above.
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<p>
|
||||||
|
We answer within one month. If you think we have violated your rights, you can lodge a complaint with the
|
||||||
|
Hungarian National Authority for Data Protection and Freedom of Information (NAIH, 1055 Budapest, Falk Miksa
|
||||||
|
utca 9–11.,{" "}
|
||||||
|
<a href="https://naih.hu" target="_blank" rel="noopener noreferrer">
|
||||||
|
naih.hu
|
||||||
|
</a>
|
||||||
|
) or go to court.
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>10. Age limit</h2>
|
||||||
|
<p>The service is for people over 16.</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>11. Changes</h2>
|
||||||
|
<p>
|
||||||
|
If this policy changes materially, we will tell you when you sign in or by e-mail. The current version is
|
||||||
|
always on this page.
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -16,7 +16,7 @@ export function AccountData() {
|
|||||||
setError(null);
|
setError(null);
|
||||||
try {
|
try {
|
||||||
await api("/me", { method: "DELETE", body: { confirm: "DELETE" } });
|
await api("/me", { method: "DELETE", body: { confirm: "DELETE" } });
|
||||||
window.location.href = "/belepes";
|
window.location.href = "/";
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
setError(errorText(e));
|
setError(errorText(e));
|
||||||
setBusy(false);
|
setBusy(false);
|
||||||
|
|||||||
@@ -0,0 +1,52 @@
|
|||||||
|
import type { MetadataRoute } from "next";
|
||||||
|
|
||||||
|
import { siteUrl } from "@/lib/share";
|
||||||
|
|
||||||
|
// AI crawlers that train models or answer from the site: they load pages
|
||||||
|
// far more often than visitors do. Link preview robots (Facebook, Messenger,
|
||||||
|
// Slack, WhatsApp, X, LinkedIn) stay allowed, they make the shared links work.
|
||||||
|
const AI_CRAWLERS = [
|
||||||
|
"GPTBot",
|
||||||
|
"ChatGPT-User",
|
||||||
|
"OAI-SearchBot",
|
||||||
|
"ClaudeBot",
|
||||||
|
"Claude-User",
|
||||||
|
"Claude-SearchBot",
|
||||||
|
"anthropic-ai",
|
||||||
|
"CCBot",
|
||||||
|
"Google-Extended",
|
||||||
|
"GoogleOther",
|
||||||
|
"Applebot-Extended",
|
||||||
|
"PerplexityBot",
|
||||||
|
"Perplexity-User",
|
||||||
|
"Bytespider",
|
||||||
|
"Amazonbot",
|
||||||
|
"meta-externalagent",
|
||||||
|
"meta-externalfetcher",
|
||||||
|
"FacebookBot",
|
||||||
|
"cohere-ai",
|
||||||
|
"cohere-training-data-crawler",
|
||||||
|
"Diffbot",
|
||||||
|
"ImagesiftBot",
|
||||||
|
"Omgilibot",
|
||||||
|
"Omgili",
|
||||||
|
"YouBot",
|
||||||
|
"Timpibot",
|
||||||
|
"AI2Bot",
|
||||||
|
"Ai2Bot-Dolma",
|
||||||
|
"DuckAssistBot",
|
||||||
|
"MistralAI-User",
|
||||||
|
"PetalBot",
|
||||||
|
"Scrapy",
|
||||||
|
];
|
||||||
|
|
||||||
|
export default async function robots(): Promise<MetadataRoute.Robots> {
|
||||||
|
return {
|
||||||
|
sitemap: `${await siteUrl()}/sitemap.xml`,
|
||||||
|
rules: [
|
||||||
|
{ userAgent: AI_CRAWLERS, disallow: "/" },
|
||||||
|
// Logged-in pages redirect anyway; shared links carry noindex.
|
||||||
|
{ userAgent: "*", allow: "/", disallow: ["/api/", "/admin", "/profil", "/kepletek", "/osszevetesek", "/szemelyek", "/szamlak"] },
|
||||||
|
],
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
// The link preview image of a shared chart (og:image): the wheel, the title
|
||||||
|
// and the text of the short summary. The file name carries a version (see
|
||||||
|
// `imageVersion`), so a rewritten summary gets a new address and Facebook and
|
||||||
|
// co. fetch it again.
|
||||||
|
import { SIGNS, signName } from "@/lib/astro";
|
||||||
|
import { chartCard } from "@/lib/ogCard";
|
||||||
|
import { bigThree, loadShare, plain, shorten } from "@/lib/share";
|
||||||
|
|
||||||
|
export async function GET(_req: Request, { params }: { params: Promise<{ slug: string; file: string }> }) {
|
||||||
|
const { slug } = await params;
|
||||||
|
const share = await loadShare(slug);
|
||||||
|
const chart = share?.chart?.chart;
|
||||||
|
if (!share || !chart) return new Response("Not found", { status: 404 });
|
||||||
|
return chartCard({
|
||||||
|
chart,
|
||||||
|
timeKnown: chart.time_known,
|
||||||
|
eyebrow: "SZÜLETÉSI KÉPLET · RÖVIDEN",
|
||||||
|
title: share.summary?.title ?? "Születési képlet",
|
||||||
|
text: shorten(plain(share.summary?.summary ?? ""), 280),
|
||||||
|
lines: bigThree(chart).map((t) => ({
|
||||||
|
glyph: SIGNS[t.sign]?.glyph ?? "",
|
||||||
|
label: `${t.label === "Aszcendens" ? "Asc" : t.label} ${signName(t.sign)}`,
|
||||||
|
})),
|
||||||
|
// A day at the edge: a revoked link's image goes away from there too.
|
||||||
|
cacheControl: "public, max-age=3600, s-maxage=86400",
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -0,0 +1,108 @@
|
|||||||
|
import type { Metadata } from "next";
|
||||||
|
import Link from "next/link";
|
||||||
|
import { notFound } from "next/navigation";
|
||||||
|
|
||||||
|
import { ChartWheel, WheelLegend } from "@/components/ChartWheel";
|
||||||
|
import { Rich } from "@/components/Rich";
|
||||||
|
import { ShareVisit } from "@/components/ShareVisit";
|
||||||
|
import { PublicHeader } from "@/components/SiteHeader";
|
||||||
|
import { SIGNS, signName } from "@/lib/astro";
|
||||||
|
import { getMe } from "@/lib/server";
|
||||||
|
import { bigThree, imageVersion, loadShare, plain, shorten, siteUrl } from "@/lib/share";
|
||||||
|
|
||||||
|
type Props = { params: Promise<{ slug: string }> };
|
||||||
|
|
||||||
|
/** Title, description and preview image for Facebook, Messenger, WhatsApp and co. */
|
||||||
|
export async function generateMetadata({ params }: Props): Promise<Metadata> {
|
||||||
|
const { slug } = await params;
|
||||||
|
const share = await loadShare(slug);
|
||||||
|
if (!share?.chart) return { title: "A link nem érhető el", robots: { index: false } };
|
||||||
|
const base = await siteUrl();
|
||||||
|
const title = share.summary?.title ?? "Születési képlet";
|
||||||
|
const description = share.summary?.summary
|
||||||
|
? shorten(plain(share.summary.summary), 200)
|
||||||
|
: "Egy születési képlet a Sorsfonalakon.";
|
||||||
|
const url = `${base}/s/${slug}`;
|
||||||
|
const image = { url: `${base}/s/${slug}/kep/${imageVersion(share)}.png`, width: 1200, height: 630, alt: title };
|
||||||
|
return {
|
||||||
|
title,
|
||||||
|
description,
|
||||||
|
// Personal content: shown when shared, not listed in search engines.
|
||||||
|
robots: { index: false, follow: false },
|
||||||
|
alternates: { canonical: url },
|
||||||
|
openGraph: { type: "website", siteName: "Sorsfonalak", locale: "hu_HU", url, title, description, images: [image] },
|
||||||
|
twitter: { card: "summary_large_image", title, description, images: [image.url] },
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/** A shared chart: the wheel and its short summary, open to anyone with the link. */
|
||||||
|
export default async function SharedChartPage({ params }: Props) {
|
||||||
|
const { slug } = await params;
|
||||||
|
const [share, me] = await Promise.all([loadShare(slug), getMe()]);
|
||||||
|
const chart = share?.chart?.chart;
|
||||||
|
if (!share || !chart) notFound();
|
||||||
|
const summary = share.summary;
|
||||||
|
const trio = bigThree(chart);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<ShareVisit slug={slug} />
|
||||||
|
{!me && (
|
||||||
|
<PublicHeader />
|
||||||
|
)}
|
||||||
|
<main className="page" style={{ maxWidth: 1180 }}>
|
||||||
|
<div className="page-head">
|
||||||
|
<span className="eyebrow">Megosztott születési képlet</span>
|
||||||
|
<h1>{summary?.title ?? "Születési képlet"}</h1>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<section className="chart-layout" aria-label="A megosztott képlet">
|
||||||
|
<div className="card chart-wheel-card">
|
||||||
|
<ChartWheel chart={chart} timeKnown={chart.time_known} />
|
||||||
|
<WheelLegend />
|
||||||
|
</div>
|
||||||
|
<div className="field chart-side">
|
||||||
|
<section className="card summary-card" aria-label="Röviden">
|
||||||
|
<span className="eyebrow">Röviden</span>
|
||||||
|
{summary?.summary ? (
|
||||||
|
<p className="summary-text" lang={summary.language}>
|
||||||
|
<Rich text={summary.summary} />
|
||||||
|
</p>
|
||||||
|
) : (
|
||||||
|
<p className="muted">Ehhez a képlethez még nincs rövid összefoglaló.</p>
|
||||||
|
)}
|
||||||
|
{trio.length > 0 && (
|
||||||
|
<p className="share-trio">
|
||||||
|
{trio.map((t) => (
|
||||||
|
<span key={t.label}>
|
||||||
|
<span className="sym" aria-hidden="true">
|
||||||
|
{SIGNS[t.sign]?.glyph}
|
||||||
|
</span>{" "}
|
||||||
|
{t.label} {signName(t.sign)}
|
||||||
|
</span>
|
||||||
|
))}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
{!chart.time_known && (
|
||||||
|
<p className="hint">A születési idő nem ismert, ezért a képleten nincsenek házak és Aszcendens.</p>
|
||||||
|
)}
|
||||||
|
</section>
|
||||||
|
<section className="card share-cta">
|
||||||
|
<h2>És a te képleted mit mutat?</h2>
|
||||||
|
<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.
|
||||||
|
</p>
|
||||||
|
<Link href={me ? "/keplet" : "/belepes"} className="btn btn-primary">
|
||||||
|
{me ? "A saját képletem" : "Elkészítem a sajátomat"}
|
||||||
|
</Link>
|
||||||
|
</section>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
<p className="hint">
|
||||||
|
Ezt a képletet a tulajdonosa osztotta meg, név és születési adatok nélkül. A szöveget mesterséges intelligencia
|
||||||
|
írta a képlet alapján.
|
||||||
|
</p>
|
||||||
|
</main>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
import type { MetadataRoute } from "next";
|
||||||
|
|
||||||
|
import { siteUrl } from "@/lib/share";
|
||||||
|
|
||||||
|
/** The public pages for search engines; everything else needs a login. */
|
||||||
|
export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
|
||||||
|
const base = await siteUrl();
|
||||||
|
const privacy = { languages: { hu: `${base}/adatvedelem`, en: `${base}/privacy` } };
|
||||||
|
return [
|
||||||
|
{ url: `${base}/`, changeFrequency: "weekly", priority: 1 },
|
||||||
|
{ url: `${base}/pelda`, changeFrequency: "monthly", priority: 0.8 },
|
||||||
|
{ url: `${base}/adatvedelem`, 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>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -3,7 +3,9 @@ import Link from "next/link";
|
|||||||
|
|
||||||
import { ChartCard } from "@/components/ChartCard";
|
import { ChartCard } from "@/components/ChartCard";
|
||||||
import { PersonActions } from "@/components/PersonActions";
|
import { PersonActions } from "@/components/PersonActions";
|
||||||
|
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";
|
||||||
|
|
||||||
@@ -22,6 +24,7 @@ export default async function PersonsPage() {
|
|||||||
const isAdmin = me.user.roles.includes("admin");
|
const isAdmin = me.user.roles.includes("admin");
|
||||||
const slots = me.persons;
|
const slots = me.persons;
|
||||||
const full = slots.left === 0;
|
const full = slots.left === 0;
|
||||||
|
const invitesOpen = (config?.user_invites ?? false) || isAdmin;
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -46,19 +49,47 @@ export default async function PersonsPage() {
|
|||||||
</ChartCard>
|
</ChartCard>
|
||||||
))}
|
))}
|
||||||
|
|
||||||
{!full && (
|
{(!full || invitesOpen) && (
|
||||||
<Link href="/szemelyek/uj" className="chart-card chart-card-new">
|
<Link href="/szemelyek/uj" className="chart-card chart-card-new">
|
||||||
<span className="chart-card-plus" aria-hidden="true">
|
<span className="chart-card-plus" aria-hidden="true">
|
||||||
+
|
+
|
||||||
</span>
|
</span>
|
||||||
<strong className="chart-card-name">Új személy</strong>
|
<strong className="chart-card-name">Új személy</strong>
|
||||||
<span className="muted">
|
<span className="muted">
|
||||||
{slots.unlimited ? "Korlátlan számú személy" : `Még ${slots.left} személyt vehetsz fel`}
|
{!invitesOpen
|
||||||
|
? slots.unlimited
|
||||||
|
? "Korlátlan számú személy"
|
||||||
|
: `Még ${slots.left} személyt vehetsz fel`
|
||||||
|
: full
|
||||||
|
? "Meghívással bármikor"
|
||||||
|
: slots.unlimited
|
||||||
|
? "Adatokkal vagy meghívással"
|
||||||
|
: `Még ${slots.left} személyt vehetsz fel, vagy hívd meg`}
|
||||||
</span>
|
</span>
|
||||||
</Link>
|
</Link>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{invitesOpen ? (
|
||||||
|
<PendingInvites />
|
||||||
|
) : (
|
||||||
|
<section className="card invite-soon" aria-labelledby="invite-soon-title">
|
||||||
|
<div className="card-head">
|
||||||
|
<h2 id="invite-soon-title">Hívd meg, akit szeretsz</h2>
|
||||||
|
<span className="badge">Hamarosan</span>
|
||||||
|
</div>
|
||||||
|
<p className="muted">
|
||||||
|
Hamarosan te is meghívhatod a barátaidat, a családodat vagy a párodat: ők megadják a saját születési adataikat,
|
||||||
|
ingyen megkapják a képletüket, és együtt megnézitek, mennyire illetek össze.
|
||||||
|
</p>
|
||||||
|
<div>
|
||||||
|
<button type="button" className="btn" disabled>
|
||||||
|
Meghívó küldése
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
)}
|
||||||
|
|
||||||
{!slots.unlimited && (
|
{!slots.unlimited && (
|
||||||
<section className="card" aria-labelledby="slots-title">
|
<section className="card" aria-labelledby="slots-title">
|
||||||
<div className="card-head">
|
<div className="card-head">
|
||||||
@@ -72,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>
|
||||||
|
|||||||
@@ -0,0 +1,88 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import Link from "next/link";
|
||||||
|
import { useState } from "react";
|
||||||
|
|
||||||
|
import { InvitePerson } from "@/components/InvitePerson";
|
||||||
|
|
||||||
|
import { NewPerson } from "./NewPerson";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Adding a person: typing in their birth data (uses a slot), or inviting
|
||||||
|
* them to compare charts (they give their own data; no slot used).
|
||||||
|
*/
|
||||||
|
export function NewPersonChooser({
|
||||||
|
canAdd,
|
||||||
|
hasOwnChart,
|
||||||
|
invitesOpen,
|
||||||
|
full,
|
||||||
|
}: {
|
||||||
|
/** A slot is free for typed-in data. */
|
||||||
|
canAdd: boolean;
|
||||||
|
/** Inviting is on (until the launch it is shown, but off). */
|
||||||
|
invitesOpen: boolean;
|
||||||
|
/** Inviting compares with the user's own chart. */
|
||||||
|
hasOwnChart: boolean;
|
||||||
|
/** Shown instead of the form when no slot is left. */
|
||||||
|
full: React.ReactNode;
|
||||||
|
}) {
|
||||||
|
const [mode, setMode] = useState<"data" | "invite">(canAdd || !invitesOpen ? "data" : "invite");
|
||||||
|
return (
|
||||||
|
<div className="field" style={{ gap: 18 }}>
|
||||||
|
<div className="mode-switch" role="tablist" aria-label="Hogyan veszed fel?">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
role="tab"
|
||||||
|
aria-selected={mode === "data"}
|
||||||
|
className="mode-option"
|
||||||
|
onClick={() => setMode("data")}
|
||||||
|
>
|
||||||
|
<strong>Adatok megadása</strong>
|
||||||
|
<span>Te írod be a születési adatait. Egy személyhelyet használ.</span>
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
role="tab"
|
||||||
|
aria-selected={mode === "invite"}
|
||||||
|
aria-disabled={!invitesOpen}
|
||||||
|
disabled={!invitesOpen}
|
||||||
|
className="mode-option"
|
||||||
|
onClick={() => setMode("invite")}
|
||||||
|
>
|
||||||
|
<strong>
|
||||||
|
Meghívom {!invitesOpen && <span className="badge mode-soon">Hamarosan</span>}
|
||||||
|
</strong>
|
||||||
|
<span>
|
||||||
|
{invitesOpen
|
||||||
|
? "Ő adja meg a saját adatait, és megnézitek, mennyire illetek össze. Ingyenes, nem kell hozzá hely."
|
||||||
|
: "Hamarosan meghívhatod azokat, akiket szeretsz: ők adják meg a saját adataikat, és együtt nézitek meg, mennyire illetek össze."}
|
||||||
|
</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
{mode === "data" ? (
|
||||||
|
canAdd ? (
|
||||||
|
<>
|
||||||
|
<NewPerson />
|
||||||
|
<p className="hint">Az adatokat a felvételt követő egy órán belül még javíthatod, utána nem módosíthatók.</p>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
full
|
||||||
|
)
|
||||||
|
) : hasOwnChart ? (
|
||||||
|
<>
|
||||||
|
<InvitePerson />
|
||||||
|
<p className="hint">
|
||||||
|
A meghívott a saját képletét és rövid összefoglalóját ingyen kapja. Ti ketten az összevetést látjátok, egymás
|
||||||
|
születési adatait nem. A részletes kapcsolati elemzést bármelyikőtök kérheti egy kapcsolati elemzéssel, és
|
||||||
|
mindketten látjátok.
|
||||||
|
</p>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<p className="muted">
|
||||||
|
A meghívó a saját képleteddel veti össze az övét, ezért előbb <Link href="/profil#birth">add meg a saját
|
||||||
|
születési adataidat</Link>.
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,10 +1,11 @@
|
|||||||
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";
|
||||||
|
|
||||||
import { NewPerson } from "./NewPerson";
|
import { NewPersonChooser } from "./NewPersonChooser";
|
||||||
|
|
||||||
export const metadata: Metadata = { title: "Új személy" };
|
export const metadata: Metadata = { title: "Új személy" };
|
||||||
|
|
||||||
@@ -18,22 +19,23 @@ export default async function NewPersonPage() {
|
|||||||
<div className="page-head">
|
<div className="page-head">
|
||||||
<h1>Új személy</h1>
|
<h1>Új személy</h1>
|
||||||
<p className="muted">
|
<p className="muted">
|
||||||
Társad, családtagod, barátod: a születési adataiból elkészül a képlete és egy rövid összefoglaló.
|
Társad, családtagod, barátod: megadhatod a születési adatait, vagy meghívhatod, hogy ő adja meg, és megnézzétek,
|
||||||
|
mennyire illetek össze.
|
||||||
{!slots.unlimited && slots.left !== null && slots.left > 0 && ` Még ${slots.left} személyt vehetsz fel.`}
|
{!slots.unlimited && slots.left !== null && slots.left > 0 && ` Még ${slots.left} személyt vehetsz fel.`}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<section className="card" aria-label="Születési adatok">
|
<section className="card" aria-label="Új személy">
|
||||||
{slots.left === 0 ? (
|
<NewPersonChooser
|
||||||
<>
|
canAdd={slots.left !== 0}
|
||||||
<p className="muted">Elfogytak a helyeid. Újabb személyhez válassz csomagot.</p>
|
hasOwnChart={me.primary_chart_id !== null}
|
||||||
<PersonPacks canPay={config?.mock_payments ?? false} />
|
invitesOpen={(config?.user_invites ?? false) || me.user.roles.includes("admin")}
|
||||||
</>
|
full={
|
||||||
) : (
|
<>
|
||||||
<>
|
<p className="muted">Elfogytak a helyeid. Újabb személyhez válassz csomagot, vagy hívd meg.</p>
|
||||||
<NewPerson />
|
<PersonPacks canPay={payMethod(config, me)} />
|
||||||
<p className="hint">Az adatokat a felvételt követő egy órán belül még javíthatod, utána nem módosíthatók.</p>
|
</>
|
||||||
</>
|
}
|
||||||
)}
|
/>
|
||||||
</section>
|
</section>
|
||||||
</main>
|
</main>
|
||||||
);
|
);
|
||||||
|
|||||||