From 11384e4060f9409c9cfe21853adf318a9a9cf1ab Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 15 Sep 2021 15:01:14 +0200
Subject: [PATCH] style fix, locale fix, all settings fix

---
 .../components/SidebarPlugin/SideBar.spec.js  |  6 ---
 .../src/components/SidebarPlugin/SideBar.vue  |  5 ---
 frontend/src/locales/de.json                  |  4 +-
 frontend/src/locales/en.json                  |  4 +-
 .../views/Layout/DashboardLayout_gdd.spec.js  |  4 --
 .../src/views/Pages/UserProfile/UserCard.vue  |  6 ++-
 .../UserProfile/UserCard_FormUserData.vue     | 30 +++++++-------
 .../Pages/UserProfile/UserCard_Language.vue   | 33 ++++++++++++----
 .../Pages/UserProfile/UserCard_Newsletter.vue | 39 ++++++++-----------
 9 files changed, 68 insertions(+), 63 deletions(-)

diff --git a/frontend/src/components/SidebarPlugin/SideBar.spec.js b/frontend/src/components/SidebarPlugin/SideBar.spec.js
index 58405f38f..9f182ca93 100644
--- a/frontend/src/components/SidebarPlugin/SideBar.spec.js
+++ b/frontend/src/components/SidebarPlugin/SideBar.spec.js
@@ -113,12 +113,6 @@ describe('SideBar', () => {
           expect(wrapper.emitted('logout')).toEqual([[]])
         })
       })
-
-      describe('language-switch', () => {
-        it('has a language-switch button', () => {
-          expect(wrapper.find('div.language-switch').exists()).toBeTruthy()
-        })
-      })
     })
   })
 })
diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index c3f991297..519a4f0b1 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -64,23 +64,18 @@
             </a>
           </li>
         </ul>
-        <div class="mt-5 ml-4">
-          <language-switch />
-        </div>
       </div>
     </div>
   </nav>
 </template>
 <script>
 import NavbarToggleButton from '@/components/NavbarToggleButton'
