YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-06-05 22:09:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: show pinned memos in explore (#1141)

Browse Source
This commit is contained in:
boojack
2023-02-23 19:59:18 +08:00
committed by GitHub
parent 1517688076
commit 6d2d322140
4 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server/memo.go
View File

@@ -209,22 +209,7 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {
if err != nil { if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, "Failed to fetch memo list").SetInternal(err) return echo.NewHTTPError(http.StatusInternalServerError, "Failed to fetch memo list").SetInternal(err)
} }
return c.JSON(http.StatusOK, composeResponse(list))
var pinnedMemoList []*api.Memo
var unpinnedMemoList []*api.Memo
for _, memo := range list {
if memo.Pinned {
pinnedMemoList = append(pinnedMemoList, memo)
} else {
unpinnedMemoList = append(unpinnedMemoList, memo)
}
}
memoList := []*api.Memo{}
memoList = append(memoList, pinnedMemoList...)
memoList = append(memoList, unpinnedMemoList...)
return c.JSON(http.StatusOK, composeResponse(memoList))
}) })
g.GET("/memo/:memoId", func(c echo.Context) error { g.GET("/memo/:memoId", func(c echo.Context) error {

2
store/memo.go
View File

@@ -306,7 +306,7 @@ func findMemoRawList(ctx context.Context, tx *sql.Tx, find *api.MemoFind) ([]*me
FROM memo FROM memo
LEFT JOIN memo_organizer ON memo_organizer.memo_id = memo.id LEFT JOIN memo_organizer ON memo_organizer.memo_id = memo.id
WHERE ` + strings.Join(where, " AND ") + ` WHERE ` + strings.Join(where, " AND ") + `
ORDER BY memo.created_ts DESC ORDER BY memo_organizer.pinned DESC, memo.created_ts DESC
` `
if find.Limit != nil { if find.Limit != nil {
query = fmt.Sprintf("%s LIMIT %d", query, *find.Limit) query = fmt.Sprintf("%s LIMIT %d", query, *find.Limit)

16
web/src/less/explore.less
View File

@@ -24,7 +24,21 @@
@apply relative flex-grow max-w-2xl w-full h-auto flex flex-col justify-start items-start px-4 sm:pr-6 ml-calc; @apply relative flex-grow max-w-2xl w-full h-auto flex flex-col justify-start items-start px-4 sm:pr-6 ml-calc;
> .memo-container { > .memo-container {
@apply flex flex-col justify-start items-start w-full p-4 mt-2 bg-white dark:bg-zinc-700 rounded-lg border border-white dark:border-zinc-800 hover:border-gray-200 dark:hover:border-zinc-600; @apply relative flex flex-col justify-start items-start w-full p-4 mt-2 bg-white dark:bg-zinc-700 rounded-lg border border-white dark:border-zinc-800 hover:border-gray-200 dark:hover:border-zinc-600;
&.pinned {
@apply border-gray-200 border-2 dark:border-zinc-600;
}
> .corner-container {
@apply absolute top-0 right-0 z-1;
&::after {
@apply rounded-tr-md absolute top-0 right-0 border-transparent border-t-green-600 border-r-green-600;
content: "";
border-width: 6px;
}
}
> .memo-header { > .memo-header {
@apply mb-2 w-full flex flex-row justify-start items-center text-sm text-gray-400; @apply mb-2 w-full flex flex-row justify-start items-center text-sm text-gray-400;

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

@@ -73,12 +73,7 @@ const Explore = () => {
}) })
: state.memos; : state.memos;
const sortedMemos = shownMemos const sortedMemos = shownMemos.filter((m) => m.rowStatus === "NORMAL");
.filter((m) => m.rowStatus === "NORMAL")
.sort((mi: Memo, mj: Memo) => {
return mj.createdTs - mi.createdTs;
});
const handleFetchMoreClick = async () => { const handleFetchMoreClick = async () => {
try { try {
const fetchedMemos = await memoStore.fetchAllMemos(DEFAULT_MEMO_LIMIT, state.memos.length); const fetchedMemos = await memoStore.fetchAllMemos(DEFAULT_MEMO_LIMIT, state.memos.length);
@@ -143,7 +138,8 @@ const Explore = () => {
{sortedMemos.map((memo) => { {sortedMemos.map((memo) => {
const createdAtStr = dayjs(memo.createdTs).locale(i18n.language).format("YYYY/MM/DD HH:mm:ss"); const createdAtStr = dayjs(memo.createdTs).locale(i18n.language).format("YYYY/MM/DD HH:mm:ss");
return ( return (
<div className="memo-container" key={memo.id}> <div className={`memo-container ${memo.pinned ? "pinned" : ""}`} key={memo.id}>
{memo.pinned && <div className="corner-container"></div>}
<div className="memo-header"> <div className="memo-header">
<span className="time-text">{createdAtStr}</span> <span className="time-text">{createdAtStr}</span>
<a className="name-text" href={`/u/${memo.creator.id}`}> <a className="name-text" href={`/u/${memo.creator.id}`}>