chore: add edit button to memo detail page

This commit is contained in:
Steven
2023-09-26 23:46:58 +08:00
parent 7cdc5c711c
commit 7722c41680
3 changed files with 27 additions and 16 deletions

View File

@ -43,7 +43,7 @@ const MemoResourceListView: React.FC<Props> = (props: Props) => {
<> <>
{imageResourceList.length > 0 && {imageResourceList.length > 0 &&
(imageResourceList.length === 1 ? ( (imageResourceList.length === 1 ? (
<div className="mt-2 max-w-[90%] max-h-64 flex justify-center items-center border dark:border-zinc-800 rounded overflow-hidden hide-scrollbar hover:shadow-md"> <div className="mt-2 max-w-full max-h-72 flex justify-center items-center border dark:border-zinc-800 rounded overflow-hidden hide-scrollbar hover:shadow-md">
<img <img
className="cursor-pointer min-h-full w-auto min-w-full object-cover" className="cursor-pointer min-h-full w-auto min-w-full object-cover"
src={getResourceUrl(imageResourceList[0])} src={getResourceUrl(imageResourceList[0])}

View File

@ -7,12 +7,14 @@ import { useParams } from "react-router-dom";
import FloatingNavButton from "@/components/FloatingNavButton"; import FloatingNavButton from "@/components/FloatingNavButton";
import Icon from "@/components/Icon"; import Icon from "@/components/Icon";
import MemoContent from "@/components/MemoContent"; import MemoContent from "@/components/MemoContent";
import showMemoEditorDialog from "@/components/MemoEditor/MemoEditorDialog";
import MemoRelationListView from "@/components/MemoRelationListView"; import MemoRelationListView from "@/components/MemoRelationListView";
import MemoResourceListView from "@/components/MemoResourceListView"; import MemoResourceListView from "@/components/MemoResourceListView";
import showShareMemoDialog from "@/components/ShareMemoDialog"; import showShareMemoDialog from "@/components/ShareMemoDialog";
import UserAvatar from "@/components/UserAvatar"; import UserAvatar from "@/components/UserAvatar";
import { VISIBILITY_SELECTOR_ITEMS } from "@/helpers/consts"; import { VISIBILITY_SELECTOR_ITEMS } from "@/helpers/consts";
import { getDateTimeString } from "@/helpers/datetime"; import { getDateTimeString } from "@/helpers/datetime";
import useCurrentUser from "@/hooks/useCurrentUser";
import useNavigateTo from "@/hooks/useNavigateTo"; import useNavigateTo from "@/hooks/useNavigateTo";
import { useMemoStore } from "@/store/module"; import { useMemoStore } from "@/store/module";
import { useUserV1Store } from "@/store/v1"; import { useUserV1Store } from "@/store/v1";
@ -25,9 +27,11 @@ const MemoDetail = () => {
const t = useTranslate(); const t = useTranslate();
const memoStore = useMemoStore(); const memoStore = useMemoStore();
const userV1Store = useUserV1Store(); const userV1Store = useUserV1Store();
const currentUser = useCurrentUser();
const [user, setUser] = useState<User>(); const [user, setUser] = useState<User>();
const memoId = Number(params.memoId); const memoId = Number(params.memoId);
const memo = memoStore.state.memos.find((memo) => memo.id === memoId); const memo = memoStore.state.memos.find((memo) => memo.id === memoId);
const allowEdit = memo?.creatorUsername === currentUser?.username;
useEffect(() => { useEffect(() => {
if (memoId && !isNaN(memoId)) { if (memoId && !isNaN(memoId)) {
@ -65,6 +69,12 @@ const MemoDetail = () => {
}); });
}; };
const handleEditMemoClick = () => {
showMemoEditorDialog({
memoId: memo.id,
});
};
const handleCopyLinkBtnClick = () => { const handleCopyLinkBtnClick = () => {
copy(`${window.location.origin}/m/${memo.id}`); copy(`${window.location.origin}/m/${memo.id}`);
toast.success(t("message.succeed-copy-link")); toast.success(t("message.succeed-copy-link"));
@ -113,6 +123,11 @@ const MemoDetail = () => {
</Tooltip> </Tooltip>
</div> </div>
<div className="flex flex-row sm:justify-end items-center"> <div className="flex flex-row sm:justify-end items-center">
{allowEdit && (
<IconButton size="sm" onClick={handleEditMemoClick}>
<Icon.Edit3 className="w-4 h-auto text-gray-600 dark:text-gray-400" />
</IconButton>
)}
<IconButton size="sm" onClick={handleCopyLinkBtnClick}> <IconButton size="sm" onClick={handleCopyLinkBtnClick}>
<Icon.Link className="w-4 h-auto text-gray-600 dark:text-gray-400" /> <Icon.Link className="w-4 h-auto text-gray-600 dark:text-gray-400" />
</IconButton> </IconButton>

View File

@ -33,7 +33,7 @@ const initialGlobalStateLoader = (() => {
}; };
})(); })();
const userStateLoader = async () => { const initialUserStateLoader = async (redirectWhenNotFound = true) => {
let user = undefined; let user = undefined;
try { try {
user = await initialUserState(); user = await initialUserState();
@ -41,7 +41,7 @@ const userStateLoader = async () => {
// do nothing. // do nothing.
} }
if (!user) { if (!user && redirectWhenNotFound) {
return redirect("/explore"); return redirect("/explore");
} }
return null; return null;
@ -71,53 +71,49 @@ const router = createBrowserRouter([
{ {
path: "", path: "",
element: <Home />, element: <Home />,
loader: userStateLoader, loader: () => initialUserStateLoader(),
}, },
{ {
path: "explore", path: "explore",
element: <Explore />, element: <Explore />,
loader: async () => { loader: () => initialUserStateLoader(false),
try {
await initialUserState();
} catch (error) {
// do nothing.
}
return null;
},
}, },
{ {
path: "review", path: "review",
element: <DailyReview />, element: <DailyReview />,
loader: userStateLoader, loader: () => initialUserStateLoader(),
}, },
{ {
path: "resources", path: "resources",
element: <Resources />, element: <Resources />,
loader: userStateLoader, loader: () => initialUserStateLoader(),
}, },
{ {
path: "archived", path: "archived",
element: <Archived />, element: <Archived />,
loader: userStateLoader, loader: () => initialUserStateLoader(),
}, },
{ {
path: "setting", path: "setting",
element: <Setting />, element: <Setting />,
loader: userStateLoader, loader: () => initialUserStateLoader(),
}, },
], ],
}, },
{ {
path: "/m/:memoId", path: "/m/:memoId",
element: <MemoDetail />, element: <MemoDetail />,
loader: () => initialUserStateLoader(false),
}, },
{ {
path: "/m/:memoId/embed", path: "/m/:memoId/embed",
element: <EmbedMemo />, element: <EmbedMemo />,
loader: () => initialUserStateLoader(false),
}, },
{ {
path: "/u/:username", path: "/u/:username",
element: <UserProfile />, element: <UserProfile />,
loader: () => initialUserStateLoader(false),
}, },
{ {
path: "*", path: "*",