From f3804bb553c535bcc49270a564a9540aee82378e Mon Sep 17 00:00:00 2001 From: Mrugesh Mohapatra Date: Sat, 14 Jan 2017 18:30:20 +0530 Subject: [PATCH] chore(passwordless): Update to freeCodeCamp --- common/models/user.js | 2 +- server/views/account/email-signin.jade | 4 ++-- server/views/account/signin.jade | 2 +- server/views/emails/user-request-sign-in.ejs | 4 ++-- server/views/emails/user-request-sign-up.ejs | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/models/user.js b/common/models/user.js index 3fe90c9a02..c32786942e 100644 --- a/common/models/user.js +++ b/common/models/user.js @@ -601,7 +601,7 @@ module.exports = function(User) { type: 'email', to: user.email, from: 'Team@freecodecamp.com', - subject: 'Free Code Camp - Authentication Request!', + subject: 'freeCodeCamp - Authentication Request!', text: renderAuthEmail({ loginEmail, loginToken diff --git a/server/views/account/email-signin.jade b/server/views/account/email-signin.jade index 7f49c73dfb..b5386d40d8 100644 --- a/server/views/account/email-signin.jade +++ b/server/views/account/email-signin.jade @@ -25,9 +25,9 @@ block content .col-sm-6.col-sm-offset-3 br p.text-center - | Free Code Camp uses passwordless authentication. + | freeCodeCamp uses passwordless authentication. br - | If you are a new camper use any email, and sign up instantly, + | If you are a new camper just use any email, and sign up instantly, | or use your existing email with us, if you already have an account. br p.text-center diff --git a/server/views/account/signin.jade b/server/views/account/signin.jade index 44283ca74f..b73e8b8271 100644 --- a/server/views/account/signin.jade +++ b/server/views/account/signin.jade @@ -1,7 +1,7 @@ extends ../layout block content .text-center - h2 Welcome to Free Code Camp. + h2 Welcome to freeCodeCamp! br .button-spacer | Sign in or Sign up with one of these options: diff --git a/server/views/emails/user-request-sign-in.ejs b/server/views/emails/user-request-sign-in.ejs index 74967a86cb..bdd9e5c921 100644 --- a/server/views/emails/user-request-sign-in.ejs +++ b/server/views/emails/user-request-sign-in.ejs @@ -1,6 +1,6 @@ Greetings from San Francisco! -You can now sign in to Free Code Camp, without a password. Just follow the link below: +You can now sign in to freeCodeCamp, without a password. Just follow the link below: https://freecodecamp.com/passwordless-auth?email=<%= loginEmail %>&token=<%= loginToken %> @@ -11,5 +11,5 @@ Do not share this email with anyone, doing so may give them access to your accou Good luck with the challenges! Thanks, -The Free Code Camp Team. +The freeCodeCamp Team. team@freecodecamp.com diff --git a/server/views/emails/user-request-sign-up.ejs b/server/views/emails/user-request-sign-up.ejs index 19b9468968..be92535b80 100644 --- a/server/views/emails/user-request-sign-up.ejs +++ b/server/views/emails/user-request-sign-up.ejs @@ -1,6 +1,6 @@ Greetings from San Francisco! -Welcome to Free Code Camp. We've created a new account for you. +Welcome to freeCodeCamp. We've created a new account for you. To verify and start using your profile just follow the link below: https://freecodecamp.com/passwordless-auth?email=<%= loginEmail %>&token=<%= loginToken %> @@ -18,5 +18,5 @@ Do not share this email with anyone, doing so may give them access to your accou Good luck with the challenges! Thanks, -The Free Code Camp Team. +The freeCodeCamp Team. team@freecodecamp.com