From e961ce404274c55b9f90e702e4ef55889a5c5042 Mon Sep 17 00:00:00 2001
From: Aaron Po <apo2@uwo.ca>
Date: Tue, 13 Oct 2026 01:32:36 -0400
Subject: [PATCH] Move the login page onto the split-screen shell

---
 .../features/auth/components/LoginForm.tsx    | 65 +++++++++++--------
 .../auth/components/RegisterCallout.tsx       | 23 -------
 .../app/features/auth/routes/login.tsx        | 45 +++++--------
 3 files changed, 55 insertions(+), 78 deletions(-)
 delete mode 100644 web/frontend/app/features/auth/components/RegisterCallout.tsx

diff --git a/web/frontend/app/features/auth/components/LoginForm.tsx b/web/frontend/app/features/auth/components/LoginForm.tsx
index 399fdc07..bceaa87b 100644
--- a/web/frontend/app/features/auth/components/LoginForm.tsx
+++ b/web/frontend/app/features/auth/components/LoginForm.tsx
@@ -1,8 +1,9 @@
-import { BaseSyntheticEvent } from 'react';
+import { BaseSyntheticEvent, useState } from 'react';
 import { FormState, UseFormRegister } from 'react-hook-form';
 import FormField from '../../../components/ui/forms/FormField';
 import SubmitButton from '../../../components/ui/forms/SubmitButton';
 import type { LoginSchema } from '../schemas';
+import ShowPasswordToggle from './ShowPasswordToggle';
 
 interface LoginFormProps {
     onSubmit: (e?: BaseSyntheticEvent) => Promise<Awaited<void> | undefined>;
@@ -11,34 +12,42 @@ interface LoginFormProps {
     submitting: boolean;
 }
 
-const LoginForm = (props: LoginFormProps) => (
-    <form onSubmit={props.onSubmit} className="space-y-3">
-        <FormField
-            id="username"
-            type="text"
-            autoComplete="username"
-            placeholder="your_username"
-            label="Username"
-            error={props.formState.errors.username?.message}
-            {...props.register('username')}
-        />
+const LoginForm = (props: LoginFormProps) => {
+    const [showPassword, setShowPassword] = useState(false);
 
-        <FormField
-            id="password"
-            type="password"
-            autoComplete="current-password"
-            placeholder="••••••••"
-            label="Password"
-            error={props.formState.errors.password?.message}
-            {...props.register('password')}
-        />
+    return (
+        <form onSubmit={props.onSubmit} className="flex flex-col gap-4">
+            <FormField
+                id="username"
+                type="text"
+                autoComplete="username"
+                label="Username"
+                error={props.formState.errors.username?.message}
+                {...props.register('username')}
+            />
 
-        <SubmitButton
-            isSubmitting={props.submitting}
-            idleText="Sign In"
-            submittingText="Signing in..."
-        />
-    </form>
-);
+            <FormField
+                id="password"
+                type={showPassword ? 'text' : 'password'}
+                autoComplete="current-password"
+                label="Password"
+                error={props.formState.errors.password?.message}
+                {...props.register('password')}
+            />
+
+            <ShowPasswordToggle
+                shown={showPassword}
+                onToggle={() => setShowPassword((shown) => !shown)}
+            />
+
+            <SubmitButton
+                isSubmitting={props.submitting}
+                idleText="Sign in"
+                submittingText="Signing in…"
+                className="btn btn-primary min-h-12 w-full"
+            />
+        </form>
+    );
+};
 
 export default LoginForm;
diff --git a/web/frontend/app/features/auth/components/RegisterCallout.tsx b/web/frontend/app/features/auth/components/RegisterCallout.tsx
deleted file mode 100644
index d0317bae..00000000
--- a/web/frontend/app/features/auth/components/RegisterCallout.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { HomeSimpleDoor, UserPlus } from 'iconoir-react';
-import { Link } from 'react-router';
-
-const RegisterCallout = () => (
-    <>
-        <div className="divider text-xs">New here?</div>
-        <div className="text-center space-y-2">
-            <Link to="/register" className="btn btn-outline btn-sm w-full gap-2">
-                <UserPlus className="size-4" aria-hidden="true" />
-                Create an account
-            </Link>
-            <Link
-                to="/"
-                className="link link-hover text-sm text-base-content/70 inline-flex items-center gap-1"
-            >
-                <HomeSimpleDoor className="size-4" aria-hidden="true" />
-                Back to home
-            </Link>
-        </div>
-    </>
-);
-
-export default RegisterCallout;
diff --git a/web/frontend/app/features/auth/routes/login.tsx b/web/frontend/app/features/auth/routes/login.tsx
index 5178e7af..3d482539 100644
--- a/web/frontend/app/features/auth/routes/login.tsx
+++ b/web/frontend/app/features/auth/routes/login.tsx
@@ -1,10 +1,12 @@
 import { zodResolver } from '@hookform/resolvers/zod';
-import { LogIn } from 'iconoir-react';
 import { useForm } from 'react-hook-form';
 import { redirect, useNavigation, useSubmit } from 'react-router';
 import { createAuthSession, getOptionalAuth, login } from '../auth.server';
+import AuthCardHeading from '../components/AuthCardHeading';
+import AuthErrorAlert from '../components/AuthErrorAlert';
+import AuthSplitLayout from '../components/AuthSplitLayout';
+import AuthSwitchPrompt from '../components/AuthSwitchPrompt';
 import LoginForm from '../components/LoginForm';
-import RegisterCallout from '../components/RegisterCallout';
 import { useActionErrorToast } from '../hooks/useActionErrorToast';
 import { loginSchema, type LoginSchema } from '../schemas';
 import type { Route } from './+types/login';
@@ -54,34 +56,23 @@ const Login = ({ actionData }: Route.ComponentProps) => {
     useActionErrorToast(actionData?.error);
 
     return (
-        <div className="hero min-h-screen bg-base-200">
-            <div className="card w-full max-w-md bg-base-100 shadow-xl">
-                <div className="card-body gap-4">
-                    <div className="text-center">
-                        <h1 className="card-title text-3xl justify-center gap-2">
-                            <LogIn className="size-7" aria-hidden="true" />
-                            Login
-                        </h1>
-                        <p className="text-base-content/70">Sign in to your Biergarten account</p>
-                    </div>
+        <AuthSplitLayout
+            headline="Good to see you again."
+            blurb="Sign in to pick up where you left off with our partner breweries."
+        >
+            <AuthCardHeading title="Sign in" subtitle="Sign in to your Biergarten account" />
 
-                    {actionData?.error && (
-                        <div role="alert" className="alert alert-error alert-soft">
-                            <span>{actionData.error}</span>
-                        </div>
-                    )}
+            {actionData?.error && <AuthErrorAlert message={actionData.error} />}
 
-                    <LoginForm
-                        onSubmit={onSubmit}
-                        formState={formState}
-                        register={register}
-                        submitting={isSubmitting}
-                    />
+            <LoginForm
+                onSubmit={onSubmit}
+                formState={formState}
+                register={register}
+                submitting={isSubmitting}
+            />
 
-                    <RegisterCallout />
-                </div>
-            </div>
-        </div>
+            <AuthSwitchPrompt lead="New to Biergarten?" to="/register" label="Create an account" />
+        </AuthSplitLayout>
     );
 };