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.

feat: add memo display setting menu

Steven158745704e86
diff --git a/web/src/components/HomeSidebar/TagsSection.tsx b/web/src/components/HomeSidebar/TagsSection.tsx
index 2e64dbbd7..8411de151 100644
--- a/web/src/components/HomeSidebar/TagsSection.tsx
+++ b/web/src/components/HomeSidebar/TagsSection.tsx
@@ -68,7 +68,7 @@ const TagsSection = (props: Props) => {
<PopoverTrigger>
<Icon.MoreVertical className="w-4 h-auto shrink-0 opacity-60" />
</PopoverTrigger>
- <PopoverContent>
+ <PopoverContent align="end" alignOffset={-12}>
<div className="w-auto flex flex-row justify-between items-center gap-2">
<span className="text-sm shrink-0">Tree mode</span>
<Switch size="sm" checked={treeMode} onChange={(event) => setTreeMode(event.target.checked)} />
diff --git a/web/src/components/MemoDisplaySettingMenu.tsx b/web/src/components/MemoDisplaySettingMenu.tsx
new file mode 100644
index 000000000..97e242cea
--- /dev/null
+++ b/web/src/components/MemoDisplaySettingMenu.tsx
@@ -0,0 +1,43 @@
+import { Option, Select } from "@mui/joy";
+import clsx from "clsx";
+import { useMemoFilterStore } from "@/store/v1";
+import Icon from "./Icon";
+import { Popover, PopoverContent, PopoverTrigger } from "./ui/Popover";
+
+interface Props {
+ className?: string;
+}
+
+const MemoDisplaySettingMenu = ({ className }: Props) => {
+ const memoFilterStore = useMemoFilterStore();
+ const isApplying = Boolean(memoFilterStore.orderByTimeAsc) !== false;
+
+ return (
+ <Popover>
+ <PopoverTrigger
+ className={clsx(className, isApplying ? "text-teal-600 bg-teal-50 dark:text-teal-500 dark:bg-teal-900 rounded-sm" : "opacity-40")}
+ >
+ <Icon.Settings2 className="w-4 h-auto shrink-0" />
+ </PopoverTrigger>
+ <PopoverContent align="end" alignOffset={-12}>
+ <div className="flex flex-col gap-2">
+ <div className="w-full flex flex-row justify-between items-center">
+ <span className="text-sm shrink-0 mr-2">Order by</span>
+ <Select value="displayTime">
+ <Option value={"displayTime"}>Display Time</Option>
+ </Select>
+ </div>
+ <div className="w-full flex flex-row justify-between items-center">
+ <span className="text-sm shrink-0 mr-2">Direction</span>
+ <Select value={memoFilterStore.orderByTimeAsc} onChange={(_, value) => memoFilterStore.setOrderByTimeAsc(Boolean(value))}>
+ <Option value={false}>DESC</Option>
+ <Option value={true}>ASC</Option>
+ </Select>
+ </div>
+ </div>
+ </PopoverContent>
+ </Popover>
+ );
+};
+
+export default MemoDisplaySettingMenu;
diff --git a/web/src/components/MemoFilters.tsx b/web/src/components/MemoFilters.tsx
index 639b43b10..70fd6f391 100644
--- a/web/src/components/MemoFilters.tsx
+++ b/web/src/components/MemoFilters.tsx
@@ -40,15 +40,6 @@ const MemoFilters = () => {
</button>
</div>
))}
- <div
- className="flex flex-row items-center gap-1 pl-1.5 pr-1 hover:opacity-80 cursor-pointer"
- onClick={() => memoFilterStore.setOrderByTimeAsc(!memoFilterStore.orderByTimeAsc)}
- >
- <Icon.Clock className="w-4 h-auto text-gray-500 dark:text-gray-400 opacity-60" />
- <span className="text-gray-500 dark:text-gray-400 text-sm max-w-32 truncate">
- {memoFilterStore.orderByTimeAsc ? "Asc" : "Desc"}
- </span>
- </div>
</div>
</div>
);
diff --git a/web/src/components/SearchBar.tsx b/web/src/components/SearchBar.tsx
index 392381b28..27450fdd0 100644
--- a/web/src/components/SearchBar.tsx
+++ b/web/src/components/SearchBar.tsx
@@ -2,6 +2,7 @@ import { useState } from "react";
import { useMemoFilterStore } from "@/store/v1";
import { useTranslate } from "@/utils/i18n";
import Icon from "./Icon";
+import MemoDisplaySettingMenu from "./MemoDisplaySettingMenu";
const SearchBar = () => {
const t = useTranslate();
@@ -28,7 +29,7 @@ const SearchBar = () => {
return (
<div className="relative w-full h-auto flex flex-row justify-start items-center">
- <Icon.Search className="absolute left-3 w-4 h-auto opacity-30" />
+ <Icon.Search className="absolute left-3 w-4 h-auto opacity-40" />
<input
className="w-full text-gray-500 dark:text-gray-400 bg-zinc-50 dark:bg-zinc-900 border dark:border-zinc-800 text-sm leading-7 rounded-lg p-1 pl-8 outline-none"
placeholder={t("memo.search-placeholder")}
@@ -36,6 +37,7 @@ const SearchBar = () => {
onChange={onTextChange}
onKeyDown={onKeyDown}
/>
+ <MemoDisplaySettingMenu className="absolute right-3 top-3" />
</div>
);
};
diff --git a/web/src/components/UserStatisticsView.tsx b/web/src/components/UserStatisticsView.tsx
index be1cb5b34..0421217d2 100644
--- a/web/src/components/UserStatisticsView.tsx
+++ b/web/src/components/UserStatisticsView.tsx
@@ -90,7 +90,7 @@ const UserStatisticsView = () => {
<PopoverTrigger>
<Icon.MoreVertical className="w-4 h-auto shrink-0 opacity-60" />
</PopoverTrigger>
- <PopoverContent>
+ <PopoverContent align="end" alignOffset={-12}>
<button className="w-auto flex flex-row justify-between items-center gap-2 hover:opacity-80" onClick={rebuildMemoTags}>
<Icon.RefreshCcw className="text-gray-400 w-4 h-auto cursor-pointer opacity-60" />
<span className="text-sm shrink-0 text-gray-500 dark:text-gray-400">Refresh</span>
diff --git a/web/src/pages/Archived.tsx b/web/src/pages/Archived.tsx
index 034de908e..18369d60c 100644
--- a/web/src/pages/Archived.tsx
+++ b/web/src/pages/Archived.tsx
@@ -27,7 +27,7 @@ const Archived = () => {
const sortedMemos = memoList.value
.filter((memo) => memo.rowStatus === RowStatus.ARCHIVED)
.sort((a, b) =>
- memoFilterStore.orderByTimeAsc && memoFilterStore.filters.length > 0
+ memoFilterStore.orderByTimeAsc
? dayjs(a.displayTime).unix() - dayjs(b.displayTime).unix()
: dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix(),
);
@@ -49,7 +49,7 @@ const Archived = () => {
tagSearch.push(`"${filter.value}"`);
}
}
- if (memoFilterStore.orderByTimeAsc && memoFilterStore.filters.length > 0) {
+ if (memoFilterStore.orderByTimeAsc) {
filters.push(`order_by_time_asc == true`);
}
if (contentSearch.length > 0) {
diff --git a/web/src/pages/Explore.tsx b/web/src/pages/Explore.tsx
index 20cc9f809..9fced6506 100644
--- a/web/src/pages/Explore.tsx
+++ b/web/src/pages/Explore.tsx
@@ -24,7 +24,7 @@ const Explore = () => {
const [isRequesting, setIsRequesting] = useState(true);
const [nextPageToken, setNextPageToken] = useState<string>("");
const sortedMemos = memoList.value.sort((a, b) =>
- memoFilterStore.orderByTimeAsc && memoFilterStore.filters.length > 0
+ memoFilterStore.orderByTimeAsc
? dayjs(a.displayTime).unix() - dayjs(b.displayTime).unix()
: dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix(),
);
@@ -46,7 +46,7 @@ const Explore = () => {
tagSearch.push(`"${filter.value}"`);
}
}
- if (memoFilterStore.orderByTimeAsc && memoFilterStore.filters.length > 0) {
+ if (memoFilterStore.orderByTimeAsc) {
filters.push(`order_by_time_asc == true`);
}
if (contentSearch.length > 0) {
diff --git a/web/src/pages/Home.tsx b/web/src/pages/Home.tsx
index 7bb494e23..22add5e82 100644
--- a/web/src/pages/Home.tsx
+++ b/web/src/pages/Home.tsx
@@ -28,7 +28,7 @@ const Home = () => {
const sortedMemos = memoList.value
.filter((memo) => memo.rowStatus === RowStatus.ACTIVE)
.sort((a, b) =>
- memoFilterStore.orderByTimeAsc && memoFilterStore.filters.length > 0
+ memoFilterStore.orderByTimeAsc
? dayjs(a.displayTime).unix() - dayjs(b.displayTime).unix()
: dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix(),
)
@@ -61,7 +61,7 @@ const Home = () => {
filters.push(`display_time_before == ${timestampAfter + 60 * 60 * 24}`);
}
}
- if (memoFilterStore.orderByTimeAsc && memoFilterStore.filters.length > 0) {
+ if (memoFilterStore.orderByTimeAsc) {
filters.push(`order_by_time_asc == true`);
}
if (contentSearch.length > 0) {
diff --git a/web/src/pages/UserProfile.tsx b/web/src/pages/UserProfile.tsx
index 4649388ee..7b698fd39 100644
--- a/web/src/pages/UserProfile.tsx
+++ b/web/src/pages/UserProfile.tsx
@@ -28,11 +28,7 @@ const UserProfile = () => {
const [isRequesting, setIsRequesting] = useState(true);
const [nextPageToken, setNextPageToken] = useState<string>("");
const sortedMemos = memoList.value
- .sort((a, b) =>
- memoFilterStore.orderByTimeAsc && memoFilterStore.filters.length > 0
- ? dayjs(a.displayTime).unix() - dayjs(b.displayTime).unix()
- : dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix(),
- )
+ .sort((a, b) => dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix())
.sort((a, b) => Number(b.pinned) - Number(a.pinned));
useEffect(() => {
@@ -82,9 +78,6 @@ const UserProfile = () => {
tagSearch.push(`"${filter.value}"`);
}
}
- if (memoFilterStore.orderByTimeAsc && memoFilterStore.filters.length > 0) {
- filters.push(`order_by_time_asc == true`);
- }
if (contentSearch.length > 0) {
filters.push(`content_search == [${contentSearch.join(", ")}]`);
}
diff --git a/web/src/theme/index.ts b/web/src/theme/index.ts
index a9405043e..d202c02fe 100644
--- a/web/src/theme/index.ts
+++ b/web/src/theme/index.ts
@@ -16,6 +16,11 @@ const theme = extendTheme({
defaultProps: {
size: "sm",
},
+ styleOverrides: {
+ listbox: {
+ zIndex: 9999,
+ },
+ },
},
},
});