From 03848a501d8bdbf110cee50314e4e512c6294ae7 Mon Sep 17 00:00:00 2001
From: Michael Harlow <94586121+michaelharlow@users.noreply.github.com>
Date: Wed, 23 Oct 2024 18:33:19 -0500
Subject: [PATCH 1/8] frontend: basic LoginService by searching db for matching
 user

---
 .../example/controller/LoginController.java   | 21 +++++++++++++++++++
 .../com/avengers/example/domain/Login.java    | 12 +++++++++++
 .../example/repository/AccountRepository.java |  1 +
 .../example/service/AccountService.java       |  6 ++++++
 .../example/service/LoginService.java         | 20 ++++++++++++++++++
 5 files changed, 60 insertions(+)
 create mode 100644 src/main/java/com/avengers/example/controller/LoginController.java
 create mode 100644 src/main/java/com/avengers/example/domain/Login.java
 create mode 100644 src/main/java/com/avengers/example/service/LoginService.java

diff --git a/src/main/java/com/avengers/example/controller/LoginController.java b/src/main/java/com/avengers/example/controller/LoginController.java
new file mode 100644
index 0000000..366e80e
--- /dev/null
+++ b/src/main/java/com/avengers/example/controller/LoginController.java
@@ -0,0 +1,21 @@
+package com.avengers.example.controller;
+
+import com.avengers.example.domain.Login;
+import com.avengers.example.service.LoginService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class LoginController {
+    private final LoginService loginService;
+
+    public LoginController(LoginService loginService) {
+        this.loginService = loginService;
+    }
+
+    @PostMapping("/login")
+    public boolean login(@RequestBody Login login) {
+        return loginService.isLoginValid(login.username(), login.password());
+    }
+}
diff --git a/src/main/java/com/avengers/example/domain/Login.java b/src/main/java/com/avengers/example/domain/Login.java
new file mode 100644
index 0000000..605f22f
--- /dev/null
+++ b/src/main/java/com/avengers/example/domain/Login.java
@@ -0,0 +1,12 @@
+package com.avengers.example.domain;
+
+import java.util.Objects;
+
+public record Login(String username, String password)
+{
+    public Login
+    {
+        Objects.requireNonNull(username, "Username cannot be null.");
+        Objects.requireNonNull(password, "Password cannot be null.");
+    }
+}
diff --git a/src/main/java/com/avengers/example/repository/AccountRepository.java b/src/main/java/com/avengers/example/repository/AccountRepository.java
index efcf511..400ca04 100644
--- a/src/main/java/com/avengers/example/repository/AccountRepository.java
+++ b/src/main/java/com/avengers/example/repository/AccountRepository.java
@@ -7,4 +7,5 @@
 @Repository
 public interface AccountRepository extends JpaRepository<Account, Long>
 {
+    Account findByUsernameAndPassword(String username, String password);
 }
diff --git a/src/main/java/com/avengers/example/service/AccountService.java b/src/main/java/com/avengers/example/service/AccountService.java
index b316c17..1f79e25 100644
--- a/src/main/java/com/avengers/example/service/AccountService.java
+++ b/src/main/java/com/avengers/example/service/AccountService.java
@@ -4,6 +4,7 @@
 import com.avengers.example.repository.AccountRepository;
 import jakarta.transaction.Transactional;
 import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Example;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -24,4 +25,9 @@ public List<Account> findAll()
     {
         return accountRepository.findAll();
     }
+
+    public Account findByUsernameAndPassword(String username, String password)
+    {
+        return accountRepository.findByUsernameAndPassword(username, password);
+    }
 }
diff --git a/src/main/java/com/avengers/example/service/LoginService.java b/src/main/java/com/avengers/example/service/LoginService.java
new file mode 100644
index 0000000..a00eff2
--- /dev/null
+++ b/src/main/java/com/avengers/example/service/LoginService.java
@@ -0,0 +1,20 @@
+package com.avengers.example.service;
+
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+
+@Service
+public class LoginService {
+
+    private final AccountService accountService;
+
+    public LoginService(AccountService accountService) {
+        this.accountService = accountService;
+    }
+
+    public boolean isLoginValid(String username, String password) {
+        return !Objects.isNull(accountService.findByUsernameAndPassword(username, password));
+    }
+
+}

