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: fix memos sorting

Stevena50f3b938255
diff --git a/web/src/pages/Archived.tsx b/web/src/pages/Archived.tsx
index bac94b2a2..cc28c7b3f 100644
--- a/web/src/pages/Archived.tsx
+++ b/web/src/pages/Archived.tsx
@@ -1,4 +1,5 @@
import { Button, Tooltip } from "@mui/joy";
+import dayjs from "dayjs";
import { ClientError } from "nice-grpc-web";
import { useEffect, useState } from "react";
import toast from "react-hot-toast";
@@ -23,7 +24,9 @@ const Archived = () => {
const memoFilterStore = useMemoFilterStore();
const [isRequesting, setIsRequesting] = useState(true);
const [nextPageToken, setNextPageToken] = useState<string>("");
- const sortedMemos = memoList.value.filter((memo) => memo.rowStatus === RowStatus.ARCHIVED);
+ const sortedMemos = memoList.value
+ .filter((memo) => memo.rowStatus === RowStatus.ARCHIVED)
+ .sort((a, b) => dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix());
useEffect(() => {
memoList.reset();
diff --git a/web/src/pages/Explore.tsx b/web/src/pages/Explore.tsx
index 9281a2377..5863577b0 100644
--- a/web/src/pages/Explore.tsx
+++ b/web/src/pages/Explore.tsx
@@ -1,5 +1,6 @@
import { Button } from "@mui/joy";
import clsx from "clsx";
+import dayjs from "dayjs";
import { useEffect, useState } from "react";
import Empty from "@/components/Empty";
import { ExploreSidebar, ExploreSidebarDrawer } from "@/components/ExploreSidebar";
@@ -22,7 +23,7 @@ const Explore = () => {
const memoFilterStore = useMemoFilterStore();
const [isRequesting, setIsRequesting] = useState(true);
const [nextPageToken, setNextPageToken] = useState<string>("");
- const sortedMemos = memoList.value;
+ const sortedMemos = memoList.value.sort((a, b) => dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix());
useEffect(() => {
memoList.reset();
diff --git a/web/src/pages/Home.tsx b/web/src/pages/Home.tsx
index a729cfe25..a6aca6a83 100644
--- a/web/src/pages/Home.tsx
+++ b/web/src/pages/Home.tsx
@@ -1,5 +1,6 @@
import { Button } from "@mui/joy";
import clsx from "clsx";
+import dayjs from "dayjs";
import { useEffect, useState } from "react";
import Empty from "@/components/Empty";
import { HomeSidebar, HomeSidebarDrawer } from "@/components/HomeSidebar";
@@ -26,6 +27,7 @@ const Home = () => {
const [nextPageToken, setNextPageToken] = useState<string>("");
const sortedMemos = memoList.value
.filter((memo) => memo.rowStatus === RowStatus.ACTIVE)
+ .sort((a, b) => dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix())
.sort((a, b) => Number(b.pinned) - Number(a.pinned));
useEffect(() => {
diff --git a/web/src/pages/UserProfile.tsx b/web/src/pages/UserProfile.tsx
index 9aa02a728..7b698fd39 100644
--- a/web/src/pages/UserProfile.tsx
+++ b/web/src/pages/UserProfile.tsx
@@ -1,5 +1,6 @@
import { Button } from "@mui/joy";
import copy from "copy-to-clipboard";
+import dayjs from "dayjs";
import { useEffect, useState } from "react";
import { toast } from "react-hot-toast";
import { useParams } from "react-router-dom";
@@ -26,7 +27,9 @@ const UserProfile = () => {
const memoFilterStore = useMemoFilterStore();
const [isRequesting, setIsRequesting] = useState(true);
const [nextPageToken, setNextPageToken] = useState<string>("");
- const sortedMemos = memoList.value.sort((a, b) => Number(b.pinned) - Number(a.pinned));
+ const sortedMemos = memoList.value
+ .sort((a, b) => dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix())
+ .sort((a, b) => Number(b.pinned) - Number(a.pinned));
useEffect(() => {
const username = params.username;