diff --git a/client/src/components/profile/PasswordChangeForm.vue b/client/src/components/profile/PasswordChangeForm.vue index 4c33be61..6d298048 100644 --- a/client/src/components/profile/PasswordChangeForm.vue +++ b/client/src/components/profile/PasswordChangeForm.vue @@ -11,6 +11,7 @@ :class="{ 'skillboxform-input__input--error': errors.has('oldPassword') }" class="change-form__old skillbox-input skillboxform-input__input" autocomplete="off" + data-vv-as="Altes Passwort" data-cy="old-password"> {{ errors.first('oldPassword') }} {{ error }} @@ -21,6 +22,7 @@ name="newPassword" type="text" v-model="newPassword" + data-vv-as="Neues Passwort" v-validate="'required|min:8|strongPassword'" :class="{ 'skillboxform-input__input--error': errors.has('newPassword') }" class="change-form__new skillbox-input skillboxform-input__input" diff --git a/client/src/graphql/gql/mutations/registration.gql b/client/src/graphql/gql/mutations/registration.gql new file mode 100644 index 00000000..4a5f8367 --- /dev/null +++ b/client/src/graphql/gql/mutations/registration.gql @@ -0,0 +1,8 @@ +mutation Registration($input: RegistrationInput!){ + registration(input: $input) { + success + errors { + field + } + } +} diff --git a/client/src/pages/registration.vue b/client/src/pages/registration.vue new file mode 100644 index 00000000..533c1891 --- /dev/null +++ b/client/src/pages/registration.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/client/src/router/index.js b/client/src/router/index.js index 7f6f410e..3a3c754a 100644 --- a/client/src/router/index.js +++ b/client/src/router/index.js @@ -28,6 +28,7 @@ import surveyPage from '@/pages/survey' import styleGuidePage from '@/pages/styleguide' import moduleRoom from '@/pages/moduleRoom' import login from '@/pages/login' +import registration from '@/pages/registration' import store from '@/store/index'; @@ -117,6 +118,7 @@ const routes = [ props: true, meta: {layout: 'simple'} }, + {path: '/register', component: registration}, {path: '/styleguide', component: styleGuidePage}, {path: '*', component: p404} ]; diff --git a/server/registration/admin.py b/server/registration/admin.py new file mode 100644 index 00000000..a155661d --- /dev/null +++ b/server/registration/admin.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# +# ITerativ GmbH +# http://www.iterativ.ch/ +# +# Copyright (c) 2019 ITerativ GmbH. All rights reserved. +# +# Created on 2019-10-10 +# @author: chrigu +from django.contrib import admin + +from registration.models import LicenseType, License + + +@admin.register(LicenseType) +class LicenseTypeAdmin(admin.ModelAdmin): + list_display = ('id', 'key', 'for_role') + list_filter = ('for_role',) + + +@admin.register(License) +class LicenseAdmin(admin.ModelAdmin): + list_display = ('license_type', 'licensee') + list_filter = ('license_type', 'licensee')