Packages: from one analysis to unlimited, admin can give them
A fixed catalog (packages.rs, reasoning in docs/csomagok.md): Egy elemzés
2 990 Ft, Páros 6 990 Ft, Család 11 990 Ft (featured), Korlátlan 17 990 Ft
for a year, and two top-ups. Every grant is a package_orders row; units are
credit_ledger rows with reason 'package' and never expire. The unlimited
package is a time-limited 'unlimited' entitlement: analyses use no unit and
persons have no limit, with a daily fair-use cap (UNLIMITED_DAILY_LIMIT, 5);
buying it again extends it by a year.
- GET /v1/packages, mock payment by package id, /v1/me unlimited_until
- POST /v1/admin/users/{id}/packages: give a package as a gift
- /csomagok page; the paid step of an analysis offers three packages with
the bigger one featured; person packs use the catalog; admin user list
has a package column
- PERSON_PACK_SIZE is replaced by the catalog's +5 személy top-up
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
This commit is contained in:
@@ -2,9 +2,10 @@
|
||||
|
||||
import { useCallback, useEffect, useState } from "react";
|
||||
|
||||
import { huf, usePackages } from "@/components/PackageCards";
|
||||
import { api, errorText } from "@/lib/api";
|
||||
import { ROLE_LABELS, formatDate } from "@/lib/astro";
|
||||
import type { AdminUser, Role } from "@/lib/types";
|
||||
import type { AdminUser, Package, Role } from "@/lib/types";
|
||||
|
||||
const EDITABLE_ROLES: Role[] = ["user", "creator", "admin"];
|
||||
const UNITS: { value: "natal" | "synastry"; label: string }[] = [
|
||||
@@ -16,6 +17,7 @@ export function AdminUsers({ selfId }: { selfId: string }) {
|
||||
const [query, setQuery] = useState("");
|
||||
const [users, setUsers] = useState<AdminUser[] | null>(null);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const packages = usePackages() ?? [];
|
||||
|
||||
const load = useCallback(async (q: string) => {
|
||||
try {
|
||||
@@ -62,6 +64,7 @@ export function AdminUsers({ selfId }: { selfId: string }) {
|
||||
<th scope="col">Felhasználó</th>
|
||||
<th scope="col">Szerepkörök</th>
|
||||
<th scope="col">Részletes elemzések</th>
|
||||
<th scope="col">Csomag</th>
|
||||
<th scope="col">Képletek</th>
|
||||
<th scope="col">Regisztrált</th>
|
||||
<th scope="col">Utoljára belépett</th>
|
||||
@@ -73,6 +76,7 @@ export function AdminUsers({ selfId }: { selfId: string }) {
|
||||
key={u.id}
|
||||
user={u}
|
||||
isSelf={u.id === selfId}
|
||||
packages={packages}
|
||||
onChange={(next) => setUsers((list) => list?.map((x) => (x.id === next.id ? next : x)) ?? null)}
|
||||
/>
|
||||
))}
|
||||
@@ -84,7 +88,17 @@ export function AdminUsers({ selfId }: { selfId: string }) {
|
||||
);
|
||||
}
|
||||
|
||||
function UserRow({ user, isSelf, onChange }: { user: AdminUser; isSelf: boolean; onChange: (u: AdminUser) => void }) {
|
||||
function UserRow({
|
||||
user,
|
||||
isSelf,
|
||||
packages,
|
||||
onChange,
|
||||
}: {
|
||||
user: AdminUser;
|
||||
isSelf: boolean;
|
||||
packages: Package[];
|
||||
onChange: (u: AdminUser) => void;
|
||||
}) {
|
||||
const [status, setStatus] = useState<{ ok: boolean; text: string } | null>(null);
|
||||
const [busy, setBusy] = useState(false);
|
||||
const [delta, setDelta] = useState("");
|
||||
@@ -200,9 +214,84 @@ function UserRow({ user, isSelf, onChange }: { user: AdminUser; isSelf: boolean;
|
||||
</span>
|
||||
)}
|
||||
</td>
|
||||
<td>
|
||||
<PackageGrant user={user} packages={packages} onChange={onChange} />
|
||||
</td>
|
||||
<td className="num">{user.charts}</td>
|
||||
<td className="num">{formatDate(user.created_at)}</td>
|
||||
<td className="num">{formatDate(user.last_login_at, true)}</td>
|
||||
</tr>
|
||||
);
|
||||
}
|
||||
|
||||
/** Gives the user a package from the catalog (a gift: nothing is paid). */
|
||||
function PackageGrant({
|
||||
user,
|
||||
packages,
|
||||
onChange,
|
||||
}: {
|
||||
user: AdminUser;
|
||||
packages: Package[];
|
||||
onChange: (u: AdminUser) => void;
|
||||
}) {
|
||||
const [id, setId] = useState("");
|
||||
const [busy, setBusy] = useState(false);
|
||||
const [status, setStatus] = useState<{ ok: boolean; text: string } | null>(null);
|
||||
|
||||
async function give(e: React.FormEvent) {
|
||||
e.preventDefault();
|
||||
const pkg = packages.find((p) => p.id === id);
|
||||
if (!pkg) return;
|
||||
setBusy(true);
|
||||
setStatus(null);
|
||||
try {
|
||||
const res = await api<{ analyses_left: AdminUser["analyses_left"]; unlimited_until: string | null }>(
|
||||
`/admin/users/${user.id}/packages`,
|
||||
{ body: { package: pkg.id, note: "admin ajándék" } },
|
||||
);
|
||||
onChange({ ...user, analyses_left: res.analyses_left, unlimited_until: res.unlimited_until });
|
||||
setStatus({ ok: true, text: `${pkg.name} kiosztva` });
|
||||
setId("");
|
||||
} catch (err) {
|
||||
setStatus({ ok: false, text: errorText(err) });
|
||||
} finally {
|
||||
setBusy(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<form onSubmit={give} className="field" style={{ gap: 6 }}>
|
||||
{user.unlimited_until && (
|
||||
<span className="badge badge-gold">Korlátlan {formatDate(user.unlimited_until).replace(/\.$/, "")}-ig</span>
|
||||
)}
|
||||
<div className="row" style={{ gap: 6, flexWrap: "nowrap" }}>
|
||||
<label className="sr-only" htmlFor={`pkg-${user.id}`}>
|
||||
Kiosztandó csomag
|
||||
</label>
|
||||
<select
|
||||
id={`pkg-${user.id}`}
|
||||
className="inp"
|
||||
style={{ width: 190, minHeight: 36 }}
|
||||
value={id}
|
||||
onChange={(e) => setId(e.target.value)}
|
||||
disabled={busy || packages.length === 0}
|
||||
>
|
||||
<option value="">Válassz csomagot…</option>
|
||||
{packages.map((p) => (
|
||||
<option key={p.id} value={p.id}>
|
||||
{p.name} ({huf(p.price_huf)})
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
<button type="submit" className="btn btn-sm" disabled={busy || !id}>
|
||||
{busy ? "…" : "Kiosztás"}
|
||||
</button>
|
||||
</div>
|
||||
{status && (
|
||||
<span className={status.ok ? "msg msg-ok" : "msg msg-error"} role="status">
|
||||
{status.text}
|
||||
</span>
|
||||
)}
|
||||
</form>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ export default async function AdminPage() {
|
||||
<AdminNav current="/admin" />
|
||||
<div className="page-head">
|
||||
<h1>Felhasználók</h1>
|
||||
<p className="muted">Szerepkörök kezelése és részletes elemzések jóváírása (ajándék, reklamáció). A vásárlások is ide könyvelődnek majd.</p>
|
||||
<p className="muted">Szerepkörök kezelése, csomagok kiosztása és elemzések jóváírása (ajándék, reklamáció).</p>
|
||||
</div>
|
||||
<AdminUsers selfId={me.user.id} />
|
||||
</main>
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
import type { Metadata } from "next";
|
||||
|
||||
import { PackageCards } from "@/components/PackageCards";
|
||||
import { formatDate } from "@/lib/astro";
|
||||
import { backendGet, requireMe } from "@/lib/server";
|
||||
import type { Package, PublicConfig } from "@/lib/types";
|
||||
|
||||
export const metadata: Metadata = { title: "Csomagok" };
|
||||
|
||||
const faq = (dailyLimit: number): [string, string][] => [
|
||||
[
|
||||
"Lejárnak a megvett elemzések?",
|
||||
"Nem. A csomagokban kapott elemzések és személyhelyek addig megmaradnak, amíg fel nem használod őket. Csak a Korlátlan csomag szól egy évre.",
|
||||
],
|
||||
[
|
||||
"Mi a különbség a képletelemzés és a kapcsolati elemzés között?",
|
||||
"A képletelemzés egy ember születési képletét írja le hat fejezetben. A kapcsolati elemzés két képletet vet össze: mi vonz, hol súrlódtok, és mit ad a kapcsolat.",
|
||||
],
|
||||
[
|
||||
"Mire kell a személyhely?",
|
||||
"A saját képleted mellé felvett emberekhez (társ, gyerek, barát). Egy személy felvétele egy helyet használ; a képlete és a rövid összefoglalója ingyenes, a részletes elemzés külön jár.",
|
||||
],
|
||||
[
|
||||
"Van korlát a Korlátlan csomagban?",
|
||||
`Méltányos használat: naponta legfeljebb ${dailyLimit} új részletes elemzés kérhető. Ha még tart, egy újabb Korlátlan csomag a lejárathoz ad hozzá egy évet.`,
|
||||
],
|
||||
];
|
||||
|
||||
/** The packages: the main ladder, top-ups, and what the user has now. */
|
||||
export default async function PackagesPage() {
|
||||
const me = await requireMe("/csomagok");
|
||||
const [catalog, config] = await Promise.all([
|
||||
backendGet<{ packages: Package[] }>("/v1/packages"),
|
||||
backendGet<PublicConfig>("/v1/config"),
|
||||
]);
|
||||
const packages = catalog?.packages ?? [];
|
||||
const canPay = config?.mock_payments ?? false;
|
||||
const left = me.analyses_left;
|
||||
const slots = me.persons;
|
||||
|
||||
return (
|
||||
<main className="page" style={{ maxWidth: 1180 }}>
|
||||
<div className="page-head">
|
||||
<h1>Csomagok</h1>
|
||||
<p className="muted">
|
||||
Minél többen vagytok, annál kevesebbe kerül egy elemzés. A megvett elemzések nem járnak le.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<section className="card holdings" aria-label="Amid most van">
|
||||
<span className="eyebrow">Most</span>
|
||||
{me.unlimited_until ? (
|
||||
<p>
|
||||
<strong>Korlátlan csomag</strong> {formatDate(me.unlimited_until).replace(/\.$/, "")}-ig.
|
||||
</p>
|
||||
) : (
|
||||
<p>
|
||||
<strong>{left.natal}</strong> képletelemzés · <strong>{left.synastry}</strong> kapcsolati elemzés ·{" "}
|
||||
{slots.unlimited ? (
|
||||
"korlátlan személy"
|
||||
) : (
|
||||
<>
|
||||
<strong>{slots.left}</strong> szabad személyhely
|
||||
</>
|
||||
)}
|
||||
</p>
|
||||
)}
|
||||
</section>
|
||||
|
||||
<PackageCards packages={packages} canPay={canPay} />
|
||||
|
||||
<section className="field" aria-labelledby="addon-title" style={{ gap: 12 }}>
|
||||
<h2 id="addon-title">Kiegészítők</h2>
|
||||
<p className="muted">Ha már van csomagod, és csak egy kicsi kell még.</p>
|
||||
<PackageCards
|
||||
packages={packages}
|
||||
ids={packages.filter((p) => p.tier === "addon").map((p) => p.id)}
|
||||
canPay={canPay}
|
||||
compact
|
||||
/>
|
||||
</section>
|
||||
|
||||
<section className="card" aria-labelledby="faq-title">
|
||||
<h2 id="faq-title">Gyakori kérdések</h2>
|
||||
<dl className="faq">
|
||||
{faq(config?.unlimited_daily_limit ?? 5).map(([q, a]) => (
|
||||
<div key={q}>
|
||||
<dt>{q}</dt>
|
||||
<dd className="muted">{a}</dd>
|
||||
</div>
|
||||
))}
|
||||
</dl>
|
||||
<p className="hint">Az árak bruttó árak, az áfát tartalmazzák.</p>
|
||||
</section>
|
||||
</main>
|
||||
);
|
||||
}
|
||||
@@ -216,8 +216,8 @@ td.num { font-variant-numeric: tabular-nums; white-space: nowrap; }
|
||||
@media (max-width: 640px) { .loading { flex-direction: column; text-align: center; } }
|
||||
|
||||
/* Payment step */
|
||||
.pay-box { display: flex; flex-direction: column; gap: 16px; padding: 20px; max-width: 520px; border: 1px solid var(--line-2); border-radius: var(--radius); background: var(--panel-2); }
|
||||
.pay-line { display: flex; justify-content: space-between; gap: 12px; }
|
||||
.pay-box { display: flex; flex-direction: column; gap: 16px; padding: 20px; border: 1px solid var(--line-2); border-radius: var(--radius); background: var(--panel-2); }
|
||||
.pay-lead { margin: 0; }
|
||||
.chart-layout { display: grid; grid-template-columns: minmax(0, 1.35fr) minmax(280px, 1fr); gap: 24px; align-items: stretch; }
|
||||
.chart-side { gap: 16px; }
|
||||
.chart-side .summary-card { flex: 1 1 auto; }
|
||||
@@ -353,13 +353,6 @@ td.num { font-variant-numeric: tabular-nums; white-space: nowrap; }
|
||||
.person-actions { display: flex; flex-wrap: wrap; align-items: center; gap: 4px 6px; padding: 0 12px 12px; border-top: 1px solid var(--line); padding-top: 8px; margin: 0 8px; }
|
||||
.btn-danger { border-color: var(--danger); color: var(--danger); }
|
||||
.btn-danger:hover { background: rgba(242, 160, 160, 0.08); color: var(--danger); border-color: var(--danger); }
|
||||
.packs { display: grid; grid-template-columns: repeat(auto-fit, minmax(220px, 1fr)); gap: 12px; }
|
||||
.pack {
|
||||
display: flex; flex-direction: column; gap: 6px; align-items: flex-start; padding: 16px 18px;
|
||||
background: var(--panel-2); border: 1px solid var(--line-2); border-radius: var(--radius);
|
||||
}
|
||||
.pack strong { font-family: var(--font-display); font-size: 22px; font-weight: 600; }
|
||||
.pack .btn { margin-top: 8px; }
|
||||
|
||||
/* Chart switcher (the chart page title) */
|
||||
.switcher { position: relative; align-self: flex-start; }
|
||||
@@ -517,3 +510,42 @@ a.pair-row:hover strong { color: var(--gold); }
|
||||
.nav a { white-space: nowrap; padding: 10px 9px; }
|
||||
.cross-grid td.cross-corner { min-width: 56px; font-size: 9px; }
|
||||
}
|
||||
|
||||
/* Packages */
|
||||
.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 {
|
||||
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);
|
||||
}
|
||||
.pkg-grid-compact .pkg { padding: 18px 16px 16px; gap: 8px; background: var(--panel-2); }
|
||||
.pkg-featured { border-color: var(--gold); box-shadow: 0 0 0 1px var(--gold), 0 12px 32px rgba(217, 180, 106, 0.12); }
|
||||
.pkg-tags { display: flex; gap: 6px; min-height: 22px; flex-wrap: wrap; }
|
||||
.pkg-badge, .pkg-save {
|
||||
display: inline-flex; align-items: center; min-height: 22px; padding: 0 9px; border-radius: 999px;
|
||||
font-size: 12px; font-weight: 600; letter-spacing: 0.3px;
|
||||
}
|
||||
.pkg-badge { background: var(--gold); color: var(--gold-ink); }
|
||||
.pkg-save { border: 1px solid rgba(159, 216, 176, 0.5); color: var(--ok); }
|
||||
.pkg-name { font-size: 26px; }
|
||||
.pkg-grid-compact .pkg-name { font-size: 22px; }
|
||||
.pkg-tagline { margin: 0; font-size: 14px; min-height: 42px; }
|
||||
.pkg-price { display: flex; align-items: baseline; gap: 10px; flex-wrap: wrap; }
|
||||
.pkg-price strong { font-family: var(--font-display); font-size: 32px; font-weight: 600; color: var(--ink); }
|
||||
.pkg-grid-compact .pkg-price strong { font-size: 26px; }
|
||||
.pkg-list { list-style: none; margin: 0; padding: 0; display: flex; flex-direction: column; gap: 6px; font-size: 14px; color: var(--ink-2); flex: 1; }
|
||||
.pkg-list li { padding-left: 22px; position: relative; }
|
||||
.pkg-list li::before { content: "✓"; position: absolute; left: 0; color: var(--gold); }
|
||||
.pkg-per { margin: 0; }
|
||||
.pkg-step { margin: 0; font-size: 13px; color: var(--gold); }
|
||||
.pkg .btn { margin-top: 4px; width: 100%; }
|
||||
.holdings { gap: 6px; padding: 16px 20px; }
|
||||
.holdings p { margin: 0; color: var(--ink-2); }
|
||||
.faq { margin: 0; display: flex; flex-direction: column; gap: 14px; }
|
||||
.faq dt { font-weight: 600; margin-bottom: 4px; }
|
||||
.faq dd { margin: 0; }
|
||||
@media (max-width: 1000px) { .pkg-grid { grid-template-columns: repeat(2, minmax(0, 1fr)); } }
|
||||
@media (max-width: 640px) {
|
||||
.pkg-grid, .pkg-grid-compact { grid-template-columns: 1fr; }
|
||||
.pkg-tagline { min-height: 0; }
|
||||
}
|
||||
|
||||
@@ -160,6 +160,7 @@ export default async function ChartPage({ params }: { params: Promise<{ id: stri
|
||||
initial={detailed}
|
||||
left={me.analyses_left.natal}
|
||||
isAdmin={me.user.roles.includes("admin")}
|
||||
unlimited={me.unlimited_until !== null}
|
||||
canPay={config?.mock_payments ?? false}
|
||||
/>
|
||||
),
|
||||
|
||||
@@ -127,6 +127,7 @@ export default async function ComparisonPage({ params }: { params: Promise<{ id:
|
||||
initial={detailed}
|
||||
left={me.analyses_left.synastry}
|
||||
isAdmin={me.user.roles.includes("admin")}
|
||||
unlimited={me.unlimited_until !== null}
|
||||
canPay={config?.mock_payments ?? false}
|
||||
note={`Az elemzésben az első fél: ${name1}, a második fél: ${name2}.`}
|
||||
/>
|
||||
|
||||
@@ -46,7 +46,10 @@ export default async function ProfilePage() {
|
||||
<dd>{me.providers.map((p) => PROVIDERS[p] ?? p).join(", ") || "–"}</dd>
|
||||
<dt>Részletes elemzések</dt>
|
||||
<dd>
|
||||
{me.analyses_left.natal} képlet, {me.analyses_left.synastry} szinasztria
|
||||
{me.unlimited_until
|
||||
? `Korlátlan, ${formatDate(me.unlimited_until).replace(/\.$/, "")}-ig`
|
||||
: `${me.analyses_left.natal} képlet, ${me.analyses_left.synastry} kapcsolati`}{" "}
|
||||
· <Link href="/csomagok">Csomagok</Link>
|
||||
</dd>
|
||||
<dt>Személyek</dt>
|
||||
<dd>
|
||||
|
||||
@@ -72,7 +72,7 @@ export default async function PersonsPage() {
|
||||
? "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."}
|
||||
</p>
|
||||
<PersonPacks packSize={config?.person_pack_size ?? 5} canPay={config?.mock_payments ?? false} />
|
||||
<PersonPacks canPay={config?.mock_payments ?? false} />
|
||||
</section>
|
||||
)}
|
||||
</main>
|
||||
|
||||
@@ -26,7 +26,7 @@ export default async function NewPersonPage() {
|
||||
{slots.left === 0 ? (
|
||||
<>
|
||||
<p className="muted">Elfogytak a helyeid. Újabb személyhez válassz csomagot.</p>
|
||||
<PersonPacks packSize={config?.person_pack_size ?? 5} canPay={config?.mock_payments ?? false} />
|
||||
<PersonPacks canPay={config?.mock_payments ?? false} />
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
|
||||
@@ -7,6 +7,7 @@ import { api, errorText } from "@/lib/api";
|
||||
import type { Analysis } from "@/lib/types";
|
||||
|
||||
import { AnalysisLoading } from "./AnalysisLoading";
|
||||
import { PackageChooser } from "./PackageCards";
|
||||
import { AnalysisView } from "./AnalysisView";
|
||||
|
||||
const POLL_MS = 5000;
|
||||
@@ -29,6 +30,7 @@ const TEXTS = {
|
||||
"Most íródik a hat fejezet a képleted alapján. Ez általában 1–3 perc; nyugodtan elhagyhatod az oldalt, az elemzés elkészül és itt vár.",
|
||||
item: "Részletes képletelemzés",
|
||||
unitName: "képletelemzés",
|
||||
packages: ["single", "couple", "family"],
|
||||
},
|
||||
synastry: {
|
||||
eyebrow: "Kapcsolati elemzés",
|
||||
@@ -41,6 +43,7 @@ const TEXTS = {
|
||||
"Most íródik az öt fejezet a két képlet alapján. Ez általában 1–3 perc; nyugodtan elhagyhatod az oldalt, az elemzés elkészül és itt vár.",
|
||||
item: "Részletes kapcsolati elemzés",
|
||||
unitName: "kapcsolati elemzés",
|
||||
packages: ["addon_synastry", "couple", "family"],
|
||||
},
|
||||
};
|
||||
|
||||
@@ -54,6 +57,7 @@ export function DetailedAnalysis({
|
||||
initial,
|
||||
left,
|
||||
isAdmin,
|
||||
unlimited = false,
|
||||
canPay,
|
||||
note,
|
||||
}: {
|
||||
@@ -61,6 +65,8 @@ export function DetailedAnalysis({
|
||||
initial: Analysis | null;
|
||||
left: number;
|
||||
isAdmin: boolean;
|
||||
/** A running unlimited package: no unit is needed. */
|
||||
unlimited?: boolean;
|
||||
/** The stand-in payment is on (MOCK_PAYMENTS). */
|
||||
canPay: boolean;
|
||||
/** Shown above a finished analysis (e.g. who is the first and the second person). */
|
||||
@@ -97,11 +103,10 @@ export function DetailedAnalysis({
|
||||
};
|
||||
}, [waiting, analysis]);
|
||||
|
||||
async function start(pay: boolean) {
|
||||
async function start() {
|
||||
setBusy(true);
|
||||
setError(null);
|
||||
try {
|
||||
if (pay) await api("/payments/mock", { body: { unit: target.kind } });
|
||||
setAnalysis(await api<Analysis>(`${path}/analyses`, { method: "POST" }));
|
||||
setStep("offer");
|
||||
} catch (e) {
|
||||
@@ -148,17 +153,17 @@ export function DetailedAnalysis({
|
||||
</p>
|
||||
)}
|
||||
|
||||
{isAdmin ? (
|
||||
{isAdmin || unlimited ? (
|
||||
<div className="form-actions">
|
||||
<button type="button" className="btn btn-primary" onClick={() => start(false)} disabled={busy}>
|
||||
<button type="button" className="btn btn-primary" onClick={start} disabled={busy}>
|
||||
{busy ? "Indítás…" : `${t.item} készítése`}
|
||||
</button>
|
||||
<span className="hint">Adminként ingyenes.</span>
|
||||
<span className="hint">{isAdmin ? "Adminként ingyenes." : "A korlátlan csomagod része."}</span>
|
||||
</div>
|
||||
) : left > 0 ? (
|
||||
step === "confirm" ? (
|
||||
<div className="form-actions">
|
||||
<button type="button" className="btn btn-primary" onClick={() => start(false)} disabled={busy}>
|
||||
<button type="button" className="btn btn-primary" onClick={start} disabled={busy}>
|
||||
{busy ? "Indítás…" : "Igen, kérem az elemzést"}
|
||||
</button>
|
||||
<button type="button" className="btn btn-ghost" onClick={() => setStep("offer")} disabled={busy}>
|
||||
@@ -181,19 +186,15 @@ export function DetailedAnalysis({
|
||||
) : canPay ? (
|
||||
step === "pay" ? (
|
||||
<div className="pay-box">
|
||||
<div className="pay-line">
|
||||
<span>{t.item}</span>
|
||||
<strong>1 db</strong>
|
||||
</div>
|
||||
<p className="pay-lead">
|
||||
Válassz csomagot. A vásárlás után az elemzés azonnal elindul, a maradék elemzések pedig nem járnak le.
|
||||
</p>
|
||||
<PackageChooser ids={t.packages} canPay={canPay} onBought={start} />
|
||||
<div className="form-actions">
|
||||
<button type="button" className="btn btn-primary" onClick={() => start(true)} disabled={busy}>
|
||||
{busy ? "Fizetés…" : "Fizetés"}
|
||||
</button>
|
||||
<button type="button" className="btn btn-ghost" onClick={() => setStep("offer")} disabled={busy}>
|
||||
Mégse
|
||||
</button>
|
||||
</div>
|
||||
<p className="hint">Tesztüzem: a fizetés még nincs bekötve, a gomb nem terhel semmit.</p>
|
||||
</div>
|
||||
) : (
|
||||
<div className="form-actions">
|
||||
|
||||
@@ -0,0 +1,180 @@
|
||||
"use client";
|
||||
|
||||
import Link from "next/link";
|
||||
import { useRouter } from "next/navigation";
|
||||
import { useEffect, useState } from "react";
|
||||
|
||||
import { api, errorText } from "@/lib/api";
|
||||
import type { Package } from "@/lib/types";
|
||||
|
||||
export const huf = (n: number) => `${n.toLocaleString("hu-HU")} Ft`;
|
||||
|
||||
/** What a package contains, as short lines. */
|
||||
export function contents(p: Package): string[] {
|
||||
if (p.unlimited_months) {
|
||||
return [
|
||||
"Korlátlan képletelemzés",
|
||||
"Korlátlan kapcsolati elemzés",
|
||||
"Korlátlan számú személy",
|
||||
`${p.unlimited_months} hónapig`,
|
||||
];
|
||||
}
|
||||
const lines: string[] = [];
|
||||
if (p.natal) lines.push(`${p.natal} részletes képletelemzés`);
|
||||
if (p.synastry) lines.push(`${p.synastry} kapcsolati elemzés`);
|
||||
if (p.persons) lines.push(`${p.persons} személy felvétele`);
|
||||
return lines;
|
||||
}
|
||||
|
||||
/**
|
||||
* Package cards with a buy button. Bigger packages show what they save and
|
||||
* how little more they cost than the previous one. Until Stripe is connected
|
||||
* the payment is a stand-in (MOCK_PAYMENTS) that grants the package at once.
|
||||
*/
|
||||
export function PackageCards({
|
||||
packages,
|
||||
ids,
|
||||
canPay,
|
||||
compact = false,
|
||||
onBought,
|
||||
}: {
|
||||
packages: Package[];
|
||||
/** Which packages, in this order (default: the main ladder). */
|
||||
ids?: string[];
|
||||
canPay: boolean;
|
||||
compact?: boolean;
|
||||
/** After a purchase (default: reload the page data). */
|
||||
onBought?: (p: Package) => Promise<void> | void;
|
||||
}) {
|
||||
const router = useRouter();
|
||||
const [busy, setBusy] = useState<string | null>(null);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [done, setDone] = useState<string | null>(null);
|
||||
const shown = ids
|
||||
? ids.map((id) => packages.find((p) => p.id === id)).filter((p): p is Package => p !== undefined)
|
||||
: packages.filter((p) => p.tier === "main");
|
||||
|
||||
async function buy(p: Package) {
|
||||
setBusy(p.id);
|
||||
setError(null);
|
||||
setDone(null);
|
||||
try {
|
||||
await api("/payments/mock", { body: { package: p.id } });
|
||||
if (onBought) await onBought(p);
|
||||
else {
|
||||
setDone(p.name);
|
||||
router.refresh();
|
||||
}
|
||||
} catch (e) {
|
||||
setError(errorText(e));
|
||||
} finally {
|
||||
setBusy(null);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="field" style={{ gap: 12 }}>
|
||||
<div className={compact ? "pkg-grid pkg-grid-compact" : "pkg-grid"}>
|
||||
{shown.map((p, i) => {
|
||||
const prev = i > 0 ? shown[i - 1] : null;
|
||||
const step = prev && p.tier === "main" && prev.tier === "main" ? p.price_huf - prev.price_huf : null;
|
||||
return (
|
||||
<article key={p.id} className={p.badge ? "pkg pkg-featured" : "pkg"} aria-labelledby={`pkg-${p.id}`}>
|
||||
<div className="pkg-tags">
|
||||
{p.badge && <span className="pkg-badge">{p.badge}</span>}
|
||||
{p.savings_percent ? <span className="pkg-save">−{p.savings_percent}%</span> : null}
|
||||
</div>
|
||||
<h3 id={`pkg-${p.id}`} className="pkg-name">
|
||||
{p.name}
|
||||
</h3>
|
||||
{!compact && <p className="muted pkg-tagline">{p.tagline}</p>}
|
||||
<div className="pkg-price">
|
||||
<strong>{huf(p.price_huf)}</strong>
|
||||
{p.list_price_huf && p.list_price_huf > p.price_huf && (
|
||||
<s className="hint" aria-label={`Külön megvéve ${huf(p.list_price_huf)}`}>
|
||||
{huf(p.list_price_huf)}
|
||||
</s>
|
||||
)}
|
||||
</div>
|
||||
<ul className="pkg-list">
|
||||
{contents(p).map((line) => (
|
||||
<li key={line}>{line}</li>
|
||||
))}
|
||||
</ul>
|
||||
<p className="hint pkg-per">
|
||||
{p.unlimited_months
|
||||
? "Aki sokakat vesz fel: családot, barátokat."
|
||||
: p.per_analysis_huf
|
||||
? `Elemzésenként ${huf(p.per_analysis_huf)}`
|
||||
: " "}
|
||||
</p>
|
||||
{step !== null && step > 0 && prev && (
|
||||
<p className="pkg-step">
|
||||
Csak +{huf(step)} a(z) {prev.name} csomaghoz képest
|
||||
</p>
|
||||
)}
|
||||
{canPay ? (
|
||||
<button
|
||||
type="button"
|
||||
className={p.badge ? "btn btn-primary" : "btn"}
|
||||
onClick={() => buy(p)}
|
||||
disabled={busy !== null}
|
||||
>
|
||||
{busy === p.id ? "Fizetés…" : "Megveszem"}
|
||||
</button>
|
||||
) : (
|
||||
<button type="button" className="btn" disabled>
|
||||
Hamarosan
|
||||
</button>
|
||||
)}
|
||||
</article>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
{error && (
|
||||
<p className="msg msg-error" role="alert">
|
||||
{error}
|
||||
</p>
|
||||
)}
|
||||
{done && (
|
||||
<p className="msg msg-ok" role="status">
|
||||
A(z) {done} csomag jóváírva.
|
||||
</p>
|
||||
)}
|
||||
{canPay && <p className="hint">Tesztüzem: a fizetés még nincs bekötve, a gomb nem terhel semmit.</p>}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
/** Loads the catalog in the browser (for choosers inside other components). */
|
||||
export function usePackages(): Package[] | null {
|
||||
const [packages, setPackages] = useState<Package[] | null>(null);
|
||||
useEffect(() => {
|
||||
api<{ packages: Package[] }>("/packages")
|
||||
.then((d) => setPackages(d.packages))
|
||||
.catch(() => setPackages([]));
|
||||
}, []);
|
||||
return packages;
|
||||
}
|
||||
|
||||
/** A few packages to choose from, loaded on demand, with a link to all of them. */
|
||||
export function PackageChooser({
|
||||
ids,
|
||||
canPay,
|
||||
onBought,
|
||||
}: {
|
||||
ids: string[];
|
||||
canPay: boolean;
|
||||
onBought?: (p: Package) => Promise<void> | void;
|
||||
}) {
|
||||
const packages = usePackages();
|
||||
if (packages === null) return <p className="muted">Csomagok betöltése…</p>;
|
||||
return (
|
||||
<div className="field" style={{ gap: 8 }}>
|
||||
<PackageCards packages={packages} ids={ids} canPay={canPay} compact onBought={onBought} />
|
||||
<Link href="/csomagok" className="hint">
|
||||
Összes csomag és a részletek →
|
||||
</Link>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -1,64 +1,8 @@
|
||||
"use client";
|
||||
|
||||
import { useRouter } from "next/navigation";
|
||||
import { useState } from "react";
|
||||
import { PackageChooser } from "./PackageCards";
|
||||
|
||||
import { api, errorText } from "@/lib/api";
|
||||
|
||||
/**
|
||||
* Person packages: a few more persons, or any number. Until Stripe is
|
||||
* connected the payment is a stand-in (MOCK_PAYMENTS) that grants it at once.
|
||||
*/
|
||||
export function PersonPacks({ packSize, canPay }: { packSize: number; canPay: boolean }) {
|
||||
const router = useRouter();
|
||||
const [busy, setBusy] = useState<string | null>(null);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
async function buy(pkg: "persons" | "persons_unlimited") {
|
||||
setBusy(pkg);
|
||||
setError(null);
|
||||
try {
|
||||
await api("/payments/mock", { body: { package: pkg } });
|
||||
router.refresh();
|
||||
} catch (e) {
|
||||
setError(errorText(e));
|
||||
} finally {
|
||||
setBusy(null);
|
||||
}
|
||||
}
|
||||
|
||||
if (!canPay) {
|
||||
return <p className="hint">További személyekhez csomag kell; a csomagok hamarosan elérhetők.</p>;
|
||||
}
|
||||
return (
|
||||
<div className="field" style={{ gap: 12 }}>
|
||||
<div className="packs">
|
||||
<div className="pack">
|
||||
<strong>+{packSize} személy</strong>
|
||||
<span className="muted">Még {packSize} ember képlete és elemzése.</span>
|
||||
<button type="button" className="btn btn-primary btn-sm" onClick={() => buy("persons")} disabled={busy !== null}>
|
||||
{busy === "persons" ? "Fizetés…" : "Fizetés"}
|
||||
</button>
|
||||
</div>
|
||||
<div className="pack">
|
||||
<strong>Korlátlan</strong>
|
||||
<span className="muted">Bárkit felvehetsz, nincs felső határ.</span>
|
||||
<button
|
||||
type="button"
|
||||
className="btn btn-primary btn-sm"
|
||||
onClick={() => buy("persons_unlimited")}
|
||||
disabled={busy !== null}
|
||||
>
|
||||
{busy === "persons_unlimited" ? "Fizetés…" : "Fizetés"}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
{error && (
|
||||
<p className="msg msg-error" role="alert">
|
||||
{error}
|
||||
</p>
|
||||
)}
|
||||
<p className="hint">Tesztüzem: a fizetés még nincs bekötve, a gomb nem terhel semmit.</p>
|
||||
</div>
|
||||
);
|
||||
/** Packages that give more persons: a few more, the family package, or unlimited. */
|
||||
export function PersonPacks({ canPay }: { canPay: boolean }) {
|
||||
return <PackageChooser ids={["addon_persons", "family", "unlimited"]} canPay={canPay} />;
|
||||
}
|
||||
|
||||
@@ -18,6 +18,7 @@ export function SiteHeader({ me }: { me: Me }) {
|
||||
{ href: "/keplet", label: "Képletem" },
|
||||
{ href: "/szemelyek", label: "Személyek" },
|
||||
{ href: "/osszevetesek", label: "Összevetések" },
|
||||
{ href: "/csomagok", label: "Csomagok" },
|
||||
{ href: "/profil", label: "Profil" },
|
||||
];
|
||||
if (me.user.roles.includes("admin")) links.push({ href: "/admin", label: "Admin" });
|
||||
|
||||
@@ -19,6 +19,25 @@ export interface Me {
|
||||
analyses_left: UnitBalance;
|
||||
birth_change: BirthChange;
|
||||
persons: PersonSlots;
|
||||
/** The unlimited package runs until then (null: none). */
|
||||
unlimited_until: string | null;
|
||||
}
|
||||
|
||||
/** A package from the catalog (`GET /v1/packages`). */
|
||||
export interface Package {
|
||||
id: string;
|
||||
name: string;
|
||||
tagline: string;
|
||||
tier: "main" | "addon";
|
||||
price_huf: number;
|
||||
natal: number;
|
||||
synastry: number;
|
||||
persons: number;
|
||||
unlimited_months: number | null;
|
||||
badge: string | null;
|
||||
list_price_huf: number | null;
|
||||
savings_percent: number | null;
|
||||
per_analysis_huf: number | null;
|
||||
}
|
||||
|
||||
/** How many persons the user may still add (`left`/`limit` null: no limit). */
|
||||
@@ -50,7 +69,8 @@ export interface PublicConfig {
|
||||
password_login: boolean;
|
||||
password_min_length: number;
|
||||
mock_payments: boolean;
|
||||
person_pack_size: number;
|
||||
/** New detailed analyses a day with the unlimited package. */
|
||||
unlimited_daily_limit: number;
|
||||
}
|
||||
|
||||
export interface Position {
|
||||
@@ -208,6 +228,7 @@ export interface AdminUser {
|
||||
last_login_at: string | null;
|
||||
charts: number;
|
||||
analyses_left: UnitBalance;
|
||||
unlimited_until: string | null;
|
||||
}
|
||||
|
||||
export type PromptKind = "summary" | "natal" | "synastry";
|
||||
|
||||
Reference in New Issue
Block a user