From 3842c0b9c868ec206d257d0249ef111a778abe56 Mon Sep 17 00:00:00 2001 From: Stephen Wanhella Date: Sat, 4 Jul 2015 16:04:12 -0700 Subject: [PATCH 1/8] Fixed typos in Bonfire: Friendly Date Ranges #1156 --- seed/challenges/advanced-bonfires.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/advanced-bonfires.json b/seed/challenges/advanced-bonfires.json index f729bde4e2..3816d28ded 100644 --- a/seed/challenges/advanced-bonfires.json +++ b/seed/challenges/advanced-bonfires.json @@ -277,7 +277,7 @@ ], "tests": [ "assert.deepEqual(friendly(['2015-07-01', '2015-07-04']), ['July 1st','4th'], 'ending month should be omitted since it is already mentioned');", - "assert.deepEqual(friendly(['2015-12-01', '2016-02-03']), ['December 1st','February 3rd'], 'one month apart can be inferred it is the next year');", + "assert.deepEqual(friendly(['2015-12-01', '2016-02-03']), ['December 1st','February 3rd'], 'two months apart can be inferred if it is the next year');", "assert.deepEqual(friendly(['2015-12-01', '2017-02-03']), ['December 1st, 2015','February 3rd, 2017']);", "assert.deepEqual(friendly(['2016-03-01', '2016-05-05']), ['March 1st','May 5th, 2016']);", "assert.deepEqual(friendly(['2017-01-01', '2017-01-01']), ['January 1st, 2017'], 'since we do not duplicate only return once');", From d6b9093be9cf207d6d325661143115454262ed0c Mon Sep 17 00:00:00 2001 From: LumenTeun Date: Wed, 8 Jul 2015 21:19:34 +0200 Subject: [PATCH 2/8] Improved consitency in 'Friendly Date Ranges' test cases. #410 --- seed/challenges/advanced-bonfires.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/advanced-bonfires.json b/seed/challenges/advanced-bonfires.json index f729bde4e2..8d13526b7f 100644 --- a/seed/challenges/advanced-bonfires.json +++ b/seed/challenges/advanced-bonfires.json @@ -279,7 +279,7 @@ "assert.deepEqual(friendly(['2015-07-01', '2015-07-04']), ['July 1st','4th'], 'ending month should be omitted since it is already mentioned');", "assert.deepEqual(friendly(['2015-12-01', '2016-02-03']), ['December 1st','February 3rd'], 'one month apart can be inferred it is the next year');", "assert.deepEqual(friendly(['2015-12-01', '2017-02-03']), ['December 1st, 2015','February 3rd, 2017']);", - "assert.deepEqual(friendly(['2016-03-01', '2016-05-05']), ['March 1st','May 5th, 2016']);", + "assert.deepEqual(friendly(['2016-03-01', '2016-05-05']), ['March 1st','May 5th'], 'one month apart can be inferred it is the same year');", "assert.deepEqual(friendly(['2017-01-01', '2017-01-01']), ['January 1st, 2017'], 'since we do not duplicate only return once');", "assert.deepEqual(friendly(['2022-09-05', '2023-09-04']), ['September 5th, 2022','September 4th, 2023']);" ], From 1654d535ac0d2550e713dfbc9f09ebd74903ea01 Mon Sep 17 00:00:00 2001 From: cahlan Date: Mon, 3 Aug 2015 05:32:27 +0000 Subject: [PATCH 3/8] adding new location --- public/json/bootcamps.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/json/bootcamps.json b/public/json/bootcamps.json index 18f2a5f046..41b906c20b 100644 --- a/public/json/bootcamps.json +++ b/public/json/bootcamps.json @@ -104,7 +104,8 @@ "weeks": "12", "cities": [ "provo", - "salt-lake-city" + "salt-lake-city", + "dallas" ] }, { "name": "Epicodus", From 7ca1d7cfde6d5699eda1c53a4be642f215f965de Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Mon, 3 Aug 2015 12:52:57 -0700 Subject: [PATCH 4/8] remove facebook/google/linkedin auth from linking --- server/views/account/account.jade | 38 +++++++++++++++---------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/server/views/account/account.jade b/server/views/account/account.jade index dd9d3d9c47..0dc4e5cb2c 100644 --- a/server/views/account/account.jade +++ b/server/views/account/account.jade @@ -261,31 +261,31 @@ block content .panel-heading.text-center Manage your account here: .panel-body if (!user.google || !user.facebook || !user.linkedin || !user.twitter) - if (!user.google) + if (!user.github) .col-xs-12 - a.btn.btn-lg.btn-block.btn-google-plus.btn-link-social(href='/auth/google') - i.fa.fa-google-plus - | Link Google with my account - if (!user.facebook) - .col-xs-12 - a.btn.btn-lg.btn-block.btn-facebook.btn-link-social(href='/auth/facebook') - i.fa.fa-facebook - | Link Facebook with my account - //if (!user.github) - // .col-xs-12 - // a.btn.btn-lg.btn-block.btn-github.btn-link-social(href='/auth/github') - // i.fa.fa-github - // | Link GitHub with my account - if (!user.linkedin) - .col-xs-12 - a.btn.btn-lg.btn-block.btn-linkedin.btn-link-social(href='/auth/linkedin') - i.fa.fa-linkedin - | Link LinkedIn with my account + a.btn.btn-lg.btn-block.btn-github.btn-link-social(href='/auth/github') + i.fa.fa-github + | Link GitHub with my account if (!user.twitter) .col-xs-12 a.btn.btn-lg.btn-block.btn-twitter.btn-link-social(href='/auth/twitter') i.fa.fa-twitter | Link Twitter with my account + if (!user.google) + .col-xs-12 + a.btn.btn-lg.btn-block.btn-google-plus.btn-link-social.disabled(href='#') + i.fa.fa-google-plus + | Link Google with my account + if (!user.facebook) + .col-xs-12 + a.btn.btn-lg.btn-block.btn-facebook.btn-link-social.disabled(href='#') + i.fa.fa-facebook + | Link Facebook with my account + if (!user.linkedin) + .col-xs-12 + a.btn.btn-lg.btn-block.btn-linkedin.btn-link-social.disabled(href='#') + i.fa.fa-linkedin + | Link LinkedIn with my account .col-xs-12 a.btn.btn-lg.btn-block.btn-warning.btn-link-social(href='/logout') span.ion-android-exit From 041779de7609c92c97f13b2cfe40429953c07226 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Mon, 3 Aug 2015 13:47:07 -0700 Subject: [PATCH 5/8] Update README.md --- README.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 692946ee8b..ab883ae64b 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,6 @@ Welcome to Free Code Camp's open source codebase! ======================= -#Note -We're currently very close to moving from Express to Loopback. As such, please keep in mind that the instructions here for setting up and running the project do not directly translate to the staging branch. Additionally, the file structure is quite a bit different. As always, the staging branch is the appropriate place to branch off of to fix/add something! - Free Code Camp is an open-source community of busy people who learn to code, then build projects for nonprofits. Our campers (students) start by working through our free, self-paced, browser-based curriculum. Next, they build several practice projects. Finally, we pair two campers together with a stakeholder from a nonprofit organization, and help them build the solution the nonprofit has requested. @@ -20,7 +17,14 @@ Our campers (students) start by working through our free, self-paced, browser-ba This code is running live at [FreeCodeCamp.com](http://www.FreeCodeCamp.com). We also have [Gitter](https://gitter.im/FreeCodeCamp/FreeCodeCamp), a [blog](http://blog.freecodecamp.com), and even a [Twitch.tv channel](http://twitch.tv/freecodecamp). -[Join our community](http://www.freecodecamp.com/signin)! +[Join our community here](http://www.freecodecamp.com/signin). + +*Note: We're currently very close to moving from Express to Loopback. As such, please keep in mind that the instructions here for setting up and running the project do not directly translate to the staging branch. Additionally, the file structure is quite a bit different. As always, the staging branch is the appropriate place to branch off of to fix/add something.* + +Wiki +------------ + +We would love your help expanding our [wiki](https://gitter.im/freecodecamp/freecodecamp/wiki) with more information about learning to code and getting a coding job. Contributing ------------ From 44f52b5f066fa467df65c446c1e52708adc0596c Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Mon, 3 Aug 2015 13:49:16 -0700 Subject: [PATCH 6/8] Update and add wiki link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ab883ae64b..8765f0044e 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ This code is running live at [FreeCodeCamp.com](http://www.FreeCodeCamp.com). We Wiki ------------ -We would love your help expanding our [wiki](https://gitter.im/freecodecamp/freecodecamp/wiki) with more information about learning to code and getting a coding job. +We would love your help expanding our [wiki](https://github.com/freecodecamp/freecodecamp/wiki) with more information about learning to code and getting a coding job. Contributing ------------ From c9db4191c29bd12ddc59188cf0f46345beb48aaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Djordje=20Lacmanovi=C4=87?= Date: Tue, 4 Aug 2015 00:39:11 +0200 Subject: [PATCH 7/8] fixed a typo as per issue 1473 --- seed/challenges/bootstrap.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/seed/challenges/bootstrap.json b/seed/challenges/bootstrap.json index bb4d81430e..c0b4014f93 100644 --- a/seed/challenges/bootstrap.json +++ b/seed/challenges/bootstrap.json @@ -797,8 +797,8 @@ "Delete the \".red-text\", \"p\", and \".smaller-image\" CSS declarations from your style element so that the only declarations left in your style element are \"h2\" and \"thick-green-border\". Then Delete the p element that contains a dead link. Then remove the \"red-text\" class from your h2 element and replace it with the \"text-primary\" Bootstrap class. Finally, remove the \"smaller-image\" class from your first img element and replace it with the img-responsive class." ], "tests": [ - "assert(!$('h2').hasClass('red-text'), 'You h2 element should no longer have the class \"red-text\".')", - "assert($('h2').hasClass('text-primary'), 'You h2 element should now have the class \"text-primary\".')", + "assert(!$('h2').hasClass('red-text'), 'Your h2 element should no longer have the class \"red-text\".')", + "assert($('h2').hasClass('text-primary'), 'Your h2 element should now have the class \"text-primary\".')", "assert(!$('p').css('font-family').match(/monospace/i), 'Your paragraph elements should no longer use the font \"Monospace\".')", "assert(!$('img').hasClass('smaller-image'), 'Remove the \"smaller-image\" class from your top image.')", "assert($('.img-responsive').length > 1, 'Add the \"img-responsive\" class to your top image.')" From a920e16cb9d02d7a741c9b57cbb2480e42afda78 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Mon, 3 Aug 2015 16:35:22 -0700 Subject: [PATCH 8/8] fix completedWith.toLowerCase bug --- server/boot/challenge.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/server/boot/challenge.js b/server/boot/challenge.js index 8a74822b34..5e0cc37f0d 100644 --- a/server/boot/challenge.js +++ b/server/boot/challenge.js @@ -372,7 +372,7 @@ module.exports = function(app) { function completedZiplineOrBasejump(req, res, next) { - var completedWith = req.body.challengeInfo.completedWith || false; + var completedWith = req.body.challengeInfo.completedWith || ''; var completedDate = Math.round(+new Date()); var challengeId = req.body.challengeInfo.challengeId; var solutionLink = req.body.challengeInfo.publicURL; @@ -423,17 +423,17 @@ module.exports = function(app) { pairedWith: pairedWith }; }) - .doOnNext(function(dats) { + .doOnNext(function({ user, pairedWith }) { updateUserProgress( - dats.user, + user, challengeId, - dats.pairedWith ? - assign({ completedWith: dats.pairedWith.id }, challengeData) : + pairedWith ? + assign({ completedWith: pairedWith.id }, challengeData) : challengeData ); }) - .flatMap(function(dats) { - return Rx.Observable.from([dats.user, dats.pairedWith]); + .flatMap(function({ user, pairedWith }) { + return Rx.Observable.from([user, pairedWith]); }) // save users .flatMap(function(user) {