From f362eafb00df8c5b0fa52db6f5e4b870dc096bdf Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Wed, 29 Jan 2025 12:58:18 +0100 Subject: [PATCH] refactor template --- .../sendEmailVariants.test.ts.snap | 9 ++++----- backend/src/emails/sendEmailTranslated.ts | 5 +++++ .../emails/templates/includes/chatbox-icon.png | Bin 0 -> 323 bytes .../emails/templates/includes/chatbox-icon.pug | 8 ++++++-- .../src/emails/templates/includes/webflow.css | 7 +++++++ .../templates/transactionReceived/html.pug | 16 +++++++++++++--- backend/src/locales/de.json | 4 ++-- backend/src/locales/en.json | 2 +- 8 files changed, 38 insertions(+), 13 deletions(-) create mode 100644 backend/src/emails/templates/includes/chatbox-icon.png diff --git a/backend/src/emails/__snapshots__/sendEmailVariants.test.ts.snap b/backend/src/emails/__snapshots__/sendEmailVariants.test.ts.snap index 6da26b327..0e4e4ba7c 100644 --- a/backend/src/emails/__snapshots__/sendEmailVariants.test.ts.snap +++ b/backend/src/emails/__snapshots__/sendEmailVariants.test.ts.snap @@ -1699,17 +1699,16 @@ exports[`sendEmailVariants sendTransactionReceivedEmail result has the correct h

Bibi Bloxberg has sent you 37.40 Gradido

Hello Peter Lustig,

-

You have just received 37.40 GDD from Bibi Bloxberg (bibi@bloxberg.de).

+

You have just received 37.40 GDD from Bibi Bloxberg (bibi@bloxberg.de). +

Message

Du bist schon lustiger ;)
-
- - - Reply
+
\\"chatbox\\"Reply +
To account

Kind regards,
your Gradido team diff --git a/backend/src/emails/sendEmailTranslated.ts b/backend/src/emails/sendEmailTranslated.ts index fe0bb27e7..f78ecf805 100644 --- a/backend/src/emails/sendEmailTranslated.ts +++ b/backend/src/emails/sendEmailTranslated.ts @@ -99,6 +99,11 @@ export const sendEmailTranslated = async ({ path: path.join(__dirname, 'templates/includes/youtube-icon.png'), cid: 'youtubeicon', }, + { + filename: 'chatbox-icon.png', + path: path.join(__dirname, 'templates/includes/chatbox-icon.png'), + cid: 'chatboxicon', + }, ], }, locals, // the 'locale' in here seems not to be used by 'email-template', because it doesn't work if the language isn't set before by 'i18n.setLocale' diff --git a/backend/src/emails/templates/includes/chatbox-icon.png b/backend/src/emails/templates/includes/chatbox-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a25c7c209cb79912e5adab4b7732ca9858955e17 GIT binary patch literal 323 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9F5he4R}c>anMprB-l zYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt&fkT^vI^I^Rxpt*$!I@bcilmcXRrOkP_`0>HiiLiq(xj+>07kDqMfHY{##Q zlh#;pR2gl4c_ETL@xfeC%dqcrr^TpWs_@NqndEL~zIij>tP8)bE11vjc5$h#TT}z| O8-u5-pUXO@geCw$1$z7d literal 0 HcmV?d00001 diff --git a/backend/src/emails/templates/includes/chatbox-icon.pug b/backend/src/emails/templates/includes/chatbox-icon.pug index 0f09e86ff..62775b0f0 100644 --- a/backend/src/emails/templates/includes/chatbox-icon.pug +++ b/backend/src/emails/templates/includes/chatbox-icon.pug @@ -1,2 +1,6 @@ -svg(xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 -960 960 960" style="vertical-align: middle; margin-right: 8px;") - path(d="M240-400h480v-80H240v80Zm0-120h480v-80H240v80Zm0-120h480v-80H240v80ZM880-80 720-240H160q-33 0-56.5-23.5T80-320v-480q0-33 23.5-56.5T160-880h640q33 0 56.5 23.5T880-800v720ZM160-320h594l46 45v-525H160v480Zm0 0v-480 480Z" fill="#e8eaed") \ No newline at end of file +span.chatbox-wrapper + img.bi-chatbox( + alt="chatbox" + loading="lazy" + src="cid:chatboxicon" + ) \ No newline at end of file diff --git a/backend/src/emails/templates/includes/webflow.css b/backend/src/emails/templates/includes/webflow.css index 6a0f99c02..a78c0ed4f 100644 --- a/backend/src/emails/templates/includes/webflow.css +++ b/backend/src/emails/templates/includes/webflow.css @@ -86,6 +86,13 @@ h2 { box-shadow: 20px 25px 30px rgba(56, 56, 56, 0.4); } +.chatbox-wrapper { + margin-right: 8px; +} +.bi-chatbox { + margin-bottom: -5px; +} + .child-right { text-align: right; } diff --git a/backend/src/emails/templates/transactionReceived/html.pug b/backend/src/emails/templates/transactionReceived/html.pug index 9605dae5d..4f9aa9c31 100644 --- a/backend/src/emails/templates/transactionReceived/html.pug +++ b/backend/src/emails/templates/transactionReceived/html.pug @@ -1,16 +1,26 @@ extend ../layout.pug -block content +block content + mixin mailto(email, subject) + - var formattedSubject = encodeURIComponent(subject) + a(class!=attributes.class href=`mailto:${email}?subject=${formattedSubject}`) + block + + - var subject= t('emails.transactionReceived.replySubject', { senderFirstName, senderLastName, transactionAmount }) h2= t('emails.transactionReceived.title', { senderFirstName, senderLastName, transactionAmount }) .text-block include ../includes/salutation.pug - p= t('emails.transactionReceived.haveReceivedAmountGDDFrom', { transactionAmount, senderFirstName, senderLastName, senderEmail }) + p + = t('emails.transactionReceived.haveReceivedAmountGDDFrom', { transactionAmount, senderFirstName, senderLastName }) + | ( + +mailto(senderEmail, subject)=senderEmail + |). .content h2= t('emails.general.message') .child-left div(class="p_content")= memo .child-right - a.button-5(href= `mailto:${senderEmail}?subject=${encodeURIComponent(t('emails.transactionReceived.replySubject', { senderFirstName, senderLastName, transactionAmount }))}`) + +mailto(senderEmail, subject)(class="button-5") include ../includes/chatbox-icon.pug span #{t('emails.general.answerNow')} diff --git a/backend/src/locales/de.json b/backend/src/locales/de.json index b37604321..8c0c8ff0c 100644 --- a/backend/src/locales/de.json +++ b/backend/src/locales/de.json @@ -88,9 +88,9 @@ "title": "{senderFirstName} {senderLastName} hat deinen Gradido-Link eingelöst" }, "transactionReceived": { - "haveReceivedAmountGDDFrom": "du hast soeben {transactionAmount} GDD von {senderFirstName} {senderLastName} (mailto:{senderEmail}) erhalten.", + "haveReceivedAmountGDDFrom": "du hast soeben {transactionAmount} GDD erhalten von {senderFirstName} {senderLastName}", "subject": "{senderFirstName} {senderLastName} hat dir {transactionAmount} Gradido gesendet", - "replySubject": "RE: {senderFirstName} {senderLastName} hat dir {transactionAmount} Gradido gesendet", + "replySubject": "Re: {senderFirstName} {senderLastName} hat dir {transactionAmount} Gradido gesendet", "title": "{senderFirstName} {senderLastName} hat dir {transactionAmount} Gradido gesendet" } }, diff --git a/backend/src/locales/en.json b/backend/src/locales/en.json index 18b703d25..9b6b2a4cf 100644 --- a/backend/src/locales/en.json +++ b/backend/src/locales/en.json @@ -88,7 +88,7 @@ "title": "{senderFirstName} {senderLastName} has redeemed your Gradido link" }, "transactionReceived": { - "haveReceivedAmountGDDFrom": "You have just received {transactionAmount} GDD from {senderFirstName} {senderLastName} (mailto:{senderEmail}).", + "haveReceivedAmountGDDFrom": "You have just received {transactionAmount} GDD from {senderFirstName} {senderLastName}", "replySubject": "RE: {senderFirstName} {senderLastName} has sent you {transactionAmount} Gradido", "subject": "{senderFirstName} {senderLastName} has sent you {transactionAmount} Gradido", "title": "{senderFirstName} {senderLastName} has sent you {transactionAmount} Gradido"