Merge branch 'master' into 1942-Replace-pictures-for-carousel

frontend/src/assets/scss/gradido-template.scss

@@ -41,26 +41,49 @@ 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%);
+  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, 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 {
-  color: #212529;
+  color: #fff;
+  box-shadow: 0 5px 10px rgb(0 0 0 / 20%);
 }
 
 .btn-gradido:focus {
   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, 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;
+}
+
 .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,

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()

frontend/src/pages/Register.vue

@@ -61,11 +61,7 @@
             </b-col>
           </b-row>
           <b-row>
-            <b-col sm="12" md="6"><input-email v-model="form.email"></input-email></b-col>
-            <b-col sm="12" md="6">
-              <label>{{ $t('language') }}</label>
-              <language-switch-select @update-language="updateLanguage" />
-            </b-col>
+            <b-col><input-email v-model="form.email"></input-email></b-col>
           </b-row>
 
           <b-row class="mt-4 mb-4">
@@ -84,7 +80,7 @@
               <b-button
                 type="submit"
                 :disabled="disabled"
-                :variant="disabled ? 'outline-gradido' : 'gradido'"
+                :variant="disabled ? 'gradido-disable' : 'gradido'"
               >
                 {{ $t('signup') }}
               </b-button>
@@ -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