From 7e57c7d155826eba7170383fa444fd122b9fd1bd Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 7 Nov 2022 14:22:07 +0100
Subject: [PATCH 01/10] move the information about GRadido being free to the
 auth layout

---
 frontend/src/components/LinkInformations/RedeemLoggedOut.vue | 1 -
 frontend/src/layouts/AuthLayout.vue                          | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/LinkInformations/RedeemLoggedOut.vue b/frontend/src/components/LinkInformations/RedeemLoggedOut.vue
index 6673b3c5b..bbad3f9fb 100644
--- a/frontend/src/components/LinkInformations/RedeemLoggedOut.vue
+++ b/frontend/src/components/LinkInformations/RedeemLoggedOut.vue
@@ -13,7 +13,6 @@
           <b-button variant="primary" :to="register">
             {{ $t('gdd_per_link.to-register') }}
           </b-button>
-          <p class="mt-3">{{ $t('gdd_per_link.isFree') }}</p>
         </b-col>
         <b-col sm="12" md="6" class="mt-xs-6 mt-sm-6 mt-md-0">
           <p>{{ $t('gdd_per_link.has-account') }}</p>
diff --git a/frontend/src/layouts/AuthLayout.vue b/frontend/src/layouts/AuthLayout.vue
index 948775952..1ec48079d 100644
--- a/frontend/src/layouts/AuthLayout.vue
+++ b/frontend/src/layouts/AuthLayout.vue
@@ -70,6 +70,7 @@
               </b-row>
               <b-card-body class="">
                 <router-view></router-view>
+                <p class="mt-3">{{ $t('gdd_per_link.isFree') }}</p>
               </b-card-body>
             </b-card>
           </div>

From 106a72dd787419edbae4bf64171cb13f2e45078e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 9 Nov 2022 14:36:11 +0100
Subject: [PATCH 02/10] better behaviour when editing

---
 .../ContributionLink/ContributionLink.vue      | 18 ++++++++++++++++--
 .../ContributionLink/ContributionLinkForm.vue  |  5 +++++
 admin/src/locales/de.json                      |  1 +
 admin/src/locales/en.json                      |  1 +
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/admin/src/components/ContributionLink/ContributionLink.vue b/admin/src/components/ContributionLink/ContributionLink.vue
index a2d171d56..7190742f7 100644
--- a/admin/src/components/ContributionLink/ContributionLink.vue
+++ b/admin/src/components/ContributionLink/ContributionLink.vue
@@ -8,7 +8,11 @@
       header-class="text-center"
       class="mt-5"
     >
-      <b-button v-b-toggle.newContribution class="my-3 d-flex justify-content-left">
+      <b-button
+        v-if="!editContributionLink"
+        v-b-toggle.newContribution
+        class="my-3 d-flex justify-content-left"
+      >
         {{ $t('math.plus') }} {{ $t('contributionLink.newContributionLink') }}
       </b-button>
 
@@ -19,6 +23,7 @@
             :contributionLinkData="contributionLinkData"
             :editContributionLink="editContributionLink"
             @get-contribution-links="$emit('get-contribution-links')"
+            @closeContributionForm="closeContributionForm"
           />
         </b-card>
       </b-collapse>
@@ -63,9 +68,18 @@ export default {
     }
   },
   methods: {
+    closeContributionForm() {
+      if (this.visible) {
+        this.$root.$emit('bv::toggle::collapse', 'newContribution')
+        this.editContributionLink = false
+      }
+    },
     editContributionLinkData(data) {
-      if (!this.visible) this.$root.$emit('bv::toggle::collapse', 'newContribution')
+      if (!this.visible) {
+        this.$root.$emit('bv::toggle::collapse', 'newContribution')
+      }
       this.contributionLinkData = data
+      console.log('contributionLinkData', this.contributionLinkData)
       this.editContributionLink = true
     },
   },
diff --git a/admin/src/components/ContributionLink/ContributionLinkForm.vue b/admin/src/components/ContributionLink/ContributionLinkForm.vue
index 05f5dac8b..ff7af8f7d 100644
--- a/admin/src/components/ContributionLink/ContributionLinkForm.vue
+++ b/admin/src/components/ContributionLink/ContributionLinkForm.vue
@@ -6,6 +6,7 @@
         <b-col>
           <b-form-group :label="$t('contributionLink.validFrom')">
             <b-form-datepicker