From f6c3cc6c5d164932e86bc707d703c32190433d83 Mon Sep 17 00:00:00 2001
From: Michael Harlow <94586121+michaelharlow@users.noreply.github.com>
Date: Wed, 23 Oct 2024 18:33:56 -0500
Subject: [PATCH 2/8] frontend: unused import

---
 src/main/java/com/avengers/example/service/AccountService.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/avengers/example/service/AccountService.java b/src/main/java/com/avengers/example/service/AccountService.java
index 1f79e25..6217aa2 100644
--- a/src/main/java/com/avengers/example/service/AccountService.java
+++ b/src/main/java/com/avengers/example/service/AccountService.java
@@ -4,7 +4,6 @@
 import com.avengers.example.repository.AccountRepository;
 import jakarta.transaction.Transactional;
 import lombok.AllArgsConstructor;
-import org.springframework.data.domain.Example;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

From 1225fc8f7824914ba0df7c8928b36eec1b744945 Mon Sep 17 00:00:00 2001
From: Michael Harlow <94586121+michaelharlow@users.noreply.github.com>
Date: Thu, 24 Oct 2024 10:40:26 -0500
Subject: [PATCH 3/8] login: component style update

---
 src/main/frontend/src/components/ui/button.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/frontend/src/components/ui/button.tsx b/src/main/frontend/src/components/ui/button.tsx
index 0270f64..65d4fcd 100644
--- a/src/main/frontend/src/components/ui/button.tsx
+++ b/src/main/frontend/src/components/ui/button.tsx
@@ -5,7 +5,7 @@ import { cva, type VariantProps } from "class-variance-authority"
 import { cn } from "@/lib/utils"
 
 const buttonVariants = cva(
-  "inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50",
+  "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
   {
     variants: {
       variant: {

From a106d9abc2334370bdb1de02be30f645548cd31c Mon Sep 17 00:00:00 2001
From: Michael Harlow <94586121+michaelharlow@users.noreply.github.com>
Date: Thu, 24 Oct 2024 21:16:37 -0500
Subject: [PATCH 4/8] login: form wrapper component

---
 src/main/frontend/package-lock.json          |  38 +++-
 src/main/frontend/package.json               |   5 +-
 src/main/frontend/src/components/ui/form.tsx | 176 +++++++++++++++++++
 3 files changed, 215 insertions(+), 4 deletions(-)
 create mode 100644 src/main/frontend/src/components/ui/form.tsx

diff --git a/src/main/frontend/package-lock.json b/src/main/frontend/package-lock.json
index 2be3119..3848510 100644
--- a/src/main/frontend/package-lock.json
+++ b/src/main/frontend/package-lock.json
@@ -8,6 +8,7 @@
       "name": "frontend",
       "version": "0.0.0",
       "dependencies": {
+        "@hookform/resolvers": "^3.9.0",
         "@radix-ui/react-icons": "^1.3.0",
         "@radix-ui/react-label": "^2.1.0",
         "@radix-ui/react-slot": "^1.1.0",
@@ -16,9 +17,11 @@
         "lucide-react": "^0.453.0",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
+        "react-hook-form": "^7.53.1",
         "react-router-dom": "^6.27.0",
         "tailwind-merge": "^2.5.4",
-        "tailwindcss-animate": "^1.0.7"
+        "tailwindcss-animate": "^1.0.7",
+        "zod": "^3.23.8"
       },
       "devDependencies": {
         "@eslint/js": "^9.11.1",
@@ -575,6 +578,14 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
+    "node_modules/@hookform/resolvers": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-3.9.0.tgz",
+      "integrity": "sha512-bU0Gr4EepJ/EQsH/IwEzYLsT/PEj5C0ynLQ4m+GSHS+xKH4TfSelhluTgOaoc4kA5s7eCsQbM4wvZLzELmWzUg==",
+      "peerDependencies": {
+        "react-hook-form": "^7.0.0"
+      }
+    },
     "node_modules/@humanfs/core": {
       "version": "0.19.0",
       "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.0.tgz",
@@ -765,7 +776,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.0.tgz",
       "integrity": "sha512-peLblDlFw/ngk3UWq0VnYaOLy6agTZZ+MUO/WhVfm14vJGML+xH4FAl2XQGLqdefjNb7ApRg6Yn7U42ZhmYXdw==",
-      "license": "MIT",
       "dependencies": {
         "@radix-ui/react-primitive": "2.0.0"
       },
@@ -811,7 +821,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.0.tgz",
       "integrity": "sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==",
-      "license": "MIT",
       "dependencies": {
         "@radix-ui/react-compose-refs": "1.1.0"
       },
@@ -3306,6 +3315,21 @@
         "react": "^18.3.1"
       }
     },
+    "node_modules/react-hook-form": {
+      "version": "7.53.1",
+      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.53.1.tgz",
+      "integrity": "sha512-6aiQeBda4zjcuaugWvim9WsGqisoUk+etmFEsSUMm451/Ic8L/UAb7sRtMj3V+Hdzm6mMjU1VhiSzYUZeBm0Vg==",
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/react-hook-form"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17 || ^18 || ^19"
+      }
+    },
     "node_modules/react-router": {
       "version": "6.27.0",
       "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.27.0.tgz",
@@ -4092,6 +4116,14 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
+    },
+    "node_modules/zod": {
+      "version": "3.23.8",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz",
+      "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
     }
   }
 }
