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.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
feat: rebuild timeline page
Steven6d7186fc8182
diff --git a/web/src/components/ActivityCalendar.tsx b/web/src/components/ActivityCalendar.tsxnew file mode 100644index 000000000..e21917189--- /dev/null+++ b/web/src/components/ActivityCalendar.tsx@@ -0,0 +1,66 @@+import { Tooltip } from "@mui/joy";+import classNames from "classnames";++interface Props {+ // Format: 2021-1+ month: string;+ data: Record<string, number>;+}++const getBgColor = (count: number, maxCount: number) => {+ if (count === 0) {+ return "bg-gray-100 dark:bg-gray-700";+ }++ const ratio = count / maxCount;+ if (ratio > 0.7) {+ return "bg-blue-600";+ } else if (ratio > 0.5) {+ return "bg-blue-400";+ } else if (ratio > 0.3) {+ return "bg-blue-300";+ } else {+ return "bg-blue-200";+ }+};++const ActivityCalendar = (props: Props) => {+ const { month: monthStr, data } = props;+ const [year, month] = monthStr.split("-");+ const dayInMonth = new Date(Number(year), Number(month), 0).getDate();+ const firstDay = new Date(Number(year), Number(month) - 1, 1).getDay();+ const lastDay = new Date(Number(year), Number(month) - 1, dayInMonth).getDay();+ const maxCount = Math.max(...Object.values(data));+ const days = [];++ for (let i = 0; i < firstDay; i++) {+ days.push(0);+ }+ for (let i = 1; i <= dayInMonth; i++) {+ days.push(i);+ }+ for (let i = 0; i < 6 - lastDay; i++) {+ days.push(0);+ }++ return (+ <div className="w-28 h-20 p-0.5 shrink-0 grid grid-cols-7 grid-flow-row gap-1">+ {days.map((day, index) => {+ const date = `${year}-${month}-${day}`;+ const count = data[date] || 0;+ return day ? (+ <Tooltip className="shrink-0" key={`${date}-${index}`} title={`${count} memos in ${date}`} placement="top">+ <div className={classNames("w-3 h-3 rounded flex justify-center items-center", getBgColor(count, maxCount))}></div>+ </Tooltip>+ ) : (+ <div+ key={`${date}-${index}`}+ className={classNames("shrink-0 opacity-30 w-3 h-3 rounded flex justify-center items-center", getBgColor(count, maxCount))}+ ></div>+ );+ })}+ </div>+ );+};++export default ActivityCalendar;diff --git a/web/src/components/MemoView.tsx b/web/src/components/MemoView.tsxindex ec5255b10..9439a47e5 100644--- a/web/src/components/MemoView.tsx+++ b/web/src/components/MemoView.tsx@@ -1,4 +1,5 @@import { Divider, Tooltip } from "@mui/joy";+import classNames from "classnames";import copy from "copy-to-clipboard";import { memo, useEffect, useRef, useState } from "react";import { toast } from "react-hot-toast";@@ -30,13 +31,13 @@ import "@/less/memo.less";interface Props {memo: Memo;showCreator?: boolean;- showParent?: boolean;showVisibility?: boolean;showPinnedStyle?: boolean;+ className?: string;}const MemoView: React.FC<Props> = (props: Props) => {- const { memo } = props;+ const { memo, className } = props;const t = useTranslate();const navigateTo = useNavigateTo();const { i18n } = useTranslation();@@ -165,7 +166,7 @@ const MemoView: React.FC<Props> = (props: Props) => {return (<div- className={`group memo-wrapper ${"memos-" + memo.id} ${memo.pinned && props.showPinnedStyle ? "pinned" : ""}`}+ className={classNames("group memo-wrapper", "memos-" + memo.id, memo.pinned && props.showPinnedStyle ? "pinned" : "", className)}ref={memoContainerRef}><div className="memo-top-wrapper mb-1">diff --git a/web/src/components/TimelineMemo.tsx b/web/src/components/TimelineMemo.tsxdeleted file mode 100644index 33074d16d..000000000--- a/web/src/components/TimelineMemo.tsx+++ /dev/null@@ -1,28 +0,0 @@-import MemoContent from "@/components/MemoContent";-import MemoResourceListView from "@/components/MemoResourceListView";-import { getTimeString } from "@/helpers/datetime";-import { MemoRelation_Type } from "@/types/proto/api/v2/memo_relation_service";-import { Memo } from "@/types/proto/api/v2/memo_service";-import MemoRelationListView from "./MemoRelationListView";--interface Props {- memo: Memo;-}--const TimelineMemo = (props: Props) => {- const { memo } = props;- const relations = memo.relations.filter((relation) => relation.type === MemoRelation_Type.REFERENCE);-- return (- <div className="relative w-full flex flex-col justify-start items-start">- <div className="w-full flex flex-row justify-start items-center mt-0.5 mb-1 text-sm font-mono text-gray-500 dark:text-gray-400">- <span className="opacity-80">{getTimeString(memo.displayTime)}</span>- </div>- <MemoContent memoId={memo.id} nodes={memo.nodes} />- <MemoResourceListView resourceList={memo.resources} />- <MemoRelationListView memo={memo} relationList={relations} />- </div>- );-};--export default TimelineMemo;diff --git a/web/src/pages/Explore.tsx b/web/src/pages/Explore.tsxindex 4b37bc366..e71873d76 100644--- a/web/src/pages/Explore.tsx+++ b/web/src/pages/Explore.tsx@@ -56,7 +56,7 @@ const Explore = () => {<div className="relative w-full h-auto flex flex-col justify-start items-start px-4 sm:px-6"><MemoFilter />{sortedMemos.map((memo) => (- <MemoView key={memo.id} memo={memo} showCreator showParent />+ <MemoView key={memo.id} memo={memo} showCreator />))}{isRequesting ? (diff --git a/web/src/pages/Home.tsx b/web/src/pages/Home.tsxindex 6397dae7e..cb4590c37 100644--- a/web/src/pages/Home.tsx+++ b/web/src/pages/Home.tsx@@ -73,7 +73,7 @@ const Home = () => {<div className="flex flex-col justify-start items-start w-full max-w-full pb-28"><MemoFilter />{sortedMemos.map((memo) => (- <MemoView key={`${memo.id}-${memo.updateTime}`} memo={memo} showVisibility showPinnedStyle showParent />+ <MemoView key={`${memo.id}-${memo.updateTime}`} memo={memo} showVisibility showPinnedStyle />))}{isRequesting ? (<div className="flex flex-col justify-start items-center w-full my-4">diff --git a/web/src/pages/Inboxes.tsx b/web/src/pages/Inboxes.tsxindex d3ec68a45..63984ada9 100644--- a/web/src/pages/Inboxes.tsx+++ b/web/src/pages/Inboxes.tsx@@ -25,8 +25,9 @@ const Inboxes = () => {<div className="w-full px-4 sm:px-6"><div className="w-full shadow flex flex-col justify-start items-start px-4 py-3 rounded-xl bg-white dark:bg-zinc-800 text-black dark:text-gray-300"><div className="relative w-full flex flex-row justify-between items-center">- <p className="px-2 py-1 flex flex-row justify-start items-center select-none opacity-80">- <Icon.Bell className="w-5 h-auto mr-1" /> {t("common.inbox")}+ <p className="py-1 flex flex-row justify-start items-center select-none opacity-80">+ <Icon.Bell className="w-6 h-auto mr-1 opacity-80" />+ <span className="text-lg">{t("common.inbox")}</span></p></div><div className="w-full h-auto flex flex-col justify-start items-start px-2 pb-4">diff --git a/web/src/pages/Resources.tsx b/web/src/pages/Resources.tsxindex aaa0f8ffe..415e1390f 100644--- a/web/src/pages/Resources.tsx+++ b/web/src/pages/Resources.tsx@@ -71,8 +71,9 @@ const Resources = () => {<div className="w-full px-4 sm:px-6"><div className="w-full shadow flex flex-col justify-start items-start px-4 py-3 rounded-xl bg-white dark:bg-zinc-800 text-black dark:text-gray-300"><div className="relative w-full flex flex-row justify-between items-center">- <p className="px-2 py-1 flex flex-row justify-start items-center select-none opacity-80">- <Icon.Paperclip className="w-5 h-auto mr-1" /> {t("common.resources")}+ <p className="py-1 flex flex-row justify-start items-center select-none opacity-80">+ <Icon.Paperclip className="w-6 h-auto mr-1 opacity-80" />+ <span className="text-lg">{t("common.resources")}</span></p><div><Inputdiff --git a/web/src/pages/Timeline.tsx b/web/src/pages/Timeline.tsxindex f3b3e4af2..82727a938 100644--- a/web/src/pages/Timeline.tsx+++ b/web/src/pages/Timeline.tsx@@ -1,60 +1,87 @@-import { Button } from "@mui/joy";+import { Button, IconButton } from "@mui/joy";+import classNames from "classnames";import { useEffect, useState } from "react";-import { useSearchParams } from "react-router-dom";-import useToggle from "react-use/lib/useToggle";+import ActivityCalendar from "@/components/ActivityCalendar";import Empty from "@/components/Empty";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 TimelineMemo from "@/components/TimelineMemo";-import DatePicker from "@/components/kit/DatePicker";-import { DAILY_TIMESTAMP } from "@/helpers/consts";-import { getDateStampByDate, getNormalizedDateString, getTimeStampByDate } from "@/helpers/datetime";+import { memoServiceClient } from "@/grpcweb";+import { DEFAULT_MEMO_LIMIT } from "@/helpers/consts";+import { getNormalizedTimeString, getTimeStampByDate } from "@/helpers/datetime";import useCurrentUser from "@/hooks/useCurrentUser";+import useResponsiveWidth from "@/hooks/useResponsiveWidth";+import i18n from "@/i18n";import { useMemoList, useMemoStore } from "@/store/v1";+import { Memo } from "@/types/proto/api/v2/memo_service";import { useTranslate } from "@/utils/i18n";+interface GroupedByMonthItem {+ // Format: 2021-1+ month: string;+ data: Record<string, number>;+ memos: Memo[];+}++const groupByMonth = (dateCountMap: Record<string, number>, memos: Memo[]): GroupedByMonthItem[] => {+ const groupedByMonth: GroupedByMonthItem[] = [];++ Object.entries(dateCountMap).forEach(([date, count]) => {+ const month = date.split("-").slice(0, 2).join("-");+ const existingMonth = groupedByMonth.find((group) => group.month === month);+ if (existingMonth) {+ existingMonth.data[date] = count;+ } else {+ const monthMemos = memos.filter((memo) => getNormalizedTimeString(memo.displayTime).startsWith(month));+ groupedByMonth.push({ month, data: { [date]: count }, memos: monthMemos });+ }+ });++ return groupedByMonth.filter((group) => group.memos.length > 0).sort((a, b) => getTimeStampByDate(b.month) - getTimeStampByDate(a.month));+};+const Timeline = () => {const t = useTranslate();- const [searchParams, setSearchParams] = useSearchParams();+ const { md } = useResponsiveWidth();const user = useCurrentUser();const memoStore = useMemoStore();const memoList = useMemoList();- const currentDateStamp = getDateStampByDate(getNormalizedDateString()) as number;- const [selectedDateStamp, setSelectedDateStamp] = useState<number>(- (searchParams.get("timestamp") ? Number(searchParams.get("timestamp")) : currentDateStamp) as number- );+ const [activityStats, setActivityStats] = useState<Record<string, number>>({});const [isRequesting, setIsRequesting] = useState(true);- const [showDatePicker, toggleShowDatePicker] = useToggle(false);- const sortedMemos = memoList.value.sort((a, b) => getTimeStampByDate(a.createTime) - getTimeStampByDate(b.createTime));+ const [isComplete, setIsComplete] = useState(false);+ const sortedMemos = memoList.value.sort((a, b) => getTimeStampByDate(b.displayTime) - getTimeStampByDate(a.displayTime));+ const groupedByMonth = groupByMonth(activityStats, sortedMemos);useEffect(() => {- setSearchParams();+ memoList.reset();+ fetchMemos();}, []);useEffect(() => {- memoList.reset();- fetchMemos();- }, [selectedDateStamp]);+ (async () => {+ const { stats } = await memoServiceClient.getUserMemosStats({+ name: user.name,+ timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,+ });+ setActivityStats(stats);+ })();+ }, [sortedMemos.length]);const fetchMemos = async () => {- const filters = [- `creator == "${user.name}"`,- `row_status == "NORMAL"`,- `created_ts_after == ${selectedDateStamp / 1000}`,- `created_ts_before == ${(selectedDateStamp + DAILY_TIMESTAMP) / 1000}`,- ];+ const filters = [`creator == "${user.name}"`, `row_status == "NORMAL"`];setIsRequesting(true);- await memoStore.fetchMemos({+ const data = await memoStore.fetchMemos({filter: filters.join(" && "),+ limit: DEFAULT_MEMO_LIMIT,offset: memoList.size(),});setIsRequesting(false);+ setIsComplete(data.length < DEFAULT_MEMO_LIMIT);};- const handleDataPickerChange = (datestamp: number): void => {- setSelectedDateStamp(datestamp);- toggleShowDatePicker(false);+ const handleNewMemo = () => {+ showMemoEditorDialog({});};return (@@ -62,63 +89,75 @@ const Timeline = () => {<MobileHeader /><div className="w-full px-4 sm:px-6"><div className="w-full shadow flex flex-col justify-start items-start px-4 py-3 rounded-xl bg-white dark:bg-zinc-800 text-black dark:text-gray-300">- <div className="relative w-full flex flex-row justify-start items-center">- <p- className="px-2 py-1 mr-2 flex flex-row justify-start items-center cursor-pointer select-none rounded opacity-80 hover:bg-gray-100 dark:hover:bg-zinc-700"- onClick={() => toggleShowDatePicker()}- >- <Icon.Calendar className="w-5 h-auto mr-2" />- <span className="font-mono mt-0.5">{new Date(selectedDateStamp).toLocaleDateString()}</span>- </p>- {selectedDateStamp !== currentDateStamp && (- <Button- variant="outlined"- startDecorator={<Icon.Undo2 className="w-5 h-auto" />}- onClick={() => setSelectedDateStamp(currentDateStamp)}- >- {"Back to today"}- </Button>- )}- <DatePicker- className={`absolute top-8 mt-2 z-20 mx-auto border bg-white shadow dark:bg-zinc-800 dark:border-zinc-800 rounded-lg mb-6 ${- showDatePicker ? "" : "!hidden"- }`}- datestamp={selectedDateStamp}- isFutureDateDisabled- handleDateStampChange={handleDataPickerChange}- handleClickAway={() => toggleShowDatePicker(false)}- />+ <div className="relative w-full flex flex-row justify-between items-center">+ <div>+ <p className="py-1 flex flex-row justify-start items-center select-none opacity-80">+ <Icon.GanttChartSquare className="w-6 h-auto mr-1 opacity-80" />+ <span className="text-lg">{t("timeline.title")}</span>+ </p>+ </div>+ <div className="flex justify-end items-center gap-2">+ <IconButton variant="outlined" size="sm" onClick={() => handleNewMemo()}>+ <Icon.Plus className="w-5 h-auto" />+ </IconButton>+ </div></div>- <div className="w-full h-auto flex flex-col justify-start items-start px-2 pb-4 bg-white dark:bg-zinc-800">- <div className="flex flex-col justify-start items-start w-full mt-2">- {sortedMemos.map((memo, index) => (- <div- key={`${memo.id}-${memo.createTime}`}- className="relative w-full flex flex-col justify-start items-start pl-8 sm:pl-12 pt-2 pb-4"- >- <TimelineMemo memo={memo} />- <div className="absolute left-1 sm:left-2 top-3 h-full">- {index !== sortedMemos.length - 1 && (- <div className="absolute top-2 left-[7px] h-full w-0.5 bg-gray-400 dark:bg-gray-500 block"></div>- )}- <div className="border-4 rounded-full border-white relative dark:border-zinc-800">- <Icon.Circle className="w-2 h-auto bg-gray-400 text-gray-400 dark:bg-gray-500 dark:text-gray-500 rounded-full" />- </div>+ <div className="w-full h-auto flex flex-col justify-start items-start">+ {groupedByMonth.map((group) => (+ <div+ key={group.month}+ className={classNames("flex justify-start items-start w-full mt-2 mb-4", md ? "flex-row" : "flex-col")}+ >+ <div className={classNames("flex shrink-0", md ? "flex-col w-32 pr-4 pl-1 pb-8" : "flex-row w-full pl-1 mt-2 mb-2")}>+ <div className="w-full flex flex-col mt-2 mb-2">+ <span className="font-medium text-4xl leading-none mb-1">+ {new Date(group.month).toLocaleString(i18n.language, { month: "short" })}+ </span>+ <span className="text-sm opacity-60">{new Date(group.month).getFullYear()}</span></div>+ <ActivityCalendar month={group.month} data={group.data} /></div>- ))}- {!isRequesting && sortedMemos.length === 0 && (- <div className="w-full mt-4 mb-8 flex flex-col justify-center items-center italic">- <Empty />- <p className="mt-4 text-gray-600 dark:text-gray-400">{t("message.no-data")}</p>++ <div className={classNames("flex flex-col justify-start items-start", md ? "w-[calc(100%-8rem)]" : "w-full")}>+ {group.memos.map((memo, index) => (+ <div+ key={`${memo.id}-${memo.createTime}`}+ className="relative w-full flex flex-col justify-start items-start pl-4 sm:pl-8 pt-0"+ >+ <MemoView className="!border !border-gray-100 dark:!border-zinc-700" memo={memo} />+ {group.memos.length > 1 && (+ <div className="absolute -left-1 sm:left-2 top-4 h-full">+ {index !== group.memos.length - 1 && (+ <div className="absolute top-2 left-[7px] h-full w-0.5 bg-gray-200 dark:bg-gray-700 block"></div>+ )}+ <div className="border-4 rounded-full border-white relative dark:border-zinc-800">+ <Icon.Circle className="w-2 h-auto bg-gray-200 text-gray-200 dark:bg-gray-700 dark:text-gray-700 rounded-full" />+ </div>+ </div>+ )}+ </div>+ ))}</div>- )}- {selectedDateStamp === currentDateStamp && (- <div className="w-full pl-0 sm:pl-12 sm:mt-4">- <MemoEditor cacheKey="timeline-editor" />+ </div>+ ))}+ {isRequesting ? (+ <div className="flex flex-col justify-start items-center w-full my-4">+ <p className="text-sm text-gray-400 italic">{t("memo.fetching-data")}</p>+ </div>+ ) : isComplete ? (+ sortedMemos.length === 0 && (+ <div className="w-full mt-12 mb-8 flex flex-col justify-center items-center italic">+ <Empty />+ <p className="mt-2 text-gray-600 dark:text-gray-400">{t("message.no-data")}</p></div>- )}- </div>+ )+ ) : (+ <div className="w-full flex flex-row justify-center items-center my-4">+ <Button variant="plain" endDecorator={<Icon.ArrowDown className="w-5 h-auto" />} onClick={fetchMemos}>+ {t("memo.fetch-more")}+ </Button>+ </div>+ )}</div></div></div>diff --git a/web/src/pages/UserProfile.tsx b/web/src/pages/UserProfile.tsxindex 675d8e911..1495248df 100644--- a/web/src/pages/UserProfile.tsx+++ b/web/src/pages/UserProfile.tsx@@ -92,7 +92,7 @@ const UserProfile = () => {</div></div>{sortedMemos.map((memo) => (- <MemoView key={memo.id} memo={memo} showVisibility showPinnedStyle showParent />+ <MemoView key={memo.id} memo={memo} showVisibility showPinnedStyle />))}{isRequesting ? (<div className="flex flex-col justify-start items-center w-full my-4">