From 5206e27a7a52625b8bc6b9a3d358a4cb65fc2b46 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 30 Nov 2021 13:44:42 +0100 Subject: [PATCH 01/16] Add PublisherID input box per collaps --- frontend/src/views/Pages/Register.vue | 31 ++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index ea4000cff..551b2927b 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -121,8 +121,37 @@ {{ messageError }} + + PublisherId + + + + + + + + + + + + + +
+ Trage hier die ID des Herausgebers ein. Wenn du keine ID hast dann bitte + lehr lassen. + Dies ist für die Registrieung nicht nötig! +
+ +
+
+ + + -
+
From 57e8be75a6291906abf90931cf6dca2b3dce3fa1 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 30 Nov 2021 13:52:57 +0100 Subject: [PATCH 02/16] Add PublisherID locales in DOM and german --- frontend/src/locales/de.json | 5 +++++ frontend/src/views/Pages/Register.vue | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index b0dfe36d4..3494d5c52 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -169,6 +169,11 @@ "my-profil": "Mein Profil", "support": "Support" }, + "publisher": { + "publisherId": "Herausgeber ID", + "infoText": "Trage hier die ID des Herausgebers ein. Wenn du keine ID hast dann bitte lehr lassen.", + "infoNoRegister": "Dies ist für die Registrieung nicht nötig!" + }, "signup": { "agree": "Ich stimme der Datenschutzerklärung zu.", "dont_match": "Die Passwörter stimmen nicht überein.", diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index 551b2927b..569d00bb9 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -122,7 +122,7 @@ - PublisherId + {{ $t('publisher.publisherId') }} @@ -140,9 +140,8 @@ v-b-toggle:my-collapse class="text-center mt-1 shadow-lg p-3 mb-5 rounded" > - Trage hier die ID des Herausgebers ein. Wenn du keine ID hast dann bitte - lehr lassen. - Dies ist für die Registrieung nicht nötig! + {{ $t('publisher.infoText') }} + {{ $t('publisher.infoNoRegister') }}
From 75ec2a6e8cc4bce2341a9f08abd28dc1d00d054f Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 30 Nov 2021 13:54:33 +0100 Subject: [PATCH 03/16] Add PublisherID locales in DOM and english --- frontend/src/locales/en.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 135729ffa..595d97c0c 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -169,6 +169,11 @@ "my-profil": "My profile", "support": "Support" }, + "publisher": { + "publisherId": "PublisherID", + "infoText": "Enter the ID of the publisher here. If you do not have an ID, please leave it blank.", + "infoNoRegister": "This is not necessary for registration!" + }, "signup": { "agree": "I agree to the privacy policy.", "dont_match": "Passwords don't match.", From a1018b526d8cd48cd55d40a5a6889144168d589b Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 30 Nov 2021 13:56:22 +0100 Subject: [PATCH 04/16] Add locales for PublisherID --- frontend/src/locales/de.json | 10 +++++----- frontend/src/locales/en.json | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 3494d5c52..eccb7b7fb 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -150,6 +150,11 @@ } }, "signup": "Registrieren", + "publisher": { + "publisherId": "Herausgeber ID", + "infoText": "Trage hier die ID des Herausgebers ein. Wenn du keine ID hast dann bitte lehr lassen.", + "infoNoRegister": "Dies ist für die Registrieung nicht nötig!" + }, "site": { "404": { "back": "Zurück zur Übersicht!", @@ -169,11 +174,6 @@ "my-profil": "Mein Profil", "support": "Support" }, - "publisher": { - "publisherId": "Herausgeber ID", - "infoText": "Trage hier die ID des Herausgebers ein. Wenn du keine ID hast dann bitte lehr lassen.", - "infoNoRegister": "Dies ist für die Registrieung nicht nötig!" - }, "signup": { "agree": "Ich stimme der Datenschutzerklärung zu.", "dont_match": "Die Passwörter stimmen nicht überein.", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 595d97c0c..bcf4d7c11 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -150,6 +150,11 @@ } }, "signup": "Sign up", + "publisher": { + "publisherId": "PublisherID", + "infoText": "Enter the ID of the publisher here. If you do not have an ID, please leave it blank.", + "infoNoRegister": "This is not necessary for registration!" + }, "site": { "404": { "back": "Back to dashboard!", @@ -169,11 +174,6 @@ "my-profil": "My profile", "support": "Support" }, - "publisher": { - "publisherId": "PublisherID", - "infoText": "Enter the ID of the publisher here. If you do not have an ID, please leave it blank.", - "infoNoRegister": "This is not necessary for registration!" - }, "signup": { "agree": "I agree to the privacy policy.", "dont_match": "Passwords don't match.", From 2de8684ca3391a5aa89cca8523d396db0f7e7699 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 30 Nov 2021 13:57:40 +0100 Subject: [PATCH 05/16] Add edit locales for german PublisherID for Herausgeber ID --- 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 eccb7b7fb..e68caaa59 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -151,7 +151,7 @@ }, "signup": "Registrieren", "publisher": { - "publisherId": "Herausgeber ID", + "publisherId": "PublisherID", "infoText": "Trage hier die ID des Herausgebers ein. Wenn du keine ID hast dann bitte lehr lassen.", "infoNoRegister": "Dies ist für die Registrieung nicht nötig!" }, From eece84d007672d056d5ce1287d2dc503d0696abe Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 30 Nov 2021 13:58:34 +0100 Subject: [PATCH 06/16] yarn locales --fix --- frontend/src/locales/de.json | 10 +++++----- frontend/src/locales/en.json | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index e68caaa59..3e104541d 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -114,6 +114,11 @@ "message": "hallo gradido !!", "overview": "Übersicht", "privacy_policy": "Datenschutzerklärung", + "publisher": { + "infoNoRegister": "Dies ist für die Registrieung nicht nötig!", + "infoText": "Trage hier die ID des Herausgebers ein. Wenn du keine ID hast dann bitte lehr lassen.", + "publisherId": "PublisherID" + }, "send": "Senden", "settings": { "coinanimation": { @@ -150,11 +155,6 @@ } }, "signup": "Registrieren", - "publisher": { - "publisherId": "PublisherID", - "infoText": "Trage hier die ID des Herausgebers ein. Wenn du keine ID hast dann bitte lehr lassen.", - "infoNoRegister": "Dies ist für die Registrieung nicht nötig!" - }, "site": { "404": { "back": "Zurück zur Übersicht!", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index bcf4d7c11..f473ff798 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -114,6 +114,11 @@ "message": "hello gradido !!", "overview": "Overview", "privacy_policy": "Privacy policy", + "publisher": { + "infoNoRegister": "This is not necessary for registration!", + "infoText": "Enter the ID of the publisher here. If you do not have an ID, please leave it blank.", + "publisherId": "PublisherID" + }, "send": "Send", "settings": { "coinanimation": { @@ -150,11 +155,6 @@ } }, "signup": "Sign up", - "publisher": { - "publisherId": "PublisherID", - "infoText": "Enter the ID of the publisher here. If you do not have an ID, please leave it blank.", - "infoNoRegister": "This is not necessary for registration!" - }, "site": { "404": { "back": "Back to dashboard!", From bc21f76848e56050b38cb13b0ba88eb0932b1c62 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 30 Nov 2021 14:57:04 +0100 Subject: [PATCH 07/16] Insert publishID from Store when set --- frontend/src/views/Pages/Register.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index 569d00bb9..517085a36 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -122,7 +122,7 @@ - {{ $t('publisher.publisherId') }} + {{ $t('publisher.publisherId') }} : {{ $store.state.publisherId }} @@ -134,7 +134,7 @@ - +
Date: Tue, 30 Nov 2021 14:57:38 +0100 Subject: [PATCH 08/16] yarn lint --fix --- frontend/src/views/Pages/Register.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index 517085a36..43334eaf7 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -122,7 +122,9 @@ - {{ $t('publisher.publisherId') }} : {{ $store.state.publisherId }} + + {{ $t('publisher.publisherId') }} : {{ $store.state.publisherId }} + @@ -134,7 +136,11 @@ - +
Date: Wed, 1 Dec 2021 15:34:08 +0100 Subject: [PATCH 09/16] Update frontend/src/locales/de.json Co-authored-by: Moriz Wahl --- 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 3e104541d..1e8bfb621 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -116,7 +116,7 @@ "privacy_policy": "Datenschutzerklärung", "publisher": { "infoNoRegister": "Dies ist für die Registrieung nicht nötig!", - "infoText": "Trage hier die ID des Herausgebers ein. Wenn du keine ID hast dann bitte lehr lassen.", + "infoText": "Trage hier die ID des Herausgebers ein. Wenn du keine ID hast dann bitte leer lassen.", "publisherId": "PublisherID" }, "send": "Senden", From 2bb11230f69cb293c1c49fe5b33f4525c6d67db7 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 1 Dec 2021 15:34:19 +0100 Subject: [PATCH 10/16] Update frontend/src/views/Pages/Register.vue Co-authored-by: Moriz Wahl --- frontend/src/views/Pages/Register.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index 43334eaf7..2842ad853 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -138,7 +138,7 @@ From 09cdd00c82849fa84d8a6ae6a34e78462eed8d81 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 1 Dec 2021 17:53:58 +0100 Subject: [PATCH 11/16] Add Methods commitStore() for publisherId --- frontend/src/views/Pages/Register.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index 2842ad853..da97c7c07 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -139,7 +139,8 @@
Date: Wed, 1 Dec 2021 17:55:03 +0100 Subject: [PATCH 12/16] remove all console logs --- 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 da97c7c07..f80e37a22 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -234,7 +234,6 @@ export default { return dirty || validated ? valid : null }, commitStore(val) { - console.log('commitStore', val) this.$store.commit('publisherId', val) }, async onSubmit() { From 31adf5d6e26bf94642bbd6979bce8f41709eb85d Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 1 Dec 2021 18:39:25 +0100 Subject: [PATCH 13/16] jest test for input publisherId --- frontend/src/views/Pages/Register.spec.js | 6 ++++++ frontend/src/views/Pages/Register.vue | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js index c63de66cf..4cc8d9030 100644 --- a/frontend/src/views/Pages/Register.spec.js +++ b/frontend/src/views/Pages/Register.spec.js @@ -170,6 +170,11 @@ describe('Register', () => { expect(wrapper.find('#registerCheckbox').exists()).toBeTruthy() }) + it('has PublisherId input fields', () => { + wrapper.find('.publisherCollaps').trigger('click') + expect(wrapper.find('#publisherid').exists()).toBe(true) + }) + it('has disabled submit button when not completely filled', () => { expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBe('disabled') }) @@ -221,6 +226,7 @@ describe('Register', () => { wrapper.find('input[name="form.password"]').setValue('Aa123456_') wrapper.find('input[name="form.passwordRepeat"]').setValue('Aa123456_') wrapper.find('.language-switch-select').findAll('option').at(1).setSelected() + wrapper.find('#publisherid').setValue('12345') }) it('has enabled submit button when completely filled', () => { diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index f80e37a22..8669781a4 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -121,7 +121,7 @@ {{ messageError }} - + {{ $t('publisher.publisherId') }} : {{ $store.state.publisherId }} @@ -137,6 +137,7 @@ Date: Wed, 1 Dec 2021 18:51:12 +0100 Subject: [PATCH 14/16] jest test for input publisherId commit to store --- frontend/src/views/Pages/Register.spec.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js index 4cc8d9030..ed4908d86 100644 --- a/frontend/src/views/Pages/Register.spec.js +++ b/frontend/src/views/Pages/Register.spec.js @@ -229,6 +229,10 @@ describe('Register', () => { wrapper.find('#publisherid').setValue('12345') }) + it('commits openCreationsMinus to store', () => { + expect(storeCommitMock).toBeCalledWith('publisherId', 12345) + }) + it('has enabled submit button when completely filled', () => { expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBe('disabled') }) From fc799a78ebb25ad97d3b449aa49ac08f8bb3bf42 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 2 Dec 2021 09:19:35 +0100 Subject: [PATCH 15/16] test von store commit publisherId, test store isAdmin --- frontend/src/store/store.test.js | 10 ++++++++++ frontend/src/views/Pages/Register.spec.js | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/frontend/src/store/store.test.js b/frontend/src/store/store.test.js index 829678b44..051c16102 100644 --- a/frontend/src/store/store.test.js +++ b/frontend/src/store/store.test.js @@ -11,6 +11,7 @@ const { coinanimation, newsletterState, publisherId, + isAdmin, community, hasElopage, } = mutations @@ -104,6 +105,15 @@ describe('Vuex store', () => { }) }) + + describe('isAdmin', () => { + it('sets the state of isAdmin', () => { + const state = { isAdmin: null } + isAdmin(state, true) + expect(state.isAdmin).toEqual(true) + }) + }) + describe('community', () => { it('sets the state of community', () => { const state = {} diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js index ed4908d86..d6814bd49 100644 --- a/frontend/src/views/Pages/Register.spec.js +++ b/frontend/src/views/Pages/Register.spec.js @@ -229,8 +229,8 @@ describe('Register', () => { wrapper.find('#publisherid').setValue('12345') }) - it('commits openCreationsMinus to store', () => { - expect(storeCommitMock).toBeCalledWith('publisherId', 12345) + it('commits publisherId to store', () => { + expect(mockStoreCommit).toBeCalledWith('publisherId', 12345) }) it('has enabled submit button when completely filled', () => { From 36d3850c3f95a837614f57d2a7914b35a6137152 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 2 Dec 2021 09:20:38 +0100 Subject: [PATCH 16/16] yarn lint --fix --- frontend/src/store/store.test.js | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/store/store.test.js b/frontend/src/store/store.test.js index 051c16102..4f25f5352 100644 --- a/frontend/src/store/store.test.js +++ b/frontend/src/store/store.test.js @@ -105,7 +105,6 @@ describe('Vuex store', () => { }) }) - describe('isAdmin', () => { it('sets the state of isAdmin', () => { const state = { isAdmin: null }