--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/components/Layers.vue	Fri Sep 07 08:40:21 2018 +0200
@@ -0,0 +1,41 @@
+<template>
+  <div class="ui-element card layerselection shadow">
+    <div class="card-body">
+      <div class="headline">
+        <h4 class="card-title">Layers</h4>
+      </div>
+      <hr>
+      <div class="d-flex flex-column">
+        <Layerselect :layerindex="index" :layername="layer.name" v-for="(layer, index) in layers" :key="layer.name" :isVisible="layer.isVisible" @visibilityToggled="visibilityToggled"></Layerselect>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss">
+@import "../assets/application.scss";
+
+.layerselection {
+  background-color: white;
+  margin-left: 0.5rem;
+}
+</style>
+
+<script>
+import Layerselect from "./Layerselect";
+import { mapGetters } from "vuex";
+export default {
+  name: "layers",
+  components: {
+    Layerselect
+  },
+  computed: {
+    ...mapGetters("mapstore", ["layers"])
+  },
+  methods: {
+    visibilityToggled(layer) {
+      this.$store.commit("mapstore/toggleVisibility", layer);
+    }
+  }
+};
+</script>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/components/User.vue	Fri Sep 07 08:40:21 2018 +0200
@@ -0,0 +1,38 @@
+<template>
+  <div class="ui-element d-flex justify-content-around usermanagement">
+    <img class="userpic" src="../assets/user.png">
+    <span class="username align-self-center">{{ userinfo }}</span>
+    <span class="logout align-self-center" @click="logoff">
+      <i class="fa fa-power-off"></i>
+    </span>
+  </div>
+</template>
+
+<style lang="scss">
+.usermanagement {
+  background: white;
+  width: 150px;
+  padding: 0.25rem;
+  border-radius: 0.25rem;
+}
+</style>
+
+<script>
+import { mapGetters } from "vuex";
+export default {
+  name: "user",
+  data() {
+    return {};
+  },
+  methods: {
+    logoff() {
+      this.$store.commit("user/clear_auth");
+      this.$store.commit("application/resetSidebar");
+      this.$router.push("/login");
+    }
+  },
+  computed: {
+    ...mapGetters("user", ["userinfo"])
+  }
+};
+</script>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/stores/mapstore.js	Fri Sep 07 08:40:21 2018 +0200
@@ -0,0 +1,58 @@
+//import { HTTP } from "../lib/http";
+
+import TileWMS from "ol/source/TileWMS.js";
+import { Tile as TileLayer, Vector as VectorLayer } from "ol/layer.js";
+import OSM from "ol/source/OSM";
+import { Stroke, Style } from "ol/style.js";
+import VectorSource from "ol/source/Vector.js";
+
+const MapStore = {
+  namespaced: true,
+  state: {
+    layers: [
+      {
+        name: "Open Streetmap",
+        data: new TileLayer({
+          source: new OSM()
+        }),
+        isVisible: true
+      },
+      {
+        name: "D4D",
+        data: new TileLayer({
+          source: new TileWMS({
+            url: "https://demo.d4d-portal.info/wms",
+            params: { LAYERS: "d4d", VERSION: "1.1.1", TILED: true }
+          })
+        }),
+        isVisible: true
+      },
+      {
+        name: "Fairways Dimensions",
+        data: new VectorLayer({
+          source: new VectorSource(),
+          style: new Style({
+            stroke: new Stroke({
+              color: "rgba(0, 0, 255, 1.0)",
+              width: 2
+            })
+          })
+        }),
+        isVisible: true
+      }
+    ]
+  },
+  getters: {
+    layers: state => {
+      return state.layers;
+    }
+  },
+  mutations: {
+    toggleVisibility: (state, layer) => {
+      state.layers[layer].isVisible = !state.layers[layer].isVisible;
+      state.layers[layer].data.setVisible(state.layers[layer].isVisible);
+    }
+  }
+};
+
+export default MapStore;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/views/Usermanagement.vue	Fri Sep 07 08:40:21 2018 +0200
@@ -0,0 +1,283 @@
+<template>
+  <div class="main d-flex flex-column">
+    <div class="d-flex content flex-column">
+      <div class="d-flex flex-row">
+        <div :class="userlistStyle">
+          <div class="card">
+            <div class="card-header shadow-sm text-white bg-info mb-3">
+              Users
+            </div>
+            <div class="card-body">
+              <table id="datatable" :class="tableStyle">
+                <thead>
+                  <tr>
+                    <th scope="col" @click="sortBy('user')">
+                      <span>Username&nbsp;
+                        <i v-if="sortCriterion=='user'" class="fa fa-angle-down"></i>
+                      </span>
+                    </th>
+                    <th scope="col" @click="sortBy('country')">
+                      <span>Country&nbsp;
+                        <i v-if="sortCriterion=='country'" class="fa fa-angle-down"></i>
+                      </span>
+                    </th>
+                    <th scope="col" @click="sortBy('email')">
+                      <span>Email&nbsp;
+                        <i v-if="sortCriterion=='email'" class="fa fa-angle-down"></i>
+                      </span>
+                    </th>
+                    <th scope="col" @click="sortBy('role')">
+                      <span>Role&nbsp;
+                        <i v-if="sortCriterion=='role'" class="fa fa-angle-down"></i>
+                      </span>
+                    </th>
+                    <th scope="col"></th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr v-for="user in users" :key="user.user" @click="selectUser(user.user)">
+                    <td>{{ user.user }}</td>
+                    <td>{{ user.country }}</td>
+                    <td>{{ user.email}}</td>
+                    <td>
+                      <i v-tooltip="user.roleLabel" :class="{
+                        fa:true,
+                        icon:true, 
+                        'fa-user':user.role==='waterway_user',
+                        'fa-star':user.role=='sys_admin',
+                        'fa-adn':user.role==='waterway_admin'}"></i>
+                    </td>
+                    <td>
+                      <i @click="deleteUser(user.user)" class="icon fa fa-trash-o"></i>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
+            <div class="d-flex flex-row pagination">
+              <i @click=" prevPage " v-if="this.currentPage!=1 " class="backwards btn btn-sm btn-light align-self-center pages fa fa-caret-left "></i> {{this.currentPage}} / {{this.pages}}
+              <i @click="nextPage " class="forwards btn btn-sm btn-light align-self-center pages fa fa-caret-right "></i>
+            </div>
+            <div class="adduser ">
+              <button @click="addUser " class="btn btn-info pull-right shadow-sm ">Add User</button>
+            </div>
+          </div>
+        </div>
+        <Userdetail v-if="isUserDetailsVisible "></Userdetail>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss">
+@import "../assets/application.scss";
+@import "../assets/tooltip.scss";
+.main {
+  height: 100vh;
+}
+
+.backwards {
+  margin-right: 0.5rem;
+}
+
+.forwards {
+  margin-left: 0.5rem;
+}
+
+.content {
+  margin-top: $large-offset;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.adduser {
+  margin-right: $offset;
+  padding-bottom: $offset;
+}
+
+.icon {
+  font-size: large;
+}
+
+.userlist {
+  margin-top: $topbarheight;
+  margin-right: $offset;
+  min-width: 520px;
+  height: 100%;
+}
+
+.pagination {
+  margin-left: auto;
+  margin-right: auto;
+}
+.userlistsmall {
+  width: 30vw;
+}
+
+.userlistextended {
+  width: 70vw;
+}
+
+.table {
+  width: 90% !important;
+  margin: auto;
+}
+
+.table th,
+.pages {
+  cursor: pointer;
+}
+
+.table th,
+td {
+  font-size: 0.9rem;
+  border-top: 0px !important;
+  text-align: left;
+  padding: 0.5rem !important;
+}
+
+.table td {
+  font-size: 0.9rem;
+  cursor: pointer;
+}
+
+tr span {
+  display: flex;
+}
+</style>
+
+<script>
+import Userdetail from "../components/Userdetail";
+import store from "../store";
+import { mapGetters } from "vuex";
+import { displayError } from "../lib/errors.js";
+
+export default {
+  name: "userview",
+  data() {
+    return {
+      sortCriterion: "user",
+      pageSize: 10,
+      currentPage: 1
+    };
+  },
+  components: {
+    Userdetail
+  },
+  computed: {
+    ...mapGetters("usermanagement", ["isUserDetailsVisible"]),
+    ...mapGetters("application", ["sidebarCollapsed"]),
+    users() {
+      let users = [...this.$store.getters["usermanagement/users"]];
+      users.sort((a, b) => {
+        if (
+          a[this.sortCriterion].toLowerCase() <
+          b[this.sortCriterion].toLowerCase()
+        )
+          return -1;
+        if (
+          a[this.sortCriterion].toLowerCase() >
+          b[this.sortCriterion].toLowerCase()
+        )
+          return 1;
+        return 0;
+      });
+      const start = (this.currentPage - 1) * this.pageSize;
+      return users.slice(start, start + this.pageSize);
+    },
+    pages() {
+      let users = [...this.$store.getters["usermanagement/users"]];
+      return Math.ceil(users.length / this.pageSize);
+    },
+    tableStyle() {
+      return {
+        table: true,
+        "table-hover": true,
+        "table-sm": this.isUserDetailsVisible,
+        fadeIn: true,
+        animated: true
+      };
+    },
+    userlistStyle() {
+      return {
+        userlist: true,
+        shadow: true,
+        userlistsmall: this.isUserDetailsVisible,
+        userlistextended: !this.isUserDetailsVisible
+      };
+    }
+  },
+  methods: {
+    tween() {},
+    nextPage() {
+      if (this.currentPage < this.pages) {
+        document.querySelector("#datatable").classList.add("fadeOut");
+        setTimeout(() => {
+          document.querySelector("#datatable").classList.remove("fadeOut");
+          this.currentPage += 1;
+        }, 10);
+      }
+      return;
+    },
+    prevPage() {
+      if (this.currentPage > 0) {
+        document.querySelector("#datatable").classList.add("fadeOut");
+        setTimeout(() => {
+          document.querySelector("#datatable").classList.remove("fadeOut");
+          this.currentPage -= 1;
+        }, 10);
+      }
+      return;
+    },
+    sortBy(criterion) {
+      this.sortCriterion = criterion;
+    },
+    deleteUser(name) {
+      this.$store
+        .dispatch("usermanagement/deleteUser", { name: name })
+        .then(() => {
+          this.submitted = false;
+          this.$store.dispatch("usermanagement/loadUsers").catch(error => {
+            const { status, data } = error.response;
+            displayError({
+              title: "Backend Error",
+              message: `${status}: ${data.message || data}`
+            });
+          });
+        })
+        .catch(error => {
+          const { status, data } = error.response;
+          displayError({
+            title: "Backend Error",
+            message: `${status}: ${data.message || data}`
+          });
+        });
+    },
+    addUser() {
+      this.$store.commit("usermanagement/clearCurrentUser");
+      this.$store.commit("usermanagement/setUserDetailsVisible");
+    },
+    selectUser(name) {
+      const user = this.$store.getters["usermanagement/getUserByName"](name);
+      this.$store.commit("usermanagement/setCurrentUser", user);
+    }
+  },
+  beforeRouteEnter(to, from, next) {
+    store
+      .dispatch("usermanagement/loadUsers")
+      .then(next)
+      .catch(error => {
+        const { status, data } = error.response;
+        displayError({
+          title: "Backend Error",
+          message: `${status}: ${data}`
+        });
+      });
+  },
+  beforeRouteLeave(to, from, next) {
+    store.commit("usermanagement/clearCurrentUser");
+    store.commit("usermanagement/setUserDetailsInvisible");
+    next();
+  }
+};
+</script>