diff --git a/common/app/routes/Jobs/components/Show.jsx b/common/app/routes/Jobs/components/Show.jsx
index 2c4825bcff..85034e3242 100644
--- a/common/app/routes/Jobs/components/Show.jsx
+++ b/common/app/routes/Jobs/components/Show.jsx
@@ -1,4 +1,4 @@
-import React, { createClass } from 'react';
+import React, { PropTypes } from 'react';
import { History } from 'react-router';
import { contain } from 'thundercats-react';
@@ -6,12 +6,66 @@ import ShowJob from './ShowJob.jsx';
import JobNotFound from './JobNotFound.jsx';
import { isJobValid } from '../utils';
+function shouldShowApply(
+ {
+ isFrontEndCert: isFrontEndCertReq = false,
+ isFullStackCert: isFullStackCertReq = false
+ }, {
+ isFrontEndCert = false,
+ isFullStackCert = false
+ }
+) {
+ return (!isFrontEndCertReq && !isFullStackCertReq) ||
+ (isFullStackCertReq && isFullStackCert) ||
+ (isFrontEndCertReq && isFrontEndCert);
+}
+
+function generateMessage(
+ {
+ isFrontEndCert: isFrontEndCertReq = false,
+ isFullStackCert: isFullStackCertReq = false
+ },
+ {
+ isFrontEndCert = false,
+ isFullStackCert = false,
+ isSignedIn = false
+ }
+) {
+
+ if (!isSignedIn) {
+ return 'Must be signed in to apply';
+ }
+ if (isFrontEndCertReq && !isFrontEndCert) {
+ return 'This employer requires Free Code Camp’s Front ' +
+ 'End Development Certification in order to apply';
+ }
+ if (isFullStackCertReq && !isFullStackCert) {
+ return 'This employer requires Free Code Camp’s Full ' +
+ 'Stack Development Certification in order to apply';
+ }
+ if (isFrontEndCertReq && isFrontEndCertReq) {
+ return 'This employer requires the Front End Development Certification. ' +
+ "You've earned it, so feel free to apply.";
+ }
+ return 'This employer requires the Full Stack Development Certification. ' +
+ "You've earned it, so feel free to apply.";
+}
+
export default contain(
{
- store: 'jobsStore',
+ stores: ['appStore', 'jobsStore'],
+ fetchWaitFor: 'jobsStore',
fetchAction: 'jobActions.getJob',
- map({ currentJob }) {
- return { job: currentJob };
+ combineLatest(
+ { username, isFrontEndCert, isFullStackCert },
+ { currentJob }
+ ) {
+ return {
+ username,
+ job: currentJob,
+ isFrontEndCert,
+ isFullStackCert
+ };
},
getPayload({ params: { id }, job = {} }) {
return {
@@ -25,9 +79,16 @@ export default contain(
return job.id !== id;
}
},
- createClass({
+ React.createClass({
displayName: 'Show',
+ propTypes: {
+ job: PropTypes.object,
+ isFullStackCert: PropTypes.bool,
+ isFrontEndCert: PropTypes.bool,
+ username: PropTypes.string
+ },
+
mixins: [History],
componentDidMount() {
@@ -39,12 +100,36 @@ export default contain(
},
render() {
- const { job } = this.props;
+ const {
+ isFullStackCert,
+ isFrontEndCert,
+ job,
+ username
+ } = this.props;
if (!isJobValid(job)) {
return
;
}
- return
;
+
+ const isSignedIn = !!username;
+
+ const showApply = shouldShowApply(
+ job,
+ { isFrontEndCert, isFullStackCert }
+ );
+
+ const message = generateMessage(
+ job,
+ { isFrontEndCert, isFullStackCert, isSignedIn }
+ );
+
+ return (
+
+ );
}
})
);
diff --git a/common/app/routes/Jobs/components/ShowJob.jsx b/common/app/routes/Jobs/components/ShowJob.jsx
index e9cddc55fc..db9cf511e5 100644
--- a/common/app/routes/Jobs/components/ShowJob.jsx
+++ b/common/app/routes/Jobs/components/ShowJob.jsx
@@ -22,7 +22,10 @@ export default React.createClass({
displayName: 'ShowJob',
propTypes: {
job: PropTypes.object,
- params: PropTypes.object
+ params: PropTypes.object,
+ showApply: PropTypes.bool,
+ preview: PropTypes.bool,
+ message: PropTypes.string
},
renderHeader({ company, position }) {
@@ -38,8 +41,45 @@ export default React.createClass({
);
},
+ renderHowToApply(showApply, preview, message, howToApply) {
+ if (!showApply) {
+ return (
+
+
+ { message }
+
+
+ );
+ }
+
+ return (
+
+
+
+ { preview ? 'How do I apply?' : message }
+
+
+
+
+
+
+ );
+ },
+
render() {
- const { job = {} } = this.props;
+ const {
+ showApply = true,
+ message,
+ preview = true,
+ job = {}
+ } = this.props;
+
const {
logo,
position,
@@ -93,20 +133,7 @@ export default React.createClass({
{ description }
-
-
-
- How do I apply?
-
-
-
-
-
-
+ { this.renderHowToApply(showApply, preview, message, howToApply) }
diff --git a/common/app/routes/Jobs/components/TwitterBtn.jsx b/common/app/routes/Jobs/components/TwitterBtn.jsx
index fb5f8edf12..7998353ffc 100644
--- a/common/app/routes/Jobs/components/TwitterBtn.jsx
+++ b/common/app/routes/Jobs/components/TwitterBtn.jsx
@@ -1,4 +1,4 @@
-import React, { createClass, PropTypes } from 'react';
+import React, { PropTypes } from 'react';
import { Button } from 'react-bootstrap';
const followLink = 'https://twitter.com/intent/follow?' +
@@ -9,7 +9,7 @@ function commify(count) {
return Number(count).toLocaleString('en');
}
-export default createClass({
+export default React.createClass({
displayName: 'FollowButton',
diff --git a/common/app/shared/displayCode/Display.jsx b/common/app/shared/displayCode/Display.jsx
deleted file mode 100644
index 9eb60db8da..0000000000
--- a/common/app/shared/displayCode/Display.jsx
+++ /dev/null
@@ -1,51 +0,0 @@
-var React = require('react'),
- Tailspin = require('tailspin');
-
-var Editor = React.createClass({
-
- propTypes: {
- value: React.PropTypes.string
- },
-
- getDefaultProps: function() {
- return {
- value: [
- '/**',
- '* Your output will go here.',
- '* Console.log() -type statements',
- '* will appear in your browser\'s',
- '* DevTools JavaScript console.',
- '**/'
- ].join('\n')
- };
- },
-
- render: function() {
- var value = this.props.value;
- var options = {
- lineNumbers: false,
- lineWrapping: true,
- mode: 'text',
- readOnly: 'noCursor',
- textAreaClassName: 'hide-textarea',
- theme: 'monokai',
- value: value
- };
-
- var config = {
- setSize: ['100%', '100%']
- };
-
- return (
-
- );
- }
-});
-
-module.exports = Editor;
diff --git a/common/app/shared/displayCode/index.js b/common/app/shared/displayCode/index.js
deleted file mode 100644
index d3e3560174..0000000000
--- a/common/app/shared/displayCode/index.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('./Display.jsx');
diff --git a/common/app/shared/editor/Editor.jsx b/common/app/shared/editor/Editor.jsx
deleted file mode 100644
index 8e72f5d4a0..0000000000
--- a/common/app/shared/editor/Editor.jsx
+++ /dev/null
@@ -1,91 +0,0 @@
-var React = require('react'),
- debug = require('debug')('freecc:comp:editor'),
- jshint = require('jshint').JSHINT,
- Tailspin = require('tailspin');
-
-var Editor = React.createClass({
-
- propTypes: {
- onValueChange: React.PropTypes.func,
- value: React.PropTypes.string
- },
-
- getDefaultProps: function() {
- return {
- value: 'console.log(\'freeCodeCamp is awesome\')'
- };
- },
-
- getInitialState: function() {
- return {
- value: this.props.value
- };
- },
-
- render: function() {
- var options = {
- autoCloseBrackets: true,
- gutters: ['CodeMirror-lint-markers'],
- lint: true,
- linter: jshint,
- lineNumbers: true,
- lineWrapping: true,
- mode: 'javascript',
- matchBrackets: true,
- runnable: true,
- scrollbarStyle: 'null',
- theme: 'monokai',
- textAreaClassName: 'hide-textarea',
- value: this.state.value,
- onChange: e => {
- this.setState({ value: e.target.value});
- if (typeof this.props.onValueChange === 'function') {
- this.props.onValueChange(e.target.value);
- }
- }
- };
-
- var config = {
- setSize: ['100%', 'auto'],
- extraKeys: {
- Tab: function(cm) {
- debug('tab pressed');
- if (cm.somethingSelected()) {
- cm.indentSelection('add');
- } else {
- var spaces = new Array(cm.getOption('indentUnit') + 1).join(' ');
- cm.replaceSelection(spaces);
- }
- },
- 'Shift-Tab': function(cm) {
- debug('shift-tab pressed');
- if (cm.somethingSelected()) {
- cm.indentSelection('subtract');
- } else {
- var spaces = new Array(cm.getOption('indentUnit') + 1).join(' ');
- cm.replaceSelection(spaces);
- }
- },
- 'Ctrl-Enter': function() {
- debug('C-enter pressed');
- // execute bonfire action
- return false;
- }
- }
- };
-
- return (
-
- );
- }
-});
-
-module.exports = Editor;
diff --git a/common/app/shared/editor/index.js b/common/app/shared/editor/index.js
deleted file mode 100644
index 5e431fabff..0000000000
--- a/common/app/shared/editor/index.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('./Editor.jsx');
diff --git a/common/models/challenge.json b/common/models/challenge.json
index 729cb97625..10ce49a058 100644
--- a/common/models/challenge.json
+++ b/common/models/challenge.json
@@ -44,6 +44,20 @@
"tests": {
"type": "array"
},
+ "head": {
+ "type": "array",
+ "default": [],
+ "description": "appended to user code"
+ },
+ "tail": {
+ "type": "array",
+ "default": [],
+ "description": "prepended to user code"
+ },
+ "fileName": {
+ "type": "string",
+ "description": "filename challenge comes from. Used in dev mode"
+ },
"challengeSeed": {
"type": "array"
},
diff --git a/gulpfile.js b/gulpfile.js
index 4ae0d93d23..614403a623 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -93,8 +93,7 @@ var paths = {
],
challenges: [
- 'seed/challenges/*.json',
- 'seed/under-construction/*.json'
+ 'seed/challenges/*.json'
]
};
@@ -178,7 +177,14 @@ gulp.task('sync', syncDepenedents, function() {
});
gulp.task('lint-js', function() {
- return gulp.src(['public/js/lib/**/*'])
+ return gulp.src([
+ 'common/**/*.js',
+ 'common/**/*.jsx',
+ 'client/**/*.js',
+ 'client/**/*.jsx',
+ 'server/**/*.js',
+ 'config/**/*.js'
+ ])
.pipe(eslint())
.pipe(eslint.format());
});
@@ -392,10 +398,15 @@ var watchDependents = [
'pack-watch-manifest'
];
+gulp.task('reload', function() {
+ notify({ message: 'test changed' });
+ reload();
+});
+
gulp.task('watch', watchDependents, function() {
gulp.watch(paths.lessFiles, ['less']);
gulp.watch(paths.js, ['js']);
- gulp.watch(paths.challenges, ['test-challenges']);
+ gulp.watch(paths.challenges, ['test-challenges', 'reload']);
gulp.watch(paths.js, ['js', 'dependents']);
gulp.watch(paths.dependents, ['dependents']);
gulp.watch(paths.manifest + '/*.json', ['build-manifest-watch']);
diff --git a/index.html b/index.html
deleted file mode 100644
index cd3ee82b9c..0000000000
--- a/index.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
Free Code Camp
-
-
-
-
-
diff --git a/package.json b/package.json
index ef06329143..79e7ad80bf 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
"lint-server": "jsonlint -q server/*.json",
"lint-resources": "jsonlint -q server/resources/*.json",
"lint-utils": "jsonlint -q server/utils/*.json",
- "lint-js": "eslint --ext=.js,.jsx server/ common/models common/utils config/",
+ "lint-js": "eslint --ext=.js,.jsx server/ common/ config/ client/",
"lint-json": "npm run lint-server && npm run lint-nonprofits && npm run lint-challenges && npm run lint-resources && npm run lint-utils",
"test-challenges": "babel-node seed/test-challenges.js | tnyan",
"pretest": "npm run lint",
@@ -26,124 +26,111 @@
},
"license": "(BSD-3-Clause AND CC-BY-SA-4.0)",
"dependencies": {
- "accepts": "~1.2.5",
- "async": "~0.9.0",
- "babel": "5.8.23",
- "babel-core": "5.8.23",
- "babel-eslint": "4.1.1",
- "babel-loader": "5.2.2",
- "bcrypt-nodejs": "~0.0.3",
+ "accepts": "^1.3.0",
+ "async": "^1.5.0",
+ "babel": "5.8.29",
+ "babel-core": "5.8.34",
+ "babel-eslint": "^4.1.4",
+ "babel-loader": "5.3.3",
"body-parser": "^1.13.2",
- "chai-jquery": "~2.0.0",
- "cheerio": "~0.18.0",
+ "chai-jquery": "^2.0.0",
+ "cheerio": "~0.19.0",
"classnames": "^2.1.2",
- "clockwork": "~0.1.1",
- "compression": "~1.2.1",
- "connect-mongo": "~0.7.0",
- "cookie-parser": "~1.3.3",
- "csso": "~1.3.11",
- "dateformat": "~1.0.11",
- "debug": "~2.1.0",
- "dedent": "^0.4.0",
- "dotenv": "~0.4.0",
- "errorhandler": "~1.3.0",
- "es6-map": "^0.1.1",
+ "compression": "^1.6.0",
+ "connect-mongo": "~0.8.2",
+ "cookie-parser": "^1.4.0",
+ "csso": "^1.4.1",
+ "dateformat": "^1.0.11",
+ "debug": "^2.2.0",
+ "dedent": "~0.6.0",
+ "dotenv": "^1.2.0",
+ "errorhandler": "^1.4.2",
+ "es6-map": "~0.1.1",
"eslint": "^1.1.0",
- "eslint-plugin-react": "^3.2.1",
- "express": "~4.10.4",
+ "eslint-plugin-react": "^3.7.1",
+ "express": "^4.13.3",
"express-flash": "~0.0.2",
- "express-session": "~1.9.2",
+ "express-session": "^1.12.1",
"express-state": "^1.2.0",
- "express-validator": "~2.8.0",
- "fetchr": "^0.5.12",
- "font-awesome": "~4.3.0",
- "forever": "~0.14.1",
- "frameguard": "^0.2.2",
- "github-api": "~0.7.0",
- "gulp": "~3.8.8",
- "gulp-eslint": "~0.9.0",
- "gulp-inject": "~1.0.2",
+ "express-validator": "^2.18.0",
+ "fetchr": "~0.5.12",
+ "forever": "~0.15.1",
+ "frameguard": "~0.2.2",
+ "gulp": "^3.9.0",
+ "gulp-eslint": "^1.1.0",
+ "gulp-inject": "^3.0.0",
"gulp-jsonlint": "^1.1.0",
"gulp-less": "^3.0.3",
- "gulp-minify-css": "~0.5.1",
+ "gulp-minify-css": "^1.2.1",
"gulp-nodemon": "^2.0.3",
"gulp-notify": "^2.2.0",
"gulp-plumber": "^1.0.1",
"gulp-reduce-file": "0.0.1",
"gulp-rev": "^6.0.1",
- "gulp-rev-replace": "^0.4.2",
+ "gulp-rev-replace": "~0.4.2",
"gulp-util": "^3.0.6",
"gulp-webpack": "^1.5.0",
- "helmet": "~0.9.0",
- "helmet-csp": "^0.2.3",
+ "helmet": "~0.14.0",
+ "helmet-csp": "~0.3.0",
"history": "^1.9.0",
- "jade": "~1.8.0",
- "json-loader": "^0.5.2",
- "less": "~2.5.1",
+ "jade": "^1.11.0",
+ "json-loader": "~0.5.2",
+ "less": "^2.5.1",
"lodash": "^3.9.3",
"loopback": "^2.22.0",
"loopback-boot": "^2.13.0",
- "loopback-component-passport": "https://github.com/FreeCodeCamp/loopback-component-passport.git#feature/flashfailure",
+ "loopback-component-passport": "^1.6.0",
"loopback-connector-mongodb": "^1.10.0",
- "lusca": "~1.0.2",
- "method-override": "~2.3.0",
- "moment": "~2.10.2",
+ "method-override": "^2.3.0",
+ "moment": "^2.10.2",
"mongodb": "^2.0.33",
- "morgan": "~1.5.0",
- "node-libs-browser": "^0.5.2",
- "node-slack": "0.0.7",
+ "morgan": "^1.6.1",
"node-uuid": "^1.4.3",
- "nodemailer": "~1.3.0",
+ "nodemailer": "^1.9.0",
"normalize-url": "^1.3.1",
- "object.assign": "^3.0.0",
+ "object.assign": "^4.0.3",
"passport-facebook": "^2.0.0",
- "passport-github": "^0.1.5",
- "passport-google-oauth2": "^0.1.6",
+ "passport-github": "^1.0.0",
+ "passport-google-oauth2": "~0.1.6",
"passport-linkedin-oauth2": "^1.2.1",
"passport-local": "^1.0.0",
"passport-oauth": "^1.0.0",
"passport-twitter": "^1.0.3",
- "pmx": "^0.3.16",
- "ramda": "~0.10.0",
- "react": "^0.13.3",
- "react-bootstrap": "~0.23.7",
- "react-motion": "~0.1.0",
- "react-router": "https://github.com/BerkeleyTrue/react-router.git#freecodecamp",
- "react-router-bootstrap": "^0.19.2",
- "react-vimeo": "^0.0.3",
- "request": "~2.53.0",
+ "pmx": "~0.5.5",
+ "ramda": "~0.18.0",
+ "react": "~0.14.2",
+ "react-bootstrap": "~0.27.3",
+ "react-motion": "~0.3.1",
+ "react-router": "^1.0.0-rc4",
+ "react-router-bootstrap": "~0.19.2",
+ "react-vimeo": "~0.0.3",
+ "request": "^2.65.0",
"rev-del": "^1.0.5",
"rx": "^4.0.0",
- "sanitize-html": "~1.6.1",
+ "sanitize-html": "^1.11.1",
"sort-keys": "^1.1.1",
- "source-map-support": "^0.3.2",
"store": "https://github.com/berkeleytrue/store.js.git#feature/noop-server",
"thundercats": "^3.0.0",
- "thundercats-react": "^0.3.0",
- "twit": "~1.1.20",
- "uglify-js": "~2.4.15",
+ "thundercats-react": "~0.4.0",
+ "twit": "^2.1.1",
+ "uglify-js": "^2.5.0",
"url-regex": "^3.0.0",
- "validator": "^3.22.1",
+ "validator": "^4.2.1",
"webpack": "^1.9.12",
- "xss-filters": "^1.2.6",
- "yui": "~3.18.1"
+ "xss-filters": "^1.2.6"
},
"devDependencies": {
- "blessed": "~0.0.37",
+ "blessed": "~0.1.81",
"bower-main-files": "~0.0.4",
- "browser-sync": "~1.8.1",
- "browserify": "^10.2.4",
- "chai": "~1.10.0",
+ "browser-sync": "^2.9.12",
+ "chai": "^3.4.0",
"envify": "^3.4.0",
- "istanbul": "^0.3.15",
+ "istanbul": "~0.4.0",
"jsonlint": "^1.6.2",
- "loopback-explorer": "^1.7.2",
+ "loopback-component-explorer": "^2.1.1",
"loopback-testing": "^1.1.0",
- "mocha": "~2.0.1",
- "multiline": "~1.0.1",
- "supertest": "~0.15.0",
+ "mocha": "^2.3.3",
"tap-nyan": "0.0.2",
- "tape": "^4.2.2",
- "vinyl-source-stream": "^1.1.0"
+ "tape": "^4.2.2"
}
}
diff --git a/seed/challenges/advanced-bonfires.json b/seed/challenges/advanced-bonfires.json
index 115b236eba..a1decfaa34 100644
--- a/seed/challenges/advanced-bonfires.json
+++ b/seed/challenges/advanced-bonfires.json
@@ -91,7 +91,8 @@
"tests": [
"assert.sameMembers(sym([1, 2, 3], [5, 2, 1, 4]), [3, 5, 4], 'message:
sym([1, 2, 3], [5, 2, 1, 4]) should return
[3, 5, 4].');",
"assert.sameMembers(sym([1, 2, 5], [2, 3, 5], [3, 4, 5]), [1, 4, 5], 'message:
sym([1, 2, 5], [2, 3, 5], [3, 4, 5]) should return
[1, 4, 5]');",
- "assert.sameMembers(sym([1, 1, 2, 5], [2, 2, 3, 5], [3, 4, 5, 5]), [1, 4, 5], 'message:
sym([1, 1, 2, 5], [2, 2, 3, 5], [3, 4, 5, 5]) should return
[1, 4, 5].');"
+ "assert.sameMembers(sym([1, 1, 2, 5], [2, 2, 3, 5], [3, 4, 5, 5]), [1, 4, 5], 'message:
sym([1, 1, 2, 5], [2, 2, 3, 5], [3, 4, 5, 5]) should return
[1, 4, 5].');",
+ "assert.sameMembers(sym([3, 3, 3, 2, 5], [2, 1, 5, 7], [3, 4, 6, 6], [1, 2, 3]), [ 7, 4, 6, 2, 3 ], 'message:
sym([3, 3, 3, 2, 5], [2, 1, 5, 7], [3, 4, 6, 6], [1, 2, 3]) should return
[ 7, 4, 6, 2, 3 ].');"
],
"MDNlinks": [
"Array.reduce()",
diff --git a/seed/challenges/basejumps.json b/seed/challenges/basejumps.json
index 850a8a2a88..c4171eb6f0 100644
--- a/seed/challenges/basejumps.json
+++ b/seed/challenges/basejumps.json
@@ -85,6 +85,12 @@
"A gif showing you how to create a new GitHub repository and push your code up to it.",
"Create a new GitHub repository. Then copy its .git URL.
Return to c9.io's terminal and set your GitHub remote URL:
git remote set-url origin followed by the URL you copied from GitHub.
Run
git push origin master.
Now tab back to GitHub and refresh, and you'll see that your code is now on GitHub.",
"https://github.com/new"
+ ],
+ [
+ "http://i.imgur.com/Qn0K65B.gif",
+ "A gif showing you how to add add-ons to Heroku.",
+ "We will soon add instructions for getting Clementine running on Heroku. For now, develop your Basejumps right on c9.io.",
+ ""
]
],
"type": "Waypoint",
@@ -119,7 +125,6 @@
"
Bonus User Story: As an unauthenticated or authenticated user, I can see and vote on everyone's polls.",
"
Bonus User Story: As an unauthenticated or authenticated user, I can see the results of polls in chart form. (This could be implemented using Chart.js or Google Charts.)",
"
Bonus User Story: As an authenticated user, if I don't like the options on a poll, I can create a new option.",
- "If you need further guidance on using Yeoman Angular-Fullstack Generator, check out:
https://github.com/clnhll/guidetobasejumps.",
"Once you've finished implementing these user stories, click the \"I've completed this challenge\" button and enter the URLs for both your GitHub repository and your live app running on Heroku. If you pair programmed with a friend, enter his or her Free Code Camp username as well so that you both get credit for completing it.",
"If you'd like immediate feedback on your project from fellow campers, click this button and paste in a link to your CodePen project.
Click here then add your link to your tweet's text"
],
@@ -151,8 +156,7 @@
"
User Story: As an authenticated user, I can add myself to a bar to indicate I am going there tonight.",
"
User Story: As an authenticated user, I can remove myself from a bar if I no longer want to go there.",
"
Bonus User Story: As an unauthenticated user, when I login I should not have to search again.",
- "
Hint: Try using the
Yelp API to find venues in the cities your users search for.",
- "If you need further guidance on using Yeoman Angular-Fullstack Generator, check out:
https://github.com/clnhll/guidetobasejumps.",
+ "
Hint: Try using the
Yelp API to find venues in the cities your users search for. If you use Yelp's API, be sure to mention so in your app.",
"Once you've finished implementing these user stories, click the \"I've completed this challenge\" button and enter the URLs for both your GitHub repository and your live app running on Heroku. If you pair programmed with a friend, enter his or her Free Code Camp username as well so that you both get credit for completing it.",
"If you'd like immediate feedback on your project from fellow campers, click this button and paste in a link to your CodePen project.
Click here then add your link to your tweet's text"
],
@@ -184,7 +188,6 @@
"
User Story: As a user, I can add new stocks by their symbol name.",
"
User Story: As a user, I can remove stocks.",
"
Bonus User Story: As a user, I can see changes in real-time when any other user adds or removes a stock.",
- "If you need further guidance on using Yeoman Angular-Fullstack Generator, check out:
https://github.com/clnhll/guidetobasejumps.",
"Once you've finished implementing these user stories, click the \"I've completed this challenge\" button and enter the URLs for both your GitHub repository and your live app running on Heroku. If you pair programmed with a friend, enter his or her Free Code Camp username as well so that you both get credit for completing it.",
"If you'd like immediate feedback on your project from fellow campers, click this button and paste in a link to your CodePen project.
Click here then add your link to your tweet's text"
],
@@ -216,7 +219,6 @@
"
User Story: As an authenticated user, I can add a new book.",
"
User Story: As an authenticated user, I can update my settings to store my full name, city, and state.",
"
Bonus User Story: As an authenticated user, I can propose a trade and wait for the other user to accept the trade.",
- "If you need further guidance on using Yeoman Angular-Fullstack Generator, check out:
https://github.com/clnhll/guidetobasejumps.",
"Once you've finished implementing these user stories, click the \"I've completed this challenge\" button and enter the URLs for both your GitHub repository and your live app running on Heroku. If you pair programmed with a friend, enter his or her Free Code Camp username as well so that you both get credit for completing it.",
"If you'd like immediate feedback on your project from fellow campers, click this button and paste in a link to your CodePen project.
Click here then add your link to your tweet's text"
],
@@ -251,7 +253,6 @@
"
User Story: As an unauthenticated user, I can browse other users' walls of images.",
"
Bonus User Story: As an authenticated user, if I upload an image that is broken, it will be replaced by a placeholder image. (can use jQuery broken image detection)",
"
Hint: Masonry.js is a library that allows for Pinterest-style image grids.",
- "If you need further guidance on using Yeoman Angular-Fullstack Generator, check out:
https://github.com/clnhll/guidetobasejumps.",
"Once you've finished implementing these user stories, click the \"I've completed this challenge\" button and enter the URLs for both your GitHub repository and your live app running on Heroku. If you pair programmed with a friend, enter his or her Free Code Camp username as well so that you both get credit for completing it.",
"If you'd like immediate feedback on your project from fellow campers, click this button and paste in a link to your CodePen project.
Click here then add your link to your tweet's text"
],
diff --git a/seed/challenges/basic-bonfires.json b/seed/challenges/basic-bonfires.json
index 505b91fd5e..c1327a5c84 100644
--- a/seed/challenges/basic-bonfires.json
+++ b/seed/challenges/basic-bonfires.json
@@ -325,16 +325,17 @@
"tests": [
"assert(end(\"Bastian\", \"n\") === true, 'message:
end(\"Bastian\", \"n\") should return true.');",
"assert(end(\"Connor\", \"n\") === false, 'message:
end(\"Connor\", \"n\") should return false.');",
- "assert(end(\"Walking on water and developing software from a specification are easy if both are frozen\", \"specification\") === false, '
\"Walking on water and developing software from a specification are easy if both are frozen\", \"specification\") should return false.');",
+ "assert(end(\"Walking on water and developing software from a specification are easy if both are frozen\", \"specification\") === false, 'message:
end(\"Walking on water and developing software from a specification are easy if both are frozen\", \"specification\") should return false.');",
"assert(end(\"He has to give me a new name\", \"name\") === true, 'message:
end(\"He has to give me a new name\", \"name\") should return true.');",
"assert(end(\"He has to give me a new name\", \"me\") === true, 'message:
end(\"He has to give me a new name\", \"me\") should return true.');",
+ "assert(end(\"He has to give me a new name\", \"na\") === false, 'message:
end(\"He has to give me a new name\", \"na\") should return false.');",
"assert(end(\"If you want to save our world, you must hurry. We dont know how much longer we can withstand the nothing\", \"mountain\") === false, 'message:
end(\"If you want to save our world, you must hurry. We dont know how much longer we can withstand the nothing\", \"mountain\") should return false.');"
],
"MDNlinks": [
"String.substr()"
],
"solutions": [
- "function end(str, target) {\n // \"Never give up and good luck will find you.\"\n // -- Falcor\n return str.substring(str.length-target.length) === target;\n}\n\nend('Bastian', 'n');\n"
+ "function end(str, target) {\n return str.substring(str.length-target.length) === target;\n};\n"
],
"type": "bonfire",
"challengeType": 5,
@@ -367,6 +368,9 @@
"tests": [
"assert(repeat(\"*\", 3) === \"***\", 'message:
repeat(\"*\", 3) should return
\"***\".');",
"assert(repeat(\"abc\", 3) === \"abcabcabc\", 'message:
repeat(\"abc\", 3) should return
\"abcabcabc\".');",
+ "assert(repeat(\"abc\", 4) === \"abcabcabcabc\", 'message:
repeat(\"abc\", 4) should return
\"abcabcabcabc\".');",
+ "assert(repeat(\"abc\", 1) === \"abc\", 'message:
repeat(\"abc\", 1) should return
\"abc\".');",
+ "assert(repeat(\"*\", 8) === \"********\", 'message:
repeat(\"*\", 8) should return
\"********\".');",
"assert(repeat(\"abc\", -2) === \"\", 'message:
repeat(\"abc\", -2) should return
\"\".');"
],
"MDNlinks": [
@@ -410,12 +414,14 @@
"assert(truncate(\"Peter Piper picked a peck of pickled peppers\", 14) === \"Peter Piper...\", 'message:
truncate(\"Peter Piper picked a peck of pickled peppers\", 14) should return \"Peter Piper...\".');",
"assert(truncate(\"A-tisket a-tasket A green and yellow basket\", \"A-tisket a-tasket A green and yellow basket\".length) === \"A-tisket a-tasket A green and yellow basket\", 'message:
truncate(\"A-tisket a-tasket A green and yellow basket\", \"A-tisket a-tasket A green and yellow basket\".length) should return \"A-tisket a-tasket A green and yellow basket\".');",
"assert(truncate('A-tisket a-tasket A green and yellow basket', 'A-tisket a-tasket A green and yellow basket'.length + 2) === 'A-tisket a-tasket A green and yellow basket', 'message:
truncate(\"A-tisket a-tasket A green and yellow basket\", \"A-tisket a-tasket A green and yellow basket\".length + 2) should return \"A-tisket a-tasket A green and yellow basket\".');",
- "assert(truncate(\"A-\", 1) === \"A...\", 'message:
truncate(\"A-\", 1) should return \"A...\".');"
+ "assert(truncate(\"A-\", 1) === \"A...\", 'message:
truncate(\"A-\", 1) should return \"A...\".');",
+ "assert(truncate(\"Abolutely Longer\", 2) === \"Ab...\", 'message:
truncate(\"Absolutely Longer\", 2) should return \"Ab...\".');"
],
"MDNlinks": [
"String.slice()"
],
"solutions": [
+ "function truncate(str, num) {\n if(str.length > num ) {\n if(num > 3) {\n return str.slice(0, num - 3) + '...';\n } else {\n return str.slice(0,num) + '...';\n }\n } \n return str;\n}"
],
"type": "bonfire",
"challengeType": 5,
diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json
index c8663c4f27..7aac971929 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -7,7 +7,7 @@
"id": "bd7123c9c441eddfaeb4bdef",
"title": "Comment your JavaScript Code",
"description": [
- "Comments are lines of code that your computer will intentionally ignore. Comments are a great way to leave notes to yourself and to other people who will later need to figure out what it does.",
+ "Comments are lines of code that your computer will intentionally ignore. Comments are a great way to leave notes to yourself and to other people who will later need to figure out what that code does.",
"Let's take a look at the two ways you can write comments in JavaScript.",
"The double-slash comment will comment out the remainder of the text on the current line:",
"
// This is a comment.",
@@ -30,7 +30,7 @@
"description": [
"In computer science,
data structures are things that hold data. JavaScript has seven of these. For example, the
Number data structure holds numbers.",
"Let's learn about the most basic data structure of all: the
Boolean. Booleans can only hold the value of either true or false. They are basically little on-off switches.",
- "Let's modify our
welcomeToBooleans function so that it will return
true instead of
falsewhen the run button is clicked."
+ "Let's modify our
welcomeToBooleans function so that it will return
true instead of
false when the run button is clicked."
],
"tests": [
"assert(typeof(welcomeToBooleans()) === 'boolean', 'message: The
welcomeToBooleans() function should return a boolean (true/false) value.');",
@@ -44,8 +44,9 @@
" return false;",
"",
"// Only change code above this line.",
- "}",
- "",
+ "}"
+ ],
+ "tail": [
"welcomeToBooleans();"
],
"type": "waypoint",
@@ -67,9 +68,9 @@
"challengeSeed": [
"var ourName = \"Free Code Camp\";",
"",
- "",
- "// Only change code above this line.",
- "",
+ ""
+ ],
+ "tail": [
"if(typeof(myName) !== \"undefined\"){(function(v){return v;})(myName);}"
],
"type": "waypoint",
@@ -87,7 +88,6 @@
"assert((function(){if(typeof(myLastName) !== \"undefined\" && typeof(myLastName) === \"string\" && myLastName.length > 0){return true;}else{return false;}})(), 'message:
myLastName should be a string with at least one character in it.');"
],
"challengeSeed": [
- "var name = \"Alan Turing\";",
"var firstName = \"Alan\";",
"var lastName = \"Turing\";",
"",
@@ -140,11 +140,11 @@
"
Bracket notation is a way to get a character at a specific
index within a string.",
"Computers don't start counting at 1 like humans do. They start at 0.",
"For example, the character at index 0 in the word \"Charles\" is \"C\". So if
var firstName = \"Charles\", you can get the value of the first letter of the string by using
firstName[0].",
- "Use
bracket notation to find the first character in the
firstLetterOfLastName variable.",
+ "Use
bracket notation to find the first character in the
lastName variable and assign it to
firstLetterOfLastName.",
"Try looking at the
firstLetterOfFirstName variable declaration if you get stuck."
],
"tests": [
- "assert((function(){if(typeof(firstLetterOfLastName) !== \"undefined\" && editor.getValue().match(/\\[0\\]/gi) && typeof(firstLetterOfLastName) === \"string\" && firstLetterOfLastName === \"L\"){return true;}else{return false;}})(), 'message: The first letter of
firstLetterOfLastName should be a
\"L\".');"
+ "assert((function(){if(typeof(firstLetterOfLastName) !== \"undefined\" && editor.getValue().match(/\\[0\\]/gi) && typeof(firstLetterOfLastName) === \"string\" && firstLetterOfLastName === \"L\"){return true;}else{return false;}})(), 'message: The
firstLetterOfLastName variable should have the value of
L.');"
],
"challengeSeed": [
"var firstLetterOfFirstName = \"\";",
@@ -176,7 +176,7 @@
"Try looking at the
secondLetterOfFirstName variable declaration if you get stuck."
],
"tests": [
- "assert(thirdLetterOfLastName === 'v', 'message: The third letter of
lastName should be a \"v\".');"
+ "assert(thirdLetterOfLastName === 'v', 'message: The
thirdLetterOfLastName variable should have the value of
v.');"
],
"challengeSeed": [
"var firstName = \"Ada\";",
@@ -229,7 +229,7 @@
"id": "bd7123c9c452eddfaeb5bdef",
"title": "Use Bracket Notation to Find the Nth-to-Last Character in a String",
"description": [
- "In order to get the last letter of a string, you can subtract one from the string's length.",
+ "You can use the same principle we just used to retrieve the last character in a string to retrieve the Nth-to-last character.",
"For example, you can get the value of the third-to-last letter of the
var firstName = \"Charles\" string by using
firstName[firstName.length - 3]",
"Use
bracket notation to find the second-to-last character in the
lastName string.",
"Try looking at the
thirdToLastLetterOfFirstName variable declaration if you get stuck."
@@ -524,7 +524,7 @@
"title": "Manipulate Arrays With pop()",
"description": [
"Another way to change the data in an array is with the
.pop() function.",
- "
.pop()is used to \"pop\" a value off of the end of an array. We can store this \"popped off\" variable by performing
pop() within a variable declaration.",
+ "
.pop() is used to \"pop\" a value off of the end of an array. We can store this \"popped off\" variable by performing
pop() within a variable declaration.",
"Any type of data structure can be \"popped\" off of an array - numbers, strings, even nested arrays.",
"Use the
.pop() function to remove the last item from
myArray, assigning the \"popped off\" value to
removedFromMyArray."
],
@@ -545,7 +545,7 @@
"",
"// Only change code above this line.",
"",
- "(function(y, z){return 'removedFromMyArray = ' + JSON.stringify(y) + ' & removed = ' + JSON.stringify(z);})(myArray, removedFromMyArray);"
+ "(function(y, z){return 'myArray = ' + JSON.stringify(y) + ' & removedFromMyArray = ' + JSON.stringify(z);})(myArray, removedFromMyArray);"
],
"type": "waypoint",
"challengeType": 1
@@ -661,7 +661,7 @@
"Create and call a function called
myFunction that returns the sum of
a and
b."
],
"tests": [
- "assert((function(){if(typeof(f) !== \"undefined\" && f === a + b){return true;}else{return false;}})(), 'message: Your function should return the value of a + b');"
+ "assert((function(){if(typeof(f) !== \"undefined\" && f === a + b){return true;}else{return false;}})(), 'message: Your function should return the value of
a + b.');"
],
"challengeSeed": [
"var a = 4;",
@@ -752,7 +752,7 @@
"Let's update the
myDog object's name property. Let's change her name from \"Coder\" to \"Happy Coder\"."
],
"tests": [
- "assert(/happy coder/gi.test(myDog.name), 'message: Update
myDog\\'s
\"name\" property to equal \"Happy Coder\".');"
+ "assert(/happy coder/gi.test(myDog.name), 'message: Update
myDog's
\"name\" property to equal \"Happy Coder\".');"
],
"challengeSeed": [
"var ourDog = {",
@@ -771,6 +771,10 @@
" \"friends\": [\"Free Code Camp Campers\"]",
"};",
"",
+ "// Only change code below this line.",
+ "",
+ "",
+ "",
"// Only change code above this line.",
"",
"(function(z){return z;})(myDog);"
@@ -867,26 +871,26 @@
"You can run the same code multiple times by using a loop.",
"The most common type of JavaScript loop is called a \"for loop\" because it runs \"for\" a specific number of times.",
"For loops are declared with three optional expressions seperated by semicolons:",
- "
for([initialization]; [condition]; [final-expression])",
+ "
for ([initialization]; [condition]; [final-expression])",
"The
initialization statement is executed one time only before the loop starts. It is typically used to define and setup your loop variable.",
"The
condition statement is evaluated at the beginning of every loop iteration and will continue as long as it evalutes to
true. When
condition is
false at the start of the iteration, the loop will stop executing. This means if
condition starts as
false, your loop will never execute.",
"The
final-expression is executed at the end of each loop iteration, prior to the next
condition check and is usually used to increment or decrement your loop counter.",
"In the following example we initialize with
i = 0 and iterate while our condition
i < 5 is true. We'll increment
i by
1 in each loop iteration with
i++ as our
final-expression.",
"
var ourArray = [];",
- "
for(var i = 0; i < 5; i++) {",
+ "
for (var i = 0; i < 5; i++) {",
"
ourArray.push(i);",
"
}",
"
ourArray will now contain
[0,1,2,3,4].",
- "Let's try getting a
for loop to work by pushing values to an array."
+ "Let's use a
for loop to work to push the values 1 through 5 onto
myArray."
],
"tests": [
"assert(editor.getValue().match(/for\\s*\\(/g).length > 1, 'message: You should be using a
for loop for this.');",
- "assert.deepEqual(myArray, [0,1,2,3,4], 'message:
myArray should equal
[0,1,2,3,4]');"
+ "assert.deepEqual(myArray, [1,2,3,4,5], 'message:
myArray should equal
[1,2,3,4,5].');"
],
"challengeSeed": [
"var ourArray = [];",
"",
- "for(var i = 0; i < 5; i++){",
+ "for (var i = 0; i < 5; i++) {",
" ourArray.push(i);",
"}",
"",
@@ -911,21 +915,21 @@
"For loops don't have to iterate one at a time. By changing our
final-expression, we can count by even numbers.",
"We'll start at
i = 0 and loop while
i < 10. We'll increment
i by 2 each loop with
i += 2.",
"
var ourArray = [];",
- "
for(var i = 0; i < 10; i += 2) {",
+ "
for (var i = 0; i < 10; i += 2) {",
"
ourArray.push(i);",
"
}",
- "
ourArray will now contain [0,2,4,6,8] ",
+ "
ourArray will now contain
[0,2,4,6,8].",
"Let's change our
initialization and
final-expression so we can count by odd numbers.",
- "Push the odd numbers from 1 through 9 to
myArray using a
for loop."
+ "Push the odd numbers from 1 through 9 to
myArray using a
for loop."
],
"tests":[
"assert(editor.getValue().match(/for\\s*\\(/g).length > 1, 'message: You should be using a
for loop for this.');",
- "assert.deepEqual(myArray, [1,3,5,7,9], 'message:
myArray should equal
[1,3,5,7,9]');"
+ "assert.deepEqual(myArray, [1,3,5,7,9], 'message:
myArray should equal
[1,3,5,7,9].');"
],
"challengeSeed":[
"var ourArray = [];",
"",
- "for(var i = 0; i < 10; i += 2){",
+ "for (var i = 0; i < 10; i += 2) {",
" ourArray.push(i);",
"}",
"",
@@ -951,21 +955,21 @@
"In order to count backwards by twos, we'll need to change our
initialization,
condition, and
final-expression.",
"We'll start at
i = 10 and loop while
i > 0. We'll decrement
i by 2 each loop with
i -= 2.",
"
var ourArray = [];",
- "
for(var i = 10; i > 0; i -= 2) {",
+ "
for (var i = 10; i > 0; i -= 2) {",
"
ourArray.push(i);",
"
}",
- "
ourArray will now contain
[10,8,6,4,2]",
+ "
ourArray will now contain
[10,8,6,4,2].",
"Let's change our
initialization and
final-expression so we can count backward by twos for numbers.",
- "Push the odd numbers from 9 through 1 to
myArray using a
for loop."
+ "Push the odd numbers from 9 through 1 to
myArray using a
for loop."
],
"tests":[
"assert(editor.getValue().match(/for\\s*\\(/g).length > 1, 'message: You should be using a
for loop for this.');",
- "assert.deepEqual(myArray, [9,7,5,3,1], 'message:
myArray should equal
[9,7,5,3,1]');"
+ "assert.deepEqual(myArray, [9,7,5,3,1], 'message:
myArray should equal
[9,7,5,3,1].');"
],
"challengeSeed":[
"var ourArray = [];",
"",
- "for(var i = 10; i > 0; i -= 2){",
+ "for (var i = 10; i > 0; i -= 2) {",
" ourArray.push(i);",
"}",
"",
@@ -996,11 +1000,11 @@
"
i++;",
"
}",
"Let's try getting a while loop to work by pushing values to an array.",
- "Push the numbers 0 through 4 to
myArray using a
while loop."
+ "Push the numbers 0 through 4 to
myArray using a
while loop."
],
"tests": [
"assert(editor.getValue().match(/while/g), 'message: You should be using a
while loop for this.');",
- "assert.deepEqual(myArray, [0,1,2,3,4], 'message:
myArray should equal
[0,1,2,3,4]');"
+ "assert.deepEqual(myArray, [0,1,2,3,4], 'message:
myArray should equal
[0,1,2,3,4].');"
],
"challengeSeed": [
"var myArray = [];",
@@ -1062,23 +1066,24 @@
"Let's use this technique to generate and return a random whole number between 0 and 9."
],
"tests": [
- "assert(typeof(myFunction()) === \"number\", 'message: The result of
myFunction should be a number.');",
- "assert(editor.getValue().match(/Math.random/g), 'message: You should be using Math.random to generate a random number.');",
+ "assert(typeof(myFunction()) === \"number\" && (function(){var r = myFunction();return Math.floor(r) === r;})(), 'message: The result of
myFunction should be a whole number.');",
+ "assert(editor.getValue().match(/Math.random/g).length > 1, 'message: You should be using
Math.random to generate a random number.');",
"assert(editor.getValue().match(/\\(\\s*?Math.random\\s*?\\(\\s*?\\)\\s*?\\*\\s*?10\\s*?\\)/g) || editor.getValue().match(/\\(\\s*?10\\s*?\\*\\s*?Math.random\\s*?\\(\\s*?\\)\\s*?\\)/g), 'message: You should have multiplied the result of
Math.random by 10 to make it a number that is between zero and nine.');",
- "assert(editor.getValue().match(/Math.floor/g), 'message: You should use
Math.floor to remove the decimal part of the number.');"
+ "assert(editor.getValue().match(/Math.floor/g).length > 1, 'message: You should use
Math.floor to remove the decimal part of the number.');"
],
"challengeSeed": [
"var randomNumberBetween0and19 = Math.floor(Math.random() * 20);",
"",
- "function myFunction(){",
+ "function myFunction() {",
"",
" // Only change code below this line.",
"",
" return Math.random();",
"",
" // Only change code above this line.",
- "}",
- "",
+ "}"
+ ],
+ "tail":[
"(function(){return myFunction();})();"
],
"type": "waypoint",
@@ -1092,7 +1097,7 @@
"To do this, we'll define a minimum number
min and a maximum number
max.",
"Here's the formula we'll use. Take a moment to read it and try to understand what this code is doing:",
"
Math.floor(Math.random() * (max - min + 1)) + min",
- "Define two variables:
myMin and myMax, and set them both equal to numbers.",
+ "Define two variables:
myMin and
myMax, and set them both equal to numbers.",
"Then create a function called
myFunction that returns a random number that's greater than or equal to
myMin, and is less than or equal to
myMax."
],
"tests": [
@@ -1211,7 +1216,7 @@
"title": "Find Numbers with Regular Expressions",
"description": [
"We can use special selectors in
Regular Expressions to select a particular type of value.",
- "One such selector is the digit selector
\\d which is used to grab the numbers in a string.",
+ "One such selector is the digit selector
\\d which is used to retrieve the numbers in a string.",
"It is used like this:
/\\d/g.",
"For numbers this is often written as
/\\d+/g, where the
+ following the digit selector allows this regular expression to match multi-digit numbers.",
"Use the
\\d selector to select the number of numbers in the string, allowing for the possibility of multi-digit numbers."
@@ -1315,7 +1320,7 @@
],
"challengeSeed": [
"fccss",
- " function runSlots(){",
+ " function runSlots() {",
" var slotOne;",
" var slotTwo;",
" var slotThree;",
@@ -1331,14 +1336,14 @@
" $(\".logger\").html(\"\");",
" $(\".logger\").html(\"Not A Win\")",
" ",
- " if(slotOne !== undefined && slotTwo !== undefined && slotThree !== undefined){",
+ " if (slotOne !== undefined && slotTwo !== undefined && slotThree !== undefined) {",
" $(\".logger\").html(slotOne + \" \" + slotTwo + \" \" + slotThree);",
" }",
" return [slotOne, slotTwo, slotThree];",
" }",
"",
- " $(document).ready(function(){",
- " $(\".go\").click(function(){",
+ " $(document).ready(function() {",
+ " $(\".go\").click(function() {",
" runSlots();",
" });",
" });",
@@ -1459,7 +1464,7 @@
"Otherwise, we should return
null, which is a JavaScript data structure that means nothing.",
"If all three numbers match, we should return the number that we have in three of slots or leave it as
null.",
"Let's create an
if statement with multiple conditions in order to check whether all numbers are equal.",
- "
if(slotOne !== slotTwo || slotTwo !== slotThree){",
+ "
if (slotOne !== slotTwo || slotTwo !== slotThree) {",
"
return null;",
"
}"
],
@@ -1468,7 +1473,7 @@
],
"challengeSeed": [
"fccss",
- " function runSlots(){",
+ " function runSlots() {",
" var slotOne;",
" var slotTwo;",
" var slotThree;",
@@ -1480,7 +1485,7 @@
" slotThree = Math.floor(Math.random() * (3 - 1 + 1)) + 1;",
" ",
" $(\".logger\").html(\"\");",
- " $(\".logger\").html(\"Not A Win\")",
+ " $(\".logger\").html(\"Not A Win\");",
" ",
" // Only change code below this line.",
" ",
@@ -1488,7 +1493,7 @@
" ",
" // Only change code above this line.",
" ",
- " if(slotOne !== undefined && slotTwo !== undefined && slotThree !== undefined){",
+ " if (slotOne !== undefined && slotTwo !== undefined && slotThree !== undefined) {",
" $(\".logger\").html(slotOne);",
" $(\".logger\").append(\" \" + slotTwo);",
" $(\".logger\").append(\" \" + slotThree);",
@@ -1496,8 +1501,8 @@
" return [slotOne, slotTwo, slotThree];",
" }",
"",
- " $(document).ready(function(){",
- " $(\".go\").click(function(){",
+ " $(document).ready(function() {",
+ " $(\".go\").click(function() {",
" runSlots();",
" });",
" });",
@@ -1626,7 +1631,7 @@
],
"challengeSeed": [
"fccss",
- " function runSlots(){",
+ " function runSlots() {",
" var slotOne;",
" var slotTwo;",
" var slotThree;",
@@ -1650,7 +1655,7 @@
" return slotOne;",
" }",
" ",
- " if(slotOne !== undefined && slotTwo !== undefined && slotThree !== undefined){",
+ " if (slotOne !== undefined && slotTwo !== undefined && slotThree !== undefined) {",
" $(\".logger\").html(slotOne);",
" $(\".logger\").append(\" \" + slotTwo);",
" $(\".logger\").append(\" \" + slotThree);",
@@ -1659,8 +1664,8 @@
" return [slotOne, slotTwo, slotThree];",
" }",
"",
- " $(document).ready(function(){",
- " $(\".go\").click(function(){",
+ " $(document).ready(function() {",
+ " $(\".go\").click(function() {",
" runSlots();",
" });",
" });",
@@ -1785,7 +1790,7 @@
"Set up all three slots like this, then click the \"Go\" button to play the slot machine."
],
"tests": [
- "assert((editor.match(/\\$\\s*?\\(\\s*?\\$\\s*?\\(\\s*?(?:'|\")\\s*?\\.slot\\s*?(?:'|\")\\s*?\\)\\[\\d\\]\\s*?\\)\\.html\\(\\s*?\\'\\
\\'\\s*?\\);/gi) && editor.match(/\\$\\s*?\\(\\s*?\\$\\s*?\\(\\s*?(?:'|\")\\s*?\\.slot\\s*?(?:'|\")\\s*?\\)\\[\\d\\]\\s*?\\)\\.html\\(\\s*?\\'\\\\'\\s*?\\);/gi).length >= 3), 'Use the provided code three times. One for each slot.')",
+ "assert((editor.match(/\\$\\s*?\\(\\s*?\\$\\s*?\\(\\s*?(?:'|\")\\s*?\\.slot\\s*?(?:'|\")\\s*?\\)\\[\\d\\]\\s*?\\)\\.html\\(\\s*?\\'\\\\'\\s*?\\);/gi) && editor.match(/\\$\\s*?\\(\\s*?\\$\\s*?\\(\\s*?(?:'|\")\\s*?\\.slot\\s*?(?:'|\")\\s*?\\)\\[\\d\\]\\s*?\\)\\.html\\(\\s*?\\'\\\\'\\s*?\\);/gi).length >= 3), 'Use the provided code three times. One for each slot.')",
"assert(editor.match(/\\$\\s*?\\(\\s*?\\$\\s*?\\(\\s*?(?:'|\")\\s*?\\.slot\\s*?(?:'|\")\\s*?\\)\\[0\\]\\s*?\\)/gi), 'You should have used $('.slot')[0] at least once.')",
"assert(editor.match(/\\$\\s*?\\(\\s*?\\$\\s*?\\(\\s*?(?:'|\")\\s*?\\.slot\\s*?(?:'|\")\\s*?\\)\\[1\\]\\s*?\\)/gi), 'You should have used $('.slot')[1] at least once.')",
"assert(editor.match(/\\$\\s*?\\(\\s*?\\$\\s*?\\(\\s*?(?:'|\")\\s*?\\.slot\\s*?(?:'|\")\\s*?\\)\\[2\\]\\s*?\\)/gi), 'You should have used $('.slot')[2] at least once.')",
@@ -1795,7 +1800,7 @@
],
"challengeSeed": [
"fccss",
- " function runSlots(){",
+ " function runSlots() {",
" var slotOne;",
" var slotTwo;",
" var slotThree;",
@@ -1819,7 +1824,7 @@
" return slotOne;",
" }",
" ",
- " if(slotOne !== undefined && slotTwo !== undefined && slotThree !== undefined){",
+ " if (slotOne !== undefined && slotTwo !== undefined && slotThree !== undefined) {",
" $('.logger').html(slotOne);",
" $('.logger').append(' ' + slotTwo);",
" $('.logger').append(' ' + slotThree);",
@@ -1828,8 +1833,8 @@
" return [slotOne, slotTwo, slotThree];",
" }",
"",
- " $(document).ready(function(){",
- " $('.go').click(function(){",
+ " $(document).ready(function() {",
+ " $('.go').click(function() {",
" runSlots();",
" });",
" });",
diff --git a/seed/challenges/bootstrap.json b/seed/challenges/bootstrap.json
index 4c5a3f66de..ef672fb6ee 100644
--- a/seed/challenges/bootstrap.json
+++ b/seed/challenges/bootstrap.json
@@ -1674,11 +1674,12 @@
"title": "Create a Bootstrap Row",
"description": [
"Now we'll create a Bootstrap row for our inline elements.",
- "Create a div element with the class row."
+ "Create a div element below the h3 tag, with a class of row."
],
"tests": [
"assert($(\"div\").length > 1, 'Add a div element below your h3 element.')",
"assert($(\"div\").hasClass(\"row\"), 'Your div element should have the class row')",
+ "assert($(\"div.container-fluid div.row\").length > 0, 'Your row div should be nested inside the container-fluid div')",
"assert(editor.match(/<\\/div>/g) && editor.match(//g).length === editor.match(/
div element has a closing tag.')"
],
"challengeSeed": [
diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json
index 6ceb796a9c..386c36088f 100644
--- a/seed/challenges/html5-and-css.json
+++ b/seed/challenges/html5-and-css.json
@@ -557,16 +557,15 @@
"Font size is controlled by the
font-size CSS property, like this:",
"
h1 {",
"
font-size: 30px;",
- "}",
- "See if you can figure out how to give both of your
p elements the font-size of 16 pixels (
16px). You can do this inside the same
<style> tag that we created for your
red-text class.",
+ "
}",
"Create a second
p element with the following kitty ipsum text:
Purr jump eat the grass rip the couch scratched sunbathe, shed everywhere rip the couch sleep in the sink fluffy fur catnip scratched.",
- "Then, inside your
<style> element, set the
font-size of all
p elements to 16 pixels."
+ "Inside the same
<style> tag that we created for your
red-text class, set the
font-size of all
p elements to 16 pixels (
16px)."
],
"tests": [
"assert($(\"p\").length > 1, 'You need 2
p elements with Kitty Ipsum text.')",
"assert(editor.match(/<\\/p>/g) && editor.match(/<\\/p>/g).length === editor.match(/
p elements has a closing tag.')",
"assert.isTrue((/Purr\\s+jump\\s+eat/gi).test($(\"p\").text()), 'Your p element should contain the first few words of the provided additional kitty ipsum text.')",
- "assert($(\"p\").css(\"font-size\") === \"16px\", 'Give elements with the red-text class a font-size of 16px.')"
+ "assert($(\"p\").css(\"font-size\") === \"16px\", 'Give elements with the p tag a font-size of 16px.')"
],
"challengeSeed": [
"",
"",
@@ -2939,9 +2939,9 @@
"id": "bad87fee1248bd9aedf08824",
"title": "Add Different Margins to Each Side of an Element",
"description": [
- "Give the green box a margin of 40px on its top and left side, but only 20px on its bottom and right side.",
"Sometimes you will want to customize an element so that it has a different margin on each of its sides.",
- "CSS allows you to control the margin of an element on all four sides with margin-top, margin-right, margin-bottom, and margin-left properties."
+ "CSS allows you to control the margin of an element on all four sides with margin-top, margin-right, margin-bottom, and margin-left properties.",
+ "Give the green box a margin of 40px on its top and left side, but only 20px on its bottom and right side."
],
"tests": [
"assert($(\".green-box\").css(\"margin-top\") === \"40px\", 'Your green-box class should give the top of elements 40px of margin.')",
@@ -3157,7 +3157,8 @@
"}"
],
"tests": [
- "assert($(\"body\").css(\"background-color\") === \"rgb(0, 0, 0)\", 'Give your body element the background-color of black.')"
+ "assert($(\"body\").css(\"background-color\") === \"rgb(0, 0, 0)\", 'Give your body element the background-color of black.')",
+ "assert(editor.match(/