From dd227e4bb1fb1e6a81f66f752f4c2cfa6a9dfb25 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Tue, 15 Jun 2021 11:47:07 +0200
Subject: [PATCH 1/4] change userdata button disable rules

---
 .../Pages/UserProfile/UserCard_FormUserData.vue  |  2 +-
 .../UserProfile/UserCard_FormUserPasswort.vue    | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue
index 1fa26b5e0..254c0cb9e 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue
@@ -68,7 +68,7 @@
             <b-col>
               <div class="text-right" ref="submitButton">
                 <b-button
-                  variant="info"
+                  :variant="loading ? 'default' : 'success'"
                   @click="onSubmit"
                   type="submit"
                   class="mt-4"
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
index 6bc1d8942..aba9809fe 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
@@ -89,10 +89,17 @@
               </b-input-group>
             </b-col>
           </b-row>
+
           <b-row class="text-right" v-if="!edit_pwd">
             <b-col>
               <div class="text-right" ref="submitButton">
-                <b-button variant="info" @click="onSubmit" class="mt-4">
+                <b-button
+                  :variant="loading ? 'default' : 'success'"
+                  @click="onSubmit"
+                  type="submit"
+                  class="mt-4"
+                  :disabled="loading"
+                >
                   {{ $t('form.save') }}
                 </b-button>
               </div>
@@ -132,7 +139,12 @@ export default {
       this.passwordVisibleOldPwd = !this.passwordVisibleOldPwd
     },
     loadSubmitButton() {
-      if (this.passwordVisibleNewPwd === this.passwordVisibleNewPwdRepeat) {
+      if (
+        this.password !== '' &&
+        this.passwordNew !== '' &&
+        this.passwordNewRepeat !== '' &&
+        this.passwordNew === this.passwordNewRepeat
+      ) {
         this.loading = false
       } else {
         this.loading = true

From 37ffb1fc594cb6b81ab81b8d738b5220313a54f4 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Tue, 15 Jun 2021 12:21:18 +0200
Subject: [PATCH 2/4] rules for change new passwort fix

---
 .../UserProfile/UserCard_FormUserPasswort.vue | 48 ++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
index aba9809fe..34fd39e68 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
@@ -20,7 +20,7 @@
         </b-row>
 
         <div v-if="!edit_pwd">
-          <b-row class="mb-3">
+          <b-row class="mb-5">
             <b-col class="col-lg-3 col-md-10 col-sm-10 text-md-left text-lg-right">
               <small>{{ $t('form.password_old') }}</small>
             </b-col>
@@ -43,6 +43,7 @@
               </b-input-group>
             </b-col>
           </b-row>
+
           <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('form.password_new') }}</small>
@@ -89,6 +90,26 @@
               </b-input-group>
             </b-col>
           </b-row>
+          <b-row>
+            <b-col></b-col>
+            <b-col>
+              <transition name="hint" appear>
+                <div v-if="passwordValidation.errors.length > 0 && !submitted" class="hints">
+                  <ul>
+                    <li v-for="error in passwordValidation.errors" :key="error">
+                      <small>{{ error }}</small>
+                    </li>
+                  </ul>
+                </div>
+                <div class="matches" v-else-if="!samePasswords">
+                  <p>
+                    {{ $t('site.signup.dont_match') }}
+                    <i class="ni ni-active-40" color="danger"></i>
+                  </p>
+                </div>
+              </transition>
+            </b-col>
+          </b-row>
 
           <b-row class="text-right" v-if="!edit_pwd">
             <b-col>
@@ -165,6 +186,31 @@ export default {
       }
     },
   },
+  computed: {
+    samePasswords() {
+      return this.password === this.passwordNew
+    },
+    rules() {
+      return [
+        { message: this.$t('site.signup.lowercase'), regex: /[a-z]+/ },
+        { message: this.$t('site.signup.uppercase'), regex: /[A-Z]+/ },
+        { message: this.$t('site.signup.minimum'), regex: /.{8,}/ },
+        { message: this.$t('site.signup.one_number'), regex: /[0-9]+/ },
+      ]
+    },
+    passwordValidation() {
+      const errors = []
+      for (const condition of this.rules) {
+        if (!condition.regex.test(this.passwordNew)) {
+          errors.push(condition.message)
+        }
+      }
+      if (errors.length === 0) {
+        return { valid: true, errors }
+      }
+      return { valid: false, errors }
+    },
+  },
 }
 </script>
 <style></style>

From 280aa8e1f13860c1648f31471bff86067ac301fb Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Tue, 15 Jun 2021 12:39:47 +0200
Subject: [PATCH 3/4] rules fix

---
 .../Pages/UserProfile/UserCard_FormUserPasswort.vue      | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
index 34fd39e68..4a8979d2c 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
@@ -94,19 +94,13 @@
             <b-col></b-col>
             <b-col>
               <transition name="hint" appear>
-                <div v-if="passwordValidation.errors.length > 0 && !submitted" class="hints">
+                <div v-if="passwordValidation.errors.length > 0" class="hints">
                   <ul>
                     <li v-for="error in passwordValidation.errors" :key="error">
                       <small>{{ error }}</small>
                     </li>
                   </ul>
                 </div>
-                <div class="matches" v-else-if="!samePasswords">
-                  <p>
-                    {{ $t('site.signup.dont_match') }}
-                    <i class="ni ni-active-40" color="danger"></i>
-                  </p>
-                </div>
               </transition>
             </b-col>
           </b-row>
@@ -147,6 +141,7 @@ export default {
       passwordVisibleNewPwd: false,
       passwordVisibleNewPwdRepeat: false,
       loading: true,
+
     }
   },
   methods: {

From 4aa25724b0c3e33fb22d40f4aefcae41e798f841 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Tue, 15 Jun 2021 12:43:13 +0200
Subject: [PATCH 4/4] fix sidebar xxx

---
 frontend/src/components/SidebarPlugin/SideBar.vue               | 2 +-
 .../src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index 756e72d2a..495dec3d2 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -85,7 +85,7 @@ export default {
       default: 'img/brand/green.png',
       description: 'Gradido Sidebar app logo',
     },
-    value: { type: Array },
+    value: { type: String },
     autoClose: {
       type: Boolean,
       default: true,
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
index 4a8979d2c..4cd266975 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
@@ -141,7 +141,6 @@ export default {
       passwordVisibleNewPwd: false,
       passwordVisibleNewPwdRepeat: false,
       loading: true,
-
     }
   },
   methods: {