From 54c96657926fa343cba04a8e62ecc9d8300c7aed Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 5 May 2021 15:45:11 +0200
Subject: [PATCH 1/2] transactionslist load and icon

---
 frontend/src/locales/de.json                  |  2 +-
 frontend/src/locales/en.json                  |  2 +-
 .../src/views/KontoOverview/GddStatus.vue     |  3 +-
 frontend/src/views/KontoOverview/GddTable.vue | 49 ++++++++-------
 .../src/views/Layout/DashboardLayout_gdd.vue  | 63 ++++++++++++++++---
 .../src/views/Pages/KontoOverview.spec.js     |  4 +-
 frontend/src/views/Pages/KontoOverview.vue    | 19 +++---
 .../Pages/UserProfileTransactionList.vue      | 17 ++++-
 8 files changed, 112 insertions(+), 47 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index e3868124c..0fd68c060 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -46,8 +46,8 @@
     "send_success":"Deine Zahlung wurde erfolgreich versendet."
   },
   "transaction":{
-    "show_part": "Die letzten <strong>{count}</strong> Transaktionen",
     "show_all":"Alle <strong>{count}</strong> Transaktionen ansehen",
+    "nullTransactions":"Du hast noch keine Transaktionen auf deinem Konto.",
     "more": "mehr"
   },
   "site": {
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 521f68f0d..f734e75ee 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -47,7 +47,7 @@
   },
   "transaction":{
     "show_part": "The last <strong>{count}</strong> transactions",
-    "show_all":"View all <strong>{count}</strong> transactions",
+    "nullTransactions":"You don't have any transactions on your account yet.",
     "more": "more"
   },
   "site": {
diff --git a/frontend/src/views/KontoOverview/GddStatus.vue b/frontend/src/views/KontoOverview/GddStatus.vue
index 87a06dfb6..ba4c64e68 100644
--- a/frontend/src/views/KontoOverview/GddStatus.vue
+++ b/frontend/src/views/KontoOverview/GddStatus.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <b-row v-show="showTransactionList">
+    <b-row>
       <b-col xl="6" md="6">
         <stats-card
           type="gradient-red"
@@ -29,7 +29,6 @@
 export default {
   name: 'GddStatus',
   props: {
-    showTransactionList: { type: Boolean, default: true },
     balance: { type: Number, default: 0 },
     GdtBalance: { type: Number, default: 0 },
   },
diff --git a/frontend/src/views/KontoOverview/GddTable.vue b/frontend/src/views/KontoOverview/GddTable.vue
index e8e1f3cd3..2d8563330 100644
--- a/frontend/src/views/KontoOverview/GddTable.vue
+++ b/frontend/src/views/KontoOverview/GddTable.vue
@@ -2,26 +2,42 @@
   <div>
     <b-list-group v-show="showTransactionList">
       <b-list-group-item
-        v-for="item in filteredItems"
+        v-for="item in transactions"
         :key="item.id"
         style="background-color: #ebebeba3 !important"
       >
         <div class="d-flex w-100 justify-content-between">
           <b-icon
             v-if="item.type === 'send'"
-            icon="box-arrow-left"
-            class="m-1"
+            icon="arrow-left-circle"
+            class="m-1 text-danger"
             font-scale="2"
             style="color: red"
           ></b-icon>
           <b-icon
-            v-else
-            icon="box-arrow-right"
+            v-else-if="item.type === 'receive'"
+            icon="arrow-right-circle"
             class="m-1"
             font-scale="2"
             style="color: green"
           ></b-icon>
-          <h1 class="mb-1">
+          <b-icon
+            v-else-if="item.type === 'creation'"
+            icon="gift"
+            class="m-1"
+            font-scale="2"
+            style="color: orange"
+          ></b-icon>
+          <b-icon
+            v-else
+            icon="droplet-half"
+            class="m-1"
+            font-scale="2"
+            style="color: orange"
+          ></b-icon>
+          <h1 class="">
+            <span v-if="item.type === 'receive' || item.type === 'creation'">+</span>
+            <span v-else>-</span>
             {{ $n(item.balance / 10000) }}
             <small>GDD</small>
           </h1>
@@ -73,11 +89,11 @@
         </b-collapse>
       </b-list-group-item>
       <b-list-group-item v-show="this.$route.path == '/overview'">
-        <b-alert v-if="count < 5" show variant="secondary">
-          <span class="alert-text" v-html="$t('transaction.show_part', { count: count })"></span>
+        <b-alert v-if="transactions.length === 0" show variant="secondary">
+          <span class="alert-text">{{ $t('transaction.nullTransactions') }}</span>
         </b-alert>
         <router-link
-          v-else
+          v-else-if="transactions.length > 5"
           to="/transactions"
           v-html="$t('transaction.show_all', { count: count })"
         ></router-link>
@@ -87,13 +103,11 @@
 </template>
 
 <script>
-import axios from 'axios'
-import communityAPI from '../../apis/communityAPI'
-
 export default {
   name: 'GddTable',
   props: {
     showTransactionList: { type: Boolean, default: true },
+    transactions: { default: [] },
   },
   data() {
     return {
@@ -104,15 +118,8 @@ export default {
     }
   },
 
-  async created() {
-    const result = await communityAPI.transactions(this.$store.state.session_id)
-
-    if (result.success) {
-      this.items = result.result.data.transactions
-      this.count = result.result.data.count
-    } else {
-      //console.log('error', result)
-    }
+  created() {
+    this.$emit('change-transactions')
   },
   computed: {
     filteredItems() {
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index 79270493a..cdd72b68d 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -31,7 +31,9 @@
           <router-view
             :balance="balance"
             :gdt-balance="GdtBalance"
+            :transactions="transactions"
             @update-balance="updateBalance"
+            @update-transactions="updateTransactions"
           ></router-view>
         </fade-transition>
       </div>
@@ -76,6 +78,7 @@ export default {
     return {
       balance: 0,
       GdtBalance: 0,
+      transactions: [],
     }
   },
   methods: {
@@ -99,13 +102,57 @@ export default {
         // what to do when loading balance fails?
       }
     },
-    async loadGDTBalance() {
-      const result = await communityAPI.transactions(this.$store.state.session_id)
-      if (result.success) {
-        this.GdtBalance = result.result.data.gdtSum / 10000
-      } else {
-        // what to do when loading balance fails?
-      }
+    async updateTransactions() {
+      // const result = await communityAPI.transactions(this.$store.state.session_id)
+      // if (result.success) {
+      //   this.GdtBalance = result.result.data.gdtSum / 10000
+      //   this.transactions = result.result.data.transactions
+      // } else {
+      //   // what to do when loading balance fails?
+      // }
+
+      this.transactions = [
+        {
+          name: 'Max Mustermann',
+          email: 'Maxim@Mustermann',
+          type: 'send',
+          transaction_id: 2,
+          date: '2021-02-19T13:25:38+00:00',
+          balance: 1920000,
+          memo: 'a piece of cake :)',
+          pubkey: '038a6f93270dc57b91d76bf110ad3863fcb7d1b08e7692e793fcdb4467e5b6a7',
+        },
+        {
+          name: 'Bob Bobmann',
+          email: 'Bob@Bobmann',
+          type: 'receive',
+          transaction_id: 3,
+          date: '2021-03-19T13:27:36+00:00',
+          balance: 1920000,
+          memo: 'test text hier eingeben :)',
+          pubkey: '038a6f93270dc57b91d76bf110ad3863fcb7d1b08e7692e793fcdb4467e5b6a7',
+        },
+        {
+          name: 'Gradido Akademie',
+          email: 'Gradido@Akademie',
+          type: 'creation',
+          transaction_id: 4,
+          date: '2021-03-22T13:25:36+00:00',
+          balance: 10000000,
+          memo: '1000 Gradidos für das Sammeln von Müll im Wald.',
+          pubkey: '038a6f93270dc57b91d76bf110ad3863fcb7d1b08e7692e793fcdb4467e5b6a7',
+        },
+        {
+          name: 'Verfall',
+          email: 'Gradido@Akademie',
+          type: 'decay',
+          transaction_id: 5,
+          date: '2021-02-22T13:25:37+00:00',
+          balance: 20000,
+          memo: 'verfall',
+          pubkey: '038a6f93270dc57b91d76bf110ad3863fcb7d1b08e7692e793fcdb4467e5b6a7',
+        },
+      ]
     },
     updateBalance(ammount) {
       this.balance -= ammount
@@ -116,7 +163,7 @@ export default {
   },
   created() {
     this.loadBalance()
-    this.loadGDTBalance()
+    this.updateTransactions()
   },
 }
 </script>
diff --git a/frontend/src/views/Pages/KontoOverview.spec.js b/frontend/src/views/Pages/KontoOverview.spec.js
index b0385cbc3..3cb3b8271 100644
--- a/frontend/src/views/Pages/KontoOverview.spec.js
+++ b/frontend/src/views/Pages/KontoOverview.spec.js
@@ -35,8 +35,8 @@ describe('KontoOverview', () => {
       expect(wrapper.find('gdd-table-stub').exists()).toBeTruthy()
     })
 
-    it('updates transctions data when change-transactions is emitted', async () => {
-      wrapper.find('gdd-table-stub').vm.$emit('change-transactions', [0, 1])
+    it('updates transctions data when update-transactions is emitted', async () => {
+      wrapper.find('gdd-table-stub').vm.$emit('update-transactions', [0, 1])
       await wrapper.vm.$nextTick()
       expect(wrapper.vm.transactions).toEqual(expect.arrayContaining([0, 1]))
     })
diff --git a/frontend/src/views/Pages/KontoOverview.vue b/frontend/src/views/Pages/KontoOverview.vue
index e05a6236d..52b9f832b 100644
--- a/frontend/src/views/Pages/KontoOverview.vue
+++ b/frontend/src/views/Pages/KontoOverview.vue
@@ -2,11 +2,7 @@
   <div>
     <base-header class="pb-6 pb-8 pt-5 pt-md-8 bg-transparent"></base-header>
     <b-container fluid class="mt--7">
-      <gdd-status
-        :balance="balance"
-        :gdt-balance="GdtBalance"
-        :show-transaction-list="showTransactionList"
-      />
+      <gdd-status v-if="showTransactionList" :balance="balance" :gdt-balance="GdtBalance" />
       <br />
       <gdd-send
         :balance="balance"
@@ -16,9 +12,9 @@
       />
       <hr />
       <gdd-table
-        :show-transaction-list="showTransactionList"
+        v-if="showTransactionList"
         :transactions="transactions"
-        @change-transactions="setTransactions"
+        @update-transactions="updateTransactions"
       />
     </b-container>
   </div>
@@ -32,13 +28,16 @@ export default {
   name: 'Overview',
   data() {
     return {
-      transactions: [],
       showTransactionList: true,
     }
   },
   props: {
     balance: { type: Number, default: 0 },
     GdtBalance: { type: Number, default: 0 },
+
+    transactions: {
+      default: [],
+    },
   },
   components: {
     GddStatus,
@@ -52,8 +51,8 @@ export default {
     updateBalance(data) {
       this.$emit('update-balance', data.ammount)
     },
-    setTransactions(transactions) {
-      this.transactions = transactions
+    updateTransactions() {
+      this.$emit('update-transactions')
     },
   },
 }
diff --git a/frontend/src/views/Pages/UserProfileTransactionList.vue b/frontend/src/views/Pages/UserProfileTransactionList.vue
index 2033a189a..7b4ad2ccc 100644
--- a/frontend/src/views/Pages/UserProfileTransactionList.vue
+++ b/frontend/src/views/Pages/UserProfileTransactionList.vue
@@ -7,19 +7,32 @@
     <b-container fluid class="mt--6">
       <b-row>
         <b-col class="order-xl-1">
-          <gdd-table></gdd-table>
+          <gdd-table :transactions="transactions" @update-transactions="updateTransactions" />
         </b-col>
       </b-row>
+      <b-row class="text-center mb-6" v-if="transactions.length == 0">
+        <b-col class="h2">{{ $t('transaction.nullTransactions') }}</b-col>
+      </b-row>
     </b-container>
   </div>
 </template>
 <script>
-import GddTable from '../../views/KontoOverview/GddTable.vue'
+import GddTable from '../KontoOverview/GddTable.vue'
 
 export default {
   components: {
     GddTable,
   },
+  props: {
+    transactions: {
+      default: [],
+    },
+  },
+  methods: {
+    updateTransactions() {
+      this.$emit('update-transactions')
+    },
+  },
 }
 </script>
 <style></style>

From b3529c0ea36da438e23909ea8b3df1b409f5729e Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 5 May 2021 16:53:09 +0200
Subject: [PATCH 2/2] remove testData, fix test

---
 .../src/views/Layout/DashboardLayout_gdd.vue  | 57 +++----------------
 .../src/views/Pages/KontoOverview.spec.js     |  6 --
 frontend/src/views/Pages/KontoOverview.vue    |  3 +-
 3 files changed, 8 insertions(+), 58 deletions(-)

diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index cdd72b68d..5fc696574 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -103,56 +103,13 @@ export default {
       }
     },
     async updateTransactions() {
-      // const result = await communityAPI.transactions(this.$store.state.session_id)
-      // if (result.success) {
-      //   this.GdtBalance = result.result.data.gdtSum / 10000
-      //   this.transactions = result.result.data.transactions
-      // } else {
-      //   // what to do when loading balance fails?
-      // }
-
-      this.transactions = [
-        {
-          name: 'Max Mustermann',
-          email: 'Maxim@Mustermann',
-          type: 'send',
-          transaction_id: 2,
-          date: '2021-02-19T13:25:38+00:00',
-          balance: 1920000,
-          memo: 'a piece of cake :)',
-          pubkey: '038a6f93270dc57b91d76bf110ad3863fcb7d1b08e7692e793fcdb4467e5b6a7',
-        },
-        {
-          name: 'Bob Bobmann',
-          email: 'Bob@Bobmann',
-          type: 'receive',
-          transaction_id: 3,
-          date: '2021-03-19T13:27:36+00:00',
-          balance: 1920000,
-          memo: 'test text hier eingeben :)',
-          pubkey: '038a6f93270dc57b91d76bf110ad3863fcb7d1b08e7692e793fcdb4467e5b6a7',
-        },
-        {
-          name: 'Gradido Akademie',
-          email: 'Gradido@Akademie',
-          type: 'creation',
-          transaction_id: 4,
-          date: '2021-03-22T13:25:36+00:00',
-          balance: 10000000,
-          memo: '1000 Gradidos für das Sammeln von Müll im Wald.',
-          pubkey: '038a6f93270dc57b91d76bf110ad3863fcb7d1b08e7692e793fcdb4467e5b6a7',
-        },
-        {
-          name: 'Verfall',
-          email: 'Gradido@Akademie',
-          type: 'decay',
-          transaction_id: 5,
-          date: '2021-02-22T13:25:37+00:00',
-          balance: 20000,
-          memo: 'verfall',
-          pubkey: '038a6f93270dc57b91d76bf110ad3863fcb7d1b08e7692e793fcdb4467e5b6a7',
-        },
-      ]
+      const result = await communityAPI.transactions(this.$store.state.session_id)
+      if (result.success) {
+        this.GdtBalance = result.result.data.gdtSum / 10000
+        this.transactions = result.result.data.transactions
+      } else {
+        // what to do when loading balance fails?
+      }
     },
     updateBalance(ammount) {
       this.balance -= ammount
diff --git a/frontend/src/views/Pages/KontoOverview.spec.js b/frontend/src/views/Pages/KontoOverview.spec.js
index 3cb3b8271..7f09e4e2e 100644
--- a/frontend/src/views/Pages/KontoOverview.spec.js
+++ b/frontend/src/views/Pages/KontoOverview.spec.js
@@ -35,12 +35,6 @@ describe('KontoOverview', () => {
       expect(wrapper.find('gdd-table-stub').exists()).toBeTruthy()
     })
 
-    it('updates transctions data when update-transactions is emitted', async () => {
-      wrapper.find('gdd-table-stub').vm.$emit('update-transactions', [0, 1])
-      await wrapper.vm.$nextTick()
-      expect(wrapper.vm.transactions).toEqual(expect.arrayContaining([0, 1]))
-    })
-
     describe('updateBalance method', () => {
       beforeEach(async () => {
         wrapper.find('gdd-send-stub').vm.$emit('update-balance', {
diff --git a/frontend/src/views/Pages/KontoOverview.vue b/frontend/src/views/Pages/KontoOverview.vue
index 52b9f832b..64c5d2417 100644
--- a/frontend/src/views/Pages/KontoOverview.vue
+++ b/frontend/src/views/Pages/KontoOverview.vue
@@ -34,9 +34,8 @@ export default {
   props: {
     balance: { type: Number, default: 0 },
     GdtBalance: { type: Number, default: 0 },
-
     transactions: {
-      default: [],
+      default: () => [],
     },
   },
   components: {