From 1bebe61634c073b5a50f68bc87c698e6d97bef91 Mon Sep 17 00:00:00 2001 From: Ardeman Date: Mon, 3 Mar 2025 17:50:10 +0800 Subject: [PATCH] feat: enhance admin login flow with conditional redirects based on authentication status --- app/routes/_admin.lg-admin._auth.login.tsx | 13 ------------- app/routes/_admin.lg-admin.tsx | 4 ++++ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/app/routes/_admin.lg-admin._auth.login.tsx b/app/routes/_admin.lg-admin._auth.login.tsx index 0ee9f17..0113752 100644 --- a/app/routes/_admin.lg-admin._auth.login.tsx +++ b/app/routes/_admin.lg-admin._auth.login.tsx @@ -1,17 +1,4 @@ -import { redirect } from 'react-router' - -import { handleCookie } from '~/libs/cookies' import { AdminLoginPage } from '~/pages/admin-login' -import type { Route } from './+types/_admin.lg-admin._auth.login' - -export const loader = async ({ request }: Route.LoaderArgs) => { - const { staffToken } = await handleCookie(request) - - if (staffToken) { - throw redirect('/lg-admin') - } -} - const AuthLayout = () => export default AuthLayout diff --git a/app/routes/_admin.lg-admin.tsx b/app/routes/_admin.lg-admin.tsx index da8f184..f7e87de 100644 --- a/app/routes/_admin.lg-admin.tsx +++ b/app/routes/_admin.lg-admin.tsx @@ -18,6 +18,10 @@ export const loader = async ({ request }: Route.LoaderArgs) => { throw redirect('/lg-admin/login') } + if (isAuthPage && staffToken) { + throw redirect('/lg-admin') + } + if (staffToken) { const { data } = await getStaff({ accessToken: staffToken,