diff --git a/webapp/components/Registration/RegistrationItemCreateUserAccount.vue b/webapp/components/Registration/RegistrationItemCreateUserAccount.vue index ce7548699..420a783f3 100644 --- a/webapp/components/Registration/RegistrationItemCreateUserAccount.vue +++ b/webapp/components/Registration/RegistrationItemCreateUserAccount.vue @@ -29,10 +29,11 @@ --> - @@ -226,6 +227,7 @@ export default { this.noPolitical = this.sliderData.collectedInputData.noPolitical ? this.sliderData.collectedInputData.noPolitical : false + this.sendValidation() }) }, computed: { @@ -284,7 +286,7 @@ export default { noCommercial, noPolitical, } = this - // const locale = this.$i18n.locale() + const locale = this.$i18n.locale() const value = { name, about, @@ -298,7 +300,7 @@ export default { minimumAge, noCommercial, noPolitical, - // locale, + locale, } console.log('sendValidation !!!', ' this.valid: ', this.valid, ' value: ', value) this.sliderData.validateCallback(this.valid, value) diff --git a/webapp/components/Registration/RegistrationItemEnterEmail.vue b/webapp/components/Registration/RegistrationItemEnterEmail.vue new file mode 100644 index 000000000..fb4fc4f7e --- /dev/null +++ b/webapp/components/Registration/RegistrationItemEnterEmail.vue @@ -0,0 +1,197 @@ + + + + diff --git a/webapp/components/Registration/RegistrationItemEnterInvite.vue b/webapp/components/Registration/RegistrationItemEnterInvite.vue index 0e0f186f7..15215b569 100644 --- a/webapp/components/Registration/RegistrationItemEnterInvite.vue +++ b/webapp/components/Registration/RegistrationItemEnterInvite.vue @@ -3,9 +3,9 @@ class="enter-invite" v-model="formData" :schema="formSchema" - @submit="handleSubmitVerify" @input="handleInput" @input-valid="handleInputValid" + @submit="handleSubmitVerify" > + + + + {{ $t('components.enter-nonce.form.description') }} + + + + + + + + + diff --git a/webapp/components/Registration/RegistrationSlider.story.js b/webapp/components/Registration/RegistrationSlider.story.js index 0bf6d5932..56990cccf 100644 --- a/webapp/components/Registration/RegistrationSlider.story.js +++ b/webapp/components/Registration/RegistrationSlider.story.js @@ -5,123 +5,63 @@ import helpers from '~/storybook/helpers' helpers.init() -// Wolle export const searchResults = [ -// { -// id: 'post-by-jenny', -// __typename: 'Post', -// slug: 'user-post-by-jenny', -// title: 'User Post by Jenny', -// value: 'User Post by Jenny', -// shoutedCount: 0, -// commentsCount: 4, -// createdAt: '2019-11-13T03:03:16.155Z', -// author: { -// id: 'u3', -// name: 'Jenny Rostock', -// slug: 'jenny-rostock', -// }, -// }, -// { -// id: 'f48f00a0-c412-432f-8334-4276a4e15d1c', -// __typename: 'Post', -// slug: 'eum-quos-est-molestiae-enim-magni-consequuntur-sed-commodi-eos', -// title: 'Eum quos est molestiae enim magni consequuntur sed commodi eos.', -// value: 'Eum quos est molestiae enim magni consequuntur sed commodi eos.', -// shoutedCount: 0, -// commentsCount: 0, -// createdAt: '2019-11-13T03:00:45.478Z', -// author: { -// id: 'u6', -// name: 'Louie', -// slug: 'louie', -// }, -// }, -// { -// id: 'p7', -// __typename: 'Post', -// slug: 'this-is-post-7', -// title: 'This is post #7', -// value: 'This is post #7', -// shoutedCount: 1, -// commentsCount: 1, -// createdAt: '2019-11-13T03:00:23.098Z', -// author: { -// id: 'u6', -// name: 'Louie', -// slug: 'louie', -// }, -// }, -// { -// id: 'p12', -// __typename: 'Post', -// slug: 'this-is-post-12', -// title: 'This is post #12', -// value: 'This is post #12', -// shoutedCount: 0, -// commentsCount: 12, -// createdAt: '2019-11-13T03:00:23.098Z', -// author: { -// id: 'u6', -// name: 'Louie', -// slug: 'louie', -// }, -// }, -// { -// id: 'u1', -// __typename: 'User', -// avatar: { -// url: -// 'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg', -// }, -// name: 'Peter Lustig', -// slug: 'peter-lustig', -// }, -// { -// id: 'cdbca762-0632-4564-b646-415a0c42d8b8', -// __typename: 'User', -// avatar: { -// url: -// 'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg', -// }, -// name: 'Herbert Schultz', -// slug: 'herbert-schultz', -// }, -// { -// id: 'u2', -// __typename: 'User', -// avatar: { -// url: -// 'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg', -// }, -// name: 'Bob der Baumeister', -// slug: 'bob-der-baumeister', -// }, -// { -// id: '7b654f72-f4da-4315-8bed-39de0859754b', -// __typename: 'User', -// avatar: { -// url: -// 'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg', -// }, -// name: 'Tonya Mohr', -// slug: 'tonya-mohr', -// }, -// { -// id: 'Hashtag', -// __typename: 'Tag', -// }, -// ] - storiesOf('RegistrationSlider', module) .addDecorator(withA11y) .addDecorator(helpers.layout) - .add('standard', () => ({ + .add('invite-code empty', () => ({ components: { RegistrationSlider }, store: helpers.store, data: () => ({ // Wolle searchResults, }), template: ` - + + `, + })) + .add('invite-code with data', () => ({ + components: { RegistrationSlider }, + store: helpers.store, + data: () => ({ + overwriteSliderData: { + collectedInputData: { + inviteCode: 'IN1T6Y', + email: 'wolle.huss@pjannto.com', + nonce: 'NTRSCZ', + name: 'Wolle', + password: 'Hello', + passwordConfirmation: 'Hello', + about: `Hey`, + termsAndConditionsAgreedVersion: null, + termsAndConditionsConfirmed: true, + dataPrivacy: true, + minimumAge: true, + noCommercial: true, + noPolitical: true, + locale: null, + }, + }, + }), + template: ` + + `, + })) + .add('public-registration', () => ({ + components: { RegistrationSlider }, + store: helpers.store, + data: () => ({ + // Wolle searchResults, + }), + template: ` + + `, + })) + .add('invite-mail', () => ({ + components: { RegistrationSlider }, + store: helpers.store, + data: () => ({ + // Wolle searchResults, + }), + template: ` + `, })) diff --git a/webapp/components/Registration/RegistrationSlider.vue b/webapp/components/Registration/RegistrationSlider.vue index 61c4164d2..c77f4b8d2 100644 --- a/webapp/components/Registration/RegistrationSlider.vue +++ b/webapp/components/Registration/RegistrationSlider.vue @@ -14,23 +14,25 @@ -