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

20
web/src/App.tsx
View File

@ -5,7 +5,8 @@ import { Outlet } from "react-router-dom";
import storage from "./helpers/storage";
import { getSystemColorScheme } from "./helpers/utils";
import Loading from "./pages/Loading";
import { initialGlobalState, initialUserState, useGlobalStore } from "./store/module";
import store from "./store";
import { useGlobalStore } from "./store/module";
import { useUserV1Store } from "./store/v1";
const App = () => {
@ -18,21 +19,10 @@ const App = () => {
useEffect(() => {
const initialState = async () => {
try {
await initialGlobalState();
} catch (error) {
// do nothing
const { user } = store.getState().user;
if (user) {
await userV1Store.getOrFetchUserByUsername(user.username);
}
try {
const user = await initialUserState();
if (user) {
await userV1Store.getOrFetchUserByUsername(user.username);
}
} catch (error) {
// do nothing.
}
setLoading(false);
};