From d045b96e80a11ebd344cc3e43ca51ed87c65d882 Mon Sep 17 00:00:00 2001 From: NoriDev Date: Thu, 26 Oct 2023 03:41:08 +0900 Subject: [PATCH] =?UTF-8?q?enhance(frontend):=20=EC=9A=94=EC=95=BD=20?= =?UTF-8?q?=ED=83=AD=EC=9D=98=20=EB=A6=AC=EC=95=A1=EC=85=98=EC=9D=84=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0=20&=20=EB=85=B8=ED=8A=B8=20=ED=83=AD?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=A6=AC=EC=95=A1=EC=85=98=EC=9D=84=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG_CHERRYPICK.md | 4 ++-- .../src/pages/user/index.timeline.vue | 4 ++++ packages/frontend/src/pages/user/index.vue | 8 +------- .../frontend/src/pages/user/reactions.vue | 20 +++++++++---------- 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md index 5328014621..780bfad0d9 100644 --- a/CHANGELOG_CHERRYPICK.md +++ b/CHANGELOG_CHERRYPICK.md @@ -38,8 +38,8 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2023xx](CHANGE - Enhance: 노트 작성 폼에서 노트를 게시한 뒤에 textarea의 높이를 원래대로 되돌림 - Enhance: 노트 상세 페이지의 답글 목록 개선 - Enhance: 유저 페이지 개선 - - 요약 탭의 하이라이트를 제거 - - 노트 탭으로 하이라이트를 이동 + - 요약 탭의 하이라이트를 제거 & 노트 탭으로 하이라이트를 이동 + - 요약 탭의 리액션을 제거 & 노트 탭으로 리액션을 이동 - chore: 이모티콘 이름 필드에서 autocapitalize를 끄기 (misskey-dev/misskey#12139) - Fix: 외부 리소스 설치 페이지에서 페이지 캐시가 작동하는 문제 수정 (misskey-dev/misskey#12105) - Fix: 채널 생성/업데이트 시 실패하면 아무 것도 표시되지 않는 문제 수정 misskey-dev/misskey#11983 (misskey-dev/misskey#12142) diff --git a/packages/frontend/src/pages/user/index.timeline.vue b/packages/frontend/src/pages/user/index.timeline.vue index 7beebdc1e4..25e548d55a 100644 --- a/packages/frontend/src/pages/user/index.timeline.vue +++ b/packages/frontend/src/pages/user/index.timeline.vue @@ -11,9 +11,11 @@ SPDX-License-Identifier: AGPL-3.0-only + + @@ -23,7 +25,9 @@ import { ref, computed } from 'vue'; import * as Misskey from 'cherrypick-js'; import MkNotes from '@/components/MkNotes.vue'; import MkTab from '@/components/MkTab.vue'; +import XReactions from '@/pages/user/reactions.vue'; import { i18n } from '@/i18n.js'; +import { $i } from '@/account.js'; const props = defineProps<{ user: Misskey.entities.UserDetailed; diff --git a/packages/frontend/src/pages/user/index.vue b/packages/frontend/src/pages/user/index.vue index 50e7af918f..7131af3f7d 100644 --- a/packages/frontend/src/pages/user/index.vue +++ b/packages/frontend/src/pages/user/index.vue @@ -15,7 +15,6 @@ SPDX-License-Identifier: AGPL-3.0-only - @@ -52,7 +51,6 @@ const XHome = defineAsyncComponent(() => import('./home.vue')); const XEvent = defineAsyncComponent(() => import('./events.vue')); const XActivity = defineAsyncComponent(() => import('./activity.vue')); const XAchievements = defineAsyncComponent(() => import('./achievements.vue')); -const XReactions = defineAsyncComponent(() => import('./reactions.vue')); const XClips = defineAsyncComponent(() => import('./clips.vue')); const XLists = defineAsyncComponent(() => import('./lists.vue')); const XPages = defineAsyncComponent(() => import('./pages.vue')); @@ -106,11 +104,7 @@ const headerTabs = $computed(() => user ? [{ key: 'achievements', title: i18n.ts.achievements, icon: 'ti ti-medal', -}] : []), ...($i && ($i.id === user.id)) || user.publicReactions ? [{ - key: 'reactions', - title: i18n.ts.reaction, - icon: 'ti ti-mood-happy', -}] : [], { +}] : []), { key: 'clips', title: i18n.ts.clips, icon: 'ti ti-paperclip', diff --git a/packages/frontend/src/pages/user/reactions.vue b/packages/frontend/src/pages/user/reactions.vue index da1f3cbfad..82de3edc46 100644 --- a/packages/frontend/src/pages/user/reactions.vue +++ b/packages/frontend/src/pages/user/reactions.vue @@ -4,18 +4,16 @@ SPDX-License-Identifier: AGPL-3.0-only -->