From 8649e562dc7d99b57b7bb9acf9cf777c857655d4 Mon Sep 17 00:00:00 2001 From: Steven Date: Sun, 7 Apr 2024 19:35:13 +0800 Subject: [PATCH] refactor: update imports --- frontend/web/src/App.tsx | 5 ++--- .../src/components/ChangePasswordDialog.tsx | 4 ++-- .../web/src/components/CollectionView.tsx | 4 +--- .../components/CreateAccessTokenDialog.tsx | 2 +- .../src/components/CreateCollectionDrawer.tsx | 6 ++---- .../src/components/CreateShortcutDrawer.tsx | 6 +++--- .../web/src/components/CreateUserDialog.tsx | 4 ++-- frontend/web/src/components/DemoBanner.tsx | 2 +- .../web/src/components/EditUserinfoDialog.tsx | 4 ++-- frontend/web/src/components/FilterView.tsx | 2 +- frontend/web/src/components/Header.tsx | 3 +-- .../components/ShortcutActionsDropdown.tsx | 3 +-- frontend/web/src/components/ShortcutCard.tsx | 3 +-- .../web/src/components/ShortcutsContainer.tsx | 2 +- .../web/src/components/ShortcutsNavigator.tsx | 3 +-- frontend/web/src/components/ViewSetting.tsx | 2 +- .../components/setting/AccessTokenSection.tsx | 2 +- .../src/components/setting/AccountSection.tsx | 2 +- .../src/components/setting/MemberSection.tsx | 2 +- .../components/setting/PreferenceSection.tsx | 2 +- .../components/setting/WorkspaceSection.tsx | 2 +- frontend/web/src/layouts/Root.tsx | 4 ++-- .../web/src/pages/CollectionDashboard.tsx | 3 +-- frontend/web/src/pages/CollectionSpace.tsx | 4 +--- frontend/web/src/pages/Home.tsx | 19 +++++++++---------- frontend/web/src/pages/ShortcutDetail.tsx | 3 +-- frontend/web/src/pages/ShortcutSpace.tsx | 3 +-- frontend/web/src/pages/SignIn.tsx | 3 +-- frontend/web/src/pages/SignUp.tsx | 3 +-- .../web/src/pages/SubscriptionSetting.tsx | 5 ++--- frontend/web/src/pages/WorkspaceSetting.tsx | 5 ++--- .../web/src/stores/{v1 => }/collection.ts | 0 frontend/web/src/stores/index.ts | 7 +++++++ frontend/web/src/stores/{v1 => }/shortcut.ts | 0 .../web/src/stores/{v1 => }/subscription.ts | 0 frontend/web/src/stores/{v1 => }/user.ts | 0 frontend/web/src/stores/{v1 => }/view.ts | 0 frontend/web/src/stores/{v1 => }/workspace.ts | 0 38 files changed, 56 insertions(+), 68 deletions(-) rename frontend/web/src/stores/{v1 => }/collection.ts (100%) create mode 100644 frontend/web/src/stores/index.ts rename frontend/web/src/stores/{v1 => }/shortcut.ts (100%) rename frontend/web/src/stores/{v1 => }/subscription.ts (100%) rename frontend/web/src/stores/{v1 => }/user.ts (100%) rename frontend/web/src/stores/{v1 => }/view.ts (100%) rename frontend/web/src/stores/{v1 => }/workspace.ts (100%) diff --git a/frontend/web/src/App.tsx b/frontend/web/src/App.tsx index 17b9bde..359cf68 100644 --- a/frontend/web/src/App.tsx +++ b/frontend/web/src/App.tsx @@ -1,9 +1,8 @@ import { useColorScheme } from "@mui/joy"; import { useEffect, useState } from "react"; import { Outlet } from "react-router-dom"; -import DemoBanner from "./components/DemoBanner"; -import useUserStore from "./stores/v1/user"; -import useWorkspaceStore from "./stores/v1/workspace"; +import DemoBanner from "@/components/DemoBanner"; +import { useUserStore, useWorkspaceStore } from "@/stores"; function App() { const { mode: colorScheme } = useColorScheme(); diff --git a/frontend/web/src/components/ChangePasswordDialog.tsx b/frontend/web/src/components/ChangePasswordDialog.tsx index 9d60d50..94d8074 100644 --- a/frontend/web/src/components/ChangePasswordDialog.tsx +++ b/frontend/web/src/components/ChangePasswordDialog.tsx @@ -2,8 +2,8 @@ import { Button, Input, Modal, ModalDialog } from "@mui/joy"; import { useState } from "react"; import { toast } from "react-hot-toast"; import { useTranslation } from "react-i18next"; -import useLoading from "../hooks/useLoading"; -import useUserStore from "../stores/v1/user"; +import useLoading from "@/hooks/useLoading"; +import { useUserStore } from "@/stores"; import Icon from "./Icon"; interface Props { diff --git a/frontend/web/src/components/CollectionView.tsx b/frontend/web/src/components/CollectionView.tsx index 37c9cde..6c27fd7 100644 --- a/frontend/web/src/components/CollectionView.tsx +++ b/frontend/web/src/components/CollectionView.tsx @@ -7,9 +7,7 @@ import { Link } from "react-router-dom"; import { absolutifyLink } from "@/helpers/utils"; import useNavigateTo from "@/hooks/useNavigateTo"; import useResponsiveWidth from "@/hooks/useResponsiveWidth"; -import useCollectionStore from "@/stores/v1/collection"; -import useShortcutStore from "@/stores/v1/shortcut"; -import useUserStore from "@/stores/v1/user"; +import { useCollectionStore, useShortcutStore, useUserStore } from "@/stores"; import { Collection } from "@/types/proto/api/v1/collection_service"; import { Shortcut } from "@/types/proto/api/v1/shortcut_service"; import { showCommonDialog } from "./Alert"; diff --git a/frontend/web/src/components/CreateAccessTokenDialog.tsx b/frontend/web/src/components/CreateAccessTokenDialog.tsx index 2052fac..8332c78 100644 --- a/frontend/web/src/components/CreateAccessTokenDialog.tsx +++ b/frontend/web/src/components/CreateAccessTokenDialog.tsx @@ -3,8 +3,8 @@ import { useState } from "react"; import { toast } from "react-hot-toast"; import { useTranslation } from "react-i18next"; import { userServiceClient } from "@/grpcweb"; +import { useUserStore } from "@/stores"; import useLoading from "../hooks/useLoading"; -import useUserStore from "../stores/v1/user"; import Icon from "./Icon"; interface Props { diff --git a/frontend/web/src/components/CreateCollectionDrawer.tsx b/frontend/web/src/components/CreateCollectionDrawer.tsx index 8737685..69b33ba 100644 --- a/frontend/web/src/components/CreateCollectionDrawer.tsx +++ b/frontend/web/src/components/CreateCollectionDrawer.tsx @@ -3,14 +3,12 @@ import { isUndefined } from "lodash-es"; import { useEffect, useState } from "react"; import { toast } from "react-hot-toast"; import { useTranslation } from "react-i18next"; -import useCollectionStore from "@/stores/v1/collection"; -import useShortcutStore from "@/stores/v1/shortcut"; -import useWorkspaceStore from "@/stores/v1/workspace"; +import useLoading from "@/hooks/useLoading"; +import { useCollectionStore, useShortcutStore, useWorkspaceStore } from "@/stores"; import { Collection } from "@/types/proto/api/v1/collection_service"; import { Visibility } from "@/types/proto/api/v1/common"; import { Shortcut } from "@/types/proto/api/v1/shortcut_service"; import { convertVisibilityFromPb } from "@/utils/visibility"; -import useLoading from "../hooks/useLoading"; import Icon from "./Icon"; import ShortcutView from "./ShortcutView"; diff --git a/frontend/web/src/components/CreateShortcutDrawer.tsx b/frontend/web/src/components/CreateShortcutDrawer.tsx index d5fbd99..d37732b 100644 --- a/frontend/web/src/components/CreateShortcutDrawer.tsx +++ b/frontend/web/src/components/CreateShortcutDrawer.tsx @@ -16,12 +16,12 @@ import { isUndefined, uniq } from "lodash-es"; import { useEffect, useState } from "react"; import { toast } from "react-hot-toast"; import { useTranslation } from "react-i18next"; -import useShortcutStore, { getShortcutUpdateMask } from "@/stores/v1/shortcut"; -import useWorkspaceStore from "@/stores/v1/workspace"; +import useLoading from "@/hooks/useLoading"; +import { useWorkspaceStore, useShortcutStore } from "@/stores"; +import { getShortcutUpdateMask } from "@/stores/shortcut"; import { Visibility } from "@/types/proto/api/v1/common"; import { Shortcut } from "@/types/proto/api/v1/shortcut_service"; import { convertVisibilityFromPb } from "@/utils/visibility"; -import useLoading from "../hooks/useLoading"; import Icon from "./Icon"; interface Props { diff --git a/frontend/web/src/components/CreateUserDialog.tsx b/frontend/web/src/components/CreateUserDialog.tsx index 80f7a85..20ea945 100644 --- a/frontend/web/src/components/CreateUserDialog.tsx +++ b/frontend/web/src/components/CreateUserDialog.tsx @@ -3,9 +3,9 @@ import { isUndefined } from "lodash-es"; import { useEffect, useState } from "react"; import { toast } from "react-hot-toast"; import { useTranslation } from "react-i18next"; +import useLoading from "@/hooks/useLoading"; +import { useUserStore } from "@/stores"; import { Role, User } from "@/types/proto/api/v1/user_service"; -import useLoading from "../hooks/useLoading"; -import useUserStore from "../stores/v1/user"; import Icon from "./Icon"; interface Props { diff --git a/frontend/web/src/components/DemoBanner.tsx b/frontend/web/src/components/DemoBanner.tsx index 0290510..407fd25 100644 --- a/frontend/web/src/components/DemoBanner.tsx +++ b/frontend/web/src/components/DemoBanner.tsx @@ -1,4 +1,4 @@ -import useWorkspaceStore from "@/stores/v1/workspace"; +import { useWorkspaceStore } from "@/stores"; import Icon from "./Icon"; const DemoBanner: React.FC = () => { diff --git a/frontend/web/src/components/EditUserinfoDialog.tsx b/frontend/web/src/components/EditUserinfoDialog.tsx index 71d1a4e..7d81a83 100644 --- a/frontend/web/src/components/EditUserinfoDialog.tsx +++ b/frontend/web/src/components/EditUserinfoDialog.tsx @@ -2,8 +2,8 @@ import { Button, Input, Modal, ModalDialog } from "@mui/joy"; import { useState } from "react"; import { toast } from "react-hot-toast"; import { useTranslation } from "react-i18next"; -import useLoading from "../hooks/useLoading"; -import useUserStore from "../stores/v1/user"; +import useLoading from "@/hooks/useLoading"; +import { useUserStore } from "@/stores"; import Icon from "./Icon"; interface Props { diff --git a/frontend/web/src/components/FilterView.tsx b/frontend/web/src/components/FilterView.tsx index c5d15dd..69e8d68 100644 --- a/frontend/web/src/components/FilterView.tsx +++ b/frontend/web/src/components/FilterView.tsx @@ -1,6 +1,6 @@ import { useTranslation } from "react-i18next"; +import { useViewStore } from "@/stores"; import { convertVisibilityFromPb } from "@/utils/visibility"; -import useViewStore from "../stores/v1/view"; import Icon from "./Icon"; import VisibilityIcon from "./VisibilityIcon"; diff --git a/frontend/web/src/components/Header.tsx b/frontend/web/src/components/Header.tsx index 8f1bff5..992db08 100644 --- a/frontend/web/src/components/Header.tsx +++ b/frontend/web/src/components/Header.tsx @@ -3,10 +3,9 @@ import { useState } from "react"; import { useTranslation } from "react-i18next"; import { Link, useLocation } from "react-router-dom"; import { authServiceClient } from "@/grpcweb"; -import useWorkspaceStore from "@/stores/v1/workspace"; +import { useWorkspaceStore, useUserStore } from "@/stores"; import { PlanType } from "@/types/proto/api/v1/subscription_service"; import { Role } from "@/types/proto/api/v1/user_service"; -import useUserStore from "../stores/v1/user"; import AboutDialog from "./AboutDialog"; import Icon from "./Icon"; import Dropdown from "./common/Dropdown"; diff --git a/frontend/web/src/components/ShortcutActionsDropdown.tsx b/frontend/web/src/components/ShortcutActionsDropdown.tsx index 7b57aff..b36aec4 100644 --- a/frontend/web/src/components/ShortcutActionsDropdown.tsx +++ b/frontend/web/src/components/ShortcutActionsDropdown.tsx @@ -1,10 +1,9 @@ import { useState } from "react"; import { useTranslation } from "react-i18next"; import useNavigateTo from "@/hooks/useNavigateTo"; -import useShortcutStore from "@/stores/v1/shortcut"; +import { useShortcutStore, useUserStore } from "@/stores"; import { Shortcut } from "@/types/proto/api/v1/shortcut_service"; import { Role } from "@/types/proto/api/v1/user_service"; -import useUserStore from "../stores/v1/user"; import { showCommonDialog } from "./Alert"; import CreateShortcutDrawer from "./CreateShortcutDrawer"; import GenerateQRCodeDialog from "./GenerateQRCodeDialog"; diff --git a/frontend/web/src/components/ShortcutCard.tsx b/frontend/web/src/components/ShortcutCard.tsx index b84fd64..fe0cbdd 100644 --- a/frontend/web/src/components/ShortcutCard.tsx +++ b/frontend/web/src/components/ShortcutCard.tsx @@ -5,11 +5,10 @@ import { useEffect } from "react"; import toast from "react-hot-toast"; import { useTranslation } from "react-i18next"; import { Link } from "react-router-dom"; -import useUserStore from "@/stores/v1/user"; +import { useUserStore, useViewStore } from "@/stores"; import { Shortcut } from "@/types/proto/api/v1/shortcut_service"; import { convertVisibilityFromPb } from "@/utils/visibility"; import { absolutifyLink, getFaviconWithGoogleS2 } from "../helpers/utils"; -import useViewStore from "../stores/v1/view"; import Icon from "./Icon"; import ShortcutActionsDropdown from "./ShortcutActionsDropdown"; import VisibilityIcon from "./VisibilityIcon"; diff --git a/frontend/web/src/components/ShortcutsContainer.tsx b/frontend/web/src/components/ShortcutsContainer.tsx index ebbeeec..315d104 100644 --- a/frontend/web/src/components/ShortcutsContainer.tsx +++ b/frontend/web/src/components/ShortcutsContainer.tsx @@ -1,7 +1,7 @@ import classNames from "classnames"; import useNavigateTo from "@/hooks/useNavigateTo"; +import { useViewStore } from "@/stores"; import { Shortcut } from "@/types/proto/api/v1/shortcut_service"; -import useViewStore from "../stores/v1/view"; import ShortcutCard from "./ShortcutCard"; import ShortcutView from "./ShortcutView"; diff --git a/frontend/web/src/components/ShortcutsNavigator.tsx b/frontend/web/src/components/ShortcutsNavigator.tsx index 27986f5..ec15a17 100644 --- a/frontend/web/src/components/ShortcutsNavigator.tsx +++ b/frontend/web/src/components/ShortcutsNavigator.tsx @@ -1,7 +1,6 @@ import classNames from "classnames"; import { useTranslation } from "react-i18next"; -import useShortcutStore from "@/stores/v1/shortcut"; -import useViewStore from "../stores/v1/view"; +import { useShortcutStore, useViewStore } from "@/stores"; import Icon from "./Icon"; const ShortcutsNavigator = () => { diff --git a/frontend/web/src/components/ViewSetting.tsx b/frontend/web/src/components/ViewSetting.tsx index c4144d9..444fdb8 100644 --- a/frontend/web/src/components/ViewSetting.tsx +++ b/frontend/web/src/components/ViewSetting.tsx @@ -1,6 +1,6 @@ import { Divider, Option, Select, Switch } from "@mui/joy"; import { useTranslation } from "react-i18next"; -import useViewStore from "../stores/v1/view"; +import { useViewStore } from "@/stores"; import Icon from "./Icon"; import Dropdown from "./common/Dropdown"; diff --git a/frontend/web/src/components/setting/AccessTokenSection.tsx b/frontend/web/src/components/setting/AccessTokenSection.tsx index 47075dd..ec822d3 100644 --- a/frontend/web/src/components/setting/AccessTokenSection.tsx +++ b/frontend/web/src/components/setting/AccessTokenSection.tsx @@ -4,8 +4,8 @@ import { useEffect, useState } from "react"; import { toast } from "react-hot-toast"; import { useTranslation } from "react-i18next"; import { userServiceClient } from "@/grpcweb"; +import { useUserStore } from "@/stores"; import { UserAccessToken } from "@/types/proto/api/v1/user_service"; -import useUserStore from "../../stores/v1/user"; import { showCommonDialog } from "../Alert"; import CreateAccessTokenDialog from "../CreateAccessTokenDialog"; import Icon from "../Icon"; diff --git a/frontend/web/src/components/setting/AccountSection.tsx b/frontend/web/src/components/setting/AccountSection.tsx index baa0a65..a2c9921 100644 --- a/frontend/web/src/components/setting/AccountSection.tsx +++ b/frontend/web/src/components/setting/AccountSection.tsx @@ -1,8 +1,8 @@ import { Button } from "@mui/joy"; import { useState } from "react"; import { useTranslation } from "react-i18next"; +import { useUserStore } from "@/stores"; import { Role } from "@/types/proto/api/v1/user_service"; -import useUserStore from "../../stores/v1/user"; import ChangePasswordDialog from "../ChangePasswordDialog"; import EditUserinfoDialog from "../EditUserinfoDialog"; diff --git a/frontend/web/src/components/setting/MemberSection.tsx b/frontend/web/src/components/setting/MemberSection.tsx index 7a28495..a4b077f 100644 --- a/frontend/web/src/components/setting/MemberSection.tsx +++ b/frontend/web/src/components/setting/MemberSection.tsx @@ -2,9 +2,9 @@ import { Button, IconButton } from "@mui/joy"; import { useEffect, useState } from "react"; import toast from "react-hot-toast"; import { useTranslation } from "react-i18next"; +import { useUserStore } from "@/stores"; import { User } from "@/types/proto/api/v1/user_service"; import { convertRoleFromPb } from "@/utils/user"; -import useUserStore from "../../stores/v1/user"; import { showCommonDialog } from "../Alert"; import CreateUserDialog from "../CreateUserDialog"; import Icon from "../Icon"; diff --git a/frontend/web/src/components/setting/PreferenceSection.tsx b/frontend/web/src/components/setting/PreferenceSection.tsx index 982837a..4990a3f 100644 --- a/frontend/web/src/components/setting/PreferenceSection.tsx +++ b/frontend/web/src/components/setting/PreferenceSection.tsx @@ -1,7 +1,7 @@ import { Option, Select } from "@mui/joy"; import { useTranslation } from "react-i18next"; +import { useUserStore } from "@/stores"; import { UserSetting, UserSetting_ColorTheme, UserSetting_Locale } from "@/types/proto/api/v1/user_setting_service"; -import useUserStore from "../../stores/v1/user"; import BetaBadge from "../BetaBadge"; const PreferenceSection: React.FC = () => { diff --git a/frontend/web/src/components/setting/WorkspaceSection.tsx b/frontend/web/src/components/setting/WorkspaceSection.tsx index 5b699ca..299a9a2 100644 --- a/frontend/web/src/components/setting/WorkspaceSection.tsx +++ b/frontend/web/src/components/setting/WorkspaceSection.tsx @@ -4,7 +4,7 @@ import { useRef, useState } from "react"; import toast from "react-hot-toast"; import { useTranslation } from "react-i18next"; import { workspaceServiceClient } from "@/grpcweb"; -import useWorkspaceStore from "@/stores/v1/workspace"; +import { useWorkspaceStore } from "@/stores"; import { Visibility } from "@/types/proto/api/v1/common"; import { WorkspaceSetting } from "@/types/proto/api/v1/workspace_service"; diff --git a/frontend/web/src/layouts/Root.tsx b/frontend/web/src/layouts/Root.tsx index fc2e916..2e3955b 100644 --- a/frontend/web/src/layouts/Root.tsx +++ b/frontend/web/src/layouts/Root.tsx @@ -3,11 +3,11 @@ import { isEqual } from "lodash-es"; import { useEffect } from "react"; import { useTranslation } from "react-i18next"; import { Outlet } from "react-router-dom"; +import Header from "@/components/Header"; import Navigator from "@/components/Navigator"; import useNavigateTo from "@/hooks/useNavigateTo"; +import { useUserStore } from "@/stores"; import { UserSetting_ColorTheme, UserSetting_Locale } from "@/types/proto/api/v1/user_setting_service"; -import Header from "../components/Header"; -import useUserStore from "../stores/v1/user"; const Root: React.FC = () => { const navigateTo = useNavigateTo(); diff --git a/frontend/web/src/pages/CollectionDashboard.tsx b/frontend/web/src/pages/CollectionDashboard.tsx index ba62274..6bec356 100644 --- a/frontend/web/src/pages/CollectionDashboard.tsx +++ b/frontend/web/src/pages/CollectionDashboard.tsx @@ -3,8 +3,7 @@ import { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; import CollectionView from "@/components/CollectionView"; import CreateCollectionDrawer from "@/components/CreateCollectionDrawer"; -import useCollectionStore from "@/stores/v1/collection"; -import useShortcutStore from "@/stores/v1/shortcut"; +import { useShortcutStore, useCollectionStore } from "@/stores"; import FilterView from "../components/FilterView"; import Icon from "../components/Icon"; import useLoading from "../hooks/useLoading"; diff --git a/frontend/web/src/pages/CollectionSpace.tsx b/frontend/web/src/pages/CollectionSpace.tsx index 60a496e..5e8b700 100644 --- a/frontend/web/src/pages/CollectionSpace.tsx +++ b/frontend/web/src/pages/CollectionSpace.tsx @@ -7,9 +7,7 @@ import Icon from "@/components/Icon"; import ShortcutFrame from "@/components/ShortcutFrame"; import ShortcutView from "@/components/ShortcutView"; import useResponsiveWidth from "@/hooks/useResponsiveWidth"; -import useCollectionStore from "@/stores/v1/collection"; -import useShortcutStore from "@/stores/v1/shortcut"; -import useUserStore from "@/stores/v1/user"; +import { useUserStore, useCollectionStore, useShortcutStore } from "@/stores"; import { Collection } from "@/types/proto/api/v1/collection_service"; import { Shortcut } from "@/types/proto/api/v1/shortcut_service"; diff --git a/frontend/web/src/pages/Home.tsx b/frontend/web/src/pages/Home.tsx index 9e2cd30..9fd61df 100644 --- a/frontend/web/src/pages/Home.tsx +++ b/frontend/web/src/pages/Home.tsx @@ -1,16 +1,15 @@ import { Button, Input } from "@mui/joy"; import { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; -import useShortcutStore from "@/stores/v1/shortcut"; -import CreateShortcutDrawer from "../components/CreateShortcutDrawer"; -import FilterView from "../components/FilterView"; -import Icon from "../components/Icon"; -import ShortcutsContainer from "../components/ShortcutsContainer"; -import ShortcutsNavigator from "../components/ShortcutsNavigator"; -import ViewSetting from "../components/ViewSetting"; -import useLoading from "../hooks/useLoading"; -import useUserStore from "../stores/v1/user"; -import useViewStore, { getFilteredShortcutList, getOrderedShortcutList } from "../stores/v1/view"; +import CreateShortcutDrawer from "@/components/CreateShortcutDrawer"; +import FilterView from "@/components/FilterView"; +import Icon from "@/components/Icon"; +import ShortcutsContainer from "@/components/ShortcutsContainer"; +import ShortcutsNavigator from "@/components/ShortcutsNavigator"; +import ViewSetting from "@/components/ViewSetting"; +import useLoading from "@/hooks/useLoading"; +import { useShortcutStore, useUserStore, useViewStore } from "@/stores"; +import { getFilteredShortcutList, getOrderedShortcutList } from "@/stores/view"; interface State { showCreateShortcutDrawer: boolean; diff --git a/frontend/web/src/pages/ShortcutDetail.tsx b/frontend/web/src/pages/ShortcutDetail.tsx index d55a6f2..a54f583 100644 --- a/frontend/web/src/pages/ShortcutDetail.tsx +++ b/frontend/web/src/pages/ShortcutDetail.tsx @@ -7,7 +7,7 @@ import { useTranslation } from "react-i18next"; import { useParams } from "react-router-dom"; import useLoading from "@/hooks/useLoading"; import useNavigateTo from "@/hooks/useNavigateTo"; -import useShortcutStore from "@/stores/v1/shortcut"; +import { useUserStore, useShortcutStore } from "@/stores"; import { Shortcut } from "@/types/proto/api/v1/shortcut_service"; import { Role } from "@/types/proto/api/v1/user_service"; import { convertVisibilityFromPb } from "@/utils/visibility"; @@ -19,7 +19,6 @@ import Icon from "../components/Icon"; import VisibilityIcon from "../components/VisibilityIcon"; import Dropdown from "../components/common/Dropdown"; import { absolutifyLink, getFaviconWithGoogleS2 } from "../helpers/utils"; -import useUserStore from "../stores/v1/user"; interface State { showEditDrawer: boolean; diff --git a/frontend/web/src/pages/ShortcutSpace.tsx b/frontend/web/src/pages/ShortcutSpace.tsx index 9a86cb0..a79b4c8 100644 --- a/frontend/web/src/pages/ShortcutSpace.tsx +++ b/frontend/web/src/pages/ShortcutSpace.tsx @@ -5,8 +5,7 @@ import { useParams } from "react-router-dom"; import CreateShortcutDrawer from "@/components/CreateShortcutDrawer"; import { isURL } from "@/helpers/utils"; import useNavigateTo from "@/hooks/useNavigateTo"; -import useShortcutStore from "@/stores/v1/shortcut"; -import useUserStore from "@/stores/v1/user"; +import { useShortcutStore, useUserStore } from "@/stores"; import { Shortcut } from "@/types/proto/api/v1/shortcut_service"; const ShortcutSpace = () => { diff --git a/frontend/web/src/pages/SignIn.tsx b/frontend/web/src/pages/SignIn.tsx index 392b086..a1bde5a 100644 --- a/frontend/web/src/pages/SignIn.tsx +++ b/frontend/web/src/pages/SignIn.tsx @@ -6,8 +6,7 @@ import { Link } from "react-router-dom"; import Icon from "@/components/Icon"; import { authServiceClient } from "@/grpcweb"; import useNavigateTo from "@/hooks/useNavigateTo"; -import useUserStore from "@/stores/v1/user"; -import useWorkspaceStore from "@/stores/v1/workspace"; +import { useUserStore, useWorkspaceStore } from "@/stores"; import useLoading from "../hooks/useLoading"; const SignIn: React.FC = () => { diff --git a/frontend/web/src/pages/SignUp.tsx b/frontend/web/src/pages/SignUp.tsx index c14b075..4a95254 100644 --- a/frontend/web/src/pages/SignUp.tsx +++ b/frontend/web/src/pages/SignUp.tsx @@ -6,8 +6,7 @@ import { Link } from "react-router-dom"; import Icon from "@/components/Icon"; import { authServiceClient } from "@/grpcweb"; import useNavigateTo from "@/hooks/useNavigateTo"; -import useUserStore from "@/stores/v1/user"; -import useWorkspaceStore from "@/stores/v1/workspace"; +import { useUserStore, useWorkspaceStore } from "@/stores"; import useLoading from "../hooks/useLoading"; const SignUp: React.FC = () => { diff --git a/frontend/web/src/pages/SubscriptionSetting.tsx b/frontend/web/src/pages/SubscriptionSetting.tsx index 3bf23bf..d5e3967 100644 --- a/frontend/web/src/pages/SubscriptionSetting.tsx +++ b/frontend/web/src/pages/SubscriptionSetting.tsx @@ -4,11 +4,10 @@ import toast from "react-hot-toast"; import Icon from "@/components/Icon"; import SubscriptionFAQ from "@/components/SubscriptionFAQ"; import { subscriptionServiceClient } from "@/grpcweb"; -import { stringifyPlanType } from "@/stores/v1/subscription"; -import useWorkspaceStore from "@/stores/v1/workspace"; +import { useUserStore, useWorkspaceStore } from "@/stores"; +import { stringifyPlanType } from "@/stores/subscription"; import { PlanType } from "@/types/proto/api/v1/subscription_service"; import { Role } from "@/types/proto/api/v1/user_service"; -import useUserStore from "../stores/v1/user"; const SubscriptionSetting: React.FC = () => { const workspaceStore = useWorkspaceStore(); diff --git a/frontend/web/src/pages/WorkspaceSetting.tsx b/frontend/web/src/pages/WorkspaceSetting.tsx index b7bb728..a5ed3b2 100644 --- a/frontend/web/src/pages/WorkspaceSetting.tsx +++ b/frontend/web/src/pages/WorkspaceSetting.tsx @@ -2,12 +2,11 @@ import { Alert, Button } from "@mui/joy"; import { useEffect } from "react"; import { Link } from "react-router-dom"; import Icon from "@/components/Icon"; -import { stringifyPlanType } from "@/stores/v1/subscription"; -import useWorkspaceStore from "@/stores/v1/workspace"; +import { useUserStore, useWorkspaceStore } from "@/stores"; +import { stringifyPlanType } from "@/stores/subscription"; import { Role } from "@/types/proto/api/v1/user_service"; import MemberSection from "../components/setting/MemberSection"; import WorkspaceSection from "../components/setting/WorkspaceSection"; -import useUserStore from "../stores/v1/user"; const WorkspaceSetting: React.FC = () => { const workspaceStore = useWorkspaceStore(); diff --git a/frontend/web/src/stores/v1/collection.ts b/frontend/web/src/stores/collection.ts similarity index 100% rename from frontend/web/src/stores/v1/collection.ts rename to frontend/web/src/stores/collection.ts diff --git a/frontend/web/src/stores/index.ts b/frontend/web/src/stores/index.ts new file mode 100644 index 0000000..36638fa --- /dev/null +++ b/frontend/web/src/stores/index.ts @@ -0,0 +1,7 @@ +import useCollectionStore from "./collection"; +import useShortcutStore from "./shortcut"; +import useUserStore from "./user"; +import useViewStore from "./view"; +import useWorkspaceStore from "./workspace"; + +export { useUserStore, useCollectionStore, useShortcutStore, useViewStore, useWorkspaceStore }; diff --git a/frontend/web/src/stores/v1/shortcut.ts b/frontend/web/src/stores/shortcut.ts similarity index 100% rename from frontend/web/src/stores/v1/shortcut.ts rename to frontend/web/src/stores/shortcut.ts diff --git a/frontend/web/src/stores/v1/subscription.ts b/frontend/web/src/stores/subscription.ts similarity index 100% rename from frontend/web/src/stores/v1/subscription.ts rename to frontend/web/src/stores/subscription.ts diff --git a/frontend/web/src/stores/v1/user.ts b/frontend/web/src/stores/user.ts similarity index 100% rename from frontend/web/src/stores/v1/user.ts rename to frontend/web/src/stores/user.ts diff --git a/frontend/web/src/stores/v1/view.ts b/frontend/web/src/stores/view.ts similarity index 100% rename from frontend/web/src/stores/v1/view.ts rename to frontend/web/src/stores/view.ts diff --git a/frontend/web/src/stores/v1/workspace.ts b/frontend/web/src/stores/workspace.ts similarity index 100% rename from frontend/web/src/stores/v1/workspace.ts rename to frontend/web/src/stores/workspace.ts