Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

chore: fix suspense wrapper

Steven30dca18b79c4
diff --git a/web/src/layouts/SuspenseWrapper.tsx b/web/src/layouts/SuspenseWrapper.tsx
new file mode 100644
index 000000000..886ac6134
--- /dev/null
+++ b/web/src/layouts/SuspenseWrapper.tsx
@@ -0,0 +1,13 @@
+import { Suspense } from "react";
+import { Outlet } from "react-router-dom";
+import Loading from "@/pages/Loading";
+
+function SuspenseWrapper() {
+ return (
+ <Suspense fallback={<Loading />}>
+ <Outlet />
+ </Suspense>
+ );
+}
+
+export default SuspenseWrapper;
diff --git a/web/src/router/index.tsx b/web/src/router/index.tsx
index 39c23cea6..8c7369b76 100644
--- a/web/src/router/index.tsx
+++ b/web/src/router/index.tsx
@@ -1,6 +1,7 @@
import { lazy } from "react";
import { createBrowserRouter } from "react-router-dom";
import App from "@/App";
+import SuspenseWrapper from "@/layouts/SuspenseWrapper";
import { initialGlobalState } from "@/store/module";
import AuthStatusProvider from "./AuthStatusProvider";
@@ -36,16 +37,22 @@ const router = createBrowserRouter([
loader: () => initialGlobalStateLoader(),
children: [
{
- path: "/auth",
- element: <SignIn />,
- },
- {
- path: "/auth/signup",
- element: <SignUp />,
- },
- {
- path: "/auth/callback",
- element: <AuthCallback />,
+ path: "/auth/",
+ element: <SuspenseWrapper />,
+ children: [
+ {
+ path: "",
+ element: <SignIn />,
+ },
+ {
+ path: "signup",
+ element: <SignUp />,
+ },
+ {
+ path: "callback",
+ element: <AuthCallback />,
+ },
+ ],
},
{
path: "/",