mirror of
https://github.com/Myzel394/kleckrelay-website.git
synced 2025-06-19 07:55:25 +02:00
fix: LoadingPage
This commit is contained in:
parent
e4c321a8cf
commit
21c9acbd2c
10
src/App.tsx
10
src/App.tsx
@ -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,
|
||||||
|
@ -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()
|
||||||
|
@ -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])
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user