From 1eea07ac704b251c8c4d289f15d1aa03c836508e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 14 Dec 2022 15:42:31 +0100
Subject: [PATCH] rightSide LastTransaction style, click name

---
 .../Contributions/ContributionForm.vue         |  4 ++--
 frontend/src/components/Inputs/InputTime.vue   |  8 ++++----
 .../Template/RightSide/LastTransactions.vue    |  7 ++++++-
 .../src/components/TransactionRows/Name.vue    | 18 +++++++-----------
 frontend/src/layouts/templates/RightSide.vue   | 16 ++++++++--------
 frontend/src/validation-rules.js               | 12 ++++++------
 6 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index 611e171ba..546e86d11 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -190,8 +190,8 @@ export default {
       return Number(this.isThisMonth ? this.maxGddThisMonth : this.maxGddLastMonth)
     },
     validMaxTime() {
-      console.log(this.validMaxGDD)
-      console.log(this.validMaxGDD / 20)
+      // console.log(this.validMaxGDD)
+      // console.log(this.validMaxGDD / 20)
       return Number(this.validMaxGDD / 20)
     },
   },
diff --git a/frontend/src/components/Inputs/InputTime.vue b/frontend/src/components/Inputs/InputTime.vue
index 073e98d06..cd9cecc3d 100644
--- a/frontend/src/components/Inputs/InputTime.vue
+++ b/frontend/src/components/Inputs/InputTime.vue
@@ -51,14 +51,14 @@ export default {
       this.$emit('input', this.currentValue)
     },
     value() {
-      console.log('value', this.value)
-      console.log('value !== currentValue', this.value !== this.currentValue)
+      //   console.log('value', this.value)
+      //   console.log('value !== currentValue', this.value !== this.currentValue)
       // this.value = Number(this.value)
       if (Number(this.value) !== this.currentValue) this.currentValue = this.value
       this.currentValue = Number(this.currentValue)
       // this.value = Number(this.value)
-      console.log('value', typeof(this.value))
-      console.log('currentValue', typeof(this.currentValue))
+      //   console.log('value', typeof(this.value))
+      //   console.log('currentValue', typeof(this.currentValue))
     },
   },
   methods: {
diff --git a/frontend/src/components/Template/RightSide/LastTransactions.vue b/frontend/src/components/Template/RightSide/LastTransactions.vue
index 95d6b1ac4..bb0d563da 100644
--- a/frontend/src/components/Template/RightSide/LastTransactions.vue
+++ b/frontend/src/components/Template/RightSide/LastTransactions.vue
@@ -24,7 +24,7 @@
               class="mr-3"
             ></b-avatar>
             <span class="mr-auto">
-              {{ transaction.linkedUser.firstName }} {{ transaction.linkedUser.lastName }}
+              <name :linkedUser="transaction.linkedUser" />
             </span>
             <b-badge>{{ transaction.amount | GDD }}</b-badge>
           </div>
@@ -34,8 +34,13 @@
   </div>
 </template>
 <script>
+import Name from '@/components/TransactionRows/Name.vue'
+
 export default {
   name: 'LastTransactions',
+  components: {
+    Name,
+  },
   props: {
     transactions: {
       default: () => [],
diff --git a/frontend/src/components/TransactionRows/Name.vue b/frontend/src/components/TransactionRows/Name.vue
index c7bae8159..a10ed3bc8 100644
--- a/frontend/src/components/TransactionRows/Name.vue
+++ b/frontend/src/components/TransactionRows/Name.vue
@@ -5,7 +5,7 @@
         <b-link @click.stop="tunnelEmail">
           {{ itemText }}
         </b-link>
-        <span v-if="transactionLinkId">
+        <!-- <span v-if="transactionLinkId">
           {{ $t('via_link') }}
           <b-icon
             icon="link45deg"
@@ -13,7 +13,7 @@
             class="m-mb-1"
             :title="$t('gdd_per_link.redeemed-title')"
           />
-        </span>
+        </span> -->
       </div>
       <span v-else>{{ itemText }}</span>
     </div>
@@ -23,10 +23,6 @@
 export default {
   name: 'Name',
   props: {
-    amount: {
-      type: String,
-      required: true,
-    },
     linkedUser: {
       type: Object,
       required: false,
@@ -35,11 +31,11 @@ export default {
       type: String,
       required: false,
     },
-    transactionLinkId: {
-      type: Number,
-      required: false,
-      default: null,
-    },
+    // transactionLinkId: {
+    //   type: Number,
+    //   required: false,
+    //   default: null,
+    // },
   },
   methods: {
     tunnelEmail() {
diff --git a/frontend/src/layouts/templates/RightSide.vue b/frontend/src/layouts/templates/RightSide.vue
index bb4a3ddff..1cb279bc7 100644
--- a/frontend/src/layouts/templates/RightSide.vue
+++ b/frontend/src/layouts/templates/RightSide.vue
@@ -8,9 +8,9 @@
           </div>
         </b-col>
       </b-row> -->
-      <b-row class="mt-3 mt-lg-5">
+      <b-row>
         <b-col>
-          <div class="p-4 h-100">
+          <div>
             <last-transactions
               :transactions="transactions"
               :transactionCount="transactionCount"
@@ -45,9 +45,9 @@
           </div>
         </b-col>
       </b-row> -->
-      <b-row class="mt-3 mt-lg-5">
+      <b-row>
         <b-col>
-          <div class="p-4 h-100">
+          <div>
             <last-transactions
               :transactions="transactions"
               :transactionCount="transactionCount"
@@ -65,9 +65,9 @@
           </div>
         </b-col>
       </b-row> -->
-      <b-row class="mt-3 mt-lg-5">
+      <b-row>
         <b-col>
-          <div class="p-4 h-100">
+          <div>
             <last-transactions
               :transactions="transactions"
               :transactionCount="transactionCount"
@@ -85,9 +85,9 @@
           </div>
         </b-col>
       </b-row> -->
-      <b-row class="mt-3 mt-lg-5">
+      <b-row>
         <b-col>
-          <div class="p-4 h-100">
+          <div>
             <last-transactions
               :transactions="transactions"
               :transactionCount="transactionCount"
diff --git a/frontend/src/validation-rules.js b/frontend/src/validation-rules.js
index ef597ff3b..d262dfe26 100644
--- a/frontend/src/validation-rules.js
+++ b/frontend/src/validation-rules.js
@@ -56,12 +56,12 @@ export const loadAllRules = (i18nCallback) => {
 
   extend('gddCreationTime', {
     validate(value, { min, max }) {
-      console.log(value)
-      console.log(min)
-      console.log(max)
-      console.log(typeof(value))
-      console.log(typeof(min))
-      console.log(typeof(max))
+      // console.log(value)
+      // console.log(min)
+      // console.log(max)
+      // console.log(typeof(value))
+      // console.log(typeof(min))
+      // console.log(typeof(max))
       // value = value.replace(',', '.')
       return Number(value) >= min && Number(value) <= max
     },