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.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
chore: update router
boojackcc2e5ab6fd1c
diff --git a/web/src/hooks/useLoading.ts b/web/src/hooks/useLoading.tsindex 57781fe96..daf365745 100644--- a/web/src/hooks/useLoading.ts+++ b/web/src/hooks/useLoading.ts@@ -1,6 +1,6 @@import { useState } from "react";-function useLoading(initialState = true) {+export default function useLoading(initialState = true) {const [state, setState] = useState({ isLoading: initialState, isFailed: false, isSucceed: false });return {@@ -31,5 +31,3 @@ function useLoading(initialState = true) {},};}--export default useLoading;diff --git a/web/src/hooks/useRefresh.ts b/web/src/hooks/useRefresh.tsindex 8d2f66285..f3204057b 100644--- a/web/src/hooks/useRefresh.ts+++ b/web/src/hooks/useRefresh.ts@@ -1,6 +1,6 @@import { useCallback, useState } from "react";-function useRefresh() {+export default function useRefresh() {const [, setBoolean] = useState<boolean>(false);const refresh = useCallback(() => {@@ -11,5 +11,3 @@ function useRefresh() {return refresh;}--export default useRefresh;diff --git a/web/src/less/home.less b/web/src/less/home.lessindex 4e6a22ace..5f1e43664 100644--- a/web/src/less/home.less+++ b/web/src/less/home.less@@ -1,4 +1,5 @@@import "./mixin.less";+@import "./memos-header.less";#root {background-color: #f6f5f4;@@ -7,4 +8,8 @@#page-wrapper {@apply w-full h-full m-auto grid max-w-4xl mx-auto;grid-template-columns: min-content 1fr;++ .memos-wrapper {+ @apply w-full h-full overflow-x-hidden flex flex-col justify-start items-start px-4 pr-10;+ }}diff --git a/web/src/less/memos.less b/web/src/less/memos.lessdeleted file mode 100644index 216a3bb2b..000000000--- a/web/src/less/memos.less+++ /dev/null@@ -1,6 +0,0 @@-@import "./mixin.less";-@import "./memos-header.less";--.memos-wrapper {- @apply w-full h-full overflow-x-hidden flex flex-col justify-start items-start px-4 pr-10;-}diff --git a/web/src/pages/Home.tsx b/web/src/pages/Home.tsxindex 1c21c6305..1e9fa7b75 100644--- a/web/src/pages/Home.tsx+++ b/web/src/pages/Home.tsx@@ -1,13 +1,14 @@import { useEffect } from "react";import { locationService, userService } from "../services";-import { homeRouterSwitch } from "../routers";-import { useAppSelector } from "../store";import Sidebar from "../components/Sidebar";import useLoading from "../hooks/useLoading";+import MemosHeader from "../components/MemosHeader";+import MemoEditor from "../components/MemoEditor";+import MemoFilter from "../components/MemoFilter";+import MemoList from "../components/MemoList";import "../less/home.less";function Home() {- const pathname = useAppSelector((state) => state.location.pathname);const loadingState = useLoading();useEffect(() => {@@ -35,7 +36,12 @@ function Home() {{loadingState.isLoading ? null : (<section id="page-wrapper"><Sidebar />- {homeRouterSwitch(pathname)}+ <main className="memos-wrapper">+ <MemosHeader />+ <MemoEditor />+ <MemoFilter />+ <MemoList />+ </main></section>)}</>diff --git a/web/src/pages/Memos.tsx b/web/src/pages/Memos.tsxdeleted file mode 100644index 1de2abeb3..000000000--- a/web/src/pages/Memos.tsx+++ /dev/null@@ -1,18 +0,0 @@-import MemoEditor from "../components/MemoEditor";-import MemosHeader from "../components/MemosHeader";-import MemoFilter from "../components/MemoFilter";-import MemoList from "../components/MemoList";-import "../less/memos.less";--function Memos() {- return (- <main className="memos-wrapper">- <MemosHeader />- <MemoEditor />- <MemoFilter />- <MemoList />- </main>- );-}--export default Memos;diff --git a/web/src/routers/homeRouter.tsx b/web/src/routers/homeRouter.tsxdeleted file mode 100644index b39661f08..000000000--- a/web/src/routers/homeRouter.tsx+++ /dev/null@@ -1,7 +0,0 @@-import Memos from "../pages/Memos";--const homeRouter = {- "*": <Memos />,-};--export default homeRouter;diff --git a/web/src/routers/index.ts b/web/src/routers/index.tsindex 7075095ad..6c1a94178 100644--- a/web/src/routers/index.ts+++ b/web/src/routers/index.ts@@ -1,5 +1,4 @@import appRouter from "./appRouter";-import homeRouter from "./homeRouter";// just like React-Routerinterface Router {@@ -19,4 +18,3 @@ const routerSwitch = (router: Router) => {};export const appRouterSwitch = routerSwitch(appRouter);-export const homeRouterSwitch = routerSwitch(homeRouter);