diff --git a/common/models/user.js b/common/models/user.js
index fa2623ddad..b25579056d 100644
--- a/common/models/user.js
+++ b/common/models/user.js
@@ -212,7 +212,7 @@ module.exports = function(User) {
text: `
Hello,\n\n
This email is confirming that you requested to
- reset your password for your Free Code Camp account.
+ reset your password for your freeCodeCamp account.
This is your email: ${ info.email }.
Go to ${ url } to reset your password.
\n
@@ -439,8 +439,8 @@ module.exports = function(User) {
var mailOptions = {
type: 'email',
to: email,
- from: 'Team@freecodecamp.com',
- subject: 'Welcome to Free Code Camp!',
+ from: 'team@freecodecamp.com',
+ subject: 'Welcome to freeCodeCamp!',
protocol: isDev ? null : 'https',
host: isDev ? 'localhost' : 'freecodecamp.com',
port: isDev ? null : 443,
diff --git a/seed/challenges/01-front-end-development-certification/json-apis-and-ajax.json b/seed/challenges/01-front-end-development-certification/json-apis-and-ajax.json
index 1cd8f10183..d5a0467aca 100644
--- a/seed/challenges/01-front-end-development-certification/json-apis-and-ajax.json
+++ b/seed/challenges/01-front-end-development-certification/json-apis-and-ajax.json
@@ -136,7 +136,7 @@
"Most web APIs transfer data in a format called JSON. JSON stands for JavaScript Object Notation.",
"You've already been using JSON whenever you create a JavaScript object. JSON is nothing more than object properties and their current values, sandwiched between a { and a }.",
"These properties and their values are often referred to as \"key-value pairs\".",
- "Let's get the JSON from Free Code Camp's Cat Photo API.",
+ "Let's get the JSON from freeCodeCamp's Cat Photo API.",
"Here's the code you can put in your click event to do this:",
"$.getJSON(\"/json/cats.json\", function(json) {
$(\".message\").html(JSON.stringify(json));
});
",
"Once you've added this, click the \"Get Message\" button. Your Ajax function will replace the \"The message will go here\" text with the raw JSON output from the Free Code Camp Cat Photo API."
@@ -363,7 +363,7 @@
"id": "56bbb991ad1ed5201cd392d9",
"title": "Prefilter JSON",
"description": [
- "If we don't want to render every cat photo we get from our Free Code Camp's Cat Photo JSON API, we can pre-filter the json before we loop through it.",
+ "If we don't want to render every cat photo we get from our freeCodeCamp Cat Photo JSON API, we can pre-filter the json before we loop through it.",
"Let's filter out the cat whose \"id\" key has a value of 1.",
"Here's the code to do this:",
"json = json.filter(function(val) { return (val.id !== 1);});
"
diff --git a/seed/challenges/02-data-visualization-certification/react-projects.json b/seed/challenges/02-data-visualization-certification/react-projects.json
index c2307cfc2e..cddef0b574 100644
--- a/seed/challenges/02-data-visualization-certification/react-projects.json
+++ b/seed/challenges/02-data-visualization-certification/react-projects.json
@@ -61,7 +61,7 @@
"description": [
"Objective: Build a CodePen.io app that is functionally similar to this: https://codepen.io/FreeCodeCamp/full/eZGMjp/.",
"Fulfill the below user stories. Use whichever libraries or APIs you need. Give it your own personal style.",
- "User Story: I can see a table of the Free Code Camp campers who've earned the most brownie points in the past 30 days.",
+ "User Story: I can see a table of the freeCodeCamp campers who've earned the most brownie points in the past 30 days.",
"User Story: I can see how many brownie points they've earned in the past 30 days, and how many they've earned total.",
"User Story: I can toggle between sorting the list by how many brownie points they've earned in the past 30 days and by how many brownie points they've earned total.",
"Hint: To get the top 100 campers for the last 30 days: https://fcctop100.herokuapp.com/api/fccusers/top/recent.",
diff --git a/server/boot/user.js b/server/boot/user.js
index 29e3338ba8..913c42949d 100644
--- a/server/boot/user.js
+++ b/server/boot/user.js
@@ -221,7 +221,7 @@ module.exports = function(app) {
return res.redirect('/');
}
return res.render('account/signin', {
- title: 'Sign in to Free Code Camp'
+ title: 'Sign in to freeCodeCamp'
});
}
@@ -239,7 +239,7 @@ module.exports = function(app) {
return res.redirect('/');
}
return res.render('account/deprecated-signin', {
- title: 'Sign in to Free Code Camp using a Deprecated Login'
+ title: 'Sign in to freeCodeCamp using a Deprecated Login'
});
}
@@ -257,7 +257,7 @@ module.exports = function(app) {
return res.redirect('/');
}
return res.render('account/email-signin', {
- title: 'Sign in to Free Code Camp using your Email Address'
+ title: 'Sign in to freeCodeCamp using your Email Address'
});
}
@@ -266,7 +266,7 @@ module.exports = function(app) {
return res.redirect('/');
}
return res.render('account/email-signup', {
- title: 'Sign up for Free Code Camp using your Email Address'
+ title: 'Sign up for freeCodeCamp using your Email Address'
});
}
diff --git a/server/views/account/show.jade b/server/views/account/show.jade
index 4a27079e59..9b8232d0d8 100644
--- a/server/views/account/show.jade
+++ b/server/views/account/show.jade
@@ -15,7 +15,7 @@ block content
| Update my settings
.col-xs-12
a.btn.btn-lg.btn-block.btn-primary.btn-link-social(href='/signout')
- | Sign me out of Free Code Camp
+ | Sign me out of freeCodeCamp
.col-xs-12
a.btn.btn-lg.btn-block.btn-primary.btn-link-social(href='mailto:team@freecodecamp.com')
| Email us at team@freecodecamp.com
diff --git a/server/views/account/signin.jade b/server/views/account/signin.jade
index f6a5b02c1b..1b77878dfa 100644
--- a/server/views/account/signin.jade
+++ b/server/views/account/signin.jade
@@ -1,7 +1,7 @@
extends ../layout
block content
.text-center
- h2 Are you new to Free Code Camp?
+ h2 Are you new to freeCodeCamp?
.spacer
a.btn.btn-lg.btn-block.btn-social.btn-primary(href='/email-signup')
i.fa.fa-envelope
diff --git a/server/views/emails/a-extend-user-welcome.ejs b/server/views/emails/a-extend-user-welcome.ejs
index 97b0f159cd..c2ef0ebcbf 100644
--- a/server/views/emails/a-extend-user-welcome.ejs
+++ b/server/views/emails/a-extend-user-welcome.ejs
@@ -10,7 +10,7 @@ Please verify your email by following the link below:
<%= verifyHref %>
-Feel free to email us at this address if you have any questions about Free Code Camp.
+Feel free to email us at this address if you have any questions about freeCodeCamp.
And if you have a moment, check out our blog: https://medium.freecodecamp.com.
@@ -20,4 +20,4 @@ Good luck with the challenges!
-- the Free Code Camp Team.
+- the freeCodeCamp Team
diff --git a/server/views/emails/certified.ejs b/server/views/emails/certified.ejs
index 0987058f4e..93bcc7009c 100644
--- a/server/views/emails/certified.ejs
+++ b/server/views/emails/certified.ejs
@@ -1,6 +1,6 @@
Hi <%= name || username %>,
-Congratulations on recently completing all three Free Code Camp certifications. But you have not yet finished Free Code Camp. The most important part still remains: the nonprofit projects.
+Congratulations on recently completing all three freeCodeCamp certifications. But you have not yet finished freeCodeCamp. The most important part still remains: the nonprofit projects.
These will help you contextualize and apply the raw skills you've picked up. You'll practice by building full stack JavaScript apps that real people will use. And in the end, you'll have code in production that you can showcase in your portfolio. This will be critical to your job search.
@@ -10,4 +10,4 @@ Once you fill this out we will get back to you as quickly as possible to get you
Best,
-Michael - nonprofit guy @ Free Code Camp
+Michael - nonprofit guy @ freeCodeCamp
diff --git a/server/views/emails/user-email-verify.ejs b/server/views/emails/user-email-verify.ejs
index a7f23e373d..7184c7be99 100644
--- a/server/views/emails/user-email-verify.ejs
+++ b/server/views/emails/user-email-verify.ejs
@@ -7,8 +7,8 @@ Please verify your email by following the link below:
<%= verifyHref %>
-Please email us at this address if you have any questions about Free Code Camp.
+Please email us at this address if you have any questions about freeCodeCamp.
-- the Free Code Camp Team
\ No newline at end of file
+- the freeCodeCamp Team
\ No newline at end of file
diff --git a/server/views/partials/meta.jade b/server/views/partials/meta.jade
index 8ba19b0ca6..121f6333c7 100644
--- a/server/views/partials/meta.jade
+++ b/server/views/partials/meta.jade
@@ -2,7 +2,7 @@ meta(charset='utf-8')
meta(http-equiv='X-UA-Compatible', content='IE=edge')
meta(name='viewport', content='width=device-width, initial-scale=1.0')
meta(name='csrf-token', content=_csrf)
-title #{title} | Free Code Camp
+title #{title} | freeCodeCamp
link(rel='canonical', href='http://freecodecamp.com')
meta(charset='utf-8')
meta(http-equiv='X-UA-Compatible', content='IE=edge')
@@ -10,7 +10,7 @@ meta(name='viewport', content='width=device-width, initial-scale=1.0')
meta(name='csrf-token', content=_csrf)
meta(name='keywords', content='learn to code, learn to program, learn programming, learn javascript, learn coding, code, coding, programming, software engineer, software developer, mean stack, web development, development, engineering, learn node.js, learn angular.js, learn express.js, learn mongoDB, coding bootcamp, javascript, open source')
meta(property="og:title", content="Learn to code and help nonprofits")
-meta(property="og:site_name", content="Free Code Camp")
+meta(property="og:site_name", content="freeCodeCamp")
meta(name='twitter:widgets:csp', content='on')
meta(name='p:domain_verify', content='d0bc047a482c03c24f1168004c2a216a')
meta(property="og:url", content="http://www.freecodecamp.com")
diff --git a/server/views/partials/navbar.jade b/server/views/partials/navbar.jade
index 1f9450c98d..40be62c9a5 100644
--- a/server/views/partials/navbar.jade
+++ b/server/views/partials/navbar.jade
@@ -4,17 +4,15 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height
.col-xs-12
span.hamburger-text Menu
a.navbar-brand(href='/challenges/next-challenge')
- img.img-responsive.nav-logo(src='https://s3.amazonaws.com/freecodecamp/freecodecamp_logo.svg', alt='learn to code javascript at Free Code Camp logo')
+ img.img-responsive.nav-logo(src='https://s3.amazonaws.com/freecodecamp/freecodecamp_logo.svg', alt='learn to code javascript at freeCodeCamp logo')
.collapse.navbar-collapse
ul.nav.navbar-nav.navbar-right.hamburger-dropdown
li.hidden-xs
a#nav-map-btn(href='/map' onclick='if (!(event.ctrlKey || event.metaKey)) {return false;}') Map
li.visible-xs
a(href='/map') Map
- li.hidden-xs
- a#nav-chat-btn(href='//gitter.im/freecodecamp/freecodecamp' onclick="if (!(event.ctrlKey || event.metaKey)) {return false;}") Chat
- li.visible-xs
- a(href="//gitter.im/freecodecamp/freecodecamp" target="_blank") Chat
+ li
+ a(href="//gitter.im/freecodecamp/home" target="_blank") Chat
li
a(href='http://forum.freecodecamp.com', target='_blank') Forum
li
diff --git a/server/views/resources/nonprofits.jade b/server/views/resources/nonprofits.jade
index 962c78357d..afea1dd6ad 100644
--- a/server/views/resources/nonprofits.jade
+++ b/server/views/resources/nonprofits.jade
@@ -23,15 +23,15 @@ block content
.row
.col-xs-12.col-sm-12.col-md-4
img.img-responsive.testimonial-image.img-center(src="//i.imgur.com/ZHnFFN5.jpg", alt="Ewa's testimonial image")
- p.nonprofit-testimonial-copy With Free Code Camp's valuable contribution, we were able to improve all of our systems and processes as part of our Wonder Women Eastern Indonesia program, and make sure that even more life changing technologies get to where they are needed most.
+ p.nonprofit-testimonial-copy With freeCodeCamp's valuable contribution, we were able to improve all of our systems and processes as part of our Wonder Women Eastern Indonesia program, and make sure that even more life changing technologies get to where they are needed most.
h3 - Ewa Wojkowska with Kopernik
.col-xs-12.col-sm-12.col-md-4
img.img-responsive.testimonial-image.img-center(src="//i.imgur.com/KHF8O2i.jpg", alt="Jennifer's testimonial image")
- p.nonprofit-testimonial-copy We have been blown away by the professional quality of the work that has been produced by the campers working on our projects. Free Code Camp has been an invaluable partner and we are grateful for their support.
+ p.nonprofit-testimonial-copy We have been blown away by the professional quality of the work that has been produced by the campers working on our projects. freeCodeCamp has been an invaluable partner and we are grateful for their support.
h3 - Jennifer McDowell with Child First Authority
.col-xs-12.col-sm-12.col-md-4
img.img-responsive.testimonial-image.img-center(src="//i.imgur.com/9VknVe3.jpg", alt="Stephanie's testimonial image")
- p.nonprofit-testimonial-copy We had the pleasure to work with two very talented campers who went above and beyond to create a web-based app for us. I would highly recommend that nonprofits apply to Free Code Camp with their custom solution needs!
+ p.nonprofit-testimonial-copy We had the pleasure to work with two very talented campers who went above and beyond to create a web-based app for us. I would highly recommend that nonprofits apply to freeCodeCamp with their custom solution needs!
h3 - Stephanie McAllister with Timeraiser
.spacer
hr
diff --git a/server/views/resources/software-resources-for-nonprofits.jade b/server/views/resources/software-resources-for-nonprofits.jade
index 470ecdf82a..c910b0d32b 100644
--- a/server/views/resources/software-resources-for-nonprofits.jade
+++ b/server/views/resources/software-resources-for-nonprofits.jade
@@ -3,7 +3,7 @@ block content
.col-xs-12.col-sm-8.col-sm-offset-2.col-md-6.col-md-offset-3
h2.text-center Software Resources for Nonprofits
hr
- p Please note that Free Code Camp is not partnered with, nor do we receive a referral fee from, any of the following providers. We simply want to help guide you toward a solution for your organization.
+ p Please note that freeCodeCamp is not partnered with, nor do we receive a referral fee from, any of the following providers. We simply want to help guide you toward a solution for your organization.
h3 Skills-based Volunteer Organizations:
ul
li
diff --git a/server/views/resources/welcome.jade b/server/views/resources/welcome.jade
index 373702c879..1ce1f0bd44 100644
--- a/server/views/resources/welcome.jade
+++ b/server/views/resources/welcome.jade
@@ -2,7 +2,7 @@ extends ../layout
block content
.row
.col-xs-12.col-sm-10.col-sm-offset-1.col-md-6.col-md-offset-3.text-center
- h1 Welcome to Free Code Camp!
+ h1 Welcome to freeCodeCamp!
p You have created a brand new account. Check your email so we can verify your email address.
p If you previously had an account, and created this new account by accident, try signing in with a different email address
a(href='/email-signin') here