From 70a8d27d22240dee87ef5cb73cccdf5a5cf6f2f5 Mon Sep 17 00:00:00 2001 From: marcobaobao Date: Sun, 3 Dec 2023 11:53:15 +0100 Subject: [PATCH] fixed redirect when auth is enabled --- frontend/src/components/SocketSubscriber.tsx | 6 +++++- frontend/src/router.tsx | 8 ++++++++ frontend/src/views/Login.tsx | 1 - 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/SocketSubscriber.tsx b/frontend/src/components/SocketSubscriber.tsx index 155363a..43a9f4c 100644 --- a/frontend/src/components/SocketSubscriber.tsx +++ b/frontend/src/components/SocketSubscriber.tsx @@ -1,5 +1,6 @@ import * as O from 'fp-ts/Option' import { useEffect, useMemo } from 'react' +import { useNavigate } from 'react-router-dom' import { useRecoilState, useRecoilValue } from 'recoil' import { take, timer } from 'rxjs' import { downloadsState } from '../atoms/downloads' @@ -23,6 +24,8 @@ const SocketSubscriber: React.FC = () => { const { client } = useRPC() const { pushMessage } = useToast() + const navigate = useNavigate() + const socketOnce$ = useMemo(() => client.socket$.pipe(take(1)), []) useEffect(() => { @@ -60,7 +63,8 @@ const SocketSubscriber: React.FC = () => { pushMessage( `${i18n.t('rpcConnErr')} (${serverAddressAndPort})`, "error" - ) + ), + navigate(`/error`) } ) diff --git a/frontend/src/router.tsx b/frontend/src/router.tsx index 3221541..4c8147c 100644 --- a/frontend/src/router.tsx +++ b/frontend/src/router.tsx @@ -57,6 +57,14 @@ export const router = createHashRouter([ ) }, + { + path: '/error', + element: ( + }> + + + ) + }, ] }, ]) \ No newline at end of file diff --git a/frontend/src/views/Login.tsx b/frontend/src/views/Login.tsx index 2b92fa3..0cc28c6 100644 --- a/frontend/src/views/Login.tsx +++ b/frontend/src/views/Login.tsx @@ -63,7 +63,6 @@ export default function Login() { username, password, }), - redirect: 'follow' }) pipe(