From bfb64d06188703552469490f1fc53d5980d3a910 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 24 May 2022 10:44:32 +0200 Subject: [PATCH 1/3] remove language input from register --- frontend/src/pages/Register.vue | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue index 4ffd6ce79..27235011b 100755 --- a/frontend/src/pages/Register.vue +++ b/frontend/src/pages/Register.vue @@ -61,11 +61,7 @@ - - - - - + @@ -103,13 +99,11 @@ import { createUser } from '@/graphql/mutations' import CONFIG from '@/config' import InputEmail from '@/components/Inputs/InputEmail.vue' -import LanguageSwitchSelect from '@/components/LanguageSwitchSelect.vue' import Message from '@/components/Message/Message' export default { components: { InputEmail, - LanguageSwitchSelect, Message, }, name: 'Register', @@ -121,7 +115,6 @@ export default { email: '', agree: false, }, - language: '', showPageMessage: false, submitted: false, publisherId: this.$store.state.publisherId, @@ -130,10 +123,6 @@ export default { } }, methods: { - updateLanguage(e) { - this.language = e - this.$store.commit('language', this.language) - }, getValidationState({ dirty, validated, valid = null }) { return dirty || validated ? valid : null }, @@ -148,7 +137,7 @@ export default { email: this.form.email, firstName: this.form.firstname, lastName: this.form.lastname, - language: this.language, + language: this.$store.state.language, publisherId: this.$store.state.publisherId, redeemCode: this.redeemCode, }, @@ -183,7 +172,7 @@ export default { return this.form.email !== '' }, disabled() { - return !(this.namesFilled && this.emailFilled && this.form.agree && !!this.language) + return !(this.namesFilled && this.emailFilled && this.form.agree) }, enterData() { return !this.showPageMessage From 225eec36dea435d66c574026f4aa506eaff372f0 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 24 May 2022 12:13:05 +0200 Subject: [PATCH 2/3] fixed stylelint --- frontend/src/assets/scss/gradido-template.scss | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/frontend/src/assets/scss/gradido-template.scss b/frontend/src/assets/scss/gradido-template.scss index 04f47d8f5..e932774c0 100644 --- a/frontend/src/assets/scss/gradido-template.scss +++ b/frontend/src/assets/scss/gradido-template.scss @@ -63,17 +63,17 @@ a, .btn-gradido-disable { padding: 1em 3em; - letter-spacing: 0.05em; - color: #fff; - transition: all 0.5s ease; - background: rgb(97,97,97); - background: linear-gradient(135deg, rgba(180,180,180,1) 46%, rgba(180,180,180,1) 99%); - box-shadow: rgba(0, 0, 0, 0.4) 0px 30px 90px; - border-radius:26px; + letter-spacing: 0.05em; + color: #fff; + transition: all 0.5s ease; + background: rgb(97 97 97); + background: linear-gradient(135deg, rgb(180 180 180 / 100%) 46%, rgb(180 180 180 / 100%) 99%); + box-shadow: rgb(0 0 0 / 40%) 0 30px 90px; + border-radius: 26px; } .btn-gradido-disable:hover { - color: #fff; + color: #fff; } .btn-outline-gradido { From ff867523ab73577ec4efc2343b4317b438a7866f Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 24 May 2022 13:22:32 +0200 Subject: [PATCH 3/3] fixed test for Register.spec.js --- frontend/src/pages/Register.spec.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/frontend/src/pages/Register.spec.js b/frontend/src/pages/Register.spec.js index fc5108a62..742851a1d 100644 --- a/frontend/src/pages/Register.spec.js +++ b/frontend/src/pages/Register.spec.js @@ -68,15 +68,6 @@ describe('Register', () => { expect(wrapper.find('#Email-input-field').exists()).toBe(true) }) - it('has Language selected field', () => { - expect(wrapper.find('.selectedLanguage').exists()).toBe(true) - }) - - it('selects Language value en', async () => { - wrapper.find('.selectedLanguage').findAll('option').at(1).setSelected() - expect(wrapper.find('.selectedLanguage').element.value).toBe('en') - }) - it('has 1 checkbox input fields', () => { expect(wrapper.find('#registerCheckbox').exists()).toBe(true) }) @@ -114,7 +105,6 @@ describe('Register', () => { beforeEach(() => { wrapper.find('#registerFirstname').setValue('Max') wrapper.find('#registerLastname').setValue('Mustermann') - wrapper.find('.language-switch-select').findAll('option').at(1).setSelected() }) it('has disabled submit button when missing input checked box', () => { wrapper.find('#Email-input-field').setValue('max.mustermann@gradido.net') @@ -132,7 +122,6 @@ describe('Register', () => { wrapper.find('#registerFirstname').setValue('Max') wrapper.find('#registerLastname').setValue('Mustermann') wrapper.find('#Email-input-field').setValue('max.mustermann@gradido.net') - wrapper.find('.language-switch-select').findAll('option').at(1).setSelected() wrapper.find('#registerCheckbox').setChecked() }) @@ -241,7 +230,6 @@ describe('Register', () => { wrapper.find('#registerFirstname').setValue('Max') wrapper.find('#registerLastname').setValue('Mustermann') wrapper.find('#Email-input-field').setValue('max.mustermann@gradido.net') - wrapper.find('.language-switch-select').findAll('option').at(1).setSelected() wrapper.find('#registerCheckbox').setChecked() await wrapper.find('form').trigger('submit') await flushPromises()