fix: LoadingPage

This commit is contained in:
Myzel394 2023-02-24 12:23:36 +01:00
parent e4c321a8cf
commit 21c9acbd2c
No known key found for this signature in database
GPG Key ID: 79CC92F37B3E1A2B
3 changed files with 10 additions and 10 deletions

View File

@ -21,7 +21,7 @@ import GlobalSettingsRoute from "~/routes/GlobalSettingsRoute"
import I18nHandler from "./I18nHandler" import I18nHandler from "./I18nHandler"
import LoginRoute from "~/routes/LoginRoute" import LoginRoute from "~/routes/LoginRoute"
import LogoutRoute from "~/routes/LogoutRoute" import LogoutRoute from "~/routes/LogoutRoute"
import RedirectRoute from "~/routes/RedirectRoute" import RedirectRoute from "./routes/RedirectRoute"
import ReportDetailRoute from "~/routes/ReportDetailRoute" import ReportDetailRoute from "~/routes/ReportDetailRoute"
import ReportsRoute from "~/routes/ReportsRoute" import ReportsRoute from "~/routes/ReportsRoute"
import ReservedAliasDetailRoute from "~/routes/ReservedAliasDetailRoute" import ReservedAliasDetailRoute from "~/routes/ReservedAliasDetailRoute"
@ -39,6 +39,10 @@ const router = createBrowserRouter([
element: <RootRoute />, element: <RootRoute />,
errorElement: <ErrorPage />, errorElement: <ErrorPage />,
children: [ children: [
{
path: "/",
element: <RedirectRoute />,
},
{ {
path: "/auth", path: "/auth",
element: <AuthenticateRoute />, element: <AuthenticateRoute />,
@ -73,10 +77,6 @@ const router = createBrowserRouter([
path: "/", path: "/",
element: <AuthenticatedRoute />, element: <AuthenticatedRoute />,
children: [ children: [
{
path: "/",
element: <RedirectRoute />,
},
{ {
path: "/aliases", path: "/aliases",
loader: getServerSettings, loader: getServerSettings,

View File

@ -3,7 +3,7 @@ import {useTranslation} from "react-i18next"
import {Grid, Typography} from "@mui/material" 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 { export default function LoadingPage(): ReactElement {
const {t} = useTranslation() const {t} = useTranslation()

View File

@ -1,18 +1,18 @@
import {ReactElement, useLayoutEffect} from "react" import {ReactElement, useContext, useLayoutEffect} from "react"
import {useNavigate} from "react-router-dom" import {useNavigate} from "react-router-dom"
import {useUser} from "~/hooks" import {AuthContext} from "~/components"
import LoadingPage from "~/components/widgets/LoadingPage" import LoadingPage from "~/components/widgets/LoadingPage"
export default function RedirectRoute(): ReactElement { export default function RedirectRoute(): ReactElement {
const navigate = useNavigate() const navigate = useNavigate()
const user = useUser() const {user} = useContext(AuthContext)
useLayoutEffect(() => { useLayoutEffect(() => {
if (user) { if (user) {
navigate("/aliases") navigate("/aliases")
} else { } else {
navigate("/login") navigate("/auth/login")
} }
}, [user]) }, [user])