From f907619752a600032356c16a859daf2f77b724f9 Mon Sep 17 00:00:00 2001 From: Johnny Date: Mon, 7 Jul 2025 22:44:08 +0800 Subject: [PATCH] chore: move frontend store --- .github/instructions/frontend.instructions.md | 2 +- web/src/App.tsx | 2 +- .../ActivityCalendar/ActivityCalendar.tsx | 2 +- web/src/components/AuthFooter.tsx | 2 +- web/src/components/BrandBanner.tsx | 2 +- .../components/ChangeMemberPasswordDialog.tsx | 2 +- web/src/components/CreateShortcutDialog.tsx | 2 +- .../components/HomeSidebar/HomeSidebar.tsx | 2 +- .../HomeSidebar/ShortcutsSection.tsx | 4 +- .../components/HomeSidebar/TagsSection.tsx | 4 +- .../components/Inbox/MemoCommentMessage.tsx | 2 +- web/src/components/MemoActionMenu.tsx | 2 +- .../EmbeddedContent/EmbeddedAttachment.tsx | 2 +- .../EmbeddedContent/EmbeddedMemo.tsx | 2 +- web/src/components/MemoContent/Link.tsx | 2 +- .../ReferencedContent/ReferencedMemo.tsx | 2 +- web/src/components/MemoContent/Tag.tsx | 4 +- .../components/MemoContent/TaskListItem.tsx | 2 +- web/src/components/MemoContent/index.tsx | 2 +- web/src/components/MemoDisplaySettingMenu.tsx | 2 +- .../MemoEditor/ActionButton/TagSelector.tsx | 2 +- .../ActionButton/UploadAttachmentButton.tsx | 2 +- .../MemoEditor/Editor/TagSuggestions.tsx | 2 +- .../MemoEditor/RelationListView.tsx | 2 +- web/src/components/MemoEditor/index.tsx | 2 +- web/src/components/MemoFilters.tsx | 4 +- web/src/components/MemoReactionListView.tsx | 2 +- web/src/components/MemoView.tsx | 2 +- web/src/components/Navigation.tsx | 2 +- web/src/components/NavigationDrawer.tsx | 2 +- .../PagedMemoList/PagedMemoList.tsx | 2 +- web/src/components/PasswordSignInForm.tsx | 4 +- web/src/components/ReactionSelector.tsx | 2 +- web/src/components/ReactionView.tsx | 2 +- web/src/components/SearchBar.tsx | 2 +- web/src/components/Settings/MemberSection.tsx | 2 +- .../Settings/MemoRelatedSettings.tsx | 4 +- .../Settings/PreferencesSection.tsx | 2 +- .../components/Settings/StorageSection.tsx | 4 +- .../components/Settings/WorkspaceSection.tsx | 4 +- .../StatisticsView/StatisticsView.tsx | 4 +- web/src/components/TagTree.tsx | 2 +- web/src/components/UpdateAccountDialog.tsx | 2 +- .../UpdateCustomizedProfileDialog.tsx | 4 +- web/src/hooks/useCurrentUser.ts | 2 +- web/src/hooks/useStatisticsData.ts | 2 +- web/src/layouts/RootLayout.tsx | 4 +- web/src/main.tsx | 4 +- web/src/pages/AdminSignIn.tsx | 2 +- web/src/pages/Archived.tsx | 4 +- web/src/pages/Attachments.tsx | 2 +- web/src/pages/AuthCallback.tsx | 2 +- web/src/pages/Explore.tsx | 2 +- web/src/pages/Home.tsx | 4 +- web/src/pages/Inboxes.tsx | 2 +- web/src/pages/MemoDetail.tsx | 4 +- web/src/pages/Setting.tsx | 4 +- web/src/pages/SignIn.tsx | 2 +- web/src/pages/SignUp.tsx | 4 +- web/src/pages/UserProfile.tsx | 4 +- web/src/store/{v2 => }/attachment.ts | 0 web/src/store/{v2 => }/index.ts | 0 web/src/store/{v2 => }/memo.ts | 0 web/src/store/{v2 => }/memoFilter.ts | 0 web/src/store/{v2 => }/user.ts | 0 web/src/store/v2/dialog.ts | 40 ------------------- web/src/store/{v2 => }/view.ts | 0 web/src/store/{v2 => }/workspace.ts | 2 +- 68 files changed, 79 insertions(+), 119 deletions(-) rename web/src/store/{v2 => }/attachment.ts (100%) rename web/src/store/{v2 => }/index.ts (100%) rename web/src/store/{v2 => }/memo.ts (100%) rename web/src/store/{v2 => }/memoFilter.ts (100%) rename web/src/store/{v2 => }/user.ts (100%) delete mode 100644 web/src/store/v2/dialog.ts rename web/src/store/{v2 => }/view.ts (100%) rename web/src/store/{v2 => }/workspace.ts (98%) diff --git a/.github/instructions/frontend.instructions.md b/.github/instructions/frontend.instructions.md index 0b38d5e51..5b67ec44b 100644 --- a/.github/instructions/frontend.instructions.md +++ b/.github/instructions/frontend.instructions.md @@ -63,7 +63,7 @@ pnpm dlx shadcn@latest add button - `web/src/components/` → shared React components - `web/src/pages/` → route-based pages -- `web/src/store/v2/` → MobX stores +- `web/src/store/` → MobX stores - `web/src/style.css` → color variables and global styles - `web/src/hooks/` → reusable hooks diff --git a/web/src/App.tsx b/web/src/App.tsx index 0e1bf90d8..6ac72c4fa 100644 --- a/web/src/App.tsx +++ b/web/src/App.tsx @@ -4,7 +4,7 @@ import { useTranslation } from "react-i18next"; import { Outlet } from "react-router-dom"; import { getSystemColorScheme } from "./helpers/utils"; import useNavigateTo from "./hooks/useNavigateTo"; -import { userStore, workspaceStore } from "./store/v2"; +import { userStore, workspaceStore } from "./store"; import { loadTheme } from "./utils/theme"; const App = observer(() => { diff --git a/web/src/components/ActivityCalendar/ActivityCalendar.tsx b/web/src/components/ActivityCalendar/ActivityCalendar.tsx index 20df99aae..125e5f65d 100644 --- a/web/src/components/ActivityCalendar/ActivityCalendar.tsx +++ b/web/src/components/ActivityCalendar/ActivityCalendar.tsx @@ -3,7 +3,7 @@ import { observer } from "mobx-react-lite"; import { memo, useMemo } from "react"; import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"; import { cn } from "@/lib/utils"; -import { workspaceStore } from "@/store/v2"; +import { workspaceStore } from "@/store"; import type { ActivityCalendarProps, CalendarDay } from "@/types/statistics"; import { useTranslate } from "@/utils/i18n"; diff --git a/web/src/components/AuthFooter.tsx b/web/src/components/AuthFooter.tsx index db2eba004..2a449bb21 100644 --- a/web/src/components/AuthFooter.tsx +++ b/web/src/components/AuthFooter.tsx @@ -1,6 +1,6 @@ import { observer } from "mobx-react-lite"; import { cn } from "@/lib/utils"; -import { workspaceStore } from "@/store/v2"; +import { workspaceStore } from "@/store"; import AppearanceSelect from "./AppearanceSelect"; import LocaleSelect from "./LocaleSelect"; diff --git a/web/src/components/BrandBanner.tsx b/web/src/components/BrandBanner.tsx index f8673afbe..4746fef4f 100644 --- a/web/src/components/BrandBanner.tsx +++ b/web/src/components/BrandBanner.tsx @@ -1,6 +1,6 @@ import { observer } from "mobx-react-lite"; import { cn } from "@/lib/utils"; -import { workspaceStore } from "@/store/v2"; +import { workspaceStore } from "@/store"; import UserAvatar from "./UserAvatar"; interface Props { diff --git a/web/src/components/ChangeMemberPasswordDialog.tsx b/web/src/components/ChangeMemberPasswordDialog.tsx index 37e374c86..c4537f67e 100644 --- a/web/src/components/ChangeMemberPasswordDialog.tsx +++ b/web/src/components/ChangeMemberPasswordDialog.tsx @@ -4,7 +4,7 @@ import { Button } from "@/components/ui/button"; import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog"; import { Input } from "@/components/ui/input"; import { Label } from "@/components/ui/label"; -import { userStore } from "@/store/v2"; +import { userStore } from "@/store"; import { User } from "@/types/proto/api/v1/user_service"; import { useTranslate } from "@/utils/i18n"; diff --git a/web/src/components/CreateShortcutDialog.tsx b/web/src/components/CreateShortcutDialog.tsx index 1b49e593e..92e3daacc 100644 --- a/web/src/components/CreateShortcutDialog.tsx +++ b/web/src/components/CreateShortcutDialog.tsx @@ -8,7 +8,7 @@ import { Textarea } from "@/components/ui/textarea"; import { shortcutServiceClient } from "@/grpcweb"; import useCurrentUser from "@/hooks/useCurrentUser"; import useLoading from "@/hooks/useLoading"; -import { userStore } from "@/store/v2"; +import { userStore } from "@/store"; import { Shortcut } from "@/types/proto/api/v1/shortcut_service"; import { useTranslate } from "@/utils/i18n"; diff --git a/web/src/components/HomeSidebar/HomeSidebar.tsx b/web/src/components/HomeSidebar/HomeSidebar.tsx index c8e3ae600..03d939d8a 100644 --- a/web/src/components/HomeSidebar/HomeSidebar.tsx +++ b/web/src/components/HomeSidebar/HomeSidebar.tsx @@ -6,7 +6,7 @@ import SearchBar from "@/components/SearchBar"; import useCurrentUser from "@/hooks/useCurrentUser"; import { cn } from "@/lib/utils"; import { Routes } from "@/router"; -import { memoStore, userStore } from "@/store/v2"; +import { memoStore, userStore } from "@/store"; import MemoFilters from "../MemoFilters"; import StatisticsView from "../StatisticsView"; import ShortcutsSection from "./ShortcutsSection"; diff --git a/web/src/components/HomeSidebar/ShortcutsSection.tsx b/web/src/components/HomeSidebar/ShortcutsSection.tsx index 89db44f5d..2a2457809 100644 --- a/web/src/components/HomeSidebar/ShortcutsSection.tsx +++ b/web/src/components/HomeSidebar/ShortcutsSection.tsx @@ -5,8 +5,8 @@ import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/comp import { shortcutServiceClient } from "@/grpcweb"; import useAsyncEffect from "@/hooks/useAsyncEffect"; import { cn } from "@/lib/utils"; -import { userStore } from "@/store/v2"; -import memoFilterStore from "@/store/v2/memoFilter"; +import { userStore } from "@/store"; +import memoFilterStore from "@/store/memoFilter"; import { Shortcut } from "@/types/proto/api/v1/shortcut_service"; import { useTranslate } from "@/utils/i18n"; import CreateShortcutDialog from "../CreateShortcutDialog"; diff --git a/web/src/components/HomeSidebar/TagsSection.tsx b/web/src/components/HomeSidebar/TagsSection.tsx index 04df9f65f..b8e5935a8 100644 --- a/web/src/components/HomeSidebar/TagsSection.tsx +++ b/web/src/components/HomeSidebar/TagsSection.tsx @@ -7,8 +7,8 @@ import { Switch } from "@/components/ui/switch"; import { memoServiceClient } from "@/grpcweb"; import { useDialog } from "@/hooks/useDialog"; import { cn } from "@/lib/utils"; -import { userStore } from "@/store/v2"; -import memoFilterStore, { MemoFilter } from "@/store/v2/memoFilter"; +import { userStore } from "@/store"; +import memoFilterStore, { MemoFilter } from "@/store/memoFilter"; import { useTranslate } from "@/utils/i18n"; import RenameTagDialog from "../RenameTagDialog"; import TagTree from "../TagTree"; diff --git a/web/src/components/Inbox/MemoCommentMessage.tsx b/web/src/components/Inbox/MemoCommentMessage.tsx index 7a1b1e1e0..05662269f 100644 --- a/web/src/components/Inbox/MemoCommentMessage.tsx +++ b/web/src/components/Inbox/MemoCommentMessage.tsx @@ -7,8 +7,8 @@ import { activityServiceClient } from "@/grpcweb"; import useAsyncEffect from "@/hooks/useAsyncEffect"; import useNavigateTo from "@/hooks/useNavigateTo"; import { cn } from "@/lib/utils"; +import { memoStore, userStore } from "@/store"; import { activityNamePrefix } from "@/store/common"; -import { memoStore, userStore } from "@/store/v2"; import { Inbox, Inbox_Status } from "@/types/proto/api/v1/inbox_service"; import { Memo } from "@/types/proto/api/v1/memo_service"; import { User } from "@/types/proto/api/v1/user_service"; diff --git a/web/src/components/MemoActionMenu.tsx b/web/src/components/MemoActionMenu.tsx index 1ef241c0d..c91e8c7fe 100644 --- a/web/src/components/MemoActionMenu.tsx +++ b/web/src/components/MemoActionMenu.tsx @@ -15,7 +15,7 @@ import toast from "react-hot-toast"; import { useLocation } from "react-router-dom"; import { markdownServiceClient } from "@/grpcweb"; import useNavigateTo from "@/hooks/useNavigateTo"; -import { memoStore, userStore } from "@/store/v2"; +import { memoStore, userStore } from "@/store"; import { State } from "@/types/proto/api/v1/common"; import { NodeType } from "@/types/proto/api/v1/markdown_service"; import { Memo } from "@/types/proto/api/v1/memo_service"; diff --git a/web/src/components/MemoContent/EmbeddedContent/EmbeddedAttachment.tsx b/web/src/components/MemoContent/EmbeddedContent/EmbeddedAttachment.tsx index 15d6438cf..782487eac 100644 --- a/web/src/components/MemoContent/EmbeddedContent/EmbeddedAttachment.tsx +++ b/web/src/components/MemoContent/EmbeddedContent/EmbeddedAttachment.tsx @@ -3,7 +3,7 @@ import { useEffect } from "react"; import MemoAttachmentListView from "@/components/MemoAttachmentListView"; import useLoading from "@/hooks/useLoading"; import { cn } from "@/lib/utils"; -import { attachmentStore } from "@/store/v2"; +import { attachmentStore } from "@/store"; import Error from "./Error"; interface Props { diff --git a/web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx b/web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx index 20d671f8f..651d204bd 100644 --- a/web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx +++ b/web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx @@ -7,8 +7,8 @@ import { Link } from "react-router-dom"; import MemoAttachmentListView from "@/components/MemoAttachmentListView"; import useLoading from "@/hooks/useLoading"; import { cn } from "@/lib/utils"; +import { memoStore } from "@/store"; import { extractMemoIdFromName } from "@/store/common"; -import { memoStore } from "@/store/v2"; import MemoContent from ".."; import { RendererContext } from "../types"; import Error from "./Error"; diff --git a/web/src/components/MemoContent/Link.tsx b/web/src/components/MemoContent/Link.tsx index 0923963f3..0b6f6bcec 100644 --- a/web/src/components/MemoContent/Link.tsx +++ b/web/src/components/MemoContent/Link.tsx @@ -1,7 +1,7 @@ import { useState } from "react"; import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"; import { markdownServiceClient } from "@/grpcweb"; -import { workspaceStore } from "@/store/v2"; +import { workspaceStore } from "@/store"; import { LinkMetadata, Node } from "@/types/proto/api/v1/markdown_service"; import Renderer from "./Renderer"; diff --git a/web/src/components/MemoContent/ReferencedContent/ReferencedMemo.tsx b/web/src/components/MemoContent/ReferencedContent/ReferencedMemo.tsx index 138fd6964..e4d66b559 100644 --- a/web/src/components/MemoContent/ReferencedContent/ReferencedMemo.tsx +++ b/web/src/components/MemoContent/ReferencedContent/ReferencedMemo.tsx @@ -2,8 +2,8 @@ import { observer } from "mobx-react-lite"; import { useContext, useEffect } from "react"; import useLoading from "@/hooks/useLoading"; import useNavigateTo from "@/hooks/useNavigateTo"; +import { memoStore } from "@/store"; import { memoNamePrefix } from "@/store/common"; -import { memoStore } from "@/store/v2"; import { RendererContext } from "../types"; import Error from "./Error"; diff --git a/web/src/components/MemoContent/Tag.tsx b/web/src/components/MemoContent/Tag.tsx index 4c011b268..63534a083 100644 --- a/web/src/components/MemoContent/Tag.tsx +++ b/web/src/components/MemoContent/Tag.tsx @@ -4,8 +4,8 @@ import { useLocation } from "react-router-dom"; import useNavigateTo from "@/hooks/useNavigateTo"; import { cn } from "@/lib/utils"; import { Routes } from "@/router"; -import { memoFilterStore } from "@/store/v2"; -import { stringifyFilters, MemoFilter } from "@/store/v2/memoFilter"; +import { memoFilterStore } from "@/store"; +import { stringifyFilters, MemoFilter } from "@/store/memoFilter"; import { RendererContext } from "./types"; interface Props { diff --git a/web/src/components/MemoContent/TaskListItem.tsx b/web/src/components/MemoContent/TaskListItem.tsx index fdb740f73..dba2c4ab2 100644 --- a/web/src/components/MemoContent/TaskListItem.tsx +++ b/web/src/components/MemoContent/TaskListItem.tsx @@ -3,7 +3,7 @@ import { useContext } from "react"; import { Checkbox } from "@/components/ui/checkbox"; import { markdownServiceClient } from "@/grpcweb"; import { cn } from "@/lib/utils"; -import { memoStore } from "@/store/v2"; +import { memoStore } from "@/store"; import { Node, TaskListItemNode } from "@/types/proto/api/v1/markdown_service"; import Renderer from "./Renderer"; import { RendererContext } from "./types"; diff --git a/web/src/components/MemoContent/index.tsx b/web/src/components/MemoContent/index.tsx index 42f36dcb4..116c18d59 100644 --- a/web/src/components/MemoContent/index.tsx +++ b/web/src/components/MemoContent/index.tsx @@ -2,7 +2,7 @@ import { observer } from "mobx-react-lite"; import { memo, useEffect, useRef, useState } from "react"; import useCurrentUser from "@/hooks/useCurrentUser"; import { cn } from "@/lib/utils"; -import { memoStore } from "@/store/v2"; +import { memoStore } from "@/store"; import { Node, NodeType } from "@/types/proto/api/v1/markdown_service"; import { useTranslate } from "@/utils/i18n"; import { isSuperUser } from "@/utils/user"; diff --git a/web/src/components/MemoDisplaySettingMenu.tsx b/web/src/components/MemoDisplaySettingMenu.tsx index c97a90c5f..e906913fc 100644 --- a/web/src/components/MemoDisplaySettingMenu.tsx +++ b/web/src/components/MemoDisplaySettingMenu.tsx @@ -2,7 +2,7 @@ import { Settings2Icon } from "lucide-react"; import { observer } from "mobx-react-lite"; import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"; import { cn } from "@/lib/utils"; -import { viewStore } from "@/store/v2"; +import { viewStore } from "@/store"; import { useTranslate } from "@/utils/i18n"; import { Popover, PopoverContent, PopoverTrigger } from "./ui/popover"; diff --git a/web/src/components/MemoEditor/ActionButton/TagSelector.tsx b/web/src/components/MemoEditor/ActionButton/TagSelector.tsx index 3fe4644f4..cb1ba0657 100644 --- a/web/src/components/MemoEditor/ActionButton/TagSelector.tsx +++ b/web/src/components/MemoEditor/ActionButton/TagSelector.tsx @@ -2,7 +2,7 @@ import { HashIcon } from "lucide-react"; import { observer } from "mobx-react-lite"; import OverflowTip from "@/components/kit/OverflowTip"; import { Button } from "@/components/ui/button"; -import { userStore } from "@/store/v2"; +import { userStore } from "@/store"; import { useTranslate } from "@/utils/i18n"; import { Popover, PopoverContent, PopoverTrigger } from "../../ui/popover"; import { EditorRefActions } from "../Editor"; diff --git a/web/src/components/MemoEditor/ActionButton/UploadAttachmentButton.tsx b/web/src/components/MemoEditor/ActionButton/UploadAttachmentButton.tsx index d5ab68f74..00fe6cc13 100644 --- a/web/src/components/MemoEditor/ActionButton/UploadAttachmentButton.tsx +++ b/web/src/components/MemoEditor/ActionButton/UploadAttachmentButton.tsx @@ -3,7 +3,7 @@ import { observer } from "mobx-react-lite"; import { useContext, useRef, useState } from "react"; import toast from "react-hot-toast"; import { Button } from "@/components/ui/button"; -import { attachmentStore } from "@/store/v2"; +import { attachmentStore } from "@/store"; import { Attachment } from "@/types/proto/api/v1/attachment_service"; import { MemoEditorContext } from "../types"; diff --git a/web/src/components/MemoEditor/Editor/TagSuggestions.tsx b/web/src/components/MemoEditor/Editor/TagSuggestions.tsx index e717fe5ca..fb6e7631f 100644 --- a/web/src/components/MemoEditor/Editor/TagSuggestions.tsx +++ b/web/src/components/MemoEditor/Editor/TagSuggestions.tsx @@ -4,7 +4,7 @@ import { useEffect, useRef, useState } from "react"; import getCaretCoordinates from "textarea-caret"; import OverflowTip from "@/components/kit/OverflowTip"; import { cn } from "@/lib/utils"; -import { userStore } from "@/store/v2"; +import { userStore } from "@/store"; import { EditorRefActions } from "."; type Props = { diff --git a/web/src/components/MemoEditor/RelationListView.tsx b/web/src/components/MemoEditor/RelationListView.tsx index 8b977e4c4..76c5e4a70 100644 --- a/web/src/components/MemoEditor/RelationListView.tsx +++ b/web/src/components/MemoEditor/RelationListView.tsx @@ -1,7 +1,7 @@ import { LinkIcon, XIcon } from "lucide-react"; import { observer } from "mobx-react-lite"; import { useEffect, useState } from "react"; -import { memoStore } from "@/store/v2"; +import { memoStore } from "@/store"; import { Memo, MemoRelation, MemoRelation_Type } from "@/types/proto/api/v1/memo_service"; interface Props { diff --git a/web/src/components/MemoEditor/index.tsx b/web/src/components/MemoEditor/index.tsx index 90e8f1871..d6a02d8f8 100644 --- a/web/src/components/MemoEditor/index.tsx +++ b/web/src/components/MemoEditor/index.tsx @@ -13,8 +13,8 @@ import { isValidUrl } from "@/helpers/utils"; import useAsyncEffect from "@/hooks/useAsyncEffect"; import useCurrentUser from "@/hooks/useCurrentUser"; import { cn } from "@/lib/utils"; +import { memoStore, attachmentStore, userStore, workspaceStore } from "@/store"; import { extractMemoIdFromName } from "@/store/common"; -import { memoStore, attachmentStore, userStore, workspaceStore } from "@/store/v2"; import { Attachment } from "@/types/proto/api/v1/attachment_service"; import { Location, Memo, MemoRelation, MemoRelation_Type, Visibility } from "@/types/proto/api/v1/memo_service"; import { UserSetting } from "@/types/proto/api/v1/user_service"; diff --git a/web/src/components/MemoFilters.tsx b/web/src/components/MemoFilters.tsx index 30aec3497..8699f6d6f 100644 --- a/web/src/components/MemoFilters.tsx +++ b/web/src/components/MemoFilters.tsx @@ -3,8 +3,8 @@ import { CalendarIcon, CheckCircleIcon, CodeIcon, EyeIcon, HashIcon, LinkIcon, B import { observer } from "mobx-react-lite"; import { useEffect } from "react"; import { useSearchParams } from "react-router-dom"; -import { memoFilterStore } from "@/store/v2"; -import { FilterFactor, getMemoFilterKey, MemoFilter, stringifyFilters } from "@/store/v2/memoFilter"; +import { memoFilterStore } from "@/store"; +import { FilterFactor, getMemoFilterKey, MemoFilter, stringifyFilters } from "@/store/memoFilter"; import { useTranslate } from "@/utils/i18n"; const MemoFilters = observer(() => { diff --git a/web/src/components/MemoReactionListView.tsx b/web/src/components/MemoReactionListView.tsx index 9dc8268b9..124e3855f 100644 --- a/web/src/components/MemoReactionListView.tsx +++ b/web/src/components/MemoReactionListView.tsx @@ -2,7 +2,7 @@ import { uniq } from "lodash-es"; import { observer } from "mobx-react-lite"; import { memo, useEffect, useState } from "react"; import useCurrentUser from "@/hooks/useCurrentUser"; -import { userStore } from "@/store/v2"; +import { userStore } from "@/store"; import { State } from "@/types/proto/api/v1/common"; import { Memo } from "@/types/proto/api/v1/memo_service"; import { Reaction } from "@/types/proto/api/v1/memo_service"; diff --git a/web/src/components/MemoView.tsx b/web/src/components/MemoView.tsx index 2d6564d0b..50d2cc5f7 100644 --- a/web/src/components/MemoView.tsx +++ b/web/src/components/MemoView.tsx @@ -7,7 +7,7 @@ import useAsyncEffect from "@/hooks/useAsyncEffect"; import useCurrentUser from "@/hooks/useCurrentUser"; import useNavigateTo from "@/hooks/useNavigateTo"; import { cn } from "@/lib/utils"; -import { memoStore, userStore, workspaceStore } from "@/store/v2"; +import { memoStore, userStore, workspaceStore } from "@/store"; import { State } from "@/types/proto/api/v1/common"; import { Memo, MemoRelation_Type, Visibility } from "@/types/proto/api/v1/memo_service"; import { useTranslate } from "@/utils/i18n"; diff --git a/web/src/components/Navigation.tsx b/web/src/components/Navigation.tsx index 98a9c1d61..6991a3aee 100644 --- a/web/src/components/Navigation.tsx +++ b/web/src/components/Navigation.tsx @@ -6,7 +6,7 @@ import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/comp import useCurrentUser from "@/hooks/useCurrentUser"; import { cn } from "@/lib/utils"; import { Routes } from "@/router"; -import { userStore } from "@/store/v2"; +import { userStore } from "@/store"; import { useTranslate } from "@/utils/i18n"; import BrandBanner from "./BrandBanner"; import UserBanner from "./UserBanner"; diff --git a/web/src/components/NavigationDrawer.tsx b/web/src/components/NavigationDrawer.tsx index 6d7682b36..0cee7e329 100644 --- a/web/src/components/NavigationDrawer.tsx +++ b/web/src/components/NavigationDrawer.tsx @@ -3,7 +3,7 @@ import { useEffect, useState } from "react"; import { useLocation } from "react-router-dom"; import { Button } from "@/components/ui/button"; import { Sheet, SheetContent, SheetHeader, SheetTitle, SheetTrigger } from "@/components/ui/sheet"; -import { workspaceStore } from "@/store/v2"; +import { workspaceStore } from "@/store"; import Navigation from "./Navigation"; import UserAvatar from "./UserAvatar"; diff --git a/web/src/components/PagedMemoList/PagedMemoList.tsx b/web/src/components/PagedMemoList/PagedMemoList.tsx index b86662871..30db9a4e2 100644 --- a/web/src/components/PagedMemoList/PagedMemoList.tsx +++ b/web/src/components/PagedMemoList/PagedMemoList.tsx @@ -7,7 +7,7 @@ import { Button } from "@/components/ui/button"; import { DEFAULT_LIST_MEMOS_PAGE_SIZE } from "@/helpers/consts"; import useResponsiveWidth from "@/hooks/useResponsiveWidth"; import { Routes } from "@/router"; -import { memoStore, viewStore } from "@/store/v2"; +import { memoStore, viewStore } from "@/store"; import { State } from "@/types/proto/api/v1/common"; import { Memo } from "@/types/proto/api/v1/memo_service"; import { useTranslate } from "@/utils/i18n"; diff --git a/web/src/components/PasswordSignInForm.tsx b/web/src/components/PasswordSignInForm.tsx index d7a05deb3..af4f0458f 100644 --- a/web/src/components/PasswordSignInForm.tsx +++ b/web/src/components/PasswordSignInForm.tsx @@ -8,8 +8,8 @@ import { Input } from "@/components/ui/input"; import { authServiceClient } from "@/grpcweb"; import useLoading from "@/hooks/useLoading"; import useNavigateTo from "@/hooks/useNavigateTo"; -import { workspaceStore } from "@/store/v2"; -import { initialUserStore } from "@/store/v2/user"; +import { workspaceStore } from "@/store"; +import { initialUserStore } from "@/store/user"; import { useTranslate } from "@/utils/i18n"; const PasswordSignInForm = observer(() => { diff --git a/web/src/components/ReactionSelector.tsx b/web/src/components/ReactionSelector.tsx index f07df1860..3698d477b 100644 --- a/web/src/components/ReactionSelector.tsx +++ b/web/src/components/ReactionSelector.tsx @@ -5,7 +5,7 @@ import useClickAway from "react-use/lib/useClickAway"; import { memoServiceClient } from "@/grpcweb"; import useCurrentUser from "@/hooks/useCurrentUser"; import { cn } from "@/lib/utils"; -import { memoStore, workspaceStore } from "@/store/v2"; +import { memoStore, workspaceStore } from "@/store"; import { Memo } from "@/types/proto/api/v1/memo_service"; import { Popover, PopoverContent, PopoverTrigger } from "./ui/popover"; diff --git a/web/src/components/ReactionView.tsx b/web/src/components/ReactionView.tsx index 720f450d9..c97f4b757 100644 --- a/web/src/components/ReactionView.tsx +++ b/web/src/components/ReactionView.tsx @@ -3,7 +3,7 @@ import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/comp import { memoServiceClient } from "@/grpcweb"; import useCurrentUser from "@/hooks/useCurrentUser"; import { cn } from "@/lib/utils"; -import { memoStore } from "@/store/v2"; +import { memoStore } from "@/store"; import { State } from "@/types/proto/api/v1/common"; import { Memo } from "@/types/proto/api/v1/memo_service"; import { User } from "@/types/proto/api/v1/user_service"; diff --git a/web/src/components/SearchBar.tsx b/web/src/components/SearchBar.tsx index b2a488dc2..3aee50559 100644 --- a/web/src/components/SearchBar.tsx +++ b/web/src/components/SearchBar.tsx @@ -2,7 +2,7 @@ import { SearchIcon } from "lucide-react"; import { observer } from "mobx-react-lite"; import { useState } from "react"; import { cn } from "@/lib/utils"; -import { memoFilterStore } from "@/store/v2"; +import { memoFilterStore } from "@/store"; import { useTranslate } from "@/utils/i18n"; import MemoDisplaySettingMenu from "./MemoDisplaySettingMenu"; diff --git a/web/src/components/Settings/MemberSection.tsx b/web/src/components/Settings/MemberSection.tsx index 65f36120d..7734063bf 100644 --- a/web/src/components/Settings/MemberSection.tsx +++ b/web/src/components/Settings/MemberSection.tsx @@ -6,7 +6,7 @@ import { Button } from "@/components/ui/button"; import { userServiceClient } from "@/grpcweb"; import useCurrentUser from "@/hooks/useCurrentUser"; import { useDialog } from "@/hooks/useDialog"; -import { userStore } from "@/store/v2"; +import { userStore } from "@/store"; import { State } from "@/types/proto/api/v1/common"; import { User, User_Role } from "@/types/proto/api/v1/user_service"; import { useTranslate } from "@/utils/i18n"; diff --git a/web/src/components/Settings/MemoRelatedSettings.tsx b/web/src/components/Settings/MemoRelatedSettings.tsx index a1489b938..6bc2e8efe 100644 --- a/web/src/components/Settings/MemoRelatedSettings.tsx +++ b/web/src/components/Settings/MemoRelatedSettings.tsx @@ -7,9 +7,9 @@ import { Badge } from "@/components/ui/badge"; import { Button } from "@/components/ui/button"; import { Input } from "@/components/ui/input"; import { Switch } from "@/components/ui/switch"; +import { workspaceStore } from "@/store"; import { workspaceSettingNamePrefix } from "@/store/common"; -import { workspaceStore } from "@/store/v2"; -import { WorkspaceSettingKey } from "@/store/v2/workspace"; +import { WorkspaceSettingKey } from "@/store/workspace"; import { WorkspaceMemoRelatedSetting } from "@/types/proto/api/v1/workspace_service"; import { useTranslate } from "@/utils/i18n"; diff --git a/web/src/components/Settings/PreferencesSection.tsx b/web/src/components/Settings/PreferencesSection.tsx index d051509ca..f8659cade 100644 --- a/web/src/components/Settings/PreferencesSection.tsx +++ b/web/src/components/Settings/PreferencesSection.tsx @@ -1,7 +1,7 @@ import { observer } from "mobx-react-lite"; import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"; import { Separator } from "@/components/ui/separator"; -import { userStore } from "@/store/v2"; +import { userStore } from "@/store"; import { Visibility } from "@/types/proto/api/v1/memo_service"; import { UserSetting } from "@/types/proto/api/v1/user_service"; import { useTranslate } from "@/utils/i18n"; diff --git a/web/src/components/Settings/StorageSection.tsx b/web/src/components/Settings/StorageSection.tsx index f8781da9a..c7529e230 100644 --- a/web/src/components/Settings/StorageSection.tsx +++ b/web/src/components/Settings/StorageSection.tsx @@ -11,9 +11,9 @@ import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group"; import { Separator } from "@/components/ui/separator"; import { Switch } from "@/components/ui/switch"; import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"; +import { workspaceStore } from "@/store"; import { workspaceSettingNamePrefix } from "@/store/common"; -import { workspaceStore } from "@/store/v2"; -import { WorkspaceSettingKey } from "@/store/v2/workspace"; +import { WorkspaceSettingKey } from "@/store/workspace"; import { WorkspaceStorageSetting, WorkspaceStorageSetting_S3Config, diff --git a/web/src/components/Settings/WorkspaceSection.tsx b/web/src/components/Settings/WorkspaceSection.tsx index 6bdf0f80b..ddb393d0f 100644 --- a/web/src/components/Settings/WorkspaceSection.tsx +++ b/web/src/components/Settings/WorkspaceSection.tsx @@ -11,9 +11,9 @@ import { Switch } from "@/components/ui/switch"; import { Textarea } from "@/components/ui/textarea"; import { identityProviderServiceClient } from "@/grpcweb"; import useDialog from "@/hooks/useDialog"; +import { workspaceStore } from "@/store"; import { workspaceSettingNamePrefix } from "@/store/common"; -import { workspaceStore } from "@/store/v2"; -import { WorkspaceSettingKey } from "@/store/v2/workspace"; +import { WorkspaceSettingKey } from "@/store/workspace"; import { IdentityProvider } from "@/types/proto/api/v1/idp_service"; import { WorkspaceGeneralSetting } from "@/types/proto/api/v1/workspace_service"; import { useTranslate } from "@/utils/i18n"; diff --git a/web/src/components/StatisticsView/StatisticsView.tsx b/web/src/components/StatisticsView/StatisticsView.tsx index f89c17917..feed59ba5 100644 --- a/web/src/components/StatisticsView/StatisticsView.tsx +++ b/web/src/components/StatisticsView/StatisticsView.tsx @@ -6,8 +6,8 @@ import { matchPath, useLocation } from "react-router-dom"; import useCurrentUser from "@/hooks/useCurrentUser"; import { useStatisticsData } from "@/hooks/useStatisticsData"; import { Routes } from "@/router"; -import { userStore } from "@/store/v2"; -import memoFilterStore, { FilterFactor } from "@/store/v2/memoFilter"; +import { userStore } from "@/store"; +import memoFilterStore, { FilterFactor } from "@/store/memoFilter"; import { useTranslate } from "@/utils/i18n"; import ActivityCalendar from "../ActivityCalendar"; import { MonthNavigator } from "./MonthNavigator"; diff --git a/web/src/components/TagTree.tsx b/web/src/components/TagTree.tsx index ee139e1d1..87b4a6c8d 100644 --- a/web/src/components/TagTree.tsx +++ b/web/src/components/TagTree.tsx @@ -2,7 +2,7 @@ import { ChevronRightIcon, HashIcon } from "lucide-react"; import { observer } from "mobx-react-lite"; import { useEffect, useState } from "react"; import useToggle from "react-use/lib/useToggle"; -import memoFilterStore, { MemoFilter } from "@/store/v2/memoFilter"; +import memoFilterStore, { MemoFilter } from "@/store/memoFilter"; interface Tag { key: string; diff --git a/web/src/components/UpdateAccountDialog.tsx b/web/src/components/UpdateAccountDialog.tsx index 0fe12bfe6..9db072d8c 100644 --- a/web/src/components/UpdateAccountDialog.tsx +++ b/web/src/components/UpdateAccountDialog.tsx @@ -9,7 +9,7 @@ import { Label } from "@/components/ui/label"; import { Textarea } from "@/components/ui/textarea"; import { convertFileToBase64 } from "@/helpers/utils"; import useCurrentUser from "@/hooks/useCurrentUser"; -import { userStore, workspaceStore } from "@/store/v2"; +import { userStore, workspaceStore } from "@/store"; import { User as UserPb } from "@/types/proto/api/v1/user_service"; import { useTranslate } from "@/utils/i18n"; import UserAvatar from "./UserAvatar"; diff --git a/web/src/components/UpdateCustomizedProfileDialog.tsx b/web/src/components/UpdateCustomizedProfileDialog.tsx index cbd36e3db..44e835955 100644 --- a/web/src/components/UpdateCustomizedProfileDialog.tsx +++ b/web/src/components/UpdateCustomizedProfileDialog.tsx @@ -5,9 +5,9 @@ import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } f import { Input } from "@/components/ui/input"; import { Label } from "@/components/ui/label"; import { Textarea } from "@/components/ui/textarea"; +import { workspaceStore } from "@/store"; import { workspaceSettingNamePrefix } from "@/store/common"; -import { workspaceStore } from "@/store/v2"; -import { WorkspaceSettingKey } from "@/store/v2/workspace"; +import { WorkspaceSettingKey } from "@/store/workspace"; import { WorkspaceCustomProfile } from "@/types/proto/api/v1/workspace_service"; import { useTranslate } from "@/utils/i18n"; import AppearanceSelect from "./AppearanceSelect"; diff --git a/web/src/hooks/useCurrentUser.ts b/web/src/hooks/useCurrentUser.ts index 158f9247e..ba5429ef1 100644 --- a/web/src/hooks/useCurrentUser.ts +++ b/web/src/hooks/useCurrentUser.ts @@ -1,4 +1,4 @@ -import { userStore } from "@/store/v2"; +import { userStore } from "@/store"; const useCurrentUser = () => { return userStore.state.userMapByName[userStore.state.currentUser || ""]; diff --git a/web/src/hooks/useStatisticsData.ts b/web/src/hooks/useStatisticsData.ts index 698f971a8..11eee8da1 100644 --- a/web/src/hooks/useStatisticsData.ts +++ b/web/src/hooks/useStatisticsData.ts @@ -1,7 +1,7 @@ import dayjs from "dayjs"; import { countBy } from "lodash-es"; import { useMemo } from "react"; -import { userStore } from "@/store/v2"; +import { userStore } from "@/store"; import { UserStats_MemoTypeStats } from "@/types/proto/api/v1/user_service"; import type { StatisticsData } from "@/types/statistics"; diff --git a/web/src/layouts/RootLayout.tsx b/web/src/layouts/RootLayout.tsx index e3e33dd81..02a65f0a2 100644 --- a/web/src/layouts/RootLayout.tsx +++ b/web/src/layouts/RootLayout.tsx @@ -8,8 +8,8 @@ import useResponsiveWidth from "@/hooks/useResponsiveWidth"; import { cn } from "@/lib/utils"; import Loading from "@/pages/Loading"; import { Routes } from "@/router"; -import { workspaceStore } from "@/store/v2"; -import memoFilterStore from "@/store/v2/memoFilter"; +import { workspaceStore } from "@/store"; +import memoFilterStore from "@/store/memoFilter"; const RootLayout = observer(() => { const location = useLocation(); diff --git a/web/src/main.tsx b/web/src/main.tsx index 46b6dc126..8884e8495 100644 --- a/web/src/main.tsx +++ b/web/src/main.tsx @@ -6,8 +6,8 @@ import { RouterProvider } from "react-router-dom"; import "./i18n"; import "./index.css"; import router from "./router"; -import { initialUserStore } from "./store/v2/user"; -import { initialWorkspaceStore } from "./store/v2/workspace"; +import { initialUserStore } from "./store/user"; +import { initialWorkspaceStore } from "./store/workspace"; import "leaflet/dist/leaflet.css"; const Main = observer(() => ( diff --git a/web/src/pages/AdminSignIn.tsx b/web/src/pages/AdminSignIn.tsx index 19d1eaaf8..5a81ef54a 100644 --- a/web/src/pages/AdminSignIn.tsx +++ b/web/src/pages/AdminSignIn.tsx @@ -1,7 +1,7 @@ import { observer } from "mobx-react-lite"; import AuthFooter from "@/components/AuthFooter"; import PasswordSignInForm from "@/components/PasswordSignInForm"; -import { workspaceStore } from "@/store/v2"; +import { workspaceStore } from "@/store"; const AdminSignIn = observer(() => { const workspaceGeneralSetting = workspaceStore.state.generalSetting; diff --git a/web/src/pages/Archived.tsx b/web/src/pages/Archived.tsx index f7657a4c4..edbe63d30 100644 --- a/web/src/pages/Archived.tsx +++ b/web/src/pages/Archived.tsx @@ -4,8 +4,8 @@ import { useMemo } from "react"; import MemoView from "@/components/MemoView"; import PagedMemoList from "@/components/PagedMemoList"; import useCurrentUser from "@/hooks/useCurrentUser"; -import { viewStore } from "@/store/v2"; -import memoFilterStore from "@/store/v2/memoFilter"; +import { viewStore } from "@/store"; +import memoFilterStore from "@/store/memoFilter"; import { State } from "@/types/proto/api/v1/common"; import { Memo } from "@/types/proto/api/v1/memo_service"; diff --git a/web/src/pages/Attachments.tsx b/web/src/pages/Attachments.tsx index 1c601752a..f8bafcdd5 100644 --- a/web/src/pages/Attachments.tsx +++ b/web/src/pages/Attachments.tsx @@ -14,7 +14,7 @@ import { attachmentServiceClient } from "@/grpcweb"; import useLoading from "@/hooks/useLoading"; import useResponsiveWidth from "@/hooks/useResponsiveWidth"; import i18n from "@/i18n"; -import { memoStore } from "@/store/v2"; +import { memoStore } from "@/store"; import { Attachment } from "@/types/proto/api/v1/attachment_service"; import { useTranslate } from "@/utils/i18n"; diff --git a/web/src/pages/AuthCallback.tsx b/web/src/pages/AuthCallback.tsx index f42f25e6f..539750187 100644 --- a/web/src/pages/AuthCallback.tsx +++ b/web/src/pages/AuthCallback.tsx @@ -7,7 +7,7 @@ import { useSearchParams } from "react-router-dom"; import { authServiceClient } from "@/grpcweb"; import { absolutifyLink } from "@/helpers/utils"; import useNavigateTo from "@/hooks/useNavigateTo"; -import { initialUserStore } from "@/store/v2/user"; +import { initialUserStore } from "@/store/user"; interface State { loading: boolean; diff --git a/web/src/pages/Explore.tsx b/web/src/pages/Explore.tsx index a862c1e86..f5cc4eeed 100644 --- a/web/src/pages/Explore.tsx +++ b/web/src/pages/Explore.tsx @@ -4,7 +4,7 @@ import MemoView from "@/components/MemoView"; import MobileHeader from "@/components/MobileHeader"; import PagedMemoList from "@/components/PagedMemoList"; import useResponsiveWidth from "@/hooks/useResponsiveWidth"; -import { viewStore } from "@/store/v2"; +import { viewStore } from "@/store"; import { State } from "@/types/proto/api/v1/common"; import { Memo } from "@/types/proto/api/v1/memo_service"; diff --git a/web/src/pages/Home.tsx b/web/src/pages/Home.tsx index 5c321f0c9..7294a4e36 100644 --- a/web/src/pages/Home.tsx +++ b/web/src/pages/Home.tsx @@ -4,8 +4,8 @@ import { useMemo } from "react"; import MemoView from "@/components/MemoView"; import PagedMemoList from "@/components/PagedMemoList"; import useCurrentUser from "@/hooks/useCurrentUser"; -import { viewStore, userStore } from "@/store/v2"; -import memoFilterStore from "@/store/v2/memoFilter"; +import { viewStore, userStore } from "@/store"; +import memoFilterStore from "@/store/memoFilter"; import { State } from "@/types/proto/api/v1/common"; import { Memo } from "@/types/proto/api/v1/memo_service"; diff --git a/web/src/pages/Inboxes.tsx b/web/src/pages/Inboxes.tsx index 7187c5f63..aca73663b 100644 --- a/web/src/pages/Inboxes.tsx +++ b/web/src/pages/Inboxes.tsx @@ -6,7 +6,7 @@ import Empty from "@/components/Empty"; import MemoCommentMessage from "@/components/Inbox/MemoCommentMessage"; import MobileHeader from "@/components/MobileHeader"; import useResponsiveWidth from "@/hooks/useResponsiveWidth"; -import { userStore } from "@/store/v2"; +import { userStore } from "@/store"; import { Inbox, Inbox_Status, Inbox_Type } from "@/types/proto/api/v1/inbox_service"; import { useTranslate } from "@/utils/i18n"; diff --git a/web/src/pages/MemoDetail.tsx b/web/src/pages/MemoDetail.tsx index a732ed874..943c26b4a 100644 --- a/web/src/pages/MemoDetail.tsx +++ b/web/src/pages/MemoDetail.tsx @@ -13,9 +13,9 @@ import useCurrentUser from "@/hooks/useCurrentUser"; import useNavigateTo from "@/hooks/useNavigateTo"; import useResponsiveWidth from "@/hooks/useResponsiveWidth"; import { cn } from "@/lib/utils"; +import { memoStore } from "@/store"; +import { workspaceStore } from "@/store"; import { memoNamePrefix } from "@/store/common"; -import { memoStore } from "@/store/v2"; -import { workspaceStore } from "@/store/v2"; import { Memo, MemoRelation_Type } from "@/types/proto/api/v1/memo_service"; import { useTranslate } from "@/utils/i18n"; diff --git a/web/src/pages/Setting.tsx b/web/src/pages/Setting.tsx index addf8eeb0..f16e0870e 100644 --- a/web/src/pages/Setting.tsx +++ b/web/src/pages/Setting.tsx @@ -14,8 +14,8 @@ import WorkspaceSection from "@/components/Settings/WorkspaceSection"; import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"; import useCurrentUser from "@/hooks/useCurrentUser"; import useResponsiveWidth from "@/hooks/useResponsiveWidth"; -import { workspaceStore } from "@/store/v2"; -import { WorkspaceSettingKey } from "@/store/v2/workspace"; +import { workspaceStore } from "@/store"; +import { WorkspaceSettingKey } from "@/store/workspace"; import { User_Role } from "@/types/proto/api/v1/user_service"; import { useTranslate } from "@/utils/i18n"; diff --git a/web/src/pages/SignIn.tsx b/web/src/pages/SignIn.tsx index 92b470ca3..76528ed8a 100644 --- a/web/src/pages/SignIn.tsx +++ b/web/src/pages/SignIn.tsx @@ -10,8 +10,8 @@ import { identityProviderServiceClient } from "@/grpcweb"; import { absolutifyLink } from "@/helpers/utils"; import useCurrentUser from "@/hooks/useCurrentUser"; import { Routes } from "@/router"; +import { workspaceStore } from "@/store"; import { extractIdentityProviderIdFromName } from "@/store/common"; -import { workspaceStore } from "@/store/v2"; import { IdentityProvider, IdentityProvider_Type } from "@/types/proto/api/v1/idp_service"; import { useTranslate } from "@/utils/i18n"; diff --git a/web/src/pages/SignUp.tsx b/web/src/pages/SignUp.tsx index 1f123b1ef..183147150 100644 --- a/web/src/pages/SignUp.tsx +++ b/web/src/pages/SignUp.tsx @@ -10,8 +10,8 @@ import { Input } from "@/components/ui/input"; import { authServiceClient, userServiceClient } from "@/grpcweb"; import useLoading from "@/hooks/useLoading"; import useNavigateTo from "@/hooks/useNavigateTo"; -import { workspaceStore } from "@/store/v2"; -import { initialUserStore } from "@/store/v2/user"; +import { workspaceStore } from "@/store"; +import { initialUserStore } from "@/store/user"; import { User, User_Role } from "@/types/proto/api/v1/user_service"; import { useTranslate } from "@/utils/i18n"; diff --git a/web/src/pages/UserProfile.tsx b/web/src/pages/UserProfile.tsx index 1d87e6958..c208f35b0 100644 --- a/web/src/pages/UserProfile.tsx +++ b/web/src/pages/UserProfile.tsx @@ -10,8 +10,8 @@ import PagedMemoList from "@/components/PagedMemoList"; import UserAvatar from "@/components/UserAvatar"; import { Button } from "@/components/ui/button"; import useLoading from "@/hooks/useLoading"; -import { viewStore, userStore } from "@/store/v2"; -import memoFilterStore from "@/store/v2/memoFilter"; +import { viewStore, userStore } from "@/store"; +import memoFilterStore from "@/store/memoFilter"; import { State } from "@/types/proto/api/v1/common"; import { Memo } from "@/types/proto/api/v1/memo_service"; import { User } from "@/types/proto/api/v1/user_service"; diff --git a/web/src/store/v2/attachment.ts b/web/src/store/attachment.ts similarity index 100% rename from web/src/store/v2/attachment.ts rename to web/src/store/attachment.ts diff --git a/web/src/store/v2/index.ts b/web/src/store/index.ts similarity index 100% rename from web/src/store/v2/index.ts rename to web/src/store/index.ts diff --git a/web/src/store/v2/memo.ts b/web/src/store/memo.ts similarity index 100% rename from web/src/store/v2/memo.ts rename to web/src/store/memo.ts diff --git a/web/src/store/v2/memoFilter.ts b/web/src/store/memoFilter.ts similarity index 100% rename from web/src/store/v2/memoFilter.ts rename to web/src/store/memoFilter.ts diff --git a/web/src/store/v2/user.ts b/web/src/store/user.ts similarity index 100% rename from web/src/store/v2/user.ts rename to web/src/store/user.ts diff --git a/web/src/store/v2/dialog.ts b/web/src/store/v2/dialog.ts deleted file mode 100644 index 8cc33b895..000000000 --- a/web/src/store/v2/dialog.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { last } from "lodash-es"; -import { makeAutoObservable, runInAction } from "mobx"; - -class LocalState { - stack: string[] = []; - - constructor() { - makeAutoObservable(this); - } - - setPartial(partial: Partial) { - Object.assign(this, partial); - } -} - -const dialogStore = (() => { - const state = new LocalState(); - - const pushDialog = (name: string) => { - runInAction(() => state.stack.push(name)); - }; - - const popDialog = () => runInAction(() => state.stack.pop()); - - const removeDialog = (name: string) => { - runInAction(() => (state.stack = state.stack.filter((n) => n !== name))); - }; - - const topDialog = last(state.stack); - - return { - state, - topDialog, - pushDialog, - popDialog, - removeDialog, - }; -})(); - -export default dialogStore; diff --git a/web/src/store/v2/view.ts b/web/src/store/view.ts similarity index 100% rename from web/src/store/v2/view.ts rename to web/src/store/view.ts diff --git a/web/src/store/v2/workspace.ts b/web/src/store/workspace.ts similarity index 98% rename from web/src/store/v2/workspace.ts rename to web/src/store/workspace.ts index d17ba8266..2fba97416 100644 --- a/web/src/store/v2/workspace.ts +++ b/web/src/store/workspace.ts @@ -4,7 +4,7 @@ import { workspaceServiceClient } from "@/grpcweb"; import { WorkspaceProfile } from "@/types/proto/api/v1/workspace_service"; import { WorkspaceGeneralSetting, WorkspaceMemoRelatedSetting, WorkspaceSetting } from "@/types/proto/api/v1/workspace_service"; import { isValidateLocale } from "@/utils/i18n"; -import { workspaceSettingNamePrefix } from "../common"; +import { workspaceSettingNamePrefix } from "./common"; export enum WorkspaceSettingKey { /** BASIC - BASIC is the key for basic settings. */