# HG changeset patch # User Thomas Junk # Date 1554451485 -7200 # Node ID 149a8f81f99e2f44b038101ae70cce11772965d2 # Parent b92a8d088d8a2e490c73beb66fbfa3b36bb5aafb# Parent 78affd725ba528978e80da4fcce8a9e29daacafc merge with default diff -r 78affd725ba5 -r 149a8f81f99e client/src/components/App.vue --- a/client/src/components/App.vue Thu Apr 04 18:46:17 2019 +0200 +++ b/client/src/components/App.vue Fri Apr 05 10:04:45 2019 +0200 @@ -79,7 +79,7 @@ ...mapState("user", ["isAuthenticated"]), ...mapState("application", ["contextBoxContent", "showSearchbar"]), isMapVisible() { - return /importoverview|stretches|review|bottlenecks|mainview/.test( + return /importconfiguration|importoverview|stretches|review|bottlenecks|mainview/.test( this.routeName ); }, diff -r 78affd725ba5 -r 149a8f81f99e client/src/components/Contextbox.vue --- a/client/src/components/Contextbox.vue Thu Apr 04 18:46:17 2019 +0200 +++ b/client/src/components/Contextbox.vue Fri Apr 05 10:04:45 2019 +0200 @@ -6,6 +6,7 @@ + @@ -31,7 +32,9 @@ Bottlenecks: () => import("@/components/Bottlenecks"), Stretches: () => import("@/components/ImportStretches.vue"), ImportOverview: () => - import("@/components/importoverview/ImportOverview.vue") + import("@/components/importoverview/ImportOverview.vue"), + ImportConfiguration: () => + import("@/components/importconfiguration/Import.vue") }, computed: { ...mapState("application", [ diff -r 78affd725ba5 -r 149a8f81f99e client/src/components/importconfiguration/Import.vue --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/src/components/importconfiguration/Import.vue Fri Apr 05 10:04:45 2019 +0200 @@ -0,0 +1,9 @@ + + + + + diff -r 78affd725ba5 -r 149a8f81f99e client/src/router.js --- a/client/src/router.js Thu Apr 04 18:46:17 2019 +0200 +++ b/client/src/router.js Fri Apr 05 10:04:45 2019 +0200 @@ -175,6 +175,26 @@ } }, { + path: "/imports/configuration", + name: "importconfiguration", + component: Maplayer, + meta: { + requiresAuth: true + }, + beforeEnter: (to, from, next) => { + const isWaterwayAdmin = store.getters["user/isWaterwayAdmin"]; + if (!isWaterwayAdmin) { + next("/login"); + } else { + store.commit("application/searchQuery", ""); + store.commit("application/showContextBox", true); + store.commit("application/contextBoxContent", "importconfiguration"); + store.commit("application/showSearchbar", true); + next(); + } + } + }, + { path: "/imports/overview/:id?", name: "importoverview", component: Maplayer,