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

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

Browse Source
This commit is contained in:
Berkeley Martinez
2015-08-16 03:45:32 -07:00
parent 0908844e6d 1fbb2a32f8
commit db21489541
13 changed files with 778 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
seed/challenges/angularjs.json
View File

@ -1,6 +1,6 @@
{
"name": "AngularJS",
"order": 0.017,
"order": 0.014,
"challenges": [
{
"id": "bd7154d8c441eddfaeb5bdef",

40
seed/challenges/automated-testing-and-debugging.json
View File

@ -1,22 +1,23 @@
{
"name": "Automated Testing and Debugging - Coming Soon",
"name": "Automated Testing and Debugging",
"order": 0.012,
"challenges": [
{
"id":"cf1111c1c16feddfaeb6bdef",
"title":"Using the Javascript console",
"title":"Use the Javascript Console",
"difficulty":0,
"description":[
"",
"The browser console is the best and easiest tool for debugging your scripts",
"It can normally be access by pressing f12 in most browsers or right click > inspect element > console",
"Let's print to this console using the console.log method",
"Both Chrome and Firefox have excellent JavaScript consoles, also known as DevTools, for debugging your JavaScript.",
"You can find <code>Developer tools</code> in your Chrome's menu or <code>Web Console</code> in FireFox's menu. If you're using a different browser, or a mobile phone, we strongly recommend switching to desktop Firefox or Chrome.",
"Let's print to this console using the <code>console.log</code> method.",
"<code>console.log('Hello world!')</code>"
],
"tests":[
"assert(editor.getValue().match(/console\\.log\\(/gi), 'You should use the console.log method to ');"
"assert(editor.getValue().match(/console\\.log\\(/gi), 'You should use the console.log method to log \"Hello world!\" to your JavaScript console.');"
],
"challengeSeed":[
"",
"",
""
],
"challengeType":1
@ -26,22 +27,23 @@
"title":"Using typeof",
"difficulty":0,
"description":[
"",
"typeof is a useful method that we can use to check the type of a variable",
"One thing to be careful of is that an array has the type objects",
"Try using each of these to see the types they have",
"<code>console.log(typeof(\"\"));",
"console.log(typeof(0));",
"console.log(typeof([]));",
"console.log(typeof({}));</code>"
"<code>typeof</code> is a useful method that we can use to check the type of a variable.",
"One thing to be careful of is that an array has the type objects.",
"Try using each of these to see the types they have.",
"<code>console.log(typeof(\"\"));</code>",
"<code>console.log(typeof(0));</code>",
"<code>console.log(typeof([]));</code>",
"<code>console.log(typeof({}));</code>"
],
"tests":[
"assert(editor.getValue().match(/console\\.log\\(typeof\\(\"\"\\)\\);/gi), 'You should console.log the typeof a string');",
"assert(editor.getValue().match(/console\\.log\\(typeof\\(0\\)\\);/gi), 'You should console.log the typeof a number');",
"assert(editor.getValue().match(/console\\.log\\(typeof\\(\\[\\]\\)\\);/gi), 'You should console.log the typeof a array');",
"assert(editor.getValue().match(/console\\.log\\(typeof\\(\\{\\}\\)\\);/gi), 'You should console.log the typeof a object');"
"assert(editor.getValue().match(/console\\.log\\(typeof\\(\"\"\\)\\);/gi), 'You should <code>console.log</code> the <code>typeof</code> a string.');",
"assert(editor.getValue().match(/console\\.log\\(typeof\\(0\\)\\);/gi), 'You should <code>console.log</code> the <code>typeof</code> a number.');",
"assert(editor.getValue().match(/console\\.log\\(typeof\\(\\[\\]\\)\\);/gi), 'You should <code>console.log</code> the <code>typeof</code> an array.');",
"assert(editor.getValue().match(/console\\.log\\(typeof\\(\\{\\}\\)\\);/gi), 'You should <code>console.log</code> the <code>typeof</code> a object.');"
],
"challengeSeed":[
"",
"",
""
],
"challengeType":1

793
seed/challenges/basic-javascript.json
View File

File diff suppressed because it is too large Load Diff

2
seed/challenges/git.json
View File

@ -1,6 +1,6 @@
{
"name": "Git",
"order" : 0.014,
"order" : 0.016,
"challenges": [
{
"id": "bd7353d8c341eddeaeb5bd0f",

4
seed/challenges/html5-and-css.json
View File

@ -438,7 +438,7 @@
"tests": [
"assert($(\"h2\").css(\"color\") === \"rgb(255, 0, 0)\", 'Your <code>h2</code> element should be red.')",
"assert($(\"h2\").hasClass(\"red-text\"), 'Your <code>h2</code> element should have the class <code>red-text</code>.')",
"assert($(\"h2\").attr(\"style\") === undefined, 'Don't use inline style declarations like <code>style=\"color: red\"</code> in your <code>h2</code> element.')"
"assert($(\"h2\").attr(\"style\") === undefined, 'Do not use inline style declarations like <code>style=\"color&#58; red\"</code> in your <code>h2</code> element.')"
],
"challengeSeed": [
"<style>",
@ -538,7 +538,7 @@
"title": "Change the Font Size of an Element",
"difficulty": 1.13,
"description": [
"Create a second <code>p</code> element with the following <code>kitty ipsum text<code>: <code>Purr jump eat the grass rip the couch scratched sunbathe, shed everywhere rip the couch sleep in the sink fluffy fur catnip scratched.</code>",
"Create a second <code>p</code> element with the following <code>kitty ipsum text</code>: <code>Purr jump eat the grass rip the couch scratched sunbathe, shed everywhere rip the couch sleep in the sink fluffy fur catnip scratched.</code>",
"Then, inside your <code>&#60;style&#62;</code> element, set the <code>font-size</code> of all <code>p</code> elements to 16 pixels.",
"Font size is controlled by the <code>font-size</code> CSS attribute, like this: <code>h1 { font-size: 30px; }</code>.",
"See if you can figure out how to give both of your <code>p</code> elements the font-size of 16 pixels (<code>16px</code>). You can do this inside the same <code>&#60;style&#62;</code> tag that we created for your <code>red-text</code> class."

1
seed/challenges/intermediate-bonfires.json
View File

@ -548,6 +548,7 @@
"difficulty": "2.11",
"description": [
"Find the smallest number that is evenly divisible by all numbers in the provided range.",
"In other words, given the range [3,7], you will need to find the least common multiple of 3, 4, 5, 6, and 7.",
"The range will be an array of two numbers that will not necessarily be in numerical order.",
"Remember to use <a href='//github.com/FreeCodeCamp/freecodecamp/wiki/How-to-get-help-when-you-get-stuck' target='_blank'>Read-Search-Ask</a> if you get stuck. Try to pair program. Write your own code."
],

2
seed/challenges/intermediate-ziplines.json
View File

@ -1,6 +1,6 @@
{
"name": "Intermediate Front End Development Projects",
"order": 0.018,
"order": 0.015,
"challenges": [
{
"id": "bd7158d8c442eddfaeb5bd18",

2
seed/challenges/mongodb.json
View File

@ -1,6 +1,6 @@
{
"name": "MongoDB",
"order" : 0.016,
"order" : 0.018,
"challenges": [
{
"id": "bd7243d8c341eddeaeb5bd0f",

2
seed/challenges/nodejs-and-expressjs.json
View File

@ -1,6 +1,6 @@
{
"name": "Node.js and Express.js",
"order" : 0.015,
"order" : 0.017,
"challenges": [
{
"id": "bd7153d8c441eddfaeb5bd0f",

11
seed/challenges/object-oriented-and-functional-programming.json
View File

@ -1,6 +1,6 @@
{
"name": "Object Oriented and Functional Programming",
"order": 0.009,
"order": 0.010,
"note": [
"Waypoint: Closures",
"Waypoint: Factories",
@ -15,7 +15,8 @@
"title":"Waypoint: A Review On Objects",
"difficulty":0,
"description":[
"Before we dive into Object Oriented Programming Let's take a quick look over objects in javascript"
"Before we dive into Object Oriented Programming, let's revisit JavaScript objects.",
"Give your <code>motorBike</code> object the correct attributes."
],
"tests":[
"assert(motorBike.wheels===2, 'You should have given motorBike two wheels');",
@ -47,7 +48,8 @@
"title":"Waypoint: Constructing Objects",
"difficulty":0,
"description":[
"We are also able to create Objects using functions"
"We are also able to create objects using functions.",
""
],
"tests":[
"assert((new Car()).wheels === 4, \"myCar.wheels should be four. Make sure that you haven't changed this value\");",
@ -55,12 +57,11 @@
"assert(typeof((new Car()).seats) === 'number', 'myCar.seats should be a number');"
],
"challengeSeed":[
"//Let's add the properties engine and seats to the car in the same way that the property wheels has been added below. They should both be numbers",
"// Let's add the properties engine and seats to the car in the same way that the property wheels has been added below. They should both be numbers.",
"var Car = function(){",
" this.wheels = 4;",
"};",
"",
"//Instantiated Here",
"var myCar = new Car();",
"",
"(function(){return(JSON.stringify(myCar));})();"

1
server/boot/story.js
View File

@ -167,7 +167,6 @@ module.exports = function(app) {
originalStoryLink: dashedName,
originalStoryAuthorEmail: story.author.email || '',
author: story.author,
description: story.description,
rank: story.upVotes.length,
upVotes: story.upVotes,
id: story.id,

23
server/views/stories/show.jade
View File

@ -23,19 +23,18 @@ h3.row
.col-xs-12.col-sm-12.col-md-6
h4= storyMetaDescription
.col-xs-12
h4= description
.negative-5
if !hasUserVoted
a#upvote.btn.btn-no-shadow.btn-primary.btn-xs.btn-primary-ghost Upvote
| &thinsp;·&thinsp;
else
a#upvote.btn.disabled.btn-no-shadow.btn-primary.btn-xs.btn-primary-ghost Upvoted!
| &thinsp;·&thinsp;
span#storyRank= rank + (rank > 1 ? " points" : " point")
.spacer
if !hasUserVoted
a#upvote.btn.btn-no-shadow.btn-primary.btn-xs.btn-primary-ghost Upvote
| &thinsp;·&thinsp;
span Posted #{timeAgo}
span &thinsp;by&thinsp;
a(href="/" + author.username) @#{author.username}
else
a#upvote.btn.disabled.btn-no-shadow.btn-primary.btn-xs.btn-primary-ghost Upvoted!
| &thinsp;·&thinsp;
span#storyRank= rank + (rank > 1 ? " points" : " point")
| &thinsp;·&thinsp;
span Posted #{timeAgo}
span &thinsp;by&thinsp;
a(href="/" + author.username) @#{author.username}
script.
if (image) {

7
server/views/stories/submit-story.jade
View File

@ -45,10 +45,3 @@
if (storyImage) {
$('#image-display').removeClass('hidden-element');
}
var text_max = 140;
$('#textarea_feedback').html(text_max + ' characters remaining');
$('#description-box').keyup(function () {
var text_length = $('#description-box').val().length;
var text_remaining = text_max - text_length;
$('#textarea_feedback').html(text_remaining + ' characters remaining');
});