diff --git a/seed/challenges/01-front-end-development-certification/basic-javascript.json b/seed/challenges/01-front-end-development-certification/basic-javascript.json index e368cebe7e..0e824133ca 100644 --- a/seed/challenges/01-front-end-development-certification/basic-javascript.json +++ b/seed/challenges/01-front-end-development-certification/basic-javascript.json @@ -1693,7 +1693,7 @@ "var myArray = [1,2,3];\nvar myData = myArray[0];" ], "tests": [ - "assert((function(){if(typeof myArray != 'undefined' && typeof myData != 'undefined' && myArray[0] == myData){return true;}else{return false;}})(), 'message: The variable myData should equal the first value of myArray.');" + "assert((function(){if(typeof myArray != 'undefined' && typeof myData != 'undefined' && myArray[0] === myData){return true;}else{return false;}})(), 'message: The variable myData should equal the first value of myArray.');" ], "type": "waypoint", "challengeType": 1, @@ -2783,7 +2783,7 @@ "assert(testNotEqual(12) === \"Not Equal\", 'message: testNotEqual(12) should return \"Not Equal\"');", "assert(testNotEqual(\"12\") === \"Not Equal\", 'message: testNotEqual(\"12\") should return \"Not Equal\"');", "assert(testNotEqual(\"bob\") === \"Not Equal\", 'message: testNotEqual(\"bob\") should return \"Not Equal\"');", - "assert(code.match(/val\\s*!=\\s*\\d+/g).length > 0, 'message: You should use the != operator');" + "assert(code.match(/(?!!==)!=/), 'message: You should use the != operator');" ], "type": "waypoint", "challengeType": 1, @@ -3280,7 +3280,7 @@ "Order is important in if, else if statements.", "The loop is executed from top to bottom so you will want to be careful of what statement comes first.", "Take these two functions as an example.", - "Heres the first:", + "Here's the first:", "
function foo(x) {
if (x < 1) {
return \"Less than one\";
} else if (x < 2) {
return \"Less than two\";
} else {
return \"Greater than or equal to two\";
}
}
", "And the second just switches the order of the statements:", "
function bar(x) {
if (x < 2) {
return \"Less than two\";
} else if (x < 1) {
return \"Less than one\";
} else {
return \"Greater than or equal to two\";
}
}
", @@ -4502,6 +4502,7 @@ "For the given id in collection:", "If value is non-blank (value !== \"\") and prop is not \"tracks\" then update or set the value for the prop.", "If the prop is \"tracks\" and value is non-blank, push the value onto the end of the tracks array.", + "If \"tracks\" is non-existent before you update it, create an empty array before pushing a track to it.", "If value is blank, delete that prop.", "Always return the entire collection object.", "Note
Don't forget to use bracket notation when accessing object properties with variables." diff --git a/seed/challenges/01-front-end-development-certification/html5-and-css.json b/seed/challenges/01-front-end-development-certification/html5-and-css.json index 0f8bfdec44..b51b6a8d5c 100644 --- a/seed/challenges/01-front-end-development-certification/html5-and-css.json +++ b/seed/challenges/01-front-end-development-certification/html5-and-css.json @@ -713,7 +713,7 @@ "description": [ "Font size is controlled by the font-size CSS property, like this:", "
h1 {
  font-size: 30px;
}
", - "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.", + "Create a second p element after the existing 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.", "Inside the same <style> tag that contains your red-text class, create an entry for p elements and set the font-size to 16 pixels (16px).", "Note
Due to browser implementation differences, you may need to be at 100% zoom to pass the tests on this challenge.", "Also, please do not add a class attribute to your new p element." diff --git a/server/boot/a-react.js b/server/boot/a-react.js index 5d13e39b99..c9e895a5da 100644 --- a/server/boot/a-react.js +++ b/server/boot/a-react.js @@ -12,8 +12,6 @@ const log = debug('fcc:react-server'); // add routes here as they slowly get reactified // remove their individual controllers const routes = [ - '/jobs', - '/jobs/*', '/videos', '/videos/*' ]; diff --git a/server/boot/certificate.js b/server/boot/certificate.js index c41ac148ad..df65cd2b73 100644 --- a/server/boot/certificate.js +++ b/server/boot/certificate.js @@ -66,7 +66,7 @@ function getIdsForCert$(id, Challenge) { // getFormatedDate(challengeMap: Object, challengeId: String) => String, throws function getFormatedDate(challengeMap, challengeId) { return moment(challengeMap[challengeId].completedDate) - .format('MMM Do, YYYY'); + .format('MMMM D, YYYY'); } // sendCertifiedEmail( diff --git a/server/boot/user.js b/server/boot/user.js index 2391f25cd8..3db07e3189 100644 --- a/server/boot/user.js +++ b/server/boot/user.js @@ -188,8 +188,8 @@ module.exports = function(app) { flashIfNotVerified, getSettings ); - router.get('/vote1', vote1); - router.get('/vote2', vote2); + // router.get('/vote1', vote1); + // router.get('/vote2', vote2); // Ensure these are the last routes! router.get( @@ -432,7 +432,7 @@ module.exports = function(app) { certViews[certType], { username: user.username, - date: moment(new Date(completedDate)).format('MMMM, Do YYYY'), + date: moment(new Date(completedDate)).format('MMMM D, YYYY'), name: user.name } ); @@ -579,33 +579,33 @@ module.exports = function(app) { }); } - function vote1(req, res, next) { - if (req.user) { - req.user.tshirtVote = 1; - req.user.save(function(err) { - if (err) { return next(err); } - - req.flash('success', { msg: 'Thanks for voting!' }); - return res.redirect('/map'); - }); - } else { - req.flash('error', { msg: 'You must be signed in to vote.' }); - res.redirect('/map'); - } - } - - function vote2(req, res, next) { - if (req.user) { - req.user.tshirtVote = 2; - req.user.save(function(err) { - if (err) { return next(err); } - - req.flash('success', { msg: 'Thanks for voting!' }); - return res.redirect('/map'); - }); - } else { - req.flash('error', {msg: 'You must be signed in to vote.'}); - res.redirect('/map'); - } - } + // function vote1(req, res, next) { + // if (req.user) { + // req.user.tshirtVote = 1; + // req.user.save(function(err) { + // if (err) { return next(err); } + // + // req.flash('success', { msg: 'Thanks for voting!' }); + // return res.redirect('/map'); + // }); + // } else { + // req.flash('error', { msg: 'You must be signed in to vote.' }); + // res.redirect('/map'); + // } + // } + // + // function vote2(req, res, next) { + // if (req.user) { + // req.user.tshirtVote = 2; + // req.user.save(function(err) { + // if (err) { return next(err); } + // + // req.flash('success', { msg: 'Thanks for voting!' }); + // return res.redirect('/map'); + // }); + // } else { + // req.flash('error', {msg: 'You must be signed in to vote.'}); + // res.redirect('/map'); + // } + // } };