diff --git a/package-lock.json b/package-lock.json index de45238d..c8059dc4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10086,8 +10086,7 @@ "version": "4.0.8", "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz", "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=", - "dev": true, - "optional": true + "dev": true }, "rx-lite-aggregates": { "version": "4.0.8", diff --git a/src/components/Menu.vue b/src/components/Menu.vue index 0f1d9d2f..af7fef6e 100644 --- a/src/components/Menu.vue +++ b/src/components/Menu.vue @@ -57,6 +57,9 @@ Contact Information + + Profil + Logout diff --git a/src/components/Menu2.vue b/src/components/Menu2.vue index 4a996709..92e4120a 100644 --- a/src/components/Menu2.vue +++ b/src/components/Menu2.vue @@ -65,7 +65,18 @@ - Logout + + + person Profil + + + + + + + exit_to_app Logout + + @@ -145,5 +156,12 @@ } } - - + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 06b100d9..acfbd32a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -9,6 +9,7 @@ import ListApps from '../views/ListApps' import AppDetails from '../views/AppDetails' import NewApp from '../views/NewApp' import Mail from '../views/Mail' +import UserProfile from '../views/UserProfile' Vue.use(Router) @@ -67,6 +68,12 @@ export default new Router({ path: '/user/mails', name: 'userMails', component: Mail + }, + { + beforeEnter: guard, + path: '/user/profile', + name: 'userProfile', + component: UserProfile } ] }) diff --git a/src/views/Login.vue b/src/views/Login.vue index 479721a3..3ddf80cd 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -69,15 +69,12 @@ } }, mounted: function() { - console.log("REDIRECT: "+this.$store.state.redirectIfLoggedIn) if(this.$store.state.loggedIn == true) { if(this.$store.state.redirectIfLoggedIn != null) { this.$router.push(this.$store.state.redirectIfLoggedIn); } else { this.$router.push({name: 'Dashboard'}); } - - } this.nameBig = this.$store.getters.getSettingValue("name_big"); this.nameSmall = this.$store.getters.getSettingValue("name_small"); diff --git a/src/views/UserProfile.vue b/src/views/UserProfile.vue new file mode 100644 index 00000000..ae42ec49 --- /dev/null +++ b/src/views/UserProfile.vue @@ -0,0 +1,100 @@ + + + + +