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
feat: layout style(1)
email2b5ee7839728
diff --git a/web/package.json b/web/package.jsonindex 498067614..fb43900ba 100644--- a/web/package.json+++ b/web/package.json@@ -10,8 +10,7 @@"dependencies": {"lodash-es": "^4.17.21","react": "^17.0.2",- "react-dom": "^17.0.2",- "tiny-undo": "^0.0.8"+ "react-dom": "^17.0.2"},"devDependencies": {"@types/lodash-es": "^4.17.5",diff --git a/web/src/components/Editor/Editor.tsx b/web/src/components/Editor/Editor.tsxindex fd084b7a1..514ec4e70 100644--- a/web/src/components/Editor/Editor.tsx+++ b/web/src/components/Editor/Editor.tsx@@ -1,7 +1,4 @@-import { forwardRef, ReactNode, useCallback, useContext, useEffect, useImperativeHandle, useRef } from "react";-import TinyUndo from "tiny-undo";-import appContext from "../../stores/appContext";-import { storage } from "../../helpers/storage";+import { forwardRef, ReactNode, useCallback, useEffect, useImperativeHandle, useRef } from "react";import useRefresh from "../../hooks/useRefresh";import Only from "../common/OnlyWhen";import "../../less/editor.less";@@ -28,9 +25,6 @@ interface EditorProps {// eslint-disable-next-line react/display-nameconst Editor = forwardRef((props: EditorProps, ref: React.ForwardedRef<EditorRefActions>) => {- const {- globalState: { useTinyUndoHistoryCache },- } = useContext(appContext);const {className,initialContent,@@ -42,59 +36,14 @@ const Editor = forwardRef((props: EditorProps, ref: React.ForwardedRef<EditorRefonContentChange: handleContentChangeCallback,} = props;const editorRef = useRef<HTMLTextAreaElement>(null);- const tinyUndoRef = useRef<TinyUndo | null>(null);- // NOTE: auto-justify textarea heightconst refresh = useRefresh();useEffect(() => {- if (!editorRef.current) {- return;- }-- if (initialContent) {+ if (editorRef.current && initialContent) {editorRef.current.value = initialContent;- refresh();}}, []);- useEffect(() => {- if (useTinyUndoHistoryCache) {- if (!editorRef.current) {- return;- }-- const { tinyUndoActionsCache, tinyUndoIndexCache } = storage.get(["tinyUndoActionsCache", "tinyUndoIndexCache"]);-- tinyUndoRef.current = new TinyUndo(editorRef.current, {- interval: 5000,- initialActions: tinyUndoActionsCache,- initialIndex: tinyUndoIndexCache,- });-- tinyUndoRef.current.subscribe((actions, index) => {- storage.set({- tinyUndoActionsCache: actions,- tinyUndoIndexCache: index,- });- });-- return () => {- tinyUndoRef.current?.destroy();- };- } else {- tinyUndoRef.current?.destroy();- tinyUndoRef.current = null;- storage.remove(["tinyUndoActionsCache", "tinyUndoIndexCache"]);- }- }, [useTinyUndoHistoryCache]);-- useEffect(() => {- if (editorRef.current) {- editorRef.current.style.height = "auto";- editorRef.current.style.height = (editorRef.current.scrollHeight ?? 0) + "px";- }- }, [editorRef.current?.value]);-useImperativeHandle(ref,() => ({@@ -111,13 +60,11 @@ const Editor = forwardRef((props: EditorProps, ref: React.ForwardedRef<EditorRefeditorRef.current.value =prevValue.slice(0, editorRef.current.selectionStart) + rawText + prevValue.slice(editorRef.current.selectionStart);handleContentChangeCallback(editorRef.current.value);- refresh();},setContent: (text: string) => {if (editorRef.current) {editorRef.current.value = text;handleContentChangeCallback(editorRef.current.value);- refresh();}},getContent: (): string => {@@ -140,7 +87,6 @@ const Editor = forwardRef((props: EditorProps, ref: React.ForwardedRef<EditorRefhandleCommonConfirmBtnClick();}}- refresh();}, []);const handleCommonConfirmBtnClick = useCallback(() => {@@ -150,9 +96,6 @@ const Editor = forwardRef((props: EditorProps, ref: React.ForwardedRef<EditorRefhandleConfirmBtnClickCallback(editorRef.current.value);editorRef.current.value = "";- refresh();- // After confirm btn clicked, tiny-undo should reset state(clear actions and index)- tinyUndoRef.current?.resetState();}, []);const handleCommonCancelBtnClick = useCallback(() => {diff --git a/web/src/components/MemoEditor.tsx b/web/src/components/MemoEditor.tsxindex 3f576f67b..b9f747974 100644--- a/web/src/components/MemoEditor.tsx+++ b/web/src/components/MemoEditor.tsx@@ -276,7 +276,7 @@ const MemoEditor: React.FC<Props> = () => {);return (- <div className={"memo-editor-wrapper " + (showEditStatus ? "edit-ing" : "")}>+ <div className={"memo-editor-container " + (showEditStatus ? "edit-ing" : "")}><p className={"tip-text " + (showEditStatus ? "" : "hidden")}>Editting...</p><Editorref={editorRef}diff --git a/web/src/components/MemoList.tsx b/web/src/components/MemoList.tsxindex f4169a441..91fcad904 100644--- a/web/src/components/MemoList.tsx+++ b/web/src/components/MemoList.tsx@@ -6,7 +6,7 @@ import utils from "../helpers/utils";import { checkShouldShowMemoWithFilters } from "../helpers/filter";import Memo from "./Memo";import toastHelper from "./Toast";-import "../less/memolist.less";+import "../less/memo-list.less";interface Props {}@@ -105,7 +105,7 @@ const MemoList: React.FC<Props> = () => {}, []);return (- <div className={`memolist-wrapper ${isFetching ? "" : "completed"}`} onClick={handleMemoListClick} ref={wrapperElement}>+ <div className={`memo-list-container ${isFetching ? "" : "completed"}`} onClick={handleMemoListClick} ref={wrapperElement}>{shownMemos.map((memo) => (<Memo key={`${memo.id}-${memo.updatedAt}`} memo={memo} />))}diff --git a/web/src/components/MenuBtnsPopup.tsx b/web/src/components/MenuBtnsPopup.tsxindex aafd89f7d..3da1cbc59 100644--- a/web/src/components/MenuBtnsPopup.tsx+++ b/web/src/components/MenuBtnsPopup.tsx@@ -33,7 +33,7 @@ const MenuBtnsPopup: React.FC<Props> = (props: Props) => {};const handleMemosTrashBtnClick = () => {- locationService.pushHistory("/recycle");+ locationService.pushHistory("/trash");};const handleAboutBtnClick = () => {diff --git a/web/src/components/PreferencesSection.tsx b/web/src/components/PreferencesSection.tsxindex ff61f901e..03663fa69 100644--- a/web/src/components/PreferencesSection.tsx+++ b/web/src/components/PreferencesSection.tsx@@ -9,16 +9,10 @@ interface Props {}const PreferencesSection: React.FC<Props> = () => {const { globalState } = useContext(appContext);- const { useTinyUndoHistoryCache, shouldHideImageUrl, shouldSplitMemoWord, shouldUseMarkdownParser } = globalState;+ const { shouldHideImageUrl, shouldSplitMemoWord, shouldUseMarkdownParser } = globalState;const demoMemoContent = "π Hiya, welcome to memos!\n* β¨ **Open source project**;\n* π What do you think;\n* π Tell me something plz;";- const handleOpenTinyUndoChanged = () => {- globalStateService.setAppSetting({- useTinyUndoHistoryCache: !useTinyUndoHistoryCache,- });- };-const handleSplitWordsValueChanged = () => {globalStateService.setAppSetting({shouldSplitMemoWord: !shouldSplitMemoWord,@@ -83,18 +77,6 @@ const PreferencesSection: React.FC<Props> = () => {<img className="icon-img" src={shouldHideImageUrl ? "/icons/checkbox-active.svg" : "/icons/checkbox.svg"} /></label></div>- <div className="section-container preferences-section-container">- <p className="title-text">Editor Extensions</p>- <label className="form-label checkbox-form-label" onClick={handleOpenTinyUndoChanged}>- <span className="normal-text">- Use{" "}- <a target="_blank" href="https://github.com/boojack/tiny-undo" onClick={(e) => e.stopPropagation()} rel="noreferrer">- tiny-undo- </a>- </span>- <img className="icon-img" src={useTinyUndoHistoryCache ? "/icons/checkbox-active.svg" : "/icons/checkbox.svg"} />- </label>- </div><div className="section-container"><p className="title-text">Others</p><div className="w-full flex flex-row justify-start items-center">diff --git a/web/src/components/ShortcutList.tsx b/web/src/components/ShortcutList.tsxindex 999c75abc..b53820295 100644--- a/web/src/components/ShortcutList.tsx+++ b/web/src/components/ShortcutList.tsx@@ -67,11 +67,14 @@ const ShortcutContainer: React.FC<ShortcutContainerProps> = (props: ShortcutContconst { shortcut, isActive } = props;const [showConfirmDeleteBtn, toggleConfirmDeleteBtn] = useToggle(false);- const handleQueryClick = () => {+ console.log(props);++ const handleShortcutClick = () => {+ console.log("here");if (isActive) {locationService.setMemoShortcut("");} else {- if (!["/", "/recycle"].includes(locationService.getState().pathname)) {+ if (!["/", "/trash"].includes(locationService.getState().pathname)) {locationService.setPathname("/");}locationService.setMemoShortcut(shortcut.id);@@ -125,7 +128,7 @@ const ShortcutContainer: React.FC<ShortcutContainerProps> = (props: ShortcutContreturn (<>- <div className={`shortcut-container ${isActive ? "active" : ""}`} onClick={handleQueryClick}>+ <div className={`shortcut-container ${isActive ? "active" : ""}`} onClick={handleShortcutClick}><div className="shortcut-text-container"><span className="icon-text">#</span><span className="shortcut-text">{shortcut.title}</span>diff --git a/web/src/components/Sidebar.tsx b/web/src/components/Sidebar.tsxindex 1a8384d7d..492247b5e 100644--- a/web/src/components/Sidebar.tsx+++ b/web/src/components/Sidebar.tsx@@ -1,7 +1,6 @@import { useRef } from "react";import UserBanner from "./UserBanner";import ShortcutList from "./ShortcutList";-import TagList from "./TagList";import UsageHeatMap from "./UsageHeatMap";import "../less/siderbar.less";@@ -15,7 +14,6 @@ const Sidebar: React.FC<Props> = () => {<UserBanner /><UsageHeatMap /><ShortcutList />- <TagList /></aside>);};diff --git a/web/src/components/TagList.tsx b/web/src/components/TagList.tsxindex 6e217f158..88213a39e 100644--- a/web/src/components/TagList.tsx+++ b/web/src/components/TagList.tsx@@ -101,7 +101,7 @@ const TagItemContainer: React.FC<TagItemContainerProps> = (props: TagItemContainlocationService.setTagQuery("");} else {utils.copyTextToClipboard(`#${tag.text} `);- if (!["/", "/recycle"].includes(locationService.getState().pathname)) {+ if (!["/", "/trash"].includes(locationService.getState().pathname)) {locationService.setPathname("/");}locationService.setTagQuery(tag.text);diff --git a/web/src/components/UsageHeatMap.tsx b/web/src/components/UsageHeatMap.tsxindex fb144d4a5..2d5a189d9 100644--- a/web/src/components/UsageHeatMap.tsx+++ b/web/src/components/UsageHeatMap.tsx@@ -76,7 +76,7 @@ const UsageHeatMap: React.FC<Props> = () => {locationService.setFromAndToQuery(0, 0);setCurrentStat(null);} else if (item.count > 0) {- if (!["/", "/recycle"].includes(locationService.getState().pathname)) {+ if (!["/", "/trash"].includes(locationService.getState().pathname)) {locationService.setPathname("/");}locationService.setFromAndToQuery(item.timestamp, item.timestamp + DAILY_TIMESTAMP);diff --git a/web/src/helpers/storage.ts b/web/src/helpers/storage.tsindex f0f0a3051..fd5afef30 100644--- a/web/src/helpers/storage.ts+++ b/web/src/helpers/storage.ts@@ -1,5 +1,3 @@-import { InputAction } from "tiny-undo";-/*** Define storage data type*/@@ -9,14 +7,6 @@ interface StorageData {shouldSplitMemoWord: boolean;shouldHideImageUrl: boolean;shouldUseMarkdownParser: boolean;-- // Editor setting- useTinyUndoHistoryCache: boolean;-- // tiny undo actions cache- tinyUndoActionsCache: InputAction[];- // tiny undo index cache- tinyUndoIndexCache: number;}type StorageKey = keyof StorageData;diff --git a/web/src/less/editor.less b/web/src/less/editor.lessindex 633fcb3f2..a1dc80fab 100644--- a/web/src/less/editor.less+++ b/web/src/less/editor.less@@ -2,18 +2,10 @@.common-editor-wrapper {.flex(column, flex-start, flex-start);- position: relative;- width: 100%;- height: auto;- background-color: white;+ @apply relative w-full h-full bg-white grow;> .common-editor-inputer {- display: inline-block;- width: 100%;- padding-top: 4px;- padding-bottom: 12px;- min-height: 40px;- max-height: 300px;+ @apply w-full h-full pt-1 pb-3 grow;font-size: 15px;line-height: 24px;resize: none;@@ -22,7 +14,6 @@background-color: transparent;z-index: 1;white-space: pre-wrap;- .hide-scroll-bar();&::placeholder {padding-left: 2px;diff --git a/web/src/less/global.less b/web/src/less/global.lessindex 26e122bac..72facbaad 100644--- a/web/src/less/global.less+++ b/web/src/less/global.less@@ -8,7 +8,7 @@body,html {- @apply w-full h-full overflow-hidden text-base;+ @apply w-screen h-screen overflow-hidden text-base;font-family: -apple-system, BlinkMacSystemFont, "PingFang SC", "Noto Sans", "Noto Sans CJK SC", "Microsoft YaHei UI", "Microsoft YaHei","WenQuanYi Micro Hei", sans-serif, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol","Noto Color Emoji";diff --git a/web/src/less/home.less b/web/src/less/home.lessindex 8837053ca..a9d6eafbb 100644--- a/web/src/less/home.less+++ b/web/src/less/home.less@@ -6,10 +6,5 @@#page-wrapper {.flex(row, flex-start, flex-start);- @apply w-full max-w-4xl h-full m-auto -translate-x-4;-- > .content-wrapper {- .flex(column, flex-start, flex-start);- @apply relative flex-grow h-auto;- }+ @apply w-full h-full m-auto;}diff --git a/web/src/less/memo-editor.less b/web/src/less/memo-editor.lessindex 06ecced8c..dbf30c7a0 100644--- a/web/src/less/memo-editor.less+++ b/web/src/less/memo-editor.less@@ -1,14 +1,7 @@@import "./mixin.less";-.memo-editor-wrapper {- .flex(column, flex-start, flex-start);- position: relative;- width: 100%;- height: auto;- background-color: white;- padding: 16px;- border-radius: 8px;- border: 2px solid @bg-gray;+.memo-editor-container {+ @apply relative w-full h-96 max-h-full flex flex-col justify-start items-start grow bg-white p-4 rounded-lg border-2 border-gray-200;&.edit-ing {border-color: @text-blue;diff --git a/web/src/less/memo-filter.less b/web/src/less/memo-filter.lessindex c2d4aa2aa..754fb90be 100644--- a/web/src/less/memo-filter.less+++ b/web/src/less/memo-filter.less@@ -2,34 +2,18 @@.filter-query-container {.flex(row, flex-start, flex-start);- width: 100%;- flex-wrap: wrap;- padding: 12px 12px;- padding-bottom: 4px;- font-size: 13px;- line-height: 1.8;+ @apply w-full flex-wrap p-3 pb-1 text-sm leading-7;> .tip-text {- padding: 2px 0;+ @apply mr-2;}> .filter-item-container {- padding: 2px 8px;- margin-right: 6px;- cursor: pointer;- background-color: @bg-gray;- border-radius: 4px;+ @apply px-2 mr-2 cursor-pointer bg-gray-200 rounded whitespace-nowrap truncate hover:line-through;max-width: 200px;- white-space: nowrap;- overflow: hidden;- text-overflow: ellipsis;> .icon-text {letter-spacing: 2px;}-- &:hover {- text-decoration: line-through;- }}}diff --git a/web/src/less/memolist.less b/web/src/less/memo-list.lesssimilarity index 95%rename from web/src/less/memolist.lessrename to web/src/less/memo-list.lessindex 352fbe870..a8596956e 100644--- a/web/src/less/memolist.less+++ b/web/src/less/memo-list.less@@ -1,6 +1,6 @@@import "./mixin.less";-.memolist-wrapper {+.memo-list-container {.flex(column, flex-start, flex-start);flex-grow: 1;width: 100%;diff --git a/web/src/less/memo-trash.less b/web/src/less/memo-trash.lessindex 1562a8f57..fa5b20b4c 100644--- a/web/src/less/memo-trash.less+++ b/web/src/less/memo-trash.less@@ -2,6 +2,7 @@@import "./memos-header.less";.memo-trash-wrapper {+ @apply px-8;.flex(column, flex-start, flex-start);width: 100%;height: 100%;diff --git a/web/src/less/memo.less b/web/src/less/memo.lessindex 2e5ebcd33..a0a919fde 100644--- a/web/src/less/memo.less+++ b/web/src/less/memo.less@@ -3,16 +3,7 @@.memo-wrapper {.flex(column, flex-start, flex-start);- width: 100%;- padding: 12px 18px;- background-color: white;- margin-top: 8px;- border-radius: 8px;- border: 1px solid transparent;-- &:hover {- border-color: @bg-gray;- }+ @apply w-full p-4 px-6 mt-2 bg-white rounded-lg border border-transparent hover:border-gray-200;> .memo-top-wrapper {.flex(row, space-between, center);@@ -21,10 +12,8 @@margin-bottom: 4px;> .time-text {- font-size: 12px;- line-height: 24px;+ @apply text-xs;color: gray;- flex-shrink: 0;cursor: pointer;}@@ -114,7 +103,7 @@}> .memo-content-text {- width: 100%;+ @apply w-full;}> .images-wrapper {diff --git a/web/src/less/memos.less b/web/src/less/memos.lessnew file mode 100644index 000000000..1f44bf672--- /dev/null+++ b/web/src/less/memos.less@@ -0,0 +1,15 @@+@import "./mixin.less";+@import "./memos-header.less";++.memos-wrapper {+ .flex(row, flex-start, flex-start);+ @apply w-auto h-full grow;++ > .memo-editor-wrapper {+ @apply w-96 h-full shrink-0 py-16 px-8 bg-white;+ }++ > .memo-list-wrapper {+ @apply w-auto h-full grow px-16 flex flex-col justify-start items-start;+ }+}diff --git a/web/src/less/search-bar.less b/web/src/less/search-bar.lessindex fafbca411..da03afbb9 100644--- a/web/src/less/search-bar.less+++ b/web/src/less/search-bar.less@@ -1,7 +1,7 @@@import "./mixin.less";.search-bar-container {- width: 160px;+ @apply relative w-40;> .search-bar-inputer {.flex(row, flex-start, center);@@ -30,13 +30,8 @@}> .quickly-action-wrapper {- display: none;- position: absolute;- top: 52px;- right: -8px;+ @apply hidden absolute top-9 -right-2 p-2 w-80;z-index: 2;- padding: 8px;- width: 320px;> .quickly-action-container {.flex(column, flex-start, flex-start);diff --git a/web/src/less/setting.less b/web/src/less/setting.lessindex 17bdc1352..60da39e1c 100644--- a/web/src/less/setting.less+++ b/web/src/less/setting.less@@ -3,7 +3,7 @@.preference-wrapper {.flex(column, flex-start, flex-start);- @apply w-full h-full grow overflow-y-scroll;+ @apply w-full h-full grow overflow-y-scroll px-8;.hide-scroll-bar();> .section-header-container {diff --git a/web/src/less/siderbar.less b/web/src/less/siderbar.lessindex a57be0d19..df04895eb 100644--- a/web/src/less/siderbar.less+++ b/web/src/less/siderbar.less@@ -2,7 +2,7 @@.sidebar-wrapper {.flex(column, flex-start, flex-start);- @apply w-60 h-auto py-4 overflow-x-hidden overflow-y-auto shrink-0;+ @apply w-60 h-full py-4 overflow-x-hidden overflow-y-auto shrink-0;.hide-scroll-bar();> * {diff --git a/web/src/pages/Home.tsx b/web/src/pages/Home.tsxindex 030392357..9c856b70c 100644--- a/web/src/pages/Home.tsx+++ b/web/src/pages/Home.tsx@@ -37,7 +37,7 @@ function Home() {{loadingState.isLoading ? null : (<section id="page-wrapper"><Sidebar />- <main className="content-wrapper">{homeRouterSwitch(pathname)}</main>+ {homeRouterSwitch(pathname)}</section>)}</>diff --git a/web/src/pages/Memos.tsx b/web/src/pages/Memos.tsxindex 8d0beec47..2f041e1ce 100644--- a/web/src/pages/Memos.tsx+++ b/web/src/pages/Memos.tsx@@ -2,15 +2,20 @@ 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 (- <>- <MemosHeader />- <MemoEditor />- <MemoFilter />- <MemoList />- </>+ <main className="memos-wrapper">+ <div className="memo-editor-wrapper">+ <MemoEditor />+ </div>+ <div className="memo-list-wrapper">+ <MemosHeader />+ <MemoFilter />+ <MemoList />+ </div>+ </main>);}diff --git a/web/src/pages/MemoTrash.tsx b/web/src/pages/Trash.tsxsimilarity index 98%rename from web/src/pages/MemoTrash.tsxrename to web/src/pages/Trash.tsxindex b4a0606f5..6737020f0 100644--- a/web/src/pages/MemoTrash.tsx+++ b/web/src/pages/Trash.tsx@@ -12,7 +12,7 @@ import "../less/memo-trash.less";interface Props {}-const MemoTrash: React.FC<Props> = () => {+const Trash: React.FC<Props> = () => {const {locationState: { query },} = useContext(appContext);@@ -126,4 +126,4 @@ const MemoTrash: React.FC<Props> = () => {);};-export default MemoTrash;+export default Trash;diff --git a/web/src/routers/homeRouter.tsx b/web/src/routers/homeRouter.tsxindex 7588e4e5d..9e648ea40 100644--- a/web/src/routers/homeRouter.tsx+++ b/web/src/routers/homeRouter.tsx@@ -1,9 +1,9 @@import Memos from "../pages/Memos";-import MemoTrash from "../pages/MemoTrash";+import Trash from "../pages/Trash";import Setting from "../pages/Setting";const homeRouter = {- "/recycle": <MemoTrash />,+ "/trash": <Trash />,"/setting": <Setting />,"*": <Memos />,};diff --git a/web/src/services/globalStateService.ts b/web/src/services/globalStateService.tsindex 7f232455a..80ca3ace4 100644--- a/web/src/services/globalStateService.ts+++ b/web/src/services/globalStateService.ts@@ -4,12 +4,11 @@ import { AppSetting } from "../stores/globalStateStore";class GlobalStateService {constructor() {- const cachedSetting = storage.get(["shouldSplitMemoWord", "shouldHideImageUrl", "shouldUseMarkdownParser", "useTinyUndoHistoryCache"]);+ const cachedSetting = storage.get(["shouldSplitMemoWord", "shouldHideImageUrl", "shouldUseMarkdownParser"]);const defaultAppSetting = {shouldSplitMemoWord: cachedSetting.shouldSplitMemoWord ?? true,shouldHideImageUrl: cachedSetting.shouldHideImageUrl ?? true,shouldUseMarkdownParser: cachedSetting.shouldUseMarkdownParser ?? true,- useTinyUndoHistoryCache: cachedSetting.useTinyUndoHistoryCache ?? false,};this.setAppSetting(defaultAppSetting);diff --git a/web/src/services/locationService.ts b/web/src/services/locationService.tsindex ae7190786..cfb7319b2 100644--- a/web/src/services/locationService.ts+++ b/web/src/services/locationService.ts@@ -185,7 +185,7 @@ class LocationService {};public getValidPathname = (pathname: string): AppRouter => {- if (["/", "/signin", "/recycle", "/setting"].includes(pathname)) {+ if (["/", "/signin", "/trash", "/setting"].includes(pathname)) {return pathname as AppRouter;} else {return "/";diff --git a/web/src/services/shortcutService.ts b/web/src/services/shortcutService.tsindex fcb0ed28e..c23971494 100644--- a/web/src/services/shortcutService.ts+++ b/web/src/services/shortcutService.ts@@ -82,6 +82,7 @@ class ShortcutService {public convertResponseModelShortcut(shortcut: Model.Shortcut): Model.Shortcut {return {...shortcut,+ id: String(shortcut.id),createdAt: utils.getDataStringWithTs(shortcut.createdTs),updatedAt: utils.getDataStringWithTs(shortcut.updatedTs),};diff --git a/web/src/stores/globalStateStore.ts b/web/src/stores/globalStateStore.tsindex 1ff4c4786..ac386d90b 100644--- a/web/src/stores/globalStateStore.ts+++ b/web/src/stores/globalStateStore.ts@@ -2,7 +2,6 @@ export interface AppSetting {shouldSplitMemoWord: boolean;shouldHideImageUrl: boolean;shouldUseMarkdownParser: boolean;- useTinyUndoHistoryCache: boolean;}export interface State extends AppSetting {@@ -71,5 +70,4 @@ export const defaultState: State = {shouldSplitMemoWord: true,shouldHideImageUrl: true,shouldUseMarkdownParser: true,- useTinyUndoHistoryCache: false,};diff --git a/web/src/stores/locationStore.ts b/web/src/stores/locationStore.tsindex d32fe0496..6cbeb029d 100644--- a/web/src/stores/locationStore.ts+++ b/web/src/stores/locationStore.ts@@ -165,7 +165,7 @@ export function reducer(state: State, action: Actions) {...state,query: {...state.query,- filter: action.payload,+ shortcutId: action.payload,},};}diff --git a/web/src/types/location.d.ts b/web/src/types/location.d.tsindex 802a61518..3d6cf2f91 100644--- a/web/src/types/location.d.ts+++ b/web/src/types/location.d.ts@@ -11,7 +11,7 @@ interface Query {shortcutId: string;}-type AppRouter = "/" | "/signin" | "/recycle" | "/setting";+type AppRouter = "/" | "/signin" | "/trash" | "/setting";interface AppLocation {pathname: AppRouter;diff --git a/web/yarn.lock b/web/yarn.lockindex e3247e4e8..3b7a748bb 100644--- a/web/yarn.lock+++ b/web/yarn.lock@@ -2294,11 +2294,6 @@ text-table@^0.2.0:resolved "https://registry.nlark.com/text-table/download/text-table-0.2.0.tgz?cache=0&sync_timestamp=1618846790938&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftext-table%2Fdownload%2Ftext-table-0.2.0.tgz"integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=-tiny-undo@^0.0.8:- version "0.0.8"- resolved "https://registry.npmjs.org/tiny-undo/-/tiny-undo-0.0.8.tgz"- integrity sha512-x/zUWVVoehq0TTLTLngUCvg41bssl5OYloNOE6sRz/2fsEetB87zpj4kEZyrmvzI3Rsq+t9olujqXprlu+lbvw==-to-fast-properties@^2.0.0:version "2.0.0"resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"