Decouple admin from public max-w-7xl via (site) route group.
Local Build and Deploy / deploy (push) Successful in 54s

Public chrome and width live only under (site). /admin and /client inherit the root layout alone, so housekeeping width is no longer tied to the public template.

Co-authored-by: Cursor <[email protected]>
This commit is contained in:
SimoandCursor committed 2026-07-15 21:12:52 +02:00
1 parent a1dc7ff0a7
commit 367f69a439
60 files changed
+29 -30

No files matched your search

+186
View File
@@ -0,0 +1,186 @@
"use client";
import { useState } from "react";
/**
* Client form for /shop/topup. Posts the chosen amount to /api/paypal/create,
* then redirects the browser to PayPal's approval URL. After PayPal returns to
* /shop/topup?token=<orderId>&status=success, it captures via /api/paypal/capture.
*/
export default function TopUpForm({
currency,
creditsPerUnit,
}: {
currency: string;
creditsPerUnit: number;
}) {
const [amount, setAmount] = useState("5.00");
const [pending, setPending] = useState(false);
const [error, setError] = useState<string | null>(null);
const [success, setSuccess] = useState<string | null>(null);
const numeric = Number(amount);
const credits =
Number.isFinite(numeric) && numeric > 0
? Math.floor(numeric * creditsPerUnit)
: 0;
async function startCheckout(e: React.FormEvent) {
e.preventDefault();
setError(null);
setPending(true);
try {
const res = await fetch("/api/paypal/create", {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ amount: numeric }),
});
const data = (await res.json().catch(() => ({}))) as {
approveUrl?: string;
error?: string;
};
if (!res.ok || !data.approveUrl) {
setError(data.error ?? "Could not start the PayPal checkout.");
setPending(false);
return;
}
// Hand off to PayPal for approval.
const redirectUrl = new URL(data.approveUrl);
if (redirectUrl.protocol !== "https:") {
throw new Error("Invalid redirect URL: must be HTTPS");
}
if (
!redirectUrl.hostname.endsWith(".paypal.com") &&
redirectUrl.hostname !== "paypal.com"
) {
throw new Error("Invalid redirect URL: must be a PayPal domain");
}
window.location.href = redirectUrl.href;
} catch {
setError("Network error — please try again.");
setPending(false);
}
}
async function capture(orderId: string) {
setPending(true);
setError(null);
try {
const res = await fetch("/api/paypal/capture", {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ orderId }),
});
const data = (await res.json().catch(() => ({}))) as {
ok?: boolean;
credits?: number;
error?: string;
};
if (res.ok && data.ok) {
setSuccess(
`Payment complete! ${(data.credits ?? 0).toLocaleString()} credits were added.`,
);
} else {
setError(
data.error ??
"We couldn't confirm your payment. Contact staff if charged.",
);
}
} catch {
setError(
"Network error confirming payment — contact staff if you were charged.",
);
} finally {
setPending(false);
// Clean the token/status query so a refresh doesn't re-capture.
window.history.replaceState(null, "", "/shop/topup");
}
}
// On return from PayPal (?token=<orderId>&status=success), auto-capture once.
if (typeof window !== "undefined" && !pending && !success) {
const params = new URLSearchParams(window.location.search);
const token = params.get("token");
if (token && params.get("status") === "success") {
// Defer to avoid setState during render.
queueMicrotask(() => capture(token));
}
}
if (success) {
return (
<p
role="status"
aria-live="polite"
style={{ margin: 0, fontWeight: 700, color: "var(--color-accent)" }}
>
{success}
</p>
);
}
return (
<form
onSubmit={startCheckout}
style={{ display: "flex", flexDirection: "column", gap: "0.75rem" }}
>
<label htmlFor="amount" style={{ fontWeight: 700 }}>
Amount ({currency})
</label>
<input
id="amount"
name="amount"
type="number"
min={1}
max={500}
step={0.01}
value={amount}
onChange={(e) => setAmount(e.target.value)}
aria-label={`Amount in ${currency}`}
required
/>
<div
style={{
display: "flex",
flexWrap: "wrap",
gap: "0.4rem",
}}
>
{["2.00", "5.00", "10.00", "25.00"].map((v) => (
<button
key={v}
type="button"
className={`btn ${amount === v ? "btn-primary" : "btn-outline"}`}
onClick={() => setAmount(v)}
>
{currency} {v}
</button>
))}
</div>
<p className="muted" style={{ margin: 0 }}>
You&apos;ll receive <strong>{credits.toLocaleString()}</strong> credits.
</p>
<div>
<button
type="submit"
className="btn btn-primary"
disabled={pending || credits <= 0}
>
{pending ? "Redirecting…" : "Pay with PayPal"}
</button>
</div>
{error ? (
<p
role="alert"
aria-live="polite"
style={{ margin: 0, fontWeight: 700, color: "var(--color-danger)" }}
>
{error}
</p>
) : null}
</form>
);
}
+96
View File
@@ -0,0 +1,96 @@
import { redirect } from "next/navigation";
import { getTranslations } from "next-intl/server";
import { ContentCard, StatBlock } from "@/components/public/ui";
import { auth } from "@/lib/auth";
import { prisma } from "@/lib/prisma";
import {
creditsPerUnit,
isPayPalConfigured,
PAYPAL_CURRENCY,
} from "@/lib/services/paypal";
import TopUpForm from "./TopUpForm";
export const dynamic = "force-dynamic";
export default async function TopUpPage({
searchParams,
}: {
searchParams: Promise<{ status?: string }>;
}) {
const session = await auth();
if (!session?.user?.id) redirect("/login");
const t = await getTranslations("pages.topup");
const sp = await searchParams;
const id = Number(session.user.id);
// Current credits balance for context (fail soft).
let user: { username: string; credits: number } | null = null;
try {
user = await prisma.user.findUnique({
where: { id },
select: { username: true, credits: true },
});
} catch {
user = null;
}
if (!user) redirect("/login");
const configured = isPayPalConfigured();
const rate = creditsPerUnit();
return (
<main style={{ display: "grid", gap: "1.5rem" }}>
<ContentCard icon="💳" title={t("title")} subtitle={t("subtitle")} />
{sp.status === "cancel" ? (
<div className="card" style={{ borderColor: "var(--color-danger)" }}>
<p style={{ margin: 0 }}>{t("cancelled")}</p>
</div>
) : null}
<div className="card-grid sm-2">
<ContentCard icon="🪙" title={t("chooseAmount")}>
{configured ? (
<TopUpForm currency={PAYPAL_CURRENCY} creditsPerUnit={rate} />
) : (
<p className="muted" style={{ margin: 0 }}>
{t("notConfiguredPre")} <code>PAYPAL_CLIENT_ID</code>{" "}
{t("notConfiguredAnd")} <code>PAYPAL_SECRET</code>{" "}
{t("notConfiguredOptional")} <code>PAYPAL_API</code>{" "}
{t("notConfiguredPost")}
</p>
)}
</ContentCard>
<ContentCard
icon="💰"
title={t("balanceTitle")}
subtitle={t("signedInAs", { username: user.username })}
>
<div className="stat-grid">
<StatBlock
value={user.credits.toLocaleString()}
label={t("credits")}
icon="🪙"
/>
<StatBlock
value={rate.toLocaleString()}
label={t("creditsPerUnit", { currency: PAYPAL_CURRENCY })}
/>
</div>
<p
className="muted"
style={{ marginBottom: 0, marginTop: "0.85rem" }}
>
{t.rich("rateLine", {
amount: rate.toLocaleString(),
currency: PAYPAL_CURRENCY,
strong: (chunks) => <strong>{chunks}</strong>,
})}
</p>
</ContentCard>
</div>
</main>
);
}