Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

chore: tweak memo detail page

Stevene7a788fa7119
diff --git a/web/src/components/MemoEditor/MemoEditorDialog.tsx b/web/src/components/MemoEditor/MemoEditorDialog.tsx
index 091592a44..ad2dd23a7 100644
--- a/web/src/components/MemoEditor/MemoEditorDialog.tsx
+++ b/web/src/components/MemoEditor/MemoEditorDialog.tsx
@@ -1,18 +1,21 @@
import { IconButton } from "@mui/joy";
import { useEffect } from "react";
import { useTagStore } from "@/store/v1";
-import { MemoRelation } from "@/types/proto/api/v1/memo_relation_service";
-import MemoEditor from ".";
+import MemoEditor, { Props as MemoEditorProps } from ".";
import { generateDialog } from "../Dialog";
import Icon from "../Icon";
-interface Props extends DialogProps {
- memoName?: string;
- cacheKey?: string;
- relationList?: MemoRelation[];
-}
+interface Props extends DialogProps, MemoEditorProps {}
-const MemoEditorDialog: React.FC<Props> = ({ memoName: memo, cacheKey, relationList, destroy }: Props) => {
+const MemoEditorDialog: React.FC<Props> = ({
+ memoName: memo,
+ parentMemoName,
+ placeholder,
+ cacheKey,
+ relationList,
+ onConfirm,
+ destroy,
+}: Props) => {
const tagStore = useTagStore();
useEffect(() => {
@@ -23,6 +26,13 @@ const MemoEditorDialog: React.FC<Props> = ({ memoName: memo, cacheKey, relationL
destroy();
};
+ const handleConfirm = (memoName: string) => {
+ handleCloseBtnClick();
+ if (onConfirm) {
+ onConfirm(memoName);
+ }
+ };
+
return (
<>
<div className="w-full flex flex-row justify-between items-center mb-2">
@@ -39,8 +49,10 @@ const MemoEditorDialog: React.FC<Props> = ({ memoName: memo, cacheKey, relationL
className="border-none !p-0 -mb-2"
cacheKey={`memo-editor-${cacheKey || memo}`}
memoName={memo}
+ parentMemoName={parentMemoName}
+ placeholder={placeholder}
relationList={relationList}
- onConfirm={handleCloseBtnClick}
+ onConfirm={handleConfirm}
autoFocus
/>
</div>
@@ -48,7 +60,7 @@ const MemoEditorDialog: React.FC<Props> = ({ memoName: memo, cacheKey, relationL
);
};
-export default function showMemoEditorDialog(props: Pick<Props, "memoName" | "cacheKey" | "relationList"> = {}): void {
+export default function showMemoEditorDialog(props: Partial<Props> = {}): void {
generateDialog(
{
className: "memo-editor-dialog",
diff --git a/web/src/components/MemoEditor/index.tsx b/web/src/components/MemoEditor/index.tsx
index e50794322..68b4e6769 100644
--- a/web/src/components/MemoEditor/index.tsx
+++ b/web/src/components/MemoEditor/index.tsx
@@ -28,7 +28,7 @@ import ResourceListView from "./ResourceListView";
import { handleEditorKeydownWithMarkdownShortcuts, hyperlinkHighlightedText } from "./handlers";
import { MemoEditorContext } from "./types";
-interface Props {
+export interface Props {
className?: string;
cacheKey?: string;
placeholder?: string;
diff --git a/web/src/less/base-dialog.less b/web/src/less/base-dialog.less
index b6777709b..e40e2080f 100644
--- a/web/src/less/base-dialog.less
+++ b/web/src/less/base-dialog.less
@@ -1,5 +1,5 @@
.dialog-wrapper {
- @apply fixed top-0 left-0 flex flex-col justify-start items-center w-full h-full pt-16 pb-8 px-4 z-2000 overflow-x-hidden overflow-y-scroll bg-transparent transition-all hide-scrollbar bg-black bg-opacity-60;
+ @apply fixed top-0 left-0 flex flex-col justify-start items-center w-full h-full pt-16 pb-8 px-4 z-1000 overflow-x-hidden overflow-y-scroll bg-transparent transition-all hide-scrollbar bg-black bg-opacity-60;
> .dialog-container {
@apply max-w-full shadow flex flex-col justify-start items-start bg-white dark:bg-zinc-800 dark:text-gray-300 p-4 rounded-lg;
diff --git a/web/src/locales/en.json b/web/src/locales/en.json
index 323a630ec..6f257dad6 100644
--- a/web/src/locales/en.json
+++ b/web/src/locales/en.json
@@ -96,8 +96,8 @@
"memo": {
"archived-at": "Archived at",
"comment": {
- "no-comment": "No comment",
- "self": "Comments"
+ "self": "Comments",
+ "write-a-comment": "Write a comment"
},
"copy-link": "Copy Link",
"count-memos-in-date": "{{count}} memos in {{date}}",
diff --git a/web/src/pages/MemoDetail.tsx b/web/src/pages/MemoDetail.tsx
index 8155c8776..799aa253c 100644
--- a/web/src/pages/MemoDetail.tsx
+++ b/web/src/pages/MemoDetail.tsx
@@ -1,9 +1,10 @@
+import { Button } from "@mui/joy";
import { ClientError } from "nice-grpc-web";
import { useEffect, useState } from "react";
import { toast } from "react-hot-toast";
import { Link, useParams } from "react-router-dom";
import Icon from "@/components/Icon";
-import MemoEditor from "@/components/MemoEditor";
+import showMemoEditorDialog from "@/components/MemoEditor/MemoEditorDialog";
import MemoView from "@/components/MemoView";
import MobileHeader from "@/components/MobileHeader";
import useCurrentUser from "@/hooks/useCurrentUser";
@@ -60,6 +61,14 @@ const MemoDetail = () => {
return null;
}
+ const handleShowCommentEditor = () => {
+ showMemoEditorDialog({
+ placeholder: t("editor.add-your-comment-here"),
+ parentMemoName: memo.name,
+ onConfirm: handleCommentCreated,
+ });
+ };
+
const handleCommentCreated = async (memoCommentName: string) => {
await memoStore.getOrFetchMemoByName(memoCommentName);
await memoStore.getOrFetchMemoByName(memo.name, { skipCache: true });
@@ -96,33 +105,35 @@ const MemoDetail = () => {
</h2>
<div className="relative mx-auto flex-grow w-full min-h-full flex flex-col justify-start items-start gap-y-1">
{comments.length === 0 ? (
- <div className="w-full flex flex-col justify-center items-center py-6 mb-2">
- <Icon.MessageCircle strokeWidth={1} className="w-8 h-auto text-gray-400" />
- <p className="text-gray-400 italic text-sm">{t("memo.comment.no-comment")}</p>
- </div>
+ currentUser && (
+ <div className="w-full flex flex-row justify-center items-center py-6">
+ <Button
+ variant="plain"
+ color="neutral"
+ startDecorator={<Icon.MessageCircle className="w-5 h-auto text-gray-400" />}
+ onClick={handleShowCommentEditor}
+ >
+ <span className="">{t("memo.comment.write-a-comment")}</span>
+ </Button>
+ </div>
+ )
) : (
<>
- <div className="w-full flex flex-row justify-start items-center pl-3 mb-3">
- <Icon.MessageCircle className="w-5 h-auto text-gray-400 mr-1" />
- <span className="text-gray-400 text-sm">{t("memo.comment.self")}</span>
- <span className="text-gray-400 text-sm ml-0.5">({comments.length})</span>
+ <div className="w-full flex flex-row justify-between items-center px-3 mb-2">
+ <div className="flex flex-row justify-start items-center">
+ <Icon.MessageCircle className="w-5 h-auto text-gray-400 mr-1" />
+ <span className="text-gray-400 text-sm">{t("memo.comment.self")}</span>
+ <span className="text-gray-400 text-sm ml-1">({comments.length})</span>
+ </div>
+ <Button variant="plain" color="neutral" onClick={handleShowCommentEditor}>
+ <span className="font-normal">{t("memo.comment.write-a-comment")}</span>
+ </Button>
</div>
{comments.map((comment) => (
<MemoView key={`${comment.name}-${comment.displayTime}`} memo={comment} showCreator />
))}
</>
)}
-
- {/* Only show comment editor when user login */}
- {currentUser && (
- <MemoEditor
- key={memo.name}
- cacheKey={`comment-editor-${memo.name}`}
- placeholder={t("editor.add-your-comment-here")}
- parentMemoName={memo.name}
- onConfirm={handleCommentCreated}
- />
- )}
</div>
</div>
</div>