Merge branch 'develop' into alex/414-bug-bash-add-alert-when-pick-is-…

…upda
LetsGetTechnical · Jul 19, 2024 · 1f26a02 · 1f26a02
2 parents 1236a94 + 49148fe
commit 1f26a02
Show file tree

Hide file tree

Showing 48 changed files with 122 additions and 16 deletions.
diff --git a/api/apiFunctions.interface.ts b/api/apiFunctions.interface.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Gridiron Survivor.
 // Licensed under the MIT License.
 
-import { IEntry } from '@/app/league/[leagueId]/entry/Entries.interface';
+import { IEntry } from '@/app/(main)/league/[leagueId]/entry/Entries.interface';
 
 export interface IAccountData {
   email: string;

diff --git a/api/apiFunctions.ts b/api/apiFunctions.ts
@@ -16,7 +16,7 @@ import { Query } from 'appwrite';
 import {
   IEntry,
   IEntryProps,
-} from '@/app/league/[leagueId]/entry/Entries.interface';
+} from '@/app/(main)/league/[leagueId]/entry/Entries.interface';
 
 /**
  * Register a new account

diff --git a/app/(admin)/admin/leagues/page.tsx b/app/(admin)/admin/leagues/page.tsx
@@ -0,0 +1,14 @@
+// Copyright (c) Gridiron Survivor.
+// Licensed under the MIT License.
+
+import { JSX } from 'react';
+
+/**
+ * Renders the admin page.
+ * @returns {JSX.Element} - The rendered login page.
+ */
+const AdminLeagues = (): JSX.Element => {
+  return <div>Admin Leagues</div>;
+};
+
+export default AdminLeagues;
diff --git a/app/(admin)/admin/notifications/page.tsx b/app/(admin)/admin/notifications/page.tsx
@@ -0,0 +1,14 @@
+// Copyright (c) Gridiron Survivor.
+// Licensed under the MIT License.
+
+import { JSX } from 'react';
+
+/**
+ * Renders the admin page.
+ * @returns {JSX.Element} - The rendered login page.
+ */
+const AdminNotifications = (): JSX.Element => {
+  return <div>Admin Notifications</div>;
+};
+
+export default AdminNotifications;
diff --git a/app/(admin)/admin/page.tsx b/app/(admin)/admin/page.tsx
@@ -0,0 +1,14 @@
+// Copyright (c) Gridiron Survivor.
+// Licensed under the MIT License.
+
+import { JSX } from 'react';
+
+/**
+ * Renders the admin page.
+ * @returns {JSX.Element} - The rendered login page.
+ */
+const AdminHome = (): JSX.Element => {
+  return <div>Admin Home</div>;
+};
+
+export default AdminHome;
diff --git a/app/(admin)/admin/players/page.tsx b/app/(admin)/admin/players/page.tsx
@@ -0,0 +1,14 @@
+// Copyright (c) Gridiron Survivor.
+// Licensed under the MIT License.
+
+import { JSX } from 'react';
+
+/**
+ * Renders the admin page.
+ * @returns {JSX.Element} - The rendered login page.
+ */
+const AdminPlayers = (): JSX.Element => {
+  return <div>Admin Players</div>;
+};
+
+export default AdminPlayers;
diff --git a/app/(admin)/layout.tsx b/app/(admin)/layout.tsx
@@ -0,0 +1,46 @@
+// Copyright (c) Gridiron Survivor.
+// Licensed under the MIT License.
+
+import React, { JSX } from 'react';
+import { GeistSans } from 'geist/font/sans';
+import '../globals.css';
+import { AuthContextProvider } from '@/context/AuthContextProvider';
+import ErrorBoundary from '../error';
+import { Toaster } from 'react-hot-toast';
+
+const defaultUrl = process.env.VERCEL_URL
+  ? `https://${process.env.VERCEL_URL}`
+  : 'http://localhost:3000';
+
+export const metadata = {
+  metadataBase: new URL(defaultUrl),
+  title: 'GridIron Survivor',
+  description: 'Fantasy Football Survivor Pool',
+};
+
+/**
+ * The root layout for the application.
+ * @param props - The props
+ * @param props.children - The children
+ * @returns The rendered root layout.
+ */
+const RootLayout = ({
+  children,
+}: {
+  children: React.ReactNode;
+}): JSX.Element => {
+  return (
+    <html lang="en" className={GeistSans.className}>
+      <body className="dark:dark bg-background pb-8 px-4 text-foreground xl:pb-0">
+        <ErrorBoundary>
+          <AuthContextProvider>
+            <main>{children}</main>
+            <Toaster />
+          </AuthContextProvider>
+        </ErrorBoundary>
+      </body>
+    </html>
+  );
+};
+
+export default RootLayout;
diff --git a/app/layout.tsx → app/(main)/layout.tsx b/app/layout.tsx → app/(main)/layout.tsx
@@ -3,10 +3,10 @@
 
 import React, { JSX } from 'react';
 import { GeistSans } from 'geist/font/sans';
