' +
error.replace(/j\$/gi, '$').replace(/jdocument/gi, 'document').replace(/jjQuery/gi, 'jQuery') +
@@ -471,7 +516,10 @@ function safeHTMLRun(test) {
var codeStorage = common.codeStorage;
if (common.challengeType === '0') {
var previewFrame = document.getElementById('preview');
- var preview = previewFrame.contentDocument || previewFrame.contentWindow.document;
+
+ var preview = previewFrame.contentDocument ||
+ previewFrame.contentWindow.document;
+
if (editor.getValue().match(/\/gi) !== null) {
var s = editor
.getValue()
@@ -554,9 +602,11 @@ function updatePreview() {
if (typeof prodOrDev !== 'undefined') {
- var nodeEnv = prodOrDev === 'production' ?
+ /* eslint-disable no-unused-vars */
+ var nodeEnv = window.prodOrDev === 'production' ?
'http://www.freecodecamp.com' :
'http://localhost:3001';
+ /* eslint-enable no-unused-vars */
if (common.challengeType === '0') {
setTimeout(updatePreview, 300);
@@ -567,8 +617,11 @@ if (typeof prodOrDev !== 'undefined') {
* "post" methods
*/
+/* eslint-disable no-unused-vars */
var testResults = [];
var postSuccess = function(data) {
+/* eslint-enable no-unused-vars */
+
var testDoc = document.createElement('div');
$(testDoc).html(
"" +
@@ -614,7 +667,9 @@ function showCompletion() {
isInitRun = false;
return;
}
- var time = Math.floor(Date.now()) - started;
+
+ var time = Math.floor(Date.now()) - window.started;
+
ga(
'send',
'event',
@@ -672,8 +727,11 @@ function showCompletion() {
});
}
+/* eslint-disable no-unused-vars */
var resetEditor = function resetEditor() {
- editor.setValue(replaceSafeTags(common.seed));
+/* eslint-enable no-unused-vars */
+
+ editor.setValue(common.replaceSafeTags(common.seed));
$('#testSuite').empty();
bonfireExecute(true);
common.codeStorage.updateStorage();
@@ -863,15 +921,15 @@ common.init.push((function() {
var nextStep = getNextStep($(stepClass));
$(this)
.parent()
- .addClass('animated fadeOutLeft')
- .delay(700)
+ .addClass('animated fadeOutLeft fast-animation')
+ .delay(250)
.queue(function(next) {
$(this).addClass('hidden');
if (nextStep) {
$(nextStep)
.removeClass('hidden')
- .addClass('animated slideInRight')
- .delay(1000)
+ .addClass('animated slideInRight fast-animation')
+ .delay(500)
.queue(function(next) {
$(this).removeClass('slideInRight');
next();
diff --git a/client/less/chat.less b/client/less/chat.less
new file mode 100644
index 0000000000..a6f83171ca
--- /dev/null
+++ b/client/less/chat.less
@@ -0,0 +1,24 @@
+.chat-embed-main-title {
+ display: flex;
+ flex-grow: 1;
+ padding-left: 31px;
+ padding-top: 7px;
+}
+
+.gitter-chat-embed {
+ z-index: 100;
+ position: fixed;
+
+ top: 0;
+ left: 60%;
+ bottom: 0;
+ right: 0;
+
+ display: flex;
+ flex-direction: row;
+ transition: transform 0.3s cubic-bezier(0.16, 0.22, 0.22, 1.7);
+}
+
+.gitter-chat-embed.is-collapsed:not(.is-loading) {
+ transform: translateX(110%);
+}
diff --git a/client/less/main.less b/client/less/main.less
index 067290e9be..aa70867894 100644
--- a/client/less/main.less
+++ b/client/less/main.less
@@ -96,6 +96,10 @@ h1, h2, h3, h4, h5, h6, p, li {
margin-right: 5px;
}
+.fa:hover {
+ text-decoration: none;
+}
+
.img-center {
margin: 0 auto;
}
@@ -490,11 +494,17 @@ thead {
border-radius: 5px;
}
+.story-section {
+ height: 500px;
+}
+
.testimonial-copy {
- font-size: 20px;
- text-align: center;
+ text-align: justify;
+ font-size: 18px !important;
+ margin-left: 20px;
+ margin-right: 20px;
@media (min-width: 991px) and (max-width: 1199px) {
- height: 120px;
+ height: 140px;
}
@media (min-width: 1200px) {
height: 90px;
@@ -945,6 +955,11 @@ code {
margin: 0!important;
}
+// gitter chat
+.gitter-chat-embed {
+ z-index: 20000 !important;
+}
+
//uncomment this to see the dimensions of all elements outlined in red
//* {
// border-color: red;
@@ -1052,3 +1067,5 @@ code {
transform: rotate(0deg);
}
}
+
+@import "chat.less";
diff --git a/client/main.js b/client/main.js
index c1578c1d6f..6f147abcf7 100644
--- a/client/main.js
+++ b/client/main.js
@@ -1,12 +1,120 @@
-var mapShareKey = 'map-shares';
+var main = window.main || {};
+
+main.mapShareKey = 'map-shares';
+
+main.ga = window.ga || function() {};
+
+main = (function(main) {
+
+ // should be set before gitter script loads
+ ((window.gitter = {}).chat = {}).options = {
+ disableDefaultChat: true
+ };
+ // wait for sidecar to load
+
+ main.chat = {};
+ main.chat.isOpen = false;
+ main.chat.createHelpChat = function createHelpChat() {
+ throw new Error('Sidecar chat has not initialized');
+ };
+
+ document.addEventListener('gitter-sidecar-ready', function(e) {
+ main.chat.GitterChat = e.detail.Chat;
+
+ main.chat.createHelpChat = function(room, helpChatBtnClass, roomTitle) {
+ roomTitle = roomTitle || 'Waypoint Help';
+
+ $('body').append(
+ ''
+ );
+
+ main.chat.helpChat = new main.chat.GitterChat({
+ room: room,
+ activationElement: false,
+ targetElement: $('#chat-embed-help')
+ });
+
+ $(helpChatBtnClass).on('click', function() {
+ // is button already pressed?
+ // no? open chat
+ // yes? close chat
+ var shouldChatBeOpen = !$(this).hasClass('active');
+ main.chat.helpChat.toggleChat(shouldChatBeOpen);
+ if (shouldChatBeOpen) {
+ $(helpChatBtnClass).addClass('active');
+ }
+ });
+
+ var helpTitleAdd = false;
+ $('#chat-embed-help').on('gitter-chat-toggle', function(e) {
+ var shouldButtonBePressed = !!e.originalEvent.detail.state;
+
+ if (!helpTitleAdd) {
+ helpTitleAdd = true;
+ $('#chat-embed-help > .gitter-chat-embed-action-bar').prepend(
+ ''
+ );
+ }
+
+ if (shouldButtonBePressed) {
+ return $(helpChatBtnClass).addClass('active');
+ }
+ return $(helpChatBtnClass).removeClass('active');
+ });
+ };
+
+ $('body').append(
+ ''
+ );
+
+ main.chat.mainChat = new main.chat.GitterChat({
+ room: 'freecodecamp/freecodecamp',
+ activationElement: false,
+ targetElement: $('#chat-embed-main')
+ });
+
+ var mainChatTitleAdded = false;
+ $('#chat-embed-main').on('gitter-chat-toggle', function() {
+ if (mainChatTitleAdded) {
+ return null;
+ }
+ mainChatTitleAdded = true;
+
+ $('#chat-embed-main > .gitter-chat-embed-action-bar').prepend(
+ ''
+ );
+ });
+
+
+ $('#nav-chat-btn').on('click', function() {
+ if (!main.chat.isOpen) {
+
+ main.chat.mainChat.toggleChat(true);
+ }
+ });
+ });
+
+ return main;
+}(main));
+
var lastCompleted = typeof lastCompleted !== 'undefined' ?
lastCompleted :
'';
function getMapShares() {
- var alreadyShared = JSON.parse(localStorage.getItem(mapShareKey) || '[]');
+ var alreadyShared = JSON.parse(
+ localStorage.getItem(main.mapShareKey) ||
+ '[]'
+ );
+
if (!alreadyShared || !Array.isArray(alreadyShared)) {
- localStorage.setItem(mapShareKey, JSON.stringify([]));
+ localStorage.setItem(main.mapShareKey, JSON.stringify([]));
alreadyShared = [];
}
return alreadyShared;
@@ -23,15 +131,16 @@ function setMapShare(id) {
if (!found) {
alreadyShared.push(id);
}
- localStorage.setItem(mapShareKey, JSON.stringify(alreadyShared));
+ localStorage.setItem(main.mapShareKey, JSON.stringify(alreadyShared));
return alreadyShared;
}
$(document).ready(function() {
+
var challengeName = typeof challengeName !== 'undefined' ?
challengeName :
- 'Untitled';
+ '';
if (challengeName) {
ga('send', 'event', 'Challenge', 'load', challengeName);
@@ -126,13 +235,14 @@ $(document).ready(function() {
'links to screenshots if possible.\n\n'
].join('');
- if (editor.getValue().trim()) {
+ if (typeof editor !== 'undefined' && editor.getValue().trim()) {
var type;
switch (challengeType) {
case challengeTypes.HTML_CSS_JQ:
type = 'html';
break;
case challengeTypes.JAVASCRIPT:
+ case challengeTypes.BONFIRE:
type = 'javascript';
break;
default:
@@ -444,6 +554,7 @@ $(document).ready(function() {
'&redirect_uri=http%3A%2F%2Ffreecodecamp%2Ecom%2Fmap';
setMapShare(challengeBlockName);
+ main.ga('send', 'event', 'FB_LINK', 'SHARE', 'Facebook map share');
window.location.href = link;
});
});
diff --git a/common/app/components/Footer/links.json b/common/app/components/Footer/links.json
index 92199b127f..8089a868e4 100644
--- a/common/app/components/Footer/links.json
+++ b/common/app/components/Footer/links.json
@@ -2,7 +2,7 @@
{
"className": "ion-speakerphone",
"content": " Blog ",
- "href": "http://blog.freecodecamp.com",
+ "href": "http://medium.freecodecamp.com",
"target": "_blank"
},
{
diff --git a/common/app/flux/Store.js b/common/app/flux/Store.js
index c745e16ac0..30ee4e7ff3 100644
--- a/common/app/flux/Store.js
+++ b/common/app/flux/Store.js
@@ -8,13 +8,17 @@ const initValue = {
points: 0
};
-export default Store(initValue)
- .refs({ displayName: 'AppStore' })
- .init(({ instance: appStore, args: [cat] }) => {
+export default Store({
+ refs: {
+ displayName: 'AppStore',
+ value: initValue
+ },
+ init({ instance: appStore, args: [cat] }) {
const { setUser, setTitle } = cat.getActions('appActions');
const register = createRegistrar(appStore);
register(setter(fromMany(setUser, setTitle)));
return appStore;
- });
+ }
+});
diff --git a/common/app/routes/Hikes/components/Lecture.jsx b/common/app/routes/Hikes/components/Lecture.jsx
index ea3c85191d..e47dc0fc98 100644
--- a/common/app/routes/Hikes/components/Lecture.jsx
+++ b/common/app/routes/Hikes/components/Lecture.jsx
@@ -1,6 +1,6 @@
import React, { PropTypes } from 'react';
import { Button, Col, Row, Panel } from 'react-bootstrap';
-import { Navigation } from 'react-router';
+import { History } from 'react-router';
import Vimeo from 'react-vimeo';
import debugFactory from 'debug';
@@ -8,7 +8,7 @@ const debug = debugFactory('freecc:hikes');
export default React.createClass({
displayName: 'Lecture',
- mixins: [Navigation],
+ mixins: [History],
propTypes: {
currentHike: PropTypes.object,
@@ -20,7 +20,7 @@ export default React.createClass({
handleFinish() {
debug('loading questions');
const { dashedName } = this.props.params;
- this.transitionTo(`/hikes/${dashedName}/questions/1`);
+ this.history.pushState(null, `/hikes/${dashedName}/questions/1`);
},
renderTranscript(transcript, dashedName) {
diff --git a/common/app/routes/Hikes/components/Question.jsx b/common/app/routes/Hikes/components/Question.jsx
index e7fe7662d9..4f7e97f149 100644
--- a/common/app/routes/Hikes/components/Question.jsx
+++ b/common/app/routes/Hikes/components/Question.jsx
@@ -1,6 +1,6 @@
import React, { PropTypes } from 'react';
import { Spring } from 'react-motion';
-import { Navigation, TransitionHook } from 'react-router';
+import { History, Lifecycle } from 'react-router';
import debugFactory from 'debug';
import {
Button,
@@ -19,8 +19,8 @@ export default React.createClass({
displayName: 'Question',
mixins: [
- Navigation,
- TransitionHook
+ History,
+ Lifecycle
],
propTypes: {
@@ -150,7 +150,8 @@ export default React.createClass({
postJSON$('/completed-challenge', { id, name }).subscribeOnCompleted(() => {
if (tests[nextQuestionIndex]) {
- return this.transitionTo(
+ return this.history.pushState(
+ null,
`/hikes/${ dashedName }/questions/${ nextQuestionIndex + 1 }`
);
}
@@ -168,13 +169,13 @@ export default React.createClass({
}, null);
if (nextHike) {
- return this.transitionTo(`/hikes/${ nextHike.dashedName }`);
+ return this.history.pushState(null, `/hikes/${ nextHike.dashedName }`);
}
debug(
'next Hike was not found, currentHike %s',
currentHike.dashedName
);
- this.transitionTo('/hikes');
+ this.history.pushState(null, '/hikes');
});
},
diff --git a/common/app/routes/Hikes/flux/Actions.js b/common/app/routes/Hikes/flux/Actions.js
index 2d9d44a4fd..f6ed407fae 100644
--- a/common/app/routes/Hikes/flux/Actions.js
+++ b/common/app/routes/Hikes/flux/Actions.js
@@ -3,7 +3,7 @@ import debugFactory from 'debug';
const debug = debugFactory('freecc:hikes:actions');
-function getCurrentHike(hikes =[{}], dashedName, currentHike) {
+function getCurrentHike(hikes = [{}], dashedName, currentHike) {
if (!dashedName) {
debug('no dashedName');
return hikes[0];
diff --git a/common/app/routes/Hikes/flux/Store.js b/common/app/routes/Hikes/flux/Store.js
index 4c7080b1c2..9755ed679a 100644
--- a/common/app/routes/Hikes/flux/Store.js
+++ b/common/app/routes/Hikes/flux/Store.js
@@ -5,12 +5,16 @@ const initialValue = {
currentHike: {}
};
-export default Store(initialValue)
- .refs({ displayName: 'HikesStore'})
- .init(({ instance: hikeStore, args: [cat] }) => {
+export default Store({
+ refs: {
+ displayName: 'HikesStore',
+ value: initialValue
+ },
+ init({ instance: hikeStore, args: [cat] }) {
let { setHikes } = cat.getActions('hikesActions');
hikeStore.register(setHikes);
return hikeStore;
- });
+ }
+});
diff --git a/common/app/routes/Jobs/flux/Store.js b/common/app/routes/Jobs/flux/Store.js
index b2f5132013..8f3acd2949 100644
--- a/common/app/routes/Jobs/flux/Store.js
+++ b/common/app/routes/Jobs/flux/Store.js
@@ -6,9 +6,12 @@ const {
transformer
} = Store;
-export default Store({ showModal: false })
- .refs({ displayName: 'JobsStore' })
- .init(({ instance: jobsStore, args: [cat] }) => {
+export default Store({
+ refs: {
+ displayName: 'JobsStore',
+ value: { showModal: false }
+ },
+ init({ instance: jobsStore, args: [cat] }) {
const {
setJobs,
findJob,
@@ -27,4 +30,5 @@ export default Store({ showModal: false })
register(transformer(findJob));
register(handleForm);
- });
+ }
+});
diff --git a/common/models/challenge.json b/common/models/challenge.json
index 84cf3a4c6b..81d6af6eef 100644
--- a/common/models/challenge.json
+++ b/common/models/challenge.json
@@ -82,6 +82,10 @@
},
"descriptionPt": {
"type": "array"
+ },
+ "solutions": {
+ "type": "array",
+ "default": []
}
},
"validations": [],
diff --git a/common/models/pledge.json b/common/models/pledge.json
new file mode 100644
index 0000000000..08e46df414
--- /dev/null
+++ b/common/models/pledge.json
@@ -0,0 +1,55 @@
+{
+ "name": "pledge",
+ "base": "PersistedModel",
+ "idInjection": true,
+ "trackChanges": false,
+ "properties": {
+ "nonprofit": {
+ "type": "string",
+ "index": true
+ },
+ "amount": {
+ "type": "number"
+ },
+ "dateStarted": {
+ "type": "date",
+ "defaultFn": "now"
+ },
+ "dateEnded": {
+ "type": "date"
+ },
+ "formerUserId": {
+ "type": "string"
+ },
+ "isOrphaned": {
+ "type": "boolean"
+ },
+ "isCompleted": {
+ "type": "boolean",
+ "default": "false"
+ }
+ },
+ "validations": [],
+ "relations": {
+ "user": {
+ "type": "hasMany",
+ "model": "user",
+ "foreignKey": "userId"
+ }
+ },
+ "acls": [
+ {
+ "accessType": "*",
+ "principalType": "ROLE",
+ "principalId": "$everyone",
+ "permission": "DENY"
+ },
+ {
+ "accessType": "READ",
+ "principalType": "ROLE",
+ "principalId": "$everyone",
+ "permission": "ALLOW"
+ }
+ ],
+ "methods": []
+}
diff --git a/common/models/user.js b/common/models/user.js
index 06761e0209..bb746ed8d8 100644
--- a/common/models/user.js
+++ b/common/models/user.js
@@ -322,7 +322,7 @@ module.exports = function(User) {
})
// no results means this is the first brownie point given by giver
// so return -1 to indicate receiver should receive point
- .firstOrDefault(null, -1)
+ .first({ defaultValue: -1 })
.flatMap((browniePointsFromGiver) => {
if (browniePointsFromGiver === -1) {
diff --git a/common/models/user.json b/common/models/user.json
index 776c2c500e..f85cc1023c 100644
--- a/common/models/user.json
+++ b/common/models/user.json
@@ -166,6 +166,11 @@
"type": "hasMany",
"model": "userIdentity",
"foreignKey": ""
+ },
+ "pledge": {
+ "type": "hasOne",
+ "model": "pledge",
+ "foreignKey": ""
}
},
"acls": [
diff --git a/gulpfile.js b/gulpfile.js
index fd5fdda38d..4ae0d93d23 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -79,6 +79,7 @@ var paths = {
],
less: './client/less/main.less',
+ lessFiles: './client/less/*.less',
manifest: 'server/manifests/',
@@ -392,7 +393,7 @@ var watchDependents = [
];
gulp.task('watch', watchDependents, function() {
- gulp.watch(paths.less, ['less']);
+ gulp.watch(paths.lessFiles, ['less']);
gulp.watch(paths.js, ['js']);
gulp.watch(paths.challenges, ['test-challenges']);
gulp.watch(paths.js, ['js', 'dependents']);
diff --git a/package.json b/package.json
index c3f7c0bebb..06d6a933ce 100644
--- a/package.json
+++ b/package.json
@@ -63,8 +63,8 @@
"json-loader": "^0.5.2",
"less": "~2.5.1",
"lodash": "^3.9.3",
- "loopback": "https://github.com/FreeCodeCamp/loopback.git#fix/no-password",
- "loopback-boot": "2.8.2",
+ "loopback": "^2.22.0",
+ "loopback-boot": "^2.13.0",
"loopback-component-passport": "https://github.com/FreeCodeCamp/loopback-component-passport.git#feature/flashfailure",
"loopback-connector-mongodb": "^1.10.0",
"lusca": "~1.0.2",
@@ -89,17 +89,17 @@
"react": "^0.13.3",
"react-bootstrap": "~0.23.7",
"react-motion": "~0.1.0",
- "react-router": "^1.0.0-rc1",
+ "react-router": "https://github.com/BerkeleyTrue/react-router.git#freecodecamp",
"react-vimeo": "^0.0.3",
"request": "~2.53.0",
"rev-del": "^1.0.5",
- "rx": "^2.5.3",
+ "rx": "^4.0.0",
"sanitize-html": "~1.6.1",
"sort-keys": "^1.1.1",
"source-map-support": "^0.3.2",
"store": "https://github.com/berkeleytrue/store.js.git#feature/noop-server",
- "thundercats": "^2.1.0",
- "thundercats-react": "^0.1.0",
+ "thundercats": "^3.0.0",
+ "thundercats-react": "^0.3.0",
"twit": "~1.1.20",
"uglify-js": "~2.4.15",
"validator": "^3.22.1",
diff --git a/seed/challenges/advanced-bonfires.json b/seed/challenges/advanced-bonfires.json
index db81a04400..8ff025e2fe 100644
--- a/seed/challenges/advanced-bonfires.json
+++ b/seed/challenges/advanced-bonfires.json
@@ -1,6 +1,7 @@
{
"name": "Advanced Algorithm Scripting",
"order": 15,
+ "time": "50h",
"challenges": [
{
"id": "aff0395860f5d3034dc0bfc9",
@@ -39,7 +40,9 @@
"assert(telephoneCheck(\"27576227382\") === false, 'message: telephoneCheck(\"27576227382\") should return false.');",
"assert(telephoneCheck(\"(275)76227382\") === false, 'message: telephoneCheck(\"(275)76227382\") should return false.');",
"assert(telephoneCheck(\"2(757)6227382\") === false, 'message: telephoneCheck(\"2(757)6227382\") should return false.');",
- "assert(telephoneCheck(\"2(757)622-7382\") === false, 'message: telephoneCheck(\"2(757)622-7382\") should return false.');"
+ "assert(telephoneCheck(\"2(757)622-7382\") === false, 'message: telephoneCheck(\"2(757)622-7382\") should return false.');",
+ "assert(telephoneCheck(\"555)-555-5555\") === false, 'message: telephoneCheck(\"555)555-5555\") should return false.');",
+ "assert(telephoneCheck(\"(555-555-5555\") === false, 'message: telephoneCheck(\"(555-555-5555\") should return false.');"
],
"challengeSeed": [
"function telephoneCheck(str) {",
@@ -142,6 +145,7 @@
"assert.deepEqual(drawer(19.50, 20.00, [[\"PENNY\", 1.01], [\"NICKEL\", 2.05], [\"DIME\", 3.10], [\"QUARTER\", 4.25], [\"ONE\", 90.00], [\"FIVE\", 55.00], [\"TEN\", 20.00], [\"TWENTY\", 60.00], [\"ONE HUNDRED\", 100.00]]), [[\"QUARTER\", 0.50]], 'message: drawer(19.50, 20.00, [[\"PENNY\", 1.01], [\"NICKEL\", 2.05], [\"DIME\", 3.10], [\"QUARTER\", 4.25], [\"ONE\", 90.00], [\"FIVE\", 55.00], [\"TEN\", 20.00], [\"TWENTY\", 60.00], [\"ONE HUNDRED\", 100.00]]) should return [[\"QUARTER\", 0.50]].');",
"assert.deepEqual(drawer(3.26, 100.00, [[\"PENNY\", 1.01], [\"NICKEL\", 2.05], [\"DIME\", 3.10], [\"QUARTER\", 4.25], [\"ONE\", 90.00], [\"FIVE\", 55.00], [\"TEN\", 20.00], [\"TWENTY\", 60.00], [\"ONE HUNDRED\", 100.00]]), [[\"TWENTY\", 60.00], [\"TEN\", 20.00], [\"FIVE\", 15], [\"ONE\", 1], [\"QUARTER\", 0.50], [\"DIME\", 0.20], [\"PENNY\", 0.04]], 'message: drawer(3.26, 100.00, [[\"PENNY\", 1.01], [\"NICKEL\", 2.05], [\"DIME\", 3.10], [\"QUARTER\", 4.25], [\"ONE\", 90.00], [\"FIVE\", 55.00], [\"TEN\", 20.00], [\"TWENTY\", 60.00], [\"ONE HUNDRED\", 100.00]]) should return [[\"TWENTY\", 60.00], [\"TEN\", 20.00], [\"FIVE\", 15], [\"ONE\", 1], [\"QUARTER\", 0.50], [\"DIME\", 0.20], [\"PENNY\", 0.04]].');",
"assert.deepEqual(drawer(19.50, 20.00, [[\"PENNY\", 0.01], [\"NICKEL\", 0], [\"DIME\", 0], [\"QUARTER\", 0], [\"ONE\", 0], [\"FIVE\", 0], [\"TEN\", 0], [\"TWENTY\", 0], [\"ONE HUNDRED\", 0]]), \"Insufficient Funds\", 'message: drawer(19.50, 20.00, [[\"PENNY\", 0.01], [\"NICKEL\", 0], [\"DIME\", 0], [\"QUARTER\", 0], [\"ONE\", 0], [\"FIVE\", 0], [\"TEN\", 0], [\"TWENTY\", 0], [\"ONE HUNDRED\", 0]]) should return \"Insufficient Funds\".');",
+ "assert.deepEqual(drawer(19.50, 20.00, [[\"PENNY\", 0.01], [\"NICKEL\", 0], [\"DIME\", 0], [\"QUARTER\", 0], [\"ONE\", 1.00], [\"FIVE\", 0], [\"TEN\", 0], [\"TWENTY\", 0], [\"ONE HUNDRED\", 0]]), \"Insufficient Funds\", 'message: drawer(19.50, 20.00, [[\"PENNY\", 0.01], [\"NICKEL\", 0], [\"DIME\", 0], [\"QUARTER\", 0], [\"ONE\", 1.00], [\"FIVE\", 0], [\"TEN\", 0], [\"TWENTY\", 0], [\"ONE HUNDRED\", 0]]) should return \"Insufficient Funds\".');",
"assert.deepEqual(drawer(19.50, 20.00, [[\"PENNY\", 0.50], [\"NICKEL\", 0], [\"DIME\", 0], [\"QUARTER\", 0], [\"ONE\", 0], [\"FIVE\", 0], [\"TEN\", 0], [\"TWENTY\", 0], [\"ONE HUNDRED\", 0]]), \"Closed\", 'message: drawer(19.50, 20.00, [[\"PENNY\", 0.50], [\"NICKEL\", 0], [\"DIME\", 0], [\"QUARTER\", 0], [\"ONE\", 0], [\"FIVE\", 0], [\"TEN\", 0], [\"TWENTY\", 0], [\"ONE HUNDRED\", 0]]) should return \"Closed\".');"
],
"MDNlinks": [
diff --git a/seed/challenges/angularjs.json b/seed/challenges/angularjs.json
index 92c85e751b..905c120f33 100644
--- a/seed/challenges/angularjs.json
+++ b/seed/challenges/angularjs.json
@@ -1,6 +1,7 @@
{
"name": "AngularJS",
"order": 16,
+ "time": "5h",
"challenges": [
{
"id": "bd7154d8c441eddfaeb5bdef",
diff --git a/seed/challenges/automated-testing-and-debugging.json b/seed/challenges/automated-testing-and-debugging.json
index b5ab25c2f9..0c7304045b 100644
--- a/seed/challenges/automated-testing-and-debugging.json
+++ b/seed/challenges/automated-testing-and-debugging.json
@@ -1,6 +1,7 @@
{
"name": "Automated Testing and Debugging",
"order": 14,
+ "time": "15m",
"challenges": [
{
"id":"cf1111c1c16feddfaeb6bdef",
diff --git a/seed/challenges/basejumps.json b/seed/challenges/basejumps.json
index c0dc0a0ba3..627e95482f 100644
--- a/seed/challenges/basejumps.json
+++ b/seed/challenges/basejumps.json
@@ -1,6 +1,7 @@
{
"name": "Full Stack JavaScript Projects",
"order": 20,
+ "time": "300h",
"challenges": [
{
"id": "bd7158d8c443eddfaeb5bcef",
@@ -52,7 +53,7 @@
"Before you publish to Heroku, you should free up as much memory as possible on Cloud9. In each of the Cloud9 terminal prompt tabs where MongoDB and Grunt are running, press the control + c hotkey to shut down these processes.",
"Run the following command in a Cloud9 terminal prompt tab: npm install grunt-contrib-imagemin --save-dev && npm install --save-dev && heroku login. At this point, the terminal will prompt you to log in to Heroku from the command line.",
"Now run yo angular-fullstack:heroku. You can choose a name for your Heroku project, or Heroku will create a random one for you. You can choose whether you want to deploy to servers the US or the EU.",
- "Set the config flag for your Heroku environment and add MongoLab for your MongoDB instance by running the following command: cd ~/workspace/dist && heroku config:set NODE_ENV=production && heroku addons:create mongolab.",
+ "Set the config flag for your Heroku environment and add MongoLab for your MongoDB instance by running the following command: cd ~/workspace/dist && heroku config:set NODE_ENV=production && heroku addons:add mongolab.",
"As you build your app, you should frequently commit changes to your codebase. Make sure you're in the ~/workspace directory by running cd ~/workspace. Then you can use this code to stage the changes to your changes and commit them: git commit -am \"your commit message\". Note that you should replace \"your commit message\" with a short summary of the changes you made to your code, such as \"added a records controller and corresponding routes\".",
"You can push these new commits to GitHub by running git push origin master, and to Heroku by running grunt --force && grunt buildcontrol:heroku.",
"If you need further guidance on using Yeoman Angular-Fullstack Generator, check out: https://github.com/clnhll/guidetobasejumps.",
diff --git a/seed/challenges/basic-bonfires.json b/seed/challenges/basic-bonfires.json
index 12da55a771..e2e2fa0e3f 100644
--- a/seed/challenges/basic-bonfires.json
+++ b/seed/challenges/basic-bonfires.json
@@ -1,6 +1,7 @@
{
"name": "Basic Algorithm Scripting",
- "order": 7,
+ "order": 8,
+ "time": "50h",
"challenges": [
{
"id": "ad7123c8c441eddfaeb5bdef",
@@ -60,7 +61,7 @@
" return str;",
"}",
"",
- "reverseString(\"hello\", \"\");"
+ "reverseString(\"hello\");"
],
"MDNlinks": [
"Global String Object",
@@ -103,7 +104,7 @@
" return num;",
"}",
"",
- "factorialize(5, '');"
+ "factorialize(5);"
],
"MDNlinks": [
"Arithmetic Operators"
@@ -142,7 +143,7 @@
"assert(palindrome(\"almostomla\") === false, 'message: palindrome(\"almostomla\") should return false.');",
"assert(palindrome(\"My age is 0, 0 si ega ym.\") === true, 'message: palindrome(\"My age is 0, 0 si ega ym.\") should return true.');",
"assert(palindrome(\"1 eye for of 1 eye.\") === false, 'message: palindrome(\"1 eye for of 1 eye.\") should return false.');",
- "assert(palindrome(\"0_0 (: /-\\ :) 0-0\") === true, 'message: palindrome(\"0_0 (: /-\\\\ :) 0-0\") should return true.');"
+ "assert(palindrome(\"0_0 (: /-\\ :) 0-0\") === true, 'message: palindrome(\"0_0 (: /-\\ :) 0-0\") should return true.');"
],
"challengeSeed": [
"function palindrome(str) {",
@@ -224,7 +225,7 @@
" return str;",
"}",
"",
- "titleCase(\"I'm a little tea pot\", \"\");"
+ "titleCase(\"I'm a little tea pot\");"
],
"tests": [
"assert(typeof(titleCase(\"I'm a little tea pot\")) === \"string\", 'message: titleCase() should return a string.');",
@@ -300,13 +301,14 @@
" return str;",
"}",
"",
- "end(\"Bastian\", \"n\", \"\");"
+ "end(\"Bastian\", \"n\");"
],
"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, '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(\"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": [
@@ -338,7 +340,7 @@
" return str;",
"}",
"",
- "repeat(\"abc\", 3, \"\");"
+ "repeat(\"abc\", 3);"
],
"tests": [
"assert(repeat(\"*\", 3) === \"***\", 'message: repeat(\"*\", 3) should return \"***\".');",
@@ -367,6 +369,7 @@
"description": [
"Truncate a string (first argument) if it is longer than the given maximum string length (second argument). Return the truncated string with a \"...\" ending.",
"Note that the three dots at the end add to the string length.",
+ "If the length of the string is less than or equal to 3 characters, then the length of the three dots is not added to the string length.",
"Remember to use Read-Search-Ask if you get stuck. Write your own code."
],
"challengeSeed": [
@@ -375,13 +378,14 @@
" return str;",
"}",
"",
- "truncate(\"A-tisket a-tasket A green and yellow basket\", 11, \"\");"
+ "truncate(\"A-tisket a-tasket A green and yellow basket\", 11);"
],
"tests": [
"assert(truncate(\"A-tisket a-tasket A green and yellow basket\", 11) === \"A-tisket...\", 'message: truncate(\"A-tisket a-tasket A green and yellow basket\", 11) should return \"A-tisket...\".');",
"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-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...\".');"
],
"MDNlinks": [
"String.slice()"
@@ -412,7 +416,7 @@
" return arr;",
"}",
"",
- "chunk([\"a\", \"b\", \"c\", \"d\"], 2, \"\");"
+ "chunk([\"a\", \"b\", \"c\", \"d\"], 2);"
],
"tests": [
"assert.deepEqual(chunk([\"a\", \"b\", \"c\", \"d\"], 2), [[\"a\", \"b\"], [\"c\", \"d\"]], 'message: chunk([\"a\", \"b\", \"c\", \"d\"], 2) should return [[\"a\", \"b\"], [\"c\", \"d\"]].');",
@@ -450,12 +454,13 @@
" return arr;",
"}",
"",
- "slasher([1, 2, 3], 2, \"\");"
+ "slasher([1, 2, 3], 2);"
],
"tests": [
- "assert.deepEqual(slasher([1, 2, 3], 2), [3], 'message: slasher([1, 2, 3], 2, [3]) should return [3].');",
+ "assert.deepEqual(slasher([1, 2, 3], 2), [3], 'message: slasher([1, 2, 3], 2) should return [3].');",
"assert.deepEqual(slasher([1, 2, 3], 0), [1, 2, 3], 'message: slasher([1, 2, 3], 0) should return [1, 2, 3].');",
- "assert.deepEqual(slasher([1, 2, 3], 9), [], 'message: slasher([1, 2, 3], 9) should return [].');"
+ "assert.deepEqual(slasher([1, 2, 3], 9), [], 'message: slasher([1, 2, 3], 9) should return [].');",
+ "assert.deepEqual(slasher([1, 2, 3], 4), [], 'message: slasher([1, 2, 3], 4) should return [].');"
],
"MDNlinks": [
"Array.slice()",
@@ -489,7 +494,7 @@
" return arr;",
"}",
"",
- "mutation([\"hello\", \"hey\"], \"\");"
+ "mutation([\"hello\", \"hey\"]);"
],
"tests": [
"assert(mutation([\"hello\", \"hey\"]) === false, 'message: mutation([\"hello\", \"hey\"]) should return false.');",
@@ -531,7 +536,7 @@
" return arr;",
"}",
"",
- "bouncer([7, \"ate\", \"\", false, 9], \"\");"
+ "bouncer([7, \"ate\", \"\", false, 9]);"
],
"tests": [
"assert.deepEqual(bouncer([7, \"ate\", \"\", false, 9]), [7, \"ate\", 9], 'message: bouncer([7, \"ate\", \"\", false, 9]) should return [7, \"ate\", 9].');",
@@ -568,7 +573,7 @@
" return arr;",
"}",
"",
- "destroyer([1, 2, 3, 1, 2, 3], 2, 3, \"\");"
+ "destroyer([1, 2, 3, 1, 2, 3], 2, 3);"
],
"tests": [
"assert.deepEqual(destroyer([1, 2, 3, 1, 2, 3], 2, 3), [1, 1], 'message: destroyer([1, 2, 3, 1, 2, 3], 2, 3) should return [1, 1].');",
@@ -608,7 +613,7 @@
" return num;",
"}",
"",
- "where([40, 60], 50, \"\");"
+ "where([40, 60], 50);"
],
"MDNlinks": [
"Array.sort()"
diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json
index 82a0430852..97b37c6fab 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -1,6 +1,7 @@
{
"name": "Basic JavaScript",
- "order": 5,
+ "order": 6,
+ "time": "3h",
"challenges": [
{
"id":"bd7123c9c441eddfaeb4bdef",
@@ -177,9 +178,9 @@
"id": "bd7123c9c450eddfaeb5bdef",
"title": "Use Bracket Notation to Find the Nth Character in a String",
"description": [
- "You can also use bracket Notationto get the character at other positions within a string.",
+ "You can also use bracket notation to get the character at other positions within a string.",
"Remember that computers start counting at 0, so the first character is actually the zeroth character.",
- "Let's try to set thirdLetterOfLastNameto equal the third letter of the lastName variable.",
+ "Let's try to set thirdLetterOfLastName to equal the third letter of the lastName variable.",
"Try looking at the secondLetterOfFirstName variable declaration if you get stuck."
],
"tests": [
@@ -529,7 +530,7 @@
],
"tests": [
"assert((function(d){if(d[0] == 'John' && d[1] == 23 && d[2] == undefined){return true;}else{return false;}})(myArray), 'message: myArray should only contain [\"John\", 23].');",
- "assert((function(d){if(d[0] == 'cat' && d[1] == 2 && d[2] == undefined){return true;}else{return false;}})(removed), 'message: removed should only contain [\"cat\"], 2.');"
+ "assert((function(d){if(d[0] == 'cat' && d[1] == 2 && d[2] == undefined){return true;}else{return false;}})(removed), 'message: removed should only contain [\"cat\", 2].');"
],
"challengeSeed": [
"// var numbers = [1,2,3];",
@@ -802,7 +803,7 @@
"assert.deepEqual(myArray, [0,1,2,3,4], 'message: myArray should equal [0,1,2,3,4].');"
],
"challengeSeed":[
- "ourArray = [];",
+ "var ourArray = [];",
"for(var i = 0; i < 5; i++){",
" ourArray.push(i);",
"}",
@@ -933,13 +934,13 @@
"assert(myFunction() >= min, 'message: The random number generated by myFunction should be greater than or equal to the minimum number.');",
"assert(myFunction() <= max, 'message: The random number generated by myFunction should be less than or equal to the maximum number.');",
"assert(myFunction() % 1 === 0 , 'message: The random number generated by myFunction should be an integer, not a decimal.');",
- "assert((function(){if(editor.getValue().match(/max/g).length >= 2 && editor.getValue().match(/min/g).length >= 2 && editor.getValue().match(/Math.floor/g) && editor.getValue().match(/Math.random/g)){return true;}else{return false;}})(), 'message: You should be using the function given in the description to calculate the random in number in a range.');"
+ "assert((function(){if(editor.getValue().match(/max/g).length >= 3 && editor.getValue().match(/min/g).length >= 4 && editor.getValue().match(/Math.floor/g) && editor.getValue().match(/Math.random/g)){return true;}else{return false;}})(), 'message: You should be using the function given in the description to calculate the random in number in a range.');"
],
"challengeSeed":[
- "var min = 0;",
+ "var min = 1;",
"var max = 9;",
"function myFunction() {",
- " // Make myFunction return a random number between zero and nine instead of a decimal",
+ " // Make myFunction return a random number between min and max values instead of a decimal",
" // Only change code below this line.",
"",
" return Math.random();",
@@ -1059,13 +1060,14 @@
},
{
"id":"cf1111c1c12feddfaeb8bdef",
- "title": "Find White Space with Regular Expressions",
+ "title": "Find Whitespace with Regular Expressions",
"difficulty":"9.986",
"description":[
- "We can also use selectors like \\s to find spaces in a string.",
+ "We can also use selectors like \\s to find whitespace in a string.",
+ "The whitespace characters are \" \" (space), \\r (carriage return), \\n (newline), \\t (tab), and \\f (form feed).",
"It is used like this:",
"/\\s+/g",
- "Select all the spaces in the sentence string."
+ "Select all the whitespace characters in the sentence string."
],
"tests":[
"assert(test === 7, 'message: Your RegEx should have found seven spaces in the testString.');",
@@ -1127,10 +1129,10 @@
"Math.floor(Math.random() * (3 - 1 + 1)) + 1;"
],
"tests":[
- "assert(typeof(runSlots($(\".slot\"))[0]) === \"number\", 'message: slotOne should be a random number.')",
- "assert(typeof(runSlots($(\".slot\"))[1]) === \"number\", 'message: slotTwo should be a random number.')",
- "assert(typeof(runSlots($(\".slot\"))[2]) === \"number\", 'message: slotThree should be a random number.')",
- "assert((function(){if(editor.match(/Math\\.floor\\(\\s?Math\\.random\\(\\)\\s?\\*\\s?\\(\\s?3\\s?\\-\\s?1\\s?\\+\\s?1\\s?\\)\\s?\\)\\s?\\+\\s?1;/gi) !== null){return editor.match(/Math\\.floor\\(\\s?Math\\.random\\(\\)\\s?\\*\\s?\\(\\s?3\\s?\\-\\s?1\\s?\\+\\s?1\\s?\\)\\s?\\)\\s?\\+\\s?1;/gi).length >= 3;}else{return false;}})(), 'message: You should have used Math.floor(Math.random() * (3 - 1 + 1)) + 1; three times to generate your random numbers.')"
+ "assert(typeof(runSlots($(\".slot\"))[0]) === \"number\", 'slotOne should be a random number.')",
+ "assert(typeof(runSlots($(\".slot\"))[1]) === \"number\", 'slotTwo should be a random number.')",
+ "assert(typeof(runSlots($(\".slot\"))[2]) === \"number\", 'slotThree should be a random number.')",
+ "assert((function(){if(editor.match(/Math\\.floor\\(\\s?Math\\.random\\(\\)\\s?\\*\\s?\\(\\s?3\\s?\\-\\s?1\\s?\\+\\s?1\\s?\\)\\s?\\)\\s?\\+\\s?1;/gi) !== null){return editor.match(/Math\\.floor\\(\\s?Math\\.random\\(\\)\\s?\\*\\s?\\(\\s?3\\s?\\-\\s?1\\s?\\+\\s?1\\s?\\)\\s?\\)\\s?\\+\\s?1;/gi).length >= 3;}else{return false;}})(), 'You should have used Math.floor(Math.random() * (3 - 1 + 1)) + 1; three times to generate your random numbers.')"
],
"challengeSeed":[
"fccss",
diff --git a/seed/challenges/basic-ziplines.json b/seed/challenges/basic-ziplines.json
index cf2ac272f6..15043e6220 100644
--- a/seed/challenges/basic-ziplines.json
+++ b/seed/challenges/basic-ziplines.json
@@ -1,50 +1,53 @@
{
"name": "Basic Front End Development Projects",
- "order": 8,
+ "order": 9,
+ "time": "100h",
"challenges": [
{
"id": "bd7158d8c442eddfbeb5bd1f",
"title": "Get Set for Ziplines",
- "difficulty": 1.00,
- "challengeSeed": ["125658022"],
+ "challengeSeed": [],
"description": [
- "Now you're ready to start our Zipline challenges. These front-end development challenges will give you many opportunities to apply the HTML, CSS, jQuery and JavaScript you've learned to build static (database-less) applications.",
- "Whatever you do, don't get discouraged! Remember to use Read-Search-Ask if you get stuck.",
- "We'll build these challenges using CodePen, a popular tool for creating, sharing, and discovering static web applications.",
- "Go to http://codepen.io and create an account.",
- "Click your user image in the top right corner, then click the \"New pen\" button that drops down.",
- "Drag the windows around and press the buttons in the lower-right hand corner to change the orientation to suit your preference.",
- "Click the gear next to CSS. Then under the \"Add External CSS\" section, use the \"Quick-add\" select box to select Bootstrap. Then click \"Save & Close\".",
- "Verify that bootstrap is active by adding the following code to your HTML: <h1 class='text-primary'>Hello CodePen!</h1>. The text's color should be Bootstrap blue.",
- "Click the gear next to JavaScript. Click the \"Quick-add\" select box and choose jQuery (not jQuery UI).",
- "Click the \"Quick-add\" select box again and choose Bootstrap. Then click \"Save & Close\".",
- "Now add the following code to your JavaScript: $(document).ready(function() { $('.text-primary').text('Hi CodePen!') });. Click the \"Save\" button at the top. Your \"Hello CodePen!\" should change to \"Hi CodePen!\". This means that jQuery is working.",
- "You can use this CodePen that you've just created as a starting point for your Ziplines. Just click the \"fork\" button at the top of your CodePen and it will create a duplicate CodePen.",
- "Now you're ready for your first Zipline. Click the \"I've completed this challenge\" button."
+ [
+ "http://i.imgur.com/6WLULsC.gif",
+ "A gif showing how to create a Codepen account.",
+ "For our front end Zipline challenges, we'll use a popular browser-based code editor called CodePen. Open CodePen and click \"Sign up\" in the upper right hand corner, then scroll down to the free plan and click \"Sign up\" again. Click the \"Use info from GitHub button\", then add your email address and create a password. Click the \"Sign up\" button. Then in the upper right hand corner, click \"New pen\".",
+ "http://codepen.io"
+ ],
+ [
+ "http://i.imgur.com/U4y9RJ1.gif",
+ "A gif showing that you can type \"hello world\" will output \"hello world\" in the preview window. You can also drag windows to resize them, and change their orientation.",
+ "In the HTML box, create an h1 element with the text \"Hello World\". You can drag the frames around to resize them. You can also click the \"Change View\" button and change the orientation of the frames.",
+ ""
+ ],
+ [
+ "http://i.imgur.com/G9KFQDL.gif",
+ "A gif showing the process of adding Bootstrap to your pen.",
+ "Click the gear in the upper left hand corner of the CSS box, then scroll down to \"Quick add\" and choose Bootstrap. Now give your h1 element the class of \"text-primary\" to change its color and prove that Bootstrap is now available.",
+ ""
+ ],
+ [
+ "http://i.imgur.com/Gi3aig0.gif",
+ "A gif showing the process of adding Animate.css and jQuery to pen.",
+ "Click the gear in the upper left hand corner of the CSS box, then scroll down to \"Quick add\" and choose Animate.css. Click the gear in the upper left hand corner of the JS box, then scroll down to \"Quick add\" and choose jQuery. Let's prove that Animate.css and jQuery are loaded properly. In the JS box, add the following code to make your h1 element bounce: $(document).ready(function(){ $(\"h1\").addClass(\"animated bounce\"); });.",
+ ""
+ ],
+ [
+ "http://i.imgur.com/Wzt6Y9Y.gif",
+ "A gif showing the process of saving and forking a pen.",
+ "Save your pen with the \"Save\" button. Then click the \"Fork\" button. This will create a fork (copy) of your pen that you can experiment with.",
+ ""
+ ]
],
- "type": "waypoint",
- "challengeType": 2,
+ "type": "Waypoint",
+ "challengeType": 7,
"tests": [],
"nameCn": "",
"descriptionCn": [],
"nameFr": "",
"descriptionFr": [],
- "nameRu": "Приготовьтесь к Zipline'ам",
- "descriptionRu": [
- "Теперь вы готовы приступить к Zipline'ам. Это задания по фронт-энд разработке, в них вы примените ранее изученные HTML, CSS, jQuery и JavaScript и создадите статические (не использующие базу данных) приложения.",
- "Ни в коем случае не унывайте! Воспользуйтесь Read-Search-Ask, если что-то не получается.",
- "Задания мы будем выполнять используя CodePen - популярный инструмент для создания и обмена статическими веб приложениями.",
- "Перейдите по ссылке http://codepen.io и создайте аккаунт.",
- "Нажмите на ваш аватар в правом верхнем углу, а затем в открывшемся меню на кнопку \"New pen\".",
- "Выберите удобное расположение окон с помощью кнопок в правом нижнем углу, отрегулируйте их ширину.",
- "Нажмите на звездочку рядом с CSS. Затем в секции \"Add External CSS\" выберите \"Quick-add\" и добавьте Bootstrap. Нажмите \"Save & Close\".",
- "Проверьте, что Bootstrap подключен добавив следующий HTML код: <h1 class='text-primary'>Hello CodePen!</h1>. Цвет текста должен быть синим.",
- "Нажмите на звездочку рядом с JavaScript. Нажмите \"Quick-add\" и выберите jQuery (не jQuery UI). Нажмите \"Save & Close\".",
- "Снова нажмите на поле \"Quick-add\", выберите Bootstrap и затем нажмите \"Save & Close\".",
- "Теперь добавьте следующий код в окошко JavaScript: $(document).ready(function() { $('.text-primary').text('Hi CodePen!') });. Нажмите на кнопку \"Save\" расположенную наверху. Текст \"Hello CodePen!\" должен измениться на \"Hi CodePen!\". Это значит что jQuery работает.",
- "CodePen, который мы создали, можно использовать в качестве отправной точки для ваших Zipline'ов. Кликните кнопку \"fork\", чтобы создать копию текущего CodePen'a.",
- "Все готово для первого Zipline'а. Жмите кнопку \"I've completed this challenge\"."
- ],
+ "nameRu": "",
+ "descriptionRu": [],
"nameEs": "",
"descriptionEs": [],
"namePt": "",
@@ -53,7 +56,6 @@
{
"id": "bd7158d8c242eddfaeb5bd13",
"title": "Build a Personal Portfolio Webpage",
- "difficulty": 1.01,
"challengeSeed": ["133315782"],
"description": [
"Objective: Build a CodePen.io app that successfully reverse-engineers this: http://codepen.io/ThiagoFerreir4/full/eNMxEp.",
@@ -107,7 +109,6 @@
{
"id": "bd7158d8c442eddfaeb5bd13",
"title": "Build a Random Quote Machine",
- "difficulty": 1.02,
"challengeSeed": ["126415122"],
"description": [
"Objective: Build a CodePen.io app that successfully reverse-engineers this: http://codepen.io/AdventureBear/full/vEoVMw.",
@@ -117,7 +118,6 @@
"Here are the user stories you must enable, and optional bonus user stories:",
"User Story: As a user, I can click a button to show me a new random quote.",
"Bonus User Story: As a user, I can press a button to tweet out a quote.",
- "Note that you can either put your quotes into an array and show them at random, or use an API to get quotes, such as http://forismatic.com/en/api/.",
"Remember to use Read-Search-Ask if you get stuck.",
"When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. If you pair programmed, you should also include the Free Code Camp username of your pair.",
"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"
@@ -203,7 +203,7 @@
"Here are the user stories you must enable, and optional bonus user stories:",
"User Story: As a user, I can add, subtract, multiply and divide two numbers.",
"Bonus User Story: I can clear the input field with a clear button.",
- "Bonus User Story: I can keep chaining mathematical operations together until I hit the clear button, and the calculator will tell me the correct output.",
+ "Bonus User Story: I can keep chaining mathematical operations together until I hit the equal button, and the calculator will tell me the correct output.",
"Remember to use Read-Search-Ask if you get stuck.",
"When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. If you pair programmed, you should also include the Free Code Camp username of your pair.",
"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/bootstrap.json b/seed/challenges/bootstrap.json
index 3982fe18d5..e9b43babb3 100644
--- a/seed/challenges/bootstrap.json
+++ b/seed/challenges/bootstrap.json
@@ -1,6 +1,7 @@
{
"name": "Responsive Design with Bootstrap",
"order": 3,
+ "time": "2h",
"challenges": [
{
"id": "bad87fee1348bd9acde08712",
@@ -13,8 +14,9 @@
"To get started, we should nest all of our HTML in a div element with the class container-fluid."
],
"tests": [
- "assert($(\"div\").hasClass(\"container-fluid\"), 'Your div element should have the class container-fluid')",
- "assert(editor.match(/<\\/div>/g) && editor.match(//g).length === editor.match(/div elements has a closing tag.')"
+ "assert($(\"div\").hasClass(\"container-fluid\"), 'Your div element should have the class container-fluid.')",
+ "assert(editor.match(/<\\/div>/g) && editor.match(//g).length === editor.match(/div elements has a closing tag.')",
+ "assert($(\".container-fluid\").children().length >= 8, 'Make sure you have nested all HTML elements in .container-fluid.')"
],
"challengeSeed": [
"",
@@ -89,7 +91,7 @@
"id": "bad87fee1348bd9acde08812",
"title": "Make Images Mobile Responsive",
"description": [
- "First, add a new image below the existing one. Set it's src attribute to http://bit.ly/fcc-running-cats.",
+ "First, add a new image below the existing one. Set its src attribute to http://bit.ly/fcc-running-cats.",
"It would be great if this image could be exactly the width of our phone's screen.",
"Fortunately, with Bootstrap, all we need to do is add the img-responsive class to your image. Do this, and the image should perfectly fit the width of your page."
],
@@ -2110,7 +2112,7 @@
"tests": [
"assert(editor.match(//g) && editor.match(/-->/g).length > 0, 'Be sure to close your comment with -->.')"
+ "assert(editor.match(/-->.*\\n+.+/g), 'Be sure to close your comment with -->.')"
],
"challengeSeed": [
"",
diff --git a/seed/challenges/front-end-development-certificate.json b/seed/challenges/front-end-development-certificate.json
index 351809e702..4d6a83c406 100644
--- a/seed/challenges/front-end-development-certificate.json
+++ b/seed/challenges/front-end-development-certificate.json
@@ -1,6 +1,7 @@
{
"name": "Claim Your Front End Development Certificate",
"order": 12,
+ "time": "5m",
"challenges": [
{
"id": "561add10cb82ac38a17513be",
@@ -14,7 +15,7 @@
],
"description": [
[
- "http://i.imgur.com/luMkKst.jpg",
+ "http://i.imgur.com/syJxavV.jpg",
"An image of our Front End Development Certificate",
"This challenge will give you your verified Front End Development Certificate. Before we issue your certificate, we must verify that you have completed all of our basic and intermediate Bonfires, and all our basic and intermediate Ziplines. You must also accept our Academic Honesty Pledge. Click the button below to start this process.",
""
diff --git a/seed/challenges/full-stack-development-certificate.json b/seed/challenges/full-stack-development-certificate.json
index 7ae95c94e7..1d0cd92963 100644
--- a/seed/challenges/full-stack-development-certificate.json
+++ b/seed/challenges/full-stack-development-certificate.json
@@ -1,6 +1,7 @@
{
"name": "Claim Your Full Stack Development Certificate",
"order": 21,
+ "time": "5m",
"challenges": [
{
"id": "660add10cb82ac38a17513be",
@@ -15,7 +16,7 @@
],
"description": [
[
- "http://i.imgur.com/qXublEe.jpg",
+ "http://i.imgur.com/sKYQhdG.jpg",
"An image of our Full Stack Development Certificate",
"This challenge will give you your verified Full Stack Development Certificate. Before we issue your certificate, we must verify that you have completed all of Bonfires, Ziplines and Basejumps. You must also accept our Academic Honesty Pledge. Click the button below to start this process.",
""
diff --git a/seed/challenges/gear-up-for-success.json b/seed/challenges/gear-up-for-success.json
new file mode 100644
index 0000000000..7a6fd0a670
--- /dev/null
+++ b/seed/challenges/gear-up-for-success.json
@@ -0,0 +1,111 @@
+{
+ "name": "Gear up for Success",
+ "order": 4,
+ "time": "10m",
+ "challenges": [
+ {
+ "id": "560add65cb82ac38a17513c2",
+ "title": "Browse Camper News",
+ "challengeSeed": [],
+ "description": [
+ [
+ "http://i.imgur.com/YNwsMXM.gif",
+ "A gif showing how you can access our Camper News page and click the \"upvote\" button to upvote a story.",
+ "Click the \"News\" button in your upper right hand corner. You can browse links on Camper News and upvote ones that you enjoy.",
+ ""
+ ]
+ ],
+ "type": "Waypoint",
+ "challengeType": 7,
+ "tests": [],
+ "nameCn": "",
+ "descriptionCn": [],
+ "nameFr": "",
+ "descriptionFr": [],
+ "nameRu": "",
+ "descriptionRu": [],
+ "nameEs": "",
+ "descriptionEs": [],
+ "namePt": "",
+ "descriptionPt": []
+ },
+ {
+ "id": "560add65cb82ac38a17513c1",
+ "title": "Reference our Wiki",
+ "challengeSeed": [],
+ "description": [
+ [
+ "http://i.imgur.com/4GO4zcI.gif",
+ "A gif showing how you can click the \"Wiki\" button in your upper-right corner to access the wiki.",
+ "Click the \"Wiki\" button in your upper right hand corner. Our community has contributed lots of useful information to this searchable wiki.",
+ ""
+ ]
+ ],
+ "type": "Waypoint",
+ "challengeType": 7,
+ "tests": [],
+ "nameCn": "",
+ "descriptionCn": [],
+ "nameFr": "",
+ "descriptionFr": [],
+ "nameRu": "",
+ "descriptionRu": [],
+ "nameEs": "",
+ "descriptionEs": [],
+ "namePt": "",
+ "descriptionPt": []
+ },
+ {
+ "id": "570add8ccb82ac38a17513c3",
+ "title": "Join our LinkedIn Alumni Network",
+ "challengeSeed": [],
+ "description": [
+ [
+ "http://i.imgur.com/vJyiXzU.gif",
+ "A gif showing how you can click the link below and fill in the necessary fields to add your Free Code Camp studies to your LinkedIn profile.",
+ "You can add Free Code Camp to your LinkedIn education background. Set your graduation date as next year. For \"Degree\", type \"Full Stack Web Development Certification\". For \"Field of study\", type \"Computer Software Engineering\". Then click \"Save Changes\".",
+ "https://www.linkedin.com/profile/edit-education?school=Free+Code+Camp"
+ ]
+ ],
+ "type": "Waypoint",
+ "challengeType": 7,
+ "tests": [],
+ "nameCn": "",
+ "descriptionCn": [],
+ "nameFr": "",
+ "descriptionFr": [],
+ "nameRu": "",
+ "descriptionRu": [],
+ "nameEs": "",
+ "descriptionEs": [],
+ "namePt": "",
+ "descriptionPt": []
+ },
+ {
+ "id": "560add8ccb81ac38a17513c4",
+ "title": "Commit to a Goal and a Nonprofit",
+ "challengeSeed": [],
+ "description": [
+ [
+ "http://i.imgur.com/Og1ifsn.gif",
+ "A gif showing how you can commit to a goal for your Free Code Camp studies and pledge a monthly donation to a nonprofit to give you external motivation to reach that goal.",
+ "You can set a goal and pledge to donate to a nonprofit each month until you achieve that goal. give you external motivation in your quest to learn to code, as well as the opportunity to help nonprofits right away. Choose your goal, choose a monthly donation. When you click \"commit\", the nonprofit's donate page will open in a new tab. You can change your commitment or stop it at any time.",
+ "/commit"
+ ]
+ ],
+ "type": "Waypoint",
+ "challengeType": 7,
+ "tests": [],
+ "nameCn": "",
+ "descriptionCn": [],
+ "nameFr": "",
+ "descriptionFr": [],
+ "nameRu": "",
+ "descriptionRu": [],
+ "nameEs": "",
+ "descriptionEs": [],
+ "namePt": "",
+ "descriptionPt": []
+ }
+ ]
+}
diff --git a/seed/challenges/getting-started.json b/seed/challenges/getting-started.json
index 23b43e6b59..3513468561 100644
--- a/seed/challenges/getting-started.json
+++ b/seed/challenges/getting-started.json
@@ -1,6 +1,7 @@
{
"name": "Get Started with Free Code Camp",
"order": 1,
+ "time": "10m",
"challenges": [
{
"id": "560add10cb82ac38a17513be",
@@ -9,13 +10,13 @@
"description": [
[
"http://i.imgur.com/RlEk2IF.jpg",
- "a picture of Free Code Camp's 4 benefits: Get connected, Learn JavaScript, Build your Portfolio, Help nonprofits",
+ "A picture of Free Code Camp's 4 benefits: Get connected, Learn JavaScript, Build your Portfolio, Help nonprofits",
"Welcome to Free Code Camp. We're an open source community of busy people who learn to code and help nonprofits.",
""
],
[
"http://i.imgur.com/pYsTbjI.jpg",
- "a screenshot of our curriculum alongside a screenshot of our chat room.",
+ "A screenshot of our curriculum alongside a screenshot of our chat room.",
"Learning to code is hard. To succeed, you'll need lots of practice and support. That's why we've created a rigorous curriculum and supportive community.",
""
],
@@ -32,14 +33,14 @@
""
],
[
- "http://i.imgur.com/q4IjuCL.jpg",
- "a screenshot of our Front End Development Certificate",
+ "http://i.imgur.com/sKYQhdG.jpg",
+ "A screenshot of our Front End Development Certificate",
"About half way through our curriculum, you'll earn a verified Front End Development Certificate. If you can finish our entire curriculum, you'll earn a verified Full Stack Development Certificate.",
""
],
[
"http://i.imgur.com/yXyxbDd.jpg",
- "a screen shot of our nonprofit project directory.",
+ "A screen shot of our nonprofit project directory.",
"Then 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.",
""
]
@@ -65,7 +66,7 @@
"description": [
[
"http://i.imgur.com/EAR7Lvh.jpg",
- "a screenshot of our one of our Gitter chat rooms.",
+ "A screenshot of our one of our Gitter chat rooms.",
"Now let's join Free Code Camp's chat rooms. You can come here any time of day to hang out, ask questions, or find another camper to pair program with. First you'll need a GitHub account.",
""
],
@@ -82,15 +83,15 @@
"https://github.com/settings/profile"
],
[
- "http://i.imgur.com/OXL3G3n.gif",
- "Click the link below to navigate to Free Code Camp's open-source repository. In the upper right hand corner, you can click the \"star\" button to star this repository.",
+ "http://i.imgur.com/pYk0wOk.gif",
+ "A gif showing how you can star a GitHub repo.",
"Go to Free Code Camp's open-source repository and \"star\" it. \"Starring\" is the GitHub equivalent of \"liking\" something.",
"https://github.com/freecodecamp/freecodecamp"
],
[
- "http://i.imgur.com/EZHzKCV.gif",
+ "http://i.imgur.com/zwYPeQT.gif",
"A gif showing you how to click the link below to go to our chat room and click the \"sign in with GitHub\" button. Then you can click into the text input field and type a message to your fellow campers.",
- " Now that you have a GitHub account, you can join our main chat room by logging in with GitHub. Introduce yourself by saying \"Hello world!\". Tell your fellow campers how you found Free Code Camp. Also tell us why you want to learn to code.",
+ "Now that you have a GitHub account, you can join our main chat room by logging in with GitHub. Introduce yourself by saying \"Hello world!\". Tell your fellow campers how you found Free Code Camp. Also tell us why you want to learn to code.",
"https://gitter.im/FreeCodeCamp/FreeCodeCamp"
],
[
@@ -112,7 +113,7 @@
""
],
[
- "http://i.imgur.com/SLQ27Gr.gif",
+ "http://i.imgur.com/WvQvNGN.gif",
"A gif showing how you can click the link below to download a native chat room app for your computer.",
"You can also download the chat room app to your computer or phone.",
"https://gitter.im/apps"
@@ -134,51 +135,13 @@
},
{
"id": "560add56cb82ac38a17513c0",
- "title": "Configure your Public Profile",
+ "title": "Configure your Code Portfolio",
"challengeSeed": [],
"description": [
[
- "http://i.imgur.com/FkEzbto.gif",
- "A gif showing how you can click your profile image in your upper right hand corner to access the account page and connect GitHub.",
- "Check out your portfolio page. Click your picture your upper right hand corner. To activate your portfolio page, you'll need to link your GitHub account with Free Code Camp.",
- ""
- ],
- [
- "http://i.imgur.com/WKzEr1q.gif",
- "A gif showing how you can access your profile page and hover over different days to see how many brownie points you got on those days.",
- "Your portfolio page shows your progress and how many Brownie Points you have. You can get Brownie Points by completing challenges and by helping other campers in our chat rooms. If you get Brownie Points on several days in a row, you'll get a streak.",
- ""
- ]
- ],
- "type": "Waypoint",
- "challengeType": 7,
- "tests": [],
- "nameCn": "",
- "descriptionCn": [],
- "nameFr": "",
- "descriptionFr": [],
- "nameRu": "",
- "descriptionRu": [],
- "nameEs": "",
- "descriptionEs": [],
- "namePt": "",
- "descriptionPt": []
- },
- {
- "id": "560add65cb82ac38a17513c1",
- "title": "Try our Wiki and Camper News",
- "challengeSeed": [],
- "description": [
- [
- "http://i.imgur.com/DoOqkNW.gif",
- "A gif showing how you can click the \"Wiki\" button in your upper-right corner to access the wiki.",
- "Try this: Click the \"Wiki\" button in your upper right hand corner. Our community has contributed lots of useful information to this searchable wiki.",
- ""
- ],
- [
- "http://i.imgur.com/nmSiMy1.gif",
- "A gif showing how you can access our Camper News page and click the \"upvote\" button to upvote a story.",
- "Click the \"News\" button in your upper right hand corner. You can browse links on Camper News and upvote ones that you enjoy.",
+ "http://i.imgur.com/tP2ccTE.gif",
+ "A gif showing how you can click your profile image in your upper right hand corner to your code portfolio and connect GitHub.",
+ "Check out your code portfolio. Click your picture in your upper right hand corner. To activate your code portfolio, you'll need to link your GitHub account with Free Code Camp. Your code portfolio shows your progress and how many Brownie Points you have. You can get Brownie Points by completing challenges and by helping other campers in our chat rooms. If you get Brownie Points on several days in a row, you'll get a streak.",
""
]
],
@@ -208,9 +171,9 @@
""
],
[
- "http://i.imgur.com/EZHzKCV.gif",
+ "http://i.imgur.com/fTFMjwf.gif",
"A gif showing how you can click the link below, find your city on the list of Campsites, then click on the Facebook link for your city and join your city's Facebook group.",
- "Find your city on this list, click the \"Facebook\" link, then click the \"Join group\" button to apply to join your city's Facebook group (someone from the campsite should approve you shortly). If your city isn't on this list, scroll to the bottom of the wiki article for instructions for how you can create your city's Campsite.",
+ "Find your city on this list and click it. This will take you to your city's Campsite's Facebook group. Click the \"Join group\" button to apply to join your city's Facebook group. Someone from the campsite should approve you shortly. If your city isn't on this list, scroll to the bottom of the wiki article for instructions for how you can create your city's Campsite.",
"https://github.com/FreeCodeCamp/freecodecamp/wiki/List-of-Free-Code-Camp-city-based-Campsites"
]
],
@@ -228,38 +191,6 @@
"namePt": "",
"descriptionPt": []
},
- {
- "id": "560add8ccb82ac38a17513c3",
- "title": "Join our Alumni Network and Commit to Your Goal",
- "challengeSeed": [],
- "description": [
- [
- "http://i.imgur.com/P7qfJXt.gif",
- "A gif showing how you can click the link below and fill in the necessary fields to add your Free Code Camp studies to your LinkedIn profile.",
- "You can add Free Code Camp to your LinkedIn education background. Set your graduation date as next year. For \"Degree\", type \"Full Stack Web Development\". For \"Field of study\", type \"Computer Software Engineering\". Then click \"Save Changes\".",
- "https://www.linkedin.com/profile/edit-education?school=Free+Code+Camp"
- ],
- [
- "",
- "",
- "Free Code Camp will always be free. If you want to feel more motivated to earn our certificates faster, we encourage you to instead pledge to donate to a nonprofit each day.",
- ""
- ]
- ],
- "type": "Waypoint",
- "challengeType": 7,
- "tests": [],
- "nameCn": "",
- "descriptionCn": [],
- "nameFr": "",
- "descriptionFr": [],
- "nameRu": "",
- "descriptionRu": [],
- "nameEs": "",
- "descriptionEs": [],
- "namePt": "",
- "descriptionPt": []
- },
{
"id": "560add8ccb82ac38a17513c4",
"title": "Learn What to Do If You Get Stuck",
@@ -290,8 +221,8 @@
"https://gitter.im/FreeCodeCamp/Help"
],
[
- "http://i.imgur.com/WsfzvVo.gif",
- "A gif showing us clicking the \"map\" button in our upper right hand corner and browsing our challenge map.",
+ "http://i.imgur.com/ZRgXraT.gif",
+ "A gif showing us scrolling through our challenge map.",
"Now you're ready to start coding! The \"Map\" button in your upper right hand corner will show you our challenge map. This map shows all our coding challenges. We recommend that you complete these from top to bottom, at a sustainable pace. You can also return to your next challenge by clicking the \"Learn\" button.",
""
]
diff --git a/seed/challenges/git.json b/seed/challenges/git.json
index d3abf068ba..8a642ab615 100644
--- a/seed/challenges/git.json
+++ b/seed/challenges/git.json
@@ -1,6 +1,7 @@
{
"name": "Git",
"order" : 17,
+ "time": "3h",
"challenges": [
{
"id": "bd7353d8c341eddeaeb5bd0f",
diff --git a/seed/challenges/hikes.json b/seed/challenges/hikes.json
index 1f5d7f3113..0e9dbb56a4 100644
--- a/seed/challenges/hikes.json
+++ b/seed/challenges/hikes.json
@@ -1,6 +1,7 @@
{
"name": "Hikes",
"order": 0.050,
+ "time": "3h",
"challenges": [
{
"id": "bd7128d8c441eddfbeb5bddf",
diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json
index 3b2f72853e..555a56aae2 100644
--- a/seed/challenges/html5-and-css.json
+++ b/seed/challenges/html5-and-css.json
@@ -1,6 +1,7 @@
{
"name": "HTML5 and CSS",
"order": 2,
+ "time": "3h",
"challenges": [
{
"id": "bd7123c8c441eddfaeb5bdef",
@@ -376,6 +377,7 @@
"assert(!$(\"h2\").attr(\"style\"), 'Remove the style attribute from your h2 element.')",
"assert($(\"style\") && $(\"style\").length > 1, 'Create a style element.')",
"assert($(\"h2\").css(\"color\") === \"rgb(0, 0, 255)\", 'Your h2 element should be blue.')",
+ "assert(editor.match(/h2\\s*\\{\\s*color:\\s*blue;\\s*\\}/g), 'Ensure that your stylesheet h2 declaration is valid with a semicolon and closing brace')",
"assert(editor.match(/<\\/style>/g) && editor.match(/<\\/style>/g).length === (editor.match(//g) || []).length, 'Make sure all your style elements are valid and have a closing tag.')"
],
"challengeSeed": [
@@ -434,6 +436,7 @@
"tests": [
"assert($(\"h2\").css(\"color\") === \"rgb(255, 0, 0)\", 'Your h2 element should be red.')",
"assert($(\"h2\").hasClass(\"red-text\"), 'Your h2 element should have the class red-text.')",
+ "assert(editor.match(/\\.red-text\\s*\\{\\s*color:\\s*red;\\s*\\}/g), 'Your stylesheet should declare a red-text class and have its color set to red.')",
"assert($(\"h2\").attr(\"style\") === undefined, 'Do not use inline style declarations like style=\"color: red\" in your h2 element.')"
],
"challengeSeed": [
@@ -541,7 +544,6 @@
"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.red-text\").length === 2, 'Give each of your p elements the red-text class.')",
"assert($(\"p\").css(\"font-size\") === \"16px\", 'Give elements with the red-text class a font-size of 16px.')"
],
"challengeSeed": [
@@ -1122,7 +1124,7 @@
"assert($(\"a\").text().match(/cat\\sphotos/gi), 'Your a element should have the anchor text of \"cat photos\"')",
"assert($(\"p\") && $(\"p\").length > 2, 'Create a new p element around your a element.')",
"assert($(\"a[href=\\\"http://www.freecatphotoapp.com\\\"]\").parent().is(\"p\"), 'Your a element should be nested within your new p element.')",
- "assert($(\"p\").text().match(/^View\\smore\\s/gi), 'Your p element should have the text \"View more \" (with a space after it).')",
+ "assert($(\"p\").text().match(/^\\s*View\\smore\\s/gi), 'Your p element should have the text \"View more \" (with a space after it).')",
"assert(!$(\"a\").text().match(/View\\smore/gi), 'Your a element should not have the text \"View more\".')",
"assert(editor.match(/<\\/p>/g) && editor.match(/
/g).length === editor.match(/
p elements has a closing tag.')",
"assert(editor.match(/<\\/a>/g) && editor.match(//g).length === editor.match(/a elements has a closing tag.')"
@@ -1156,9 +1158,11 @@
"",
"",
"CatPhotoApp
",
+ "",
"",
"cat photos",
"",
+ "",
"![](\"https://bit.ly/fcc-relaxing-cat\")
",
"",
"
Kitty ipsum dolor sit amet, shed everywhere shed everywhere stretching attack your ankles chase the red dot, hairball run catnip eat the grass sniff.
",
@@ -1411,7 +1415,7 @@
"assert($(\"ul\").length > 0, 'Create a ul element.')",
"assert($(\"ul li\").length > 2, 'You should have three li elements within your ul element.')",
"assert(editor.match(/<\\/ul>/g) && editor.match(//g).length === editor.match(/ul element has a closing tag.')",
- "assert(editor.match(/<\\/li>/g) && editor.match(/- /g) && editor.match(/<\\/li>/g).length === editor.match(/
- /g).length, 'Make sure your
li element has a closing tag.')"
+ "assert(editor.match(/<\\/li>/g) && editor.match(/]/g) && editor.match(/<\\/li>/g).length === editor.match(/]/g).length, 'Make sure your li elements have closing tags.')"
],
"challengeSeed": [
"",
@@ -3702,7 +3706,7 @@
"Let's replace the hex code in our body element's background color with the RGB value for black: rgb(0, 0, 0)"
],
"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)\", 'Your body element should have a black background.')",
"assert(editor.match(/rgb\\s*\\(\\s*0\\s*,\\s*0\\s*,\\s*0\\s*\\)/ig), 'Use rgb to give your body element the background-color of black. For example body { color: rgb(0, 0, 0); }.')"
],
"challengeSeed": [
@@ -3736,7 +3740,7 @@
"Change the body element's background color from the RGB value for black to the rgb value for white: rgb(255, 255, 255)"
],
"tests": [
- "assert($(\"body\").css(\"background-color\") === \"rgb(255, 255, 255)\", 'Give your body element the background-color of white.')",
+ "assert($(\"body\").css(\"background-color\") === \"rgb(255, 255, 255)\", 'Your body should have a white background.')",
"assert(editor.match(/rgb\\s*\\(\\s*255\\s*,\\s*255\\s*,\\s*255\\s*\\)/ig), 'Use rgb to give your body element the background-color of white. For example body { background-color: rgb(255, 255 , 255); }.')"
],
"challengeSeed": [
@@ -3770,7 +3774,7 @@
"Change the body element's background color to the RGB value red: rgb(255, 0, 0)"
],
"tests": [
- "assert($(\"body\").css(\"background-color\") === \"rgb(255, 0, 0)\", 'Give your body element the background-color of red.')",
+ "assert($(\"body\").css(\"background-color\") === \"rgb(255, 0, 0)\", 'Your body should have a red background.')",
"assert(editor.match(/rgb\\s*\\(\\s*255\\s*,\\s*0\\s*,\\s*0\\s*\\)/ig), 'Use rgb to give your body element the background-color of red. For example body { background-color: rgb(255, 0, 0); }.')"
],
"challengeSeed": [
@@ -3802,7 +3806,7 @@
"Now change the body element's background color to the rgb value green: rgb(0, 255, 0)"
],
"tests": [
- "assert($(\"body\").css(\"background-color\") === \"rgb(0, 255, 0)\", 'Give your body element the background-color of green.')",
+ "assert($(\"body\").css(\"background-color\") === \"rgb(0, 255, 0)\", 'Your body element should have a green background.')",
"assert(editor.match(/rgb\\s*\\(\\s*0\\s*,\\s*255\\s*,\\s*0\\s*\\)/ig), 'Use rgb to give your body element the background-color of green. For example body { background-color: rgb(0, 255, 0); }.')"
],
"challengeSeed": [
@@ -3834,7 +3838,7 @@
"Change the body element's background color to the RGB value blue: rgb(0, 0, 255)"
],
"tests": [
- "assert($(\"body\").css(\"background-color\") === \"rgb(0, 0, 255)\", 'Give your body element the background-color of blue.')",
+ "assert($(\"body\").css(\"background-color\") === \"rgb(0, 0, 255)\", 'Your body element should have a blue background.')",
"assert(editor.match(/rgb\\s*\\(\\s*0\\s*,\\s*0\\s*,\\s*255\\s*\\)/ig), 'Use rgb to give your body element the background-color of blue. For example body { background-color: rgb(0, 0, 255); }.')"
],
"challengeSeed": [
@@ -3867,7 +3871,7 @@
"Change the body element's background color to the RGB value orange: rgb(255, 165, 0)"
],
"tests": [
- "assert($(\"body\").css(\"background-color\") === \"rgb(255, 165, 0)\", 'Give your body element the background-color of orange.')",
+ "assert($(\"body\").css(\"background-color\") === \"rgb(255, 165, 0)\", 'Your body element should have an orange background.')",
"assert(editor.match(/rgb\\s*\\(\\s*255\\s*,\\s*165\\s*,\\s*0\\s*\\)/ig), 'Use rgb to give your body element the background-color of orange. For example body { background-color: rgb(255, 165, 0); }.')"
],
"challengeSeed": [
@@ -3900,7 +3904,7 @@
"Change the body element's background color to the RGB value for gray: rgb(128, 128, 128)"
],
"tests": [
- "assert($(\"body\").css(\"background-color\") === \"rgb(128, 128, 128)\", 'Give your body element the background-color of gray.')",
+ "assert($(\"body\").css(\"background-color\") === \"rgb(128, 128, 128)\", 'Your body element should have a gray background.')",
"assert(editor.match(/rgb\\s*\\(\\s*128\\s*,\\s*128\\s*,\\s*128\\s*\\)/ig), 'Use rgb to give your body element the background-color of gray. For example body { background-color: rgb(128, 128, 128); }.')"
],
"challengeSeed": [
diff --git a/seed/challenges/intermediate-bonfires.json b/seed/challenges/intermediate-bonfires.json
index cc15964181..ea05dd355f 100644
--- a/seed/challenges/intermediate-bonfires.json
+++ b/seed/challenges/intermediate-bonfires.json
@@ -1,6 +1,7 @@
{
"name": "Intermediate Algorithm Scripting",
- "order": 9,
+ "order": 10,
+ "time": "50h",
"challenges": [
{
"id": "a3566b1109230028080c9345",
@@ -65,7 +66,8 @@
"assert.deepEqual(diff([\"andesite\", \"grass\", \"dirt\", \"dead shrub\"], [\"andesite\", \"grass\", \"dirt\", \"dead shrub\"]), [], 'message: [\"andesite\", \"grass\", \"dirt\", \"dead shrub\"], [\"andesite\", \"grass\", \"dirt\", \"dead shrub\"] should return [].');",
"assert.deepEqual(diff([1, 2, 3, 5], [1, 2, 3, 4, 5]), [4], 'message: [1, 2, 3, 5], [1, 2, 3, 4, 5] should return [4].');",
"assert.includeMembers(diff([1, \"calf\", 3, \"piglet\"], [1, \"calf\", 3, 4]), [\"piglet\", 4], 'message: [1, \"calf\", 3, \"piglet\"], [1, \"calf\", 3, 4] should return [\"piglet\", 4].');",
- "assert.deepEqual(diff([], [\"snuffleupagus\", \"cookie monster\", \"elmo\"]), [\"snuffleupagus\", \"cookie monster\", \"elmo\"], 'message: [], [\"snuffleupagus\", \"cookie monster\", \"elmo\"] should return [\"snuffleupagus\", \"cookie monster\", \"elmo\"].');"
+ "assert.deepEqual(diff([], [\"snuffleupagus\", \"cookie monster\", \"elmo\"]), [\"snuffleupagus\", \"cookie monster\", \"elmo\"], 'message: [], [\"snuffleupagus\", \"cookie monster\", \"elmo\"] should return [\"snuffleupagus\", \"cookie monster\", \"elmo\"].');",
+ "assert.includeMembers(diff([1, \"calf\", 3, \"piglet\"], [7, \"filly\"]), [1, \"calf\", 3, \"piglet\", 7, \"filly\"], 'message: [1, \"calf\", 3, \"piglet\"], [7, \"filly\"] should return [1, \"calf\", 3, \"piglet\", 7, \"filly\"].');"
],
"MDNlinks": [
"Comparison Operators",
@@ -355,7 +357,7 @@
"assert.strictEqual(boo([].slice), false, 'message: boo([].slice) should return false.');",
"assert.strictEqual(boo({ \"a\": 1 }), false, 'message: boo({ \"a\": 1 }) should return false.');",
"assert.strictEqual(boo(1), false, 'message: boo(1) should return false.');",
- "assert.strictEqual(boo(NaN), false, 'message: boo(NaN) should return true.');",
+ "assert.strictEqual(boo(NaN), false, 'message: boo(NaN) should return false.');",
"assert.strictEqual(boo(\"a\"), false, 'message: boo(\"a\") should return false.');"
],
"MDNlinks": [
@@ -511,7 +513,7 @@
"sumFibs(4);"
],
"tests": [
- "assert(typeof(sumFibs(1)) === \"number\", 'message: sumFibs() should return a number.');",
+ "assert(typeof(sumFibs(1)) === \"number\", 'message: sumFibs(1) should return a number.');",
"assert.deepEqual(sumFibs(1000), 1785, 'message: sumFibs(1000) should return 1785.');",
"assert.deepEqual(sumFibs(4000000), 4613732, 'message: sumFibs(4000000) should return 4613732.');",
"assert.deepEqual(sumFibs(4), 5, 'message: sumFibs(4) should return 5.');",
@@ -631,7 +633,7 @@
"assert.strictEqual(find([1, 3, 5, 9], function(num) { return num % 2 === 0; }), undefined, 'message: find([1, 3, 5, 9], function(num) { return num % 2 === 0; }) should return undefined.');"
],
"MDNlinks": [
- "Array.some()"
+ "Array.filter()"
],
"type": "bonfire",
"challengeType": 5,
@@ -823,7 +825,7 @@
"assert.isUndefined(add(2)([3]), 'message: add(2)([3]) should return undefined.');"
],
"MDNlinks": [
- "Global Function Object",
+ "Closures",
"Arguments object"
],
"type": "bonfire",
diff --git a/seed/challenges/intermediate-ziplines.json b/seed/challenges/intermediate-ziplines.json
index 27680d7350..0d2afbcb5c 100644
--- a/seed/challenges/intermediate-ziplines.json
+++ b/seed/challenges/intermediate-ziplines.json
@@ -1,13 +1,14 @@
{
"name": "Intermediate Front End Development Projects",
"order": 11,
+ "time": "200h",
"challenges": [
{
"id": "bd7158d8c442eddfaeb5bd10",
"title": "Show the Local Weather",
"challengeSeed": ["126415127"],
"description": [
- "Objective: Build a CodePen.io app that successfully reverse-engineers this: http://codepen.io/AdventureBear/full/yNBJRj.",
+ "Objective: Build a CodePen.io app that successfully reverse-engineers this: http://codepen.io/FreeCodeCamp/pen/avqvgJ.",
"Rule #1: Don't look at the example project's code on CodePen. Figure it out for yourself.",
"Rule #2: You may use whichever libraries or APIs you need.",
"Rule #3: Reverse engineer the example project's functionality, and also feel free to personalize it.",
@@ -16,6 +17,7 @@
"Bonus User Story: As a user, I can see an icon depending on the weather.",
"Bonus User Story: As a user, I see a different background image (e.g. snowy mountain, hot desert) depending on the weather.",
"Bonus User Story: As a user, I can push a button to toggle between Fahrenheit and Celsius.",
+ "We recommend using the Open Weather API. This will require creating a free API key. Normally you want to avoid exposing API keys on CodePen, but we haven't been able to find a keyless API for weather.",
"Remember to use Read-Search-Ask if you get stuck.",
"When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. If you pair programmed, you should also include the Free Code Camp username of your pair.",
"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/jquery.json b/seed/challenges/jquery.json
index 8d3de88c68..b0280aa0c3 100644
--- a/seed/challenges/jquery.json
+++ b/seed/challenges/jquery.json
@@ -1,6 +1,7 @@
{
"name": "jQuery",
- "order": 4,
+ "order": 5,
+ "time": "2h",
"challenges": [
{
"id": "bad87fee1348bd9acdd08826",
@@ -10,7 +11,9 @@
"Before we can start using jQuery, we need to add some things to our HTML.",
"First, add a script element at the top of your page. Be sure to close it on the following line.",
"Your browser will run any JavaScript inside a script element, including jQuery.",
- "Inside your script element, add this code: $(document).ready(function() { to your script. Then close it on the following line (still inside your script element) with: });"
+ "Inside your script element, add this code: $(document).ready(function() { to your script. Then close it on the following line (still inside your script element) with: });",
+ "We'll learn more about functions later. The important thing to know is that code you put inside this function will run as soon as your browser has loaded your page.",
+ "This is important because without your document ready function, your code may run before your HTML is rendered, which would cause bugs."
],
"tests": [
"assert(editor.match(/