gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging

Browse Source
This commit is contained in:
Quincy Larson
2015-09-09 20:41:13 -07:00
parent 3afedf14f7 d02ad70913
commit 8ed1cf2fb9
12 changed files with 86 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -7,7 +7,7 @@
Welcome to Free Code Camp's open source codebase! Welcome to Free Code Camp's open source codebase!
======================= =======================
Free Code Camp is an open-source community of busy people who learn to code, then build projects for nonprofits. Free Code Camp is an open-source community of busy people who learn to code and build projects for nonprofits.
Our campers (students) start by working through our free, self-paced, browser-based curriculum. Next, they build several practice projects. Finally, we pair two campers together with a stakeholder from a nonprofit organization, and help them build the solution the nonprofit has requested. Our campers (students) start by working through our free, self-paced, browser-based curriculum. Next, they build several practice projects. Finally, we pair two campers together with a stakeholder from a nonprofit organization, and help them build the solution the nonprofit has requested.
@ -24,7 +24,7 @@ This code is running live at [FreeCodeCamp.com](http://www.FreeCodeCamp.com). We
Wiki Wiki
------------ ------------
We would love your help expanding our [wiki](https://github.com/freecodecamp/freecodecamp/wiki) with more information about learning to code and getting a coding job. We would love your help expanding our [wiki](https://github.com/freecodecamp/freecodecamp/wiki). Our goal is to become a great resource for people learning to code, building local coding communities, and applying for coding jobs.
Contributing Contributing
------------ ------------

5
client/commonFramework.js
View File

@ -244,6 +244,7 @@ editor.setOption('extraKeys', {
} }
}, },
'Ctrl-Enter': function() { 'Ctrl-Enter': function() {
isInitRun = false;
bonfireExecute(true); bonfireExecute(true);
return false; return false;
} }
@ -415,9 +416,6 @@ var testSuccess = function() {
if (goodTests === tests.length) { if (goodTests === tests.length) {
return showCompletion(); return showCompletion();
} }
// test unsuccessful, make sure initRun is set to false
isInitRun = false;
}; };
function ctrlEnterClickHandler(e) { function ctrlEnterClickHandler(e) {
@ -779,6 +777,7 @@ function bonfireExecute(shouldTest) {
} }
$('#submitButton').on('click', function() { $('#submitButton').on('click', function() {
isInitRun = false;
bonfireExecute(true); bonfireExecute(true);
}); });

2
server/boot/home.js
View File

@ -1,7 +1,7 @@
import { defaultProfileImage } from '../../common/utils/constantStrings.json'; import { defaultProfileImage } from '../../common/utils/constantStrings.json';
const message = const message =
'Learn to Code JavaScript and get a Coding Job by Helping Nonprofits'; 'Learn to Code and Build Projects for Nonprofits';
module.exports = function(app) { module.exports = function(app) {
var router = app.loopback.Router(); var router = app.loopback.Router();

6
server/views/challengeMap/show.jade
View File

@ -1,5 +1,11 @@
extends ../layout extends ../layout
block content block content
.panel
h3.text-center Your friends won't hear about our open source community unless you tell them.
.row
.col-xs-12.col-sm-10.col-sm-offset-1.col-md-8.col-md-offset-2
a.btn.btn-lg.btn-primary.btn-block(href="https://www.facebook.com/sharer/sharer.php?u=http://freecodecamp.com" target='_blank') Share our open source community on Facebook
.spacer
.panel.panel-info .panel.panel-info
.panel-heading.text-center .panel-heading.text-center
h1 Challenge Map h1 Challenge Map

8
server/views/coursewares/showBonfire.jade
View File

@ -82,7 +82,7 @@ block content
alert(type='danger') alert(type='danger')
span.ion-close-circled span.ion-close-circled
| Username not found | Username not found
label.negative-10.btn.btn-primary.btn-block#submitButton label.negative-10.btn.btn-primary.btn-block.btn-lg#submitButton
i.fa.fa-play i.fa.fa-play
|   Run tests (ctrl + enter) |   Run tests (ctrl + enter)
.button-spacer .button-spacer
@ -99,8 +99,12 @@ block content
label.btn.btn-success#trigger-issue-modal label.btn.btn-success#trigger-issue-modal
i.fa.fa-bug i.fa.fa-bug
|   Bug |   Bug
if (!user)
.button-spacer
a.btn.signup-btn.btn-block.btn-block(href='/login') Sign in so you can save your progress
script.
var userLoggedIn = false;
.button-spacer .button-spacer
form.code form.code
.form-group.codeMirrorView .form-group.codeMirrorView
textarea#codeOutput(style='display: none;') textarea#codeOutput(style='display: none;')

31
server/views/coursewares/showHTML.jade
View File

@ -30,24 +30,23 @@ block content
for sentence in details for sentence in details
p.wrappable.negative-10!= sentence p.wrappable.negative-10!= sentence
.negative-bottom-margin-30 .negative-bottom-margin-30
label.negative-10.btn.btn-primary.btn-block#submitButton label.negative-10.btn.btn-primary.btn-lg.btn-block#submitButton
i.fa.fa-play i.fa.fa-play
|   Run tests (ctrl + enter) |   Run tests (ctrl + enter)
if (user) .button-spacer
.button-spacer .btn-group.input-group.btn-group-justified
.btn-group.input-group.btn-group-justified label.btn.btn-success#trigger-reset-modal
label.btn.btn-success#trigger-reset-modal i.fa.fa-refresh
i.fa.fa-refresh |   Reset
|   Reset label.btn.btn-success#trigger-help-modal
label.btn.btn-success#trigger-help-modal i.fa.fa-medkit
i.fa.fa-medkit |   Help
|   Help label.btn.btn-success#trigger-issue-modal
label.btn.btn-success#trigger-issue-modal i.fa.fa-bug
i.fa.fa-bug |   Bug
|   Bug script.
script. var userLoggedIn = true;
var userLoggedIn = true; if (!user)
else
.button-spacer .button-spacer
a.btn.signup-btn.btn-block.btn-block(href='/login') Sign in so you can save your progress a.btn.signup-btn.btn-block.btn-block(href='/login') Sign in so you can save your progress
script. script.

7
server/views/coursewares/showJS.jade
View File

@ -35,7 +35,7 @@ block content
.form-group.text-center.negative-10 .form-group.text-center.negative-10
.col-xs-12 .col-xs-12
// extra field to distract password tools like lastpass from injecting css into our username field // extra field to distract password tools like lastpass from injecting css into our username field
label.negative-10.btn.btn-primary.btn-block#submitButton label.negative-10.btn.btn-primary.btn-lg.btn-block#submitButton
i.fa.fa-play i.fa.fa-play
|   Run tests (ctrl + enter) |   Run tests (ctrl + enter)
.button-spacer .button-spacer
@ -49,6 +49,11 @@ block content
label.btn.btn-success#trigger-issue-modal label.btn.btn-success#trigger-issue-modal
i.fa.fa-bug i.fa.fa-bug
|   Bug |   Bug
if (!user)
.button-spacer
a.btn.signup-btn.btn-block.btn-block(href='/login') Sign in so you can save your progress
script.
var userLoggedIn = false;
.button-spacer .button-spacer
form.code form.code
.form-group.codeMirrorView .form-group.codeMirrorView

28
server/views/coursewares/showVideo.jade
View File

@ -15,22 +15,22 @@ block content
.col-xs-12.col-sm-12.col-md-8 .col-xs-12.col-sm-12.col-md-8
.embed-responsive.embed-responsive-16by9 .embed-responsive.embed-responsive-16by9
iframe.embed-responsive-item(src='//player.vimeo.com/video/#{video}') iframe.embed-responsive-item(src='//player.vimeo.com/video/#{video}')
br .spacer
if (user) if (user)
a.btn.btn-primary.btn-big.btn-block#completed-courseware-editorless I've completed this challenge (ctrl + enter) a.btn.btn-primary.btn-big.btn-block#completed-courseware-editorless I've completed this challenge (ctrl + enter)
else
a.btn.btn-big.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) I've completed this challenge (ctrl + enter)
script. script.
var userLoggedIn = true; var userLoggedIn = true;
.button-spacer .button-spacer
.btn-group.input-group.btn-group-justified .btn-group.input-group.btn-group-justified
.btn.btn-success.btn-big#trigger-help-modal-modal .btn.btn-success.btn-big#trigger-help-modal
i.fa.fa-medkit i.fa.fa-medkit
|   Get help |   Get help
.btn.btn-success.btn-big#trigger-issue-modal .btn.btn-success.btn-big#trigger-issue-modal
i.fa.fa-bug i.fa.fa-bug
|   Report a bug |   Report a bug
.button-spacer if (!user)
else
a.animated.fadeIn.btn.btn-big.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge (ctrl + enter)
.button-spacer .button-spacer
a.btn.btn-big.signup-btn.btn-block(href='/login') Sign in so you can save your progress a.btn.btn-big.signup-btn.btn-block(href='/login') Sign in so you can save your progress
script. script.
@ -66,7 +66,7 @@ block content
.animated.zoomInDown.delay-half .animated.zoomInDown.delay-half
span.completion-icon.ion-checkmark-circled.text-primary span.completion-icon.ion-checkmark-circled.text-primary
if (user) if (user)
a.btn.btn-lg.btn-primary.btn-block#next-courseware-button(name='_csrf', value=_csrf) Go to my next challenge a.btn.btn-lg.btn-primary.btn-block#next-courseware-button(name='_csrf', value=_csrf) I've completed this challenge (ctrl + enter)
script. script.
$('#complete-courseware-editorless-dialog').bind('keypress', modalControlEnterHandler); $('#complete-courseware-editorless-dialog').bind('keypress', modalControlEnterHandler);
@ -76,7 +76,7 @@ block content
i.fa.fa-twitter   i.fa.fa-twitter  
= phrase = phrase
else else
a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) I've completed this challenge (ctrl + enter)
script. script.
$('body').bind('keypress', controlEnterHandler); $('body').bind('keypress', controlEnterHandler);
script. script.

28
server/views/coursewares/showZiplineOrBasejump.jade
View File

@ -18,22 +18,26 @@ block content
br br
if (user) if (user)
a.btn.btn-primary.btn-big.btn-block#completed-zipline-or-basejump I've completed this challenge (ctrl + enter) a.btn.btn-primary.btn-big.btn-block#completed-zipline-or-basejump I've completed this challenge (ctrl + enter)
.button-spacer
.btn-group.input-group.btn-group-justified
.btn.btn-success.btn-big#trigger-help-modal
i.fa.fa-medkit
|   Help
.btn.btn-success.btn-big#trigger-pair-modal
i.fa.fa-user-plus
|   Pair
.btn.btn-success.btn-big#trigger-issue-modal
i.fa.fa-bug
|   Bug
.button-spacer
script. script.
var userLoggedIn = true; var userLoggedIn = true;
else else
a.btn.btn-big.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge (ctrl + enter) a.btn.btn-big.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge (ctrl + enter)
<<<<<<< HEAD
.button-spacer
.btn-group.input-group.btn-group-justified
.btn.btn-success.btn-big#trigger-help-modal
i.fa.fa-medkit
| &nbsp; Help
.btn.btn-success.btn-big#trigger-pair-modal
i.fa.fa-user-plus
| &nbsp; Pair
.btn.btn-success.btn-big#trigger-issue-modal
i.fa.fa-bug
| &nbsp; Bug
if (!user)
.button-spacer
=======
>>>>>>> staging
a.btn.btn-big.signup-btn.btn-block(href='/login') Sign in so you can save your progress a.btn.btn-big.signup-btn.btn-block(href='/login') Sign in so you can save your progress
script. script.
var userLoggedIn = false; var userLoggedIn = false;

20
server/views/home.jade
View File

@ -3,12 +3,12 @@ block content
.jumbotron .jumbotron
.text-center .text-center
h1.hug-top Code with Us h1.hug-top Code with Us
h2 Let's learn to code by building projects for nonprofits h2 Let's learn to code and build projects for nonprofits
.row .row
.col-xs-12.col-sm-12.col-md-3 .col-xs-12.col-sm-12.col-md-3
h3.nowrap Get Connected h3.nowrap Get Connected
img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_connect.svg.gz', alt='Get great references and connections to start your software engineer career') img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_connect.svg.gz', alt='Get great references and connections to start your software engineer career')
p.landing-p Join a community of busy, motivated professionals. p.landing-p Join a community of busy, motivated people.
.col-xs-12.col-sm-12.col-md-3 .col-xs-12.col-sm-12.col-md-3
h3.nowrap Learn JavaScript h3.nowrap Learn JavaScript
img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_learn.svg.gz', alt='Learn to code and learn full stack JavaScript') img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_learn.svg.gz', alt='Learn to code and learn full stack JavaScript')
@ -77,18 +77,16 @@ block content
br br
br br
.big-break .big-break
h2 Why you should join our community right now: h2 Why you should join our open source community right now:
h3.col-xs-offset-0.col-sm-offset-1 h3.col-xs-offset-0.col-sm-offset-1
ul.text-left ul.text-left
li.ion-code &thinsp; We're thousands of professionals. We all learn to code together. li.ion-code &thinsp; You'll get help in real time from our community chat rooms.
li.ion-code &thinsp; We're building projects for dozens of nonprofits. li.ion-code &thinsp; You'll meet up with other coders in your city.
li.ion-code &thinsp; Our community is 100% free and open source.
li.ion-code &thinsp; You'll learn Full Stack JavaScript and become a Software Engineer.
li.ion-code &thinsp; You'll work through our focused, interactive courses and tutorials.
li.ion-code &thinsp; You'll learn to code at your own pace, in your browser or on your phone. li.ion-code &thinsp; You'll learn to code at your own pace, in your browser or on your phone.
li.ion-code &thinsp; You'll become qualified for thousands of jobs currently going unfilled. li.ion-code &thinsp; You'll work through our focused, interactive courses and tutorials.
li.ion-code &thinsp; You can get help in real time from our community chat rooms. li.ion-code &thinsp; You'll learn state-of-the-art full stack JavaScript technologies.
li.ion-code &thinsp; We all share one common goal: to boost our careers with code. li.ion-code &thinsp; You'll build projects that help nonprofits carry out their missions more effectively.
li.ion-code &thinsp; You'll assemble a portfolio of real apps used by real people.
.big-break .big-break
.row .row
.col-xs-12.col-sm-8.col-sm-offset-2 .col-xs-12.col-sm-8.col-sm-offset-2

