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

feat: add root layout (#1294)

Browse Source
This commit is contained in:
boojack
2023-03-06 21:13:35 +08:00
committed by GitHub
parent 003161ea54
commit 595dbdb0ec
6 changed files with 69 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ import { isNullorUndefined } from "../helpers/utils";
import store from "../store";
import { initialGlobalState, initialUserState } from "../store/module";
const Root = lazy(() => import("../layouts/Root"));
const Auth = lazy(() => import("../pages/Auth"));
const AuthCallback = lazy(() => import("../pages/AuthCallback"));
const Explore = lazy(() => import("../pages/Explore"));
@ -43,24 +44,30 @@ const router = createBrowserRouter([
},
{
path: "/",
element: <Home />,
loader: async () => {
await initialGlobalStateLoader();
element: <Root />,
children: [
{
path: "",
element: <Home />,
loader: async () => {
await initialGlobalStateLoader();
try {
await initialUserState();
} catch (error) {
// do nth
}
try {
await initialUserState();
} catch (error) {
// do nth
}
const { host, user } = store.getState().user;
if (isNullorUndefined(host)) {
return redirect("/auth");
} else if (isNullorUndefined(user)) {
return redirect("/explore");
}
return null;
},
const { host, user } = store.getState().user;
if (isNullorUndefined(host)) {
return redirect("/auth");
} else if (isNullorUndefined(user)) {
return redirect("/explore");
}
return null;
},
},
],
},
{
path: "/u/:userId",