diff --git a/src/main/frontend/package.json b/src/main/frontend/package.json
index a1813f5..633d7e2 100644
--- a/src/main/frontend/package.json
+++ b/src/main/frontend/package.json
@@ -10,6 +10,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "@hookform/resolvers": "^3.9.0",
     "@radix-ui/react-icons": "^1.3.0",
     "@radix-ui/react-label": "^2.1.0",
     "@radix-ui/react-slot": "^1.1.0",
@@ -18,9 +19,11 @@
     "lucide-react": "^0.453.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
+    "react-hook-form": "^7.53.1",
     "react-router-dom": "^6.27.0",
     "tailwind-merge": "^2.5.4",
-    "tailwindcss-animate": "^1.0.7"
+    "tailwindcss-animate": "^1.0.7",
+    "zod": "^3.23.8"
   },
   "devDependencies": {
     "@eslint/js": "^9.11.1",
diff --git a/src/main/frontend/src/components/ui/form.tsx b/src/main/frontend/src/components/ui/form.tsx
new file mode 100644
index 0000000..f6afdaf
--- /dev/null
+++ b/src/main/frontend/src/components/ui/form.tsx
@@ -0,0 +1,176 @@
+import * as React from "react"
+import * as LabelPrimitive from "@radix-ui/react-label"
+import { Slot } from "@radix-ui/react-slot"
+import {
+  Controller,
+  ControllerProps,
+  FieldPath,
+  FieldValues,
+  FormProvider,
+  useFormContext,
+} from "react-hook-form"
+
+import { cn } from "@/lib/utils"
+import { Label } from "@/components/ui/label"
+
+const Form = FormProvider
+
+type FormFieldContextValue<
+  TFieldValues extends FieldValues = FieldValues,
+  TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>
+> = {
+  name: TName
+}
+
+const FormFieldContext = React.createContext<FormFieldContextValue>(
+  {} as FormFieldContextValue
+)
+
+const FormField = <
+  TFieldValues extends FieldValues = FieldValues,
+  TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>
+>({
+  ...props
+}: ControllerProps<TFieldValues, TName>) => {
+  return (
+    <FormFieldContext.Provider value={{ name: props.name }}>
+      <Controller {...props} />
+    </FormFieldContext.Provider>
+  )
+}
+
+const useFormField = () => {
+  const fieldContext = React.useContext(FormFieldContext)
+  const itemContext = React.useContext(FormItemContext)
+  const { getFieldState, formState } = useFormContext()
+
+  const fieldState = getFieldState(fieldContext.name, formState)
+
+  if (!fieldContext) {
+    throw new Error("useFormField should be used within <FormField>")
+  }
+
+  const { id } = itemContext
+
+  return {
+    id,
+    name: fieldContext.name,
+    formItemId: `${id}-form-item`,
+    formDescriptionId: `${id}-form-item-description`,
+    formMessageId: `${id}-form-item-message`,
+    ...fieldState,
+  }
+}
+
+type FormItemContextValue = {
+  id: string
+}
+
+const FormItemContext = React.createContext<FormItemContextValue>(
+  {} as FormItemContextValue
+)
+
+const FormItem = React.forwardRef<
+  HTMLDivElement,
+  React.HTMLAttributes<HTMLDivElement>
+>(({ className, ...props }, ref) => {
+  const id = React.useId()
+
+  return (
+    <FormItemContext.Provider value={{ id }}>
+      <div ref={ref} className={cn("space-y-2", className)} {...props} />
+    </FormItemContext.Provider>
+  )
+})
+FormItem.displayName = "FormItem"
+
+const FormLabel = React.forwardRef<
+  React.ElementRef<typeof LabelPrimitive.Root>,
+  React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root>
+>(({ className, ...props }, ref) => {
+  const { error, formItemId } = useFormField()
+
+  return (
+    <Label
+      ref={ref}
+      className={cn(error && "text-destructive", className)}
+      htmlFor={formItemId}
+      {...props}
+    />
+  )
+})
+FormLabel.displayName = "FormLabel"
+
+const FormControl = React.forwardRef<
+  React.ElementRef<typeof Slot>,
+  React.ComponentPropsWithoutRef<typeof Slot>
+>(({ ...props }, ref) => {
+  const { error, formItemId, formDescriptionId, formMessageId } = useFormField()
+
+  return (
+    <Slot
+      ref={ref}
+      id={formItemId}
+      aria-describedby={
+        !error
+          ? `${formDescriptionId}`
+          : `${formDescriptionId} ${formMessageId}`
+      }
+      aria-invalid={!!error}
+      {...props}
+    />
+  )
+})
+FormControl.displayName = "FormControl"
+
+const FormDescription = React.forwardRef<
+  HTMLParagraphElement,
+  React.HTMLAttributes<HTMLParagraphElement>
+>(({ className, ...props }, ref) => {
+  const { formDescriptionId } = useFormField()
+
+  return (
+    <p
+      ref={ref}
+      id={formDescriptionId}
+      className={cn("text-[0.8rem] text-muted-foreground", className)}
+      {...props}
+    />
+  )
+})
+FormDescription.displayName = "FormDescription"
+
+const FormMessage = React.forwardRef<
+  HTMLParagraphElement,
+  React.HTMLAttributes<HTMLParagraphElement>
+>(({ className, children, ...props }, ref) => {
+  const { error, formMessageId } = useFormField()
+  const body = error ? String(error?.message) : children
+
+  if (!body) {
+    return null
+  }
+
+  return (
+    <p
+      ref={ref}
+      id={formMessageId}
+      className={cn("text-[0.8rem] font-medium text-destructive", className)}
+      {...props}
+    >
+      {body}
+    </p>
+  )
+})
+FormMessage.displayName = "FormMessage"
+
+export {
+  useFormField,
+  Form,
+  FormItem,
+  FormLabel,
+  FormControl,
+  FormDescription,
+  FormMessage,
+  FormField,
+}

From 1012343667756e224157085668887c7a6f0294d3 Mon Sep 17 00:00:00 2001
From: Michael Harlow <94586121+michaelharlow@users.noreply.github.com>
Date: Thu, 24 Oct 2024 21:17:26 -0500
Subject: [PATCH 5/8] login: change login to use email not username

---
 .../com/avengers/example/controller/LoginController.java  | 8 ++++++--
 src/main/java/com/avengers/example/domain/Login.java      | 4 ++--
 .../avengers/example/repository/AccountRepository.java    | 2 +-
 .../java/com/avengers/example/service/AccountService.java | 4 ++--
 .../java/com/avengers/example/service/LoginService.java   | 4 ++--
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/avengers/example/controller/LoginController.java b/src/main/java/com/avengers/example/controller/LoginController.java
index 366e80e..f079c60 100644
--- a/src/main/java/com/avengers/example/controller/LoginController.java
+++ b/src/main/java/com/avengers/example/controller/LoginController.java
@@ -2,10 +2,14 @@
 
 import com.avengers.example.domain.Login;
 import com.avengers.example.service.LoginService;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+@CrossOrigin(origins = "http://localhost:3000")
 @RestController
 public class LoginController {
     private final LoginService loginService;
@@ -15,7 +19,7 @@ public LoginController(LoginService loginService) {
     }
 
     @PostMapping("/login")
-    public boolean login(@RequestBody Login login) {
-        return loginService.isLoginValid(login.username(), login.password());
+    public ResponseEntity<?> login(@RequestBody Login login) {
+        return new ResponseEntity<>(loginService.isLoginValid(login.email(), login.password()), HttpStatus.OK);
     }
 }
diff --git a/src/main/java/com/avengers/example/domain/Login.java b/src/main/java/com/avengers/example/domain/Login.java
index 605f22f..799f9b0 100644
--- a/src/main/java/com/avengers/example/domain/Login.java
+++ b/src/main/java/com/avengers/example/domain/Login.java
@@ -2,11 +2,11 @@
 
 import java.util.Objects;
 
-public record Login(String username, String password)
+public record Login(String email, String password)
 {
     public Login
     {
-        Objects.requireNonNull(username, "Username cannot be null.");
+        Objects.requireNonNull(email, "Username cannot be null.");
         Objects.requireNonNull(password, "Password cannot be null.");
     }
 }
diff --git a/src/main/java/com/avengers/example/repository/AccountRepository.java b/src/main/java/com/avengers/example/repository/AccountRepository.java
index 400ca04..96c9a66 100644
--- a/src/main/java/com/avengers/example/repository/AccountRepository.java
+++ b/src/main/java/com/avengers/example/repository/AccountRepository.java
@@ -7,5 +7,5 @@
 @Repository
 public interface AccountRepository extends JpaRepository<Account, Long>
 {
-    Account findByUsernameAndPassword(String username, String password);
+    Account findByEmailAndPassword(String email, String password);
 }
diff --git a/src/main/java/com/avengers/example/service/AccountService.java b/src/main/java/com/avengers/example/service/AccountService.java
index 6217aa2..ee93b9a 100644
--- a/src/main/java/com/avengers/example/service/AccountService.java
+++ b/src/main/java/com/avengers/example/service/AccountService.java
@@ -25,8 +25,8 @@ public List<Account> findAll()
         return accountRepository.findAll();
     }
 
-    public Account findByUsernameAndPassword(String username, String password)
+    public Account findByEmailAndPassword(String email, String password)
     {
-        return accountRepository.findByUsernameAndPassword(username, password);
+        return accountRepository.findByEmailAndPassword(email, password);
     }
 }
