@appscode/design-system 1.0.43-alpha.195 → 1.0.43-alpha.196

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appscode/design-system",
-  "version": "1.0.43-alpha.195",
+  "version": "1.0.43-alpha.196",
   "description": "A design system for Appscode websites and dashboards made using Bulma",
   "main": "main.scss",
   "scripts": {

package/vue-components/v2/navbar/User.vue

@@ -132,7 +132,15 @@
             </transition-group>
           </li>
           <li key="dashboard">
+            <nuxt-link
+              v-if="isPlatformDomain"
+              to="/dashboard"
+              data-testid="user-dashboard-link"
+            >
+              Dashboard
+            </nuxt-link>
             <a
+              v-else
               :href="`${serverDomain}/dashboard`"
               data-testid="user-dashboard-link"
             >
@@ -182,6 +190,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    isPlatformDomain: {
+      type: Boolean,
+      default: false,
+    },
   },
 
   components: {

package/vue-components/v3/navbar/User.vue

@@ -8,13 +8,21 @@
       </div>
     </button>
     <navbar-item-content class="navbar-dropdown-wrapper">
-      <div v-if="user.username" class="user-profile-wrapper" @mouseleave="onMouseLeave()">
+      <div
+        v-if="user.username"
+        class="user-profile-wrapper"
+        @mouseleave="onMouseLeave()"
+      >
         <div class="profile-area">
           <div class="profile-photo">
-            <img :src="user.avatar_url" alt="User Photo" class="width-50 height-50" />
+            <img
+              :src="user.avatar_url"
+              alt="User Photo"
+              class="width-50 height-50"
+            />
             <button class="camera-icon"></button>
           </div>
-          <div class="profile-info" style="width: calc(100% - 60px);">
+          <div class="profile-info" style="width: calc(100% - 60px)">
             <a
               :href="`${serverDomain}/${user.username}`"
               :title="user.username.toUpperCase()"
@@ -31,8 +39,13 @@
           <li v-if="user.is_admin" key="site-admin">
             <a :href="`${accountsDomain}/admin`">Site Administration</a>
           </li>
-          <li v-if="showAccountSwitcher" :class="`is-${dropDownStatus}`" key="switcher">
-            <a class="
+          <li
+            v-if="showAccountSwitcher"
+            :class="`is-${dropDownStatus}`"
+            key="switcher"
+          >
+            <a
+              class="
                 ac-dropdown-button
                 is-fullwidth
                 is-flex
@@ -50,7 +63,9 @@
                 ></i
               ></span>
             </a>
-            <transition-group name="list" tag="ul"
+            <transition-group
+              name="list"
+              tag="ul"
               class="ac-vscrollbar"
               ref="dropdownItems"
               :style="{ maxHeight: dropDownSectionHeight }"
@@ -80,7 +95,11 @@
                     "
                   >
                     <div class="org-info">
-                      <strong :title="org.username" class="line-break-anywhere is-ellipsis-1">{{ org.username }}</strong>
+                      <strong
+                        :title="org.username"
+                        class="line-break-anywhere is-ellipsis-1"
+                        >{{ org.username }}</strong
+                      >
                       <p>
                         {{
                           org.isPersonalAccount
@@ -106,10 +125,28 @@
             </transition-group>
           </li>
           <li key="dashboard">
-            <a :href="`${serverDomain}/dashboard`"> Dashboard </a>
+            <nuxt-link
+              v-if="isPlatformDomain"
+              to="/dashboard"
+              data-testid="user-dashboard-link"
+            >
+              Dashboard
+            </nuxt-link>
+            <a
+              v-else
+              :href="`${serverDomain}/dashboard`"
+              data-testid="user-dashboard-link"
+            >
+              Dashboard
+            </a>
           </li>
           <li key="signout" @click="$emit('on-logout')">
-            <a data-testid="user-logout-link" :href="`${accountsDomain}/user/logout`"> Sign out </a>
+            <a
+              data-testid="user-logout-link"
+              :href="`${accountsDomain}/user/logout`"
+            >
+              Sign out
+            </a>
           </li>
           <li key="theme" v-if="showThemeMode">
             <theme-mode @set:theme="setTheme" />
@@ -149,17 +186,23 @@ export default defineComponent({
     },
     showThemeMode: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
+    isPlatformDomain: {
+      type: Boolean,
+      default: false,
+    },
   },
-  emits: ["set:theme","on-logout"],
+  emits: ["set:theme", "on-logout"],
 
   components: {
     NavbarItem: defineAsyncComponent(() =>
       import("../../v2/navbar/NavbarItem.vue").then((module) => module.default)
     ),
     NavbarItemContent: defineAsyncComponent(() =>
-      import("../../v2/navbar/NavbarItemContent.vue").then((module) => module.default)
+      import("../../v2/navbar/NavbarItemContent.vue").then(
+        (module) => module.default
+      )
     ),
     ThemeMode: defineAsyncComponent(() =>
       import("../../v3/navbar/ThemeMode.vue").then((module) => module.default)
@@ -205,9 +248,9 @@ export default defineComponent({
     onMouseLeave() {
       this.dropDownStatus = "close";
     },
-    setTheme(val){
+    setTheme(val) {
       this.$emit("set:theme", val);
-    }
+    },
   },
 
   watch: {