From d5ba30df6fe5de0ee8bc395a1bc702e53df07c1a Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 30 Apr 2021 15:34:52 +0200 Subject: [PATCH 1/4] 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 @@ - From c62faf0d8661c8c50d387be310c80456e3030702 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 4 May 2021 15:28:14 +0200 Subject: [PATCH 3/4] 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 @@
- {{ $n(this.$store.state.user.balance) }} + {{ $n(balance) }} GDD
@@ -60,6 +60,9 @@ export default { components: { VueQrcode, }, + props: { + balance: { type: Number, default: 0 }, + }, } 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 @@ - + @@ -20,6 +20,9 @@ export default { components: { UserCard, }, + props: { + balance: { type: Number, default: 0 }, + }, } From 5336742c1791cc921c5cbbb26ad1c28e3b2a7464 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 4 May 2021 19:02:18 +0200 Subject: [PATCH 4/4] 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 -