chore: remove sort by pinned

pull/4486/head
Johnny 4 months ago
parent ff13e0f353
commit 7123a2cf51

@ -38,7 +38,7 @@ const MemoDisplaySettingMenu = observer(({ className }: Props) => {
</Select> </Select>
</div> </div>
<div className="w-full flex flex-row justify-between items-center"> <div className="w-full flex flex-row justify-between items-center">
<span className="text-sm shrink-0 mr-3">{t("memo.masonry-view")}</span> <span className="text-sm shrink-0 mr-3">Layout</span>
<Select <Select
value={viewStore.state.layout} value={viewStore.state.layout}
onChange={(_, value) => onChange={(_, value) =>

@ -125,7 +125,6 @@ const MemoView: React.FC<Props> = (props: Props) => {
<div <div
className={cn( className={cn(
"group relative flex flex-col justify-start items-start w-full px-4 py-3 mb-2 gap-2 bg-white dark:bg-zinc-800 rounded-lg border border-white dark:border-zinc-800 hover:border-gray-200 dark:hover:border-zinc-700", "group relative flex flex-col justify-start items-start w-full px-4 py-3 mb-2 gap-2 bg-white dark:bg-zinc-800 rounded-lg border border-white dark:border-zinc-800 hover:border-gray-200 dark:hover:border-zinc-700",
props.showPinned && memo.pinned && "border-gray-200 border dark:border-zinc-700",
className, className,
)} )}
ref={memoContainerRef} ref={memoContainerRef}

@ -143,8 +143,7 @@
"direction-asc": "Ascending", "direction-asc": "Ascending",
"no-memos": "No memos.", "no-memos": "No memos.",
"click-to-show-nsfw-content": "Click to show NSFW contnet", "click-to-show-nsfw-content": "Click to show NSFW contnet",
"click-to-hide-nsfw-content": "Click to hide NSFW content", "click-to-hide-nsfw-content": "Click to hide NSFW content"
"masonry-view": "Masonry View"
}, },
"message": { "message": {
"archived-successfully": "Archived successfully", "archived-successfully": "Archived successfully",

@ -140,7 +140,6 @@
"filters": "Filtros", "filters": "Filtros",
"links": "Links", "links": "Links",
"load-more": "Carregar mais", "load-more": "Carregar mais",
"masonry-view": "Visão em grade",
"no-archived-memos": "Nenhum memo arquivado.", "no-archived-memos": "Nenhum memo arquivado.",
"no-memos": "Nenhum memo.", "no-memos": "Nenhum memo.",
"order-by": "Ordenar por", "order-by": "Ordenar por",
@ -409,4 +408,4 @@
"delete-tag": "Excluir Tag", "delete-tag": "Excluir Tag",
"no-tag-found": "Nenhuma tag encontrada" "no-tag-found": "Nenhuma tag encontrada"
} }
} }

@ -139,8 +139,7 @@
"direction-asc": "正序", "direction-asc": "正序",
"no-memos": "无备忘", "no-memos": "无备忘",
"click-to-show-nsfw-content": "点击显示 NSFW 内容", "click-to-show-nsfw-content": "点击显示 NSFW 内容",
"click-to-hide-nsfw-content": "点击隐藏 NSFW 内容", "click-to-hide-nsfw-content": "点击隐藏 NSFW 内容"
"masonry-view": "砖块视图"
}, },
"message": { "message": {
"archived-successfully": "归档成功", "archived-successfully": "归档成功",
@ -394,4 +393,4 @@
"blogs": "博客", "blogs": "博客",
"documents": "文档" "documents": "文档"
} }
} }

@ -57,7 +57,6 @@ const Home = observer(() => {
? dayjs(a.displayTime).unix() - dayjs(b.displayTime).unix() ? dayjs(a.displayTime).unix() - dayjs(b.displayTime).unix()
: dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix(), : dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix(),
) )
.sort((a, b) => Number(b.pinned) - Number(a.pinned))
} }
owner={user.name} owner={user.name}
direction={viewStore.state.orderByTimeAsc ? Direction.ASC : Direction.DESC} direction={viewStore.state.orderByTimeAsc ? Direction.ASC : Direction.DESC}

@ -112,7 +112,6 @@ const UserProfile = observer(() => {
? dayjs(a.displayTime).unix() - dayjs(b.displayTime).unix() ? dayjs(a.displayTime).unix() - dayjs(b.displayTime).unix()
: dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix(), : dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix(),
) )
.sort((a, b) => Number(b.pinned) - Number(a.pinned))
} }
owner={user.name} owner={user.name}
direction={viewStore.state.orderByTimeAsc ? Direction.ASC : Direction.DESC} direction={viewStore.state.orderByTimeAsc ? Direction.ASC : Direction.DESC}

Loading…
Cancel
Save