+
+ ![\\"Gradido](\\"cid:gradidoheader\\")
+
+
+
+"
+`;
+
+exports[`sendEmailVariants sendAccountMultiRegistrationEmail calls "sendEmailTranslated" result has the correct html as snapshot 1`] = `
+"
+
+
+
+
+
+
+
+
+
+
+
+ Email Verification
+
+
+ Hello Peter Lustig,
+Your email address has just been registered with Gradido.
+
+
+
+
+ Complete registration
+Please click here to complete the registration and activate your Gradido account.
Activate account
+ Or copy the link into your browser window.
http://localhost/checkEmail/6627633878930542284
+ Request new valid link
+The link has a validity of 23 hours and 30 minutes.
+If the validity of the link has already expired, you can have a new link sent to you here.
New link
+
+
+ Kind regards,
your Gradido team
+
+
+
+
+
+
+"
+`;
+
+exports[`sendEmailVariants sendAddedContributionMessageEmail result has the correct html as snapshot 1`] = `
+"
+
+
+
+
+
+
+
+
+
+
+
+ Try To Register Again With Your Email
+
+
+ Hello Peter Lustig,
+Your email address has just been used again to register an account with Gradido.
However, an account already exists for your email address.
+
+
+ Reset password
+If you have forgotten your password, please click here.
reset
+ Or copy the link into your browser window.
http://localhost/forgot-password
+ Contact support
+If you did not try to register again, please contact our support:
support@supportmail.com
+
+
+ Kind regards,
your Gradido team
+
+
+
+
+
+
+"
+`;
+
+exports[`sendEmailVariants sendContributionConfirmedEmail result has the correct html as snapshot 1`] = `
+"
+
+
+
+
+
+
+
+
+
+
+
+ Message about your common good contribution
+
+
+ Hello Peter Lustig,
+You have received a message from Bibi Bloxberg regarding your common good contribution “My contribution.”.
+
+
+ Read and reply to message
+To view and reply to the message, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab.
To account
+ Please do not reply to this email.
+
+
+ Kind regards,
your Gradido team
+
+
+
+
+
+
+"
+`;
+
+exports[`sendEmailVariants sendContributionDeletedEmail result has the correct html as snapshot 1`] = `
+"
+
+
+
+
+
+
+
+
+
+
+
+ Your contribution to the common good was confirmed
+
+
+ Hello Peter Lustig,
+Your common good contribution “My contribution.” has just been approved by Bibi Bloxberg. Your Gradido account has been credited with 23.54 GDD.
+
+
+ Contribution details
+To see your common good contributions and related messages, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab.
To account
+ Or copy the link into your browser window.
https://gdd.gradido.net/community/contributions
+ Please do not reply to this email.
+
+
+ Kind regards,
your Gradido team
+
+
+
+
+
+
+"
+`;
+
+exports[`sendEmailVariants sendContributionDeniedEmail result has the correct html as snapshot 1`] = `
+"
+
+
+
+
+
+
+
+
+
+
+
+ Your common good contribution was deleted
+
+
+ Hello Peter Lustig,
+Your common good contribution “My contribution.” was deleted by Bibi Bloxberg.
+
+
+ Contribution details
+To see your common good contributions and related messages, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab.
To account
+ Or copy the link into your browser window.
https://gdd.gradido.net/community/contributions
+ Please do not reply to this email.
+
+
+ Kind regards,
your Gradido team
+
+
+
+
+
+
+"
+`;
+
+exports[`sendEmailVariants sendResetPasswordEmail result has the correct html as snapshot 1`] = `
+"
+
+
+
+
+
+
+
+
+
+
+
+ Your common good contribution was rejected
+
+
+ Hello Peter Lustig,
+Your common good contribution “My contribution.” was rejected by Bibi Bloxberg.
+
+
+ Contribution details
+To see your common good contributions and related messages, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab.
To account
+ Or copy the link into your browser window.
https://gdd.gradido.net/community/contributions
+ Please do not reply to this email.
+
+
+ Kind regards,
your Gradido team
+
+
+
+
+
+
+"
+`;
+
+exports[`sendEmailVariants sendTransactionLinkRedeemedEmail result has the correct html as snapshot 1`] = `
+"
+
+
+
+
+
+
+
+
+
+
+
+ Reset password
+
+
+ Hello Peter Lustig,
+You, or someone else, requested a password reset for this account.
+
+
+
+
+ Reset password
+If it was you, please click here.
reset
+ Or copy the link into your browser window.
http://localhost/reset-password/3762660021544901417
+ Request new valid link
+The link has a validity of 23 hours and 30 minutes.
+If the validity of the link has already expired, you can have a new link sent to you here.
New link
+
+
+ Kind regards,
your Gradido team
+
+
+
+
+
+
+"
+`;
+
+exports[`sendEmailVariants sendTransactionReceivedEmail result has the correct html as snapshot 1`] = `
+"
+
+
+
+
+
+
+
+
+
+
+
+ Bibi Bloxberg has redeemed your Gradido link
+
+
+ Hello Peter Lustig,
+Bibi Bloxberg (bibi@bloxberg.de) has just redeemed your link.
+
+
+ Transaction details
+Amount: 17.65 GDD
Message: You deserve it! 🙏🏼
You can find transaction details in your Gradido account. +
To account
+ Message: You deserve it! 🙏🏼
You can find transaction details in your Gradido account. +
Please do not reply to this email.
+
+
+ Kind regards,
your Gradido team
+
+
+
+
+
+
+"
+`;
diff --git a/backend/src/emails/sendEmailTranslated.test.ts b/backend/src/emails/sendEmailTranslated.test.ts
index 3f1dd1061..b6ec0fbb5 100644
--- a/backend/src/emails/sendEmailTranslated.test.ts
+++ b/backend/src/emails/sendEmailTranslated.test.ts
@@ -94,11 +94,11 @@ describe('sendEmailTranslated', () => {
originalMessage: expect.objectContaining({
to: 'receiver@mail.org',
cc: 'support@gradido.net',
- from: 'Gradido (do not answer)
+
+
+ Bibi Bloxberg has sent you 37.40 Gradido
+
+
+ Hello Peter Lustig,
+You have just received 37.40 GDD from Bibi Bloxberg (bibi@bloxberg.de).
+
+
+ Transaction details
+You can find transaction details in your Gradido account.
To account
+ Please do not reply to this email.
+
+
+ Kind regards,
your Gradido team
+
your Gradido team') - expect(result.originalMessage.html).toContain('—————') - expect(result.originalMessage.html).toContain( - '
Gradido-Akademie
Institut für Wirtschaftsbionik
Pfarrweg 2
74653 Künzelsau
Deutschland
support@supportmail.com
http://localhost/', - ) + }) + + it('has the correct html as snapshot', () => { + expect(result.originalMessage.html).toMatchSnapshot() }) }) }) @@ -163,8 +143,10 @@ describe('sendEmailVariants', () => { }, }) }) + }) - it('has expected result', () => { + describe('result', () => { + it('is the expected object', () => { expect(result).toMatchObject({ envelope: { from: 'info@gradido.net', @@ -173,41 +155,17 @@ describe('sendEmailVariants', () => { message: expect.any(String), originalMessage: expect.objectContaining({ to: 'Peter Lustig
your Gradido team') - expect(result.originalMessage.html).toContain('—————') - expect(result.originalMessage.html).toContain( - '
Gradido-Akademie
Institut für Wirtschaftsbionik
Pfarrweg 2
74653 Künzelsau
Deutschland
support@supportmail.com
http://localhost/', - ) + }) + + it('has the correct html as snapshot', () => { + expect(result.originalMessage.html).toMatchSnapshot() }) }) }) @@ -240,54 +198,28 @@ describe('sendEmailVariants', () => { }) }) - it('has expected result', () => { - expect(result).toMatchObject({ - envelope: { - from: 'info@gradido.net', - to: ['peter@lustig.de'], - }, - message: expect.any(String), - originalMessage: expect.objectContaining({ - to: 'Peter Lustig
support@supportmail.com', - ) - expect(result.originalMessage.html).toContain('Kind regards,
your Gradido team') - expect(result.originalMessage.html).toContain('—————') - expect(result.originalMessage.html).toContain( - '
Gradido-Akademie
Institut für Wirtschaftsbionik
Pfarrweg 2
74653 Künzelsau
Deutschland
support@supportmail.com
http://localhost/', - ) }) }) }) @@ -327,8 +259,10 @@ describe('sendEmailVariants', () => { }, }) }) + }) - it('has expected result', () => { + describe('result', () => { + it('is the expected object', () => { expect(result).toMatchObject({ envelope: { from: 'info@gradido.net', @@ -337,37 +271,17 @@ describe('sendEmailVariants', () => { message: expect.any(String), originalMessage: expect.objectContaining({ to: 'Peter Lustig
your Gradido team') - expect(result.originalMessage.html).toContain('—————') - expect(result.originalMessage.html).toContain( - '
Gradido-Akademie
Institut für Wirtschaftsbionik
Pfarrweg 2
74653 Künzelsau
Deutschland
support@supportmail.com
http://localhost/', - ) + }) + + it('has the correct html as snapshot', () => { + expect(result.originalMessage.html).toMatchSnapshot() }) }) }) @@ -405,7 +319,9 @@ describe('sendEmailVariants', () => { }, }) }) + }) + describe('result', () => { it('has expected result', () => { expect(result).toMatchObject({ envelope: { @@ -415,37 +331,17 @@ describe('sendEmailVariants', () => { message: expect.any(String), originalMessage: expect.objectContaining({ to: 'Peter Lustig
your Gradido team') - expect(result.originalMessage.html).toContain('—————') - expect(result.originalMessage.html).toContain( - '
Gradido-Akademie
Institut für Wirtschaftsbionik
Pfarrweg 2
74653 Künzelsau
Deutschland
support@supportmail.com
http://localhost/', - ) + }) + + it('has the correct html as snapshot', () => { + expect(result.originalMessage.html).toMatchSnapshot() }) }) }) @@ -483,8 +379,10 @@ describe('sendEmailVariants', () => { }, }) }) + }) - it('has expected result', () => { + describe('result', () => { + it('is the expected object', () => { expect(result).toMatchObject({ envelope: { from: 'info@gradido.net', @@ -493,37 +391,17 @@ describe('sendEmailVariants', () => { message: expect.any(String), originalMessage: expect.objectContaining({ to: 'Peter Lustig
your Gradido team') - expect(result.originalMessage.html).toContain('—————') - expect(result.originalMessage.html).toContain( - '
Gradido-Akademie
Institut für Wirtschaftsbionik
Pfarrweg 2
74653 Künzelsau
Deutschland
support@supportmail.com
http://localhost/', - ) + }) + + it('has the correct html as snapshot', () => { + expect(result.originalMessage.html).toMatchSnapshot() }) }) }) @@ -559,8 +437,10 @@ describe('sendEmailVariants', () => { }, }) }) + }) - it('has expected result', () => { + describe('result', () => { + it('is the expected object', () => { expect(result).toMatchObject({ envelope: { from: 'info@gradido.net', @@ -569,39 +449,17 @@ describe('sendEmailVariants', () => { message: expect.any(String), originalMessage: expect.objectContaining({ to: 'Peter Lustig
your Gradido team') - expect(result.originalMessage.html).toContain('—————') - expect(result.originalMessage.html).toContain( - '
Gradido-Akademie
Institut für Wirtschaftsbionik
Pfarrweg 2
74653 Künzelsau
Deutschland
support@supportmail.com
http://localhost/', - ) + }) + + it('has the correct html as snapshot', () => { + expect(result.originalMessage.html).toMatchSnapshot() }) }) }) @@ -643,8 +501,10 @@ describe('sendEmailVariants', () => { }, }) }) + }) - it('has expected result', () => { + describe('result', () => { + it('is the expected object', () => { expect(result).toMatchObject({ envelope: { from: 'info@gradido.net', @@ -653,36 +513,17 @@ describe('sendEmailVariants', () => { message: expect.any(String), originalMessage: expect.objectContaining({ to: 'Peter Lustig
your Gradido team') - expect(result.originalMessage.html).toContain('—————') - expect(result.originalMessage.html).toContain( - '
Gradido-Akademie
Institut für Wirtschaftsbionik
Pfarrweg 2
74653 Künzelsau
Deutschland
support@supportmail.com
http://localhost/', - ) + }) + + it('has the correct html as snapshot', () => { + expect(result.originalMessage.html).toMatchSnapshot() }) }) }) @@ -722,8 +563,10 @@ describe('sendEmailVariants', () => { }, }) }) + }) - it('has expected result', () => { + describe('result', () => { + it('is the expected object', () => { expect(result).toMatchObject({ envelope: { from: 'info@gradido.net', @@ -732,34 +575,17 @@ describe('sendEmailVariants', () => { message: expect.any(String), originalMessage: expect.objectContaining({ to: 'Peter Lustig
your Gradido team') - expect(result.originalMessage.html).toContain('—————') - expect(result.originalMessage.html).toContain( - '
Gradido-Akademie
Institut für Wirtschaftsbionik
Pfarrweg 2
74653 Künzelsau
Deutschland
support@supportmail.com
http://localhost/', - ) + }) + + it('has the correct html as snapshot', () => { + expect(result.originalMessage.html).toMatchSnapshot() }) }) }) diff --git a/backend/src/emails/templates/accountActivation/html.pug b/backend/src/emails/templates/accountActivation/html.pug index 6075fa8a8..027dcbc63 100644 --- a/backend/src/emails/templates/accountActivation/html.pug +++ b/backend/src/emails/templates/accountActivation/html.pug @@ -1,20 +1,16 @@ -doctype html -html(lang=locale) - head - title= t('emails.accountActivation.subject') - body - h1(style='margin-bottom: 24px;')= t('emails.accountActivation.subject') - #container.col - include ../hello.pug - p= t('emails.accountActivation.emailRegistered') - p - = t('emails.accountActivation.pleaseClickLink') - br - a(href=activationLink) #{activationLink} - br - = t('emails.general.orCopyLink') - p - = t('emails.accountActivation.duration', { hours: timeDurationObject.hours, minutes: timeDurationObject.minutes }) - br - a(href=resendLink) #{resendLink} - include ../greatingFormularImprint.pug +extend ../layout.pug + +block content + h2= t('emails.accountActivation.title') + .text-block + include ../includes/salutation.pug + p= t('emails.accountActivation.emailRegistered') + .content + h2= t('emails.general.completeRegistration') + div(class="p_content")= t('emails.accountActivation.pleaseClickLink') + a.button-3(href=activationLink) #{t('emails.accountActivation.activateAccount')} + div(class="p_content")= t('emails.general.orCopyLink') + + a.clink(href=activationLink) #{activationLink} + + include ../includes/requestNewLink.pug diff --git a/backend/src/emails/templates/accountMultiRegistration/html.pug b/backend/src/emails/templates/accountMultiRegistration/html.pug index f8570422c..4d568261b 100644 --- a/backend/src/emails/templates/accountMultiRegistration/html.pug +++ b/backend/src/emails/templates/accountMultiRegistration/html.pug @@ -1,23 +1,22 @@ -doctype html -html(lang=locale) - head - title= t('emails.accountMultiRegistration.subject') - body - h1(style='margin-bottom: 24px;')= t('emails.accountMultiRegistration.subject') - #container.col - include ../hello.pug - p - = t('emails.accountMultiRegistration.emailReused') - br - = t('emails.accountMultiRegistration.emailExists') - p - = t('emails.accountMultiRegistration.onForgottenPasswordClickLink') - br - a(href=resendLink) #{resendLink} - br - = t('emails.accountMultiRegistration.onForgottenPasswordCopyLink') - p - = t('emails.accountMultiRegistration.ifYouAreNotTheOne') - br - a(href='mailto:' + supportEmail)= supportEmail - include ../greatingFormularImprint.pug +extend ../layout.pug + +block content + h2= t('emails.accountMultiRegistration.title') + .text-block + include ../includes/salutation.pug + p + = t('emails.accountMultiRegistration.emailReused') + br + = t('emails.accountMultiRegistration.emailExists') + .content + h2= t('emails.resetPassword.title') + div(class="p_content")= t('emails.accountMultiRegistration.onForgottenPasswordClickLink') + a.button-3(href=resendLink) #{t('emails.general.reset')} + div(class="p_content")= t('emails.general.orCopyLink') + + a.clink(href=resendLink) #{resendLink} + + h2(style="color: red")= t('emails.accountMultiRegistration.contactSupport') + div(class="p_content")= t('emails.accountMultiRegistration.ifYouAreNotTheOne') + + a.clink(href='mailto:' + supportEmail)= supportEmail diff --git a/backend/src/emails/templates/addedContributionMessage/html.pug b/backend/src/emails/templates/addedContributionMessage/html.pug index e7410c0f0..b09d2c0f0 100644 --- a/backend/src/emails/templates/addedContributionMessage/html.pug +++ b/backend/src/emails/templates/addedContributionMessage/html.pug @@ -1,16 +1,14 @@ -doctype html -html(lang=locale) - head - title= t('emails.addedContributionMessage.subject') - body - h1(style='margin-bottom: 24px;')= t('emails.addedContributionMessage.subject') - #container.col - include ../hello.pug - p= t('emails.addedContributionMessage.commonGoodContributionMessage', { senderFirstName, senderLastName, contributionMemo }) - p= t('emails.addedContributionMessage.toSeeAndAnswerMessage') - p - = t('emails.general.linkToYourAccount') - = " " - a(href=overviewURL) #{overviewURL} - p= t('emails.general.pleaseDoNotReply') - include ../greatingFormularImprint.pug +extend ../layout.pug + +block content + h2= t('emails.addedContributionMessage.title') + .text-block + include ../includes/salutation.pug + p= t('emails.addedContributionMessage.commonGoodContributionMessage', { senderFirstName, senderLastName, contributionMemo }) + .content + h2= t('emails.addedContributionMessage.readMessage') + div(class="p_content")= t('emails.addedContributionMessage.toSeeAndAnswerMessage') + + a.button-3(href="https://gdd.gradido.net/community/contribution") #{t('emails.general.toAccount')} + + include ../includes/doNotReply.pug diff --git a/backend/src/emails/templates/contributionConfirmed/html.pug b/backend/src/emails/templates/contributionConfirmed/html.pug index 4ff17ffd4..310993d97 100644 --- a/backend/src/emails/templates/contributionConfirmed/html.pug +++ b/backend/src/emails/templates/contributionConfirmed/html.pug @@ -1,16 +1,10 @@ -doctype html -html(lang=locale) - head - title= t('emails.contributionConfirmed.subject') - body - h1(style='margin-bottom: 24px;')= t('emails.contributionConfirmed.subject') - #container.col - include ../hello.pug - p= t('emails.contributionConfirmed.commonGoodContributionConfirmed', { senderFirstName, senderLastName, contributionMemo }) - p= t('emails.general.amountGDD', { amountGDD: contributionAmount }) - p - = t('emails.general.linkToYourAccount') - = " " - a(href=overviewURL) #{overviewURL} - p= t('emails.general.pleaseDoNotReply') - include ../greatingFormularImprint.pug +extend ../layout.pug + +block content + h2= t('emails.contributionConfirmed.title') + .text-block + include ../includes/salutation.pug + p= t('emails.contributionConfirmed.commonGoodContributionConfirmed', { contributionMemo, senderFirstName, senderLastName, amountGDD: contributionAmount }) + .content + include ../includes/contributionDetailsCTA.pug + include ../includes/doNotReply.pug \ No newline at end of file diff --git a/backend/src/emails/templates/contributionDeleted/html.pug b/backend/src/emails/templates/contributionDeleted/html.pug index d6b3ea207..daf54227d 100644 --- a/backend/src/emails/templates/contributionDeleted/html.pug +++ b/backend/src/emails/templates/contributionDeleted/html.pug @@ -1,16 +1,10 @@ -doctype html -html(lang=locale) - head - title= t('emails.contributionDeleted.subject') - body - h1(style='margin-bottom: 24px;')= t('emails.contributionDeleted.subject') - #container.col - include ../hello.pug - p= t('emails.contributionDeleted.commonGoodContributionDeleted', { senderFirstName, senderLastName, contributionMemo }) - p= t('emails.contributionDeleted.toSeeContributionsAndMessages') - p - = t('emails.general.linkToYourAccount') - = " " - a(href=overviewURL) #{overviewURL} - p= t('emails.general.pleaseDoNotReply') - include ../greatingFormularImprint.pug +extend ../layout.pug + +block content + h2= t('emails.contributionDeleted.title') + .text-block + include ../includes/salutation.pug + p= t('emails.contributionDeleted.commonGoodContributionDeleted', { contributionMemo, senderFirstName, senderLastName }) + .content + include ../includes/contributionDetailsCTA.pug + include ../includes/doNotReply.pug diff --git a/backend/src/emails/templates/contributionDenied/html.pug b/backend/src/emails/templates/contributionDenied/html.pug index a324374a7..d30653acd 100644 --- a/backend/src/emails/templates/contributionDenied/html.pug +++ b/backend/src/emails/templates/contributionDenied/html.pug @@ -1,16 +1,10 @@ -doctype html -html(lang=locale) - head - title= t('emails.contributionDenied.subject') - body - h1(style='margin-bottom: 24px;')= t('emails.contributionDenied.subject') - #container.col - include ../hello.pug - p= t('emails.contributionDenied.commonGoodContributionDenied', { senderFirstName, senderLastName, contributionMemo }) - p= t('emails.contributionDenied.toSeeContributionsAndMessages') - p - = t('emails.general.linkToYourAccount') - = " " - a(href=overviewURL) #{overviewURL} - p= t('emails.general.pleaseDoNotReply') - include ../greatingFormularImprint.pug +extend ../layout.pug + +block content + h2= t('emails.contributionDenied.title') + .text-block + include ../includes/salutation.pug + p= t('emails.contributionDenied.commonGoodContributionDenied', { contributionMemo, senderFirstName, senderLastName }) + .content + include ../includes/contributionDetailsCTA.pug + include ../includes/doNotReply.pug diff --git a/backend/src/emails/templates/greatingFormularImprint.pug b/backend/src/emails/templates/greatingFormularImprint.pug deleted file mode 100644 index d7d8c3a14..000000000 --- a/backend/src/emails/templates/greatingFormularImprint.pug +++ /dev/null @@ -1,16 +0,0 @@ -p(style='margin-top: 24px;') - = t('emails.general.sincerelyYours') - br - = t('emails.general.yourGradidoTeam') -p(style='margin-top: 24px;')= '—————' -p(style='margin-top: 24px;') - if t('general.imprintImageURL').length > 0 - div(style='position: relative; left: -22px;') - img(src=t('general.imprintImageURL'), width='200', alt=t('general.imprintImageAlt')) - br - each line in t('general.imprint').split(/\n/) - = line - br - a(href='mailto:' + supportEmail)= supportEmail - br - a(href=communityURL)= communityURL diff --git a/backend/src/emails/templates/includes/contributionDetailsCTA.pug b/backend/src/emails/templates/includes/contributionDetailsCTA.pug new file mode 100644 index 000000000..c2209014f --- /dev/null +++ b/backend/src/emails/templates/includes/contributionDetailsCTA.pug @@ -0,0 +1,7 @@ +//- +h2= t('emails.general.contributionDetails') +div(class="p_content")= t('emails.contribution.toSeeContributionsAndMessages') +a.button-3(href="https://gdd.gradido.net/community/contributions") #{t('emails.general.toAccount')} +div(class="p_content")= t('emails.general.orCopyLink') + +a.clink(href="https://gdd.gradido.net/community/contributions") https://gdd.gradido.net/community/contributions \ No newline at end of file diff --git a/backend/src/emails/templates/includes/doNotReply.pug b/backend/src/emails/templates/includes/doNotReply.pug new file mode 100644 index 000000000..506a5d0db --- /dev/null +++ b/backend/src/emails/templates/includes/doNotReply.pug @@ -0,0 +1 @@ +div(class="p_content")= t('emails.general.pleaseDoNotReply') \ No newline at end of file diff --git a/backend/src/emails/templates/includes/email.css b/backend/src/emails/templates/includes/email.css new file mode 100644 index 000000000..5110c3882 --- /dev/null +++ b/backend/src/emails/templates/includes/email.css @@ -0,0 +1,216 @@ +/* vietnamese */ +/* @font-face { + font-family: 'Work Sans'; + font-style: normal; + font-weight: 100; + src: url(https://fonts.gstatic.com/s/worksans/v18/QGYsz_wNahGAdqQ43Rh_c6Dpp_k.woff2) format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB; +} */ +/* latin-ext */ +@font-face { + font-family: 'Work Sans'; + font-style: normal; + font-weight: 100; + src: url(https://fonts.gstatic.com/s/worksans/v18/QGYsz_wNahGAdqQ43Rh_cqDpp_k.woff2) format('woff2'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Work Sans'; + font-style: normal; + font-weight: 100; + src: url(https://fonts.gstatic.com/s/worksans/v18/QGYsz_wNahGAdqQ43Rh_fKDp.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* vietnamese */ +/* @font-face { + font-family: 'Work Sans'; + font-style: normal; + font-weight: 200; + src: url(https://fonts.gstatic.com/s/worksans/v18/QGYsz_wNahGAdqQ43Rh_c6Dpp_k.woff2) format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB; +} */ +/* latin-ext */ +@font-face { + font-family: 'Work Sans'; + font-style: normal; + font-weight: 200; + src: url(https://fonts.gstatic.com/s/worksans/v18/QGYsz_wNahGAdqQ43Rh_cqDpp_k.woff2) format('woff2'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Work Sans'; + font-style: normal; + font-weight: 200; + src: url(https://fonts.gstatic.com/s/worksans/v18/QGYsz_wNahGAdqQ43Rh_fKDp.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* vietnamese */ +/* @font-face { + font-family: 'Work Sans'; + font-style: normal; + font-weight: 300; + src: url(https://fonts.gstatic.com/s/worksans/v18/QGYsz_wNahGAdqQ43Rh_c6Dpp_k.woff2) format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB; +} */ +/* latin-ext */ +@font-face { + font-family: 'Work Sans'; + font-style: normal; + font-weight: 300; + src: url(https://fonts.gstatic.com/s/worksans/v18/QGYsz_wNahGAdqQ43Rh_cqDpp_k.woff2) format('woff2'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Work Sans'; + font-style: normal; + font-weight: 300; + src: url(https://fonts.gstatic.com/s/worksans/v18/QGYsz_wNahGAdqQ43Rh_fKDp.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* vietnamese */ +/* @font-face { + font-family: 'Work Sans'; + font-style: normal; + font-weight: 400; + src: url(https://fonts.gstatic.com/s/worksans/v18/QGYsz_wNahGAdqQ43Rh_c6Dpp_k.woff2) format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB; +} */ +/* latin-ext */ +@font-face { + font-family: 'Work Sans'; + font-style: normal; + font-weight: 400; + src: url(https://fonts.gstatic.com/s/worksans/v18/QGYsz_wNahGAdqQ43Rh_cqDpp_k.woff2) format('woff2'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Work Sans'; + font-style: normal; + font-weight: 400; + src: url(https://fonts.gstatic.com/s/worksans/v18/QGYsz_wNahGAdqQ43Rh_fKDp.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* vietnamese */ +/* @font-face { + font-family: 'Work Sans'; + font-style: normal; + font-weight: 500; + src: url(https://fonts.gstatic.com/s/worksans/v18/QGYsz_wNahGAdqQ43Rh_c6Dpp_k.woff2) format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB; +} */ +/* latin-ext */ +@font-face { + font-family: 'Work Sans'; + font-style: normal; + font-weight: 500; + src: url(https://fonts.gstatic.com/s/worksans/v18/QGYsz_wNahGAdqQ43Rh_cqDpp_k.woff2) format('woff2'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Work Sans'; + font-style: normal; + font-weight: 500; + src: url(https://fonts.gstatic.com/s/worksans/v18/QGYsz_wNahGAdqQ43Rh_fKDp.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* vietnamese */ +/* @font-face { + font-family: 'Work Sans'; + font-style: normal; + font-weight: 600; + src: url(https://fonts.gstatic.com/s/worksans/v18/QGYsz_wNahGAdqQ43Rh_c6Dpp_k.woff2) format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB; +} */ +/* latin-ext */ +@font-face { + font-family: 'Work Sans'; + font-style: normal; + font-weight: 600; + src: url(https://fonts.gstatic.com/s/worksans/v18/QGYsz_wNahGAdqQ43Rh_cqDpp_k.woff2) format('woff2'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Work Sans'; + font-style: normal; + font-weight: 600; + src: url(https://fonts.gstatic.com/s/worksans/v18/QGYsz_wNahGAdqQ43Rh_fKDp.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* vietnamese */ +/* @font-face { + font-family: 'Work Sans'; + font-style: normal; + font-weight: 700; + src: url(https://fonts.gstatic.com/s/worksans/v18/QGYsz_wNahGAdqQ43Rh_c6Dpp_k.woff2) format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB; +} */ +/* latin-ext */ +@font-face { + font-family: 'Work Sans'; + font-style: normal; + font-weight: 700; + src: url(https://fonts.gstatic.com/s/worksans/v18/QGYsz_wNahGAdqQ43Rh_cqDpp_k.woff2) format('woff2'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Work Sans'; + font-style: normal; + font-weight: 700; + src: url(https://fonts.gstatic.com/s/worksans/v18/QGYsz_wNahGAdqQ43Rh_fKDp.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* vietnamese */ +/* @font-face { + font-family: 'Work Sans'; + font-style: normal; + font-weight: 800; + src: url(https://fonts.gstatic.com/s/worksans/v18/QGYsz_wNahGAdqQ43Rh_c6Dpp_k.woff2) format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB; +} */ +/* latin-ext */ +@font-face { + font-family: 'Work Sans'; + font-style: normal; + font-weight: 800; + src: url(https://fonts.gstatic.com/s/worksans/v18/QGYsz_wNahGAdqQ43Rh_cqDpp_k.woff2) format('woff2'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Work Sans'; + font-style: normal; + font-weight: 800; + src: url(https://fonts.gstatic.com/s/worksans/v18/QGYsz_wNahGAdqQ43Rh_fKDp.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* vietnamese */ +/* @font-face { + font-family: 'Work Sans'; + font-style: normal; + font-weight: 900; + src: url(https://fonts.gstatic.com/s/worksans/v18/QGYsz_wNahGAdqQ43Rh_c6Dpp_k.woff2) format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB; +} */ +/* latin-ext */ +@font-face { + font-family: 'Work Sans'; + font-style: normal; + font-weight: 900; + src: url(https://fonts.gstatic.com/s/worksans/v18/QGYsz_wNahGAdqQ43Rh_cqDpp_k.woff2) format('woff2'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Work Sans'; + font-style: normal; + font-weight: 900; + src: url(https://fonts.gstatic.com/s/worksans/v18/QGYsz_wNahGAdqQ43Rh_fKDp.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} diff --git a/backend/src/emails/templates/includes/facebook-icon.png b/backend/src/emails/templates/includes/facebook-icon.png new file mode 100644 index 000000000..1d880cf3e Binary files /dev/null and b/backend/src/emails/templates/includes/facebook-icon.png differ diff --git a/backend/src/emails/templates/includes/footer.pug b/backend/src/emails/templates/includes/footer.pug new file mode 100644 index 000000000..3ae63e32e --- /dev/null +++ b/backend/src/emails/templates/includes/footer.pug @@ -0,0 +1,73 @@ +footer + .w-container(class="footer_01") + .socialmedia + a.slink( + target="_blank" + href="https://www.facebook.com/groups/Gradido/" + ) + img.bi-facebook( + alt="facebook" + loading="lazy" + src="cid:facebookicon" + ) + a.slink( + target="_blank" + href="https://t.me/GradidoGruppe" + ) + img.bi-telegram( + alt="Telegram" + loading="lazy" + src="cid:telegramicon" + ) + a.slink( + target="_blank" + href="https://twitter.com/gradido" + ) + img.bi-twitter( + alt="Twitter" + loading="lazy" + src="cid:twittericon" + ) + a.slink( + target="_blank" + href="https://www.youtube.com/c/GradidoNet" + ) + img.bi-youtube( + alt="youtube" + loading="lazy" + src="cid:youtubeicon" + ) + .line + .footer + div(class="footer_p1")= t("emails.footer.contactOurSupport") + div(class="footer_p2")= t("emails.footer.supportEmail") + img.image( + alt="Gradido Logo" + src="https://gdd.gradido.net/img/brand/green.png" + ) + div + a( + class="terms_of_use" + href="https://gradido.net/de/impressum/" + target="_blank" + )= t("emails.footer.imprint") + br + a( + class="terms_of_use" + href="https://gradido.net/de/datenschutz/" + target="_blank" + )= t("emails.footer.privacyPolicy") + div(class="footer_p1") + | Gradido-Akademie + br + | Institut für Wirtschaftsbionik + br + | Pfarrweg 2 + br + | 74653 Künzelsau + br + | Deutschland + br + br + br + diff --git a/backend/src/emails/templates/includes/gradido-header.jpeg b/backend/src/emails/templates/includes/gradido-header.jpeg new file mode 100644 index 000000000..38a5c3a80 Binary files /dev/null and b/backend/src/emails/templates/includes/gradido-header.jpeg differ diff --git a/backend/src/emails/templates/includes/greeting.pug b/backend/src/emails/templates/includes/greeting.pug new file mode 100644 index 000000000..6693e23ca --- /dev/null +++ b/backend/src/emails/templates/includes/greeting.pug @@ -0,0 +1,6 @@ +//- This sets the greeting at the end of every e-mail +.text-block + p + = t('emails.general.sincerelyYours') + br + = t('emails.general.yourGradidoTeam') \ No newline at end of file diff --git a/backend/src/emails/templates/includes/header.pug b/backend/src/emails/templates/includes/header.pug new file mode 100644 index 000000000..3160d3e2b --- /dev/null +++ b/backend/src/emails/templates/includes/header.pug @@ -0,0 +1,13 @@ +header + .head + //- TODO + //- when https://gdd.gradido.net/img/gradido-email-header.jpg is on production, + //- replace this URL by https://gdd.gradido.net/img/brand/gradido-email-header.png + img.head-logo( + alt="Gradido Logo" + loading="lazy" + src="cid:gradidoheader" + ) + + + diff --git a/backend/src/emails/templates/includes/requestNewLink.pug b/backend/src/emails/templates/includes/requestNewLink.pug new file mode 100644 index 000000000..8baa3d6df --- /dev/null +++ b/backend/src/emails/templates/includes/requestNewLink.pug @@ -0,0 +1,10 @@ +//- +requestNewLink + h2= t('emails.general.requestNewLink') + + if timeDurationObject.minutes == 0 + div(class="p_content")= t('emails.general.linkValidity', { hours: timeDurationObject.hours }) + else + div(class="p_content")= t('emails.general.linkValidityWithMinutes', { hours: timeDurationObject.hours, minutes: timeDurationObject.minutes }) + + a.button-4(href=resendLink) #{t('emails.general.newLink')} \ No newline at end of file diff --git a/backend/src/emails/templates/hello.pug b/backend/src/emails/templates/includes/salutation.pug similarity index 100% rename from backend/src/emails/templates/hello.pug rename to backend/src/emails/templates/includes/salutation.pug diff --git a/backend/src/emails/templates/includes/telegram-icon.png b/backend/src/emails/templates/includes/telegram-icon.png new file mode 100644 index 000000000..4c36ff661 Binary files /dev/null and b/backend/src/emails/templates/includes/telegram-icon.png differ diff --git a/backend/src/emails/templates/includes/twitter-icon.png b/backend/src/emails/templates/includes/twitter-icon.png new file mode 100644 index 000000000..fffb9b599 Binary files /dev/null and b/backend/src/emails/templates/includes/twitter-icon.png differ diff --git a/backend/src/emails/templates/includes/webflow.css b/backend/src/emails/templates/includes/webflow.css new file mode 100644 index 000000000..02e7fc4e0 --- /dev/null +++ b/backend/src/emails/templates/includes/webflow.css @@ -0,0 +1,136 @@ +body{ + display: block; + font-family: "Work Sans", sans-serif; + font-size: 17px; + text-align: center; + text-align: -webkit-center; + justify-content: center; + padding: 0px; + margin: 0px; +} + +h2 { + margin-top: 15px; + color: #383838; +} + +.container { + max-width: 680px; + margin: 0 auto; + display: block; +} + +.head-logo { + width: 100%; + height: auto; +} + +.text-block { + margin-top: 20px; + color: #9ca0a8; +} + +.content { + display: block; + width: 78%; + margin: 40px 1% 40px 1%; + padding: 20px 10% 40px 10%; + border-radius: 24px; + background-image: linear-gradient(180deg, #f5f5f5, #f5f5f5); +} + +.p_content{ + margin: 15px 0 15px 0; + line-height: 26px; + color: #9ca0a8; +} + +.clink { + line-break: anywhere; + margin-bottom: 40px; +} + +.button-3, +.button-4 { + display: inline-block; + padding: 9px 15px; + color: white; + border: 0; + line-height: inherit; + text-decoration: none; + cursor: pointer; + border-radius: 20px; + background-image: radial-gradient(circle farthest-corner at 0% 0%, #f9cd69, #c58d38); + box-shadow: 16px 13px 35px 0 rgba(56, 56, 56, 0.3); + margin: 25px 0 25px 0; + width: 50%; +} + +.button-4 { + background-image: radial-gradient(circle farthest-corner at 0% 0%, #616161, #c2c2c2); +} + +.socialmedia { + display: flex; + margin-top: 40px; + max-width: 600px; + +} +.slink{ + width: 150px; +} + +.footer { + padding-bottom: 20px; +} + +.footer_p1 { + margin-top: 30px; + color: #9ca0a8; + margin-bottom: 30px; +} + +.footer_p2 { + color: #383838; + font-weight: bold; +} + + +.image { + width: 200px; + margin-top: 30px; + margin-bottom: 30px; +} + +.div-block { + display: table; + margin-top: 20px; + margin-bottom: 40px; + flex-direction: row; + justify-content: center; + align-items: center; +} + +.terms_of_use { + color: #9ca0a8; +} + +.text-block-3 { + color: #9ca0a8; + margin-bottom: 30px; +} + +.line_image, +.line { + width: 100%; + height: 13px; + margin-top: 40px; +} + +.line_image { + background-image: linear-gradient(90deg, #c58d38, #c58d38 0%, #f3cd7c 35%, #dbb056 54%, #eec05f 63%, #cc9d3d); +} + +.line { + background-image: linear-gradient(90deg, #c58d38, #f3cd7c 40%, #dbb056 55%, #eec05f 71%, #cc9d3d); +} diff --git a/backend/src/emails/templates/includes/youtube-icon.png b/backend/src/emails/templates/includes/youtube-icon.png new file mode 100644 index 000000000..d135ba625 Binary files /dev/null and b/backend/src/emails/templates/includes/youtube-icon.png differ diff --git a/backend/src/emails/templates/layout.pug b/backend/src/emails/templates/layout.pug new file mode 100644 index 000000000..0995b2647 --- /dev/null +++ b/backend/src/emails/templates/layout.pug @@ -0,0 +1,26 @@ +doctype html +html(lang=locale) + head + meta( + content="multipart/html; charset=UTF-8" + http-equiv="content-type" + ) + meta( + name="viewport" + content="width=device-width, initial-scale=1" + ) + style. + .wf-force-outline-none[tabindex="-1"]:focus{outline:none;} + style + include includes/email.css + include includes/webflow.css + + body + div.container + include includes/header.pug + + .wrapper + block content + include includes/greeting.pug + + include includes/footer.pug diff --git a/backend/src/emails/templates/resetPassword/html.pug b/backend/src/emails/templates/resetPassword/html.pug index 53ffbcd04..4d4ed3f50 100644 --- a/backend/src/emails/templates/resetPassword/html.pug +++ b/backend/src/emails/templates/resetPassword/html.pug @@ -1,20 +1,16 @@ -doctype html -html(lang=locale) - head - title= t('emails.resetPassword.subject') - body - h1(style='margin-bottom: 24px;')= t('emails.resetPassword.subject') - #container.col - include ../hello.pug - p= t('emails.resetPassword.youOrSomeoneResetPassword') - p - = t('emails.resetPassword.pleaseClickLink') - br - a(href=resetLink) #{resetLink} - br - = t('emails.general.orCopyLink') - p - = t('emails.resetPassword.duration', { hours: timeDurationObject.hours, minutes: timeDurationObject.minutes }) - br - a(href=resendLink) #{resendLink} - include ../greatingFormularImprint.pug +extends ../layout.pug + +block content + h2= t('emails.resetPassword.title') + .text-block + include ../includes/salutation.pug + p= t('emails.resetPassword.youOrSomeoneResetPassword') + .content + h2= t('emails.resetPassword.title') + div(class="p_content")= t('emails.resetPassword.pleaseClickLink') + a.button-3(href=resetLink) #{t('emails.general.reset')} + div(class="p_content")= t('emails.general.orCopyLink') + + a.clink(href=resetLink) #{resetLink} + + include ../includes/requestNewLink.pug diff --git a/backend/src/emails/templates/transactionLinkRedeemed/html.pug b/backend/src/emails/templates/transactionLinkRedeemed/html.pug index 30146e27f..598a18337 100644 --- a/backend/src/emails/templates/transactionLinkRedeemed/html.pug +++ b/backend/src/emails/templates/transactionLinkRedeemed/html.pug @@ -1,19 +1,18 @@ -doctype html -html(lang=locale) - head - title= t('emails.transactionLinkRedeemed.subject', { senderFirstName, senderLastName }) - body - h1(style='margin-bottom: 24px;')= t('emails.transactionLinkRedeemed.subject', { senderFirstName, senderLastName }) - #container.col - include ../hello.pug - p= t('emails.transactionLinkRedeemed.hasRedeemedYourLink', { senderFirstName, senderLastName, senderEmail }) - p - = t('emails.general.amountGDD', { amountGDD: transactionAmount }) - br - = t('emails.transactionLinkRedeemed.memo', { transactionMemo }) - p - = t('emails.general.detailsYouFindOnLinkToYourAccount') - = " " - a(href=overviewURL) #{overviewURL} - p= t('emails.general.pleaseDoNotReply') - include ../greatingFormularImprint.pug +extend ../layout.pug + +block content + h2= t('emails.transactionLinkRedeemed.title', { senderFirstName, senderLastName }) + .text-block + include ../includes/salutation.pug + p= t('emails.transactionLinkRedeemed.hasRedeemedYourLink', { senderFirstName, senderLastName, senderEmail }) + .content + h2= t('emails.general.transactionDetails') + div(class="p_content")= t('emails.general.amountGDD', { amountGDD: transactionAmount }) + br + = t('emails.transactionLinkRedeemed.memo', { transactionMemo }) + br + = t('emails.general.detailsYouFindOnLinkToYourAccount') + + a.button-3(href="https://gdd.gradido.net/transactions") #{t('emails.general.toAccount')} + + include ../includes/doNotReply.pug diff --git a/backend/src/emails/templates/transactionReceived/html.pug b/backend/src/emails/templates/transactionReceived/html.pug index e6807f539..abf468dd0 100644 --- a/backend/src/emails/templates/transactionReceived/html.pug +++ b/backend/src/emails/templates/transactionReceived/html.pug @@ -1,15 +1,15 @@ -doctype html -html(lang=locale) - head - title= t('emails.transactionReceived.subject', { senderFirstName, senderLastName, transactionAmount }) - body - h1(style='margin-bottom: 24px;')= t('emails.transactionReceived.subject', { senderFirstName, senderLastName, transactionAmount }) - #container.col - include ../hello.pug - p= t('emails.transactionReceived.haveReceivedAmountGDDFrom', { transactionAmount, senderFirstName, senderLastName, senderEmail }) - p - = t('emails.general.detailsYouFindOnLinkToYourAccount') - = " " - a(href=overviewURL) #{overviewURL} - p= t('emails.general.pleaseDoNotReply') - include ../greatingFormularImprint.pug +extend ../layout.pug + +block content + h2= t('emails.transactionReceived.title', { senderFirstName, senderLastName, transactionAmount }) + .text-block + include ../includes/salutation.pug + p= t('emails.transactionReceived.haveReceivedAmountGDDFrom', { transactionAmount, senderFirstName, senderLastName, senderEmail }) + .content + h2= t('emails.general.transactionDetails') + div(class="p_content")= t('emails.general.detailsYouFindOnLinkToYourAccount') + + a.button-3(href="https://gdd.gradido.net/transactions") #{t('emails.general.toAccount')} + + include ../includes/doNotReply.pug + diff --git a/backend/src/graphql/arg/SearchUsersArgs.ts b/backend/src/graphql/arg/SearchUsersArgs.ts deleted file mode 100644 index 0ebc442c3..000000000 --- a/backend/src/graphql/arg/SearchUsersArgs.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { ArgsType, Field, Int } from 'type-graphql' - -import { SearchUsersFilters } from '@arg/SearchUsersFilters' - -@ArgsType() -export class SearchUsersArgs { - @Field(() => String) - searchText: string - - @Field(() => Int, { nullable: true }) - // eslint-disable-next-line type-graphql/invalid-nullable-input-type - currentPage?: number - - @Field(() => Int, { nullable: true }) - // eslint-disable-next-line type-graphql/invalid-nullable-input-type - pageSize?: number - - // eslint-disable-next-line type-graphql/wrong-decorator-signature - @Field(() => SearchUsersFilters, { nullable: true, defaultValue: null }) - filters?: SearchUsersFilters | null -} diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts index b5db21b16..6f36a9f64 100644 --- a/backend/src/graphql/model/Contribution.ts +++ b/backend/src/graphql/model/Contribution.ts @@ -15,7 +15,7 @@ export class Contribution { this.confirmedAt = contribution.confirmedAt this.confirmedBy = contribution.confirmedBy this.contributionDate = contribution.contributionDate - this.state = contribution.contributionStatus + this.status = contribution.contributionStatus this.messagesCount = contribution.messages ? contribution.messages.length : 0 this.deniedAt = contribution.deniedAt this.deniedBy = contribution.deniedBy @@ -68,7 +68,7 @@ export class Contribution { messagesCount: number @Field(() => String) - state: string + status: string @Field(() => Int, { nullable: true }) moderatorId: number | null diff --git a/backend/src/graphql/model/GdtEntryList.ts b/backend/src/graphql/model/GdtEntryList.ts index 06f77f532..7c08520c8 100644 --- a/backend/src/graphql/model/GdtEntryList.ts +++ b/backend/src/graphql/model/GdtEntryList.ts @@ -10,7 +10,7 @@ import { GdtEntry } from './GdtEntry' @ObjectType() export class GdtEntryList { constructor(json: any) { - this.state = json.state + this.status = json.state this.count = json.count this.gdtEntries = json.gdtEntries ? json.gdtEntries.map((json: any) => new GdtEntry(json)) : [] this.gdtSum = json.gdtSum @@ -18,7 +18,7 @@ export class GdtEntryList { } @Field(() => String) - state: string + status: string @Field(() => Int) count: number diff --git a/backend/src/graphql/model/KlickTipp.ts b/backend/src/graphql/model/KlickTipp.ts index 059c7874d..356ed391f 100644 --- a/backend/src/graphql/model/KlickTipp.ts +++ b/backend/src/graphql/model/KlickTipp.ts @@ -1,12 +1,9 @@ -/* eslint-disable @typescript-eslint/no-explicit-any */ -/* eslint-disable @typescript-eslint/no-unsafe-member-access */ -/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ import { ObjectType, Field } from 'type-graphql' @ObjectType() export class KlickTipp { - constructor(json: any) { - this.newsletterState = json.status === 'Subscribed' + constructor(newsletterState: boolean) { + this.newsletterState = newsletterState } @Field(() => Boolean) diff --git a/backend/src/graphql/model/UnconfirmedContribution.ts b/backend/src/graphql/model/UnconfirmedContribution.ts index dece05781..5e38db6a0 100644 --- a/backend/src/graphql/model/UnconfirmedContribution.ts +++ b/backend/src/graphql/model/UnconfirmedContribution.ts @@ -16,7 +16,7 @@ export class UnconfirmedContribution { this.email = user ? user.emailContact.email : '' this.moderator = contribution.moderatorId this.creation = creations - this.state = contribution.contributionStatus + this.status = contribution.contributionStatus this.messageCount = contribution.messages ? contribution.messages.length : 0 } @@ -51,7 +51,7 @@ export class UnconfirmedContribution { creation: Decimal[] @Field(() => String) - state: string + status: string @Field(() => Int) messageCount: number diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts index d4c84b4f3..f3646de54 100644 --- a/backend/src/graphql/resolver/ContributionResolver.test.ts +++ b/backend/src/graphql/resolver/ContributionResolver.test.ts @@ -1092,29 +1092,29 @@ describe('ContributionResolver', () => { contributionCount: 4, contributionList: expect.arrayContaining([ expect.not.objectContaining({ - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.objectContaining({ id: pendingContribution.data.createContribution.id, - state: 'PENDING', + status: 'PENDING', memo: 'Test PENDING contribution update', amount: '10', }), expect.objectContaining({ id: contributionToDeny.data.createContribution.id, - state: 'DENIED', + status: 'DENIED', memo: 'Test contribution to deny', amount: '100', }), expect.objectContaining({ id: contributionToDelete.data.createContribution.id, - state: 'DELETED', + status: 'DELETED', memo: 'Test contribution to delete', amount: '100', }), expect.objectContaining({ id: inProgressContribution.data.createContribution.id, - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', memo: 'Test IN_PROGRESS contribution', amount: '100', }), @@ -1223,47 +1223,47 @@ describe('ContributionResolver', () => { contributionCount: 7, contributionList: expect.arrayContaining([ expect.not.objectContaining({ - state: 'DELETED', + status: 'DELETED', }), expect.objectContaining({ amount: '100', - state: 'CONFIRMED', + status: 'CONFIRMED', id: contributionToConfirm.data.createContribution.id, memo: 'Test contribution to confirm', }), expect.objectContaining({ id: pendingContribution.data.createContribution.id, - state: 'PENDING', + status: 'PENDING', memo: 'Test PENDING contribution update', amount: '10', }), expect.objectContaining({ id: contributionToDeny.data.createContribution.id, - state: 'DENIED', + status: 'DENIED', memo: 'Test contribution to deny', amount: '100', }), expect.objectContaining({ id: inProgressContribution.data.createContribution.id, - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', memo: 'Test IN_PROGRESS contribution', amount: '100', }), expect.objectContaining({ id: bibiCreatedContribution.id, - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Herzlich Willkommen bei Gradido!', amount: '1000', }), expect.objectContaining({ id: expect.any(Number), - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Whatever contribution', amount: '166', }), expect.objectContaining({ id: expect.any(Number), - state: 'DENIED', + status: 'DENIED', memo: 'Whatever contribution', amount: '166', }), @@ -1288,47 +1288,47 @@ describe('ContributionResolver', () => { contributionCount: 7, contributionList: expect.arrayContaining([ expect.not.objectContaining({ - state: 'DELETED', + status: 'DELETED', }), expect.objectContaining({ amount: '100', - state: 'CONFIRMED', + status: 'CONFIRMED', id: contributionToConfirm.data.createContribution.id, memo: 'Test contribution to confirm', }), expect.objectContaining({ id: pendingContribution.data.createContribution.id, - state: 'PENDING', + status: 'PENDING', memo: 'Test PENDING contribution update', amount: '10', }), expect.objectContaining({ id: contributionToDeny.data.createContribution.id, - state: 'DENIED', + status: 'DENIED', memo: 'Test contribution to deny', amount: '100', }), expect.objectContaining({ id: inProgressContribution.data.createContribution.id, - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', memo: 'Test IN_PROGRESS contribution', amount: '100', }), expect.objectContaining({ id: bibiCreatedContribution.id, - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Herzlich Willkommen bei Gradido!', amount: '1000', }), expect.objectContaining({ id: expect.any(Number), - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Whatever contribution', amount: '166', }), expect.objectContaining({ id: expect.any(Number), - state: 'DENIED', + status: 'DENIED', memo: 'Whatever contribution', amount: '166', }), @@ -1353,47 +1353,47 @@ describe('ContributionResolver', () => { contributionCount: 7, contributionList: expect.arrayContaining([ expect.not.objectContaining({ - state: 'DELETED', + status: 'DELETED', }), expect.objectContaining({ amount: '100', - state: 'CONFIRMED', + status: 'CONFIRMED', id: contributionToConfirm.data.createContribution.id, memo: 'Test contribution to confirm', }), expect.objectContaining({ id: pendingContribution.data.createContribution.id, - state: 'PENDING', + status: 'PENDING', memo: 'Test PENDING contribution update', amount: '10', }), expect.objectContaining({ id: contributionToDeny.data.createContribution.id, - state: 'DENIED', + status: 'DENIED', memo: 'Test contribution to deny', amount: '100', }), expect.objectContaining({ id: inProgressContribution.data.createContribution.id, - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', memo: 'Test IN_PROGRESS contribution', amount: '100', }), expect.objectContaining({ id: bibiCreatedContribution.id, - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Herzlich Willkommen bei Gradido!', amount: '1000', }), expect.objectContaining({ id: expect.any(Number), - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Whatever contribution', amount: '166', }), expect.objectContaining({ id: expect.any(Number), - state: 'DENIED', + status: 'DENIED', memo: 'Whatever contribution', amount: '166', }), @@ -1419,33 +1419,33 @@ describe('ContributionResolver', () => { contributionList: expect.arrayContaining([ expect.objectContaining({ amount: '100', - state: 'CONFIRMED', + status: 'CONFIRMED', id: contributionToConfirm.data.createContribution.id, memo: 'Test contribution to confirm', }), expect.objectContaining({ id: bibiCreatedContribution.id, - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Herzlich Willkommen bei Gradido!', amount: '1000', }), expect.objectContaining({ id: expect.any(Number), - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Whatever contribution', amount: '166', }), expect.not.objectContaining({ - state: 'PENDING', + status: 'PENDING', }), expect.not.objectContaining({ - state: 'DENIED', + status: 'DENIED', }), expect.not.objectContaining({ - state: 'DELETED', + status: 'DELETED', }), expect.not.objectContaining({ - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', }), ]), }) @@ -1468,20 +1468,20 @@ describe('ContributionResolver', () => { contributionCount: 1, contributionList: expect.arrayContaining([ expect.not.objectContaining({ - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.not.objectContaining({ - state: 'DENIED', + status: 'DENIED', }), expect.not.objectContaining({ - state: 'DELETED', + status: 'DELETED', }), expect.not.objectContaining({ - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', }), expect.objectContaining({ id: pendingContribution.data.createContribution.id, - state: 'PENDING', + status: 'PENDING', memo: 'Test PENDING contribution update', amount: '10', }), @@ -1506,20 +1506,20 @@ describe('ContributionResolver', () => { contributionCount: 1, contributionList: expect.arrayContaining([ expect.not.objectContaining({ - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.not.objectContaining({ - state: 'PENDING', + status: 'PENDING', }), expect.not.objectContaining({ - state: 'DENIED', + status: 'DENIED', }), expect.not.objectContaining({ - state: 'DELETED', + status: 'DELETED', }), expect.objectContaining({ id: inProgressContribution.data.createContribution.id, - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', memo: 'Test IN_PROGRESS contribution', amount: '100', }), @@ -1545,27 +1545,27 @@ describe('ContributionResolver', () => { contributionList: expect.arrayContaining([ expect.objectContaining({ id: contributionToDeny.data.createContribution.id, - state: 'DENIED', + status: 'DENIED', memo: 'Test contribution to deny', amount: '100', }), expect.objectContaining({ id: expect.any(Number), - state: 'DENIED', + status: 'DENIED', memo: 'Whatever contribution', amount: '166', }), expect.not.objectContaining({ - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.not.objectContaining({ - state: 'DELETED', + status: 'DELETED', }), expect.not.objectContaining({ - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', }), expect.not.objectContaining({ - state: 'PENDING', + status: 'PENDING', }), ]), }) @@ -1608,36 +1608,36 @@ describe('ContributionResolver', () => { contributionList: expect.arrayContaining([ expect.objectContaining({ amount: '100', - state: 'CONFIRMED', + status: 'CONFIRMED', id: contributionToConfirm.data.createContribution.id, memo: 'Test contribution to confirm', }), expect.objectContaining({ id: pendingContribution.data.createContribution.id, - state: 'PENDING', + status: 'PENDING', memo: 'Test PENDING contribution update', amount: '10', }), expect.objectContaining({ id: bibiCreatedContribution.id, - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Herzlich Willkommen bei Gradido!', amount: '1000', }), expect.objectContaining({ id: expect.any(Number), - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Whatever contribution', amount: '166', }), expect.not.objectContaining({ - state: 'DENIED', + status: 'DENIED', }), expect.not.objectContaining({ - state: 'DELETED', + status: 'DELETED', }), expect.not.objectContaining({ - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', }), ]), }) @@ -2691,7 +2691,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Herzlich Willkommen bei Gradido liebe Bibi!', messagesCount: 0, - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.objectContaining({ amount: expect.decimalEqual(50), @@ -2700,7 +2700,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Herzlich Willkommen bei Gradido liebe Bibi!', messagesCount: 0, - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.objectContaining({ amount: expect.decimalEqual(450), @@ -2709,7 +2709,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Herzlich Willkommen bei Gradido liebe Bibi!', messagesCount: 0, - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.objectContaining({ amount: expect.decimalEqual(400), @@ -2718,7 +2718,7 @@ describe('ContributionResolver', () => { lastName: 'Lustig', memo: 'Herzlich Willkommen bei Gradido!', messagesCount: 0, - state: 'PENDING', + status: 'PENDING', }), expect.objectContaining({ amount: expect.decimalEqual(100), @@ -2727,7 +2727,7 @@ describe('ContributionResolver', () => { lastName: 'der Baumeister', memo: 'Confirmed Contribution', messagesCount: 0, - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.objectContaining({ amount: expect.decimalEqual(100), @@ -2736,7 +2736,7 @@ describe('ContributionResolver', () => { lastName: 'Lustig', memo: 'Test env contribution', messagesCount: 0, - state: 'PENDING', + status: 'PENDING', }), expect.objectContaining({ amount: expect.decimalEqual(200), @@ -2745,7 +2745,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Aktives Grundeinkommen', messagesCount: 0, - state: 'PENDING', + status: 'PENDING', }), expect.objectContaining({ amount: expect.decimalEqual(200), @@ -2754,7 +2754,7 @@ describe('ContributionResolver', () => { lastName: 'Lustig', memo: 'Das war leider zu Viel!', messagesCount: 0, - state: 'DELETED', + status: 'DELETED', }), expect.objectContaining({ amount: expect.decimalEqual(166), @@ -2763,7 +2763,7 @@ describe('ContributionResolver', () => { lastName: 'Hotzenplotz', memo: 'Whatever contribution', messagesCount: 0, - state: 'DENIED', + status: 'DENIED', }), expect.objectContaining({ amount: expect.decimalEqual(166), @@ -2772,7 +2772,7 @@ describe('ContributionResolver', () => { lastName: 'Hotzenplotz', memo: 'Whatever contribution', messagesCount: 0, - state: 'DELETED', + status: 'DELETED', }), expect.objectContaining({ amount: expect.decimalEqual(166), @@ -2781,7 +2781,7 @@ describe('ContributionResolver', () => { lastName: 'Hotzenplotz', memo: 'Whatever contribution', messagesCount: 0, - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.objectContaining({ amount: expect.decimalEqual(100), @@ -2790,7 +2790,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Test contribution to delete', messagesCount: 0, - state: 'DELETED', + status: 'DELETED', }), expect.objectContaining({ amount: expect.decimalEqual(100), @@ -2799,7 +2799,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Test contribution to deny', messagesCount: 0, - state: 'DENIED', + status: 'DENIED', }), expect.objectContaining({ amount: expect.decimalEqual(100), @@ -2808,7 +2808,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Test contribution to confirm', messagesCount: 0, - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.objectContaining({ amount: expect.decimalEqual(100), @@ -2817,7 +2817,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Test IN_PROGRESS contribution', messagesCount: 1, - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', }), expect.objectContaining({ amount: expect.decimalEqual(10), @@ -2826,7 +2826,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Test PENDING contribution update', messagesCount: 1, - state: 'PENDING', + status: 'PENDING', }), expect.objectContaining({ amount: expect.decimalEqual(1000), @@ -2835,7 +2835,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Herzlich Willkommen bei Gradido!', messagesCount: 0, - state: 'CONFIRMED', + status: 'CONFIRMED', }), ]), }) @@ -2864,7 +2864,7 @@ describe('ContributionResolver', () => { lastName: 'Lustig', memo: 'Herzlich Willkommen bei Gradido!', messagesCount: 0, - state: 'PENDING', + status: 'PENDING', }), expect.objectContaining({ amount: '100', @@ -2873,19 +2873,19 @@ describe('ContributionResolver', () => { lastName: 'Lustig', memo: 'Test env contribution', messagesCount: 0, - state: 'PENDING', + status: 'PENDING', }), expect.not.objectContaining({ - state: 'DENIED', + status: 'DENIED', }), expect.not.objectContaining({ - state: 'DELETED', + status: 'DELETED', }), expect.not.objectContaining({ - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.not.objectContaining({ - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', }), ]), }) diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts index 25787490f..0384b64c5 100644 --- a/backend/src/graphql/resolver/UserResolver.test.ts +++ b/backend/src/graphql/resolver/UserResolver.test.ts @@ -2110,7 +2110,7 @@ describe('UserResolver', () => { describe('search users', () => { const variablesWithoutTextAndFilters = { - searchText: '', + query: '', currentPage: 1, pageSize: 25, filters: null, diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 8687b2830..663bc8059 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -8,22 +8,12 @@ import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink' import { User as DbUser } from '@entity/User' import { UserContact as DbUserContact } from '@entity/UserContact' import i18n from 'i18n' -import { - Resolver, - Query, - Args, - Arg, - Authorized, - Ctx, - UseMiddleware, - Mutation, - Int, -} from 'type-graphql' +import { Resolver, Query, Args, Arg, Authorized, Ctx, Mutation, Int } from 'type-graphql' import { v4 as uuidv4 } from 'uuid' import { CreateUserArgs } from '@arg/CreateUserArgs' import { Paginated } from '@arg/Paginated' -import { SearchUsersArgs } from '@arg/SearchUsersArgs' +import { SearchUsersFilters } from '@arg/SearchUsersFilters' import { UnsecureLoginArgs } from '@arg/UnsecureLoginArgs' import { UpdateUserInfosArgs } from '@arg/UpdateUserInfosArgs' import { OptInType } from '@enum/OptInType' @@ -60,7 +50,6 @@ import { EVENT_ADMIN_USER_DELETE, EVENT_ADMIN_USER_UNDELETE, } from '@/event/Events' -import { klicktippNewsletterStateMiddleware } from '@/middleware/klicktippMiddleware' import { isValidPassword } from '@/password/EncryptorUtils' import { encryptPassword, verifyPassword } from '@/password/PasswordEncryptor' import { Context, getUser, getClientTimezoneOffset } from '@/server/context' @@ -71,15 +60,14 @@ import { hasElopageBuys } from '@/util/hasElopageBuys' import { getTimeDurationObject, printTimeDuration } from '@/util/time' import random from 'random-bigint' +import { randombytes_random } from 'sodium-native' import { FULL_CREATION_AVAILABLE } from './const/const' import { getUserCreations } from './util/creations' import { findUserByIdentifier } from './util/findUserByIdentifier' +import { getKlicktippState } from './util/getKlicktippState' import { validateAlias } from './util/validateAlias' -// eslint-disable-next-line @typescript-eslint/no-var-requires, import/no-commonjs -const sodium = require('sodium-native') - const LANGUAGES = ['de', 'en', 'es', 'fr', 'nl'] const DEFAULT_LANGUAGE = 'de' const isLanguage = (language: string): boolean => { @@ -122,7 +110,6 @@ const newGradidoID = async (): Promise
{{ $t('contributionText') }}
{{ memo }}
@@ -37,11 +37,11 @@
{{ $t('creation') }} {{ $t('(') }}{{ amount / 20 }} {{ $t('h') }}{{ $t(')') }}
-
+
+
{{ $t('contribution.deleted') }}
{{ amount | GDD }}
@@ -53,12 +53,12 @@
@@ -69,7 +69,7 @@