usememos/memos
1
1
Fork 0
mirror of https://github.com/usememos/memos.git synced 2024-12-23 11:11:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: use user avatar in ShareMemoDialog (#2102)

Browse Source 
fix: ShareMemoDialog use user avata
This commit is contained in:
Chris Akring 2023-08-07 19:40:43 +08:00 committed by GitHub
parent f9d1080a7d
commit 9503f73115
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@ import { VISIBILITY_SELECTOR_ITEMS } from "@/helpers/consts";
import { getDateTimeString, getTimeStampByDate } from "@/helpers/datetime"; import { getDateTimeString, getTimeStampByDate } from "@/helpers/datetime";
import useLoading from "@/hooks/useLoading"; import useLoading from "@/hooks/useLoading";
import toImage from "@/labs/html2image"; import toImage from "@/labs/html2image";
import { useGlobalStore, useMemoStore, useUserStore } from "@/store/module"; import { useMemoStore, useUserStore } from "@/store/module";
import { useTranslate } from "@/utils/i18n"; import { useTranslate } from "@/utils/i18n";
import { generateDialog } from "./Dialog"; import { generateDialog } from "./Dialog";
import showEmbedMemoDialog from "./EmbedMemoDialog"; import showEmbedMemoDialog from "./EmbedMemoDialog";
@ -33,9 +33,7 @@ const ShareMemoDialog: React.FC<Props> = (props: Props) => {
const t = useTranslate(); const t = useTranslate();
const userStore = useUserStore(); const userStore = useUserStore();
const memoStore = useMemoStore(); const memoStore = useMemoStore();
const globalStore = useGlobalStore();
const user = userStore.state.user as User; const user = userStore.state.user as User;
const { systemStatus } = globalStore.state;
const [state, setState] = useState<State>({ const [state, setState] = useState<State>({
memoAmount: 0, memoAmount: 0,
memoVisibility: propsMemo.visibility, memoVisibility: propsMemo.visibility,
@ -181,7 +179,7 @@ const ShareMemoDialog: React.FC<Props> = (props: Props) => {
</div> </div>
<div className="flex flex-row justify-between items-center w-full bg-gray-100 dark:bg-zinc-700 py-4 px-6"> <div className="flex flex-row justify-between items-center w-full bg-gray-100 dark:bg-zinc-700 py-4 px-6">
<div className="mr-2"> <div className="mr-2">
<img className="h-10 w-auto rounded-lg" src={`${systemStatus.customizedProfile.logoUrl || "/logo.webp"}`} alt="" /> <img className="h-10 w-auto rounded-lg" src={`${user.avatarUrl || "/logo.webp"}`} alt="" />
</div> </div>
<div className="w-auto grow truncate flex mr-2 flex-col justify-center items-start"> <div className="w-auto grow truncate flex mr-2 flex-col justify-center items-start">
<span className="w-full text-sm truncate font-bold text-gray-600 dark:text-gray-300">{user.nickname || user.username}</span> <span className="w-full text-sm truncate font-bold text-gray-600 dark:text-gray-300">{user.nickname || user.username}</span>