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(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 () { ) } + +export default function LoginPage () { + return ( + Loading...

} + > + +
+ ) +} + +function LoginPageWithParams () { + const params = useSearchParams() + const redirect = params.get('redirect') + + return +} 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) }, [])