From 9bb827a8ee83e241d538329a4399d4a95a53d422 Mon Sep 17 00:00:00 2001 From: roschaefer Date: Mon, 15 Jun 2020 15:13:36 +0200 Subject: [PATCH] Remove name "Human Connection" in email templates --- backend/src/config/index.js | 2 ++ backend/src/config/metadata.js | 7 +++++++ .../src/middleware/email/templateBuilder.js | 15 +++++++++----- .../email/templates/emailVerification.html | 12 +++++------ .../middleware/email/templates/layout.html | 2 +- .../email/templates/resetPassword.html | 12 +++++------ .../middleware/email/templates/signup.html | 20 +++++++++---------- .../email/templates/wrongAccount.html | 16 +++++++-------- 8 files changed, 50 insertions(+), 36 deletions(-) create mode 100644 backend/src/config/metadata.js diff --git a/backend/src/config/index.js b/backend/src/config/index.js index 0f024b670..96fcac44a 100644 --- a/backend/src/config/index.js +++ b/backend/src/config/index.js @@ -1,5 +1,6 @@ import dotenv from 'dotenv' import links from './links.js' +import metadata from './metadata.js' if (require.resolve) { // are we in a nodejs environment? @@ -94,6 +95,7 @@ export const s3Configs = { export const customConfigs = { EMAIL_DEFAULT_SENDER, SUPPORT_URL: links.SUPPORT, + APPLICATION_NAME: metadata.APPLICATION_NAME, } export default { diff --git a/backend/src/config/metadata.js b/backend/src/config/metadata.js new file mode 100644 index 000000000..6017cd1af --- /dev/null +++ b/backend/src/config/metadata.js @@ -0,0 +1,7 @@ +export default { + APPLICATION_NAME: 'fyphe_O', + APPLICATION_SHORT_NAME: 'fyphe', + APPLICATION_DESCRIPTION: 'The Schools in Motion Network', + ORGANIZATION_NAME: 'Ensible e.V.', + ORGANIZATION_JURISDICTION: 'Köln', +} diff --git a/backend/src/middleware/email/templateBuilder.js b/backend/src/middleware/email/templateBuilder.js index 1a0aad9d5..28acb633e 100644 --- a/backend/src/middleware/email/templateBuilder.js +++ b/backend/src/middleware/email/templateBuilder.js @@ -4,11 +4,16 @@ import CONFIG from '../../config' import * as templates from './templates' const from = CONFIG.EMAIL_DEFAULT_SENDER -const supportUrl = CONFIG.SUPPORT_URL const welcomeImageUrl = new URL(`/img/custom/welcome.svg`, CONFIG.CLIENT_URI) +const defaultParams = { + supportUrl: CONFIG.SUPPORT_URL, + APPLICATION_NAME: CONFIG.APPLICATION_NAME, + welcomeImageUrl +} + export const signupTemplate = ({ email, nonce }) => { - const subject = 'Willkommen, Bienvenue, Welcome to Human Connection!' + const subject = `Willkommen, Bienvenue, Welcome to ${CONFIG.APPLICATION_NAME}!` const actionUrl = new URL('/registration/create-user-account', CONFIG.CLIENT_URI) actionUrl.searchParams.set('nonce', nonce) actionUrl.searchParams.set('email', email) @@ -19,7 +24,7 @@ export const signupTemplate = ({ email, nonce }) => { subject, html: mustache.render( templates.layout, - { actionUrl, nonce, supportUrl, welcomeImageUrl, subject }, + { ...defaultParams, actionUrl, nonce, subject }, { content: templates.signup }, ), } @@ -37,7 +42,7 @@ export const emailVerificationTemplate = ({ email, nonce, name }) => { subject, html: mustache.render( templates.layout, - { actionUrl, name, nonce, supportUrl, welcomeImageUrl, subject }, + { ...defaultParams, actionUrl, name, nonce, subject }, { content: templates.emailVerification }, ), } @@ -55,7 +60,7 @@ export const resetPasswordTemplate = ({ email, nonce, name }) => { subject, html: mustache.render( templates.layout, - { actionUrl, name, nonce, supportUrl, welcomeImageUrl, subject }, + { ...defaultParams, actionUrl, name, nonce, subject }, { content: templates.passwordReset }, ), } diff --git a/backend/src/middleware/email/templates/emailVerification.html b/backend/src/middleware/email/templates/emailVerification.html index dda8684ec..9982ad192 100644 --- a/backend/src/middleware/email/templates/emailVerification.html +++ b/backend/src/middleware/email/templates/emailVerification.html @@ -7,7 +7,7 @@ Human Connection community logo @@ -75,8 +75,8 @@

Sollte der Button für Dich nicht funktionieren, kannst Du auch folgenden Code in Dein Browserfenster kopieren: {{{ nonce }}}

Bis bald bei Human Connection!

-

– Dein Human Connection Team

+ style="color: #17b53e;">{{{APPLICATION_NAME}}}!

+

– Dein {{APPLICATION_NAME}} Team

@@ -105,7 +105,7 @@ Human Connection community logo @@ -173,8 +173,8 @@

If the above button doesn't work you can also copy the following code into your browser window: {{{ nonce }}}

See you soon on Human Connection!

-

– The Human Connection Team

+ style="color: #17b53e;">{{{APPLICATION_NAME}}}!

+

– The {{APPLICATION_NAME}} Team

diff --git a/backend/src/middleware/email/templates/layout.html b/backend/src/middleware/email/templates/layout.html index 7e1c39ace..a5731395d 100644 --- a/backend/src/middleware/email/templates/layout.html +++ b/backend/src/middleware/email/templates/layout.html @@ -170,7 +170,7 @@

- Human Connection gGmbH
Bahnhofstraße 11, 73235 Weilheim / + {{ORGANIZATION_NAME}}
Bahnhofstraße 11, 73235 Weilheim / Teck
Germany

diff --git a/backend/src/middleware/email/templates/resetPassword.html b/backend/src/middleware/email/templates/resetPassword.html index 5026c8dcc..8eb2203cb 100644 --- a/backend/src/middleware/email/templates/resetPassword.html +++ b/backend/src/middleware/email/templates/resetPassword.html @@ -7,7 +7,7 @@ Human Connection community logo @@ -75,8 +75,8 @@

Sollte der Button für Dich nicht funktionieren, kannst Du auch folgenden Code in Dein Browserfenster kopieren: {{{ nonce }}}

Bis bald bei Human Connection!

-

– Dein Human Connection Team

+ style="color: #17b53e;">{{APPLICATION_NAME}}!

+

– Dein {{APPLICATION_NAME}} Team

@@ -105,7 +105,7 @@ Human Connection community logo @@ -172,8 +172,8 @@

If the above button doesn't work you can also copy the following code into your browser window: {{{ nonce }}}

See you soon on Human Connection!

-

– The Human Connection Team

+ style="color: #17b53e;">{{APPLICATION_NAME}}!

+

– The {{APPLICATION_NAME}} Team

diff --git a/backend/src/middleware/email/templates/signup.html b/backend/src/middleware/email/templates/signup.html index 174137859..e939bc217 100644 --- a/backend/src/middleware/email/templates/signup.html +++ b/backend/src/middleware/email/templates/signup.html @@ -7,7 +7,7 @@ Human Connection community logo @@ -23,7 +23,7 @@ style="padding: 20px; padding-top: 0; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">

- Willkommen bei Human Connection!

+ Willkommen bei {{APPLICATION_NAME}}!

Danke, dass Du dich angemeldet hast – wir freuen uns, Dich dabei zu haben. Jetzt fehlt nur noch eine Kleinigkeit, bevor wir gemeinsam die Welt verbessern können ... Bitte bestätige Deine E-Mail Adresse:

@@ -63,7 +63,7 @@

Sollte der Button für Dich nicht funktionieren, kannst Du auch folgenden Code in Dein Browserfenster kopieren: {{{ nonce }}}

Das funktioniert allerdings nur, wenn du Dich über unsere Website registriert hast.

Falls Du Dich nicht selbst bei Human Connection angemeldet hast, schau doch mal vorbei! + style="color: #17b53e;">{{APPLICATION_NAME}} angemeldet hast, schau doch mal vorbei! Wir sind ein gemeinnütziges Aktionsnetzwerk – von Menschen für Menschen.

PS: Wenn Du keinen Account bei uns möchtest, kannst Du diese E-Mail einfach ignorieren. ;)

