From b93858635389f67a8741a1e16f43951d13be3c40 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 18 Jan 2023 16:07:36 +0100
Subject: [PATCH 01/13] style refactor mobile device auth template

---
 frontend/src/components/Auth/AuthNavbar.vue | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/frontend/src/components/Auth/AuthNavbar.vue b/frontend/src/components/Auth/AuthNavbar.vue
index ade6340a6..7d8c6f08a 100644
--- a/frontend/src/components/Auth/AuthNavbar.vue
+++ b/frontend/src/components/Auth/AuthNavbar.vue
@@ -53,6 +53,7 @@ export default {
 
 .auth-header {
   font-family: 'Open Sans', sans-serif !important;
+  height: 150px;
 }
 
 .sheet-img {
@@ -61,6 +62,17 @@ export default {
   max-width: 64%;
 }
 
+@media screen and (max-width: 1024px) {
+  .auth-header {
+    height: 100px;
+  }
+}
+
+@media screen and (max-width: 768px) {
+  .auth-header {
+    height: 70px;
+  }
+}
 @media screen and (max-width: 450px) {
   .sheet-img {
     top: -15px;

From f7b74d8e63cb39f1ce6c2a6ff1254ffbe0e34354 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 19 Jan 2023 07:57:11 +0100
Subject: [PATCH 02/13] refctor link result

---
 frontend/src/components/ClipboardCopy.vue     | 32 ++++++++++++-------
 .../GddSend/TransactionResultLink.vue         | 13 ++++++++
 frontend/src/mixins/copyLinks.js              | 11 ++-----
 3 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/frontend/src/components/ClipboardCopy.vue b/frontend/src/components/ClipboardCopy.vue
index 7c4e014ec..ce7d0f312 100644
--- a/frontend/src/components/ClipboardCopy.vue
+++ b/frontend/src/components/ClipboardCopy.vue
@@ -1,22 +1,32 @@
 <template>
   <div class="clipboard-copy">
-    <div v-if="canCopyLink" size="lg" class="mb-5">
-      <div class="d-flex">
-        <div>
-          <label>{{ $t('gdd_per_link.copy-link') }}</label>
-          <div class="pointer text-center bg-secondary gradido-border-radius p-4" @click="copyLink">
-            {{ link }}
-          </div>
-        </div>
-        <div class="ml-5">
-          <label>{{ $t('gdd_per_link.copy-link-with-text') }}</label>
+    <div v-if="canCopyLink" class="mb-5">
+      <div>
+        <label>{{ $t('gdd_per_link.copy-link') }}</label>
+        <div class="pointer text-center bg-secondary gradido-border-radius p-3" @click="copyLink">
+          {{ link }}
           <div>
-            <b-button @click="copyLinkWithText" class="p-4">
+            <b-button class="p-4">
               <b-icon icon="link45deg"></b-icon>
             </b-button>
           </div>
         </div>
       </div>
+      <div class="mt-5">
+        <label>{{ $t('gdd_per_link.copy-link-with-text') }}</label>
+        <div
+          class="pointer text-center bg-secondary gradido-border-radius p-3"
+          @click="copyLinkWithText"
+        >
+          {{ text }}
+          <div>
+            <b-button class="p-4">
+              <b-icon icon="link45deg"></b-icon>
+            </b-button>
+          </div>
+        </div>
+        <div></div>
+      </div>
     </div>
     <div v-else>
       <div class="alert-danger p-3">{{ $t('gdd_per_link.not-copied') }}</div>
diff --git a/frontend/src/components/GddSend/TransactionResultLink.vue b/frontend/src/components/GddSend/TransactionResultLink.vue
index e72bbc73f..53b9d05cb 100644
--- a/frontend/src/components/GddSend/TransactionResultLink.vue
+++ b/frontend/src/components/GddSend/TransactionResultLink.vue
@@ -6,7 +6,9 @@
       :amount="amount"
       :memo="memo"
       :validUntil="validUntil"
+      :text="text"
     ></clipboard-copy>
+    <label>{{ $t('qrCode') }}</label>
     <div class="text-center">
       <div><figure-qr-code :link="link" /></div>
       <div>
@@ -33,5 +35,16 @@ export default {
     memo: { type: String, required: true },
     validUntil: { type: String, required: true },
   },
+  data() {
+    return {
+      text: `${this.link}
+${this.$store.state.firstName} ${this.$t('transaction-link.send_you')} ${this.amount} Gradido.
+"${this.memo}"
+${this.$t('gdd_per_link.credit-your-gradido')} ${this.$t('gdd_per_link.validUntilDate', {
+        date: this.$d(new Date(this.validUntil), 'short'),
+      })}
+${this.$t('gdd_per_link.link-hint')}`,
+    }
+  },
 }
 </script>
diff --git a/frontend/src/mixins/copyLinks.js b/frontend/src/mixins/copyLinks.js
index ac6be95c5..b6d422c67 100644
--- a/frontend/src/mixins/copyLinks.js
+++ b/frontend/src/mixins/copyLinks.js
@@ -4,6 +4,7 @@ export const copyLinks = {
     amount: { type: String, required: true },
     memo: { type: String, required: true },
     validUntil: { type: String, required: true },
+    text: { type: String, required: true },
   },
   data() {
     return {
@@ -24,15 +25,7 @@ export const copyLinks = {
     },
     copyLinkWithText() {
       navigator.clipboard
-        .writeText(
-          `${this.link}
-${this.$store.state.firstName} ${this.$t('transaction-link.send_you')} ${this.amount} Gradido.
-"${this.memo}"
-${this.$t('gdd_per_link.credit-your-gradido')} ${this.$t('gdd_per_link.validUntilDate', {
-            date: this.$d(new Date(this.validUntil), 'short'),
-          })}
-${this.$t('gdd_per_link.link-hint')}`,
-        )
+        .writeText(this.text)
         .then(() => {
           this.toastSuccess(this.$t('gdd_per_link.link-and-text-copied'))
         })

From ad8e8b860907ba8bbb65be7738d6a64d8ba478cc Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 19 Jan 2023 09:13:39 +0100
Subject: [PATCH 03/13] fix test

---
 frontend/src/components/ClipboardCopy.vue                 | 7 ++++++-
 .../DecayInformations/CollapseLinksList.spec.js           | 2 ++
 .../components/TransactionLinks/TransactionLink.spec.js   | 1 +
 .../Transactions/TransactionLinkSummary.spec.js           | 8 ++++++++
 frontend/src/pages/Send.spec.js                           | 8 ++++----
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/ClipboardCopy.vue b/frontend/src/components/ClipboardCopy.vue
index ce7d0f312..67887d3bd 100644
--- a/frontend/src/components/ClipboardCopy.vue
+++ b/frontend/src/components/ClipboardCopy.vue
@@ -3,7 +3,11 @@
     <div v-if="canCopyLink" class="mb-5">
       <div>
         <label>{{ $t('gdd_per_link.copy-link') }}</label>
-        <div class="pointer text-center bg-secondary gradido-border-radius p-3" @click="copyLink">
+        <div
+          class="pointer text-center bg-secondary gradido-border-radius p-3"
+          @click="copyLink"
+          data-test="copyLink"
+        >
           {{ link }}
           <div>
             <b-button class="p-4">
@@ -16,6 +20,7 @@
         <label>{{ $t('gdd_per_link.copy-link-with-text') }}</label>
         <div
           class="pointer text-center bg-secondary gradido-border-radius p-3"
+          data-test="copyLinkWithText"
           @click="copyLinkWithText"
         >
           {{ text }}
diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.spec.js b/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
index 68d5d427f..2bec71172 100644
--- a/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
+++ b/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
@@ -24,6 +24,7 @@ const propsData = {
       memo: 'Eene meene Siegerpreis, vor mir steht ein Schokoeis. Hex-hex!',
       redeemedAt: null,
       validUntil: '2022-03-30T14:22:40.000Z',
+      text: '',
     },
     {
       amount: '6',
@@ -35,6 +36,7 @@ const propsData = {
       memo: 'Eene meene buntes Laub, auf dem Schrank da liegt kein Staub.',
       redeemedAt: null,
       validUntil: '2022-03-30T14:22:40.000Z',
+      text: '',
     },
   ],
   transactionLinkCount: 3,
diff --git a/frontend/src/components/TransactionLinks/TransactionLink.spec.js b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
index da37173c9..e947a7818 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.spec.js
+++ b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
@@ -28,6 +28,7 @@ const propsData = {
   id: 12,
   memo: 'Katzenauge, Eulenschrei, was verschwunden komm herbei!',
   validUntil: '2022-03-30T14:22:40.000Z',
+  text: '',
 }
 
 describe('TransactionLink', () => {
diff --git a/frontend/src/components/Transactions/TransactionLinkSummary.spec.js b/frontend/src/components/Transactions/TransactionLinkSummary.spec.js
index fe949bd61..829a8930e 100644
--- a/frontend/src/components/Transactions/TransactionLinkSummary.spec.js
+++ b/frontend/src/components/Transactions/TransactionLinkSummary.spec.js
@@ -52,6 +52,7 @@ describe('TransactionLinkSummary', () => {
                 'Hokuspokus Haselnuss, Vogelbein und Fliegenfuß, damit der Trick gelingen muss!',
               redeemedAt: null,
               validUntil: '2022-03-30T14:22:40.000Z',
+              text: '',
             },
             {
               amount: '85',
@@ -62,6 +63,7 @@ describe('TransactionLinkSummary', () => {
               memo: 'Mäusespeck und Katzenbuckel, Tricks und Tracks und Zauberkugel!',
               redeemedAt: null,
               validUntil: '2022-03-30T14:22:40.000Z',
+              text: '',
             },
             {
               amount: '95',
@@ -73,6 +75,7 @@ describe('TransactionLinkSummary', () => {
                 'Abrakadabra 1,2,3, die Sonne kommt herbei. Schweinepups und Spuckebrei, der Regen ist vorbei.',
               redeemedAt: null,
               validUntil: '2022-03-30T14:22:40.000Z',
+              text: '',
             },
             {
               amount: '150',
@@ -84,6 +87,7 @@ describe('TransactionLinkSummary', () => {
                 'Abrakadabra 1,2,3 was verschwunden ist komme herbei.Wieseldreck und Schweinemist, zaubern das ist keine List.',
               redeemedAt: null,
               validUntil: '2022-03-30T14:22:40.000Z',
+              text: '',
             },
           ],
         },
@@ -171,6 +175,7 @@ describe('TransactionLinkSummary', () => {
                     'Hat jemand die Nummer von der Hexe aus Schneewittchen? Ich bräuchte mal ein paar Äpfel.',
                   redeemedAt: null,
                   validUntil: '2022-03-30T14:22:40.000Z',
+                  text: '',
                 },
                 {
                   amount: '86',
@@ -182,6 +187,7 @@ describe('TransactionLinkSummary', () => {
                     'Die Windfahn´ krächzt am Dach, Der Uhu im Geklüfte; Was wispert wie ein Ach Verhallend in die Lüfte?',
                   redeemedAt: null,
                   validUntil: '2022-03-30T14:22:40.000Z',
+                  text: '',
                 },
                 {
                   amount: '96',
@@ -193,6 +199,7 @@ describe('TransactionLinkSummary', () => {
                     'Verschlafen kräht der Hahn, Ein Blitz noch, und ein trüber, Umwölbter Tag bricht an – Walpurgisnacht vorüber!',
                   redeemedAt: null,
                   validUntil: '2022-03-30T14:22:40.000Z',
+                  text: '',
                 },
                 {
                   amount: '150',
@@ -203,6 +210,7 @@ describe('TransactionLinkSummary', () => {
                   memo: 'Eene meene Flaschenschrank, fertig ist der Hexentrank!',
                   redeemedAt: null,
                   validUntil: '2022-03-30T14:22:40.000Z',
+                  text: '',
                 },
               ],
             },
diff --git a/frontend/src/pages/Send.spec.js b/frontend/src/pages/Send.spec.js
index 63715a6a2..651ba9c4d 100644
--- a/frontend/src/pages/Send.spec.js
+++ b/frontend/src/pages/Send.spec.js
@@ -254,7 +254,7 @@ describe('Send', () => {
           describe('copy link with success', () => {
             beforeEach(async () => {
               navigatorClipboardMock.mockResolvedValue()
-              await wrapper.find('.pointer').trigger('click')
+              await wrapper.find('div[data-test="copyLink"]').trigger('click')
             })
 
             it('should call clipboard.writeText', () => {
@@ -270,7 +270,7 @@ describe('Send', () => {
           describe('copy link with error', () => {
             beforeEach(async () => {
               navigatorClipboardMock.mockRejectedValue()
-              await wrapper.find('.clipboard-copy').find('.btn-secondary').trigger('click')
+              await wrapper.find('div[data-test="copyLink"]').trigger('click')
             })
 
             it('toasts error message', () => {
@@ -292,7 +292,7 @@ describe('Send', () => {
           describe('copy link and text with success', () => {
             beforeEach(async () => {
               navigatorClipboardMock.mockResolvedValue()
-              await wrapper.findAll('button').at(0).trigger('click')
+              await wrapper.find('div[data-test="copyLinkWithText"]').trigger('click')
             })
 
             it('should call clipboard.writeText', () => {
@@ -312,7 +312,7 @@ describe('Send', () => {
           describe('copy link and text with error', () => {
             beforeEach(async () => {
               navigatorClipboardMock.mockRejectedValue()
-              await wrapper.findAll('button').at(0).trigger('click')
+              await wrapper.find('div[data-test="copyLinkWithText"]').trigger('click')
             })
 
             it('toasts error message', () => {

From 79d9af6ec47c3fe42c8a68f78ebecc5ef206fbff Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 19 Jan 2023 10:14:45 +0100
Subject: [PATCH 04/13] test open in TransactionLinkSummary.spec.js

---
 .../DecayInformations/CollapseLinksList.spec.js      |  2 --
 .../src/components/GddSend/TransactionResultLink.vue | 12 ------------
 .../Transactions/TransactionLinkSummary.spec.js      | 10 +---------
 frontend/src/mixins/copyLinks.js                     |  8 +++++++-
 4 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.spec.js b/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
index 2bec71172..68d5d427f 100644
--- a/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
+++ b/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
@@ -24,7 +24,6 @@ const propsData = {
       memo: 'Eene meene Siegerpreis, vor mir steht ein Schokoeis. Hex-hex!',
       redeemedAt: null,
       validUntil: '2022-03-30T14:22:40.000Z',
-      text: '',
     },
     {
       amount: '6',
@@ -36,7 +35,6 @@ const propsData = {
       memo: 'Eene meene buntes Laub, auf dem Schrank da liegt kein Staub.',
       redeemedAt: null,
       validUntil: '2022-03-30T14:22:40.000Z',
-      text: '',
     },
   ],
   transactionLinkCount: 3,
diff --git a/frontend/src/components/GddSend/TransactionResultLink.vue b/frontend/src/components/GddSend/TransactionResultLink.vue
index 53b9d05cb..9efbbb3c2 100644
--- a/frontend/src/components/GddSend/TransactionResultLink.vue
+++ b/frontend/src/components/GddSend/TransactionResultLink.vue
@@ -6,7 +6,6 @@
       :amount="amount"
       :memo="memo"
       :validUntil="validUntil"
-      :text="text"
     ></clipboard-copy>
     <label>{{ $t('qrCode') }}</label>
     <div class="text-center">
@@ -35,16 +34,5 @@ export default {
     memo: { type: String, required: true },
     validUntil: { type: String, required: true },
   },
-  data() {
-    return {
-      text: `${this.link}
-${this.$store.state.firstName} ${this.$t('transaction-link.send_you')} ${this.amount} Gradido.
-"${this.memo}"
-${this.$t('gdd_per_link.credit-your-gradido')} ${this.$t('gdd_per_link.validUntilDate', {
-        date: this.$d(new Date(this.validUntil), 'short'),
-      })}
-${this.$t('gdd_per_link.link-hint')}`,
-    }
-  },
 }
 </script>
diff --git a/frontend/src/components/Transactions/TransactionLinkSummary.spec.js b/frontend/src/components/Transactions/TransactionLinkSummary.spec.js
index 829a8930e..a5bdc4714 100644
--- a/frontend/src/components/Transactions/TransactionLinkSummary.spec.js
+++ b/frontend/src/components/Transactions/TransactionLinkSummary.spec.js
@@ -52,7 +52,6 @@ describe('TransactionLinkSummary', () => {
                 'Hokuspokus Haselnuss, Vogelbein und Fliegenfuß, damit der Trick gelingen muss!',
               redeemedAt: null,
               validUntil: '2022-03-30T14:22:40.000Z',
-              text: '',
             },
             {
               amount: '85',
@@ -63,7 +62,6 @@ describe('TransactionLinkSummary', () => {
               memo: 'Mäusespeck und Katzenbuckel, Tricks und Tracks und Zauberkugel!',
               redeemedAt: null,
               validUntil: '2022-03-30T14:22:40.000Z',
-              text: '',
             },
             {
               amount: '95',
@@ -75,7 +73,6 @@ describe('TransactionLinkSummary', () => {
                 'Abrakadabra 1,2,3, die Sonne kommt herbei. Schweinepups und Spuckebrei, der Regen ist vorbei.',
               redeemedAt: null,
               validUntil: '2022-03-30T14:22:40.000Z',
-              text: '',
             },
             {
               amount: '150',
@@ -87,7 +84,6 @@ describe('TransactionLinkSummary', () => {
                 'Abrakadabra 1,2,3 was verschwunden ist komme herbei.Wieseldreck und Schweinemist, zaubern das ist keine List.',
               redeemedAt: null,
               validUntil: '2022-03-30T14:22:40.000Z',
-              text: '',
             },
           ],
         },
@@ -175,7 +171,6 @@ describe('TransactionLinkSummary', () => {
                     'Hat jemand die Nummer von der Hexe aus Schneewittchen? Ich bräuchte mal ein paar Äpfel.',
                   redeemedAt: null,
                   validUntil: '2022-03-30T14:22:40.000Z',
-                  text: '',
                 },
                 {
                   amount: '86',
@@ -187,7 +182,6 @@ describe('TransactionLinkSummary', () => {
                     'Die Windfahn´ krächzt am Dach, Der Uhu im Geklüfte; Was wispert wie ein Ach Verhallend in die Lüfte?',
                   redeemedAt: null,
                   validUntil: '2022-03-30T14:22:40.000Z',
-                  text: '',
                 },
                 {
                   amount: '96',
@@ -199,7 +193,6 @@ describe('TransactionLinkSummary', () => {
                     'Verschlafen kräht der Hahn, Ein Blitz noch, und ein trüber, Umwölbter Tag bricht an – Walpurgisnacht vorüber!',
                   redeemedAt: null,
                   validUntil: '2022-03-30T14:22:40.000Z',
-                  text: '',
                 },
                 {
                   amount: '150',
@@ -210,7 +203,6 @@ describe('TransactionLinkSummary', () => {
                   memo: 'Eene meene Flaschenschrank, fertig ist der Hexentrank!',
                   redeemedAt: null,
                   validUntil: '2022-03-30T14:22:40.000Z',
-                  text: '',
                 },
               ],
             },
@@ -222,7 +214,7 @@ describe('TransactionLinkSummary', () => {
           })
         })
 
-        it('has eight transactionLinks', () => {
+        it('has four transactionLinks', () => {
           expect(wrapper.vm.transactionLinks).toHaveLength(4)
         })
 
diff --git a/frontend/src/mixins/copyLinks.js b/frontend/src/mixins/copyLinks.js
index b6d422c67..ee48dc4e1 100644
--- a/frontend/src/mixins/copyLinks.js
+++ b/frontend/src/mixins/copyLinks.js
@@ -4,11 +4,17 @@ export const copyLinks = {
     amount: { type: String, required: true },
     memo: { type: String, required: true },
     validUntil: { type: String, required: true },
-    text: { type: String, required: true },
   },
   data() {
     return {
       canCopyLink: true,
+      text: `${this.link}
+${this.$store.state.firstName} ${this.$t('transaction-link.send_you')} ${this.amount} Gradido.
+"${this.memo}"
+${this.$t('gdd_per_link.credit-your-gradido')} ${this.$t('gdd_per_link.validUntilDate', {
+        date: this.$d(new Date(this.validUntil), 'short'),
+      })}
+${this.$t('gdd_per_link.link-hint')}`,
     }
   },
   methods: {

From d8645969d3eb8d5f8d4fca66260c2ff746cf4bd7 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 19 Jan 2023 11:28:24 +0100
Subject: [PATCH 05/13] remove mx for small device, change email align & change
 col size.

---
 frontend/src/App.vue                                           | 2 +-
 frontend/src/components/Contributions/ContributionListItem.vue | 2 +-
 frontend/src/components/Menu/Navbar.vue                        | 2 +-
 frontend/src/layouts/DashboardLayout.vue                       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 1933e380b..3ec57ca70 100755
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -30,7 +30,7 @@ export default {
   font-family: 'WorkSans', sans-serif !important;
 }
 .appContent {
-  min-width: 360px;
+  min-width: 330px;
   max-width: 1320px;
   margin-right: auto;
   margin-left: auto;
diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 1f35097ef..4717f29e5 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -26,7 +26,7 @@
             {{ $t('contribution.alert.answerQuestion') }}
           </div>
         </b-col>
-        <b-col cols="12" lg="3" offset="3" offset-md="0" offset-lg="0">
+        <b-col cols="9" lg="3" offset="3" offset-md="0" offset-lg="0">
           <div class="small">
             {{ $t('creation') }} {{ $t('(') }}{{ amount / 20 }} {{ $t('h') }}{{ $t(')') }}
           </div>
diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index f939de71d..03217a5ae 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -30,7 +30,7 @@
               <div>
                 <div data-test="navbar-item-username">{{ username.username }}</div>
 
-                <div class="text-right" data-test="navbar-item-email">
+                <div data-test="navbar-item-email">
                   {{ $store.state.email }}
                 </div>
               </div>
diff --git a/frontend/src/layouts/DashboardLayout.vue b/frontend/src/layouts/DashboardLayout.vue
index 722f89fbc..11b9e3060 100755
--- a/frontend/src/layouts/DashboardLayout.vue
+++ b/frontend/src/layouts/DashboardLayout.vue
@@ -3,7 +3,7 @@
     <div v-if="skeleton">
       <skeleton-overview />
     </div>
-    <div v-else class="mx--3 mx-lg-0">
+    <div v-else class="mx-lg-0">
       <!-- navbar -->
       <b-row>
         <b-col>

From 13c52efbbe5783db5a34f9836595ff097c0d8147 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <fridolin@tutanota.com>
Date: Thu, 19 Jan 2023 11:50:31 +0100
Subject: [PATCH 06/13] Update frontend/src/components/ClipboardCopy.vue

Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
---
 frontend/src/components/ClipboardCopy.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/components/ClipboardCopy.vue b/frontend/src/components/ClipboardCopy.vue
index 67887d3bd..df224bb67 100644
--- a/frontend/src/components/ClipboardCopy.vue
+++ b/frontend/src/components/ClipboardCopy.vue
@@ -30,7 +30,6 @@
             </b-button>
           </div>
         </div>
-        <div></div>
       </div>
     </div>
     <div v-else>

From 0f0a5a88070bdf7ef062a2de018c374730adf6f3 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 19 Jan 2023 12:13:57 +0100
Subject: [PATCH 07/13] fix tests after new layout

---
 .../TransactionLinkSummary.spec.js            | 36 +++++++++++--------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/frontend/src/components/Transactions/TransactionLinkSummary.spec.js b/frontend/src/components/Transactions/TransactionLinkSummary.spec.js
index a5bdc4714..d0086ceab 100644
--- a/frontend/src/components/Transactions/TransactionLinkSummary.spec.js
+++ b/frontend/src/components/Transactions/TransactionLinkSummary.spec.js
@@ -17,6 +17,12 @@ const mocks = {
   $apollo: {
     query: apolloQueryMock,
   },
+  $store: {
+    state: {
+      firstName: 'Bibi',
+      lastName: 'Bloxberg',
+    },
+  },
 }
 
 const propsData = {
@@ -102,10 +108,10 @@ describe('TransactionLinkSummary', () => {
 
     describe('click on transaction links', () => {
       beforeEach(async () => {
-        wrapper.find('div.transaction-slot-link').trigger('click')
+        wrapper.find('div.row').trigger('click')
       })
 
-      it.skip('calls the API to get the list transaction links', () => {
+      it('calls the API to get the list transaction links', () => {
         expect(apolloQueryMock).toBeCalledWith({
           query: listTransactionLinks,
           variables: {
@@ -115,14 +121,14 @@ describe('TransactionLinkSummary', () => {
         })
       })
 
-      it.skip('has four transactionLinks', () => {
+      it('has four transactionLinks', () => {
         expect(wrapper.vm.transactionLinks).toHaveLength(4)
       })
 
       describe('close transaction link details', () => {
         beforeEach(() => {
           jest.clearAllMocks()
-          wrapper.find('div.transaction-slot-link').trigger('click')
+          wrapper.find('div.row').trigger('click')
         })
 
         it('does not call the API', () => {
@@ -136,10 +142,10 @@ describe('TransactionLinkSummary', () => {
         describe('reopen transaction link details', () => {
           beforeEach(() => {
             jest.clearAllMocks()
-            wrapper.find('div.transaction-slot-link').trigger('click')
+            wrapper.find('div.row').trigger('click')
           })
 
-          it.skip('calls the API to get the list transaction links', () => {
+          it('calls the API to get the list transaction links', () => {
             expect(apolloQueryMock).toBeCalledWith({
               query: listTransactionLinks,
               variables: {
@@ -149,7 +155,7 @@ describe('TransactionLinkSummary', () => {
             })
           })
 
-          it.skip('has four transactionLinks', () => {
+          it('has four transactionLinks', () => {
             expect(wrapper.vm.transactionLinks).toHaveLength(4)
           })
         })
@@ -214,8 +220,8 @@ describe('TransactionLinkSummary', () => {
           })
         })
 
-        it('has four transactionLinks', () => {
-          expect(wrapper.vm.transactionLinks).toHaveLength(4)
+        it('has eight transactionLinks', () => {
+          expect(wrapper.vm.transactionLinks).toHaveLength(8)
         })
 
         it('loads more transaction links', () => {
@@ -230,19 +236,19 @@ describe('TransactionLinkSummary', () => {
 
         describe('close transaction link list', () => {
           beforeEach(async () => {
-            wrapper.find('div.transaction-slot-link').trigger('click')
+            wrapper.find('div.row').trigger('click')
           })
           describe('reopen transaction link list', () => {
             beforeEach(async () => {
               jest.clearAllMocks()
-              wrapper.find('div.transaction-slot-link').trigger('click')
+              wrapper.find('div.row').trigger('click')
             })
 
-            it.skip('calls the API once', () => {
+            it('calls the API once', () => {
               expect(apolloQueryMock).toBeCalledTimes(1)
             })
 
-            it.skip('calls the API with current page one', () => {
+            it('calls the API with current page one', () => {
               expect(apolloQueryMock).toBeCalledWith({
                 query: listTransactionLinks,
                 variables: {
@@ -289,10 +295,10 @@ describe('TransactionLinkSummary', () => {
       })
     })
 
-    describe.skip('loads transaction links with error', () => {
+    describe('loads transaction links with error', () => {
       beforeEach(() => {
         apolloQueryMock.mockRejectedValue({ message: 'OUCH!' })
-        wrapper.find('div.transaction-slot-link').trigger('click')
+        wrapper.find('div.row').trigger('click')
       })
 
       it('toasts an error message', () => {

From e0365b3ed5cf94dfa4185d013d1954fd008881ed Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 19 Jan 2023 12:16:55 +0100
Subject: [PATCH 08/13] add store to mocks

---
 .../components/DecayInformations/CollapseLinksList.spec.js  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.spec.js b/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
index 68d5d427f..fddc00317 100644
--- a/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
+++ b/frontend/src/components/DecayInformations/CollapseLinksList.spec.js
@@ -10,6 +10,12 @@ const mocks = {
   $tc: jest.fn((tc) => tc),
   $t: jest.fn((t) => t),
   $d: jest.fn((d) => d),
+  $store: {
+    state: {
+      firstName: 'Bibi',
+      lastName: 'Bloxberg',
+    },
+  },
 }
 
 const propsData = {

From 2d567fb46c70d89ac59656fba6c9472a4e542d8f Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 19 Jan 2023 12:22:06 +0100
Subject: [PATCH 09/13] linkText as computed property

---
 frontend/src/components/ClipboardCopy.vue     |  2 +-
 .../TransactionLinks/TransactionLink.spec.js  |  1 -
 frontend/src/mixins/copyLinks.js              | 20 +++++++++++--------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/ClipboardCopy.vue b/frontend/src/components/ClipboardCopy.vue
index df224bb67..4374f7182 100644
--- a/frontend/src/components/ClipboardCopy.vue
+++ b/frontend/src/components/ClipboardCopy.vue
@@ -23,7 +23,7 @@
           data-test="copyLinkWithText"
           @click="copyLinkWithText"
         >
-          {{ text }}
+          {{ linkText }}
           <div>
             <b-button class="p-4">
               <b-icon icon="link45deg"></b-icon>
diff --git a/frontend/src/components/TransactionLinks/TransactionLink.spec.js b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
index e947a7818..da37173c9 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.spec.js
+++ b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
@@ -28,7 +28,6 @@ const propsData = {
   id: 12,
   memo: 'Katzenauge, Eulenschrei, was verschwunden komm herbei!',
   validUntil: '2022-03-30T14:22:40.000Z',
-  text: '',
 }
 
 describe('TransactionLink', () => {
diff --git a/frontend/src/mixins/copyLinks.js b/frontend/src/mixins/copyLinks.js
index ee48dc4e1..1e339c49f 100644
--- a/frontend/src/mixins/copyLinks.js
+++ b/frontend/src/mixins/copyLinks.js
@@ -8,13 +8,6 @@ export const copyLinks = {
   data() {
     return {
       canCopyLink: true,
-      text: `${this.link}
-${this.$store.state.firstName} ${this.$t('transaction-link.send_you')} ${this.amount} Gradido.
-"${this.memo}"
-${this.$t('gdd_per_link.credit-your-gradido')} ${this.$t('gdd_per_link.validUntilDate', {
-        date: this.$d(new Date(this.validUntil), 'short'),
-      })}
-${this.$t('gdd_per_link.link-hint')}`,
     }
   },
   methods: {
@@ -31,7 +24,7 @@ ${this.$t('gdd_per_link.link-hint')}`,
     },
     copyLinkWithText() {
       navigator.clipboard
-        .writeText(this.text)
+        .writeText(this.linkText)
         .then(() => {
           this.toastSuccess(this.$t('gdd_per_link.link-and-text-copied'))
         })
@@ -41,4 +34,15 @@ ${this.$t('gdd_per_link.link-hint')}`,
         })
     },
   },
+  computed: {
+    linkText() {
+      return `${this.link}
+${this.$store.state.firstName} ${this.$t('transaction-link.send_you')} ${this.amount} Gradido.
+"${this.memo}"
+${this.$t('gdd_per_link.credit-your-gradido')} ${this.$t('gdd_per_link.validUntilDate', {
+        date: this.$d(new Date(this.validUntil), 'short'),
+      })}
+${this.$t('gdd_per_link.link-hint')}`
+    },
+  },
 }

From a99acadf2168b65c1e99cfd746565136f19343e4 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 19 Jan 2023 12:23:05 +0100
Subject: [PATCH 10/13] coverage frontend to 93%

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 82785db18..dfac48371 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -437,7 +437,7 @@ jobs:
           report_name: Coverage Frontend
           type: lcov
           result_path: ./coverage/lcov.info
-          min_coverage: 92
+          min_coverage: 93
           token: ${{ github.token }}
   
   ##############################################################################

From 633c89f082ca16fd9a138e13bb68c7cc8b14e05c Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 19 Jan 2023 12:59:17 +0100
Subject: [PATCH 11/13] change dropdown placement calender no-flip true

---
 frontend/src/components/Contributions/ContributionForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index e9f99848f..84059dcbd 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -17,7 +17,7 @@
         :label-no-date-selected="$t('contribution.noDateSelected')"
         required
         :disabled="this.form.id !== null"
-        :dropleft="true"
+        :no-flip="true"
       >
         <template #nav-prev-year><span></span></template>
         <template #nav-next-year><span></span></template>

From ac15586f34f09281d41a9862a5d62e16832fc4e1 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 19 Jan 2023 13:05:58 +0100
Subject: [PATCH 12/13] reduce min value to 0.25 to be consistent

---
 frontend/src/components/Contributions/ContributionForm.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index e9f99848f..b70404c9b 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -35,12 +35,12 @@
         v-model="form.hours"
         :name="$t('form.hours')"
         :label="$t('form.hours')"
-        placeholder="0.5"
+        placeholder="0.25"
         :rules="{
           required: true,
-          min: 0.5,
+          min: 0.25,
           max: validMaxTime,
-          gddCreationTime: [0.5, validMaxTime],
+          gddCreationTime: [0.25, validMaxTime],
         }"
         :validMaxTime="validMaxTime"
         @updateAmount="updateAmount"

From d7fa8b8f8b4133e861e8e73daadec940335c0b38 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 19 Jan 2023 13:24:51 +0100
Subject: [PATCH 13/13] refactor(frontend): forgot password unit tests

---
 frontend/src/pages/ForgotPassword.spec.js | 62 +++++++++--------------
 1 file changed, 24 insertions(+), 38 deletions(-)

diff --git a/frontend/src/pages/ForgotPassword.spec.js b/frontend/src/pages/ForgotPassword.spec.js
index f4b74e555..c5b25bf1c 100644
--- a/frontend/src/pages/ForgotPassword.spec.js
+++ b/frontend/src/pages/ForgotPassword.spec.js
@@ -1,4 +1,4 @@
-import { mount, RouterLinkStub } from '@vue/test-utils'
+import { mount } from '@vue/test-utils'
 import flushPromises from 'flush-promises'
 import { toastErrorSpy } from '@test/testSetup'
 import ForgotPassword from './ForgotPassword'
@@ -7,43 +7,28 @@ const mockAPIcall = jest.fn()
 
 const localVue = global.localVue
 
-const mockRouterPush = jest.fn()
-
-const stubs = {
-  RouterLink: RouterLinkStub,
-}
-
-const createMockObject = (comingFrom) => {
-  return {
-    localVue,
-    mocks: {
-      $t: jest.fn((t) => t),
-      $router: {
-        push: mockRouterPush,
-      },
-      $apollo: {
-        mutate: mockAPIcall,
-      },
-      $route: {
-        params: {
-          comingFrom,
-        },
-      },
+const mocks = {
+  $t: jest.fn((t) => t),
+  $apollo: {
+    mutate: mockAPIcall,
+  },
+  $route: {
+    params: {
+      comingFrom: '',
     },
-    stubs,
-  }
+  },
 }
 
 describe('ForgotPassword', () => {
   let wrapper
 
-  const Wrapper = (functionN) => {
-    return mount(ForgotPassword, functionN)
+  const Wrapper = () => {
+    return mount(ForgotPassword, { localVue, mocks })
   }
 
   describe('mount', () => {
     beforeEach(() => {
-      wrapper = Wrapper(createMockObject())
+      wrapper = Wrapper()
     })
 
     it('renders the component', () => {
@@ -110,12 +95,6 @@ describe('ForgotPassword', () => {
               expect(wrapper.find('.test-message-button').attributes('href')).toBe('/login')
             })
 
-            it.skip('click redirects to "/login"', async () => {
-              // wrapper.find('.test-message-button').trigger('click')
-              // await wrapper.vm.$nextTick()
-              expect(mockRouterPush).toBeCalledWith('/login')
-            })
-
             it('toasts a standard error message', () => {
               expect(toastErrorSpy).toBeCalledWith('error.email-already-sent')
             })
@@ -144,13 +123,20 @@ describe('ForgotPassword', () => {
             it('button link redirects to "/login"', () => {
               expect(wrapper.find('.test-message-button').attributes('href')).toBe('/login')
             })
-
-            it.skip('click redirects to "/login"', () => {
-              // expect(mockRouterPush).toBeCalledWith('/login')
-            })
           })
         })
       })
     })
+
+    describe('route has coming from ', () => {
+      beforeEach(() => {
+        mocks.$route.params.comingFrom = 'coming from'
+        wrapper = Wrapper()
+      })
+
+      it('changes subtitle', () => {
+        expect(wrapper.vm.subtitle).toBe('settings.password.resend_subtitle')
+      })
+    })
   })
 })