-import './globals.css';
+import '../globals.css';
 import Nav from '@/components/Nav/Nav';
 import { AuthContextProvider } from '@/context/AuthContextProvider';
-import ErrorBoundary from './error';
+import ErrorBoundary from '../error';
 import { Toaster } from 'react-hot-toast';
 
 const defaultUrl = process.env.VERCEL_URL

diff --git a/...gue/[leagueId]/entry/Entries.interface.ts → ...gue/[leagueId]/entry/Entries.interface.ts b/...gue/[leagueId]/entry/Entries.interface.ts → ...gue/[leagueId]/entry/Entries.interface.ts
diff --git a/...d]/entry/[entryId]/week/Week.interface.ts → ...d]/entry/[entryId]/week/Week.interface.ts b/...d]/entry/[entryId]/week/Week.interface.ts → ...d]/entry/[entryId]/week/Week.interface.ts
diff --git a/...gueId]/entry/[entryId]/week/Week.test.tsx → ...gueId]/entry/[entryId]/week/Week.test.tsx b/...gueId]/entry/[entryId]/week/Week.test.tsx → ...gueId]/entry/[entryId]/week/Week.test.tsx
diff --git a/.../[leagueId]/entry/[entryId]/week/Week.tsx → .../[leagueId]/entry/[entryId]/week/Week.tsx b/.../[leagueId]/entry/[entryId]/week/Week.tsx → .../[leagueId]/entry/[entryId]/week/Week.tsx
@@ -69,7 +69,9 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
     }
 
     try {
-      const scheduleData = await import(`@/app/schedule/2024/week${week}.json`);
+      const scheduleData = await import(
+        `@/app/(main)/schedule/2024/week${week}.json`
+      );
       setSchedule(scheduleData.events);
     } catch (error) {
       console.error('Could not load week data:', error);

diff --git a/...ueId]/entry/[entryId]/week/WeekHelper.tsx → ...ueId]/entry/[entryId]/week/WeekHelper.tsx b/...ueId]/entry/[entryId]/week/WeekHelper.tsx → ...ueId]/entry/[entryId]/week/WeekHelper.tsx
diff --git a/...try/[entryId]/week/WeekTeams.interface.ts → ...try/[entryId]/week/WeekTeams.interface.ts b/...try/[entryId]/week/WeekTeams.interface.ts → ...try/[entryId]/week/WeekTeams.interface.ts
diff --git a/...gueId]/entry/[entryId]/week/WeekTeams.tsx → ...gueId]/entry/[entryId]/week/WeekTeams.tsx b/...gueId]/entry/[entryId]/week/WeekTeams.tsx → ...gueId]/entry/[entryId]/week/WeekTeams.tsx
diff --git a/...d]/entry/[entryId]/week/[weekId]/page.tsx → ...d]/entry/[entryId]/week/[weekId]/page.tsx b/...d]/entry/[entryId]/week/[weekId]/page.tsx → ...d]/entry/[entryId]/week/[weekId]/page.tsx
diff --git a/app/league/[leagueId]/entry/all/page.tsx → ...ain)/league/[leagueId]/entry/all/page.tsx b/app/league/[leagueId]/entry/all/page.tsx → ...ain)/league/[leagueId]/entry/all/page.tsx
diff --git a/app/league/all/page.test.tsx → app/(main)/league/all/page.test.tsx b/app/league/all/page.test.tsx → app/(main)/league/all/page.test.tsx
diff --git a/app/league/all/page.tsx → app/(main)/league/all/page.tsx b/app/league/all/page.tsx → app/(main)/league/all/page.tsx
diff --git a/app/login/page.spec.ts → app/(main)/login/page.spec.ts b/app/login/page.spec.ts → app/(main)/login/page.spec.ts
diff --git a/app/login/page.test.tsx → app/(main)/login/page.test.tsx b/app/login/page.test.tsx → app/(main)/login/page.test.tsx
@@ -24,7 +24,7 @@ jest.mock('next/navigation', () => ({
   },
 }));
 
