Mercurial > gemma
changeset 285:8e22d1f16f81 usermanagement
refactor: better variable naming
In order to achieve more consistent style all boolean getter functions were
renamed according JS style and is-prefixed.
Sidebar collapsed renamed to isCollapsed.
author | Thomas Junk <thomas.junk@intevation.de> |
---|---|
date | Tue, 31 Jul 2018 09:36:15 +0200 |
parents | 96860b2bbc0d |
children | aee175e3f82c |
files | client/src/components/Sidebar.vue client/src/router.js client/src/stores/user.js |
diffstat | 3 files changed, 19 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/components/Sidebar.vue Mon Jul 30 17:43:59 2018 +0200 +++ b/client/src/components/Sidebar.vue Tue Jul 31 09:36:15 2018 +0200 @@ -6,7 +6,7 @@ <a class="nav-link" href="#">Link</a> <a class="nav-link" href="#">Link</a> <a class="nav-link disabled" href="#">Disabled</a> - <div v-if="is_sys_admin"> + <div v-if="isSysAdmin"> <router-link to="users">Users</router-link> </div> </nav> @@ -28,12 +28,12 @@ name: "sidebar", props: ["isOverlay"], computed: { - ...mapGetters("user", ["userinfo", "is_sys_admin"]), + ...mapGetters("user", ["userinfo", "isSysAdmin"]), collapseicon() { return { fa: true, - "fa-angle-double-left": !this.collapsed, - "fa-angle-double-right": this.collapsed + "fa-angle-double-left": !this.isCollapsed, + "fa-angle-double-right": this.isCollapsed }; }, menuStyle() { @@ -41,37 +41,37 @@ menu: true, nav: true, "flex-column": true, - "visibility-extended": !this.collapsed, - "visibility-collapsed": this.collapsed + "visibility-extended": !this.isCollapsed, + "visibility-collapsed": this.isCollapsed }; }, userinfoStyle() { return { user: true, "d-inline-flex": true, - "visibility-extended": !this.collapsed, - "visibility-collapsed": this.collapsed + "visibility-extended": !this.isCollapsed, + "visibility-collapsed": this.isCollapsed }; }, collapseStyle() { return { collapser: true, - collapserextended: !this.collapsed, - collapsercollapsed: this.collapsed + collapserextended: !this.isCollapsed, + collapsercollapsed: this.isCollapsed }; }, sidebarStyle() { return { sidebar: true, overlay: this.isOverlay, - sidebarcollapsed: this.collapsed, - sidebarextended: !this.collapsed + sidebarcollapsed: this.isCollapsed, + sidebarextended: !this.isCollapsed }; } }, methods: { collapse() { - this.collapsed = !this.collapsed; + this.isCollapsed = !this.isCollapsed; }, logoff() { this.$store.commit("user/clear_auth"); @@ -80,7 +80,7 @@ }, data() { return { - collapsed: false + isCollapsed: false }; } };
--- a/client/src/router.js Mon Jul 30 17:43:59 2018 +0200 +++ b/client/src/router.js Tue Jul 31 09:36:15 2018 +0200 @@ -23,7 +23,7 @@ requiresAuth: true }, beforeEnter: (to, from, next) => { - const isSysadmin = store.getters["user/is_sys_admin"]; + const isSysadmin = store.getters["user/isSysAdmin"]; if (!isSysadmin) { next("/"); } else { @@ -62,7 +62,7 @@ router.beforeEach((to, from, next) => { const requiresAuth = to.matched.some(record => record.meta.requiresAuth); - const loggedIn = store.getters.authenticated; + const loggedIn = store.getters["user/isAuthenticated"]; const expiresFromPastSession = toMillisFromString( localStorage.getItem("expires") );
--- a/client/src/stores/user.js Mon Jul 30 17:43:59 2018 +0200 +++ b/client/src/stores/user.js Tue Jul 31 09:36:15 2018 +0200 @@ -9,7 +9,7 @@ user: "" }, getters: { - authenticated: state => { + isAuthenticated: state => { return state.authenticated; }, userinfo: state => { @@ -21,10 +21,10 @@ expires: state => { return state.expires; }, - is_waterway_admin: state => { + isWaterwayAdmin: state => { return state.roles.includes("waterway_admin"); }, - is_sys_admin: state => { + isSysAdmin: state => { return state.roles.includes("sys_admin"); } },