Fix broken logout link in desktop nav view (#580)

knadh · Nov 10, 2021 · 46f13bf · 46f13bf
1 parent 2388a05
commit 46f13bf
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
@@ -11,7 +11,8 @@
         </template>
         <template slot="end">
           <navigation v-if="isMobile" :isMobile="isMobile"
-            :activeItem="activeItem" :activeGroup="activeGroup" @toggleGroup="toggleGroup" />
+            :activeItem="activeItem" :activeGroup="activeGroup" @toggleGroup="toggleGroup"
+            @doLogout="doLogout" />
           <b-navbar-item v-else tag="div">
             <a href="#" @click.prevent="doLogout">{{ $t('users.logout') }}</a>
           </b-navbar-item>
@@ -65,6 +66,7 @@
 <script>
 import Vue from 'vue';
 import { mapState } from 'vuex';
+import { uris } from './constants';
 
 import Navigation from './components/Navigation.vue';
 
@@ -79,7 +81,6 @@ export default Vue.extend({
     return {
       activeItem: {},
       activeGroup: {},
-      showLogout: Boolean,
       windowWidth: window.innerWidth,
     };
   },
@@ -118,6 +119,20 @@ export default Vue.extend({
         }, 500);
       });
     },
+
+    doLogout() {
+      const http = new XMLHttpRequest();
+
+      const u = uris.root.substr(-1) === '/' ? uris.root : `${uris.root}/`;
+      http.open('get', `${u}api/logout`, false, 'logout_non_user', 'logout_non_user');
+      http.onload = () => {
+        document.location.href = uris.root;
+      };
+      http.onerror = () => {
+        document.location.href = uris.root;
+      };
+      http.send();
+    },
   },
 
   computed: {

diff --git a/frontend/src/components/Navigation.vue b/frontend/src/components/Navigation.vue
@@ -82,8 +82,6 @@
 
 
 <script>
-import { uris } from '../constants';
-
 export default {
   name: 'navigation',
 
@@ -99,17 +97,7 @@ export default {
     },
 
     doLogout() {
-      const http = new XMLHttpRequest();
-
-      const u = uris.root.substr(-1) === '/' ? uris.root : `${uris.root}/`;
-      http.open('get', `${u}api/logout`, false, 'logout_non_user', 'logout_non_user');
-      http.onload = () => {
-        document.location.href = uris.root;
-      };
-      http.onerror = () => {
-        document.location.href = uris.root;
-      };
-      http.send();
+      this.$emit('doLogout');
     },
   },
 };