feat : update
This commit is contained in:
@@ -1,5 +0,0 @@
|
||||
import { redirect } from "next/navigation";
|
||||
|
||||
export default function LegacyCommissionLoginPage() {
|
||||
redirect("/login?next=%2Fcommission");
|
||||
}
|
||||
@@ -25,8 +25,8 @@ async function CommissionContent() {
|
||||
if (!session) return <div className="flex flex-col gap-4 rounded-xl border p-6">
|
||||
<p>เข้าสู่ระบบหรือสมัครสมาชิกก่อนเริ่มคำขอ</p>
|
||||
<div className="flex flex-wrap gap-2">
|
||||
<Button nativeButton={false} render={<Link href="/login?next=%2Fcommission" />}>เข้าสู่ระบบ</Button>
|
||||
<Button variant="outline" nativeButton={false} render={<Link href="/register?next=%2Fcommission" />}>สมัครสมาชิก</Button>
|
||||
<Button nativeButton={false} render={<Link href="/auth/login?next=%2Fcommission" />}>เข้าสู่ระบบ</Button>
|
||||
<Button variant="outline" nativeButton={false} render={<Link href="/auth/register?next=%2Fcommission" />}>สมัครสมาชิก</Button>
|
||||
</div>
|
||||
</div>;
|
||||
const catalog = await getCatalogOptions();
|
||||
@@ -43,7 +43,7 @@ export default function CommissionPage() {
|
||||
<main className="mx-auto flex w-full max-w-5xl flex-col gap-6 p-4 py-10 sm:p-8">
|
||||
<header><h1 className="font-heading text-3xl font-semibold">Commission</h1>
|
||||
<p className="text-muted-foreground">ขอทีม เปรียบเทียบอาวุธหรือกลุ่มดาวตามที่ต้องการ</p></header>
|
||||
<Suspense fallback={<p>กำลังโหลด...</p>}><CommissionContent /></Suspense>
|
||||
<Suspense fallback={null}><CommissionContent /></Suspense>
|
||||
</main>
|
||||
</div>;
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@ export default async function CommissionPayPage({ params }: PageProps<"/commissi
|
||||
await connection();
|
||||
const { id } = await params;
|
||||
const session = await getCustomerSession();
|
||||
if (!session) redirect(`/login?next=${encodeURIComponent(`/commission/pay/${id}`)}`);
|
||||
if (!session) redirect(`/auth/login?next=${encodeURIComponent(`/commission/pay/${id}`)}`);
|
||||
const [checkout] = await getDb().select().from(commissionCheckouts)
|
||||
.where(and(eq(commissionCheckouts.id, id), eq(commissionCheckouts.userId, session.user.id))).limit(1);
|
||||
if (!checkout) notFound();
|
||||
|
||||
@@ -16,7 +16,7 @@ export const instant = false;
|
||||
export default async function CommissionTicketsPage() {
|
||||
await connection();
|
||||
const session = await getCustomerSession();
|
||||
if (!session) redirect("/login?next=%2Fcommission%2Ftickets");
|
||||
if (!session) redirect("/auth/login?next=%2Fcommission%2Ftickets");
|
||||
const [tickets, pending] = await Promise.all([
|
||||
getDb().select({ ticket: commissionTickets, amount: commissionCheckouts.amountBaht })
|
||||
.from(commissionTickets).innerJoin(commissionCheckouts, eq(commissionTickets.checkoutId, commissionCheckouts.id))
|
||||
|
||||
Reference in New Issue
Block a user