diff --git a/src/main/java/com/avengers/example/service/LoginService.java b/src/main/java/com/avengers/example/service/LoginService.java
index a00eff2..546ca63 100644
--- a/src/main/java/com/avengers/example/service/LoginService.java
+++ b/src/main/java/com/avengers/example/service/LoginService.java
@@ -13,8 +13,8 @@ public LoginService(AccountService accountService) {
         this.accountService = accountService;
     }
 
-    public boolean isLoginValid(String username, String password) {
-        return !Objects.isNull(accountService.findByUsernameAndPassword(username, password));
+    public boolean isLoginValid(String email, String password) {
+        return !Objects.isNull(accountService.findByEmailAndPassword(email, password));
     }
 
 }

From e6681c9f7d90dd3895f9753814fc30729d2c4c58 Mon Sep 17 00:00:00 2001
From: Michael Harlow <94586121+michaelharlow@users.noreply.github.com>
Date: Thu, 24 Oct 2024 22:14:10 -0500
Subject: [PATCH 6/8] login: change login to use email not username

---
 .../java/com/avengers/example/controller/LoginController.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/avengers/example/controller/LoginController.java b/src/main/java/com/avengers/example/controller/LoginController.java
index f079c60..889a774 100644
--- a/src/main/java/com/avengers/example/controller/LoginController.java
+++ b/src/main/java/com/avengers/example/controller/LoginController.java
@@ -20,6 +20,7 @@ public LoginController(LoginService loginService) {
 
     @PostMapping("/login")
     public ResponseEntity<?> login(@RequestBody Login login) {
-        return new ResponseEntity<>(loginService.isLoginValid(login.email(), login.password()), HttpStatus.OK);
+        boolean isValid = loginService.isLoginValid(login.email(), login.password());
+        return new ResponseEntity<>(isValid ? HttpStatus.OK : HttpStatus.UNAUTHORIZED);
     }
 }

