YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-06-05 22:09:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: update state initial loader

Browse Source
This commit is contained in:
Steven
2023-09-15 08:31:19 +08:00
parent f5802a7d82
commit 936fe5ac9d
7 changed files with 58 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
web/src/router/index.tsx
View File

@ -1,11 +1,13 @@
import { lazy } from "react";
import { createBrowserRouter } from "react-router-dom";
import { createBrowserRouter, redirect } from "react-router-dom";
import App from "@/App";
import { isNullorUndefined } from "@/helpers/utils";
import Archived from "@/pages/Archived";
import DailyReview from "@/pages/DailyReview";
import ResourcesDashboard from "@/pages/ResourcesDashboard";
import Setting from "@/pages/Setting";
import { initialGlobalState } from "@/store/module";
import store from "@/store";
import { initialGlobalState, initialUserState } from "@/store/module";
const Root = lazy(() => import("@/layouts/Root"));
const Auth = lazy(() => import("@/pages/Auth"));
@ -37,14 +39,14 @@ const router = createBrowserRouter([
{
path: "/",
element: <App />,
loader: async () => {
await initialGlobalStateLoader();
return null;
},
children: [
{
path: "/auth",
element: <Auth />,
loader: async () => {
await initialGlobalStateLoader();
return null;
},
},
{
path: "/auth/callback",
@ -53,10 +55,25 @@ const router = createBrowserRouter([
{
path: "/",
element: <Root />,
loader: async () => {
try {
await initialUserState();
} catch (error) {
// do nth
}
return null;
},
children: [
{
path: "",
element: <Home />,
loader: async () => {
const { user } = store.getState().user;
if (isNullorUndefined(user)) {
return redirect("/explore");
}
},
},
{
path: "explore",
@ -65,18 +82,46 @@ const router = createBrowserRouter([
{
path: "review",
element: <DailyReview />,
loader: async () => {
const { user } = store.getState().user;
if (isNullorUndefined(user)) {
return redirect("/explore");
}
},
},
{
path: "resources",
element: <ResourcesDashboard />,
loader: async () => {
const { user } = store.getState().user;
if (isNullorUndefined(user)) {
return redirect("/explore");
}
},
},
{
path: "archived",
element: <Archived />,
loader: async () => {
const { user } = store.getState().user;
if (isNullorUndefined(user)) {
return redirect("/explore");
}
},
},
{
path: "setting",
element: <Setting />,
loader: async () => {
const { user } = store.getState().user;
if (isNullorUndefined(user)) {
return redirect("/explore");
}
},
},
],
},