happyz
/
memos
mirror of https://github.com/usememos/memos.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed the pinned error

This commit is contained in:
Rashel Shah 2025-10-04 23:32:34 +05:30
parent bcfcb1b554
commit 6a2db5f27c
7 changed files with 10070 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10019
web/package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

14
web/src/pages/Archived.tsx
View File

@ -31,11 +31,17 @@ const Archived = observer(() => {
listSort={(memos: Memo[]) =>
memos
.filter((memo) => memo.state === State.ARCHIVED)
.sort((a, b) =>
viewStore.state.orderByTimeAsc
.sort((a, b) => {
if (a.pinned && !b.pinned) {
return -1;
}
if (!a.pinned && b.pinned) {
return 1;
}
return viewStore.state.orderByTimeAsc
? dayjs(a.displayTime).unix() - dayjs(b.displayTime).unix()
: dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix(),
)
: dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix();
})
}
state={State.ARCHIVED}
orderBy={viewStore.state.orderByTimeAsc ? "display_time asc" : "display_time desc"}

14
web/src/pages/Explore.tsx
View File

@ -20,11 +20,17 @@ const Explore = observer(() => {
listSort={(memos: Memo[]) =>
memos
.filter((memo) => memo.state === State.NORMAL)
.sort((a, b) =>
viewStore.state.orderByTimeAsc
.sort((a, b) => {
if (a.pinned && !b.pinned) {
return -1;
}
if (!a.pinned && b.pinned) {
return 1;
}
return viewStore.state.orderByTimeAsc
? dayjs(a.displayTime).unix() - dayjs(b.displayTime).unix()
: dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix(),
)
: dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix();
})
}
orderBy={viewStore.state.orderByTimeAsc ? "display_time asc" : "display_time desc"}
/>

14
web/src/pages/Home.tsx
View File

@ -60,11 +60,17 @@ const Home = observer(() => {
listSort={(memos: Memo[]) =>
memos
.filter((memo) => memo.state === State.NORMAL)
.sort((a, b) =>
viewStore.state.orderByTimeAsc
.sort((a, b) => {
if (a.pinned && !b.pinned) {
return -1;
}
if (!a.pinned && b.pinned) {
return 1;
}
return viewStore.state.orderByTimeAsc
? dayjs(a.displayTime).unix() - dayjs(b.displayTime).unix()
: dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix(),
)
: dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix();
})
}
orderBy={viewStore.state.orderByTimeAsc ? "display_time asc" : "display_time desc"}
filter={memoFilter}

14
web/src/pages/UserProfile.tsx
View File

@ -95,11 +95,17 @@ const UserProfile = observer(() => {
listSort={(memos: Memo[]) =>
memos
.filter((memo) => memo.state === State.NORMAL)
.sort((a, b) =>
viewStore.state.orderByTimeAsc
.sort((a, b) => {
if (a.pinned && !b.pinned) {
return -1;
}
if (!a.pinned && b.pinned) {
return 1;
}
return viewStore.state.orderByTimeAsc
? dayjs(a.displayTime).unix() - dayjs(b.displayTime).unix()
: dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix(),
)
: dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix();
})
}
orderBy={viewStore.state.orderByTimeAsc ? "display_time asc" : "display_time desc"}
filter={memoFilter}

10
web/src/store/memo.ts
View File

@ -21,7 +21,15 @@ class LocalState {
}
get memos() {
return Object.values(this.memoMapByName);
return Object.values(this.memoMapByName).sort((a, b) => {
if (a.pinned && !b.pinned) {
return -1;
}
if (!a.pinned && b.pinned) {
return 1;
}
return 0;
});
}
get size() {

4
web/vite.config.mts
View File

@ -13,11 +13,11 @@ if (process.env.DEV_PROXY_SERVER && process.env.DEV_PROXY_SERVER.length > 0) {
// https://vitejs.dev/config/
export default defineConfig({
plugins: [
react(),
tailwindcss(),
codeInspectorPlugin({
bundler: "vite",
}),
react(),
tailwindcss(),
],
server: {
host: "0.0.0.0",