From 76cf1a9ddb8c91908a7d239f55b3425efd67de84 Mon Sep 17 00:00:00 2001
From: Michael Harlow <94586121+michaelharlow@users.noreply.github.com>
Date: Thu, 24 Oct 2024 22:17:59 -0500
Subject: [PATCH 7/8] login: authorization on frontend login + all routes

---
 src/main/frontend/src/components/Auth.tsx |  53 +++++++++++
 src/main/frontend/src/main.tsx            |  13 ++-
 src/main/frontend/src/routes/Login.tsx    | 104 +++++++++++++++++++---
 src/main/frontend/src/vite-env.d.ts       |   9 ++
 4 files changed, 162 insertions(+), 17 deletions(-)
 create mode 100644 src/main/frontend/src/components/Auth.tsx

diff --git a/src/main/frontend/src/components/Auth.tsx b/src/main/frontend/src/components/Auth.tsx
new file mode 100644
index 0000000..91744d7
--- /dev/null
+++ b/src/main/frontend/src/components/Auth.tsx
@@ -0,0 +1,53 @@
+import {createContext, useContext, useState} from "react";
+import {Navigate, Outlet} from "react-router-dom";
+
+
+interface AuthContextType {
+    user: Login | undefined;
+    signIn: (data: any) => void;
+    signOut: () => void;
+}
+
+const AuthContext = createContext<AuthContextType | undefined>(undefined);
+
+function AuthProvider({ children}: Props) {
+    const [user, setUser] = useState<any | undefined>(() => {
+        const user = sessionStorage.getItem("user");
+        return user ? JSON.parse(user) : undefined;
+    });
+
+    const signIn = (data: any) => {
+        setUser(data);
+        sessionStorage.setItem("user", JSON.stringify(data));
+    };
+
+    const signOut = () => {
+        setUser(undefined);
+        sessionStorage.removeItem("user");
+    };
+
+    return (
+      <AuthContext.Provider value={{user, signIn, signOut}}>
+          {children}
+      </AuthContext.Provider>
+    );
+}
+
+const useAuth = () => {
+    const context = useContext(AuthContext);
+    if (context === undefined) {
+        throw new Error("useAuth must be used within an AuthProvider");
+    }
+    return context;
+}
+
+function ProtectedRoute() {
+    const {user} = useAuth();
+    console.log(`User2: ${user}`);
+    if (user === undefined) {
+        return <Navigate to={"/login"} replace />;
+    }
+    return <Outlet />;
+}
+
+export { AuthProvider, useAuth, ProtectedRoute };
\ No newline at end of file
diff --git a/src/main/frontend/src/main.tsx b/src/main/frontend/src/main.tsx
index fbd8599..0726a47 100644
--- a/src/main/frontend/src/main.tsx
+++ b/src/main/frontend/src/main.tsx
@@ -2,21 +2,28 @@ import { StrictMode } from 'react'
 import { createRoot } from 'react-dom/client'
 import App from './App.tsx'
 import './index.css'
