From 9ee51a58313bab6523ff968fc98348af4958b6e6 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Wed, 30 Nov 2022 15:30:17 +0800
Subject: [PATCH] ui: improve account switcher

---
 components/main/MainContent.vue  |  2 +-
 components/nav/NavSide.vue       |  1 +
 components/user/UserSwitcher.vue |  2 +-
 composables/screen.ts            |  1 +
 layouts/default.vue              | 31 ++++++++++++++++---------------
 5 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/components/main/MainContent.vue b/components/main/MainContent.vue
index 64ae5136..3ca7d9d7 100644
--- a/components/main/MainContent.vue
+++ b/components/main/MainContent.vue
@@ -21,7 +21,7 @@ defineProps<{
         </div>
         <div flex items-center>
           <slot name="actions" />
-          <NavUser v-if="isSmallScreen" />
+          <NavUser v-if="isMediumScreen" />
         </div>
       </div>
       <slot name="header" />
diff --git a/components/nav/NavSide.vue b/components/nav/NavSide.vue
index 0c00e857..eee95789 100644
--- a/components/nav/NavSide.vue
+++ b/components/nav/NavSide.vue
@@ -16,6 +16,7 @@ const { t } = useI18n()
       <NavSideItem :text="t('nav_side.favourites')" to="/favourites" icon="i-ri:heart-3-line" />
       <NavSideItem :text="t('nav_side.bookmarks')" to="/bookmarks" icon="i-ri:bookmark-line " />
       <NavSideItem
+        v-if="isMediumScreen"
         :text="currentUser.account.displayName"
         :to="getAccountPath(currentUser.account)"
         icon="i-ri:account-circle-line"
diff --git a/components/user/UserSwitcher.vue b/components/user/UserSwitcher.vue
index 8a0ae455..71508291 100644
--- a/components/user/UserSwitcher.vue
+++ b/components/user/UserSwitcher.vue
@@ -28,7 +28,7 @@ const switchUser = (user: UserLogin) => {
         aria-label="Switch user"
         @click="switchUser(user)"
       >
-        <AccountInfo :account="user.account" />
+        <AccountInfo :account="user.account" :hover-card="false" />
         <div flex-auto />
         <div v-if="user.token === currentUser?.token" i-ri:check-line text-primary mya text-2xl />
       </button>
diff --git a/composables/screen.ts b/composables/screen.ts
index 4b601579..3797cea5 100644
--- a/composables/screen.ts
+++ b/composables/screen.ts
@@ -3,3 +3,4 @@ import { breakpointsTailwind } from '@vueuse/core'
 export const breakpoints = useBreakpoints(breakpointsTailwind)
 
 export const isSmallScreen = breakpoints.smallerOrEqual('md')
+export const isMediumScreen = breakpoints.smallerOrEqual('lg')
diff --git a/layouts/default.vue b/layouts/default.vue
index f0f2fb35..8a587f5b 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -21,23 +21,24 @@
         <div sticky top-0 h-screen flex="~ col">
           <slot name="right">
             <UserSignInEntry v-if="!currentUser" />
-            <VDropdown
-              v-if="currentUser"
-              :distance="0"
-              placement="bottom-end"
-            >
-              <button
-                m5 p2 rounded-full text-start w-full
+            <div v-if="currentUser" py6 px4 w-full flex="~" items-center justify-between>
+              <NuxtLink
+                p2 rounded-full text-start w-full
                 hover:bg-active cursor-pointer transition-100
-                class="md:(w-7.5/10 rounded-5)"
-                aria-label="Switch account"
+                :to="getAccountPath(currentUser.account)"
               >
-                <AccountInfo :account="currentUser.account" md:flex="col" md:break-words />
-              </button>
-              <template #popper>
-                <UserSwitcher />
-              </template>
-            </VDropdown>
+                <AccountInfo :account="currentUser.account" md:break-words />
+              </NuxtLink>
+              <VDropdown :distance="0" placement="bottom-end">
+                <button btn-action-icon aria-label="Switch account">
+                  <div i-ri:more-2-line />
+                </button>
+                <template #popper>
+                  <UserSwitcher />
+                </template>
+              </VDropdown>
+            </div>
+
             <div flex-auto />
             <NavFooter />
           </slot>