From 7c39cc1e70b4f655541bc0282645db6f11b96b1b Mon Sep 17 00:00:00 2001 From: Bernd Hueckstaedt Date: Thu, 2 Mar 2023 11:09:06 +0100 Subject: [PATCH 01/19] Update de.json --- frontend/src/locales/de.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index d966e2867..c5cb0c12a 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -27,9 +27,9 @@ "moderator": "Moderator", "moderators": "Moderatoren", "myContributions": "Meine Beiträge", - "noOpenContributionLinkText": "Zur Zeit gibt es keine automatischen Schöpfungen.", - "openContributionLinks": "Öffentliche Beitrags-Linkliste", - "openContributionLinkText": "Folgende {count} automatische Schöpfungen werden zur Zeit durch die Gemeinschaft „{name}“ bereitgestellt.", + "noOpenContributionLinkText": "Zur Zeit gibt es keine projektbezogenen Guthaben-Links.", + "openContributionLinks": "Projektbezogene Guthaben-Links und QR-Codes", + "openContributionLinkText": "Die Gemeinschaft kann Links und QR-Codes für die automatische Schöpfung von Startguthaben oder wiederkehrenden Gemeinwohl-Beiträgen erstellen.

Folgende {count} Guthaben-Links werden zur Zeit durch die Gemeinschaft „{name}“ bereitgestellt.", "submitContribution": "Schreiben" }, "communityInfo": "Gemeinschaft Information", From 664c59abb29dd16911c8ac11df91a9efa0e1d7a6 Mon Sep 17 00:00:00 2001 From: Bernd Hueckstaedt Date: Fri, 3 Mar 2023 11:17:02 +0100 Subject: [PATCH 02/19] Update de.json --- frontend/src/locales/de.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index c5cb0c12a..bf5205bf6 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -27,9 +27,9 @@ "moderator": "Moderator", "moderators": "Moderatoren", "myContributions": "Meine Beiträge", - "noOpenContributionLinkText": "Zur Zeit gibt es keine projektbezogenen Guthaben-Links.", - "openContributionLinks": "Projektbezogene Guthaben-Links und QR-Codes", - "openContributionLinkText": "Die Gemeinschaft kann Links und QR-Codes für die automatische Schöpfung von Startguthaben oder wiederkehrenden Gemeinwohl-Beiträgen erstellen.

