chore: cleanup SidebarNav, SidebarNavLink

Author: xidedix

src/components/Sidebar/SidebarNav.vue

@@ -21,13 +21,13 @@
                     <!-- Second level dropdown -->
                     <SidebarNavDropdown :key="index1" :name="childL1.name" :url="childL1.url" :icon="childL1.icon">
                       <li :key="index2" class="nav-item" v-for="(childL2, index2) in childL1.children">
-                        <SidebarNavLink :name="childL2.name" :url="childL2.url" :icon="childL2.icon" :badge="childL2.badge" :variant="item.variant" :attributes="item.attributes" />
+                        <SidebarNavLink :name="childL2.name" :url="childL2.url" :icon="childL2.icon" :badge="childL2.badge" :variant="childL2.variant" :attributes="childL2.attributes" />
                       </li>
                     </SidebarNavDropdown>
                   </template>
                   <template v-else>
                     <SidebarNavItem :key="index1" :classes="item.class">
-                      <SidebarNavLink :name="childL1.name" :url="childL1.url" :icon="childL1.icon" :badge="childL1.badge" :variant="item.variant" :attributes="item.attributes"/>
+                      <SidebarNavLink :name="childL1.name" :url="childL1.url" :icon="childL1.icon" :badge="childL1.badge" :variant="childL1.variant" :attributes="childL1.attributes"/>
                     </SidebarNavItem>
                   </template>
                 </template>

src/components/Sidebar/SidebarNavLink.vue

@@ -1,22 +1,16 @@
 <template>
-  <div v-if="isDisabled">
-    <a href :class="classList" v-bind="attributes" tabindex="-1">
-      <i :class="classIcon"></i> {{name}}
-      <b-badge v-if="badge && badge.text" :variant="badge.variant">{{badge.text}}</b-badge>
-    </a>
-  </div>
-  <div v-else-if="isExternalLink">
-    <a :href="url" :class="classList" v-bind="attributes">
-      <i :class="classIcon"></i> {{name}}
-      <b-badge v-if="badge && badge.text" :variant="badge.variant">{{badge.text}}</b-badge>
-    </a>
-  </div>
-  <div v-else>
-    <router-link :to="url" :class="classList" v-bind="attributes">
-      <i :class="classIcon"></i> {{name}}
-      <b-badge v-if="badge && badge.text" :variant="badge.variant">{{badge.text}}</b-badge>
-    </router-link>
-  </div>
+  <a :class="classList" v-bind="attributes" tabindex="-1" v-on:click.stop.prevent v-if="isDisabled">
+    <i :class="classIcon"></i> <span>{{name}}</span>
+    <b-badge v-if="badge && badge.text" :variant="badge.variant">{{badge.text}}</b-badge>
+  </a>
+  <a :href="url" :class="classList" v-bind="attributes" v-else-if="isExternalLink">
+    <i :class="classIcon"></i> {{name}}
+    <b-badge v-if="badge && badge.text" :variant="badge.variant">{{badge.text}}</b-badge>
+  </a>
+  <router-link :to="url" :class="classList" v-bind="attributes" v-else>
+    <i :class="classIcon"></i> {{name}}
+    <b-badge v-if="badge && badge.text" :variant="badge.variant">{{badge.text}}</b-badge>
+  </router-link>
 </template>
 
 <script>
@@ -78,7 +72,7 @@ export default {
       return this.getClassArray(this.attributes.class)
     },
     disabledClasses () {
-      return this.isDisabled ? 'disabled btn-link'.split(' ') : []
+      return this.isDisabled ? 'disabled'.split(' ') : []
     },
     isDisabled () {
       return Boolean(this.attributes.disabled)