# HG changeset patch # User Sascha Wilde # Date 1538135835 -7200 # Node ID d464b777d98fd5b2f1417bd842d05d364f685c0a # Parent 83c271cb23441aa9404471d7e1154d7eb4a7bae2# Parent fb39ec3b95a82d7da6fd2144a5bd5f379c3538dc Merged diff -r 83c271cb2344 -r d464b777d98f client/src/application/Sidebar.vue --- a/client/src/application/Sidebar.vue Fri Sep 28 13:54:57 2018 +0200 +++ b/client/src/application/Sidebar.vue Fri Sep 28 13:57:15 2018 +0200 @@ -10,6 +10,9 @@ Users + + Systemconfiguration + Systeminformation @@ -86,7 +89,7 @@ } .sidebarextended { - height: $sidebar-height; + min-height: $sidebar-height; width: $sidebar-width; } diff -r 83c271cb2344 -r d464b777d98f client/src/fairway/Fairwayprofile.vue --- a/client/src/fairway/Fairwayprofile.vue Fri Sep 28 13:54:57 2018 +0200 +++ b/client/src/fairway/Fairwayprofile.vue Fri Sep 28 13:57:15 2018 +0200 @@ -84,9 +84,7 @@ } }, methods: { - setWaterlevel(level) { - console.log(level); - }, + setWaterlevel() {}, drawDiagram() { const chartDiv = document.querySelector(".fairwayprofile"); d3.select("svg").remove(); diff -r 83c271cb2344 -r d464b777d98f client/src/logs/logs.vue --- a/client/src/logs/logs.vue Fri Sep 28 13:54:57 2018 +0200 +++ b/client/src/logs/logs.vue Fri Sep 28 13:57:15 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(); diff -r 83c271cb2344 -r d464b777d98f client/src/router.js --- a/client/src/router.js Fri Sep 28 13:54:57 2018 +0200 +++ b/client/src/router.js Fri Sep 28 13:57:15 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,