From 7123a2cf5173d5ae7797db36af055d5633683aee Mon Sep 17 00:00:00 2001
From: Johnny <yourselfhosted@gmail.com>
Date: Mon, 10 Mar 2025 21:32:17 +0800
Subject: [PATCH] chore: remove sort by pinned

---
 web/src/components/MemoDisplaySettingMenu.tsx | 2 +-
 web/src/components/MemoView.tsx               | 1 -
 web/src/locales/en.json                       | 3 +--
 web/src/locales/pt-BR.json                    | 3 +--
 web/src/locales/zh-Hans.json                  | 5 ++---
 web/src/pages/Home.tsx                        | 1 -
 web/src/pages/UserProfile.tsx                 | 1 -
 7 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/web/src/components/MemoDisplaySettingMenu.tsx b/web/src/components/MemoDisplaySettingMenu.tsx
index 9327475d9..249325a1b 100644
--- a/web/src/components/MemoDisplaySettingMenu.tsx
+++ b/web/src/components/MemoDisplaySettingMenu.tsx
@@ -38,7 +38,7 @@ const MemoDisplaySettingMenu = observer(({ className }: Props) => {
             </Select>
           </div>
           <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
               value={viewStore.state.layout}
               onChange={(_, value) =>
diff --git a/web/src/components/MemoView.tsx b/web/src/components/MemoView.tsx
index 9420bb94c..ab5e21067 100644
--- a/web/src/components/MemoView.tsx
+++ b/web/src/components/MemoView.tsx
@@ -125,7 +125,6 @@ const MemoView: React.FC<Props> = (props: Props) => {
     <div
       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",
-        props.showPinned && memo.pinned && "border-gray-200 border dark:border-zinc-700",
         className,
       )}
       ref={memoContainerRef}
diff --git a/web/src/locales/en.json b/web/src/locales/en.json
index b4a1eba2f..f3548912d 100644
--- a/web/src/locales/en.json
+++ b/web/src/locales/en.json
@@ -143,8 +143,7 @@
     "direction-asc": "Ascending",
     "no-memos": "No memos.",
     "click-to-show-nsfw-content": "Click to show NSFW contnet",
-    "click-to-hide-nsfw-content": "Click to hide NSFW content",
-    "masonry-view": "Masonry View"
+    "click-to-hide-nsfw-content": "Click to hide NSFW content"
   },
   "message": {
     "archived-successfully": "Archived successfully",
diff --git a/web/src/locales/pt-BR.json b/web/src/locales/pt-BR.json
index 5fb6384aa..e16bb2cd3 100644
--- a/web/src/locales/pt-BR.json
+++ b/web/src/locales/pt-BR.json
@@ -140,7 +140,6 @@
     "filters": "Filtros",
     "links": "Links",
     "load-more": "Carregar mais",
-    "masonry-view": "Visão em grade",
     "no-archived-memos": "Nenhum memo arquivado.",
     "no-memos": "Nenhum memo.",
     "order-by": "Ordenar por",
@@ -409,4 +408,4 @@
     "delete-tag": "Excluir Tag",
     "no-tag-found": "Nenhuma tag encontrada"
   }
-}
+}
\ No newline at end of file
diff --git a/web/src/locales/zh-Hans.json b/web/src/locales/zh-Hans.json
index 72c01271c..713550377 100644
--- a/web/src/locales/zh-Hans.json
+++ b/web/src/locales/zh-Hans.json
@@ -139,8 +139,7 @@
     "direction-asc": "正序",
     "no-memos": "无备忘",
     "click-to-show-nsfw-content": "点击显示 NSFW 内容",
-    "click-to-hide-nsfw-content": "点击隐藏 NSFW 内容",
-    "masonry-view": "砖块视图"
+    "click-to-hide-nsfw-content": "点击隐藏 NSFW 内容"
   },
   "message": {
     "archived-successfully": "归档成功",
@@ -394,4 +393,4 @@
     "blogs": "博客",
     "documents": "文档"
   }
-}
+}
\ No newline at end of file
diff --git a/web/src/pages/Home.tsx b/web/src/pages/Home.tsx
index 99b46751a..c2291ac23 100644
--- a/web/src/pages/Home.tsx
+++ b/web/src/pages/Home.tsx
@@ -57,7 +57,6 @@ const Home = observer(() => {
               ? dayjs(a.displayTime).unix() - dayjs(b.displayTime).unix()
               : dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix(),
           )
-          .sort((a, b) => Number(b.pinned) - Number(a.pinned))
       }
       owner={user.name}
       direction={viewStore.state.orderByTimeAsc ? Direction.ASC : Direction.DESC}
diff --git a/web/src/pages/UserProfile.tsx b/web/src/pages/UserProfile.tsx
index 98c8a5b4f..02c954c38 100644
--- a/web/src/pages/UserProfile.tsx
+++ b/web/src/pages/UserProfile.tsx
@@ -112,7 +112,6 @@ const UserProfile = observer(() => {
                         ? dayjs(a.displayTime).unix() - dayjs(b.displayTime).unix()
                         : dayjs(b.displayTime).unix() - dayjs(a.displayTime).unix(),
                     )
-                    .sort((a, b) => Number(b.pinned) - Number(a.pinned))
                 }
                 owner={user.name}
                 direction={viewStore.state.orderByTimeAsc ? Direction.ASC : Direction.DESC}