diff --git a/web/src/components/MemoContent/index.tsx b/web/src/components/MemoContent/index.tsx index 2d590995..80c4ccfa 100644 --- a/web/src/components/MemoContent/index.tsx +++ b/web/src/components/MemoContent/index.tsx @@ -4,7 +4,6 @@ import useCurrentUser from "@/hooks/useCurrentUser"; import { useMemoStore } from "@/store/v1"; import { Node, NodeType } from "@/types/node"; import { useTranslate } from "@/utils/i18n"; -import Icon from "../Icon"; import Renderer from "./Renderer"; import { RendererContext } from "./types"; @@ -89,15 +88,14 @@ const MemoContent: React.FC = (props: Props) => { return ; })} - {memo && showCompactMode && ( + {showCompactMode && (
-
setShowCompactMode(false)} > {t("memo.show-more")} - -
+
)} diff --git a/web/src/components/MemoFilter.tsx b/web/src/components/MemoFilter.tsx index b963c69f..dff13d5a 100644 --- a/web/src/components/MemoFilter.tsx +++ b/web/src/components/MemoFilter.tsx @@ -45,7 +45,7 @@ const MemoFilter = (props: Props) => { filterStore.setTagFilter(undefined); }} > - {tagQuery} + {tagQuery}
{ const homeNavLink: NavLinkItem = { id: "header-home", - path: "/", + path: Routes.HOME, title: t("common.home"), icon: , }; const timelineNavLink: NavLinkItem = { id: "header-timeline", - path: "/timeline", + path: Routes.TIMELINE, title: t("timeline.title"), icon: , }; const resourcesNavLink: NavLinkItem = { id: "header-resources", - path: "/resources", + path: Routes.RESOURCES, title: t("common.resources"), icon: , }; const exploreNavLink: NavLinkItem = { id: "header-explore", - path: "/explore", + path: Routes.EXPLORE, title: t("common.explore"), icon: , }; @@ -79,7 +80,7 @@ const Navigation = (props: Props) => { }; const inboxNavLink: NavLinkItem = { id: "header-inbox", - path: "/inbox", + path: Routes.INBOX, title: t("common.inbox"), icon: ( <> @@ -92,25 +93,25 @@ const Navigation = (props: Props) => { }; const archivedNavLink: NavLinkItem = { id: "header-archived", - path: "/archived", + path: Routes.ARCHIVED, title: t("common.archived"), icon: , }; const settingNavLink: NavLinkItem = { id: "header-setting", - path: "/setting", + path: Routes.SETTING, title: t("common.settings"), icon: , }; const signInNavLink: NavLinkItem = { id: "header-auth", - path: "/auth", + path: Routes.AUTH, title: t("common.sign-in"), icon: , }; const aboutNavLink: NavLinkItem = { id: "header-about", - path: "/about", + path: Routes.ABOUT, title: t("common.about"), icon: , }; diff --git a/web/src/components/ShareMemoDialog.tsx b/web/src/components/ShareMemoDialog.tsx index f86a8040..c976762c 100644 --- a/web/src/components/ShareMemoDialog.tsx +++ b/web/src/components/ShareMemoDialog.tsx @@ -26,14 +26,14 @@ interface Props extends DialogProps { const ShareMemoDialog: React.FC = (props: Props) => { const { memoId, destroy } = props; const t = useTranslate(); + const currentUser = useCurrentUser(); const userStore = useUserStore(); + const memoStore = useMemoStore(); const downloadingImageState = useLoading(false); const loadingState = useLoading(); - const memoElRef = useRef(null); - const memoStore = useMemoStore(); + const memoContainerRef = useRef(null); const memo = memoStore.getMemoById(memoId); const user = userStore.getUserByUsername(extractUsernameFromName(memo.creator)); - const currentUser = useCurrentUser(); const readonly = memo?.creatorId !== currentUser?.id; useEffect(() => { @@ -48,12 +48,12 @@ const ShareMemoDialog: React.FC = (props: Props) => { }; const handleDownloadImageBtnClick = () => { - if (!memoElRef.current) { + if (!memoContainerRef.current) { return; } downloadingImageState.setLoading(); - toImage(memoElRef.current, { + toImage(memoContainerRef.current, { pixelRatio: window.devicePixelRatio * 2, }) .then((url) => { @@ -151,10 +151,10 @@ const ShareMemoDialog: React.FC = (props: Props) => {
{getDateTimeString(memo.displayTime)} -
+
diff --git a/web/src/components/TagList.tsx b/web/src/components/TagList.tsx index de2571f8..36ce22ae 100644 --- a/web/src/components/TagList.tsx +++ b/web/src/components/TagList.tsx @@ -83,7 +83,7 @@ const TagList = () => {
-
+
{tags.map((t, idx) => ( ))} @@ -133,7 +133,7 @@ const TagItemContainer: React.FC = (props: TagItemContain return ( <> -
+
= (props: TagItemContain > -
- +
+ +
- + showRenameTagDialog({ tag: tag.text })}> {t("common.rename")} @@ -156,7 +157,7 @@ const TagItemContainer: React.FC = (props: TagItemContain - + {tag.key}
@@ -166,7 +167,7 @@ const TagItemContainer: React.FC = (props: TagItemContain className={`flex flex-row justify-center items-center w-6 h-6 shrink-0 transition-all rotate-0 ${showSubTags && "rotate-90"}`} onClick={handleToggleBtnClick} > - + ) : null}
diff --git a/web/src/layouts/HomeLayout.tsx b/web/src/layouts/HomeLayout.tsx index 2bf63c93..14b5bddf 100644 --- a/web/src/layouts/HomeLayout.tsx +++ b/web/src/layouts/HomeLayout.tsx @@ -26,7 +26,7 @@ const HomeLayout = () => { location.pathname, ) ) { - navigateTo("/explore"); + navigateTo(Routes.EXPLORE); } }, []); diff --git a/web/src/router/index.tsx b/web/src/router/index.tsx index 68f68d31..e0814bbb 100644 --- a/web/src/router/index.tsx +++ b/web/src/router/index.tsx @@ -27,6 +27,9 @@ export enum Routes { INBOX = "/inbox", ARCHIVED = "/archived", SETTING = "/setting", + EXPLORE = "/explore", + ABOUT = "/about", + AUTH = "/auth", } const router = createBrowserRouter([ @@ -35,7 +38,7 @@ const router = createBrowserRouter([ element: , children: [ { - path: "/auth", + path: Routes.AUTH, element: , children: [ { @@ -81,7 +84,7 @@ const router = createBrowserRouter([ element: , }, { - path: "explore", + path: Routes.EXPLORE, element: , }, { @@ -93,7 +96,7 @@ const router = createBrowserRouter([ element: , }, { - path: "about", + path: Routes.ABOUT, element: , }, {