diff --git a/api/apiFunctions.interface.ts b/api/apiFunctions.interface.ts index 9de608db..f384597a 100644 --- 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 index 938ce9ec..2cd7a402 100644 --- 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 new file mode 100644 index 00000000..e2765a5e --- /dev/null +++ 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
Admin Leagues
; +}; + +export default AdminLeagues; diff --git a/app/(admin)/admin/notifications/page.tsx b/app/(admin)/admin/notifications/page.tsx new file mode 100644 index 00000000..62c2bbe6 --- /dev/null +++ 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
Admin Notifications
; +}; + +export default AdminNotifications; diff --git a/app/(admin)/admin/page.tsx b/app/(admin)/admin/page.tsx new file mode 100644 index 00000000..8b7420df --- /dev/null +++ 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
Admin Home
; +}; + +export default AdminHome; diff --git a/app/(admin)/admin/players/page.tsx b/app/(admin)/admin/players/page.tsx new file mode 100644 index 00000000..a6e97f10 --- /dev/null +++ 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
Admin Players
; +}; + +export default AdminPlayers; diff --git a/app/(admin)/layout.tsx b/app/(admin)/layout.tsx new file mode 100644 index 00000000..f3490975 --- /dev/null +++ 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 ( + + + {/* */} + +
{children}
+ +
+ {/*
*/} + + + ); +}; + +export default RootLayout; diff --git a/app/layout.tsx b/app/(main)/layout.tsx similarity index 95% rename from app/layout.tsx rename to app/(main)/layout.tsx index a655b61c..6823b012 100644 --- a/app/layout.tsx +++ b/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/app/league/[leagueId]/entry/Entries.interface.ts b/app/(main)/league/[leagueId]/entry/Entries.interface.ts similarity index 100% rename from app/league/[leagueId]/entry/Entries.interface.ts rename to app/(main)/league/[leagueId]/entry/Entries.interface.ts diff --git a/app/league/[leagueId]/entry/[entryId]/week/Week.interface.ts b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.interface.ts similarity index 100% rename from app/league/[leagueId]/entry/[entryId]/week/Week.interface.ts rename to app/(main)/league/[leagueId]/entry/[entryId]/week/Week.interface.ts diff --git a/app/league/[leagueId]/entry/[entryId]/week/Week.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx similarity index 100% rename from app/league/[leagueId]/entry/[entryId]/week/Week.tsx rename to app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx diff --git a/app/league/[leagueId]/entry/[entryId]/week/WeekTeams.interface.ts b/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.interface.ts similarity index 100% rename from app/league/[leagueId]/entry/[entryId]/week/WeekTeams.interface.ts rename to app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.interface.ts diff --git a/app/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx similarity index 100% rename from app/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx rename to app/(main)/league/[leagueId]/entry/[entryId]/week/WeekTeams.tsx diff --git a/app/league/[leagueId]/entry/[entryId]/week/[weekId]/page.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/[weekId]/page.tsx similarity index 100% rename from app/league/[leagueId]/entry/[entryId]/week/[weekId]/page.tsx rename to app/(main)/league/[leagueId]/entry/[entryId]/week/[weekId]/page.tsx diff --git a/app/league/[leagueId]/entry/all/page.tsx b/app/(main)/league/[leagueId]/entry/all/page.tsx similarity index 100% rename from app/league/[leagueId]/entry/all/page.tsx rename to app/(main)/league/[leagueId]/entry/all/page.tsx diff --git a/app/league/all/page.test.tsx b/app/(main)/league/all/page.test.tsx similarity index 100% rename from app/league/all/page.test.tsx rename to app/(main)/league/all/page.test.tsx diff --git a/app/league/all/page.tsx b/app/(main)/league/all/page.tsx similarity index 100% rename from app/league/all/page.tsx rename to app/(main)/league/all/page.tsx diff --git a/app/login/page.spec.ts b/app/(main)/login/page.spec.ts similarity index 100% rename from app/login/page.spec.ts rename to app/(main)/login/page.spec.ts diff --git a/app/login/page.test.tsx b/app/(main)/login/page.test.tsx similarity index 100% rename from app/login/page.test.tsx rename to app/(main)/login/page.test.tsx diff --git a/app/login/page.tsx b/app/(main)/login/page.tsx similarity index 99% rename from app/login/page.tsx rename to app/(main)/login/page.tsx index c776bf2a..03fc3811 100644 --- a/app/login/page.tsx +++ b/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 b/app/(main)/page.tsx similarity index 100% rename from app/page.tsx rename to app/(main)/page.tsx diff --git a/app/register/page.test.tsx b/app/(main)/register/page.test.tsx similarity index 100% rename from app/register/page.test.tsx rename to app/(main)/register/page.test.tsx diff --git a/app/register/page.tsx b/app/(main)/register/page.tsx similarity index 99% rename from app/register/page.tsx rename to app/(main)/register/page.tsx index 6a58553c..a3861dc0 100644 --- a/app/register/page.tsx +++ b/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 b/app/(main)/schedule/2024/week1.json similarity index 100% rename from app/schedule/2024/week1.json rename to app/(main)/schedule/2024/week1.json diff --git a/app/schedule/2024/week10.json b/app/(main)/schedule/2024/week10.json similarity index 100% rename from app/schedule/2024/week10.json rename to app/(main)/schedule/2024/week10.json diff --git a/app/schedule/2024/week11.json b/app/(main)/schedule/2024/week11.json similarity index 100% rename from app/schedule/2024/week11.json rename to app/(main)/schedule/2024/week11.json diff --git a/app/schedule/2024/week12.json b/app/(main)/schedule/2024/week12.json similarity index 100% rename from app/schedule/2024/week12.json rename to app/(main)/schedule/2024/week12.json diff --git a/app/schedule/2024/week13.json b/app/(main)/schedule/2024/week13.json similarity index 100% rename from app/schedule/2024/week13.json rename to app/(main)/schedule/2024/week13.json diff --git a/app/schedule/2024/week14.json b/app/(main)/schedule/2024/week14.json similarity index 100% rename from app/schedule/2024/week14.json rename to app/(main)/schedule/2024/week14.json diff --git a/app/schedule/2024/week15.json b/app/(main)/schedule/2024/week15.json similarity index 100% rename from app/schedule/2024/week15.json rename to app/(main)/schedule/2024/week15.json diff --git a/app/schedule/2024/week16.json b/app/(main)/schedule/2024/week16.json similarity index 100% rename from app/schedule/2024/week16.json rename to app/(main)/schedule/2024/week16.json diff --git a/app/schedule/2024/week17.json b/app/(main)/schedule/2024/week17.json similarity index 100% rename from app/schedule/2024/week17.json rename to app/(main)/schedule/2024/week17.json diff --git a/app/schedule/2024/week18.json b/app/(main)/schedule/2024/week18.json similarity index 100% rename from app/schedule/2024/week18.json rename to app/(main)/schedule/2024/week18.json diff --git a/app/schedule/2024/week2.json b/app/(main)/schedule/2024/week2.json similarity index 100% rename from app/schedule/2024/week2.json rename to app/(main)/schedule/2024/week2.json diff --git a/app/schedule/2024/week3.json b/app/(main)/schedule/2024/week3.json similarity index 100% rename from app/schedule/2024/week3.json rename to app/(main)/schedule/2024/week3.json diff --git a/app/schedule/2024/week4.json b/app/(main)/schedule/2024/week4.json similarity index 100% rename from app/schedule/2024/week4.json rename to app/(main)/schedule/2024/week4.json diff --git a/app/schedule/2024/week5.json b/app/(main)/schedule/2024/week5.json similarity index 100% rename from app/schedule/2024/week5.json rename to app/(main)/schedule/2024/week5.json diff --git a/app/schedule/2024/week6.json b/app/(main)/schedule/2024/week6.json similarity index 100% rename from app/schedule/2024/week6.json rename to app/(main)/schedule/2024/week6.json diff --git a/app/schedule/2024/week7.json b/app/(main)/schedule/2024/week7.json similarity index 100% rename from app/schedule/2024/week7.json rename to app/(main)/schedule/2024/week7.json diff --git a/app/schedule/2024/week8.json b/app/(main)/schedule/2024/week8.json similarity index 100% rename from app/schedule/2024/week8.json rename to app/(main)/schedule/2024/week8.json diff --git a/app/schedule/2024/week9.json b/app/(main)/schedule/2024/week9.json similarity index 100% rename from app/schedule/2024/week9.json rename to app/(main)/schedule/2024/week9.json diff --git a/components/Nav/Nav.test.tsx b/components/Nav/Nav.test.tsx index ca2cb246..e1c26dd3 100644 --- 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/pnpm-lock.yaml b/pnpm-lock.yaml index 1469df30..463540e1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -95,7 +95,7 @@ importers: version: 1.44.1 '@storybook/addon-essentials': specifier: ^8.0.4 - version: 8.1.6(@types/react-dom@18.2.5)(@types/react@18.2.8)(encoding@0.1.13)(prettier@3.3.1)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) + version: 8.1.6(@types/react-dom@18.2.5)(@types/react@18.2.8)(encoding@0.1.13)(prettier@2.3.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) '@storybook/addon-interactions': specifier: ^8.0.4 version: 8.1.6(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.3.1)(ts-node@10.9.2(@types/node@20.3.1)(typescript@5.1.3))) @@ -107,13 +107,13 @@ importers: version: 8.1.6(react@18.2.0) '@storybook/blocks': specifier: ^8.0.4 - version: 8.1.6(@types/react-dom@18.2.5)(@types/react@18.2.8)(encoding@0.1.13)(prettier@3.3.1)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) + version: 8.1.6(@types/react-dom@18.2.5)(@types/react@18.2.8)(encoding@0.1.13)(prettier@2.3.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) '@storybook/nextjs': specifier: ^8.0.4 - version: 8.1.6(@jest/globals@29.7.0)(@types/jest@29.5.12)(encoding@0.1.13)(esbuild@0.20.2)(jest@29.7.0(@types/node@20.3.1)(ts-node@10.9.2(@types/node@20.3.1)(typescript@5.1.3)))(next@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))(prettier@3.3.1)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(type-fest@2.19.0)(typescript@5.1.3)(webpack-hot-middleware@2.26.1)(webpack@5.91.0(esbuild@0.20.2)) + version: 8.1.6(@jest/globals@29.7.0)(@types/jest@29.5.12)(encoding@0.1.13)(esbuild@0.20.2)(jest@29.7.0(@types/node@20.3.1)(ts-node@10.9.2(@types/node@20.3.1)(typescript@5.1.3)))(next@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))(prettier@2.3.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(type-fest@2.19.0)(typescript@5.1.3)(webpack-hot-middleware@2.26.1)(webpack@5.91.0(esbuild@0.20.2)) '@storybook/react': specifier: ^8.0.4 - version: 8.1.6(encoding@0.1.13)(prettier@3.3.1)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.1.3) + version: 8.1.6(encoding@0.1.13)(prettier@2.3.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.1.3) '@storybook/test': specifier: ^8.0.4 version: 8.1.6(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.3.1)(ts-node@10.9.2(@types/node@20.3.1)(typescript@5.1.3))) @@ -8244,9 +8244,9 @@ snapshots: memoizerific: 1.11.3 ts-dedent: 2.2.0 - '@storybook/addon-controls@8.1.6(@types/react-dom@18.2.5)(@types/react@18.2.8)(encoding@0.1.13)(prettier@3.3.1)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': + '@storybook/addon-controls@8.1.6(@types/react-dom@18.2.5)(@types/react@18.2.8)(encoding@0.1.13)(prettier@2.3.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': dependencies: - '@storybook/blocks': 8.1.6(@types/react-dom@18.2.5)(@types/react@18.2.8)(encoding@0.1.13)(prettier@3.3.1)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) + '@storybook/blocks': 8.1.6(@types/react-dom@18.2.5)(@types/react@18.2.8)(encoding@0.1.13)(prettier@2.3.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) dequal: 2.0.3 lodash: 4.17.21 ts-dedent: 2.2.0 @@ -8259,11 +8259,11 @@ snapshots: - react-dom - supports-color - '@storybook/addon-docs@8.1.6(@types/react-dom@18.2.5)(encoding@0.1.13)(prettier@3.3.1)': + '@storybook/addon-docs@8.1.6(@types/react-dom@18.2.5)(encoding@0.1.13)(prettier@2.3.2)': dependencies: '@babel/core': 7.24.7 '@mdx-js/react': 3.0.1(@types/react@18.2.8)(react@18.2.0) - '@storybook/blocks': 8.1.6(@types/react-dom@18.2.5)(@types/react@18.2.8)(encoding@0.1.13)(prettier@3.3.1)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) + '@storybook/blocks': 8.1.6(@types/react-dom@18.2.5)(@types/react@18.2.8)(encoding@0.1.13)(prettier@2.3.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) '@storybook/client-logger': 8.1.6 '@storybook/components': 8.1.6(@types/react-dom@18.2.5)(@types/react@18.2.8)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) '@storybook/csf-plugin': 8.1.6 @@ -8287,18 +8287,18 @@ snapshots: - prettier - supports-color - '@storybook/addon-essentials@8.1.6(@types/react-dom@18.2.5)(@types/react@18.2.8)(encoding@0.1.13)(prettier@3.3.1)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': + '@storybook/addon-essentials@8.1.6(@types/react-dom@18.2.5)(@types/react@18.2.8)(encoding@0.1.13)(prettier@2.3.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': dependencies: '@storybook/addon-actions': 8.1.6 '@storybook/addon-backgrounds': 8.1.6 - '@storybook/addon-controls': 8.1.6(@types/react-dom@18.2.5)(@types/react@18.2.8)(encoding@0.1.13)(prettier@3.3.1)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) - '@storybook/addon-docs': 8.1.6(@types/react-dom@18.2.5)(encoding@0.1.13)(prettier@3.3.1) + '@storybook/addon-controls': 8.1.6(@types/react-dom@18.2.5)(@types/react@18.2.8)(encoding@0.1.13)(prettier@2.3.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) + '@storybook/addon-docs': 8.1.6(@types/react-dom@18.2.5)(encoding@0.1.13)(prettier@2.3.2) '@storybook/addon-highlight': 8.1.6 '@storybook/addon-measure': 8.1.6 '@storybook/addon-outline': 8.1.6 '@storybook/addon-toolbars': 8.1.6 '@storybook/addon-viewport': 8.1.6 - '@storybook/core-common': 8.1.6(encoding@0.1.13)(prettier@3.3.1) + '@storybook/core-common': 8.1.6(encoding@0.1.13)(prettier@2.3.2) '@storybook/manager-api': 8.1.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0) '@storybook/node-logger': 8.1.6 '@storybook/preview-api': 8.1.6 @@ -8361,14 +8361,14 @@ snapshots: dependencies: memoizerific: 1.11.3 - '@storybook/blocks@8.1.6(@types/react-dom@18.2.5)(@types/react@18.2.8)(encoding@0.1.13)(prettier@3.3.1)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': + '@storybook/blocks@8.1.6(@types/react-dom@18.2.5)(@types/react@18.2.8)(encoding@0.1.13)(prettier@2.3.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': dependencies: '@storybook/channels': 8.1.6 '@storybook/client-logger': 8.1.6 '@storybook/components': 8.1.6(@types/react-dom@18.2.5)(@types/react@18.2.8)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) '@storybook/core-events': 8.1.6 '@storybook/csf': 0.1.8 - '@storybook/docs-tools': 8.1.6(encoding@0.1.13)(prettier@3.3.1) + '@storybook/docs-tools': 8.1.6(encoding@0.1.13)(prettier@2.3.2) '@storybook/global': 5.0.0 '@storybook/icons': 1.2.9(react-dom@18.2.0(react@18.2.0))(react@18.2.0) '@storybook/manager-api': 8.1.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0) @@ -8418,13 +8418,13 @@ snapshots: - prettier - supports-color - '@storybook/builder-webpack5@8.1.6(encoding@0.1.13)(esbuild@0.20.2)(prettier@3.3.1)(typescript@5.1.3)': + '@storybook/builder-webpack5@8.1.6(encoding@0.1.13)(esbuild@0.20.2)(prettier@2.3.2)(typescript@5.1.3)': dependencies: '@storybook/channels': 8.1.6 '@storybook/client-logger': 8.1.6 - '@storybook/core-common': 8.1.6(encoding@0.1.13)(prettier@3.3.1) + '@storybook/core-common': 8.1.6(encoding@0.1.13)(prettier@2.3.2) '@storybook/core-events': 8.1.6 - '@storybook/core-webpack': 8.1.6(encoding@0.1.13)(prettier@3.3.1) + '@storybook/core-webpack': 8.1.6(encoding@0.1.13)(prettier@2.3.2) '@storybook/node-logger': 8.1.6 '@storybook/preview': 8.1.6 '@storybook/preview-api': 8.1.6 @@ -8563,6 +8563,43 @@ snapshots: - '@types/react' - '@types/react-dom' + '@storybook/core-common@8.1.6(encoding@0.1.13)(prettier@2.3.2)': + dependencies: + '@storybook/core-events': 8.1.6 + '@storybook/csf-tools': 8.1.6 + '@storybook/node-logger': 8.1.6 + '@storybook/types': 8.1.6 + '@yarnpkg/fslib': 2.10.3 + '@yarnpkg/libzip': 2.3.0 + chalk: 4.1.2 + cross-spawn: 7.0.3 + esbuild: 0.20.2 + esbuild-register: 3.5.0(esbuild@0.20.2) + execa: 5.1.1 + file-system-cache: 2.3.0 + find-cache-dir: 3.3.2 + find-up: 5.0.0 + fs-extra: 11.2.0 + glob: 10.4.1 + handlebars: 4.7.8 + lazy-universal-dotenv: 4.0.0 + node-fetch: 2.7.0(encoding@0.1.13) + picomatch: 2.3.1 + pkg-dir: 5.0.0 + prettier-fallback: prettier@3.3.1 + pretty-hrtime: 1.0.3 + resolve-from: 5.0.0 + semver: 7.6.2 + tempy: 3.1.0 + tiny-invariant: 1.3.3 + ts-dedent: 2.2.0 + util: 0.12.5 + optionalDependencies: + prettier: 2.3.2 + transitivePeerDependencies: + - encoding + - supports-color + '@storybook/core-common@8.1.6(encoding@0.1.13)(prettier@3.3.1)': dependencies: '@storybook/core-events': 8.1.6 @@ -8661,9 +8698,9 @@ snapshots: - supports-color - utf-8-validate - '@storybook/core-webpack@8.1.6(encoding@0.1.13)(prettier@3.3.1)': + '@storybook/core-webpack@8.1.6(encoding@0.1.13)(prettier@2.3.2)': dependencies: - '@storybook/core-common': 8.1.6(encoding@0.1.13)(prettier@3.3.1) + '@storybook/core-common': 8.1.6(encoding@0.1.13)(prettier@2.3.2) '@storybook/node-logger': 8.1.6 '@storybook/types': 8.1.6 '@types/node': 18.19.34 @@ -8700,9 +8737,9 @@ snapshots: '@storybook/docs-mdx@3.1.0-next.0': {} - '@storybook/docs-tools@8.1.6(encoding@0.1.13)(prettier@3.3.1)': + '@storybook/docs-tools@8.1.6(encoding@0.1.13)(prettier@2.3.2)': dependencies: - '@storybook/core-common': 8.1.6(encoding@0.1.13)(prettier@3.3.1) + '@storybook/core-common': 8.1.6(encoding@0.1.13)(prettier@2.3.2) '@storybook/core-events': 8.1.6 '@storybook/preview-api': 8.1.6 '@storybook/types': 8.1.6 @@ -8755,7 +8792,7 @@ snapshots: '@storybook/manager@8.1.6': {} - '@storybook/nextjs@8.1.6(@jest/globals@29.7.0)(@types/jest@29.5.12)(encoding@0.1.13)(esbuild@0.20.2)(jest@29.7.0(@types/node@20.3.1)(ts-node@10.9.2(@types/node@20.3.1)(typescript@5.1.3)))(next@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))(prettier@3.3.1)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(type-fest@2.19.0)(typescript@5.1.3)(webpack-hot-middleware@2.26.1)(webpack@5.91.0(esbuild@0.20.2))': + '@storybook/nextjs@8.1.6(@jest/globals@29.7.0)(@types/jest@29.5.12)(encoding@0.1.13)(esbuild@0.20.2)(jest@29.7.0(@types/node@20.3.1)(ts-node@10.9.2(@types/node@20.3.1)(typescript@5.1.3)))(next@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))(prettier@2.3.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(type-fest@2.19.0)(typescript@5.1.3)(webpack-hot-middleware@2.26.1)(webpack@5.91.0(esbuild@0.20.2))': dependencies: '@babel/core': 7.24.7 '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.24.7) @@ -8771,13 +8808,13 @@ snapshots: '@babel/preset-typescript': 7.24.7(@babel/core@7.24.7) '@babel/runtime': 7.24.7 '@pmmmwh/react-refresh-webpack-plugin': 0.5.15(react-refresh@0.14.2)(type-fest@2.19.0)(webpack-hot-middleware@2.26.1)(webpack@5.91.0(esbuild@0.20.2)) - '@storybook/builder-webpack5': 8.1.6(encoding@0.1.13)(esbuild@0.20.2)(prettier@3.3.1)(typescript@5.1.3) - '@storybook/core-common': 8.1.6(encoding@0.1.13)(prettier@3.3.1) + '@storybook/builder-webpack5': 8.1.6(encoding@0.1.13)(esbuild@0.20.2)(prettier@2.3.2)(typescript@5.1.3) + '@storybook/core-common': 8.1.6(encoding@0.1.13)(prettier@2.3.2) '@storybook/core-events': 8.1.6 '@storybook/node-logger': 8.1.6 - '@storybook/preset-react-webpack': 8.1.6(encoding@0.1.13)(esbuild@0.20.2)(prettier@3.3.1)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.1.3) + '@storybook/preset-react-webpack': 8.1.6(encoding@0.1.13)(esbuild@0.20.2)(prettier@2.3.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.1.3) '@storybook/preview-api': 8.1.6 - '@storybook/react': 8.1.6(encoding@0.1.13)(prettier@3.3.1)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.1.3) + '@storybook/react': 8.1.6(encoding@0.1.13)(prettier@2.3.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.1.3) '@storybook/test': 8.1.6(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.3.1)(ts-node@10.9.2(@types/node@20.3.1)(typescript@5.1.3))) '@storybook/types': 8.1.6 '@types/node': 18.19.34 @@ -8836,12 +8873,12 @@ snapshots: '@storybook/node-logger@8.1.6': {} - '@storybook/preset-react-webpack@8.1.6(encoding@0.1.13)(esbuild@0.20.2)(prettier@3.3.1)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.1.3)': + '@storybook/preset-react-webpack@8.1.6(encoding@0.1.13)(esbuild@0.20.2)(prettier@2.3.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.1.3)': dependencies: - '@storybook/core-webpack': 8.1.6(encoding@0.1.13)(prettier@3.3.1) - '@storybook/docs-tools': 8.1.6(encoding@0.1.13)(prettier@3.3.1) + '@storybook/core-webpack': 8.1.6(encoding@0.1.13)(prettier@2.3.2) + '@storybook/docs-tools': 8.1.6(encoding@0.1.13)(prettier@2.3.2) '@storybook/node-logger': 8.1.6 - '@storybook/react': 8.1.6(encoding@0.1.13)(prettier@3.3.1)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.1.3) + '@storybook/react': 8.1.6(encoding@0.1.13)(prettier@2.3.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.1.3) '@storybook/react-docgen-typescript-plugin': 1.0.6--canary.9.0c3f3b7.0(typescript@5.1.3)(webpack@5.91.0(esbuild@0.20.2)) '@types/node': 18.19.34 '@types/semver': 7.5.8 @@ -8904,10 +8941,10 @@ snapshots: react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - '@storybook/react@8.1.6(encoding@0.1.13)(prettier@3.3.1)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.1.3)': + '@storybook/react@8.1.6(encoding@0.1.13)(prettier@2.3.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.1.3)': dependencies: '@storybook/client-logger': 8.1.6 - '@storybook/docs-tools': 8.1.6(encoding@0.1.13)(prettier@3.3.1) + '@storybook/docs-tools': 8.1.6(encoding@0.1.13)(prettier@2.3.2) '@storybook/global': 5.0.0 '@storybook/preview-api': 8.1.6 '@storybook/react-dom-shim': 8.1.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0) diff --git a/utils/utils.interface.ts b/utils/utils.interface.ts index b8e3f763..78045232 100644 --- 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 index e77d4ae9..3110957b 100644 --- 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 => { return await getCurrentUserEntries(userId, leagueId); -} \ No newline at end of file +}