From 2964d0ce468d300c085934ee4948e251a5d1f26f Mon Sep 17 00:00:00 2001 From: Jayden Windle Date: Mon, 30 May 2016 22:06:58 -0400 Subject: [PATCH 1/9] Changed date format for certificate generation --- server/boot/user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/boot/user.js b/server/boot/user.js index 685a2aed5c..4c279085d0 100644 --- a/server/boot/user.js +++ b/server/boot/user.js @@ -429,7 +429,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 } ); From 78d1c9d32a7d0ac7006955185e0076f398179ed4 Mon Sep 17 00:00:00 2001 From: Scott McAllister Date: Mon, 30 May 2016 22:20:49 -0400 Subject: [PATCH 2/9] changed date format updated month format --- server/boot/certificate.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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( From 06b928fbc8b47ddc873fa424f66cdd324a73aadf Mon Sep 17 00:00:00 2001 From: Stuart Date: Wed, 1 Jun 2016 09:40:37 +0100 Subject: [PATCH 3/9] Fix/Comparison with the Inequality Operator. --- .../basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 40f93ba7e1..d2da8ca2a6 100644 --- a/seed/challenges/01-front-end-development-certification/basic-javascript.json +++ b/seed/challenges/01-front-end-development-certification/basic-javascript.json @@ -2782,7 +2782,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, From b29432e26d7cd4053e1b02a2b284bc06315122c9 Mon Sep 17 00:00:00 2001 From: Priya Ranjan Singh Date: Wed, 8 Jun 2016 22:16:47 +0530 Subject: [PATCH 4/9] add challenge instruction for valid array operations --- .../01-front-end-development-certification/basic-javascript.json | 1 + 1 file changed, 1 insertion(+) 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..83e0d43ccb 100644 --- a/seed/challenges/01-front-end-development-certification/basic-javascript.json +++ b/seed/challenges/01-front-end-development-certification/basic-javascript.json @@ -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." From 42023aec9211606926ad4f7d4129516561eaade9 Mon Sep 17 00:00:00 2001 From: Junaid Ahmed Date: Thu, 9 Jun 2016 16:26:39 +0530 Subject: [PATCH 5/9] replaced comparison with strict equality operator --- .../basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c7f4ae49ac..c09141ee96 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, From b730761ebebcdc99df4deb9e180f5ea3172b6379 Mon Sep 17 00:00:00 2001 From: Pasayadaan Date: Thu, 9 Jun 2016 21:59:30 -0500 Subject: [PATCH 6/9] This is a buggy challange (#8843) Updated description in seed/challenges/01-front-end-development-certification/html5-and-css.json to instruct "Create second

element after the existing

element" --- .../01-front-end-development-certification/html5-and-css.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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." From ebcd50bf589f2196ba9ab9e3eba482fda847489d Mon Sep 17 00:00:00 2001 From: Sheri Richardson Date: Sat, 11 Jun 2016 20:49:52 +0200 Subject: [PATCH 7/9] Removed the route /jobs from rendering closes #9083 --- server/boot/a-react.js | 2 -- 1 file changed, 2 deletions(-) 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/*' ]; From f3761e86e574ef3c2b5dfeda143773b5bc414dde Mon Sep 17 00:00:00 2001 From: Brandon Kish Date: Sat, 11 Jun 2016 22:30:26 -0400 Subject: [PATCH 8/9] Fix missing apostrophe in Basic JavaScript conditional challenge --- .../basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c09141ee96..0e824133ca 100644 --- a/seed/challenges/01-front-end-development-certification/basic-javascript.json +++ b/seed/challenges/01-front-end-development-certification/basic-javascript.json @@ -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\";
}
}
", From 7346cd14748de5d6b7b224d418e7a2ae520415ed Mon Sep 17 00:00:00 2001 From: Jonathan Date: Sun, 12 Jun 2016 17:09:58 +0100 Subject: [PATCH 9/9] Commented out vote1 and vote2 endpoints --- server/boot/user.js | 62 ++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/server/boot/user.js b/server/boot/user.js index 3a3fed0421..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( @@ -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'); + // } + // } };