+              reset-button
               v-model="form.validFrom"
               size="lg"
               :min="min"
@@ -19,6 +20,7 @@
         <b-col>
           <b-form-group :label="$t('contributionLink.validTo')">
             <b-form-datepicker
+              reset-button
               v-model="form.validTo"
               size="lg"
               :min="form.validFrom ? form.validFrom : min"
@@ -110,6 +112,9 @@
         <b-button type="reset" variant="danger" @click.prevent="onReset">
           {{ $t('contributionLink.clear') }}
         </b-button>
+        <b-button @click.prevent="onReset(), $emit('closeContributionForm')">
+          {{ $t('contributionLink.close') }}
+        </b-button>
       </div>
     </b-form>
   </div>
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index ffe1cab24..c012e3171 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -5,6 +5,7 @@
     "amount": "Betrag",
     "changeSaved": "Änderungen gespeichert",
     "clear": "Löschen",
+    "close": "Schließen",
     "contributionLinks": "Beitragslinks",
     "create": "Anlegen",
     "cycle": "Zyklus",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index b32efe97e..9bff733c5 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -5,6 +5,7 @@
     "amount": "Amount",
     "changeSaved": "Changes saved",
     "clear": "Clear",
+    "close": "Close",
     "contributionLinks": "Contribution Links",
     "create": "Create",
     "cycle": "Cycle",

From ae3a8dc5875920cde061e5917b59384fdde547c7 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 9 Nov 2022 14:37:23 +0100
Subject: [PATCH 03/10] fix lint and locales

---
 admin/src/components/ContributionLink/ContributionLink.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/admin/src/components/ContributionLink/ContributionLink.vue b/admin/src/components/ContributionLink/ContributionLink.vue
index 7190742f7..1bff30226 100644
--- a/admin/src/components/ContributionLink/ContributionLink.vue
+++ b/admin/src/components/ContributionLink/ContributionLink.vue
@@ -79,7 +79,6 @@ export default {
         this.$root.$emit('bv::toggle::collapse', 'newContribution')
       }
       this.contributionLinkData = data
-      console.log('contributionLinkData', this.contributionLinkData)
       this.editContributionLink = true
     },
   },

From 8b9b6f1f9ae152aa3d647efb65c28bbc0482d677 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 9 Nov 2022 17:15:29 +0100
Subject: [PATCH 04/10] fix clean display for all functions

---
 .../components/ContributionLink/ContributionLink.vue  |  1 +
 .../ContributionLink/ContributionLinkForm.vue         | 11 ++---------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/admin/src/components/ContributionLink/ContributionLink.vue b/admin/src/components/ContributionLink/ContributionLink.vue
index 1bff30226..c8963d3ab 100644
--- a/admin/src/components/ContributionLink/ContributionLink.vue
+++ b/admin/src/components/ContributionLink/ContributionLink.vue
@@ -72,6 +72,7 @@ export default {
       if (this.visible) {
         this.$root.$emit('bv::toggle::collapse', 'newContribution')
         this.editContributionLink = false
+        this.contributionLinkData = {}
       }
     },
     editContributionLinkData(data) {
diff --git a/admin/src/components/ContributionLink/ContributionLinkForm.vue b/admin/src/components/ContributionLink/ContributionLinkForm.vue
index ff7af8f7d..85b9a3e95 100644
--- a/admin/src/components/ContributionLink/ContributionLinkForm.vue
+++ b/admin/src/components/ContributionLink/ContributionLinkForm.vue
@@ -112,7 +112,7 @@
         <b-button type="reset" variant="danger" @click.prevent="onReset">
           {{ $t('contributionLink.clear') }}
         </b-button>
-        <b-button @click.prevent="onReset(), $emit('closeContributionForm')">
+        <b-button @click.prevent="$emit('closeContributionForm')">
           {{ $t('contributionLink.close') }}
         </b-button>
       </div>
@@ -208,14 +208,7 @@ export default {
   },
   watch: {
     contributionLinkData() {
-      this.form.name = this.contributionLinkData.name
-      this.form.memo = this.contributionLinkData.memo
-      this.form.amount = this.contributionLinkData.amount
-      this.form.validFrom = this.contributionLinkData.validFrom
-      this.form.validTo = this.contributionLinkData.validTo
-      this.form.cycle = this.contributionLinkData.cycle
-      this.form.maxPerCycle = this.contributionLinkData.maxPerCycle
-      this.form.maxAmountPerMonth = this.contributionLinkData.maxAmountPerMonth
+      this.form = this.contributionLinkData
     },
   },
 }

