diff --git a/src/App.tsx b/src/App.tsx index b39de0f..b58d2d1 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -21,7 +21,7 @@ import GlobalSettingsRoute from "~/routes/GlobalSettingsRoute" import I18nHandler from "./I18nHandler" import LoginRoute from "~/routes/LoginRoute" import LogoutRoute from "~/routes/LogoutRoute" -import RedirectRoute from "~/routes/RedirectRoute" +import RedirectRoute from "./routes/RedirectRoute" import ReportDetailRoute from "~/routes/ReportDetailRoute" import ReportsRoute from "~/routes/ReportsRoute" import ReservedAliasDetailRoute from "~/routes/ReservedAliasDetailRoute" @@ -39,6 +39,10 @@ const router = createBrowserRouter([ element: , errorElement: , children: [ + { + path: "/", + element: , + }, { path: "/auth", element: , @@ -73,10 +77,6 @@ const router = createBrowserRouter([ path: "/", element: , children: [ - { - path: "/", - element: , - }, { path: "/aliases", loader: getServerSettings, diff --git a/src/components/widgets/LoadingPage.tsx b/src/components/widgets/LoadingPage.tsx index 92deb2a..af8b9b2 100644 --- a/src/components/widgets/LoadingPage.tsx +++ b/src/components/widgets/LoadingPage.tsx @@ -3,7 +3,7 @@ import {useTranslation} from "react-i18next" import {Grid, Typography} from "@mui/material" -import {ReactComponent as Logo} from "~/assets/logo.svg" +import {ReactComponent as Logo} from "../../../public/logo.svg" export default function LoadingPage(): ReactElement { const {t} = useTranslation() diff --git a/src/routes/RedirectRoute.tsx b/src/routes/RedirectRoute.tsx index a88fc18..948a86a 100644 --- a/src/routes/RedirectRoute.tsx +++ b/src/routes/RedirectRoute.tsx @@ -1,18 +1,18 @@ -import {ReactElement, useLayoutEffect} from "react" +import {ReactElement, useContext, useLayoutEffect} from "react" import {useNavigate} from "react-router-dom" -import {useUser} from "~/hooks" +import {AuthContext} from "~/components" import LoadingPage from "~/components/widgets/LoadingPage" export default function RedirectRoute(): ReactElement { const navigate = useNavigate() - const user = useUser() + const {user} = useContext(AuthContext) useLayoutEffect(() => { if (user) { navigate("/aliases") } else { - navigate("/login") + navigate("/auth/login") } }, [user])