205418fc4e
Fix blank /org/login (and /admin/login): the guarded portal layout was wrapping its own login route, rendering null when unauthenticated. Move each portal's authed pages into a (authed)/(chapter) route group so login pages live outside the guard. Structure: - app/(chapter)/* — chapter admin pages + guarded layout (was root-level) - app/org/(authed)/* — org pages + guarded layout; /org/login now free - app/admin/(authed)/* — admin pages + guarded layout; /admin/login free - Root layout slimmed to providers only (no shared sidebar) - Convert moved files' relative imports to @/app alias Design system: - PortalShell: shared sidebar shell (brand mark, themed active nav with accent bar, avatar dropdown user menu, loading skeletons) - portal-theme.ts: per-portal theme tokens (violet/slate/blue/emerald) - PortalLoginShell redesigned: two-column with gradient branding panel, dotted pattern, value-prop highlights, built-in back link - New shadcn components: Avatar, DropdownMenu, Skeleton - Move shared DraftCard to _components/draft-card.tsx (used by 2 portals) - Portal selector: remove Super Admin card, icon tiles, hover lift - All 4 login pages use react-hook-form + Zod + themed shell - Member nav restored to full 11-section list with icons Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
87 lines
3.0 KiB
TypeScript
87 lines
3.0 KiB
TypeScript
'use client';
|
|
|
|
import { Suspense } from 'react';
|
|
import { useRouter, useSearchParams } from 'next/navigation';
|
|
import { useForm } from 'react-hook-form';
|
|
import { zodResolver } from '@hookform/resolvers/zod';
|
|
import { z } from 'zod';
|
|
import { useAuth } from '../_lib/auth-context';
|
|
import { PortalLoginShell } from '../_components/portal-login-shell';
|
|
import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from '../_components/ui/form';
|
|
import { Input } from '../_components/ui/input';
|
|
import { Button } from '../_components/ui/button';
|
|
|
|
const schema = z.object({
|
|
email: z.string().email('Enter a valid email'),
|
|
password: z.string().min(1, 'Password is required'),
|
|
});
|
|
type FormValues = z.infer<typeof schema>;
|
|
|
|
function LoginForm() {
|
|
const router = useRouter();
|
|
const searchParams = useSearchParams();
|
|
const { refresh } = useAuth();
|
|
const next = searchParams.get('next') ?? '/search';
|
|
|
|
const form = useForm<FormValues>({ resolver: zodResolver(schema), defaultValues: { email: '', password: '' } });
|
|
|
|
async function onSubmit(values: FormValues) {
|
|
const res = await fetch('/api/auth/login', {
|
|
method: 'POST',
|
|
headers: { 'Content-Type': 'application/json' },
|
|
body: JSON.stringify(values),
|
|
credentials: 'include',
|
|
});
|
|
if (!res.ok) {
|
|
const data = await res.json().catch(() => ({})) as { message?: string };
|
|
form.setError('root', { message: data.message ?? 'Invalid email or password' });
|
|
return;
|
|
}
|
|
await refresh();
|
|
router.push(next);
|
|
router.refresh();
|
|
}
|
|
|
|
return (
|
|
<Form {...form}>
|
|
<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
|
|
<FormField control={form.control} name="email" render={({ field }) => (
|
|
<FormItem>
|
|
<FormLabel>Email</FormLabel>
|
|
<FormControl><Input type="email" placeholder="admin@chapter.com" autoComplete="username" {...field} /></FormControl>
|
|
<FormMessage />
|
|
</FormItem>
|
|
)} />
|
|
<FormField control={form.control} name="password" render={({ field }) => (
|
|
<FormItem>
|
|
<FormLabel>Password</FormLabel>
|
|
<FormControl><Input type="password" autoComplete="current-password" {...field} /></FormControl>
|
|
<FormMessage />
|
|
</FormItem>
|
|
)} />
|
|
{form.formState.errors.root && (
|
|
<p className="text-sm text-destructive">{form.formState.errors.root.message}</p>
|
|
)}
|
|
<Button type="submit" className="w-full" disabled={form.formState.isSubmitting}>
|
|
{form.formState.isSubmitting ? 'Signing in…' : 'Sign in'}
|
|
</Button>
|
|
</form>
|
|
</Form>
|
|
);
|
|
}
|
|
|
|
export default function ChapterLoginPage() {
|
|
return (
|
|
<PortalLoginShell
|
|
title="Chapter Portal"
|
|
subtitle="Sign in to manage your chapter's messages and groups."
|
|
theme="blue"
|
|
highlights={['Approve & route group messages', 'Configure hashtag and prefix rules', 'Review AI-generated digests']}
|
|
>
|
|
<Suspense>
|
|
<LoginForm />
|
|
</Suspense>
|
|
</PortalLoginShell>
|
|
);
|
|
}
|