Merge branch 'develop' of github.com:LetsGetTechnical/gridiron-surviv…

…or into jennifer/update-selection-page

.eslintignore

@@ -1,4 +1,5 @@
 **/*.test.ts
 **/*.test.tsx
 **/*.test.js
-**/*.test.jsx
+**/*.test.jsx
+next-env.d.ts

.eslintrc.json

@@ -135,6 +135,19 @@
       "rules": {
         "no-unused-vars": "off"
       }
+    },
+    {
+      "files": ["playwright.config.ts"],
+      "rules": {
+        "no-undefined": "off"
+      }
+    },
+    {
+      "files": ["functions/userAuth.js"],
+      "rules": {
+        "@typescript-eslint/explicit-function-return-type": "off",
+        "@typescript-eslint/no-var-requires": "off"
+      }
     }
   ]
-}
+}

context/AuthContextProvider.tsx

@@ -11,6 +11,7 @@ import type { DataStore } from '@/store/dataStore';
 import { IUser } from '@/api/apiFunctions.interface';
 import { getCurrentUser } from '@/api/apiFunctions';
 import { loginAccount } from './AuthHelper';
+import { usePathname } from 'next/navigation';
 
 type UserCredentials = {
   email: string;
@@ -43,6 +44,7 @@ export const AuthContextProvider = ({
     (state) => state,
   );
   const router = useRouter();
+  const pathname = usePathname();
 
   useEffect(() => {
     if (user.id === '' || user.email === '') {
@@ -87,7 +89,9 @@ export const AuthContextProvider = ({
    */
   const getUser = async (): Promise<IUser | undefined> => {
     if (!isSessionInLocalStorage()) {
-      router.push('/login');
+      if (pathname !== '/register') {
+        router.push('/login');
+      }
       return;
     }
 

jest.setup.js

@@ -1 +1,4 @@
+// Copyright (c) Gridiron Survivor.
+// Licensed under the MIT License.
+
 import '@testing-library/jest-dom';

middleware.ts

@@ -1,6 +1,14 @@
+// Copyright (c) Gridiron Survivor.
+// Licensed under the MIT License.
+
 import { NextResponse, type NextRequest } from 'next/server'
 
-export async function middleware(request: NextRequest) {
+/**
+ * Checks if the request is a POST request and if so, returns the response object
+ * @param request - The request object
+ * @returns {NextResponse} - The response object
+ */
+export async function middleware(request: NextRequest): Promise<NextResponse> {
   try {
     return NextResponse.next({
       request: {

next.config.js

@@ -20,4 +20,8 @@ module.exports = {
   images: {
     domains: ['a.espncdn.com'],
   },
-}
+  eslint: {
+    ignoreDuringBuilds: false,
+    dirs: ["."],
+  }
+}

package.json

@@ -10,7 +10,7 @@
     "storybook-docs": "storybook dev --docs",
     "storybook": "storybook dev -p 6006",
     "build-storybook": "storybook build",
-    "lint": "next lint --quiet"
+    "lint": "npx next lint --dir ."
   },
   "dependencies": {
     "@hookform/resolvers": "^3.3.4",

playwright.config.ts

@@ -1,7 +1,13 @@
+// Copyright (c) Gridiron Survivor.
+// Licensed under the MIT License.
+
 import { defineConfig, devices } from '@playwright/test';
 import { execSync } from 'child_process';
 
-// Get the current branch
+/**
+ * Get the current branch
+ * @returns {void}
+ */
 function getCurrentBranch(): string {
   try {
     const branch = execSync('git rev-parse --abbrev-ref HEAD')

postcss.config.js

@@ -1,3 +1,6 @@
+// Copyright (c) Gridiron Survivor.
+// Licensed under the MIT License.
+
 module.exports = {
   plugins: {
     tailwindcss: {},

prettier.config.js

@@ -1,7 +1,10 @@
+// Copyright (c) Gridiron Survivor.
+// Licensed under the MIT License.
+
 module.exports = {
   printWidth: 80,
   semi: true,
   singleQuote: true,
   tabWidth: 2,
   trailingComma: 'all',
-};
+};

tsconfig.json

@@ -30,6 +30,6 @@
     "**/*.tsx",
     ".next/types/**/*.ts",
     "jest.config.ts"
-  ],
+, "functions/userAuth.ts"  ],
   "exclude": ["node_modules"]
-}
+}