12
server/views/partials/meta.jade
View File

@ -3,27 +3,27 @@ meta(charset='utf-8')
meta(http-equiv='X-UA-Compatible', content='IE=edge') meta(http-equiv='X-UA-Compatible', content='IE=edge')
meta(name='viewport', content='width=device-width, initial-scale=1.0') meta(name='viewport', content='width=device-width, initial-scale=1.0')
meta(name='csrf-token', content=_csrf) meta(name='csrf-token', content=_csrf)
meta(name='keywords', content='learn to code, learn how to code, code, coding, software engineer, software developer, mean stack, pair programming, node.js, angular.js, express.js, mongoDB, coding bootcamp') 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") meta(property="og:title", content="Learn to code and build projects for nonprofits")
meta(property="og:site_name", content="Free Code Camp") meta(property="og:site_name", content="Free Code Camp")
meta(name='twitter:widgets:csp', content='on') meta(name='twitter:widgets:csp', content='on')
meta(name='p:domain_verify', content='d0bc047a482c03c24f1168004c2a216a') meta(name='p:domain_verify', content='d0bc047a482c03c24f1168004c2a216a')
meta(property="og:url", content="http://www.freecodecamp.com") meta(property="og:url", content="http://www.freecodecamp.com")
meta(property="og:description", content="Learn to code by helping nonprofits. Build your full stack web development portfolio today.") meta(property="og:description", content="Learn to code and build projects for nonprofits. Build your full stack web development portfolio today.")
meta(property="og:image", content="https://s3.amazonaws.com/freecodecamp/curriculum-diagram-full.jpg") meta(property="og:image", content="https://s3.amazonaws.com/freecodecamp/curriculum-diagram-full.jpg")
meta(property="og:type", content="article") meta(property="og:type", content="article")
meta(property="article:publisher", content="https://www.facebook.com/freecodecamp") meta(property="article:publisher", content="https://www.facebook.com/freecodecamp")
meta(property="article:section", content="Responsive") meta(property="article:section", content="Responsive")
link(rel="publisher", href="https://plus.google.com/+Freecodecamp") link(rel="publisher", href="https://plus.google.com/+Freecodecamp")
link(rel="author", href="https://plus.google.com/+Freecodecamp") link(rel="author", href="https://plus.google.com/+Freecodecamp")
meta(name="description", content="Learn to code by helping nonprofits. Build your full stack web development portfolio today.") meta(name="description", content="Learn to code and build projects for nonprofits. Build your full stack web development portfolio today.")
meta(name="twitter:creator", content="@freecodecamp") meta(name="twitter:creator", content="@freecodecamp")
meta(name="twitter:url", content="http://www.freecodecamp.com") meta(name="twitter:url", content="http://www.freecodecamp.com")
meta(name="twitter:site", content="@freecodecamp") meta(name="twitter:site", content="@freecodecamp")
meta(name="twitter:card", content="summary_large_image") meta(name="twitter:card", content="summary_large_image")
meta(name="twitter:image:src", content="https://s3.amazonaws.com/freecodecamp/curriculum-diagram-full.jpg") meta(name="twitter:image:src", content="https://s3.amazonaws.com/freecodecamp/curriculum-diagram-full.jpg")
meta(name="twitter:title", content="Learn to code by helping nonprofits") meta(name="twitter:title", content="Learn to code and build projects for nonprofits")
meta(name="twitter:description", content="We're a community where you learn to code by helping nonprofits. Build your full stack JavaScript Portfolio today.") meta(name="twitter:description", content="We're an open source community of busy people who learn to code and build projects for nonprofits. Build your full stack web development portfolio today.")
meta(content="a40ee5d5dba3bb091ad783ebd2b1383f", name="p:domain_verify") meta(content="a40ee5d5dba3bb091ad783ebd2b1383f", name="p:domain_verify")
meta(name="msapplication-TileColor", content="#FFFFFF") meta(name="msapplication-TileColor", content="#FFFFFF")
meta(name="msapplication-TileImage", content="/") meta(name="msapplication-TileImage", content="/")

