From 61f9ec49f41af68abe1148d9a829e9b02c534da4 Mon Sep 17 00:00:00 2001
From: Dichi13 <diciganteng01@icloud.com>
Date: Sat, 13 Apr 2019 02:49:01 +0700
Subject: [PATCH] fixed name not appearing upon loading from cookie and tidy up
logic on navbar
---
src/components/partials/Navbar.vue | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/src/components/partials/Navbar.vue b/src/components/partials/Navbar.vue
index 8aaf6a8..2525475 100644
--- a/src/components/partials/Navbar.vue
+++ b/src/components/partials/Navbar.vue
@@ -12,7 +12,7 @@
<b-collapse is-nav id="nav_collapse">
<!-- Right aligned nav items -->
<b-navbar-nav>
- <b-nav-item-dropdown v-bind:text=pilihan left>
+ <b-nav-item-dropdown v-bind:text=state left>
<b-dropdown-item v-on:click="gotoPage('semua-anggaran')">
Semua Anggaran
</b-dropdown-item>
@@ -38,7 +38,7 @@
</b-nav-item>
</div>
<div v-else>
- <b-nav-item-dropdown v-bind:text=nama right>
+ <b-nav-item-dropdown v-bind:text=name right>
<b-dropdown-item v-on:click="gotoPage('semua-anggaran')">
Pengaturan
</b-dropdown-item>
@@ -61,13 +61,15 @@ export default {
name: 'Navbar',
data () {
return {
- pilihan : this.$store.state.pilihan,
- nama : this.$store.state.user.name,
+
}
},
computed : {
- state_watcher() {
+ state() {
return this.$store.state.pilihan
+ },
+ name() {
+ return this.$store.state.user.name
}
},
methods : {
@@ -80,15 +82,6 @@ export default {
this.$router.push({name: 'LandingPage'});
}
},
- created() {
- this.pilihan = this.$store.state.pilihan
- },
- watch : {
- state_watcher(newPilihan, oldPilihan) {
- // console.log("lama : " + oldPilihan + ", baru :" +newPilihan)
- this.pilihan = newPilihan
- }
- }
}
</script>
--
GitLab