diff --git a/.env.config b/.env.config index 6df72aaae..67bff70af 100644 --- a/.env.config +++ b/.env.config @@ -14,10 +14,14 @@ JWT_SECRET='shhhh super secret code here bro' ROOT_URL='http://localhost:3000' # Credentials for the admin user created at app initialization -ADMIN_EMAIL='admin@example.org' +ADMIN_EMAIL='admin@example.com' ADMIN_PASS='party' # Used to send verification, registration, and confirmation emails +EMAIL_ADDRESS='team@example.com' +HACKATHON_NAME='Hackathon' +TWITTER_HANDLE='hackathon' +FACEBOOK_HANDLE='hackathon' EMAIL_CONTACT='Hackathon Team ' EMAIL_HOST='smtp.gmail.com' EMAIL_USER='foo@bar.com' diff --git a/app.json b/app.json index a7fa58552..e5bd55026 100644 --- a/app.json +++ b/app.json @@ -16,9 +16,22 @@ }, "ADMIN_EMAIL": { "description": "Credentials for the admin user created at app initialization", - "value": "admin@example.org" + "value": "admin@example.com" }, "ADMIN_PASS": "party", + "EMAIL_ADDRESS": { + "description": "The email address that is included in the 'email us' link at the bottom of emails.", + "value": "team@example.com" + }, + "HACKATHON_NAME": "Hackathon", + "TWITTER_HANDLE": { + "description": "Everything after https://twitter.com/", + "value": "hackathon" + }, + "FACEBOOK_HANDLE": { + "description": "Everything after https://facebook.com/", + "value": "hackathon" + }, "EMAIL_CONTACT": { "description": "Used to send verification, registration, and confirmation emails", "value": "Hackathon Team " diff --git a/app/server/services/email.js b/app/server/services/email.js index 3cb40ce23..117af6b5e 100644 --- a/app/server/services/email.js +++ b/app/server/services/email.js @@ -7,6 +7,11 @@ var emailTemplates = require('email-templates'); var ROOT_URL = process.env.ROOT_URL; +var HACKATHON_NAME = process.env.HACKATHON_NAME; +var EMAIL_ADDRESS = process.env.EMAIL_ADDRESS; +var TWITTER_HANDLE = proccess.env.TWITTER_HANDLE; +var FACEBOOK_HANDLE = proccess.env.FACEBOOK_HANDLE; + var EMAIL_HOST = process.env.EMAIL_HOST; var EMAIL_USER = process.env.EMAIL_USER; var EMAIL_PASS = process.env.EMAIL_PASS; @@ -48,6 +53,10 @@ function sendOne(templateName, options, data, callback){ } data.emailHeaderImage = EMAIL_HEADER_IMAGE; + data.emailAddress = EMAIL_ADDRESS; + data.hackathonName = HACKATHON_NAME; + data.twitterHandle = TWITTER_HANDLE; + data.facebookHandle = FACEBOOK_HANDLE; template(templateName, data, function(err, html, text){ if (err) { return callback(err); @@ -79,7 +88,7 @@ controller.sendVerificationEmail = function(email, token, callback) { var options = { to: email, - subject: "[HACKMIT] - Verify your email" + subject: "[HACKATHON] - Verify your email" }; var locals = { @@ -116,7 +125,7 @@ controller.sendPasswordResetEmail = function(email, token, callback) { var options = { to: email, - subject: "[HACKMIT] - Password reset requested!" + subject: "[HACKATHON] - Password reset requested!" }; var locals = { @@ -157,7 +166,7 @@ controller.sendPasswordChangedEmail = function(email, callback){ var options = { to: email, - subject: "[HACKMIT] - Your password has been changed!" + subject: "[HACKATHON] - Your password has been changed!" }; var locals = { @@ -185,4 +194,4 @@ controller.sendPasswordChangedEmail = function(email, callback){ }; -module.exports = controller; \ No newline at end of file +module.exports = controller; diff --git a/app/server/templates/email-basic/html.hbs b/app/server/templates/email-basic/html.hbs index 61e890ebb..01652b70c 100644 --- a/app/server/templates/email-basic/html.hbs +++ b/app/server/templates/email-basic/html.hbs @@ -39,7 +39,7 @@ Thanks,
- The HackMIT Team + The {{ hackathonName }} Team @@ -54,13 +54,13 @@ diff --git a/app/server/templates/email-link-action/html.hbs b/app/server/templates/email-link-action/html.hbs index 168ebf154..d993da154 100644 --- a/app/server/templates/email-link-action/html.hbs +++ b/app/server/templates/email-link-action/html.hbs @@ -45,7 +45,7 @@ @@ -60,13 +60,13 @@
- Follow on Twitter   Like on Facebook    - Email Us + Follow on Twitter   Like on Facebook    + Email Us
- Copyright © HackMIT 2015, All rights reserved. + Copyright © {{ hackathonName }} 2017, All rights reserved.
Thanks,
- The HackMIT Team + The {{ hackathonName }} Team
diff --git a/app/server/templates/email-verify/html.hbs b/app/server/templates/email-verify/html.hbs index 015734d68..d8d901369 100644 --- a/app/server/templates/email-verify/html.hbs +++ b/app/server/templates/email-verify/html.hbs @@ -31,7 +31,7 @@ @@ -60,13 +60,13 @@
- Follow on Twitter   Like on Facebook    - Email Us + Follow on Twitter   Like on Facebook    + Email Us
- Copyright © HackMIT 2015, All rights reserved. + Copyright © {{ hackathonName }} 2017, All rights reserved.

Verify Your Email

-

Thanks for signing up for HackMIT 2015!

+

Thanks for signing up for {{ hackathonName }}!

To verify your email, click the button below.

@@ -45,7 +45,7 @@ 		Thanks,
- The HackMIT Team + The {{ hackathonName }} Team
- Follow on Twitter   Like on Facebook    - Email Us + Follow on Twitter   Like on Facebook    + Email Us
- Copyright © HackMIT 2015, All rights reserved. + Copyright © {{ hackathonName }} 2017, All rights reserved.