From 88cae0e528eea80319306e8dcef8305f01140d84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 29 Nov 2022 13:40:08 +0100 Subject: [PATCH] Move email '*.pug' templates in 'templates' folder --- backend/src/emails/sendEmailTranslated.ts | 2 +- backend/src/emails/{ => templates}/accountActivation/html.pug | 0 .../src/emails/{ => templates}/accountActivation/subject.pug | 0 .../emails/{ => templates}/accountMultiRegistration/html.pug | 0 .../emails/{ => templates}/accountMultiRegistration/subject.pug | 0 .../emails/{ => templates}/addedContributionMessage/html.pug | 0 .../emails/{ => templates}/addedContributionMessage/subject.pug | 0 .../src/emails/{ => templates}/contributionConfirmed/html.pug | 0 .../emails/{ => templates}/contributionConfirmed/subject.pug | 0 .../src/emails/{ => templates}/contributionRejected/html.pug | 0 .../src/emails/{ => templates}/contributionRejected/subject.pug | 0 backend/src/emails/{ => templates}/resetPassword/html.pug | 0 backend/src/emails/{ => templates}/resetPassword/subject.pug | 0 .../src/emails/{ => templates}/transactionLinkRedeemed/html.pug | 0 .../emails/{ => templates}/transactionLinkRedeemed/subject.pug | 0 backend/src/emails/{ => templates}/transactionReceived/html.pug | 0 .../src/emails/{ => templates}/transactionReceived/subject.pug | 0 17 files changed, 1 insertion(+), 1 deletion(-) rename backend/src/emails/{ => templates}/accountActivation/html.pug (100%) rename backend/src/emails/{ => templates}/accountActivation/subject.pug (100%) rename backend/src/emails/{ => templates}/accountMultiRegistration/html.pug (100%) rename backend/src/emails/{ => templates}/accountMultiRegistration/subject.pug (100%) rename backend/src/emails/{ => templates}/addedContributionMessage/html.pug (100%) rename backend/src/emails/{ => templates}/addedContributionMessage/subject.pug (100%) rename backend/src/emails/{ => templates}/contributionConfirmed/html.pug (100%) rename backend/src/emails/{ => templates}/contributionConfirmed/subject.pug (100%) rename backend/src/emails/{ => templates}/contributionRejected/html.pug (100%) rename backend/src/emails/{ => templates}/contributionRejected/subject.pug (100%) rename backend/src/emails/{ => templates}/resetPassword/html.pug (100%) rename backend/src/emails/{ => templates}/resetPassword/subject.pug (100%) rename backend/src/emails/{ => templates}/transactionLinkRedeemed/html.pug (100%) rename backend/src/emails/{ => templates}/transactionLinkRedeemed/subject.pug (100%) rename backend/src/emails/{ => templates}/transactionReceived/html.pug (100%) rename backend/src/emails/{ => templates}/transactionReceived/subject.pug (100%) diff --git a/backend/src/emails/sendEmailTranslated.ts b/backend/src/emails/sendEmailTranslated.ts index 3f5d9d9fd..69008c00e 100644 --- a/backend/src/emails/sendEmailTranslated.ts +++ b/backend/src/emails/sendEmailTranslated.ts @@ -63,7 +63,7 @@ export const sendEmailTranslated = async (params: { // ATTENTION: await is needed, because otherwise on send the email gets send in the language of the current user, because below the language gets reset await email .send({ - template: path.join(__dirname, params.template), + template: path.join(__dirname, 'templates', params.template), message: params.receiver, locals: params.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/accountActivation/html.pug b/backend/src/emails/templates/accountActivation/html.pug similarity index 100% rename from backend/src/emails/accountActivation/html.pug rename to backend/src/emails/templates/accountActivation/html.pug diff --git a/backend/src/emails/accountActivation/subject.pug b/backend/src/emails/templates/accountActivation/subject.pug similarity index 100% rename from backend/src/emails/accountActivation/subject.pug rename to backend/src/emails/templates/accountActivation/subject.pug diff --git a/backend/src/emails/accountMultiRegistration/html.pug b/backend/src/emails/templates/accountMultiRegistration/html.pug similarity index 100% rename from backend/src/emails/accountMultiRegistration/html.pug rename to backend/src/emails/templates/accountMultiRegistration/html.pug diff --git a/backend/src/emails/accountMultiRegistration/subject.pug b/backend/src/emails/templates/accountMultiRegistration/subject.pug similarity index 100% rename from backend/src/emails/accountMultiRegistration/subject.pug rename to backend/src/emails/templates/accountMultiRegistration/subject.pug diff --git a/backend/src/emails/addedContributionMessage/html.pug b/backend/src/emails/templates/addedContributionMessage/html.pug similarity index 100% rename from backend/src/emails/addedContributionMessage/html.pug rename to backend/src/emails/templates/addedContributionMessage/html.pug diff --git a/backend/src/emails/addedContributionMessage/subject.pug b/backend/src/emails/templates/addedContributionMessage/subject.pug similarity index 100% rename from backend/src/emails/addedContributionMessage/subject.pug rename to backend/src/emails/templates/addedContributionMessage/subject.pug diff --git a/backend/src/emails/contributionConfirmed/html.pug b/backend/src/emails/templates/contributionConfirmed/html.pug similarity index 100% rename from backend/src/emails/contributionConfirmed/html.pug rename to backend/src/emails/templates/contributionConfirmed/html.pug diff --git a/backend/src/emails/contributionConfirmed/subject.pug b/backend/src/emails/templates/contributionConfirmed/subject.pug similarity index 100% rename from backend/src/emails/contributionConfirmed/subject.pug rename to backend/src/emails/templates/contributionConfirmed/subject.pug diff --git a/backend/src/emails/contributionRejected/html.pug b/backend/src/emails/templates/contributionRejected/html.pug similarity index 100% rename from backend/src/emails/contributionRejected/html.pug rename to backend/src/emails/templates/contributionRejected/html.pug diff --git a/backend/src/emails/contributionRejected/subject.pug b/backend/src/emails/templates/contributionRejected/subject.pug similarity index 100% rename from backend/src/emails/contributionRejected/subject.pug rename to backend/src/emails/templates/contributionRejected/subject.pug diff --git a/backend/src/emails/resetPassword/html.pug b/backend/src/emails/templates/resetPassword/html.pug similarity index 100% rename from backend/src/emails/resetPassword/html.pug rename to backend/src/emails/templates/resetPassword/html.pug diff --git a/backend/src/emails/resetPassword/subject.pug b/backend/src/emails/templates/resetPassword/subject.pug similarity index 100% rename from backend/src/emails/resetPassword/subject.pug rename to backend/src/emails/templates/resetPassword/subject.pug diff --git a/backend/src/emails/transactionLinkRedeemed/html.pug b/backend/src/emails/templates/transactionLinkRedeemed/html.pug similarity index 100% rename from backend/src/emails/transactionLinkRedeemed/html.pug rename to backend/src/emails/templates/transactionLinkRedeemed/html.pug diff --git a/backend/src/emails/transactionLinkRedeemed/subject.pug b/backend/src/emails/templates/transactionLinkRedeemed/subject.pug similarity index 100% rename from backend/src/emails/transactionLinkRedeemed/subject.pug rename to backend/src/emails/templates/transactionLinkRedeemed/subject.pug diff --git a/backend/src/emails/transactionReceived/html.pug b/backend/src/emails/templates/transactionReceived/html.pug similarity index 100% rename from backend/src/emails/transactionReceived/html.pug rename to backend/src/emails/templates/transactionReceived/html.pug diff --git a/backend/src/emails/transactionReceived/subject.pug b/backend/src/emails/templates/transactionReceived/subject.pug similarity index 100% rename from backend/src/emails/transactionReceived/subject.pug rename to backend/src/emails/templates/transactionReceived/subject.pug