From 9af8b968a84228de254115fe09139bbf6c3ba01a Mon Sep 17 00:00:00 2001
From: Aaron Po <apo2@uwo.ca>
Date: Thu, 8 Oct 2026 23:10:48 -0400
Subject: [PATCH] Rework the login and register forms for the split-screen
 layout

---
 .../features/auth/components/LoginForm.tsx    |  65 ++++----
 .../features/auth/components/RegisterForm.tsx | 147 +++++++++---------
 2 files changed, 113 insertions(+), 99 deletions(-)

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/RegisterForm.tsx b/web/frontend/app/features/auth/components/RegisterForm.tsx
index f118d164..71bf9dc6 100644
--- a/web/frontend/app/features/auth/components/RegisterForm.tsx
+++ b/web/frontend/app/features/auth/components/RegisterForm.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 { RegisterSchema } from '../schemas';
+import ShowPasswordToggle from './ShowPasswordToggle';
 
 interface RegisterFormProps {
     onSubmit: (e?: BaseSyntheticEvent) => Promise<Awaited<void> | undefined>;
@@ -11,87 +12,91 @@ interface RegisterFormProps {
     submitting: boolean;
 }
 
-const RegisterForm = (props: RegisterFormProps) => (
-    <form onSubmit={props.onSubmit} className="space-y-3">
-        <FormField
-            id="username"
-            type="text"
-            autoComplete="username"
-            placeholder="your_username"
-            label="Username"
-            hint="3-64 characters, alphanumeric and . _ -"
-            error={props.formState.errors.username?.message}
-            {...props.register('username')}
-        />
+const RegisterForm = (props: RegisterFormProps) => {
+    const [showPassword, setShowPassword] = useState(false);
+
+    return (
+        <form onSubmit={props.onSubmit} className="flex flex-col gap-4">
+            <div className="grid grid-cols-1 gap-3.5 min-[420px]:grid-cols-2">
+                <FormField
+                    id="firstName"
+                    type="text"
+                    autoComplete="given-name"
+                    label="First name"
+                    error={props.formState.errors.firstName?.message}
+                    {...props.register('firstName')}
+                />
+
+                <FormField
+                    id="lastName"
+                    type="text"
+                    autoComplete="family-name"
+                    label="Last name"
+                    error={props.formState.errors.lastName?.message}
+                    {...props.register('lastName')}
+                />
+            </div>
 
-        <div className="grid grid-cols-2 gap-3">
             <FormField
-                id="firstName"
+                id="username"
                 type="text"
-                autoComplete="given-name"
-                placeholder="Jane"
-                label="First Name"
-                error={props.formState.errors.firstName?.message}
-                {...props.register('firstName')}
+                autoComplete="username"
+                label="Username"
+                hint="3-64 characters, alphanumeric and . _ -"
+                error={props.formState.errors.username?.message}
+                {...props.register('username')}
             />
 
             <FormField
-                id="lastName"
-                type="text"
-                autoComplete="family-name"
-                placeholder="Doe"
-                label="Last Name"
-                error={props.formState.errors.lastName?.message}
-                {...props.register('lastName')}
+                id="email"
+                type="email"
+                autoComplete="email"
+                label="Email"
+                error={props.formState.errors.email?.message}
+                {...props.register('email')}
             />
-        </div>
 
-        <FormField
-            id="email"
-            type="email"
-            autoComplete="email"
-            placeholder="jane@example.com"
-            label="Email"
-            error={props.formState.errors.email?.message}
-            {...props.register('email')}
-        />
+            <FormField
+                id="dateOfBirth"
+                type="date"
+                label="Date of birth"
+                hint="Must be 19 years or older."
+                error={props.formState.errors.dateOfBirth?.message}
+                {...props.register('dateOfBirth')}
+            />
 
-        <FormField
-            id="dateOfBirth"
-            type="date"
-            label="Date of Birth"
-            hint="Must be 19 years or older"
-            error={props.formState.errors.dateOfBirth?.message}
-            {...props.register('dateOfBirth')}
-        />
+            <FormField
+                id="password"
+                type={showPassword ? 'text' : 'password'}
+                autoComplete="new-password"
+                label="Password"
+                hint="8+ chars: uppercase, lowercase, digit, special character"
+                error={props.formState.errors.password?.message}
+                {...props.register('password')}
+            />
 
-        <FormField
-            id="password"
-            type="password"
-            autoComplete="new-password"
-            placeholder="••••••••"
-            label="Password"
-            hint="8+ chars: uppercase, lowercase, digit, special character"
-            error={props.formState.errors.password?.message}
-            {...props.register('password')}
-        />
+            <FormField
+                id="confirmPassword"
+                type={showPassword ? 'text' : 'password'}
+                autoComplete="new-password"
+                label="Confirm password"
+                error={props.formState.errors.confirmPassword?.message}
+                {...props.register('confirmPassword')}
+            />
 
-        <FormField
-            id="confirmPassword"
-            type="password"
-            autoComplete="new-password"
-            placeholder="••••••••"
-            label="Confirm Password"
-            error={props.formState.errors.confirmPassword?.message}
-            {...props.register('confirmPassword')}
-        />
+            <ShowPasswordToggle
+                shown={showPassword}
+                onToggle={() => setShowPassword((shown) => !shown)}
+            />
 
-        <SubmitButton
-            isSubmitting={props.submitting}
-            idleText="Create Account"
-            submittingText="Creating account..."
-        />
-    </form>
-);
+            <SubmitButton
+                isSubmitting={props.submitting}
+                idleText="Create account"
+                submittingText="Creating account…"
+                className="btn btn-primary min-h-12 w-full"
+            />
+        </form>
+    );
+};
 
 export default RegisterForm;