From 1ff25f266ceb899f5508b2ace8f67af1db99dca9 Mon Sep 17 00:00:00 2001 From: Kekskurse Date: Fri, 22 Nov 2019 12:06:33 +0100 Subject: [PATCH] Stuff --- package-lock.json | 6 ++ package.json | 1 + src/App.vue | 2 +- src/components/AppCards.vue | 8 -- src/components/Menu2.vue | 20 ++++- src/components/MenuMobile.vue | 161 ++++++++++++++-------------------- src/plugins/vuetify.js | 3 +- src/router/index.js | 7 ++ src/services/Server.js | 5 +- src/services/User.js | 9 ++ src/store/store.js | 2 +- src/views/Access.vue | 10 ++- src/views/Profile.vue | 137 +++++++++++++++++++++++++++++ 13 files changed, 260 insertions(+), 111 deletions(-) create mode 100644 src/views/Profile.vue diff --git a/package-lock.json b/package-lock.json index 9d914c5d..f30b63ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -960,6 +960,12 @@ "postcss": "^7.0.0" } }, + "@mdi/font": { + "version": "4.5.95", + "resolved": "https://registry.npmjs.org/@mdi/font/-/font-4.5.95.tgz", + "integrity": "sha512-AjR2Zgu1feBXWlTfEjD6JQqLAMCqYn2Gzia5PWqFnysvz5F6JmPHtQFldIHXqyv2s/FwME7ZDBc5N86NEHbyvQ==", + "dev": true + }, "@mrmlnc/readdir-enhanced": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", diff --git a/package.json b/package.json index 10a66349..9193a559 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "vuex": "^3.1.1" }, "devDependencies": { + "@mdi/font": "^4.5.95", "@vue/cli-plugin-babel": "^3.10.0", "@vue/cli-plugin-eslint": "^3.10.0", "@vue/cli-service": "^3.10.0", diff --git a/src/App.vue b/src/App.vue index 3fa08c2a..89512fca 100644 --- a/src/App.vue +++ b/src/App.vue @@ -2,7 +2,7 @@
- + diff --git a/src/components/AppCards.vue b/src/components/AppCards.vue index 3b6fe38c..02693d85 100644 --- a/src/components/AppCards.vue +++ b/src/components/AppCards.vue @@ -29,11 +29,6 @@ import AppService from '../services/Apps' export default { - data () { - return { - apps: [] - } - }, props: [ 'apps' ], @@ -41,9 +36,6 @@ 'getImageUrl' : function (id) { return AppService.getAppImage(id); }, - }, - mounted: function() { - console.log("APPCARDSW"); } } diff --git a/src/components/Menu2.vue b/src/components/Menu2.vue index 55648585..a3b73ff7 100644 --- a/src/components/Menu2.vue +++ b/src/components/Menu2.vue @@ -2,20 +2,23 @@ - + {{nameBig}}{{nameSmall}} + + Login Invited Dashboard Developer + + Profile + App Access @@ -140,6 +151,9 @@ UserServie.logout(); this.$store.dispatch('checkAccount') this.$router.push({"path": "login"}) + }, + toggleMenu: function () { + this.$store.state.sideMenu = !this.$store.state.sideMenu ; } }, mounted: function () { diff --git a/src/components/MenuMobile.vue b/src/components/MenuMobile.vue index 9d9a5330..c4261546 100644 --- a/src/components/MenuMobile.vue +++ b/src/components/MenuMobile.vue @@ -1,112 +1,85 @@ @@ -184,4 +157,4 @@ this.generateMenu(); } } - \ No newline at end of file + diff --git a/src/plugins/vuetify.js b/src/plugins/vuetify.js index f2596e71..fbce59a9 100644 --- a/src/plugins/vuetify.js +++ b/src/plugins/vuetify.js @@ -1,3 +1,4 @@ +import '@mdi/font/css/materialdesignicons.css' // Ensure you are using css-loader import Vue from 'vue'; import Vuetify from 'vuetify/lib'; @@ -5,6 +6,6 @@ Vue.use(Vuetify); export default new Vuetify({ icons: { - iconfont: 'mdiSvg', + iconfont: 'mdi', }, }); diff --git a/src/router/index.js b/src/router/index.js index 35623211..80ab5019 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -12,6 +12,7 @@ import Mail from '../views/Mail' import Invite from '../views/Invite' import Register from '../views/Register' import Access from '../views/Access' +import Profile from '../views/Profile' Vue.use(Router) @@ -69,6 +70,12 @@ export default new Router({ name: 'Access', component: Access }, + { + beforeEnter: guard, + path: '/profile', + name: 'Profile', + component: Profile + }, { beforeEnter: guard, path: '/apps/new', diff --git a/src/services/Server.js b/src/services/Server.js index ffe6cc9e..3c1b0ba7 100644 --- a/src/services/Server.js +++ b/src/services/Server.js @@ -3,5 +3,8 @@ import Api from '@/services/Api' export default { getPublicSettings (params) { return Api().get('/v1/server/settings') + }, + getStatus () { + return Api().get("/v1/status/check") } -} \ No newline at end of file +} diff --git a/src/services/User.js b/src/services/User.js index d669046f..5a5bb5f7 100644 --- a/src/services/User.js +++ b/src/services/User.js @@ -17,12 +17,21 @@ export default { me() { return Api().get('/v1/user/me') }, + mails() { + return Api().get('/v1/user/me/mails') + }, logout() { localStorage.removeItem("access_token"); }, getMails() { return Api().get('/v1/user/me/mails'); }, + addMail(mail) { + return Api().post('/v1/user/me/mails', {mail: mail}); + }, + removeMail(mailID) { + return Api().delete('/v1/user/me/mail/'+mailID); + }, getCaptchaSettings() { return Api().get("/v1/user/captcha"); }, diff --git a/src/store/store.js b/src/store/store.js index c5e960ba..dd9e5848 100644 --- a/src/store/store.js +++ b/src/store/store.js @@ -13,7 +13,7 @@ export default new Vuex.Store({ me: [], redirectIfLoggedIn: null, settings: [], // The TV inventory - sideMenu: false, //Toggle Side Menu on side Bar, + sideMenu: true, //Toggle Side Menu on side Bar, error: false }, diff --git a/src/views/Access.vue b/src/views/Access.vue index 3fe0faf3..e6cb09c3 100644 --- a/src/views/Access.vue +++ b/src/views/Access.vue @@ -13,8 +13,11 @@ Name + + + Description Created at - Info + Actions @@ -24,7 +27,6 @@ {{ item.app.name }} - {{ item.created }}