ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Style pages, remove no-class page

This commit is contained in:
Christian Cueni 2020-05-06 08:37:30 +02:00
parent 9e940e31d8
commit b222fc86e4
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/src/pages/check-email.vue
View File

@ -1,9 +1,17 @@
<template> <template>
<div class="check-email"> <div class="check-email">
<main class="check-email__content" data-cy="email-check"> <main class="check-email__content content" data-cy="email-check">
Ein Email ist auf dem Weg, bitte überprüfen sie ihre E-mail Konto. <p class="content__instructions">Ein Email ist auf dem Weg, bitte überprüfen sie ihre E-mail Konto.</p>
</main> </main>
</div> </div>
</template> </template>
<style scoped lang="scss">
@import "@/styles/_variables.scss";
.content__instructions {
margin-top: $medium-spacing;
}
</style>

11
client/src/pages/joinClass.vue
View File

@ -21,7 +21,7 @@
<div> <div>
<a class="button button--primary button--big" data-cy="join-class" @click="joinClass(code)">Klasse beitreten</a> <a class="button button--primary button--big" data-cy="join-class" @click="joinClass(code)">Klasse beitreten</a>
<a class="button button--big" data-cy="join-class-cancel" @click="cancel">Abbrechen</a> <button class="button button--big" data-cy="join-class-cancel" @click="logout">Abmelden</button>
</div> </div>
</div> </div>
@ -31,6 +31,7 @@
<script> <script>
import JOIN_CLASS_MUTATION from '@/graphql/gql/mutations/joinClass.gql'; import JOIN_CLASS_MUTATION from '@/graphql/gql/mutations/joinClass.gql';
import MY_SCHOOL_CLASS_QUERY from '@/graphql/gql/mySchoolClass'; import MY_SCHOOL_CLASS_QUERY from '@/graphql/gql/mySchoolClass';
import LOGOUT_MUTATION from '@/graphql/gql/mutations/logoutUser.gql';
import addSchoolClassMixin from '@/mixins/add-school-class'; import addSchoolClassMixin from '@/mixins/add-school-class';
@ -74,8 +75,12 @@
} }
}) })
}, },
cancel() { logout() {
this.$router.go(-1); this.$apollo.mutate({
mutation: LOGOUT_MUTATION,
}).then(({data}) => {
if (data.logout.success) { location.replace('/') }
});
} }
} }
} }

9
client/src/router/index.js
View File

@ -31,7 +31,6 @@ import login from '@/pages/login'
import betaLogin from '@/pages/beta-login' import betaLogin from '@/pages/beta-login'
import hello from '@/pages/hello' import hello from '@/pages/hello'
import registration from '@/pages/registration' import registration from '@/pages/registration'
import waitForClass from '@/pages/waitForClass'
import checkEmail from '@/pages/check-email' import checkEmail from '@/pages/check-email'
import emailVerification from '@/pages/email-verification' import emailVerification from '@/pages/email-verification'
import licenseActivation from '@/pages/license-activation' import licenseActivation from '@/pages/license-activation'
@ -148,7 +147,7 @@ const routes = [
{path: 'show-code', name: 'show-code', component: showCode, meta: {layout: 'simple'}}, {path: 'show-code', name: 'show-code', component: showCode, meta: {layout: 'simple'}},
] ]
}, },
{path: 'join-class', name: 'join-class', component: joinClass, meta: {layout: 'simple'}}, {path: 'join-class', name: 'join-class', component: joinClass, meta: {layout: 'public'}},
{ {
path: '/survey/:id', path: '/survey/:id',
component: surveyPage, component: surveyPage,
@ -165,12 +164,6 @@ const routes = [
layout: 'public', layout: 'public',
} }
}, },
{
path: '/no-class',
component: waitForClass,
name: 'noClass',
meta: {layout: 'public'}
},
{ {
path: '/check-email', path: '/check-email',
component: checkEmail, component: checkEmail,