Browse Source

Fix user log out on refresh

master
Kobus 5 years ago
parent
commit
aab02e0878

+ 1
- 0
src/components/admin/status/timeshareAdminPage.vue View File

23
           @onClearSelected="onClearSelected"
23
           @onClearSelected="onClearSelected"
24
           :columnsCount="15"
24
           :columnsCount="15"
25
           :title="'Pending Weeks'"
25
           :title="'Pending Weeks'"
26
+          :showNew="false"
26
         />
27
         />
27
       </div>
28
       </div>
28
     </div>
29
     </div>

+ 1
- 1
src/components/shared/listView.vue View File

5
     <div style="height:5px"></div>
5
     <div style="height:5px"></div>
6
     <div class="d-flex justify-content-between table-title">
6
     <div class="d-flex justify-content-between table-title">
7
       <div class="p-2" v-if="!hideSearch">
7
       <div class="p-2" v-if="!hideSearch">
8
-        <input v-model="searchItem" class="form-control" :placeholder="currentPage" />
8
+        <input v-model="searchItem" class="form-control" placeholder="Search...." />
9
       </div>
9
       </div>
10
       <div class="p-2" v-if="title">
10
       <div class="p-2" v-if="title">
11
         <h2>{{title}}</h2>
11
         <h2>{{title}}</h2>

+ 6
- 4
src/components/shared/navBar.vue View File

214
 
214
 
215
 <script>
215
 <script>
216
 import { mapState, mapActions } from 'vuex';
216
 import { mapState, mapActions } from 'vuex';
217
+import Log from '../../assets/Log';
217
 
218
 
218
 export default {
219
 export default {
219
   computed: {
220
   computed: {
224
       'person',
225
       'person',
225
       'token',
226
       'token',
226
     ]),
227
     ]),
227
-    NAME() {
228
-      return this.person.name;
229
-    },
230
     isLoggedIn() {
228
     isLoggedIn() {
231
-      return this.token !== null && this.token !== undefined;
229
+      console.log(Log.isLoggedIn());
230
+      return Log.isLoggedIn();
231
+    },
232
+    NAME() {
233
+      return Log.getPerson().name;
232
     },
234
     },
233
     // eslint-disable-next-line vue/return-in-computed-property
235
     // eslint-disable-next-line vue/return-in-computed-property
234
     Logout() {
236
     Logout() {

Loading…
Cancel
Save