-import {createBrowserRouter, createRoutesFromElements, Route, RouterProvider} from "react-router-dom";
+import {createBrowserRouter, createRoutesFromElements, Navigate, Route, RouterProvider} from "react-router-dom";
 import Layout from "@/components/Layout.tsx";
 import Login from "@/routes/Login.tsx";
+import {AuthProvider, ProtectedRoute} from "@/components/Auth.tsx";
 
 const router = createBrowserRouter(
     createRoutesFromElements(
         <Route path={"/"} element={<Layout />}>
-            <Route index element={<App />} /> {/* element={<Navigate to={"login"} replace />} */}
+            <Route index element={<Navigate to={"login"} replace />} />
             <Route path={"login"} element={<Login />} />
+            <Route path={"register"} element={<h1>HELLO OTHER ROUTE</h1>} />
+            <Route path={"/"} element={<ProtectedRoute />}>
+                <Route path={"app-demo"} element={<App />} />
+            </Route>
         </Route>
     )
 )
 
 createRoot(document.getElementById('root')!).render(
   <StrictMode>
-    <RouterProvider router={router} />
+    <AuthProvider>
+        <RouterProvider router={router} />
+    </AuthProvider>
   </StrictMode>,
 )
diff --git a/src/main/frontend/src/routes/Login.tsx b/src/main/frontend/src/routes/Login.tsx
index 1587c90..5e4f72f 100644
--- a/src/main/frontend/src/routes/Login.tsx
+++ b/src/main/frontend/src/routes/Login.tsx
@@ -1,27 +1,103 @@
-import {Label} from "@/components/ui/label.tsx";
 import {Input} from "@/components/ui/input.tsx";
 import {Button} from "@/components/ui/button.tsx";
+import {
+    Form,
+    FormControl,
+    FormField,
+    FormItem,
+    FormLabel,
+    FormMessage,
+} from "@/components/ui/form"
+import {zodResolver} from "@hookform/resolvers/zod";
+import {useForm} from "react-hook-form";
+import {z} from "zod"
+import {useAuth} from "@/components/Auth.tsx";
+import {useNavigate} from "react-router-dom";
 
