From 44f9c96d95285370183fae4e94cc61c5dbef0e4c Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 24 May 2022 08:37:37 +0200 Subject: [PATCH 1/6] refactor gradido template button, hover --- .../src/assets/scss/gradido-template.scss | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/frontend/src/assets/scss/gradido-template.scss b/frontend/src/assets/scss/gradido-template.scss index 97118ca2b..569f4d538 100644 --- a/frontend/src/assets/scss/gradido-template.scss +++ b/frontend/src/assets/scss/gradido-template.scss @@ -41,17 +41,19 @@ a, } .btn-gradido { - background-image: linear-gradient(146deg, rgb(220 167 44) 50%, rgb(197 141 56 / 100%) 100%); - background-size: auto; - background-position: 0% 0%; - background-repeat: repeat; - border-style: none; - box-shadow: 10px 10px 50px 10px rgb(56 56 56 / 31%); - color: #fff; + display: inline-block; + padding: 1em 3em; + letter-spacing: 0.05em; + color: #fff; + transition: all 0.5s ease; + background: rgb(249,205,105); + background: linear-gradient(135deg, rgba(249,205,105,1) 2%, rgba(197,141,56,1) 55%); + box-shadow: rgba(0, 0, 0, 0.4) 0px 30px 90px; + border-radius:26px; } .btn-gradido:hover { - color: #212529; + box-shadow: 0 5px 10px rgba(0,0,0,0.2); } .btn-gradido:focus { @@ -61,6 +63,11 @@ a, .btn-outline-gradido { color: rgb(140 121 88); border: 1px solid #f5b805; + box-shadow: 10px 10px 50px 10px rgb(56 56 56 / 31%); +} + +.btn-outline-gradido:hover { + box-shadow: 10px 10px 50px 10px rgb(56 56 56 / 0%); } .form-control, From 60945b0f72c5435ae38551fe1f290d16c8bec896 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 24 May 2022 09:05:09 +0200 Subject: [PATCH 2/6] fixed stylelint --- frontend/src/assets/scss/gradido-template.scss | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/frontend/src/assets/scss/gradido-template.scss b/frontend/src/assets/scss/gradido-template.scss index 569f4d538..ed7e71173 100644 --- a/frontend/src/assets/scss/gradido-template.scss +++ b/frontend/src/assets/scss/gradido-template.scss @@ -42,18 +42,18 @@ a, .btn-gradido { display: inline-block; - padding: 1em 3em; - letter-spacing: 0.05em; - color: #fff; - transition: all 0.5s ease; - background: rgb(249,205,105); - background: linear-gradient(135deg, rgba(249,205,105,1) 2%, rgba(197,141,56,1) 55%); - box-shadow: rgba(0, 0, 0, 0.4) 0px 30px 90px; - border-radius:26px; + padding: 1em 3em; + letter-spacing: 0.05em; + color: #fff; + transition: all 0.5s ease; + background: rgb(249 205 105); + background: linear-gradient(135deg, rgb(249 205 105 / 100%) 2%, rgb(197 141 56 / 100%) 55%); + box-shadow: rgb(0 0 0 / 40%) 0 30px 90px; + border-radius: 26px; } .btn-gradido:hover { - box-shadow: 0 5px 10px rgba(0,0,0,0.2); + box-shadow: 0 5px 10px rgb(0 0 0 / 20%); } .btn-gradido:focus { From bfb64d06188703552469490f1fc53d5980d3a910 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 24 May 2022 10:44:32 +0200 Subject: [PATCH 3/6] 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 c7b727e984488dc141b4ed2ef541f2477f3b2141 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 24 May 2022 11:47:48 +0200 Subject: [PATCH 4/6] add button disable --- frontend/src/assets/scss/gradido-template.scss | 16 ++++++++++++++++ frontend/src/pages/Register.vue | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/frontend/src/assets/scss/gradido-template.scss b/frontend/src/assets/scss/gradido-template.scss index ed7e71173..04f47d8f5 100644 --- a/frontend/src/assets/scss/gradido-template.scss +++ b/frontend/src/assets/scss/gradido-template.scss @@ -53,6 +53,7 @@ a, } .btn-gradido:hover { + color: #fff; box-shadow: 0 5px 10px rgb(0 0 0 / 20%); } @@ -60,6 +61,21 @@ a, outline: none; } +.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; +} + +.btn-gradido-disable:hover { + color: #fff; +} + .btn-outline-gradido { color: rgb(140 121 88); border: 1px solid #f5b805; diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue index 4ffd6ce79..7cab11bed 100755 --- a/frontend/src/pages/Register.vue +++ b/frontend/src/pages/Register.vue @@ -84,7 +84,7 @@ {{ $t('signup') }} From 225eec36dea435d66c574026f4aa506eaff372f0 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 24 May 2022 12:13:05 +0200 Subject: [PATCH 5/6] 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 6/6] 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()