magic link support and forgot password
This commit is contained in:
+408
-179
@@ -1,209 +1,438 @@
|
||||
// app/(account)/account/page.tsx
|
||||
"use client";
|
||||
|
||||
import { useMemo, useState } from "react";
|
||||
import { useSearchParams, useRouter } from "next/navigation";
|
||||
import { useAuth } from "@/context/AuthContext";
|
||||
|
||||
function StatChip({
|
||||
label,
|
||||
value,
|
||||
}: {
|
||||
label: string;
|
||||
value: React.ReactNode;
|
||||
}) {
|
||||
return (
|
||||
<div className="rounded-lg border border-white/10 bg-white/5 px-3 py-2">
|
||||
<div className="text-[11px] uppercase tracking-[0.18em] text-white/50">
|
||||
{label}
|
||||
</div>
|
||||
<div className="text-sm font-semibold text-white/90">{value}</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function Card({
|
||||
title,
|
||||
description,
|
||||
children,
|
||||
badge,
|
||||
}: {
|
||||
title: string;
|
||||
description?: string;
|
||||
children: React.ReactNode;
|
||||
badge?: React.ReactNode;
|
||||
}) {
|
||||
return (
|
||||
<section className="rounded-2xl border border-white/10 bg-white/5 p-5">
|
||||
<div className="flex items-start justify-between gap-4">
|
||||
<div>
|
||||
<h3 className="text-sm font-semibold text-white/90">{title}</h3>
|
||||
{description ? (
|
||||
<p className="mt-1 text-sm text-white/60">{description}</p>
|
||||
) : null}
|
||||
</div>
|
||||
{badge ? <div className="shrink-0">{badge}</div> : null}
|
||||
</div>
|
||||
|
||||
<div className="mt-4">{children}</div>
|
||||
</section>
|
||||
);
|
||||
}
|
||||
|
||||
function Row({ label, value }: { label: string; value: React.ReactNode }) {
|
||||
return (
|
||||
<div className="flex items-center justify-between gap-4 py-2">
|
||||
<div className="text-sm text-white/60">{label}</div>
|
||||
<div className="text-sm font-medium text-white/90">{value}</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
const API_BASE_URL =
|
||||
process.env.NEXT_PUBLIC_API_BASE_URL ?? "http://localhost:8080";
|
||||
|
||||
export default function AccountPage() {
|
||||
const { user, loading } = useAuth();
|
||||
const { user, loading, token, setSession, logout } = useAuth();
|
||||
const searchParams = useSearchParams();
|
||||
const router = useRouter();
|
||||
|
||||
if (loading) return <div className="text-sm text-white/60">Loading…</div>;
|
||||
const welcome = searchParams.get("welcome") === "1";
|
||||
|
||||
const needsDisplayName = useMemo(() => {
|
||||
return !user?.displayName || user.displayName.trim().length === 0;
|
||||
}, [user?.displayName]);
|
||||
|
||||
// Only show welcome panel if they actually need setup
|
||||
const showWelcomeCard = welcome && needsDisplayName;
|
||||
|
||||
// ----------------------------
|
||||
// Display Name state (shared)
|
||||
// ----------------------------
|
||||
const [displayName, setDisplayName] = useState(user?.displayName ?? "");
|
||||
const [saving, setSaving] = useState(false);
|
||||
const [msg, setMsg] = useState<string | null>(null);
|
||||
|
||||
// Inline profile editor
|
||||
const [editingName, setEditingName] = useState(false);
|
||||
|
||||
// ----------------------------
|
||||
// Password state
|
||||
// ----------------------------
|
||||
const [showPassword, setShowPassword] = useState(false);
|
||||
const [pw1, setPw1] = useState("");
|
||||
const [pw2, setPw2] = useState("");
|
||||
const [pwSaving, setPwSaving] = useState(false);
|
||||
const [pwMsg, setPwMsg] = useState<string | null>(null);
|
||||
|
||||
const canSaveName = useMemo(() => {
|
||||
return displayName.trim().length > 0 && !saving;
|
||||
}, [displayName, saving]);
|
||||
|
||||
const pwMismatch = useMemo(
|
||||
() => pw1.length > 0 && pw2.length > 0 && pw1 !== pw2,
|
||||
[pw1, pw2]
|
||||
);
|
||||
const pwTooShort = useMemo(() => pw1.length > 0 && pw1.length < 8, [pw1]);
|
||||
const canSavePassword = useMemo(() => {
|
||||
return !pwSaving && pw1.length >= 8 && pw1 === pw2;
|
||||
}, [pwSaving, pw1, pw2]);
|
||||
|
||||
if (loading) return <div className="text-sm opacity-70">Loading…</div>;
|
||||
|
||||
if (!user) {
|
||||
return (
|
||||
<div className="rounded-2xl border border-white/10 bg-white/5 p-6">
|
||||
<h2 className="text-base font-semibold text-white/90">
|
||||
You’re not logged in
|
||||
</h2>
|
||||
<p className="mt-2 text-sm text-white/60">
|
||||
Please log in to view your account.
|
||||
</p>
|
||||
<div className="text-sm opacity-70">
|
||||
You’re not logged in. Please log in to view your account.
|
||||
</div>
|
||||
);
|
||||
}
|
||||
const authedUser = user; // user is non-null from here down
|
||||
|
||||
const planLabel = user.role === "ADMIN" ? "Admin" : "Beta Access";
|
||||
async function saveDisplayName() {
|
||||
setSaving(true);
|
||||
setMsg(null);
|
||||
|
||||
try {
|
||||
const nextName = displayName.trim();
|
||||
|
||||
const res = await fetch(`${API_BASE_URL}/api/users/me`, {
|
||||
method: "PATCH",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
...(token ? { Authorization: `Bearer ${token}` } : {}),
|
||||
},
|
||||
body: JSON.stringify({ displayName: nextName }),
|
||||
});
|
||||
|
||||
if (!res.ok) {
|
||||
const text = await res.text().catch(() => "");
|
||||
throw new Error(text || "Failed to update profile");
|
||||
}
|
||||
|
||||
const updated = await res.json().catch(() => null);
|
||||
|
||||
const nextUser = {
|
||||
email: authedUser.email,
|
||||
displayName: updated?.displayName ?? nextName,
|
||||
role: authedUser.role,
|
||||
};
|
||||
|
||||
if (token) setSession(token, nextUser);
|
||||
|
||||
setMsg("Saved ✅");
|
||||
setEditingName(false);
|
||||
|
||||
// If we came from the welcome flow, clear the param
|
||||
if (welcome) router.replace("/account");
|
||||
} catch (e: any) {
|
||||
setMsg(e?.message || "Couldn’t save. Try again.");
|
||||
} finally {
|
||||
setSaving(false);
|
||||
}
|
||||
}
|
||||
|
||||
async function savePassword() {
|
||||
setPwMsg(null);
|
||||
|
||||
if (pw1.length < 8) {
|
||||
setPwMsg("Password must be at least 8 characters.");
|
||||
return;
|
||||
}
|
||||
if (pw1 !== pw2) {
|
||||
setPwMsg("Passwords don’t match.");
|
||||
return;
|
||||
}
|
||||
|
||||
setPwSaving(true);
|
||||
|
||||
try {
|
||||
const res = await fetch(`${API_BASE_URL}/api/users/me/password`, {
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
...(token ? { Authorization: `Bearer ${token}` } : {}),
|
||||
},
|
||||
body: JSON.stringify({ password: pw1 }),
|
||||
});
|
||||
|
||||
if (!res.ok) {
|
||||
const text = await res.text().catch(() => "");
|
||||
throw new Error(text || "Failed to set password");
|
||||
}
|
||||
|
||||
setPwMsg("Password set ✅ You can now use email + password login.");
|
||||
setPw1("");
|
||||
setPw2("");
|
||||
setShowPassword(false);
|
||||
|
||||
if (welcome) router.replace("/account");
|
||||
} catch (e: any) {
|
||||
setPwMsg(e?.message || "Couldn’t set password. Try again.");
|
||||
} finally {
|
||||
setPwSaving(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="space-y-6">
|
||||
{/* Quick stats (lightweight “premium” feel) */}
|
||||
{/* <div className="grid grid-cols-2 gap-3 sm:grid-cols-4">
|
||||
<StatChip label="Email" value={user.email} />
|
||||
<StatChip label="Display Name" value={user.displayName || "—"} />
|
||||
<StatChip label="Role" value={user.role} />
|
||||
<StatChip label="Plan" value={planLabel} />
|
||||
</div> */}
|
||||
|
||||
<div id="profile">
|
||||
<Card
|
||||
title="Profile"
|
||||
description="Basic account info."
|
||||
badge={
|
||||
<span className="rounded-full border border-white/10 bg-white/5 px-2 py-1 text-[11px] text-white/60">
|
||||
Read-only (for now)
|
||||
</span>
|
||||
}
|
||||
>
|
||||
<div className="divide-y divide-white/10">
|
||||
<Row label="Email" value={user.email} />
|
||||
<Row label="Display name" value={user.displayName || "—"} />
|
||||
<Row label="Role" value={user.role} />
|
||||
</div>
|
||||
</Card>
|
||||
</div>
|
||||
|
||||
<div id="preferences">
|
||||
<Card
|
||||
title="Preferences"
|
||||
description="Placeholders until we wire the backend."
|
||||
badge={
|
||||
<span className="rounded-full border border-white/10 bg-white/5 px-2 py-1 text-[11px] text-white/60">
|
||||
Coming soon
|
||||
</span>
|
||||
}
|
||||
>
|
||||
<div className="space-y-3">
|
||||
<label className="flex items-center justify-between gap-4 rounded-xl border border-white/10 bg-white/5 p-3">
|
||||
{/* Welcome / Setup card (only if needed) */}
|
||||
{showWelcomeCard && (
|
||||
<div className="rounded-xl border border-amber-500/30 bg-amber-500/10 p-4 space-y-4">
|
||||
<div>
|
||||
<div className="text-sm font-medium text-white/90">
|
||||
Default new builds to private
|
||||
<h2 className="text-base font-semibold">Welcome to the beta 👋</h2>
|
||||
<p className="text-sm text-zinc-300/80">
|
||||
Quick setup and you’re ready to cook.
|
||||
</p>
|
||||
</div>
|
||||
<div className="text-sm text-white/60">
|
||||
Keeps builds off the public feed until you publish.
|
||||
</div>
|
||||
</div>
|
||||
<input
|
||||
type="checkbox"
|
||||
disabled
|
||||
className="h-4 w-4 accent-orange-400"
|
||||
/>
|
||||
|
||||
{/* Display name */}
|
||||
<div className="space-y-2">
|
||||
<label className="text-xs font-medium text-zinc-200">
|
||||
Display name
|
||||
</label>
|
||||
|
||||
<label className="flex items-center justify-between gap-4 rounded-xl border border-white/10 bg-white/5 p-3">
|
||||
<div>
|
||||
<div className="text-sm font-medium text-white/90">
|
||||
Weekly digest
|
||||
</div>
|
||||
<div className="text-sm text-white/60">
|
||||
Price drops, new parts, and updates.
|
||||
</div>
|
||||
</div>
|
||||
<input
|
||||
type="checkbox"
|
||||
disabled
|
||||
className="h-4 w-4 accent-orange-400"
|
||||
value={displayName}
|
||||
onChange={(e) => setDisplayName(e.target.value)}
|
||||
placeholder="e.g. Sean / S2Tactical / DirtNinja69"
|
||||
className="w-full rounded-md border border-white/10 bg-black/40 px-3 py-2 text-sm outline-none focus:ring-2 focus:ring-amber-500/40"
|
||||
/>
|
||||
</label>
|
||||
</div>
|
||||
</Card>
|
||||
</div>
|
||||
|
||||
<div id="security">
|
||||
<Card
|
||||
title="Security"
|
||||
description="Sessions, password change, and 2FA will live here."
|
||||
badge={
|
||||
<span className="rounded-full border border-white/10 bg-white/5 px-2 py-1 text-[11px] text-white/60">
|
||||
Coming soon
|
||||
</span>
|
||||
}
|
||||
>
|
||||
<div className="space-y-3">
|
||||
<div className="rounded-xl border border-white/10 bg-white/5 p-3">
|
||||
<div className="text-sm font-medium text-white/90">2FA</div>
|
||||
<div className="text-sm text-white/60">
|
||||
Not enabled yet (on the roadmap).
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="rounded-xl border border-white/10 bg-white/5 p-3">
|
||||
<div className="text-sm font-medium text-white/90">
|
||||
Active sessions
|
||||
</div>
|
||||
<div className="text-sm text-white/60">
|
||||
We’ll show devices + allow logout everywhere.
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</Card>
|
||||
</div>
|
||||
|
||||
<div id="danger">
|
||||
<Card
|
||||
title="Danger Zone"
|
||||
description="Destructive actions. Handle with care."
|
||||
>
|
||||
<div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
|
||||
<div>
|
||||
<div className="text-sm font-medium text-white/90">
|
||||
Delete account
|
||||
</div>
|
||||
<div className="text-sm text-white/60">
|
||||
Removes your account and builds. (We’ll add this flow later.)
|
||||
</div>
|
||||
</div>
|
||||
<div className="flex items-center gap-3">
|
||||
<button
|
||||
type="button"
|
||||
disabled
|
||||
className="inline-flex items-center justify-center rounded-lg border border-white/10 bg-white/5 px-4 py-2 text-sm font-semibold text-red-200/90 opacity-60"
|
||||
onClick={saveDisplayName}
|
||||
disabled={!canSaveName}
|
||||
className="rounded-md bg-amber-400 px-3 py-2 text-sm font-medium text-black disabled:opacity-50"
|
||||
>
|
||||
Delete (coming soon)
|
||||
{saving ? "Saving…" : "Save"}
|
||||
</button>
|
||||
{msg && (
|
||||
<span
|
||||
className={`text-xs ${
|
||||
msg.toLowerCase().includes("couldn")
|
||||
? "text-red-300"
|
||||
: "text-zinc-200/80"
|
||||
}`}
|
||||
>
|
||||
{msg}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Password */}
|
||||
<div className="pt-2 border-t border-white/10">
|
||||
<p className="text-xs text-zinc-300/80">
|
||||
Want password login later? Optional (but recommended).
|
||||
</p>
|
||||
|
||||
{!showPassword ? (
|
||||
<button
|
||||
onClick={() => setShowPassword(true)}
|
||||
className="mt-2 text-xs underline opacity-80 hover:opacity-100"
|
||||
>
|
||||
Set a password
|
||||
</button>
|
||||
) : (
|
||||
<div className="mt-3 space-y-2">
|
||||
<input
|
||||
type="password"
|
||||
value={pw1}
|
||||
onChange={(e) => setPw1(e.target.value)}
|
||||
placeholder="New password (min 8 chars)"
|
||||
className="w-full rounded-md border border-white/10 bg-black/40 px-3 py-2 text-sm outline-none focus:ring-2 focus:ring-amber-500/40"
|
||||
/>
|
||||
<input
|
||||
type="password"
|
||||
value={pw2}
|
||||
onChange={(e) => setPw2(e.target.value)}
|
||||
placeholder="Confirm password"
|
||||
className="w-full rounded-md border border-white/10 bg-black/40 px-3 py-2 text-sm outline-none focus:ring-2 focus:ring-amber-500/40"
|
||||
/>
|
||||
|
||||
{(pwTooShort || pwMismatch) && (
|
||||
<div className="text-xs text-red-300">
|
||||
{pwTooShort
|
||||
? "Password must be at least 8 characters."
|
||||
: "Passwords don’t match."}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="flex items-center gap-3">
|
||||
<button
|
||||
onClick={savePassword}
|
||||
disabled={!canSavePassword}
|
||||
className="rounded-md bg-amber-400 px-3 py-2 text-sm font-medium text-black disabled:opacity-50"
|
||||
>
|
||||
{pwSaving ? "Saving…" : "Save password"}
|
||||
</button>
|
||||
<button
|
||||
onClick={() => {
|
||||
setShowPassword(false);
|
||||
setPw1("");
|
||||
setPw2("");
|
||||
setPwMsg(null);
|
||||
}}
|
||||
className="text-xs opacity-80 hover:opacity-100"
|
||||
>
|
||||
Cancel
|
||||
</button>
|
||||
</div>
|
||||
</Card>
|
||||
|
||||
{pwMsg && (
|
||||
<div
|
||||
className={`text-xs ${
|
||||
pwMsg.toLowerCase().includes("couldn")
|
||||
? "text-red-300"
|
||||
: "text-zinc-200/80"
|
||||
}`}
|
||||
>
|
||||
{pwMsg}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Profile header */}
|
||||
<div>
|
||||
<h2 className="text-lg font-semibold">Profile</h2>
|
||||
<p className="text-sm opacity-70">Basic account info.</p>
|
||||
</div>
|
||||
|
||||
{/* Profile card */}
|
||||
<div className="rounded-xl border border-white/10 bg-white/5 p-4 space-y-3">
|
||||
<div className="text-sm">
|
||||
<span className="opacity-70">Email:</span>{" "}
|
||||
<span className="font-medium">{user.email}</span>
|
||||
</div>
|
||||
|
||||
{/* Display name (inline editable) */}
|
||||
<div className="text-sm">
|
||||
<span className="opacity-70">Display name:</span>{" "}
|
||||
{!editingName ? (
|
||||
<>
|
||||
<span className="font-medium">{user.displayName || "—"}</span>
|
||||
<button
|
||||
onClick={() => {
|
||||
setEditingName(true);
|
||||
setMsg(null);
|
||||
setDisplayName(user.displayName ?? "");
|
||||
}}
|
||||
className="ml-3 text-xs underline opacity-70 hover:opacity-100"
|
||||
>
|
||||
Edit
|
||||
</button>
|
||||
</>
|
||||
) : (
|
||||
<div className="mt-2 space-y-2">
|
||||
<input
|
||||
value={displayName}
|
||||
onChange={(e) => setDisplayName(e.target.value)}
|
||||
placeholder="Your display name"
|
||||
className="w-full rounded-md border border-white/10 bg-black/40 px-3 py-2 text-sm outline-none focus:ring-2 focus:ring-amber-500/40"
|
||||
/>
|
||||
|
||||
<div className="flex items-center gap-3">
|
||||
<button
|
||||
onClick={saveDisplayName}
|
||||
disabled={!canSaveName}
|
||||
className="rounded-md bg-amber-400 px-3 py-2 text-xs font-medium text-black disabled:opacity-50"
|
||||
>
|
||||
{saving ? "Saving…" : "Save"}
|
||||
</button>
|
||||
<button
|
||||
onClick={() => {
|
||||
setEditingName(false);
|
||||
setDisplayName(user.displayName ?? "");
|
||||
setMsg(null);
|
||||
}}
|
||||
className="text-xs opacity-80 hover:opacity-100"
|
||||
>
|
||||
Cancel
|
||||
</button>
|
||||
{msg && (
|
||||
<span
|
||||
className={`text-xs ${
|
||||
msg.toLowerCase().includes("couldn")
|
||||
? "text-red-300"
|
||||
: "text-zinc-200/80"
|
||||
}`}
|
||||
>
|
||||
{msg}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="text-sm">
|
||||
<span className="opacity-70">Role:</span>{" "}
|
||||
<span className="font-medium">{user.role}</span>
|
||||
</div>
|
||||
|
||||
<div className="pt-3 border-t border-white/10 flex items-center justify-between">
|
||||
<button
|
||||
onClick={logout}
|
||||
className="rounded-md border border-white/10 px-3 py-2 text-xs opacity-80 hover:opacity-100"
|
||||
>
|
||||
Log out
|
||||
</button>
|
||||
|
||||
{/* Optional: quick link to set password later */}
|
||||
<button
|
||||
onClick={() => {
|
||||
setShowPassword(true);
|
||||
// Scroll user’s attention to welcome panel area if it exists,
|
||||
// otherwise just open the password UI in their mind.
|
||||
// (Kept simple: you can add a dedicated card later if you want)
|
||||
setPwMsg(null);
|
||||
}}
|
||||
className="text-xs underline opacity-70 hover:opacity-100"
|
||||
>
|
||||
Set / change password
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{/* If user clicks "Set/change password" outside welcome flow, show it here */}
|
||||
{!showWelcomeCard && showPassword && (
|
||||
<div className="pt-4 border-t border-white/10 space-y-2">
|
||||
<div className="text-sm font-medium">Set password</div>
|
||||
<input
|
||||
type="password"
|
||||
value={pw1}
|
||||
onChange={(e) => setPw1(e.target.value)}
|
||||
placeholder="New password (min 8 chars)"
|
||||
className="w-full rounded-md border border-white/10 bg-black/40 px-3 py-2 text-sm outline-none focus:ring-2 focus:ring-amber-500/40"
|
||||
/>
|
||||
<input
|
||||
type="password"
|
||||
value={pw2}
|
||||
onChange={(e) => setPw2(e.target.value)}
|
||||
placeholder="Confirm password"
|
||||
className="w-full rounded-md border border-white/10 bg-black/40 px-3 py-2 text-sm outline-none focus:ring-2 focus:ring-amber-500/40"
|
||||
/>
|
||||
|
||||
{(pwTooShort || pwMismatch) && (
|
||||
<div className="text-xs text-red-300">
|
||||
{pwTooShort
|
||||
? "Password must be at least 8 characters."
|
||||
: "Passwords don’t match."}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="flex items-center gap-3">
|
||||
<button
|
||||
onClick={savePassword}
|
||||
disabled={!canSavePassword}
|
||||
className="rounded-md bg-amber-400 px-3 py-2 text-sm font-medium text-black disabled:opacity-50"
|
||||
>
|
||||
{pwSaving ? "Saving…" : "Save password"}
|
||||
</button>
|
||||
<button
|
||||
onClick={() => {
|
||||
setShowPassword(false);
|
||||
setPw1("");
|
||||
setPw2("");
|
||||
setPwMsg(null);
|
||||
}}
|
||||
className="text-xs opacity-80 hover:opacity-100"
|
||||
>
|
||||
Cancel
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{pwMsg && (
|
||||
<div
|
||||
className={`text-xs ${
|
||||
pwMsg.toLowerCase().includes("couldn")
|
||||
? "text-red-300"
|
||||
: "text-zinc-200/80"
|
||||
}`}
|
||||
>
|
||||
{pwMsg}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
+37
-48
@@ -2,23 +2,24 @@
|
||||
"use client";
|
||||
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
import { useSearchParams } from "next/navigation";
|
||||
import { useRouter, useSearchParams } from "next/navigation";
|
||||
import { useAuth } from "@/context/AuthContext";
|
||||
|
||||
const API_BASE_URL =
|
||||
process.env.NEXT_PUBLIC_API_BASE_URL ?? "http://localhost:8080";
|
||||
|
||||
type Status = "loading" | "success" | "error";
|
||||
|
||||
export default function BetaConfirmPage() {
|
||||
const searchParams = useSearchParams();
|
||||
const token = searchParams.get("token");
|
||||
|
||||
const [status, setStatus] = useState<Status>("loading");
|
||||
const [message, setMessage] = useState<string>("Please hang tight.");
|
||||
|
||||
// Prevent double-fire in React Strict Mode (dev)
|
||||
const params = useSearchParams();
|
||||
const token = params.get("token");
|
||||
const router = useRouter();
|
||||
const { setSession } = useAuth();
|
||||
const ran = useRef(false);
|
||||
|
||||
const [message, setMessage] = useState("Confirming your email…");
|
||||
const [status, setStatus] = useState<"loading" | "success" | "error">(
|
||||
"loading"
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
if (!token) {
|
||||
setStatus("error");
|
||||
@@ -26,67 +27,55 @@ export default function BetaConfirmPage() {
|
||||
return;
|
||||
}
|
||||
|
||||
// StrictMode can run effects twice in dev; bail out after first
|
||||
if (ran.current) return;
|
||||
ran.current = true;
|
||||
|
||||
const controller = new AbortController();
|
||||
|
||||
(async () => {
|
||||
try {
|
||||
setStatus("loading");
|
||||
setMessage("Confirming your email…");
|
||||
|
||||
const res = await fetch(`${API_BASE_URL}/api/auth/beta/confirm`, {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({ token }),
|
||||
signal: controller.signal,
|
||||
});
|
||||
|
||||
// If request was aborted, do nothing
|
||||
if (controller.signal.aborted) return;
|
||||
|
||||
if (!res.ok) {
|
||||
// Don’t assume expired—just say it didn’t work
|
||||
throw new Error("Confirm failed");
|
||||
const text = await res.text().catch(() => "");
|
||||
throw new Error(text || "Confirm link invalid/expired");
|
||||
}
|
||||
|
||||
const data = await res.json();
|
||||
const jwt = data.token ?? data.accessToken;
|
||||
if (!jwt) throw new Error("No token returned from server");
|
||||
|
||||
setSession(jwt, {
|
||||
email: data.email,
|
||||
displayName: data.displayName ?? null,
|
||||
role: data.role ?? "USER",
|
||||
});
|
||||
|
||||
setStatus("success");
|
||||
setMessage("Check your inbox for your secure sign-in link.");
|
||||
} catch (err) {
|
||||
if (controller.signal.aborted) return;
|
||||
|
||||
setMessage("Confirmed. Signing you in…");
|
||||
router.replace("/account?welcome=1");
|
||||
} catch (e: any) {
|
||||
setStatus("error");
|
||||
setMessage("This link is invalid or expired. Please request a new one.");
|
||||
setMessage(
|
||||
e?.message ||
|
||||
"That link is invalid or expired. Please request a new one."
|
||||
);
|
||||
}
|
||||
})();
|
||||
|
||||
return () => controller.abort();
|
||||
}, [token]);
|
||||
}, [token, router, setSession]);
|
||||
|
||||
return (
|
||||
<main className="min-h-screen flex items-center justify-center bg-black text-white px-6">
|
||||
<div className="max-w-md w-full text-center space-y-4">
|
||||
{status === "loading" && (
|
||||
<>
|
||||
<h1 className="text-xl font-semibold">Confirming email…</h1>
|
||||
<p className="text-sm text-zinc-400">{message}</p>
|
||||
</>
|
||||
)}
|
||||
|
||||
{status === "success" && (
|
||||
<>
|
||||
<h1 className="text-xl font-semibold">Email confirmed ✅</h1>
|
||||
<p className="text-sm text-zinc-400">{message}</p>
|
||||
</>
|
||||
)}
|
||||
<div className="max-w-md w-full rounded-xl border border-white/10 bg-white/5 p-6 text-center">
|
||||
<h1 className="text-lg font-semibold">Battl Builders</h1>
|
||||
<p className="mt-2 text-sm text-zinc-300">{message}</p>
|
||||
|
||||
{status === "error" && (
|
||||
<>
|
||||
<h1 className="text-xl font-semibold">Link expired or invalid</h1>
|
||||
<p className="text-sm text-zinc-400">{message}</p>
|
||||
</>
|
||||
<p className="mt-4 text-xs text-zinc-400">
|
||||
Go back and request a fresh sign-in link.
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
</main>
|
||||
|
||||
@@ -52,7 +52,7 @@ export default function BetaMagicPage() {
|
||||
|
||||
setStatus("success");
|
||||
setMessage("You’re in. Redirecting…");
|
||||
router.replace("/builder");
|
||||
router.replace("/account?welcome=1");
|
||||
} catch (e: any) {
|
||||
setStatus("error");
|
||||
setMessage(e?.message || "Magic link expired. Request a new one.");
|
||||
|
||||
+105
-4
@@ -1,12 +1,15 @@
|
||||
// app/login/page.tsx
|
||||
"use client";
|
||||
|
||||
import { FormEvent, useState } from "react";
|
||||
import { FormEvent, useMemo, useState } from "react";
|
||||
import { useRouter, useSearchParams } from "next/navigation";
|
||||
import Link from "next/link";
|
||||
import { useAuth } from "@/context/AuthContext";
|
||||
import { Button, Field, Input } from "@/components/ui/form";
|
||||
|
||||
const API_BASE_URL =
|
||||
process.env.NEXT_PUBLIC_API_BASE_URL ?? "http://localhost:8080";
|
||||
|
||||
export default function LoginPage() {
|
||||
const router = useRouter();
|
||||
const searchParams = useSearchParams();
|
||||
@@ -14,9 +17,18 @@ export default function LoginPage() {
|
||||
|
||||
const [email, setEmail] = useState("");
|
||||
const [password, setPassword] = useState("");
|
||||
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
const next = searchParams.get("next") || "/builder";
|
||||
// Magic link UI state (separate from password login)
|
||||
const [magicLoading, setMagicLoading] = useState(false);
|
||||
const [magicMessage, setMagicMessage] = useState<string | null>(null);
|
||||
const [magicError, setMagicError] = useState<string | null>(null);
|
||||
|
||||
const next = useMemo(
|
||||
() => searchParams.get("next") || "/builder",
|
||||
[searchParams]
|
||||
);
|
||||
|
||||
async function handleSubmit(e: FormEvent) {
|
||||
e.preventDefault();
|
||||
@@ -26,7 +38,52 @@ export default function LoginPage() {
|
||||
await login({ email, password });
|
||||
router.push(next);
|
||||
} catch (err: any) {
|
||||
setError(err.message ?? "Failed to log in");
|
||||
setError(err?.message ?? "Failed to log in");
|
||||
}
|
||||
}
|
||||
|
||||
async function handleMagicLinkRequest() {
|
||||
setMagicMessage(null);
|
||||
setMagicError(null);
|
||||
|
||||
const normalizedEmail = email.trim();
|
||||
|
||||
if (!normalizedEmail) {
|
||||
setMagicError("Please enter your email above first.");
|
||||
return;
|
||||
}
|
||||
|
||||
setMagicLoading(true);
|
||||
|
||||
try {
|
||||
// ✅ This endpoint exists in your AuthController:
|
||||
// POST /api/auth/beta/signup { email, useCase }
|
||||
const res = await fetch(`${API_BASE_URL}/api/auth/beta/signup`, {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({
|
||||
email: normalizedEmail,
|
||||
useCase: "login_magic",
|
||||
}),
|
||||
});
|
||||
|
||||
// Soft-fail (avoid email enumeration)
|
||||
if (!res.ok) {
|
||||
const text = await res.text().catch(() => "");
|
||||
console.error("Magic link request failed:", res.status, text);
|
||||
}
|
||||
|
||||
setMagicMessage(
|
||||
"If that email is eligible, you’ll get a sign-in link shortly ✨"
|
||||
);
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
// Soft-fail
|
||||
setMagicMessage(
|
||||
"If that email is eligible, you’ll get a sign-in link shortly ✨"
|
||||
);
|
||||
} finally {
|
||||
setMagicLoading(false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -40,6 +97,7 @@ export default function LoginPage() {
|
||||
Use your beta credentials to get back to your saved builds.
|
||||
</p>
|
||||
|
||||
{/* Password Login */}
|
||||
<form onSubmit={handleSubmit} className="mt-6 space-y-4">
|
||||
{error && (
|
||||
<div className="rounded-md border border-red-500/40 bg-red-500/10 px-3 py-2 text-sm text-red-200">
|
||||
@@ -74,7 +132,50 @@ export default function LoginPage() {
|
||||
</Button>
|
||||
</form>
|
||||
|
||||
<p className="mt-4 text-xs text-zinc-500">
|
||||
{/* Divider */}
|
||||
<div className="mt-8 flex items-center gap-3">
|
||||
<div className="h-px flex-1 bg-white/10" />
|
||||
<span className="text-xs text-zinc-500">or</span>
|
||||
<div className="h-px flex-1 bg-white/10" />
|
||||
</div>
|
||||
|
||||
{/* Magic Link Request */}
|
||||
<div className="mt-6 space-y-3">
|
||||
<div>
|
||||
<h2 className="text-sm font-medium text-zinc-200">
|
||||
Already a beta user?
|
||||
</h2>
|
||||
<p className="mt-1 text-xs text-zinc-500">
|
||||
Request a one-time sign-in link (no password needed).
|
||||
</p>
|
||||
</div>
|
||||
|
||||
{magicError && (
|
||||
<div className="rounded-md border border-red-500/40 bg-red-500/10 px-3 py-2 text-sm text-red-200">
|
||||
{magicError}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{magicMessage && (
|
||||
<div className="rounded-md border border-emerald-500/30 bg-emerald-500/10 px-3 py-2 text-sm text-emerald-200">
|
||||
{magicMessage}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<Button
|
||||
type="button"
|
||||
disabled={magicLoading}
|
||||
onClick={handleMagicLinkRequest}
|
||||
>
|
||||
{magicLoading ? "Sending link…" : "Email me a sign-in link"}
|
||||
</Button>
|
||||
|
||||
<p className="text-[11px] text-zinc-500">
|
||||
Tip: check spam/promotions. Links expire.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<p className="mt-8 text-xs text-zinc-500">
|
||||
New here?{" "}
|
||||
<Link href="/register" className="text-amber-300 hover:text-amber-200">
|
||||
Join the beta
|
||||
|
||||
+10
-5
@@ -205,10 +205,12 @@ export default function HomePage() {
|
||||
</p>
|
||||
)}
|
||||
|
||||
<p className="pt-1 text-[10px] leading-relaxed text-zinc-500">
|
||||
You can one-click unsubscribe any time with one-click. No data
|
||||
games, no surprise newsletters.
|
||||
</p>
|
||||
<div className="mt-6 text-center text-[11px] text-zinc-500">
|
||||
Already invited?{" "}
|
||||
<a href="/login" className="underline hover:text-zinc-300">
|
||||
Log in
|
||||
</a>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</section>
|
||||
@@ -216,7 +218,10 @@ export default function HomePage() {
|
||||
{/* Footer strip */}
|
||||
<footer className="mt-12 border-t border-zinc-900 pt-4 text-xs text-zinc-500">
|
||||
<div className="flex flex-wrap items-center justify-between gap-3">
|
||||
<span>© {new Date().getFullYear()} BATTL BUILDERS<span className="align-super text-[0.9em] ml-0.5">™</span></span>
|
||||
<span>
|
||||
© {new Date().getFullYear()} BATTL BUILDERS
|
||||
<span className="align-super text-[0.9em] ml-0.5">™</span>
|
||||
</span>
|
||||
<span className="text-zinc-600">
|
||||
v0.1 • Import engine online • Builder UI in progress
|
||||
</span>
|
||||
|
||||
Reference in New Issue
Block a user