+const formSchema = z.object({
+    email: z.string().email({
+        message: "Invalid email address",
+    }),
+    password: z.string({
+        message: "Invalid password",
+    }),
+})
 
 function Login() {
+    const { signIn } = useAuth();
+    const navigate = useNavigate();
+
+    const form = useForm<z.infer<typeof formSchema>>({
+        resolver: zodResolver(formSchema),
+        defaultValues: {
+            email: "",
+            password: "",
+        },
+    })
+
+    const onSubmit = (data: z.infer<typeof formSchema>) => {
+        fetch("http://localhost:8080/login", {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+            },
+            body: JSON.stringify(data),
+        }).then((response) => {
+            if (!response.ok) {
+                throw new Error("Password is incorrect")
+            }
+        }).then(() => {
+            console.log(data);
+            signIn(data);
+            navigate("/app-demo");
+        }).catch((error) => {
+            form.setError(
+                "password",
+                {
+                    type: "value",
+                    message: error.message,
+                }
+            )
+        })
+    }
+
     return (
         <div className={"flex rounded-3xl floating-shadow w-[900px] h-[600px] mb-16 overflow-hidden"}>
             <div className={"bg-white w-1/2 px-6 py-12"}>
                 <h1>Welcome Back!</h1>
                 <h2 className={"font-light"}>Login to access loans and more.</h2>
-                <div className={"mt-8"}>
-                    <Label>Email</Label>
-                    <Input type={"email"} className={"mt-1"}/>
-                </div>
-                <div className={"mt-6"}>
-                    <Label>Password</Label>
-                    <Input type={"password"} className={"mt-1"}/>
-                </div>
-                <div className={"flex justify-between"}>
-                    <Button variant={"link"} className={"mt-4 px-0 text-commerce-green font-semibold"}>Admin</Button>
-                    <Button variant={"link"} className={"mt-4 px-0 text-commerce-green font-semibold"}>Forgot Password?</Button>
-                </div>
-                <Button className={"mt-8 w-full"}>Login</Button>
+                <Form {...form}>
+                    <form onSubmit={form.handleSubmit(onSubmit)}>
+                        <FormField
+                            control={form.control}
+                            name="email"
+                            render={({field}) => (
+                                <FormItem className={"mt-8"}>
+                                    <FormLabel className={"text-black"}>Email</FormLabel>
+                                    <FormControl>
+                                        <Input {...field} />
+                                    </FormControl>
+                                    <FormMessage/>
+                                </FormItem>
+                            )}
+                        />
+                        <FormField
+                            control={form.control}
+                            name="password"
+                            render={({field}) => (
+                                <FormItem className={"mt-6"}>
+                                    <FormLabel className={"text-black"}>Password</FormLabel>
+                                    <FormControl>
+                                        <Input type="password" {...field} />
+                                    </FormControl>
+                                    <FormMessage/>
+                                </FormItem>
+                            )}
+                        />
+                        <Button type={"button"} variant={"link"} className={"px-0 text-commerce-green font-semibold"}>Forgot Password?</Button>
+                        <Button type={"submit"} className={"mt-4 py-6 w-full"}>Login</Button>
+                    </form>
+                </Form>
             </div>
             <div className={"bg-commerce-green w-1/2"}>
                 <img className={"m-auto mt-64"} src={"/commerce_globe_45x48.png"} alt={"Logo"}/>
diff --git a/src/main/frontend/src/vite-env.d.ts b/src/main/frontend/src/vite-env.d.ts
index 2816e47..3489bcf 100644
--- a/src/main/frontend/src/vite-env.d.ts
+++ b/src/main/frontend/src/vite-env.d.ts
@@ -1,5 +1,9 @@
 /// <reference types="vite/client" />
 
+interface Props {
+    children?: React.ReactNode;
+}
+
 interface Account {
     id: number;
     userType: number;
@@ -7,4 +11,9 @@ interface Account {
     password: string;
     email: string;
     phoneNumber: string;
+}
+
+interface Login {
+    email: string;
+    password: string;
 }
\ No newline at end of file

From a431859a99482fa2cc40b7fedcefef2f7589923c Mon Sep 17 00:00:00 2001
From: Michael Harlow <94586121+michaelharlow@users.noreply.github.com>
Date: Fri, 25 Oct 2024 19:51:39 -0500
Subject: [PATCH 8/8] login: authorization organization

---
 src/main/frontend/src/components/Auth.tsx     | 23 +++----------------
 .../src/components/ProtectedRoute.tsx         | 13 +++++++++++
 src/main/frontend/src/main.tsx                |  3 ++-
 src/main/frontend/src/vite-env.d.ts           |  6 +++++
 4 files changed, 24 insertions(+), 21 deletions(-)
 create mode 100644 src/main/frontend/src/components/ProtectedRoute.tsx

diff --git a/src/main/frontend/src/components/Auth.tsx b/src/main/frontend/src/components/Auth.tsx
index 91744d7..664637a 100644
--- a/src/main/frontend/src/components/Auth.tsx
+++ b/src/main/frontend/src/components/Auth.tsx
@@ -1,22 +1,14 @@
 import {createContext, useContext, useState} from "react";
-import {Navigate, Outlet} from "react-router-dom";
-
-
-interface AuthContextType {
-    user: Login | undefined;
-    signIn: (data: any) => void;
-    signOut: () => void;
-}
 
 const AuthContext = createContext<AuthContextType | undefined>(undefined);
 
 function AuthProvider({ children}: Props) {
-    const [user, setUser] = useState<any | undefined>(() => {
+    const [user, setUser] = useState<Login | undefined>(() => {
         const user = sessionStorage.getItem("user");
         return user ? JSON.parse(user) : undefined;
     });
 
-    const signIn = (data: any) => {
+    const signIn = (data: Login) => {
         setUser(data);
         sessionStorage.setItem("user", JSON.stringify(data));
     };
@@ -41,13 +33,4 @@ const useAuth = () => {
     return context;
 }
 
-function ProtectedRoute() {
-    const {user} = useAuth();
-    console.log(`User2: ${user}`);
-    if (user === undefined) {
-        return <Navigate to={"/login"} replace />;
-    }
-    return <Outlet />;
-}
-
-export { AuthProvider, useAuth, ProtectedRoute };
\ No newline at end of file
+export { AuthProvider, useAuth };
\ No newline at end of file
diff --git a/src/main/frontend/src/components/ProtectedRoute.tsx b/src/main/frontend/src/components/ProtectedRoute.tsx
new file mode 100644
index 0000000..a6c2b2c
--- /dev/null
+++ b/src/main/frontend/src/components/ProtectedRoute.tsx
@@ -0,0 +1,13 @@
+import {Navigate, Outlet} from "react-router-dom";
+import {useAuth} from "@/components/Auth.tsx";
+
+function ProtectedRoute() {
+    const {user} = useAuth();
+    console.log(`User2: ${user}`);
+    if (user === undefined) {
+        return <Navigate to={"/login"} replace />;
+    }
+    return <Outlet />;
+}
+
+export default ProtectedRoute;
\ No newline at end of file
diff --git a/src/main/frontend/src/main.tsx b/src/main/frontend/src/main.tsx
index 0726a47..7616a0f 100644
--- a/src/main/frontend/src/main.tsx
+++ b/src/main/frontend/src/main.tsx
@@ -5,7 +5,8 @@ import './index.css'
 import {createBrowserRouter, createRoutesFromElements, Navigate, Route, RouterProvider} from "react-router-dom";
 import Layout from "@/components/Layout.tsx";
 import Login from "@/routes/Login.tsx";
-import {AuthProvider, ProtectedRoute} from "@/components/Auth.tsx";
+import { AuthProvider } from "@/components/Auth.tsx";
+import ProtectedRoute from "@/components/ProtectedRoute.tsx";
 
 const router = createBrowserRouter(
     createRoutesFromElements(
diff --git a/src/main/frontend/src/vite-env.d.ts b/src/main/frontend/src/vite-env.d.ts
index 3489bcf..b4f2572 100644
--- a/src/main/frontend/src/vite-env.d.ts
+++ b/src/main/frontend/src/vite-env.d.ts
@@ -4,6 +4,12 @@ interface Props {
     children?: React.ReactNode;
 }
 
+interface AuthContextType {
+    user: Login | undefined;
+    signIn: (data: any) => void;
+    signOut: () => void;
+}
+
 interface Account {
     id: number;
     userType: number;