From d5ba30df6fe5de0ee8bc395a1bc702e53df07c1a Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 30 Apr 2021 15:34:52 +0200
Subject: [PATCH 1/9] renamed KontoOverview to AccountOverview. Moved
 AccountOverview folder into Pages folder

---
 frontend/src/routes/routes.js                               | 2 +-
 .../{KontoOverview.spec.js => AccountOverview.spec.js}      | 6 +++---
 .../views/Pages/{KontoOverview.vue => AccountOverview.vue}  | 6 +++---
 .../AccountOverview}/GddAddWork2.vue                        | 0
 .../{KontoOverview => Pages/AccountOverview}/GddSend.vue    | 2 +-
 .../AccountOverview}/GddStatus.spec.js                      | 0
 .../{KontoOverview => Pages/AccountOverview}/GddStatus.vue  | 0
 .../{KontoOverview => Pages/AccountOverview}/GddTable.vue   | 2 +-
 .../AccountOverview}/GddWorkTable.vue                       | 0
 frontend/src/views/Pages/UserProfileActivity.vue            | 4 ++--
 frontend/src/views/Pages/UserProfileTransactionList.vue     | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)
 rename frontend/src/views/Pages/{KontoOverview.spec.js => AccountOverview.spec.js} (92%)
 rename frontend/src/views/Pages/{KontoOverview.vue => AccountOverview.vue} (89%)
 rename frontend/src/views/{KontoOverview => Pages/AccountOverview}/GddAddWork2.vue (100%)
 rename frontend/src/views/{KontoOverview => Pages/AccountOverview}/GddSend.vue (99%)
 rename frontend/src/views/{KontoOverview => Pages/AccountOverview}/GddStatus.spec.js (100%)
 rename frontend/src/views/{KontoOverview => Pages/AccountOverview}/GddStatus.vue (100%)
 rename frontend/src/views/{KontoOverview => Pages/AccountOverview}/GddTable.vue (98%)
 rename frontend/src/views/{KontoOverview => Pages/AccountOverview}/GddWorkTable.vue (100%)

diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index cb1e0eeba..236cc15af 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -9,7 +9,7 @@ const routes = [
   },
   {
     path: '/overview',
-    component: () => import('../views/Pages/KontoOverview.vue'),
+    component: () => import('../views/Pages/AccountOverview.vue'),
     meta: {
       requiresAuth: true,
     },
diff --git a/frontend/src/views/Pages/KontoOverview.spec.js b/frontend/src/views/Pages/AccountOverview.spec.js
similarity index 92%
rename from frontend/src/views/Pages/KontoOverview.spec.js
rename to frontend/src/views/Pages/AccountOverview.spec.js
index b0385cbc3..676ccc433 100644
--- a/frontend/src/views/Pages/KontoOverview.spec.js
+++ b/frontend/src/views/Pages/AccountOverview.spec.js
@@ -1,9 +1,9 @@
 import { shallowMount } from '@vue/test-utils'
-import KontoOverview from './KontoOverview'
+import AccountOverview from './AccountOverview'
 
 const localVue = global.localVue
 
-describe('KontoOverview', () => {
+describe('AccountOverview', () => {
   let wrapper
 
   let mocks = {
@@ -11,7 +11,7 @@ describe('KontoOverview', () => {
   }
 
   const Wrapper = () => {
-    return shallowMount(KontoOverview, { localVue, mocks })
+    return shallowMount(AccountOverview, { localVue, mocks })
   }
 
   describe('shallow Mount', () => {
diff --git a/frontend/src/views/Pages/KontoOverview.vue b/frontend/src/views/Pages/AccountOverview.vue
similarity index 89%
rename from frontend/src/views/Pages/KontoOverview.vue
rename to frontend/src/views/Pages/AccountOverview.vue
index e05a6236d..f756ba9bf 100644
--- a/frontend/src/views/Pages/KontoOverview.vue
+++ b/frontend/src/views/Pages/AccountOverview.vue
@@ -24,9 +24,9 @@
   </div>
 </template>
 <script>
-import GddStatus from '../KontoOverview/GddStatus.vue'
-import GddSend from '../KontoOverview/GddSend.vue'
-import GddTable from '../KontoOverview/GddTable.vue'
+import GddStatus from './AccountOverview/GddStatus.vue'
+import GddSend from './AccountOverview/GddSend.vue'
+import GddTable from './AccountOverview/GddTable.vue'
 
 export default {
   name: 'Overview',
diff --git a/frontend/src/views/KontoOverview/GddAddWork2.vue b/frontend/src/views/Pages/AccountOverview/GddAddWork2.vue
similarity index 100%
rename from frontend/src/views/KontoOverview/GddAddWork2.vue
rename to frontend/src/views/Pages/AccountOverview/GddAddWork2.vue
diff --git a/frontend/src/views/KontoOverview/GddSend.vue b/frontend/src/views/Pages/AccountOverview/GddSend.vue
similarity index 99%
rename from frontend/src/views/KontoOverview/GddSend.vue
rename to frontend/src/views/Pages/AccountOverview/GddSend.vue
index 64e71ab39..c212785da 100644
--- a/frontend/src/views/KontoOverview/GddSend.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddSend.vue
@@ -194,7 +194,7 @@
 <script>
 import { QrcodeStream, QrcodeDropZone } from 'vue-qrcode-reader'
 import { BIcon } from 'bootstrap-vue'
-import communityAPI from '../../apis/communityAPI.js'
+import communityAPI from '../../../apis/communityAPI.js'
 
 export default {
   name: 'GddSent',
diff --git a/frontend/src/views/KontoOverview/GddStatus.spec.js b/frontend/src/views/Pages/AccountOverview/GddStatus.spec.js
similarity index 100%
rename from frontend/src/views/KontoOverview/GddStatus.spec.js
rename to frontend/src/views/Pages/AccountOverview/GddStatus.spec.js
diff --git a/frontend/src/views/KontoOverview/GddStatus.vue b/frontend/src/views/Pages/AccountOverview/GddStatus.vue
similarity index 100%
rename from frontend/src/views/KontoOverview/GddStatus.vue
rename to frontend/src/views/Pages/AccountOverview/GddStatus.vue
diff --git a/frontend/src/views/KontoOverview/GddTable.vue b/frontend/src/views/Pages/AccountOverview/GddTable.vue
similarity index 98%
rename from frontend/src/views/KontoOverview/GddTable.vue
rename to frontend/src/views/Pages/AccountOverview/GddTable.vue
index e8e1f3cd3..e35b1ff13 100644
--- a/frontend/src/views/KontoOverview/GddTable.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTable.vue
@@ -88,7 +88,7 @@
 
 <script>
 import axios from 'axios'
-import communityAPI from '../../apis/communityAPI'
+import communityAPI from '../../../apis/communityAPI'
 
 export default {
   name: 'GddTable',
diff --git a/frontend/src/views/KontoOverview/GddWorkTable.vue b/frontend/src/views/Pages/AccountOverview/GddWorkTable.vue
similarity index 100%
rename from frontend/src/views/KontoOverview/GddWorkTable.vue
rename to frontend/src/views/Pages/AccountOverview/GddWorkTable.vue
diff --git a/frontend/src/views/Pages/UserProfileActivity.vue b/frontend/src/views/Pages/UserProfileActivity.vue
index 637837f70..6d69bc162 100644
--- a/frontend/src/views/Pages/UserProfileActivity.vue
+++ b/frontend/src/views/Pages/UserProfileActivity.vue
@@ -31,8 +31,8 @@
   </div>
 </template>
 <script>
-import GddWorkTable from '../../views/KontoOverview/GddWorkTable.vue'
-import GddAddWork2 from '../../views/KontoOverview/GddAddWork2.vue'
+import GddWorkTable from '../../views/Pages/AccountOverview/GddWorkTable.vue'
+import GddAddWork2 from '../../views/Pages/AccountOverview/GddAddWork2.vue'
 
 import * as chartConfigs from '@/components/Charts/config'
 import LineChart from '@/components/Charts/LineChart'
diff --git a/frontend/src/views/Pages/UserProfileTransactionList.vue b/frontend/src/views/Pages/UserProfileTransactionList.vue
index 2033a189a..7535144ae 100644
--- a/frontend/src/views/Pages/UserProfileTransactionList.vue
+++ b/frontend/src/views/Pages/UserProfileTransactionList.vue
@@ -14,7 +14,7 @@
   </div>
 </template>
 <script>
-import GddTable from '../../views/KontoOverview/GddTable.vue'
+import GddTable from '../../views/Pages/AccountOverview/GddTable.vue'
 
 export default {
   components: {

From 1133e2c9b9d0ea856093f7288b5c5177c9ce9ef2 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 30 Apr 2021 17:10:21 +0200
Subject: [PATCH 2/9] removed UserProfile.vue, tests for GddSend.vue

---
 .../Pages/AccountOverview/GddSend.spec.js     | 135 ++++++++++++++++++
 .../views/Pages/AccountOverview/GddSend.vue   |   5 +-
 frontend/src/views/Pages/UserProfile.vue      |  51 -------
 3 files changed, 137 insertions(+), 54 deletions(-)
 create mode 100644 frontend/src/views/Pages/AccountOverview/GddSend.spec.js
 delete mode 100755 frontend/src/views/Pages/UserProfile.vue

diff --git a/frontend/src/views/Pages/AccountOverview/GddSend.spec.js b/frontend/src/views/Pages/AccountOverview/GddSend.spec.js
new file mode 100644
index 000000000..330ce7192
--- /dev/null
+++ b/frontend/src/views/Pages/AccountOverview/GddSend.spec.js
@@ -0,0 +1,135 @@
+import { mount } from '@vue/test-utils'
+import GddSend from './GddSend'
+import Vuex from 'vuex'
+
+const localVue = global.localVue
+
+describe('GddSend', () => {
+  let wrapper
+
+  let state = {
+    user: {
+      balance: 1234,
+      balance_gdt: 9876,
+    },
+  }
+
+  let store = new Vuex.Store({
+    state,
+  })
+
+  let mocks = {
+    //    $n: jest.fn((n) => n),
+    $t: jest.fn((t) => t),
+    $moment: jest.fn((m) => ({
+      format: () => m,
+    })),
+  }
+
+  const Wrapper = () => {
+    return mount(GddSend, { localVue, store, mocks })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('renders the component', () => {
+      expect(wrapper.find('div.gdd-send').exists()).toBeTruthy()
+    })
+
+    describe('warning messages', () => {
+      it('has a warning message', () => {
+        expect(wrapper.find('div.alert-warning').find('span').text()).toBe('form.attention')
+      })
+
+      it('has a dismiss button', () => {
+        expect(wrapper.find('div.alert-warning').find('button').exists()).toBeTruthy()
+      })
+
+      it('dismisses the warning when button is clicked', async () => {
+        wrapper.find('div.alert-warning').find('button').trigger('click')
+        await wrapper.vm.$nextTick()
+        expect(wrapper.find('div.alert-warning').exists()).toBeFalsy()
+      })
+    })
+
+    describe('transaction form', () => {
+      describe('email field', () => {
+        it('has an input field of type email', () => {
+          expect(wrapper.find('#input-group-1').find('input').attributes('type')).toBe('email')
+        })
+
+        it('has an envelope icon', () => {
+          expect(wrapper.find('#input-group-1').find('svg').attributes('aria-label')).toBe(
+            'envelope',
+          )
+        })
+
+        it('has a label form.receiver', () => {
+          expect(wrapper.findAll('div.text-left').at(0).text()).toBe('form.receiver')
+        })
+
+        it('has a placeholder "E-Mail"', () => {
+          expect(wrapper.find('#input-group-1').find('input').attributes('placeholder')).toBe(
+            'E-Mail',
+          )
+        })
+      })
+
+      describe('ammount field', () => {
+        it('has an input field of type number', () => {
+          expect(wrapper.find('#input-group-2').find('input').attributes('type')).toBe('number')
+        })
+
+        it('has an GDD text icon', () => {
+          expect(wrapper.find('#input-group-2').find('div.h3').text()).toBe('GDD')
+        })
+
+        it('has a label form.amount', () => {
+          expect(wrapper.findAll('div.text-left').at(1).text()).toBe('form.amount')
+        })
+
+        it('has a placeholder "0.01"', () => {
+          expect(wrapper.find('#input-group-2').find('input').attributes('placeholder')).toBe(
+            '0.01',
+          )
+        })
+      })
+
+      describe('message text box', () => {
+        it('has an textarea field', () => {
+          expect(wrapper.find('#input-group-3').find('textarea').exists()).toBeTruthy()
+        })
+
+        it('has an chat-right-text icon', () => {
+          expect(wrapper.find('#input-group-3').find('svg').attributes('aria-label')).toBe(
+            'chat right text',
+          )
+        })
+
+        it('has a label form.memo', () => {
+          expect(wrapper.findAll('div.text-left').at(2).text()).toBe('form.memo')
+        })
+      })
+
+      describe('cancel button', () => {
+        it('has a cancel button', () => {
+          expect(wrapper.find('button[type="reset"]').exists()).toBeTruthy()
+        })
+
+        it('has the text "form.cancel"', () => {
+          expect(wrapper.find('button[type="reset"]').text()).toBe('form.cancel')
+        })
+
+        it.skip('clears the email field on click', async () => {
+          wrapper.find('#input-group-1').find('input').setValue('someone@watches.tv')
+          wrapper.find('button[type="reset"]').trigger('click')
+          await wrapper.vm.$nextTick()
+          expect(wrapper.vm.form.email).toBeNull()
+        })
+      })
+    })
+  })
+})
diff --git a/frontend/src/views/Pages/AccountOverview/GddSend.vue b/frontend/src/views/Pages/AccountOverview/GddSend.vue
index c212785da..5f2794922 100644
--- a/frontend/src/views/Pages/AccountOverview/GddSend.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddSend.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="gdd-send">
     <b-row v-show="showTransactionList">
       <b-col xl="12" md="12">
         <b-alert show dismissible variant="warning" class="text-center">
@@ -105,8 +105,7 @@
                   ></b-form-input>
                 </b-input-group>
                 <b-col class="text-left p-3 p-sm-1">{{ $t('form.memo') }}</b-col>
-
-                <b-input-group>
+                <b-input-group id="input-group-3">
                   <b-input-group-prepend class="p-3 d-none d-md-block">
                     <b-icon icon="chat-right-text" class="display-3"></b-icon>
                   </b-input-group-prepend>
diff --git a/frontend/src/views/Pages/UserProfile.vue b/frontend/src/views/Pages/UserProfile.vue
deleted file mode 100755
index 388568a5b..000000000
--- a/frontend/src/views/Pages/UserProfile.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-<template>
-  <div>
-    <div
-      class="header pb-8 pt-5 pt-lg-8 d-flex align-items-center profile-header"
-      style="
-        min-height: 600px;
-        background-image: url(img/theme/profile-cover.jpg);
-        background-size: cover;
-        background-position: center top;
-      "
-    >
-      <b-container fluid>
-        <b-container fluid class="d-flex align-items-center">
-          <b-row>
-            <b-col lg="7" md="10">
-              <h1 class="display-2 text-white">Hello {{ this.$store.state.email }}</h1>
-              <p class="text-white mt-0 mb-5">
-                This is your profile page. You can see the progress you've made with your work and
-                manage your projects or assigned tasks
-              </p>
-              <a href="#!" class="btn btn-info">Edit profile</a>
-            </b-col>
-          </b-row>
-        </b-container>
-      </b-container>
-    </div>
-
-    <b-container fluid class="mt--6">
-      <b-row>
-        <b-col xl="4" class="order-xl-2 mb-5">
-          <user-card></user-card>
-        </b-col>
-        <b-col xl="8" class="order-xl-1">
-          <edit-profile-form></edit-profile-form>
-        </b-col>
-      </b-row>
-    </b-container>
-  </div>
-</template>
-<script>
-import EditProfileForm from './UserProfile/EditProfileForm.vue'
-import UserCard from './UserProfile/UserCard.vue'
-
-export default {
-  components: {
-    EditProfileForm,
-    UserCard,
-  },
-}
-</script>
-<style></style>

From c62faf0d8661c8c50d387be310c80456e3030702 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 4 May 2021 15:28:14 +0200
Subject: [PATCH 3/9] use dynamic balance in user profile

---
 frontend/src/views/Pages/UserProfile/UserCard.vue | 5 ++++-
 frontend/src/views/Pages/UserProfileCard.vue      | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/Pages/UserProfile/UserCard.vue b/frontend/src/views/Pages/UserProfile/UserCard.vue
index 9282dd574..b14670e21 100755
--- a/frontend/src/views/Pages/UserProfile/UserCard.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard.vue
@@ -36,7 +36,7 @@
             </div>
             <div>
               <span class="heading">
-                {{ $n(this.$store.state.user.balance) }}
+                {{ $n(balance) }}
               </span>
               <span class="description">GDD</span>
             </div>
@@ -60,6 +60,9 @@ export default {
   components: {
     VueQrcode,
   },
+  props: {
+    balance: { type: Number, default: 0 },
+  },
 }
 </script>
 <style></style>
diff --git a/frontend/src/views/Pages/UserProfileCard.vue b/frontend/src/views/Pages/UserProfileCard.vue
index 161bb30a0..882b52e78 100644
--- a/frontend/src/views/Pages/UserProfileCard.vue
+++ b/frontend/src/views/Pages/UserProfileCard.vue
@@ -7,7 +7,7 @@
     <b-container fluid class="mt--6">
       <b-row>
         <b-col xl="12" class="order-xl-2 mb-5">
-          <user-card></user-card>
+          <user-card :balance="balance"></user-card>
         </b-col>
       </b-row>
     </b-container>
@@ -20,6 +20,9 @@ export default {
   components: {
     UserCard,
   },
+  props: {
+    balance: { type: Number, default: 0 },
+  },
 }
 </script>
 <style></style>

From 5336742c1791cc921c5cbbb26ad1c28e3b2a7464 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 4 May 2021 19:02:18 +0200
Subject: [PATCH 4/9] fixed bug_report.md issue template - comment not closed

---
 .github/ISSUE_TEMPLATE/bug_report.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 08e03c5b7..c7d06fcbe 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -6,4 +6,4 @@ title: 🐛 [Bug]
 ---
 
 ## 🐛 Bugreport
-<!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the bug is.--
+<!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the bug is.-->

From 46bf1e2e936fcfbb2794943856438df3ab001652 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 5 May 2021 09:11:07 +0200
Subject: [PATCH 5/9] THX changed to Thank you

---
 frontend/src/locales/de.json | 4 ++--
 frontend/src/locales/en.json | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index e3868124c..4859a3422 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -42,8 +42,8 @@
     "scann_code":"<strong>QR Code Scanner</strong> - Scanne den QR Code deines Partners",
     "max_gdd_info":"maximale anzahl GDD zum versenden erreicht!",
     "send_check":"Bestätige deine Zahlung. Prüfe bitte nochmal alle Daten!",
-    "thx":"Danke!",
-    "send_success":"Deine Zahlung wurde erfolgreich versendet."
+    "thx":"Danke, ",
+    "send_success":"deine Transaktion wurde erfolgreich ausgeführt"
   },
   "transaction":{
     "show_part": "Die letzten <strong>{count}</strong> Transaktionen",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 521f68f0d..802a4af31 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -42,8 +42,8 @@
     "scann_code":"<strong>QR Code Scanner</strong> - Scanne den QR Code deines Partners",
     "max_gdd_info":"maximale anzahl GDD zum versenden erreicht!",
     "send_check":"Bestätige deine Zahlung. Prüfe bitte nochmal alle Daten!",
-    "thx":"THX",
-    "send_success":"Deine Zahlung wurde erfolgreich versendet."
+    "thx":"Thank you, ",
+    "send_success":"your transaction was successfully completed"
   },
   "transaction":{
     "show_part": "The last <strong>{count}</strong> transactions",

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 6/9] 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 7c972a1c72b6ef0d3b83d1024f47a29fd5690b19 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Wed, 5 May 2021 15:57:13 +0200
Subject: [PATCH 7/9] lehrzeichen entfernt

---
 frontend/src/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 4859a3422..c5cbffef0 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -42,7 +42,7 @@
     "scann_code":"<strong>QR Code Scanner</strong> - Scanne den QR Code deines Partners",
     "max_gdd_info":"maximale anzahl GDD zum versenden erreicht!",
     "send_check":"Bestätige deine Zahlung. Prüfe bitte nochmal alle Daten!",
-    "thx":"Danke, ",
+    "thx":"Danke,",
     "send_success":"deine Transaktion wurde erfolgreich ausgeführt"
   },
   "transaction":{

From ff65c78244ffd21c6e2b14ba00ce3ded0f04d57a Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Wed, 5 May 2021 15:57:45 +0200
Subject: [PATCH 8/9] update

---
 frontend/src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 802a4af31..eb30bbc29 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -42,7 +42,7 @@
     "scann_code":"<strong>QR Code Scanner</strong> - Scanne den QR Code deines Partners",
     "max_gdd_info":"maximale anzahl GDD zum versenden erreicht!",
     "send_check":"Bestätige deine Zahlung. Prüfe bitte nochmal alle Daten!",
-    "thx":"Thank you, ",
+    "thx":"Thank you,",
     "send_success":"your transaction was successfully completed"
   },
   "transaction":{

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 9/9] 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: {