diff --git a/app.js b/app.js index 3d59edce81..38385282fd 100644 --- a/app.js +++ b/app.js @@ -149,8 +149,8 @@ app.get('/reset/:token', userController.getReset); app.post('/reset/:token', userController.postReset); app.get('/signup', userController.getSignup); app.post('/signup', userController.postSignup); -app.get('/non-profits', contactController.getContact); -app.post('/non-profits', contactController.postContact); +app.get('/nonprofits', contactController.getContact); +app.post('/nonprofits', contactController.postContact); app.get('/account', passportConf.isAuthenticated, userController.getAccount); app.post('/account/profile', passportConf.isAuthenticated, userController.postUpdateProfile); app.post('/account/password', passportConf.isAuthenticated, userController.postUpdatePassword); diff --git a/controllers/contact.js b/controllers/contact.js index 95d5126a29..ee953b1cfe 100644 --- a/controllers/contact.js +++ b/controllers/contact.js @@ -36,7 +36,7 @@ exports.postContact = function(req, res) { if (errors) { req.flash('errors', errors); - return res.redirect('/non-profits'); + return res.redirect('/nonprofits'); } var from = req.body.email; @@ -55,9 +55,9 @@ exports.postContact = function(req, res) { transporter.sendMail(mailOptions, function(err) { if (err) { req.flash('errors', { msg: err.message }); - return res.redirect('/non-profits'); + return res.redirect('/nonprofits'); } req.flash('success', { msg: 'Email has been sent successfully!' }); - res.redirect('/non-profits'); + res.redirect('/nonprofits'); }); }; diff --git a/public/css/styles.less b/public/css/styles.less index f16ed16f3f..0bb1a98ed6 100644 --- a/public/css/styles.less +++ b/public/css/styles.less @@ -88,7 +88,7 @@ h1, h2, h3, h4, h5, h6, p, li { font-size: 40px; } -.non-profit-cta { +.nonprofit-cta { font-size: 28px; } diff --git a/views/contact.jade b/views/contact.jade index 7a12aabcc3..9317da5169 100644 --- a/views/contact.jade +++ b/views/contact.jade @@ -2,7 +2,7 @@ extends layout block content .jumbotron - h1.animated.lightSpeedIn.text-center We'll code software solutions for your non-profit, for free! + h1.animated.lightSpeedIn.text-center We'll code software solutions for your nonprofit, for free! .animated.fadeIn.delay-2.landing-panel-body h3 Our students will help you build that donor tracking system, community message board, or whatever your organization needs,  strong at no cost. diff --git a/views/home.jade b/views/home.jade index c7cddef955..0dd1e4b048 100644 --- a/views/home.jade +++ b/views/home.jade @@ -5,7 +5,7 @@ block content .animated.pulse h1 Become a Software Engineer .delay-1.animated.pulse.slow-animation - h2 Learn to code by collaborating on projects for non-profits + h2 Learn to code by collaborating on projects for nonprofits .row .col-xs-12.col-sm-12.col-md-4 h3.delay-3.animated.pulse Technical Mastery @@ -18,17 +18,17 @@ block content .negative-10 span.landing-icon.ion-social-github.text-primary .negative-10 - p You'll use your new coding skills to build software solutions for non-profits. Your portfolio projects will have grateful users. + p You'll use your new coding skills to build software solutions for nonprofits. Your portfolio projects will have grateful users. .col-xs-12.col-sm-12.col-md-4 h3.delay-5.animated.pulse Glowing References .negative-10 span.landing-icon.ion-thumbsup.text-primary .negative-10 - p You'll gain the respect of your peers and the non-profits you help. These types of connections are critical to your job search. + p You'll gain the respect of your peers and the nonprofits you help. These types of connections are critical to your job search. a.btn.btn-cta.btn-primary(href="/login") Sign in now to start coding (it's free) br br - a.btn.non-profit-cta.btn-success(href="/non-profits") I'm with a non-profit and need something coded up + a.btn.nonprofit-cta.btn-success(href="/nonprofits") I'm with a nonprofit and want help coding something br .panel.panel-primary .panel-heading.landing-panel-heading Frequently Asked Questions @@ -50,7 +50,7 @@ block content li • Git - the best way to save and share your projects li • Databases - SQL is like a giant spread sheet that stores and retrieves your data li • Algorithms - these are basically step-by-step recipies for getting things done - p You'll spend the last half of Free Code Camp using Agile Methodologies and Full Stack JavaScript to build projects for non-profits: + p You'll spend the last half of Free Code Camp using Agile Methodologies and Full Stack JavaScript to build projects for nonprofits: ul li • Agile - a set of software development principles that focus the design and production of a project on the needs of its users. li • MongoDB - a popular non-relational database @@ -59,7 +59,7 @@ block content li • NodeJS - a JavaScript-based web server h2 How will I learn all this? ul - p By pair programming with other Free Code Camp students on our coding challenges. We've also built an optional curriculum of the best free courses on the web. Eventually, you'll work with people at non-profits to build real-life software solutions. + p By pair programming with other Free Code Camp students on our coding challenges. We've also built an optional curriculum of the best free courses on the web. Eventually, you'll work with people at nonprofits to build real-life software solutions. h2 What is 'pair programming', and what's so special about it? ul p Pair programming is where two people code together on one computer. You discuss different approaches to solving problems, and keep each other motivated. The result is better code than either of you could have written by yourselves. Because of its benefits, many engineers pair program full time. And it's the best way to learn coding. Thanks to tools like Screen Hero, you can pair program online without needing to be in the same room. @@ -93,14 +93,14 @@ block content img.img-center.img-responsive(src="http://dberkholz-media.redmonk.com/dberkholz/files/2014/04/github_new_repos-custom.png", style="max-height: 300px;") h2 Will I be ready to get a software engineer job after this? ul - p At the end of Free Code Camp, you will have pair programmed around 1,000 hours with dozens of other students, built a portfolio of projects that people are actively using, and a roster of glowing references from non-profits you've helped. On average, 75% of bootcamp graduates get software engineering jobs within 6 months, and earn an average annual salary of $76,000. + p At the end of Free Code Camp, you will have pair programmed around 1,000 hours with dozens of other students, built a portfolio of projects that people are actively using, and a roster of glowing references from nonprofits you've helped. On average, 75% of bootcamp graduates get software engineering jobs within 6 months, and earn an average annual salary of $76,000. img.img-center.img-responsive(src="https://www.evernote.com/shard/s116/sh/4bb05639-d86c-4c15-b3a8-e4a43fa22d89/7cf00ed01124fac6e6741b97f8fb9e6f/deep/0/https---www.coursereport.com-2014-graduate-survey.pdf.png") h2 Is this really free? Do you claim part of my first year's salary like some bootcamps do? ul p Our name is Free Code Camp. We are a free code camp. If you had to pay us (or sign over future earnings), we'd have to change our name. And we are not going to do that. h2 Does Free Code Camp have an application process? ul - p Unlike most bootcamps, anyone can study at Free Code Camp. We're not going to tell you that you can't become a software engineer. We believe the only person who should be able to tell you that is you. If you perservere, and keep working through our challenges and non-profits' projects, you will become an employable software engineer. + p Unlike most bootcamps, anyone can study at Free Code Camp. We're not going to tell you that you can't become a software engineer. We believe the only person who should be able to tell you that is you. If you perservere, and keep working through our challenges and nonprofits' projects, you will become an employable software engineer. br .text-center a.btn.btn-cta.btn-primary(href="/login") Sign in now to start coding (it's free) \ No newline at end of file diff --git a/views/partials/challenges.jade b/views/partials/challenges.jade index b0c72f87e5..0993188ce0 100644 --- a/views/partials/challenges.jade +++ b/views/partials/challenges.jade @@ -38,6 +38,6 @@ li a.disabled(href="#") Reverse Engineer Pintrest li - a.disabled(href="#") Help a Non-profit: Team Project + a.disabled(href="#") Help a Nonprofit: Team Project li - a.disabled(href="#") Help a Non-profit: Solo Project \ No newline at end of file + a.disabled(href="#") Help a Nonprofit: Solo Project \ No newline at end of file diff --git a/views/partials/meta.jade b/views/partials/meta.jade index 2a7aa7b05f..5b0545bdfe 100644 --- a/views/partials/meta.jade +++ b/views/partials/meta.jade @@ -3,24 +3,24 @@ 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) meta(name='keywords', content='free code camp mean stack screenhero remote pair programming node.js angular.js express.js mongoDB coding bootcamp') -meta(content="A free online coding bootcamp for busy people. Learn JavaScript, build a portfolio, and get great references - all by helping non-profits!", property="og:title") +meta(content="A free online coding bootcamp for busy people. Learn JavaScript, build a portfolio, and get great references - all by helping nonprofits!", property="og:title") meta(content="FreeCodeCamp", property="og:site_name") meta(content="http://www.freecodecamp.com", property="og:url") -meta(content="A free online coding bootcamp for busy people. Learn JavaScript, build a portfolio, and get great references - all by helping non-profits!", property="og:description") +meta(content="A free online coding bootcamp for busy people. Learn JavaScript, build a portfolio, and get great references - all by helping nonprofits!", property="og:description") meta(content="https://pbs.twimg.com/profile_images/522961310212833280/XE6vGAaO.jpeg", property="og:image") meta(content="article", property="og:type") meta(content="https://www.facebook.com/freecodecamp", property="article:publisher") meta(content="Responsive", property="article:section") //meta(content="44011818", property="fb:admins") //Google -meta(content="A free online coding bootcamp for busy people. Learn JavaScript, build a portfolio, and get great references - all by helping non-profits!", name="description") +meta(content="A free online coding bootcamp for busy people. Learn JavaScript, build a portfolio, and get great references - all by helping nonprofits!", name="description") link(href="https://plus.google.com/114148836969274586544", rel="author") //Twitter meta(content="freecodecamp", name="twitter:creator") meta(content="http://www.freecodecamp.com", name="twitter:url") meta(content="freecodecamp", name="twitter:site") //meta(content="summary_large_image", name="twitter:card") -meta(content="A free online coding bootcamp for busy people. Learn JavaScript, build a portfolio, and get great references - all by helping non-profits!", name="twitter:title") +meta(content="A free online coding bootcamp for busy people. Learn JavaScript, build a portfolio, and get great references - all by helping nonprofits!", name="twitter:title") meta(content="https://pbs.twimg.com/profile_images/522961310212833280/XE6vGAaO.jpeg", name="twitter:image:src") -meta(content="A free online coding bootcamp for busy people. Learn JavaScript, build a portfolio, and get great references - all by helping non-profits!", name="twitter:description") +meta(content="A free online coding bootcamp for busy people. Learn JavaScript, build a portfolio, and get great references - all by helping nonprofits!", name="twitter:description") meta(content="a40ee5d5dba3bb091ad783ebd2b1383f", name="p:domain_verify") \ No newline at end of file