diff --git a/package-lock.json b/package-lock.json index 97d3fcc..84aa886 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,6 @@ "version": "0.1.0", "dependencies": { "@clerk/nextjs": "^4.25.6", - "@netlify/next": "^1.4.9", "@reduxjs/toolkit": "^1.9.5", "@tanem/react-nprogress": "^5.0.36", "axios": "^1.3.6", @@ -24,7 +23,7 @@ "moment": "^2.29.4", "mongoose": "^7.6.3", "next": "^13.4.12", - "next-auth": "^4.22.1", + "next-auth": "^4.24.4", "path-to-regexp": "^6.2.1", "rdndmb-html5-to-touch": "^8.0.3", "react": "18.2.0", @@ -358,17 +357,6 @@ "sparse-bitfield": "^3.0.3" } }, - "node_modules/@netlify/next": { - "version": "1.4.9", - "resolved": "https://registry.npmjs.org/@netlify/next/-/next-1.4.9.tgz", - "integrity": "sha512-lrbY+CEhS9x0jV7oXVYi/rqxZ6ht5KeLGNZsgIPI34kpDaBuD/EfsyKa28BWeSrFalxRZmkMxQYRSTa82v3roQ==", - "engines": { - "node": ">=12.0.0" - }, - "peerDependencies": { - "next": ">=12.2.0" - } - }, "node_modules/@next/env": { "version": "13.4.12", "resolved": "https://registry.npmjs.org/@next/env/-/env-13.4.12.tgz", @@ -4003,9 +3991,9 @@ } }, "node_modules/next-auth": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/next-auth/-/next-auth-4.22.1.tgz", - "integrity": "sha512-NTR3f6W7/AWXKw8GSsgSyQcDW6jkslZLH8AiZa5PQ09w1kR8uHtR9rez/E9gAq/o17+p0JYHE8QjF3RoniiObA==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/next-auth/-/next-auth-4.24.4.tgz", + "integrity": "sha512-5DGffi+OpkbU62vPQIJ1z+hFnmow+ec5Qrn9m6eoglIO51m0DlrmLxBduZEwKAYDEg9k2joi1yelgmq1vqK3aQ==", "dependencies": { "@babel/runtime": "^7.20.13", "@panva/hkdf": "^1.0.2", @@ -4018,7 +4006,7 @@ "uuid": "^8.3.2" }, "peerDependencies": { - "next": "^12.2.5 || ^13", + "next": "^12.2.5 || ^13 || ^14", "nodemailer": "^6.6.5", "react": "^17.0.2 || ^18", "react-dom": "^17.0.2 || ^18" @@ -6229,12 +6217,6 @@ "sparse-bitfield": "^3.0.3" } }, - "@netlify/next": { - "version": "1.4.9", - "resolved": "https://registry.npmjs.org/@netlify/next/-/next-1.4.9.tgz", - "integrity": "sha512-lrbY+CEhS9x0jV7oXVYi/rqxZ6ht5KeLGNZsgIPI34kpDaBuD/EfsyKa28BWeSrFalxRZmkMxQYRSTa82v3roQ==", - "requires": {} - }, "@next/env": { "version": "13.4.12", "resolved": "https://registry.npmjs.org/@next/env/-/env-13.4.12.tgz", @@ -8806,9 +8788,9 @@ } }, "next-auth": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/next-auth/-/next-auth-4.22.1.tgz", - "integrity": "sha512-NTR3f6W7/AWXKw8GSsgSyQcDW6jkslZLH8AiZa5PQ09w1kR8uHtR9rez/E9gAq/o17+p0JYHE8QjF3RoniiObA==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/next-auth/-/next-auth-4.24.4.tgz", + "integrity": "sha512-5DGffi+OpkbU62vPQIJ1z+hFnmow+ec5Qrn9m6eoglIO51m0DlrmLxBduZEwKAYDEg9k2joi1yelgmq1vqK3aQ==", "requires": { "@babel/runtime": "^7.20.13", "@panva/hkdf": "^1.0.2", diff --git a/package.json b/package.json index 20a258f..f6f2f4d 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,6 @@ }, "dependencies": { "@clerk/nextjs": "^4.25.6", - "@netlify/next": "^1.4.9", "@reduxjs/toolkit": "^1.9.5", "@tanem/react-nprogress": "^5.0.36", "axios": "^1.3.6", @@ -25,7 +24,7 @@ "moment": "^2.29.4", "mongoose": "^7.6.3", "next": "^13.4.12", - "next-auth": "^4.22.1", + "next-auth": "^4.24.4", "path-to-regexp": "^6.2.1", "rdndmb-html5-to-touch": "^8.0.3", "react": "18.2.0", diff --git a/src/components/auth/AuthForm.js b/src/components/auth/AuthForm.js index 867ef3a..9927397 100644 --- a/src/components/auth/AuthForm.js +++ b/src/components/auth/AuthForm.js @@ -54,7 +54,7 @@ const AuthForm = (props) => { const googleAuthHandler = (event) => { event.preventDefault(); - let redirectLink = "/"; + let redirectLink = `/?`; if (redirect && joinClass === "true" && classId) { redirectLink = `/?jc=true&id=${classId}`; } diff --git a/src/middleware.js b/src/middleware.js index bfe91f3..896d216 100644 --- a/src/middleware.js +++ b/src/middleware.js @@ -8,6 +8,7 @@ export async function middleware(request) { }); const PUBLIC_FILE = /\.(.*)$/; + const { pathname } = request.nextUrl; if (