-import LanguageSwitch from '@/components/LanguageSwitch.vue'
 import VueQrcode from 'vue-qrcode'
 
 export default {
   name: 'sidebar',
   components: {
     NavbarToggleButton,
-    LanguageSwitch,
     VueQrcode,
   },
   props: {
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 6093f2239..23adb0246 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -45,8 +45,8 @@
   "setting": {
     "newsletter": "Newsletter",
     "changeNewsletter": "Newsletter Status ändern",
-    "newsletterTrue": "Du bist im Newslettersystem von Gradido eingetraten und erhällst regelmäsig Neuigkeiten und Informationen.",
-    "newsletterFalse": "Du bist aus Newslettersystem von Gradido ausgetragen."
+    "newsletterTrue": "Du bist im Newslettersystem eingetraten.",
+    "newsletterFalse": "Du bist aus Newslettersystem ausgetragen."
   },
   "form": {
     "cancel": "Abbrechen",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index d1652965f..30f43bc4f 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -45,8 +45,8 @@
   "setting": {
     "newsletter": "Newsletter",
     "changeNewsletter": "Newsletter status change",
-    "newsletterTrue": "You have joined the Gradido newsletter system and receive news and information regularly.",
-    "newsletterFalse": "You are unsubscribed from Gradido's newsletter system."
+    "newsletterTrue": "You are subscribed to newsletter system.",
+    "newsletterFalse": "You are unsubscribed from newsletter system."
   },
   "form": {
     "cancel":"Cancel",
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
index 614ddf9c4..d59942a2e 100644
--- a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js
@@ -117,10 +117,6 @@ describe('DashboardLayoutGdd', () => {
         )
       })
 
-      it('has a locale switch', () => {
-        expect(wrapper.find('div.language-switch').exists()).toBeTruthy()
-      })
-
       it('has a logout button', () => {
         expect(wrapper.findAll('ul').at(3).text()).toBe('logout')
       })
diff --git a/frontend/src/views/Pages/UserProfile/UserCard.vue b/frontend/src/views/Pages/UserProfile/UserCard.vue
index 6beee221a..2065ab839 100755
--- a/frontend/src/views/Pages/UserProfile/UserCard.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard.vue
@@ -1,7 +1,11 @@
 <template>
   <b-card class="bg-transparent">
     <div class="w-100 text-center">
-      <vue-qrcode :value="$store.state.email" type="image/png"></vue-qrcode>
+      <vue-qrcode
+        v-if="$store.state.email"
+        :value="$store.state.email"
+        type="image/png"
+      ></vue-qrcode>
     </div>
 
     <div class="card-profile-stats d-flex justify-content-center mt-md-5">
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue
index 5fb0c607f..55063d270 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue
@@ -12,38 +12,42 @@
       </b-row>
     </div>
 
-    <b-container>
+    <div>
       <b-form @keyup.prevent="loadSubmitButton">
         <b-row class="mb-3">
-          <b-col class="col-12 col-lg-3 col-md-12 col-sm-12 text-md-left text-lg-right">
-            <small>{{ $t('form.firstname') }}</small>
+          <b-col class="col-12">
+            <small>
+              <b>{{ $t('form.firstname') }}</b>
+            </small>
           </b-col>
-          <b-col v-if="showUserData" class="h2 col-sm-10 col-md-9">
+          <b-col v-if="showUserData" class="col-12">
             {{ form.firstName }}
           </b-col>
-          <b-col v-else class="col-md-9 col-sm-10">
+          <b-col v-else class="col-12">
             <b-input type="text" v-model="form.firstName"></b-input>
           </b-col>
         </b-row>
         <b-row class="mb-3">
-          <b-col class="col-12 col-lg-3 col-md-12 col-sm-12 text-md-left text-lg-right">
-            <small>{{ $t('form.lastname') }}</small>
+          <b-col class="col-12">
+            <small>
+              <b>{{ $t('form.lastname') }}</b>
+            </small>
           </b-col>
-          <b-col v-if="showUserData" class="h2 col-sm-10 col-md-9">
+          <b-col v-if="showUserData" class="col-12">
             {{ form.lastName }}
           </b-col>
-          <b-col v-else class="col-md-9 col-sm-10">
+          <b-col v-else class="col-12">
             <b-input type="text" v-model="form.lastName"></b-input>
           </b-col>
         </b-row>
         <b-row class="mb-3" v-show="false">
-          <b-col class="col-12 col-lg-3 col-md-10 col-sm-10 text-md-left text-lg-right">
+          <b-col class="col-12">
             <small>{{ $t('form.description') }}</small>
           </b-col>
-          <b-col v-if="showUserData" class="col-sm-10 col-md-9">
+          <b-col v-if="showUserData" class="col-12">
             {{ form.description }}
           </b-col>
-          <b-col v-else class="col-sm-10 col-md-9">
+          <b-col v-else class="col-12">
             <b-textarea rows="3" max-rows="6" v-model="form.description"></b-textarea>
           </b-col>
         </b-row>
@@ -64,7 +68,7 @@
           </b-col>
         </b-row>
       </b-form>
-    </b-container>
+    </div>
   </b-card>
 </template>
 <script>
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_Language.vue b/frontend/src/views/Pages/UserProfile/UserCard_Language.vue
index 684f0c91e..7bd02cf4c 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_Language.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_Language.vue
@@ -18,10 +18,12 @@
 
     <div v-if="showLanguage">
       <b-row class="mb-3">
-        <b-col class="col-lg-3 col-md-10 col-sm-10 text-md-left text-lg-right">
-          <small>{{ $t('language') }}</small>
+        <b-col class="col-12">
+          <small>
+            <b>{{ $t('language') }}</b>
+          </small>
         </b-col>
-        <b-col class="h2 col-md-9 col-sm-10">{{ $store.state.language }}</b-col>
+        <b-col class="col-12">{{ $store.state.language }}</b-col>
       </b-row>
     </div>
 
@@ -29,18 +31,26 @@
       <div>
         <b-form @submit.stop.prevent="handleSubmit(onSubmit)">
           <b-row class="mb-2">
-            <b-col class="col-lg-3 col-md-10 col-sm-10 text-md-left text-lg-right">
-              <small>{{ $t('language') }}</small>
+            <b-col class="col-12">
+              <small>
+                <b>{{ $t('language') }}</b>
+              </small>
             </b-col>
-            <b-col class="col-md-9 col-sm-10">
+            <b-col class="col-12">
               <language-switch-select @update-language="updateLanguage" :language="language" />
             </b-col>
           </b-row>
 
           <b-row class="text-right">
             <b-col>
-              <div class="text-right">
-                <b-button type="submit" variant="primary" class="mt-4">
+              <div class="text-right" ref="submitButton">
+                <b-button
+                  :variant="loading ? 'default' : 'success'"
+                  @click="onSubmit"
+                  type="submit"
+                  class="mt-4"
+                  :disabled="loading"
+                >
                   {{ $t('form.save') }}
                 </b-button>
               </div>
@@ -62,15 +72,22 @@ export default {
     return {
       showLanguage: true,
       language: '',
+      loading: true,
     }
   },
   methods: {
     updateLanguage(e) {
       this.language = e
+      if (this.language !== this.$store.state.language) {
+        this.loading = false
+      } else {
+        this.loading = true
+      }
     },
     cancelEdit() {
       this.showLanguage = true
     },
+
     async onSubmit() {
       this.$apollo
         .query({
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.vue b/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.vue
index 17fcd65bf..bdcdee847 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.vue
@@ -5,29 +5,21 @@
     style="background-color: #ebebeba3 !important"
   >
     <div>
-      <b-row class="mb-4 text-right">
-        <b-col class="text-right">
-          <div>
-            <b-form-checkbox
-              class="text-right Test-BFormCheckbox"
-              v-model="NewsletterStatus"
-              name="check-button"
-              switch
-            >
-              {{ $t('setting.changeNewsletter') }}
-            </b-form-checkbox>
-          </div>
-        </b-col>
-      </b-row>
-    </div>
-
-    <div v-if="showNewsletter">
       <b-row class="mb-3">
-        <b-col class="col-lg-3 col-md-10 col-sm-10 text-md-left text-lg-right">
-          <small>{{ $t('setting.newsletter') }}</small>
+        <b-col class="mb-2 col-12">
+          <small>
+            <b>{{ $t('setting.newsletter') }}</b>
+          </small>
         </b-col>
-        <b-col class="h2 col-md-9 col-sm-10">
-          {{ NewsletterStatus ? $t('setting.newsletterTrue') : $t('setting.newsletterFalse') }}
+        <b-col class="col-12">
+          <b-form-checkbox
+            class="Test-BFormCheckbox"
+            v-model="NewsletterStatus"
+            name="check-button"
+            switch
+          >
+            {{ NewsletterStatus ? $t('setting.newsletterTrue') : $t('setting.newsletterFalse') }}
+          </b-form-checkbox>
         </b-col>
       </b-row>
     </div>
@@ -44,13 +36,16 @@ export default {
       NewsletterStatus: true,
     }
   },
+  created() {
+    this.NewsletterStatus = this.$store.state.newsletter /* exestiert noch nicht im store */
+  },
   methods: {
     async onSubmit() {
       this.$apollo
         .query({
           query: updateUserInfos,
           variables: {
-            newsletter: this.$store.state.newsletter /* exestiert noch nicht im store */,
+            newsletter: this.$store.state.language /* exestiert noch nicht im store */,
           },
         })
         .then(() => {