From ec5151c42cadaab78395bd05afa5843e9f768755 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 20 Mar 2022 09:12:55 +0100
Subject: [PATCH] change color link information box

---
 .../LinkInformatins/RedeemSelfCreator.vue     |  2 +-
 .../LinkInformatins/RedeemValid.vue           |  3 +-
 .../ShowTransactionLinkInformations.spec.js   | 26 ++++++-----
 .../pages/ShowTransactionLinkInformations.vue | 45 +++++++++++--------
 4 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/frontend/src/components/LinkInformatins/RedeemSelfCreator.vue b/frontend/src/components/LinkInformatins/RedeemSelfCreator.vue
index ce0f268d5..9b8405ad6 100644
--- a/frontend/src/components/LinkInformatins/RedeemSelfCreator.vue
+++ b/frontend/src/components/LinkInformatins/RedeemSelfCreator.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="redeem-self-creator">
-    <b-jumbotron bg-variant="info" text-variant="dark" border-variant="dark">
+    <b-jumbotron bg-variant="muted" text-variant="dark" border-variant="info">
       <h1>
         {{ user.firstName }}
         {{ $t('transaction-link.send_you') }} {{ amount | GDD }}
diff --git a/frontend/src/components/LinkInformatins/RedeemValid.vue b/frontend/src/components/LinkInformatins/RedeemValid.vue
index f17fb2c56..9d0b9e037 100644
--- a/frontend/src/components/LinkInformatins/RedeemValid.vue
+++ b/frontend/src/components/LinkInformatins/RedeemValid.vue
@@ -10,7 +10,7 @@
 
     <b-jumbotron>
       <div class="mb-3 text-center">
-        <b-button variant="primary" @click="$emit('redeem-link')" size="lg">
+        <b-button variant="primary" @click="$emit('redeem-link', id, amount)" size="lg">
           {{ $t('gdd_per_link.redeem') }}
         </b-button>
       </div>
