From 368f88b2c28004700fdaca963392013f4d1606b0 Mon Sep 17 00:00:00 2001
From: Lncvrt <lncvrtreal@gmail.com>
Date: Fri, 30 Jan 2026 21:01:35 -0700
Subject: [PATCH] Make this redirect back when logged in

---
 src/app/account/login/page.tsx          | 25 +++++++++++++++++++++----
 src/app/game/berry-dash/splash/page.tsx |  2 +-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/app/account/login/page.tsx b/src/app/account/login/page.tsx
index db18950..13bc020 100644
--- a/src/app/account/login/page.tsx
+++ b/src/app/account/login/page.tsx
@@ -1,13 +1,13 @@
 'use client'
 
-import { useRouter } from 'next/navigation'
+import { useRouter, useSearchParams } from 'next/navigation'
 import { getCookie, setCookie } from '@/util/cookie'
-import { useEffect, useState } from 'react'
+import { Suspense, useEffect, useState } from 'react'
 import { HomeButton } from '@/app/components/HomeButton'
 import { DiscordButton } from '@/app/components/DiscordButton'
 import axios from 'axios'
 
-export default function AccountLoginPage () {
+function LoginForm ({ redirect }: { redirect: string | null }) {
   const [loading, setLoading] = useState<boolean>(true)
   const router = useRouter()
 
@@ -51,7 +51,7 @@ export default function AccountLoginPage () {
                 if (result.data.data.id)
                   setCookie('accountId', result.data.data.id)
 
-                router.push('/account')
+                router.push(redirect ?? '/account')
               } else {
                 alert(
                   'Failed to login, error: ' + (result.data.message || 'n/a')
@@ -92,3 +92,20 @@ export default function AccountLoginPage () {
     </div>
   )
 }
+
+export default function LoginPage () {
+  return (
+    <Suspense
+      fallback={<p className='px-8 -mt-2 -mb-2 text-center'>Loading...</p>}
+    >
+      <LoginPageWithParams />
+    </Suspense>
+  )
+}
+
+function LoginPageWithParams () {
+  const params = useSearchParams()
+  const redirect = params.get('redirect')
+
+  return <LoginForm redirect={redirect} />
+}
diff --git a/src/app/game/berry-dash/splash/page.tsx b/src/app/game/berry-dash/splash/page.tsx
index 297aa8f..e3e1799 100644
--- a/src/app/game/berry-dash/splash/page.tsx
+++ b/src/app/game/berry-dash/splash/page.tsx
@@ -19,7 +19,7 @@ export default function BerryDashSplash () {
 
     const token = getCookie('accountToken', '-1')
     if (token === '-1') {
-      router.push('/account')
+      router.push('/account/login?redirect=/game/berry-dash/splash')
     } else setLoading(false)
   }, [])