From ea2b007b1a5459343dbf4dd49531768fbb8cad38 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Thu, 7 Sep 2023 16:54:19 -0500
Subject: [PATCH] fix(profile): focus behavior

---
 .../src/components/userMenu/profile.vue       | 53 +++++++++----------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/website/client/src/components/userMenu/profile.vue b/website/client/src/components/userMenu/profile.vue
index 9b1bd4dbb7..6772ef6eb3 100644
--- a/website/client/src/components/userMenu/profile.vue
+++ b/website/client/src/components/userMenu/profile.vue
@@ -222,23 +222,19 @@
                   <!-- ADMIN PANEL -->
                   <b-dropdown-item
                     v-if="hasPermission(userLoggedIn, 'userSupport')"
-                    class="selectListItem view-admin-panel"
+                    class="selectListItem"
+                    @click="openAdminPanel()"
                   >
-                    <router-link
-                      :to="{ name: 'adminPanelUser',
-                             params: { userIdentifier: user._id } }"
-                    >
-                      <span class="with-icon">
-                        <span
-                          v-once
-                          class="svg-icon icon-16 color"
-                          v-html="icons.crown"
-                        ></span>
-                        <span v-once>
-                          {{ $t('viewAdminPanel') }}
-                        </span>
+                    <span class="with-icon">
+                      <span
+                        v-once
+                        class="svg-icon icon-16 color"
+                        v-html="icons.crown"
+                      ></span>
+                      <span v-once>
+                        {{ $t('viewAdminPanel') }}
                       </span>
-                    </router-link>
+                    </span>
                   </b-dropdown-item>
 
                   <!-- BAN USER -->
@@ -580,8 +576,11 @@
       }
     }
 
-    .dropdown-item:not(.disabled):hover svg {
-      color: $purple-300;
+    .dropdown-item:not(.disabled):hover,
+    .dropdown-item:not(.disabled):focus {
+      a, svg {
+        color: $purple-300;
+      }
     }
 
     .drawer-toggle-icon {
@@ -604,7 +603,13 @@
       }
       &.block-ban {
         &:hover, .dropdown-item:hover {
+          color: $maroon-50 !important;
           background-color: rgba($red-500, 0.25) !important;
+          svg {
+            color: $maroon-50;
+          }
+        }
+        &:focus, .dropdown-item:focus {
           color: $maroon-50 !important;
           svg {
             color: $maroon-50;
@@ -714,16 +719,6 @@
     }
   }
 
-  .view-admin-panel
-   a, a:not([href]):not([tabindex]) {
-    cursor: pointer;
-    color: $gray-50;
-    text-decoration: none;
-    &:hover {
-      color:$purple-300;
-    }
-  }
-
   .profile-actions {
     float: right;
     margin-right: 16px;
@@ -1410,6 +1405,10 @@ export default {
         username: this.user.auth.local.username,
       });
     },
+
+    openAdminPanel () {
+      this.$router.push(`/admin-panel/${this.hero._id}`);
+    },
   },
 };
 </script>