Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(Timeline): For #3119 Enhance date filtering and navigation functionalities #3244

Closed
wants to merge 3 commits into from
Closed

feat(Timeline): For #3119 Enhance date filtering and navigation functionalities #3244

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f508a82
feat(Timeline): Enhance date filtering and navigation functionalities
Yamico Apr 16, 2024
3e33d0f
fix: correct ESLint formatting issues
Yamico Apr 16, 2024
c672ccf
fix: Fix bug in switching between months
Yamico Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion web/src/components/ActivityCalendar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ interface Props {
month: string;
data: Record<string, number>;
onClick?: (date: string) => void;
selectedDate?: string;
}

const getCellAdditionalStyles = (count: number, maxCount: number) => {
Expand All @@ -26,8 +27,8 @@ const getCellAdditionalStyles = (count: number, maxCount: number) => {
};

const ActivityCalendar = (props: Props) => {
const { month: monthStr, data, onClick, selectedDate } = props;
const t = useTranslate();
const { month: monthStr, data, onClick } = props;
const year = new Date(monthStr).getUTCFullYear();
const month = new Date(monthStr).getUTCMonth() + 1;
const dayInMonth = new Date(year, month, 0).getDate();
Expand Down Expand Up @@ -55,13 +56,15 @@ const ActivityCalendar = (props: Props) => {
const count = data[date] || 0;
const isToday = new Date().toDateString() === new Date(date).toDateString();
const tooltipText = count ? t("memo.count-memos-in-date", { count: count, date: date }) : date;
const isSelected = date === selectedDate;
return day ? (
<Tooltip className="shrink-0" key={`${date}-${index}`} title={tooltipText} placement="top" arrow>
<div
className={classNames(
"w-4 h-4 text-[9px] rounded-md flex justify-center items-center border border-transparent",
getCellAdditionalStyles(count, maxCount),
isToday && "border-gray-600 dark:!border-gray-500",
isSelected && "bg-green-500 text-white",
)}
onClick={() => count && onClick && onClick(date)}
>
Expand Down
3 changes: 2 additions & 1 deletion web/src/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,8 @@
"succeed-update-customized-profile": "Profile successfully customized.",
"succeed-update-additional-script": "Additional script updated successfully.",
"update-succeed": "Update succeeded",
"maximum-upload-size-is": "Maximum allowed upload size is {{size}} MiB"
"maximum-upload-size-is": "Maximum allowed upload size is {{size}} MiB",
"no-more-memos": "No more memmos"
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo: should be Memos

},
"inbox": {
"memo-comment": "{{user}} has a comment on your {{memo}}.",
Expand Down
3 changes: 2 additions & 1 deletion web/src/locales/zh-Hans.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,8 @@
"succeed-update-customized-profile": "更新自定义配置文件成功。",
"succeed-vacuum-database": "清理数据库成功。",
"update-succeed": "更新成功",
"user-not-found": "未找到该用户"
"user-not-found": "未找到该用户",
"no-more-memos": "没有更多Memos记录"
},
"reference": {
"add-references": "添加引用",
Expand Down
188 changes: 158 additions & 30 deletions web/src/pages/Timeline.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Button, Divider, IconButton } from "@mui/joy";
import classNames from "classnames";
import { Fragment, useEffect, useRef, useState } from "react";
import toast from "react-hot-toast";
import ActivityCalendar from "@/components/ActivityCalendar";
import Empty from "@/components/Empty";
import Icon from "@/components/Icon";
Expand Down Expand Up @@ -58,6 +59,93 @@ const Timeline = () => {
const sortedMemos = memoList.value.sort((a, b) => getTimeStampByDate(b.displayTime) - getTimeStampByDate(a.displayTime));
const groupedByMonth = groupByMonth(activityStats, sortedMemos);

const handleDateClick = (date: string) => {
if (date === selectedDay) {
setSelectedDay(undefined);
} else {
setSelectedDay(date);
}
};
const handlePrevDay = () => {
if (!selectedDay) return;

const currentDate = new Date(selectedDay);
currentDate.setUTCDate(currentDate.getUTCDate() - 1);

let found = false;
while (currentDate >= new Date(Object.keys(activityStats).sort()[0])) {
const checkDateStr = currentDate.toISOString().substring(0, 10);
if (activityStats[checkDateStr] && activityStats[checkDateStr] > 0) {
setSelectedDay(checkDateStr);
found = true;
break;
}
currentDate.setUTCDate(currentDate.getUTCDate() - 1);
}

if (!found) {
toast.error(t("message.no-more-memos"));
}
};
const handleNextDay = () => {
if (!selectedDay) return;

const currentDate = new Date(selectedDay);
currentDate.setUTCDate(currentDate.getUTCDate() + 1);

let found = false;
while (currentDate <= new Date(Object.keys(activityStats).sort().reverse()[0])) {
const checkDateStr = currentDate.toISOString().substring(0, 10);
if (activityStats[checkDateStr] && activityStats[checkDateStr] > 0) {
setSelectedDay(checkDateStr);
found = true;
break;
}
currentDate.setUTCDate(currentDate.getUTCDate() + 1);
}
if (!found) {
toast.error(t("message.no-more-memos"));
}
};

const handlePrevMonth = () => {
if (!selectedDay) return;
const currentMonth = new Date(selectedDay);
currentMonth.setUTCMonth(currentMonth.getUTCMonth() - 1);

const prevMonthStr = currentMonth.toISOString().substring(0, 7);
const datesWithData = Object.keys(activityStats)
.filter((date) => date.startsWith(prevMonthStr))
.sort();
if (datesWithData.length > 0) {
setSelectedDay(datesWithData[0]);
} else {
handlePrevDay();
}
};
const handleNextMonth = () => {
if (!selectedDay) return;
const currentMonth = new Date(selectedDay);
currentMonth.setUTCMonth(currentMonth.getUTCMonth() + 1);
const nextMonthStr = currentMonth.toISOString().substring(0, 7);
const datesWithData = Object.keys(activityStats)
.filter((date) => date.startsWith(nextMonthStr))
.sort();
if (datesWithData.length > 0) {
setSelectedDay(datesWithData[0]);
} else {
const currentMonthStr = selectedDay.substring(0, 7);
const datesInCurrentMonth = Object.keys(activityStats)
.filter((date) => date.startsWith(currentMonthStr))
.sort();
if (datesInCurrentMonth.length > 0 && selectedDay !== datesInCurrentMonth[datesInCurrentMonth.length - 1]) {
setSelectedDay(datesInCurrentMonth[datesInCurrentMonth.length - 1]);
} else {
toast.error(t("message.no-more-memos"));
}
}
};

useEffect(() => {
nextPageTokenRef.current = undefined;
memoList.reset();
Expand Down Expand Up @@ -139,6 +227,23 @@ const Timeline = () => {
</div>
</div>
<div className="flex justify-end items-center gap-2">
{selectedDay && (
<div>
<IconButton variant="outlined" size="sm" onClick={() => handlePrevMonth()}>
<Icon.ChevronsLeft className="w-5 h-auto" />
</IconButton>
<IconButton variant="outlined" size="sm" onClick={() => handlePrevDay()}>
<Icon.ChevronLeft className="w-5 h-auto" />
</IconButton>
<IconButton variant="outlined" size="sm" onClick={() => handleNextDay()}>
<Icon.ChevronRight className="w-5 h-auto" />
</IconButton>
<IconButton variant="outlined" size="sm" onClick={() => handleNextMonth()}>
<Icon.ChevronsRight className="w-5 h-auto" />
</IconButton>
</div>
)}

<IconButton variant="outlined" size="sm" onClick={() => handleNewMemo()}>
<Icon.Plus className="w-5 h-auto" />
</IconButton>
Expand All @@ -147,41 +252,64 @@ const Timeline = () => {
<div className="w-full h-auto flex flex-col justify-start items-start">
<MemoFilter className="px-2 my-4" />

{groupedByMonth.map((group, index) => (
<Fragment key={group.month}>
<div className={classNames("flex flex-col justify-start items-start w-full mt-2 last:mb-4")}>
<div className={classNames("flex shrink-0 flex-row w-full pl-1 mt-2 mb-2")}>
<div className={classNames("w-full flex flex-col")}>
<span className="font-medium text-3xl leading-tight mb-1">
{new Date(group.month).toLocaleString(i18n.language, { month: "short", timeZone: "UTC" })}
</span>
<span className="opacity-60">{new Date(group.month).getUTCFullYear()}</span>
{activityStats &&
Object.keys(activityStats).length > 0 &&
groupedByMonth.map((group, index) => (
<Fragment key={group.month}>
<div className={classNames("flex flex-col justify-start items-start w-full mt-2 last:mb-4")}>
<div className={classNames("flex shrink-0 flex-row w-full pl-1 mt-2 mb-2", "sticky")}>
<div className={classNames("w-full flex flex-col")}>
<span className="font-medium text-3xl leading-tight mb-1">
{new Date(group.month).toLocaleString(i18n.language, { month: "short", timeZone: "UTC" })}
</span>
{selectedDay ? (
<span className="font-medium text-3xl leading-none mb-1">
{new Date(selectedDay).toLocaleDateString(i18n.language, {
month: "long",
day: "numeric",
timeZone: "UTC",
})}
</span>
) : (
<span className="font-medium text-3xl leading-none mb-1">
{new Date().toLocaleDateString(i18n.language, {
month: "long",
timeZone: "UTC",
})}
</span>
)}
<span className="opacity-60">{new Date(group.month).getUTCFullYear()}</span>
</div>
<ActivityCalendar
month={group.month}
data={group.data}
onClick={(date) => handleDateClick(date)}
selectedDate={selectedDay}
/>
</div>
<ActivityCalendar month={group.month} data={group.data} onClick={(date) => setSelectedDay(date)} />
</div>

<div className={classNames("w-full flex flex-col justify-start items-start")}>
{group.memos.map((memo, index) => (
<div
key={`${memo.name}-${memo.displayTime}`}
className={classNames("relative w-full flex flex-col justify-start items-start pl-4 sm:pl-10 pt-0")}
>
<MemoView className="!border max-w-full !border-gray-100 dark:!border-zinc-700" memo={memo} />
<div className="absolute -left-2 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 className={classNames("w-full flex flex-col justify-start items-start")}>
{group.memos.map((memo, index) => (
<div
key={`${memo.name}-${memo.displayTime}`}
className={classNames("relative w-full flex flex-col justify-start items-start pl-4 sm:pl-10 pt-0")}
>
<MemoView className="!border max-w-full !border-gray-100 dark:!border-zinc-700" memo={memo} />
<div className="absolute -left-2 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>
))}
))}
</div>
</div>
</div>
{index !== groupedByMonth.length - 1 && <Divider className="w-full !my-4 md:!mb-8 !bg-gray-100 dark:!bg-zinc-700" />}
</Fragment>
))}
{index !== groupedByMonth.length - 1 && <Divider className="w-full !my-4 md:!mb-8 !bg-gray-100 dark:!bg-zinc-700" />}
</Fragment>
))}
{isRequesting ? (
<div className="flex flex-row justify-center items-center w-full my-4 text-gray-400">
<Icon.Loader className="w-4 h-auto animate-spin mr-1" />
Expand Down