From 25eb8a8c005c7b9e4a9a2cb5e4988ed1e042cdea Mon Sep 17 00:00:00 2001
From: NoriDev <m1nthing2322@gmail.com>
Date: Tue, 30 May 2023 16:50:49 +0900
Subject: [PATCH] =?UTF-8?q?feat(client/friendly):=20=E3=83=87=E3=82=B9?=
 =?UTF-8?q?=E3=82=AF=E3=83=88=E3=83=83=E3=83=97=E3=83=A2=E3=83=BC=E3=83=89?=
 =?UTF-8?q?=E3=81=A7=E3=82=BF=E3=82=A4=E3=83=A0=E3=83=A9=E3=82=A4=E3=83=B3?=
 =?UTF-8?q?=E3=81=AE=E6=A8=AA=E3=81=AB=E9=80=9A=E7=9F=A5=E9=A0=98=E5=9F=9F?=
 =?UTF-8?q?=E3=82=92=E9=85=8D=E7=BD=AE=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG_CHERRYPICK.md               |  1 +
 packages/frontend/src/ui/friendly.vue | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md
index 5e675ae178..9ec392546d 100644
--- a/CHANGELOG_CHERRYPICK.md
+++ b/CHANGELOG_CHERRYPICK.md
@@ -20,6 +20,7 @@
 - (Friendly) 모바일에서 하단 바를 길게 눌러 나오는 계정 관리 팝업에서 로그아웃 버튼 제거
 - (Friendly) 모바일에서 하단 바를 길게 눌러 나오는 계정 관리 팝업에서 현재 계정의 이름을 표시하도록
 - (Friendly) 데스크톱 헤더 디자인 개선
+- (Friendly) 데스크톱 모드에서 타임라인 옆에 알림 영역을 배치하도록
 - 채팅 및 그룹 기능 유지 (revert: [misskey-dev/misskey#9919](https://github.com/misskey-dev/misskey/pull/9919), [misskey-dev/misskey#9942](https://github.com/misskey-dev/misskey/pull/9942))
 - 클라이언트에서 사용되는 폰트의 확장자를 ttf에서 woff2 및 woff로 변경 ([@mk-castella](https://github.com/libnare/mk-castella/commit/f439b3e007618c02da7a352016b3d0f397311f54))
 - about-misskey 페이지에 CherryPick 관련 정보 추가 및 Misskey 문단 구분명 추가
diff --git a/packages/frontend/src/ui/friendly.vue b/packages/frontend/src/ui/friendly.vue
index 25f6c07e07..abb347cc0e 100644
--- a/packages/frontend/src/ui/friendly.vue
+++ b/packages/frontend/src/ui/friendly.vue
@@ -12,6 +12,10 @@
 		</main>
 	</MkStickyContainer>
 
+	<div v-if="isDesktop && mainRouter.currentRoute.value.name !== 'my-notifications'" :class="$style.notificationWidgets">
+		<XNotifications/>
+	</div>
+
 	<div v-if="isDesktop" :class="$style.widgets">
 		<XWidgets/>
 	</div>
@@ -107,6 +111,7 @@ import { eventBus } from '@/scripts/cherrypick/eventBus';
 import { CURRENT_STICKY_BOTTOM } from '@/const';
 import CPAvatar from '@/components/global/CPAvatar-Friendly.vue';
 const XWidgets = defineAsyncComponent(() => import('./universal.widgets.vue'));
+const XNotifications = defineAsyncComponent(() => import('@/pages/notifications.vue'));
 const XSidebar = defineAsyncComponent(() => import('@/ui/friendly/navbar.vue'));
 const XStatusBars = defineAsyncComponent(() => import('@/ui/_common_/statusbars.vue'));
 
@@ -172,9 +177,6 @@ defaultStore.loaded.then(() => {
 		defaultStore.set('widgets', [{
 			name: 'calendar',
 			id: 'a', place: 'right', data: {},
-		}, {
-			name: 'notifications',
-			id: 'b', place: 'right', data: {},
 		}, {
 			name: 'trends',
 			id: 'c', place: 'right', data: {},
@@ -372,6 +374,11 @@ $float-button-size: 65px;
 	}
 }
 
+.notificationWidgets {
+	composes: widgets;
+	padding: initial;
+}
+
 .floatNavButton {
 	display: block;
 	position: fixed;