From c8227670a43edd4747ca1dbd0871edda1aa03ad9 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 9 Nov 2022 19:58:47 +0100
Subject: [PATCH 05/10] fix test over 95%

---
 .../src/components/ContributionLink/ContributionLink.spec.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/admin/src/components/ContributionLink/ContributionLink.spec.js b/admin/src/components/ContributionLink/ContributionLink.spec.js
index 9818e8b93..b72a0347c 100644
--- a/admin/src/components/ContributionLink/ContributionLink.spec.js
+++ b/admin/src/components/ContributionLink/ContributionLink.spec.js
@@ -46,5 +46,10 @@ describe('ContributionLink', () => {
       wrapper.vm.editContributionLinkData()
       expect(wrapper.vm.$root.$emit('bv::toggle::collapse', 'newContribution')).toBeTruthy()
     })
+
+    it('emits toggle::collapse close Contribution-Form ', async () => {
+      wrapper.vm.closeContributionForm()
+      expect(wrapper.vm.$root.$emit('bv::toggle::collapse', 'newContribution')).toBeTruthy()
+    })
   })
 })

From 57a98def9476b9be450ff1271e8239b3d733935b Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 10 Nov 2022 11:28:50 +0100
Subject: [PATCH 06/10] auth pages: move text about GRadido being free to the
 top of the card

---
 frontend/src/layouts/AuthLayout.vue | 1 -
 frontend/src/pages/Login.vue        | 2 +-
 frontend/src/pages/Register.vue     | 4 +---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/frontend/src/layouts/AuthLayout.vue b/frontend/src/layouts/AuthLayout.vue
index 1ec48079d..948775952 100644
--- a/frontend/src/layouts/AuthLayout.vue
+++ b/frontend/src/layouts/AuthLayout.vue
@@ -70,7 +70,6 @@
               </b-row>
               <b-card-body class="">
                 <router-view></router-view>
-                <p class="mt-3">{{ $t('gdd_per_link.isFree') }}</p>
               </b-card-body>
             </b-card>
           </div>
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 0b602f74b..6d2dff5fa 100755
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="login-form">
     <b-container v-if="enterData">
-      <div class="pb-5">{{ $t('site.login.heading') }}</div>
+      <div class="pb-5" align="center">{{ $t('gdd_per_link.isFree') }}</div>
       <validation-observer ref="observer" v-slot="{ handleSubmit }">
         <b-form @submit.stop.prevent="handleSubmit(onSubmit)">
           <b-row>
diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index 0ae316ae9..9ecb196db 100755
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -1,9 +1,7 @@
 <template>
   <div id="registerform">
     <b-container v-if="enterData">
-      <div class="pb-5">
-        {{ $t('site.signup.heading') }}
-      </div>
+      <div class="pb-5" align="center">{{ $t('gdd_per_link.isFree') }}</div>
       <validation-observer ref="observer" v-slot="{ handleSubmit }">
         <b-form role="form" @submit.prevent="handleSubmit(onSubmit)">
           <b-row>

From 230118e3902ffce9d2a1d3795715663de565bc07 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 10 Nov 2022 11:30:32 +0100
Subject: [PATCH 07/10] remove unused sign in an sign up headings from locales
 files

---
 frontend/src/locales/de.json | 4 ----
 frontend/src/locales/en.json | 4 ----
 frontend/src/locales/es.json | 4 ----
 frontend/src/locales/fr.json | 4 ----
 frontend/src/locales/nl.json | 4 ----
 5 files changed, 20 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 5304881c4..2e72da314 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -288,16 +288,12 @@
     "forgotPassword": {
       "heading": "Bitte gib deine E-Mail an mit der du bei Gradido angemeldet bist."
     },