@@ -21,6 +21,7 @@
 export default {
   name: 'RedeemValid',
   props: {
+    id: { type: Number, required: false },
     user: { type: Object, required: false },
     amount: { type: String, required: false },
     memo: { type: String, required: false, default: '' },
diff --git a/frontend/src/pages/ShowTransactionLinkInformations.spec.js b/frontend/src/pages/ShowTransactionLinkInformations.spec.js
index 73de19f80..e5b112f2a 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.spec.js
+++ b/frontend/src/pages/ShowTransactionLinkInformations.spec.js
@@ -5,20 +5,26 @@ import { queryTransactionLink } from '@/graphql/queries'
 const localVue = global.localVue
 
 const errorHandler = jest.fn()
+const apolloQueryMock = jest.fn()
 
 localVue.config.errorHandler = errorHandler
 
-const apolloQueryMock = jest.fn()
 apolloQueryMock.mockResolvedValue({
-  id: 92,
-  amount: '22',
-  memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
-  createdAt: '2022-03-17T16:10:28.000Z',
-  validUntil: '2022-03-31T16:10:28.000Z',
-  redeemedAt: '2022-03-18T10:08:43.000Z',
-  deletedAt: null,
-  user: { firstName: 'Bibi', publisherId: 0, email: 'bibi@bloxberg.de', __typename: 'User' },
-  __typename: 'TransactionLink',
+  data: {
+    listTransactionLinks: [
+      {
+        id: 92,
+        amount: '22',
+        memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
+        createdAt: '2022-03-17T16:10:28.000Z',
+        validUntil: '2022-03-31T16:10:28.000Z',
+        redeemedAt: '2022-03-18T10:08:43.000Z',
+        deletedAt: null,
+        user: { firstName: 'Bibi', publisherId: 0, email: 'bibi@bloxberg.de', __typename: 'User' },
+        __typename: 'TransactionLink',
+      },
+    ],
+  },
 })
 
 const createMockObject = (code) => {
diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/ShowTransactionLinkInformations.vue
index cb16f4b25..7c55bbc03 100644
--- a/frontend/src/pages/ShowTransactionLinkInformations.vue
+++ b/frontend/src/pages/ShowTransactionLinkInformations.vue
@@ -3,13 +3,21 @@
     <div class="text-center"><b-img :src="img" fluid alt="logo"></b-img></div>
     <b-container class="mt-4">
       <transaction-link-information-item :type="itemType">
-        <template #X1><redeem-logged-out v-bind="displaySetup" /></template>
+        <template #X1>
+          <redeem-logged-out v-bind="displaySetup" />
+        </template>
 
-        <template #X2><redeem-self-creator v-bind="displaySetup" /></template>
+        <template #X2>
+          <redeem-self-creator v-bind="displaySetup" />
+        </template>
 
-        <template #X3><redeem-valid v-bind="displaySetup" @redeem-link="redeemLink" /></template>
+        <template #X3>
+          <redeem-valid v-bind="displaySetup" @redeem-link="redeemLink" />
+        </template>
 
-        <template #X4><redeemed-text-box :text="redeemedBoxText" /></template>
+        <template #X4>
+          <redeemed-text-box :text="redeemedBoxText" />
+        </template>
       </transaction-link-information-item>
     </b-container>
   </div>
@@ -20,7 +28,6 @@ import RedeemLoggedOut from '@/components/LinkInformatins/RedeemLoggedOut'
 import RedeemSelfCreator from '@/components/LinkInformatins/RedeemSelfCreator'
 import RedeemValid from '@/components/LinkInformatins/RedeemValid'
 import RedeemedTextBox from '@/components/LinkInformatins/RedeemedTextBox'
-
 import { queryTransactionLink } from '@/graphql/queries'
 import { redeemTransactionLink } from '@/graphql/mutations'
 
@@ -38,9 +45,9 @@ export default {
       img: '/img/brand/green.png',
       displaySetup: {
         amount: '123.45',
-        memo: '',
+        memo: 'memo',
         user: {
-          firstName: '',
+          firstName: 'Bibi',
         },
         deletedAt: null,
       },
@@ -63,20 +70,20 @@ export default {
           this.displaySetup.deletedAt = true
         })
     },
-    redeemLink() {
+    redeemLink(id, amount) {
       this.$bvModal.msgBoxConfirm(this.$t('gdd_per_link.redeem-text')).then(async (value) => {
         if (value)
           await this.$apollo
             .mutate({
               mutation: redeemTransactionLink,
               variables: {
-                id: this.displaySetup.id,
+                id: id,
               },
             })
-            .then((result) => {
+            .then(() => {
               this.toastSuccess(
                 this.$t('gdd_per_link.redeemed', {
-                  n: this.displaySetup.amount,
+                  n: amount,
                 }),
               )
               this.$router.push('/overview')
@@ -98,15 +105,15 @@ export default {
           date: this.displaySetup.deletedAt,
           user: this.displaySetup.firstName,
         })
-        return 'X4'
+        return `X4`
       } else {
         // link ist abgelaufen, nicht gelöscht
-        if (new Date(this.displaySetup.validUntil) < new Date()) {
+        if (new Date(this.displaySetup.validUntil) > new Date()) {
           // eslint-disable-next-line vue/no-side-effects-in-computed-properties
           this.redeemedBoxText = this.$t('gdd_per_link.link-expired', {
             date: this.displaySetup.validUntil,
           })
-          return 'X4'
+          return `X4`
         }
 
         // der link wurde eingelöst, nicht gelöscht
@@ -115,16 +122,16 @@ export default {
           this.redeemedBoxText = this.$t('gdd_per_link.redeemed-at', {
             date: this.displaySetup.redeemedAt,
           })
-          return 'X4'
+          return `X4`
         }
       }
 
       if (!this.$store.state.token) {
-        return 'X1'
+        return `X1`
       } else {
         // logged in, nicht berechtigt einzulösen, eigener link
         if (this.$store.state.email === this.displaySetup.user.email) {
-          return 'X2'
+          return `X2`
         }
 
         // logged in und berechtigt einzulösen
@@ -133,11 +140,11 @@ export default {
           !this.displaySetup.redeemedAt &&
           !this.displaySetup.deletedAt
         ) {
-          return 'X3'
+          return `X3`
         }
       }
 
-      return ''
+      return `X`
     },
   },
   created() {