feat : update

app/admin/[character]/[page]/page.tsx

@@ -31,7 +31,7 @@ export default async function StructuredEditorPage({
   params: Promise<{ character: string; page: string }>;
 }) {
   await connection();
-  if (!(await getAdminSession())) redirect("/admin/login");
+  if (!(await getAdminSession())) redirect("/login?next=%2Fadmin");
   const { character, page } = await params;
   const guide = await getGuideEditorHeader(character);
   if (!guide) notFound();

app/admin/[character]/page.tsx

@@ -27,7 +27,7 @@ export const instant = false;
 
 export default async function GuideOverviewPage({ params }: { params: Promise<{ character: string }> }) {
   await connection();
-  if (!(await getAdminSession())) redirect("/admin/login");
+  if (!(await getAdminSession())) redirect("/login?next=%2Fadmin");
   const { character } = await params;
   const guide = await getGuideByCharacterKey(character);
   if (!guide) notFound();

app/admin/[character]/preview/[[...page]]/page.tsx

@@ -14,7 +14,7 @@ export default async function GuidePreviewPage({
   params: Promise<{ character: string; page?: string[] }>;
 }) {
   await connection();
-  if (!(await getAdminSession())) redirect("/admin/login");
+  if (!(await getAdminSession())) redirect("/login?next=%2Fadmin");
   const { character, page } = await params;
   if (page && page.length > 1) notFound();
   const header = await getGuideEditorHeader(character);

app/admin/activity/page.tsx

@@ -21,7 +21,7 @@ export default async function AuditLogPage({
   searchParams: Promise<Record<string, string | string[] | undefined>>;
 }) {
   await connection();
-  if (!(await getAdminSession())) redirect("/admin/login");
+  if (!(await getAdminSession())) redirect("/login?next=%2Fadmin");
 
   const query = await searchParams;
   const rawPage = Array.isArray(query.page) ? query.page[0] : query.page;

app/admin/commission/page.tsx

@@ -19,7 +19,7 @@ export const instant = false;
 export default async function AdminCommissionPage({ searchParams }: PageProps<"/admin/commission">) {
   await connection();
   const session = await getAdminSession();
-  if (!session) redirect("/admin/login");
+  if (!session) redirect("/login?next=%2Fadmin");
   const query = await searchParams;
   const rawPage = Number(query.page ?? 1);
   const page = Number.isInteger(rawPage) && rawPage > 0 ? Math.min(rawPage, 10000) : 1;

app/admin/create/page.tsx

@@ -11,7 +11,7 @@ import { getActiveCatalog, listGuideCards } from "@/lib/guides/queries";
 
 export default async function CreateGuidePage() {
   await connection();
-  if (!(await getAdminSession())) redirect("/admin/login");
+  if (!(await getAdminSession())) redirect("/login?next=%2Fadmin");
   const [catalog, guides] = await Promise.all([getActiveCatalog(), listGuideCards()]);
   if (!catalog) redirect("/admin?sync=required");
   return (

app/admin/glossary/page.tsx

@@ -9,7 +9,7 @@ import { getCatalogOptions } from "@/lib/guides/queries";
 
 export default async function GlossaryPage() {
   await connection();
-  if (!(await getAdminSession())) redirect("/admin/login");
+  if (!(await getAdminSession())) redirect("/login?next=%2Fadmin");
   const [catalog, aliases] = await Promise.all([
     getCatalogOptions(),
     listGlossaryAliases(),

app/admin/image/layout.tsx

@@ -9,7 +9,7 @@ export default async function ImageGeneratorLayout({
   children,
 }: LayoutProps<"/admin/image">) {
   await connection();
-  if (!(await getAdminSession())) redirect("/admin/login");
+  if (!(await getAdminSession())) redirect("/login?next=%2Fadmin");
 
   return (
     <div className="min-h-svh">

app/admin/login/page.tsx

@@ -1,25 +0,0 @@
-import { redirect } from "next/navigation";
-import { connection } from "next/server";
-
-import { LoginCard } from "@/components/admin/login-card";
-import { SiteHeader } from "@/components/public/site-header";
-import { getAdminSession } from "@/lib/auth/server";
-
-export default async function AdminLoginPage() {
-  await connection();
-  if (await getAdminSession()) redirect("/admin");
-
-  const turnstileSiteKey = process.env.TURNSTILE_SITE_KEY;
-  if (process.env.NODE_ENV !== "development" && !turnstileSiteKey) {
-    throw new Error("TURNSTILE_SITE_KEY is required for administrator login.");
-  }
-
-  return (
-    <div className="min-h-svh">
-      <SiteHeader />
-      <main className="grid min-h-[calc(100svh-4rem)] place-items-center px-4 py-12">
-        <LoginCard turnstileSiteKey={turnstileSiteKey ?? ""} />
-      </main>
-    </div>
-  );
-}

app/admin/page.tsx

@@ -12,7 +12,7 @@ export const instant = false;
 
 export default async function AdminPage() {
   await connection();
-  if (!(await getAdminSession())) redirect("/admin/login");
+  if (!(await getAdminSession())) redirect("/login?next=%2Fadmin");
   const [guides, trash, catalogVersion] = await Promise.all([
     listGuideCards(),
     listGuideCards(true),

app/admin/stygian/page.tsx

@@ -11,7 +11,7 @@ import { getStygianSchedule, listStygianSchedules } from "@/lib/stygian/reposito
 
 export default async function AdminStygianPage({ searchParams }: { searchParams: Promise<Record<string, string | string[] | undefined>> }) {
   await connection();
-  if (!(await getAdminSession())) redirect("/admin/login");
+  if (!(await getAdminSession())) redirect("/login?next=%2Fadmin");
   const query = await searchParams;
   const schedules = await listStygianSchedules();
   const raw = Array.isArray(query.schedule) ? query.schedule[0] : query.schedule;

app/check-email/page.tsx

@@ -0,0 +1,15 @@
+import { connection } from "next/server";
+import { SiteHeader } from "@/components/public/site-header";
+import { RegistrationOtpForm } from "@/components/auth/registration-otp-form";
+import { safeAuthReturnPath } from "@/lib/auth/return-path";
+
+export const instant = false;
+
+export default async function CheckEmailPage({ searchParams }: PageProps<"/check-email">) {
+  await connection();
+  const { email, next, setup } = await searchParams;
+  return <div className="min-h-svh"><SiteHeader /><main className="grid min-h-[calc(100svh-4rem)] place-items-center p-4">
+    <RegistrationOtpForm email={typeof email === "string" ? email : ""}
+      nextPath={safeAuthReturnPath(next)} setup={setup === "1"} />
+  </main></div>;
+}

app/forgot-password/page.tsx

@@ -0,0 +1,8 @@
+import { SiteHeader } from "@/components/public/site-header";
+import { EmailActionForm } from "@/components/auth/email-action-form";
+
+export default function ForgotPasswordPage() {
+  return <div className="min-h-svh"><SiteHeader /><main className="grid min-h-[calc(100svh-4rem)] place-items-center p-4">
+    <EmailActionForm mode="forgot" />
+  </main></div>;
+}

app/login/page.tsx

@@ -5,6 +5,7 @@ export const instant = false;
 
 export default async function LoginPage({ searchParams }: PageProps<"/login">) {
   await connection();
-  const { next } = await searchParams;
-  return <AccountPage mode="login" next={next} />;
+  const { next, verified, error } = await searchParams;
+  return <AccountPage mode="login" next={next} verified={verified === "1" && !error}
+    verificationError={typeof error === "string"} />;
 }

app/profile/page.tsx

@@ -6,6 +6,8 @@ import { users } from "@/db/schema";
 import { SiteHeader } from "@/components/public/site-header";
 import { AdminHeader } from "@/components/admin/admin-header";
 import { ProfileForm } from "@/components/auth/profile-form";
+import { PasswordForm } from "@/components/auth/password-form";
+import { EmailSettings } from "@/components/auth/email-settings";
 import { isAuthorizedAdmin } from "@/lib/auth/authorization";
 import { getCustomerSession } from "@/lib/auth/server";
 import { safeAuthReturnPath } from "@/lib/auth/return-path";
@@ -14,22 +16,28 @@ export const instant = false;
 
 export default async function ProfilePage({ searchParams }: PageProps<"/profile">) {
   await connection();
-  const { setup, next, upload } = await searchParams;
+  const { setup, next, upload, emailAction, error } = await searchParams;
   const nextPath = safeAuthReturnPath(next);
   const setupNextPath = nextPath === "/profile" || nextPath.startsWith("/profile?") ? "/" : nextPath;
   const session = await getCustomerSession();
   if (!session) redirect("/login?next=%2Fprofile");
-  const [user] = await getDb().select({ name: users.name, email: users.email, image: users.image })
+  const [user] = await getDb().select({ name: users.name, email: users.email,
+    emailVerified: users.emailVerified, image: users.image })
     .from(users).where(eq(users.id, session.user.id)).limit(1);
   if (!user) redirect("/login?next=%2Fprofile");
   return <div className="min-h-svh">{isAuthorizedAdmin(session.user) ? <AdminHeader /> : <SiteHeader />}
-    <main className="mx-auto max-w-xl p-4 py-10 sm:p-8">
+    <main className="mx-auto max-w-5xl p-4 py-10 sm:p-8">
       <h1 className="mb-6 font-heading text-3xl font-semibold">โปรไฟล์ของฉัน</h1>
       {setup === "1" && <p className="mb-6 text-muted-foreground">
         {upload === "failed" ? "สร้างบัญชีแล้ว แต่บันทึกรูปโปรไฟล์ไม่สำเร็จ กรุณาลองอีกครั้งหรือข้ามไปก่อน" :
           "เพิ่มรูปโปรไฟล์หรือแก้ชื่อที่แสดงก่อนเริ่มใช้งาน"}
       </p>}
-      <ProfileForm {...user} nextPath={setup === "1" ? setupNextPath : undefined} />
+      <div className="grid items-start gap-6 md:grid-cols-2">
+        <ProfileForm {...user} nextPath={setup === "1" ? setupNextPath : undefined} />
+        <EmailSettings email={user.email} verified={user.emailVerified}
+          callbackCompleted={emailAction === "1" && !error} callbackError={typeof error === "string"} />
+        <PasswordForm />
+      </div>
     </main>
   </div>;
 }

app/reset-password/page.tsx

@@ -0,0 +1,13 @@
+import { connection } from "next/server";
+import { SiteHeader } from "@/components/public/site-header";
+import { EmailActionForm } from "@/components/auth/email-action-form";
+
+export const instant = false;
+
+export default async function ResetPasswordPage({ searchParams }: PageProps<"/reset-password">) {
+  await connection();
+  const { token, error } = await searchParams;
+  return <div className="min-h-svh"><SiteHeader /><main className="grid min-h-[calc(100svh-4rem)] place-items-center p-4">
+    <EmailActionForm mode="reset" token={typeof token === "string" ? token : ""} invalidToken={typeof error === "string"} />
+  </main></div>;
+}