From 7f24bc06731b2bd147f0ff1dede804a77584c4f1 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Fri, 7 May 2021 11:18:02 +0200
Subject: [PATCH 1/5] befor merge master

---
 frontend/src/views/Pages/AccountOverview.vue  | 13 ++++++-----
 .../views/Pages/AccountOverview/GddTable.vue  |  5 -----
 .../Pages/AccountOverview/GddTableFooter.vue  | 22 +++++++++++++++++++
 3 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 frontend/src/views/Pages/AccountOverview/GddTableFooter.vue

diff --git a/frontend/src/views/Pages/AccountOverview.vue b/frontend/src/views/Pages/AccountOverview.vue
index a9bc7852a..37045cd6e 100644
--- a/frontend/src/views/Pages/AccountOverview.vue
+++ b/frontend/src/views/Pages/AccountOverview.vue
@@ -17,6 +17,7 @@
         :max="5"
         @update-transactions="updateTransactions"
       />
+      <gdd-table-footer :count="count"/>
     </b-container>
   </div>
 </template>
@@ -24,9 +25,16 @@
 import GddStatus from './AccountOverview/GddStatus.vue'
 import GddSend from './AccountOverview/GddSend.vue'
 import GddTable from './AccountOverview/GddTable.vue'
+import GddTableFooter from './AccountOverview/GddTableFooter.vue'
 
 export default {
   name: 'Overview',
+  components: {
+    GddStatus,
+    GddSend,
+    GddTable,
+    GddTableFooter,
+  },
   data() {
     return {
       showTransactionList: true,
@@ -39,11 +47,6 @@ export default {
       default: () => [],
     },
   },
-  components: {
-    GddStatus,
-    GddSend,
-    GddTable,
-  },
   methods: {
     toggleShowList(bool) {
       this.showTransactionList = bool
diff --git a/frontend/src/views/Pages/AccountOverview/GddTable.vue b/frontend/src/views/Pages/AccountOverview/GddTable.vue
index 84a049537..ca8b9fcab 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTable.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTable.vue
@@ -92,11 +92,6 @@
         <b-alert v-if="transactions.length === 0" show variant="secondary">
           <span class="alert-text">{{ $t('transaction.nullTransactions') }}</span>
         </b-alert>
-        <router-link
-          v-else-if="transactions.length > 5"
-          to="/transactions"
-          v-html="$t('transaction.show_all', { count: count })"
-        ></router-link>
       </b-list-group-item>
     </b-list-group>
   </div>
diff --git a/frontend/src/views/Pages/AccountOverview/GddTableFooter.vue b/frontend/src/views/Pages/AccountOverview/GddTableFooter.vue
new file mode 100644
index 000000000..682f060d4
--- /dev/null
+++ b/frontend/src/views/Pages/AccountOverview/GddTableFooter.vue
@@ -0,0 +1,22 @@
+<template>
+  <div>
+    <b-list-group>
+      <b-list-group-item >
+        <router-link
+          to="/transactions"
+          v-html="$t('transaction.show_all', { count: count })"
+        ></router-link>
+      </b-list-group-item>
+    </b-list-group>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'GddTableFooter',
+  props: {
+    count: { count: Number },
+  },
+}
+</script>
+

From c9604135c1f366a3c87d461b259ae7e3f2ce28c9 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Fri, 7 May 2021 12:13:30 +0200
Subject: [PATCH 2/5] change

---
 frontend/src/views/Pages/AccountOverview/GddTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/Pages/AccountOverview/GddTable.vue b/frontend/src/views/Pages/AccountOverview/GddTable.vue
index a1242654d..194315b31 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTable.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTable.vue
@@ -88,7 +88,7 @@
           </b-card>
         </b-collapse>
       </b-list-group-item>
-      <b-list-group-item v-show="this.$route.path == '/overview'">
+      <b-list-group-item>
         <b-alert v-if="transactions.length === 0" show variant="secondary">
           <span class="alert-text">{{ $t('transaction.nullTransactions') }}</span>
         </b-alert>

From a21e5676bcc99c464dc4d435f63fbfcdd390baa8 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Mon, 10 May 2021 10:49:49 +0200
Subject: [PATCH 3/5] fix extra table-transactions footer

---
 frontend/src/views/Pages/AccountOverview.vue    |  3 +++
 .../views/Pages/AccountOverview/GddStatus.vue   |  4 ++--
 .../views/Pages/AccountOverview/GddTable.vue    |  9 ++-------
 .../Pages/AccountOverview/GddTableFooter.vue    | 17 +++++++++++++++++
 .../views/Pages/UserProfileTransactionList.vue  |  3 ---
 5 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 frontend/src/views/Pages/AccountOverview/GddTableFooter.vue

diff --git a/frontend/src/views/Pages/AccountOverview.vue b/frontend/src/views/Pages/AccountOverview.vue
index d41e7de56..2d5047d8c 100644
--- a/frontend/src/views/Pages/AccountOverview.vue
+++ b/frontend/src/views/Pages/AccountOverview.vue
@@ -19,6 +19,7 @@
         :transactionCount="transactionCount"
         @update-transactions="updateTransactions"
       />
+      <gdd-table-footer :transactionCount="transactionCount" />
     </b-container>
   </div>
 </template>
@@ -26,6 +27,7 @@
 import GddStatus from './AccountOverview/GddStatus.vue'
 import GddSend from './AccountOverview/GddSend.vue'
 import GddTable from './AccountOverview/GddTable.vue'
+import GddTableFooter from './AccountOverview/GddTableFooter.vue'
 
 export default {
   name: 'Overview',
@@ -47,6 +49,7 @@ export default {
     GddStatus,
     GddSend,
     GddTable,
+    GddTableFooter,
   },
   methods: {
     toggleShowList(bool) {
diff --git a/frontend/src/views/Pages/AccountOverview/GddStatus.vue b/frontend/src/views/Pages/AccountOverview/GddStatus.vue
index 96267e335..8698d1fdc 100644
--- a/frontend/src/views/Pages/AccountOverview/GddStatus.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddStatus.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <b-row>
-      <b-col col="6">
+      <b-col>
         <stats-card
           type="gradient-red"
           sub-title="balance_gdd"
@@ -11,7 +11,7 @@
           {{ $n(balance) }} GDD
         </stats-card>
       </b-col>
-      <b-col col="6">
+      <b-col>
         <stats-card
           type="gradient-orange"
           sub-title="balance_gdt"
diff --git a/frontend/src/views/Pages/AccountOverview/GddTable.vue b/frontend/src/views/Pages/AccountOverview/GddTable.vue
index c60e4013b..e4d5fcb77 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTable.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTable.vue
@@ -88,15 +88,10 @@
           </b-card>
         </b-collapse>
       </b-list-group-item>
-      <b-list-group-item v-show="this.$route.path == '/overview'">
-        <b-alert v-if="transactions.length === 0" show variant="secondary">
+      <b-list-group-item v-show="transactionCount === 0">
+        <b-alert show variant="secondary">
           <span class="alert-text">{{ $t('transaction.nullTransactions') }}</span>
         </b-alert>
-        <router-link
-          v-else-if="transactions.length > 5"
-          to="/transactions"
-          v-html="$t('transaction.show_all', { count: transactionCount })"
-        ></router-link>
       </b-list-group-item>
     </b-list-group>
   </div>
diff --git a/frontend/src/views/Pages/AccountOverview/GddTableFooter.vue b/frontend/src/views/Pages/AccountOverview/GddTableFooter.vue
new file mode 100644
index 000000000..a8b7bd8ae
--- /dev/null
+++ b/frontend/src/views/Pages/AccountOverview/GddTableFooter.vue
@@ -0,0 +1,17 @@
+<template>
+  <b-list-group>
+    <b-list-group-item v-show="transactionCount > 5">
+      <router-link
+        to="/transactions"
+        v-html="$t('transaction.show_all', { count: transactionCount })"
+      ></router-link>
+    </b-list-group-item>
+  </b-list-group>
+</template>
+<script>
+export default {
+  props: {
+    transactionCount: { type: Number, default: 0 },
+  },
+}
+</script>
diff --git a/frontend/src/views/Pages/UserProfileTransactionList.vue b/frontend/src/views/Pages/UserProfileTransactionList.vue
index 21668fd06..e7c35a731 100644
--- a/frontend/src/views/Pages/UserProfileTransactionList.vue
+++ b/frontend/src/views/Pages/UserProfileTransactionList.vue
@@ -15,9 +15,6 @@
           />
         </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>

From 6ca0ca7047c614d978156d94dca36035772600f8 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Mon, 10 May 2021 10:58:46 +0200
Subject: [PATCH 4/5] fix lint

---
 frontend/src/views/Pages/AccountOverview.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/Pages/AccountOverview.vue b/frontend/src/views/Pages/AccountOverview.vue
index fd02d6b5a..941303e7f 100644
--- a/frontend/src/views/Pages/AccountOverview.vue
+++ b/frontend/src/views/Pages/AccountOverview.vue
@@ -19,7 +19,7 @@
         :transactionCount="transactionCount"
         @update-transactions="updateTransactions"
       />
-      <gdd-table-footer :count="count"/>
+      <gdd-table-footer :count="transactionCount"/>
     </b-container>
   </div>
 </template>

From 7bd8c5f7e529c8fc5d1c08b1e66f3553f605239b Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Mon, 10 May 2021 11:25:56 +0200
Subject: [PATCH 5/5] fix lint

---
 frontend/src/views/Pages/AccountOverview.vue                | 2 +-
 frontend/src/views/Pages/AccountOverview/GddTableFooter.vue | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/Pages/AccountOverview.vue b/frontend/src/views/Pages/AccountOverview.vue
index 941303e7f..41dcc7848 100644
--- a/frontend/src/views/Pages/AccountOverview.vue
+++ b/frontend/src/views/Pages/AccountOverview.vue
@@ -19,7 +19,7 @@
         :transactionCount="transactionCount"
         @update-transactions="updateTransactions"
       />
-      <gdd-table-footer :count="transactionCount"/>
+      <gdd-table-footer :count="transactionCount" />
     </b-container>
   </div>
 </template>
diff --git a/frontend/src/views/Pages/AccountOverview/GddTableFooter.vue b/frontend/src/views/Pages/AccountOverview/GddTableFooter.vue
index 1e2238bb9..74f254ebb 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTableFooter.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTableFooter.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <b-list-group>
-      <b-list-group-item  v-if="count > 5" >
+      <b-list-group-item v-if="count > 5">
         <router-link
           to="/transactions"
           v-html="$t('transaction.show_all', { count: count })"
@@ -19,4 +19,3 @@ export default {
   },
 }
 </script>
-