diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue index 689e5b12900b64b463a9834794ac70c73c4af468..961d3d25ebc55bb9a4bbf8406b8a5bb7a1b0fb6f 100644 --- a/src/components/Navbar.vue +++ b/src/components/Navbar.vue @@ -12,34 +12,29 @@ <b-collapse is-nav id="nav_collapse"> <!-- Right aligned nav items --> <b-navbar-nav> - <b-nav-item-dropdown v-bind:text=pilihan left> - <b-dropdown-item> - <router-link to="/Pendapatan"> - Pendapatan - </router-link> - </b-dropdown-item> - <b-dropdown-item> - <router-link to="/BiayaLangsung"> - BiayaLangsung - </router-link> - </b-dropdown-item> - <b-dropdown-item> - <router-link to="/BiayaTidakLangsung"> - Biaya Tidak Langsung - </router-link> - </b-dropdown-item> - <b-dropdown-item> - <router-link to="/Pembiayaan"> - Pembiayaan - </router-link> - </b-dropdown-item> - </b-nav-item-dropdown> + <b-nav-item-dropdown v-bind:text=pilihan left> + <b-dropdown-item v-on:click="gotoPage('semua-anggaran')"> + Semua Anggaran + </b-dropdown-item> + <b-dropdown-item v-on:click="gotoPage('pendapatan')"> + Anggaran Pendapatan + </b-dropdown-item> + <b-dropdown-item v-on:click="gotoPage('biaya-langsung')"> + Anggaran Biaya Langsung + </b-dropdown-item> + <b-dropdown-item v-on:click="gotoPage('biaya-tidak-langsung')"> + Anggaran Biaya Tidak Langsung + </b-dropdown-item> + <b-dropdown-item v-on:click="gotoPage('pembiayaan')"> + Anggaran Pembiayaan + </b-dropdown-item> + </b-nav-item-dropdown> </b-navbar-nav> <b-navbar-nav class="ml-auto"> <b-nav-item> - <router-link to="/Login" style="color:white;"> - Login + <router-link to="/login" style="color:white;"> + Masuk </router-link> </b-nav-item> </b-navbar-nav> @@ -65,7 +60,9 @@ export default { } }, methods : { - + gotoPage : function(page) { + this.$router.push(page) + } }, created : function() { this.pilihan = this.$store.state.pilihan diff --git a/src/components/pages/BiayaLangsungPage.vue b/src/components/pages/BiayaLangsungPage.vue index a5f47f6a1aa7de5d296824496b8f9cc8a36fcde7..5b5a8c2967ae17a9347406e39ad5bed3a6d421d5 100644 --- a/src/components/pages/BiayaLangsungPage.vue +++ b/src/components/pages/BiayaLangsungPage.vue @@ -19,7 +19,7 @@ export default { }, created : function() { - this.$store.commit('changed','Biaya Langsung') + this.$store.commit('changed','Anggaran Biaya Langsung') } } </script> diff --git a/src/components/pages/BiayaTidakLangsungPage.vue b/src/components/pages/BiayaTidakLangsungPage.vue index dafc41113d2d81f9e5dc620688c67fd2b569b0d8..cbb2ae33d5a9f7df37a4b90aeb8b1bff2a0f8062 100644 --- a/src/components/pages/BiayaTidakLangsungPage.vue +++ b/src/components/pages/BiayaTidakLangsungPage.vue @@ -19,7 +19,7 @@ export default { }, created : function() { - this.$store.commit('changed','Biaya Tidak Langsung') + this.$store.commit('changed','Anggaran Biaya Tidak Langsung') } } </script> diff --git a/src/components/pages/LandingPage.vue b/src/components/pages/LandingPage.vue index d3da1bbd04f2cc716326a3bba5765a413897539a..a9a8303402f092e78a2ecd6ef0bfa3eabad1618f 100644 --- a/src/components/pages/LandingPage.vue +++ b/src/components/pages/LandingPage.vue @@ -34,11 +34,11 @@ export default { gotoYear : function(year) { // TODO: Redirect to visualization page relevant to the selected year this.$store.commit('setYear', year) - this.$router.push('Pendapatan') + this.$router.push('semua-anggaran') } }, created : function() { - this.$store.commit('changed','Pendapatan') + //this.$store.commit('changed','semua-anggaran') } } </script> diff --git a/src/components/pages/PembiayaanPage.vue b/src/components/pages/PembiayaanPage.vue index 30fccfa5b72cc859cbfaf0cd085a1cfd9d2c3430..4b7aec2f153fe04a1c79da38ba050afd9cabbd02 100644 --- a/src/components/pages/PembiayaanPage.vue +++ b/src/components/pages/PembiayaanPage.vue @@ -19,7 +19,7 @@ export default { }, created : function() { - this.$store.commit('changed','Pembiayaan') + this.$store.commit('changed','Anggaran Pembiayaan') } } </script> diff --git a/src/components/pages/PendapatanPage.vue b/src/components/pages/PendapatanPage.vue index 04b07295b428e0087e67351b049cc509d08d1412..d10e93592525e1d1d8a24de584d3c04eca31711b 100644 --- a/src/components/pages/PendapatanPage.vue +++ b/src/components/pages/PendapatanPage.vue @@ -19,7 +19,7 @@ export default { }, created : function() { - this.$store.commit('changed','Pendapatan') + this.$store.commit('changed','Anggaran Pendapatan') } } </script> diff --git a/src/components/pages/SemuaAnggaran.vue b/src/components/pages/SemuaAnggaran.vue new file mode 100644 index 0000000000000000000000000000000000000000..2cae2a81a87eb321f127cf9b69741a2c21a75428 --- /dev/null +++ b/src/components/pages/SemuaAnggaran.vue @@ -0,0 +1,31 @@ +<template> + <div> + Semua Anggaran + </div> +</template> + +<script> +export default { + name: 'SemuaAnggaran', + components: { + + }, + data() { + return { + + } + }, + methods: { + + }, + created : function() { + this.$store.commit('changed','Semua Anggaran') + } +} +</script> + + +<style lang="scss" scoped> +@import 'src/assets/css/style.scss'; + +</style> \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 57518edc6970d15e6946567628f9a2b0ce4dbb41..944e9235c1f8e1b7e85635a83609feb29264dfad 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -6,7 +6,7 @@ import Pendapatan from '@/components/pages/PendapatanPage' import Pembiayaan from '@/components/pages/PembiayaanPage' import BiayaTidakLangsung from '@/components/pages/BiayaTidakLangsungPage' import BiayaLangsung from '@/components/pages/BiayaLangsungPage' - +import SemuaAnggaran from '@/components/pages/SemuaAnggaran' Vue.use(Router) export default new Router({ @@ -22,25 +22,30 @@ export default new Router({ component: LoginPage }, { - path: '/Pendapatan', + path: '/pendapatan', name: 'PendapatanPage', component: Pendapatan }, { - path: '/BiayaTidakLangsung', + path: '/biaya-tidak-langsung', name: 'BiayaTidakLangsung', component: BiayaTidakLangsung }, { - path: '/BiayaLangsung', + path: '/biaya-langsung', name: 'BiayaLangsung', component: BiayaLangsung }, { - path: '/Pembiayaan', + path: '/pembiayaan', name: 'Pembiayaan', component: Pembiayaan }, + { + path: '/semua-anggaran', + name: 'SemuaAnggaran', + component: SemuaAnggaran + }, ], mode: 'history', })