From 0efa487bb2259e6b34c7f45146d9ff7ca5289ff1 Mon Sep 17 00:00:00 2001 From: einhorn_b Date: Sun, 29 Oct 2023 19:34:47 +0100 Subject: [PATCH 1/5] split moderators and admins and show both --- frontend/src/graphql/queries.js | 1 + frontend/src/locales/de.json | 1 + frontend/src/locales/en.json | 1 + frontend/src/locales/es.json | 1 + frontend/src/locales/fr.json | 1 + frontend/src/locales/nl.json | 1 + frontend/src/locales/tr.json | 1 + frontend/src/pages/InfoStatistic.vue | 20 +++++++++++++++----- 8 files changed, 22 insertions(+), 5 deletions(-) diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js index 3cdf55c3f..996c80777 100644 --- a/frontend/src/graphql/queries.js +++ b/frontend/src/graphql/queries.js @@ -241,6 +241,7 @@ export const searchAdminUsers = gql` userList { firstName lastName + role } } } diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 9d3dee531..e73d3da01 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -20,6 +20,7 @@ }, "back": "Zurück", "community": { + "admins": "Administratoren", "choose-another-community": "Eine andere Gemeinschaft auswählen", "community": "Gemeinschaft", "communityMember": "Du bist aktives Mitglied", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 4ef319374..9dc029992 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -20,6 +20,7 @@ }, "back": "Back", "community": { + "admins": "Administrators", "choose-another-community": "Choose another community", "community": "Community", "communityMember": "You are an active member", diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json index 439fcca67..a09074962 100644 --- a/frontend/src/locales/es.json +++ b/frontend/src/locales/es.json @@ -18,6 +18,7 @@ }, "back": "Volver", "community": { + "admins": "Administradores", "choose-another-community": "Escoger otra comunidad", "community": "Comunidad", "continue-to-registration": "Continuar con el registro", diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json index 4ea1a083b..f419bc511 100644 --- a/frontend/src/locales/fr.json +++ b/frontend/src/locales/fr.json @@ -20,6 +20,7 @@ }, "back": "Retour", "community": { + "admins": "Administrateurs", "choose-another-community": "Choisissez une autre communauté", "community": "Communauté", "communityMember": "Vous etes un membre actif", diff --git a/frontend/src/locales/nl.json b/frontend/src/locales/nl.json index 31cd778a1..ba71c288b 100644 --- a/frontend/src/locales/nl.json +++ b/frontend/src/locales/nl.json @@ -18,6 +18,7 @@ }, "back": "Terug", "community": { + "admins": "Beheerders", "choose-another-community": "Kies een andere gemeenschap", "community": "Gemeenschap", "continue-to-registration": "Verder ter registratie", diff --git a/frontend/src/locales/tr.json b/frontend/src/locales/tr.json index 610a7d149..0fbc55b95 100644 --- a/frontend/src/locales/tr.json +++ b/frontend/src/locales/tr.json @@ -20,6 +20,7 @@ }, "back": "Geri", "community": { + "admins": "Yöneticiler", "choose-another-community": "Başka bir topluluk seçin", "community": "Topluluk", "continue-to-registration": "Kayıt işlemine devam et", diff --git a/frontend/src/pages/InfoStatistic.vue b/frontend/src/pages/InfoStatistic.vue index 1bfb53d4a..0b6a85dd2 100644 --- a/frontend/src/pages/InfoStatistic.vue +++ b/frontend/src/pages/InfoStatistic.vue @@ -11,7 +11,7 @@
-
{{ $t('community.openContributionLinks') }}
+ +
{{ $t('community.admins') }}
+
{{ $t('community.moderators') }}
@@ -96,6 +98,14 @@ export default { totalGradidoAvailable: null, } }, + computed: { + admins() { + return this.itemsAdminUser.filter((item) => item.role === 'ADMIN') + }, + moderators() { + return this.itemsAdminUser.filter((item) => item.role === 'MODERATOR') + }, + }, methods: { getContributionLinks() { this.$apollo From 3a70a548ecc71f982db4ffea578f45c79c26fb68 Mon Sep 17 00:00:00 2001 From: einhorn_b Date: Sun, 29 Oct 2023 20:09:14 +0100 Subject: [PATCH 2/5] fix linting --- frontend/src/locales/de.json | 6 +----- frontend/src/locales/en.json | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index b03b83538..3b35450bd 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -28,9 +28,6 @@ "moderator": "Moderator", "moderators": "Moderatoren", "myContributions": "Meine Beiträge", - "noOpenContributionLinkText": "Zur Zeit gibt es keine per Link erzeugte Schöpfungen.", - "openContributionLinks": "Per Link erzeugte Schöpfungen", - "openContributionLinkText": "Für Startguthaben oder ähnliche Zwecke kann die Gemeinschaft so genannte Schöpfungs-Links erstellen. Sie lösen automatische Schöpfungen aus, die dem Benutzer gut geschrieben werden.\nDie Gemeinschaft „{name}“ unterstützt aktuell {count} per Link erzeugte Schöpfungen:", "startNewsButton": "Gradidos versenden", "submitContribution": "Schreiben" }, @@ -78,8 +75,7 @@ "yourActivity": "Bitte trage eine Tätigkeit ein!" }, "contribution-link": { - "thanksYouWith": "dankt dir mit", - "unique": "(einmalig)" + "thanksYouWith": "dankt dir mit" }, "contributionText": "Beitragstext", "creation": "Schöpfen", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 1207150e8..059ee670c 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -28,9 +28,6 @@ "moderator": "Moderator", "moderators": "Moderators", "myContributions": "My contributions", - "noOpenContributionLinkText": "Currently there are no link-generated creations.", - "openContributionLinks": "Creations generated by link", - "openContributionLinkText": "For starting credits or similar purposes, the community can create so-called creation links. They trigger automatic creations that are credited to the user.\nThe \"{name}\" community currently supports {count} link-generated creations:", "startNewsButton": "Send Gradidos", "submitContribution": "Contribute" }, @@ -78,8 +75,7 @@ "yourActivity": "Please enter an activity!" }, "contribution-link": { - "thanksYouWith": "thanks you with", - "unique": "(unique)" + "thanksYouWith": "thanks you with" }, "contributionText": "Contribution Text", "creation": "Creation", From 480f156e1a5b240c1d7af9c5887566b2b7a45e74 Mon Sep 17 00:00:00 2001 From: Claus-Peter Huebner Date: Mon, 30 Oct 2023 22:43:48 +0100 Subject: [PATCH 3/5] prepare release 2.0.0 --- CHANGELOG.md | 17 +++++++++++++++++ admin/package.json | 2 +- backend/package.json | 2 +- database/package.json | 2 +- dht-node/package.json | 2 +- dlt-connector/package.json | 2 +- federation/package.json | 2 +- frontend/package.json | 2 +- package.json | 2 +- 9 files changed, 25 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 997233ca8..fda62a534 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,25 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +#### [2.0.0](https://github.com/gradido/gradido/compare/1.23.3...2.0.0) + +- feat(backend): x-com-sendcoins 31: insert recipient as foreign user in users table after x com sendcoins [`#3215`](https://github.com/gradido/gradido/pull/3215) +- feat(frontend): tunnel community UUId to send [`#3216`](https://github.com/gradido/gradido/pull/3216) + #### [1.23.3](https://github.com/gradido/gradido/compare/1.23.2...1.23.3) +> 6 October 2023 + +- chore(release): v1.23.3 [`#3205`](https://github.com/gradido/gradido/pull/3205) +- refactor(backend): x-sendcoins-3: refactor transactionResolver to distingue between local and x-com-transaction [`#3200`](https://github.com/gradido/gradido/pull/3200) +- feat(federation): x-com sendcoins 23: invoke settlement of pending tx [`#3194`](https://github.com/gradido/gradido/pull/3194) +- fix(database): update mariadb image name [`#3212`](https://github.com/gradido/gradido/pull/3212) +- feat(dlt): add community, use dlt-database [`#3207`](https://github.com/gradido/gradido/pull/3207) +- feat(dlt): protobuf entities for blockchain protocol [`#3199`](https://github.com/gradido/gradido/pull/3199) +- fix(frontend): make invisible community visible [`#3210`](https://github.com/gradido/gradido/pull/3210) +- feat(federation): x-com sendcoins 22: add graphql endpoints for revert pending tx [`#3193`](https://github.com/gradido/gradido/pull/3193) +- feat(federation): x-com sendcoins 21: add graphql endpoints for starting tx 2-phase-commit handshake [`#3192`](https://github.com/gradido/gradido/pull/3192) +- feat(database): dlt database [`#3189`](https://github.com/gradido/gradido/pull/3189) - feat(backend): x-sendcoins: filter on authenticated communities for selection [`#3203`](https://github.com/gradido/gradido/pull/3203) - feat(frontend): make community switch looking similar to other inputs [`#3202`](https://github.com/gradido/gradido/pull/3202) - fix(frontend): prevent showing edit link in contribution community view [`#3197`](https://github.com/gradido/gradido/pull/3197) diff --git a/admin/package.json b/admin/package.json index fa473b9b7..f44873ed8 100644 --- a/admin/package.json +++ b/admin/package.json @@ -3,7 +3,7 @@ "description": "Administraion Interface for Gradido", "main": "index.js", "author": "Moriz Wahl", - "version": "1.23.3", + "version": "2.0.0", "license": "Apache-2.0", "private": false, "scripts": { diff --git a/backend/package.json b/backend/package.json index 91eac2bc7..1f4ea67af 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "gradido-backend", - "version": "1.23.3", + "version": "2.0.0", "description": "Gradido unified backend providing an API-Service for Gradido Transactions", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/backend", diff --git a/database/package.json b/database/package.json index 1cb2d2d45..efb310a5a 100644 --- a/database/package.json +++ b/database/package.json @@ -1,6 +1,6 @@ { "name": "gradido-database", - "version": "1.23.3", + "version": "2.0.0", "description": "Gradido Database Tool to execute database migrations", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/database", diff --git a/dht-node/package.json b/dht-node/package.json index 62f97c540..a43c38cf5 100644 --- a/dht-node/package.json +++ b/dht-node/package.json @@ -1,6 +1,6 @@ { "name": "gradido-dht-node", - "version": "1.23.3", + "version": "2.0.0", "description": "Gradido dht-node module", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/", diff --git a/dlt-connector/package.json b/dlt-connector/package.json index 47e9136ff..d6d698542 100644 --- a/dlt-connector/package.json +++ b/dlt-connector/package.json @@ -1,6 +1,6 @@ { "name": "gradido-dlt-connector", - "version": "1.23.3", + "version": "2.0.0", "description": "Gradido DLT-Connector", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/", diff --git a/federation/package.json b/federation/package.json index f91d06299..926453137 100644 --- a/federation/package.json +++ b/federation/package.json @@ -1,6 +1,6 @@ { "name": "gradido-federation", - "version": "1.23.3", + "version": "2.0.0", "description": "Gradido federation module providing Gradido-Hub-Federation and versioned API for inter community communication", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/federation", diff --git a/frontend/package.json b/frontend/package.json index 30e9803f7..b0473f15e 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "bootstrap-vue-gradido-wallet", - "version": "1.23.3", + "version": "2.0.0", "private": true, "scripts": { "start": "node run/server.js", diff --git a/package.json b/package.json index aaec08e3d..b48251874 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gradido", - "version": "1.23.3", + "version": "2.0.0", "description": "Gradido", "main": "index.js", "repository": "git@github.com:gradido/gradido.git", From 10729ce3cbe47ec6334ac0ef9991910c31d91b65 Mon Sep 17 00:00:00 2001 From: Claus-Peter Huebner Date: Mon, 30 Oct 2023 22:56:15 +0100 Subject: [PATCH 4/5] manually correct generated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fda62a534..a7d68c67e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). #### [2.0.0](https://github.com/gradido/gradido/compare/1.23.3...2.0.0) +- feat(federation): x-com-sendcoins 32: communtiy authentication handshake [`#3220`](https://github.com/gradido/gradido/pull/3220) - feat(backend): x-com-sendcoins 31: insert recipient as foreign user in users table after x com sendcoins [`#3215`](https://github.com/gradido/gradido/pull/3215) - feat(frontend): tunnel community UUId to send [`#3216`](https://github.com/gradido/gradido/pull/3216) From ae6b24ea0473c168f48bcc48915d5b76a0b0c798 Mon Sep 17 00:00:00 2001 From: Claus-Peter Huebner Date: Tue, 31 Oct 2023 14:54:02 +0100 Subject: [PATCH 5/5] new generated changelog, modify installAll-order of moduls because of error in e2e --- CHANGELOG.md | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7d68c67e..f07cc6645 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). #### [2.0.0](https://github.com/gradido/gradido/compare/1.23.3...2.0.0) - feat(federation): x-com-sendcoins 32: communtiy authentication handshake [`#3220`](https://github.com/gradido/gradido/pull/3220) +- docs(frontend): update news on wallet start page [`#3221`](https://github.com/gradido/gradido/pull/3221) - feat(backend): x-com-sendcoins 31: insert recipient as foreign user in users table after x com sendcoins [`#3215`](https://github.com/gradido/gradido/pull/3215) - feat(frontend): tunnel community UUId to send [`#3216`](https://github.com/gradido/gradido/pull/3216) diff --git a/package.json b/package.json index b48251874..ff2475769 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "license": "Apache-2.0", "scripts": { "release": "scripts/release.sh", - "installAll": "yarn && cd database && yarn && cd ../frontend && yarn && cd ../admin && yarn && cd ../backend && yarn && cd ../e2e-tests && yarn && cd ../federation && yarn && cd ../dht-node && yarn && cd .." + "installAll": "yarn && cd database && yarn && cd ../frontend && yarn && cd ../admin && yarn && cd ../backend && yarn && cd ../federation && yarn && cd ../dht-node && yarn && cd ../e2e-tests && yarn && cd .." }, "dependencies": { "auto-changelog": "^2.4.0",