From 5474635320b6a38af8c2a99b34b231c73704628d Mon Sep 17 00:00:00 2001
From: fs5m8 <fsco3092@protonmail.com>
Date: Thu, 18 Aug 2022 03:25:37 +0900
Subject: [PATCH] Fix: Sidebar

---
 .../desktop/views/components/ui.sidebar.vue   | 60 +++++++------------
 1 file changed, 23 insertions(+), 37 deletions(-)

diff --git a/src/client/app/desktop/views/components/ui.sidebar.vue b/src/client/app/desktop/views/components/ui.sidebar.vue
index c355ca7f14..6ba3f976c6 100644
--- a/src/client/app/desktop/views/components/ui.sidebar.vue
+++ b/src/client/app/desktop/views/components/ui.sidebar.vue
@@ -1,6 +1,11 @@
 <template>
 <div class="header" :class="navbar" :data-shadow="$store.state.device.useShadow">
 	<div class="body">
+		<div class="account">
+			<router-link :to="`/@${ $store.state.i.username }`">
+				<mk-avatar class="avatar" :user="$store.state.i"/>
+			</router-link>
+		</div>
 		<div class="post">
 			<button @click="post" :title="$t('title')"><fa icon="pencil-alt"/></button>
 		</div>
@@ -24,6 +29,9 @@
 			<div :title="$t('@.drive')">
 				<a @click="drive"><fa icon="cloud"/></a>
 			</div>
+			<div>
+				<router-link to="/i/favorites"><fa icon="star"/></router-link>
+			</div>
 			<div ref="notificationsButton" :class="{ active: showNotifications }">
 				<a @click="notifications"><fa :icon="['far', 'bell']"/></a>
 			</div>
@@ -36,28 +44,6 @@
 			<div class="signout">
 				<a @click="signout"><fa icon="power-off"/></a>
 			</div>
-			<div>
-				<router-link to="/i/favorites"><fa icon="star"/></router-link>
-			</div>
-			<div v-if="($store.state.i.isLocked || $store.state.i.carefulBot || $store.state.i.carefulRemote)">
-				<a @click="followRequests"><fa :icon="['far', 'envelope']"/><i v-if="$store.state.i.pendingReceivedFollowRequestsCount">{{ $store.state.i.pendingReceivedFollowRequestsCount }}</i></a>
-			</div>
-			<div class="account">
-				<router-link :to="`/@${ $store.state.i.username }`">
-					<mk-avatar class="avatar" :user="$store.state.i"/>
-				</router-link>
-			</div>
-			<div>
-				<template v-if="$store.state.device.inDeckMode">
-					<a @click="toggleDeckMode(false)"><fa icon="home"/></a>
-				</template>
-				<template v-else>
-					<a @click="toggleDeckMode(true)"><fa icon="columns"/></a>
-				</template>
-			</div>
-			<div>
-				<a @click="dark"><template v-if="$store.state.device.darkmode"><fa icon="moon"/></template><template v-else><fa :icon="['far', 'moon']"/></template></a>
-			</div>
 		</div>
 	</div>
 
@@ -274,6 +260,21 @@ export default Vue.extend({
 		height 100%
 		background var(--desktopHeaderBg)
 
+		> .account
+			width $width
+			height $width
+			padding 14px
+
+			> *
+				display block
+				width 100%
+				height 100%
+
+				> .avatar
+					pointer-events none
+					width 100%
+					height 100%
+
 		> .post
 			width $width
 			height $width
@@ -311,21 +312,6 @@ export default Vue.extend({
 			bottom 0
 			left 0
 
-			> .account
-				width $width
-				height $width
-				padding 14px
-
-				> *
-					display block
-					width 100%
-					height 100%
-
-					> .avatar
-						pointer-events none
-						width 100%
-						height 100%
-
 	> .notifications
 		position fixed
 		top 0