From 8e871c372d126a089ab12128e56faae58d9f40f2 Mon Sep 17 00:00:00 2001 From: Kekskurse Date: Wed, 25 Sep 2019 11:00:55 +0200 Subject: [PATCH] YoLo this is Spartaaaaaaaa --- src/components/Menu2.vue | 3 + src/router/index.js | 7 ++ src/services/Apps.js | 6 ++ src/services/User.js | 4 +- src/views/Access.vue | 134 +++++++++++++++++++++++++++++++++++++++ src/views/Dashboard.vue | 7 +- src/views/Invite.vue | 1 - src/views/Register.vue | 74 +++++++++++++++++++-- 8 files changed, 229 insertions(+), 7 deletions(-) create mode 100644 src/views/Access.vue diff --git a/src/components/Menu2.vue b/src/components/Menu2.vue index 22bfbbcd..55648585 100644 --- a/src/components/Menu2.vue +++ b/src/components/Menu2.vue @@ -64,6 +64,9 @@ + + App Access + Logout diff --git a/src/router/index.js b/src/router/index.js index 7f45c4f8..35623211 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -11,6 +11,7 @@ import NewApp from '../views/NewApp' import Mail from '../views/Mail' import Invite from '../views/Invite' import Register from '../views/Register' +import Access from '../views/Access' Vue.use(Router) @@ -62,6 +63,12 @@ export default new Router({ name: 'Apps', component: ListApps }, + { + beforeEnter: guard, + path: '/access', + name: 'Access', + component: Access + }, { beforeEnter: guard, path: '/apps/new', diff --git a/src/services/Apps.js b/src/services/Apps.js index 04012ce9..c7d67ce3 100644 --- a/src/services/Apps.js +++ b/src/services/Apps.js @@ -30,5 +30,11 @@ export default { }, newApp(name, description, url) { return Api().post('/v1/app', {name: name, description: description, url: url}); + }, + getAccessList() { + return Api().get('/v1/access') + }, + removeAccess(accessId) { + return Api().delete('/v1/access/'+accessId) } } diff --git a/src/services/User.js b/src/services/User.js index 3b840c4f..d669046f 100644 --- a/src/services/User.js +++ b/src/services/User.js @@ -4,7 +4,9 @@ export default { login(username, password, recaptchaToken) { return Api().post('/v1/user/login', {username: username, password: password, "g-recaptcha-response": recaptchaToken}); }, - + register(username, password, mail, invite, recaptchaToken) { + return Api().post('/v1/user/register', {username: username, password: password, mail: mail, invite: invite, "g-recaptcha-response": recaptchaToken}); + }, setAccessToken(access_token) { localStorage.setItem('access_token', access_token) Api().defaults.headers.common['Authorization'] = `Bearer ${access_token}` diff --git a/src/views/Access.vue b/src/views/Access.vue new file mode 100644 index 00000000..3fe0faf3 --- /dev/null +++ b/src/views/Access.vue @@ -0,0 +1,134 @@ + + + + + diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue index cc111534..86e572a8 100644 --- a/src/views/Dashboard.vue +++ b/src/views/Dashboard.vue @@ -35,7 +35,12 @@ return AppService.getAppImage(id); }, 'navigateToApp': function(item) { - location.href = item.directUrl; + if(item.directUrl) { + location.href = item.directUrl; + } else { + location.href = item.url; + } + }, 'getStartpageApps': function () { AppService.getStartPageApps().then((res) => { diff --git a/src/views/Invite.vue b/src/views/Invite.vue index c2f501b7..6de7652a 100644 --- a/src/views/Invite.vue +++ b/src/views/Invite.vue @@ -73,7 +73,6 @@ UserService.getInviteCodeInfo(this.code).then((res) => { if(res.data.data.usable) { this.errorMsg = ""; - this.$router.push({name: 'Register', query: {code: this.code}}); } else { this.errorMsg = "Invite code not valide"; } diff --git a/src/views/Register.vue b/src/views/Register.vue index 1d55b093..b986b711 100644 --- a/src/views/Register.vue +++ b/src/views/Register.vue @@ -11,7 +11,13 @@ class="mx-auto" > Register - + + Your account is register, you can now login to your Account.

+

+ + +
+

Register a new Account

@@ -23,19 +29,31 @@ value="" v-model="username" :disabled=usernameForced + :error-messages=usernameError + :error=usernameErrorFlage > +
+ Register @@ -69,23 +87,68 @@