Mercurial > gemma
changeset 853:fb39ec3b95a8
systemconfig WIP
author | Thomas Junk <thomas.junk@intevation.de> |
---|---|
date | Fri, 28 Sep 2018 13:55:44 +0200 |
parents | a3b2626cef49 |
children | d464b777d98f |
files | client/src/application/Sidebar.vue client/src/fairway/Fairwayprofile.vue client/src/logs/logs.vue client/src/router.js |
diffstat | 4 files changed, 24 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/application/Sidebar.vue Fri Sep 28 13:45:04 2018 +0200 +++ b/client/src/application/Sidebar.vue Fri Sep 28 13:55:44 2018 +0200 @@ -10,6 +10,9 @@ <router-link class="text-body d-flex flex-row nav-link" to="usermanagement"> <i class="fa fa-address-card-o align-self-center navicon"></i>Users </router-link> + <router-link class="text-body d-flex flex-row nav-link" to="systemconfiguration"> + <i class="fa fa-wrench align-self-center navicon"></i>Systemconfiguration + </router-link> <router-link class="text-body d-flex flex-row nav-link" to="logs"> <i class="fa fa-book align-self-center navicon"></i>Systeminformation </router-link> @@ -86,7 +89,7 @@ } .sidebarextended { - height: $sidebar-height; + min-height: $sidebar-height; width: $sidebar-width; } </style>
--- a/client/src/fairway/Fairwayprofile.vue Fri Sep 28 13:45:04 2018 +0200 +++ b/client/src/fairway/Fairwayprofile.vue Fri Sep 28 13:55:44 2018 +0200 @@ -84,9 +84,7 @@ } }, methods: { - setWaterlevel(level) { - console.log(level); - }, + setWaterlevel() {}, drawDiagram() { const chartDiv = document.querySelector(".fairwayprofile"); d3.select("svg").remove();
--- a/client/src/logs/logs.vue Fri Sep 28 13:45:04 2018 +0200 +++ b/client/src/logs/logs.vue Fri Sep 28 13:55:44 2018 +0200 @@ -111,9 +111,7 @@ this.refreshed = new Date().toLocaleString(); this.currentFile = file; }) - .catch(error => { - console.log(error); - }); + .catch(); }, disallow(e) { e.target.blur();
--- a/client/src/router.js Fri Sep 28 13:45:04 2018 +0200 +++ b/client/src/router.js Fri Sep 28 13:55:44 2018 +0200 @@ -11,6 +11,8 @@ const Main = () => import("./application/Main.vue"); const Usermanagement = () => import("./usermanagement/Usermanagement.vue"); const Logs = () => import("./logs/logs.vue"); +const Systemconfiguration = () => + import("./systemconfiguration/systemconfiguration.vue"); Vue.use(Router); @@ -54,6 +56,22 @@ } }, { + path: "/systemconfiguration", + name: "systemconfiguration", + component: Systemconfiguration, + meta: { + requiresAuth: true + }, + beforeEnter: (to, from, next) => { + const isSysadmin = store.getters["user/isSysAdmin"]; + if (!isSysadmin) { + next("/"); + } else { + next(); + } + } + }, + { path: "/", name: "mainview", component: Main,