From fe6d2cc88eb71e6e9364d2ef1e09bf0db514ff13 Mon Sep 17 00:00:00 2001
From: ZL <ray040406@gmail.com>
Date: Mon, 26 Aug 2024 16:03:30 +1200
Subject: [PATCH 1/8] added message

---
 client/src/components/composite/LoginForm/LoginForm.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/components/composite/LoginForm/LoginForm.tsx b/client/src/components/composite/LoginForm/LoginForm.tsx
index ca5939c55..5f4f5188e 100644
--- a/client/src/components/composite/LoginForm/LoginForm.tsx
+++ b/client/src/components/composite/LoginForm/LoginForm.tsx
@@ -67,6 +67,7 @@ const LoginForm = ({
         setLoginSuccessful(true)
         setMessages({ success: "Logged In" })
         if (successHandler !== undefined) successHandler()
+        alert("Logged In!")
       } else {
         setLoginSuccessful(false)
         // We want the messages to be overwritten

From 0456d5d88100833347c5cc9a244e152614eef6aa Mon Sep 17 00:00:00 2001
From: ZL <ray040406@gmail.com>
Date: Mon, 26 Aug 2024 16:14:44 +1200
Subject: [PATCH 2/8] changed to msg of telling user during logging in

---
 client/src/components/composite/LoginForm/LoginForm.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/composite/LoginForm/LoginForm.tsx b/client/src/components/composite/LoginForm/LoginForm.tsx
index 5f4f5188e..ef5eae24d 100644
--- a/client/src/components/composite/LoginForm/LoginForm.tsx
+++ b/client/src/components/composite/LoginForm/LoginForm.tsx
@@ -57,6 +57,7 @@ const LoginForm = ({
     if (isLoading || !loginHandler) return
     try {
       setIsLoading(true)
+      alert("Logging In...")
       const { success, error } = await loginHandler({
         email: formData.email,
         password: formData.password
@@ -67,7 +68,6 @@ const LoginForm = ({
         setLoginSuccessful(true)
         setMessages({ success: "Logged In" })
         if (successHandler !== undefined) successHandler()
-        alert("Logged In!")
       } else {
         setLoginSuccessful(false)
         // We want the messages to be overwritten

From c5c97a06ffd0fff7aaf40cc4fb7d1e8ad0e2e970 Mon Sep 17 00:00:00 2001
From: ZL <ray040406@gmail.com>
Date: Mon, 26 Aug 2024 21:33:19 +1200
Subject: [PATCH 3/8] added msg under loading condition

---
 client/src/components/composite/LoginForm/LoginForm.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/composite/LoginForm/LoginForm.tsx b/client/src/components/composite/LoginForm/LoginForm.tsx
index ef5eae24d..7261c00bc 100644
--- a/client/src/components/composite/LoginForm/LoginForm.tsx
+++ b/client/src/components/composite/LoginForm/LoginForm.tsx
@@ -57,7 +57,6 @@ const LoginForm = ({
     if (isLoading || !loginHandler) return
     try {
       setIsLoading(true)
-      alert("Logging In...")
       const { success, error } = await loginHandler({
         email: formData.email,
         password: formData.password
@@ -135,6 +134,7 @@ const LoginForm = ({
           >
             Login
           </Button>
+          {isLoading ? <p className="">Logging in...</p> : null}
           <Link href="/register" className="flex">
             <Button variant="inverted-default-sm">Register</Button>
           </Link>

From 26efab66edafa1417d29ff02bdc86737037d1506 Mon Sep 17 00:00:00 2001
From: ZL <ray040406@gmail.com>
Date: Mon, 26 Aug 2024 21:35:16 +1200
Subject: [PATCH 4/8] adjusted position of the text

---
 client/src/components/composite/LoginForm/LoginForm.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/src/components/composite/LoginForm/LoginForm.tsx b/client/src/components/composite/LoginForm/LoginForm.tsx
index 7261c00bc..948fa56c5 100644
--- a/client/src/components/composite/LoginForm/LoginForm.tsx
+++ b/client/src/components/composite/LoginForm/LoginForm.tsx
@@ -134,7 +134,9 @@ const LoginForm = ({
           >
             Login
           </Button>
-          {isLoading ? <p className="">Logging in...</p> : null}
+          {isLoading ? (
+            <p className="text-dark-blue-100 mt-1">Logging in...</p>
+          ) : null}
           <Link href="/register" className="flex">
             <Button variant="inverted-default-sm">Register</Button>
           </Link>

From 07c076db4bca940894ac7e1aca38163f6b0ed798 Mon Sep 17 00:00:00 2001
From: ZL <ray040406@gmail.com>
Date: Mon, 26 Aug 2024 22:44:02 +1200
Subject: [PATCH 5/8] set the position to the bottom

---
 client/src/components/composite/LoginForm/LoginForm.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/client/src/components/composite/LoginForm/LoginForm.tsx b/client/src/components/composite/LoginForm/LoginForm.tsx
index 948fa56c5..4eea1e07d 100644
--- a/client/src/components/composite/LoginForm/LoginForm.tsx
+++ b/client/src/components/composite/LoginForm/LoginForm.tsx
@@ -134,13 +134,12 @@ const LoginForm = ({
           >
             Login
           </Button>
-          {isLoading ? (
-            <p className="text-dark-blue-100 mt-1">Logging in...</p>
-          ) : null}
+
           <Link href="/register" className="flex">
             <Button variant="inverted-default-sm">Register</Button>
           </Link>
         </span>
+        {isLoading ? <p className="text-dark-blue-100">Logging in...</p> : null}
         <div className="mt-6 uppercase">
           {messages.success && (
             <h5 className="font-bold">{messages.success}</h5>

From cd4c9913427835d10685cba91d86bdff600f3891 Mon Sep 17 00:00:00 2001
From: ZL <ray040406@gmail.com>
Date: Mon, 26 Aug 2024 22:49:55 +1200
Subject: [PATCH 6/8] position adjustments

---
 client/src/components/composite/LoginForm/LoginForm.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/src/components/composite/LoginForm/LoginForm.tsx b/client/src/components/composite/LoginForm/LoginForm.tsx
index 4eea1e07d..a454293b9 100644
--- a/client/src/components/composite/LoginForm/LoginForm.tsx
+++ b/client/src/components/composite/LoginForm/LoginForm.tsx
@@ -139,7 +139,9 @@ const LoginForm = ({
             <Button variant="inverted-default-sm">Register</Button>
           </Link>
         </span>
-        {isLoading ? <p className="text-dark-blue-100">Logging in...</p> : null}
+        {isLoading ? (
+          <p className="text-dark-blue-100 absolute mt-4">Logging in...</p>
+        ) : null}
         <div className="mt-6 uppercase">
           {messages.success && (
             <h5 className="font-bold">{messages.success}</h5>

From 92fddf16c61482dec2ea58776c30a1b75354d3d2 Mon Sep 17 00:00:00 2001
From: zlrkw11 <64724157+zlrkw11@users.noreply.github.com>
Date: Tue, 27 Aug 2024 15:48:31 +1200
Subject: [PATCH 7/8] Update
 client/src/components/composite/LoginForm/LoginForm.tsx

Co-authored-by: Benson Cho <100653148+bcho892@users.noreply.github.com>
---
 client/src/components/composite/LoginForm/LoginForm.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/components/composite/LoginForm/LoginForm.tsx b/client/src/components/composite/LoginForm/LoginForm.tsx
index a454293b9..91863953c 100644
--- a/client/src/components/composite/LoginForm/LoginForm.tsx
+++ b/client/src/components/composite/LoginForm/LoginForm.tsx
@@ -139,9 +139,9 @@ const LoginForm = ({
             <Button variant="inverted-default-sm">Register</Button>
           </Link>
         </span>
-        {isLoading ? (
-          <p className="text-dark-blue-100 absolute mt-4">Logging in...</p>
-        ) : null}
+        {isLoading && (
+          <p className="text-dark-blue-100 mt-4">Logging in...</p>
+        )}
         <div className="mt-6 uppercase">
           {messages.success && (
             <h5 className="font-bold">{messages.success}</h5>

From d335f47fa59f62101910e06e2f460fe88ddb62d7 Mon Sep 17 00:00:00 2001
From: ZL <ray040406@gmail.com>
Date: Tue, 27 Aug 2024 15:51:33 +1200
Subject: [PATCH 8/8] remove absolute

---
 client/src/components/composite/LoginForm/LoginForm.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/composite/LoginForm/LoginForm.tsx b/client/src/components/composite/LoginForm/LoginForm.tsx
index a454293b9..76085abbc 100644
--- a/client/src/components/composite/LoginForm/LoginForm.tsx
+++ b/client/src/components/composite/LoginForm/LoginForm.tsx
@@ -140,7 +140,7 @@ const LoginForm = ({
           </Link>
         </span>
         {isLoading ? (
-          <p className="text-dark-blue-100 absolute mt-4">Logging in...</p>
+          <p className="text-dark-blue-100 mt-4">Logging in...</p>
         ) : null}
         <div className="mt-6 uppercase">
           {messages.success && (