Folgende {count} Guthaben-Links werden zur Zeit durch die Gemeinschaft „{name}“ bereitgestellt.", + "noOpenContributionLinkText": "Zur Zeit gibt es keine per Link erzeugte Schöpfungen.", + "openContributionLinks": "Per Link erzeugte Schöpfungen", + "openContributionLinkText": "Die Gemeinschaft „{name}“ unterstützt aktuell {count} per Link erzeugte Schöpfungen:", "submitContribution": "Schreiben" }, "communityInfo": "Gemeinschaft Information", From 091b856a201eaf17d4ebaeec2172ae9784951d20 Mon Sep 17 00:00:00 2001 From: Bernd Hueckstaedt Date: Fri, 3 Mar 2023 11:32:13 +0100 Subject: [PATCH 03/19] Update en.json --- frontend/src/locales/en.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index a5be6e05b..78898266f 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -27,9 +27,9 @@ "moderator": "Moderator", "moderators": "Moderators", "myContributions": "My contributions", - "noOpenContributionLinkText": "Currently there are no automatic creations.", - "openContributionLinks": "Open contribution-link list", - "openContributionLinkText": "The following {count} automatic creations are currently provided by the \"{name}\" community.", + "noOpenContributionLinkText": "Currently there are no link-generated creations.", + "openContributionLinks": "Creations generated by link", + "openContributionLinkText": "The \"{name}\" community currently supports {count} link-generated creations:", "submitContribution": "Contribute" }, "communityInfo": "Community Information", From 83cf137122e186f0a68d0a58b7c7d9eaca534b8e Mon Sep 17 00:00:00 2001 From: Bernd Hueckstaedt Date: Fri, 3 Mar 2023 11:36:52 +0100 Subject: [PATCH 04/19] (refactor): creations generated by link --- frontend/src/locales/es.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json index 9441a10a2..fbcb5867e 100644 --- a/frontend/src/locales/es.json +++ b/frontend/src/locales/es.json @@ -26,8 +26,8 @@ "moderator": "Moderador", "moderators": "Moderadores", "myContributions": "Mis contribuciones al bien común", - "openContributionLinks": "lista de enlaces de contribuciones públicas", - "openContributionLinkText": "La comunidad \"{name}\" proporciona actualmente las siguientes {count} creaciones automáticas.", + "openContributionLinks": "Creaciones generadas por enlace", + "openContributionLinkText": "La comunidad \"{name}\" admite actualmente {count} creaciones generadas por enlaces:", "other-communities": "Otras comunidades", "statistic": "Estadísticas", "submitContribution": "escribir", From a22cf6bfe3f7f2ee4f59863dc66e82af151c377e Mon Sep 17 00:00:00 2001 From: Bernd Hueckstaedt Date: Fri, 3 Mar 2023 11:39:33 +0100 Subject: [PATCH 05/19] (refactor): creations generated by link --- 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 78898266f..f551fea3f 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -131,7 +131,7 @@ "close": "Close", "current_balance": "Current Balance", "date": "Date", - "description": "Description", + "description": "Description", "email": "Email", "firstname": "Firstname", "from": "from", From 3436f4abcaa8ac54e2f17539253603d16f208d75 Mon Sep 17 00:00:00 2001 From: Bernd Hueckstaedt Date: Fri, 3 Mar 2023 19:07:43 +0100 Subject: [PATCH 06/19] Update frontend/src/locales/de.json Co-authored-by: Hannes Heine --- 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 bf5205bf6..ef2abe366 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -29,7 +29,7 @@ "myContributions": "Meine Beiträge", "noOpenContributionLinkText": "Zur Zeit gibt es keine per Link erzeugte Schöpfungen.", "openContributionLinks": "Per Link erzeugte Schöpfungen", - "openContributionLinkText": "Die Gemeinschaft „{name}“ unterstützt aktuell {count} per Link erzeugte Schöpfungen:", + "openContributionLinkText": "Die Gemeinschaft „{name}“ unterstützt aktuell {count} per Link erzeugte Schöpfungen:", "submitContribution": "Schreiben" }, "communityInfo": "Gemeinschaft Information", From 68be6053510493072749267e6d3b1ac6ec2024fe Mon Sep 17 00:00:00 2001 From: Bernd Hueckstaedt Date: Fri, 3 Mar 2023 19:07:55 +0100 Subject: [PATCH 07/19] Update frontend/src/locales/es.json Co-authored-by: Hannes Heine --- frontend/src/locales/es.json | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json index fbcb5867e..93891d2da 100644 --- a/frontend/src/locales/es.json +++ b/frontend/src/locales/es.json @@ -26,6 +26,7 @@ "moderator": "Moderador", "moderators": "Moderadores", "myContributions": "Mis contribuciones al bien común", + "noOpenContributionLinkText": "Actualmente no hay creaciones automáticas.", "openContributionLinks": "Creaciones generadas por enlace", "openContributionLinkText": "La comunidad \"{name}\" admite actualmente {count} creaciones generadas por enlaces:", "other-communities": "Otras comunidades", From ae05185544c325851ddd48b1624f82391d414b45 Mon Sep 17 00:00:00 2001 From: Bernd Hueckstaedt Date: Fri, 3 Mar 2023 19:08:22 +0100 Subject: [PATCH 08/19] Update frontend/src/locales/en.json Co-authored-by: Hannes Heine --- 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 f551fea3f..78898266f 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -131,7 +131,7 @@ "close": "Close", "current_balance": "Current Balance", "date": "Date", - "description": "Description", + "description": "Description", "email": "Email", "firstname": "Firstname", "from": "from", From b66b40ba43a24f0504320d93dac97b4dda1d58d4 Mon Sep 17 00:00:00 2001 From: Bernd Hueckstaedt Date: Sat, 4 Mar 2023 07:36:33 +0100 Subject: [PATCH 09/19] (refactor): Creations generated by link (Fr) --- frontend/src/locales/fr.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json index 9e2c11fc5..102825acc 100644 --- a/frontend/src/locales/fr.json +++ b/frontend/src/locales/fr.json @@ -27,9 +27,9 @@ "moderator": "Modérateur", "moderators": "Modérateurs", "myContributions": "Mes contributions", - "noOpenContributionLinkText": "Currently there are no automatic creations.", - "openContributionLinks": "liste de liens de contribution publique", - "openContributionLinkText": "Les {count} créations automatiques suivantes sont actuellement fournies par la communauté \"{name}\".", + "noOpenContributionLinkText": "Actuellement, il n'y a pas de créations générées par lien.", + "openContributionLinks": "Créations générées par lien", + "openContributionLinkText": "La communauté \"{name}\" soutient actuellement {count} créations générées par lien:", "submitContribution": "Contribuer" }, "communityInfo": "Information communauté^^", From 001ed6946f6a850ca9c4fdaa91320389065e2f6c Mon Sep 17 00:00:00 2001 From: Bernd Hueckstaedt Date: Sat, 4 Mar 2023 07:48:24 +0100 Subject: [PATCH 10/19] (refactor): creations generated by link NL --- frontend/src/locales/nl.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/nl.json b/frontend/src/locales/nl.json index 0ac052c47..f1306eda8 100644 --- a/frontend/src/locales/nl.json +++ b/frontend/src/locales/nl.json @@ -26,8 +26,9 @@ "moderator": "Moderator", "moderators": "Moderators", "myContributions": "Mijn bijdragen voor het algemeen belang", - "openContributionLinks": "openbare lijst van bijdragen", - "openContributionLinkText": "De volgende {count} automatische creaties worden momenteel aangeboden door de gemeenschap \"{name}\".", + "noOpenContributionLinkText": "Er zijn momenteel geen link-gegenereerde creaties.", + "openContributionLinks": "Creaties gegenereerd door link", + "openContributionLinkText": "De community \"{name}\" ondersteunt momenteel {count} link-gegenereerde creaties:", "other-communities": "Verdere gemeenschappen", "statistic": "Statistieken", "submitContribution": "schrijf", From 70817a9c2db6ed690084e432e13723c9ac9f999b Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 6 Mar 2023 12:20:31 +0100 Subject: [PATCH 11/19] change text to 'Check Now' --- frontend/src/components/GddSend/TransactionForm.vue | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue index 10884d5f1..b560e0767 100644 --- a/frontend/src/components/GddSend/TransactionForm.vue +++ b/frontend/src/components/GddSend/TransactionForm.vue @@ -105,10 +105,7 @@ - {{ $t('form.check_now') }} - - {{ $t('form.generate_now') }} - + {{ $t('form.check_now') }} From 992eb6e89bcaeb7be5d98f396450dee3ba6babd7 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 8 Mar 2023 07:44:43 +0100 Subject: [PATCH 12/19] Add margin-top -7px to navbar brand. --- admin/src/components/NavBar.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue index 7e2b7d76f..9b2c7a077 100644 --- a/admin/src/components/NavBar.vue +++ b/admin/src/components/NavBar.vue @@ -50,6 +50,10 @@ export default { } From 747c146bbf24d44497baaa293d143fb61c91898b Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 8 Mar 2023 12:33:15 +0100 Subject: [PATCH 17/19] Add to database query relation messages --- backend/src/graphql/resolver/ContributionResolver.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts index ab177d759..2469f60ba 100644 --- a/backend/src/graphql/resolver/ContributionResolver.ts +++ b/backend/src/graphql/resolver/ContributionResolver.ts @@ -391,7 +391,7 @@ export class ContributionResolver { currentPage, pageSize, true, - ['user'], + ['user', 'messages'], undefined, statusFilter, ) From 775d29fb68700e7acc972e58a8103b4844f82e2a Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 8 Mar 2023 14:29:25 +0100 Subject: [PATCH 18/19] Add messageCount value to the contributions that got messages, order the objects in the same order as they are found. --- .../resolver/ContributionResolver.test.ts | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts index ed4cdffa0..27f6d1c2a 100644 --- a/backend/src/graphql/resolver/ContributionResolver.test.ts +++ b/backend/src/graphql/resolver/ContributionResolver.test.ts @@ -2745,15 +2745,6 @@ describe('ContributionResolver', () => { messagesCount: 0, state: 'CONFIRMED', }), - expect.objectContaining({ - amount: expect.decimalEqual(100), - firstName: 'Bob', - id: expect.any(Number), - lastName: 'der Baumeister', - memo: 'Confirmed Contribution', - messagesCount: 0, - state: 'CONFIRMED', - }), expect.objectContaining({ amount: expect.decimalEqual(400), firstName: 'Peter', @@ -2763,6 +2754,15 @@ describe('ContributionResolver', () => { messagesCount: 0, state: 'PENDING', }), + expect.objectContaining({ + amount: expect.decimalEqual(100), + firstName: 'Bob', + id: expect.any(Number), + lastName: 'der Baumeister', + memo: 'Confirmed Contribution', + messagesCount: 0, + state: 'CONFIRMED', + }), expect.objectContaining({ amount: expect.decimalEqual(100), firstName: 'Peter', @@ -2781,15 +2781,6 @@ describe('ContributionResolver', () => { messagesCount: 0, state: 'PENDING', }), - expect.objectContaining({ - amount: expect.decimalEqual(10), - firstName: 'Bibi', - id: expect.any(Number), - lastName: 'Bloxberg', - memo: 'Test PENDING contribution update', - messagesCount: 0, - state: 'PENDING', - }), expect.objectContaining({ amount: expect.decimalEqual(200), firstName: 'Peter', @@ -2799,15 +2790,6 @@ describe('ContributionResolver', () => { messagesCount: 0, state: 'DELETED', }), - expect.objectContaining({ - amount: expect.decimalEqual(166), - firstName: 'Räuber', - id: expect.any(Number), - lastName: 'Hotzenplotz', - memo: 'Whatever contribution', - messagesCount: 0, - state: 'DELETED', - }), expect.objectContaining({ amount: expect.decimalEqual(166), firstName: 'Räuber', @@ -2817,6 +2799,15 @@ describe('ContributionResolver', () => { messagesCount: 0, state: 'DENIED', }), + expect.objectContaining({ + amount: expect.decimalEqual(166), + firstName: 'Räuber', + id: expect.any(Number), + lastName: 'Hotzenplotz', + memo: 'Whatever contribution', + messagesCount: 0, + state: 'DELETED', + }), expect.objectContaining({ amount: expect.decimalEqual(166), firstName: 'Räuber', @@ -2831,18 +2822,9 @@ describe('ContributionResolver', () => { firstName: 'Bibi', id: expect.any(Number), lastName: 'Bloxberg', - memo: 'Test IN_PROGRESS contribution', + memo: 'Test contribution to delete', messagesCount: 0, - state: 'IN_PROGRESS', - }), - expect.objectContaining({ - amount: expect.decimalEqual(100), - firstName: 'Bibi', - id: expect.any(Number), - lastName: 'Bloxberg', - memo: 'Test contribution to confirm', - messagesCount: 0, - state: 'CONFIRMED', + state: 'DELETED', }), expect.objectContaining({ amount: expect.decimalEqual(100), @@ -2858,9 +2840,27 @@ describe('ContributionResolver', () => { firstName: 'Bibi', id: expect.any(Number), lastName: 'Bloxberg', - memo: 'Test contribution to delete', + memo: 'Test contribution to confirm', messagesCount: 0, - state: 'DELETED', + state: 'CONFIRMED', + }), + expect.objectContaining({ + amount: expect.decimalEqual(100), + firstName: 'Bibi', + id: expect.any(Number), + lastName: 'Bloxberg', + memo: 'Test IN_PROGRESS contribution', + messagesCount: 1, + state: 'IN_PROGRESS', + }), + expect.objectContaining({ + amount: expect.decimalEqual(10), + firstName: 'Bibi', + id: expect.any(Number), + lastName: 'Bloxberg', + memo: 'Test PENDING contribution update', + messagesCount: 1, + state: 'PENDING', }), expect.objectContaining({ amount: expect.decimalEqual(1000), From 34def5fdbf533e93ca2d48495132849cb338649e Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 9 Mar 2023 12:49:12 +0100 Subject: [PATCH 19/19] Change info.svg to path --- frontend/public/img/svg/info.svg | 186 +++---------------------------- 1 file changed, 13 insertions(+), 173 deletions(-) diff --git a/frontend/public/img/svg/info.svg b/frontend/public/img/svg/info.svg index 1d1b88c65..0510a5b60 100644 --- a/frontend/public/img/svg/info.svg +++ b/frontend/public/img/svg/info.svg @@ -3,180 +3,20 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -