@@ -94,5 +96,7 @@ LoadingSpinner.UWSpinner = ({ size = 'md' }) => {
);
};
+UWSpinner.displayName = 'LoadingSpinner.UWSpinner';
+LoadingSpinner.UWSpinner = UWSpinner;
export default LoadingSpinner;
diff --git a/src/middleware.ts b/src/middleware.ts
index 36a86161..4f7f5681 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -43,8 +43,6 @@ export default authMiddleware({
'/games',
'/leaderboard',
'/tasks',
- '/change-password',
- '/change-username',
];
const isProtectedRoute = protectedRoutes.some(route => pathname.startsWith(route));
diff --git a/src/pages/api/bets/auto-settle-user.js b/src/pages/api/bets/auto-settle-user.js
index bc1d4170..65b50a4e 100644
--- a/src/pages/api/bets/auto-settle-user.js
+++ b/src/pages/api/bets/auto-settle-user.js
@@ -13,7 +13,6 @@
*/
import connectDB from '@server/db';
-import Game from '@server/models/Game';
import Bet from '@server/models/Bet';
import User from '@server/models/User';
import { getAuth } from '@clerk/nextjs/server';
diff --git a/src/pages/api/games/sync-from-espn.js b/src/pages/api/games/sync-from-espn.js
index 89aac131..1c76e4c2 100644
--- a/src/pages/api/games/sync-from-espn.js
+++ b/src/pages/api/games/sync-from-espn.js
@@ -86,7 +86,6 @@ export default async function handler(req, res) {
if (game) {
// Update existing game
- const wasCompleted = game.status === 'completed';
const isNowCompleted = gameData.status === 'completed';
// Update fields
diff --git a/src/server/services/StatisticsService.js b/src/server/services/StatisticsService.js
index 5873819f..196b72da 100644
--- a/src/server/services/StatisticsService.js
+++ b/src/server/services/StatisticsService.js
@@ -1,5 +1,4 @@
import User from '@server/models/User';
-import Game from '@server/models/Game';
import Bet from '@server/models/Bet';
import { calculateWinRate, calculateROI } from '@shared/utils/stats-utils';
@@ -218,19 +217,6 @@ class StatisticsService {
const user = await User.findOne({ clerkId: userId });
if (!user) throw new Error('User not found');
- // Determine sort order
- let sortField;
- switch (sortBy) {
- case 'biscuits':
- sortField = { biscuits: -1 };
- break;
- case 'totalBets':
- sortField = { totalBets: -1, biscuits: -1 };
- break;
- default:
- sortField = { biscuits: -1 };
- }
-
// Count how many users are ranked higher
const query = {
isActive: true,
From 2f0510968bbf1f268efe1c3c2dbbf6856826c1b7 Mon Sep 17 00:00:00 2001
From: Yonie <164077864+Isaiahriveraa@users.noreply.github.com>
Date: Wed, 24 Dec 2025 02:16:15 -0800
Subject: [PATCH 5/7] Summary: Fix auth page redirects and prevent build errors
with Suspense
Changed:
- Wrapped LoginPage and SignUpPage in Suspense to handle useSearchParams correctly
- Updated SignUpPage to respect the redirect URL parameter
Files:
- src/app/login/[[...sign-in]]/page.js
- src/app/sign-up/[[...sign-up]]/page.jsx
- src/app/sign-up/__tests__/redirect.test.jsx
Why:
Next.js requires components using useSearchParams to be wrapped in a Suspense boundary to avoid de-opting entire pages to client-side rendering during build. Additionally, the sign-up flow was ignoring the post-auth redirect destination, causing UX issues where users were not sent to their intended protected route.
---
src/app/login/[[...sign-in]]/page.js | 135 +++++++++++---------
src/app/sign-up/[[...sign-up]]/page.jsx | 117 +++++++++--------
src/app/sign-up/__tests__/redirect.test.jsx | 49 +++++++
3 files changed, 190 insertions(+), 111 deletions(-)
create mode 100644 src/app/sign-up/__tests__/redirect.test.jsx
diff --git a/src/app/login/[[...sign-in]]/page.js b/src/app/login/[[...sign-in]]/page.js
index 437a8739..8ebde92a 100644
--- a/src/app/login/[[...sign-in]]/page.js
+++ b/src/app/login/[[...sign-in]]/page.js
@@ -3,76 +3,89 @@
import { SignIn } from '@clerk/nextjs';
import { useSearchParams } from 'next/navigation';
import Link from 'next/link';
+import { Suspense } from 'react';
/**
- * Login Page
- * Uses Clerk's pre-built SignIn component for authentication
- * Clerk handles redirects natively via afterSignInUrl
+ * Login Page Content
+ * Extracted to allow Suspense wrapping
*/
-export default function LoginPage() {
+function LoginContent() {
const searchParams = useSearchParams();
const redirectUrl = searchParams.get('redirect') || '/dashboard';
return (
-
-
- {/* Minimal header */}
-
-
- {/* Clerk SignIn Component with minimal styling */}
-
-
-
-
- {/* Footer link */}
-
- No account?{' '}
-
- Sign up
-
+
+ {/* Minimal header */}
+
+
+ HuskyBids
+
+
+ Log in to your account
+
+
+ {/* Clerk SignIn Component with minimal styling */}
+
+
+
+ {/* Footer link */}
+
+ No account?{' '}
+
+ Sign up
+
+
+
+ );
+}
+
+/**
+ * Login Page
+ * Uses Clerk's pre-built SignIn component for authentication
+ * Clerk handles redirects natively via afterSignInUrl
+ */
+export default function LoginPage() {
+ return (
+
+ Loading...
}>
+
+
);
}
diff --git a/src/app/sign-up/[[...sign-up]]/page.jsx b/src/app/sign-up/[[...sign-up]]/page.jsx
index 287bd71f..2283c215 100644
--- a/src/app/sign-up/[[...sign-up]]/page.jsx
+++ b/src/app/sign-up/[[...sign-up]]/page.jsx
@@ -1,6 +1,70 @@
'use client';
import { SignUp } from '@clerk/nextjs';
+import { useSearchParams } from 'next/navigation';
+import { Suspense } from 'react';
+
+/**
+ * Sign Up Page Content
+ * Extracted to allow Suspense wrapping
+ */
+function SignUpContent() {
+ const searchParams = useSearchParams();
+ const redirectUrl = searchParams.get('redirect') || '/dashboard';
+
+ return (
+
+ {/* Minimal header */}
+
+
+ HuskyBids
+
+
+ Create your account
+
+
+
+ {/* Clerk SignUp Component with minimal styling */}
+
+
+
+
+ );
+}
/**
* Sign Up Page
@@ -10,56 +74,9 @@ import { SignUp } from '@clerk/nextjs';
export default function SignUpPage() {
return (
-
- {/* Minimal header */}
-
-
- HuskyBids
-
-
- Create your account
-
-
-
- {/* Clerk SignUp Component with minimal styling */}
-
-
-
-
+
Loading...}>
+
+
);
}
diff --git a/src/app/sign-up/__tests__/redirect.test.jsx b/src/app/sign-up/__tests__/redirect.test.jsx
new file mode 100644
index 00000000..f19afdbb
--- /dev/null
+++ b/src/app/sign-up/__tests__/redirect.test.jsx
@@ -0,0 +1,49 @@
+
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import SignUpPage from '../[[...sign-up]]/page';
+
+// Mock Clerk components
+jest.mock('@clerk/nextjs', () => ({
+ SignUp: (props) => {
+ return
SignUp Component
;
+ },
+}));
+
+// Mock useSearchParams
+const mockGet = jest.fn();
+jest.mock('next/navigation', () => ({
+ useSearchParams: () => ({
+ get: mockGet,
+ }),
+}));
+
+describe('SignUp Page Redirect Logic', () => {
+ beforeEach(() => {
+ mockGet.mockClear();
+ });
+
+ it('should respect the redirect query parameter for afterSignUpUrl', () => {
+ // Simulate ?redirect=/betting-history
+ mockGet.mockReturnValue('/betting-history');
+
+ render(
);
+
+ const signUpComponent = screen.getByTestId('clerk-signup');
+ const props = JSON.parse(signUpComponent.getAttribute('data-props'));
+
+ // This is expected to FAIL currently because it's hardcoded to /dashboard
+ expect(props.afterSignUpUrl).toBe('/betting-history');
+ });
+
+ it('should default to /dashboard if no redirect param', () => {
+ mockGet.mockReturnValue(null);
+
+ render(
);
+
+ const signUpComponent = screen.getByTestId('clerk-signup');
+ const props = JSON.parse(signUpComponent.getAttribute('data-props'));
+
+ expect(props.afterSignUpUrl).toBe('/dashboard');
+ });
+});
From d25a07605b80e164bf660194a8ab40f467b1f584 Mon Sep 17 00:00:00 2001
From: Yonie <164077864+Isaiahriveraa@users.noreply.github.com>
Date: Wed, 24 Dec 2025 02:23:02 -0800
Subject: [PATCH 6/7] Summary:
Improve Mongoose model registration check for serverless and hot-reload environments
Changed:
- Updated registerModels to check for existing models in mongoose.models alongside the modelsRegistered flag.
Files:
- src/server/models/index.js
Why:
In serverless environments or during hot reloads in development, the module-level modelsRegistered flag might persist while the internal Mongoose model cache is cleared. Verifying both ensures that models are always correctly registered before use, preventing 'Schema hasn't been registered' errors.
---
src/server/models/index.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/server/models/index.js b/src/server/models/index.js
index 4e072056..6d272d83 100644
--- a/src/server/models/index.js
+++ b/src/server/models/index.js
@@ -19,7 +19,8 @@ let modelsRegistered = false;
*/
export async function registerModels() {
// Only register once per serverless function instance
- if (modelsRegistered) {
+ // We also check mongoose.models to ensure they persist across hot reloads
+ if (modelsRegistered && mongoose.models.User && mongoose.models.Game && mongoose.models.Bet) {
return;
}
From da413f030ca95e15451ad8f0c6000b185263af79 Mon Sep 17 00:00:00 2001
From: Yonie <164077864+Isaiahriveraa@users.noreply.github.com>
Date: Wed, 24 Dec 2025 12:04:01 -0800
Subject: [PATCH 7/7] Summary: Fix CI build error caused by invalid Clerk
publishable key format
Changed:
- Updated the dummy NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY in the CI workflow to a syntactically valid mock key (pk_test_Y2xlcmsuY29tJA).
Files:
- .github/workflows/ci.yml
Why:
The Clerk SDK performs a Base64 decoding on the publishable key during Next.js's static page generation. Using a non-base64 string like 'pk_test_dummy' caused a DOMException [InvalidCharacterError], breaking the build in CI environments.
---
.github/workflows/ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 959208c7..48412fad 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,5 +37,5 @@ jobs:
SKIP_ENV_VALIDATION: true
# Provide dummy values for required env vars during build
MONGODB_URI: mongodb://localhost:27017/test
- NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY: pk_test_dummy
+ NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY: pk_test_Y2xlcmsuY29tJA
CLERK_SECRET_KEY: sk_test_dummy
-