From 66c1d8a9e8a25f931b4adfe0c3e0925e850479f8 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 18 Jan 2022 16:15:48 +0100 Subject: [PATCH 01/63] remove decay calculation in confirm send page --- .../Pages/SendOverview/GddSend/TransactionConfirmation.vue | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue index dd5caf0f8..54ab06384 100644 --- a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue +++ b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue @@ -46,14 +46,9 @@ - {{ $n(amount, 'decimal') }} - - {{ $t('decay.decay') }} - - {{ $n(decay, 'decimal') }} - - {{ $t('form.new_balance') }} - ~ {{ $n(balance - amount - decay, 'decimal') }} + ~ {{ $n(balance - amount, 'decimal') }} From b5bc1a31bd777832b13403bc66ba9a7b164bb1e1 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 18 Jan 2022 16:28:09 +0100 Subject: [PATCH 02/63] Advance calculation text added --- .../views/Pages/SendOverview/GddSend/TransactionConfirmation.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue index 54ab06384..2bcabea8a 100644 --- a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue +++ b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue @@ -34,6 +34,7 @@ +

Vorausberechnung - Calculation in advance

{{ $t('form.current_balance') }} {{ $n(balance, 'decimal') }} From d8b9062a92859b9166a4702638db73e416a0a052 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 18 Jan 2022 16:31:10 +0100 Subject: [PATCH 03/63] add locales for advance-calculation --- frontend/src/locales/de.json | 1 + frontend/src/locales/en.json | 1 + 2 files changed, 2 insertions(+) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 1af76e4df..eb91cfb5d 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -1,5 +1,6 @@ { "admin_area": "Adminbereich", + "advance-calculation":"Vorausberechnung ", "back": "Zurück", "community": { "choose-another-community": "Eine andere Gemeinschaft auswählen", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 71ce6f9ef..dbc1658e6 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -1,5 +1,6 @@ { "admin_area": "Admin Area", + "advance-calculation":"Advance calculation", "back": "Back", "community": { "choose-another-community": "Choose another community", From e239b51a8c8c865089800f2085167adb7998bcf8 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 18 Jan 2022 16:34:47 +0100 Subject: [PATCH 04/63] set locales for advance-calculation --- frontend/src/locales/de.json | 2 +- .../Pages/SendOverview/GddSend/TransactionConfirmation.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index eb91cfb5d..ab68adf3b 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -1,6 +1,6 @@ { "admin_area": "Adminbereich", - "advance-calculation":"Vorausberechnung ", + "advance-calculation":"Vorausberechnung", "back": "Zurück", "community": { "choose-another-community": "Eine andere Gemeinschaft auswählen", diff --git a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue index 2bcabea8a..a5d88af05 100644 --- a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue +++ b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue @@ -34,7 +34,7 @@ -

Vorausberechnung - Calculation in advance

+

{{ $t('advance-calculation') }}

{{ $t('form.current_balance') }} {{ $n(balance, 'decimal') }} @@ -49,7 +49,7 @@ {{ $t('form.new_balance') }} - ~ {{ $n(balance - amount, 'decimal') }} + ~ {{ $n(balance - amount, 'decimal') }} From e1dc7ea272e981dae7398dac56fa3f7e62a25849 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 18 Jan 2022 16:35:20 +0100 Subject: [PATCH 05/63] fix lint --- .../Pages/SendOverview/GddSend/TransactionConfirmation.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue index a5d88af05..422c34a76 100644 --- a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue +++ b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue @@ -49,7 +49,9 @@ {{ $t('form.new_balance') }} - ~ {{ $n(balance - amount, 'decimal') }} + + ~ {{ $n(balance - amount, 'decimal') }} + From cca2de8fafa09a7dc73d7143cceea297e79137e4 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 18 Jan 2022 16:36:17 +0100 Subject: [PATCH 06/63] fix locales --- frontend/src/locales/de.json | 2 +- frontend/src/locales/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index ab68adf3b..74df7ef8a 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -1,6 +1,6 @@ { "admin_area": "Adminbereich", - "advance-calculation":"Vorausberechnung", + "advance-calculation": "Vorausberechnung", "back": "Zurück", "community": { "choose-another-community": "Eine andere Gemeinschaft auswählen", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index dbc1658e6..4ff2ab7ad 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -1,6 +1,6 @@ { "admin_area": "Admin Area", - "advance-calculation":"Advance calculation", + "advance-calculation": "Advance calculation", "back": "Back", "community": { "choose-another-community": "Choose another community", From 9c8aa4d60ec180e4d220869245d1e9421c686603 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 18 Jan 2022 16:40:26 +0100 Subject: [PATCH 07/63] add class border-bottom --- .../Pages/SendOverview/GddSend/TransactionConfirmation.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue index 422c34a76..37ac66059 100644 --- a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue +++ b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue @@ -43,7 +43,7 @@ {{ $t('form.your_amount') }} - + - {{ $n(amount, 'decimal') }} @@ -93,5 +93,6 @@ export default { } .borderbottom { border-bottom: 1px solid rgb(70, 65, 65); + border-bottom-style: double; } From a67831b8adef5b24a95a83278d4dda0d8923dba2 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 18 Jan 2022 16:41:46 +0100 Subject: [PATCH 08/63] remove strong element on new_balance --- .../Pages/SendOverview/GddSend/TransactionConfirmation.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue index 37ac66059..40b61c7e5 100644 --- a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue +++ b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue @@ -50,7 +50,7 @@ {{ $t('form.new_balance') }} - ~ {{ $n(balance - amount, 'decimal') }} + ~ {{ $n(balance - amount, 'decimal') }} From dff51c6782c32496ccf70345dd07a80dbf48ae50 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 18 Jan 2022 16:48:36 +0100 Subject: [PATCH 09/63] yarn lint --fix --- .../Pages/SendOverview/GddSend/TransactionConfirmation.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue index 40b61c7e5..aa0567279 100644 --- a/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue +++ b/frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue @@ -49,9 +49,7 @@ {{ $t('form.new_balance') }} - - ~ {{ $n(balance - amount, 'decimal') }} - + ~ {{ $n(balance - amount, 'decimal') }} From f42d2b96e395088dac324b331b3bf0dea1b3c4fe Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 08:59:19 +0100 Subject: [PATCH 10/63] change Admin Gradido-Logo font color to white --- admin/src/components/NavBar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue index 0e8ad8acf..b606fb730 100644 --- a/admin/src/components/NavBar.vue +++ b/admin/src/components/NavBar.vue @@ -2,7 +2,7 @@
- ... + ... From 99fbeb3ca55e86d730498c99c6054959e9b8f76d Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 09:14:13 +0100 Subject: [PATCH 11/63] Button ist hell wenn nicht aktiv, und blau wenn aktiv --- frontend/src/views/Pages/Register.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index 070d80bb9..5c42f0103 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -164,7 +164,8 @@ {{ $t('signup') }} From 733f66018bc01e6ed4bd60f3350cfdb0895fb4ce Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 09:14:32 +0100 Subject: [PATCH 12/63] yarn lint fix --- frontend/src/views/Pages/Register.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index 5c42f0103..58ad7d4cd 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -164,8 +164,11 @@ {{ $t('signup') }} From 9d7be547fa2c431281db7088c287ad916f3683a4 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 09:47:16 +0100 Subject: [PATCH 13/63] remove text publisher.infoNoRegister from register --- frontend/src/views/Pages/Register.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index 070d80bb9..c734df852 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -145,7 +145,6 @@ class="text-center mt-1 shadow-lg p-3 mb-5 rounded" > {{ $t('publisher.infoText') }} - {{ $t('publisher.infoNoRegister') }}
From fb4bbac8aa7790245d77221a9b5480ae7881d8e4 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 09:47:47 +0100 Subject: [PATCH 14/63] remove text publisher.infoNoRegister from locales de --- frontend/src/locales/de.json | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 1af76e4df..5e59e3af0 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -120,7 +120,6 @@ "overview": "Übersicht", "privacy_policy": "Datenschutzerklärung", "publisher": { - "infoNoRegister": "Dies ist für die Registrieung nicht nötig.", "infoText": "Wenn dir dein Empfehlungsgeber seine Publisher-Id gegeben hat, trage sie hier ein, sonst lass das Feld bitte unverändert!", "publisherId": "Publisher-Id" }, From d168ca2b1a49d935e597f3c4e385cae564919b25 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 09:48:12 +0100 Subject: [PATCH 15/63] remove text publisher.infoNoRegister from locales en --- frontend/src/locales/en.json | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 71ce6f9ef..d30d16717 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -120,7 +120,6 @@ "overview": "Overview", "privacy_policy": "Privacy policy", "publisher": { - "infoNoRegister": "This is not necessary for registration.", "infoText": "If your referrer has given you his publisher id, enter it here, otherwise leave the field unchanged!", "publisherId": "PublisherID" }, From 26bbc88d87665ae35759cdca5f5c2c7da351f098 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 11:03:58 +0100 Subject: [PATCH 16/63] add computed variable disabled --- frontend/src/views/Pages/Register.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index 58ad7d4cd..db5a7b4f6 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -162,10 +162,9 @@ From 3af4935fbc5fe57ecf9f6649d74dd0b69621d7cf Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 11:04:34 +0100 Subject: [PATCH 17/63] yarn lint fix --- frontend/src/views/Pages/Register.vue | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index db5a7b4f6..37c28ed54 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -164,10 +164,7 @@ {{ $t('signup') }} From a5489ebb15d845f5e9db16834ac8c494f64ad9ba Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 12:03:41 +0100 Subject: [PATCH 18/63] test submit buttion have attributes disabled --- frontend/src/views/Pages/Register.spec.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js index 56f97549d..433781ce9 100644 --- a/frontend/src/views/Pages/Register.spec.js +++ b/frontend/src/views/Pages/Register.spec.js @@ -221,14 +221,16 @@ describe('Register', () => { wrapper.find('#Email-input-field').setValue('max.mustermann@gradido.net') wrapper.find('.language-switch-select').findAll('option').at(1).setSelected() wrapper.find('#publisherid').setValue('12345') + wrapper.find('#registerCheckbox').trigger('click') }) it('commits publisherId to store', () => { expect(mockStoreCommit).toBeCalledWith('publisherId', 12345) }) - it('has enabled submit button when completely filled', () => { - expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBe('disabled') + it('has enabled submit button when completely filled', async () => { + await wrapper.vm.$nextTick() + expect(wrapper.find('button[type="submit"]').disabled).toBeFalsy() }) describe('server sends back error', () => { From 7e351e67992c1612fe80344da065e0f7b6948a7a Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 12:04:36 +0100 Subject: [PATCH 19/63] yarn lint fix --- frontend/src/views/Pages/Register.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js index 433781ce9..20f8c704b 100644 --- a/frontend/src/views/Pages/Register.spec.js +++ b/frontend/src/views/Pages/Register.spec.js @@ -229,7 +229,7 @@ describe('Register', () => { }) it('has enabled submit button when completely filled', async () => { - await wrapper.vm.$nextTick() + await wrapper.vm.$nextTick() expect(wrapper.find('button[type="submit"]').disabled).toBeFalsy() }) From 473ea3b92de40b2d54504663f0f0908c54f27850 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 12:29:09 +0100 Subject: [PATCH 20/63] if form completely filled .attributes('disabled')).toBe(undefined) --- frontend/src/views/Pages/Register.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js index 20f8c704b..a9b983440 100644 --- a/frontend/src/views/Pages/Register.spec.js +++ b/frontend/src/views/Pages/Register.spec.js @@ -221,7 +221,7 @@ describe('Register', () => { wrapper.find('#Email-input-field').setValue('max.mustermann@gradido.net') wrapper.find('.language-switch-select').findAll('option').at(1).setSelected() wrapper.find('#publisherid').setValue('12345') - wrapper.find('#registerCheckbox').trigger('click') + wrapper.find('#registerCheckbox').setChecked() }) it('commits publisherId to store', () => { @@ -230,7 +230,7 @@ describe('Register', () => { it('has enabled submit button when completely filled', async () => { await wrapper.vm.$nextTick() - expect(wrapper.find('button[type="submit"]').disabled).toBeFalsy() + expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBe(undefined) }) describe('server sends back error', () => { From 48b3f26a1776a8216e316a69283558cefe444c1a Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 13:07:28 +0100 Subject: [PATCH 21/63] more test for submit button function --- frontend/src/views/Pages/Register.spec.js | 41 ++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js index a9b983440..ca89fc72a 100644 --- a/frontend/src/views/Pages/Register.spec.js +++ b/frontend/src/views/Pages/Register.spec.js @@ -214,7 +214,46 @@ describe('Register', () => { }) */ - describe('API calls', () => { + describe('API calls when form is missing', () => { + + it('has disabled submit button when missing checked box', () => { + beforeEach(() => { + wrapper.find('#registerFirstname').setValue('Max') + wrapper.find('#registerLastname').setValue('Mustermann') + wrapper.find('#Email-input-field').setValue('max.mustermann@gradido.net') + wrapper.find('.language-switch-select').findAll('option').at(1).setSelected() + wrapper.find('#publisherid').setValue('12345') + }) + expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBe('disabled') + }) + + it('has disabled submit button when missing email input', () => { + beforeEach(() => { + wrapper.find('#registerFirstname').setValue('Max') + wrapper.find('#registerLastname').setValue('Mustermann') + wrapper.find('.language-switch-select').findAll('option').at(1).setSelected() + wrapper.find('#publisherid').setValue('12345') + wrapper.find('#registerCheckbox').setChecked() + }) + expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBe('disabled') + }) + }) + + describe('API calls when completely filled and missing publisherid', () => { + beforeEach(() => { + wrapper.find('#registerFirstname').setValue('Max') + wrapper.find('#registerLastname').setValue('Mustermann') + wrapper.find('#Email-input-field').setValue('max.mustermann@gradido.net') + wrapper.find('.language-switch-select').findAll('option').at(1).setSelected() + wrapper.find('#registerCheckbox').setChecked() + }) + it('has enabled submit button when completely filled', async () => { + await wrapper.vm.$nextTick() + expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBe(undefined) + }) + }) + + describe('API calls when completely filled', () => { beforeEach(() => { wrapper.find('#registerFirstname').setValue('Max') wrapper.find('#registerLastname').setValue('Mustermann') From 0256ab937b7a097a9e66152cee2769566d5b989b Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 13:07:59 +0100 Subject: [PATCH 22/63] yarn lint fix --- frontend/src/views/Pages/Register.spec.js | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js index ca89fc72a..85646ea61 100644 --- a/frontend/src/views/Pages/Register.spec.js +++ b/frontend/src/views/Pages/Register.spec.js @@ -215,7 +215,6 @@ describe('Register', () => { */ describe('API calls when form is missing', () => { - it('has disabled submit button when missing checked box', () => { beforeEach(() => { wrapper.find('#registerFirstname').setValue('Max') From 793e10683e11c63346750468967ce7f993638c96 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 13:15:04 +0100 Subject: [PATCH 23/63] refactor tests for submit button beforeEach --- frontend/src/views/Pages/Register.spec.js | 26 +++++++++-------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js index 85646ea61..1a966e5b6 100644 --- a/frontend/src/views/Pages/Register.spec.js +++ b/frontend/src/views/Pages/Register.spec.js @@ -214,26 +214,20 @@ describe('Register', () => { }) */ - describe('API calls when form is missing', () => { - it('has disabled submit button when missing checked box', () => { - beforeEach(() => { - wrapper.find('#registerFirstname').setValue('Max') - wrapper.find('#registerLastname').setValue('Mustermann') - wrapper.find('#Email-input-field').setValue('max.mustermann@gradido.net') - wrapper.find('.language-switch-select').findAll('option').at(1).setSelected() - wrapper.find('#publisherid').setValue('12345') - }) + describe('API calls when form is missing input', () => { + beforeEach(() => { + wrapper.find('#registerFirstname').setValue('Max') + wrapper.find('#registerLastname').setValue('Mustermann') + wrapper.find('.language-switch-select').findAll('option').at(1).setSelected() + wrapper.find('#publisherid').setValue('12345') + }) + it('has disabled submit button when missing input checked box', () => { + wrapper.find('#Email-input-field').setValue('max.mustermann@gradido.net') expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBe('disabled') }) it('has disabled submit button when missing email input', () => { - beforeEach(() => { - wrapper.find('#registerFirstname').setValue('Max') - wrapper.find('#registerLastname').setValue('Mustermann') - wrapper.find('.language-switch-select').findAll('option').at(1).setSelected() - wrapper.find('#publisherid').setValue('12345') - wrapper.find('#registerCheckbox').setChecked() - }) + wrapper.find('#registerCheckbox').setChecked() expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBe('disabled') }) }) From 3b11337fe68dc48d9500ad5042a2bb00b36e3278 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 19 Jan 2022 13:37:03 +0100 Subject: [PATCH 24/63] fix: Render Localized Balance in NavBar --- frontend/src/components/Menu/Navbar.spec.js | 2 ++ frontend/src/components/Menu/Navbar.vue | 6 +++++- frontend/src/views/Layout/DashboardLayout_gdd.vue | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/Menu/Navbar.spec.js b/frontend/src/components/Menu/Navbar.spec.js index 2b929f422..21b0e97df 100644 --- a/frontend/src/components/Menu/Navbar.spec.js +++ b/frontend/src/components/Menu/Navbar.spec.js @@ -7,6 +7,7 @@ const propsData = { balance: 1234, visible: false, elopageUri: 'https://elopage.com', + pending: false, } const mocks = { @@ -20,6 +21,7 @@ const mocks = { isAdmin: true, }, }, + $n: jest.fn((n) => n), } describe('Navbar', () => { diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue index 4687f639f..72d193e4c 100644 --- a/frontend/src/components/Menu/Navbar.vue +++ b/frontend/src/components/Menu/Navbar.vue @@ -10,7 +10,7 @@
- {{ balance }} GDD + {{ pending ? '—' : $n(balance, 'decimal') }} GDD {{ $store.state.firstName }} {{ $store.state.lastName }}, @@ -87,6 +87,10 @@ export default { type: String, required: false, }, + pending: { + type: Boolean, + required: true, + }, }, data() { return { diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue index 0c910bca5..932f3efdd 100755 --- a/frontend/src/views/Layout/DashboardLayout_gdd.vue +++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue @@ -4,6 +4,7 @@ class="main-navbar" :balance="balance" :visible="visible" + :pending="pending" :elopageUri="elopageUri" @set-visible="setVisible" @admin="admin" From 018bfa05d6782904e0bf89578748537f06d2d67e Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 19 Jan 2022 14:37:49 +0100 Subject: [PATCH 25/63] defined fields for Transactionlist in UserSearch in Adminarea, add Localized fields and formatted fields --- .../CreationTransactionListFormular.vue | 25 ++++++++++++++++++- admin/src/locales/de.json | 8 +++++- admin/src/locales/en.json | 8 +++++- 3 files changed, 38 insertions(+), 3 deletions(-) diff --git a/admin/src/components/CreationTransactionListFormular.vue b/admin/src/components/CreationTransactionListFormular.vue index 7fed4adcc..1de1cce83 100644 --- a/admin/src/components/CreationTransactionListFormular.vue +++ b/admin/src/components/CreationTransactionListFormular.vue @@ -1,7 +1,7 @@ + From 9df3ca7c01a3a79e7aaf63a971be2f780f7baff0 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 24 Jan 2022 16:42:09 +0100 Subject: [PATCH 58/63] mock path to have differnet include results --- .../src/views/Pages/ResetPassword.spec.js | 126 +++++++++++------- frontend/src/views/Pages/ResetPassword.vue | 2 +- 2 files changed, 81 insertions(+), 47 deletions(-) diff --git a/frontend/src/views/Pages/ResetPassword.spec.js b/frontend/src/views/Pages/ResetPassword.spec.js index d6319086c..da8b4bc4f 100644 --- a/frontend/src/views/Pages/ResetPassword.spec.js +++ b/frontend/src/views/Pages/ResetPassword.spec.js @@ -15,54 +15,48 @@ const stubs = { RouterLink: RouterLinkStub, } -const createMockObject = (comingFrom) => { - return { - localVue, - mocks: { - $i18n: { - locale: 'en', - }, - $t: jest.fn((t) => t), - $route: { - params: { - optin: '123', - comingFrom, - }, - path: { - includes: (t) => t, - }, - }, - $toasted: { - global: { - error: toasterMock, - }, - }, - $router: { - push: routerPushMock, - }, - $loading: { - show: jest.fn(() => { - return { hide: jest.fn() } - }), - }, - $apollo: { - mutate: apolloMutationMock, - }, +const mocks = { + $i18n: { + locale: 'en', + }, + $t: jest.fn((t) => t), + $route: { + params: { + optin: '123', }, - stubs, - } + path: { + mock: 'checkEmail', + includes: jest.fn((t) => t === mocks.$route.path.mock), + }, + }, + $toasted: { + global: { + error: toasterMock, + }, + }, + $router: { + push: routerPushMock, + }, + $loading: { + show: jest.fn(() => { + return { hide: jest.fn() } + }), + }, + $apollo: { + mutate: apolloMutationMock, + }, } describe('ResetPassword', () => { let wrapper - const Wrapper = (functionName) => { - return mount(ResetPassword, functionName) + const Wrapper = () => { + return mount(ResetPassword, { localVue, mocks, stubs }) } describe('mount', () => { beforeEach(() => { - wrapper = Wrapper(createMockObject()) + wrapper = Wrapper() }) describe('No valid optin', () => { @@ -86,11 +80,32 @@ describe('ResetPassword', () => { }) describe('Register header', () => { - it('has a welcome message', async () => { - expect(wrapper.find('div.header').text()).toContain('settings.password.reset') - expect(wrapper.find('div.header').text()).toContain( - 'settings.password.reset-password.text', - ) + describe('from reset', () => { + beforeEach(() => { + mocks.$route.path.mock = 'reset' + wrapper = Wrapper() + }) + + it('has a welcome message', async () => { + expect(wrapper.find('div.header').text()).toContain('settings.password.reset') + expect(wrapper.find('div.header').text()).toContain( + 'settings.password.reset-password.text', + ) + }) + }) + + describe('from checkEmail', () => { + beforeEach(() => { + mocks.$route.path.mock = 'checkEmail' + wrapper = Wrapper() + }) + + it('has a welcome message', async () => { + expect(wrapper.find('div.header').text()).toContain('settings.password.set') + expect(wrapper.find('div.header').text()).toContain( + 'settings.password.set-password.text', + ) + }) }) }) @@ -128,7 +143,6 @@ describe('ResetPassword', () => { describe('submit form', () => { beforeEach(async () => { - // wrapper = Wrapper(createMockObject()) await wrapper.findAll('input').at(0).setValue('Aa123456_') await wrapper.findAll('input').at(1).setValue('Aa123456_') await flushPromises() @@ -164,14 +178,14 @@ describe('ResetPassword', () => { }) }) - describe('server response with success', () => { + describe('server response with success on /checkEmail', () => { beforeEach(async () => { + mocks.$route.path.mock = 'checkEmail' apolloMutationMock.mockResolvedValue({ data: { resetPassword: 'success', }, }) - wrapper = Wrapper(createMockObject('checkEmail')) await wrapper.findAll('input').at(0).setValue('Aa123456_') await wrapper.findAll('input').at(1).setValue('Aa123456_') await wrapper.find('form').trigger('submit') @@ -193,6 +207,26 @@ describe('ResetPassword', () => { expect(routerPushMock).toHaveBeenCalledWith('/thx/checkEmail') }) }) + + describe('server response with success on /reset', () => { + beforeEach(async () => { + mocks.$route.path.mock = 'reset' + wrapper = Wrapper() + apolloMutationMock.mockResolvedValue({ + data: { + resetPassword: 'success', + }, + }) + await wrapper.findAll('input').at(0).setValue('Aa123456_') + await wrapper.findAll('input').at(1).setValue('Aa123456_') + await wrapper.find('form').trigger('submit') + await flushPromises() + }) + + it('redirects to "/thx/reset"', () => { + expect(routerPushMock).toHaveBeenCalledWith('/thx/reset') + }) + }) }) }) }) diff --git a/frontend/src/views/Pages/ResetPassword.vue b/frontend/src/views/Pages/ResetPassword.vue index f0ed0c348..0023c3838 100644 --- a/frontend/src/views/Pages/ResetPassword.vue +++ b/frontend/src/views/Pages/ResetPassword.vue @@ -94,7 +94,7 @@ export default { this.form.password = '' if (this.$route.path.includes('checkEmail')) { this.$router.push('/thx/checkEmail') - } else if (this.$route.path.includes('reset')) { + } else { this.$router.push('/thx/reset') } }) From 1be4d83a3648cdbb63b0feda9260c0a69f61dc87 Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 24 Jan 2022 16:58:03 +0100 Subject: [PATCH 59/63] change css for twi elements, sidebar and navbar active only --- frontend/src/components/Menu/Sidebar.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue index 67e3a7d25..20943d14a 100644 --- a/frontend/src/components/Menu/Sidebar.vue +++ b/frontend/src/components/Menu/Sidebar.vue @@ -53,7 +53,8 @@ export default { } From 6dca1536c829c35d6a9dfe849833218eb90d32ef Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 24 Jan 2022 17:01:26 +0100 Subject: [PATCH 60/63] test that i18n.locale is set to the value in the store --- admin/src/main.test.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/admin/src/main.test.js b/admin/src/main.test.js index 06efa8b65..a5eda5c65 100644 --- a/admin/src/main.test.js +++ b/admin/src/main.test.js @@ -15,7 +15,15 @@ jest.mock('vue-apollo') jest.mock('vuex') jest.mock('vue-i18n') jest.mock('vue-moment') -jest.mock('./store/store') +jest.mock('./store/store', () => { + return { + state: { + moderator: { + language: 'es', + }, + }, + } +}) jest.mock('./i18n') jest.mock('./router/router') @@ -101,4 +109,8 @@ describe('main', () => { }), ) }) + + it('sets the locale from store', () => { + expect(i18n.locale).toBe('es') + }) }) From 6d6cdb1e647d005d3e18a33a1c43934c2c9cf6ad Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 24 Jan 2022 17:26:47 +0100 Subject: [PATCH 61/63] set i18n.locale and localeChanged from vee-validate inside the language mutation of the store --- frontend/src/store/store.js | 4 ++++ frontend/src/store/store.test.js | 18 ++++++++++++++++++ frontend/src/views/Pages/Login.vue | 3 --- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js index d219ecacd..1a6521cd7 100644 --- a/frontend/src/store/store.js +++ b/frontend/src/store/store.js @@ -1,11 +1,15 @@ import Vue from 'vue' import Vuex from 'vuex' import createPersistedState from 'vuex-persistedstate' +import { localeChanged } from 'vee-validate' +import i18n from '../i18n.js' Vue.use(Vuex) export const mutations = { language: (state, language) => { + i18n.locale = language + localeChanged(language) state.language = language }, email: (state, email) => { diff --git a/frontend/src/store/store.test.js b/frontend/src/store/store.test.js index da108b9ff..4c0c03178 100644 --- a/frontend/src/store/store.test.js +++ b/frontend/src/store/store.test.js @@ -1,8 +1,18 @@ import { mutations, actions } from './store' import Vuex from 'vuex' import Vue from 'vue' +import i18n from '../i18n.js' +import { localeChanged } from 'vee-validate' jest.mock('vuex') +jest.mock('../i18n.js') +jest.mock('vee-validate', () => { + return { + localeChanged: jest.fn(), + } +}) + +i18n.locale = 'blubb' const { language, @@ -29,6 +39,14 @@ describe('Vuex store', () => { language(state, 'de') expect(state.language).toEqual('de') }) + + it('sets the i18n locale', () => { + expect(i18n.locale).toBe('de') + }) + + it('calls localChanged of vee-validate', () => { + expect(localeChanged).toBeCalledWith('de') + }) }) describe('email', () => { diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue index 1c2f4c8d0..4d2b75d2a 100755 --- a/frontend/src/views/Pages/Login.vue +++ b/frontend/src/views/Pages/Login.vue @@ -64,7 +64,6 @@ import InputPassword from '../../components/Inputs/InputPassword' import InputEmail from '../../components/Inputs/InputEmail' import { login } from '../../graphql/queries' import { getCommunityInfoMixin } from '../../mixins/getCommunityInfo' -import { localeChanged } from 'vee-validate' export default { name: 'login', @@ -102,8 +101,6 @@ export default { data: { login }, } = result this.$store.dispatch('login', login) - this.$i18n.locale = login.language - localeChanged(login.language) this.$router.push('/overview') loader.hide() }) From e8920f4c35de6cd6dbd7ec14722438089a9a4ad2 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 24 Jan 2022 17:39:42 +0100 Subject: [PATCH 62/63] all locale handling is done by store, so that commit the language to store on change is enough. Note that dispatch login calls commit language --- .../src/components/#LanguageSwitchSelect.vue# | 39 +++++++++++++++++++ .../src/components/.#LanguageSwitchSelect.vue | 1 + frontend/src/components/LanguageSwitch.vue | 5 +-- frontend/src/main.js | 2 +- frontend/src/routes/guards.js | 3 +- frontend/src/views/Pages/Register.vue | 3 -- .../UserProfile/UserCard_Language.spec.js | 4 -- .../Pages/UserProfile/UserCard_Language.vue | 3 -- 8 files changed, 43 insertions(+), 17 deletions(-) create mode 100644 frontend/src/components/#LanguageSwitchSelect.vue# create mode 120000 frontend/src/components/.#LanguageSwitchSelect.vue diff --git a/frontend/src/components/#LanguageSwitchSelect.vue# b/frontend/src/components/#LanguageSwitchSelect.vue# new file mode 100644 index 000000000..545cef4e9 --- /dev/null +++ b/frontend/src/components/#LanguageSwitchSelect.vue# @@ -0,0 +1,39 @@ + + diff --git a/frontend/src/components/.#LanguageSwitchSelect.vue b/frontend/src/components/.#LanguageSwitchSelect.vue new file mode 120000 index 000000000..8a9d4d991 --- /dev/null +++ b/frontend/src/components/.#LanguageSwitchSelect.vue @@ -0,0 +1 @@ +moriz@bluestar.2222:1642854724 \ No newline at end of file diff --git a/frontend/src/components/LanguageSwitch.vue b/frontend/src/components/LanguageSwitch.vue index 5e4c71287..2678883c3 100644 --- a/frontend/src/components/LanguageSwitch.vue +++ b/frontend/src/components/LanguageSwitch.vue @@ -12,7 +12,6 @@ diff --git a/frontend/src/components/.#LanguageSwitchSelect.vue b/frontend/src/components/.#LanguageSwitchSelect.vue deleted file mode 120000 index 8a9d4d991..000000000 --- a/frontend/src/components/.#LanguageSwitchSelect.vue +++ /dev/null @@ -1 +0,0 @@ -moriz@bluestar.2222:1642854724 \ No newline at end of file