-jest.mock('../../context/AuthContextProvider', () => ({
+jest.mock('../../../context/AuthContextProvider', () => ({
   useAuthContext() {
     return {
       ...mockUseAuthContext,

diff --git a/app/login/page.tsx → app/(main)/login/page.tsx b/app/login/page.tsx → app/(main)/login/page.tsx
@@ -18,7 +18,7 @@ import {
   FormField,
   FormItem,
   FormMessage,
-} from '../../components/Form/Form';
+} from '../../../components/Form/Form';
 
 const LoginUserSchema = z.object({
   email: z

diff --git a/app/page.tsx → app/(main)/page.tsx b/app/page.tsx → app/(main)/page.tsx
diff --git a/app/register/page.test.tsx → app/(main)/register/page.test.tsx b/app/register/page.test.tsx → app/(main)/register/page.test.tsx
@@ -8,7 +8,7 @@ import { toast } from 'react-hot-toast';
 const mockLogin = jest.fn();
 const mockPush = jest.fn();
 
-jest.mock('../../api/apiFunctions', () => ({
+jest.mock('../../../api/apiFunctions', () => ({
   registerAccount: jest.fn(),
 }));
 
@@ -37,7 +37,7 @@ jest.mock('next/navigation', () => ({
   },
 }));
 
-jest.mock('../../context/AuthContextProvider', () => ({
+jest.mock('../../../context/AuthContextProvider', () => ({
   useAuthContext() {
     return mockUseAuthContext;
   },

diff --git a/app/register/page.tsx → app/(main)/register/page.tsx b/app/register/page.tsx → app/(main)/register/page.tsx
@@ -20,7 +20,7 @@ import {
   FormField,
   FormItem,
   FormMessage,
-} from '../../components/Form/Form';
+} from '../../../components/Form/Form';
 import { toast } from 'react-hot-toast';
 import Alert from '@/components/AlertNotification/AlertNotification';
 import { AlertVariants } from '@/components/AlertNotification/Alerts.enum';

diff --git a/app/schedule/2024/week1.json → app/(main)/schedule/2024/week1.json b/app/schedule/2024/week1.json → app/(main)/schedule/2024/week1.json
diff --git a/app/schedule/2024/week10.json → app/(main)/schedule/2024/week10.json b/app/schedule/2024/week10.json → app/(main)/schedule/2024/week10.json
diff --git a/app/schedule/2024/week11.json → app/(main)/schedule/2024/week11.json b/app/schedule/2024/week11.json → app/(main)/schedule/2024/week11.json
diff --git a/app/schedule/2024/week12.json → app/(main)/schedule/2024/week12.json b/app/schedule/2024/week12.json → app/(main)/schedule/2024/week12.json
diff --git a/app/schedule/2024/week13.json → app/(main)/schedule/2024/week13.json b/app/schedule/2024/week13.json → app/(main)/schedule/2024/week13.json
diff --git a/app/schedule/2024/week14.json → app/(main)/schedule/2024/week14.json b/app/schedule/2024/week14.json → app/(main)/schedule/2024/week14.json
diff --git a/app/schedule/2024/week15.json → app/(main)/schedule/2024/week15.json b/app/schedule/2024/week15.json → app/(main)/schedule/2024/week15.json
diff --git a/app/schedule/2024/week16.json → app/(main)/schedule/2024/week16.json b/app/schedule/2024/week16.json → app/(main)/schedule/2024/week16.json
diff --git a/app/schedule/2024/week17.json → app/(main)/schedule/2024/week17.json b/app/schedule/2024/week17.json → app/(main)/schedule/2024/week17.json
diff --git a/app/schedule/2024/week18.json → app/(main)/schedule/2024/week18.json b/app/schedule/2024/week18.json → app/(main)/schedule/2024/week18.json
diff --git a/app/schedule/2024/week2.json → app/(main)/schedule/2024/week2.json b/app/schedule/2024/week2.json → app/(main)/schedule/2024/week2.json
diff --git a/app/schedule/2024/week3.json → app/(main)/schedule/2024/week3.json b/app/schedule/2024/week3.json → app/(main)/schedule/2024/week3.json
diff --git a/app/schedule/2024/week4.json → app/(main)/schedule/2024/week4.json b/app/schedule/2024/week4.json → app/(main)/schedule/2024/week4.json
diff --git a/app/schedule/2024/week5.json → app/(main)/schedule/2024/week5.json b/app/schedule/2024/week5.json → app/(main)/schedule/2024/week5.json
diff --git a/app/schedule/2024/week6.json → app/(main)/schedule/2024/week6.json b/app/schedule/2024/week6.json → app/(main)/schedule/2024/week6.json
diff --git a/app/schedule/2024/week7.json → app/(main)/schedule/2024/week7.json b/app/schedule/2024/week7.json → app/(main)/schedule/2024/week7.json
diff --git a/app/schedule/2024/week8.json → app/(main)/schedule/2024/week8.json b/app/schedule/2024/week8.json → app/(main)/schedule/2024/week8.json
diff --git a/app/schedule/2024/week9.json → app/(main)/schedule/2024/week9.json b/app/schedule/2024/week9.json → app/(main)/schedule/2024/week9.json
diff --git a/components/Alert/Alert.tsx b/components/Alert/Alert.tsx
@@ -27,10 +27,11 @@ const alertVariants = cva(
 const Alert = React.forwardRef<
   HTMLDivElement,
   React.HTMLAttributes<HTMLDivElement> & VariantProps<typeof alertVariants>
->(({ variant, children }) => (
+>(({ variant, children }, ref) => (
   <div
     role="alert"
     className={alertVariants({ variant })}
+    ref={ref}
   >{children}</div>
 ));
 Alert.displayName = 'Alert';

diff --git a/components/LeagueCard/LeagueCard.tsx b/components/LeagueCard/LeagueCard.tsx
@@ -18,13 +18,14 @@ const LeagueCard = React.forwardRef<HTMLAnchorElement, ILeagueCardProps>(
     survivors,
     title,
     totalPlayers,
-  }) => (
+  }, ref) => (
     <Link
       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 hover:bg-zinc-800 transition',
       )}
+      ref={ref}
     >
       <Image
         alt="League Logo"

diff --git a/components/Nav/Nav.test.tsx b/components/Nav/Nav.test.tsx
@@ -1,6 +1,6 @@
 import { render, screen, fireEvent, waitFor } from '@testing-library/react';
 import Nav from './Nav';
-import Login from '@/app/login/page';
+import Login from '@/app/(main)/login/page';
 
 const mockPush = jest.fn();
 const mockUsePathname = jest.fn();

diff --git a/utils/utils.interface.ts b/utils/utils.interface.ts
@@ -8,7 +8,7 @@ import {
   IUser,
   IWeeklyPicks,
 } from '@/api/apiFunctions.interface';
-import { IEntry } from '@/app/league/[leagueId]/entry/Entries.interface';
+import { IEntry } from '@/app/(main)/league/[leagueId]/entry/Entries.interface';
 
 export interface IGetGameData {
   userId: IUser['id'];

diff --git a/utils/utils.ts b/utils/utils.ts
@@ -14,7 +14,7 @@ import {
   IGetUserPick,
 } from './utils.interface';
 import { ILeague } from '@/api/apiFunctions.interface';
-import { IEntry } from '@/app/league/[leagueId]/entry/Entries.interface';
+import { IEntry } from '@/app/(main)/league/[leagueId]/entry/Entries.interface';
 
 /**
  * Combine class names
@@ -143,4 +143,4 @@ export const getUserLeagues = async (
  */
 export const getUserEntries = async (userId: IUser['id'], leagueId: ILeague['leagueId']): Promise<IEntry[]> => {
   return await getCurrentUserEntries(userId, leagueId);
-}
+}