From d0f3f286b935d943d27bcf6e476c8446449684e3 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 11 Nov 2022 12:34:08 +0100 Subject: [PATCH 01/22] fix (frontend): Better History Messages --- .../ContributionMessagesListItem.vue | 4 ++-- .../ContributionMessages/LinkifyMessage.vue | 22 ++++++++++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue index 9c7a3a0f2..df0ddbc4c 100644 --- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue +++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue @@ -4,14 +4,14 @@ {{ message.userFirstName }} {{ message.userLastName }} {{ $d(new Date(message.createdAt), 'short') }} - +
{{ message.userFirstName }} {{ message.userLastName }} {{ $d(new Date(message.createdAt), 'short') }} {{ $t('community.moderator') }} - +
diff --git a/frontend/src/components/ContributionMessages/LinkifyMessage.vue b/frontend/src/components/ContributionMessages/LinkifyMessage.vue index 09418858f..1f1e99417 100644 --- a/frontend/src/components/ContributionMessages/LinkifyMessage.vue +++ b/frontend/src/components/ContributionMessages/LinkifyMessage.vue @@ -2,6 +2,14 @@
{{ text }} + + {{ $d(new Date(text), 'short') }} +
+ + +
+ {{ text | GDD }} + {{ text }}
@@ -17,11 +25,22 @@ export default { type: String, required: true, }, + type: { + type: String, + reuired: true, + }, }, computed: { linkifiedMessage() { - const linkified = [] let string = this.message + const linkified = [] + let amount + if (this.type === 'HISTORY') { + const split = string.split(/\n\s*---\n\s*/) + string = split[1] + linkified.push({ type: 'date', text: split[0].trim() }) + amount = split[2].trim() + } let match while ((match = string.match(LINK_REGEX_PATTERN))) { if (match.index > 0) @@ -30,6 +49,7 @@ export default { string = string.substring(match.index + match[0].length) } if (string.length > 0) linkified.push({ type: 'text', text: string }) + if (amount) linkified.push({ type: 'amount', text: amount }) return linkified }, }, From 5204e16240facad4beebd709c0601cf1e37dd1b6 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 11 Nov 2022 12:41:06 +0100 Subject: [PATCH 02/22] rename component --- .../ContributionMessages/ContributionMessagesListItem.vue | 8 ++++---- .../{LinkifyMessage.vue => ParseMessage.vue} | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) rename frontend/src/components/ContributionMessages/{LinkifyMessage.vue => ParseMessage.vue} (92%) diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue index df0ddbc4c..5862f97f5 100644 --- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue +++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue @@ -4,25 +4,25 @@ {{ message.userFirstName }} {{ message.userLastName }} {{ $d(new Date(message.createdAt), 'short') }} - +
{{ message.userFirstName }} {{ message.userLastName }} {{ $d(new Date(message.createdAt), 'short') }} {{ $t('community.moderator') }} - +
diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue index 30960bd33..53006cff5 100644 --- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue +++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue @@ -5,23 +5,23 @@ {{ message.userFirstName }} {{ message.userLastName }} {{ $d(new Date(message.createdAt), 'short') }} {{ $t('moderator') }} - +
{{ message.userFirstName }} {{ message.userLastName }} {{ $d(new Date(message.createdAt), 'short') }} - +
diff --git a/admin/src/components/ContributionMessages/ParseMessage.vue b/admin/src/components/ContributionMessages/ParseMessage.vue index 2b0b72901..dc630eed2 100644 --- a/admin/src/components/ContributionMessages/ParseMessage.vue +++ b/admin/src/components/ContributionMessages/ParseMessage.vue @@ -8,7 +8,7 @@
- {{ $n(parseFloat(text), 'decimal') }} GDD + {{ text | GDD }} {{ text }} From 16a2ffca76b0e5316b6396947e9653a128ec8d34 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Sat, 12 Nov 2022 14:40:48 +0100 Subject: [PATCH 05/22] remove GDD filter --- admin/src/components/ContributionMessages/ParseMessage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/components/ContributionMessages/ParseMessage.vue b/admin/src/components/ContributionMessages/ParseMessage.vue index dc630eed2..069373840 100644 --- a/admin/src/components/ContributionMessages/ParseMessage.vue +++ b/admin/src/components/ContributionMessages/ParseMessage.vue @@ -8,7 +8,7 @@
- {{ text | GDD }} + {{ `${$n(Number(text), 'decimal')} GDD` }} {{ text }} From dcfab11f5e130a1c39f50a9b935ed6bbe1c798e8 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 12 Nov 2022 20:41:21 +0100 Subject: [PATCH 06/22] corrected E-Mail texts --- .../src/mailer/text/contributionConfirmed.ts | 17 +++++++------ .../text/contributionMessageReceived.ts | 8 +++---- .../src/mailer/text/contributionRejected.ts | 17 ++++++------- .../mailer/text/transactionLinkRedeemed.ts | 24 +++++++++---------- .../src/mailer/text/transactionReceived.ts | 8 +++---- 5 files changed, 37 insertions(+), 37 deletions(-) diff --git a/backend/src/mailer/text/contributionConfirmed.ts b/backend/src/mailer/text/contributionConfirmed.ts index dc82d7615..106c3a4c5 100644 --- a/backend/src/mailer/text/contributionConfirmed.ts +++ b/backend/src/mailer/text/contributionConfirmed.ts @@ -2,7 +2,7 @@ import Decimal from 'decimal.js-light' export const contributionConfirmed = { de: { - subject: 'Schöpfung wurde bestätigt', + subject: 'Dein Gemeinwohl-Beitrag wurde bestätigt', text: (data: { senderFirstName: string senderLastName: string @@ -14,18 +14,17 @@ export const contributionConfirmed = { }): string => `Hallo ${data.recipientFirstName} ${data.recipientLastName}, -Dein eingereichter Gemeinwohl-Beitrag "${data.contributionMemo}" wurde soeben von ${ - data.senderFirstName - } ${data.senderLastName} bestätigt. +dein Gemeinwohl-Beitrag "${data.contributionMemo}" wurde soeben von ${data.senderFirstName} ${ + data.senderLastName + } bestätigt und in deinem Gradido-Konto gutgeschrieben. Betrag: ${data.contributionAmount.toFixed(2).replace('.', ',')} GDD +Link zu deinem Konto: ${data.overviewURL} + Bitte antworte nicht auf diese E-Mail! -Mit freundlichen Grüßen, -dein Gradido-Team - - -Link zu deinem Konto: ${data.overviewURL}`, +Liebe Grüße +dein Gradido-Team`, }, } diff --git a/backend/src/mailer/text/contributionMessageReceived.ts b/backend/src/mailer/text/contributionMessageReceived.ts index af1cabb9f..71f16b2cd 100644 --- a/backend/src/mailer/text/contributionMessageReceived.ts +++ b/backend/src/mailer/text/contributionMessageReceived.ts @@ -1,6 +1,6 @@ export const contributionMessageReceived = { de: { - subject: 'Rückfrage zu Deinem Gemeinwohl-Beitrag', + subject: 'Nachricht zu Deinem Gemeinwohl-Beitrag', text: (data: { senderFirstName: string senderLastName: string @@ -14,15 +14,15 @@ export const contributionMessageReceived = { }): string => `Hallo ${data.recipientFirstName} ${data.recipientLastName}, -du hast soeben zu deinem eingereichten Gemeinwohl-Beitrag "${data.contributionMemo}" eine Rückfrage von ${data.senderFirstName} ${data.senderLastName} erhalten. +du hast zu deinem Gemeinwohl-Beitrag "${data.contributionMemo}" eine Nachricht von ${data.senderFirstName} ${data.senderLastName} erhalten. -Bitte beantworte die Rückfrage in deinem Gradido-Konto im Menü "Gemeinschaft" im Tab "Meine Beiträge zum Gemeinwohl"! +Um die Nachricht zu sehen und darauf zu antworten, gehe in deinem Gradido-Konto ins Menü "Gemeinschaft" auf den Tab "Meine Beiträge zum Gemeinwohl"! Link zu deinem Konto: ${data.overviewURL} Bitte antworte nicht auf diese E-Mail! -Mit freundlichen Grüßen, +Liebe Grüße dein Gradido-Team`, }, } diff --git a/backend/src/mailer/text/contributionRejected.ts b/backend/src/mailer/text/contributionRejected.ts index a101e7a25..ff52c7b5a 100644 --- a/backend/src/mailer/text/contributionRejected.ts +++ b/backend/src/mailer/text/contributionRejected.ts @@ -2,7 +2,7 @@ import Decimal from 'decimal.js-light' export const contributionRejected = { de: { - subject: 'Schöpfung wurde abgelehnt', + subject: 'Dein Gemeinwohl-Beitrag wurde abgelehnt', text: (data: { senderFirstName: string senderLastName: string @@ -14,14 +14,15 @@ export const contributionRejected = { }): string => `Hallo ${data.recipientFirstName} ${data.recipientLastName}, -Dein eingereichter Gemeinwohl-Beitrag "${data.contributionMemo}" wurde soeben von ${data.senderFirstName} ${data.senderLastName} abgelehnt. - +dein Gemeinwohl-Beitrag "${data.contributionMemo}" wurde von ${data.senderFirstName} ${data.senderLastName} abgelehnt. + +Um deine Gemeinwohl-Beiträge und dazugehörige Nachrichten zu sehen, gehe in deinem Gradido-Konto ins Menü "Gemeinschaft" auf den Tab "Meine Beiträge zum Gemeinwohl"! + +Link zu deinem Konto: ${data.overviewURL} + Bitte antworte nicht auf diese E-Mail! -Mit freundlichen Grüßen, -dein Gradido-Team - - -Link zu deinem Konto: ${data.overviewURL}`, +Liebe Grüße +dein Gradido-Team`, }, } diff --git a/backend/src/mailer/text/transactionLinkRedeemed.ts b/backend/src/mailer/text/transactionLinkRedeemed.ts index 4d8e89cae..a63e5d275 100644 --- a/backend/src/mailer/text/transactionLinkRedeemed.ts +++ b/backend/src/mailer/text/transactionLinkRedeemed.ts @@ -14,20 +14,20 @@ export const transactionLinkRedeemed = { memo: string overviewURL: string }): string => - `Hallo ${data.recipientFirstName} ${data.recipientLastName} + `Hallo ${data.recipientFirstName} ${data.recipientLastName}, - ${data.senderFirstName} ${data.senderLastName} (${ +${data.senderFirstName} ${data.senderLastName} (${ data.senderEmail }) hat soeben deinen Link eingelöst. - - Betrag: ${data.amount.toFixed(2).replace('.', ',')} GDD, - Memo: ${data.memo} - - Details zur Transaktion findest du in deinem Gradido-Konto: ${data.overviewURL} - - Bitte antworte nicht auf diese E-Mail! - - Mit freundlichen Grüßen, - dein Gradido-Team`, + +Betrag: ${data.amount.toFixed(2).replace('.', ',')} GDD, +Memo: ${data.memo} + +Details zur Transaktion findest du in deinem Gradido-Konto: ${data.overviewURL} + +Bitte antworte nicht auf diese E-Mail! + +Liebe Grüße +dein Gradido-Team`, }, } diff --git a/backend/src/mailer/text/transactionReceived.ts b/backend/src/mailer/text/transactionReceived.ts index ba61ae680..67758c0e1 100644 --- a/backend/src/mailer/text/transactionReceived.ts +++ b/backend/src/mailer/text/transactionReceived.ts @@ -2,7 +2,7 @@ import Decimal from 'decimal.js-light' export const transactionReceived = { de: { - subject: 'Gradido Überweisung', + subject: 'Du hast Gradidos erhalten', text: (data: { senderFirstName: string senderLastName: string @@ -13,9 +13,9 @@ export const transactionReceived = { amount: Decimal overviewURL: string }): string => - `Hallo ${data.recipientFirstName} ${data.recipientLastName} + `Hallo ${data.recipientFirstName} ${data.recipientLastName}, -Du hast soeben ${data.amount.toFixed(2).replace('.', ',')} GDD von ${data.senderFirstName} ${ +du hast soeben ${data.amount.toFixed(2).replace('.', ',')} GDD von ${data.senderFirstName} ${ data.senderLastName } (${data.senderEmail}) erhalten. @@ -23,7 +23,7 @@ Details zur Transaktion findest du in deinem Gradido-Konto: ${data.overviewURL} Bitte antworte nicht auf diese E-Mail! -Mit freundlichen Grüßen, +Liebe Grüße dein Gradido-Team`, }, } From 1b40d6aaeebff2091f3c563a82f53051fd1c0ed3 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Sun, 13 Nov 2022 13:18:41 +0100 Subject: [PATCH 07/22] unit tests for HISTORY type contribution messages --- .../ContributionMessagesListItem.spec.js | 63 ++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js index 2dc9fb3ce..1a918747f 100644 --- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js +++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js @@ -5,9 +5,11 @@ import ContributionMessagesListItem from './ContributionMessagesListItem.vue' const localVue = global.localVue let wrapper +const dateMock = jest.fn((d) => d) + const mocks = { $t: jest.fn((t) => t), - $d: jest.fn((d) => d), + $d: dateMock, $store: { state: { firstName: 'Peter', @@ -239,4 +241,63 @@ and here is the link to the repository: https://github.com/gradido/gradido`) }) }) }) + + describe('contribution message type HISTORY', () => { + const propsData = { + message: { + id: 111, + message: `Sun Nov 13 2022 13:05:48 GMT+0100 (Central European Standard Time) +--- +This message also contains a link: https://gradido.net/de/ +--- +350.00`, + createdAt: '2022-08-29T12:23:27.000Z', + updatedAt: null, + type: 'HISTORY', + userFirstName: 'Peter', + userLastName: 'Lustig', + userId: 107, + __typename: 'ContributionMessage', + }, + } + + const itemWrapper = () => { + return mount(ContributionMessagesListItem, { + localVue, + mocks, + propsData, + }) + } + + let messageField + + describe('render HISTORY message', () => { + beforeEach(() => { + jest.clearAllMocks() + wrapper = itemWrapper() + messageField = wrapper.find('div.is-not-moderator.text-right > div:nth-child(4)') + }) + + it('renders the date', () => { + expect(dateMock).toBeCalledWith( + new Date('Sun Nov 13 2022 13:05:48 GMT+0100 (Central European Standard Time'), + 'short', + ) + }) + + it('renders the amount', () => { + expect(messageField.text()).toContain('350.00 GDD') + }) + + it('contains the link as text', () => { + expect(messageField.text()).toContain( + 'This message also contains a link: https://gradido.net/de/', + ) + }) + + it('contains a link to the given address', () => { + expect(messageField.find('a').attributes('href')).toBe('https://gradido.net/de/') + }) + }) + }) }) From 0cb318907398c1a806cb57bd2f1e495a818c5eba Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Sun, 13 Nov 2022 13:24:00 +0100 Subject: [PATCH 08/22] unit tests for HISTORY type contribution messages --- .../ContributionMessagesListItem.spec.js | 66 ++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js index c1a4e65c6..1b4f963e8 100644 --- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js +++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js @@ -3,12 +3,16 @@ import ContributionMessagesListItem from './ContributionMessagesListItem.vue' const localVue = global.localVue +const dateMock = jest.fn((d) => d) +const numberMock = jest.fn((n) => n) + describe('ContributionMessagesListItem', () => { let wrapper const mocks = { $t: jest.fn((t) => t), - $d: jest.fn((d) => d), + $d: dateMock, + $n: numberMock, } describe('if message author has moderator role', () => { @@ -189,4 +193,64 @@ and here is the link to the repository: https://github.com/gradido/gradido`) }) }) }) + + describe('contribution message type HISTORY', () => { + const propsData = { + message: { + id: 111, + message: `Sun Nov 13 2022 13:05:48 GMT+0100 (Central European Standard Time) +--- +This message also contains a link: https://gradido.net/de/ +--- +350.00`, + createdAt: '2022-08-29T12:23:27.000Z', + updatedAt: null, + type: 'HISTORY', + userFirstName: 'Peter', + userLastName: 'Lustig', + userId: 107, + __typename: 'ContributionMessage', + }, + } + + const itemWrapper = () => { + return mount(ContributionMessagesListItem, { + localVue, + mocks, + propsData, + }) + } + + let messageField + + describe('render HISTORY message', () => { + beforeEach(() => { + jest.clearAllMocks() + wrapper = itemWrapper() + messageField = wrapper.find('div.is-not-moderator.text-left > div:nth-child(4)') + }) + + it('renders the date', () => { + expect(dateMock).toBeCalledWith( + new Date('Sun Nov 13 2022 13:05:48 GMT+0100 (Central European Standard Time'), + 'short', + ) + }) + + it('renders the amount', () => { + expect(numberMock).toBeCalledWith(350, 'decimal') + expect(messageField.text()).toContain('350 GDD') + }) + + it('contains the link as text', () => { + expect(messageField.text()).toContain( + 'This message also contains a link: https://gradido.net/de/', + ) + }) + + it('contains a link to the given address', () => { + expect(messageField.find('a').attributes('href')).toBe('https://gradido.net/de/') + }) + }) + }) }) From f65cb9c5864e7277c00d8b3f2ac8d49a29624fd4 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sun, 13 Nov 2022 14:21:27 +0100 Subject: [PATCH 09/22] missing change, `deinem` not with capital letter --- backend/src/mailer/text/contributionMessageReceived.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/mailer/text/contributionMessageReceived.ts b/backend/src/mailer/text/contributionMessageReceived.ts index 71f16b2cd..301ebef22 100644 --- a/backend/src/mailer/text/contributionMessageReceived.ts +++ b/backend/src/mailer/text/contributionMessageReceived.ts @@ -1,6 +1,6 @@ export const contributionMessageReceived = { de: { - subject: 'Nachricht zu Deinem Gemeinwohl-Beitrag', + subject: 'Nachricht zu deinem Gemeinwohl-Beitrag', text: (data: { senderFirstName: string senderLastName: string From b8c1a9d477a6b2f7c0292c56afe86d28fba63f8d Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sun, 13 Nov 2022 14:21:33 +0100 Subject: [PATCH 10/22] fixed tests --- backend/src/mailer/sendAddedContributionMessageEmail.test.ts | 4 ++-- backend/src/mailer/sendContributionConfirmedEmail.test.ts | 4 ++-- backend/src/mailer/sendContributionRejectedEmail.test.ts | 4 ++-- backend/src/mailer/sendTransactionReceivedEmail.test.ts | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/src/mailer/sendAddedContributionMessageEmail.test.ts b/backend/src/mailer/sendAddedContributionMessageEmail.test.ts index bed8f6214..9a2ec1aa1 100644 --- a/backend/src/mailer/sendAddedContributionMessageEmail.test.ts +++ b/backend/src/mailer/sendAddedContributionMessageEmail.test.ts @@ -26,12 +26,12 @@ describe('sendAddedContributionMessageEmail', () => { it('calls sendEMail', () => { expect(sendEMail).toBeCalledWith({ to: `Bibi Bloxberg `, - subject: 'Rückfrage zu Deinem Gemeinwohl-Beitrag', + subject: 'Nachricht zu deinem Gemeinwohl-Beitrag', text: expect.stringContaining('Hallo Bibi Bloxberg') && expect.stringContaining('Peter Lustig') && expect.stringContaining( - 'Du hast soeben zu deinem eingereichten Gradido Schöpfungsantrag "Vielen herzlichen Dank für den neuen Hexenbesen!" eine Rückfrage von Peter Lustig erhalten.', + 'du hast zu deinem Gemeinwohl-Beitrag "Vielen herzlichen Dank für den neuen Hexenbesen!" eine Nachricht von Peter Lustig erhalten.', ) && expect.stringContaining('Was für ein Besen ist es geworden?') && expect.stringContaining('http://localhost/overview'), diff --git a/backend/src/mailer/sendContributionConfirmedEmail.test.ts b/backend/src/mailer/sendContributionConfirmedEmail.test.ts index 1935144fd..bd89afa69 100644 --- a/backend/src/mailer/sendContributionConfirmedEmail.test.ts +++ b/backend/src/mailer/sendContributionConfirmedEmail.test.ts @@ -26,11 +26,11 @@ describe('sendContributionConfirmedEmail', () => { it('calls sendEMail', () => { expect(sendEMail).toBeCalledWith({ to: 'Bibi Bloxberg ', - subject: 'Schöpfung wurde bestätigt', + subject: 'Dein Gemeinwohl-Beitrag wurde bestätigt', text: expect.stringContaining('Hallo Bibi Bloxberg') && expect.stringContaining( - 'Dein Gradido Schöpfungsantrag "Vielen herzlichen Dank für den neuen Hexenbesen!" wurde soeben bestätigt.', + 'dein Gemeinwohl-Beitrag "Vielen herzlichen Dank für den neuen Hexenbesen!" wurde soeben von Peter Lustig bestätigt und in deinem Gradido-Konto gutgeschrieben.', ) && expect.stringContaining('Betrag: 200,00 GDD') && expect.stringContaining('Link zu deinem Konto: http://localhost/overview'), diff --git a/backend/src/mailer/sendContributionRejectedEmail.test.ts b/backend/src/mailer/sendContributionRejectedEmail.test.ts index fb044692b..be41ff15f 100644 --- a/backend/src/mailer/sendContributionRejectedEmail.test.ts +++ b/backend/src/mailer/sendContributionRejectedEmail.test.ts @@ -26,11 +26,11 @@ describe('sendContributionConfirmedEmail', () => { it('calls sendEMail', () => { expect(sendEMail).toBeCalledWith({ to: 'Bibi Bloxberg ', - subject: 'Schöpfung wurde abgelehnt', + subject: 'Dein Gemeinwohl-Beitrag wurde abgelehnt', text: expect.stringContaining('Hallo Bibi Bloxberg') && expect.stringContaining( - 'Dein Gradido Schöpfungsantrag "Vielen herzlichen Dank für den neuen Hexenbesen!" wurde soeben von Peter Lustig abgelehnt.', + 'dein Gemeinwohl-Beitrag "Vielen herzlichen Dank für den neuen Hexenbesen!" wurde von Peter Lustig abgelehnt.', ) && expect.stringContaining('Link zu deinem Konto: http://localhost/overview'), }) diff --git a/backend/src/mailer/sendTransactionReceivedEmail.test.ts b/backend/src/mailer/sendTransactionReceivedEmail.test.ts index 9f2ba9938..ca813c033 100644 --- a/backend/src/mailer/sendTransactionReceivedEmail.test.ts +++ b/backend/src/mailer/sendTransactionReceivedEmail.test.ts @@ -26,7 +26,7 @@ describe('sendTransactionReceivedEmail', () => { it('calls sendEMail', () => { expect(sendEMail).toBeCalledWith({ to: `Peter Lustig `, - subject: 'Gradido Überweisung', + subject: 'Du hast Gradidos erhalten', text: expect.stringContaining('Hallo Peter Lustig') && expect.stringContaining('42,00 GDD') && From 6a47ba78297de6f98f604b184d713a333b4a569e Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 14 Nov 2022 14:29:16 +0100 Subject: [PATCH 11/22] close all open collapse by change tabs in community --- .../components/Contributions/ContributionListItem.vue | 2 ++ frontend/src/pages/Community.vue | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue index 683d234ba..82b796e33 100644 --- a/frontend/src/components/Contributions/ContributionListItem.vue +++ b/frontend/src/components/Contributions/ContributionListItem.vue @@ -54,6 +54,7 @@ v-b-toggle="collapsId" icon="chat-dots" class="h2 mr-5" + @mousedown="$root.$emit('close-all-open-collapse')" @click="getListContributionMessages" > @@ -64,6 +65,7 @@ v-if="state === 'IN_PROGRESS'" v-b-toggle="collapsId" variant="warning" + @mousedown="$root.$emit('close-all-open-collapse')" @click="getListContributionMessages" > {{ $t('contribution.alert.answerQuestion') }} diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue index 786307405..28d3bdabf 100644 --- a/frontend/src/pages/Community.vue +++ b/frontend/src/pages/Community.vue @@ -49,7 +49,7 @@ :pageSize="pageSize" /> - +

{{ $t('navigation.community') }}

@@ -70,6 +70,7 @@ :items="itemsAll" @update-list-contributions="updateListAllContributions" @update-contribution-form="updateContributionForm" + @close-all-open-collapse="closeAllOpenCollapse" :contributionCount="contributionCountAll" :showPagination="true" :pageSize="pageSizeAll" @@ -112,6 +113,13 @@ export default { } }, methods: { + closeAllOpenCollapse() { + // console.log('Community closeAllOpenCollapse ') + // console.log('closeAllOpenCollapse', this.$el.querySelectorAll('.collapse.show')) + this.$el.querySelectorAll('.collapse.show').forEach((value) => { + this.$root.$emit('bv::toggle::collapse', value.id) + }) + }, setContribution(data) { this.$apollo .mutate({ From 1afac12aa831380fa18cc56812b74f7a988b09b5 Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 14 Nov 2022 15:23:44 +0100 Subject: [PATCH 12/22] close open messagebox by open another messagebox --- frontend/src/components/Contributions/ContributionList.vue | 1 + frontend/src/components/Contributions/ContributionListItem.vue | 3 +-- frontend/src/pages/Community.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/Contributions/ContributionList.vue b/frontend/src/components/Contributions/ContributionList.vue index ca4e7a9a0..e76664e03 100644 --- a/frontend/src/components/Contributions/ContributionList.vue +++ b/frontend/src/components/Contributions/ContributionList.vue @@ -3,6 +3,7 @@

{{ $t('contribution.alert.answerQuestion') }} diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue index 28d3bdabf..ae0dca62e 100644 --- a/frontend/src/pages/Community.vue +++ b/frontend/src/pages/Community.vue @@ -39,6 +39,7 @@
Date: Mon, 14 Nov 2022 15:31:42 +0100 Subject: [PATCH 13/22] same event on chat-dot icon --- frontend/src/components/Contributions/ContributionListItem.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue index 6cf8f4cab..d09b1c790 100644 --- a/frontend/src/components/Contributions/ContributionListItem.vue +++ b/frontend/src/components/Contributions/ContributionListItem.vue @@ -54,8 +54,7 @@ v-b-toggle="collapsId" icon="chat-dots" class="h2 mr-5" - @mousedown="$root.$emit('close-all-open-collapse')" - @click="getListContributionMessages" + @click="$emit('closeAllOpenCollapse'), getListContributionMessages" > From 6e83d9447a66d426d9ea22e37b8f48f69ea0c4e6 Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 14 Nov 2022 16:49:00 +0100 Subject: [PATCH 14/22] add test, coverage to over 95% --- .../Contributions/ContributionListItem.spec.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/frontend/src/components/Contributions/ContributionListItem.spec.js b/frontend/src/components/Contributions/ContributionListItem.spec.js index 0b0519dda..f477d1c2c 100644 --- a/frontend/src/components/Contributions/ContributionListItem.spec.js +++ b/frontend/src/components/Contributions/ContributionListItem.spec.js @@ -132,6 +132,16 @@ describe('ContributionListItem', () => { expect(wrapper.emitted('delete-contribution')).toBeFalsy() }) }) + + describe('updateState', () => { + beforeEach(async () => { + await wrapper.vm.updateState() + }) + + it('emit update-state', () => { + expect(wrapper.vm.$emit('update-state')).toBeTruthy() + }) + }) }) }) }) From 1b3a25eb0dd2e4ad153ef95bbab0a0d55ff4c1d6 Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 14 Nov 2022 17:27:43 +0100 Subject: [PATCH 15/22] close all open collapse if tab new constribution and if edit --- .../Contributions/ContributionListItem.vue | 13 +++++++------ frontend/src/pages/Community.vue | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue index d09b1c790..22f7e791c 100644 --- a/frontend/src/components/Contributions/ContributionListItem.vue +++ b/frontend/src/components/Contributions/ContributionListItem.vue @@ -32,12 +32,13 @@ v-if="!['CONFIRMED', 'DELETED'].includes(state) && !allContribution" class="pointer ml-5" @click=" - $emit('update-contribution-form', { - id: id, - contributionDate: contributionDate, - memo: memo, - amount: amount, - }) + $emit('closeAllOpenCollapse'), + $emit('update-contribution-form', { + id: id, + contributionDate: contributionDate, + memo: memo, + amount: amount, + }) " > diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue index ae0dca62e..58426207f 100644 --- a/frontend/src/pages/Community.vue +++ b/frontend/src/pages/Community.vue @@ -2,7 +2,7 @@
- + Date: Mon, 14 Nov 2022 17:44:48 +0100 Subject: [PATCH 16/22] release: Version 1.14.0 --- CHANGELOG.md | 29 +++++++++++++++++++++++++++++ admin/package.json | 2 +- backend/package.json | 2 +- database/package.json | 2 +- frontend/package.json | 2 +- package.json | 2 +- 6 files changed, 34 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 754566658..1178a09f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,37 @@ 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). +#### [1.14.0](https://github.com/gradido/gradido/compare/1.13.3...1.14.0) + +- fix(frontend): close all open collapse by change tabs in community [`#2388`](https://github.com/gradido/gradido/pull/2388) +- fix(backend): corrected E-Mail texts [`#2386`](https://github.com/gradido/gradido/pull/2386) +- fix(frontend): better history messages [`#2381`](https://github.com/gradido/gradido/pull/2381) +- fix(frontend): mailto link [`#2383`](https://github.com/gradido/gradido/pull/2383) +- fix(admin): fix text in admin area to uppercase [`#2365`](https://github.com/gradido/gradido/pull/2365) +- feat(frontend): move the information about gradido being free to the auth layout [`#2349`](https://github.com/gradido/gradido/pull/2349) +- fix(admin): load error fixed for contribution link [`#2364`](https://github.com/gradido/gradido/pull/2364) +- fix(admin): edit contribution link does not take old values [`#2362`](https://github.com/gradido/gradido/pull/2362) +- fix(other): corrected dockerfile descriptions [`#2346`](https://github.com/gradido/gradido/pull/2346) +- feat(backend): 🍰 Send email for rejected contributions [`#2340`](https://github.com/gradido/gradido/pull/2340) +- feat(admin): edit automatic contribution link [`#2309`](https://github.com/gradido/gradido/pull/2309) +- refactor(backend): fix logger mocks [`#2308`](https://github.com/gradido/gradido/pull/2308) +- fix(admin): update contribution list after admin updates contribution [`#2330`](https://github.com/gradido/gradido/pull/2330) +- fix(frontend): inconsistent labeling on login register [`#2350`](https://github.com/gradido/gradido/pull/2350) +- feat(backend): setup hyperswarm [`#1874`](https://github.com/gradido/gradido/pull/1874) +- feat(other): lint pull request workflow [`#2338`](https://github.com/gradido/gradido/pull/2338) +- Feature: 🍰 add updated at to contributions [`#2237`](https://github.com/gradido/gradido/pull/2237) +- Refactor: GitHub test workflow - disable video recording and reduce wait time [`#2336`](https://github.com/gradido/gradido/pull/2336) +- 2274 feature concept manuel user registration for admins [`#2289`](https://github.com/gradido/gradido/pull/2289) +- 1574 concept to introduce gradidoID and change password encryption [`#2252`](https://github.com/gradido/gradido/pull/2252) +- contributionlink stage-2 and stage-3 of capturing and activation [`#2241`](https://github.com/gradido/gradido/pull/2241) +- Github workflow: update actions to the current API version using Node v 16 [`#2323`](https://github.com/gradido/gradido/pull/2323) +- feature: Fullstack tests in GitHub workflow [`#2319`](https://github.com/gradido/gradido/pull/2319) + #### [1.13.3](https://github.com/gradido/gradido/compare/1.13.2...1.13.3) +> 1 November 2022 + +- release: Version 1.13.3 [`#2322`](https://github.com/gradido/gradido/pull/2322) - 2294 contribution links on its own page [`#2312`](https://github.com/gradido/gradido/pull/2312) - fix: Change Orange Color [`#2302`](https://github.com/gradido/gradido/pull/2302) - fix: Release Statistic Query Runner [`#2320`](https://github.com/gradido/gradido/pull/2320) diff --git a/admin/package.json b/admin/package.json index 82a2413de..2adbbce0c 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.13.3", + "version": "1.14.0", "license": "Apache-2.0", "private": false, "scripts": { diff --git a/backend/package.json b/backend/package.json index 1db683b2a..92a31f4a0 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "gradido-backend", - "version": "1.13.3", + "version": "1.14.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 096c7a9bd..08e6695a4 100644 --- a/database/package.json +++ b/database/package.json @@ -1,6 +1,6 @@ { "name": "gradido-database", - "version": "1.13.3", + "version": "1.14.0", "description": "Gradido Database Tool to execute database migrations", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/database", diff --git a/frontend/package.json b/frontend/package.json index 4e983d716..69aecf595 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "bootstrap-vue-gradido-wallet", - "version": "1.13.3", + "version": "1.14.0", "private": true, "scripts": { "start": "node run/server.js", diff --git a/package.json b/package.json index 8e5fcfc70..11a1cc473 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gradido", - "version": "1.13.3", + "version": "1.14.0", "description": "Gradido", "main": "index.js", "repository": "git@github.com:gradido/gradido.git", From fd1fb07184d739760017089a715493a9b5f2a1b7 Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 14 Nov 2022 19:42:54 +0100 Subject: [PATCH 17/22] load contributionMessages is fixed --- .../src/components/Contributions/ContributionListItem.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue index 22f7e791c..9d38b9309 100644 --- a/frontend/src/components/Contributions/ContributionListItem.vue +++ b/frontend/src/components/Contributions/ContributionListItem.vue @@ -55,7 +55,7 @@ v-b-toggle="collapsId" icon="chat-dots" class="h2 mr-5" - @click="$emit('closeAllOpenCollapse'), getListContributionMessages" + @click="getListContributionMessages" >
@@ -65,7 +65,7 @@ v-if="state === 'IN_PROGRESS'" v-b-toggle="collapsId" variant="warning" - @click="$emit('closeAllOpenCollapse'), getListContributionMessages" + @click="getListContributionMessages" > {{ $t('contribution.alert.answerQuestion') }} @@ -181,6 +181,7 @@ export default { }, getListContributionMessages() { // console.log('getListContributionMessages', this.contributionId) + this.$emit('closeAllOpenCollapse') this.$apollo .query({ query: listContributionMessages, From ee570e9578b21f6bd17be78aad3d2268a02c564f Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 14 Nov 2022 20:22:36 +0100 Subject: [PATCH 18/22] fix errors --- .../ContributionMessages/ContributionMessagesFormular.vue | 2 +- .../ContributionMessages/ContributionMessagesList.vue | 4 ++-- .../src/components/Contributions/ContributionListItem.vue | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue index 1a5928cc3..c601de4f5 100644 --- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue +++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue @@ -51,7 +51,7 @@ export default { }, }) .then((result) => { - this.$emit('get-list-contribution-messages', this.contributionId) + this.$emit('get-list-contribution-messages', false) this.$emit('update-state', this.contributionId) this.form.text = '' this.toastSuccess(this.$t('message.reply')) diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue index 4b7045a40..52cf403e6 100644 --- a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue +++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue @@ -9,7 +9,7 @@ @@ -51,7 +51,7 @@ export default { }, methods: { getListContributionMessages() { - this.$emit('get-list-contribution-messages', this.contributionId) + this.$emit('get-list-contribution-messages') }, updateState(id) { this.$emit('update-state', id) diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue index 9d38b9309..53de8c461 100644 --- a/frontend/src/components/Contributions/ContributionListItem.vue +++ b/frontend/src/components/Contributions/ContributionListItem.vue @@ -179,9 +179,10 @@ export default { if (value) this.$emit('delete-contribution', item) }) }, - getListContributionMessages() { - // console.log('getListContributionMessages', this.contributionId) - this.$emit('closeAllOpenCollapse') + getListContributionMessages(closeCollapse = true) { + if (closeCollapse) { + this.$emit('closeAllOpenCollapse') + } this.$apollo .query({ query: listContributionMessages, From 1a34db8b1894a757bba2fc5b2ac5953d1c923ad5 Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 14 Nov 2022 20:36:34 +0100 Subject: [PATCH 19/22] fix test --- .../ContributionMessagesFormular.spec.js | 4 ++-- .../Contributions/ContributionListItem.spec.js | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js index aba5abc34..42deac9cb 100644 --- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js +++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js @@ -67,9 +67,9 @@ describe('ContributionMessagesFormular', () => { await wrapper.find('form').trigger('submit') }) - it('emitted "get-list-contribution-messages" with data', async () => { + it('emitted "get-list-contribution-messages" with false', async () => { expect(wrapper.emitted('get-list-contribution-messages')).toEqual( - expect.arrayContaining([expect.arrayContaining([42])]), + expect.arrayContaining([expect.arrayContaining([false])]), ) }) diff --git a/frontend/src/components/Contributions/ContributionListItem.spec.js b/frontend/src/components/Contributions/ContributionListItem.spec.js index f477d1c2c..66e3bcef9 100644 --- a/frontend/src/components/Contributions/ContributionListItem.spec.js +++ b/frontend/src/components/Contributions/ContributionListItem.spec.js @@ -9,6 +9,7 @@ describe('ContributionListItem', () => { const mocks = { $t: jest.fn((t) => t), $d: jest.fn((d) => d), + $apollo: { query: jest.fn().mockResolvedValue() }, } const propsData = { @@ -143,5 +144,16 @@ describe('ContributionListItem', () => { }) }) }) + + describe('getListContributionMessages', () => { + beforeEach(() => { + wrapper + .findComponent({ name: 'ContributionMessagesList' }) + .vm.$emit('get-list-contribution-messages') + }) + it('emits closeAllOpenCollapse', () => { + expect(wrapper.emitted('closeAllOpenCollapse')).toBeTruthy() + }) + }) }) }) From 428c4fd22d702751a6a074dd7b794e8ea3b85586 Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 14 Nov 2022 20:38:55 +0100 Subject: [PATCH 20/22] remove unused code --- .../ContributionMessages/ContributionMessagesList.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue index 52cf403e6..e9262c073 100644 --- a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue +++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue @@ -50,9 +50,6 @@ export default { }, }, methods: { - getListContributionMessages() { - this.$emit('get-list-contribution-messages') - }, updateState(id) { this.$emit('update-state', id) }, From dca87634722582626c7907edef8dc1937607eb1d Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 14 Nov 2022 20:57:25 +0100 Subject: [PATCH 21/22] remove depricated test --- .../ContributionMessagesList.spec.js | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js index 7798532b7..c5c26a2c0 100644 --- a/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js +++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js @@ -40,16 +40,6 @@ describe('ContributionMessagesList', () => { expect(wrapper.findComponent({ name: 'ContributionMessagesFormular' }).exists()).toBe(true) }) - describe('get List Contribution Messages', () => { - beforeEach(() => { - wrapper.vm.getListContributionMessages() - }) - - it('emits getListContributionMessages', async () => { - expect(wrapper.vm.$emit('get-list-contribution-messages')).toBeTruthy() - }) - }) - describe('update State', () => { beforeEach(() => { wrapper.vm.updateState() From debc27549fd7df324b1413e3d46544b1c6bb007d Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 14 Nov 2022 21:13:41 +0100 Subject: [PATCH 22/22] v1.14.1 --- CHANGELOG.md | 7 +++++++ admin/package.json | 2 +- backend/package.json | 2 +- database/package.json | 2 +- frontend/package.json | 2 +- package.json | 2 +- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1178a09f9..9ce354b1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,15 @@ 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). +#### [1.14.1](https://github.com/gradido/gradido/compare/1.14.0...1.14.1) + +- fix(frontend): load contributionMessages is fixed [`#2390`](https://github.com/gradido/gradido/pull/2390) + #### [1.14.0](https://github.com/gradido/gradido/compare/1.13.3...1.14.0) +> 14 November 2022 + +- chore(release): version 1.14.0 [`#2389`](https://github.com/gradido/gradido/pull/2389) - fix(frontend): close all open collapse by change tabs in community [`#2388`](https://github.com/gradido/gradido/pull/2388) - fix(backend): corrected E-Mail texts [`#2386`](https://github.com/gradido/gradido/pull/2386) - fix(frontend): better history messages [`#2381`](https://github.com/gradido/gradido/pull/2381) diff --git a/admin/package.json b/admin/package.json index 2adbbce0c..7f0e7ffd5 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.14.0", + "version": "1.14.1", "license": "Apache-2.0", "private": false, "scripts": { diff --git a/backend/package.json b/backend/package.json index 92a31f4a0..332f8ddae 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "gradido-backend", - "version": "1.14.0", + "version": "1.14.1", "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 08e6695a4..6216a25fb 100644 --- a/database/package.json +++ b/database/package.json @@ -1,6 +1,6 @@ { "name": "gradido-database", - "version": "1.14.0", + "version": "1.14.1", "description": "Gradido Database Tool to execute database migrations", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/database", diff --git a/frontend/package.json b/frontend/package.json index 69aecf595..cfc12630e 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "bootstrap-vue-gradido-wallet", - "version": "1.14.0", + "version": "1.14.1", "private": true, "scripts": { "start": "node run/server.js", diff --git a/package.json b/package.json index 11a1cc473..72efee984 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gradido", - "version": "1.14.0", + "version": "1.14.1", "description": "Gradido", "main": "index.js", "repository": "git@github.com:gradido/gradido.git",