@@ -88,8 +88,8 @@

Melde Dich gerne bei unserem Support Team, wenn Du Fragen hast.

Bis bald bei Human Connection!

-

– Dein Human Connection Team

+ style="color: #17b53e;">{{APPLICATION_NAME}}!

+

– Dein {{APPLICATION_NAME}} Team

@@ -118,7 +118,7 @@ Human Connection community logo @@ -134,7 +134,7 @@ style="padding: 20px; padding-top: 0; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">

- Welcome to Human Connection!

+ Welcome to {{APPLICATION_NAME}}!

Thank you for joining our cause – it's awesome to have you on board. There's just one tiny step missing before we can start shaping the world together ... Please confirm your e-mail address by clicking the button below:

@@ -174,7 +174,7 @@

If the above button doesn't work, you can also copy the following code into your browser window: {{{ nonce }}}

However, this only works if you have registered through our website.

If you didn't sign up for Human Connection we recommend you to check it out! + style="color: #17b53e;">{{APPLICATION_NAME}} we recommend you to check it out! It's a social network from people for people who want to connect and change the world together.

PS: If you ignore this e-mail we will not create an account for @@ -201,8 +201,8 @@ support team with any questions you have.

See you soon on Human Connection!

-

– The Human Connection Team

+ style="color: #17b53e;">{{APPLICATION_NAME}}!

+

– The {{APPLICATION_NAME}} Team

diff --git a/backend/src/middleware/email/templates/wrongAccount.html b/backend/src/middleware/email/templates/wrongAccount.html index d6574aac5..f828a4d1d 100644 --- a/backend/src/middleware/email/templates/wrongAccount.html +++ b/backend/src/middleware/email/templates/wrongAccount.html @@ -7,7 +7,7 @@ Human Connection community logo @@ -56,7 +56,7 @@

Wenn Du noch keinen Account bei Human Connection hast oder Dein Password gar nicht ändern willst, + style="color: #17b53e;">{{APPLICATION_NAME}} hast oder Dein Password gar nicht ändern willst, kannst Du diese E-Mail einfach ignorieren!

@@ -75,8 +75,8 @@

Ansonsten hilft Dir unser Support Team gerne weiter.

Bis bald bei Human Connection!

-

– Dein Human Connection Team

+ style="color: #17b53e;">{{APPLICATION_NAME}}!

+

– Dein {{APPLICATION_NAME}} Team

@@ -105,7 +105,7 @@ Human Connection community logo @@ -153,7 +153,7 @@

If you don't have an account at Human Connection yet or if you didn't want to reset your password, + style="color: #17b53e;">{{APPLICATION_NAME}} yet or if you didn't want to reset your password, please ignore this e-mail.

@@ -172,8 +172,8 @@

Otherwise our support team will be happy to help you out.

See you soon on Human Connection!

-

– The Human Connection Team

+ style="color: #17b53e;">{{APPLICATION_NAME}}!

+

– The {{APPLICATION_NAME}} Team