From fe61aeea2880b00cb99285715c3de35387027847 Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Fri, 5 Jul 2024 12:29:18 -0400
Subject: [PATCH 001/118] feat(LoadingSpinner.tsx): created first iteration of
 a loading spinner

---
 app/league/all/page.tsx                      |  5 ++++-
 components/LoadingSpinner/LoadingSpinner.tsx | 23 ++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 components/LoadingSpinner/LoadingSpinner.tsx

diff --git a/app/league/all/page.tsx b/app/league/all/page.tsx
index 03f9e1b1..e5e9f2c5 100644
--- a/app/league/all/page.tsx
+++ b/app/league/all/page.tsx
@@ -9,6 +9,7 @@ import { IGameWeek, ILeague } from '@/api/apiFunctions.interface';
 import { getUserLeagues } from '@/utils/utils';
 import { useDataStore } from '@/store/dataStore';
 import { getGameWeek } from '@/api/apiFunctions';
+import LoadingSpinner from '@/components/LoadingSpinner/LoadingSpinner';
 
 /**
  * Renders the leagues component.
@@ -69,10 +70,12 @@ const Leagues = (): JSX.Element => {
           ))
         ) : (
           <div className="text-center">
-            <p className="text-lg font-bold">Loading ...</p>
+            {/* <p className="text-lg font-bold">Loading ...</p> */}
+            <LoadingSpinner />
           </div>
         )}
       </section>
+      <LoadingSpinner />
     </div>
   );
 };
diff --git a/components/LoadingSpinner/LoadingSpinner.tsx b/components/LoadingSpinner/LoadingSpinner.tsx
new file mode 100644
index 00000000..be6b612c
--- /dev/null
+++ b/components/LoadingSpinner/LoadingSpinner.tsx
@@ -0,0 +1,23 @@
+// Copyright (c) Gridiron Survivor.
+// Licensed under the MIT License.
+
+import React from 'react';
+
+/**
+ * asdf
+ * @returns asdf
+ */
+const LoadingSpinner = () => {
+  return (
+    <div className="loading-spinner-container h-48 place-content-center border">
+      <div
+        className="loading-spinner w-12 h-12 mx-auto rounded-full border-4 border-t-muted-foreground border-foreground animate-spin"
+        data-testid="loading-spinner"
+      >
+        <span className="sr-only">Loading</span>
+      </div>
+    </div>
+  );
+};
+
+export default LoadingSpinner;

From 5d7fb40aabe612a1ec8cd2bf295c07794859f5cb Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Sat, 13 Jul 2024 11:00:33 -0400
Subject: [PATCH 002/118] feat(LoadingSpinner.tsx): added optional height and
 width props to component

optional props expect strings (tailwind classes) so the loader takes up the same amount of space as the element it is replacing before it loads in.
---
 app/league/all/page.tsx                      |  4 +--
 components/LeagueCard/LeagueCard.tsx         |  2 +-
 components/LoadingSpinner/LoadingSpinner.tsx | 30 ++++++++++++++++----
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/app/league/all/page.tsx b/app/league/all/page.tsx
index e5e9f2c5..156ec885 100644
--- a/app/league/all/page.tsx
+++ b/app/league/all/page.tsx
@@ -70,12 +70,10 @@ const Leagues = (): JSX.Element => {
           ))
         ) : (
           <div className="text-center">
-            {/* <p className="text-lg font-bold">Loading ...</p> */}
-            <LoadingSpinner />
+            <LoadingSpinner height="max-h-32 h-32" />
           </div>
         )}
       </section>
-      <LoadingSpinner />
     </div>
   );
 };
diff --git a/components/LeagueCard/LeagueCard.tsx b/components/LeagueCard/LeagueCard.tsx
index 1412f946..54be3f7a 100644
--- a/components/LeagueCard/LeagueCard.tsx
+++ b/components/LeagueCard/LeagueCard.tsx
@@ -23,7 +23,7 @@ const LeagueCard = React.forwardRef<HTMLAnchorElement, ILeagueCardProps>(
       data-testid="LeagueCard"
       href={href}
       className={cn(
-        'LeagueCard flex max-h-32 place-items-center gap-6 rounded-lg border bg-card p-4 text-card-foreground shadow-sm dark:border-zinc-800',
+        'LeagueCard flex max-h-32 h-32 place-items-center gap-6 rounded-lg border bg-card p-4 text-card-foreground shadow-sm dark:border-zinc-800',
       )}
     >
       <Image
diff --git a/components/LoadingSpinner/LoadingSpinner.tsx b/components/LoadingSpinner/LoadingSpinner.tsx
index be6b612c..5b9d7d14 100644
--- a/components/LoadingSpinner/LoadingSpinner.tsx
+++ b/components/LoadingSpinner/LoadingSpinner.tsx
@@ -1,15 +1,35 @@
 // Copyright (c) Gridiron Survivor.
 // Licensed under the MIT License.
 
-import React from 'react';
+import React, { JSX } from 'react';
+import { cn } from '@/utils/utils';
 
+export interface ILoadingSpinnerProps {
+  height?: string;
+  width?: string;
+}
 /**
- * asdf
- * @returns asdf
+ * Renders a loading spinner.
+ * @param {ILoadingSpinnerProps} props - The props for the loading spinner component.
+ * @param {string} props.height - The height of the loading spinner. This should be the same tailwind class as the element it is standing in for.
+ * @param {string} props.width - The width of the loading spinner. This should be the same tailwind class as the element it is standing in for.
+ * @returns {JSX.Element} The rendered loading spinner component.
  */
-const LoadingSpinner = () => {
+const LoadingSpinner = ({
+  height,
+  width,
+}: ILoadingSpinnerProps): JSX.Element => {
   return (
-    <div className="loading-spinner-container h-48 place-content-center border">
+    <div
+      aria-hidden="true"
+      role="alert"
+      tabIndex={-1}
+      className={cn(
+        'loading-spinner-container w-full h-full place-content-center',
+        height,
+        width,
+      )}
+    >
       <div
         className="loading-spinner w-12 h-12 mx-auto rounded-full border-4 border-t-muted-foreground border-foreground animate-spin"
         data-testid="loading-spinner"

From 86c9e36d30ab0092098f9893241bda46f1e47013 Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Sat, 13 Jul 2024 11:33:26 -0400
Subject: [PATCH 003/118] feat(LoadingSpinner.tsx): add accessibility features

---
 components/LoadingSpinner/LoadingSpinner.tsx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/components/LoadingSpinner/LoadingSpinner.tsx b/components/LoadingSpinner/LoadingSpinner.tsx
index 5b9d7d14..cd5deb78 100644
--- a/components/LoadingSpinner/LoadingSpinner.tsx
+++ b/components/LoadingSpinner/LoadingSpinner.tsx
@@ -21,21 +21,19 @@ const LoadingSpinner = ({
 }: ILoadingSpinnerProps): JSX.Element => {
   return (
     <div
-      aria-hidden="true"
       role="alert"
       tabIndex={-1}
       className={cn(
-        'loading-spinner-container w-full h-full place-content-center',
+        'loading-spinner-container w-full h-full place-content-center text-center',
         height,
         width,
       )}
     >
       <div
-        className="loading-spinner w-12 h-12 mx-auto rounded-full border-4 border-t-muted-foreground border-foreground animate-spin"
+        className="loading-spinner w-12 h-12 mx-auto rounded-full border-4 border-t-muted-foreground border-foreground animate-spin motion-reduces:hidden"
         data-testid="loading-spinner"
-      >
-        <span className="sr-only">Loading</span>
-      </div>
+      />
+      <p className="sr-only motion-reduce:not-sr-only">Loading</p>
     </div>
   );
 };

From 8555c8cdccc5721e7c658012d7bedc40a7f6a0db Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Fri, 19 Jul 2024 16:12:33 -0400
Subject: [PATCH 004/118] feat(page.tsx): remove loading spinner component from
 league/all page

---
 app/(main)/league/all/page.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/(main)/league/all/page.tsx b/app/(main)/league/all/page.tsx
index 04f7d14c..b3ce52c9 100644
--- a/app/(main)/league/all/page.tsx
+++ b/app/(main)/league/all/page.tsx
@@ -8,8 +8,6 @@ import { LeagueCard } from '@/components/LeagueCard/LeagueCard';
 import { ILeague } from '@/api/apiFunctions.interface';
 import { getUserLeagues } from '@/utils/utils';
 import { useDataStore } from '@/store/dataStore';
-import { getGameWeek } from '@/api/apiFunctions';
-import LoadingSpinner from '@/components/LoadingSpinner/LoadingSpinner';
 import { ENTRY_URL, LEAGUE_URL } from '@/const/global';
 
 /**
@@ -58,7 +56,7 @@ const Leagues = (): JSX.Element => {
           ))
         ) : (
           <div className="text-center">
-            <LoadingSpinner height="max-h-32 h-32" />
+            <p>Loading...</p>
           </div>
         )}
       </section>

From d1ea90e7620b8a4a54b07518f5ad2e1572d00936 Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Fri, 19 Jul 2024 17:24:15 -0400
Subject: [PATCH 005/118] feat(LoadingSpinner.tsx): made loadingspinner respect
 min and max height of the button component and implemented it into the login
 page

---
 app/(main)/league/all/page.tsx               |  8 ++--
 app/(main)/login/page.tsx                    | 43 +++++++++++++-------
 components/Button/Button.tsx                 |  2 +-
 components/LoadingSpinner/LoadingSpinner.tsx | 27 +++---------
 4 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/app/(main)/league/all/page.tsx b/app/(main)/league/all/page.tsx
index b3ce52c9..cb5abbcd 100644
--- a/app/(main)/league/all/page.tsx
+++ b/app/(main)/league/all/page.tsx
@@ -3,12 +3,12 @@
 
 'use client';
 
-import React, { JSX, useEffect, useState } from 'react';
-import { LeagueCard } from '@/components/LeagueCard/LeagueCard';
-import { ILeague } from '@/api/apiFunctions.interface';
+import { ENTRY_URL, LEAGUE_URL } from '@/const/global';
 import { getUserLeagues } from '@/utils/utils';
+import { ILeague } from '@/api/apiFunctions.interface';
+import { LeagueCard } from '@/components/LeagueCard/LeagueCard';
 import { useDataStore } from '@/store/dataStore';
-import { ENTRY_URL, LEAGUE_URL } from '@/const/global';
+import React, { JSX, useEffect, useState } from 'react';
 
 /**
  * Renders the leagues component.
diff --git a/app/(main)/login/page.tsx b/app/(main)/login/page.tsx
index 03fc3811..f8abfea1 100644
--- a/app/(main)/login/page.tsx
+++ b/app/(main)/login/page.tsx
@@ -2,16 +2,8 @@
 // Licensed under the MIT License.
 
 'use client';
-import { JSX, useEffect } from 'react';
-import Logo from '@/components/Logo/Logo';
-import logo from '@/public/assets/logo-colored-outline.svg';
-import { Input } from '@/components/Input/Input';
 import { Button } from '@/components/Button/Button';
-import { useAuthContext } from '@/context/AuthContextProvider';
-import LinkCustom from '@/components/LinkCustom/LinkCustom';
-import { z } from 'zod';
 import { Control, useForm, useWatch, SubmitHandler } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
 import {
   Form,
   FormControl,
@@ -19,7 +11,26 @@ import {
   FormItem,
   FormMessage,
 } from '../../../components/Form/Form';
+import { Input } from '@/components/Input/Input';
+import React, { useEffect, useState } from 'react';
+import { useAuthContext } from '@/context/AuthContextProvider';
+import { z } from 'zod';
+import { zodResolver } from '@hookform/resolvers/zod';
+import LinkCustom from '@/components/LinkCustom/LinkCustom';
+import LoadingSpinner from '@/components/LoadingSpinner/LoadingSpinner';
+import Logo from '@/components/Logo/Logo';
+import logo from '@/public/assets/logo-colored-outline.svg';
 
+/**
+ * The schema for the login form.
+ * @type {z.ZodObject} The schema for the login form.
+ * @property {z.ZodString} email - The email address of the user.
+ * @property {z.ZodString} password - The password of the user.
+ * @returns {z.ZodObject} The schema for the login form.
+ * @throws {Error} Throws an error if the email is not a valid email address or if the password is less than 6 characters.
+ * @throws {Error} Throws an error if the email is not provided or if the password is not provided.
+ * @throws {Error} Throws an error if the email is not a string or if the password is not a string.
+ */
 const LoginUserSchema = z.object({
   email: z
     .string()
@@ -35,10 +46,11 @@ type LoginUserSchemaType = z.infer<typeof LoginUserSchema>;
 
 /**
  * Renders the login page.
- * @returns {JSX.Element} The rendered login page.
+ * @returns {React.JSX.Element} The rendered login page.
  */
-const Login = (): JSX.Element => {
+const Login = (): React.JSX.Element => {
   const { login, isSignedIn, getUser } = useAuthContext();
+  const [isLoading, setIsLoading] = useState(false);
 
   useEffect(() => {
     if (isSignedIn) {
@@ -63,12 +75,13 @@ const Login = (): JSX.Element => {
   });
 
   /**
-   * A function that handles form submission.
-   * @param {LoginUserSchemaType} data - The data submitted in the form.
-   * @returns {Promise<void>} A promise that resolves when the `login` function completes.
+   * Handles the form submission.
+   * @param {LoginUserSchemaType} data - The data from the form.
    */
   const onSubmit: SubmitHandler<LoginUserSchemaType> = async (data) => {
+    setIsLoading(true);
     await login(data);
+    setIsLoading(false);
   };
 
   return (
@@ -144,9 +157,9 @@ const Login = (): JSX.Element => {
             />
             <Button
               data-testid="continue-button"
-              label="Continue"
+              label={isLoading ? <LoadingSpinner /> : 'Continue'}
               type="submit"
-              disabled={!email || !password}
+              disabled={!email || !password || isLoading}
             />
             <LinkCustom href="/register">
               Sign up to get started with a league
diff --git a/components/Button/Button.tsx b/components/Button/Button.tsx
index 82c530b9..27588b38 100644
--- a/components/Button/Button.tsx
+++ b/components/Button/Button.tsx
@@ -38,7 +38,7 @@ const buttonVariants = cva(
 export interface ButtonProps
   extends React.ButtonHTMLAttributes<HTMLButtonElement>,
     VariantProps<typeof buttonVariants> {
-  label?: string;
+  label?: React.ReactNode;
   icon?: JSX.Element;
 }
 
diff --git a/components/LoadingSpinner/LoadingSpinner.tsx b/components/LoadingSpinner/LoadingSpinner.tsx
index cd5deb78..b0a9e5f5 100644
--- a/components/LoadingSpinner/LoadingSpinner.tsx
+++ b/components/LoadingSpinner/LoadingSpinner.tsx
@@ -1,39 +1,24 @@
 // Copyright (c) Gridiron Survivor.
 // Licensed under the MIT License.
 
-import React, { JSX } from 'react';
-import { cn } from '@/utils/utils';
+import React from 'react';
 
-export interface ILoadingSpinnerProps {
-  height?: string;
-  width?: string;
-}
 /**
  * Renders a loading spinner.
- * @param {ILoadingSpinnerProps} props - The props for the loading spinner component.
- * @param {string} props.height - The height of the loading spinner. This should be the same tailwind class as the element it is standing in for.
- * @param {string} props.width - The width of the loading spinner. This should be the same tailwind class as the element it is standing in for.
- * @returns {JSX.Element} The rendered loading spinner component.
+ * @returns {React.JSX.Element} The rendered loading spinner component.
  */
-const LoadingSpinner = ({
-  height,
-  width,
-}: ILoadingSpinnerProps): JSX.Element => {
+const LoadingSpinner = (): React.JSX.Element => {
   return (
     <div
       role="alert"
       tabIndex={-1}
-      className={cn(
-        'loading-spinner-container w-full h-full place-content-center text-center',
-        height,
-        width,
-      )}
+      className="loading-spinner-container grid place-content-center text-center"
     >
       <div
-        className="loading-spinner w-12 h-12 mx-auto rounded-full border-4 border-t-muted-foreground border-foreground animate-spin motion-reduces:hidden"
+        className="loading-spinner min-w-[1.75rem] max-w-[2.25rem] min-h-[1.75rem] max-h-[2.25rem] rounded-full border-4 border-t-muted-foreground border-foreground animate-spin motion-reduce:hidden"
         data-testid="loading-spinner"
       />
-      <p className="sr-only motion-reduce:not-sr-only">Loading</p>
+      <p className="sr-only motion-reduce:not-sr-only">Loading...</p>
     </div>
   );
 };

From 0a97191879ee0ea992a732e42d7e086f8ef0206f Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Fri, 19 Jul 2024 17:25:04 -0400
Subject: [PATCH 006/118] fix(LeagueCard.tsx): remove hard height on leaguecard
 component

---
 components/LeagueCard/LeagueCard.tsx | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/components/LeagueCard/LeagueCard.tsx b/components/LeagueCard/LeagueCard.tsx
index b6ffd5d8..87a88273 100644
--- a/components/LeagueCard/LeagueCard.tsx
+++ b/components/LeagueCard/LeagueCard.tsx
@@ -11,19 +11,22 @@ import LeagueCardPlaceholderLogo from './LeagueCardPlaceholderLogo.svg';
 import Link from 'next/link';
 
 const LeagueCard = React.forwardRef<HTMLAnchorElement, ILeagueCardProps>(
-  ({
-    href,
-    isEliminated = false,
-    leagueCardLogo = LeagueCardPlaceholderLogo,
-    survivors,
-    title,
-    totalPlayers,
-  }, ref) => (
+  (
+    {
+      href,
+      isEliminated = false,
+      leagueCardLogo = LeagueCardPlaceholderLogo,
+      survivors,
+      title,
+      totalPlayers,
+    },
+    ref,
+  ) => (
     <Link
       data-testid="LeagueCard"
       href={href}
       className={cn(
-        'LeagueCard flex max-h-32 h-32 place-items-center gap-6 rounded-lg border bg-card p-4 text-card-foreground shadow-sm dark:border-zinc-800',
+        'LeagueCard flex max-h-32 place-items-center gap-6 rounded-lg border bg-card p-4 text-card-foreground shadow-sm dark:border-zinc-800',
       )}
       ref={ref}
     >

From 0a170298cb36d98684d05a553e5084ffc777b813 Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Fri, 19 Jul 2024 18:33:32 -0400
Subject: [PATCH 007/118] test(LoadingSpinner.test.tsx): create test for
 loadingspinner component

---
 .../LoadingSpinner/LoadingSpinner.test.tsx    | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 components/LoadingSpinner/LoadingSpinner.test.tsx

diff --git a/components/LoadingSpinner/LoadingSpinner.test.tsx b/components/LoadingSpinner/LoadingSpinner.test.tsx
new file mode 100644
index 00000000..1708ce63
--- /dev/null
+++ b/components/LoadingSpinner/LoadingSpinner.test.tsx
@@ -0,0 +1,47 @@
+import { Button } from '../Button/Button';
+import { render, fireEvent, waitFor, screen } from '@testing-library/react';
+import LoadingSpinner from './LoadingSpinner';
+import React, { useState } from 'react';
+
+describe('LoadingSpinner', () => {
+  it('should render the loading spinner component when the button is clicked', () => {
+    const TestButton = () => {
+      const [isLoading, setIsLoading] = useState(false);
+
+      function mockSendingData() {
+        return new Promise((resolve) => {
+          setIsLoading(true);
+          setTimeout(() => {
+            resolve(setIsLoading(false));
+          }, 3000);
+        });
+      }
+
+      return (
+        <Button
+          data-testid="continue-button"
+          disabled={isLoading}
+          label={isLoading ? <LoadingSpinner /> : 'Continue'}
+          onClick={mockSendingData}
+          type="submit"
+        />
+      );
+    };
+    render(<TestButton />);
+
+    const button = screen.getByTestId('continue-button');
+    const buttonLabel = button.textContent;
+
+    expect(button).toBeInTheDocument();
+    expect(buttonLabel).toBe('Continue');
+    fireEvent.click(button);
+
+    const loadingSpinner = screen.getByTestId('loading-spinner');
+
+    expect(loadingSpinner).toBeInTheDocument();
+    waitFor(() => expect(loadingSpinner).not.toBeInTheDocument(), {
+      timeout: 3001,
+    });
+    expect(buttonLabel).toBe('Continue');
+  });
+});

From b13771f97d0b427f88a59fe4829a4a3764eec3de Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Tue, 23 Jul 2024 19:47:56 -0400
Subject: [PATCH 008/118] fix(LeagueCard.tsx): added hover styles that were
 unintentionally removed

---
 components/LeagueCard/LeagueCard.test.tsx | 1 -
 components/LeagueCard/LeagueCard.tsx      | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/components/LeagueCard/LeagueCard.test.tsx b/components/LeagueCard/LeagueCard.test.tsx
index 9269153d..e6c1a67e 100644
--- a/components/LeagueCard/LeagueCard.test.tsx
+++ b/components/LeagueCard/LeagueCard.test.tsx
@@ -1,5 +1,4 @@
 import { LeagueCard } from './LeagueCard';
-import Link from 'next/link';
 import { render, screen, fireEvent } from '@testing-library/react';
 import React from 'react';
 
diff --git a/components/LeagueCard/LeagueCard.tsx b/components/LeagueCard/LeagueCard.tsx
index 87a88273..bea15c39 100644
--- a/components/LeagueCard/LeagueCard.tsx
+++ b/components/LeagueCard/LeagueCard.tsx
@@ -26,7 +26,7 @@ const LeagueCard = React.forwardRef<HTMLAnchorElement, ILeagueCardProps>(
       data-testid="LeagueCard"
       href={href}
       className={cn(
-        'LeagueCard flex max-h-32 place-items-center gap-6 rounded-lg border bg-card p-4 text-card-foreground shadow-sm dark:border-zinc-800',
+        'LeagueCard flex max-h-32 place-items-center gap-6 rounded-lg  border bg-card p-4 text-card-foreground shadow-sm hover:bg-zinc-800 dark:border-zinc-800',
       )}
       ref={ref}
     >

From 7405e328e57deb71690cfea8d96f3fdeef00280d Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Tue, 23 Jul 2024 19:53:14 -0400
Subject: [PATCH 009/118] fix(league/all/page.tsx): revereted loading text
 value back so the test would pass

---
 app/(main)/league/all/page.test.tsx | 2 +-
 app/(main)/league/all/page.tsx      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/(main)/league/all/page.test.tsx b/app/(main)/league/all/page.test.tsx
index d234102d..43dc23f1 100644
--- a/app/(main)/league/all/page.test.tsx
+++ b/app/(main)/league/all/page.test.tsx
@@ -21,7 +21,7 @@ jest.mock('@/api/apiFunctions', () => ({
 }));
 
 describe('Leagues Component', () => {
-  const mockUseDataStore = useDataStore as jest.Mock;
+  const mockUseDataStore = useDataStore as unknown as jest.Mock;
   const mockGetUserLeagues = getUserLeagues as jest.Mock;
   const mockGetGameWeek = getGameWeek as jest.Mock;
 
diff --git a/app/(main)/league/all/page.tsx b/app/(main)/league/all/page.tsx
index cb5abbcd..26df2b59 100644
--- a/app/(main)/league/all/page.tsx
+++ b/app/(main)/league/all/page.tsx
@@ -56,7 +56,7 @@ const Leagues = (): JSX.Element => {
           ))
         ) : (
           <div className="text-center">
-            <p>Loading...</p>
+            <p>You are not enrolled in any leagues</p>
           </div>
         )}
       </section>

From 896684d5b98bbbb1f355d8ddc0873c0f27d22ccf Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Fri, 26 Jul 2024 19:21:29 -0400
Subject: [PATCH 010/118] fix(/login/page.tsx): added router import

---
 app/(main)/login/page.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/(main)/login/page.tsx b/app/(main)/login/page.tsx
index 221d3afc..b356dd08 100644
--- a/app/(main)/login/page.tsx
+++ b/app/(main)/login/page.tsx
@@ -20,6 +20,7 @@ import LinkCustom from '@/components/LinkCustom/LinkCustom';
 import LoadingSpinner from '@/components/LoadingSpinner/LoadingSpinner';
 import Logo from '@/components/Logo/Logo';
 import logo from '@/public/assets/logo-colored-outline.svg';
+import router from 'next/router';
 
 /**
  * The schema for the login form.

From ada9f2a3bef37a7b00693ea1dfa32e992f84bbfb Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Sat, 27 Jul 2024 10:02:52 -0400
Subject: [PATCH 011/118] test(LoadingSpinner.test.tsx): test only the
 loadingspinner component and it's classes

previously I was recreating the useState as seen on /login/page.tsx to implement the LoadingSpinner when the login button is clicked. Removed this to only include testing of the actual component.
---
 app/(main)/login/page.tsx                     |  2 +-
 .../LoadingSpinner/LoadingSpinner.test.tsx    | 48 ++++---------------
 2 files changed, 10 insertions(+), 40 deletions(-)

diff --git a/app/(main)/login/page.tsx b/app/(main)/login/page.tsx
index b356dd08..b7a8c3c4 100644
--- a/app/(main)/login/page.tsx
+++ b/app/(main)/login/page.tsx
@@ -12,7 +12,6 @@ import {
   FormMessage,
 } from '../../../components/Form/Form';
 import { Input } from '@/components/Input/Input';
-import React, { useEffect, useState } from 'react';
 import { useAuthContext } from '@/context/AuthContextProvider';
 import { z } from 'zod';
 import { zodResolver } from '@hookform/resolvers/zod';
@@ -20,6 +19,7 @@ import LinkCustom from '@/components/LinkCustom/LinkCustom';
 import LoadingSpinner from '@/components/LoadingSpinner/LoadingSpinner';
 import Logo from '@/components/Logo/Logo';
 import logo from '@/public/assets/logo-colored-outline.svg';
+import React, { useEffect, useState } from 'react';
 import router from 'next/router';
 
 /**
diff --git a/components/LoadingSpinner/LoadingSpinner.test.tsx b/components/LoadingSpinner/LoadingSpinner.test.tsx
index 1708ce63..ce9ba69a 100644
--- a/components/LoadingSpinner/LoadingSpinner.test.tsx
+++ b/components/LoadingSpinner/LoadingSpinner.test.tsx
@@ -1,47 +1,17 @@
-import { Button } from '../Button/Button';
-import { render, fireEvent, waitFor, screen } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import LoadingSpinner from './LoadingSpinner';
-import React, { useState } from 'react';
+import React from 'react';
 
 describe('LoadingSpinner', () => {
-  it('should render the loading spinner component when the button is clicked', () => {
-    const TestButton = () => {
-      const [isLoading, setIsLoading] = useState(false);
-
-      function mockSendingData() {
-        return new Promise((resolve) => {
-          setIsLoading(true);
-          setTimeout(() => {
-            resolve(setIsLoading(false));
-          }, 3000);
-        });
-      }
-
-      return (
-        <Button
-          data-testid="continue-button"
-          disabled={isLoading}
-          label={isLoading ? <LoadingSpinner /> : 'Continue'}
-          onClick={mockSendingData}
-          type="submit"
-        />
-      );
-    };
-    render(<TestButton />);
-
-    const button = screen.getByTestId('continue-button');
-    const buttonLabel = button.textContent;
-
-    expect(button).toBeInTheDocument();
-    expect(buttonLabel).toBe('Continue');
-    fireEvent.click(button);
-
+  it('should render correctly with the proper classes', () => {
+    render(<LoadingSpinner />);
     const loadingSpinner = screen.getByTestId('loading-spinner');
 
     expect(loadingSpinner).toBeInTheDocument();
-    waitFor(() => expect(loadingSpinner).not.toBeInTheDocument(), {
-      timeout: 3001,
-    });
-    expect(buttonLabel).toBe('Continue');
+    expect(loadingSpinner).toHaveClass(
+      'loading-spinner',
+      'animate-spin',
+      'motion-reduce:hidden',
+    );
   });
 });

From f4f6297180ef1db939cbaf5de668d25e87206e03 Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Sat, 27 Jul 2024 11:07:37 -0400
Subject: [PATCH 012/118] fix(register/page.tsx-and-login/page.tsx): updated
 userouter import to next/navigation as we are using the app directory

---
 app/(main)/login/page.test.tsx |  2 +-
 app/(main)/login/page.tsx      |  4 +++-
 app/(main)/register/page.tsx   | 24 ++++++++++++------------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/(main)/login/page.test.tsx b/app/(main)/login/page.test.tsx
index 85265897..a9656203 100644
--- a/app/(main)/login/page.test.tsx
+++ b/app/(main)/login/page.test.tsx
@@ -86,4 +86,4 @@ describe('Login', () => {
 
     expect(mockPush).toHaveBeenCalledWith('/league/all');
   });
-});
\ No newline at end of file
+});
diff --git a/app/(main)/login/page.tsx b/app/(main)/login/page.tsx
index b7a8c3c4..d240348e 100644
--- a/app/(main)/login/page.tsx
+++ b/app/(main)/login/page.tsx
@@ -20,7 +20,7 @@ import LoadingSpinner from '@/components/LoadingSpinner/LoadingSpinner';
 import Logo from '@/components/Logo/Logo';
 import logo from '@/public/assets/logo-colored-outline.svg';
 import React, { useEffect, useState } from 'react';
-import router from 'next/router';
+import { useRouter } from 'next/navigation';
 
 /**
  * The schema for the login form.
@@ -50,6 +50,7 @@ type LoginUserSchemaType = z.infer<typeof LoginUserSchema>;
  * @returns {React.JSX.Element} The rendered login page.
  */
 const Login = (): React.JSX.Element => {
+  const router = useRouter();
   const { login, isSignedIn, getUser } = useAuthContext();
   const [isLoading, setIsLoading] = useState(false);
 
@@ -58,6 +59,7 @@ const Login = (): React.JSX.Element => {
       getUser();
       router.push('/league/all');
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isSignedIn, getUser]);
 
   const form = useForm<LoginUserSchemaType>({
diff --git a/app/(main)/register/page.tsx b/app/(main)/register/page.tsx
index aef09212..60129e8c 100644
--- a/app/(main)/register/page.tsx
+++ b/app/(main)/register/page.tsx
@@ -2,18 +2,9 @@
 // Licensed under the MIT License.
 
 'use client';
-import React, { JSX, useEffect } from 'react';
-import { useRouter } from 'next/navigation';
-import { Input } from '@/components/Input/Input';
-import Logo from '@/components/Logo/Logo';
+import { AlertVariants } from '@/components/AlertNotification/Alerts.enum';
 import { Button } from '@/components/Button/Button';
-import { registerAccount } from '@/api/apiFunctions';
-import logo from '/public/assets/logo-colored-outline.svg';
-import { useAuthContext } from '@/context/AuthContextProvider';
-import LinkCustom from '@/components/LinkCustom/LinkCustom';
-import { z } from 'zod';
 import { Control, useForm, useWatch, SubmitHandler } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
 import {
   Form,
   FormControl,
@@ -21,9 +12,18 @@ import {
   FormItem,
   FormMessage,
 } from '../../../components/Form/Form';
+import { Input } from '@/components/Input/Input';
+import { registerAccount } from '@/api/apiFunctions';
 import { toast } from 'react-hot-toast';
+import { useAuthContext } from '@/context/AuthContextProvider';
+import { useRouter } from 'next/navigation';
+import { z } from 'zod';
+import { zodResolver } from '@hookform/resolvers/zod';
 import Alert from '@/components/AlertNotification/AlertNotification';
-import { AlertVariants } from '@/components/AlertNotification/Alerts.enum';
+import LinkCustom from '@/components/LinkCustom/LinkCustom';
+import Logo from '@/components/Logo/Logo';
+import logo from '/public/assets/logo-colored-outline.svg';
+import React, { JSX, useEffect } from 'react';
 
 const RegisterUserSchema = z
   .object({
@@ -59,6 +59,7 @@ const Register = (): JSX.Element => {
     if (isSignedIn) {
       router.push('/league/all');
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isSignedIn]);
 
   const form = useForm<RegisterUserSchemaType>({
@@ -67,7 +68,6 @@ const Register = (): JSX.Element => {
 
   /**
    * The current value of the 'email' field in the form.
-   *
    * @type {string}
    */
   const email: string = useWatch({

From a5ff75eef230bd2ab6a3a052eb825ab37837474a Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Thu, 8 Aug 2024 20:10:52 -0400
Subject: [PATCH 013/118] feat(loadingspinner.tsx): move data-testid to
 loadingspinner containing div

---
 components/LoadingSpinner/LoadingSpinner.tsx | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/components/LoadingSpinner/LoadingSpinner.tsx b/components/LoadingSpinner/LoadingSpinner.tsx
index b0a9e5f5..6cc7a292 100644
--- a/components/LoadingSpinner/LoadingSpinner.tsx
+++ b/components/LoadingSpinner/LoadingSpinner.tsx
@@ -10,14 +10,12 @@ import React from 'react';
 const LoadingSpinner = (): React.JSX.Element => {
   return (
     <div
+      className="loading-spinner-container grid place-content-center text-center"
+      data-testid="loading-spinner"
       role="alert"
       tabIndex={-1}
-      className="loading-spinner-container grid place-content-center text-center"
     >
-      <div
-        className="loading-spinner min-w-[1.75rem] max-w-[2.25rem] min-h-[1.75rem] max-h-[2.25rem] rounded-full border-4 border-t-muted-foreground border-foreground animate-spin motion-reduce:hidden"
-        data-testid="loading-spinner"
-      />
+      <div className="loading-spinner min-w-[1.75rem] max-w-[2.25rem] min-h-[1.75rem] max-h-[2.25rem] rounded-full border-4 border-t-muted-foreground border-foreground animate-spin motion-reduce:hidden" />
       <p className="sr-only motion-reduce:not-sr-only">Loading...</p>
     </div>
   );

From c57250af0d1cc408950512270ea75e58a50e35fa Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Fri, 9 Aug 2024 17:50:49 -0400
Subject: [PATCH 014/118] test(LoadingSpinner.test.tsx): remove line checking
 for classes as I moved the data-testid to the container for the spinner

---
 components/LoadingSpinner/LoadingSpinner.test.tsx | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/components/LoadingSpinner/LoadingSpinner.test.tsx b/components/LoadingSpinner/LoadingSpinner.test.tsx
index ce9ba69a..985822fd 100644
--- a/components/LoadingSpinner/LoadingSpinner.test.tsx
+++ b/components/LoadingSpinner/LoadingSpinner.test.tsx
@@ -8,10 +8,5 @@ describe('LoadingSpinner', () => {
     const loadingSpinner = screen.getByTestId('loading-spinner');
 
     expect(loadingSpinner).toBeInTheDocument();
-    expect(loadingSpinner).toHaveClass(
-      'loading-spinner',
-      'animate-spin',
-      'motion-reduce:hidden',
-    );
   });
 });

From 3691ac6f4ea82dbee96513430e144ce0c3bd6e29 Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Tue, 13 Aug 2024 11:09:37 -0400
Subject: [PATCH 015/118] change buttonprops label type and remove react from
 loadingspinner for just jsx

---
 components/Button/Button.tsx                 | 2 +-
 components/LoadingSpinner/LoadingSpinner.tsx | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/Button/Button.tsx b/components/Button/Button.tsx
index 27588b38..82c530b9 100644
--- a/components/Button/Button.tsx
+++ b/components/Button/Button.tsx
@@ -38,7 +38,7 @@ const buttonVariants = cva(
 export interface ButtonProps
   extends React.ButtonHTMLAttributes<HTMLButtonElement>,
     VariantProps<typeof buttonVariants> {
-  label?: React.ReactNode;
+  label?: string;
   icon?: JSX.Element;
 }
 
diff --git a/components/LoadingSpinner/LoadingSpinner.tsx b/components/LoadingSpinner/LoadingSpinner.tsx
index 6cc7a292..33be11a0 100644
--- a/components/LoadingSpinner/LoadingSpinner.tsx
+++ b/components/LoadingSpinner/LoadingSpinner.tsx
@@ -1,13 +1,13 @@
 // Copyright (c) Gridiron Survivor.
 // Licensed under the MIT License.
 
-import React from 'react';
+import { JSX } from 'react';
 
 /**
  * Renders a loading spinner.
- * @returns {React.JSX.Element} The rendered loading spinner component.
+ * @returns {JSX.Element} The rendered loading spinner component.
  */
-const LoadingSpinner = (): React.JSX.Element => {
+const LoadingSpinner = (): JSX.Element => {
   return (
     <div
       className="loading-spinner-container grid place-content-center text-center"

From 2fcd56a586946fb1807bc6c75548d899a22aadd4 Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Tue, 13 Aug 2024 11:21:06 -0400
Subject: [PATCH 016/118] (button.tsx): change previous change on buttonprops
 label to a string and instead added options for the label type. it can be a
 boolean, jsx element, or string

---
 components/Button/Button.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/Button/Button.tsx b/components/Button/Button.tsx
index 82c530b9..2415af2e 100644
--- a/components/Button/Button.tsx
+++ b/components/Button/Button.tsx
@@ -38,7 +38,7 @@ const buttonVariants = cva(
 export interface ButtonProps
   extends React.ButtonHTMLAttributes<HTMLButtonElement>,
     VariantProps<typeof buttonVariants> {
-  label?: string;
+  label?: boolean | JSX.Element | string;
   icon?: JSX.Element;
 }
 

From 5bbb240d9868c6c6b4dc9c3df719a3ccd06902dd Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Thu, 15 Aug 2024 19:29:24 -0400
Subject: [PATCH 017/118] sort imports in login page.tsx

---
 app/(main)/login/page.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/(main)/login/page.tsx b/app/(main)/login/page.tsx
index d240348e..b17d7922 100644
--- a/app/(main)/login/page.tsx
+++ b/app/(main)/login/page.tsx
@@ -13,6 +13,7 @@ import {
 } from '../../../components/Form/Form';
 import { Input } from '@/components/Input/Input';
 import { useAuthContext } from '@/context/AuthContextProvider';
+import { useRouter } from 'next/navigation';
 import { z } from 'zod';
 import { zodResolver } from '@hookform/resolvers/zod';
 import LinkCustom from '@/components/LinkCustom/LinkCustom';
@@ -20,7 +21,6 @@ import LoadingSpinner from '@/components/LoadingSpinner/LoadingSpinner';
 import Logo from '@/components/Logo/Logo';
 import logo from '@/public/assets/logo-colored-outline.svg';
 import React, { useEffect, useState } from 'react';
-import { useRouter } from 'next/navigation';
 
 /**
  * The schema for the login form.

From 045fea24c3332a62a2bab9cec560bfec738662c3 Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Thu, 15 Aug 2024 20:13:38 -0400
Subject: [PATCH 018/118] attempt at adding test to login page for loading
 spinner

---
 app/(main)/login/page.test.tsx | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/app/(main)/login/page.test.tsx b/app/(main)/login/page.test.tsx
index a9656203..7e7151ca 100644
--- a/app/(main)/login/page.test.tsx
+++ b/app/(main)/login/page.test.tsx
@@ -1,5 +1,11 @@
 import React from 'react';
-import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import {
+  render,
+  screen,
+  fireEvent,
+  waitFor,
+  act,
+} from '@testing-library/react';
 import Login from './page';
 
 const mockLogin = jest.fn();
@@ -86,4 +92,20 @@ describe('Login', () => {
 
     expect(mockPush).toHaveBeenCalledWith('/league/all');
   });
+
+  test('should show the loading spinner when the form is submitted', async () => {
+    await act(async () => {
+      fireEvent.change(emailInput, {
+        target: { value: 'ryandotfurrer@gmail.com' },
+      });
+      fireEvent.change(passwordInput, { target: { value: 'test1234' } });
+      fireEvent.click(continueButton);
+    });
+
+    screen.debug();
+
+    await waitFor(() => {
+      expect(screen.getByTestId('loading-spinner')).toBeInTheDocument();
+    });
+  });
 });

From 6a454406b84db9c6c30ad7e9dfc7ddc0146ee764 Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Fri, 16 Aug 2024 14:52:04 -0400
Subject: [PATCH 019/118] feat(login/page.tsx): add try and catch statements to
 onSubmit function

---
 app/(main)/login/page.tsx | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/(main)/login/page.tsx b/app/(main)/login/page.tsx
index b17d7922..e087a1af 100644
--- a/app/(main)/login/page.tsx
+++ b/app/(main)/login/page.tsx
@@ -82,10 +82,17 @@ const Login = (): React.JSX.Element => {
    * Handles the form submission.
    * @param {LoginUserSchemaType} data - The data from the form.
    */
-  const onSubmit: SubmitHandler<LoginUserSchemaType> = async (data) => {
-    setIsLoading(true);
-    await login(data);
-    setIsLoading(false);
+  const onSubmit: SubmitHandler<LoginUserSchemaType> = async (
+    data: LoginUserSchemaType,
+  ): Promise<void> => {
+    try {
+      setIsLoading(true);
+      await login(data);
+      setIsLoading(false);
+    } catch (error) {
+      setIsLoading(false);
+      console.error('Login Failed', error);
+    }
   };
 
   return (

From efbf8905c0def2aa5f423adf932e1b8d9e5c9ec5 Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Fri, 16 Aug 2024 17:03:24 -0400
Subject: [PATCH 020/118] attempt to make loadingspinner test work

---
 app/(main)/login/page.test.tsx | 51 ++++++++++++++++++++++------------
 app/(main)/login/page.tsx      |  6 ++--
 2 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/app/(main)/login/page.test.tsx b/app/(main)/login/page.test.tsx
index 7e7151ca..4f97e82a 100644
--- a/app/(main)/login/page.test.tsx
+++ b/app/(main)/login/page.test.tsx
@@ -1,17 +1,18 @@
-import React from 'react';
-import {
-  render,
-  screen,
-  fireEvent,
-  waitFor,
-  act,
-} from '@testing-library/react';
+import React, { useState as useStateMock } from 'react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import Login from './page';
 
 const mockLogin = jest.fn();
 const mockPush = jest.fn();
 const getUser = jest.fn();
 
+jest.mock('react', () => ({
+  ...jest.requireActual('react'),
+  useState: jest.fn(),
+}));
+
+const setIsLoading = jest.fn();
+
 let continueButton: HTMLElement,
   emailInput: HTMLInputElement,
   passwordInput: HTMLInputElement;
@@ -43,6 +44,7 @@ describe('Login', () => {
     jest.clearAllMocks();
 
     render(<Login />);
+
     emailInput = screen.getByTestId('email');
     passwordInput = screen.getByTestId('password');
     continueButton = screen.getByTestId('continue-button');
@@ -92,20 +94,35 @@ describe('Login', () => {
 
     expect(mockPush).toHaveBeenCalledWith('/league/all');
   });
+});
 
-  test('should show the loading spinner when the form is submitted', async () => {
-    await act(async () => {
-      fireEvent.change(emailInput, {
-        target: { value: 'ryandotfurrer@gmail.com' },
-      });
-      fireEvent.change(passwordInput, { target: { value: 'test1234' } });
-      fireEvent.click(continueButton);
+describe('Login loading spinner', () => {
+  (useStateMock as jest.Mock).mockImplementation((init: boolean) => [
+    init,
+    setIsLoading,
+  ]);
+  it('should show the loading spinner', async () => {
+    (useStateMock as jest.Mock).mockImplementation((init: boolean) => [
+      true,
+      setIsLoading,
+    ]);
+
+    // render(<Login />);
+
+    await waitFor(() => {
+      expect(screen.queryByTestId('loading-spinner')).toBeInTheDocument();
     });
+  });
+  it('should not show the loading spinner', async () => {
+    (useStateMock as jest.Mock).mockImplementation((init: boolean) => [
+      false,
+      setIsLoading,
+    ]);
 
-    screen.debug();
+    // render(<Login />);
 
     await waitFor(() => {
-      expect(screen.getByTestId('loading-spinner')).toBeInTheDocument();
+      expect(screen.queryByTestId('loading-spinner')).not.toBeInTheDocument();
     });
   });
 });
diff --git a/app/(main)/login/page.tsx b/app/(main)/login/page.tsx
index e087a1af..2330e296 100644
--- a/app/(main)/login/page.tsx
+++ b/app/(main)/login/page.tsx
@@ -137,7 +137,7 @@ const Login = (): React.JSX.Element => {
                       {...field}
                     />
                   </FormControl>
-                  {form.formState.errors.email && (
+                  {form.formState.errors?.email && (
                     <FormMessage>
                       {form.formState.errors.email.message}
                     </FormMessage>
@@ -158,9 +158,9 @@ const Login = (): React.JSX.Element => {
                       {...field}
                     />
                   </FormControl>
-                  {form.formState.errors.password && (
+                  {form.formState.errors?.password && (
                     <FormMessage>
-                      {form.formState.errors.password.message}
+                      {form.formState.errors?.password.message}
                     </FormMessage>
                   )}
                 </FormItem>

From 4b7be562214a2933efa8e7c918331f142523d632 Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Tue, 20 Aug 2024 20:12:07 -0400
Subject: [PATCH 021/118] implemented shashi's testing logic for the
 loadingspinner on the login page test

---
 app/(main)/login/page.test.tsx | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/(main)/login/page.test.tsx b/app/(main)/login/page.test.tsx
index 4f97e82a..aed86bdd 100644
--- a/app/(main)/login/page.test.tsx
+++ b/app/(main)/login/page.test.tsx
@@ -1,18 +1,18 @@
-import React, { useState as useStateMock } from 'react';
+import React, { Dispatch, useState as useStateMock } from 'react';
 import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import Login from './page';
 
 const mockLogin = jest.fn();
 const mockPush = jest.fn();
 const getUser = jest.fn();
+const setIsLoading = jest.fn();
+const setState = jest.fn();
 
 jest.mock('react', () => ({
   ...jest.requireActual('react'),
   useState: jest.fn(),
 }));
 
-const setIsLoading = jest.fn();
-
 let continueButton: HTMLElement,
   emailInput: HTMLInputElement,
   passwordInput: HTMLInputElement;
@@ -40,8 +40,14 @@ jest.mock('../../../context/AuthContextProvider', () => ({
 }));
 
 describe('Login', () => {
+  const setIsLoading = jest.fn();
+  const useStateMock = (init: any): [unknown, Dispatch<unknown>] => [
+    init,
+    setState,
+  ];
   beforeEach(() => {
     jest.clearAllMocks();
+    jest.spyOn(React, 'useState').mockImplementation(useStateMock);
 
     render(<Login />);
 
@@ -70,7 +76,7 @@ describe('Login', () => {
     fireEvent.change(passwordInput, { target: { value: 'password123' } });
     fireEvent.click(continueButton);
 
-    await waitFor(() => {
+    waitFor(() => {
       expect(mockLogin).toHaveBeenCalledWith({
         email: 'test@example.com',
         password: 'password123',
@@ -97,17 +103,13 @@ describe('Login', () => {
 });
 
 describe('Login loading spinner', () => {
-  (useStateMock as jest.Mock).mockImplementation((init: boolean) => [
-    init,
-    setIsLoading,
-  ]);
   it('should show the loading spinner', async () => {
     (useStateMock as jest.Mock).mockImplementation((init: boolean) => [
       true,
       setIsLoading,
     ]);
 
-    // render(<Login />);
+    render(<Login />);
 
     await waitFor(() => {
       expect(screen.queryByTestId('loading-spinner')).toBeInTheDocument();
@@ -119,7 +121,7 @@ describe('Login loading spinner', () => {
       setIsLoading,
     ]);
 
-    // render(<Login />);
+    render(<Login />);
 
     await waitFor(() => {
       expect(screen.queryByTestId('loading-spinner')).not.toBeInTheDocument();

From bbce8916510847e6bff92a12911d34e68803f4b1 Mon Sep 17 00:00:00 2001
From: Carlos <54788134+Clue355@users.noreply.github.com>
Date: Mon, 26 Aug 2024 15:07:43 -0500
Subject: [PATCH 022/118] Clue355/feat(#449): Use input spinner for submission
 buttons (#453)

- added spinner component to register form

---------

Co-authored-by: Shashi Lo <362527+shashilo@users.noreply.github.com>
---
 app/(main)/register/page.test.tsx | 48 +++++++++++++++++++++++++++----
 app/(main)/register/page.tsx      | 21 ++++++++------
 2 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/app/(main)/register/page.test.tsx b/app/(main)/register/page.test.tsx
index 10d46e2f..2d6c108c 100644
--- a/app/(main)/register/page.test.tsx
+++ b/app/(main)/register/page.test.tsx
@@ -1,4 +1,10 @@
-import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import {
+  render,
+  screen,
+  fireEvent,
+  waitFor,
+} from '@testing-library/react';
+import React, { Dispatch, useState as useStateMock } from 'react';
 import Register from './page';
 import { registerAccount } from '@/api/apiFunctions';
 import Alert from '@/components/AlertNotification/AlertNotification';
@@ -7,8 +13,15 @@ import { toast } from 'react-hot-toast';
 
 const mockLogin = jest.fn();
 const mockPush = jest.fn();
+const setIsLoading = jest.fn();
+const setState = jest.fn();
 
-jest.mock('../../../api/apiFunctions', () => ({
+jest.mock('react', () => ({
+  ...jest.requireActual('react'),
+  useState: jest.fn()
+}));
+
+jest.mock('@/api/apiFunctions', () => ({
   registerAccount: jest.fn(),
 }));
 
@@ -44,8 +57,11 @@ jest.mock('../../../context/AuthContextProvider', () => ({
 }));
 
 describe('Register', () => {
+  const setIsLoading = jest.fn();
+  const useStateMock = (init: any): [unknown, Dispatch<unknown>] => [init, setState];
   beforeEach(() => {
     jest.clearAllMocks();
+    jest.spyOn(React, 'useState').mockImplementation(useStateMock);
 
     render(<Register />);
 
@@ -84,9 +100,10 @@ describe('Register', () => {
     fireEvent.change(emailInput, { target: { value: 'rt@example.com' } });
     fireEvent.change(passwordInput, { target: { value: 'rawr123' } });
     fireEvent.change(confirmPasswordInput, { target: { value: 'rawr123' } });
-    fireEvent.click(continueButton);
+    fireEvent.submit(continueButton);
 
     await waitFor(() => {
+      expect(registerAccount).toHaveBeenCalledTimes(1);
       expect(registerAccount).toHaveBeenCalledWith({
         email: 'rt@example.com',
         password: 'rawr123',
@@ -116,7 +133,7 @@ describe('Register', () => {
     fireEvent.change(emailInput, { target: { value: 'test@test.com' } });
     fireEvent.change(passwordInput, { target: { value: 'pw1234' } });
     fireEvent.change(confirmPasswordInput, { target: { value: 'pw1234' } });
-    fireEvent.click(continueButton);
+    fireEvent.submit(continueButton);
 
     await waitFor(() => {
       expect(registerAccount).toHaveBeenCalledWith({
@@ -147,7 +164,7 @@ describe('Register', () => {
     fireEvent.change(emailInput, { target: { value: 'test@test.com' } });
     fireEvent.change(passwordInput, { target: { value: 'pw1234' } });
     fireEvent.change(confirmPasswordInput, { target: { value: 'pw1234' } });
-    fireEvent.click(continueButton);
+    fireEvent.submit(continueButton);
 
     await waitFor(() => {
       expect(registerAccount).toHaveBeenCalledWith({
@@ -171,3 +188,24 @@ describe('Register', () => {
     expect(darkModeSection).toHaveClass('dark:bg-gradient-to-b');
   });
 });
+
+describe('Register loading spinner', () => {
+  it('should show the loading spinner', async () => {
+    (useStateMock as jest.Mock).mockImplementation((init: boolean) => [true, setIsLoading]);
+
+    render(<Register />);
+
+    await waitFor(() => {
+      expect(screen.queryByTestId('loading-spinner')).toBeInTheDocument();
+    });
+  });
+  it('should not show the loading spinner', async () => {
+    (useStateMock as jest.Mock).mockImplementation((init: boolean) => [false, setIsLoading]);
+
+    render(<Register />);
+
+    await waitFor(() => {
+      expect(screen.queryByTestId('loading-spinner')).not.toBeInTheDocument();
+    });
+  });
+});
diff --git a/app/(main)/register/page.tsx b/app/(main)/register/page.tsx
index 60129e8c..22aea636 100644
--- a/app/(main)/register/page.tsx
+++ b/app/(main)/register/page.tsx
@@ -23,7 +23,8 @@ import Alert from '@/components/AlertNotification/AlertNotification';
 import LinkCustom from '@/components/LinkCustom/LinkCustom';
 import Logo from '@/components/Logo/Logo';
 import logo from '/public/assets/logo-colored-outline.svg';
-import React, { JSX, useEffect } from 'react';
+import React, { JSX, useEffect, useState } from 'react';
+import LoadingSpinner from '@/components/LoadingSpinner/LoadingSpinner';
 
 const RegisterUserSchema = z
   .object({
@@ -54,6 +55,7 @@ type RegisterUserSchemaType = z.infer<typeof RegisterUserSchema>;
 const Register = (): JSX.Element => {
   const router = useRouter();
   const { login, isSignedIn } = useAuthContext();
+  const [isLoading, setIsLoading] = useState(false);
 
   useEffect(() => {
     if (isSignedIn) {
@@ -105,8 +107,10 @@ const Register = (): JSX.Element => {
     data: RegisterUserSchemaType,
   ): Promise<void> => {
     try {
+      setIsLoading(true);
       await registerAccount(data);
       await login(data);
+      setIsLoading(false);
       router.push('/league/all');
       toast.custom(
         <Alert
@@ -115,6 +119,7 @@ const Register = (): JSX.Element => {
         />,
       );
     } catch (error) {
+      setIsLoading(false);
       console.error('Registration Failed', error);
       toast.custom(
         <Alert variant={AlertVariants.Error} message="Something went wrong!" />,
@@ -169,9 +174,9 @@ const Register = (): JSX.Element => {
                       {...field}
                     />
                   </FormControl>
-                  {form.formState.errors.email && (
+                  {form.formState.errors?.email && (
                     <FormMessage>
-                      {form.formState.errors.email.message}
+                      {form.formState.errors?.email.message}
                     </FormMessage>
                   )}
                 </FormItem>
@@ -190,9 +195,9 @@ const Register = (): JSX.Element => {
                       {...field}
                     />
                   </FormControl>
-                  {form.formState.errors.password && (
+                  {form.formState.errors?.password && (
                     <FormMessage>
-                      {form.formState.errors.password.message}
+                      {form.formState.errors?.password.message}
                     </FormMessage>
                   )}
                 </FormItem>
@@ -211,9 +216,9 @@ const Register = (): JSX.Element => {
                       {...field}
                     />
                   </FormControl>
-                  {form.formState.errors.confirmPassword && (
+                  {form.formState.errors?.confirmPassword && (
                     <FormMessage>
-                      {form.formState.errors.confirmPassword.message}
+                      {form.formState.errors?.confirmPassword.message}
                     </FormMessage>
                   )}
                 </FormItem>
@@ -222,7 +227,7 @@ const Register = (): JSX.Element => {
 
             <Button
               data-testid="continue-button"
-              label="Register"
+              label={isLoading ? <LoadingSpinner /> : 'Continue'}
               type="submit"
               disabled={isDisabled}
             />

From 0803b5a613abbc8c64e312282de1763e32296388 Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Wed, 28 Aug 2024 21:01:37 -0400
Subject: [PATCH 023/118] address comments in latest PR review including
 updating the login page test, throwing an error rather than conosole.error,
 and revering changes in the loading spinner componenet.

---
 app/(main)/login/page.test.tsx               | 6 ++++--
 app/(main)/login/page.tsx                    | 5 ++---
 components/LoadingSpinner/LoadingSpinner.tsx | 6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/(main)/login/page.test.tsx b/app/(main)/login/page.test.tsx
index aed86bdd..d69b9a14 100644
--- a/app/(main)/login/page.test.tsx
+++ b/app/(main)/login/page.test.tsx
@@ -1,6 +1,7 @@
 import React, { Dispatch, useState as useStateMock } from 'react';
 import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import Login from './page';
+import { loginAccount } from '@/api/apiFunctions';
 
 const mockLogin = jest.fn();
 const mockPush = jest.fn();
@@ -74,9 +75,10 @@ describe('Login', () => {
   test('should call loginAccount function with email and password when continue button is clicked', async () => {
     fireEvent.change(emailInput, { target: { value: 'test@example.com' } });
     fireEvent.change(passwordInput, { target: { value: 'password123' } });
-    fireEvent.click(continueButton);
+    fireEvent.submit(continueButton);
 
-    waitFor(() => {
+    await waitFor(() => {
+      expect(mockLogin).toHaveBeenCalledTimes(1);
       expect(mockLogin).toHaveBeenCalledWith({
         email: 'test@example.com',
         password: 'password123',
diff --git a/app/(main)/login/page.tsx b/app/(main)/login/page.tsx
index 2330e296..b9cc3787 100644
--- a/app/(main)/login/page.tsx
+++ b/app/(main)/login/page.tsx
@@ -89,9 +89,8 @@ const Login = (): React.JSX.Element => {
       setIsLoading(true);
       await login(data);
       setIsLoading(false);
-    } catch (error) {
-      setIsLoading(false);
-      console.error('Login Failed', error);
+    } finally {
+      throw new Error('An error occurred while logging in');
     }
   };
 
diff --git a/components/LoadingSpinner/LoadingSpinner.tsx b/components/LoadingSpinner/LoadingSpinner.tsx
index 33be11a0..6cc7a292 100644
--- a/components/LoadingSpinner/LoadingSpinner.tsx
+++ b/components/LoadingSpinner/LoadingSpinner.tsx
@@ -1,13 +1,13 @@
 // Copyright (c) Gridiron Survivor.
 // Licensed under the MIT License.
 
-import { JSX } from 'react';
+import React from 'react';
 
 /**
  * Renders a loading spinner.
- * @returns {JSX.Element} The rendered loading spinner component.
+ * @returns {React.JSX.Element} The rendered loading spinner component.
  */
-const LoadingSpinner = (): JSX.Element => {
+const LoadingSpinner = (): React.JSX.Element => {
   return (
     <div
       className="loading-spinner-container grid place-content-center text-center"

From 1a86fce3ef1cf086f392b16250da27c41e109c03 Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Wed, 28 Aug 2024 21:06:14 -0400
Subject: [PATCH 024/118] fix build error pertaining to the new throw in login
 page.tsx

---
 app/(main)/login/page.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/(main)/login/page.tsx b/app/(main)/login/page.tsx
index b9cc3787..e0bd7f8d 100644
--- a/app/(main)/login/page.tsx
+++ b/app/(main)/login/page.tsx
@@ -89,8 +89,11 @@ const Login = (): React.JSX.Element => {
       setIsLoading(true);
       await login(data);
       setIsLoading(false);
-    } finally {
+    } catch (error) {
+      console.error(error);
       throw new Error('An error occurred while logging in');
+    } finally {
+      setIsLoading(false);
     }
   };
 

From da6a593f54da4eb8f5f98ccf8c8bcf1a1e7c7d86 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Wed, 28 Aug 2024 23:21:33 -0400
Subject: [PATCH 025/118] release v0.3.0-alpha

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1369bf59..1415dfb8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "0.2.2",
+  "version": "0.3.0",
   "scripts": {
     "dev": "next dev",
     "build": "next build",

From 68f5ac5c599cffcecdfd0fd1739e791f6f600bf8 Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Fri, 30 Aug 2024 09:37:45 -0400
Subject: [PATCH 026/118] remove redundant setIsLoading(false) from try
 statement

---
 app/(main)/login/page.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/(main)/login/page.tsx b/app/(main)/login/page.tsx
index e0bd7f8d..15fda69a 100644
--- a/app/(main)/login/page.tsx
+++ b/app/(main)/login/page.tsx
@@ -88,7 +88,6 @@ const Login = (): React.JSX.Element => {
     try {
       setIsLoading(true);
       await login(data);
-      setIsLoading(false);
     } catch (error) {
       console.error(error);
       throw new Error('An error occurred while logging in');

From 585c807551e87571a461dce405b3c3bef89a9ed6 Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Wed, 4 Sep 2024 21:56:06 -0400
Subject: [PATCH 027/118] add `finally` statement to register page `onSubmit`
 function

---
 app/(main)/login/page.tsx    | 2 +-
 app/(main)/register/page.tsx | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/(main)/login/page.tsx b/app/(main)/login/page.tsx
index 15fda69a..8a1f017c 100644
--- a/app/(main)/login/page.tsx
+++ b/app/(main)/login/page.tsx
@@ -89,7 +89,7 @@ const Login = (): React.JSX.Element => {
       setIsLoading(true);
       await login(data);
     } catch (error) {
-      console.error(error);
+      console.error('Login error:', error);
       throw new Error('An error occurred while logging in');
     } finally {
       setIsLoading(false);
diff --git a/app/(main)/register/page.tsx b/app/(main)/register/page.tsx
index 22aea636..a909eb8f 100644
--- a/app/(main)/register/page.tsx
+++ b/app/(main)/register/page.tsx
@@ -110,7 +110,6 @@ const Register = (): JSX.Element => {
       setIsLoading(true);
       await registerAccount(data);
       await login(data);
-      setIsLoading(false);
       router.push('/league/all');
       toast.custom(
         <Alert
@@ -119,11 +118,13 @@ const Register = (): JSX.Element => {
         />,
       );
     } catch (error) {
-      setIsLoading(false);
       console.error('Registration Failed', error);
       toast.custom(
         <Alert variant={AlertVariants.Error} message="Something went wrong!" />,
       );
+      throw new Error('An error occurred while registering your account');
+    } finally {
+      setIsLoading(false);
     }
   };
 

From 97333ae10a5d85b54ca21b3a3c94f681350d5338 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Thu, 5 Sep 2024 13:19:19 -0400
Subject: [PATCH 028/118] release v0.4.0-alpha

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1369bf59..d7c25669 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "0.2.2",
+  "version": "0.4.0",
   "scripts": {
     "dev": "next dev",
     "build": "next build",

From 642ae8f87946fa1c15cd933e587f52ef13cdfa99 Mon Sep 17 00:00:00 2001
From: Shashi Lo <362527+shashilo@users.noreply.github.com>
Date: Thu, 5 Sep 2024 14:27:39 -0500
Subject: [PATCH 029/118] Fixing release bugs (#502)

---
 app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx | 5 +++--
 app/(main)/league/[leagueId]/entry/all/page.tsx            | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
index 20f5cb06..77b0877f 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
@@ -99,8 +99,8 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
       });
 
       if (userWeeklyPickResults?.[user.id]?.[entry]) {
-        const userPick = userWeeklyPickResults[user.id][entry].teamName;
-        setUserPick(userPick.teamName);
+        const userPick = userWeeklyPickResults[user.id][entry];
+        setUserPick(userPick.teamName as unknown as string);
       }
     } catch (error) {
       console.error('Error getting weekly pick:', error);
@@ -180,6 +180,7 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
 
     try {
       await onWeeklyPickChange(params);
+      setUserPick(teamSelect);
     } catch (error) {
       console.error('Submission error:', error);
     }
diff --git a/app/(main)/league/[leagueId]/entry/all/page.tsx b/app/(main)/league/[leagueId]/entry/all/page.tsx
index cbd69dec..118ff4b4 100644
--- a/app/(main)/league/[leagueId]/entry/all/page.tsx
+++ b/app/(main)/league/[leagueId]/entry/all/page.tsx
@@ -196,7 +196,7 @@ const Entry = ({
                 const selectedTeam = entry.selectedTeams[currentWeek - 1];
                 const isPickSet =
                   // eslint-disable-next-line no-undefined
-                  selectedTeam !== undefined;
+                  selectedTeam !== null && selectedTeam !== undefined;
 
                 const teamLogo = NFLTeams.find(
                   (teams) => teams.teamName === selectedTeam,

From 95ccb1df2c7f985a2ca7eb41179699ab6e6168c4 Mon Sep 17 00:00:00 2001
From: Shashi Lo <362527+shashilo@users.noreply.github.com>
Date: Thu, 5 Sep 2024 14:57:08 -0500
Subject: [PATCH 030/118] Shashi/fixing release bugs (#503)

---
 app/(main)/register/page.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/(main)/register/page.tsx b/app/(main)/register/page.tsx
index 60129e8c..c44b8482 100644
--- a/app/(main)/register/page.tsx
+++ b/app/(main)/register/page.tsx
@@ -107,7 +107,6 @@ const Register = (): JSX.Element => {
     try {
       await registerAccount(data);
       await login(data);
-      router.push('/league/all');
       toast.custom(
         <Alert
           variant={AlertVariants.Success}

From 650a3e135d2a172cf72295dced9bf83cd03ce9f2 Mon Sep 17 00:00:00 2001
From: Shashi Lo <362527+shashilo@users.noreply.github.com>
Date: Thu, 5 Sep 2024 15:01:58 -0500
Subject: [PATCH 031/118] Shashi/fixing release bugs (#504)

---
 app/(main)/register/page.test.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/(main)/register/page.test.tsx b/app/(main)/register/page.test.tsx
index 10d46e2f..564e9c46 100644
--- a/app/(main)/register/page.test.tsx
+++ b/app/(main)/register/page.test.tsx
@@ -129,7 +129,6 @@ describe('Register', () => {
         password: 'pw1234',
         confirmPassword: 'pw1234',
       });
-      expect(mockPush).toHaveBeenCalledWith('/league/all');
       expect(toast.custom).toHaveBeenCalledWith(
         <Alert
           variant={AlertVariants.Success}

From f374ce3daa3d66f863bb6e0778150f143005c5e6 Mon Sep 17 00:00:00 2001
From: Shashi Lo <362527+shashilo@users.noreply.github.com>
Date: Tue, 10 Sep 2024 15:44:08 -0500
Subject: [PATCH 032/118] Update package.json to correct version 0.3.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d7c25669..1415dfb8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "0.4.0",
+  "version": "0.3.0",
   "scripts": {
     "dev": "next dev",
     "build": "next build",

From 88375abc3d5d906c477f3e29ca5abe775d9994e5 Mon Sep 17 00:00:00 2001
From: Shashi Lo <362527+shashilo@users.noreply.github.com>
Date: Tue, 10 Sep 2024 15:57:40 -0500
Subject: [PATCH 033/118] Update package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1415dfb8..93a3c9fc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "0.3.0",
+  "version": "0.3.1",
   "scripts": {
     "dev": "next dev",
     "build": "next build",

From f1dbf17d93f14decda64822bca4895337c14ee52 Mon Sep 17 00:00:00 2001
From: Alex Appleget <alexappleget2014@gmail.com>
Date: Wed, 11 Sep 2024 13:02:59 -0500
Subject: [PATCH 034/118] Fix: Added in 'home' and 'away' labels to each team
 and added an '@' in between.

---
 .../entry/[entryId]/week/WeekTeams.tsx        | 39 ++++++++++------
 .../WeeklyPickButton/WeeklyPickButton.tsx     | 46 +++++++++++--------
 2 files changed, 51 insertions(+), 34 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx
index 2e2c3bad..516fd4fe 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx
@@ -59,25 +59,34 @@ const WeekTeams = ({
   >
     {schedule.map((scheduledGame) => (
       <div
-        className="grid w-full grid-cols-2 gap-4 pb-8"
+        className="grid w-full grid-cols-3 gap-4 pb-8"
+        style={{ direction: 'rtl' }}
         key={scheduledGame.id}
       >
-        <div className="week-page-game-schedule col-span-2 text-center">
+        <div className="week-page-game-schedule col-span-3 text-center">
           <p>{formatDateTime(scheduledGame.date)}</p>
         </div>
-        {scheduledGame.competitions[0].competitors.map((competition) => (
-          <FormItem key={competition.id}>
-            <FormControl>
-              <WeeklyPickButton
-                team={competition.team.name}
-                src={competition.team.logo}
-                isDisabled={hasTeamBeenPicked(
-                  competition.team.name,
-                  selectedTeams,
-                )}
-              />
-            </FormControl>
-          </FormItem>
+        {scheduledGame.competitions[0].competitors.map((competition, index) => (
+          <>
+            {index > 0 && (
+              <div className="text-center flex items-center justify-center">
+                <span>@</span>
+              </div>
+            )}
+            <FormItem key={competition.id} className="text-center">
+              <FormControl>
+                <WeeklyPickButton
+                  homeAway={competition.homeAway}
+                  team={competition.team.name}
+                  src={competition.team.logo}
+                  isDisabled={hasTeamBeenPicked(
+                    competition.team.name,
+                    selectedTeams,
+                  )}
+                />
+              </FormControl>
+            </FormItem>
+          </>
         ))}
       </div>
     ))}
diff --git a/components/WeeklyPickButton/WeeklyPickButton.tsx b/components/WeeklyPickButton/WeeklyPickButton.tsx
index d74b400b..b7ef7b7f 100644
--- a/components/WeeklyPickButton/WeeklyPickButton.tsx
+++ b/components/WeeklyPickButton/WeeklyPickButton.tsx
@@ -7,6 +7,7 @@ import { Label } from '../Label/Label';
 import { RadioGroupItem } from '../RadioGroup/RadioGroup';
 
 type WeeklyPickButtonProps = {
+  homeAway: string;
   team: string;
   src: string;
   isDisabled?: boolean;
@@ -18,34 +19,41 @@ type WeeklyPickButtonProps = {
  * @param props.team - The team name
  * @param props.src - The image source
  * @param props.isDisabled - Whether the button is disabled
+ * @param props.homeAway
  * @returns The rendered weekly pick button.
  */
 const WeeklyPickButton: React.FC<WeeklyPickButtonProps> = ({
+  homeAway,
   team,
   src,
   isDisabled = false,
 }): JSX.Element => {
   return (
-    <div className="flex items-center">
-      <RadioGroupItem
-        value={team}
-        id={team}
-        disabled={isDisabled}
-        data-testid="team-radio"
-      />
-      <Label htmlFor={team} data-testid="team-label" disabled={isDisabled}>
-        <Image
-          src={src}
-          alt={team}
-          width={48}
-          height={48}
-          priority
-          data-testid="team-image"
-          className="h-12 w-12"
+    <>
+      <label htmlFor="home" className="capitalize">
+        {homeAway}
+      </label>
+      <div style={{ direction: 'ltr' }} className="flex items-center mt-4">
+        <RadioGroupItem
+          value={team}
+          id={team}
+          disabled={isDisabled}
+          data-testid="team-radio"
         />
-        {team}
-      </Label>
-    </div>
+        <Label htmlFor={team} data-testid="team-label" disabled={isDisabled}>
+          <Image
+            src={src}
+            alt={team}
+            width={48}
+            height={48}
+            priority
+            data-testid="team-image"
+            className="h-12 w-12"
+          />
+          {team}
+        </Label>
+      </div>
+    </>
   );
 };
 

From ca8ef23c75c292af422456a1a95551b68e341368 Mon Sep 17 00:00:00 2001
From: Alex Appleget <alexappleget2014@gmail.com>
Date: Wed, 11 Sep 2024 13:52:33 -0500
Subject: [PATCH 035/118] Fix: Added CSS for grid layout and the @ symbol

---
 .../league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx  | 8 +++++---
 components/WeeklyPickButton/WeeklyPickButton.tsx          | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx
index 516fd4fe..6f78ca05 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx
@@ -59,7 +59,7 @@ const WeekTeams = ({
   >
     {schedule.map((scheduledGame) => (
       <div
-        className="grid w-full grid-cols-3 gap-4 pb-8"
+        className="grid w-full grid-cols-[1fr_auto_1fr] gap-4 pb-8 items-center"
         style={{ direction: 'rtl' }}
         key={scheduledGame.id}
       >
@@ -68,11 +68,13 @@ const WeekTeams = ({
         </div>
         {scheduledGame.competitions[0].competitors.map((competition, index) => (
           <>
+            {/*@*/}
             {index > 0 && (
-              <div className="text-center flex items-center justify-center">
-                <span>@</span>
+              <div>
+                <span className="mx-2">@</span>
               </div>
             )}
+            {/*teams*/}
             <FormItem key={competition.id} className="text-center">
               <FormControl>
                 <WeeklyPickButton
diff --git a/components/WeeklyPickButton/WeeklyPickButton.tsx b/components/WeeklyPickButton/WeeklyPickButton.tsx
index b7ef7b7f..2f0150a7 100644
--- a/components/WeeklyPickButton/WeeklyPickButton.tsx
+++ b/components/WeeklyPickButton/WeeklyPickButton.tsx
@@ -19,7 +19,7 @@ type WeeklyPickButtonProps = {
  * @param props.team - The team name
  * @param props.src - The image source
  * @param props.isDisabled - Whether the button is disabled
- * @param props.homeAway
+ * @param props.homeAway - Shows whether the team is home or away.
  * @returns The rendered weekly pick button.
  */
 const WeeklyPickButton: React.FC<WeeklyPickButtonProps> = ({

From 7ffe06ff100b4232c1d17c119c6b2789f2662d72 Mon Sep 17 00:00:00 2001
From: Alex Appleget <alexappleget2014@gmail.com>
Date: Wed, 11 Sep 2024 14:33:07 -0500
Subject: [PATCH 036/118] Fix: Adjusted CSS for @ symbol to be center (ryan
 helped with this).

---
 .../league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx
index 6f78ca05..16724c60 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx
@@ -59,7 +59,7 @@ const WeekTeams = ({
   >
     {schedule.map((scheduledGame) => (
       <div
-        className="grid w-full grid-cols-[1fr_auto_1fr] gap-4 pb-8 items-center"
+        className="grid w-full grid-cols-[1fr_auto_1fr] gap-4 pb-8"
         style={{ direction: 'rtl' }}
         key={scheduledGame.id}
       >
@@ -68,13 +68,11 @@ const WeekTeams = ({
         </div>
         {scheduledGame.competitions[0].competitors.map((competition, index) => (
           <>
-            {/*@*/}
             {index > 0 && (
-              <div>
+              <div className="h-20 flex self-end items-center">
                 <span className="mx-2">@</span>
               </div>
             )}
-            {/*teams*/}
             <FormItem key={competition.id} className="text-center">
               <FormControl>
                 <WeeklyPickButton

From 8f9dc6a741ce36c13c1dd54e96bc0fe8ab07332f Mon Sep 17 00:00:00 2001
From: Alex Appleget <alexappleget2014@gmail.com>
Date: Wed, 11 Sep 2024 14:59:52 -0500
Subject: [PATCH 037/118] Fix: Had to edit stories.tsx for WeeklyTeamButton to
 fix build errors.

---
 components/WeeklyPickButton/WeeklyPickButton.stories.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/components/WeeklyPickButton/WeeklyPickButton.stories.tsx b/components/WeeklyPickButton/WeeklyPickButton.stories.tsx
index a31d275e..360e0865 100644
--- a/components/WeeklyPickButton/WeeklyPickButton.stories.tsx
+++ b/components/WeeklyPickButton/WeeklyPickButton.stories.tsx
@@ -17,6 +17,7 @@ const meta = {
     },
   },
   argTypes: {
+    homeAway: { description: 'Location of game' },
     team: { description: 'Name of the team' },
     src: { description: 'Team logo image source' },
   },
@@ -33,12 +34,13 @@ type Story = StoryObj<typeof meta>;
 const withRadioGroup: Decorator = (Story) => (
   <RadioGroup>
     <Story />
-    <WeeklyPickButton team="Cowboys" src="/assets/team-logo-placeholder.jpg" />
+    <WeeklyPickButton homeAway='Home' team="Cowboys" src="/assets/team-logo-placeholder.jpg" />
   </RadioGroup>
 );
 
 export const Primary: Story = {
   args: {
+    homeAway: 'Home',
     team: 'Ravens',
     src: '/assets/team-logo-placeholder.jpg',
   },

From cd7b5fd7c56774aefc1a09c3da71eca64acbbbfe Mon Sep 17 00:00:00 2001
From: Alex Appleget <alexappleget2014@gmail.com>
Date: Wed, 11 Sep 2024 22:14:02 -0500
Subject: [PATCH 038/118] Fix: deleted margin for @ symbol

---
 app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx
index 16724c60..2ed9c61f 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx
@@ -70,7 +70,7 @@ const WeekTeams = ({
           <>
             {index > 0 && (
               <div className="h-20 flex self-end items-center">
-                <span className="mx-2">@</span>
+                <span>@</span>
               </div>
             )}
             <FormItem key={competition.id} className="text-center">

From 764b416a6a6601cc0bb5ef9de74bea40c59f813e Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Thu, 12 Sep 2024 00:05:14 -0400
Subject: [PATCH 039/118] add previous picks to entry view

---
 .../league/[leagueId]/entry/all/page.tsx      |  16 ++-
 .../LeagueEntries/LeagueEntries.interface.ts  |   3 +-
 components/LeagueEntries/LeagueEntries.tsx    | 129 +++++++++++-------
 utils/utils.ts                                |  11 ++
 4 files changed, 104 insertions(+), 55 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/all/page.tsx b/app/(main)/league/[leagueId]/entry/all/page.tsx
index 36ba5ea4..450362c4 100644
--- a/app/(main)/league/[leagueId]/entry/all/page.tsx
+++ b/app/(main)/league/[leagueId]/entry/all/page.tsx
@@ -23,6 +23,7 @@ import React, { JSX, useEffect, useState } from 'react';
 import LoadingSpinner from '@/components/LoadingSpinner/LoadingSpinner';
 import { cn } from '@/utils/utils';
 import LinkCustom from '@/components/LinkCustom/LinkCustom';
+import { getNFLTeamLogo } from '@/utils/utils';
 
 /**
  * Display all entries for a league.
@@ -198,9 +199,15 @@ const Entry = ({
                   // eslint-disable-next-line no-undefined
                   selectedTeam !== null && selectedTeam !== undefined;
 
-                const teamLogo = NFLTeams.find(
-                  (teams) => teams.teamName === selectedTeam,
-                )?.teamLogo;
+                const selectedTeamLogo = getNFLTeamLogo(NFLTeams, selectedTeam);
+
+                let userPickHistory: string[] = [];
+
+                if (currentWeek > 1 && entry.selectedTeams.length > 0) {
+                  userPickHistory = entry.selectedTeams
+                    .slice(0, currentWeek - 1)
+                    .map((teamName) => getNFLTeamLogo(NFLTeams, teamName));
+                }
 
                 return (
                   <section key={entry.$id}>
@@ -210,7 +217,8 @@ const Entry = ({
                       isEliminated={entry.eliminated}
                       isPickSet={isPickSet}
                       linkUrl={linkUrl}
-                      teamLogo={teamLogo}
+                      userPickHistory={userPickHistory}
+                      selectedTeamLogo={selectedTeamLogo}
                     />
                   </section>
                 );
diff --git a/components/LeagueEntries/LeagueEntries.interface.ts b/components/LeagueEntries/LeagueEntries.interface.ts
index f3462d48..46d0b0ad 100644
--- a/components/LeagueEntries/LeagueEntries.interface.ts
+++ b/components/LeagueEntries/LeagueEntries.interface.ts
@@ -6,5 +6,6 @@ export interface ILeagueEntriesProps {
   linkUrl: string;
   isEliminated?: boolean;
   isPickSet?: boolean;
-  teamLogo?: string;
+  userPickHistory: string[];
+  selectedTeamLogo?: string;
 }
diff --git a/components/LeagueEntries/LeagueEntries.tsx b/components/LeagueEntries/LeagueEntries.tsx
index 51026c16..d78283ba 100644
--- a/components/LeagueEntries/LeagueEntries.tsx
+++ b/components/LeagueEntries/LeagueEntries.tsx
@@ -7,6 +7,7 @@ import { EntryStatus } from '../EntryStatus/EntryStatus';
 import { ILeagueEntriesProps } from './LeagueEntries.interface';
 import React, { JSX } from 'react';
 import Link from 'next/link';
+import Image from 'next/image';
 
 /**
  * A card that contains information on the user's entry for this league. Contains the entry number, their entry status (alive or eliminated), team logo once a pick is set, and a button to make a pick or change their pick
@@ -15,7 +16,8 @@ import Link from 'next/link';
  * @param props.linkUrl - the url to the user's entry page
  * @param props.isEliminated - If true, the user is flagged as eliminat4ed
  * @param props.isPickSet - if true, the team logo of the picked team shows up on the LeagueEntries card and the button changes from "make a pick" to "chagne pick"
- * @param props.teamLogo - the team logo
+ * @param props.userPickHistory - the user's pick history for this entry
+ * @param props.selectedTeamLogo - the team logo
  * @returns {React.JSX.Element} - A div element that contains the user's entry information
  */
 const LeagueEntries = ({
@@ -23,60 +25,87 @@ const LeagueEntries = ({
   linkUrl,
   isEliminated = false,
   isPickSet = false,
-  teamLogo = '',
-}: ILeagueEntriesProps): JSX.Element => (
-  <div
-    data-testid="league-entry-container-card"
-    className={cn(
-      'league-entry-container-card grid h-20 min-w-fit grid-cols-2 justify-between rounded-lg border border-border bg-card p-4 text-card-foreground shadow-sm',
-      isEliminated ? 'bg-muted' : 'transparent',
-    )}
-  >
-    <section
-      className="league-entry-header flex items-center gap-12"
-      data-testid="league-entry-header"
+  userPickHistory,
+  selectedTeamLogo = '',
+}: ILeagueEntriesProps): JSX.Element => {
+  return (
+    <div
+      data-testid="league-entry-container-card"
+      className={cn(
+        'league-entry-container-card grid h-21 min-w-fit grid-cols-3 items-center justify-between rounded-lg border border-border bg-card p-4 text-card-foreground shadow-sm',
+        isEliminated ? 'bg-muted' : 'transparent',
+      )}
     >
-      <h4
-        data-testid="league-entry-number"
-        className={cn(
-          'league-entry-number text-xl font-semibold leading-none tracking-tight',
-          isEliminated ? 'opacity-50' : '',
-        )}
+      <section
+        className="league-entry-header flex items-center gap-12"
+        data-testid="league-entry-header"
       >
-        {entryName}
-      </h4>
-      <EntryStatus isEliminated={isEliminated} />
-    </section>
-    <section
-      className="league-entry-footer flex items-center justify-end gap-12"
-      data-testid="league-entry-footer"
-    >
-      {isPickSet && (
-        <img
-          className="league-entry-logo h-12 w-12"
-          data-testid="league-entry-logo"
-          src={teamLogo}
-          alt="teamLogo"
-        />
+        <h4
+          data-testid="league-entry-number"
+          className={cn(
+            'league-entry-number text-xl font-semibold leading-none tracking-tight',
+            isEliminated ? 'opacity-50' : '',
+          )}
+        >
+          {entryName}
+        </h4>
+        <EntryStatus isEliminated={isEliminated} />
+      </section>
+      {userPickHistory.length > 0 && (
+        <section className="flex gap-2 overflow-x-scroll justify-end">
+          {userPickHistory?.map((logoURL, index) => (
+            <div
+              key={logoURL}
+              className="flex flex-col h-[66px] items-center justify-center border border-border px-2 py-1 rounded-lg gap-1"
+            >
+              <span className="text-xs">{index + 1}</span>
+              <Image
+                className="league-entry-logo -mt-1.5"
+                width={40}
+                height={40}
+                data-testid="league-entry-logo"
+                src={logoURL}
+                alt="teamLogo"
+              />
+            </div>
+          ))}
+        </section>
       )}
-
-      <div
-        className="league-entry-pick-button-container"
-        data-testid="league-entry-pick-button-container"
+      <section
+        className="league-entry-footer flex items-center justify-end gap-12"
+        data-testid="league-entry-footer"
       >
-        {!isEliminated && (
-          <Link href={linkUrl} data-testid="league-entry-pick-button-link">
-            <Button
-              className="league-entry-pick-button"
-              data-testid="league-entry-pick-button"
-              label={isPickSet ? 'Change Pick' : 'Make Pick'}
-              variant={isPickSet ? 'secondary' : 'default'}
+        {isPickSet && (
+          <div className="flex flex-col items-center border border-primary-muted px-2 py-1 rounded-lg">
+            <span className="text-xs">current</span>
+            <Image
+              className="league-entry-logo"
+              height={40}
+              width={40}
+              data-testid="league-entry-logo"
+              src={selectedTeamLogo}
+              alt="teamLogo"
             />
-          </Link>
+          </div>
         )}
-      </div>
-    </section>
-  </div>
-);
 
+        <div
+          className="league-entry-pick-button-container"
+          data-testid="league-entry-pick-button-container"
+        >
+          {!isEliminated && (
+            <Link href={linkUrl} data-testid="league-entry-pick-button-link">
+              <Button
+                className="league-entry-pick-button"
+                data-testid="league-entry-pick-button"
+                label={isPickSet ? 'Change Pick' : 'Make Pick'}
+                variant={isPickSet ? 'secondary' : 'default'}
+              />
+            </Link>
+          )}
+        </div>
+      </section>
+    </div>
+  );
+};
 export { LeagueEntries };
diff --git a/utils/utils.ts b/utils/utils.ts
index 6bbf7f9e..355b4917 100644
--- a/utils/utils.ts
+++ b/utils/utils.ts
@@ -3,6 +3,7 @@
 
 import {
   IGameWeek,
+  INFLTeam,
   IUser,
   IUserPick,
 } from '@/api/apiFunctions.interface';
@@ -156,3 +157,13 @@ export const hasTeamBeenPicked = (teamName: string, selectedTeams: string[]): bo
   const currentWeek = useDataStore.getState().currentWeek;
   return selectedTeams.some((team, index) => index !== (currentWeek - 1) && team === teamName) ? true : false;
 }
+
+/**
+ * Returns the logos for picked NFL teams
+ * @param NFLTeams - The NFL teams
+ * @param  teamName - The team name
+ * @returns {string} - The logo URL
+ */
+export const getNFLTeamLogo = (NFLTeams: INFLTeam[], teamName: string): string => {
+  return NFLTeams.find((teams) => teams.teamName === teamName)?.teamLogo as string;
+}

From b52a648d355e688d816fd14d12281e5419634d85 Mon Sep 17 00:00:00 2001
From: Alex Appleget <alexappleget2014@gmail.com>
Date: Thu, 12 Sep 2024 10:34:30 -0500
Subject: [PATCH 040/118] Fix: Wrote testing for the label with the {homeAway}
 data rendering.

---
 components/WeeklyPickButton/WeeklyPickButton.test.tsx | 6 +++++-
 components/WeeklyPickButton/WeeklyPickButton.tsx      | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/components/WeeklyPickButton/WeeklyPickButton.test.tsx b/components/WeeklyPickButton/WeeklyPickButton.test.tsx
index 6f1f46fa..05391b23 100644
--- a/components/WeeklyPickButton/WeeklyPickButton.test.tsx
+++ b/components/WeeklyPickButton/WeeklyPickButton.test.tsx
@@ -4,6 +4,7 @@ import { WeeklyPickButton } from './WeeklyPickButton';
 import { RadioGroup } from '../RadioGroup/RadioGroup';
 
 const weeklyPickData = {
+  homeAway: 'Home',
   team: 'Ravens',
   src: '/path/to/ravens.svg',
   height: '48',
@@ -15,10 +16,13 @@ describe('WeeklyPickButton', () => {
   it('renders correctly', () => {
     render(
       <RadioGroup>
-        <WeeklyPickButton team={weeklyPickData.team} src={weeklyPickData.src} />
+        <WeeklyPickButton homeAway={weeklyPickData.homeAway} team={weeklyPickData.team} src={weeklyPickData.src} />
       </RadioGroup>,
     );
 
+    const homeAwayLabel = screen.getByTestId('home-away');
+    expect(homeAwayLabel).toBeInTheDocument();
+
     const image = screen.getByTestId('team-image');
 
     expect(image).toBeInTheDocument();
diff --git a/components/WeeklyPickButton/WeeklyPickButton.tsx b/components/WeeklyPickButton/WeeklyPickButton.tsx
index 2f0150a7..dd9fc852 100644
--- a/components/WeeklyPickButton/WeeklyPickButton.tsx
+++ b/components/WeeklyPickButton/WeeklyPickButton.tsx
@@ -30,7 +30,7 @@ const WeeklyPickButton: React.FC<WeeklyPickButtonProps> = ({
 }): JSX.Element => {
   return (
     <>
-      <label htmlFor="home" className="capitalize">
+      <label htmlFor="home" className="capitalize" data-testid="home-away">
         {homeAway}
       </label>
       <div style={{ direction: 'ltr' }} className="flex items-center mt-4">

From 8d9a919f7f9ef1b6a6e0ae821efdbd29fbebc2e8 Mon Sep 17 00:00:00 2001
From: Alex Appleget <alexappleget2014@gmail.com>
Date: Thu, 12 Sep 2024 10:40:42 -0500
Subject: [PATCH 041/118] Fix: Added more testing for homeAway label.

---
 components/WeeklyPickButton/WeeklyPickButton.test.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/WeeklyPickButton/WeeklyPickButton.test.tsx b/components/WeeklyPickButton/WeeklyPickButton.test.tsx
index 05391b23..5cfdd153 100644
--- a/components/WeeklyPickButton/WeeklyPickButton.test.tsx
+++ b/components/WeeklyPickButton/WeeklyPickButton.test.tsx
@@ -22,6 +22,7 @@ describe('WeeklyPickButton', () => {
 
     const homeAwayLabel = screen.getByTestId('home-away');
     expect(homeAwayLabel).toBeInTheDocument();
+    expect(homeAwayLabel).toHaveTextContent('Home');
 
     const image = screen.getByTestId('team-image');
 

From a5fb0b0fc0c1e4e2135b3d9dbccfb79cfd2f9344 Mon Sep 17 00:00:00 2001
From: Alex Appleget <alexappleget2014@gmail.com>
Date: Thu, 12 Sep 2024 11:37:37 -0500
Subject: [PATCH 042/118] Fix: Updated tests for home and away.

---
 components/WeeklyPickButton/WeeklyPickButton.test.tsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/components/WeeklyPickButton/WeeklyPickButton.test.tsx b/components/WeeklyPickButton/WeeklyPickButton.test.tsx
index 5cfdd153..0aeea8cd 100644
--- a/components/WeeklyPickButton/WeeklyPickButton.test.tsx
+++ b/components/WeeklyPickButton/WeeklyPickButton.test.tsx
@@ -4,7 +4,6 @@ import { WeeklyPickButton } from './WeeklyPickButton';
 import { RadioGroup } from '../RadioGroup/RadioGroup';
 
 const weeklyPickData = {
-  homeAway: 'Home',
   team: 'Ravens',
   src: '/path/to/ravens.svg',
   height: '48',
@@ -13,16 +12,16 @@ const weeklyPickData = {
 };
 
 describe('WeeklyPickButton', () => {
-  it('renders correctly', () => {
+  it.each([['Home'], ['Away']])('renders correctly with homeAway data', (homeAway) => {
     render(
       <RadioGroup>
-        <WeeklyPickButton homeAway={weeklyPickData.homeAway} team={weeklyPickData.team} src={weeklyPickData.src} />
+        <WeeklyPickButton homeAway={homeAway} team={weeklyPickData.team} src={weeklyPickData.src} />
       </RadioGroup>,
     );
 
     const homeAwayLabel = screen.getByTestId('home-away');
     expect(homeAwayLabel).toBeInTheDocument();
-    expect(homeAwayLabel).toHaveTextContent('Home');
+    expect(homeAwayLabel).toHaveTextContent(homeAway);
 
     const image = screen.getByTestId('team-image');
 

From 60792288f3f76b93d50c6a9e25f1a0b13fd66758 Mon Sep 17 00:00:00 2001
From: Jennifer Tieu <jennifer.tieuu@gmail.com>
Date: Thu, 12 Sep 2024 12:50:27 -0500
Subject: [PATCH 043/118] fix: update text color to meet accessibility standard

---
 app/globals.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/globals.css b/app/globals.css
index 5a86fb5e..8d0558f7 100644
--- a/app/globals.css
+++ b/app/globals.css
@@ -59,7 +59,7 @@
 
     --primary: 20.5 90.2% 48.2%;
     --primary-muted: 24.6 95% 53.1%;
-    --primary-foreground: 0 0% 98%;
+    --primary-foreground: 240, 6%, 10%;
 
     --secondary: 240 3.7% 15.9%;
     --secondary-muted: 240 5.3% 26.1%;

From 1250a70642408455f6d015475e64247d7fb1f313 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Thu, 12 Sep 2024 15:57:01 -0400
Subject: [PATCH 044/118] added in test for LeagueEntries and entry/all route

---
 .../[leagueId]/entry/[entryId]/week/Week.tsx  |  57 ++++-
 .../league/[leagueId]/entry/all/page.test.tsx | 199 ++++++++++++++++--
 .../league/[leagueId]/entry/all/page.tsx      |   5 +
 .../LeagueEntries/LeagueEntries.test.tsx      |  33 ++-
 components/LeagueEntries/LeagueEntries.tsx    |  16 +-
 5 files changed, 285 insertions(+), 25 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
index 87e97131..4ccfef60 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
@@ -31,6 +31,8 @@ import Alert from '@/components/AlertNotification/AlertNotification';
 import { AlertVariants } from '@/components/AlertNotification/Alerts.enum';
 import { NFLTeams } from '@/api/apiFunctions.enum';
 import { useAuthContext } from '@/context/AuthContextProvider';
+import { getNFLTeamLogo } from '@/utils/utils';
+import Image from 'next/image';
 
 /**
  * Renders the weekly picks page.
@@ -39,6 +41,7 @@ import { useAuthContext } from '@/context/AuthContextProvider';
  */
 // eslint-disable-next-line no-unused-vars
 const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
+  const [pickHistory, setPickHistory] = useState<string[]>([]);
   const [error, setError] = useState<string | null>(null);
   const [schedule, setSchedule] = useState<ISchedule[]>([]);
   const [selectedLeague, setSelectedLeague] = useState<ILeague | undefined>();
@@ -133,6 +136,36 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
     } catch (error) {
       console.error('Could not load week data:', error);
       setError('Could not load week data.');
+    }
+  };
+
+  /**
+   * Fetches all entries for the current user.
+   * @returns {Promise<void>}
+   */
+  const getPickHistory = async (): Promise<void> => {
+    const entryId: string = entry;
+    const currentWeek: number = Number(week);
+
+    try {
+      const entries = await getCurrentUserEntries(user.id, league);
+      const currentEntry = entries.find((entry) => entry.$id === entryId);
+
+      if (!currentEntry) {
+        throw new Error('Entry not found');
+      }
+
+      let entryHistory = currentEntry?.selectedTeams || [];
+
+      if (week !== '1' && currentEntry?.selectedTeams.length > 0) {
+        entryHistory = entryHistory
+          .slice(0, currentWeek - 1)
+          .map((teamName) => getNFLTeamLogo(NFLTeams, teamName));
+      }
+
+      setPickHistory(entryHistory);
+    } catch (error) {
+      throw new Error("Error fetching user's pick history");
     } finally {
       setLoadingData(false);
     }
@@ -201,6 +234,7 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
       getCurrentGameWeek();
       getUserSelectedTeams();
       getUserWeeklyPick();
+      getPickHistory();
     }
   }, [isSignedIn]);
 
@@ -229,11 +263,32 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
               {selectedLeague?.leagueName as string}
             </LinkCustom>
           </nav>
-          <section className="w-full pt-8" data-testid="weekly-picks">
+          <section className="flex flex-col items-center w-full pt-8" data-testid="weekly-picks">
             <h1 className="pb-8 text-center text-[2rem] font-bold text-foreground">
               Week {week} pick
             </h1>
 
+            {pickHistory.length > 0 && (
+              <section className="flex flex-wrap w-[90%] gap-4 overflow-x-scroll justify-center pb-10 items-center">
+                {pickHistory?.map((logoURL, index) => (
+                  <div
+                    key={logoURL}
+                    className="flex flex-col items-center justify-center border border-border p-2 rounded-lg gap-1"
+                  >
+                    <span className="text-sm">WEEK {index + 1}</span>
+                    <Image
+                      className="league-entry-logo -mt-1.5"
+                      width={64}
+                      height={64}
+                      data-testid="league-entry-logo"
+                      src={logoURL}
+                      alt="teamLogo"
+                    />
+                  </div>
+                ))}
+              </section>
+            )}
+
             <FormProvider {...form}>
               <form className="mx-auto flex w-[90%] max-w-3xl flex-col items-center">
                 <FormField
diff --git a/app/(main)/league/[leagueId]/entry/all/page.test.tsx b/app/(main)/league/[leagueId]/entry/all/page.test.tsx
index d8ad0385..22c9c5a1 100644
--- a/app/(main)/league/[leagueId]/entry/all/page.test.tsx
+++ b/app/(main)/league/[leagueId]/entry/all/page.test.tsx
@@ -5,6 +5,7 @@ import {
   getGameWeek,
   getCurrentUserEntries,
   getCurrentLeague,
+  getNFLTeams,
 } from '@/api/apiFunctions';
 
 jest.mock('@/store/dataStore', () => ({
@@ -13,7 +14,7 @@ jest.mock('@/store/dataStore', () => ({
     NFLTeams: [
       {
         teamId: '1',
-        teamLogo: 'team-a-logo.png',
+        teamLogo: '/team-a-logo.png',
         teamName: 'Packers',
       },
     ],
@@ -53,6 +54,7 @@ describe('League entries page (Entry Component)', () => {
   const mockGetCurrentUserEntries = getCurrentUserEntries as jest.Mock;
   const mockGetGameWeek = getGameWeek as jest.Mock;
   const mockUseDataStore = useDataStore as unknown as jest.Mock;
+  const mockGetNFLTeams = getNFLTeams as jest.Mock;
 
   beforeEach(() => {
     jest.clearAllMocks();
@@ -83,21 +85,40 @@ describe('League entries page (Entry Component)', () => {
   });
 
   test('should not display GlobalSpinner after data is loaded', async () => {
+    mockUseDataStore.mockReturnValue({
+      ...mockUseDataStore(),
+      currentWeek: 1,
+      NFLTeams: [
+        {
+          teamId: '1',
+          teamLogo: '/packers-logo.png',
+          teamName: 'Packers',
+        },
+        {
+          teamId: '2',
+          teamLogo: '/bears-logo.png',
+          teamName: 'Bears',
+        },
+      ],
+    });
     mockGetCurrentUserEntries.mockResolvedValueOnce([
       {
-        $id: '66311a210039f0532044',
-        name: 'Entry 1',
-        user: '1',
-        league: '1',
-        selectedTeams: '',
-        eliminated: false,
+        $id: '123',
+        name: 'Test Entry',
+        week: 1,
+        selectedTeams: ['Packers', 'Bears'],
       },
     ]);
-    mockGetCurrentLeague.mockResolvedValueOnce({
-      leagueName: 'GiS League',
-      participants: 47,
-      survivors: 47,
+    mockGetGameWeek.mockResolvedValueOnce({ week: 1 });
+    mockGetCurrentLeague.mockResolvedValue({
+      leagueName: 'Test League',
+      participants: 10,
+      survivors: 8,
     });
+    mockGetNFLTeams.mockResolvedValue([
+      { teamId: '1', teamLogo: '/packers-logo.png', teamName: 'Packers' },
+      { teamId: '2', teamLogo: '/bears-logo.png', teamName: 'Bears' },
+    ]);
 
     render(<Entry params={{ leagueId: '123' }} />);
 
@@ -105,6 +126,7 @@ describe('League entries page (Entry Component)', () => {
       expect(mockGetGameWeek).toHaveBeenCalled();
       expect(mockGetCurrentUserEntries).toHaveBeenCalled();
       expect(mockGetCurrentLeague).toHaveBeenCalled();
+      expect(mockGetNFLTeams).toHaveBeenCalled();
     });
 
     expect(screen.queryByTestId('global-spinner')).not.toBeInTheDocument();
@@ -214,7 +236,7 @@ describe('League entries page (Entry Component)', () => {
     expect(viewPastWeeksLink).toBeInTheDocument();
   });
 
-  it('should not display a button to add a new entry if there are more than 5 entries', async () => {
+  it('should not display a button to add a new entry if there are 5 entries', async () => {
     mockUseDataStore.mockReturnValue({
       ...mockUseDataStore(),
       currentWeek: 2,
@@ -318,7 +340,7 @@ describe('League entries page (Entry Component)', () => {
     await waitFor(() => {
       expect(screen.getByTestId('league-entry-logo')).toHaveAttribute(
         'src',
-        'team-a-logo.png',
+        '/_next/image?url=%2Fpackers-logo.png&w=96&q=75',
       );
 
       expect(screen.getByTestId('league-entry-pick-button')).toHaveTextContent(
@@ -326,4 +348,155 @@ describe('League entries page (Entry Component)', () => {
       );
     });
   });
+  it('should not display the user pick history if the current week is 1', async () => {
+    mockUseDataStore.mockReturnValue({
+      ...mockUseDataStore(),
+      currentWeek: 1,
+      NFLTeams: [
+        {
+          teamId: '1',
+          teamLogo: '/packers-logo.png',
+          teamName: 'Packers',
+        },
+      ],
+    });
+    mockGetCurrentUserEntries.mockResolvedValueOnce([
+      {
+        $id: '123',
+        name: 'Test Entry',
+        week: 1,
+        selectedTeams: ['Packers', 'Bears'],
+      },
+    ]);
+    mockGetGameWeek.mockResolvedValueOnce({ week: 1 });
+    mockGetCurrentLeague.mockResolvedValue({
+      leagueName: 'Test League',
+      participants: 10,
+      survivors: 8,
+    });
+    mockGetNFLTeams.mockResolvedValue([
+      { teamId: '1', teamLogo: '/packers-logo.png', teamName: 'Packers' },
+      { teamId: '2', teamLogo: '/bears-logo.png', teamName: 'Bears' },
+    ]);
+
+    render(<Entry params={{ leagueId: '123' }} />);
+
+    await waitFor(() => {
+      expect(mockGetGameWeek).toHaveBeenCalled();
+      expect(mockGetCurrentUserEntries).toHaveBeenCalled();
+      expect(mockGetCurrentLeague).toHaveBeenCalled();
+      expect(mockGetNFLTeams).toHaveBeenCalled();
+    });
+
+    const userPickHistory = screen.queryByTestId('user-pick-history');
+    expect(userPickHistory).not.toBeInTheDocument();
+  });
+
+  it('should display the user pick history if the current week is greater than 1', async () => {
+    mockUseDataStore.mockReturnValue({
+      ...mockUseDataStore(),
+      currentWeek: 2,
+      NFLTeams: [
+        {
+          teamId: '1',
+          teamLogo: '/packers-logo.png',
+          teamName: 'Packers',
+        },
+        {
+          teamId: '2',
+          teamLogo: '/bears-logo.png',
+          teamName: 'Bears',
+        },
+      ],
+    });
+    mockGetCurrentUserEntries.mockResolvedValueOnce([
+      {
+        $id: '123',
+        name: 'Test Entry',
+        week: 2,
+        selectedTeams: ['Packers', 'Bears'],
+      },
+    ]);
+    mockGetGameWeek.mockResolvedValueOnce({ week: 2 });
+    mockGetCurrentLeague.mockResolvedValue({
+      leagueName: 'Test League',
+      participants: 10,
+      survivors: 8,
+    });
+    mockGetNFLTeams.mockResolvedValue([
+      { teamId: '1', teamLogo: '/packers-logo.png', teamName: 'Packers' },
+      { teamId: '2', teamLogo: '/bears-logo.png', teamName: 'Bears' },
+    ]);
+
+    render(<Entry params={{ leagueId: '123' }} />);
+
+    await waitFor(() => {
+      expect(mockGetGameWeek).toHaveBeenCalled();
+      expect(mockGetCurrentUserEntries).toHaveBeenCalled();
+      expect(mockGetCurrentLeague).toHaveBeenCalled();
+      expect(mockGetNFLTeams).toHaveBeenCalled();
+    });
+    // Add a delay to allow for any asynchronous rendering
+    await new Promise((resolve) => setTimeout(resolve, 0));
+
+    const userPickHistory = screen.queryByTestId('user-pick-history');
+    expect(userPickHistory).toBeInTheDocument();
+    expect(screen.getByTestId('league-history-logo')).toHaveAttribute(
+      'src',
+      '/_next/image?url=%2Fpackers-logo.png&w=96&q=75',
+    );
+    expect(screen.getByTestId('league-history-logo')).not.toHaveAttribute(
+      'src',
+      '/_next/image?url=%2Fbears-logo.png&w=96&q=75',
+    );
+    expect(screen.getByTestId('league-entry-logo')).toHaveAttribute(
+      'src',
+      '/_next/image?url=%2Fbears-logo.png&w=96&q=75',
+    );
+  });
+
+  it('should not display the user pick history if the entries selected teams are empty', async () => {
+    mockUseDataStore.mockReturnValue({
+      ...mockUseDataStore(),
+      currentWeek: 2,
+      NFLTeams: [
+        {
+          teamId: '1',
+          teamLogo: '/packers-logo.png',
+          teamName: 'Packers',
+        },
+        { teamId: '2', teamLogo: '/bears-logo.png', teamName: 'Bears' },
+      ],
+    });
+    mockGetCurrentUserEntries.mockResolvedValueOnce([
+      {
+        $id: '123',
+        name: 'Test Entry',
+        week: 2,
+        selectedTeams: [],
+      },
+    ]);
+    mockGetGameWeek.mockResolvedValueOnce({ week: 2 });
+    mockGetCurrentLeague.mockResolvedValue({
+      leagueName: 'Test League',
+      participants: 10,
+      survivors: 8,
+    });
+    mockGetNFLTeams.mockResolvedValue([
+      { teamId: '1', teamLogo: '/packers-logo.png', teamName: 'Packers' },
+      { teamId: '2', teamLogo: '/bears-logo.png', teamName: 'Bears' },
+    ]);
+
+    render(<Entry params={{ leagueId: '123' }} />);
+
+    await waitFor(() => {
+      expect(mockGetGameWeek).toHaveBeenCalled();
+      expect(mockGetCurrentUserEntries).toHaveBeenCalled();
+      expect(mockGetCurrentLeague).toHaveBeenCalled();
+      expect(mockGetNFLTeams).toHaveBeenCalled();
+    });
+
+    const userPickHistory = screen.queryByTestId('user-pick-history');
+    expect(userPickHistory).not.toBeInTheDocument();
+  });
 });
diff --git a/app/(main)/league/[leagueId]/entry/all/page.tsx b/app/(main)/league/[leagueId]/entry/all/page.tsx
index 450362c4..4aad72bc 100644
--- a/app/(main)/league/[leagueId]/entry/all/page.tsx
+++ b/app/(main)/league/[leagueId]/entry/all/page.tsx
@@ -70,6 +70,7 @@ const Entry = ({
    * @returns {Promise<void>}
    */
   const getAllEntries = async (): Promise<void> => {
+    setLoadingData(true);
     try {
       const getEntries = await getCurrentUserEntries(user.id, leagueId);
       setEntries(getEntries);
@@ -85,6 +86,7 @@ const Entry = ({
    * @returns {Promise<void>}
    */
   const getCurrentGameWeek = async (): Promise<void> => {
+    setLoadingData(true);
     try {
       const getCurrentWeek = await getGameWeek();
       updateCurrentWeek(getCurrentWeek.week);
@@ -100,11 +102,14 @@ const Entry = ({
    * @returns {Promise<INFLTeam[]>} - The NFL teams.
    */
   const getAllNFLTeams = async (): Promise<void> => {
+    setLoadingData(true);
     try {
       const NFLTeams = await getNFLTeams();
       updateNFLTeams(NFLTeams);
     } catch (error) {
       throw new Error('Error getting NFL teams');
+    } finally {
+      setLoadingData(false);
     }
   };
 
diff --git a/components/LeagueEntries/LeagueEntries.test.tsx b/components/LeagueEntries/LeagueEntries.test.tsx
index d9143508..cc4f822e 100644
--- a/components/LeagueEntries/LeagueEntries.test.tsx
+++ b/components/LeagueEntries/LeagueEntries.test.tsx
@@ -4,7 +4,9 @@ import React from 'react';
 
 describe('LeagueEntries', () => {
   it(`renders 'default' state without a pick made`, () => {
-    render(<LeagueEntries entryName="Entry 1" linkUrl="" />);
+    render(
+      <LeagueEntries entryName="Entry 1" linkUrl="" userPickHistory={[]} />,
+    );
 
     const leagueEntryContainerCard = screen.getByTestId(
       'league-entry-container-card',
@@ -14,15 +16,24 @@ describe('LeagueEntries', () => {
     const leagueEntryPickButton = screen.getByTestId(
       'league-entry-pick-button',
     );
+    const userHistoryPicks = screen.queryByTestId('user-pick-history');
 
     expect(entryStatus).toHaveTextContent('alive');
     expect(leagueEntryContainerCard).toBeInTheDocument();
     expect(leagueEntryNumber).toHaveTextContent('Entry 1');
     expect(leagueEntryPickButton).toHaveTextContent('Make Pick');
+    expect(userHistoryPicks).not.toBeInTheDocument();
   });
 
   it('renders as if the user made a pick', () => {
-    render(<LeagueEntries entryName="Entry 2" linkUrl="" isPickSet={true} />);
+    render(
+      <LeagueEntries
+        entryName="Entry 2"
+        linkUrl=""
+        isPickSet={true}
+        userPickHistory={['/team-a-logo.png']}
+      />,
+    );
 
     const leagueEntryContainerCard = screen.getByTestId(
       'league-entry-container-card',
@@ -32,11 +43,13 @@ describe('LeagueEntries', () => {
     const leagueEntryPickButton = screen.getByTestId(
       'league-entry-pick-button',
     );
+    const userHistoryPicks = screen.queryByTestId('user-pick-history');
 
     expect(entryStatus).toHaveTextContent('alive');
     expect(leagueEntryContainerCard).toBeInTheDocument();
     expect(leagueEntryNumber).toHaveTextContent('Entry 2');
     expect(leagueEntryPickButton).toHaveTextContent('Change Pick');
+    expect(userHistoryPicks).toBeInTheDocument();
   });
 
   it('renders as if the user is eliminated', () => {
@@ -46,6 +59,7 @@ describe('LeagueEntries', () => {
         isEliminated
         isPickSet={false}
         linkUrl=""
+        userPickHistory={['/team-a-logo.png']}
       />,
     );
 
@@ -60,7 +74,7 @@ describe('LeagueEntries', () => {
     expect(leagueEntryNumber).toHaveTextContent('Entry 3');
   });
 
-  it('renders teamLogo when user makes a pick', () => {
+  it('renders teamLogo when user makes a pick and shows user pick history logo', () => {
     const teamLogoUrl = 'https://example.com/logo.png';
     const linkUrl = '/change-pick';
 
@@ -69,7 +83,8 @@ describe('LeagueEntries', () => {
         entryName="Entry 2"
         isPickSet={true}
         linkUrl={linkUrl}
-        teamLogo={teamLogoUrl}
+        selectedTeamLogo={teamLogoUrl}
+        userPickHistory={['/team-a-logo.png']}
       />,
     );
 
@@ -84,11 +99,19 @@ describe('LeagueEntries', () => {
     const leagueLink = screen.getByTestId('league-entry-pick-button-link');
     const leagueEntryLogo = screen.getByTestId('league-entry-logo');
 
+    expect(leagueEntryContainerCard).toBeInTheDocument();
     expect(entryStatus).toHaveTextContent('alive');
     expect(leagueEntryNumber).toHaveTextContent('Entry 2');
     expect(leagueEntryPickButton).toHaveTextContent('Change Pick');
     expect(leagueLink).toHaveAttribute('href', linkUrl);
     expect(leagueEntryLogo).toBeInTheDocument();
-    expect(leagueEntryLogo).toHaveAttribute('src', teamLogoUrl);
+    expect(leagueEntryLogo).toHaveAttribute(
+      'src',
+      '/_next/image?url=https%3A%2F%2Fexample.com%2Flogo.png&w=96&q=75',
+    );
+    expect(screen.getByTestId('league-history-logo')).toHaveAttribute(
+      'src',
+      '/_next/image?url=%2Fteam-a-logo.png&w=96&q=75',
+    );
   });
 });
diff --git a/components/LeagueEntries/LeagueEntries.tsx b/components/LeagueEntries/LeagueEntries.tsx
index d78283ba..0549675f 100644
--- a/components/LeagueEntries/LeagueEntries.tsx
+++ b/components/LeagueEntries/LeagueEntries.tsx
@@ -32,8 +32,9 @@ const LeagueEntries = ({
     <div
       data-testid="league-entry-container-card"
       className={cn(
-        'league-entry-container-card grid h-21 min-w-fit grid-cols-3 items-center justify-between rounded-lg border border-border bg-card p-4 text-card-foreground shadow-sm',
+        'league-entry-container-card grid h-21 min-w-fit items-center justify-between rounded-lg border border-border bg-card p-4 text-card-foreground shadow-sm',
         isEliminated ? 'bg-muted' : 'transparent',
+        userPickHistory.length === 0 ? 'grid-cols-2' : 'grid-cols-3',
       )}
     >
       <section
@@ -52,18 +53,21 @@ const LeagueEntries = ({
         <EntryStatus isEliminated={isEliminated} />
       </section>
       {userPickHistory.length > 0 && (
-        <section className="flex gap-2 overflow-x-scroll justify-end">
+        <section
+          className="flex gap-2 overflow-x-scroll justify-end mr-2"
+          data-testid="user-pick-history"
+        >
           {userPickHistory?.map((logoURL, index) => (
             <div
               key={logoURL}
-              className="flex flex-col h-[66px] items-center justify-center border border-border px-2 py-1 rounded-lg gap-1"
+              className="flex flex-col h-[66px] items-center justify-center border border-border px-4 py-1 rounded-lg gap-1"
             >
-              <span className="text-xs">{index + 1}</span>
+              <span className="text-xs">WEEK {index + 1}</span>
               <Image
                 className="league-entry-logo -mt-1.5"
                 width={40}
                 height={40}
-                data-testid="league-entry-logo"
+                data-testid="league-history-logo"
                 src={logoURL}
                 alt="teamLogo"
               />
@@ -77,7 +81,7 @@ const LeagueEntries = ({
       >
         {isPickSet && (
           <div className="flex flex-col items-center border border-primary-muted px-2 py-1 rounded-lg">
-            <span className="text-xs">current</span>
+            <span className="text-xs">CURRENT</span>
             <Image
               className="league-entry-logo"
               height={40}

From 413de6b549f1093f74f24033dd5ed32b7e198128 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Thu, 12 Sep 2024 16:32:29 -0400
Subject: [PATCH 045/118] removed negative margin

---
 app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx | 2 +-
 components/LeagueEntries/LeagueEntries.tsx                 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
index 4ccfef60..5866512a 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
@@ -277,7 +277,7 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
                   >
                     <span className="text-sm">WEEK {index + 1}</span>
                     <Image
-                      className="league-entry-logo -mt-1.5"
+                      className="league-entry-logo"
                       width={64}
                       height={64}
                       data-testid="league-entry-logo"
diff --git a/components/LeagueEntries/LeagueEntries.tsx b/components/LeagueEntries/LeagueEntries.tsx
index 0549675f..4168a6ec 100644
--- a/components/LeagueEntries/LeagueEntries.tsx
+++ b/components/LeagueEntries/LeagueEntries.tsx
@@ -60,11 +60,11 @@ const LeagueEntries = ({
           {userPickHistory?.map((logoURL, index) => (
             <div
               key={logoURL}
-              className="flex flex-col h-[66px] items-center justify-center border border-border px-4 py-1 rounded-lg gap-1"
+              className="flex flex-col h-[66px] opacity-80 items-center justify-center border border-border px-4 py-1 rounded-lg gap-1"
             >
               <span className="text-xs">WEEK {index + 1}</span>
               <Image
-                className="league-entry-logo -mt-1.5"
+                className="league-entry-logo"
                 width={40}
                 height={40}
                 data-testid="league-history-logo"

From b3a2f481b1b01fece98e51ad818b05e6a8a704e6 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Thu, 12 Sep 2024 16:35:05 -0400
Subject: [PATCH 046/118] removed muted from current pick border

---
 components/LeagueEntries/LeagueEntries.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/LeagueEntries/LeagueEntries.tsx b/components/LeagueEntries/LeagueEntries.tsx
index 4168a6ec..dad67bed 100644
--- a/components/LeagueEntries/LeagueEntries.tsx
+++ b/components/LeagueEntries/LeagueEntries.tsx
@@ -80,7 +80,7 @@ const LeagueEntries = ({
         data-testid="league-entry-footer"
       >
         {isPickSet && (
-          <div className="flex flex-col items-center border border-primary-muted px-2 py-1 rounded-lg">
+          <div className="flex flex-col items-center border border-primary px-2 py-1 rounded-lg">
             <span className="text-xs">CURRENT</span>
             <Image
               className="league-entry-logo"

From ac362fbbf3fb1b4cf0039c58a8f6224da3cd38b1 Mon Sep 17 00:00:00 2001
From: Alex Appleget <137813659+alexappleget@users.noreply.github.com>
Date: Thu, 12 Sep 2024 09:13:07 -0500
Subject: [PATCH 047/118] Alex/add redirect for team selections (#519)

Closes #515

Redirect user to the league home after they make a successful pick.
Allowing users to make selections to their Entries faster.

- [x] Added router.push to the handleWeeklyPickChange function to
redirect the user back to their entry page.
- [x] For testing I had to grab the 'team-radio' test id and had to use
"findAll" because I had to await it to simulate the page loading and
there are multiple team radio's.
- [x] Then in that same test, I had to put selectedTeams[0] to simulate
me clicking the first team option. The [0] is the index.

https://github.com/user-attachments/assets/3ef29b76-1b93-4e0d-8cef-f010964ba4de
---
 .../entry/[entryId]/week/Week.test.tsx        | 25 ++++++++++++++++++-
 .../[leagueId]/entry/[entryId]/week/Week.tsx  |  7 ++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
index 0c3ee833..9547503e 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
@@ -1,4 +1,4 @@
-import { render, screen, waitFor } from '@testing-library/react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import React from 'react';
 import Week from './Week';
 import {
@@ -15,6 +15,16 @@ import { onWeeklyPickChange } from './WeekHelper';
 import { parseUserPick } from '@/utils/utils';
 import { IWeeklyPicks } from '@/api/apiFunctions.interface';
 
+const mockPush = jest.fn();
+
+jest.mock('next/navigation', () => ({
+  useRouter() {
+    return {
+      push: mockPush,
+    };
+  },
+}));
+
 const mockUseAuthContext = {
   isSignedIn: false,
 };
@@ -212,4 +222,17 @@ describe('Week', () => {
       />,
     );
   });
+
+  test('should redirect back to entry page after successfully selecting a team', async () => {
+    render(
+      <Week entry={entry} league={league} NFLTeams={NFLTeams} week={week} />,
+    );
+
+    const teamRadios = await screen.findAllByTestId('team-radio');
+    fireEvent.click(teamRadios[0]);
+
+    await waitFor(() => {
+      expect(mockPush).toHaveBeenCalledWith(`/league/${league}/entry/all`);
+    })
+  });
 });
diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
index 5866512a..c8d90f76 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
@@ -15,8 +15,6 @@ import { IWeekProps } from './Week.interface';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useDataStore } from '@/store/dataStore';
 import { ISchedule } from './WeekTeams.interface';
-import LinkCustom from '@/components/LinkCustom/LinkCustom';
-import { ChevronLeft } from 'lucide-react';
 import {
   getAllWeeklyPicks,
   getCurrentUserEntries,
@@ -33,6 +31,9 @@ import { NFLTeams } from '@/api/apiFunctions.enum';
 import { useAuthContext } from '@/context/AuthContextProvider';
 import { getNFLTeamLogo } from '@/utils/utils';
 import Image from 'next/image';
+import { useRouter } from 'next/navigation';
+import LinkCustom from '@/components/LinkCustom/LinkCustom';
+import { ChevronLeft } from 'lucide-react';
 
 /**
  * Renders the weekly picks page.
@@ -51,6 +52,7 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
   const { user, updateCurrentWeek, updateWeeklyPicks, weeklyPicks } =
     useDataStore((state) => state);
   const { isSignedIn } = useAuthContext();
+  const router = useRouter();
 
   /**
    * Fetches the current game week.
@@ -216,6 +218,7 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
     try {
       await onWeeklyPickChange(params);
       setUserPick(teamSelect);
+      router.push(`/league/${league}/entry/all`);
     } catch (error) {
       console.error('Submission error:', error);
     }

From 191c2b695bbe88e0ec185acf12cf282f6f5d9c5a Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Thu, 12 Sep 2024 21:41:01 -0400
Subject: [PATCH 048/118] update entry week to show current pick

---
 .../[leagueId]/entry/[entryId]/week/Week.tsx  | 29 +++++++++++++------
 .../league/[leagueId]/entry/all/page.test.tsx |  2 +-
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
index c8d90f76..cbe6c3e7 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
@@ -29,7 +29,7 @@ import Alert from '@/components/AlertNotification/AlertNotification';
 import { AlertVariants } from '@/components/AlertNotification/Alerts.enum';
 import { NFLTeams } from '@/api/apiFunctions.enum';
 import { useAuthContext } from '@/context/AuthContextProvider';
-import { getNFLTeamLogo } from '@/utils/utils';
+import { cn, getNFLTeamLogo } from '@/utils/utils';
 import Image from 'next/image';
 import { useRouter } from 'next/navigation';
 import LinkCustom from '@/components/LinkCustom/LinkCustom';
@@ -147,7 +147,6 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
    */
   const getPickHistory = async (): Promise<void> => {
     const entryId: string = entry;
-    const currentWeek: number = Number(week);
 
     try {
       const entries = await getCurrentUserEntries(user.id, league);
@@ -159,10 +158,10 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
 
       let entryHistory = currentEntry?.selectedTeams || [];
 
-      if (week !== '1' && currentEntry?.selectedTeams.length > 0) {
-        entryHistory = entryHistory
-          .slice(0, currentWeek - 1)
-          .map((teamName) => getNFLTeamLogo(NFLTeams, teamName));
+      if (currentEntry?.selectedTeams.length > 0) {
+        entryHistory = entryHistory.map((teamName) =>
+          getNFLTeamLogo(NFLTeams, teamName),
+        );
       }
 
       setPickHistory(entryHistory);
@@ -266,7 +265,10 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
               {selectedLeague?.leagueName as string}
             </LinkCustom>
           </nav>
-          <section className="flex flex-col items-center w-full pt-8" data-testid="weekly-picks">
+          <section
+            className="flex flex-col items-center w-full pt-8"
+            data-testid="weekly-picks"
+          >
             <h1 className="pb-8 text-center text-[2rem] font-bold text-foreground">
               Week {week} pick
             </h1>
@@ -276,9 +278,18 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
                 {pickHistory?.map((logoURL, index) => (
                   <div
                     key={logoURL}
-                    className="flex flex-col items-center justify-center border border-border p-2 rounded-lg gap-1"
+                    className={cn(
+                      'flex flex-col items-center justify-center border  p-2 rounded-lg gap-1',
+                      index === pickHistory.length - 1
+                        ? 'border-primary'
+                        : 'border-border opacity-80',
+                    )}
                   >
-                    <span className="text-sm">WEEK {index + 1}</span>
+                    <span className="text-sm">
+                      {index === pickHistory.length - 1
+                        ? 'CURRENT'
+                        : `WEEK ${index + 1}`}
+                    </span>
                     <Image
                       className="league-entry-logo"
                       width={64}
diff --git a/app/(main)/league/[leagueId]/entry/all/page.test.tsx b/app/(main)/league/[leagueId]/entry/all/page.test.tsx
index 22c9c5a1..00db2aa1 100644
--- a/app/(main)/league/[leagueId]/entry/all/page.test.tsx
+++ b/app/(main)/league/[leagueId]/entry/all/page.test.tsx
@@ -67,7 +67,7 @@ describe('League entries page (Entry Component)', () => {
         name: 'Entry 1',
         user: '1',
         league: '1',
-        selectedTeams: '',
+        selectedTeams: [],
         eliminated: false,
       },
     ]);

From 2c0819ed408a80fe1dc2613007ecb226c113153d Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Fri, 13 Sep 2024 13:16:31 -0400
Subject: [PATCH 049/118] feature: add password reset functionality

---
 api/apiFunctions.interface.ts        |   8 +
 api/apiFunctions.ts                  |  60 +++++++
 app/(main)/account/recovery/page.tsx | 244 +++++++++++++++++++++++++++
 app/(main)/login/page.tsx            |   3 +
 app/(main)/recover-password/page.tsx | 151 +++++++++++++++++
 components/Nav/Nav.test.tsx          |  10 ++
 components/Nav/Nav.tsx               |   7 +-
 context/AuthContextProvider.tsx      |   6 +-
 utils/utils.ts                       |  20 +++
 9 files changed, 507 insertions(+), 2 deletions(-)
 create mode 100644 app/(main)/account/recovery/page.tsx
 create mode 100644 app/(main)/recover-password/page.tsx

diff --git a/api/apiFunctions.interface.ts b/api/apiFunctions.interface.ts
index e5e58682..355e8f23 100644
--- a/api/apiFunctions.interface.ts
+++ b/api/apiFunctions.interface.ts
@@ -48,3 +48,11 @@ export interface IGameWeek {
   id: string;
   week: number;
 }
+
+export interface IRecoveryToken {
+  $id: string;
+  userId: string;
+  secret: string;
+  expire: string;
+  phrase?: string;
+}
diff --git a/api/apiFunctions.ts b/api/apiFunctions.ts
index b499647f..ebd6b52a 100644
--- a/api/apiFunctions.ts
+++ b/api/apiFunctions.ts
@@ -10,6 +10,7 @@ import {
   IUser,
   IWeeklyPicks,
   INFLTeam,
+  IRecoveryToken,
 } from './apiFunctions.interface';
 import { Collection, Document } from './apiFunctions.enum';
 import { Query } from 'appwrite';
@@ -17,6 +18,7 @@ import {
   IEntry,
   IEntryProps,
 } from '@/app/(main)/league/[leagueId]/entry/Entries.interface';
+import { getBaseURL } from '@/utils/utils';
 
 /**
  * Register a new account
@@ -37,6 +39,64 @@ export async function registerAccount({
   }
 }
 
+/**
+ * Recover a User Password
+ * @param props - the props for the recover password function
+ * @param props.email - the email of the user
+ * @returns {Promise<IRecoveryToken>} - the recovery token
+ */
+export async function recoverPassword({
+  email,
+}: {
+  email: string;
+}): Promise<IRecoveryToken> {
+  const baseURL = getBaseURL();
+  try {
+    const result = await account.createRecovery(
+      email,
+      `${baseURL}/account/recovery`,
+    );
+    return result;
+  } catch (error) {
+    console.error(error);
+    throw new Error('Error recovering password');
+  }
+}
+
+/**
+ * Reset a User Password
+ * @param props - the props for the reset password function
+ * @param props.userId - the user id
+ * @param props.token - the recovery token
+ * @param props.password - the new password
+ * @returns {Promise<void>} - the reset password
+ */
+export async function resetPassword({
+  userId,
+  token,
+  password,
+}: {
+  userId: string;
+  token: string;
+  password: string;
+}): Promise<IRecoveryToken> {
+  try {
+    const result = await account.updateRecovery(userId, token, password);
+    return result;
+  } catch (error) {
+    console.error('Password reset error:', error);
+    throw error;
+  }
+}
+
+/**
+ * Reset a User Password
+ * @param props - the props for the reset password function
+ * @param props.recoveryToken - the recovery token
+ * @param props.password - the new password
+ * @returns {Promise<void>} - the reset password
+ */
+
 /**
  * Login to an existing account
  * @param props - The account data
diff --git a/app/(main)/account/recovery/page.tsx b/app/(main)/account/recovery/page.tsx
new file mode 100644
index 00000000..6975c7fb
--- /dev/null
+++ b/app/(main)/account/recovery/page.tsx
@@ -0,0 +1,244 @@
+// Copyright (c) Gridiron Survivor.
+// Licensed under the MIT License.
+
+'use client';
+import { resetPassword } from '@/api/apiFunctions';
+import Alert from '@/components/AlertNotification/AlertNotification';
+import { AlertVariants } from '@/components/AlertNotification/Alerts.enum';
+import { Button } from '@/components/Button/Button';
+import { Input } from '@/components/Input/Input';
+import LoadingSpinner from '@/components/LoadingSpinner/LoadingSpinner';
+import Logo from '@/components/Logo/Logo';
+import { useAuthContext } from '@/context/AuthContextProvider';
+import logo from '@/public/assets/logo-colored-outline.svg';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { useRouter, useSearchParams } from 'next/navigation';
+import React, { useEffect, useState } from 'react';
+import { Control, SubmitHandler, useForm, useWatch } from 'react-hook-form';
+import toast from 'react-hot-toast';
+import { z } from 'zod';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormMessage,
+} from '../../../../components/Form/Form';
+
+interface CustomError extends Error {
+  type?: string;
+}
+
+/**
+ * The schema for the login form.
+ * @throws {Error} Throws an error if the email is not a valid email address.
+ * @throws {Error} Throws an error if the email is not provided.
+ * @throws {Error} Throws an error if the email is not a string.
+ */
+const ResetPasswordSchema = z
+  .object({
+    password: z
+      .string()
+      .min(1, { message: 'Please enter a password' })
+      .min(6, { message: 'Password must be at least 6 characters' }),
+    confirmPassword: z
+      .string()
+      .min(1, { message: 'Please confirm your password' })
+      .min(6, { message: 'Password must be at least 6 characters' }),
+  })
+  .refine((data) => data.password === data.confirmPassword, {
+    message: "Passwords don't match",
+    path: ['confirmPassword'],
+  });
+
+type ResetUserPasswordSchemaType = z.infer<typeof ResetPasswordSchema>;
+
+/**
+ * Renders the recover password page.
+ * @returns {React.JSX.Element} The rendered login page.
+ */
+const ResetPassword = (): React.JSX.Element => {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+  const { isSignedIn, getUser } = useAuthContext();
+  const [isLoading, setIsLoading] = useState(true);
+  const [isSubmitting, setIsSubmitting] = useState(false);
+
+  const userId: string | null = searchParams.get('userId');
+  const secret: string | null = searchParams.get('secret');
+  const expire: string | null = searchParams.get('expire');
+
+  useEffect(() => {
+    if (!userId || !secret || !expire) {
+      router.push('/login');
+    } else {
+      setIsLoading(false);
+      if (isSignedIn) {
+        getUser();
+        router.push('/league/all');
+      }
+    }
+  }, [isSignedIn]);
+
+  const form = useForm<ResetUserPasswordSchemaType>({
+    resolver: zodResolver(ResetPasswordSchema),
+    defaultValues: {
+      password: '',
+      confirmPassword: '',
+    },
+  });
+
+  /**
+   * The current value of the 'password' field in the form.
+   * @type {string}
+   */
+  const password: string = useWatch({
+    control: form.control,
+    name: 'password',
+    defaultValue: '',
+  });
+
+  /**
+   * The current value of the 'confirmPassword' field in the form.
+   * @type {string}
+   */
+  const confirmPassword: string = useWatch({
+    control: form.control,
+    name: 'confirmPassword',
+    defaultValue: '',
+  });
+
+  /**
+   * Handles the form submission.
+   * @param data - The data from the form.
+   */
+  const onSubmit: SubmitHandler<ResetUserPasswordSchemaType> = async (data) => {
+    const { password } = data;
+    setIsSubmitting(true);
+
+    try {
+      await resetPassword({
+        userId: userId as string,
+        token: secret as string,
+        password,
+      });
+
+      toast.custom(
+        <Alert
+          variant={AlertVariants.Success}
+          message="Your password has been reset successfully! Please login with your new password."
+        />,
+      );
+
+      setTimeout(() => router.push('/login'), 2000);
+    } catch (err) {
+      console.error('Error resetting password:', err);
+      let errorMessage = 'There was an error resetting your password.';
+
+      if (err instanceof Error) {
+        const customErr = err as CustomError;
+        if (customErr.type === 'user_invalid_token') {
+          errorMessage =
+            'Invalid recovery token. Your token may have expired or already been used.  Please try again.';
+        }
+      }
+
+      toast.custom(
+        <Alert variant={AlertVariants.Error} message={errorMessage} />,
+      );
+
+      setTimeout(() => router.push('/recover-password'), 2000);
+    } finally {
+      setIsSubmitting(false);
+    }
+  };
+
+  const isDisabled = !password || password !== confirmPassword;
+
+  return (
+    <section className="grid xl:grid-cols-2 xl:grid-rows-none">
+      <div className="row-span-1 grid w-full place-items-center from-[#4E160E] to-zinc-950 bg-gradient-to-b xl:h-screen xl:bg-gradient-to-b">
+        <Logo className="mx-auto w-52 xl:w-64 xl:place-self-end" src={logo} />
+        <div className="mx-auto grid gap-4 place-self-end px-8 pb-8 text-foreground">
+          <p className="hidden leading-7 xl:block">
+            Thank you... fantasy football draft, for letting me know that even
+            in my fantasies, I am bad at sports.
+          </p>
+          <p className="hidden leading-7 xl:block">Jimmy Fallon</p>
+        </div>
+      </div>
+      <div className="row-span-1 mx-auto grid max-w-sm justify-center space-y-4 px-4 xl:flex xl:flex-col">
+        {!isLoading && (
+          <>
+            <div>
+              <h1 className="text-5xl font-extrabold tracking-tight">
+                Recover Your Password
+              </h1>
+              <p className="pb-4 font-normal leading-7 text-muted-foreground">
+                Enter your new password and confirm it to recover your account.
+              </p>
+            </div>
+            <Form {...form}>
+              <form
+                id="input-container"
+                className="grid gap-3"
+                onSubmit={form.handleSubmit(onSubmit)}
+              >
+                <FormField
+                  control={form.control as Control<object>}
+                  name="password"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormControl>
+                        <Input
+                          data-testid="password"
+                          type="password"
+                          placeholder="Password"
+                          {...field}
+                        />
+                      </FormControl>
+                      {form.formState.errors.password && (
+                        <FormMessage>
+                          {form.formState.errors.password.message}
+                        </FormMessage>
+                      )}
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control as Control<object>}
+                  name="confirmPassword"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormControl>
+                        <Input
+                          data-testid="confirm-password"
+                          type="password"
+                          placeholder="Confirm Password"
+                          {...field}
+                        />
+                      </FormControl>
+                      {form.formState.errors.confirmPassword && (
+                        <FormMessage>
+                          {form.formState.errors.confirmPassword.message}
+                        </FormMessage>
+                      )}
+                    </FormItem>
+                  )}
+                />
+                <Button
+                  data-testid="continue-button"
+                  label={isSubmitting ? <LoadingSpinner /> : 'Continue'}
+                  type="submit"
+                  disabled={isDisabled}
+                />
+              </form>
+            </Form>
+          </>
+        )}
+      </div>
+    </section>
+  );
+};
+
+export default ResetPassword;
diff --git a/app/(main)/login/page.tsx b/app/(main)/login/page.tsx
index 2ae2ee44..0e785c0d 100644
--- a/app/(main)/login/page.tsx
+++ b/app/(main)/login/page.tsx
@@ -168,6 +168,9 @@ const Login = (): React.JSX.Element => {
             <LinkCustom href="/register">
               Sign up to get started with a league
             </LinkCustom>
+            <LinkCustom href="/recover-password">
+              Forgot your password?
+            </LinkCustom>
           </form>
         </Form>
       </div>
diff --git a/app/(main)/recover-password/page.tsx b/app/(main)/recover-password/page.tsx
new file mode 100644
index 00000000..a087ae29
--- /dev/null
+++ b/app/(main)/recover-password/page.tsx
@@ -0,0 +1,151 @@
+// Copyright (c) Gridiron Survivor.
+// Licensed under the MIT License.
+
+'use client';
+import { Button } from '@/components/Button/Button';
+import { Control, useForm, useWatch, SubmitHandler } from 'react-hook-form';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormMessage,
+} from '../../../components/Form/Form';
+import { Input } from '@/components/Input/Input';
+import { useAuthContext } from '@/context/AuthContextProvider';
+import { z } from 'zod';
+import { zodResolver } from '@hookform/resolvers/zod';
+import LinkCustom from '@/components/LinkCustom/LinkCustom';
+import LoadingSpinner from '@/components/LoadingSpinner/LoadingSpinner';
+import Logo from '@/components/Logo/Logo';
+import logo from '@/public/assets/logo-colored-outline.svg';
+import React, { useEffect, useState } from 'react';
+import { useRouter } from 'next/navigation';
+import { recoverPassword } from '@/api/apiFunctions';
+import toast from 'react-hot-toast';
+import Alert from '@/components/AlertNotification/AlertNotification';
+import { AlertVariants } from '@/components/AlertNotification/Alerts.enum';
+
+/**
+ * The schema for the login form.
+ * @throws {Error} Throws an error if the email is not a valid email address.
+ * @throws {Error} Throws an error if the email is not provided.
+ * @throws {Error} Throws an error if the email is not a string.
+ */
+const RecoverUserPasswordSchema = z.object({
+  email: z
+    .string()
+    .min(1, { message: 'Please enter an email address' })
+    .email({ message: 'Please enter a valid email address' }),
+});
+
+type ResetUserPasswordSchemaType = z.infer<typeof RecoverUserPasswordSchema>;
+
+/**
+ * Renders the recover password page.
+ * @returns {React.JSX.Element} The rendered login page.
+ */
+const RecoverPassword = (): React.JSX.Element => {
+  const router = useRouter();
+  const { isSignedIn, getUser } = useAuthContext();
+  const [isLoading, setIsLoading] = useState(false);
+
+  useEffect(() => {
+    if (isSignedIn) {
+      getUser();
+      router.push('/league/all');
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isSignedIn, getUser]);
+
+  const form = useForm<ResetUserPasswordSchemaType>({
+    resolver: zodResolver(RecoverUserPasswordSchema),
+  });
+
+  const email = useWatch({
+    control: form.control,
+    name: 'email',
+    defaultValue: '',
+  });
+
+  /**
+   * Handles the form submission.
+   * @param {ResetUserPasswordSchemaType} data - The data from the form.
+   */
+  const onSubmit: SubmitHandler<ResetUserPasswordSchemaType> = async (data) => {
+    setIsLoading(true);
+    await recoverPassword(data);
+    setIsLoading(false);
+    toast.custom(
+      <Alert
+        variant={AlertVariants.Success}
+        message={`Thank you! Check your email for instructions to reset your password if an associated account is found with ${data.email}`}
+      />,
+    );
+    setTimeout(() => router.push('/login'), 2000);
+  };
+
+  return (
+    <section className="grid xl:grid-cols-2 xl:grid-rows-none">
+      <div className="row-span-1 grid w-full place-items-center from-[#4E160E] to-zinc-950 bg-gradient-to-b xl:h-screen xl:bg-gradient-to-b">
+        <Logo className="mx-auto w-52 xl:w-64 xl:place-self-end" src={logo} />
+        <div className="mx-auto grid gap-4 place-self-end px-8 pb-8 text-foreground">
+          <p className="hidden leading-7 xl:block">
+            Thank you... fantasy football draft, for letting me know that even
+            in my fantasies, I am bad at sports.
+          </p>
+          <p className="hidden leading-7 xl:block">Jimmy Fallon</p>
+        </div>
+      </div>
+      <div className="row-span-1 mx-auto grid max-w-sm justify-center space-y-4 px-4 xl:flex xl:flex-col">
+        <div>
+          <h1 className="text-5xl font-extrabold tracking-tight">
+            Recover Your Password
+          </h1>
+          <p className="pb-4 font-normal leading-7 text-muted-foreground">
+            Enter the email address associated with your account to recover your
+            password.
+          </p>
+        </div>
+        <Form {...form}>
+          <form
+            id="input-container"
+            className="grid gap-3"
+            onSubmit={form.handleSubmit(onSubmit)}
+          >
+            <FormField
+              control={form.control as Control<object>}
+              name="email"
+              render={({ field }) => (
+                <FormItem>
+                  <FormControl>
+                    <Input
+                      data-testid="email"
+                      type="email"
+                      placeholder="Email"
+                      {...field}
+                    />
+                  </FormControl>
+                  {form.formState.errors.email && (
+                    <FormMessage>
+                      {form.formState.errors.email.message}
+                    </FormMessage>
+                  )}
+                </FormItem>
+              )}
+            />
+            <Button
+              data-testid="continue-button"
+              label={isLoading ? <LoadingSpinner /> : 'Continue'}
+              type="submit"
+              disabled={!email || isLoading}
+            />
+            <LinkCustom href="/login">Return to Login</LinkCustom>
+          </form>
+        </Form>
+      </div>
+    </section>
+  );
+};
+
+export default RecoverPassword;
diff --git a/components/Nav/Nav.test.tsx b/components/Nav/Nav.test.tsx
index e1c26dd3..9157f050 100644
--- a/components/Nav/Nav.test.tsx
+++ b/components/Nav/Nav.test.tsx
@@ -92,6 +92,16 @@ describe('Nav', () => {
     expect(navElement).toBeInTheDocument();
     expect(navElement).toHaveClass('hidden');
   });
+  it('it should be hidden when path is /reset-password', () => {
+    mockUsePathname.mockImplementation(() => '/recover-password');
+
+    render(<Nav />);
+
+    const navElement = screen.getByTestId('nav');
+
+    expect(navElement).toBeInTheDocument();
+    expect(navElement).toHaveClass('hidden');
+  });
 
   it('it should be visible when logged in', () => {
     mockUsePathname.mockImplementation(() => '/weeklyPicks');
diff --git a/components/Nav/Nav.tsx b/components/Nav/Nav.tsx
index b3be3892..47ed1bd0 100644
--- a/components/Nav/Nav.tsx
+++ b/components/Nav/Nav.tsx
@@ -45,7 +45,12 @@ export const Nav = (): JSX.Element => {
     <nav
       className={cn(
         'flex h-16 items-center border-b border-border from-[#4E160E] to-zinc-950 px-4 bg-gradient-to-b',
-        pathname === '/login' || pathname === '/register' ? 'hidden' : '',
+        pathname === '/login' ||
+          pathname === '/register' ||
+          pathname === '/recover-password' ||
+          pathname === '/account/recovery'
+          ? 'hidden'
+          : '',
       )}
       data-testid="nav"
     >
diff --git a/context/AuthContextProvider.tsx b/context/AuthContextProvider.tsx
index 99eebea6..d607d6b0 100644
--- a/context/AuthContextProvider.tsx
+++ b/context/AuthContextProvider.tsx
@@ -81,7 +81,11 @@ export const AuthContextProvider = ({
    */
   const getUser = async (): Promise<IUser | undefined> => {
     if (!isSessionInLocalStorage()) {
-      if (pathname !== '/register') {
+      if (
+        pathname !== '/register' &&
+        pathname !== '/account/recovery' &&
+        pathname !== '/recover-password'
+      ) {
         router.push('/login');
       }
       return;
diff --git a/utils/utils.ts b/utils/utils.ts
index 6bbf7f9e..0c30c77e 100644
--- a/utils/utils.ts
+++ b/utils/utils.ts
@@ -156,3 +156,23 @@ export const hasTeamBeenPicked = (teamName: string, selectedTeams: string[]): bo
   const currentWeek = useDataStore.getState().currentWeek;
   return selectedTeams.some((team, index) => index !== (currentWeek - 1) && team === teamName) ? true : false;
 }
+
+/**
+ * Returns the base URL for the application
+ * @returns {string} - The base URL
+ */
+export const getBaseURL = (): string => {
+  // Check for Vercel production environment
+  if (process.env.VERCEL_ENV === 'production') {
+    return `https://${process.env.VERCEL_URL}`;
+  }
+
+  // Check for Vercel preview environment
+  if (process.env.VERCEL_ENV === 'preview') {
+    // Use VERCEL_BRANCH_URL if available, fallback to VERCEL_URL
+    return `https://${process.env.VERCEL_BRANCH_URL || process.env.VERCEL_URL}`;
+  }
+
+  // Default to localhost for development
+  return process.env.NEXT_PUBLIC_BASE_URL || 'http://localhost:3000';
+}

From a814fe67933639ec5cb5ea980a36c08ed224e41c Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Fri, 13 Sep 2024 13:38:04 -0400
Subject: [PATCH 050/118] fix: suspense boundary build error

---
 app/(main)/account/recovery/page.tsx | 47 +++++++++++++++++++---------
 1 file changed, 32 insertions(+), 15 deletions(-)

diff --git a/app/(main)/account/recovery/page.tsx b/app/(main)/account/recovery/page.tsx
index 6975c7fb..0ca3b0db 100644
--- a/app/(main)/account/recovery/page.tsx
+++ b/app/(main)/account/recovery/page.tsx
@@ -24,6 +24,8 @@ import {
   FormItem,
   FormMessage,
 } from '../../../../components/Form/Form';
+import { Suspense } from 'react';
+import GlobalSpinner from '@/components/GlobalSpinner/GlobalSpinner';
 
 interface CustomError extends Error {
   type?: string;
@@ -59,26 +61,37 @@ type ResetUserPasswordSchemaType = z.infer<typeof ResetPasswordSchema>;
  */
 const ResetPassword = (): React.JSX.Element => {
   const router = useRouter();
-  const searchParams = useSearchParams();
   const { isSignedIn, getUser } = useAuthContext();
   const [isLoading, setIsLoading] = useState(true);
   const [isSubmitting, setIsSubmitting] = useState(false);
+  let userId: string | null = null;
+  let secret: string | null = null;
+  let expire: string | null = null;
 
-  const userId: string | null = searchParams.get('userId');
-  const secret: string | null = searchParams.get('secret');
-  const expire: string | null = searchParams.get('expire');
-
-  useEffect(() => {
-    if (!userId || !secret || !expire) {
-      router.push('/login');
-    } else {
-      setIsLoading(false);
-      if (isSignedIn) {
-        getUser();
-        router.push('/league/all');
+  /**
+   * Wrapper component to handle search params
+   * @returns {null} - null
+   */
+  const SearchParamsWrapper = (): null => {
+    const searchParams = useSearchParams();
+    userId = searchParams.get('userId');
+    secret = searchParams.get('secret');
+    expire = searchParams.get('expire');
+
+    useEffect(() => {
+      if (!userId || !secret || !expire) {
+        router.push('/login');
+      } else {
+        setIsLoading(false);
+        if (isSignedIn) {
+          getUser();
+          router.push('/league/all');
+        }
       }
-    }
-  }, [isSignedIn]);
+    }, [isSignedIn]);
+
+    return null;
+  };
 
   const form = useForm<ResetUserPasswordSchemaType>({
     resolver: zodResolver(ResetPasswordSchema),
@@ -157,6 +170,10 @@ const ResetPassword = (): React.JSX.Element => {
 
   return (
     <section className="grid xl:grid-cols-2 xl:grid-rows-none">
+      <Suspense fallback={<GlobalSpinner />}>
+        <SearchParamsWrapper />
+      </Suspense>
+
       <div className="row-span-1 grid w-full place-items-center from-[#4E160E] to-zinc-950 bg-gradient-to-b xl:h-screen xl:bg-gradient-to-b">
         <Logo className="mx-auto w-52 xl:w-64 xl:place-self-end" src={logo} />
         <div className="mx-auto grid gap-4 place-self-end px-8 pb-8 text-foreground">

From 52b5816d09f5e5a77941ffdeb662aca2ffd4c3c7 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Fri, 13 Sep 2024 13:49:58 -0400
Subject: [PATCH 051/118] fix vercel env's to be public

---
 utils/utils.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/utils/utils.ts b/utils/utils.ts
index 0c30c77e..472cee6b 100644
--- a/utils/utils.ts
+++ b/utils/utils.ts
@@ -163,14 +163,14 @@ export const hasTeamBeenPicked = (teamName: string, selectedTeams: string[]): bo
  */
 export const getBaseURL = (): string => {
   // Check for Vercel production environment
-  if (process.env.VERCEL_ENV === 'production') {
-    return `https://${process.env.VERCEL_URL}`;
+  if (process.env.NEXT_PUBLIC_VERCEL_ENV === 'production') {
+    return `https://${process.env.NEXT_PUBLIC_VERCEL_URL}`;
   }
 
   // Check for Vercel preview environment
-  if (process.env.VERCEL_ENV === 'preview') {
+  if (process.env.NEXT_PUBLIC_VERCEL_ENV === 'preview') {
     // Use VERCEL_BRANCH_URL if available, fallback to VERCEL_URL
-    return `https://${process.env.VERCEL_BRANCH_URL || process.env.VERCEL_URL}`;
+    return `https://${process.env.NEXT_PUBLIC_VERCEL_BRANCH_URL || process.env.NEXT_PUBLIC_VERCEL_URL}`;
   }
 
   // Default to localhost for development

From 1357ed81e04a72118feda6c4ed1edfb65ceb9313 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Fri, 13 Sep 2024 14:26:53 -0400
Subject: [PATCH 052/118] update utils test

---
 utils/utils.test.ts | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/utils/utils.test.ts b/utils/utils.test.ts
index 408a3b89..528f3b0c 100644
--- a/utils/utils.test.ts
+++ b/utils/utils.test.ts
@@ -5,6 +5,7 @@ import {
   getUserPick,
   parseUserPick,
   getUserLeagues,
+  getBaseURL,
 } from './utils';
 import { getCurrentLeague, getAllWeeklyPicks } from '@/api/apiFunctions';
 
@@ -191,4 +192,26 @@ describe('utils', () => {
       expect(result).toStrictEqual([]);
     });
   });
+
+  describe('getBaseURL', () => {
+    it('should return the correct base URL for production', () => {
+      process.env.NEXT_PUBLIC_VERCEL_ENV = 'production';
+      process.env.NEXT_PUBLIC_VERCEL_URL = 'production.com';
+      const result = getBaseURL();
+      expect(result).toBe('https://production.com');
+    });
+
+    it('should return the correct base URL for preview', () => {
+      process.env.NEXT_PUBLIC_VERCEL_ENV = 'preview';
+      process.env.NEXT_PUBLIC_VERCEL_BRANCH_URL = 'preview.com';
+      const result = getBaseURL();
+      expect(result).toBe('https://preview.com');
+    });
+
+    it('should return the correct base URL for development', () => {
+      process.env.NEXT_PUBLIC_VERCEL_ENV = 'development';
+      const result = getBaseURL();
+      expect(result).toBe('http://localhost:3000');
+    });
+  });
 });

From a6a9a6327607dbb5d42ff07c63a34488eaeecbfc Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Fri, 13 Sep 2024 17:09:25 -0400
Subject: [PATCH 053/118] fix: apiFunctions.test.tsx

---
 api/apiFunctions.test.tsx | 13 +++++--------
 api/apiFunctions.ts       | 11 ++---------
 utils/getBaseUrl.test.ts  | 23 +++++++++++++++++++++++
 utils/getBaseUrl.ts       | 25 +++++++++++++++++++++++++
 utils/utils.test.ts       | 23 -----------------------
 utils/utils.ts            | 20 --------------------
 6 files changed, 55 insertions(+), 60 deletions(-)
 create mode 100644 utils/getBaseUrl.test.ts
 create mode 100644 utils/getBaseUrl.ts

diff --git a/api/apiFunctions.test.tsx b/api/apiFunctions.test.tsx
index d4776f13..8af72271 100644
--- a/api/apiFunctions.test.tsx
+++ b/api/apiFunctions.test.tsx
@@ -1,11 +1,10 @@
-import { log } from 'console';
 import {
   addUserToLeague,
   getAllLeagues,
-  getUserDocumentId,
   loginAccount,
   logoutAccount,
   registerAccount,
+  getCurrentLeague,
 } from './apiFunctions';
 import { account } from './config';
 const apiFunctions = require('./apiFunctions');
@@ -21,15 +20,13 @@ jest.mock('./apiFunctions', () => {
     getAllLeagues: jest.fn(),
     getUserDocumentId: jest.fn(),
     addUserToLeague: jest.fn(),
+    getCurrentLeague: jest.fn(),
+    loginAccount: jest.fn(),
+    registerAccount: jest.fn(),
   };
 });
 
 describe('Auth Functions', () => {
-  jest.mock('./apiFunctions', () => ({
-    loginAccount: jest.fn(),
-    registerAccount: jest.fn(),
-  }));
-
   xdescribe('login account successful', () => {
     it('should show user login successfully', async () => {
       const userDummy = {
@@ -63,7 +60,7 @@ describe('Auth Functions', () => {
   });
 
   account.create = jest.fn();
-  describe('register account successful', () => {
+  xdescribe('register account successful', () => {
     it('Should allow a user to register an account', async () => {
       const userDummy = {
         email: 'testemail0@email.com',
diff --git a/api/apiFunctions.ts b/api/apiFunctions.ts
index ebd6b52a..870a3728 100644
--- a/api/apiFunctions.ts
+++ b/api/apiFunctions.ts
@@ -18,7 +18,7 @@ import {
   IEntry,
   IEntryProps,
 } from '@/app/(main)/league/[leagueId]/entry/Entries.interface';
-import { getBaseURL } from '@/utils/utils';
+import { getBaseURL } from '@/utils/getBaseUrl';
 
 /**
  * Register a new account
@@ -51,6 +51,7 @@ export async function recoverPassword({
   email: string;
 }): Promise<IRecoveryToken> {
   const baseURL = getBaseURL();
+
   try {
     const result = await account.createRecovery(
       email,
@@ -89,14 +90,6 @@ export async function resetPassword({
   }
 }
 
-/**
- * Reset a User Password
- * @param props - the props for the reset password function
- * @param props.recoveryToken - the recovery token
- * @param props.password - the new password
- * @returns {Promise<void>} - the reset password
- */
-
 /**
  * Login to an existing account
  * @param props - The account data
diff --git a/utils/getBaseUrl.test.ts b/utils/getBaseUrl.test.ts
new file mode 100644
index 00000000..2a0149ae
--- /dev/null
+++ b/utils/getBaseUrl.test.ts
@@ -0,0 +1,23 @@
+import { getBaseURL } from './getBaseUrl';
+
+describe('getBaseURL', () => {
+  it('should return the correct base URL for production', () => {
+    process.env.NEXT_PUBLIC_VERCEL_ENV = 'production';
+    process.env.NEXT_PUBLIC_VERCEL_URL = 'production.com';
+    const result = getBaseURL();
+    expect(result).toBe('https://production.com');
+  });
+
+  it('should return the correct base URL for preview', () => {
+    process.env.NEXT_PUBLIC_VERCEL_ENV = 'preview';
+    process.env.NEXT_PUBLIC_VERCEL_BRANCH_URL = 'preview.com';
+    const result = getBaseURL();
+    expect(result).toBe('https://preview.com');
+  });
+
+  it('should return the correct base URL for development', () => {
+    process.env.NEXT_PUBLIC_VERCEL_ENV = 'development';
+    const result = getBaseURL();
+    expect(result).toBe('http://localhost:3000');
+  });
+});
diff --git a/utils/getBaseUrl.ts b/utils/getBaseUrl.ts
new file mode 100644
index 00000000..5008e735
--- /dev/null
+++ b/utils/getBaseUrl.ts
@@ -0,0 +1,25 @@
+// Copyright (c) Gridiron Survivor.
+// Licensed under the MIT License.
+
+/**
+ * Returns the base URL for the application
+ * @returns {string} - The base URL
+ */
+export const getBaseURL = (): string => {
+  // Check for Vercel production environment
+  if (process.env.NEXT_PUBLIC_VERCEL_ENV === 'production') {
+    return `https://${process.env.NEXT_PUBLIC_VERCEL_URL}`;
+  }
+
+  // Check for Vercel preview environment
+  if (process.env.NEXT_PUBLIC_VERCEL_ENV === 'preview') {
+    // Use VERCEL_BRANCH_URL if available, fallback to VERCEL_URL
+    return `https://${
+      process.env.NEXT_PUBLIC_VERCEL_BRANCH_URL ||
+      process.env.NEXT_PUBLIC_VERCEL_URL
+    }`;
+  }
+
+  // Default to localhost for development
+  return process.env.NEXT_PUBLIC_BASE_URL || 'http://localhost:3000';
+};
diff --git a/utils/utils.test.ts b/utils/utils.test.ts
index 528f3b0c..408a3b89 100644
--- a/utils/utils.test.ts
+++ b/utils/utils.test.ts
@@ -5,7 +5,6 @@ import {
   getUserPick,
   parseUserPick,
   getUserLeagues,
-  getBaseURL,
 } from './utils';
 import { getCurrentLeague, getAllWeeklyPicks } from '@/api/apiFunctions';
 
@@ -192,26 +191,4 @@ describe('utils', () => {
       expect(result).toStrictEqual([]);
     });
   });
-
-  describe('getBaseURL', () => {
-    it('should return the correct base URL for production', () => {
-      process.env.NEXT_PUBLIC_VERCEL_ENV = 'production';
-      process.env.NEXT_PUBLIC_VERCEL_URL = 'production.com';
-      const result = getBaseURL();
-      expect(result).toBe('https://production.com');
-    });
-
-    it('should return the correct base URL for preview', () => {
-      process.env.NEXT_PUBLIC_VERCEL_ENV = 'preview';
-      process.env.NEXT_PUBLIC_VERCEL_BRANCH_URL = 'preview.com';
-      const result = getBaseURL();
-      expect(result).toBe('https://preview.com');
-    });
-
-    it('should return the correct base URL for development', () => {
-      process.env.NEXT_PUBLIC_VERCEL_ENV = 'development';
-      const result = getBaseURL();
-      expect(result).toBe('http://localhost:3000');
-    });
-  });
 });
diff --git a/utils/utils.ts b/utils/utils.ts
index 472cee6b..6bbf7f9e 100644
--- a/utils/utils.ts
+++ b/utils/utils.ts
@@ -156,23 +156,3 @@ export const hasTeamBeenPicked = (teamName: string, selectedTeams: string[]): bo
   const currentWeek = useDataStore.getState().currentWeek;
   return selectedTeams.some((team, index) => index !== (currentWeek - 1) && team === teamName) ? true : false;
 }
-
-/**
- * Returns the base URL for the application
- * @returns {string} - The base URL
- */
-export const getBaseURL = (): string => {
-  // Check for Vercel production environment
-  if (process.env.NEXT_PUBLIC_VERCEL_ENV === 'production') {
-    return `https://${process.env.NEXT_PUBLIC_VERCEL_URL}`;
-  }
-
-  // Check for Vercel preview environment
-  if (process.env.NEXT_PUBLIC_VERCEL_ENV === 'preview') {
-    // Use VERCEL_BRANCH_URL if available, fallback to VERCEL_URL
-    return `https://${process.env.NEXT_PUBLIC_VERCEL_BRANCH_URL || process.env.NEXT_PUBLIC_VERCEL_URL}`;
-  }
-
-  // Default to localhost for development
-  return process.env.NEXT_PUBLIC_BASE_URL || 'http://localhost:3000';
-}

From 371211ced5588ca6c293d0c84dbea33af5836137 Mon Sep 17 00:00:00 2001
From: Alex Appleget <alexappleget2014@gmail.com>
Date: Fri, 13 Sep 2024 16:15:40 -0500
Subject: [PATCH 054/118] Fix: Deleted unnecessary arrays.

---
 components/WeeklyPickButton/WeeklyPickButton.test.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/WeeklyPickButton/WeeklyPickButton.test.tsx b/components/WeeklyPickButton/WeeklyPickButton.test.tsx
index 0aeea8cd..e8bb8821 100644
--- a/components/WeeklyPickButton/WeeklyPickButton.test.tsx
+++ b/components/WeeklyPickButton/WeeklyPickButton.test.tsx
@@ -12,7 +12,7 @@ const weeklyPickData = {
 };
 
 describe('WeeklyPickButton', () => {
-  it.each([['Home'], ['Away']])('renders correctly with homeAway data', (homeAway) => {
+  it.each(['Home', 'Away'])('renders correctly with homeAway data', (homeAway) => {
     render(
       <RadioGroup>
         <WeeklyPickButton homeAway={homeAway} team={weeklyPickData.team} src={weeklyPickData.src} />

From 8dbbdb0401607927b60a01df3f865cb68faaa609 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Fri, 13 Sep 2024 17:53:16 -0400
Subject: [PATCH 055/118] update apiFunctions.test.tsx

---
 api/apiFunctions.test.tsx | 595 +++++++++++++++++++++-----------------
 api/apiFunctions.ts       |  32 --
 2 files changed, 337 insertions(+), 290 deletions(-)

diff --git a/api/apiFunctions.test.tsx b/api/apiFunctions.test.tsx
index 8af72271..9d4da9e5 100644
--- a/api/apiFunctions.test.tsx
+++ b/api/apiFunctions.test.tsx
@@ -1,13 +1,12 @@
 import {
-  addUserToLeague,
-  getAllLeagues,
-  loginAccount,
-  logoutAccount,
+  recoverPassword,
   registerAccount,
-  getCurrentLeague,
+  resetPassword,
 } from './apiFunctions';
-import { account } from './config';
+import { IUser } from './apiFunctions.interface';
+import { account, ID } from './config';
 const apiFunctions = require('./apiFunctions');
+import { getBaseURL } from '@/utils/getBaseUrl';
 
 jest.mock('./apiFunctions', () => {
   const actualModule = jest.requireActual('./apiFunctions');
@@ -22,293 +21,373 @@ jest.mock('./apiFunctions', () => {
     addUserToLeague: jest.fn(),
     getCurrentLeague: jest.fn(),
     loginAccount: jest.fn(),
-    registerAccount: jest.fn(),
   };
 });
 
-describe('Auth Functions', () => {
-  xdescribe('login account successful', () => {
-    it('should show user login successfully', async () => {
-      const userDummy = {
-        email: 'testemail@email.com',
-        password: 'test1234',
-      };
-      await loginAccount(userDummy);
-      expect(account.createEmailPasswordSession).toBeInstanceOf(Object);
+jest.mock('@/utils/getBaseUrl', () => ({
+  getBaseURL: jest.fn(),
+}));
+
+jest.mock('./config', () => ({
+  account: {
+    create: jest.fn(),
+    createRecovery: jest.fn(),
+    updateRecovery: jest.fn(),
+  },
+  ID: {
+    unique: jest.fn(),
+  },
+}));
+
+describe('apiFunctions', () => {
+  describe('Authentication Functions', () => {
+    const mockBaseURL = 'http://example.com';
+    const mockEmail = 'test@example.com';
+    const mockPassword = 'newPassword123';
+    const mockRecoveryToken = { userId: '123', secret: 'abc123' };
+    const mockToken = 'abc123';
+    const mockUserId = '123';
+    const mockUniqueId = 'unique123';
+
+    beforeEach(() => {
+      jest.clearAllMocks();
+      (getBaseURL as jest.MockedFunction<typeof getBaseURL>).mockReturnValue(
+        mockBaseURL,
+      );
     });
 
-    //user failed to log in
-    it('should send error if user could not log in', async () => {
-      const failDummy = {
-        email: 'testemil@email.com',
-        password: 'tet1234679',
-      };
-      await loginAccount(failDummy);
-      expect(loginAccount(failDummy)).rejects.toThrow('error');
+    describe('registerAccount', () => {
+      it('should successfully register a new account', async () => {
+        const mockUser: IUser = {
+          documentId: '123',
+          id: mockUniqueId,
+          email: mockEmail,
+          leagues: [],
+        };
+
+        (ID.unique as jest.Mock).mockReturnValue(mockUniqueId);
+        (account.create as jest.Mock).mockResolvedValue(mockUser);
+
+        const result = await registerAccount({
+          email: mockEmail,
+          password: mockPassword,
+        });
+
+        expect(account.create).toHaveBeenCalledWith(
+          mockUniqueId,
+          mockEmail,
+          mockPassword,
+        );
+        expect(result).toEqual(mockUser);
+      });
+
+      it('should throw an error if registration fails', async () => {
+        const mockError = new Error('Registration failed');
+        (account.create as jest.Mock).mockRejectedValue(mockError);
+
+        await expect(
+          registerAccount({ email: mockEmail, password: mockPassword }),
+        ).rejects.toThrow('Error registering user');
+
+        expect(ID.unique).toHaveBeenCalledTimes(1);
+        expect(account.create).toHaveBeenCalledWith(
+          mockUniqueId,
+          mockEmail,
+          mockPassword,
+        );
+      });
     });
-  });
 
-  // Test the logout function
-  describe('logout account works', () => {
-    it('should log out successfully', async () => {
-      jest
-        .spyOn(account, 'deleteSession')
-        .mockResolvedValueOnce('Session deleted');
-      await logoutAccount();
-      expect(account.deleteSession).toHaveBeenCalledTimes(1);
+    describe('recoverPassword', () => {
+      it('should successfully create a recovery token', async () => {
+        (account.createRecovery as jest.Mock).mockResolvedValue(
+          mockRecoveryToken,
+        );
+
+        const result = await recoverPassword({ email: mockEmail });
+
+        expect(getBaseURL).toHaveBeenCalledTimes(1);
+        expect(account.createRecovery).toHaveBeenCalledWith(
+          mockEmail,
+          `${mockBaseURL}/account/recovery`,
+        );
+        expect(result).toEqual(mockRecoveryToken);
+      });
+
+      it('should throw an error if recovery creation fails', async () => {
+        const mockError = new Error('Recovery creation failed');
+        (account.createRecovery as jest.Mock).mockRejectedValue(mockError);
+
+        await expect(recoverPassword({ email: mockEmail })).rejects.toThrow(
+          'Error recovering password',
+        );
+        expect(getBaseURL).toHaveBeenCalledTimes(1);
+        expect(account.createRecovery).toHaveBeenCalledWith(
+          mockEmail,
+          `${mockBaseURL}/account/recovery`,
+        );
+      });
     });
-  });
 
-  account.create = jest.fn();
-  xdescribe('register account successful', () => {
-    it('Should allow a user to register an account', async () => {
-      const userDummy = {
-        email: 'testemail0@email.com',
-        password: 'test12345',
-      };
-      const response = await registerAccount(userDummy);
-      expect(account.create).toHaveBeenCalledWith(
-        expect.any(String),
-        userDummy.email,
-        userDummy.password,
-      );
+    describe('resetPassword', () => {
+      it('should successfully reset the password', async () => {
+        (account.updateRecovery as jest.Mock).mockResolvedValue(
+          mockRecoveryToken,
+        );
+
+        const result = await resetPassword({
+          userId: mockUserId,
+          token: mockToken,
+          password: mockPassword,
+        });
+
+        expect(account.updateRecovery).toHaveBeenCalledWith(
+          mockUserId,
+          mockToken,
+          mockPassword,
+        );
+        expect(result).toEqual(mockRecoveryToken);
+      });
+
+      it('should throw an error if password reset fails', async () => {
+        const mockError = new Error('Password reset failed');
+        (account.updateRecovery as jest.Mock).mockRejectedValue(mockError);
+
+        await expect(
+          resetPassword({
+            userId: mockUserId,
+            token: mockToken,
+            password: mockPassword,
+          }),
+        ).rejects.toThrow('Password reset failed');
+        expect(account.updateRecovery).toHaveBeenCalledWith(
+          mockUserId,
+          mockToken,
+          mockPassword,
+        );
+      });
     });
   });
-});
-
-xtest('get weekly picks mock function', async () => {
-  const users = { userId: '66174f2362ec891167be' };
-  const resp = { data: users };
-
-  // Mocking the getWeeklyPicks function
-  jest.mock('./apiFunctions', () => ({
-    getUserWeeklyPick: jest.fn().mockResolvedValue(resp),
-  }));
 
-  // Importing the mocked function
-  const {
-    getUserWeeklyPick: mockGetUserWeeklyPick,
-  } = require('./apiFunctions');
-
-  // Call the function
-  const result = await mockGetUserWeeklyPick();
-
-  // Assertions
-  expect(result).toEqual(resp); // Check if the result matches the expected response
-});
+  describe('Get Weekly Picks Mock function', () => {
+    it('should mock getWeeklyPicks function', async () => {
+      const users = { $id: '663130a100297f77c3c8' };
+      const resp = { data: users };
 
-describe('Get Weekly Picks Mock function', () => {
-  it('should mock getWeeklyPicks function', async () => {
-    const users = { $id: '663130a100297f77c3c8' };
-    const resp = { data: users };
+      apiFunctions.getUserWeeklyPick.mockResolvedValue(resp);
 
-    apiFunctions.getUserWeeklyPick.mockResolvedValue(resp);
+      const result = await apiFunctions.getUserWeeklyPick({
+        userId: '66281d5ec5614f76bc91',
+        weekNumber: '6622c75658b8df4c4612',
+      });
 
-    const result = await apiFunctions.getUserWeeklyPick({
-      userId: '66281d5ec5614f76bc91',
-      weekNumber: '6622c75658b8df4c4612',
+      expect(result).toEqual(resp);
     });
-
-    expect(result).toEqual(resp);
   });
-});
 
-describe('Create Weekly Picks Mock Function', () => {
-  it('should mock createWeeklyPicks function', async () => {
-    const users = { team: '66218f22b40deef340f8', correct: false };
-    const resp = { data: users };
+  describe('Create Weekly Picks Mock Function', () => {
+    it('should mock createWeeklyPicks function', async () => {
+      const users = { team: '66218f22b40deef340f8', correct: false };
+      const resp = { data: users };
 
-    apiFunctions.createWeeklyPicks.mockResolvedValue(resp);
+      apiFunctions.createWeeklyPicks.mockResolvedValue(resp);
 
-    const result = await apiFunctions.createWeeklyPicks({
-      gameWeekId: '6622c7596558b090872b',
-      gameId: '66311a210039f0532044',
-      userResults:
-        '{"66281d5ec5614f76bc91":{"team":"66218f22b40deef340f8","correct":false},"6628077faeeedd272637":{"team":"6621b30ea57bd075e9d3","correct":false}, "66174f2362ec891167be":{"team": "6621b30ea57bd075e9d3", "correct":true}}',
-    });
+      const result = await apiFunctions.createWeeklyPicks({
+        gameWeekId: '6622c7596558b090872b',
+        gameId: '66311a210039f0532044',
+        userResults:
+          '{"66281d5ec5614f76bc91":{"team":"66218f22b40deef340f8","correct":false},"6628077faeeedd272637":{"team":"6621b30ea57bd075e9d3","correct":false}, "66174f2362ec891167be":{"team": "6621b30ea57bd075e9d3", "correct":true}}',
+      });
 
-    expect(result).toEqual(resp);
+      expect(result).toEqual(resp);
+    });
   });
-});
 
-describe('Get All Weekly Picks Mock Function', () => {
-  it('should mock getAllWeeklyPicks function', async () => {
-    const weeklyPicks = {
-      '66281d5ec5614f76bc91': { team: '66218f22b40deef340f8', correct: false },
-      '6628077faeeedd272637': { team: '6621b30ea57bd075e9d3', correct: false },
-      '66174f2362ec891167be': { team: '6621b30ea57bd075e9d3', correct: true },
-    };
-    const response = { data: weeklyPicks };
+  describe('Get All Weekly Picks Mock Function', () => {
+    it('should mock getAllWeeklyPicks function', async () => {
+      const weeklyPicks = {
+        '66281d5ec5614f76bc91': {
+          team: '66218f22b40deef340f8',
+          correct: false,
+        },
+        '6628077faeeedd272637': {
+          team: '6621b30ea57bd075e9d3',
+          correct: false,
+        },
+        '66174f2362ec891167be': { team: '6621b30ea57bd075e9d3', correct: true },
+      };
+      const response = { data: weeklyPicks };
 
-    apiFunctions.getAllWeeklyPicks.mockResolvedValue(response);
+      apiFunctions.getAllWeeklyPicks.mockResolvedValue(response);
 
-    const result = await apiFunctions.getAllWeeklyPicks();
+      const result = await apiFunctions.getAllWeeklyPicks();
 
-    expect(result).toEqual(response);
+      expect(result).toEqual(response);
+    });
   });
-});
 
-describe('getCurrentUserEntries()', () => {
-  it('should get all user entries and check if eliminated is equal to true', async () => {
-    const userEntries = [
-      {
-        eliminated: true,
-        league: {},
-        name: 'name',
-        selectedTeams: [],
-        user: '000',
-        $id: '000',
-      },
-    ];
-
-    apiFunctions.getCurrentUserEntries.mockResolvedValue(userEntries);
-
-    const result = await apiFunctions.getCurrentUserEntries();
-
-    for (const entry of result) {
-      expect(entry.eliminated).toEqual(true);
-    }
-  });
+  describe('getCurrentUserEntries()', () => {
+    it('should get all user entries and check if eliminated is equal to true', async () => {
+      const userEntries = [
+        {
+          eliminated: true,
+          league: {},
+          name: 'name',
+          selectedTeams: [],
+          user: '000',
+          $id: '000',
+        },
+      ];
+
+      apiFunctions.getCurrentUserEntries.mockResolvedValue(userEntries);
+
+      const result = await apiFunctions.getCurrentUserEntries();
+
+      for (const entry of result) {
+        expect(entry.eliminated).toEqual(true);
+      }
+    });
 
-  it('should get all user entries and check if eliminated is equal to false', async () => {
-    const userEntries = [
-      {
-        eliminated: false,
-        league: {},
-        name: 'name',
-        selectedTeams: [],
-        user: '000',
-        $id: '000',
-      },
-    ];
-
-    apiFunctions.getCurrentUserEntries.mockResolvedValue(userEntries);
-
-    const result = await apiFunctions.getCurrentUserEntries();
-
-    for (const entry of result) {
-      expect(entry.eliminated).toEqual(false);
-    }
-  });
+    it('should get all user entries and check if eliminated is equal to false', async () => {
+      const userEntries = [
+        {
+          eliminated: false,
+          league: {},
+          name: 'name',
+          selectedTeams: [],
+          user: '000',
+          $id: '000',
+        },
+      ];
+
+      apiFunctions.getCurrentUserEntries.mockResolvedValue(userEntries);
+
+      const result = await apiFunctions.getCurrentUserEntries();
+
+      for (const entry of result) {
+        expect(entry.eliminated).toEqual(false);
+      }
+    });
 
-  it('should get all user entries and check if eliminated is equal to null', async () => {
-    const userEntries = [
-      {
-        eliminated: null,
-        league: {},
-        name: 'name',
-        selectedTeams: [],
-        user: '000',
-        $id: '000',
-      },
-    ];
-
-    apiFunctions.getCurrentUserEntries.mockResolvedValue(userEntries);
-
-    const result = await apiFunctions.getCurrentUserEntries();
-
-    for (const entry of result) {
-      expect(entry.eliminated).toEqual(null);
-    }
+    it('should get all user entries and check if eliminated is equal to null', async () => {
+      const userEntries = [
+        {
+          eliminated: null,
+          league: {},
+          name: 'name',
+          selectedTeams: [],
+          user: '000',
+          $id: '000',
+        },
+      ];
+
+      apiFunctions.getCurrentUserEntries.mockResolvedValue(userEntries);
+
+      const result = await apiFunctions.getCurrentUserEntries();
+
+      for (const entry of result) {
+        expect(entry.eliminated).toEqual(null);
+      }
+    });
   });
-});
 
-xdescribe('get all leagues', () => {
-  it('should return all leagues upon successful call', async () => {
-    const mockAllLeagues = [
-      {
-        leagueId: '1',
-        leagueName: 'League One',
-        logo: '',
-        participants: ['user1', 'user2'],
-        survivors: ['user1'],
-      },
-      {
-        leagueId: '2',
-        leagueName: 'League Two',
-        logo: '',
-        participants: ['user3', 'user4'],
-        survivors: ['user4'],
-      },
-    ];
-
-    apiFunctions.getAllLeagues.mockResolvedValue(mockAllLeagues);
-
-    const result = await apiFunctions.getAllLeagues();
-
-    expect(result).toEqual([
-      {
-        leagueId: '1',
-        leagueName: 'League One',
-        logo: '',
-        participants: ['user1', 'user2'],
-        survivors: ['user1'],
-      },
-      {
-        leagueId: '2',
-        leagueName: 'League Two',
-        logo: '',
-        participants: ['user3', 'user4'],
-        survivors: ['user4'],
-      },
-    ]);
-  });
-  it('should return error upon unsuccessful call', async () => {
-    apiFunctions.getAllLeagues.mockRejectedValue(
-      new Error('Error getting all leagues'),
-    );
-
-    await expect(apiFunctions.getAllLeagues()).rejects.toThrow(
-      'Error getting all leagues',
-    );
-  });
-});
+  xdescribe('get all leagues', () => {
+    it('should return all leagues upon successful call', async () => {
+      const mockAllLeagues = [
+        {
+          leagueId: '1',
+          leagueName: 'League One',
+          logo: '',
+          participants: ['user1', 'user2'],
+          survivors: ['user1'],
+        },
+        {
+          leagueId: '2',
+          leagueName: 'League Two',
+          logo: '',
+          participants: ['user3', 'user4'],
+          survivors: ['user4'],
+        },
+      ];
+
+      apiFunctions.getAllLeagues.mockResolvedValue(mockAllLeagues);
+
+      const result = await apiFunctions.getAllLeagues();
+
+      expect(result).toEqual([
+        {
+          leagueId: '1',
+          leagueName: 'League One',
+          logo: '',
+          participants: ['user1', 'user2'],
+          survivors: ['user1'],
+        },
+        {
+          leagueId: '2',
+          leagueName: 'League Two',
+          logo: '',
+          participants: ['user3', 'user4'],
+          survivors: ['user4'],
+        },
+      ]);
+    });
+    it('should return error upon unsuccessful call', async () => {
+      apiFunctions.getAllLeagues.mockRejectedValue(
+        new Error('Error getting all leagues'),
+      );
 
-describe('get users id', () => {
-  it('should return user document ID', async () => {
-    const userId = '123';
-    const response = '456';
-    apiFunctions.getUserDocumentId.mockResolvedValue(response);
-    const result = await apiFunctions.getUserDocumentId(userId);
-    expect(result).toEqual(response);
-  });
-  it('should return error upon unsuccessful call', async () => {
-    apiFunctions.getUserDocumentId.mockRejectedValue(
-      new Error('Error getting user document ID'),
-    );
-    await expect(apiFunctions.getUserDocumentId('123')).rejects.toThrow(
-      'Error getting user document ID',
-    );
+      await expect(apiFunctions.getAllLeagues()).rejects.toThrow(
+        'Error getting all leagues',
+      );
+    });
   });
-});
 
-describe('add user to league', () => {
-  const response = {
-    userDocumentId: 'user123',
-    selectedLeague: 'league123',
-    selectedLeagues: ['league123'],
-    participants: ['user123', 'user456'],
-    survivors: ['user123'],
-  };
-  it('should add user to league', async () => {
-    apiFunctions.addUserToLeague.mockResolvedValue(response);
-    const result = await apiFunctions.addUserToLeague({ response });
-    expect(result).toEqual(response);
-  });
-  it('should return error upon unsuccessful call', async () => {
-    apiFunctions.addUserToLeague.mockRejectedValue(
-      new Error('Error adding user to league'),
-    );
-    await expect(apiFunctions.addUserToLeague('123', '456')).rejects.toThrow(
-      'Error adding user to league',
-    );
+  describe('get users id', () => {
+    it('should return user document ID', async () => {
+      const userId = '123';
+      const response = '456';
+      apiFunctions.getUserDocumentId.mockResolvedValue(response);
+      const result = await apiFunctions.getUserDocumentId(userId);
+      expect(result).toEqual(response);
+    });
+    it('should return error upon unsuccessful call', async () => {
+      apiFunctions.getUserDocumentId.mockRejectedValue(
+        new Error('Error getting user document ID'),
+      );
+      await expect(apiFunctions.getUserDocumentId('123')).rejects.toThrow(
+        'Error getting user document ID',
+      );
+    });
   });
-  it('should return error upon unsuccessful call', async () => {
-    apiFunctions.addUserToLeague.mockRejectedValue(
-      new Error('Error adding user to league'),
-    );
-    await expect(apiFunctions.addUserToLeague({ response })).rejects.toThrow(
-      'Error adding user to league',
-    );
+
+  describe('add user to league', () => {
+    const response = {
+      userDocumentId: 'user123',
+      selectedLeague: 'league123',
+      selectedLeagues: ['league123'],
+      participants: ['user123', 'user456'],
+      survivors: ['user123'],
+    };
+    it('should add user to league', async () => {
+      apiFunctions.addUserToLeague.mockResolvedValue(response);
+      const result = await apiFunctions.addUserToLeague({ response });
+      expect(result).toEqual(response);
+    });
+    it('should return error upon unsuccessful call', async () => {
+      apiFunctions.addUserToLeague.mockRejectedValue(
+        new Error('Error adding user to league'),
+      );
+      await expect(apiFunctions.addUserToLeague('123', '456')).rejects.toThrow(
+        'Error adding user to league',
+      );
+    });
+    it('should return error upon unsuccessful call', async () => {
+      apiFunctions.addUserToLeague.mockRejectedValue(
+        new Error('Error adding user to league'),
+      );
+      await expect(apiFunctions.addUserToLeague({ response })).rejects.toThrow(
+        'Error adding user to league',
+      );
+    });
   });
 });
diff --git a/api/apiFunctions.ts b/api/apiFunctions.ts
index 870a3728..9dd0b12a 100644
--- a/api/apiFunctions.ts
+++ b/api/apiFunctions.ts
@@ -90,38 +90,6 @@ export async function resetPassword({
   }
 }
 
-/**
- * Login to an existing account
- * @param props - The account data
- * @param props.email - The email of the user
- * @param props.password - The password of the user
- * @returns {Models.Session | Error} - The session object or an error
- */
-export async function loginAccount({
-  email,
-  password,
-}: IAccountData): Promise<Models.Session | Error> {
-  try {
-    return await account.createEmailPasswordSession(email, password);
-  } catch (error) {
-    console.error(error);
-    throw new Error('Error logging in user');
-  }
-}
-
-/**
- * Logout the current user
- * @returns {object | Error} - The session object or an error
- */
-export async function logoutAccount(): Promise<object | Error> {
-  try {
-    return await account.deleteSession('current');
-  } catch (error) {
-    console.error(error);
-    throw new Error('Error logging out user');
-  }
-}
-
 /**
  * Get the current user
  * @param userId - The user ID

From 8457cd821e27c66ccb876b02e35a066ed18a5439 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Fri, 13 Sep 2024 17:56:05 -0400
Subject: [PATCH 056/118] update nav.test.tsx

---
 components/Nav/Nav.test.tsx | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/components/Nav/Nav.test.tsx b/components/Nav/Nav.test.tsx
index 9157f050..47abd352 100644
--- a/components/Nav/Nav.test.tsx
+++ b/components/Nav/Nav.test.tsx
@@ -102,6 +102,16 @@ describe('Nav', () => {
     expect(navElement).toBeInTheDocument();
     expect(navElement).toHaveClass('hidden');
   });
+  it('it should be hidden when path is /account/recovery', () => {
+    mockUsePathname.mockImplementation(() => '/account/recovery');
+
+    render(<Nav />);
+
+    const navElement = screen.getByTestId('nav');
+
+    expect(navElement).toBeInTheDocument();
+    expect(navElement).toHaveClass('hidden');
+  });
 
   it('it should be visible when logged in', () => {
     mockUsePathname.mockImplementation(() => '/weeklyPicks');

From cbce63b65b60b61a9f70bc7fe965dc388c9a7084 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Fri, 13 Sep 2024 21:00:14 -0400
Subject: [PATCH 057/118] update unit tests

---
 app/(main)/login/page.tsx                 |   2 +-
 app/(main)/recover-password/page.test.tsx | 120 ++++++++++++++++++++++
 2 files changed, 121 insertions(+), 1 deletion(-)
 create mode 100644 app/(main)/recover-password/page.test.tsx

diff --git a/app/(main)/login/page.tsx b/app/(main)/login/page.tsx
index 0e785c0d..f66e254a 100644
--- a/app/(main)/login/page.tsx
+++ b/app/(main)/login/page.tsx
@@ -8,7 +8,7 @@ import {
   Form,
   FormControl,
   FormField,
-  FormItem,
+  FormItem, 
   FormMessage,
 } from '../../../components/Form/Form';
 import { Input } from '@/components/Input/Input';
diff --git a/app/(main)/recover-password/page.test.tsx b/app/(main)/recover-password/page.test.tsx
new file mode 100644
index 00000000..bfe614c8
--- /dev/null
+++ b/app/(main)/recover-password/page.test.tsx
@@ -0,0 +1,120 @@
+import { recoverPassword } from '@/api/apiFunctions';
+import {
+  act,
+  fireEvent,
+  render,
+  screen,
+  waitFor,
+} from '@testing-library/react';
+import RecoverPassword from './page';
+
+// mock the recoverPassword function
+jest.mock('@/api/apiFunctions', () => ({
+  recoverPassword: jest.fn(),
+}));
+
+const mockPush = jest.fn();
+const getUser = jest.fn();
+
+let continueButton: HTMLElement, emailInput: HTMLInputElement;
+
+const mockUseAuthContext = {
+  getUser,
+  isSignedIn: false,
+};
+
+jest.mock('next/navigation', () => ({
+  useRouter() {
+    return {
+      push: mockPush,
+    };
+  },
+}));
+
+jest.mock('../../../context/AuthContextProvider', () => ({
+  useAuthContext() {
+    return {
+      ...mockUseAuthContext,
+    };
+  },
+}));
+
+jest.mock('react-hot-toast', () => ({
+  custom: jest.fn(),
+}));
+
+describe('Recover Password', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  test('should render the recover password page', () => {
+    render(<RecoverPassword />);
+    emailInput = screen.getByTestId('email');
+    continueButton = screen.getByTestId('continue-button');
+
+    const headingElement = screen.getByRole('heading', { level: 1 });
+    expect(headingElement).toHaveTextContent('Recover Your Password');
+
+    expect(emailInput).toBeInTheDocument();
+    expect(continueButton).toBeInTheDocument();
+  });
+
+  test('should update email state when input value changes', () => {
+    render(<RecoverPassword />);
+
+    emailInput = screen.getByTestId('email');
+    continueButton = screen.getByTestId('continue-button');
+
+    fireEvent.change(emailInput, { target: { value: 'test@example.com' } });
+    expect(emailInput).toHaveValue('test@example.com');
+  });
+
+  test('should call recoverPassword function and redirect to /login', async () => {
+    jest.useFakeTimers();
+    render(<RecoverPassword />);
+
+    const emailInput = screen.getByTestId('email');
+    const continueButton = screen.getByTestId('continue-button');
+
+    await act(async () => {
+      fireEvent.change(emailInput, { target: { value: 'test@example.com' } });
+      fireEvent.click(continueButton);
+    });
+
+    await waitFor(() => {
+      expect(recoverPassword).toHaveBeenCalledWith({
+        email: 'test@example.com',
+      });
+    });
+
+    act(() => {
+      jest.advanceTimersByTime(2000);
+    });
+
+    expect(mockPush).toHaveBeenCalledWith('/login');
+    jest.useRealTimers();
+  });
+
+  test('should not call recover password function when email is empty', async () => {
+    render(<RecoverPassword />);
+
+    const continueButton = screen.getByTestId('continue-button');
+
+    await act(async () => {
+      fireEvent.click(continueButton);
+    });
+
+    await waitFor(() => {
+      expect(recoverPassword).not.toHaveBeenCalled();
+    });
+  });
+
+  test('redirects to /league/all when user navigates to /recover-password and is signed in', async () => {
+    mockUseAuthContext.isSignedIn = true;
+
+    render(<RecoverPassword />);
+
+    expect(mockPush).toHaveBeenCalledWith('/league/all');
+  });
+});

From 9930901cadd1b940a7192b508f7b5702cc2d0a5f Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Fri, 13 Sep 2024 23:31:12 -0400
Subject: [PATCH 058/118] create new unit test for account/recovery

---
 app/(main)/account/recovery/page.test.tsx | 152 ++++++++++++++++++++++
 app/(main)/account/recovery/page.tsx      |   2 +-
 2 files changed, 153 insertions(+), 1 deletion(-)
 create mode 100644 app/(main)/account/recovery/page.test.tsx

diff --git a/app/(main)/account/recovery/page.test.tsx b/app/(main)/account/recovery/page.test.tsx
new file mode 100644
index 00000000..aed70fa9
--- /dev/null
+++ b/app/(main)/account/recovery/page.test.tsx
@@ -0,0 +1,152 @@
+import {
+  act,
+  fireEvent,
+  render,
+  screen,
+  waitFor,
+} from '@testing-library/react';
+import { useRouter, useSearchParams } from 'next/navigation';
+import { toast } from 'react-hot-toast';
+import ResetPassword from './page';
+import { resetPassword } from '@/api/apiFunctions';
+import { useAuthContext } from '@/context/AuthContextProvider';
+import Alert from '@/components/AlertNotification/AlertNotification';
+import { AlertVariants } from '@/components/AlertNotification/Alerts.enum';
+
+jest.mock('react-hot-toast');
+jest.mock('next/navigation');
+jest.mock('@/context/AuthContextProvider');
+jest.mock('@/api/apiFunctions');
+
+describe('ResetPassword', () => {
+  let mockUseSearchParams: jest.Mock;
+  let mockRouter: { push: jest.Mock };
+  let mockUseAuthContext: jest.Mock;
+  let mockToast: jest.Mock;
+
+  beforeEach(() => {
+    jest.useFakeTimers();
+    mockUseSearchParams = jest.fn().mockImplementation((param: string) => {
+      const params: { [key: string]: string } = {
+        userId: '123',
+        secret: 'abc',
+        expire: '2023-12-31',
+      };
+      return params[param];
+    });
+    mockRouter = { push: jest.fn() };
+    mockUseAuthContext = jest.fn().mockReturnValue({
+      isSignedIn: false,
+      getUser: jest.fn(),
+    });
+    mockToast = jest.fn();
+
+    (useSearchParams as jest.Mock).mockReturnValue({
+      get: mockUseSearchParams,
+    });
+    (useRouter as jest.Mock).mockReturnValue(mockRouter);
+    (useAuthContext as jest.Mock).mockImplementation(mockUseAuthContext);
+    (toast.custom as jest.Mock).mockImplementation(mockToast);
+  });
+
+  afterEach(() => {
+    jest.useRealTimers();
+    jest.clearAllMocks();
+  });
+
+  const fillFormAndSubmit = () => {
+    fireEvent.change(screen.getByTestId('password'), {
+      target: { value: 'newpassword123' },
+    });
+    fireEvent.change(screen.getByTestId('confirm-password'), {
+      target: { value: 'newpassword123' },
+    });
+    fireEvent.click(screen.getByTestId('continue-button'));
+  };
+
+  it('should render the reset password form when all search params are present', async () => {
+    render(<ResetPassword />);
+    await screen.findByText('Reset Your Password');
+    expect(screen.getByTestId('password')).toBeInTheDocument();
+    expect(screen.getByTestId('confirm-password')).toBeInTheDocument();
+  });
+
+  it('should redirect to login page when search params are missing', async () => {
+    mockUseSearchParams.mockReturnValue(null);
+    render(<ResetPassword />);
+    await waitFor(() => {
+      expect(mockRouter.push).toHaveBeenCalledWith('/login');
+    });
+  });
+
+  it('should submit the form and reset password successfully', async () => {
+    (resetPassword as jest.Mock).mockResolvedValue({});
+    render(<ResetPassword />);
+    fillFormAndSubmit();
+
+    await waitFor(() => {
+      expect(resetPassword).toHaveBeenCalledWith({
+        userId: '123',
+        token: 'abc',
+        password: 'newpassword123',
+      });
+      expect(mockToast).toHaveBeenCalledWith(
+        <Alert
+          variant={AlertVariants.Success}
+          message="Your password has been reset successfully! Please login with your new password."
+        />,
+      );
+    });
+
+    act(() => {
+      jest.advanceTimersByTime(2000);
+    });
+    expect(mockRouter.push).toHaveBeenCalledWith('/login');
+  });
+
+  it('should show an error message when the token is invalid', async () => {
+    const error = new Error('Invalid token') as Error & { type?: string };
+    error.type = 'user_invalid_token';
+    (resetPassword as jest.Mock).mockRejectedValue(error);
+
+    render(<ResetPassword />);
+    fillFormAndSubmit();
+
+    await waitFor(() => {
+      expect(mockToast).toHaveBeenCalledWith(
+        <Alert
+          variant={AlertVariants.Error}
+          message="Invalid recovery token. Your token may have expired or already been used.  Please try again."
+        />,
+      );
+    });
+
+    act(() => {
+      jest.advanceTimersByTime(2000);
+    });
+    expect(mockRouter.push).toHaveBeenCalledWith('/recover-password');
+  });
+
+  it('should show an error message when the password reset fails', async () => {
+    (resetPassword as jest.Mock).mockRejectedValue(
+      new Error('Error resetting password'),
+    );
+
+    render(<ResetPassword />);
+    fillFormAndSubmit();
+
+    await waitFor(() => {
+      expect(mockToast).toHaveBeenCalledWith(
+        <Alert
+          variant={AlertVariants.Error}
+          message="There was an error resetting your password."
+        />,
+      );
+    });
+
+    act(() => {
+      jest.advanceTimersByTime(2000);
+    });
+    expect(mockRouter.push).toHaveBeenCalledWith('/recover-password');
+  });
+});
diff --git a/app/(main)/account/recovery/page.tsx b/app/(main)/account/recovery/page.tsx
index 0ca3b0db..1e804bbf 100644
--- a/app/(main)/account/recovery/page.tsx
+++ b/app/(main)/account/recovery/page.tsx
@@ -189,7 +189,7 @@ const ResetPassword = (): React.JSX.Element => {
           <>
             <div>
               <h1 className="text-5xl font-extrabold tracking-tight">
-                Recover Your Password
+                Reset Your Password
               </h1>
               <p className="pb-4 font-normal leading-7 text-muted-foreground">
                 Enter your new password and confirm it to recover your account.

From 9b3d118327a5e140c501474d683f7dde24e6b8da Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Sat, 14 Sep 2024 10:50:04 -0400
Subject: [PATCH 059/118] add default value for form in recover-password route

---
 app/(main)/recover-password/page.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/(main)/recover-password/page.tsx b/app/(main)/recover-password/page.tsx
index a087ae29..dad4df11 100644
--- a/app/(main)/recover-password/page.tsx
+++ b/app/(main)/recover-password/page.tsx
@@ -60,6 +60,9 @@ const RecoverPassword = (): React.JSX.Element => {
 
   const form = useForm<ResetUserPasswordSchemaType>({
     resolver: zodResolver(RecoverUserPasswordSchema),
+    defaultValues: {
+      email: '',
+    },
   });
 
   const email = useWatch({

From bcd6b2b66686bbd42efb0daff61e6bffbc5ea708 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Mon, 16 Sep 2024 11:21:58 -0400
Subject: [PATCH 060/118] fix richard comments

---
 api/apiFunctions.test.tsx                 | 2 --
 app/(main)/recover-password/page.test.tsx | 1 -
 2 files changed, 3 deletions(-)

diff --git a/api/apiFunctions.test.tsx b/api/apiFunctions.test.tsx
index 9d4da9e5..dbaa995c 100644
--- a/api/apiFunctions.test.tsx
+++ b/api/apiFunctions.test.tsx
@@ -19,8 +19,6 @@ jest.mock('./apiFunctions', () => {
     getAllLeagues: jest.fn(),
     getUserDocumentId: jest.fn(),
     addUserToLeague: jest.fn(),
-    getCurrentLeague: jest.fn(),
-    loginAccount: jest.fn(),
   };
 });
 
diff --git a/app/(main)/recover-password/page.test.tsx b/app/(main)/recover-password/page.test.tsx
index bfe614c8..afd08f2a 100644
--- a/app/(main)/recover-password/page.test.tsx
+++ b/app/(main)/recover-password/page.test.tsx
@@ -8,7 +8,6 @@ import {
 } from '@testing-library/react';
 import RecoverPassword from './page';
 
-// mock the recoverPassword function
 jest.mock('@/api/apiFunctions', () => ({
   recoverPassword: jest.fn(),
 }));

From a9c2c4e9368d968cbd16b2bf0a22dc2e448c86cb Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Mon, 16 Sep 2024 13:39:50 -0400
Subject: [PATCH 061/118] fix richard comments

---
 api/apiFunctions.test.tsx            | 8 --------
 app/(main)/recover-password/page.tsx | 8 ++++----
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/api/apiFunctions.test.tsx b/api/apiFunctions.test.tsx
index dbaa995c..41b62230 100644
--- a/api/apiFunctions.test.tsx
+++ b/api/apiFunctions.test.tsx
@@ -371,14 +371,6 @@ describe('apiFunctions', () => {
       const result = await apiFunctions.addUserToLeague({ response });
       expect(result).toEqual(response);
     });
-    it('should return error upon unsuccessful call', async () => {
-      apiFunctions.addUserToLeague.mockRejectedValue(
-        new Error('Error adding user to league'),
-      );
-      await expect(apiFunctions.addUserToLeague('123', '456')).rejects.toThrow(
-        'Error adding user to league',
-      );
-    });
     it('should return error upon unsuccessful call', async () => {
       apiFunctions.addUserToLeague.mockRejectedValue(
         new Error('Error adding user to league'),
diff --git a/app/(main)/recover-password/page.tsx b/app/(main)/recover-password/page.tsx
index dad4df11..60634c22 100644
--- a/app/(main)/recover-password/page.tsx
+++ b/app/(main)/recover-password/page.tsx
@@ -27,7 +27,7 @@ import Alert from '@/components/AlertNotification/AlertNotification';
 import { AlertVariants } from '@/components/AlertNotification/Alerts.enum';
 
 /**
- * The schema for the login form.
+ * The schema for the recover password form
  * @throws {Error} Throws an error if the email is not a valid email address.
  * @throws {Error} Throws an error if the email is not provided.
  * @throws {Error} Throws an error if the email is not a string.
@@ -43,7 +43,7 @@ type ResetUserPasswordSchemaType = z.infer<typeof RecoverUserPasswordSchema>;
 
 /**
  * Renders the recover password page.
- * @returns {React.JSX.Element} The rendered login page.
+ * @returns {React.JSX.Element} The rendered recover password page.
  */
 const RecoverPassword = (): React.JSX.Element => {
   const router = useRouter();
@@ -56,7 +56,7 @@ const RecoverPassword = (): React.JSX.Element => {
       router.push('/league/all');
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isSignedIn, getUser]);
+  }, [isSignedIn]);
 
   const form = useForm<ResetUserPasswordSchemaType>({
     resolver: zodResolver(RecoverUserPasswordSchema),
@@ -82,7 +82,7 @@ const RecoverPassword = (): React.JSX.Element => {
     toast.custom(
       <Alert
         variant={AlertVariants.Success}
-        message={`Thank you! Check your email for instructions to reset your password if an associated account is found with ${data.email}`}
+        message={`If an account exists for ${data.email}, we've sent password reset instructions to that email address. Please check your inbox and follow the provided steps to reset your password.`}
       />,
     );
     setTimeout(() => router.push('/login'), 2000);

From d1ce1a989e9cca669e69d8568302392477343677 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Mon, 16 Sep 2024 14:25:23 -0400
Subject: [PATCH 062/118] fix initial tests that I broke with my new code

---
 .../entry/[entryId]/week/Week.test.tsx        | 48 ++++++++++++++-----
 1 file changed, 35 insertions(+), 13 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
index 9547503e..f094c4bc 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
@@ -59,9 +59,12 @@ jest.mock('@/api/apiFunctions', () => ({
   getCurrentUserEntries: jest.fn(() =>
     Promise.resolve([
       {
-        id: '123',
-        week: 1,
-        selectedTeams: [],
+        $id: '123',
+        name: 'Entry 1',
+        user: '123',
+        league: '123',
+        selectedTeams: ['Packers', 'Browns'],
+        eliminated: false,
       },
     ]),
   ),
@@ -79,6 +82,7 @@ jest.mock('@/utils/utils', () => {
   return {
     ...actualUtils,
     hasTeamBeenPicked: jest.fn(),
+    getNFLTeamLogo: jest.fn(),
   };
 });
 
@@ -96,10 +100,21 @@ global.ResizeObserver = jest.fn().mockImplementation(() => ({
 
 describe('Week', () => {
   const teamSelect = 'Browns';
-  const NFLTeams = [{ teamName: 'Browns', teamId: '1234', teamLogo: 'browns' }];
-  const user = { id: '12345', email: 'email@example.com', leagues: [] };
-  const entry = 'mockEntry';
-  const league = 'mockLeague';
+  const NFLTeams = [
+    {
+      teamName: 'Browns',
+      teamId: '1234',
+      teamLogo: 'https://example.com/logo-1.png',
+    },
+    {
+      teamName: 'Packers',
+      teamId: '1234',
+      teamLogo: 'https://example.com/logo-2.png',
+    },
+  ];
+  const user = { id: '123', email: 'email@example.com', leagues: ['123'] };
+  const entry = '123';
+  const league = '123';
   const week = '1';
   const setUserPick = jest.fn();
   const updateWeeklyPicks = jest.fn();
@@ -153,16 +168,23 @@ describe('Week', () => {
     });
   });
 
-  test('should not display GlobalSpinner after loading data', async () => {
+  test('should display main content after data is loaded and hide GlobalSpinner', async () => {
     mockUseAuthContext.isSignedIn = true;
-    mockCreateWeeklyPicks.mockResolvedValue({});
 
     render(
       <Week entry={entry} league={league} NFLTeams={NFLTeams} week={week} />,
     );
-    await waitFor(() => {
-      expect(screen.queryByTestId('global-spinner')).not.toBeInTheDocument();
-    });
+
+    // Wait for the main content to be displayed
+    await waitFor(
+      () => {
+        expect(screen.getByTestId('weekly-picks')).toBeInTheDocument();
+      },
+      { timeout: 5000 },
+    );
+
+    // Ensure the GlobalSpinner is not present when main content is loaded
+    expect(screen.queryByTestId('global-spinner')).not.toBeInTheDocument();
   });
 
   xtest('should show success notification after changing your team pick', async () => {
@@ -233,6 +255,6 @@ describe('Week', () => {
 
     await waitFor(() => {
       expect(mockPush).toHaveBeenCalledWith(`/league/${league}/entry/all`);
-    })
+    });
   });
 });

From 52ca5feb55c11dcfa3e2c3c22125158835e9bc39 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Mon, 16 Sep 2024 16:36:07 -0400
Subject: [PATCH 063/118] fix initial tests that I broke with my new code

---
 .../entry/[entryId]/week/Week.test.tsx        | 25 +++++++++++--------
 .../[leagueId]/entry/[entryId]/week/Week.tsx  |  2 +-
 .../entry/[entryId]/week/WeekHelper.tsx       |  8 ++++--
 utils/utils.ts                                |  2 +-
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
index f094c4bc..b932d3d4 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
@@ -1,13 +1,7 @@
 import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import React from 'react';
 import Week from './Week';
-import {
-  getCurrentLeague,
-  getCurrentUserEntries,
-  createWeeklyPicks,
-  getAllWeeklyPicks,
-} from '@/api/apiFunctions';
-import { useDataStore } from '@/store/dataStore';
+import { getCurrentLeague, createWeeklyPicks } from '@/api/apiFunctions';
 import Alert from '@/components/AlertNotification/AlertNotification';
 import { AlertVariants } from '@/components/AlertNotification/Alerts.enum';
 import { toast } from 'react-hot-toast';
@@ -102,13 +96,13 @@ describe('Week', () => {
   const teamSelect = 'Browns';
   const NFLTeams = [
     {
+      teamId: 'browns',
       teamName: 'Browns',
-      teamId: '1234',
       teamLogo: 'https://example.com/logo-1.png',
     },
     {
+      teamId: 'packers',
       teamName: 'Packers',
-      teamId: '1234',
       teamLogo: 'https://example.com/logo-2.png',
     },
   ];
@@ -127,7 +121,7 @@ describe('Week', () => {
     userResults: {},
   };
 
-  const teamID = NFLTeams[0].teamName;
+  const teamName = NFLTeams[0].teamName;
 
   const updatedWeeklyPicks = {
     ...weeklyPicks.userResults,
@@ -135,7 +129,7 @@ describe('Week', () => {
       ...weeklyPicks.userResults[user.id],
       [entry]: {
         ...weeklyPicks.userResults[user.id]?.[entry],
-        ...parseUserPick(user.id, entry, teamID || '')[user.id][entry],
+        ...parseUserPick(user.id, entry, teamName || '')[user.id][entry],
       },
     },
   };
@@ -246,10 +240,19 @@ describe('Week', () => {
   });
 
   test('should redirect back to entry page after successfully selecting a team', async () => {
+    mockUseAuthContext.isSignedIn = true;
+
     render(
       <Week entry={entry} league={league} NFLTeams={NFLTeams} week={week} />,
     );
 
+    await waitFor(
+      () => {
+        expect(screen.getByTestId('weekly-picks')).toBeInTheDocument();
+      },
+      { timeout: 5000 },
+    );
+
     const teamRadios = await screen.findAllByTestId('team-radio');
     fireEvent.click(teamRadios[0]);
 
diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
index cbe6c3e7..8b78fd08 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
@@ -277,7 +277,7 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
               <section className="flex flex-wrap w-[90%] gap-4 overflow-x-scroll justify-center pb-10 items-center">
                 {pickHistory?.map((logoURL, index) => (
                   <div
-                    key={logoURL}
+                    key={`${logoURL}-${index + 1}`}
                     className={cn(
                       'flex flex-col items-center justify-center border  p-2 rounded-lg gap-1',
                       index === pickHistory.length - 1
diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekHelper.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekHelper.tsx
index 15030038..9e3d24f4 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekHelper.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekHelper.tsx
@@ -39,11 +39,15 @@ export const onWeeklyPickChange = async ({
   week,
 }: IWeeklyPickChange): Promise<void> => {
   try {
-    const teamID = NFLTeams.find(
+    const selectedTeamName = NFLTeams.find(
       (team) => team.teamName === teamSelect,
     )?.teamName;
 
-    const currentUserPick = parseUserPick(user.id, entry, teamID || '');
+    const currentUserPick = parseUserPick(
+      user.id,
+      entry,
+      selectedTeamName || '',
+    );
 
     // combines current picks and the user pick into one object.
     // if the user pick exists then it overrides the pick of the user.
diff --git a/utils/utils.ts b/utils/utils.ts
index 355b4917..51aee08e 100644
--- a/utils/utils.ts
+++ b/utils/utils.ts
@@ -102,7 +102,7 @@ export const parseUserPick = (
   teamName: string,
 ): IUserPick => {
   if (!userId || !teamName || !entryId) {
-    throw new Error('User ID and Team ID Required');
+    throw new Error('User ID, Entry ID, and Team Name Required');
   }
 
   const parsedData = JSON.parse(

From 12ef37aff8b183b36a70052866f6e7893fd56ab2 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Mon, 16 Sep 2024 18:14:00 -0400
Subject: [PATCH 064/118] working test for week.test.tsx

---
 .../entry/[entryId]/week/Week.test.tsx        | 201 +++++++++++++-----
 .../[leagueId]/entry/[entryId]/week/Week.tsx  |   7 +-
 2 files changed, 149 insertions(+), 59 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
index b932d3d4..d9a7729e 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
@@ -1,12 +1,12 @@
 import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import React from 'react';
 import Week from './Week';
-import { getCurrentLeague, createWeeklyPicks } from '@/api/apiFunctions';
+import { createWeeklyPicks, getCurrentUserEntries } from '@/api/apiFunctions';
 import Alert from '@/components/AlertNotification/AlertNotification';
 import { AlertVariants } from '@/components/AlertNotification/Alerts.enum';
 import { toast } from 'react-hot-toast';
 import { onWeeklyPickChange } from './WeekHelper';
-import { parseUserPick } from '@/utils/utils';
+import { getNFLTeamLogo, parseUserPick } from '@/utils/utils';
 import { IWeeklyPicks } from '@/api/apiFunctions.interface';
 
 const mockPush = jest.fn();
@@ -34,13 +34,10 @@ jest.mock('@/context/AuthContextProvider', () => ({
 jest.mock('@/store/dataStore', () => ({
   useDataStore: jest.fn(() => ({
     currentWeek: 1,
-    getState: jest.fn(() => ({
-      currentWeek: 1,
-    })),
-    user: { id: '123', leagues: [] },
+    user: { id: '123', email: 'email@example.com', leagues: ['123'] },
+    weeklyPicks: {},
     updateWeeklyPicks: jest.fn(),
     updateCurrentWeek: jest.fn(),
-    weeklyPicks: {},
   })),
 }));
 
@@ -50,18 +47,6 @@ jest.mock('@/api/apiFunctions', () => ({
       week: 1,
     }),
   ),
-  getCurrentUserEntries: jest.fn(() =>
-    Promise.resolve([
-      {
-        $id: '123',
-        name: 'Entry 1',
-        user: '123',
-        league: '123',
-        selectedTeams: ['Packers', 'Browns'],
-        eliminated: false,
-      },
-    ]),
-  ),
   getGameWeek: jest.fn(() =>
     Promise.resolve({
       week: 1,
@@ -69,6 +54,7 @@ jest.mock('@/api/apiFunctions', () => ({
   ),
   createWeeklyPicks: jest.fn(),
   getAllWeeklyPicks: jest.fn(),
+  getCurrentUserEntries: jest.fn(),
 }));
 
 jest.mock('@/utils/utils', () => {
@@ -92,47 +78,51 @@ global.ResizeObserver = jest.fn().mockImplementation(() => ({
   disconnect: jest.fn(),
 }));
 
-describe('Week', () => {
-  const teamSelect = 'Browns';
-  const NFLTeams = [
-    {
-      teamId: 'browns',
-      teamName: 'Browns',
-      teamLogo: 'https://example.com/logo-1.png',
-    },
-    {
-      teamId: 'packers',
-      teamName: 'Packers',
-      teamLogo: 'https://example.com/logo-2.png',
-    },
-  ];
-  const user = { id: '123', email: 'email@example.com', leagues: ['123'] };
-  const entry = '123';
-  const league = '123';
-  const week = '1';
-  const setUserPick = jest.fn();
-  const updateWeeklyPicks = jest.fn();
-  const mockGetCurrentLeague = getCurrentLeague as jest.Mock;
-  const mockCreateWeeklyPicks = createWeeklyPicks as jest.Mock;
-
-  const weeklyPicks: IWeeklyPicks = {
-    leagueId: '123',
-    gameWeekId: '123456',
-    userResults: {},
-  };
+// constants
+const teamSelect = 'Browns';
+const NFLTeams = [
+  {
+    teamId: 'browns',
+    teamName: 'Browns',
+    teamLogo: 'https://example.com/browns.png',
+  },
+  {
+    teamId: 'packers',
+    teamName: 'Packers',
+    teamLogo: 'https://example.com/packers.png',
+  },
+];
+const user = { id: '123', email: 'email@example.com', leagues: ['123'] };
+const entry = '123';
+const league = '123';
+const week = '1';
+const weeklyPicks: IWeeklyPicks = {
+  leagueId: '123',
+  gameWeekId: '123456',
+  userResults: {},
+};
 
-  const teamName = NFLTeams[0].teamName;
+const teamName = NFLTeams[0].teamName;
 
-  const updatedWeeklyPicks = {
-    ...weeklyPicks.userResults,
-    [user.id]: {
-      ...weeklyPicks.userResults[user.id],
-      [entry]: {
-        ...weeklyPicks.userResults[user.id]?.[entry],
-        ...parseUserPick(user.id, entry, teamName || '')[user.id][entry],
-      },
+const updatedWeeklyPicks = {
+  ...weeklyPicks.userResults,
+  [user.id]: {
+    ...weeklyPicks.userResults[user.id],
+    [entry]: {
+      ...weeklyPicks.userResults[user.id]?.[entry],
+      ...parseUserPick(user.id, entry, teamName || '')[user.id][entry],
     },
-  };
+  },
+};
+
+describe('Week', () => {
+  const setUserPick = jest.fn();
+  const updateWeeklyPicks = jest.fn();
+  const mockGetNFLTeamLogo = getNFLTeamLogo as jest.Mock;
+  mockGetNFLTeamLogo.mockImplementation((teams, teamName) => {
+    const team = teams.find((t) => t.teamName === teamName);
+    return team ? team.teamLogo : '';
+  });
 
   const mockParseUserPick = jest.fn().mockReturnValue({
     [user.id]: {
@@ -152,6 +142,16 @@ describe('Week', () => {
 
   test('should display GlobalSpinner while loading data', async () => {
     mockUseAuthContext.isSignedIn = true;
+    (getCurrentUserEntries as jest.Mock).mockResolvedValue([
+      {
+        $id: '123',
+        name: 'Entry 1',
+        user: '123',
+        league: '123',
+        selectedTeams: [],
+        eliminated: false,
+      },
+    ]);
 
     render(
       <Week entry={entry} league={league} NFLTeams={NFLTeams} week={week} />,
@@ -164,6 +164,16 @@ describe('Week', () => {
 
   test('should display main content after data is loaded and hide GlobalSpinner', async () => {
     mockUseAuthContext.isSignedIn = true;
+    (getCurrentUserEntries as jest.Mock).mockResolvedValue([
+      {
+        $id: '123',
+        name: 'Entry 1',
+        user: '123',
+        league: '123',
+        selectedTeams: [],
+        eliminated: false,
+      },
+    ]);
 
     render(
       <Week entry={entry} league={league} NFLTeams={NFLTeams} week={week} />,
@@ -181,6 +191,73 @@ describe('Week', () => {
     expect(screen.queryByTestId('global-spinner')).not.toBeInTheDocument();
   });
 
+  test('should not show previous weeks picks if the current week is not greater than 0', async () => {
+    mockUseAuthContext.isSignedIn = true;
+    (getCurrentUserEntries as jest.Mock).mockResolvedValue([
+      {
+        $id: '123',
+        name: 'Entry 1',
+        user: '123',
+        league: '123',
+        selectedTeams: [],
+        eliminated: false,
+      },
+    ]);
+
+    render(
+      <Week entry={entry} league={league} NFLTeams={NFLTeams} week={week} />,
+    );
+
+    await waitFor(
+      () => {
+        expect(screen.getByTestId('weekly-picks')).toBeInTheDocument();
+      },
+      { timeout: 5000 },
+    );
+
+    const userPickHistory = screen.queryByTestId('user-pick-history');
+    expect(userPickHistory).not.toBeInTheDocument();
+  });
+
+  test('show show previous weeks picks if the pick history is greater than 0', async () => {
+    mockUseAuthContext.isSignedIn = true;
+    (getCurrentUserEntries as jest.Mock).mockResolvedValue([
+      {
+        $id: '123',
+        name: 'Entry 1',
+        user: '123',
+        league: '123',
+        selectedTeams: ['Packers', 'Browns'],
+        eliminated: false,
+      },
+    ]);
+
+    render(
+      <Week entry={entry} league={league} NFLTeams={NFLTeams} week={week} />,
+    );
+
+    await waitFor(
+      () => {
+        expect(screen.getByTestId('weekly-picks')).toBeInTheDocument();
+      },
+      { timeout: 5000 },
+    );
+
+    const userPickHistory = screen.getByTestId('user-pick-history');
+    expect(userPickHistory).toBeInTheDocument();
+
+    const userPickHistoryLogos = screen.queryAllByTestId('league-history-logo');
+    expect(userPickHistoryLogos).toHaveLength(2);
+    expect(userPickHistoryLogos[0]).toHaveAttribute(
+      'src',
+      '/_next/image?url=https%3A%2F%2Fexample.com%2Fpackers.png&w=128&q=75',
+    );
+    expect(userPickHistoryLogos[1]).toHaveAttribute(
+      'src',
+      '/_next/image?url=https%3A%2F%2Fexample.com%2Fbrowns.png&w=128&q=75',
+    );
+  });
+
   xtest('should show success notification after changing your team pick', async () => {
     (createWeeklyPicks as jest.Mock).mockResolvedValue({});
 
@@ -241,6 +318,16 @@ describe('Week', () => {
 
   test('should redirect back to entry page after successfully selecting a team', async () => {
     mockUseAuthContext.isSignedIn = true;
+    (getCurrentUserEntries as jest.Mock).mockResolvedValue([
+      {
+        $id: '123',
+        name: 'Entry 1',
+        user: '123',
+        league: '123',
+        selectedTeams: [],
+        eliminated: false,
+      },
+    ]);
 
     render(
       <Week entry={entry} league={league} NFLTeams={NFLTeams} week={week} />,
diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
index 8b78fd08..0996d261 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
@@ -274,7 +274,10 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
             </h1>
 
             {pickHistory.length > 0 && (
-              <section className="flex flex-wrap w-[90%] gap-4 overflow-x-scroll justify-center pb-10 items-center">
+              <section
+                className="flex flex-wrap w-[90%] gap-4 overflow-x-scroll justify-center pb-10 items-center"
+                data-testid="user-pick-history"
+              >
                 {pickHistory?.map((logoURL, index) => (
                   <div
                     key={`${logoURL}-${index + 1}`}
@@ -294,7 +297,7 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
                       className="league-entry-logo"
                       width={64}
                       height={64}
-                      data-testid="league-entry-logo"
+                      data-testid="league-history-logo"
                       src={logoURL}
                       alt="teamLogo"
                     />

From 5e411a0b026d5d8b71594dc9de1f6440de716463 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Mon, 16 Sep 2024 18:17:40 -0400
Subject: [PATCH 065/118] fix some type errors

---
 .../[leagueId]/entry/[entryId]/week/Week.test.tsx | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
index d9a7729e..e77d4cbb 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
@@ -7,7 +7,7 @@ import { AlertVariants } from '@/components/AlertNotification/Alerts.enum';
 import { toast } from 'react-hot-toast';
 import { onWeeklyPickChange } from './WeekHelper';
 import { getNFLTeamLogo, parseUserPick } from '@/utils/utils';
-import { IWeeklyPicks } from '@/api/apiFunctions.interface';
+import { INFLTeam, IWeeklyPicks } from '@/api/apiFunctions.interface';
 
 const mockPush = jest.fn();
 
@@ -92,7 +92,12 @@ const NFLTeams = [
     teamLogo: 'https://example.com/packers.png',
   },
 ];
-const user = { id: '123', email: 'email@example.com', leagues: ['123'] };
+const user = {
+  documentId: 'mockDocument',
+  id: '123',
+  email: 'email@example.com',
+  leagues: ['123'],
+};
 const entry = '123';
 const league = '123';
 const week = '1';
@@ -120,7 +125,7 @@ describe('Week', () => {
   const updateWeeklyPicks = jest.fn();
   const mockGetNFLTeamLogo = getNFLTeamLogo as jest.Mock;
   mockGetNFLTeamLogo.mockImplementation((teams, teamName) => {
-    const team = teams.find((t) => t.teamName === teamName);
+    const team = teams.find((t: INFLTeam) => t.teamName === teamName);
     return team ? team.teamLogo : '';
   });
 
@@ -261,7 +266,7 @@ describe('Week', () => {
   xtest('should show success notification after changing your team pick', async () => {
     (createWeeklyPicks as jest.Mock).mockResolvedValue({});
 
-    const currentUserPick = mockParseUserPick(user.id, entry, teamID);
+    const currentUserPick = mockParseUserPick(user.id, entry, teamName);
 
     await onWeeklyPickChange({
       teamSelect,
@@ -281,7 +286,7 @@ describe('Week', () => {
       userResults: updatedWeeklyPicks,
     });
 
-    expect(mockParseUserPick).toHaveBeenCalledWith(user.id, entry, teamID);
+    expect(mockParseUserPick).toHaveBeenCalledWith(user.id, entry, teamName);
 
     expect(toast.custom).toHaveBeenCalledWith(
       <Alert

From b2fd84713751979b0501827c5a3a84b46793a580 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Tue, 17 Sep 2024 09:35:47 -0400
Subject: [PATCH 066/118] fix test

---
 .../[leagueId]/entry/[entryId]/week/Week.test.tsx     | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
index e77d4cbb..142892fe 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
@@ -338,16 +338,13 @@ describe('Week', () => {
       <Week entry={entry} league={league} NFLTeams={NFLTeams} week={week} />,
     );
 
-    await waitFor(
-      () => {
-        expect(screen.getByTestId('weekly-picks')).toBeInTheDocument();
-      },
-      { timeout: 5000 },
-    );
-
     const teamRadios = await screen.findAllByTestId('team-radio');
     fireEvent.click(teamRadios[0]);
 
+    await waitFor(() => {
+      expect(screen.getByTestId('weekly-picks')).toBeInTheDocument();
+    });
+
     await waitFor(() => {
       expect(mockPush).toHaveBeenCalledWith(`/league/${league}/entry/all`);
     });

From 47bd4d5391bd214f4d984a243616d0c2542d266f Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Tue, 17 Sep 2024 09:53:14 -0400
Subject: [PATCH 067/118] fix richard comments

---
 .../league/[leagueId]/entry/[entryId]/week/Week.test.tsx  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
index 142892fe..adde527c 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
@@ -78,7 +78,6 @@ global.ResizeObserver = jest.fn().mockImplementation(() => ({
   disconnect: jest.fn(),
 }));
 
-// constants
 const teamSelect = 'Browns';
 const NFLTeams = [
   {
@@ -125,7 +124,7 @@ describe('Week', () => {
   const updateWeeklyPicks = jest.fn();
   const mockGetNFLTeamLogo = getNFLTeamLogo as jest.Mock;
   mockGetNFLTeamLogo.mockImplementation((teams, teamName) => {
-    const team = teams.find((t: INFLTeam) => t.teamName === teamName);
+    const team = teams.find((team: INFLTeam) => team.teamName === teamName);
     return team ? team.teamLogo : '';
   });
 
@@ -192,11 +191,10 @@ describe('Week', () => {
       { timeout: 5000 },
     );
 
-    // Ensure the GlobalSpinner is not present when main content is loaded
     expect(screen.queryByTestId('global-spinner')).not.toBeInTheDocument();
   });
 
-  test('should not show previous weeks picks if the current week is not greater than 0', async () => {
+  test('should not show previous weeks picks if there is no history of selected teams', async () => {
     mockUseAuthContext.isSignedIn = true;
     (getCurrentUserEntries as jest.Mock).mockResolvedValue([
       {
@@ -224,7 +222,7 @@ describe('Week', () => {
     expect(userPickHistory).not.toBeInTheDocument();
   });
 
-  test('show show previous weeks picks if the pick history is greater than 0', async () => {
+  test('should show previous weeks picks if their are picks in selected teams history', async () => {
     mockUseAuthContext.isSignedIn = true;
     (getCurrentUserEntries as jest.Mock).mockResolvedValue([
       {

From d71eefceaf1dcd10102eafc46a5998d4402272d8 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Tue, 17 Sep 2024 13:08:35 -0400
Subject: [PATCH 068/118] rix richard comments

---
 .../league/[leagueId]/entry/all/page.test.tsx | 68 +++++++++----------
 1 file changed, 32 insertions(+), 36 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/all/page.test.tsx b/app/(main)/league/[leagueId]/entry/all/page.test.tsx
index 00db2aa1..f5b7b10a 100644
--- a/app/(main)/league/[leagueId]/entry/all/page.test.tsx
+++ b/app/(main)/league/[leagueId]/entry/all/page.test.tsx
@@ -13,7 +13,7 @@ jest.mock('@/store/dataStore', () => ({
     currentWeek: 1,
     NFLTeams: [
       {
-        teamId: '1',
+        teamId: 'packers',
         teamLogo: '/team-a-logo.png',
         teamName: 'Packers',
       },
@@ -28,8 +28,8 @@ jest.mock('@/api/apiFunctions', () => ({
   getCurrentLeague: jest.fn(() =>
     Promise.resolve({
       leagueName: 'Test League',
-      participants: 12,
-      survivors: 10,
+      participants: ['123', '456'],
+      survivors: ['123', '456'],
     }),
   ),
   getCurrentUserEntries: jest.fn(),
@@ -41,7 +41,7 @@ jest.mock('@/api/apiFunctions', () => ({
   getNFLTeams: jest.fn(() =>
     Promise.resolve([
       {
-        teamId: '1',
+        teamId: 'packers',
         teamLogo: 'team-a-logo.png',
         teamName: 'Packers',
       },
@@ -73,8 +73,8 @@ describe('League entries page (Entry Component)', () => {
     ]);
     mockGetCurrentLeague.mockResolvedValueOnce({
       leagueName: 'GiS League',
-      participants: 47,
-      survivors: 47,
+      participants: ['123', '456'],
+      survivors: ['123', '456'],
     });
 
     render(<Entry params={{ leagueId: '123' }} />);
@@ -90,12 +90,12 @@ describe('League entries page (Entry Component)', () => {
       currentWeek: 1,
       NFLTeams: [
         {
-          teamId: '1',
+          teamId: 'packers',
           teamLogo: '/packers-logo.png',
           teamName: 'Packers',
         },
         {
-          teamId: '2',
+          teamId: 'bears',
           teamLogo: '/bears-logo.png',
           teamName: 'Bears',
         },
@@ -112,12 +112,12 @@ describe('League entries page (Entry Component)', () => {
     mockGetGameWeek.mockResolvedValueOnce({ week: 1 });
     mockGetCurrentLeague.mockResolvedValue({
       leagueName: 'Test League',
-      participants: 10,
-      survivors: 8,
+      participants: ['123', '456'],
+      survivors: ['123', '456'],
     });
     mockGetNFLTeams.mockResolvedValue([
-      { teamId: '1', teamLogo: '/packers-logo.png', teamName: 'Packers' },
-      { teamId: '2', teamLogo: '/bears-logo.png', teamName: 'Bears' },
+      { teamId: 'packers', teamLogo: '/packers-logo.png', teamName: 'Packers' },
+      { teamId: 'bears', teamLogo: '/bears-logo.png', teamName: 'Bears' },
     ]);
 
     render(<Entry params={{ leagueId: '123' }} />);
@@ -145,8 +145,8 @@ describe('League entries page (Entry Component)', () => {
     ]);
     mockGetCurrentLeague.mockResolvedValueOnce({
       leagueName: 'GiS League',
-      participants: 47,
-      survivors: 47,
+      participants: ['123', '456'],
+      survivors: ['123', '456'],
     });
 
     render(<Entry params={{ leagueId: '66311a210039f0532044' }} />);
@@ -197,8 +197,8 @@ describe('League entries page (Entry Component)', () => {
     ]);
     mockGetCurrentLeague.mockResolvedValueOnce({
       leagueName: 'GiS League',
-      participants: 47,
-      survivors: 47,
+      participants: ['123', '456'],
+      survivors: ['123', '456'],
     });
 
     render(<Entry params={{ leagueId: '66311a210039f0532044' }} />);
@@ -285,8 +285,8 @@ describe('League entries page (Entry Component)', () => {
     ]);
     mockGetCurrentLeague.mockResolvedValueOnce({
       leagueName: 'GiS League',
-      participants: 47,
-      survivors: 47,
+      participants: ['123', '456'],
+      survivors: ['123', '456'],
     });
 
     render(<Entry params={{ leagueId: '66311a210039f0532044' }} />);
@@ -354,7 +354,7 @@ describe('League entries page (Entry Component)', () => {
       currentWeek: 1,
       NFLTeams: [
         {
-          teamId: '1',
+          teamId: 'packers',
           teamLogo: '/packers-logo.png',
           teamName: 'Packers',
         },
@@ -375,8 +375,8 @@ describe('League entries page (Entry Component)', () => {
       survivors: 8,
     });
     mockGetNFLTeams.mockResolvedValue([
-      { teamId: '1', teamLogo: '/packers-logo.png', teamName: 'Packers' },
-      { teamId: '2', teamLogo: '/bears-logo.png', teamName: 'Bears' },
+      { teamId: 'packers', teamLogo: '/packers-logo.png', teamName: 'Packers' },
+      { teamId: 'bears', teamLogo: '/bears-logo.png', teamName: 'Bears' },
     ]);
 
     render(<Entry params={{ leagueId: '123' }} />);
@@ -398,12 +398,12 @@ describe('League entries page (Entry Component)', () => {
       currentWeek: 2,
       NFLTeams: [
         {
-          teamId: '1',
+          teamId: 'packers',
           teamLogo: '/packers-logo.png',
           teamName: 'Packers',
         },
         {
-          teamId: '2',
+          teamId: 'bears',
           teamLogo: '/bears-logo.png',
           teamName: 'Bears',
         },
@@ -420,12 +420,12 @@ describe('League entries page (Entry Component)', () => {
     mockGetGameWeek.mockResolvedValueOnce({ week: 2 });
     mockGetCurrentLeague.mockResolvedValue({
       leagueName: 'Test League',
-      participants: 10,
-      survivors: 8,
+      participants: ['123', '456'],
+      survivors: ['123', '456'],
     });
     mockGetNFLTeams.mockResolvedValue([
-      { teamId: '1', teamLogo: '/packers-logo.png', teamName: 'Packers' },
-      { teamId: '2', teamLogo: '/bears-logo.png', teamName: 'Bears' },
+      { teamId: 'packers', teamLogo: '/packers-logo.png', teamName: 'Packers' },
+      { teamId: 'bears', teamLogo: '/bears-logo.png', teamName: 'Bears' },
     ]);
 
     render(<Entry params={{ leagueId: '123' }} />);
@@ -445,10 +445,6 @@ describe('League entries page (Entry Component)', () => {
       'src',
       '/_next/image?url=%2Fpackers-logo.png&w=96&q=75',
     );
-    expect(screen.getByTestId('league-history-logo')).not.toHaveAttribute(
-      'src',
-      '/_next/image?url=%2Fbears-logo.png&w=96&q=75',
-    );
     expect(screen.getByTestId('league-entry-logo')).toHaveAttribute(
       'src',
       '/_next/image?url=%2Fbears-logo.png&w=96&q=75',
@@ -461,7 +457,7 @@ describe('League entries page (Entry Component)', () => {
       currentWeek: 2,
       NFLTeams: [
         {
-          teamId: '1',
+          teamId: 'packers',
           teamLogo: '/packers-logo.png',
           teamName: 'Packers',
         },
@@ -479,12 +475,12 @@ describe('League entries page (Entry Component)', () => {
     mockGetGameWeek.mockResolvedValueOnce({ week: 2 });
     mockGetCurrentLeague.mockResolvedValue({
       leagueName: 'Test League',
-      participants: 10,
-      survivors: 8,
+      participants: ['123', '456'],
+      survivors: ['123', '456'],
     });
     mockGetNFLTeams.mockResolvedValue([
-      { teamId: '1', teamLogo: '/packers-logo.png', teamName: 'Packers' },
-      { teamId: '2', teamLogo: '/bears-logo.png', teamName: 'Bears' },
+      { teamId: 'packers', teamLogo: '/packers-logo.png', teamName: 'Packers' },
+      { teamId: 'bears', teamLogo: '/bears-logo.png', teamName: 'Bears' },
     ]);
 
     render(<Entry params={{ leagueId: '123' }} />);

From 3adf6da4b3957bed51395cc39a556e3465f66164 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Tue, 17 Sep 2024 17:48:35 -0400
Subject: [PATCH 069/118] added clarification to buttons and headers

---
 app/(main)/account/recovery/page.tsx | 4 ++--
 app/(main)/recover-password/page.tsx | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/(main)/account/recovery/page.tsx b/app/(main)/account/recovery/page.tsx
index 1e804bbf..12ad4013 100644
--- a/app/(main)/account/recovery/page.tsx
+++ b/app/(main)/account/recovery/page.tsx
@@ -189,7 +189,7 @@ const ResetPassword = (): React.JSX.Element => {
           <>
             <div>
               <h1 className="text-5xl font-extrabold tracking-tight">
-                Reset Your Password
+                Password Reset
               </h1>
               <p className="pb-4 font-normal leading-7 text-muted-foreground">
                 Enter your new password and confirm it to recover your account.
@@ -245,7 +245,7 @@ const ResetPassword = (): React.JSX.Element => {
                 />
                 <Button
                   data-testid="continue-button"
-                  label={isSubmitting ? <LoadingSpinner /> : 'Continue'}
+                  label={isSubmitting ? <LoadingSpinner /> : 'Reset'}
                   type="submit"
                   disabled={isDisabled}
                 />
diff --git a/app/(main)/recover-password/page.tsx b/app/(main)/recover-password/page.tsx
index 60634c22..c6557daf 100644
--- a/app/(main)/recover-password/page.tsx
+++ b/app/(main)/recover-password/page.tsx
@@ -103,7 +103,7 @@ const RecoverPassword = (): React.JSX.Element => {
       <div className="row-span-1 mx-auto grid max-w-sm justify-center space-y-4 px-4 xl:flex xl:flex-col">
         <div>
           <h1 className="text-5xl font-extrabold tracking-tight">
-            Recover Your Password
+            Password Recovery
           </h1>
           <p className="pb-4 font-normal leading-7 text-muted-foreground">
             Enter the email address associated with your account to recover your
@@ -139,7 +139,7 @@ const RecoverPassword = (): React.JSX.Element => {
             />
             <Button
               data-testid="continue-button"
-              label={isLoading ? <LoadingSpinner /> : 'Continue'}
+              label={isLoading ? <LoadingSpinner /> : 'Recover'}
               type="submit"
               disabled={!email || isLoading}
             />

From bbd89ce23b686abb370c28b7dd0349a47cba6607 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Tue, 17 Sep 2024 23:30:04 -0400
Subject: [PATCH 070/118] fix shashi comments

---
 api/apiFunctions.test.tsx                 |  6 ++----
 api/apiFunctions.ts                       | 10 ++--------
 app/(main)/account/recovery/page.test.tsx |  8 ++++++--
 app/(main)/account/recovery/page.tsx      |  6 +++---
 app/(main)/recover-password/page.test.tsx | 10 +++++-----
 app/(main)/recover-password/page.tsx      |  4 ++--
 6 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/api/apiFunctions.test.tsx b/api/apiFunctions.test.tsx
index 41b62230..941d717f 100644
--- a/api/apiFunctions.test.tsx
+++ b/api/apiFunctions.test.tsx
@@ -116,9 +116,7 @@ describe('apiFunctions', () => {
         const mockError = new Error('Recovery creation failed');
         (account.createRecovery as jest.Mock).mockRejectedValue(mockError);
 
-        await expect(recoverPassword({ email: mockEmail })).rejects.toThrow(
-          'Error recovering password',
-        );
+        await expect(recoverPassword({ email: mockEmail })).rejects.toThrow();
         expect(getBaseURL).toHaveBeenCalledTimes(1);
         expect(account.createRecovery).toHaveBeenCalledWith(
           mockEmail,
@@ -157,7 +155,7 @@ describe('apiFunctions', () => {
             token: mockToken,
             password: mockPassword,
           }),
-        ).rejects.toThrow('Password reset failed');
+        ).rejects.toThrow();
         expect(account.updateRecovery).toHaveBeenCalledWith(
           mockUserId,
           mockToken,
diff --git a/api/apiFunctions.ts b/api/apiFunctions.ts
index 9dd0b12a..ffc3ae83 100644
--- a/api/apiFunctions.ts
+++ b/api/apiFunctions.ts
@@ -53,14 +53,9 @@ export async function recoverPassword({
   const baseURL = getBaseURL();
 
   try {
-    const result = await account.createRecovery(
-      email,
-      `${baseURL}/account/recovery`,
-    );
-    return result;
+    return await account.createRecovery(email, `${baseURL}/account/recovery`);
   } catch (error) {
-    console.error(error);
-    throw new Error('Error recovering password');
+    throw error;
   }
 }
 
@@ -85,7 +80,6 @@ export async function resetPassword({
     const result = await account.updateRecovery(userId, token, password);
     return result;
   } catch (error) {
-    console.error('Password reset error:', error);
     throw error;
   }
 }
diff --git a/app/(main)/account/recovery/page.test.tsx b/app/(main)/account/recovery/page.test.tsx
index aed70fa9..5f1e676c 100644
--- a/app/(main)/account/recovery/page.test.tsx
+++ b/app/(main)/account/recovery/page.test.tsx
@@ -61,12 +61,16 @@ describe('ResetPassword', () => {
     fireEvent.change(screen.getByTestId('confirm-password'), {
       target: { value: 'newpassword123' },
     });
-    fireEvent.click(screen.getByTestId('continue-button'));
+    fireEvent.click(screen.getByTestId('reset-password-button'));
   };
 
   it('should render the reset password form when all search params are present', async () => {
     render(<ResetPassword />);
-    await screen.findByText('Reset Your Password');
+    const heading = await screen.findByRole('heading', {
+      name: 'Reset Password',
+      level: 1,
+    });
+    expect(heading).toBeInTheDocument();
     expect(screen.getByTestId('password')).toBeInTheDocument();
     expect(screen.getByTestId('confirm-password')).toBeInTheDocument();
   });
diff --git a/app/(main)/account/recovery/page.tsx b/app/(main)/account/recovery/page.tsx
index 12ad4013..a4748001 100644
--- a/app/(main)/account/recovery/page.tsx
+++ b/app/(main)/account/recovery/page.tsx
@@ -189,7 +189,7 @@ const ResetPassword = (): React.JSX.Element => {
           <>
             <div>
               <h1 className="text-5xl font-extrabold tracking-tight">
-                Password Reset
+                Reset Password
               </h1>
               <p className="pb-4 font-normal leading-7 text-muted-foreground">
                 Enter your new password and confirm it to recover your account.
@@ -244,8 +244,8 @@ const ResetPassword = (): React.JSX.Element => {
                   )}
                 />
                 <Button
-                  data-testid="continue-button"
-                  label={isSubmitting ? <LoadingSpinner /> : 'Reset'}
+                  data-testid="reset-password-button"
+                  label={isSubmitting ? <LoadingSpinner /> : 'Reset Password'}
                   type="submit"
                   disabled={isDisabled}
                 />
diff --git a/app/(main)/recover-password/page.test.tsx b/app/(main)/recover-password/page.test.tsx
index afd08f2a..36ea164c 100644
--- a/app/(main)/recover-password/page.test.tsx
+++ b/app/(main)/recover-password/page.test.tsx
@@ -50,10 +50,10 @@ describe('Recover Password', () => {
   test('should render the recover password page', () => {
     render(<RecoverPassword />);
     emailInput = screen.getByTestId('email');
-    continueButton = screen.getByTestId('continue-button');
+    continueButton = screen.getByTestId('recover-password-button');
 
     const headingElement = screen.getByRole('heading', { level: 1 });
-    expect(headingElement).toHaveTextContent('Recover Your Password');
+    expect(headingElement).toHaveTextContent('Password Recovery');
 
     expect(emailInput).toBeInTheDocument();
     expect(continueButton).toBeInTheDocument();
@@ -63,7 +63,7 @@ describe('Recover Password', () => {
     render(<RecoverPassword />);
 
     emailInput = screen.getByTestId('email');
-    continueButton = screen.getByTestId('continue-button');
+    continueButton = screen.getByTestId('recover-password-button');
 
     fireEvent.change(emailInput, { target: { value: 'test@example.com' } });
     expect(emailInput).toHaveValue('test@example.com');
@@ -74,7 +74,7 @@ describe('Recover Password', () => {
     render(<RecoverPassword />);
 
     const emailInput = screen.getByTestId('email');
-    const continueButton = screen.getByTestId('continue-button');
+    const continueButton = screen.getByTestId('recover-password-button');
 
     await act(async () => {
       fireEvent.change(emailInput, { target: { value: 'test@example.com' } });
@@ -98,7 +98,7 @@ describe('Recover Password', () => {
   test('should not call recover password function when email is empty', async () => {
     render(<RecoverPassword />);
 
-    const continueButton = screen.getByTestId('continue-button');
+    const continueButton = screen.getByTestId('recover-password-button');
 
     await act(async () => {
       fireEvent.click(continueButton);
diff --git a/app/(main)/recover-password/page.tsx b/app/(main)/recover-password/page.tsx
index c6557daf..6caa6714 100644
--- a/app/(main)/recover-password/page.tsx
+++ b/app/(main)/recover-password/page.tsx
@@ -138,8 +138,8 @@ const RecoverPassword = (): React.JSX.Element => {
               )}
             />
             <Button
-              data-testid="continue-button"
-              label={isLoading ? <LoadingSpinner /> : 'Recover'}
+              data-testid="recover-password-button"
+              label={isLoading ? <LoadingSpinner /> : 'Recover Password'}
               type="submit"
               disabled={!email || isLoading}
             />

From 0ff1a74cbbc3f1727382799f82ef9b9f1c878f58 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Wed, 18 Sep 2024 00:03:17 -0400
Subject: [PATCH 071/118] update resetPassword function to
 resetRecoveredPassword

---
 api/apiFunctions.test.tsx                 |  6 +++---
 api/apiFunctions.ts                       |  6 +++---
 app/(main)/account/recovery/page.test.tsx | 10 +++++-----
 app/(main)/account/recovery/page.tsx      |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/api/apiFunctions.test.tsx b/api/apiFunctions.test.tsx
index 941d717f..34896d08 100644
--- a/api/apiFunctions.test.tsx
+++ b/api/apiFunctions.test.tsx
@@ -1,7 +1,7 @@
 import {
   recoverPassword,
   registerAccount,
-  resetPassword,
+  resetRecoveredPassword,
 } from './apiFunctions';
 import { IUser } from './apiFunctions.interface';
 import { account, ID } from './config';
@@ -131,7 +131,7 @@ describe('apiFunctions', () => {
           mockRecoveryToken,
         );
 
-        const result = await resetPassword({
+        const result = await resetRecoveredPassword({
           userId: mockUserId,
           token: mockToken,
           password: mockPassword,
@@ -150,7 +150,7 @@ describe('apiFunctions', () => {
         (account.updateRecovery as jest.Mock).mockRejectedValue(mockError);
 
         await expect(
-          resetPassword({
+          resetRecoveredPassword({
             userId: mockUserId,
             token: mockToken,
             password: mockPassword,
diff --git a/api/apiFunctions.ts b/api/apiFunctions.ts
index ffc3ae83..5e3bd529 100644
--- a/api/apiFunctions.ts
+++ b/api/apiFunctions.ts
@@ -60,14 +60,14 @@ export async function recoverPassword({
 }
 
 /**
- * Reset a User Password
+ * Reset a User's Recovered Password
  * @param props - the props for the reset password function
  * @param props.userId - the user id
  * @param props.token - the recovery token
  * @param props.password - the new password
- * @returns {Promise<void>} - the reset password
+ * @returns {Promise<void>}
  */
-export async function resetPassword({
+export async function resetRecoveredPassword({
   userId,
   token,
   password,
diff --git a/app/(main)/account/recovery/page.test.tsx b/app/(main)/account/recovery/page.test.tsx
index 5f1e676c..9e4a795e 100644
--- a/app/(main)/account/recovery/page.test.tsx
+++ b/app/(main)/account/recovery/page.test.tsx
@@ -8,7 +8,7 @@ import {
 import { useRouter, useSearchParams } from 'next/navigation';
 import { toast } from 'react-hot-toast';
 import ResetPassword from './page';
-import { resetPassword } from '@/api/apiFunctions';
+import { resetRecoveredPassword } from '@/api/apiFunctions';
 import { useAuthContext } from '@/context/AuthContextProvider';
 import Alert from '@/components/AlertNotification/AlertNotification';
 import { AlertVariants } from '@/components/AlertNotification/Alerts.enum';
@@ -84,12 +84,12 @@ describe('ResetPassword', () => {
   });
 
   it('should submit the form and reset password successfully', async () => {
-    (resetPassword as jest.Mock).mockResolvedValue({});
+    (resetRecoveredPassword as jest.Mock).mockResolvedValue({});
     render(<ResetPassword />);
     fillFormAndSubmit();
 
     await waitFor(() => {
-      expect(resetPassword).toHaveBeenCalledWith({
+      expect(resetRecoveredPassword).toHaveBeenCalledWith({
         userId: '123',
         token: 'abc',
         password: 'newpassword123',
@@ -111,7 +111,7 @@ describe('ResetPassword', () => {
   it('should show an error message when the token is invalid', async () => {
     const error = new Error('Invalid token') as Error & { type?: string };
     error.type = 'user_invalid_token';
-    (resetPassword as jest.Mock).mockRejectedValue(error);
+    (resetRecoveredPassword as jest.Mock).mockRejectedValue(error);
 
     render(<ResetPassword />);
     fillFormAndSubmit();
@@ -132,7 +132,7 @@ describe('ResetPassword', () => {
   });
 
   it('should show an error message when the password reset fails', async () => {
-    (resetPassword as jest.Mock).mockRejectedValue(
+    (resetRecoveredPassword as jest.Mock).mockRejectedValue(
       new Error('Error resetting password'),
     );
 
diff --git a/app/(main)/account/recovery/page.tsx b/app/(main)/account/recovery/page.tsx
index a4748001..eceb5fc1 100644
--- a/app/(main)/account/recovery/page.tsx
+++ b/app/(main)/account/recovery/page.tsx
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 'use client';
-import { resetPassword } from '@/api/apiFunctions';
+import { resetRecoveredPassword } from '@/api/apiFunctions';
 import Alert from '@/components/AlertNotification/AlertNotification';
 import { AlertVariants } from '@/components/AlertNotification/Alerts.enum';
 import { Button } from '@/components/Button/Button';
@@ -130,7 +130,7 @@ const ResetPassword = (): React.JSX.Element => {
     setIsSubmitting(true);
 
     try {
-      await resetPassword({
+      await resetRecoveredPassword({
         userId: userId as string,
         token: secret as string,
         password,

From 9c80bc6c711595e13d8340d012aca318b57096e7 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Wed, 18 Sep 2024 09:21:41 -0400
Subject: [PATCH 072/118] fix: test now are it

---
 .../[leagueId]/entry/[entryId]/week/Week.test.tsx  | 14 +++++++-------
 .../league/[leagueId]/entry/all/page.test.tsx      |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
index adde527c..b2587fa1 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
@@ -144,7 +144,7 @@ describe('Week', () => {
     jest.clearAllMocks();
   });
 
-  test('should display GlobalSpinner while loading data', async () => {
+  it('should display GlobalSpinner while loading data', async () => {
     mockUseAuthContext.isSignedIn = true;
     (getCurrentUserEntries as jest.Mock).mockResolvedValue([
       {
@@ -166,7 +166,7 @@ describe('Week', () => {
     });
   });
 
-  test('should display main content after data is loaded and hide GlobalSpinner', async () => {
+  it('should display main content after data is loaded and hide GlobalSpinner', async () => {
     mockUseAuthContext.isSignedIn = true;
     (getCurrentUserEntries as jest.Mock).mockResolvedValue([
       {
@@ -194,7 +194,7 @@ describe('Week', () => {
     expect(screen.queryByTestId('global-spinner')).not.toBeInTheDocument();
   });
 
-  test('should not show previous weeks picks if there is no history of selected teams', async () => {
+  it('should not show previous weeks picks if there is no history of selected teams', async () => {
     mockUseAuthContext.isSignedIn = true;
     (getCurrentUserEntries as jest.Mock).mockResolvedValue([
       {
@@ -222,7 +222,7 @@ describe('Week', () => {
     expect(userPickHistory).not.toBeInTheDocument();
   });
 
-  test('should show previous weeks picks if their are picks in selected teams history', async () => {
+  it('should show previous weeks picks if their are picks in selected teams history', async () => {
     mockUseAuthContext.isSignedIn = true;
     (getCurrentUserEntries as jest.Mock).mockResolvedValue([
       {
@@ -261,7 +261,7 @@ describe('Week', () => {
     );
   });
 
-  xtest('should show success notification after changing your team pick', async () => {
+  xit('should show success notification after changing your team pick', async () => {
     (createWeeklyPicks as jest.Mock).mockResolvedValue({});
 
     const currentUserPick = mockParseUserPick(user.id, entry, teamName);
@@ -296,7 +296,7 @@ describe('Week', () => {
     );
   });
 
-  xtest('should show error notification when changing your team fails', async () => {
+  xit('should show error notification when changing your team fails', async () => {
     (createWeeklyPicks as jest.Mock).mockRejectedValue(new Error('error'));
 
     await onWeeklyPickChange({
@@ -319,7 +319,7 @@ describe('Week', () => {
     );
   });
 
-  test('should redirect back to entry page after successfully selecting a team', async () => {
+  it('should redirect back to entry page after successfully selecting a team', async () => {
     mockUseAuthContext.isSignedIn = true;
     (getCurrentUserEntries as jest.Mock).mockResolvedValue([
       {
diff --git a/app/(main)/league/[leagueId]/entry/all/page.test.tsx b/app/(main)/league/[leagueId]/entry/all/page.test.tsx
index f5b7b10a..dcf26494 100644
--- a/app/(main)/league/[leagueId]/entry/all/page.test.tsx
+++ b/app/(main)/league/[leagueId]/entry/all/page.test.tsx
@@ -60,7 +60,7 @@ describe('League entries page (Entry Component)', () => {
     jest.clearAllMocks();
   });
 
-  test('should display GlobalSpinner while loading data', async () => {
+  it('should display GlobalSpinner while loading data', async () => {
     mockGetCurrentUserEntries.mockResolvedValueOnce([
       {
         $id: '66311a210039f0532044',
@@ -84,7 +84,7 @@ describe('League entries page (Entry Component)', () => {
     });
   });
 
-  test('should not display GlobalSpinner after data is loaded', async () => {
+  it('should not display GlobalSpinner after data is loaded', async () => {
     mockUseDataStore.mockReturnValue({
       ...mockUseDataStore(),
       currentWeek: 1,

From b2d564057ba43dafd7861ae018510393be261566 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Wed, 18 Sep 2024 09:33:26 -0400
Subject: [PATCH 073/118] fix richard comments

---
 .../league/[leagueId]/entry/[entryId]/week/Week.test.tsx | 8 +++-----
 .../league/[leagueId]/entry/[entryId]/week/Week.tsx      | 2 +-
 app/(main)/league/[leagueId]/entry/all/page.test.tsx     | 9 +++------
 components/LeagueEntries/LeagueEntries.test.tsx          | 3 +--
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
index b2587fa1..bc006fc4 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
@@ -119,7 +119,7 @@ const updatedWeeklyPicks = {
   },
 };
 
-describe('Week', () => {
+describe('League Week Picks', () => {
   const setUserPick = jest.fn();
   const updateWeeklyPicks = jest.fn();
   const mockGetNFLTeamLogo = getNFLTeamLogo as jest.Mock;
@@ -218,8 +218,7 @@ describe('Week', () => {
       { timeout: 5000 },
     );
 
-    const userPickHistory = screen.queryByTestId('user-pick-history');
-    expect(userPickHistory).not.toBeInTheDocument();
+    expect(screen.queryByTestId('user-pick-history')).not.toBeInTheDocument();
   });
 
   it('should show previous weeks picks if their are picks in selected teams history', async () => {
@@ -246,8 +245,7 @@ describe('Week', () => {
       { timeout: 5000 },
     );
 
-    const userPickHistory = screen.getByTestId('user-pick-history');
-    expect(userPickHistory).toBeInTheDocument();
+    expect(screen.getByTestId('user-pick-history')).toBeInTheDocument();
 
     const userPickHistoryLogos = screen.queryAllByTestId('league-history-logo');
     expect(userPickHistoryLogos).toHaveLength(2);
diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
index 0996d261..228d1085 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
@@ -136,8 +136,8 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
         setSchedule(scheduleData.events);
       }
     } catch (error) {
-      console.error('Could not load week data:', error);
       setError('Could not load week data.');
+      throw error;
     }
   };
 
diff --git a/app/(main)/league/[leagueId]/entry/all/page.test.tsx b/app/(main)/league/[leagueId]/entry/all/page.test.tsx
index dcf26494..dde50186 100644
--- a/app/(main)/league/[leagueId]/entry/all/page.test.tsx
+++ b/app/(main)/league/[leagueId]/entry/all/page.test.tsx
@@ -388,8 +388,7 @@ describe('League entries page (Entry Component)', () => {
       expect(mockGetNFLTeams).toHaveBeenCalled();
     });
 
-    const userPickHistory = screen.queryByTestId('user-pick-history');
-    expect(userPickHistory).not.toBeInTheDocument();
+    expect(screen.queryByTestId('user-pick-history')).not.toBeInTheDocument();
   });
 
   it('should display the user pick history if the current week is greater than 1', async () => {
@@ -439,8 +438,7 @@ describe('League entries page (Entry Component)', () => {
     // Add a delay to allow for any asynchronous rendering
     await new Promise((resolve) => setTimeout(resolve, 0));
 
-    const userPickHistory = screen.queryByTestId('user-pick-history');
-    expect(userPickHistory).toBeInTheDocument();
+    expect(screen.queryByTestId('user-pick-history')).toBeInTheDocument();
     expect(screen.getByTestId('league-history-logo')).toHaveAttribute(
       'src',
       '/_next/image?url=%2Fpackers-logo.png&w=96&q=75',
@@ -492,7 +490,6 @@ describe('League entries page (Entry Component)', () => {
       expect(mockGetNFLTeams).toHaveBeenCalled();
     });
 
-    const userPickHistory = screen.queryByTestId('user-pick-history');
-    expect(userPickHistory).not.toBeInTheDocument();
+    expect(screen.queryByTestId('user-pick-history')).not.toBeInTheDocument();
   });
 });
diff --git a/components/LeagueEntries/LeagueEntries.test.tsx b/components/LeagueEntries/LeagueEntries.test.tsx
index cc4f822e..a84829bd 100644
--- a/components/LeagueEntries/LeagueEntries.test.tsx
+++ b/components/LeagueEntries/LeagueEntries.test.tsx
@@ -43,13 +43,12 @@ describe('LeagueEntries', () => {
     const leagueEntryPickButton = screen.getByTestId(
       'league-entry-pick-button',
     );
-    const userHistoryPicks = screen.queryByTestId('user-pick-history');
 
     expect(entryStatus).toHaveTextContent('alive');
     expect(leagueEntryContainerCard).toBeInTheDocument();
     expect(leagueEntryNumber).toHaveTextContent('Entry 2');
     expect(leagueEntryPickButton).toHaveTextContent('Change Pick');
-    expect(userHistoryPicks).toBeInTheDocument();
+    expect(screen.queryByTestId('user-pick-history')).toBeInTheDocument();
   });
 
   it('renders as if the user is eliminated', () => {

From 5130f6a4e88f82cecc4b599d5b7be50f96460b84 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Wed, 18 Sep 2024 09:47:13 -0400
Subject: [PATCH 074/118] fix remaining comments

---
 api/apiFunctions.test.tsx                 |  5 +++--
 api/apiFunctions.ts                       |  3 +--
 app/(main)/account/recovery/page.tsx      | 14 ++++++++------
 app/(main)/recover-password/page.test.tsx | 10 +++++-----
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/api/apiFunctions.test.tsx b/api/apiFunctions.test.tsx
index 34896d08..451ad2d7 100644
--- a/api/apiFunctions.test.tsx
+++ b/api/apiFunctions.test.tsx
@@ -80,8 +80,9 @@ describe('apiFunctions', () => {
       });
 
       it('should throw an error if registration fails', async () => {
-        const mockError = new Error('Registration failed');
-        (account.create as jest.Mock).mockRejectedValue(mockError);
+        (account.create as jest.Mock).mockRejectedValue(
+          new Error('Registration failed'),
+        );
 
         await expect(
           registerAccount({ email: mockEmail, password: mockPassword }),
diff --git a/api/apiFunctions.ts b/api/apiFunctions.ts
index 5e3bd529..c3831ac7 100644
--- a/api/apiFunctions.ts
+++ b/api/apiFunctions.ts
@@ -77,8 +77,7 @@ export async function resetRecoveredPassword({
   password: string;
 }): Promise<IRecoveryToken> {
   try {
-    const result = await account.updateRecovery(userId, token, password);
-    return result;
+    return await account.updateRecovery(userId, token, password);
   } catch (error) {
     throw error;
   }
diff --git a/app/(main)/account/recovery/page.tsx b/app/(main)/account/recovery/page.tsx
index eceb5fc1..3b91d892 100644
--- a/app/(main)/account/recovery/page.tsx
+++ b/app/(main)/account/recovery/page.tsx
@@ -81,12 +81,14 @@ const ResetPassword = (): React.JSX.Element => {
     useEffect(() => {
       if (!userId || !secret || !expire) {
         router.push('/login');
-      } else {
-        setIsLoading(false);
-        if (isSignedIn) {
-          getUser();
-          router.push('/league/all');
-        }
+        return;
+      }
+
+      setIsLoading(false);
+
+      if (isSignedIn) {
+        getUser();
+        router.push('/league/all');
       }
     }, [isSignedIn]);
 
diff --git a/app/(main)/recover-password/page.test.tsx b/app/(main)/recover-password/page.test.tsx
index 36ea164c..18d9b6bd 100644
--- a/app/(main)/recover-password/page.test.tsx
+++ b/app/(main)/recover-password/page.test.tsx
@@ -47,7 +47,7 @@ describe('Recover Password', () => {
     jest.clearAllMocks();
   });
 
-  test('should render the recover password page', () => {
+  it('should render the recover password page', () => {
     render(<RecoverPassword />);
     emailInput = screen.getByTestId('email');
     continueButton = screen.getByTestId('recover-password-button');
@@ -59,7 +59,7 @@ describe('Recover Password', () => {
     expect(continueButton).toBeInTheDocument();
   });
 
-  test('should update email state when input value changes', () => {
+  it('should update email state when input value changes', () => {
     render(<RecoverPassword />);
 
     emailInput = screen.getByTestId('email');
@@ -69,7 +69,7 @@ describe('Recover Password', () => {
     expect(emailInput).toHaveValue('test@example.com');
   });
 
-  test('should call recoverPassword function and redirect to /login', async () => {
+  it('should call recoverPassword function and redirect to /login', async () => {
     jest.useFakeTimers();
     render(<RecoverPassword />);
 
@@ -95,7 +95,7 @@ describe('Recover Password', () => {
     jest.useRealTimers();
   });
 
-  test('should not call recover password function when email is empty', async () => {
+  it('should not call recover password function when email is empty', async () => {
     render(<RecoverPassword />);
 
     const continueButton = screen.getByTestId('recover-password-button');
@@ -109,7 +109,7 @@ describe('Recover Password', () => {
     });
   });
 
-  test('redirects to /league/all when user navigates to /recover-password and is signed in', async () => {
+  it('redirects to /league/all when user navigates to /recover-password and is signed in', async () => {
     mockUseAuthContext.isSignedIn = true;
 
     render(<RecoverPassword />);

From 5b93c8881e9de01ec6a60ee61e18b654b39ee032 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Wed, 18 Sep 2024 11:07:48 -0400
Subject: [PATCH 075/118] fix shashi comments

---
 app/(main)/account/recovery/page.test.tsx | 33 +++++------------------
 app/(main)/account/recovery/page.tsx      | 20 +++++---------
 app/(main)/recover-password/page.tsx      |  1 -
 3 files changed, 12 insertions(+), 42 deletions(-)

diff --git a/app/(main)/account/recovery/page.test.tsx b/app/(main)/account/recovery/page.test.tsx
index 9e4a795e..16b1270d 100644
--- a/app/(main)/account/recovery/page.test.tsx
+++ b/app/(main)/account/recovery/page.test.tsx
@@ -1,10 +1,4 @@
-import {
-  act,
-  fireEvent,
-  render,
-  screen,
-  waitFor,
-} from '@testing-library/react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import { useRouter, useSearchParams } from 'next/navigation';
 import { toast } from 'react-hot-toast';
 import ResetPassword from './page';
@@ -25,7 +19,6 @@ describe('ResetPassword', () => {
   let mockToast: jest.Mock;
 
   beforeEach(() => {
-    jest.useFakeTimers();
     mockUseSearchParams = jest.fn().mockImplementation((param: string) => {
       const params: { [key: string]: string } = {
         userId: '123',
@@ -50,7 +43,6 @@ describe('ResetPassword', () => {
   });
 
   afterEach(() => {
-    jest.useRealTimers();
     jest.clearAllMocks();
   });
 
@@ -102,15 +94,12 @@ describe('ResetPassword', () => {
       );
     });
 
-    act(() => {
-      jest.advanceTimersByTime(2000);
-    });
     expect(mockRouter.push).toHaveBeenCalledWith('/login');
   });
 
   it('should show an error message when the token is invalid', async () => {
-    const error = new Error('Invalid token') as Error & { type?: string };
-    error.type = 'user_invalid_token';
+    const error = new Error('Invalid token') as Error & { message?: string };
+    error.message = 'Invalid token';
     (resetRecoveredPassword as jest.Mock).mockRejectedValue(error);
 
     render(<ResetPassword />);
@@ -118,23 +107,16 @@ describe('ResetPassword', () => {
 
     await waitFor(() => {
       expect(mockToast).toHaveBeenCalledWith(
-        <Alert
-          variant={AlertVariants.Error}
-          message="Invalid recovery token. Your token may have expired or already been used.  Please try again."
-        />,
+        <Alert variant={AlertVariants.Error} message="Invalid token" />,
       );
     });
 
-    act(() => {
-      jest.advanceTimersByTime(2000);
-    });
     expect(mockRouter.push).toHaveBeenCalledWith('/recover-password');
   });
 
   it('should show an error message when the password reset fails', async () => {
-    (resetRecoveredPassword as jest.Mock).mockRejectedValue(
-      new Error('Error resetting password'),
-    );
+    const error = { message: 'Error resetting password' };
+    (resetRecoveredPassword as jest.Mock).mockRejectedValue(error);
 
     render(<ResetPassword />);
     fillFormAndSubmit();
@@ -148,9 +130,6 @@ describe('ResetPassword', () => {
       );
     });
 
-    act(() => {
-      jest.advanceTimersByTime(2000);
-    });
     expect(mockRouter.push).toHaveBeenCalledWith('/recover-password');
   });
 });
diff --git a/app/(main)/account/recovery/page.tsx b/app/(main)/account/recovery/page.tsx
index 3b91d892..5fabd1fa 100644
--- a/app/(main)/account/recovery/page.tsx
+++ b/app/(main)/account/recovery/page.tsx
@@ -27,10 +27,6 @@ import {
 import { Suspense } from 'react';
 import GlobalSpinner from '@/components/GlobalSpinner/GlobalSpinner';
 
-interface CustomError extends Error {
-  type?: string;
-}
-
 /**
  * The schema for the login form.
  * @throws {Error} Throws an error if the email is not a valid email address.
@@ -145,24 +141,20 @@ const ResetPassword = (): React.JSX.Element => {
         />,
       );
 
-      setTimeout(() => router.push('/login'), 2000);
-    } catch (err) {
-      console.error('Error resetting password:', err);
+      router.push('/login');
+    } catch (error) {
+      console.error('Error resetting password:', error);
       let errorMessage = 'There was an error resetting your password.';
 
-      if (err instanceof Error) {
-        const customErr = err as CustomError;
-        if (customErr.type === 'user_invalid_token') {
-          errorMessage =
-            'Invalid recovery token. Your token may have expired or already been used.  Please try again.';
-        }
+      if (error instanceof Error) {
+        errorMessage = error.message;
       }
 
       toast.custom(
         <Alert variant={AlertVariants.Error} message={errorMessage} />,
       );
 
-      setTimeout(() => router.push('/recover-password'), 2000);
+      router.push('/recover-password');
     } finally {
       setIsSubmitting(false);
     }
diff --git a/app/(main)/recover-password/page.tsx b/app/(main)/recover-password/page.tsx
index 6caa6714..1cdd18d4 100644
--- a/app/(main)/recover-password/page.tsx
+++ b/app/(main)/recover-password/page.tsx
@@ -55,7 +55,6 @@ const RecoverPassword = (): React.JSX.Element => {
       getUser();
       router.push('/league/all');
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isSignedIn]);
 
   const form = useForm<ResetUserPasswordSchemaType>({

From 18a155e128dd065fd6c5b3fe7a1862554d3b19e4 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Wed, 18 Sep 2024 12:58:57 -0400
Subject: [PATCH 076/118] udpate apiFunction test name for
 resetRecoveredPassword

---
 api/apiFunctions.test.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/apiFunctions.test.tsx b/api/apiFunctions.test.tsx
index 451ad2d7..30a7b3a5 100644
--- a/api/apiFunctions.test.tsx
+++ b/api/apiFunctions.test.tsx
@@ -126,7 +126,7 @@ describe('apiFunctions', () => {
       });
     });
 
-    describe('resetPassword', () => {
+    describe('resetRecoveredPassword', () => {
       it('should successfully reset the password', async () => {
         (account.updateRecovery as jest.Mock).mockResolvedValue(
           mockRecoveryToken,

From 53a88ac6bc069efb7ef8cb3c03c26463d15b59f7 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Wed, 18 Sep 2024 14:14:47 -0400
Subject: [PATCH 077/118] remove time from recover-password page and test

---
 app/(main)/recover-password/page.test.tsx | 6 ------
 app/(main)/recover-password/page.tsx      | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/(main)/recover-password/page.test.tsx b/app/(main)/recover-password/page.test.tsx
index 18d9b6bd..00e5dd5d 100644
--- a/app/(main)/recover-password/page.test.tsx
+++ b/app/(main)/recover-password/page.test.tsx
@@ -70,7 +70,6 @@ describe('Recover Password', () => {
   });
 
   it('should call recoverPassword function and redirect to /login', async () => {
-    jest.useFakeTimers();
     render(<RecoverPassword />);
 
     const emailInput = screen.getByTestId('email');
@@ -87,12 +86,7 @@ describe('Recover Password', () => {
       });
     });
 
-    act(() => {
-      jest.advanceTimersByTime(2000);
-    });
-
     expect(mockPush).toHaveBeenCalledWith('/login');
-    jest.useRealTimers();
   });
 
   it('should not call recover password function when email is empty', async () => {
diff --git a/app/(main)/recover-password/page.tsx b/app/(main)/recover-password/page.tsx
index 1cdd18d4..6eca9c91 100644
--- a/app/(main)/recover-password/page.tsx
+++ b/app/(main)/recover-password/page.tsx
@@ -84,7 +84,7 @@ const RecoverPassword = (): React.JSX.Element => {
         message={`If an account exists for ${data.email}, we've sent password reset instructions to that email address. Please check your inbox and follow the provided steps to reset your password.`}
       />,
     );
-    setTimeout(() => router.push('/login'), 2000);
+    router.push('/login');
   };
 
   return (

From eb1b042faa479cf8ed538c99c9b6f9f4a97edef8 Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Wed, 18 Sep 2024 21:12:18 -0400
Subject: [PATCH 078/118] create and add feedback CTA

---
 app/(main)/layout.tsx | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/(main)/layout.tsx b/app/(main)/layout.tsx
index 19eceb54..03f59ede 100644
--- a/app/(main)/layout.tsx
+++ b/app/(main)/layout.tsx
@@ -36,7 +36,24 @@ const RootLayout = ({
         <ErrorBoundary>
           <AuthContextProvider>
             <Nav />
-            <main>{children}</main>
+            <main>
+              <div className="bg-gradient-to-b from-primary to-orange-400 w-fit mx-auto my-12 rounded-lg text-center p-1 drop-shadow-[0_2px_24px_rgba(234,88,12,0.65)] hover:drop-shadow-[0_2px_24px_rgba(234,88,12,0.95)] transition-all duration-500">
+                <div className="bg-muted p-4 rounded-[calc(.5rem-2px)]">
+                  <p className="text-foreground text-lg">
+                    <a
+                      className="font-bold underline hover:text-primary"
+                      href="https://docs.google.com/forms/d/1Nz-xfu3wxUPniiG0UpLxNkl3dIQi8N5dFeq4bQELhOQ"
+                      target="_blank"
+                      rel="noopener noreferrer"
+                    >
+                      Provide feedback
+                    </a>{' '}
+                    to help make Gridiron Survivor even better!
+                  </p>
+                </div>
+              </div>
+              {children}
+            </main>
             <Toaster />
           </AuthContextProvider>
         </ErrorBoundary>

From a2cc8ca0bba50f9823c7ae76c5f70daa1ae5aa0f Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Wed, 18 Sep 2024 22:13:35 -0400
Subject: [PATCH 079/118] re-design feedback button

---
 app/(main)/layout.tsx | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/app/(main)/layout.tsx b/app/(main)/layout.tsx
index 03f59ede..c5d30dd8 100644
--- a/app/(main)/layout.tsx
+++ b/app/(main)/layout.tsx
@@ -1,13 +1,14 @@
 // Copyright (c) Gridiron Survivor.
 // Licensed under the MIT License.
 
-import React, { JSX } from 'react';
-import { GeistSans } from 'geist/font/sans';
 import '../globals.css';
-import Nav from '@/components/Nav/Nav';
 import { AuthContextProvider } from '@/context/AuthContextProvider';
-import ErrorBoundary from '../error';
+import { GeistSans } from 'geist/font/sans';
+import { MessageSquareShare } from 'lucide-react';
 import { Toaster } from 'react-hot-toast';
+import ErrorBoundary from '../error';
+import Nav from '@/components/Nav/Nav';
+import React, { JSX } from 'react';
 
 const defaultUrl = process.env.VERCEL_URL
   ? `https://${process.env.VERCEL_URL}`
@@ -37,22 +38,17 @@ const RootLayout = ({
           <AuthContextProvider>
             <Nav />
             <main>
-              <div className="bg-gradient-to-b from-primary to-orange-400 w-fit mx-auto my-12 rounded-lg text-center p-1 drop-shadow-[0_2px_24px_rgba(234,88,12,0.65)] hover:drop-shadow-[0_2px_24px_rgba(234,88,12,0.95)] transition-all duration-500">
-                <div className="bg-muted p-4 rounded-[calc(.5rem-2px)]">
-                  <p className="text-foreground text-lg">
-                    <a
-                      className="font-bold underline hover:text-primary"
-                      href="https://docs.google.com/forms/d/1Nz-xfu3wxUPniiG0UpLxNkl3dIQi8N5dFeq4bQELhOQ"
-                      target="_blank"
-                      rel="noopener noreferrer"
-                    >
-                      Provide feedback
-                    </a>{' '}
-                    to help make Gridiron Survivor even better!
-                  </p>
-                </div>
-              </div>
               {children}
+              <div>
+                <a
+                  className="bg-transparent border border-border text-primary rounded-full w-12 h-2 flex items-center justify-center fixed bottom-4 right-4 md:bottom-12 md:right-12 md:w-20 md:h-20 hover:bg-muted transition-colors duration-300"
+                  href="https://docs.google.com/forms/d/1Nz-xfu3wxUPniiG0UpLxNkl3dIQi8N5dFeq4bQELhOQ"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                >
+                  <MessageSquareShare className="md:w-9 md:h-9" />
+                </a>
+              </div>
             </main>
             <Toaster />
           </AuthContextProvider>

From af432b6d565c4bc2b0c71e4a87be101319e47fda Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Wed, 18 Sep 2024 22:20:01 -0400
Subject: [PATCH 080/118] fix ryan comments

---
 api/apiFunctions.interface.ts | 4 ++--
 api/apiFunctions.ts           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/api/apiFunctions.interface.ts b/api/apiFunctions.interface.ts
index 355e8f23..ed8352ba 100644
--- a/api/apiFunctions.interface.ts
+++ b/api/apiFunctions.interface.ts
@@ -51,8 +51,8 @@ export interface IGameWeek {
 
 export interface IRecoveryToken {
   $id: string;
-  userId: string;
-  secret: string;
   expire: string;
   phrase?: string;
+  secret: string;
+  userId: string;
 }
diff --git a/api/apiFunctions.ts b/api/apiFunctions.ts
index c3831ac7..2fcc88d1 100644
--- a/api/apiFunctions.ts
+++ b/api/apiFunctions.ts
@@ -72,9 +72,9 @@ export async function resetRecoveredPassword({
   token,
   password,
 }: {
-  userId: string;
-  token: string;
   password: string;
+  token: string;
+  userId: string;
 }): Promise<IRecoveryToken> {
   try {
     return await account.updateRecovery(userId, token, password);

From d94dfbcdd94c6dc3bf5816d878aca8aea8e50a0f Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Thu, 19 Sep 2024 06:19:34 -0400
Subject: [PATCH 081/118] refine styles of feedback link

---
 app/(main)/layout.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/(main)/layout.tsx b/app/(main)/layout.tsx
index c5d30dd8..c5a585fc 100644
--- a/app/(main)/layout.tsx
+++ b/app/(main)/layout.tsx
@@ -39,14 +39,15 @@ const RootLayout = ({
             <Nav />
             <main>
               {children}
-              <div>
+              <div className="pt-24">
                 <a
-                  className="bg-transparent border border-border text-primary rounded-full w-12 h-2 flex items-center justify-center fixed bottom-4 right-4 md:bottom-12 md:right-12 md:w-20 md:h-20 hover:bg-muted transition-colors duration-300"
+                  className="bg-background border border-border text-primary rounded-full w-24 h-24 flex flex-col items-center justify-center fixed bottom-4 right-4 md:bottom-12 md:right-12  hover:bg-muted transition-colors duration-300 text-center text-xs font-bold"
                   href="https://docs.google.com/forms/d/1Nz-xfu3wxUPniiG0UpLxNkl3dIQi8N5dFeq4bQELhOQ"
                   target="_blank"
                   rel="noopener noreferrer"
                 >
-                  <MessageSquareShare className="md:w-9 md:h-9" />
+                  <MessageSquareShare className="w-10 h-10" />
+                  Feedback
                 </a>
               </div>
             </main>

From 068061047bbe1c5b96621d3c3e5113fe6e20553d Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Thu, 19 Sep 2024 10:42:26 -0400
Subject: [PATCH 082/118] fix: bug new week shows previous week as current pick

---
 .../[leagueId]/entry/[entryId]/week/Week.tsx  | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
index 228d1085..56ccc1cc 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
@@ -273,23 +273,23 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
               Week {week} pick
             </h1>
 
-            {pickHistory.length > 0 && (
-              <section
-                className="flex flex-wrap w-[90%] gap-4 overflow-x-scroll justify-center pb-10 items-center"
-                data-testid="user-pick-history"
-              >
-                {pickHistory?.map((logoURL, index) => (
+            <div className="flex flex-wrap justify-center gap-2 mb-8">
+              {pickHistory?.map((logoURL, index) => {
+                const isCurrentWeek = index === pickHistory.length - 1;
+                const hasCurrentWeekPick = pickHistory.length === Number(week);
+
+                return (
                   <div
                     key={`${logoURL}-${index + 1}`}
                     className={cn(
-                      'flex flex-col items-center justify-center border  p-2 rounded-lg gap-1',
-                      index === pickHistory.length - 1
+                      'flex flex-col items-center justify-center border p-2 rounded-lg gap-1',
+                      isCurrentWeek && hasCurrentWeekPick
                         ? 'border-primary'
                         : 'border-border opacity-80',
                     )}
                   >
                     <span className="text-sm">
-                      {index === pickHistory.length - 1
+                      {isCurrentWeek && hasCurrentWeekPick
                         ? 'CURRENT'
                         : `WEEK ${index + 1}`}
                     </span>
@@ -302,9 +302,9 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
                       alt="teamLogo"
                     />
                   </div>
-                ))}
-              </section>
-            )}
+                );
+              })}
+            </div>
 
             <FormProvider {...form}>
               <form className="mx-auto flex w-[90%] max-w-3xl flex-col items-center">

From 57a841dc0f2a493ae87b44e35b933deddb54f2b2 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Thu, 19 Sep 2024 12:10:04 -0400
Subject: [PATCH 083/118] fix week.test.tsx

---
 .../entry/[entryId]/week/Week.test.tsx        | 17 +++--
 .../[leagueId]/entry/[entryId]/week/Week.tsx  | 68 ++++++++++---------
 2 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
index bc006fc4..be083644 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
@@ -211,18 +211,16 @@ describe('League Week Picks', () => {
       <Week entry={entry} league={league} NFLTeams={NFLTeams} week={week} />,
     );
 
-    await waitFor(
-      () => {
-        expect(screen.getByTestId('weekly-picks')).toBeInTheDocument();
-      },
-      { timeout: 5000 },
-    );
+    await waitFor(() => {
+      expect(screen.getByTestId('weekly-picks')).toBeInTheDocument();
+    });
 
     expect(screen.queryByTestId('user-pick-history')).not.toBeInTheDocument();
   });
 
   it('should show previous weeks picks if their are picks in selected teams history', async () => {
     mockUseAuthContext.isSignedIn = true;
+    const mockWeek = '2';
     (getCurrentUserEntries as jest.Mock).mockResolvedValue([
       {
         $id: '123',
@@ -235,7 +233,12 @@ describe('League Week Picks', () => {
     ]);
 
     render(
-      <Week entry={entry} league={league} NFLTeams={NFLTeams} week={week} />,
+      <Week
+        entry={entry}
+        league={league}
+        NFLTeams={NFLTeams}
+        week={mockWeek}
+      />,
     );
 
     await waitFor(
diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
index 56ccc1cc..e21c358b 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
@@ -273,38 +273,44 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
               Week {week} pick
             </h1>
 
-            <div className="flex flex-wrap justify-center gap-2 mb-8">
-              {pickHistory?.map((logoURL, index) => {
-                const isCurrentWeek = index === pickHistory.length - 1;
-                const hasCurrentWeekPick = pickHistory.length === Number(week);
+            {pickHistory.length > 0 && (
+              <section
+                className="flex flex-wrap w-[90%] gap-4 overflow-x-scroll justify-center pb-10 items-center"
+                data-testid="user-pick-history"
+              >
+                {pickHistory?.map((logoURL, index) => {
+                  const isCurrentWeek = index === pickHistory.length - 1;
+                  const hasCurrentWeekPick =
+                    pickHistory.length === Number(week);
 
-                return (
-                  <div
-                    key={`${logoURL}-${index + 1}`}
-                    className={cn(
-                      'flex flex-col items-center justify-center border p-2 rounded-lg gap-1',
-                      isCurrentWeek && hasCurrentWeekPick
-                        ? 'border-primary'
-                        : 'border-border opacity-80',
-                    )}
-                  >
-                    <span className="text-sm">
-                      {isCurrentWeek && hasCurrentWeekPick
-                        ? 'CURRENT'
-                        : `WEEK ${index + 1}`}
-                    </span>
-                    <Image
-                      className="league-entry-logo"
-                      width={64}
-                      height={64}
-                      data-testid="league-history-logo"
-                      src={logoURL}
-                      alt="teamLogo"
-                    />
-                  </div>
-                );
-              })}
-            </div>
+                  return (
+                    <div
+                      key={`${logoURL}-${index + 1}`}
+                      className={cn(
+                        'flex flex-col items-center justify-center border p-2 rounded-lg gap-1',
+                        isCurrentWeek && hasCurrentWeekPick
+                          ? 'border-primary'
+                          : 'border-border opacity-80',
+                      )}
+                    >
+                      <span className="text-sm">
+                        {isCurrentWeek && hasCurrentWeekPick
+                          ? 'CURRENT'
+                          : `WEEK ${index + 1}`}
+                      </span>
+                      <Image
+                        className="league-entry-logo"
+                        width={64}
+                        height={64}
+                        data-testid="league-history-logo"
+                        src={logoURL}
+                        alt="teamLogo"
+                      />
+                    </div>
+                  );
+                })}
+              </section>
+            )}
 
             <FormProvider {...form}>
               <form className="mx-auto flex w-[90%] max-w-3xl flex-col items-center">

From 27fabf54008e58cbdb5522813b8feaf197ffd340 Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Thu, 19 Sep 2024 16:02:30 -0400
Subject: [PATCH 084/118] update bg and hover of feedback button

---
 app/(main)/layout.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/(main)/layout.tsx b/app/(main)/layout.tsx
index c5a585fc..328a7785 100644
--- a/app/(main)/layout.tsx
+++ b/app/(main)/layout.tsx
@@ -41,7 +41,7 @@ const RootLayout = ({
               {children}
               <div className="pt-24">
                 <a
-                  className="bg-background border border-border text-primary rounded-full w-24 h-24 flex flex-col items-center justify-center fixed bottom-4 right-4 md:bottom-12 md:right-12  hover:bg-muted transition-colors duration-300 text-center text-xs font-bold"
+                  className="bg-muted ring ring-border ring-inset text-primary rounded-full w-24 h-24 flex flex-col items-center justify-center fixed bottom-4 right-4 md:bottom-12 md:right-12  hover:bg-muted transition-all duration-500 text-center text-xs font-bold hover:drop-shadow-[0_2px_24px_rgba(234,88,12,0.5)] hover:ring-primary/5"
                   href="https://docs.google.com/forms/d/1Nz-xfu3wxUPniiG0UpLxNkl3dIQi8N5dFeq4bQELhOQ"
                   target="_blank"
                   rel="noopener noreferrer"

From 6beef051f42530e16ef28d658530b42fb87de5e0 Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Thu, 19 Sep 2024 19:54:03 -0400
Subject: [PATCH 085/118] update login/page.test.tsx tests

---
 app/(main)/login/page.test.tsx | 56 +++++++++++++++++-----------------
 app/(main)/login/page.tsx      | 11 +++++--
 2 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/app/(main)/login/page.test.tsx b/app/(main)/login/page.test.tsx
index d69b9a14..7ea58670 100644
--- a/app/(main)/login/page.test.tsx
+++ b/app/(main)/login/page.test.tsx
@@ -1,13 +1,12 @@
-import React, { Dispatch, useState as useStateMock } from 'react';
+import { act } from 'react-dom/test-utils';
 import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import Login from './page';
-import { loginAccount } from '@/api/apiFunctions';
+import React, { useState as useStateMock } from 'react';
 
+const getUser = jest.fn();
 const mockLogin = jest.fn();
 const mockPush = jest.fn();
-const getUser = jest.fn();
 const setIsLoading = jest.fn();
-const setState = jest.fn();
 
 jest.mock('react', () => ({
   ...jest.requireActual('react'),
@@ -42,40 +41,35 @@ jest.mock('../../../context/AuthContextProvider', () => ({
 
 describe('Login', () => {
   const setIsLoading = jest.fn();
-  const useStateMock = (init: any): [unknown, Dispatch<unknown>] => [
-    init,
-    setState,
-  ];
   beforeEach(() => {
     jest.clearAllMocks();
-    jest.spyOn(React, 'useState').mockImplementation(useStateMock);
+    jest
+      .spyOn(React, 'useState')
+      .mockImplementation(() => [false, setIsLoading]);
 
     render(<Login />);
 
+    continueButton = screen.getByTestId('continue-button');
     emailInput = screen.getByTestId('email');
     passwordInput = screen.getByTestId('password');
-    continueButton = screen.getByTestId('continue-button');
   });
-  test('should render the login page', () => {
+  it('should render the login page', () => {
+    expect(continueButton).toBeInTheDocument();
     expect(emailInput).toBeInTheDocument();
     expect(passwordInput).toBeInTheDocument();
-    expect(continueButton).toBeInTheDocument();
   });
 
-  test('should update email state when input value changes', () => {
-    fireEvent.change(emailInput, { target: { value: 'test@example.com' } });
-    expect(emailInput).toHaveValue('test@example.com');
-  });
+  it('should update email and password fields and submit form', async () => {
+    const form = screen.getByTestId('login-form');
 
-  test('should update password state when input value changes', () => {
-    fireEvent.change(passwordInput, { target: { value: 'password123' } });
-    expect(passwordInput).toHaveValue('password123');
-  });
+    await act(async () => {
+      fireEvent.change(emailInput, { target: { value: 'test@example.com' } });
+      fireEvent.change(passwordInput, { target: { value: 'password123' } });
+    });
 
-  test('should call loginAccount function with email and password when continue button is clicked', async () => {
-    fireEvent.change(emailInput, { target: { value: 'test@example.com' } });
-    fireEvent.change(passwordInput, { target: { value: 'password123' } });
-    fireEvent.submit(continueButton);
+    await act(async () => {
+      fireEvent.submit(form);
+    });
 
     await waitFor(() => {
       expect(mockLogin).toHaveBeenCalledTimes(1);
@@ -86,7 +80,7 @@ describe('Login', () => {
     });
   });
 
-  test('redirects to /weeklyPicks when the button is clicked', () => {
+  it('redirects to /weeklyPicks when the button is clicked', () => {
     mockUseAuthContext.isSignedIn = true;
 
     render(<Login />);
@@ -95,12 +89,18 @@ describe('Login', () => {
     mockUseAuthContext.isSignedIn = false;
   });
 
-  test('redirects to /league/all when user navigates to /login', async () => {
+  it('redirects to /league/all when user navigates to /login', async () => {
     mockUseAuthContext.isSignedIn = true;
 
-    render(<Login />);
+    act(() => {
+      render(<Login />);
+    });
 
-    expect(mockPush).toHaveBeenCalledWith('/league/all');
+    await waitFor(() => {
+      expect(mockPush).toHaveBeenCalledWith('/league/all');
+    });
+
+    mockUseAuthContext.isSignedIn = false;
   });
 });
 
diff --git a/app/(main)/login/page.tsx b/app/(main)/login/page.tsx
index 2e438000..b82c51bb 100644
--- a/app/(main)/login/page.tsx
+++ b/app/(main)/login/page.tsx
@@ -8,7 +8,7 @@ import {
   Form,
   FormControl,
   FormField,
-  FormItem, 
+  FormItem,
   FormMessage,
 } from '../../../components/Form/Form';
 import { Input } from '@/components/Input/Input';
@@ -123,6 +123,7 @@ const Login = (): React.JSX.Element => {
           <form
             id="input-container"
             className="grid gap-3"
+            data-testid="login-form"
             onSubmit={form.handleSubmit(onSubmit)}
           >
             <FormField
@@ -169,7 +170,13 @@ const Login = (): React.JSX.Element => {
             />
             <Button
               data-testid="continue-button"
-              label={isLoading ? <LoadingSpinner /> : 'Continue'}
+              label={
+                isLoading ? (
+                  <LoadingSpinner data-testid="loading-spinner" />
+                ) : (
+                  'Continue'
+                )
+              }
               type="submit"
               disabled={!email || !password || isLoading}
             />

From a81040b13ded901b946bd5e4d7ea93827b87b000 Mon Sep 17 00:00:00 2001
From: Ryan Furrer <ryandotfurrer@gmail.com>
Date: Thu, 19 Sep 2024 20:25:14 -0400
Subject: [PATCH 086/118] fix register page tests

---
 app/(main)/register/page.test.tsx | 122 ++++++++++++++----------------
 app/(main)/register/page.tsx      |  10 ++-
 2 files changed, 63 insertions(+), 69 deletions(-)

diff --git a/app/(main)/register/page.test.tsx b/app/(main)/register/page.test.tsx
index 4ce73ff2..4d6e620e 100644
--- a/app/(main)/register/page.test.tsx
+++ b/app/(main)/register/page.test.tsx
@@ -1,24 +1,19 @@
-import {
-  render,
-  screen,
-  fireEvent,
-  waitFor,
-} from '@testing-library/react';
-import React, { Dispatch, useState as useStateMock } from 'react';
-import Register from './page';
-import { registerAccount } from '@/api/apiFunctions';
-import Alert from '@/components/AlertNotification/AlertNotification';
+import { act } from 'react-dom/test-utils';
 import { AlertVariants } from '@/components/AlertNotification/Alerts.enum';
+import { registerAccount } from '@/api/apiFunctions';
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
 import { toast } from 'react-hot-toast';
+import Alert from '@/components/AlertNotification/AlertNotification';
+import React, { useState as useStateMock } from 'react';
+import Register from './page';
 
 const mockLogin = jest.fn();
 const mockPush = jest.fn();
 const setIsLoading = jest.fn();
-const setState = jest.fn();
 
 jest.mock('react', () => ({
   ...jest.requireActual('react'),
-  useState: jest.fn()
+  useState: jest.fn(),
 }));
 
 jest.mock('@/api/apiFunctions', () => ({
@@ -31,17 +26,16 @@ jest.mock('react-hot-toast', () => ({
   },
 }));
 
-let confirmPasswordInput: HTMLElement;
-let continueButton: HTMLElement;
-let emailInput: HTMLElement;
-let passwordInput: HTMLElement;
+let confirmPasswordInput: HTMLElement,
+  continueButton: HTMLElement,
+  emailInput: HTMLElement,
+  passwordInput: HTMLElement;
 
 const mockUseAuthContext = {
   isSignedIn: false,
   login: mockLogin,
 };
 
-// Mock the useRouter and useAuthContext hooks
 jest.mock('next/navigation', () => ({
   useRouter() {
     return {
@@ -57,50 +51,39 @@ jest.mock('../../../context/AuthContextProvider', () => ({
 }));
 
 describe('Register', () => {
-  const setIsLoading = jest.fn();
-  const useStateMock = (init: any): [unknown, Dispatch<unknown>] => [init, setState];
   beforeEach(() => {
     jest.clearAllMocks();
-    jest.spyOn(React, 'useState').mockImplementation(useStateMock);
+    jest
+      .spyOn(React, 'useState')
+      .mockImplementation(() => [false, setIsLoading]);
 
     render(<Register />);
 
-    // Get form elements
-    emailInput = screen.getByTestId('email');
-    passwordInput = screen.getByTestId('password');
     confirmPasswordInput = screen.getByTestId('confirm-password');
     continueButton = screen.getByTestId('continue-button');
+    emailInput = screen.getByTestId('email');
+    passwordInput = screen.getByTestId('password');
   });
 
-  test('should render the register page', () => {
-    expect(emailInput).toBeInTheDocument();
-    expect(passwordInput).toBeInTheDocument();
+  it('should render the register page', () => {
     expect(confirmPasswordInput).toBeInTheDocument();
     expect(continueButton).toBeInTheDocument();
+    expect(emailInput).toBeInTheDocument();
+    expect(passwordInput).toBeInTheDocument();
   });
 
-  test('should update email state when input value changes', () => {
-    fireEvent.change(emailInput, { target: { value: 'rt@example.com' } });
-    expect(emailInput).toHaveValue('rt@example.com');
-  });
-
-  test('should update password state when input value changes', () => {
-    fireEvent.change(passwordInput, { target: { value: 'password123' } });
-    expect(passwordInput).toHaveValue('password123');
-  });
+  it('should update email, password, and confirm password fields and submit form', async () => {
+    const form = screen.getByTestId('register-form');
 
-  test('should update confirmPassword state when input value changes', () => {
-    fireEvent.change(confirmPasswordInput, {
-      target: { value: 'password123' },
+    await act(async () => {
+      fireEvent.change(emailInput, { target: { value: 'rt@example.com' } });
+      fireEvent.change(passwordInput, { target: { value: 'rawr123' } });
+      fireEvent.change(confirmPasswordInput, { target: { value: 'rawr123' } });
     });
-    expect(confirmPasswordInput).toHaveValue('password123');
-  });
 
-  test('should mock registerAccount function with email and password when continue button is clicked', async () => {
-    fireEvent.change(emailInput, { target: { value: 'rt@example.com' } });
-    fireEvent.change(passwordInput, { target: { value: 'rawr123' } });
-    fireEvent.change(confirmPasswordInput, { target: { value: 'rawr123' } });
-    fireEvent.submit(continueButton);
+    await act(async () => {
+      fireEvent.submit(form);
+    });
 
     await waitFor(() => {
       expect(registerAccount).toHaveBeenCalledTimes(1);
@@ -109,15 +92,10 @@ describe('Register', () => {
         password: 'rawr123',
         confirmPassword: 'rawr123',
       });
-      expect(mockLogin).toHaveBeenCalledWith({
-        email: 'rt@example.com',
-        password: 'rawr123',
-        confirmPassword: 'rawr123',
-      });
     });
   });
 
-  test('redirects to /league/all when the button is clicked', async () => {
+  it('redirects to /league/all when the button is clicked', async () => {
     mockUseAuthContext.isSignedIn = true;
 
     render(<Register />);
@@ -129,7 +107,7 @@ describe('Register', () => {
     mockUseAuthContext.isSignedIn = false;
   });
 
-  test('should show success notification upon successful submission', async () => {
+  it('should show success notification upon successful submission', async () => {
     fireEvent.change(emailInput, { target: { value: 'test@test.com' } });
     fireEvent.change(passwordInput, { target: { value: 'pw1234' } });
     fireEvent.change(confirmPasswordInput, { target: { value: 'pw1234' } });
@@ -155,15 +133,23 @@ describe('Register', () => {
     });
   });
 
-  test('should show error notification upon submission failing', async () => {
-    mockLogin.mockImplementationOnce(() =>
-      Promise.reject(new Error('Mock error')),
+  it('should show error notification upon submission failing', async () => {
+    const form = screen.getByTestId('register-form');
+
+    (registerAccount as jest.Mock).mockRejectedValueOnce(
+      new Error('Mock error'),
     );
+    mockLogin.mockRejectedValueOnce(new Error('Mock error'));
 
-    fireEvent.change(emailInput, { target: { value: 'test@test.com' } });
-    fireEvent.change(passwordInput, { target: { value: 'pw1234' } });
-    fireEvent.change(confirmPasswordInput, { target: { value: 'pw1234' } });
-    fireEvent.submit(continueButton);
+    await act(async () => {
+      fireEvent.change(emailInput, { target: { value: 'test@test.com' } });
+      fireEvent.change(passwordInput, { target: { value: 'pw1234' } });
+      fireEvent.change(confirmPasswordInput, { target: { value: 'pw1234' } });
+    });
+
+    await act(async () => {
+      fireEvent.submit(form);
+    });
 
     await waitFor(() => {
       expect(registerAccount).toHaveBeenCalledWith({
@@ -171,17 +157,13 @@ describe('Register', () => {
         password: 'pw1234',
         confirmPassword: 'pw1234',
       });
-      expect(mockLogin).toHaveBeenCalledWith({
-        email: 'test@test.com',
-        password: 'pw1234',
-        confirmPassword: 'pw1234',
-      });
+      expect(mockLogin).not.toHaveBeenCalled();
       expect(toast.custom).toHaveBeenCalledWith(
         <Alert variant={AlertVariants.Error} message="Something went wrong!" />,
       );
     });
   });
-  test('renders Register component in dark mode using global css styles for background and foreground', () => {
+  it('renders Register component in dark mode using global css styles for background and foreground', () => {
     const darkModeSection = screen.getByTestId('dark-mode-section');
 
     expect(darkModeSection).toHaveClass('bg-gradient-to-b');
@@ -190,7 +172,10 @@ describe('Register', () => {
 
 describe('Register loading spinner', () => {
   it('should show the loading spinner', async () => {
-    (useStateMock as jest.Mock).mockImplementation((init: boolean) => [true, setIsLoading]);
+    (useStateMock as jest.Mock).mockImplementation((init: boolean) => [
+      true,
+      setIsLoading,
+    ]);
 
     render(<Register />);
 
@@ -199,7 +184,10 @@ describe('Register loading spinner', () => {
     });
   });
   it('should not show the loading spinner', async () => {
-    (useStateMock as jest.Mock).mockImplementation((init: boolean) => [false, setIsLoading]);
+    (useStateMock as jest.Mock).mockImplementation((init: boolean) => [
+      false,
+      setIsLoading,
+    ]);
 
     render(<Register />);
 
diff --git a/app/(main)/register/page.tsx b/app/(main)/register/page.tsx
index b9a512f7..784bbac5 100644
--- a/app/(main)/register/page.tsx
+++ b/app/(main)/register/page.tsx
@@ -121,7 +121,6 @@ const Register = (): JSX.Element => {
       toast.custom(
         <Alert variant={AlertVariants.Error} message="Something went wrong!" />,
       );
-      throw new Error('An error occurred while registering your account');
     } finally {
       setIsLoading(false);
     }
@@ -159,6 +158,7 @@ const Register = (): JSX.Element => {
           <form
             id="input-container"
             className="grid gap-3"
+            data-testid="register-form"
             onSubmit={form.handleSubmit(onSubmit)}
           >
             <FormField
@@ -227,7 +227,13 @@ const Register = (): JSX.Element => {
 
             <Button
               data-testid="continue-button"
-              label={isLoading ? <LoadingSpinner /> : 'Continue'}
+              label={
+                isLoading ? (
+                  <LoadingSpinner data-testid="loading-spinner" />
+                ) : (
+                  'Continue'
+                )
+              }
               type="submit"
               disabled={isDisabled}
             />

From fdaae4f0912ebeddb9013575cf2838a8be86a53f Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Thu, 19 Sep 2024 20:32:51 -0400
Subject: [PATCH 087/118] initial fix without tests

---
 .../[leagueId]/entry/[entryId]/week/Week.tsx  | 22 ++++++++++-------
 components/LeagueEntries/LeagueEntries.tsx    | 24 ++++++++++++-------
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
index e21c358b..3552a540 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
@@ -298,14 +298,20 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
                           ? 'CURRENT'
                           : `WEEK ${index + 1}`}
                       </span>
-                      <Image
-                        className="league-entry-logo"
-                        width={64}
-                        height={64}
-                        data-testid="league-history-logo"
-                        src={logoURL}
-                        alt="teamLogo"
-                      />
+                      {logoURL ? (
+                        <Image
+                          className="league-entry-logo"
+                          width={64}
+                          height={64}
+                          data-testid="league-history-logo"
+                          src={logoURL}
+                          alt="teamLogo"
+                        />
+                      ) : (
+                        <span className="text-xs h-16 w-16 text-primary pt-6 text-center">
+                          No Pick
+                        </span>
+                      )}
                     </div>
                   );
                 })}
diff --git a/components/LeagueEntries/LeagueEntries.tsx b/components/LeagueEntries/LeagueEntries.tsx
index dad67bed..9b24f78a 100644
--- a/components/LeagueEntries/LeagueEntries.tsx
+++ b/components/LeagueEntries/LeagueEntries.tsx
@@ -59,18 +59,24 @@ const LeagueEntries = ({
         >
           {userPickHistory?.map((logoURL, index) => (
             <div
-              key={logoURL}
+              key={index}
               className="flex flex-col h-[66px] opacity-80 items-center justify-center border border-border px-4 py-1 rounded-lg gap-1"
             >
               <span className="text-xs">WEEK {index + 1}</span>
-              <Image
-                className="league-entry-logo"
-                width={40}
-                height={40}
-                data-testid="league-history-logo"
-                src={logoURL}
-                alt="teamLogo"
-              />
+              {logoURL ? (
+                <Image
+                  className="league-entry-logo"
+                  width={40}
+                  height={40}
+                  data-testid="league-history-logo"
+                  src={logoURL}
+                  alt="teamLogo"
+                />
+              ) : (
+                <span className="text-xs h-10 w-full text-primary pt-2">
+                  No Pick
+                </span>
+              )}
             </div>
           ))}
         </section>

From 42edf0faa05faaeceefd287f4ed8ef049ad528d8 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Thu, 19 Sep 2024 21:03:19 -0400
Subject: [PATCH 088/118] fix test for no pick

---
 .../entry/[entryId]/week/Week.test.tsx        | 43 +++++++++++++++++++
 .../[leagueId]/entry/[entryId]/week/Week.tsx  |  5 ++-
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
index be083644..1ffeb5cd 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
@@ -261,6 +261,49 @@ describe('League Week Picks', () => {
       '/_next/image?url=https%3A%2F%2Fexample.com%2Fbrowns.png&w=128&q=75',
     );
   });
+  it('should show previous week pick as no pick if there is no history of selected teams', async () => {
+    mockUseAuthContext.isSignedIn = true;
+    const mockWeek = '2';
+    (getCurrentUserEntries as jest.Mock).mockResolvedValue([
+      {
+        $id: '123',
+        name: 'Entry 1',
+        user: '123',
+        league: '123',
+        selectedTeams: ['', 'Browns'],
+        eliminated: false,
+      },
+    ]);
+
+    render(
+      <Week
+        entry={entry}
+        league={league}
+        NFLTeams={NFLTeams}
+        week={mockWeek}
+      />,
+    );
+
+    await waitFor(
+      () => {
+        expect(screen.getByTestId('weekly-picks')).toBeInTheDocument();
+      },
+      { timeout: 5000 },
+    );
+
+    expect(screen.getByTestId('user-pick-history')).toBeInTheDocument();
+    expect(screen.getByTestId('user-pick-history')).toHaveTextContent(
+      'No Pick',
+    );
+
+    expect(screen.getByTestId('no-pick')).toBeInTheDocument();
+    const userPickHistoryLogos = screen.queryAllByTestId('league-history-logo');
+    expect(userPickHistoryLogos).toHaveLength(1);
+    expect(userPickHistoryLogos[0]).toHaveAttribute(
+      'src',
+      '/_next/image?url=https%3A%2F%2Fexample.com%2Fbrowns.png&w=128&q=75',
+    );
+  });
 
   xit('should show success notification after changing your team pick', async () => {
     (createWeeklyPicks as jest.Mock).mockResolvedValue({});
diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
index 3552a540..f64ab02e 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
@@ -308,7 +308,10 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
                           alt="teamLogo"
                         />
                       ) : (
-                        <span className="text-xs h-16 w-16 text-primary pt-6 text-center">
+                        <span
+                          className="text-xs h-16 w-16 text-primary pt-6 text-center"
+                          data-testid="no-pick"
+                        >
                           No Pick
                         </span>
                       )}

From b732f6178222dd10702de1a2392f6375794e0f67 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Thu, 19 Sep 2024 21:16:51 -0400
Subject: [PATCH 089/118] fix test for no pick on league entry card

---
 .../[leagueId]/entry/[entryId]/week/Week.tsx  |  2 +-
 .../LeagueEntries/LeagueEntries.test.tsx      | 29 +++++++++++++++++++
 components/LeagueEntries/LeagueEntries.tsx    |  7 +++--
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
index f64ab02e..f441f8ee 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
@@ -285,7 +285,7 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
 
                   return (
                     <div
-                      key={`${logoURL}-${index + 1}`}
+                      key={`${logoURL ? logoURL : 'no-pick'}-${index + 1}`}
                       className={cn(
                         'flex flex-col items-center justify-center border p-2 rounded-lg gap-1',
                         isCurrentWeek && hasCurrentWeekPick
diff --git a/components/LeagueEntries/LeagueEntries.test.tsx b/components/LeagueEntries/LeagueEntries.test.tsx
index a84829bd..f8f99581 100644
--- a/components/LeagueEntries/LeagueEntries.test.tsx
+++ b/components/LeagueEntries/LeagueEntries.test.tsx
@@ -113,4 +113,33 @@ describe('LeagueEntries', () => {
       '/_next/image?url=%2Fteam-a-logo.png&w=96&q=75',
     );
   });
+  it('renders no pick when a previous week pick is not available', () => {
+    const teamLogoUrl = 'https://example.com/logo.png';
+    const linkUrl = '/change-pick';
+
+    render(
+      <LeagueEntries
+        entryName="Entry 2"
+        isPickSet={true}
+        linkUrl={linkUrl}
+        selectedTeamLogo={teamLogoUrl}
+        userPickHistory={['', '/team-a-logo.png']}
+      />,
+    );
+
+    const leagueEntryLogo = screen.getByTestId('league-entry-logo');
+    const noPick = screen.getByTestId('no-pick');
+
+    expect(leagueEntryLogo).toBeInTheDocument();
+    expect(leagueEntryLogo).toHaveAttribute(
+      'src',
+      '/_next/image?url=https%3A%2F%2Fexample.com%2Flogo.png&w=96&q=75',
+    );
+    expect(screen.getByTestId('league-history-logo')).toHaveAttribute(
+      'src',
+      '/_next/image?url=%2Fteam-a-logo.png&w=96&q=75',
+    );
+    expect(noPick).toBeInTheDocument();
+    expect(noPick).toHaveTextContent('No Pick');
+  });
 });
diff --git a/components/LeagueEntries/LeagueEntries.tsx b/components/LeagueEntries/LeagueEntries.tsx
index 9b24f78a..9b98d80e 100644
--- a/components/LeagueEntries/LeagueEntries.tsx
+++ b/components/LeagueEntries/LeagueEntries.tsx
@@ -59,7 +59,7 @@ const LeagueEntries = ({
         >
           {userPickHistory?.map((logoURL, index) => (
             <div
-              key={index}
+              key={`${logoURL ? logoURL : 'no-pick'}-${index + 1}`}
               className="flex flex-col h-[66px] opacity-80 items-center justify-center border border-border px-4 py-1 rounded-lg gap-1"
             >
               <span className="text-xs">WEEK {index + 1}</span>
@@ -73,7 +73,10 @@ const LeagueEntries = ({
                   alt="teamLogo"
                 />
               ) : (
-                <span className="text-xs h-10 w-full text-primary pt-2">
+                <span
+                  className="text-xs h-10 w-full text-primary pt-2"
+                  data-testid="no-pick"
+                >
                   No Pick
                 </span>
               )}

From dff9b7814262c2aa201a92ffd9eda48f64518ffc Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Fri, 20 Sep 2024 10:49:57 -0400
Subject: [PATCH 090/118] fix jennifer comments

---
 .../entry/[entryId]/week/Week.test.tsx        | 27 +++++++------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
index 1ffeb5cd..893e629f 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
@@ -184,12 +184,9 @@ describe('League Week Picks', () => {
     );
 
     // Wait for the main content to be displayed
-    await waitFor(
-      () => {
-        expect(screen.getByTestId('weekly-picks')).toBeInTheDocument();
-      },
-      { timeout: 5000 },
-    );
+    await waitFor(() => {
+      expect(screen.getByTestId('weekly-picks')).toBeInTheDocument();
+    });
 
     expect(screen.queryByTestId('global-spinner')).not.toBeInTheDocument();
   });
@@ -241,12 +238,9 @@ describe('League Week Picks', () => {
       />,
     );
 
-    await waitFor(
-      () => {
-        expect(screen.getByTestId('weekly-picks')).toBeInTheDocument();
-      },
-      { timeout: 5000 },
-    );
+    await waitFor(() => {
+      expect(screen.getByTestId('weekly-picks')).toBeInTheDocument();
+    });
 
     expect(screen.getByTestId('user-pick-history')).toBeInTheDocument();
 
@@ -284,12 +278,9 @@ describe('League Week Picks', () => {
       />,
     );
 
-    await waitFor(
-      () => {
-        expect(screen.getByTestId('weekly-picks')).toBeInTheDocument();
-      },
-      { timeout: 5000 },
-    );
+    await waitFor(() => {
+      expect(screen.getByTestId('weekly-picks')).toBeInTheDocument();
+    });
 
     expect(screen.getByTestId('user-pick-history')).toBeInTheDocument();
     expect(screen.getByTestId('user-pick-history')).toHaveTextContent(

From 0c793717efa7c47df764f02c7f8758a3da08f0d7 Mon Sep 17 00:00:00 2001
From: Alex Appleget <alexappleget2014@gmail.com>
Date: Fri, 20 Sep 2024 11:29:22 -0500
Subject: [PATCH 091/118] Fix: Edited UI to say 8 characters instead of 6 for
 password input.

---
 app/(main)/account/recovery/page.tsx | 4 ++--
 app/(main)/login/page.tsx            | 2 +-
 app/(main)/register/page.tsx         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/(main)/account/recovery/page.tsx b/app/(main)/account/recovery/page.tsx
index 5fabd1fa..bee67d5b 100644
--- a/app/(main)/account/recovery/page.tsx
+++ b/app/(main)/account/recovery/page.tsx
@@ -38,11 +38,11 @@ const ResetPasswordSchema = z
     password: z
       .string()
       .min(1, { message: 'Please enter a password' })
-      .min(6, { message: 'Password must be at least 6 characters' }),
+      .min(6, { message: 'Password must be at least 8 characters' }),
     confirmPassword: z
       .string()
       .min(1, { message: 'Please confirm your password' })
-      .min(6, { message: 'Password must be at least 6 characters' }),
+      .min(6, { message: 'Password must be at least 8 characters' }),
   })
   .refine((data) => data.password === data.confirmPassword, {
     message: "Passwords don't match",
diff --git a/app/(main)/login/page.tsx b/app/(main)/login/page.tsx
index b82c51bb..5d2fa789 100644
--- a/app/(main)/login/page.tsx
+++ b/app/(main)/login/page.tsx
@@ -40,7 +40,7 @@ const LoginUserSchema = z.object({
   password: z
     .string()
     .min(1, { message: 'Please enter a password' })
-    .min(6, { message: 'Password must be at least 6 characters' }),
+    .min(6, { message: 'Password must be at least 8 characters' }),
 });
 
 type LoginUserSchemaType = z.infer<typeof LoginUserSchema>;
diff --git a/app/(main)/register/page.tsx b/app/(main)/register/page.tsx
index 784bbac5..a4352ad4 100644
--- a/app/(main)/register/page.tsx
+++ b/app/(main)/register/page.tsx
@@ -35,11 +35,11 @@ const RegisterUserSchema = z
     password: z
       .string()
       .min(1, { message: 'Please enter a password' })
-      .min(6, { message: 'Password must be at least 6 characters' }),
+      .min(6, { message: 'Password must be at least 8 characters' }),
     confirmPassword: z
       .string()
       .min(1, { message: 'Please confirm your password' })
-      .min(6, { message: 'Password must be at least 6 characters' }),
+      .min(6, { message: 'Password must be at least 8 characters' }),
   })
   .refine((data) => data.password === data.confirmPassword, {
     message: "Passwords don't match",

From 9f5b2bdbd5c5272fac0d9239810e0c9c5548e1b8 Mon Sep 17 00:00:00 2001
From: Alex Appleget <alexappleget2014@gmail.com>
Date: Fri, 20 Sep 2024 12:14:55 -0500
Subject: [PATCH 092/118] Fix: Changed min from 6 to 8

---
 app/(main)/account/recovery/page.tsx | 4 ++--
 app/(main)/login/page.tsx            | 2 +-
 app/(main)/register/page.tsx         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/(main)/account/recovery/page.tsx b/app/(main)/account/recovery/page.tsx
index bee67d5b..aba1469d 100644
--- a/app/(main)/account/recovery/page.tsx
+++ b/app/(main)/account/recovery/page.tsx
@@ -38,11 +38,11 @@ const ResetPasswordSchema = z
     password: z
       .string()
       .min(1, { message: 'Please enter a password' })
-      .min(6, { message: 'Password must be at least 8 characters' }),
+      .min(8, { message: 'Password must be at least 8 characters' }),
     confirmPassword: z
       .string()
       .min(1, { message: 'Please confirm your password' })
-      .min(6, { message: 'Password must be at least 8 characters' }),
+      .min(8, { message: 'Password must be at least 8 characters' }),
   })
   .refine((data) => data.password === data.confirmPassword, {
     message: "Passwords don't match",
diff --git a/app/(main)/login/page.tsx b/app/(main)/login/page.tsx
index 5d2fa789..7aa5d925 100644
--- a/app/(main)/login/page.tsx
+++ b/app/(main)/login/page.tsx
@@ -40,7 +40,7 @@ const LoginUserSchema = z.object({
   password: z
     .string()
     .min(1, { message: 'Please enter a password' })
-    .min(6, { message: 'Password must be at least 8 characters' }),
+    .min(8, { message: 'Password must be at least 8 characters' }),
 });
 
 type LoginUserSchemaType = z.infer<typeof LoginUserSchema>;
diff --git a/app/(main)/register/page.tsx b/app/(main)/register/page.tsx
index a4352ad4..4d1b8e8d 100644
--- a/app/(main)/register/page.tsx
+++ b/app/(main)/register/page.tsx
@@ -35,11 +35,11 @@ const RegisterUserSchema = z
     password: z
       .string()
       .min(1, { message: 'Please enter a password' })
-      .min(6, { message: 'Password must be at least 8 characters' }),
+      .min(8, { message: 'Password must be at least 8 characters' }),
     confirmPassword: z
       .string()
       .min(1, { message: 'Please confirm your password' })
-      .min(6, { message: 'Password must be at least 8 characters' }),
+      .min(8, { message: 'Password must be at least 8 characters' }),
   })
   .refine((data) => data.password === data.confirmPassword, {
     message: "Passwords don't match",

From 1f48c04767b0496ca4656d71f542ece8eed3f932 Mon Sep 17 00:00:00 2001
From: Alex Appleget <alexappleget2014@gmail.com>
Date: Fri, 20 Sep 2024 12:27:34 -0500
Subject: [PATCH 093/118] Fix: Fixed tests after updating min password to 8.

---
 app/(main)/register/page.test.tsx | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/(main)/register/page.test.tsx b/app/(main)/register/page.test.tsx
index 4d6e620e..e03874c0 100644
--- a/app/(main)/register/page.test.tsx
+++ b/app/(main)/register/page.test.tsx
@@ -77,8 +77,8 @@ describe('Register', () => {
 
     await act(async () => {
       fireEvent.change(emailInput, { target: { value: 'rt@example.com' } });
-      fireEvent.change(passwordInput, { target: { value: 'rawr123' } });
-      fireEvent.change(confirmPasswordInput, { target: { value: 'rawr123' } });
+      fireEvent.change(passwordInput, { target: { value: 'rawr1234' } });
+      fireEvent.change(confirmPasswordInput, { target: { value: 'rawr1234' } });
     });
 
     await act(async () => {
@@ -89,8 +89,8 @@ describe('Register', () => {
       expect(registerAccount).toHaveBeenCalledTimes(1);
       expect(registerAccount).toHaveBeenCalledWith({
         email: 'rt@example.com',
-        password: 'rawr123',
-        confirmPassword: 'rawr123',
+        password: 'rawr1234',
+        confirmPassword: 'rawr1234',
       });
     });
   });
@@ -109,20 +109,20 @@ describe('Register', () => {
 
   it('should show success notification upon successful submission', async () => {
     fireEvent.change(emailInput, { target: { value: 'test@test.com' } });
-    fireEvent.change(passwordInput, { target: { value: 'pw1234' } });
-    fireEvent.change(confirmPasswordInput, { target: { value: 'pw1234' } });
+    fireEvent.change(passwordInput, { target: { value: 'pw123456' } });
+    fireEvent.change(confirmPasswordInput, { target: { value: 'pw123456' } });
     fireEvent.submit(continueButton);
 
     await waitFor(() => {
       expect(registerAccount).toHaveBeenCalledWith({
         email: 'test@test.com',
-        password: 'pw1234',
-        confirmPassword: 'pw1234',
+        password: 'pw123456',
+        confirmPassword: 'pw123456',
       });
       expect(mockLogin).toHaveBeenCalledWith({
         email: 'test@test.com',
-        password: 'pw1234',
-        confirmPassword: 'pw1234',
+        password: 'pw123456',
+        confirmPassword: 'pw123456',
       });
       expect(toast.custom).toHaveBeenCalledWith(
         <Alert
@@ -143,8 +143,8 @@ describe('Register', () => {
 
     await act(async () => {
       fireEvent.change(emailInput, { target: { value: 'test@test.com' } });
-      fireEvent.change(passwordInput, { target: { value: 'pw1234' } });
-      fireEvent.change(confirmPasswordInput, { target: { value: 'pw1234' } });
+      fireEvent.change(passwordInput, { target: { value: 'pw123456' } });
+      fireEvent.change(confirmPasswordInput, { target: { value: 'pw123456' } });
     });
 
     await act(async () => {
@@ -154,8 +154,8 @@ describe('Register', () => {
     await waitFor(() => {
       expect(registerAccount).toHaveBeenCalledWith({
         email: 'test@test.com',
-        password: 'pw1234',
-        confirmPassword: 'pw1234',
+        password: 'pw123456',
+        confirmPassword: 'pw123456',
       });
       expect(mockLogin).not.toHaveBeenCalled();
       expect(toast.custom).toHaveBeenCalledWith(

From 2ba7abd1ea796d9c4e5a98ae407a7d05c53b49ad Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Fri, 20 Sep 2024 17:15:22 -0400
Subject: [PATCH 094/118] build: update app version to 0.4.0-alpha

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index fa63a145..d7c25669 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "0.3.1",
+  "version": "0.4.0",
   "scripts": {
     "dev": "next dev",
     "build": "next build",
@@ -79,4 +79,4 @@
     "ts-node": "^10.9.2",
     "typescript": "5.1.3"
   }
-}
\ No newline at end of file
+}

From cb4a6d216fe77e01e57ee4d344f94e6fa35700aa Mon Sep 17 00:00:00 2001
From: Shashi Lo <362527+shashilo@users.noreply.github.com>
Date: Sun, 22 Sep 2024 13:37:46 -0500
Subject: [PATCH 095/118] Temporary locked picking a team (#557)

---
 .../entry/[entryId]/week/Week.test.tsx        |   2 +-
 .../[leagueId]/entry/[entryId]/week/Week.tsx  | 102 ++----------------
 2 files changed, 11 insertions(+), 93 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
index 893e629f..386b2fba 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
@@ -119,7 +119,7 @@ const updatedWeeklyPicks = {
   },
 };
 
-describe('League Week Picks', () => {
+xdescribe('League Week Picks', () => {
   const setUserPick = jest.fn();
   const updateWeeklyPicks = jest.fn();
   const mockGetNFLTeamLogo = getNFLTeamLogo as jest.Mock;
diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
index f441f8ee..abcecdff 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
@@ -24,16 +24,13 @@ import {
 import { ILeague } from '@/api/apiFunctions.interface';
 import WeekTeams from './WeekTeams';
 import GlobalSpinner from '@/components/GlobalSpinner/GlobalSpinner';
-import { onWeeklyPickChange } from './WeekHelper';
 import Alert from '@/components/AlertNotification/AlertNotification';
 import { AlertVariants } from '@/components/AlertNotification/Alerts.enum';
 import { NFLTeams } from '@/api/apiFunctions.enum';
 import { useAuthContext } from '@/context/AuthContextProvider';
-import { cn, getNFLTeamLogo } from '@/utils/utils';
-import Image from 'next/image';
-import { useRouter } from 'next/navigation';
 import LinkCustom from '@/components/LinkCustom/LinkCustom';
 import { ChevronLeft } from 'lucide-react';
+import toast from 'react-hot-toast';
 
 /**
  * Renders the weekly picks page.
@@ -42,7 +39,6 @@ import { ChevronLeft } from 'lucide-react';
  */
 // eslint-disable-next-line no-unused-vars
 const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
-  const [pickHistory, setPickHistory] = useState<string[]>([]);
   const [error, setError] = useState<string | null>(null);
   const [schedule, setSchedule] = useState<ISchedule[]>([]);
   const [selectedLeague, setSelectedLeague] = useState<ILeague | undefined>();
@@ -52,7 +48,6 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
   const { user, updateCurrentWeek, updateWeeklyPicks, weeklyPicks } =
     useDataStore((state) => state);
   const { isSignedIn } = useAuthContext();
-  const router = useRouter();
 
   /**
    * Fetches the current game week.
@@ -136,37 +131,8 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
         setSchedule(scheduleData.events);
       }
     } catch (error) {
+      console.error('Could not load week data:', error);
       setError('Could not load week data.');
-      throw error;
-    }
-  };
-
-  /**
-   * Fetches all entries for the current user.
-   * @returns {Promise<void>}
-   */
-  const getPickHistory = async (): Promise<void> => {
-    const entryId: string = entry;
-
-    try {
-      const entries = await getCurrentUserEntries(user.id, league);
-      const currentEntry = entries.find((entry) => entry.$id === entryId);
-
-      if (!currentEntry) {
-        throw new Error('Entry not found');
-      }
-
-      let entryHistory = currentEntry?.selectedTeams || [];
-
-      if (currentEntry?.selectedTeams.length > 0) {
-        entryHistory = entryHistory.map((teamName) =>
-          getNFLTeamLogo(NFLTeams, teamName),
-        );
-      }
-
-      setPickHistory(entryHistory);
-    } catch (error) {
-      throw new Error("Error fetching user's pick history");
     } finally {
       setLoadingData(false);
     }
@@ -215,9 +181,13 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
     };
 
     try {
-      await onWeeklyPickChange(params);
-      setUserPick(teamSelect);
-      router.push(`/league/${league}/entry/all`);
+      toast.custom(
+        <Alert
+          variant={AlertVariants.Error}
+          message={`Team selection has been locked for the week!`}
+        />,
+      );
+      console.error(params);
     } catch (error) {
       console.error('Submission error:', error);
     }
@@ -236,7 +206,6 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
       getCurrentGameWeek();
       getUserSelectedTeams();
       getUserWeeklyPick();
-      getPickHistory();
     }
   }, [isSignedIn]);
 
@@ -265,62 +234,11 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
               {selectedLeague?.leagueName as string}
             </LinkCustom>
           </nav>
-          <section
-            className="flex flex-col items-center w-full pt-8"
-            data-testid="weekly-picks"
-          >
+          <section className="w-full pt-8" data-testid="weekly-picks">
             <h1 className="pb-8 text-center text-[2rem] font-bold text-foreground">
               Week {week} pick
             </h1>
 
-            {pickHistory.length > 0 && (
-              <section
-                className="flex flex-wrap w-[90%] gap-4 overflow-x-scroll justify-center pb-10 items-center"
-                data-testid="user-pick-history"
-              >
-                {pickHistory?.map((logoURL, index) => {
-                  const isCurrentWeek = index === pickHistory.length - 1;
-                  const hasCurrentWeekPick =
-                    pickHistory.length === Number(week);
-
-                  return (
-                    <div
-                      key={`${logoURL ? logoURL : 'no-pick'}-${index + 1}`}
-                      className={cn(
-                        'flex flex-col items-center justify-center border p-2 rounded-lg gap-1',
-                        isCurrentWeek && hasCurrentWeekPick
-                          ? 'border-primary'
-                          : 'border-border opacity-80',
-                      )}
-                    >
-                      <span className="text-sm">
-                        {isCurrentWeek && hasCurrentWeekPick
-                          ? 'CURRENT'
-                          : `WEEK ${index + 1}`}
-                      </span>
-                      {logoURL ? (
-                        <Image
-                          className="league-entry-logo"
-                          width={64}
-                          height={64}
-                          data-testid="league-history-logo"
-                          src={logoURL}
-                          alt="teamLogo"
-                        />
-                      ) : (
-                        <span
-                          className="text-xs h-16 w-16 text-primary pt-6 text-center"
-                          data-testid="no-pick"
-                        >
-                          No Pick
-                        </span>
-                      )}
-                    </div>
-                  );
-                })}
-              </section>
-            )}
-
             <FormProvider {...form}>
               <form className="mx-auto flex w-[90%] max-w-3xl flex-col items-center">
                 <FormField

From 78d6060f6e7234cbaaeba888c39c9ec9ff07124a Mon Sep 17 00:00:00 2001
From: Shashi Lo <362527+shashilo@users.noreply.github.com>
Date: Sun, 22 Sep 2024 13:41:25 -0500
Subject: [PATCH 096/118] Update package.json to 0.4.1 (#558)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d7c25669..69391057 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "0.4.0",
+  "version": "0.4.1",
   "scripts": {
     "dev": "next dev",
     "build": "next build",

From e2412762e83ba4db5a8c8515baf3c24476496938 Mon Sep 17 00:00:00 2001
From: Shashi Lo <362527+shashilo@users.noreply.github.com>
Date: Sun, 22 Sep 2024 13:44:57 -0500
Subject: [PATCH 097/118] Release 0.4.1 (#559)

---
 .../entry/[entryId]/week/Week.test.tsx        |   2 +-
 .../[leagueId]/entry/[entryId]/week/Week.tsx  | 102 ++----------------
 package.json                                  |   2 +-
 3 files changed, 12 insertions(+), 94 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
index 893e629f..386b2fba 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
@@ -119,7 +119,7 @@ const updatedWeeklyPicks = {
   },
 };
 
-describe('League Week Picks', () => {
+xdescribe('League Week Picks', () => {
   const setUserPick = jest.fn();
   const updateWeeklyPicks = jest.fn();
   const mockGetNFLTeamLogo = getNFLTeamLogo as jest.Mock;
diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
index f441f8ee..abcecdff 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
@@ -24,16 +24,13 @@ import {
 import { ILeague } from '@/api/apiFunctions.interface';
 import WeekTeams from './WeekTeams';
 import GlobalSpinner from '@/components/GlobalSpinner/GlobalSpinner';
-import { onWeeklyPickChange } from './WeekHelper';
 import Alert from '@/components/AlertNotification/AlertNotification';
 import { AlertVariants } from '@/components/AlertNotification/Alerts.enum';
 import { NFLTeams } from '@/api/apiFunctions.enum';
 import { useAuthContext } from '@/context/AuthContextProvider';
-import { cn, getNFLTeamLogo } from '@/utils/utils';
-import Image from 'next/image';
-import { useRouter } from 'next/navigation';
 import LinkCustom from '@/components/LinkCustom/LinkCustom';
 import { ChevronLeft } from 'lucide-react';
+import toast from 'react-hot-toast';
 
 /**
  * Renders the weekly picks page.
@@ -42,7 +39,6 @@ import { ChevronLeft } from 'lucide-react';
  */
 // eslint-disable-next-line no-unused-vars
 const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
-  const [pickHistory, setPickHistory] = useState<string[]>([]);
   const [error, setError] = useState<string | null>(null);
   const [schedule, setSchedule] = useState<ISchedule[]>([]);
   const [selectedLeague, setSelectedLeague] = useState<ILeague | undefined>();
@@ -52,7 +48,6 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
   const { user, updateCurrentWeek, updateWeeklyPicks, weeklyPicks } =
     useDataStore((state) => state);
   const { isSignedIn } = useAuthContext();
-  const router = useRouter();
 
   /**
    * Fetches the current game week.
@@ -136,37 +131,8 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
         setSchedule(scheduleData.events);
       }
     } catch (error) {
+      console.error('Could not load week data:', error);
       setError('Could not load week data.');
-      throw error;
-    }
-  };
-
-  /**
-   * Fetches all entries for the current user.
-   * @returns {Promise<void>}
-   */
-  const getPickHistory = async (): Promise<void> => {
-    const entryId: string = entry;
-
-    try {
-      const entries = await getCurrentUserEntries(user.id, league);
-      const currentEntry = entries.find((entry) => entry.$id === entryId);
-
-      if (!currentEntry) {
-        throw new Error('Entry not found');
-      }
-
-      let entryHistory = currentEntry?.selectedTeams || [];
-
-      if (currentEntry?.selectedTeams.length > 0) {
-        entryHistory = entryHistory.map((teamName) =>
-          getNFLTeamLogo(NFLTeams, teamName),
-        );
-      }
-
-      setPickHistory(entryHistory);
-    } catch (error) {
-      throw new Error("Error fetching user's pick history");
     } finally {
       setLoadingData(false);
     }
@@ -215,9 +181,13 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
     };
 
     try {
-      await onWeeklyPickChange(params);
-      setUserPick(teamSelect);
-      router.push(`/league/${league}/entry/all`);
+      toast.custom(
+        <Alert
+          variant={AlertVariants.Error}
+          message={`Team selection has been locked for the week!`}
+        />,
+      );
+      console.error(params);
     } catch (error) {
       console.error('Submission error:', error);
     }
@@ -236,7 +206,6 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
       getCurrentGameWeek();
       getUserSelectedTeams();
       getUserWeeklyPick();
-      getPickHistory();
     }
   }, [isSignedIn]);
 
@@ -265,62 +234,11 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
               {selectedLeague?.leagueName as string}
             </LinkCustom>
           </nav>
-          <section
-            className="flex flex-col items-center w-full pt-8"
-            data-testid="weekly-picks"
-          >
+          <section className="w-full pt-8" data-testid="weekly-picks">
             <h1 className="pb-8 text-center text-[2rem] font-bold text-foreground">
               Week {week} pick
             </h1>
 
-            {pickHistory.length > 0 && (
-              <section
-                className="flex flex-wrap w-[90%] gap-4 overflow-x-scroll justify-center pb-10 items-center"
-                data-testid="user-pick-history"
-              >
-                {pickHistory?.map((logoURL, index) => {
-                  const isCurrentWeek = index === pickHistory.length - 1;
-                  const hasCurrentWeekPick =
-                    pickHistory.length === Number(week);
-
-                  return (
-                    <div
-                      key={`${logoURL ? logoURL : 'no-pick'}-${index + 1}`}
-                      className={cn(
-                        'flex flex-col items-center justify-center border p-2 rounded-lg gap-1',
-                        isCurrentWeek && hasCurrentWeekPick
-                          ? 'border-primary'
-                          : 'border-border opacity-80',
-                      )}
-                    >
-                      <span className="text-sm">
-                        {isCurrentWeek && hasCurrentWeekPick
-                          ? 'CURRENT'
-                          : `WEEK ${index + 1}`}
-                      </span>
-                      {logoURL ? (
-                        <Image
-                          className="league-entry-logo"
-                          width={64}
-                          height={64}
-                          data-testid="league-history-logo"
-                          src={logoURL}
-                          alt="teamLogo"
-                        />
-                      ) : (
-                        <span
-                          className="text-xs h-16 w-16 text-primary pt-6 text-center"
-                          data-testid="no-pick"
-                        >
-                          No Pick
-                        </span>
-                      )}
-                    </div>
-                  );
-                })}
-              </section>
-            )}
-
             <FormProvider {...form}>
               <form className="mx-auto flex w-[90%] max-w-3xl flex-col items-center">
                 <FormField
diff --git a/package.json b/package.json
index d7c25669..69391057 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "0.4.0",
+  "version": "0.4.1",
   "scripts": {
     "dev": "next dev",
     "build": "next build",

From 2632711b4558fc6a41a4a8452179faf60ec0f306 Mon Sep 17 00:00:00 2001
From: Shashi Lo <362527+shashilo@users.noreply.github.com>
Date: Tue, 24 Sep 2024 17:11:45 -0500
Subject: [PATCH 098/118] Revert "Temporary locked picking a team" (#562)

Reverts LetsGetTechnical/gridiron-survivor#557
---
 .../entry/[entryId]/week/Week.test.tsx        |   2 +-
 .../[leagueId]/entry/[entryId]/week/Week.tsx  | 102 ++++++++++++++++--
 2 files changed, 93 insertions(+), 11 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
index 386b2fba..893e629f 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
@@ -119,7 +119,7 @@ const updatedWeeklyPicks = {
   },
 };
 
-xdescribe('League Week Picks', () => {
+describe('League Week Picks', () => {
   const setUserPick = jest.fn();
   const updateWeeklyPicks = jest.fn();
   const mockGetNFLTeamLogo = getNFLTeamLogo as jest.Mock;
diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
index abcecdff..f441f8ee 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
@@ -24,13 +24,16 @@ import {
 import { ILeague } from '@/api/apiFunctions.interface';
 import WeekTeams from './WeekTeams';
 import GlobalSpinner from '@/components/GlobalSpinner/GlobalSpinner';
+import { onWeeklyPickChange } from './WeekHelper';
 import Alert from '@/components/AlertNotification/AlertNotification';
 import { AlertVariants } from '@/components/AlertNotification/Alerts.enum';
 import { NFLTeams } from '@/api/apiFunctions.enum';
 import { useAuthContext } from '@/context/AuthContextProvider';
+import { cn, getNFLTeamLogo } from '@/utils/utils';
+import Image from 'next/image';
+import { useRouter } from 'next/navigation';
 import LinkCustom from '@/components/LinkCustom/LinkCustom';
 import { ChevronLeft } from 'lucide-react';
-import toast from 'react-hot-toast';
 
 /**
  * Renders the weekly picks page.
@@ -39,6 +42,7 @@ import toast from 'react-hot-toast';
  */
 // eslint-disable-next-line no-unused-vars
 const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
+  const [pickHistory, setPickHistory] = useState<string[]>([]);
   const [error, setError] = useState<string | null>(null);
   const [schedule, setSchedule] = useState<ISchedule[]>([]);
   const [selectedLeague, setSelectedLeague] = useState<ILeague | undefined>();
@@ -48,6 +52,7 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
   const { user, updateCurrentWeek, updateWeeklyPicks, weeklyPicks } =
     useDataStore((state) => state);
   const { isSignedIn } = useAuthContext();
+  const router = useRouter();
 
   /**
    * Fetches the current game week.
@@ -131,8 +136,37 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
         setSchedule(scheduleData.events);
       }
     } catch (error) {
-      console.error('Could not load week data:', error);
       setError('Could not load week data.');
+      throw error;
+    }
+  };
+
+  /**
+   * Fetches all entries for the current user.
+   * @returns {Promise<void>}
+   */
+  const getPickHistory = async (): Promise<void> => {
+    const entryId: string = entry;
+
+    try {
+      const entries = await getCurrentUserEntries(user.id, league);
+      const currentEntry = entries.find((entry) => entry.$id === entryId);
+
+      if (!currentEntry) {
+        throw new Error('Entry not found');
+      }
+
+      let entryHistory = currentEntry?.selectedTeams || [];
+
+      if (currentEntry?.selectedTeams.length > 0) {
+        entryHistory = entryHistory.map((teamName) =>
+          getNFLTeamLogo(NFLTeams, teamName),
+        );
+      }
+
+      setPickHistory(entryHistory);
+    } catch (error) {
+      throw new Error("Error fetching user's pick history");
     } finally {
       setLoadingData(false);
     }
@@ -181,13 +215,9 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
     };
 
     try {
-      toast.custom(
-        <Alert
-          variant={AlertVariants.Error}
-          message={`Team selection has been locked for the week!`}
-        />,
-      );
-      console.error(params);
+      await onWeeklyPickChange(params);
+      setUserPick(teamSelect);
+      router.push(`/league/${league}/entry/all`);
     } catch (error) {
       console.error('Submission error:', error);
     }
@@ -206,6 +236,7 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
       getCurrentGameWeek();
       getUserSelectedTeams();
       getUserWeeklyPick();
+      getPickHistory();
     }
   }, [isSignedIn]);
 
@@ -234,11 +265,62 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
               {selectedLeague?.leagueName as string}
             </LinkCustom>
           </nav>
-          <section className="w-full pt-8" data-testid="weekly-picks">
+          <section
+            className="flex flex-col items-center w-full pt-8"
+            data-testid="weekly-picks"
+          >
             <h1 className="pb-8 text-center text-[2rem] font-bold text-foreground">
               Week {week} pick
             </h1>
 
+            {pickHistory.length > 0 && (
+              <section
+                className="flex flex-wrap w-[90%] gap-4 overflow-x-scroll justify-center pb-10 items-center"
+                data-testid="user-pick-history"
+              >
+                {pickHistory?.map((logoURL, index) => {
+                  const isCurrentWeek = index === pickHistory.length - 1;
+                  const hasCurrentWeekPick =
+                    pickHistory.length === Number(week);
+
+                  return (
+                    <div
+                      key={`${logoURL ? logoURL : 'no-pick'}-${index + 1}`}
+                      className={cn(
+                        'flex flex-col items-center justify-center border p-2 rounded-lg gap-1',
+                        isCurrentWeek && hasCurrentWeekPick
+                          ? 'border-primary'
+                          : 'border-border opacity-80',
+                      )}
+                    >
+                      <span className="text-sm">
+                        {isCurrentWeek && hasCurrentWeekPick
+                          ? 'CURRENT'
+                          : `WEEK ${index + 1}`}
+                      </span>
+                      {logoURL ? (
+                        <Image
+                          className="league-entry-logo"
+                          width={64}
+                          height={64}
+                          data-testid="league-history-logo"
+                          src={logoURL}
+                          alt="teamLogo"
+                        />
+                      ) : (
+                        <span
+                          className="text-xs h-16 w-16 text-primary pt-6 text-center"
+                          data-testid="no-pick"
+                        >
+                          No Pick
+                        </span>
+                      )}
+                    </div>
+                  );
+                })}
+              </section>
+            )}
+
             <FormProvider {...form}>
               <form className="mx-auto flex w-[90%] max-w-3xl flex-col items-center">
                 <FormField

From f6c90652120e092259139f529ebc4f8dd95ecbcb Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Thu, 26 Sep 2024 11:08:01 -0400
Subject: [PATCH 099/118] fix: update next.config to use images.remotePatterns
 (#532) (#561)

fixes #532

we were using domains which is outdated. next.config now uses
remotePatterns.


[https://nextjs.org/docs/app/building-your-application/optimizing/images#remote-images](https://nextjs.org/docs/app/building-your-application/optimizing/images#remote-images)
---
 next.config.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/next.config.js b/next.config.js
index faeb7f39..6774ae1e 100644
--- a/next.config.js
+++ b/next.config.js
@@ -18,7 +18,12 @@ module.exports = {
     ]
   },
   images: {
-    domains: ['a.espncdn.com'],
+    remotePatterns: [{
+      protocol: 'https',
+      hostname: 'a.espncdn.com',
+      port: '',
+      pathname: '/**',
+    }],
   },
   eslint: {
     ignoreDuringBuilds: false,

From 90add4ad2bbbb99e15d7c0e3bf4d948baadca384 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Thu, 26 Sep 2024 11:13:04 -0400
Subject: [PATCH 100/118] Fix: Password reset email link (#556) (#560)

fixes #556

- production email will now point directly to www.gridironsurvivor.com
without using vercel_env system variables.

Co-authored-by: Shashi Lo <362527+shashilo@users.noreply.github.com>
---
 utils/getBaseUrl.test.ts | 3 +--
 utils/getBaseUrl.ts      | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/utils/getBaseUrl.test.ts b/utils/getBaseUrl.test.ts
index 2a0149ae..33d46f21 100644
--- a/utils/getBaseUrl.test.ts
+++ b/utils/getBaseUrl.test.ts
@@ -3,9 +3,8 @@ import { getBaseURL } from './getBaseUrl';
 describe('getBaseURL', () => {
   it('should return the correct base URL for production', () => {
     process.env.NEXT_PUBLIC_VERCEL_ENV = 'production';
-    process.env.NEXT_PUBLIC_VERCEL_URL = 'production.com';
     const result = getBaseURL();
-    expect(result).toBe('https://production.com');
+    expect(result).toBe('https://www.gridironsurvivor.com');
   });
 
   it('should return the correct base URL for preview', () => {
diff --git a/utils/getBaseUrl.ts b/utils/getBaseUrl.ts
index 5008e735..e86f2256 100644
--- a/utils/getBaseUrl.ts
+++ b/utils/getBaseUrl.ts
@@ -8,7 +8,7 @@
 export const getBaseURL = (): string => {
   // Check for Vercel production environment
   if (process.env.NEXT_PUBLIC_VERCEL_ENV === 'production') {
-    return `https://${process.env.NEXT_PUBLIC_VERCEL_URL}`;
+    return `https://www.gridironsurvivor.com`;
   }
 
   // Check for Vercel preview environment

From d95273469423be164e9008315933122d55cb3a2b Mon Sep 17 00:00:00 2001
From: Richard <66279068+choir27@users.noreply.github.com>
Date: Thu, 26 Sep 2024 11:19:06 -0400
Subject: [PATCH 101/118] Richard/loading team input (#524)

# What does this PR do?

- [X] When a user selects a team, add the global loading spinner so it
shows up in the team's input.
- [X] Disable other teams from being selected until the API responds.
- [X] Unit test for loading spinner being on screen
- [X] Unit test for loading spinner not being on screen

Fixes #513

# Related screenshots/Videos


https://github.com/user-attachments/assets/7396ebcd-da91-4d5b-b498-f39faf0aa529

# Related Issues/PRs

- https://github.com/LetsGetTechnical/gridiron-survivor/issues/513

# Have you spent some time to check if this issue has been raised
before?
Have you Googled for a similar issue or checked our older issues?
- [X] I checked and didn't find similar issue *

---------

Co-authored-by: Shashi Lo <362527+shashilo@users.noreply.github.com>
---
 .../entry/[entryId]/week/Week.interface.ts    |  1 +
 .../[leagueId]/entry/[entryId]/week/Week.tsx  |  3 +
 .../entry/[entryId]/week/WeekHelper.tsx       | 16 ++--
 .../[entryId]/week/WeekTeams.interface.ts     |  3 +-
 .../entry/[entryId]/week/WeekTeams.test.tsx   | 14 +++-
 .../entry/[entryId]/week/WeekTeams.tsx        | 12 ++-
 .../WeeklyPickButton.stories.tsx              |  4 +-
 .../WeeklyPickButton.test.tsx                 | 73 ++++++++++++++-----
 .../WeeklyPickButton/WeeklyPickButton.tsx     | 10 ++-
 9 files changed, 100 insertions(+), 36 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.interface.ts b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.interface.ts
index 38356e44..c4b0c7da 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.interface.ts
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.interface.ts
@@ -23,6 +23,7 @@ export interface IWeeklyPickChange {
   entry: string;
   league: string;
   NFLTeams: INFLTeam[];
+  setLoadingTeamName: React.Dispatch<React.SetStateAction<string | null>>;
   setUserPick: React.Dispatch<React.SetStateAction<string>>;
   updateWeeklyPicks: ({}: IWeeklyPicks) => void;
   user: IUser;
diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
index f441f8ee..cfbbf965 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
@@ -48,6 +48,7 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
   const [selectedLeague, setSelectedLeague] = useState<ILeague | undefined>();
   const [selectedTeams, setSelectedTeams] = useState<string[]>([]);
   const [loadingData, setLoadingData] = useState<boolean>(true);
+  const [loadingTeamName, setLoadingTeamName] = useState<string | null>(null);
   const [userPick, setUserPick] = useState<string>('');
   const { user, updateCurrentWeek, updateWeeklyPicks, weeklyPicks } =
     useDataStore((state) => state);
@@ -207,6 +208,7 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
       entry,
       league,
       NFLTeams,
+      setLoadingTeamName,
       setUserPick,
       updateWeeklyPicks,
       user,
@@ -330,6 +332,7 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
                     <FormItem>
                       <FormControl>
                         <WeekTeams
+                          loadingTeamName={loadingTeamName}
                           schedule={schedule}
                           selectedTeams={selectedTeams}
                           field={field}
diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekHelper.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekHelper.tsx
index 9e3d24f4..75adfa9f 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekHelper.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekHelper.tsx
@@ -25,6 +25,7 @@ import { IWeeklyPickChange } from './Week.interface';
  * @param props.week - Prop value for gameWeekId in updateWeeklyPicks
  * @param props.updateWeeklyPicks - Prop for the updateWeeklyPicks function
  * @param props.setUserPick - Prop for the setUserPick function
+ * @param props.setLoadingTeamName - Prop for the setLoadingTeamName state
  * @returns {void}
  */
 export const onWeeklyPickChange = async ({
@@ -32,6 +33,7 @@ export const onWeeklyPickChange = async ({
   entry,
   league,
   NFLTeams,
+  setLoadingTeamName,
   setUserPick,
   updateWeeklyPicks,
   user,
@@ -39,15 +41,11 @@ export const onWeeklyPickChange = async ({
   week,
 }: IWeeklyPickChange): Promise<void> => {
   try {
-    const selectedTeamName = NFLTeams.find(
-      (team) => team.teamName === teamSelect,
-    )?.teamName;
+    const team = NFLTeams.find((team) => team.teamName === teamSelect);
 
-    const currentUserPick = parseUserPick(
-      user.id,
-      entry,
-      selectedTeamName || '',
-    );
+    setLoadingTeamName(team?.teamId ?? null);
+
+    const currentUserPick = parseUserPick(user.id, entry, team?.teamName || '');
 
     // combines current picks and the user pick into one object.
     // if the user pick exists then it overrides the pick of the user.
@@ -109,5 +107,7 @@ export const onWeeklyPickChange = async ({
         message="There was an error processing your request."
       />,
     );
+  } finally {
+    setLoadingTeamName(null);
   }
 };
diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.interface.ts b/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.interface.ts
index 4ed46818..11350033 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.interface.ts
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.interface.ts
@@ -27,11 +27,12 @@ export interface ISchedule {
 
 export interface IWeekTeamsProps {
   field: ControllerRenderProps<FieldValues, string>;
+  loadingTeamName: string | null;
+  onWeeklyPickChange: ({}: NFLTeams) => Promise<void>;
   schedule: ISchedule[];
   selectedTeams: INFLTeam['teamName'][];
   userPick: string;
   // eslint-disable-next-line no-unused-vars
-  onWeeklyPickChange: (teamSelect: NFLTeams) => Promise<void>;
 }
 
 interface ICompetition {
diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.test.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.test.tsx
index edea111d..a722ac95 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.test.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.test.tsx
@@ -24,11 +24,16 @@ const mockNewUserPick = 'Chiefs';
 const mockOnWeeklyPickChange = jest.fn();
 const mockHasTeamBeenPicked = hasTeamBeenPicked as jest.Mock;
 
-const TestWeekTeamsComponent = () => {
+const TestWeekTeamsComponent = ({
+  loadingTeamName,
+}: {
+  loadingTeamName: string;
+}) => {
   const formMethods = useForm();
   return (
     <FormProvider {...formMethods}>
       <WeekTeams
+        loadingTeamName={loadingTeamName}
         field={mockField}
         schedule={mockSchedule}
         selectedTeams={mockSelectedTeams}
@@ -47,7 +52,7 @@ describe('WeekTeams', () => {
   it('the team should render active and the user currently has them selected', () => {
     mockHasTeamBeenPicked.mockReturnValue(false);
 
-    render(<TestWeekTeamsComponent />);
+    render(<TestWeekTeamsComponent loadingTeamName={''} />);
 
     const weekTeamsRadioItems: HTMLButtonElement[] =
       screen.getAllByTestId('team-radio');
@@ -64,7 +69,7 @@ describe('WeekTeams', () => {
   it('the team should render active and the user should be able to select the team', () => {
     mockHasTeamBeenPicked.mockReturnValue(false);
 
-    render(<TestWeekTeamsComponent />);
+    render(<TestWeekTeamsComponent loadingTeamName={''} />);
     const weeklyPickButtons = screen.getAllByTestId('team-label');
 
     const chiefsButton = weeklyPickButtons.filter(
@@ -82,7 +87,7 @@ describe('WeekTeams', () => {
   it('the team should render disabled if the team has already been used and the user should not be able to select the team', () => {
     mockHasTeamBeenPicked.mockReturnValue(true);
 
-    render(<TestWeekTeamsComponent />);
+    render(<TestWeekTeamsComponent loadingTeamName={''} />);
 
     const weeklyPickButtons: HTMLButtonElement[] =
       screen.getAllByTestId('team-radio');
@@ -94,4 +99,5 @@ describe('WeekTeams', () => {
     expect(packersButton).toBeInTheDocument();
     expect(packersButton).toBeDisabled();
   });
+
 });
diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx
index 2ed9c61f..8f4973e8 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx
@@ -42,6 +42,7 @@ const formatDateTime = (dateString: string): string => {
  * @param props.selectedTeams The user's selected teams.
  * @param props.userPick The user's pick.
  * @param props.onWeeklyPickChange The function to call when the user's pick changes.
+ * @param props.loadingTeamName The loading state for selecting teams.
  * @returns The rendered weekly picks page.
  */
 const WeekTeams = ({
@@ -50,6 +51,7 @@ const WeekTeams = ({
   selectedTeams,
   userPick,
   onWeeklyPickChange,
+  loadingTeamName,
 }: IWeekTeamsProps): JSX.Element => (
   <RadioGroup
     onValueChange={(value: string) => onWeeklyPickChange(value as NFLTeams)}
@@ -76,13 +78,15 @@ const WeekTeams = ({
             <FormItem key={competition.id} className="text-center">
               <FormControl>
                 <WeeklyPickButton
+                  loadingTeamName={loadingTeamName}
+                  selectedTeam={competition.team.shortDisplayName.toLowerCase()}
                   homeAway={competition.homeAway}
                   team={competition.team.name}
                   src={competition.team.logo}
-                  isDisabled={hasTeamBeenPicked(
-                    competition.team.name,
-                    selectedTeams,
-                  )}
+                  isDisabled={
+                    Boolean(loadingTeamName) ||
+                    hasTeamBeenPicked(competition.team.name, selectedTeams)
+                  }
                 />
               </FormControl>
             </FormItem>
diff --git a/components/WeeklyPickButton/WeeklyPickButton.stories.tsx b/components/WeeklyPickButton/WeeklyPickButton.stories.tsx
index 360e0865..d4dcd23f 100644
--- a/components/WeeklyPickButton/WeeklyPickButton.stories.tsx
+++ b/components/WeeklyPickButton/WeeklyPickButton.stories.tsx
@@ -34,7 +34,7 @@ type Story = StoryObj<typeof meta>;
 const withRadioGroup: Decorator = (Story) => (
   <RadioGroup>
     <Story />
-    <WeeklyPickButton homeAway='Home' team="Cowboys" src="/assets/team-logo-placeholder.jpg" />
+    <WeeklyPickButton homeAway='Home' team="Cowboys" src="/assets/team-logo-placeholder.jpg" loadingTeamName={"ravens"} selectedTeam={""} />
   </RadioGroup>
 );
 
@@ -43,6 +43,8 @@ export const Primary: Story = {
     homeAway: 'Home',
     team: 'Ravens',
     src: '/assets/team-logo-placeholder.jpg',
+    loadingTeamName: 'ravens',
+    selectedTeam: '',
   },
   decorators: withRadioGroup,
 };
diff --git a/components/WeeklyPickButton/WeeklyPickButton.test.tsx b/components/WeeklyPickButton/WeeklyPickButton.test.tsx
index e8bb8821..408470b2 100644
--- a/components/WeeklyPickButton/WeeklyPickButton.test.tsx
+++ b/components/WeeklyPickButton/WeeklyPickButton.test.tsx
@@ -12,27 +12,66 @@ const weeklyPickData = {
 };
 
 describe('WeeklyPickButton', () => {
-  it.each(['Home', 'Away'])('renders correctly with homeAway data', (homeAway) => {
-    render(
-      <RadioGroup>
-        <WeeklyPickButton homeAway={homeAway} team={weeklyPickData.team} src={weeklyPickData.src} />
-      </RadioGroup>,
-    );
+  it.each(['Home', 'Away'])(
+    'renders correctly with homeAway data',
+    (homeAway) => {
+      render(
+        <RadioGroup>
+          <WeeklyPickButton
+            loadingTeamName={''}
+            selectedTeam={''}
+            homeAway={homeAway}
+            team={weeklyPickData.team}
+            src={weeklyPickData.src}
+          />
+        </RadioGroup>,
+      );
 
-    const homeAwayLabel = screen.getByTestId('home-away');
-    expect(homeAwayLabel).toBeInTheDocument();
-    expect(homeAwayLabel).toHaveTextContent(homeAway);
+      const homeAwayLabel = screen.getByTestId('home-away');
+      expect(homeAwayLabel).toBeInTheDocument();
+      expect(homeAwayLabel).toHaveTextContent(homeAway);
 
-    const image = screen.getByTestId('team-image');
+      const image = screen.getByTestId('team-image');
 
-    expect(image).toBeInTheDocument();
-    expect(image).toHaveAttribute('src', weeklyPickData.src);
+      expect(image).toBeInTheDocument();
+      expect(image).toHaveAttribute('src', weeklyPickData.src);
 
-    const teamName = screen.getByTestId('team-label');
-    expect(teamName).toBeInTheDocument();
+      const teamName = screen.getByTestId('team-label');
+      expect(teamName).toBeInTheDocument();
 
-    expect(image).toHaveAttribute('width', weeklyPickData.width);
-    expect(image).toHaveAttribute('height', weeklyPickData.height);
-    expect(image).toHaveAttribute('alt', weeklyPickData.alt);
+      expect(image).toHaveAttribute('width', weeklyPickData.width);
+      expect(image).toHaveAttribute('height', weeklyPickData.height);
+      expect(image).toHaveAttribute('alt', weeklyPickData.alt);
+    },
+  );
+
+  it('the loading spinner should display after team selection', () => {
+    render(
+      <RadioGroup>
+        <WeeklyPickButton
+          loadingTeamName={'packers'}
+          selectedTeam={'packers'}
+          homeAway={'Home'}
+          team={weeklyPickData.team}
+          src={weeklyPickData.src}
+        />
+      </RadioGroup>,
+    );
+    expect(screen.queryByTestId('loading-spinner')).toBeInTheDocument();
+  });
+
+  it('the loading spinner should not display after team selection', () => {
+    render(
+      <RadioGroup>
+        <WeeklyPickButton
+          loadingTeamName={''}
+          selectedTeam={'packers'}
+          homeAway={'Home'}
+          team={weeklyPickData.team}
+          src={weeklyPickData.src}
+        />
+      </RadioGroup>,
+    );
+    expect(screen.queryByTestId('loading-spinner')).not.toBeInTheDocument();
   });
 });
diff --git a/components/WeeklyPickButton/WeeklyPickButton.tsx b/components/WeeklyPickButton/WeeklyPickButton.tsx
index dd9fc852..f0dc9380 100644
--- a/components/WeeklyPickButton/WeeklyPickButton.tsx
+++ b/components/WeeklyPickButton/WeeklyPickButton.tsx
@@ -5,12 +5,15 @@ import React, { JSX } from 'react';
 import Image from 'next/image';
 import { Label } from '../Label/Label';
 import { RadioGroupItem } from '../RadioGroup/RadioGroup';
+import LoadingSpinner from '../LoadingSpinner/LoadingSpinner';
 
 type WeeklyPickButtonProps = {
   homeAway: string;
   team: string;
   src: string;
   isDisabled?: boolean;
+  loadingTeamName: string | null;
+  selectedTeam: string;
 };
 
 /**
@@ -20,6 +23,8 @@ type WeeklyPickButtonProps = {
  * @param props.src - The image source
  * @param props.isDisabled - Whether the button is disabled
  * @param props.homeAway - Shows whether the team is home or away.
+ * @param props.loadingTeamName - The loading state for selecting teams.
+ * @param props.selectedTeam - The selected team that the user chose.
  * @returns The rendered weekly pick button.
  */
 const WeeklyPickButton: React.FC<WeeklyPickButtonProps> = ({
@@ -27,6 +32,8 @@ const WeeklyPickButton: React.FC<WeeklyPickButtonProps> = ({
   team,
   src,
   isDisabled = false,
+  loadingTeamName,
+  selectedTeam,
 }): JSX.Element => {
   return (
     <>
@@ -40,6 +47,7 @@ const WeeklyPickButton: React.FC<WeeklyPickButtonProps> = ({
           disabled={isDisabled}
           data-testid="team-radio"
         />
+
         <Label htmlFor={team} data-testid="team-label" disabled={isDisabled}>
           <Image
             src={src}
@@ -50,7 +58,7 @@ const WeeklyPickButton: React.FC<WeeklyPickButtonProps> = ({
             data-testid="team-image"
             className="h-12 w-12"
           />
-          {team}
+          {loadingTeamName === selectedTeam ? <LoadingSpinner /> : <>{team}</>}
         </Label>
       </div>
     </>

From 48b941eb1c3b15f857a3883c5154b374be04afa8 Mon Sep 17 00:00:00 2001
From: Shashi Lo <362527+shashilo@users.noreply.github.com>
Date: Thu, 26 Sep 2024 11:29:32 -0500
Subject: [PATCH 102/118] Update package.json version to 0.4.2 (#564)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 69391057..cdd54c0f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "0.4.1",
+  "version": "0.4.2",
   "scripts": {
     "dev": "next dev",
     "build": "next build",

From c6ca48fe0f9d139d99ac0c37f0ed4e794b2ad77f Mon Sep 17 00:00:00 2001
From: Shashi Lo <362527+shashilo@users.noreply.github.com>
Date: Thu, 26 Sep 2024 14:57:41 -0500
Subject: [PATCH 103/118] Revert "Temporary locked picking a team" (#568)

Reverts LetsGetTechnical/gridiron-survivor#557

From 176b221813ea92481e879b397fa487232d8c62ff Mon Sep 17 00:00:00 2001
From: Shashi Lo <362527+shashilo@users.noreply.github.com>
Date: Thu, 26 Sep 2024 15:03:06 -0500
Subject: [PATCH 104/118] Revert "Temporary locked picking a team" (#570)

Reverts LetsGetTechnical/gridiron-survivor#557
---
 .../entry/[entryId]/week/Week.test.tsx        |   2 +-
 .../[leagueId]/entry/[entryId]/week/Week.tsx  | 102 ++++++++++++++++--
 2 files changed, 93 insertions(+), 11 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
index 386b2fba..893e629f 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
@@ -119,7 +119,7 @@ const updatedWeeklyPicks = {
   },
 };
 
-xdescribe('League Week Picks', () => {
+describe('League Week Picks', () => {
   const setUserPick = jest.fn();
   const updateWeeklyPicks = jest.fn();
   const mockGetNFLTeamLogo = getNFLTeamLogo as jest.Mock;
diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
index ffdcc5af..cfbbf965 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
@@ -24,13 +24,16 @@ import {
 import { ILeague } from '@/api/apiFunctions.interface';
 import WeekTeams from './WeekTeams';
 import GlobalSpinner from '@/components/GlobalSpinner/GlobalSpinner';
+import { onWeeklyPickChange } from './WeekHelper';
 import Alert from '@/components/AlertNotification/AlertNotification';
 import { AlertVariants } from '@/components/AlertNotification/Alerts.enum';
 import { NFLTeams } from '@/api/apiFunctions.enum';
 import { useAuthContext } from '@/context/AuthContextProvider';
+import { cn, getNFLTeamLogo } from '@/utils/utils';
+import Image from 'next/image';
+import { useRouter } from 'next/navigation';
 import LinkCustom from '@/components/LinkCustom/LinkCustom';
 import { ChevronLeft } from 'lucide-react';
-import toast from 'react-hot-toast';
 
 /**
  * Renders the weekly picks page.
@@ -39,6 +42,7 @@ import toast from 'react-hot-toast';
  */
 // eslint-disable-next-line no-unused-vars
 const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
+  const [pickHistory, setPickHistory] = useState<string[]>([]);
   const [error, setError] = useState<string | null>(null);
   const [schedule, setSchedule] = useState<ISchedule[]>([]);
   const [selectedLeague, setSelectedLeague] = useState<ILeague | undefined>();
@@ -49,6 +53,7 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
   const { user, updateCurrentWeek, updateWeeklyPicks, weeklyPicks } =
     useDataStore((state) => state);
   const { isSignedIn } = useAuthContext();
+  const router = useRouter();
 
   /**
    * Fetches the current game week.
@@ -132,8 +137,37 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
         setSchedule(scheduleData.events);
       }
     } catch (error) {
-      console.error('Could not load week data:', error);
       setError('Could not load week data.');
+      throw error;
+    }
+  };
+
+  /**
+   * Fetches all entries for the current user.
+   * @returns {Promise<void>}
+   */
+  const getPickHistory = async (): Promise<void> => {
+    const entryId: string = entry;
+
+    try {
+      const entries = await getCurrentUserEntries(user.id, league);
+      const currentEntry = entries.find((entry) => entry.$id === entryId);
+
+      if (!currentEntry) {
+        throw new Error('Entry not found');
+      }
+
+      let entryHistory = currentEntry?.selectedTeams || [];
+
+      if (currentEntry?.selectedTeams.length > 0) {
+        entryHistory = entryHistory.map((teamName) =>
+          getNFLTeamLogo(NFLTeams, teamName),
+        );
+      }
+
+      setPickHistory(entryHistory);
+    } catch (error) {
+      throw new Error("Error fetching user's pick history");
     } finally {
       setLoadingData(false);
     }
@@ -183,13 +217,9 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
     };
 
     try {
-      toast.custom(
-        <Alert
-          variant={AlertVariants.Error}
-          message={`Team selection has been locked for the week!`}
-        />,
-      );
-      console.error(params);
+      await onWeeklyPickChange(params);
+      setUserPick(teamSelect);
+      router.push(`/league/${league}/entry/all`);
     } catch (error) {
       console.error('Submission error:', error);
     }
@@ -208,6 +238,7 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
       getCurrentGameWeek();
       getUserSelectedTeams();
       getUserWeeklyPick();
+      getPickHistory();
     }
   }, [isSignedIn]);
 
@@ -236,11 +267,62 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
               {selectedLeague?.leagueName as string}
             </LinkCustom>
           </nav>
-          <section className="w-full pt-8" data-testid="weekly-picks">
+          <section
+            className="flex flex-col items-center w-full pt-8"
+            data-testid="weekly-picks"
+          >
             <h1 className="pb-8 text-center text-[2rem] font-bold text-foreground">
               Week {week} pick
             </h1>
 
+            {pickHistory.length > 0 && (
+              <section
+                className="flex flex-wrap w-[90%] gap-4 overflow-x-scroll justify-center pb-10 items-center"
+                data-testid="user-pick-history"
+              >
+                {pickHistory?.map((logoURL, index) => {
+                  const isCurrentWeek = index === pickHistory.length - 1;
+                  const hasCurrentWeekPick =
+                    pickHistory.length === Number(week);
+
+                  return (
+                    <div
+                      key={`${logoURL ? logoURL : 'no-pick'}-${index + 1}`}
+                      className={cn(
+                        'flex flex-col items-center justify-center border p-2 rounded-lg gap-1',
+                        isCurrentWeek && hasCurrentWeekPick
+                          ? 'border-primary'
+                          : 'border-border opacity-80',
+                      )}
+                    >
+                      <span className="text-sm">
+                        {isCurrentWeek && hasCurrentWeekPick
+                          ? 'CURRENT'
+                          : `WEEK ${index + 1}`}
+                      </span>
+                      {logoURL ? (
+                        <Image
+                          className="league-entry-logo"
+                          width={64}
+                          height={64}
+                          data-testid="league-history-logo"
+                          src={logoURL}
+                          alt="teamLogo"
+                        />
+                      ) : (
+                        <span
+                          className="text-xs h-16 w-16 text-primary pt-6 text-center"
+                          data-testid="no-pick"
+                        >
+                          No Pick
+                        </span>
+                      )}
+                    </div>
+                  );
+                })}
+              </section>
+            )}
+
             <FormProvider {...form}>
               <form className="mx-auto flex w-[90%] max-w-3xl flex-col items-center">
                 <FormField

From 5eba40b20a2e4ba1ce34307bc7cb9dd31876e69e Mon Sep 17 00:00:00 2001
From: Shashi Lo <362527+shashilo@users.noreply.github.com>
Date: Thu, 26 Sep 2024 15:04:27 -0500
Subject: [PATCH 105/118] Adding in lockdown revert that didn't work (#571)

---
 .../entry/[entryId]/week/Week.test.tsx        |   2 +-
 .../[leagueId]/entry/[entryId]/week/Week.tsx  | 102 ++++++++++++++++--
 2 files changed, 93 insertions(+), 11 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
index 386b2fba..893e629f 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
@@ -119,7 +119,7 @@ const updatedWeeklyPicks = {
   },
 };
 
-xdescribe('League Week Picks', () => {
+describe('League Week Picks', () => {
   const setUserPick = jest.fn();
   const updateWeeklyPicks = jest.fn();
   const mockGetNFLTeamLogo = getNFLTeamLogo as jest.Mock;
diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
index ffdcc5af..cfbbf965 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
@@ -24,13 +24,16 @@ import {
 import { ILeague } from '@/api/apiFunctions.interface';
 import WeekTeams from './WeekTeams';
 import GlobalSpinner from '@/components/GlobalSpinner/GlobalSpinner';
+import { onWeeklyPickChange } from './WeekHelper';
 import Alert from '@/components/AlertNotification/AlertNotification';
 import { AlertVariants } from '@/components/AlertNotification/Alerts.enum';
 import { NFLTeams } from '@/api/apiFunctions.enum';
 import { useAuthContext } from '@/context/AuthContextProvider';
+import { cn, getNFLTeamLogo } from '@/utils/utils';
+import Image from 'next/image';
+import { useRouter } from 'next/navigation';
 import LinkCustom from '@/components/LinkCustom/LinkCustom';
 import { ChevronLeft } from 'lucide-react';
-import toast from 'react-hot-toast';
 
 /**
  * Renders the weekly picks page.
@@ -39,6 +42,7 @@ import toast from 'react-hot-toast';
  */
 // eslint-disable-next-line no-unused-vars
 const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
+  const [pickHistory, setPickHistory] = useState<string[]>([]);
   const [error, setError] = useState<string | null>(null);
   const [schedule, setSchedule] = useState<ISchedule[]>([]);
   const [selectedLeague, setSelectedLeague] = useState<ILeague | undefined>();
@@ -49,6 +53,7 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
   const { user, updateCurrentWeek, updateWeeklyPicks, weeklyPicks } =
     useDataStore((state) => state);
   const { isSignedIn } = useAuthContext();
+  const router = useRouter();
 
   /**
    * Fetches the current game week.
@@ -132,8 +137,37 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
         setSchedule(scheduleData.events);
       }
     } catch (error) {
-      console.error('Could not load week data:', error);
       setError('Could not load week data.');
+      throw error;
+    }
+  };
+
+  /**
+   * Fetches all entries for the current user.
+   * @returns {Promise<void>}
+   */
+  const getPickHistory = async (): Promise<void> => {
+    const entryId: string = entry;
+
+    try {
+      const entries = await getCurrentUserEntries(user.id, league);
+      const currentEntry = entries.find((entry) => entry.$id === entryId);
+
+      if (!currentEntry) {
+        throw new Error('Entry not found');
+      }
+
+      let entryHistory = currentEntry?.selectedTeams || [];
+
+      if (currentEntry?.selectedTeams.length > 0) {
+        entryHistory = entryHistory.map((teamName) =>
+          getNFLTeamLogo(NFLTeams, teamName),
+        );
+      }
+
+      setPickHistory(entryHistory);
+    } catch (error) {
+      throw new Error("Error fetching user's pick history");
     } finally {
       setLoadingData(false);
     }
@@ -183,13 +217,9 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
     };
 
     try {
-      toast.custom(
-        <Alert
-          variant={AlertVariants.Error}
-          message={`Team selection has been locked for the week!`}
-        />,
-      );
-      console.error(params);
+      await onWeeklyPickChange(params);
+      setUserPick(teamSelect);
+      router.push(`/league/${league}/entry/all`);
     } catch (error) {
       console.error('Submission error:', error);
     }
@@ -208,6 +238,7 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
       getCurrentGameWeek();
       getUserSelectedTeams();
       getUserWeeklyPick();
+      getPickHistory();
     }
   }, [isSignedIn]);
 
@@ -236,11 +267,62 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
               {selectedLeague?.leagueName as string}
             </LinkCustom>
           </nav>
-          <section className="w-full pt-8" data-testid="weekly-picks">
+          <section
+            className="flex flex-col items-center w-full pt-8"
+            data-testid="weekly-picks"
+          >
             <h1 className="pb-8 text-center text-[2rem] font-bold text-foreground">
               Week {week} pick
             </h1>
 
+            {pickHistory.length > 0 && (
+              <section
+                className="flex flex-wrap w-[90%] gap-4 overflow-x-scroll justify-center pb-10 items-center"
+                data-testid="user-pick-history"
+              >
+                {pickHistory?.map((logoURL, index) => {
+                  const isCurrentWeek = index === pickHistory.length - 1;
+                  const hasCurrentWeekPick =
+                    pickHistory.length === Number(week);
+
+                  return (
+                    <div
+                      key={`${logoURL ? logoURL : 'no-pick'}-${index + 1}`}
+                      className={cn(
+                        'flex flex-col items-center justify-center border p-2 rounded-lg gap-1',
+                        isCurrentWeek && hasCurrentWeekPick
+                          ? 'border-primary'
+                          : 'border-border opacity-80',
+                      )}
+                    >
+                      <span className="text-sm">
+                        {isCurrentWeek && hasCurrentWeekPick
+                          ? 'CURRENT'
+                          : `WEEK ${index + 1}`}
+                      </span>
+                      {logoURL ? (
+                        <Image
+                          className="league-entry-logo"
+                          width={64}
+                          height={64}
+                          data-testid="league-history-logo"
+                          src={logoURL}
+                          alt="teamLogo"
+                        />
+                      ) : (
+                        <span
+                          className="text-xs h-16 w-16 text-primary pt-6 text-center"
+                          data-testid="no-pick"
+                        >
+                          No Pick
+                        </span>
+                      )}
+                    </div>
+                  );
+                })}
+              </section>
+            )}
+
             <FormProvider {...form}>
               <form className="mx-auto flex w-[90%] max-w-3xl flex-col items-center">
                 <FormField

From 0e7336250ad20f3c0bdf41c5967252bbde0ca197 Mon Sep 17 00:00:00 2001
From: Shashi Lo <362527+shashilo@users.noreply.github.com>
Date: Sun, 29 Sep 2024 09:01:03 -0500
Subject: [PATCH 106/118] Lockdown changes (#577)

---
 .../[leagueId]/entry/[entryId]/week/Week.test.tsx  |  2 +-
 .../[leagueId]/entry/[entryId]/week/Week.tsx       | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
index 893e629f..386b2fba 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
@@ -119,7 +119,7 @@ const updatedWeeklyPicks = {
   },
 };
 
-describe('League Week Picks', () => {
+xdescribe('League Week Picks', () => {
   const setUserPick = jest.fn();
   const updateWeeklyPicks = jest.fn();
   const mockGetNFLTeamLogo = getNFLTeamLogo as jest.Mock;
diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
index cfbbf965..9892fd15 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
@@ -24,16 +24,15 @@ import {
 import { ILeague } from '@/api/apiFunctions.interface';
 import WeekTeams from './WeekTeams';
 import GlobalSpinner from '@/components/GlobalSpinner/GlobalSpinner';
-import { onWeeklyPickChange } from './WeekHelper';
 import Alert from '@/components/AlertNotification/AlertNotification';
 import { AlertVariants } from '@/components/AlertNotification/Alerts.enum';
 import { NFLTeams } from '@/api/apiFunctions.enum';
 import { useAuthContext } from '@/context/AuthContextProvider';
 import { cn, getNFLTeamLogo } from '@/utils/utils';
 import Image from 'next/image';
-import { useRouter } from 'next/navigation';
 import LinkCustom from '@/components/LinkCustom/LinkCustom';
 import { ChevronLeft } from 'lucide-react';
+import toast from 'react-hot-toast';
 
 /**
  * Renders the weekly picks page.
@@ -53,7 +52,6 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
   const { user, updateCurrentWeek, updateWeeklyPicks, weeklyPicks } =
     useDataStore((state) => state);
   const { isSignedIn } = useAuthContext();
-  const router = useRouter();
 
   /**
    * Fetches the current game week.
@@ -217,9 +215,13 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
     };
 
     try {
-      await onWeeklyPickChange(params);
-      setUserPick(teamSelect);
-      router.push(`/league/${league}/entry/all`);
+      toast.custom(
+        <Alert
+          variant={AlertVariants.Error}
+          message={`Team selection has been locked for the week!`}
+        />,
+      );
+      console.error(params);
     } catch (error) {
       console.error('Submission error:', error);
     }

From 6fcbb2602a058f8673c260a43e8aca120579c04e Mon Sep 17 00:00:00 2001
From: Shashi Lo <362527+shashilo@users.noreply.github.com>
Date: Sun, 29 Sep 2024 09:04:54 -0500
Subject: [PATCH 107/118] Update package.json to 0.4.3 (#578)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cdd54c0f..65b1ab02 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "0.4.2",
+  "version": "0.4.3",
   "scripts": {
     "dev": "next dev",
     "build": "next build",

From f85c090d8b03af9d56220ab443b0cc3aba03be94 Mon Sep 17 00:00:00 2001
From: Shashi Lo <362527+shashilo@users.noreply.github.com>
Date: Fri, 4 Oct 2024 12:19:54 -0500
Subject: [PATCH 108/118] Shashi/disable game (#585)

---
 .../entry/[entryId]/week/WeekTeams.test.tsx   |  2 +-
 .../entry/[entryId]/week/WeekTeams.tsx        | 91 ++++++++++++-------
 2 files changed, 58 insertions(+), 35 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.test.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.test.tsx
index a722ac95..23bbe5cd 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.test.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.test.tsx
@@ -44,7 +44,7 @@ const TestWeekTeamsComponent = ({
   );
 };
 
-describe('WeekTeams', () => {
+xdescribe('WeekTeams', () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx
index 8f4973e8..0f60c44e 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx
@@ -34,6 +34,22 @@ const formatDateTime = (dateString: string): string => {
   return `${formattedDate} ・ ${formattedTime}`;
 };
 
+/**
+ * Checks if the current game time is within 1 hour of the current time.
+ * @param gameTime The game time to check.
+ * @returns True if the current game time is within 1 hour of the current time, false otherwise.
+ */
+const checkCurrentGameTime = (gameTime: string): boolean => {
+  const timestamp = new Date(gameTime);
+  const currentTime = new Date();
+
+  const currentTimeMinus1Hour = new Date(
+    currentTime.getTime() - 60 * 60 * 1000,
+  );
+
+  return currentTimeMinus1Hour > timestamp;
+};
+
 /**
  * Renders the weekly picks page.
  * @param props The parameters for the weekly picks page.
@@ -59,41 +75,48 @@ const WeekTeams = ({
     value={userPick}
     onChange={field.onChange}
   >
-    {schedule.map((scheduledGame) => (
-      <div
-        className="grid w-full grid-cols-[1fr_auto_1fr] gap-4 pb-8"
-        style={{ direction: 'rtl' }}
-        key={scheduledGame.id}
-      >
-        <div className="week-page-game-schedule col-span-3 text-center">
-          <p>{formatDateTime(scheduledGame.date)}</p>
+    {schedule.map((scheduledGame) => {
+      const disableGame = checkCurrentGameTime(scheduledGame.date);
+
+      return (
+        <div
+          className="grid w-full grid-cols-[1fr_auto_1fr] gap-4 pb-8"
+          style={{ direction: 'rtl' }}
+          key={scheduledGame.id}
+        >
+          <div className="week-page-game-schedule col-span-3 text-center">
+            <p>{formatDateTime(scheduledGame.date)}</p>
+          </div>
+          {scheduledGame.competitions[0].competitors.map(
+            (competition, index) => (
+              <>
+                {index > 0 && (
+                  <div className="h-20 flex self-end items-center">
+                    <span>@</span>
+                  </div>
+                )}
+                <FormItem key={competition.id} className="text-center">
+                  <FormControl>
+                    <WeeklyPickButton
+                      loadingTeamName={loadingTeamName}
+                      selectedTeam={competition.team.shortDisplayName.toLowerCase()}
+                      homeAway={competition.homeAway}
+                      team={competition.team.name}
+                      src={competition.team.logo}
+                      isDisabled={
+                        disableGame ||
+                        Boolean(loadingTeamName) ||
+                        hasTeamBeenPicked(competition.team.name, selectedTeams)
+                      }
+                    />
+                  </FormControl>
+                </FormItem>
+              </>
+            ),
+          )}
         </div>
-        {scheduledGame.competitions[0].competitors.map((competition, index) => (
-          <>
-            {index > 0 && (
-              <div className="h-20 flex self-end items-center">
-                <span>@</span>
-              </div>
-            )}
-            <FormItem key={competition.id} className="text-center">
-              <FormControl>
-                <WeeklyPickButton
-                  loadingTeamName={loadingTeamName}
-                  selectedTeam={competition.team.shortDisplayName.toLowerCase()}
-                  homeAway={competition.homeAway}
-                  team={competition.team.name}
-                  src={competition.team.logo}
-                  isDisabled={
-                    Boolean(loadingTeamName) ||
-                    hasTeamBeenPicked(competition.team.name, selectedTeams)
-                  }
-                />
-              </FormControl>
-            </FormItem>
-          </>
-        ))}
-      </div>
-    ))}
+      );
+    })}
   </RadioGroup>
 );
 export default WeekTeams;

From a221e7ce4f6f4af51bf75dbc585373a8ec548a20 Mon Sep 17 00:00:00 2001
From: Shashi Lo <362527+shashilo@users.noreply.github.com>
Date: Fri, 4 Oct 2024 12:39:47 -0500
Subject: [PATCH 109/118] Update package.json to 0.4.4 (#586)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 65b1ab02..bf8fd0c9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "0.4.3",
+  "version": "0.4.4",
   "scripts": {
     "dev": "next dev",
     "build": "next build",

From 2d4bc54d6fe62837ad679dc8aabe4365ed5e5f23 Mon Sep 17 00:00:00 2001
From: Shashi Lo <362527+shashilo@users.noreply.github.com>
Date: Fri, 4 Oct 2024 13:03:50 -0500
Subject: [PATCH 110/118] Exclude test for now

---
 app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
index 893e629f..78b69c1d 100644
--- a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
+++ b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.test.tsx
@@ -354,7 +354,7 @@ describe('League Week Picks', () => {
     );
   });
 
-  it('should redirect back to entry page after successfully selecting a team', async () => {
+  xit('should redirect back to entry page after successfully selecting a team', async () => {
     mockUseAuthContext.isSignedIn = true;
     (getCurrentUserEntries as jest.Mock).mockResolvedValue([
       {

From c7acabef4d5c244dbff0ab6623b544390e8c9224 Mon Sep 17 00:00:00 2001
From: Richard <66279068+choir27@users.noreply.github.com>
Date: Fri, 4 Oct 2024 14:07:31 -0400
Subject: [PATCH 111/118] P-0: Disable Adding Entries (#580)

# What does this PR do?

disables add entries and remove related code for eslint rules and ignore
realted tests
Fixes #579

# Related screenshots/Videos

<img width="960" alt="Screenshot 2024-09-30 123241"
src="https://github.com/user-attachments/assets/32833f8a-c036-4e67-8e95-e1c5ba5dbb84">

# Related Issues/PRs

- https://github.com/LetsGetTechnical/gridiron-survivor/issues/579

# Have you spent some time to check if this issue has been raised
before?
Have you Googled for a similar issue or checked our older issues?
- [X] I checked and didn't find similar issue *

Co-authored-by: Shashi Lo <362527+shashilo@users.noreply.github.com>
---
 .../league/[leagueId]/entry/all/page.test.tsx |  6 +-
 .../league/[leagueId]/entry/all/page.tsx      | 58 +------------------
 2 files changed, 4 insertions(+), 60 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/all/page.test.tsx b/app/(main)/league/[leagueId]/entry/all/page.test.tsx
index dde50186..ff92f532 100644
--- a/app/(main)/league/[leagueId]/entry/all/page.test.tsx
+++ b/app/(main)/league/[leagueId]/entry/all/page.test.tsx
@@ -180,7 +180,7 @@ describe('League entries page (Entry Component)', () => {
     expect(entryPageHeaderCurrentWeek).toHaveTextContent('Week 1');
   });
 
-  it('should display the header with the league name, survivors, and week number, with a past weeks link and add new entry button', async () => {
+  it('should display the header with the league name, survivors, and week number, with a past weeks link', async () => {
     mockUseDataStore.mockReturnValue({
       ...mockUseDataStore(),
       currentWeek: 2,
@@ -222,7 +222,6 @@ describe('League entries page (Entry Component)', () => {
       'entry-page-header-current-week',
     );
     const viewPastWeeksLink = screen.getByTestId('past-weeks-link');
-    const addNewEntryButton = screen.getByTestId('add-new-entry-button');
 
     expect(entryPageHeader).toBeInTheDocument();
     expect(entryPageHeaderToLeaguesLink).toBeInTheDocument();
@@ -232,11 +231,10 @@ describe('League entries page (Entry Component)', () => {
     expect(entryPageHeaderLeagueSurvivors).toHaveTextContent('Survivors');
     expect(entryPageHeaderCurrentWeek).toBeInTheDocument();
     expect(entryPageHeaderCurrentWeek).toHaveTextContent('Week 2');
-    expect(addNewEntryButton).toBeInTheDocument();
     expect(viewPastWeeksLink).toBeInTheDocument();
   });
 
-  it('should not display a button to add a new entry if there are 5 entries', async () => {
+  xit('should not display a button to add a new entry if there are 5 entries', async () => {
     mockUseDataStore.mockReturnValue({
       ...mockUseDataStore(),
       currentWeek: 2,
diff --git a/app/(main)/league/[leagueId]/entry/all/page.tsx b/app/(main)/league/[leagueId]/entry/all/page.tsx
index 4aad72bc..b33fd84d 100644
--- a/app/(main)/league/[leagueId]/entry/all/page.tsx
+++ b/app/(main)/league/[leagueId]/entry/all/page.tsx
@@ -3,16 +3,14 @@
 
 'use client';
 import {
-  createEntry,
   getCurrentLeague,
   getCurrentUserEntries,
   getGameWeek,
   getNFLTeams,
 } from '@/api/apiFunctions';
-import { Button } from '@/components/Button/Button';
-import { ChevronLeft, PlusCircle } from 'lucide-react';
+import { ChevronLeft } from 'lucide-react';
 import { ENTRY_URL, LEAGUE_URL, WEEK_URL } from '@/const/global';
-import { IEntry, IEntryProps } from '../Entries.interface';
+import { IEntry } from '../Entries.interface';
 import { LeagueEntries } from '@/components/LeagueEntries/LeagueEntries';
 import { LeagueSurvivors } from '@/components/LeagueSurvivors/LeagueSurvivors';
 import { useDataStore } from '@/store/dataStore';
@@ -20,8 +18,6 @@ import GlobalSpinner from '@/components/GlobalSpinner/GlobalSpinner';
 import Heading from '@/components/Heading/Heading';
 import Link from 'next/link';
 import React, { JSX, useEffect, useState } from 'react';
-import LoadingSpinner from '@/components/LoadingSpinner/LoadingSpinner';
-import { cn } from '@/utils/utils';
 import LinkCustom from '@/components/LinkCustom/LinkCustom';
 import { getNFLTeamLogo } from '@/utils/utils';
 
@@ -38,12 +34,10 @@ const Entry = ({
   const [entries, setEntries] = useState<IEntry[]>([]);
   const [leagueName, setLeagueName] = useState<string>('');
   const [loadingData, setLoadingData] = useState<boolean>(true);
-  const [addingEntry, setAddingEntry] = useState<boolean>(false);
   const [survivors, setSurvivors] = useState<number>(0);
   const [totalPlayers, setTotalPlayers] = useState<number>(0);
   const { currentWeek, NFLTeams, user, updateCurrentWeek, updateNFLTeams } =
     useDataStore((state) => state);
-  const MAX_ENTRIES = 5;
 
   useEffect(() => {
     /**
@@ -113,33 +107,6 @@ const Entry = ({
     }
   };
 
-  /**
-   * Adds a new entry to the league.
-   * @param {IEntryProps} props - The entry properties.
-   * @param {string} props.name - The name of the entry.
-   * @param {string} props.user - The user id.
-   * @param {string} props.league - The league id.
-   * @returns {void}
-   */
-  const addNewEntry = async ({
-    name,
-    user,
-    league,
-  }: IEntryProps): Promise<void> => {
-    if (entries.length >= MAX_ENTRIES) {
-      return;
-    }
-    setAddingEntry(true);
-    try {
-      const createdEntry = await createEntry({ name, user, league });
-      setEntries((prevEntries) => [...prevEntries, createdEntry]);
-    } catch (error) {
-      throw new Error('Error adding new entry');
-    } finally {
-      setAddingEntry(false);
-    }
-  };
-
   useEffect(() => {
     if (!user.id || user.id === '') {
       return;
@@ -230,27 +197,6 @@ const Entry = ({
               })}
 
             <div className="flex flex-col gap-8 justify-center items-center mt-2 mb-2 w-full">
-              {!loadingData && entries.length < MAX_ENTRIES && (
-                <Button
-                  icon={
-                    <PlusCircle
-                      className={cn('mr-2', addingEntry && 'hidden')}
-                    />
-                  }
-                  variant="outline"
-                  onClick={() =>
-                    addNewEntry({
-                      name: `Entry ${entries.length + 1}`,
-                      user: user.id,
-                      league: leagueId,
-                    })
-                  }
-                  data-testid="add-new-entry-button"
-                  disabled={addingEntry}
-                >
-                  {addingEntry ? <LoadingSpinner /> : 'Add New Entry'}
-                </Button>
-              )}
 
               {currentWeek > 1 && (
                 <Link

From 76eefd53a875d379eaf730393fbf7813ad2e2c91 Mon Sep 17 00:00:00 2001
From: Danielle Lindblom <114356705+Danielle254@users.noreply.github.com>
Date: Tue, 8 Oct 2024 08:47:29 -0600
Subject: [PATCH 112/118] Danielle/550 remove past weeks picks link (#583)

Closes #550

Before

![old](https://github.com/user-attachments/assets/313a594d-6714-40a9-8f65-5e17d7c1853a)


After

![new](https://github.com/user-attachments/assets/f125522a-12c2-4ae5-b0cf-dbbc8813b77e)


Also updated related tests. Did not see any issues with styling after
removing Link element.
---
 .../league/[leagueId]/entry/all/page.test.tsx      |  6 ++----
 app/(main)/league/[leagueId]/entry/all/page.tsx    | 14 --------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/app/(main)/league/[leagueId]/entry/all/page.test.tsx b/app/(main)/league/[leagueId]/entry/all/page.test.tsx
index ff92f532..9764ce08 100644
--- a/app/(main)/league/[leagueId]/entry/all/page.test.tsx
+++ b/app/(main)/league/[leagueId]/entry/all/page.test.tsx
@@ -132,7 +132,7 @@ describe('League entries page (Entry Component)', () => {
     expect(screen.queryByTestId('global-spinner')).not.toBeInTheDocument();
   });
 
-  it('should display the header with the league name, survivors, and week number, without a past weeks link', async () => {
+  it('should display the header with the league name, survivors, and week number', async () => {
     mockGetCurrentUserEntries.mockResolvedValueOnce([
       {
         $id: '66311a210039f0532044',
@@ -180,7 +180,7 @@ describe('League entries page (Entry Component)', () => {
     expect(entryPageHeaderCurrentWeek).toHaveTextContent('Week 1');
   });
 
-  it('should display the header with the league name, survivors, and week number, with a past weeks link', async () => {
+  it('should display the header with the league name, survivors, and week number', async () => {
     mockUseDataStore.mockReturnValue({
       ...mockUseDataStore(),
       currentWeek: 2,
@@ -221,7 +221,6 @@ describe('League entries page (Entry Component)', () => {
     const entryPageHeaderCurrentWeek = screen.getByTestId(
       'entry-page-header-current-week',
     );
-    const viewPastWeeksLink = screen.getByTestId('past-weeks-link');
 
     expect(entryPageHeader).toBeInTheDocument();
     expect(entryPageHeaderToLeaguesLink).toBeInTheDocument();
@@ -231,7 +230,6 @@ describe('League entries page (Entry Component)', () => {
     expect(entryPageHeaderLeagueSurvivors).toHaveTextContent('Survivors');
     expect(entryPageHeaderCurrentWeek).toBeInTheDocument();
     expect(entryPageHeaderCurrentWeek).toHaveTextContent('Week 2');
-    expect(viewPastWeeksLink).toBeInTheDocument();
   });
 
   xit('should not display a button to add a new entry if there are 5 entries', async () => {
diff --git a/app/(main)/league/[leagueId]/entry/all/page.tsx b/app/(main)/league/[leagueId]/entry/all/page.tsx
index b33fd84d..5ef1214c 100644
--- a/app/(main)/league/[leagueId]/entry/all/page.tsx
+++ b/app/(main)/league/[leagueId]/entry/all/page.tsx
@@ -16,7 +16,6 @@ import { LeagueSurvivors } from '@/components/LeagueSurvivors/LeagueSurvivors';
 import { useDataStore } from '@/store/dataStore';
 import GlobalSpinner from '@/components/GlobalSpinner/GlobalSpinner';
 import Heading from '@/components/Heading/Heading';
-import Link from 'next/link';
 import React, { JSX, useEffect, useState } from 'react';
 import LinkCustom from '@/components/LinkCustom/LinkCustom';
 import { getNFLTeamLogo } from '@/utils/utils';
@@ -195,19 +194,6 @@ const Entry = ({
                   </section>
                 );
               })}
-
-            <div className="flex flex-col gap-8 justify-center items-center mt-2 mb-2 w-full">
-
-              {currentWeek > 1 && (
-                <Link
-                  className="text-primary hover:text-primary-muted font-bold hover:underline"
-                  data-testid="past-weeks-link"
-                  href={`#`}
-                >
-                  View Past Weeks
-                </Link>
-              )}
-            </div>
           </section>
         </div>
       )}

From 3814e8d19cda4222beba5b0709a9137258c1c4d6 Mon Sep 17 00:00:00 2001
From: Alex Appleget <137813659+alexappleget@users.noreply.github.com>
Date: Thu, 10 Oct 2024 00:46:06 -0500
Subject: [PATCH 113/118] Alex/Adjust table component columns (#542)

---
 components/TableColumns/TableColumns.tsx | 306 ++++++++++++++++++++++-
 1 file changed, 301 insertions(+), 5 deletions(-)

diff --git a/components/TableColumns/TableColumns.tsx b/components/TableColumns/TableColumns.tsx
index bfe3b355..67f5c4ef 100644
--- a/components/TableColumns/TableColumns.tsx
+++ b/components/TableColumns/TableColumns.tsx
@@ -14,16 +14,31 @@ import {
   DropdownMenuTrigger,
 } from '../TableDropDownMenu/TableDropDownMenu';
 
-export type Header = {
+export type LeagueHeader = {
   text: string;
   text2: string;
   text3: string;
+  text4: string;
 };
 
-export const columns: ColumnDef<Header>[] = [
+export type LeagueDetailsHeader = {
+  text: string;
+  text2: string;
+  text3: string;
+  text4: string;
+};
+
+export type PlayersHeader = {
+  text: string;
+  text2: string;
+  text3: string;
+  text4: string;
+};
+
+export const leagueDetailsColumns: ColumnDef<LeagueDetailsHeader>[] = [
   {
     accessorKey: 'text',
-    header: 'HEADING',
+    header: 'User',
     /**
      * Value of row.
      * @param {object} row - The row data.
@@ -47,7 +62,7 @@ export const columns: ColumnDef<Header>[] = [
           variant="ghost"
           onClick={() => column.toggleSorting(column.getIsSorted() === 'asc')}
         >
-          HEADING
+          Entry #
           <ChevronsUpDown className="ml-2 h-4 w-4" />
         </Button>
       );
@@ -76,7 +91,7 @@ export const columns: ColumnDef<Header>[] = [
           variant="ghost"
           onClick={() => column.toggleSorting(column.getIsSorted() === 'asc')}
         >
-          HEADING
+          Pick Made
           <ChevronsUpDown className="ml-2 h-4 w-4" />
         </Button>
       );
@@ -90,6 +105,287 @@ export const columns: ColumnDef<Header>[] = [
      */
     cell: ({ row }) => <div>{row.getValue('text3')}</div>,
   },
+  {
+    accessorKey: 'text4',
+
+    /**
+     * Value of row.
+     * @param {object} column - The column data.
+     * @param {object} column.column - The column definition
+     * @returns {JSX.Element} - The cell component.
+     */
+    header: ({ column }): JSX.Element => {
+      return (
+        <Button
+          variant="ghost"
+          onClick={() => column.toggleSorting(column.getIsSorted() === 'asc')}
+        >
+          Surviving?
+          <ChevronsUpDown className="ml-2 h-4 w-4" />
+        </Button>
+      );
+    },
+
+    /**
+     * Value of row.
+     * @param {object} row - The row data.
+     * @param {object} row.row - The row definition
+     * @returns {JSX.Element} - The cell component.
+     */
+    cell: ({ row }) => <div>{row.getValue('text2')}</div>,
+  },
+  {
+    id: 'actions',
+
+    /**
+     * Admin action dropdown.
+     * @returns {JSX.Element} - The cell component.
+     */
+    cell: (): JSX.Element => {
+      return (
+        <DropdownMenu>
+          <DropdownMenuTrigger asChild>
+            <Button variant="ghost" className="h-8 w-8 p-0">
+              <span className="sr-only">Open menu</span>
+              <MoreHorizontal className="h-4 w-4" />
+            </Button>
+          </DropdownMenuTrigger>
+          <DropdownMenuContent align="end">
+            <DropdownMenuItem>View</DropdownMenuItem>
+            <DropdownMenuItem>Edit</DropdownMenuItem>
+            <DropdownMenuItem>Delete</DropdownMenuItem>
+          </DropdownMenuContent>
+        </DropdownMenu>
+      );
+    },
+  },
+];
+
+export const leagueColumns: ColumnDef<LeagueHeader>[] = [
+  {
+    accessorKey: 'text',
+    header: 'League Name',
+    /**
+     * Value of row.
+     * @param {object} row - The row data.
+     * @param {object} row.row - The row definition
+     * @returns {JSX.Element} - The cell component.
+     */
+    cell: ({ row }) => <div>{row.getValue('text')}</div>,
+  },
+  {
+    accessorKey: 'text2',
+
+    /**
+     * Value of row.
+     * @param {object} column - The column data.
+     * @param {object} column.column - The column definition
+     * @returns {JSX.Element} - The cell component.
+     */
+    header: ({ column }): JSX.Element => {
+      return (
+        <Button
+          variant="ghost"
+          onClick={() => column.toggleSorting(column.getIsSorted() === 'asc')}
+        >
+          # of Participants
+          <ChevronsUpDown className="ml-2 h-4 w-4" />
+        </Button>
+      );
+    },
+
+    /**
+     * Value of row.
+     * @param {object} row - The row data.
+     * @param {object} row.row - The row definition
+     * @returns {JSX.Element} - The cell component.
+     */
+    cell: ({ row }) => <div>{row.getValue('text2')}</div>,
+  },
+  {
+    accessorKey: 'text3',
+
+    /**
+     * Value of row.
+     * @param {object} column - The column data.
+     * @param {object} column.column - The column definition
+     * @returns {JSX.Element} - The cell component.
+     */
+    header: ({ column }): JSX.Element => {
+      return (
+        <Button
+          variant="ghost"
+          onClick={() => column.toggleSorting(column.getIsSorted() === 'asc')}
+        >
+          # of Survivors
+          <ChevronsUpDown className="ml-2 h-4 w-4" />
+        </Button>
+      );
+    },
+
+    /**
+     * Value of row.
+     * @param {object} row - The row data.
+     * @param {object} row.row - The row definition
+     * @returns {JSX.Element} - The cell component.
+     */
+    cell: ({ row }) => <div>{row.getValue('text3')}</div>,
+  },
+  {
+    accessorKey: 'text4',
+
+    /**
+     * Value of row.
+     * @param {object} column - The column data.
+     * @param {object} column.column - The column definition
+     * @returns {JSX.Element} - The cell component.
+     */
+    header: ({ column }): JSX.Element => {
+      return (
+        <Button
+          variant="ghost"
+          onClick={() => column.toggleSorting(column.getIsSorted() === 'asc')}
+        >
+          # of Entries
+          <ChevronsUpDown className="ml-2 h-4 w-4" />
+        </Button>
+      );
+    },
+
+    /**
+     * Value of row.
+     * @param {object} row - The row data.
+     * @param {object} row.row - The row definition
+     * @returns {JSX.Element} - The cell component.
+     */
+    cell: ({ row }) => <div>{row.getValue('text2')}</div>,
+  },
+  {
+    id: 'actions',
+
+    /**
+     * Admin action dropdown.
+     * @returns {JSX.Element} - The cell component.
+     */
+    cell: (): JSX.Element => {
+      return (
+        <DropdownMenu>
+          <DropdownMenuTrigger asChild>
+            <Button variant="ghost" className="h-8 w-8 p-0">
+              <span className="sr-only">Open menu</span>
+              <MoreHorizontal className="h-4 w-4" />
+            </Button>
+          </DropdownMenuTrigger>
+          <DropdownMenuContent align="end">
+            <DropdownMenuItem>View</DropdownMenuItem>
+            <DropdownMenuItem>Edit</DropdownMenuItem>
+            <DropdownMenuItem>Delete</DropdownMenuItem>
+          </DropdownMenuContent>
+        </DropdownMenu>
+      );
+    },
+  },
+];
+
+export const playerColumns: ColumnDef<PlayersHeader>[] = [
+  {
+    accessorKey: 'text',
+    header: 'Picks Made',
+    /**
+     * Value of row.
+     * @param {object} row - The row data.
+     * @param {object} row.row - The row definition
+     * @returns {JSX.Element} - The cell component.
+     */
+    cell: ({ row }) => <div>{row.getValue('text')}</div>,
+  },
+  {
+    accessorKey: 'text2',
+
+    /**
+     * Value of row.
+     * @param {object} column - The column data.
+     * @param {object} column.column - The column definition
+     * @returns {JSX.Element} - The cell component.
+     */
+    header: ({ column }): JSX.Element => {
+      return (
+        <Button
+          variant="ghost"
+          onClick={() => column.toggleSorting(column.getIsSorted() === 'asc')}
+        >
+          Entry #
+          <ChevronsUpDown className="ml-2 h-4 w-4" />
+        </Button>
+      );
+    },
+
+    /**
+     * Value of row.
+     * @param {object} row - The row data.
+     * @param {object} row.row - The row definition
+     * @returns {JSX.Element} - The cell component.
+     */
+    cell: ({ row }) => <div>{row.getValue('text2')}</div>,
+  },
+  {
+    accessorKey: 'text3',
+
+    /**
+     * Value of row.
+     * @param {object} column - The column data.
+     * @param {object} column.column - The column definition
+     * @returns {JSX.Element} - The cell component.
+     */
+    header: ({ column }): JSX.Element => {
+      return (
+        <Button
+          variant="ghost"
+          onClick={() => column.toggleSorting(column.getIsSorted() === 'asc')}
+        >
+          Eliminated?
+          <ChevronsUpDown className="ml-2 h-4 w-4" />
+        </Button>
+      );
+    },
+
+    /**
+     * Value of row.
+     * @param {object} row - The row data.
+     * @param {object} row.row - The row definition
+     * @returns {JSX.Element} - The cell component.
+     */
+    cell: ({ row }) => <div>{row.getValue('text3')}</div>,
+  },
+  {
+    accessorKey: 'text4',
+
+    /**
+     * Value of row.
+     * @param {object} column - The column data.
+     * @param {object} column.column - The column definition
+     * @returns {JSX.Element} - The cell component.
+     */
+    header: ({ column }): JSX.Element => {
+      return (
+        <Button
+          variant="ghost"
+          onClick={() => column.toggleSorting(column.getIsSorted() === 'asc')}
+        >
+          Idk what to put here for header
+          <ChevronsUpDown className="ml-2 h-4 w-4" />
+        </Button>
+      );
+    },
+
+    /**
+     * Value of row.
+     * @param {object} row - The row data.
+     * @param {object} row.row - The row definition
+     * @returns {JSX.Element} - The cell component.
+     */
+    cell: ({ row }) => <div>{row.getValue('text2')}</div>,
+  },
   {
     id: 'actions',
 

From b4d6f296ba6ae9f89a0f83c6330b4ed809b63720 Mon Sep 17 00:00:00 2001
From: Mai Vang <100221733+vmaineng@users.noreply.github.com>
Date: Fri, 11 Oct 2024 15:12:59 -0700
Subject: [PATCH 114/118] updated unit tests from #477 PR (#538)

# What does this PR do?

- [X] Updated tests from PR #477

# Related Issues/PRs
This is the PR that was submitted where tests were omitted to meet Alpha
deadline.
[-
https://github.com/LetsGetTechnical/gridiron-survivor/issues/513](https://github.com/LetsGetTechnical/gridiron-survivor/pull/491)
---
 app/(main)/league/all/page.test.tsx | 277 +++++++++++++++++++++-------
 app/(main)/league/all/page.tsx      |  13 +-
 store/dataStore.test.ts             |  37 ++--
 3 files changed, 246 insertions(+), 81 deletions(-)

diff --git a/app/(main)/league/all/page.test.tsx b/app/(main)/league/all/page.test.tsx
index c38f4503..b1a783c8 100644
--- a/app/(main)/league/all/page.test.tsx
+++ b/app/(main)/league/all/page.test.tsx
@@ -1,107 +1,183 @@
-import { render, screen, waitFor, fireEvent } from '@testing-library/react';
+import {
+  render,
+  screen,
+  waitFor,
+  waitForElementToBeRemoved,
+  fireEvent,
+} from '@testing-library/react';
 import Leagues from './page';
 import { useDataStore } from '@/store/dataStore';
 import { getUserLeagues } from '@/utils/utils';
-import {
-  getGameWeek,
-  getAllLeagues,
-  getUserDocumentId,
-} from '@/api/apiFunctions';
-import { AuthContext } from '@/context/AuthContextProvider';
+import { getAllLeagues, addUserToLeague } from '@/api/apiFunctions';
+import { toast } from 'react-hot-toast';
+import Alert from '@/components/AlertNotification/AlertNotification';
+import { AlertVariants } from '@/components/AlertNotification/Alerts.enum';
 
-jest.mock('@/store/dataStore', () => ({
-  useDataStore: jest.fn(() => ({ user: { id: '123', leagues: [] } })),
-}));
+const mockUseAuthContext = {
+  isSignedIn: false,
+};
 
-jest.mock('@/utils/utils', () => ({
-  getUserLeagues: jest.fn(() => Promise.resolve([])),
+jest.mock('@/context/AuthContextProvider', () => ({
+  useAuthContext() {
+    return {
+      ...mockUseAuthContext,
+    };
+  },
 }));
 
-jest.mock('@/api/apiFunctions', () => ({
-  getGameWeek: jest.fn(() =>
-    Promise.resolve({
-      week: 1,
-    }),
-  ),
-  getAllLeagues: jest.fn(() =>
-    Promise.resolve([
+jest.mock('@/store/dataStore', () => ({
+  useDataStore: jest.fn(() => ({
+    user: {
+      documentId: '123',
+      id: '1234',
+      email: 'test@test.com',
+      leagues: ['league1'],
+    },
+    allLeagues: [
       {
         leagueId: '123',
         leagueName: 'Test League',
-        logo: 'https://example.com/logo.png',
-        participants: ['123456', '78', '9'],
+        logo: 'logo.png',
+        participants: ['123456', '78'],
         survivors: ['123456', '78'],
       },
-    ]),
-  ),
+    ],
+    updateUser: jest.fn(),
+  })),
 }));
 
-jest.mock('@/context/AuthContextProvider', () => ({
-  useAuthContext: jest.fn(() => ({ user: { id: '123' } })),
+jest.mock('@/utils/utils', () => ({
+  getUserLeagues: jest.fn(() => Promise.resolve([])),
+  cn: jest.fn(),
+}));
+
+jest.mock('@/api/apiFunctions', () => ({
+  getAllLeagues: jest.fn(),
+  addUserToLeague: jest.fn(),
+}));
+
+jest.mock('react-hot-toast', () => ({
+  toast: {
+    custom: jest.fn(),
+  },
 }));
 
 describe('Leagues Component', () => {
   const mockUseDataStore = useDataStore as unknown as jest.Mock;
   const mockGetUserLeagues = getUserLeagues as jest.Mock;
-  const mockGetGameWeek = getGameWeek as jest.Mock;
   const mockGetAllLeagues = getAllLeagues as jest.Mock;
+  const mockAddUserToLeague = addUserToLeague as jest.Mock;
 
   beforeEach(() => {
     jest.clearAllMocks();
   });
 
-  xtest('should render "You are not enrolled in any leagues" message when no leagues are found', async () => {
-    mockUseDataStore.mockReturnValueOnce({ user: { id: '123', leagues: [] } });
-    mockGetUserLeagues.mockResolvedValueOnce([]);
-    mockGetGameWeek.mockResolvedValueOnce({ week: 1 });
+  it('should render "You are not enrolled in any leagues" message when no leagues are found', async () => {
+    mockUseAuthContext.isSignedIn = true;
+    mockUseDataStore.mockReturnValue({
+      user: {
+        documentId: '123',
+        email: 'test@test.com',
+        id: '123',
+        leagues: [],
+      },
+      allLeagues: [],
+    });
+
     render(<Leagues />);
 
+    await waitForElementToBeRemoved(() => screen.getByTestId('global-spinner'));
+
     await waitFor(() => {
-      expect(
-        screen.getByText('You are not enrolled in any leagues'),
-      ).toBeInTheDocument();
+      const messageElement = screen.getByTestId('no-leagues-message');
+      expect(messageElement).toBeInTheDocument();
     });
   });
 
-  xtest('should display GlobalSpinner while loading data', async () => {
-    mockUseDataStore.mockReturnValueOnce({ user: { id: '123', leagues: [] } });
-    mockGetUserLeagues.mockResolvedValueOnce([]);
-    mockGetGameWeek.mockResolvedValueOnce({ week: 1 });
-    render(<Leagues />);
+  it('should display GlobalSpinner while loading data', async () => {
+    mockUseAuthContext.isSignedIn = true;
 
-    await waitFor(() => {
-      expect(screen.getByTestId('global-spinner')).toBeInTheDocument();
+    mockUseDataStore.mockReturnValueOnce({
+      user: {
+        documentId: '123',
+        email: 'test@test.com',
+        id: '123',
+        leagues: [],
+      },
+      allLeagues: [],
     });
-  });
-  xtest('should not display GlobalSpinner after loading data', async () => {
-    mockUseDataStore.mockReturnValueOnce({ user: { id: '123', leagues: [] } });
-    mockGetUserLeagues.mockResolvedValueOnce([]);
-    mockGetGameWeek.mockResolvedValueOnce({ week: 1 });
 
     render(<Leagues />);
 
     expect(screen.getByTestId('global-spinner')).toBeInTheDocument();
-
-    await waitFor(() => {
-      expect(screen.queryByTestId('global-spinner')).not.toBeInTheDocument();
-    });
   });
 
-  xtest('should handle form submission to join a league', async () => {
-    mockUseDataStore.mockReturnValueOnce({
-      user: { id: '123', leagues: [] },
+  it('should not display GlobalSpinner after loading data', async () => {
+    mockUseAuthContext.isSignedIn = true;
+
+    mockUseDataStore.mockReturnValue({
+      user: {
+        documentId: '123',
+        email: 'test@test.com',
+        id: '123',
+        leagues: [],
+      },
       allLeagues: [
         {
           leagueId: '123',
           leagueName: 'Test League',
-          logo: 'https://findmylogo.com/logo.png',
+          logo: 'logo.png',
           participants: ['123456', '78'],
-          survivors: ['123456', '78', '9'],
+          survivors: ['123456', '78'],
         },
       ],
     });
+
     mockGetUserLeagues.mockResolvedValueOnce([]);
-    mockGetGameWeek.mockResolvedValueOnce({ week: 1 });
+
+    render(<Leagues />);
+
+    await waitForElementToBeRemoved(() => screen.getByTestId('global-spinner'));
+
+    expect(screen.queryByTestId('global-spinner')).not.toBeInTheDocument();
+  });
+
+  it('should handle form submission to join a league', async () => {
+    mockUseAuthContext.isSignedIn = true;
+
+    const user = {
+      documentId: '123',
+      email: 'test@test.com',
+      id: '123',
+      leagues: [],
+    };
+
+    const league = {
+      leagueId: '123',
+      leagueName: 'Test League',
+      logo: 'logo.png',
+      participants: [],
+      survivors: [],
+    };
+
+    const updateUser = jest.fn();
+
+    mockUseDataStore.mockReturnValue({
+      user,
+      allLeagues: [league],
+      updateUser,
+    });
+
+    mockGetAllLeagues.mockResolvedValueOnce([league]);
+    mockAddUserToLeague.mockResolvedValue(
+      Promise.resolve({
+        userDocumentId: user.documentId,
+        selectedLeague: league.leagueId,
+        selectedLeagues: [league.leagueId],
+        participants: [user.id],
+        survivors: [user.id],
+      }),
+    );
 
     render(<Leagues />);
 
@@ -109,16 +185,93 @@ describe('Leagues Component', () => {
       expect(screen.queryByTestId('global-spinner')).not.toBeInTheDocument();
     });
 
-    const selectElement = screen.getByLabelText(/Select league to join/i);
-    expect(selectElement).toBeInTheDocument();
+    const selectElement = screen.getByTestId('select-available-leagues');
+    fireEvent.change(selectElement, { target: { value: '123' } });
+    fireEvent.click(screen.getByTestId('join-league-button'));
+
+    await waitFor(() => {
+      expect(mockAddUserToLeague).toHaveBeenCalledWith({
+        userDocumentId: user.documentId,
+        selectedLeague: league.leagueId,
+        selectedLeagues: [league.leagueId],
+        participants: [user.id],
+        survivors: [user.id],
+      });
+      expect(updateUser).toHaveBeenCalledWith(
+        user.documentId,
+        user.id,
+        user.email,
+        [...user.leagues, league.leagueId],
+      );
+      expect(toast.custom).toHaveBeenCalledWith(
+        <Alert
+          variant={AlertVariants.Success}
+          message={`Added ${league.leagueName} to your leagues!`}
+        />,
+      );
+    });
+  });
+
+  it('should show error if adding to league fails', async () => {
+    mockUseAuthContext.isSignedIn = true;
+
+    const user = {
+      documentId: '123',
+      email: 'test@test.com',
+      id: '123',
+      leagues: [],
+    };
 
+    const league = {
+      leagueId: '123',
+      leagueName: 'Test League',
+      logo: 'logo.png',
+      participants: [],
+      survivors: [],
+    };
+
+    mockUseDataStore.mockReturnValue({
+      user,
+      allLeagues: [league],
+    });
+
+    mockGetUserLeagues.mockResolvedValueOnce([]);
+    mockGetAllLeagues.mockResolvedValueOnce([league]);
+    mockAddUserToLeague.mockResolvedValue(
+      Promise.resolve({
+        userDocumentId: user.documentId,
+        selectedLeague: league.leagueId,
+        selectedLeagues: [league.leagueId],
+        participants: [user.id],
+        survivors: [user.id],
+      }),
+    );
+
+    render(<Leagues />);
+
+    await waitFor(() => {
+      expect(screen.queryByTestId('global-spinner')).not.toBeInTheDocument();
+    });
+
+    const selectElement = screen.getByTestId('select-available-leagues');
     fireEvent.change(selectElement, { target: { value: '123' } });
-    fireEvent.click(screen.getByText(/Join League/i));
+    fireEvent.click(screen.getByTestId('join-league-button'));
 
     await waitFor(() => {
-      expect(
-        screen.getByText('Added Test League to your leagues!'),
-      ).toBeInTheDocument();
+      expect(mockAddUserToLeague).toHaveBeenCalledWith({
+        userDocumentId: user.documentId,
+        selectedLeague: league.leagueId,
+        selectedLeagues: [league.leagueId],
+        participants: [user.id],
+        survivors: [user.id],
+      });
+
+      expect(toast.custom).toHaveBeenCalledWith(
+        <Alert
+          variant={AlertVariants.Error}
+          message="Failed to add the league. Please try again."
+        />,
+      );
     });
   });
 });
diff --git a/app/(main)/league/all/page.tsx b/app/(main)/league/all/page.tsx
index 3e9e78dd..56c04323 100644
--- a/app/(main)/league/all/page.tsx
+++ b/app/(main)/league/all/page.tsx
@@ -124,13 +124,12 @@ const Leagues = (): JSX.Element => {
   return (
     <div className="Leagues mx-auto max-w-3xl pt-10">
       {loadingData ? (
-        <GlobalSpinner />
+        <GlobalSpinner data-testid="global-spinner" />
       ) : (
         <>
           <h1 className="pb-10 text-center text-3xl font-bold tracking-tight">
             Your Leagues
           </h1>
-
           <section className="grid gap-6 md:grid-cols-2 mb-10">
             {leagues.length > 0 ? (
               leagues.map((league) => (
@@ -145,7 +144,10 @@ const Leagues = (): JSX.Element => {
               ))
             ) : (
               <div className="text-center">
-                <p className="text-lg font-bold">
+                <p
+                  className="text-lg font-bold"
+                  data-testid="no-leagues-message"
+                >
                   You are not enrolled in any leagues
                 </p>
               </div>
@@ -169,6 +171,7 @@ const Leagues = (): JSX.Element => {
                 render={({ field, fieldState }) => (
                   <>
                     <select
+                      data-testid="select-available-leagues"
                       {...field}
                       id="available-leagues"
                       className={`border border-border rounded p-2 w-full text-secondary ${
@@ -198,7 +201,9 @@ const Leagues = (): JSX.Element => {
                 )}
               />
             </div>
-            <Button type="submit">Join League</Button>
+            <Button type="submit" data-testid="join-league-button">
+              Join League
+            </Button>
           </form>
         </>
       )}
diff --git a/store/dataStore.test.ts b/store/dataStore.test.ts
index 515ffa4a..ab4f9acf 100644
--- a/store/dataStore.test.ts
+++ b/store/dataStore.test.ts
@@ -3,8 +3,9 @@ import { useDataStore } from './dataStore';
 
 // test values
 const userData = {
-  userId: '123',
-  userEmail: 'test@email.com',
+  documentId: '123',
+  id: '123',
+  email: 'test@email.com',
   leagues: ['123456'],
 };
 
@@ -44,7 +45,7 @@ const allLeagues = [
 ];
 
 describe('Data Store', () => {
-  xdescribe('User Test', () => {
+  describe('User Test', () => {
     it('Check the default user state', () => {
       const { result } = renderHook(() => useDataStore());
       expect(result.current.user.id).toBe('');
@@ -56,6 +57,7 @@ describe('Data Store', () => {
 
       act(() => {
         result.current.updateUser(
+          userData.documentId,
           userData.userId,
           userData.userEmail,
           userData.leagues,
@@ -70,6 +72,7 @@ describe('Data Store', () => {
 
       act(() => {
         result.current.updateUser(
+          userData.documentId,
           userData.userId,
           userData.userEmail,
           userData.leagues,
@@ -112,18 +115,22 @@ describe('Data Store', () => {
         leagueId: '123',
         gameWeekId: '456',
         userResults: {
-          '66281d5ec5614f76bc91': {
-            team: '66218f22b40deef340f8',
-            correct: false,
-          },
-          '6628077faeeedd272637': {
-            team: '6621b30ea57bd075e9d3',
-            correct: false,
-          },
-          '66174f2362ec891167be': {
-            team: '6621b30ea57bd075e9d3',
-            correct: true,
-          },
+          '123': {
+            '456': {
+            'entry1': {
+              teamName: 'New England Patriots',
+              correct:true
+            },
+            'entry2': {
+              teamName: 'Kansas City Chiefs',
+              correct:false
+            },
+            'entry3': {
+              teamName: 'New England Patriots',
+              correct:false
+            }
+          }
+          }
         },
       };
       act(() => {

From 062603a26d0430ffad01491dfa95c665172cfe32 Mon Sep 17 00:00:00 2001
From: Eduardo Vazquez <80133388+vazquezea96@users.noreply.github.com>
Date: Mon, 14 Oct 2024 09:37:39 -0700
Subject: [PATCH 115/118] Eddie/450-add-users-leagues-to-side-menu (#460)

Adding the user's leagues to the side menu.
Actions done:

- [x] Updated Api call so it only gets called once.

---------

Co-authored-by: Shashi Lo <362527+shashilo@users.noreply.github.com>
---
 components/Nav/Nav.test.tsx | 39 +++++++++++++++++++++++++++++++++++++
 components/Nav/Nav.tsx      | 15 +++++++++++++-
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/components/Nav/Nav.test.tsx b/components/Nav/Nav.test.tsx
index 47abd352..b23ea7d9 100644
--- a/components/Nav/Nav.test.tsx
+++ b/components/Nav/Nav.test.tsx
@@ -1,6 +1,8 @@
 import { render, screen, fireEvent, waitFor } from '@testing-library/react';
 import Nav from './Nav';
 import Login from '@/app/(main)/login/page';
+import { useDataStore } from '@/store/dataStore';
+import { getUserLeagues } from '@/utils/utils';
 
 const mockPush = jest.fn();
 const mockUsePathname = jest.fn();
@@ -32,6 +34,10 @@ jest.mock('../../context/AuthContextProvider', () => ({
   },
 }));
 
+jest.mock('@/store/dataStore', () => ({
+  useDataStore: jest.fn(() => ({ user: { id: '123', leagues: [] } })),
+}));
+
 Object.defineProperty(window, 'matchMedia', {
   writable: true,
   value: jest.fn().mockImplementation((query) => ({
@@ -47,10 +53,25 @@ Object.defineProperty(window, 'matchMedia', {
 });
 
 describe('Nav', () => {
+  const mockUseDataStore = useDataStore as unknown as jest.Mock;
+  const mockGetUserLeagues = getUserLeagues as jest.Mock;
+
   beforeEach(() => {
     jest.clearAllMocks();
   });
 
+  it('renders link to /league/all', async () => {
+    render(<Nav />);
+
+    const drawTrigger = screen.getByTestId('drawer-trigger');
+    fireEvent.click(drawTrigger);
+
+    let linkNav: HTMLElement;
+    linkNav = await screen.getByTestId('league-link');
+    expect(linkNav).toBeInTheDocument();
+    expect(linkNav).toHaveAttribute('href', '/league/all');
+  });
+
   it('it should render the default component state', () => {
     mockUsePathname.mockImplementation(() => '/weeklyPicks');
 
@@ -163,4 +184,22 @@ describe('Nav', () => {
       expect(drawerTrigger.getAttribute('data-state')).toBe('closed');
     });
   });
+
+  it('it should close the drawer when the leagues link is clicked', async () => {
+    mockUsePathname.mockImplementation(() => '/league/all');
+
+    render(<Nav />);
+
+    const drawerTrigger = screen.getByTestId('drawer-trigger');
+
+    fireEvent.click(drawerTrigger);
+
+    const linkNav = screen.getByTestId('league-link');
+
+    fireEvent.click(linkNav);
+
+    await waitFor(() => {
+      expect(drawerTrigger.getAttribute('data-state')).toBe('closed');
+    });
+  });
 });
diff --git a/components/Nav/Nav.tsx b/components/Nav/Nav.tsx
index 47ed1bd0..9eba9c7e 100644
--- a/components/Nav/Nav.tsx
+++ b/components/Nav/Nav.tsx
@@ -6,6 +6,7 @@ import React, { JSX } from 'react';
 import LogoNav from '../LogoNav/LogoNav';
 import { Menu } from 'lucide-react';
 import { Button } from '../Button/Button';
+import Link from 'next/link';
 import {
   Drawer,
   DrawerContent,
@@ -68,9 +69,21 @@ export const Nav = (): JSX.Element => {
                 <DrawerTitle data-testid="title">Gridiron Survivor</DrawerTitle>
               </DrawerHeader>
               <ul className="m-0 flex flex-col gap-4 p-0">
+                <li>
+                  <Link
+                    data-testid="league-link"
+                    href="/league/all"
+                    className={cn(
+                      'underline underline-offset-4 hover:text-primary-muted transition-colors',
+                    )}
+                    onClick={() => setOpen(false)}
+                  >
+                    Leagues
+                  </Link>
+                </li>
                 <li>
                   <Button
-                    className="p-0 text-base font-normal text-muted-foreground"
+                    className="p-0 text-base font-normal text-primary-foreground"
                     variant="link"
                     label="Sign Out"
                     onClick={() => {

From 068997a3848b8131dcd7319f40fa98e0ebe9bfe8 Mon Sep 17 00:00:00 2001
From: Walter Furrer <walterfurrer@proton.me>
Date: Mon, 14 Oct 2024 13:21:26 -0400
Subject: [PATCH 116/118] docs: Create Welcome Page on Storybook (#543)

- [x] Added introductory paragraph about GIS (open to suggestions on the
verbiage).
- [x] Added Sponsors section with links to their respective websites.
- [x] Added Team Member section with GitHub and LinkedIn profile links.


![image](https://github.com/user-attachments/assets/2fc5e663-b951-4ee1-a26d-6e3d2241eb8d)

![image](https://github.com/user-attachments/assets/d55d3e87-86b0-4e3b-8576-ff6b8e27865a)

Closes #246

---------

Co-authored-by: Shashi Lo <362527+shashilo@users.noreply.github.com>
---
 .env.example                         |   4 -
 .storybook/main.ts                   |   2 +
 .storybook/manager.js                |   8 ++
 .storybook/preview.ts                |   9 +-
 package.json                         |   3 +-
 pnpm-lock.yaml                       |  24 ++++--
 public/assets/appwriteLogo.svg       |   9 ++
 public/assets/blogRecorderLogo.svg   |  85 ++++++++++++++++++
 public/assets/fonts/Geist[wght].ttf  | Bin 0 -> 141824 bytes
 public/assets/frontendMentorLogo.svg |   6 ++
 public/assets/gitkrakenLogo.svg      |   4 +
 public/assets/pastelLogo.svg         |  13 +++
 stories/Sponsors.tsx                 |  74 ++++++++++++++++
 stories/TeamMemberInfo.tsx           |  65 ++++++++++++++
 stories/TeamMemberSection.tsx        | 123 +++++++++++++++++++++++++++
 stories/Welcome.mdx                  |  36 +++++++-
 stories/styles.css                   |  62 ++++++++++++++
 tailwind.config.js                   |   2 +
 18 files changed, 508 insertions(+), 21 deletions(-)
 delete mode 100644 .env.example
 create mode 100644 .storybook/manager.js
 create mode 100644 public/assets/appwriteLogo.svg
 create mode 100644 public/assets/blogRecorderLogo.svg
 create mode 100644 public/assets/fonts/Geist[wght].ttf
 create mode 100644 public/assets/frontendMentorLogo.svg
 create mode 100644 public/assets/gitkrakenLogo.svg
 create mode 100644 public/assets/pastelLogo.svg
 create mode 100644 stories/Sponsors.tsx
 create mode 100644 stories/TeamMemberInfo.tsx
 create mode 100644 stories/TeamMemberSection.tsx

diff --git a/.env.example b/.env.example
deleted file mode 100644
index 27599447..00000000
--- a/.env.example
+++ /dev/null
@@ -1,4 +0,0 @@
-NEXT_PUBLIC_APPWRITE_API_URL=
-NEXT_PUBLIC_APPWRITE_PROJECT_ID=
-NEXT_PUBLIC_APPWRITE_DATABASE_ID=
-APPWRITE_API_KEY=
\ No newline at end of file
diff --git a/.storybook/main.ts b/.storybook/main.ts
index 04d7722b..691fc39c 100644
--- a/.storybook/main.ts
+++ b/.storybook/main.ts
@@ -2,6 +2,7 @@ import type { StorybookConfig } from '@storybook/nextjs';
 
 const config: StorybookConfig = {
   stories: [
+    '../stories/*.mdx',
     '../stories/**/*.mdx',
     '../components/**/*.stories.@(js|jsx|mjs|ts|tsx)',
   ],
@@ -12,6 +13,7 @@ const config: StorybookConfig = {
     '@storybook/addon-essentials',
     '@chromatic-com/storybook',
     '@storybook/addon-interactions',
+    '@storybook/manager-api',
   ],
   framework: {
     name: '@storybook/nextjs',
diff --git a/.storybook/manager.js b/.storybook/manager.js
new file mode 100644
index 00000000..e73de14d
--- /dev/null
+++ b/.storybook/manager.js
@@ -0,0 +1,8 @@
+import { addons } from '@storybook/manager-api';
+
+addons.setConfig({
+  sidebar: {
+    showRoots: true,
+    collapsedRoots: ['about', 'technical-planning-documents'],
+  },
+});
diff --git a/.storybook/preview.ts b/.storybook/preview.ts
index 40b5e67a..9de16511 100644
--- a/.storybook/preview.ts
+++ b/.storybook/preview.ts
@@ -1,5 +1,6 @@
 import type { Preview } from '@storybook/react';
 import '../app/globals.css';
+import '../stories/styles.css';
 
 const preview: Preview = {
   parameters: {
@@ -9,13 +10,7 @@ const preview: Preview = {
         date: /Date$/i,
       },
     },
-    backgrounds: {
-      default: 'dark',
-      values: [
-        { name: 'dark', value: '#09090B' },
-        { name: 'light', value: '#fff' },
-      ],
-    },
+    layout: 'centered',
   },
 };
 
diff --git a/package.json b/package.json
index bf8fd0c9..b7f8dbc8 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "clsx": "^2.1.0",
     "geist": "^1.2.2",
     "immer": "^10.1.1",
-    "lucide-react": "^0.312.0",
+    "lucide-react": "^0.447.0",
     "next": "^14.1.1",
     "node-appwrite": "^13.0.0",
     "postcss": "8.4.29",
@@ -34,6 +34,7 @@
     "react-dom": "18.2.0",
     "react-hook-form": "^7.51.3",
     "react-hot-toast": "^2.4.1",
+    "react-icons": "^5.3.0",
     "tailwind-merge": "^2.2.2",
     "tailwindcss": "3.3.3",
     "tailwindcss-animate": "^1.0.7",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b34ba8bc..22e5ef82 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -48,8 +48,8 @@ importers:
         specifier: ^10.1.1
         version: 10.1.1
       lucide-react:
-        specifier: ^0.312.0
-        version: 0.312.0(react@18.2.0)
+        specifier: ^0.447.0
+        version: 0.447.0(react@18.2.0)
       next:
         specifier: ^14.1.1
         version: 14.2.3(@babel/core@7.24.7)(@playwright/test@1.44.1)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
@@ -71,6 +71,9 @@ importers:
       react-hot-toast:
         specifier: ^2.4.1
         version: 2.4.1(csstype@3.1.3)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      react-icons:
+        specifier: ^5.3.0
+        version: 5.3.0(react@18.2.0)
       tailwind-merge:
         specifier: ^2.2.2
         version: 2.3.0
@@ -4890,10 +4893,10 @@ packages:
   lru-cache@5.1.1:
     resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
 
-  lucide-react@0.312.0:
-    resolution: {integrity: sha512-3UZsqyswRXjW4t+nw+InICewSimjPKHuSxiFYqTshv9xkK3tPPntXk/lvXc9pKlXIxm3v9WKyoxcrB6YHhP+dg==}
+  lucide-react@0.447.0:
+    resolution: {integrity: sha512-SZ//hQmvi+kDKrNepArVkYK7/jfeZ5uFNEnYmd45RKZcbGD78KLnrcNXmgeg6m+xNHFvTG+CblszXCy4n6DN4w==}
     peerDependencies:
-      react: ^16.5.1 || ^17.0.0 || ^18.0.0
+      react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0-rc
 
   lz-string@1.5.0:
     resolution: {integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==}
@@ -5719,6 +5722,11 @@ packages:
       react: '>=16'
       react-dom: '>=16'
 
+  react-icons@5.3.0:
+    resolution: {integrity: sha512-DnUk8aFbTyQPSkCfF8dbX6kQjXA9DktMeJqfjrg6cK9vwQVMxmcA3BfP4QoiztVmEHtwlTgLFsPuH2NskKT6eg==}
+    peerDependencies:
+      react: '*'
+
   react-is@16.13.1:
     resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
 
@@ -12981,7 +12989,7 @@ snapshots:
     dependencies:
       yallist: 3.1.1
 
-  lucide-react@0.312.0(react@18.2.0):
+  lucide-react@0.447.0(react@18.2.0):
     dependencies:
       react: 18.2.0
 
@@ -13777,6 +13785,10 @@ snapshots:
     transitivePeerDependencies:
       - csstype
 
+  react-icons@5.3.0(react@18.2.0):
+    dependencies:
+      react: 18.2.0
+
   react-is@16.13.1: {}
 
   react-is@17.0.2: {}
diff --git a/public/assets/appwriteLogo.svg b/public/assets/appwriteLogo.svg
new file mode 100644
index 00000000..6b35a520
--- /dev/null
+++ b/public/assets/appwriteLogo.svg
@@ -0,0 +1,9 @@
+<svg class="u-max-width-100-percent" xmlns="http://www.w3.org/2000/svg" width="224" height="196" viewBox="0 0 112 98"
+  fill="none">
+  <path
+    d="M111.1 73.4729V97.9638H48.8706C30.7406 97.9638 14.9105 88.114 6.44112 73.4729C5.2099 71.3444 4.13229 69.1113 3.22835 66.7935C1.45387 62.2516 0.338421 57.3779 0 52.2926V45.6712C0.0734729 44.5379 0.189248 43.4135 0.340647 42.3025C0.650124 40.0227 1.11768 37.7918 1.73218 35.6232C7.54544 15.0641 26.448 0 48.8706 0C71.2932 0 90.1935 15.0641 96.0068 35.6232H69.3985C65.0302 28.9216 57.4692 24.491 48.8706 24.491C40.272 24.491 32.711 28.9216 28.3427 35.6232C27.0113 37.6604 25.9782 39.9069 25.3014 42.3025C24.7002 44.4266 24.3796 46.6664 24.3796 48.9819C24.3796 56.0019 27.3319 62.3295 32.0653 66.7935C36.4515 70.9369 42.3649 73.4729 48.8706 73.4729H111.1Z"
+    fill="#FD366E" />
+  <path
+    d="M111.1 42.3027V66.7937H65.6759C70.4094 62.3297 73.3616 56.0021 73.3616 48.9821C73.3616 46.6666 73.041 44.4268 72.4399 42.3027H111.1Z"
+    fill="#FD366E" />
+</svg>
\ No newline at end of file
diff --git a/public/assets/blogRecorderLogo.svg b/public/assets/blogRecorderLogo.svg
new file mode 100644
index 00000000..94685af2
--- /dev/null
+++ b/public/assets/blogRecorderLogo.svg
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="_x31_" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="1200px" height="1200px" viewBox="0 0 1200 1200" enable-background="new 0 0 1200 1200" xml:space="preserve">
+<g>
+	<path fill="#FFFFFF" d="M839.66,52.725H296.127c-63.946,0-115.785,51.839-115.785,115.785v859.743
+		c0,65.734,53.288,119.021,119.021,119.021h601.274c65.734,0,119.021-53.288,119.021-119.021V239.802L839.66,52.725z"/>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="374.1526" y1="650.3186" x2="657.4055" y2="938.2042">
+		<stop  offset="0" style="stop-color:#91BFD4"/>
+		<stop  offset="0.485" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#FFFFFF"/>
+	</linearGradient>
+	<path fill="url(#SVGID_1_)" d="M375.827,520.651L719.97,869.132c0,0-53.513,41.964-190.85,17.35S308.991,680.451,316.581,641.413
+		S375.827,520.651,375.827,520.651z"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="381.4353" y1="1012.917" x2="835.0216" y2="1012.917">
+		<stop  offset="0" style="stop-color:#91BFD4"/>
+		<stop  offset="0.485" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#FFFFFF"/>
+	</linearGradient>
+	<path fill="url(#SVGID_2_)" d="M381.435,851.992l329.859,321.851c0,0,127.957-32.531,123.619-30.363
+		c-4.337,2.169-256.997-270.01-256.997-270.01s-70.485,10.844-116.028,3.253S381.435,851.992,381.435,851.992z"/>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="1065.3112" y1="1027.0924" x2="800.6655" y2="779.6491">
+		<stop  offset="0.0411" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.5125" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.5888" style="stop-color:#F6FAFC"/>
+		<stop  offset="0.7112" style="stop-color:#DFECF2"/>
+		<stop  offset="0.8633" style="stop-color:#B9D6E4"/>
+		<stop  offset="1" style="stop-color:#91BFD4"/>
+	</linearGradient>
+	<path fill="url(#SVGID_3_)" d="M892.386,532.975l146.391,166.994c0,0,23.856,364.351-68.316,412.063
+		c-92.172,47.713-145.408,22.851-145.408,22.851L609.7,907.634c0,0,143.886-41.755,194.851-137.18
+		C855.517,675.029,892.386,532.975,892.386,532.975z"/>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="647.2059" y1="564.1495" x2="913.0824" y2="621.9241">
+		<stop  offset="0" style="stop-color:#91BFD4"/>
+		<stop  offset="0.1367" style="stop-color:#B9D6E4"/>
+		<stop  offset="0.2888" style="stop-color:#DFECF2"/>
+		<stop  offset="0.4112" style="stop-color:#F6FAFC"/>
+		<stop  offset="0.4875" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.9589" style="stop-color:#FFFFFF"/>
+	</linearGradient>
+	<path fill="url(#SVGID_4_)" d="M721.235,266.559l171.151,189.425c0,0,7.771,250.491-85.576,345.916S627.315,873.47,627.315,873.47
+		l-143.74-155.066c0,0,214.707,6.506,241.816-72.653s23.856-190.609,23.856-249.286S721.235,266.559,721.235,266.559z"/>
+	<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="600" y1="1187.6229" x2="600" y2="12.3771">
+		<stop  offset="0" style="stop-color:#073251"/>
+		<stop  offset="0.3664" style="stop-color:#083352"/>
+		<stop  offset="1" style="stop-color:#296084"/>
+	</linearGradient>
+	<path fill="url(#SVGID_5_)" d="M856.829,12.377H268.583c-71.018,0-128.589,57.571-128.589,128.589v914.832
+		c0,72.805,59.02,131.824,131.824,131.824h656.364c72.805,0,131.824-59.02,131.824-131.824V239.416
+		c0-13.78-5.433-27.004-15.121-36.804L856.829,12.377z M880.007,152.852l62.985,65.462l-62.985-0.407V152.852z M979.311,294.145
+		v713.941c0,54.589-44.253,98.841-98.841,98.841H319.531c-54.589,0-98.841-44.253-98.841-98.841V188.679
+		c0-52.802,42.804-95.606,95.606-95.606h483.016v132.68c0,37.772,30.62,68.393,68.393,68.393H979.311z"/>
+	<g>
+		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="594.5435" y1="782.7435" x2="594.5435" y2="208.7465">
+			<stop  offset="0" style="stop-color:#073251"/>
+			<stop  offset="0.3664" style="stop-color:#083352"/>
+			<stop  offset="1" style="stop-color:#296084"/>
+		</linearGradient>
+		<path fill="url(#SVGID_6_)" d="M594.544,208.747L594.544,208.747c-92.628,0-167.717,75.089-167.717,167.717v238.563
+			c0,92.627,75.089,167.717,167.717,167.717h0c92.627,0,167.717-75.089,167.717-167.717V376.463
+			C762.26,283.836,687.171,208.747,594.544,208.747z M538.397,611.664H477.19c-12.909,0-23.374-10.465-23.374-23.374
+			c0-12.909,10.465-23.374,23.374-23.374h61.207c12.909,0,23.374,10.465,23.374,23.374
+			C561.771,601.198,551.306,611.664,538.397,611.664z M561.771,492.377c0,12.909-10.465,23.374-23.374,23.374H477.19
+			c-12.909,0-23.374-10.465-23.374-23.374v0c0-12.909,10.465-23.374,23.374-23.374h61.207
+			C551.306,469.002,561.771,479.467,561.771,492.377L561.771,492.377z M538.397,419.839H477.19
+			c-12.909,0-23.374-10.465-23.374-23.374c0-12.909,10.465-23.374,23.374-23.374h61.207c12.909,0,23.374,10.465,23.374,23.374
+			C561.771,409.374,551.306,419.839,538.397,419.839z M711.897,611.664H650.69c-12.909,0-23.374-10.465-23.374-23.374
+			c0-12.909,10.465-23.374,23.374-23.374h61.207c12.909,0,23.374,10.465,23.374,23.374
+			C735.271,601.198,724.806,611.664,711.897,611.664z M735.271,492.377c0,12.909-10.465,23.374-23.374,23.374H650.69
+			c-12.909,0-23.374-10.465-23.374-23.374v0c0-12.909,10.465-23.374,23.374-23.374h61.207
+			C724.806,469.002,735.271,479.467,735.271,492.377L735.271,492.377z M711.897,419.839H650.69
+			c-12.909,0-23.374-10.465-23.374-23.374c0-12.909,10.465-23.374,23.374-23.374h61.207c12.909,0,23.374,10.465,23.374,23.374
+			C735.271,409.374,724.806,419.839,711.897,419.839z"/>
+		<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="594.182" y1="1106.9271" x2="594.182" y2="499.3596">
+			<stop  offset="0" style="stop-color:#073251"/>
+			<stop  offset="1" style="stop-color:#083352"/>
+		</linearGradient>
+		<path fill="url(#SVGID_7_)" d="M849.553,499.36c-23.656,0-42.833,19.177-42.833,42.833v102.474
+			c0,117.381-95.156,212.538-212.538,212.538h-0.001c-117.381,0-212.538-95.156-212.538-212.538V542.192
+			c0-23.656-19.177-42.833-42.833-42.833c-23.656,0-42.833,19.177-42.833,42.833v103.558c0,149.47,112.429,272.661,257.329,289.672
+			v171.505h93.256V933.846c139.303-22.008,245.822-142.606,245.822-288.096V542.192C892.386,518.536,873.209,499.36,849.553,499.36z
+			"/>
+	</g>
+</g>
+</svg>
diff --git a/public/assets/fonts/Geist[wght].ttf b/public/assets/fonts/Geist[wght].ttf
new file mode 100644
index 0000000000000000000000000000000000000000..e95c2195cdc766dfe96f0af9137f7f28a33fca7a
GIT binary patch
literal 141824
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
F{{epTBe?(o

literal 0
HcmV?d00001

diff --git a/public/assets/frontendMentorLogo.svg b/public/assets/frontendMentorLogo.svg
new file mode 100644
index 00000000..ad940756
--- /dev/null
+++ b/public/assets/frontendMentorLogo.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg viewBox="0.0001 0 1000.0002 1000" width="1000" height="1000" xmlns="http://www.w3.org/2000/svg">
+  <path d="M 969.504 524.261 C 965.204 524.261 960.944 523.247 957.024 521.298 L 695.226 390.158 C 689.886 387.493 685.306 383.079 682.106 377.571 C 678.906 372.043 677.206 365.6 677.206 359.018 C 677.206 352.416 678.906 345.994 682.106 340.446 C 685.306 334.938 689.886 330.543 695.226 327.859 L 957.024 197.158 C 964.424 193.519 972.824 193.241 980.344 196.502 C 987.904 199.723 994.004 206.146 997.324 214.438 C 1000.584 222.688 1000.824 232.054 997.924 240.525 C 995.024 248.956 989.244 255.776 981.884 259.495 L 782.405 359.058 L 981.904 458.999 C 988.284 462.18 993.484 467.688 996.644 474.648 C 999.864 481.608 1000.804 489.582 999.304 497.237 C 997.884 504.893 994.124 511.753 988.664 516.645 C 983.264 521.556 976.484 524.241 969.504 524.261 Z" fill="#67BECE" style="transform-origin: 0.013px 0px;"/>
+  <path d="M 612.766 1000 C 324.948 1000 73.329 782.662 0.989 471.447 C -1.051 462.678 0.089 453.391 4.189 445.596 C 8.269 437.782 14.969 432.154 22.809 429.848 C 30.649 427.581 38.949 428.853 45.909 433.447 C 52.889 438 57.949 445.497 59.989 454.266 C 91.909 591.034 163.469 712.13 263.488 798.55 C 363.528 884.969 486.367 931.817 612.766 931.758 C 620.846 931.758 628.606 935.377 634.326 941.76 C 640.046 948.143 643.246 956.813 643.246 965.86 C 643.246 974.908 640.046 983.597 634.326 989.98 C 628.606 996.401 620.846 1000 612.766 1000 Z" fill="#3F54A3" style="transform-origin: 0.013px 0px;"/>
+  <path d="M 507.707 716.684 C 499.587 716.684 491.867 713.065 486.127 706.682 C 480.407 700.259 477.207 691.569 477.207 682.542 L 477.207 34.103 C 477.207 25.055 480.407 16.365 486.127 9.982 C 491.867 3.599 499.587 0 507.707 0 C 515.787 0 523.527 3.599 529.267 9.982 C 534.987 16.365 538.187 25.055 538.187 34.103 L 538.187 682.581 C 538.187 691.609 534.967 700.299 529.247 706.702 C 523.527 713.065 515.787 716.684 507.707 716.684 Z" fill="#67BECE" style="transform-origin: 0.013px 0px;"/>
+</svg>
\ No newline at end of file
diff --git a/public/assets/gitkrakenLogo.svg b/public/assets/gitkrakenLogo.svg
new file mode 100644
index 00000000..9faca53c
--- /dev/null
+++ b/public/assets/gitkrakenLogo.svg
@@ -0,0 +1,4 @@
+<svg width="188" height="188" viewBox="0 0 188 188" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="94" cy="94" r="91" fill="#0D1017"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 94C0 42.1664 42.1664 0 94 0C145.834 0 188 42.1664 188 94C188 145.834 145.834 188 94 188C42.1664 188 0 145.834 0 94ZM165.825 66.3028C165.536 65.5139 164.973 64.8564 164.248 64.4409L164.227 64.4357C163.501 64.0254 162.649 63.8781 161.823 64.0254C160.997 64.1779 160.25 64.6145 159.714 65.2562C159.177 65.8978 158.888 66.7131 158.888 67.5546C158.893 67.9806 158.967 68.3962 159.114 68.8064C162.07 76.6643 163.564 84.9114 163.559 93.311C163.559 110.31 157.378 126.673 146.154 139.38C135.151 151.84 120.098 159.929 103.704 162.212V130.512C105.371 130.17 107.028 129.729 108.643 129.187V156.621L109.295 156.463C123.207 153.081 135.814 145.024 144.787 133.763C154.033 122.16 158.925 108.175 158.925 93.3163C158.941 81.7083 155.837 70.2896 149.947 60.2911C144.061 50.2873 135.577 42.0349 125.421 36.4176C124.99 36.1862 124.532 36.0442 124.048 35.9969C123.564 35.9495 123.086 36.0021 122.623 36.1494C122.16 36.2967 121.739 36.5333 121.371 36.8489C121.003 37.1698 120.708 37.5485 120.493 37.9903C120.256 38.4794 120.13 39.0212 120.13 39.5629C120.13 40.1993 120.298 40.8252 120.619 41.3722C120.94 41.9192 121.403 42.3768 121.96 42.6871C131.007 47.6838 138.56 55.0262 143.809 63.9255C149.058 72.8248 151.83 82.9916 151.83 93.3215C151.83 105.161 148.274 116.543 141.536 126.247C135.114 135.504 126.263 142.62 115.901 146.87V123.638C117.579 123.049 119.052 122.018 120.193 120.645C121.413 119.173 122.171 117.39 122.391 115.491C122.612 113.587 122.276 111.678 121.418 109.968C120.614 108.359 119.393 107.012 117.879 106.055C119.266 93.3095 123.322 90.7899 126.293 88.9442L126.299 88.9402C128.067 87.8462 129.592 86.8995 129.592 84.1435V80.2198C129.592 76.1541 125.552 66.6657 116.527 54.6422C104.03 37.9955 96.9033 36.2546 95.0309 36.1178C94.3287 36.0466 93.72 36.0787 93.0476 36.1142L92.9796 36.1178C91.0914 36.2546 83.9646 37.9955 71.452 54.6422C62.4107 66.6657 58.3661 76.1541 58.3661 80.2198V84.1329C58.3661 86.889 59.8913 87.8357 61.6586 88.9297C64.6303 90.7706 68.6907 93.29 70.0792 106.039C68.717 106.891 67.5809 108.075 66.7814 109.474C65.9294 110.973 65.4876 112.677 65.5034 114.397C65.5034 118.463 68.1805 122.207 72.0621 123.633V146.87C61.7006 142.625 52.854 135.509 46.4267 126.247C39.6944 116.548 36.1284 105.161 36.1284 93.3268C36.1284 72.3041 47.5838 52.9013 66.0241 42.6871C66.7131 42.3032 67.2601 41.6983 67.5704 40.9725C67.8807 40.2466 67.9438 39.4314 67.744 38.6688C67.5494 37.9061 67.097 37.2224 66.4764 36.7385C65.8558 36.2546 65.0826 35.9863 64.2936 35.9863H64.2884C63.694 35.9863 63.105 36.1389 62.5895 36.4282C52.4279 42.0402 43.9389 50.2925 38.0429 60.2911C32.1468 70.2896 29.0331 81.7135 29.0436 93.3215C29.0436 108.185 33.9351 122.171 43.1815 133.773C52.1597 145.034 64.7617 153.092 78.6735 156.474L79.3257 156.632V129.203C80.9404 129.744 82.5971 130.191 84.2644 130.528V162.228C67.8702 159.94 52.8171 151.845 41.814 139.391C30.59 126.683 24.4047 110.326 24.4047 93.3215C24.3994 84.9219 25.8984 76.6748 28.8648 68.8169C29.0279 68.3751 29.1015 67.9123 29.0857 67.4442C29.0699 66.9761 28.9595 66.5185 28.7649 66.0924C28.5703 65.6664 28.2968 65.2877 27.9496 64.9669C27.6025 64.646 27.208 64.3988 26.7662 64.2358C26.3244 64.0727 25.8616 63.9991 25.3935 64.0149C24.9254 64.0307 24.4678 64.1411 24.0417 64.3357C23.6157 64.5303 23.237 64.8038 22.9162 65.151C22.5953 65.4981 22.3481 65.8978 22.1851 66.3344C17.9511 77.6478 16.4416 89.9764 17.8143 101.979C19.1871 113.981 23.4474 125.647 30.1271 135.714C36.8069 145.781 45.906 154.238 56.4305 160.166C66.9603 166.094 78.9049 169.491 90.9757 169.986L91.5227 170.007V131.438C92.5799 131.485 93.9158 131.512 94 131.512C94.0195 131.51 94.1421 131.507 94.3319 131.503C94.8076 131.492 95.7058 131.472 96.4615 131.438V170.007L97.0085 169.986C109.079 169.476 121.019 166.073 131.543 160.14C142.068 154.202 151.162 145.749 157.841 135.683C164.521 125.616 168.787 113.955 170.165 101.953C171.548 89.9501 170.044 77.6215 165.825 66.3028ZM80.2729 117.561C81.0093 116.462 81.3407 115.136 81.2144 113.822C81.0882 112.507 80.5044 111.271 79.5734 110.334C79.0422 109.798 78.4163 109.377 77.7168 109.088C77.0172 108.799 76.2809 108.651 75.5288 108.651H75.5235C74.2033 108.651 72.9147 109.114 71.8944 109.95C70.874 110.787 70.1692 111.96 69.9115 113.259C69.6538 114.553 69.8536 115.91 70.4743 117.072C71.0949 118.234 72.11 119.155 73.3302 119.665C74.5505 120.17 75.918 120.238 77.1803 119.86C78.4426 119.476 79.5471 118.666 80.2782 117.566L80.2729 117.561ZM117.542 111.721C116.921 110.553 115.911 109.633 114.691 109.128C113.992 108.833 113.24 108.686 112.487 108.686C111.935 108.686 111.378 108.765 110.841 108.928C109.579 109.307 108.474 110.122 107.738 111.216C107.002 112.31 106.665 113.641 106.791 114.95C106.918 116.265 107.496 117.501 108.427 118.437C108.958 118.974 109.584 119.395 110.284 119.689C110.983 119.979 111.72 120.126 112.477 120.126H112.482C113.802 120.126 115.086 119.668 116.106 118.832C117.126 117.996 117.831 116.823 118.094 115.529C118.352 114.235 118.157 112.878 117.537 111.716L117.542 111.721Z" fill="#FFFCC3"/>
+</svg>
diff --git a/public/assets/pastelLogo.svg b/public/assets/pastelLogo.svg
new file mode 100644
index 00000000..92647f4b
--- /dev/null
+++ b/public/assets/pastelLogo.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg viewBox="0.5322 0.981 1000 1333.3323" width="1000px" height="1333.332px" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <clipPath id="clip0_103_988">
+      <rect width="46.4681" height="60.3482" fill="white" transform="translate(0.532227 0.980957)"/>
+    </clipPath>
+  </defs>
+  <g clip-path="url(#clip0_103_988)" transform="matrix(21.748836517333984, 0, 0, 22.094079971313477, -11.04308795928955, -20.6923828125)">
+    <path d="M23.522 46.9605C36.2189 46.9605 46.5117 36.6676 46.5117 23.9707C46.5117 11.2738 36.2189 0.980957 23.522 0.980957C10.8251 0.980957 0.532227 11.2738 0.532227 23.9707C0.532227 36.6676 10.8251 46.9605 23.522 46.9605Z" fill="#4C6EF5"/>
+    <path d="M0.532227 22.0547C13.7582 22.0547 24.4799 32.7764 24.4799 46.0024V61.3289H0.532227V22.0547Z" fill="#FCC419"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M0.610916 22.0547H12.4103C19.0761 22.0547 24.4799 27.4584 24.4799 34.1243V46.9407C24.1622 46.9537 23.8429 46.9603 23.522 46.9603C10.8251 46.9603 0.532227 36.6674 0.532227 23.9705C0.532227 23.3254 0.558801 22.6864 0.610916 22.0547Z" fill="#3BC9DB"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/stories/Sponsors.tsx b/stories/Sponsors.tsx
new file mode 100644
index 00000000..7872ff22
--- /dev/null
+++ b/stories/Sponsors.tsx
@@ -0,0 +1,74 @@
+// Copyright (c) Gridiron Survivor.
+// Licensed under the MIT License.
+
+import React from 'react';
+import Image from 'next/image';
+
+type Sponsor = {
+  name: string;
+  logoPath: string;
+  website: string;
+};
+
+const SponsorsArray: Sponsor[] = [
+  {
+    name: 'Appwrite',
+    logoPath: '/assets/appwriteLogo.svg',
+    website: 'https://appwrite.io/',
+  },
+  {
+    name: 'Blog Recorder',
+    logoPath: '/assets/blogRecorderLogo.svg',
+    website: 'https://blogrecorder.com/',
+  },
+  {
+    name: 'Frontend Mentor',
+    logoPath: '/assets/frontendMentorLogo.svg',
+    website: 'https://www.frontendmentor.io/',
+  },
+  {
+    name: 'GitKraken',
+    logoPath: '/assets/gitkrakenLogo.svg',
+    website: 'https://www.gitkraken.com/',
+  },
+  {
+    name: 'Pastel',
+    logoPath: '/assets/pastelLogo.svg',
+    website: 'https://usepastel.com/',
+  },
+];
+
+/**
+ * Creates the Sponsors section of the Storybook Welcome page.
+ * @returns the Sponsors section
+ */
+const Sponsors = (): React.ReactElement => {
+  return (
+    <section className="sponsors-section">
+      <h2 className="pt-24 pb-8 text-center sm:text-left">Sponsors</h2>
+      <div className="sponsor-container grid grid-cols-1 gap-16 sm:grid-cols-2 sm:gap-8 md:grid-cols-3 lg:grid-cols-5">
+        {SponsorsArray.map((sponsor) => (
+          <div
+            key={sponsor.name}
+            className="sponsor-card flex flex-col items-center"
+          >
+            <a href={sponsor.website}>
+              <div className="sponsor-logo-container relative w-32 h-32">
+                <Image
+                  src={sponsor.logoPath}
+                  alt={`${sponsor.name} logo`}
+                  fill
+                  style={{ objectFit: 'contain' }}
+                  className="transition-transform group-hover:scale-110"
+                />
+              </div>
+              <h3 className="pt-8 pb-0 text-lg text-center">{sponsor.name}</h3>
+            </a>
+          </div>
+        ))}
+      </div>
+    </section>
+  );
+};
+
+export default Sponsors;
diff --git a/stories/TeamMemberInfo.tsx b/stories/TeamMemberInfo.tsx
new file mode 100644
index 00000000..9b22c65b
--- /dev/null
+++ b/stories/TeamMemberInfo.tsx
@@ -0,0 +1,65 @@
+// Copyright (c) Gridiron Survivor.
+// Licensed under the MIT License.
+
+import React from 'react';
+import { FaLinkedin, FaXTwitter, FaGithub } from 'react-icons/fa6';
+import { TeamMember } from './TeamMemberSection';
+
+/**
+ * Renders social media links for a team member.
+ * @param {TeamMember} props - The properties of a team member.
+ * @param [props.github] - The GitHub profile URL of the team member.
+ * @param [props.linkedin] - The LinkedIn profile URL of the team member.
+ * @param [props.twitter] - The Twitter profile URL of the team member.
+ * @returns {React.ReactElement} A React element containing social media links.
+ */
+const TeamMemberInfo = ({
+  name,
+  role,
+  github,
+  linkedin,
+  twitter,
+}: TeamMember): React.ReactElement => {
+  return (
+    <>
+      <div className="team-members-name-role-container">
+        <h3 className="p-0 text-foreground text-lg">{name}</h3>
+        <p className="text-muted-foreground">{role}</p>
+      </div>
+      <div className="team-members-social-container flex gap-2 pt-2">
+        {github && (
+          <a
+            href={github}
+            target="_blank"
+            rel="noreferrer"
+            className="text-muted-foreground duration-300 hover:rotate-12 hover:scale-125 hover:text-foreground hover:duration-300"
+          >
+            <FaGithub size={20} />
+          </a>
+        )}
+        {linkedin && (
+          <a
+            href={linkedin}
+            target="_blank"
+            rel="noreferrer"
+            className="text-muted-foreground duration-300 hover:rotate-12 hover:scale-125 hover:text-foreground hover:duration-300"
+          >
+            <FaLinkedin size={20} />
+          </a>
+        )}
+        {twitter && (
+          <a
+            href={twitter}
+            target="_blank"
+            rel="noreferrer"
+            className="text-muted-foreground duration-300 hover:rotate-12 hover:scale-125 hover:text-foreground hover:duration-300"
+          >
+            <FaXTwitter size={20} />
+          </a>
+        )}
+      </div>
+    </>
+  );
+};
+
+export default TeamMemberInfo;
diff --git a/stories/TeamMemberSection.tsx b/stories/TeamMemberSection.tsx
new file mode 100644
index 00000000..551e6044
--- /dev/null
+++ b/stories/TeamMemberSection.tsx
@@ -0,0 +1,123 @@
+// Copyright (c) Gridiron Survivor.
+// Licensed under the MIT License.
+
+import React from 'react';
+import TeamMemberInfo from './TeamMemberInfo';
+
+export type TeamMember = {
+  name: string;
+  role: string;
+  github?: string;
+  linkedin?: string;
+  twitter?: string;
+};
+
+export const TeamMembersArray: TeamMember[] = [
+  {
+    name: 'Shashi Lo',
+    role: 'Engineering Manager',
+    github: 'https://github.com/shashilo',
+    linkedin: 'https://www.linkedin.com/in/shashilo/',
+    twitter: 'https://x.com/shashiwhocodes',
+  },
+  {
+    name: 'Alex Appleget',
+    role: 'Software Engineer',
+    github: 'https://github.com/alexappleget',
+    linkedin: 'https://www.linkedin.com/in/alex-appleget/',
+    twitter: 'https://x.com/alexlikescoding',
+  },
+  {
+    name: 'Richard Choi',
+    role: 'Developer Relations Engineer',
+    github: 'https://github.com/choir27',
+    linkedin: 'https://www.linkedin.com/in/richard-choir/',
+    twitter: 'https://x.com/choir241',
+  },
+  {
+    name: 'Cody Epstein',
+    role: 'UX Engineer',
+    github: 'https://github.com/kepsteen/',
+    linkedin: 'https://www.linkedin.com/in/cody-epstein/',
+    twitter: '',
+  },
+  {
+    name: 'Ryan Furrer',
+    role: 'UX Engineer',
+    github: 'https://github.com/ryandotfurrer',
+    linkedin: 'https://www.linkedin.com/in/ryanfurrer/',
+    twitter: 'https://x.com/ryandotfurrer',
+  },
+  {
+    name: 'Walter Furrer',
+    role: 'Documentation Engineer',
+    github: 'https://github.com/FurrerW',
+    linkedin: 'https://www.linkedin.com/in/furrerw/',
+    twitter: 'https://x.com/furrerw',
+  },
+  {
+    name: 'Michael Larocca',
+    role: 'Documentation Engineer',
+    github: 'https://github.com/MichaelLarocca',
+    linkedin: 'https://www.linkedin.com/in/michaeljudelarocca/',
+    twitter: 'https://x.com/MikeJudeLarocca',
+  },
+  {
+    name: 'Danielle Lindblom',
+    role: 'Frontend Engineer',
+    github: 'https://github.com/Danielle254',
+    linkedin: 'https://www.linkedin.com/in/danielle-lindblom/',
+    twitter: '',
+  },
+  {
+    name: 'Dominick Monaco',
+    role: 'Frontend Engineer',
+    github: 'https://github.com/HoldUpFjord',
+    linkedin: 'https://www.linkedin.com/in/dominick-j-monaco/',
+    twitter: 'https://x.com/DominickJMonaco',
+  },
+  {
+    name: 'Corina Murg',
+    role: 'Accessibility Specialist',
+    github: 'https://github.com/CorinaMurg',
+    linkedin: 'https://www.linkedin.com/in/corinamurg/',
+    twitter: 'https://x.com/CorinaMurg',
+  },
+  {
+    name: 'Mai Vang',
+    role: 'Documentation Engineer',
+    github: 'https://github.com/vmaineng',
+    linkedin: 'https://www.linkedin.com/in/mai-vang-swe/',
+    twitter: 'https://x.com/MaiVangSWE',
+  },
+];
+
+/**
+ * Creates the Team Member section of the Storybook Welcome Page
+ * @returns the Team Member section
+ */
+const TeamMemberSection = (): React.ReactElement => {
+  return (
+    <section className="team-member-section">
+      <h2 className="pt-24 pb-8 text-center sm:text-left">Meet the Team</h2>
+      <div className="team-members-container m-auto grid grid-cols-1 gap-y-8 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
+        {TeamMembersArray.map((member) => (
+          <div
+            key={member.name}
+            className="team-member-card flex flex-col justify-around px-2 m-auto h-32 w-48 outline outline-outline rounded duration-300 hover:outline-accent-foreground"
+          >
+            <TeamMemberInfo
+              name={member.name}
+              role={member.role}
+              github={member.github}
+              linkedin={member.linkedin}
+              twitter={member.twitter}
+            />
+          </div>
+        ))}
+      </div>
+    </section>
+  );
+};
+
+export default TeamMemberSection;
diff --git a/stories/Welcome.mdx b/stories/Welcome.mdx
index 2e6f91bd..6cd34cb8 100644
--- a/stories/Welcome.mdx
+++ b/stories/Welcome.mdx
@@ -1,7 +1,37 @@
 import './styles.css';
+import Image from 'next/image';
+import gridironLogo from '../public/assets/logo-colored-outline.svg';
+import TeamMemberSection from './TeamMemberSection';
+import Sponsors from './Sponsors';
+import { Unstyled } from '@storybook/blocks';
 
-<h1>Welcome</h1>
+<Unstyled>
+<div class="light bg-background w-full">
+<Image
+  src={gridironLogo}
+  alt="Gridiron Survivor Logo"
+  className="block max-w-full m-auto py-8 justify-center"
+/>
 
-<div className="doc_nav_links">
-  <p>[Application Setup](?path=/docs/about-application-setup--docs)</p>
+<header className="mx-auto md:text-left">
+
+# What is Gridiron Survivor?
+
+Gridiron Survivor is the ultimate survivor league app. Track your picks, see how you stack up against your competition and hope to be crowned champion! Developed by a talented team of Junior Developers led by Senior Software Engineer Shashi Lo, Gridiron Survivor is the perfect app for any football fan looking to take their survivor league to the next level.
+
+<ol className="text-lg">
+  <li>[View our GitHub](https://github.com/LetsGetTechnical/gridiron-survivor)</li>
+  <li>[Check out Gridiron Survivor](https://www.gridironsurvivor.com)</li>
+</ol>
+</header>
+
+<Sponsors />
+
+<TeamMemberSection />
+
+<ol className="doc_nav_links">
+  <li></li>
+  <li>[Application Setup](?path=/docs/about-application-setup--docs)</li>
+</ol>
 </div>
+</Unstyled>
diff --git a/stories/styles.css b/stories/styles.css
index c1aa8f90..8bc8ce8a 100644
--- a/stories/styles.css
+++ b/stories/styles.css
@@ -1,3 +1,65 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+@import url('../app/globals.css');
+
+* {
+  font-family: Geist Sans;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  @apply text-foreground;
+  @apply font-bold;
+  @apply tracking-tight;
+  text-wrap: balance;
+}
+
+h1 {
+  @apply text-5xl;
+}
+
+h2 {
+  @apply text-4xl;
+}
+
+h3 {
+  @apply text-3xl;
+}
+
+h4 {
+  @apply text-2xl;
+}
+
+h5 {
+  @apply text-xl;
+}
+
+h6 {
+  @apply text-lg;
+}
+
+p {
+  @apply text-base;
+  @apply tracking-normal;
+  @apply text-muted-foreground;
+  text-wrap: balance;
+}
+
+header h1 {
+  @apply pt-24;
+  @apply pb-8;
+}
+
+header p {
+  @apply text-lg;
+  @apply pb-8;
+}
+
 .doc_nav_links {
   display: flex;
   justify-content: space-between;
diff --git a/tailwind.config.js b/tailwind.config.js
index 3d6cef2c..58a3f98f 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -3,7 +3,9 @@
 
 module.exports = {
   content: [
+    './app/*.{js,ts,jsx,tsx,mdx}',
     './app/**/*.{js,ts,jsx,tsx,mdx}',
+    './stories/*.{js,ts,jsx,tsx,mdx}',
     './stories/**/*.{js,ts,jsx,tsx,mdx}',
     './components/**/*.{js,ts,jsx,tsx,mdx}',
   ],

From 6bc5b39b5d7abc34ae8a9b9ee60d221e99b7c010 Mon Sep 17 00:00:00 2001
From: Danielle Lindblom <114356705+Danielle254@users.noreply.github.com>
Date: Wed, 16 Oct 2024 11:19:36 -0600
Subject: [PATCH 117/118] Danielle/482 notifications needs a way to exit the
 modal (#609)

Before
![before
PR](https://github.com/user-attachments/assets/d33b5fce-7076-45a9-8645-603fa07920ab)


- Changed background color to `muted` for better contrast
- Added button to manually close the alert before it expires
- Button is styled with `ghost` and standard `icon` size
- Close button is accessible by keyboard and labeled

![10_11
screen](https://github.com/user-attachments/assets/20ee4af1-08ec-43ca-a246-21d45e607c0d)
---
 components/Alert/Alert.tsx                    |  8 ++--
 .../AlertNotification.test.tsx                | 38 +++++++++++++++++--
 .../AlertNotification/AlertNotification.tsx   | 19 ++++++++--
 3 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/components/Alert/Alert.tsx b/components/Alert/Alert.tsx
index 80fc809f..fff2d4b8 100644
--- a/components/Alert/Alert.tsx
+++ b/components/Alert/Alert.tsx
@@ -9,13 +9,13 @@ const alertVariants = cva(
   {
     variants: {
       variant: {
-        default: 'bg-background text-foreground',
+        default: 'bg-muted text-muted-foreground',
         error:
-          'bg-background text-error [&>svg]:text-error text-error border-error',
+          'bg-muted text-error [&>svg]:text-error text-error border-error',
         warning:
-          'bg-background text-warning [&>svg]:text-warning text-warning border-warning',
+          'bg-muted text-warning [&>svg]:text-warning text-warning border-warning',
         success:
-          'bg-background text-success [&>svg]:text-success text-success border-success',
+          'bg-muted text-success [&>svg]:text-success text-success border-success',
       },
     },
     defaultVariants: {
diff --git a/components/AlertNotification/AlertNotification.test.tsx b/components/AlertNotification/AlertNotification.test.tsx
index 0d307594..39555f5e 100644
--- a/components/AlertNotification/AlertNotification.test.tsx
+++ b/components/AlertNotification/AlertNotification.test.tsx
@@ -1,8 +1,9 @@
-import React from 'react';
-import { render } from '@testing-library/react';
 import Alert from './AlertNotification';
 import { AlertVariants } from './Alerts.enum';
 import { CheckCircle, XCircle, Info, AlertTriangle } from 'lucide-react';
+import React from 'react';
+import { render, screen, fireEvent} from '@testing-library/react';
+import toast from 'react-hot-toast';
 
 const variantTestCases = {
   [AlertVariants.Success]: {
@@ -30,7 +31,36 @@ const variantTestCases = {
 describe('AlertNotification', () => {
   for (const [key, value] of Object.entries(variantTestCases)) {
     it(`renders the correct variant ${key}`, () => {
-      render(<Alert variant={AlertVariants[key]} message={value.message} />);
+      render(
+        <Alert
+          variant={AlertVariants[key as keyof typeof AlertVariants]}
+          message={value.message}
+        />,
+      );
+    });
+
+    it('should render the dismiss button on each alert type', () => {
+      render(
+        <Alert
+          variant={AlertVariants[key as keyof typeof AlertVariants]}
+          message={value.message}
+        />,
+      );
+      const dismissButton = screen.getByTestId('dismiss-alert-btn');
+      expect(dismissButton).toBeInTheDocument();
+    });
+
+    it('should fire the toast.remove() function when dismiss button is clicked', async () => {
+      const spyToast = jest.spyOn(toast, 'remove');
+      render(
+        <Alert
+          variant={AlertVariants[key as keyof typeof AlertVariants]}
+          message={value.message}
+        />,
+      );
+      const dismissButton = screen.getByTestId('dismiss-alert-btn');      
+      fireEvent.click(dismissButton);      
+      expect(spyToast).toHaveBeenCalled();
     });
-  }
+  };
 });
diff --git a/components/AlertNotification/AlertNotification.tsx b/components/AlertNotification/AlertNotification.tsx
index fb07b49b..95020f32 100644
--- a/components/AlertNotification/AlertNotification.tsx
+++ b/components/AlertNotification/AlertNotification.tsx
@@ -2,12 +2,14 @@
 // Licensed under the MIT License.
 
 import { Alert as AlertDefault } from '../Alert/Alert';
-import { AlertTitle } from '../AlertTItle/AlertTitle';
 import { AlertDescription } from '../AlertDescription/AlertDescription';
-import { JSX } from 'react';
-import { CheckCircle, XCircle, Info, AlertTriangle } from 'lucide-react';
-import { IAlertNotification } from './AlertNotification.interface';
+import { AlertTitle } from '../AlertTItle/AlertTitle';
 import { AlertVariants } from './Alerts.enum';
+import { Button } from '../Button/Button';
+import { CheckCircle, XCircle, Info, AlertTriangle, X } from 'lucide-react';
+import { IAlertNotification } from './AlertNotification.interface';
+import { JSX } from 'react';
+import toast from 'react-hot-toast';
 
 const variantConfig = {
   success: {
@@ -46,6 +48,15 @@ const Alert = ({
       <Icon className="h-4 w-4" data-testid="alert-icon" />
       <AlertTitle title={title} data-testid="alert-title" />
       <AlertDescription message={message} data-testid="alert-message" />
+      <Button
+        variant='ghost'
+        size="icon"
+        className="absolute right-4 top-2 hover:bg-transparent hover:text-current hover:opacity-50"
+        data-testid="dismiss-alert-btn"
+        onClick={() => toast.remove()}
+        aria-label='dismiss notification'
+        label={<X className='pl-0'/>}
+      />
     </AlertDefault>
   );
 };

From 05661c5feb7f97a5c7f646e63d1382e1a92c4ae3 Mon Sep 17 00:00:00 2001
From: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
Date: Wed, 16 Oct 2024 21:20:45 -0400
Subject: [PATCH 118/118] #539 Chris/add user settings (#544)

fixes #539

**NOTE:** This is a branch off my password reset branch which is why it
shows so many files changed.

- users can now navigate to settings using the navdrawer and update
their email and/or password.
- if the user forgot their OLD PASSWORD they can click on the recover
link in the form. When they click the link it will log them out and
route them to /recover-password.

## SCREENSHOT

![CleanShot_2024-09-18_at_17 08
32](https://github.com/user-attachments/assets/4ab11b7d-acad-4d1e-8fbe-e456ba165315)
---
 api/apiFunctions.test.tsx                     | 120 ++++++++++-
 api/apiFunctions.ts                           |  61 ++++++
 app/(main)/account/settings/page.test.tsx     |  45 ++++
 app/(main)/account/settings/page.tsx          |  66 ++++++
 components/Nav/Nav.test.tsx                   |  79 +++----
 components/Nav/Nav.tsx                        |  14 +-
 .../ResetPasswordForm.test.tsx                | 116 +++++++++++
 .../RestPasswordForm/ResetPasswordForm.tsx    | 192 ++++++++++++++++++
 .../UpdateEmailForm/UpdateEmailForm.test.tsx  |  95 +++++++++
 .../UpdateEmailForm/UpdateEmailForm.tsx       | 181 +++++++++++++++++
 10 files changed, 927 insertions(+), 42 deletions(-)
 create mode 100644 app/(main)/account/settings/page.test.tsx
 create mode 100644 app/(main)/account/settings/page.tsx
 create mode 100644 components/RestPasswordForm/ResetPasswordForm.test.tsx
 create mode 100644 components/RestPasswordForm/ResetPasswordForm.tsx
 create mode 100644 components/UpdateEmailForm/UpdateEmailForm.test.tsx
 create mode 100644 components/UpdateEmailForm/UpdateEmailForm.tsx

diff --git a/api/apiFunctions.test.tsx b/api/apiFunctions.test.tsx
index 30a7b3a5..7be6a988 100644
--- a/api/apiFunctions.test.tsx
+++ b/api/apiFunctions.test.tsx
@@ -1,12 +1,17 @@
+import { mock } from 'node:test';
 import {
   recoverPassword,
   registerAccount,
+  resetPassword,
   resetRecoveredPassword,
+  updateUserEmail,
 } from './apiFunctions';
 import { IUser } from './apiFunctions.interface';
-import { account, ID } from './config';
+import { account, databases, ID } from './config';
 const apiFunctions = require('./apiFunctions');
 import { getBaseURL } from '@/utils/getBaseUrl';
+import { Collection } from './apiFunctions.enum';
+import { Query } from 'appwrite';
 
 jest.mock('./apiFunctions', () => {
   const actualModule = jest.requireActual('./apiFunctions');
@@ -30,8 +35,17 @@ jest.mock('./config', () => ({
   account: {
     create: jest.fn(),
     createRecovery: jest.fn(),
+    updateEmail: jest.fn(),
+    updatePassword: jest.fn(),
     updateRecovery: jest.fn(),
   },
+  appwriteConfig: {
+    databaseId: 'mock-database-id',
+  },
+  databases: {
+    listDocuments: jest.fn(),
+    updateDocument: jest.fn(),
+  },
   ID: {
     unique: jest.fn(),
   },
@@ -164,6 +178,110 @@ describe('apiFunctions', () => {
         );
       });
     });
+    describe('updateUserEmail', () => {
+      const mockNewEmail = 'new@example.com';
+      const mockPassword = 'password123';
+      const mockUserId = '123';
+      const mockDocumentId = '456';
+      it("should successfully update the user's email", async () => {
+        (account.updateEmail as jest.Mock).mockResolvedValue({
+          $id: mockUserId,
+        });
+
+        (databases.listDocuments as jest.Mock).mockResolvedValue({
+          documents: [
+            {
+              $id: mockDocumentId,
+              name: 'Test User',
+              email: 'old@example.com',
+              labels: '',
+              userId: mockUserId,
+              leagues: [],
+            },
+          ],
+        });
+
+        (databases.updateDocument as jest.Mock).mockResolvedValue({});
+
+        await updateUserEmail({
+          email: mockNewEmail,
+          password: mockPassword,
+        });
+
+        expect(account.updateEmail).toHaveBeenCalledWith(
+          mockNewEmail,
+          mockPassword,
+        );
+
+        expect(databases.listDocuments).toHaveBeenCalledWith(
+          'mock-database-id',
+          Collection.USERS,
+          [Query.equal('userId', mockUserId)],
+        );
+
+        expect(databases.updateDocument).toHaveBeenCalledWith(
+          'mock-database-id',
+          Collection.USERS,
+          mockDocumentId,
+          {
+            email: mockNewEmail,
+            name: 'Test User',
+            labels: '',
+            userId: mockUserId,
+            leagues: [],
+          },
+        );
+      });
+      it('should throw an error if updating email fails', async () => {
+        (account.updateEmail as jest.Mock).mockRejectedValue(new Error());
+
+        await expect(
+          updateUserEmail({
+            email: mockNewEmail,
+            password: mockPassword,
+          }),
+        ).rejects.toThrow();
+
+        expect(account.updateEmail).toHaveBeenCalledWith(
+          mockNewEmail,
+          mockPassword,
+        );
+
+        expect(databases.listDocuments).not.toHaveBeenCalled();
+        expect(databases.updateDocument).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('resetPassword', () => {
+      it('should successfully reset the password', async () => {
+        (account.updatePassword as jest.Mock).mockResolvedValue({});
+
+        await resetPassword({
+          newPassword: 'newPassword123',
+          oldPassword: 'oldPassword123',
+        });
+
+        expect(account.updatePassword).toHaveBeenCalledWith(
+          'newPassword123',
+          'oldPassword123',
+        );
+      });
+    });
+    it('should throw an error if resetting password fails', async () => {
+      (account.updatePassword as jest.Mock).mockRejectedValue(new Error());
+
+      await expect(
+        resetPassword({
+          newPassword: 'newPassword123',
+          oldPassword: 'oldPassword123',
+        }),
+      ).rejects.toThrow();
+
+      expect(account.updatePassword).toHaveBeenCalledWith(
+        'newPassword123',
+        'oldPassword123',
+      );
+    });
   });
 
   describe('Get Weekly Picks Mock function', () => {
diff --git a/api/apiFunctions.ts b/api/apiFunctions.ts
index 2fcc88d1..93041dd3 100644
--- a/api/apiFunctions.ts
+++ b/api/apiFunctions.ts
@@ -83,6 +83,67 @@ export async function resetRecoveredPassword({
   }
 }
 
+/**
+ * Resets a user's password from the settings page
+ * @param params - The params for the reset password function
+ * @param params.newPassword - The new password
+ * @param params.oldPassword - The old password
+ * @returns {Promise<void>}
+ */
+export async function resetPassword({
+  newPassword,
+  oldPassword,
+}: {
+  newPassword: string;
+  oldPassword: string;
+}): Promise<void> {
+  try {
+    await account.updatePassword(newPassword, oldPassword);
+  } catch (error) {
+    throw error;
+  }
+}
+
+/**
+ * Update the user email
+ * @param props - The props for the update email function
+ * @param props.email - The email
+ * @param props.password - The user's current password
+ * @returns {Promise<void>} - The updated user
+ */
+export async function updateUserEmail({
+  email,
+  password,
+}: {
+  email: string;
+  password: string;
+}): Promise<void> {
+  try {
+    const result = await account.updateEmail(email, password);
+
+    const userDocument = await databases.listDocuments(
+      appwriteConfig.databaseId,
+      Collection.USERS,
+      [Query.equal('userId', result.$id)],
+    );
+
+    await databases.updateDocument(
+      appwriteConfig.databaseId,
+      Collection.USERS,
+      userDocument.documents[0].$id,
+      {
+        email: email,
+        name: userDocument.documents[0].name,
+        labels: userDocument.documents[0].labels,
+        userId: userDocument.documents[0].userId,
+        leagues: userDocument.documents[0].leagues,
+      },
+    );
+  } catch (error) {
+    throw error;
+  }
+}
+
 /**
  * Get the current user
  * @param userId - The user ID
diff --git a/app/(main)/account/settings/page.test.tsx b/app/(main)/account/settings/page.test.tsx
new file mode 100644
index 00000000..75716f33
--- /dev/null
+++ b/app/(main)/account/settings/page.test.tsx
@@ -0,0 +1,45 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import { useAuthContext } from '@/context/AuthContextProvider';
+import AccountSettings from './page';
+
+jest.mock('@/context/AuthContextProvider');
+
+describe('Account Settings Page', () => {
+  let mockUseAuthContext: jest.Mock;
+
+  beforeEach(() => {
+    mockUseAuthContext = jest.fn();
+    (useAuthContext as jest.Mock).mockImplementation(mockUseAuthContext);
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should display GlobalSpinner while loading data', async () => {
+    mockUseAuthContext.mockReturnValue({
+      isSignedIn: false,
+    });
+    render(<AccountSettings />);
+
+    await waitFor(() => {
+      expect(screen.getByTestId('global-spinner')).toBeInTheDocument();
+    });
+  });
+
+  it('should not show GlobalSpinner and render the settings page', async () => {
+    mockUseAuthContext.mockReturnValue({
+      isSignedIn: true,
+    });
+
+    render(<AccountSettings />);
+
+    expect(screen.getByTestId('settings-page-header')).toBeInTheDocument();
+    expect(screen.getByTestId('email')).toBeInTheDocument();
+    expect(screen.getByTestId('current-password')).toBeInTheDocument();
+    expect(screen.getByTestId('old-password')).toBeInTheDocument();
+    expect(screen.getByTestId('new-password')).toBeInTheDocument();
+
+    expect(screen.queryByTestId('global-spinner')).not.toBeInTheDocument();
+  });
+});
diff --git a/app/(main)/account/settings/page.tsx b/app/(main)/account/settings/page.tsx
new file mode 100644
index 00000000..29777fe8
--- /dev/null
+++ b/app/(main)/account/settings/page.tsx
@@ -0,0 +1,66 @@
+// Copyright (c) Gridiron Survivor.
+// Licensed under the MIT License.
+
+'use client';
+import GlobalSpinner from '@/components/GlobalSpinner/GlobalSpinner';
+import Heading from '@/components/Heading/Heading';
+import LinkCustom from '@/components/LinkCustom/LinkCustom';
+import ResetPasswordForm from '@/components/RestPasswordForm/ResetPasswordForm';
+import UpdateEmailForm from '@/components/UpdateEmailForm/UpdateEmailForm';
+import { useAuthContext } from '@/context/AuthContextProvider';
+import { ChevronLeft } from 'lucide-react';
+import { JSX, useEffect, useState } from 'react';
+
+/**
+ * Display user preferences
+ * @returns {JSX.Element} The rendered user preferences component.
+ */
+const AccountSettings = (): JSX.Element => {
+  const [loadingData, setLoadingData] = useState<boolean>(true);
+  const { isSignedIn } = useAuthContext();
+
+  useEffect(() => {
+    if (isSignedIn) {
+      setLoadingData(false);
+    }
+  }, [isSignedIn]);
+
+  return (
+    <>
+      {loadingData ? (
+        <GlobalSpinner />
+      ) : (
+        <section className="mx-auto max-w-5xl pt-10">
+          <header
+            className="flex flex-col gap-4"
+            data-testid="settings-page-header"
+          >
+            <div data-testid="link-to-all-leagues-page">
+              <LinkCustom
+                className="no-underline hover:underline text-primary flex gap-3 items-center font-semibold text-xl"
+                href={`/league/all`}
+              >
+                <ChevronLeft />
+                Your Leagues
+              </LinkCustom>
+            </div>
+            <Heading
+              as="h1"
+              className="text-4xl font-bold"
+              data-testid="entry-page-header-page-name"
+            >
+              Settings
+            </Heading>
+          </header>
+
+          <div className="flex flex-col w-full pt-10 gap-8">
+            <UpdateEmailForm />
+            <ResetPasswordForm />
+          </div>
+        </section>
+      )}
+    </>
+  );
+};
+
+export default AccountSettings;
diff --git a/components/Nav/Nav.test.tsx b/components/Nav/Nav.test.tsx
index b23ea7d9..74fc9655 100644
--- a/components/Nav/Nav.test.tsx
+++ b/components/Nav/Nav.test.tsx
@@ -1,8 +1,6 @@
 import { render, screen, fireEvent, waitFor } from '@testing-library/react';
 import Nav from './Nav';
 import Login from '@/app/(main)/login/page';
-import { useDataStore } from '@/store/dataStore';
-import { getUserLeagues } from '@/utils/utils';
 
 const mockPush = jest.fn();
 const mockUsePathname = jest.fn();
@@ -34,10 +32,6 @@ jest.mock('../../context/AuthContextProvider', () => ({
   },
 }));
 
-jest.mock('@/store/dataStore', () => ({
-  useDataStore: jest.fn(() => ({ user: { id: '123', leagues: [] } })),
-}));
-
 Object.defineProperty(window, 'matchMedia', {
   writable: true,
   value: jest.fn().mockImplementation((query) => ({
@@ -53,8 +47,18 @@ Object.defineProperty(window, 'matchMedia', {
 });
 
 describe('Nav', () => {
-  const mockUseDataStore = useDataStore as unknown as jest.Mock;
-  const mockGetUserLeagues = getUserLeagues as jest.Mock;
+  beforeAll(() => {
+    const originalCreateElement = document.createElement.bind(document);
+    jest
+      .spyOn(document, 'createElement')
+      .mockImplementation((tagName, options) => {
+        const element = originalCreateElement(tagName, options);
+        if (tagName.toLowerCase() === 'a') {
+          element.addEventListener('click', (e) => e.preventDefault());
+        }
+        return element;
+      });
+  });
 
   beforeEach(() => {
     jest.clearAllMocks();
@@ -63,33 +67,45 @@ describe('Nav', () => {
   it('renders link to /league/all', async () => {
     render(<Nav />);
 
-    const drawTrigger = screen.getByTestId('drawer-trigger');
-    fireEvent.click(drawTrigger);
+    fireEvent.click(screen.getByTestId('drawer-trigger'));
 
     let linkNav: HTMLElement;
-    linkNav = await screen.getByTestId('league-link');
+    linkNav = screen.getByTestId('league-link');
     expect(linkNav).toBeInTheDocument();
     expect(linkNav).toHaveAttribute('href', '/league/all');
   });
 
   it('it should render the default component state', () => {
-    mockUsePathname.mockImplementation(() => '/weeklyPicks');
+    mockUsePathname.mockImplementation(() => '/league/all');
 
     render(<Nav />);
 
-    const navElement = screen.getByTestId('nav');
-    expect(navElement).toBeInTheDocument();
+    expect(screen.getByTestId('nav')).toBeInTheDocument();
+
+    fireEvent.click(screen.getByTestId('drawer-trigger'));
+
+    expect(screen.getByTestId('settings-link')).toBeInTheDocument();
+    expect(screen.getByTestId('title')).toBeInTheDocument();
+    expect(screen.getByTestId('logo-nav')).toBeInTheDocument();
+    expect(screen.getByTestId('sign-out-button')).toBeInTheDocument();
+  });
+
+  it('should route to the settings page when the user clicks on the settings link', async () => {
+    mockUsePathname.mockReturnValue('/league/all');
+
+    render(<Nav />);
 
     const drawerTrigger = screen.getByTestId('drawer-trigger');
     fireEvent.click(drawerTrigger);
 
-    const title = screen.getByTestId('title');
-    const logo = screen.getByTestId('logo-nav');
-    const signOutButton = screen.getByTestId('sign-out-button');
+    const preferencesLink = await screen.findByTestId('settings-link');
+    expect(preferencesLink).toHaveAttribute('href', '/account/settings');
+    fireEvent.click(preferencesLink);
 
-    expect(title).toBeInTheDocument();
-    expect(logo).toBeInTheDocument();
-    expect(signOutButton).toBeInTheDocument();
+    await waitFor(() => {
+      expect(screen.queryByTestId('preferences-link')).not.toBeInTheDocument();
+      expect(drawerTrigger.getAttribute('data-state')).toBe('closed');
+    });
   });
 
   it('it should be hidden when path is /register', () => {
@@ -98,7 +114,6 @@ describe('Nav', () => {
     render(<Nav />);
 
     const navElement = screen.getByTestId('nav');
-
     expect(navElement).toBeInTheDocument();
     expect(navElement).toHaveClass('hidden');
   });
@@ -109,7 +124,6 @@ describe('Nav', () => {
     render(<Nav />);
 
     const navElement = screen.getByTestId('nav');
-
     expect(navElement).toBeInTheDocument();
     expect(navElement).toHaveClass('hidden');
   });
@@ -119,7 +133,6 @@ describe('Nav', () => {
     render(<Nav />);
 
     const navElement = screen.getByTestId('nav');
-
     expect(navElement).toBeInTheDocument();
     expect(navElement).toHaveClass('hidden');
   });
@@ -129,7 +142,6 @@ describe('Nav', () => {
     render(<Nav />);
 
     const navElement = screen.getByTestId('nav');
-
     expect(navElement).toBeInTheDocument();
     expect(navElement).toHaveClass('hidden');
   });
@@ -140,7 +152,6 @@ describe('Nav', () => {
     render(<Nav />);
 
     const navElement = screen.getByTestId('nav');
-
     expect(navElement).toBeInTheDocument();
     expect(navElement).not.toHaveClass('hidden');
   });
@@ -150,12 +161,9 @@ describe('Nav', () => {
 
     render(<Nav />);
 
-    const drawerTrigger = screen.getByTestId('drawer-trigger');
-    fireEvent.click(drawerTrigger);
-
-    const signOutButton = screen.getByTestId('sign-out-button');
+    fireEvent.click(screen.getByTestId('drawer-trigger'));
+    fireEvent.click(screen.getByTestId('sign-out-button'));
 
-    fireEvent.click(signOutButton);
     await waitFor(() => {
       expect(mockLogoutAccount).toHaveBeenCalled();
     });
@@ -173,12 +181,9 @@ describe('Nav', () => {
     render(<Nav />);
 
     const drawerTrigger = screen.getByTestId('drawer-trigger');
-
     fireEvent.click(drawerTrigger);
 
-    const signOutButton = screen.getByTestId('sign-out-button');
-
-    fireEvent.click(signOutButton);
+    fireEvent.click(screen.getByTestId('sign-out-button'));
 
     await waitFor(() => {
       expect(drawerTrigger.getAttribute('data-state')).toBe('closed');
@@ -191,12 +196,8 @@ describe('Nav', () => {
     render(<Nav />);
 
     const drawerTrigger = screen.getByTestId('drawer-trigger');
-
     fireEvent.click(drawerTrigger);
-
-    const linkNav = screen.getByTestId('league-link');
-
-    fireEvent.click(linkNav);
+    fireEvent.click(screen.getByTestId('league-link'));
 
     await waitFor(() => {
       expect(drawerTrigger.getAttribute('data-state')).toBe('closed');
diff --git a/components/Nav/Nav.tsx b/components/Nav/Nav.tsx
index 9eba9c7e..415cfe65 100644
--- a/components/Nav/Nav.tsx
+++ b/components/Nav/Nav.tsx
@@ -68,7 +68,17 @@ export const Nav = (): JSX.Element => {
               <DrawerHeader>
                 <DrawerTitle data-testid="title">Gridiron Survivor</DrawerTitle>
               </DrawerHeader>
-              <ul className="m-0 flex flex-col gap-4 p-0">
+              <ul className="m-0 flex flex-col gap-1 p-0">
+                <li>
+                  <Link
+                    href="/account/settings"
+                    className="underline underline-offset-4 hover:text-primary-muted transition-colors"
+                    onClick={() => setOpen(false)}
+                    data-testid="settings-link"
+                  >
+                    Settings
+                  </Link>
+                </li>
                 <li>
                   <Link
                     data-testid="league-link"
@@ -83,7 +93,7 @@ export const Nav = (): JSX.Element => {
                 </li>
                 <li>
                   <Button
-                    className="p-0 text-base font-normal text-primary-foreground"
+                    className="p-0 text-base font-normal hover:text-primary-muted transition-colors text-white"
                     variant="link"
                     label="Sign Out"
                     onClick={() => {
diff --git a/components/RestPasswordForm/ResetPasswordForm.test.tsx b/components/RestPasswordForm/ResetPasswordForm.test.tsx
new file mode 100644
index 00000000..93ec8b28
--- /dev/null
+++ b/components/RestPasswordForm/ResetPasswordForm.test.tsx
@@ -0,0 +1,116 @@
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { useRouter } from 'next/navigation';
+import { toast } from 'react-hot-toast';
+import ResetPasswordForm from './ResetPasswordForm';
+import { resetPassword } from '@/api/apiFunctions';
+import Alert from '@/components/AlertNotification/AlertNotification';
+import { AlertVariants } from '@/components/AlertNotification/Alerts.enum';
+import { useAuthContext } from '@/context/AuthContextProvider';
+
+jest.mock('react-hot-toast');
+jest.mock('next/navigation');
+jest.mock('@/context/AuthContextProvider', () => ({
+  useAuthContext: jest.fn(),
+}));
+jest.mock('@/api/apiFunctions');
+
+describe('ResetPassword', () => {
+  let mockRouter: { push: jest.Mock };
+  let mockToast: jest.Mock;
+  const mockLogoutAccount = jest.fn();
+
+  beforeEach(() => {
+    mockRouter = { push: jest.fn() };
+    mockToast = jest.fn();
+
+    (useAuthContext as jest.Mock).mockReturnValue({
+      logoutAccount: mockLogoutAccount,
+      isLoggedIn: true,
+    });
+    (useRouter as jest.Mock).mockReturnValue(mockRouter);
+    (toast.custom as jest.Mock).mockImplementation(mockToast);
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  const fillForm = () => {
+    fireEvent.change(screen.getByTestId('old-password'), {
+      target: { value: 'oldPassword123' },
+    });
+    fireEvent.change(screen.getByTestId('new-password'), {
+      target: { value: 'newPassword123' },
+    });
+    fireEvent.click(screen.getByTestId('update-password-button'));
+  };
+
+  it('should render the reset password form with the update button disabled', async () => {
+    render(<ResetPasswordForm />);
+
+    expect(screen.getByTestId('old-password')).toBeInTheDocument();
+    expect(screen.getByTestId('new-password')).toBeInTheDocument();
+    expect(screen.getByTestId('update-password-button')).toBeDisabled();
+  });
+
+  it('should update the form with new password and update button should be enabled', async () => {
+    render(<ResetPasswordForm />);
+    fillForm();
+
+    await waitFor(() => {
+      expect(screen.getByTestId('old-password')).toHaveValue('oldPassword123');
+      expect(screen.getByTestId('new-password')).toHaveValue('newPassword123');
+      expect(screen.getByTestId('update-password-button')).not.toBeDisabled();
+    });
+  });
+
+  it('should submit the form and update the user password successfully', async () => {
+    render(<ResetPasswordForm />);
+    fillForm();
+
+    fireEvent.click(screen.getByTestId('update-password-button'));
+
+    await waitFor(() => {
+      expect(resetPassword).toHaveBeenCalledWith({
+        newPassword: 'newPassword123',
+        oldPassword: 'oldPassword123',
+      });
+      expect(screen.getByTestId('old-password')).toHaveValue('');
+      expect(screen.getByTestId('new-password')).toHaveValue('');
+
+      expect(toast.custom).toHaveBeenCalledWith(
+        <Alert
+          variant={AlertVariants.Success}
+          message="You have successfully updated your password."
+        />,
+      );
+    });
+  });
+
+  it('should submit the form and show error message on password update failure', async () => {
+    (resetPassword as jest.Mock).mockRejectedValue(new Error());
+
+    render(<ResetPasswordForm />);
+    fillForm();
+
+    fireEvent.click(screen.getByTestId('update-password-button'));
+
+    await waitFor(() => {
+      expect(resetPassword).rejects.toThrow();
+      expect(toast.custom).toHaveBeenCalledWith(
+        <Alert
+          variant={AlertVariants.Error}
+          message="Password Update Failed!"
+        />,
+      );
+    });
+  });
+
+  it('should call logoutAccount when "Recover your password" is clicked', () => {
+    render(<ResetPasswordForm />);
+
+    fireEvent.click(screen.getByTestId('recover-password-link'));
+
+    expect(mockLogoutAccount).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/components/RestPasswordForm/ResetPasswordForm.tsx b/components/RestPasswordForm/ResetPasswordForm.tsx
new file mode 100644
index 00000000..62cc4686
--- /dev/null
+++ b/components/RestPasswordForm/ResetPasswordForm.tsx
@@ -0,0 +1,192 @@
+// Copyright (c) Gridiron Survivor.
+// Licensed under the MIT License.
+
+'use client';
+import { resetPassword } from '@/api/apiFunctions';
+import Alert from '@/components/AlertNotification/AlertNotification';
+import { AlertVariants } from '@/components/AlertNotification/Alerts.enum';
+import { Button } from '@/components/Button/Button';
+import { Input } from '@/components/Input/Input';
+import LoadingSpinner from '@/components/LoadingSpinner/LoadingSpinner';
+import { useAuthContext } from '@/context/AuthContextProvider';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { JSX, useState } from 'react';
+import { Control, SubmitHandler, useForm, useWatch } from 'react-hook-form';
+import toast from 'react-hot-toast';
+import { z } from 'zod';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '../Form/Form';
+import Link from 'next/link';
+
+const ResetPasswordSchema = z.object({
+  oldPassword: z.string().min(1, { message: 'Please enter your old password' }),
+  newPassword: z
+    .string()
+    .min(1, { message: 'Please enter your new password' })
+    .min(6, { message: 'Password must be at least 6 characters' }),
+});
+
+type ResetPasswordSchemaType = z.infer<typeof ResetPasswordSchema>;
+
+/**
+ * Display update user email form
+ * @returns {JSX.Element} The rendered update user email form.
+ */
+const ResetPasswordForm = (): JSX.Element => {
+  const [isUpdating, setIsUpdating] = useState<boolean>(false);
+  const { logoutAccount } = useAuthContext();
+
+  const form = useForm<ResetPasswordSchemaType>({
+    resolver: zodResolver(ResetPasswordSchema),
+    defaultValues: {
+      oldPassword: '',
+      newPassword: '',
+    },
+  });
+
+  const oldPassword: string = useWatch({
+    control: form.control,
+    name: 'oldPassword',
+  });
+
+  const newPassword: string = useWatch({
+    control: form.control,
+    name: 'newPassword',
+  });
+
+  /**
+   * A function that handles form submission.
+   * @param {ResetPasswordSchemaType} data - The data submitted in the form.
+   * @returns {Promise<void>} Promise that resolves after form submission is processed.
+   */
+  const onSubmit: SubmitHandler<ResetPasswordSchemaType> = async (
+    data: ResetPasswordSchemaType,
+  ): Promise<void> => {
+    const { oldPassword, newPassword } = data;
+    setIsUpdating(true);
+    try {
+      await resetPassword({
+        newPassword,
+        oldPassword,
+      });
+      toast.custom(
+        <Alert
+          variant={AlertVariants.Success}
+          message="You have successfully updated your password."
+        />,
+      );
+
+      form.reset({ oldPassword: '', newPassword: '' });
+    } catch (error) {
+      toast.custom(
+        <Alert
+          variant={AlertVariants.Error}
+          message="Password Update Failed!"
+        />,
+      );
+    } finally {
+      setIsUpdating(false);
+    }
+  };
+
+  const isDisabled = oldPassword === '' || newPassword === '' || isUpdating;
+
+  return (
+    <Form {...form}>
+      <form
+        id="password-input-container"
+        className="border border-border rounded-lg w-full bg-border/40 p-6"
+        onSubmit={form.handleSubmit(onSubmit)}
+      >
+        <div className="flex justify-between items-start mb-4 border-b border-border pb-4">
+          <div className="flex flex-col gap-2 w-1/2 pl-4 pt-4 align-top pr-5">
+            <h3 className="font-semibold text-lg">Password</h3>
+            <p className="text-sm">
+              This will update the password for your account login. If you
+              forgot your password you can{' '}
+              <Link
+                href="/recover-password"
+                className="underline underline-offset-4 hover:text-primary-muted transition-colors"
+                data-testid="recover-password-link"
+                onClick={() => {
+                  logoutAccount();
+                }}
+              >
+                Recover your password
+              </Link>
+              .
+            </p>
+          </div>
+          <div className="flex flex-col gap-4 w-2/4 pr-4 pt-4">
+            <FormField
+              control={form.control as Control<object>}
+              name="oldPassword"
+              render={({ field }) => (
+                <FormItem className="w-full">
+                  <FormLabel className="border-none px-0 py-0 pb-2 pl-1">
+                    Old Password
+                  </FormLabel>
+                  <FormControl>
+                    <Input
+                      data-testid="old-password"
+                      type="password"
+                      placeholder="Enter Password"
+                      {...field}
+                    />
+                  </FormControl>
+                  {form.formState.errors.oldPassword && (
+                    <FormMessage>
+                      {form.formState.errors.oldPassword.message}
+                    </FormMessage>
+                  )}
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control as Control<object>}
+              name="newPassword"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel className="border-none px-0 py-0 pb-2 pl-1">
+                    New Password
+                  </FormLabel>
+                  <FormControl>
+                    <Input
+                      data-testid="new-password"
+                      type="password"
+                      placeholder="Enter Password"
+                      {...field}
+                    />
+                  </FormControl>
+                  {form.formState.errors.newPassword && (
+                    <FormMessage>
+                      {form.formState.errors.newPassword.message}
+                    </FormMessage>
+                  )}
+                </FormItem>
+              )}
+            />
+          </div>
+        </div>
+        <div className="flex justify-end pb-4 pr-4">
+          <Button
+            data-testid="update-password-button"
+            type="submit"
+            disabled={isDisabled}
+            className="w-[150px]"
+          >
+            {isUpdating ? <LoadingSpinner /> : 'Update Password'}
+          </Button>
+        </div>
+      </form>
+    </Form>
+  );
+};
+
+export default ResetPasswordForm;
diff --git a/components/UpdateEmailForm/UpdateEmailForm.test.tsx b/components/UpdateEmailForm/UpdateEmailForm.test.tsx
new file mode 100644
index 00000000..8890cd1d
--- /dev/null
+++ b/components/UpdateEmailForm/UpdateEmailForm.test.tsx
@@ -0,0 +1,95 @@
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { toast } from 'react-hot-toast';
+import UpdateEmailForm from './UpdateEmailForm';
+import Alert from '@/components/AlertNotification/AlertNotification';
+import { AlertVariants } from '@/components/AlertNotification/Alerts.enum';
+import { updateUserEmail } from '@/api/apiFunctions';
+
+jest.mock('react-hot-toast');
+jest.mock('@/api/apiFunctions');
+jest.mock(`@/store/dataStore`, () => ({
+  useDataStore: jest.fn(() => ({
+    user: { documentId: 'doc123', id: '123', email: 'olduser@example.com' },
+    updateUser: jest.fn(),
+  })),
+}));
+
+describe('UpdateEmailForm', () => {
+  let mockToast: jest.Mock;
+
+  beforeEach(() => {
+    mockToast = jest.fn();
+    (toast.custom as jest.Mock).mockImplementation(mockToast);
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  const fillForm = () => {
+    fireEvent.change(screen.getByTestId('email'), {
+      target: { value: 'newuser@example.com' },
+    });
+    fireEvent.change(screen.getByTestId('current-password'), {
+      target: { value: 'password123' },
+    });
+  };
+
+  it('should render the update email form with the update button disabled', () => {
+    render(<UpdateEmailForm />);
+
+    expect(screen.getByTestId('email')).toBeInTheDocument();
+    expect(screen.getByTestId('current-password')).toBeInTheDocument();
+    expect(screen.getByTestId('updated-email-button')).toBeInTheDocument();
+    expect(screen.getByTestId('updated-email-button')).toBeDisabled();
+  });
+
+  it('should update the form with new email and password and update button should be enabled', async () => {
+    render(<UpdateEmailForm />);
+    fillForm();
+
+    await waitFor(() => {
+      expect(screen.getByTestId('email')).toHaveValue('newuser@example.com');
+      expect(screen.getByTestId('current-password')).toHaveValue('password123');
+      expect(screen.getByTestId('updated-email-button')).not.toBeDisabled();
+    });
+  });
+  it('should submit the form and update the user email successfully', async () => {
+    render(<UpdateEmailForm />);
+    fillForm();
+
+    fireEvent.click(screen.getByTestId('updated-email-button'));
+
+    await waitFor(() => {
+      expect(updateUserEmail).toHaveBeenCalledWith({
+        email: 'newuser@example.com',
+        password: 'password123',
+      });
+      expect(screen.getByTestId('email')).toHaveValue('newuser@example.com');
+      expect(screen.getByTestId('current-password')).toHaveValue('');
+
+      expect(toast.custom).toHaveBeenCalledWith(
+        <Alert
+          variant={AlertVariants.Success}
+          message="You have successfully updated your email."
+        />,
+      );
+    });
+  });
+  it('should submit the form and show error message on email update failure', async () => {
+    (updateUserEmail as jest.Mock).mockRejectedValue(new Error());
+
+    render(<UpdateEmailForm />);
+    fillForm();
+
+    fireEvent.click(screen.getByTestId('updated-email-button'));
+
+    await waitFor(() => {
+      expect(updateUserEmail).rejects.toThrow();
+
+      expect(toast.custom).toHaveBeenCalledWith(
+        <Alert variant={AlertVariants.Error} message="Email Update Failed!" />,
+      );
+    });
+  });
+});
diff --git a/components/UpdateEmailForm/UpdateEmailForm.tsx b/components/UpdateEmailForm/UpdateEmailForm.tsx
new file mode 100644
index 00000000..9348519c
--- /dev/null
+++ b/components/UpdateEmailForm/UpdateEmailForm.tsx
@@ -0,0 +1,181 @@
+// Copyright (c) Gridiron Survivor.
+// Licensed under the MIT License.
+
+'use client';
+import { updateUserEmail } from '@/api/apiFunctions';
+import Alert from '@/components/AlertNotification/AlertNotification';
+import { AlertVariants } from '@/components/AlertNotification/Alerts.enum';
+import { Button } from '@/components/Button/Button';
+import { Input } from '@/components/Input/Input';
+import LoadingSpinner from '@/components/LoadingSpinner/LoadingSpinner';
+import { useDataStore } from '@/store/dataStore';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { JSX, useState } from 'react';
+import { Control, SubmitHandler, useForm, useWatch } from 'react-hook-form';
+import toast from 'react-hot-toast';
+import { z } from 'zod';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '../Form/Form';
+
+const UpdateEmailSchema = z.object({
+  email: z
+    .string()
+    .min(1, { message: 'Please enter an email address' })
+    .email({ message: 'Please enter a valid email address' }),
+  password: z.string().min(1, { message: 'Please enter a password' }),
+});
+
+type UpdateEmailSchemaType = z.infer<typeof UpdateEmailSchema>;
+
+/**
+ * Display update user email form
+ * @returns {JSX.Element} The rendered update user email form.
+ */
+const UpdateEmailForm = (): JSX.Element => {
+  const [isUpdating, setIsUpdating] = useState<boolean>(false);
+  const { user, updateUser } = useDataStore((state) => state);
+
+  const form = useForm<UpdateEmailSchemaType>({
+    resolver: zodResolver(UpdateEmailSchema),
+    defaultValues: {
+      email: user.email,
+      password: '',
+    },
+  });
+
+  const email: string = useWatch({
+    control: form.control,
+    name: 'email',
+  });
+
+  const password: string = useWatch({
+    control: form.control,
+    name: 'password',
+  });
+
+  /**
+   * A function that handles form submission.
+   * @param {UpdateEmailSchemaType} data - The data submitted in the form.
+   * @returns {Promise<void>} Promise that resolves after form submission is processed.
+   */
+  const onSubmit: SubmitHandler<UpdateEmailSchemaType> = async (
+    data: UpdateEmailSchemaType,
+  ): Promise<void> => {
+    const { email, password } = data;
+    setIsUpdating(true);
+    try {
+      await updateUserEmail({
+        email,
+        password,
+      });
+
+      toast.custom(
+        <Alert
+          variant={AlertVariants.Success}
+          message="You have successfully updated your email."
+        />,
+      );
+
+      updateUser(user.documentId, user.id, email, user.leagues);
+      form.reset({ email: email || '', password: '' });
+    } catch (error) {
+      console.error('Email Update Failed', error);
+      toast.custom(
+        <Alert variant={AlertVariants.Error} message="Email Update Failed!" />,
+      );
+    } finally {
+      setIsUpdating(false);
+    }
+  };
+
+  const isDisabled = email === user.email || !email || isUpdating || !password;
+
+  return (
+    <Form {...form}>
+      <form
+        id="email-input-container"
+        className="border border-border rounded-lg w-full bg-border/40 p-6"
+        onSubmit={form.handleSubmit(onSubmit)}
+      >
+        <div className="flex justify-between items-start mb-4 border-b border-border pb-4">
+          <div className="flex flex-col gap-2 w-1/2 pl-4 pt-4 align-top">
+            <h3 className="font-semibold text-lg">Email</h3>
+            <p className="text-sm">
+              This will update both your login email and where you receive email
+              updates from GridIron Survivor.
+            </p>
+          </div>
+          <div className="flex flex-col gap-4 w-2/4 pr-4 pt-4">
+            <FormField
+              control={form.control as Control<object>}
+              name="email"
+              render={({ field }) => (
+                <FormItem className="w-full">
+                  <FormLabel className="border-none px-0 py-0 pb-2 pl-1">
+                    Email
+                  </FormLabel>
+                  <FormControl>
+                    <Input
+                      data-testid="email"
+                      type="email"
+                      placeholder="Email"
+                      className="w-full"
+                      {...field}
+                    />
+                  </FormControl>
+                  {form.formState.errors.email && (
+                    <FormMessage>
+                      {form.formState.errors.email.message}
+                    </FormMessage>
+                  )}
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control as Control<object>}
+              name="password"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel className="border-none px-0 py-0 pb-2 pl-1">
+                    Current Password
+                  </FormLabel>
+                  <FormControl>
+                    <Input
+                      data-testid="current-password"
+                      type="password"
+                      placeholder="Enter Password"
+                      {...field}
+                    />
+                  </FormControl>
+                  {form.formState.errors.password && (
+                    <FormMessage>
+                      {form.formState.errors.password.message}
+                    </FormMessage>
+                  )}
+                </FormItem>
+              )}
+            />
+          </div>
+        </div>
+        <div className="flex justify-end pb-4 pr-4">
+          <Button
+            data-testid="updated-email-button"
+            type="submit"
+            disabled={isDisabled}
+            className="w-[125px]"
+          >
+            {isUpdating ? <LoadingSpinner /> : 'Update Email'}
+          </Button>
+        </div>
+      </form>
+    </Form>
+  );
+};
+
+export default UpdateEmailForm;