Merge branch 'Dev' of http://www.origtek.com:2999/nelson.kai/ShowEasyFrontEnd into Dev

FrontEnd/components/NavBar.vue

@@ -114,22 +114,20 @@
                       {{ $auth.$storage.getUniversal("userLastName") }}
                     </span>
                   </v-btn>
-                  <nuxt-link
+                  <div
                     v-else
-                    class="tw-bg-primary-default tw-rounded-[12px] tw-whitespace-nowrap tw-block tw-text-white tw-px-[16px] tw-py-[9px] tw-whitespace-nowrap tw-text-[10px] tw-font-medium tw-transition-all tw-duration-200 tw-ease-in-out hover:tw-bg-primary-light"
-                    :to="localePath('/user')"
+                    class="tw-bg-primary-default tw-cursor-pointer tw-rounded-[12px] tw-whitespace-nowrap tw-block tw-text-white tw-px-[16px] tw-py-[9px] tw-whitespace-nowrap tw-text-[10px] tw-font-medium tw-transition-all tw-duration-200 tw-ease-in-out hover:tw-bg-primary-light"
+                    @click="toUser"
                   >
                     {{ $t("Log in/Sign up") }}
-                  </nuxt-link>
+                  </div>
                 </template>
                 <div class="neutrals darken-1 tw-hidden xl:tw-block">
                   <v-btn
                     :to="
                       localePath(
                         $auth.$storage.getUniversal('authtoken')
-                          ? `/user/${
-                              $auth.$storage.getUniversal('authtoken').user_id
-                            }`
+                          ? '/user'
                           : ''
                       )
                     "
@@ -280,13 +278,13 @@
                   {{ $auth.$storage.getUniversal("userLastName") }}
                 </span>
               </v-btn>
-              <nuxt-link
+              <div
                 v-else
-                class="tw-bg-primary-default tw-rounded-[12px] tw-whitespace-nowrap tw-block tw-text-white tw-px-[16px] tw-py-[9px] tw-whitespace-nowrap tw-text-[10px] tw-font-medium tw-transition-all tw-duration-200 tw-ease-in-out hover:tw-bg-primary-light"
-                :to="localePath('/user')"
+                class="tw-bg-primary-default tw-cursor-pointer tw-rounded-[12px] tw-whitespace-nowrap tw-block tw-text-white tw-px-[16px] tw-py-[9px] tw-whitespace-nowrap tw-text-[10px] tw-font-medium tw-transition-all tw-duration-200 tw-ease-in-out hover:tw-bg-primary-light"
+                @click="toUser"
               >
                 {{ $t("Log in/Sign up") }}
-              </nuxt-link>
+              </div>
               <div
                 :class="[
                   'tw-grid-cols-1 tw-gap-[14px] tw-px-[10px] tw-py-[8px] tw-bg-white tw-rounded-[10px] tw-w-max tw-absolute  tw-right-0 tw-top-[40px] tw-z-50 tw-shadow-[0_1px_4px_0_rgba(0,0,0,0.3)]',
@@ -371,11 +369,11 @@
             </div>
 
             <div v-else>
-              <nuxt-link
-                :to="localePath('/user')"
-                class="tw-text-[14px] tw-min-w-[123px] tw-whitespace-nowrap tw-text-white tw-bg-primary-1 tw-px-[16px] tw-py-[9px] tw-rounded-[12px]"
+              <div
+               @click="toUser"
+                class="tw-text-[14px] tw-cursor-pointer tw-whitespace-nowrap tw-text-white tw-bg-primary-default tw-px-[16px] tw-py-[9px] tw-rounded-[12px] hover:tw-bg-primary-light"
               >
-                {{ $t("Log in/Sign up") }}</nuxt-link
+                {{ $t("Log in/Sign up") }}</div
               >
             </div>
           </div>
@@ -783,8 +781,8 @@ export default {
       },
     },
     pictureStatus: {
-      handler: async function (newVal, oldVal) {
-          await this.fetchUser();
+      handler: function (newVal, oldVal) {
+          this.fetchUser();
           this.$forceUpdate();
       },
     },
@@ -1054,6 +1052,16 @@ export default {
       this.$nuxt.refresh();
       this.UserInfoPopup = false;
     },
+    toUser(){
+      this.$auth.$storage.removeUniversal("authtoken");
+      this.$auth.$storage.removeUniversal("userPicture");
+      this.$auth.$storage.removeUniversal("userLastName");
+      this.$auth.$storage.removeUniversal("userBeforePath");
+      this.$router.push(this.localePath("/user"));
+      this.$auth.logout();
+      this.$nuxt.refresh();
+      this.UserInfoPopup = false;
+    }
     // socialRegister() {
     //   if (this.$auth.loggedIn) {
     //     const jsonPayload =