-    "login": {
-      "heading": "Melde dich mit deinen Zugangsdaten an. Bewahre sie stets sicher auf!"
-    },
     "resetPassword": {
       "heading": "Trage bitte dein Passwort ein und wiederhole es."
     },
     "signup": {
       "agree": "Ich stimme der <a href='https://gradido.net/de/datenschutz/' target='_blank' >Datenschutzerklärung</a> zu.",
       "dont_match": "Die Passwörter stimmen nicht überein.",
-      "heading": "Registriere dich indem du alle Daten vollständig und in die richtigen Felder eingibst.",
       "lowercase": "Ein Kleinbuchstabe erforderlich.",
       "minimum": "Mindestens 8 Zeichen.",
       "no-whitespace": "Keine Leerzeichen und Tabulatoren",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 9fa2a1634..b46d3f863 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -288,16 +288,12 @@
     "forgotPassword": {
       "heading": "Please enter the email address by which you're registered here."
     },
-    "login": {
-      "heading": "Log in with your access data. Keep them safe!"
-    },
     "resetPassword": {
       "heading": "Please enter your password and repeat it."
     },
     "signup": {
       "agree": "I agree to the <a href='https://gradido.net/en/datenschutz/' target='_blank' > privacy policy</a>.",
       "dont_match": "Passwords don't match.",
-      "heading": "Register by entering all data completely and in the correct fields.",
       "lowercase": "One lowercase letter required.",
       "minimum": "8 characters minimum.",
       "no-whitespace": "No white spaces and tabs",
diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json
index b2a229f1c..2c7e4c4ba 100644
--- a/frontend/src/locales/es.json
+++ b/frontend/src/locales/es.json
@@ -288,16 +288,12 @@
     "forgotPassword": {
       "heading": "Por favor, introduce la dirección de correo electrónico con la que estas registrado en Gradido."
     },
-    "login": {
-      "heading": "Inicia sesión con tus datos de acceso. Manténlos seguros en todo momento!"
-    },
     "resetPassword": {
       "heading": "Por favor, introduce tu contraseña y repítela."
     },
     "signup": {
       "agree": "Acepto la <a href='https://gradido.net/de/datenschutz/' target='_blank' >Política de privacidad</a>.",
       "dont_match": "Las contraseñas no coinciden.",
-      "heading": "Regístrate introduciendo todos los datos completos y en los campos correctos.",
       "lowercase": "Se requiere una letra minúscula.",
       "minimum": "Al menos 8 caracteres.",
       "no-whitespace": "Sin espacios ni tabulaciones.",
diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json
index e7ac18a18..98d2e5a10 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -288,16 +288,12 @@
     "forgotPassword": {
       "heading": "Veuillez entrer l´adresse email sous laquelle vous êtes enregistré ici svp."
     },
-    "login": {
-      "heading": "Vous connecter avec vos données d´accès. Gardez les en sécurité!"
-    },
     "resetPassword": {
       "heading": "Entrez votre mot de passe et répétez l´action svp."
     },
     "signup": {
       "agree": "J´accepte le <a href='https://gradido.net/en/datenschutz/' target='_blank' > politique de confidentialité </a>.",
       "dont_match": "Les mots de passe ne correspondent pas.",
-      "heading": "Vous enregistrer en entrant toutes les données demandées dans les champs requis.",
       "lowercase": "Une lettre minuscule est requise.",
       "minimum": "8 caractères minimum.",
       "no-whitespace": "Pas d´espace ni d´onglet",
diff --git a/frontend/src/locales/nl.json b/frontend/src/locales/nl.json
index 34f484fd7..eb28615c6 100644
--- a/frontend/src/locales/nl.json
+++ b/frontend/src/locales/nl.json
@@ -288,16 +288,12 @@
     "forgotPassword": {
       "heading": "Geef alsjeblieft jouw email, waarmee je bij Gradido aangemeld bent."
     },
-    "login": {
-      "heading": "Meld je met jouw inloggegevens aan. Sla deze altijd veilig op!"
-    },
     "resetPassword": {
       "heading": "Vul alsjeblieft jouw wachtwoord in, en herhaal het."
     },
     "signup": {
       "agree": "Ik ga akkoord met <a href='https://gradido.net/de/datenschutz/' target='_blank' >Datenschutzerklärung</a>.",
       "dont_match": "De wachtwoorden zijn niet gelijk.",
-      "heading": "Schrijf je in door alle gegevens volledig en in de juiste velden in te vullen.",
       "lowercase": "Een kleine letter is noodzakelijk.",
       "minimum": "Minstens 8 tekens.",
       "no-whitespace": "Geen spaties en tabs",

From 05a4b9505d7d2c454cb2862db1a843b0de7b31a8 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 10 Nov 2022 12:25:57 +0100
Subject: [PATCH 08/10] fix load error

---
 admin/src/components/ContributionLink/ContributionLink.vue     | 1 +
 admin/src/components/ContributionLink/ContributionLinkForm.vue | 1 +
 admin/src/components/ContributionLink/ContributionLinkList.vue | 1 +
 3 files changed, 3 insertions(+)

diff --git a/admin/src/components/ContributionLink/ContributionLink.vue b/admin/src/components/ContributionLink/ContributionLink.vue
index c8963d3ab..ca82fcd42 100644
--- a/admin/src/components/ContributionLink/ContributionLink.vue
+++ b/admin/src/components/ContributionLink/ContributionLink.vue
@@ -34,6 +34,7 @@
           :items="items"
           @editContributionLinkData="editContributionLinkData"
           @get-contribution-links="$emit('get-contribution-links')"
+          @closeContributionForm="closeContributionForm"
         />
         <div v-else>{{ $t('contributionLink.noContributionLinks') }}</div>
       </b-card-text>
diff --git a/admin/src/components/ContributionLink/ContributionLinkForm.vue b/admin/src/components/ContributionLink/ContributionLinkForm.vue
index 85b9a3e95..2afd8e1c5 100644
--- a/admin/src/components/ContributionLink/ContributionLinkForm.vue
+++ b/admin/src/components/ContributionLink/ContributionLinkForm.vue
@@ -197,6 +197,7 @@ export default {
     },
     onReset() {
       this.$refs.contributionLinkForm.reset()
+      this.form = {}
       this.form.validFrom = null
       this.form.validTo = null
     },
diff --git a/admin/src/components/ContributionLink/ContributionLinkList.vue b/admin/src/components/ContributionLink/ContributionLinkList.vue
index c99821097..f67feced2 100644
--- a/admin/src/components/ContributionLink/ContributionLinkList.vue
+++ b/admin/src/components/ContributionLink/ContributionLinkList.vue
@@ -108,6 +108,7 @@ export default {
               })
               .then(() => {
                 this.toastSuccess(this.$t('contributionLink.deleted'))
+                this.$emit('closeContributionForm')
                 this.$emit('get-contribution-links')
               })
               .catch((err) => {

From 91606876e236220c9126b3d3836eb54c582958c2 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 10 Nov 2022 12:33:54 +0100
Subject: [PATCH 09/10] fix text in admin area to uppercase

---
 admin/src/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index c012e3171..456290ca7 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -98,7 +98,7 @@
   "multiple_creation_text": "Bitte wähle ein oder mehrere Mitglieder aus für die du Schöpfen möchtest.",
   "name": "Name",
   "navbar": {
-    "automaticContributions": "automatische Beiträge",
+    "automaticContributions": "Automatische Beiträge",
     "logout": "Abmelden",
     "multi_creation": "Mehrfachschöpfung",
     "my-account": "Mein Konto",

From 4724912025f69621cf7a44871a2dc49b106fd6ca Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Sat, 12 Nov 2022 16:09:13 +0100
Subject: [PATCH 10/10] fix(frontend): Mailto Link

---
 frontend/src/pages/InfoStatistic.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/InfoStatistic.vue b/frontend/src/pages/InfoStatistic.vue
index 9b3b4dff5..254a895e0 100644
--- a/frontend/src/pages/InfoStatistic.vue
+++ b/frontend/src/pages/InfoStatistic.vue
@@ -47,7 +47,7 @@
     </b-container>
     <b-container>
       <div class="h3">{{ $t('contact') }}</div>
-      <b-link href="mailto: abc@example.com">{{ supportMail }}</b-link>
+      <b-link :href="`mailto:${supportMail}`">{{ supportMail }}</b-link>
     </b-container>
     <!-- 
     <hr />