6
server/views/resources/get-started.jade
View File

@ -8,7 +8,7 @@ block content
.thumbnail .thumbnail
img.gif-block.img-center.img-responsive.thumbnail(src='http://i.imgur.com/RlEk2IF.jpg' alt="a picture of Free Code Camp's 4 benefits: Get connected, Learn JavaScript, Build your Portfolio, Help nonprofits") img.gif-block.img-center.img-responsive.thumbnail(src='http://i.imgur.com/RlEk2IF.jpg' alt="a picture of Free Code Camp's 4 benefits: Get connected, Learn JavaScript, Build your Portfolio, Help nonprofits")
.caption .caption
p.large-p Welcome to Free Code Camp. We're an open source community of busy people who learn to code, then practice by building projects for nonprofits. p.large-p Welcome to Free Code Camp. We're an open source community of busy people who learn to code and build projects for nonprofits.
.big-spacer .big-spacer
.thumbnail .thumbnail
@ -20,7 +20,7 @@ block content
.thumbnail .thumbnail
img.gif-block.img-center.img-responsive(src='http://i.imgur.com/D7Y5luw.jpg' alt='A graph of the rate of job growth against growth in computer science degree graduates. There are 1.4 million jobs and only 400 million people to fill them.') img.gif-block.img-center.img-responsive(src='http://i.imgur.com/D7Y5luw.jpg' alt='A graph of the rate of job growth against growth in computer science degree graduates. There are 1.4 million jobs and only 400 million people to fill them.')
.caption .caption
p.large-p If you can finish Free Code Camp, you will be able to get a coding job. There are thousands of coding jobs currently going unfilled, and the demand for coders grows every year. p.large-p There are thousands of coding jobs currently going unfilled, and the demand for coders grows every year. If you want a coding job, we can help prepare you to get one.
.big-spacer .big-spacer
.thumbnail .thumbnail
@ -32,7 +32,7 @@ block content
.thumbnail .thumbnail
img.gif-block.img-center.img-responsive(src='http://i.imgur.com/yXyxbDd.jpg' alt='a screen shot of our nonprofit project directory.') img.gif-block.img-center.img-responsive(src='http://i.imgur.com/yXyxbDd.jpg' alt='a screen shot of our nonprofit project directory.')
.caption .caption
p.large-p During the last 800 hours, you'll build several real-life projects for nonprofits. By the time you finish, you'll have a job-winning portfolio of real apps that people use every day. p.large-p During the last 800 hours, you'll build several real-life projects for nonprofits. By the time you finish, you'll have a portfolio of real apps that people use every day.
.big-spacer .big-spacer
.thumbnail .thumbnail