From d0c49583388d2c4195c3eb50ebc96ab06fcc35a9 Mon Sep 17 00:00:00 2001
From: Aaron Po <apo2@uwo.ca>
Date: Thu, 8 Oct 2026 23:10:48 -0400
Subject: [PATCH] Move the login and register routes onto the split-screen
 shell

---
 .../features/auth/components/LoginCallout.tsx | 18 ------
 .../auth/components/RegisterCallout.tsx       | 23 --------
 .../app/features/auth/routes/login.tsx        | 58 ++++++++++---------
 .../app/features/auth/routes/register.tsx     | 50 ++++++++--------
 4 files changed, 56 insertions(+), 93 deletions(-)
 delete mode 100644 web/frontend/app/features/auth/components/LoginCallout.tsx
 delete mode 100644 web/frontend/app/features/auth/components/RegisterCallout.tsx

diff --git a/web/frontend/app/features/auth/components/LoginCallout.tsx b/web/frontend/app/features/auth/components/LoginCallout.tsx
deleted file mode 100644
index 1b3538c7..00000000
--- a/web/frontend/app/features/auth/components/LoginCallout.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Link } from 'react-router';
-
-const LoginCallout = () => (
-    <>
-        <div className="divider text-xs">Already have an account?</div>
-
-        <div className="text-center space-y-2">
-            <Link to="/login" className="btn btn-outline btn-sm w-full">
-                Sign in
-            </Link>
-            <Link to="/" className="link link-hover text-sm text-base-content/70">
-                Back to home
-            </Link>
-        </div>
-    </>
-);
-
-export default LoginCallout;
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..14ee7f01 100644
--- a/web/frontend/app/features/auth/routes/login.tsx
+++ b/web/frontend/app/features/auth/routes/login.tsx
@@ -1,10 +1,10 @@
 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 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 +54,36 @@ 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>
-
-                    {actionData?.error && (
-                        <div role="alert" className="alert alert-error alert-soft">
-                            <span>{actionData.error}</span>
-                        </div>
-                    )}
-
-                    <LoginForm
-                        onSubmit={onSubmit}
-                        formState={formState}
-                        register={register}
-                        submitting={isSubmitting}
-                    />
-
-                    <RegisterCallout />
+        <AuthSplitLayout
+            headline="Good to see you again."
+            blurb="Sign in to pick up where you left off with our partner breweries."
+        >
+            <div className="flex w-full max-w-[25rem] flex-col gap-4">
+                <div className="flex flex-col gap-1.5">
+                    <h1 className="text-[2.125rem]">Sign in</h1>
+                    <p className="text-[var(--color-muted)]">Sign in to your Biergarten account</p>
                 </div>
+
+                {actionData?.error && (
+                    <div role="alert" className="alert alert-error alert-soft">
+                        <span>{actionData.error}</span>
+                    </div>
+                )}
+
+                <LoginForm
+                    onSubmit={onSubmit}
+                    formState={formState}
+                    register={register}
+                    submitting={isSubmitting}
+                />
+
+                <AuthSwitchPrompt
+                    lead="New to Biergarten?"
+                    to="/register"
+                    label="Create an account"
+                />
             </div>
-        </div>
+        </AuthSplitLayout>
     );
 };
 
diff --git a/web/frontend/app/features/auth/routes/register.tsx b/web/frontend/app/features/auth/routes/register.tsx
index 1d14db2a..d5be11ec 100644
--- a/web/frontend/app/features/auth/routes/register.tsx
+++ b/web/frontend/app/features/auth/routes/register.tsx
@@ -2,7 +2,8 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { useForm } from 'react-hook-form';
 import { redirect, useNavigation, useSubmit } from 'react-router';
 import { createAuthSession, getOptionalAuth, register } from '../auth.server';
-import LoginCallout from '../components/LoginCallout';
+import AuthSplitLayout from '../components/AuthSplitLayout';
+import AuthSwitchPrompt from '../components/AuthSwitchPrompt';
 import RegisterForm from '../components/RegisterForm';
 import { useActionErrorToast } from '../hooks/useActionErrorToast';
 import { registerSchema, type RegisterSchema } from '../schemas';
@@ -75,31 +76,32 @@ const Register = ({ actionData }: Route.ComponentProps) => {
     useActionErrorToast(actionData?.error);
 
     return (
-        <div className="min-h-screen bg-base-200 flex items-center justify-center p-4">
-            <div className="card w-full max-w-lg bg-base-100 shadow-xl">
-                <div className="card-body gap-4">
-                    <div className="text-center">
-                        <h1 className="card-title text-3xl justify-center">Register</h1>
-                        <p className="text-base-content/70">Create your Biergarten account</p>
-                    </div>
-
-                    {actionData?.error && (
-                        <div role="alert" className="alert alert-error alert-soft">
-                            <span>{actionData.error}</span>
-                        </div>
-                    )}
-
-                    <RegisterForm
-                        onSubmit={onSubmit}
-                        formState={formState}
-                        register={field}
-                        submitting={isSubmitting}
-                    />
-
-                    <LoginCallout />
+        <AuthSplitLayout
+            headline="Pull up a chair."
+            blurb="Create an account to explore partner breweries and their beers."
+        >
+            <div className="flex w-full max-w-[32.5rem] flex-col gap-4">
+                <div className="flex flex-col gap-1.5">
+                    <h1 className="text-[2.125rem]">Create your account</h1>
+                    <p className="text-[var(--color-muted)]">Create your Biergarten account</p>
                 </div>
+
+                {actionData?.error && (
+                    <div role="alert" className="alert alert-error alert-soft">
+                        <span>{actionData.error}</span>
+                    </div>
+                )}
+
+                <RegisterForm
+                    onSubmit={onSubmit}
+                    formState={formState}
+                    register={field}
+                    submitting={isSubmitting}
+                />
+
+                <AuthSwitchPrompt lead="Already have an account?" to="/login" label="Sign in" />
             </div>
-        </div>
+        </AuthSplitLayout>
     );
 };