YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-06-05 22:09:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove v1 prefix in store name

Browse Source
This commit is contained in:
Steven
2023-12-23 08:48:11 +08:00
parent df3303dcd3
commit df5aeb6d88
26 changed files with 132 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/src/components/ChangeMemberPasswordDialog.tsx
View File

@ -1,6 +1,6 @@
import { useEffect, useState } from "react";
import { toast } from "react-hot-toast";
import { useUserV1Store } from "@/store/v1";
import { useUserStore } from "@/store/v1";
import { User } from "@/types/proto/api/v2/user_service";
import { useTranslate } from "@/utils/i18n";
import { generateDialog } from "./Dialog";
@ -13,7 +13,7 @@ interface Props extends DialogProps {
const ChangeMemberPasswordDialog: React.FC<Props> = (props: Props) => {
const { user, destroy } = props;
const t = useTranslate();
const userV1Store = useUserV1Store();
const userStore = useUserStore();
const [newPassword, setNewPassword] = useState("");
const [newPasswordAgain, setNewPasswordAgain] = useState("");
@ -48,7 +48,7 @@ const ChangeMemberPasswordDialog: React.FC<Props> = (props: Props) => {
}
try {
await userV1Store.updateUser(
await userStore.updateUser(
{
name: user.name,
password: newPassword,

4
web/src/components/ChangeMemoCreatedTsDialog.tsx
View File

@ -2,7 +2,7 @@ import { Button } from "@mui/joy";
import { useEffect, useState } from "react";
import { toast } from "react-hot-toast";
import { getNormalizedTimeString, getUnixTime } from "@/helpers/datetime";
import { useMemoV1Store } from "@/store/v1";
import { useMemoStore } from "@/store/v1";
import { useTranslate } from "@/utils/i18n";
import { generateDialog } from "./Dialog";
import Icon from "./Icon";
@ -14,7 +14,7 @@ interface Props extends DialogProps {
const ChangeMemoCreatedTsDialog: React.FC<Props> = (props: Props) => {
const t = useTranslate();
const { destroy, memoId } = props;
const memoStore = useMemoV1Store();
const memoStore = useMemoStore();
const [createdAt, setCreatedAt] = useState("");
const maxDatetimeValue = getNormalizedTimeString();

6
web/src/components/ChangePasswordDialog.tsx
View File

@ -2,7 +2,7 @@ import { useEffect, useState } from "react";
import { toast } from "react-hot-toast";
import useCurrentUser from "@/hooks/useCurrentUser";
import { useGlobalStore } from "@/store/module";
import { useUserV1Store } from "@/store/v1";
import { useUserStore } from "@/store/v1";
import { useTranslate } from "@/utils/i18n";
import { generateDialog } from "./Dialog";
import Icon from "./Icon";
@ -12,7 +12,7 @@ type Props = DialogProps;
const ChangePasswordDialog: React.FC<Props> = ({ destroy }: Props) => {
const t = useTranslate();
const currentUser = useCurrentUser();
const userV1Store = useUserV1Store();
const userStore = useUserStore();
const globalStore = useGlobalStore();
const profile = globalStore.state.systemStatus.profile;
const [newPassword, setNewPassword] = useState("");
@ -52,7 +52,7 @@ const ChangePasswordDialog: React.FC<Props> = ({ destroy }: Props) => {
}
try {
await userV1Store.updateUser(
await userStore.updateUser(
{
name: currentUser.name,
password: newPassword,

4
web/src/components/MemoEditor/RelationListView.tsx
View File

@ -1,5 +1,5 @@
import { useEffect, useState } from "react";
import { useMemoV1Store } from "@/store/v1";
import { useMemoStore } from "@/store/v1";
import { MemoRelation, MemoRelation_Type } from "@/types/proto/api/v2/memo_relation_service";
import { Memo } from "@/types/proto/api/v2/memo_service";
import Icon from "../Icon";
@ -11,7 +11,7 @@ interface Props {
const RelationListView = (props: Props) => {
const { relationList, setRelationList } = props;
const memoStore = useMemoV1Store();
const memoStore = useMemoStore();
const [referencingMemoList, setReferencingMemoList] = useState<Memo[]>([]);
useEffect(() => {

8
web/src/components/MemoEditor/index.tsx
View File

@ -7,7 +7,7 @@ import useLocalStorage from "react-use/lib/useLocalStorage";
import { memoServiceClient } from "@/grpcweb";
import { TAB_SPACE_WIDTH, UNKNOWN_ID } from "@/helpers/consts";
import { useGlobalStore, useResourceStore } from "@/store/module";
import { useMemoV1Store, useUserV1Store } from "@/store/v1";
import { useMemoStore, useUserStore } from "@/store/v1";
import { MemoRelation, MemoRelation_Type } from "@/types/proto/api/v2/memo_relation_service";
import { Visibility } from "@/types/proto/api/v2/memo_service";
import { Resource } from "@/types/proto/api/v2/resource_service";
@ -49,8 +49,8 @@ const MemoEditor = (props: Props) => {
const {
state: { systemStatus },
} = useGlobalStore();
const userV1Store = useUserV1Store();
const memoStore = useMemoV1Store();
const userStore = useUserStore();
const memoStore = useMemoStore();
const resourceStore = useResourceStore();
const [state, setState] = useState<State>({
memoVisibility: Visibility.PRIVATE,
@ -61,7 +61,7 @@ const MemoEditor = (props: Props) => {
});
const [hasContent, setHasContent] = useState<boolean>(false);
const editorRef = useRef<EditorRefActions>(null);
const userSetting = userV1Store.userSetting as UserSetting;
const userSetting = userStore.userSetting as UserSetting;
const referenceRelations = memoId
? state.relationList.filter(
(relation) => relation.memoId === memoId && relation.relatedMemoId !== memoId && relation.type === MemoRelation_Type.REFERENCE

4
web/src/components/MemoRelationListView.tsx
View File

@ -1,7 +1,7 @@
import { Tooltip } from "@mui/joy";
import { useEffect, useState } from "react";
import { Link } from "react-router-dom";
import { useMemoV1Store } from "@/store/v1";
import { useMemoStore } from "@/store/v1";
import { MemoRelation } from "@/types/proto/api/v2/memo_relation_service";
import { Memo } from "@/types/proto/api/v2/memo_service";
import Icon from "./Icon";
@ -13,7 +13,7 @@ interface Props {
const MemoRelationListView = (props: Props) => {
const { memo, relationList } = props;
const memoStore = useMemoV1Store();
const memoStore = useMemoStore();
const [referencingMemoList, setReferencingMemoList] = useState<Memo[]>([]);
const [referencedMemoList, setReferencedMemoList] = useState<Memo[]>([]);

10
web/src/components/MemoView.tsx
View File

@ -8,7 +8,7 @@ import { getRelativeTimeString, getTimeStampByDate } from "@/helpers/datetime";
import useCurrentUser from "@/hooks/useCurrentUser";
import useNavigateTo from "@/hooks/useNavigateTo";
import { useFilterStore } from "@/store/module";
import { useUserV1Store, extractUsernameFromName, useMemoV1Store } from "@/store/v1";
import { useUserStore, extractUsernameFromName, useMemoStore } from "@/store/v1";
import { RowStatus } from "@/types/proto/api/v2/common";
import { MemoRelation_Type } from "@/types/proto/api/v2/memo_relation_service";
import { Memo, Visibility } from "@/types/proto/api/v2/memo_service";
@ -42,12 +42,12 @@ const MemoView: React.FC<Props> = (props: Props) => {
const navigateTo = useNavigateTo();
const { i18n } = useTranslation();
const filterStore = useFilterStore();
const memoStore = useMemoV1Store();
const userV1Store = useUserV1Store();
const memoStore = useMemoStore();
const userStore = useUserStore();
const user = useCurrentUser();
const [shouldRender, setShouldRender] = useState<boolean>(lazyRendering ? false : true);
const [displayTime, setDisplayTime] = useState<string>(getRelativeTimeString(getTimeStampByDate(memo.displayTime)));
const [creator, setCreator] = useState(userV1Store.getUserByUsername(extractUsernameFromName(memo.creator)));
const [creator, setCreator] = useState(userStore.getUserByUsername(extractUsernameFromName(memo.creator)));
const [parentMemo, setParentMemo] = useState<Memo | undefined>(undefined);
const memoContainerRef = useRef<HTMLDivElement>(null);
const referenceRelations = memo.relations.filter((relation) => relation.type === MemoRelation_Type.REFERENCE);
@ -58,7 +58,7 @@ const MemoView: React.FC<Props> = (props: Props) => {
if (creator) return;
(async () => {
const user = await userV1Store.getOrFetchUserByUsername(extractUsernameFromName(memo.creator));
const user = await userStore.getOrFetchUserByUsername(extractUsernameFromName(memo.creator));
setCreator(user);
})();
}, [memo.creator]);

8
web/src/components/Settings/MemberSection.tsx
View File

@ -3,7 +3,7 @@ import React, { useEffect, useState } from "react";
import { toast } from "react-hot-toast";
import { userServiceClient } from "@/grpcweb";
import useCurrentUser from "@/hooks/useCurrentUser";
import { UserNamePrefix, extractUsernameFromName, useUserV1Store } from "@/store/v1";
import { UserNamePrefix, extractUsernameFromName, useUserStore } from "@/store/v1";
import { RowStatus } from "@/types/proto/api/v2/common";
import { User, User_Role } from "@/types/proto/api/v2/user_service";
import { useTranslate } from "@/utils/i18n";
@ -19,7 +19,7 @@ interface State {
const MemberSection = () => {
const t = useTranslate();
const currentUser = useCurrentUser();
const userV1Store = useUserV1Store();
const userStore = useUserStore();
const [state, setState] = useState<State>({
createUserUsername: "",
createUserPassword: "",
@ -31,7 +31,7 @@ const MemberSection = () => {
}, []);
const fetchUserList = async () => {
const users = await userV1Store.fetchUsers();
const users = await userStore.fetchUsers();
setUserList(users);
};
@ -114,7 +114,7 @@ const MemberSection = () => {
style: "danger",
dialogName: "delete-user-dialog",
onConfirm: async () => {
await userV1Store.deleteUser(user.name);
await userStore.deleteUser(user.name);
fetchUserList();
},
});

14
web/src/components/Settings/PreferencesSection.tsx
View File

@ -3,7 +3,7 @@ import { useState } from "react";
import { toast } from "react-hot-toast";
import { Link } from "react-router-dom";
import { useGlobalStore } from "@/store/module";
import { useUserV1Store } from "@/store/v1";
import { useUserStore } from "@/store/v1";
import { Visibility } from "@/types/proto/api/v2/memo_service";
import { UserSetting } from "@/types/proto/api/v2/user_service";
import { useTranslate } from "@/utils/i18n";
@ -18,13 +18,13 @@ import "@/less/settings/preferences-section.less";
const PreferencesSection = () => {
const t = useTranslate();
const globalStore = useGlobalStore();
const userV1Store = useUserV1Store();
const userStore = useUserStore();
const { appearance, locale } = globalStore.state;
const setting = userV1Store.userSetting as UserSetting;
const setting = userStore.userSetting as UserSetting;
const [telegramUserId, setTelegramUserId] = useState<string>(setting.telegramUserId);
const handleLocaleSelectChange = async (locale: Locale) => {
await userV1Store.updateUserSetting(
await userStore.updateUserSetting(
{
locale,
},
@ -34,7 +34,7 @@ const PreferencesSection = () => {
};
const handleAppearanceSelectChange = async (appearance: Appearance) => {
await userV1Store.updateUserSetting(
await userStore.updateUserSetting(
{
appearance,
},
@ -44,7 +44,7 @@ const PreferencesSection = () => {
};
const handleDefaultMemoVisibilityChanged = async (value: string) => {
await userV1Store.updateUserSetting(
await userStore.updateUserSetting(
{
memoVisibility: value,
},
@ -54,7 +54,7 @@ const PreferencesSection = () => {
const handleSaveTelegramUserId = async () => {
try {
await userV1Store.updateUserSetting(
await userStore.updateUserSetting(
{
telegramUserId: telegramUserId,
},

8
web/src/components/ShareMemoDialog.tsx
View File

@ -5,7 +5,7 @@ import { toast } from "react-hot-toast";
import { getDateTimeString, getTimeString } from "@/helpers/datetime";
import useLoading from "@/hooks/useLoading";
import toImage from "@/labs/html2image";
import { useUserV1Store, extractUsernameFromName } from "@/store/v1";
import { useUserStore, extractUsernameFromName } from "@/store/v1";
import { Memo } from "@/types/proto/api/v2/memo_service";
import { useTranslate } from "@/utils/i18n";
import { generateDialog } from "./Dialog";
@ -22,15 +22,15 @@ interface Props extends DialogProps {
const ShareMemoDialog: React.FC<Props> = (props: Props) => {
const { memo, destroy } = props;
const t = useTranslate();
const userV1Store = useUserV1Store();
const userStore = useUserStore();
const downloadingImageState = useLoading(false);
const loadingState = useLoading();
const memoElRef = useRef<HTMLDivElement>(null);
const user = userV1Store.getUserByUsername(extractUsernameFromName(memo.creator));
const user = userStore.getUserByUsername(extractUsernameFromName(memo.creator));
useEffect(() => {
(async () => {
await userV1Store.getOrFetchUserByUsername(extractUsernameFromName(memo.creator));
await userStore.getOrFetchUserByUsername(extractUsernameFromName(memo.creator));
loadingState.setFinish();
})();
}, []);

6
web/src/components/UpdateAccountDialog.tsx
View File

@ -3,7 +3,7 @@ import { useEffect, useState } from "react";
import { toast } from "react-hot-toast";
import { convertFileToBase64 } from "@/helpers/utils";
import useCurrentUser from "@/hooks/useCurrentUser";
import { UserNamePrefix, useUserV1Store } from "@/store/v1";
import { UserNamePrefix, useUserStore } from "@/store/v1";
import { User as UserPb } from "@/types/proto/api/v2/user_service";
import { useTranslate } from "@/utils/i18n";
import { generateDialog } from "./Dialog";
@ -22,7 +22,7 @@ interface State {
const UpdateAccountDialog: React.FC<Props> = ({ destroy }: Props) => {
const t = useTranslate();
const currentUser = useCurrentUser();
const userV1Store = useUserV1Store();
const userStore = useUserStore();
const [state, setState] = useState<State>({
avatarUrl: currentUser.avatarUrl,
username: currentUser.name.replace(UserNamePrefix, ""),
@ -108,7 +108,7 @@ const UpdateAccountDialog: React.FC<Props> = ({ destroy }: Props) => {
if (!isEqual(currentUser.email, state.email)) {
updateMask.push("email");
}
await userV1Store.updateUser(
await userStore.updateUser(
UserPb.fromPartial({
name: `${UserNamePrefix}${state.username}`,
id: currentUser.id,

10
web/src/components/UsageHeatMap.tsx
View File

@ -6,7 +6,7 @@ import * as utils from "@/helpers/utils";
import useCurrentUser from "@/hooks/useCurrentUser";
import useNavigateTo from "@/hooks/useNavigateTo";
import { useGlobalStore } from "@/store/module";
import { useUserV1Store, extractUsernameFromName, useMemoV1Store } from "@/store/v1";
import { useUserStore, extractUsernameFromName, useMemoStore } from "@/store/v1";
import { useTranslate, Translations } from "@/utils/i18n";
import "@/less/usage-heat-map.less";
@ -34,9 +34,9 @@ interface DailyUsageStat {
const UsageHeatMap = () => {
const t = useTranslate();
const navigateTo = useNavigateTo();
const userV1Store = useUserV1Store();
const userStore = useUserStore();
const user = useCurrentUser();
const memoStore = useMemoV1Store();
const memoStore = useMemoStore();
const todayTimeStamp = getDateStampByDate(Date.now());
const weekDay = new Date(todayTimeStamp).getDay();
const weekFromMonday = ["zh-Hans", "ko"].includes(useGlobalStore().state.locale);
@ -49,10 +49,10 @@ const UsageHeatMap = () => {
const [createdDays, setCreatedDays] = useState(0);
const [allStat, setAllStat] = useState<DailyUsageStat[]>(getInitialUsageStat(usedDaysAmount, beginDayTimestamp));
const containerElRef = useRef<HTMLDivElement>(null);
const memos = Array.from(memoStore.getState().memoById.values());
const memos = Object.values(memoStore.getState().memoMapById);
useEffect(() => {
userV1Store.getOrFetchUserByUsername(extractUsernameFromName(user.name)).then((user) => {
userStore.getOrFetchUserByUsername(extractUsernameFromName(user.name)).then((user) => {
if (!user) {
return;
}