Merge branch 'staging' into feature/block-camper-news

seed/challenges/bootstrap.json

@@ -91,7 +91,7 @@
       "id": "bad87fee1348bd9acde08812",
       "title": "Make Images Mobile Responsive",
       "description": [
-        "First, add a new image below the existing one. Set it's <code>src</code> attribute to <code>http://bit.ly/fcc-running-cats</code>.",
+        "First, add a new image below the existing one. Set its <code>src</code> attribute to <code>http://bit.ly/fcc-running-cats</code>.",
         "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 <code>img-responsive</code> class to your image. Do this, and the image should perfectly fit the width of your page."
       ],

seed/challenges/html5-and-css.json

@@ -377,6 +377,7 @@
         "assert(!$(\"h2\").attr(\"style\"), 'Remove the style attribute from your <code>h2</code> element.')",
         "assert($(\"style\") && $(\"style\").length > 1, 'Create a <code>style</code> element.')",
         "assert($(\"h2\").css(\"color\") === \"rgb(0, 0, 255)\", 'Your <code>h2</code> element should be blue.')",
+        "assert(editor.match(/h2\\s*\\{\\s*color:\\s*blue;\\s*\\}/g), 'Ensure that your stylesheet <code>h2</code> declaration is valid with a semicolon and closing brace')",
         "assert(editor.match(/<\\/style>/g) && editor.match(/<\\/style>/g).length === (editor.match(/<style((\\s)*((type|media|scoped|title|disabled)=\"[^\"]*\")?(\\s)*)*>/g) || []).length, 'Make sure all your <code>style</code> elements are valid and have a closing tag.')"
       ],
       "challengeSeed": [

seed/challenges/intermediate-bonfires.json

@@ -633,7 +633,7 @@
         "assert.strictEqual(find([1, 3, 5, 9], function(num) { return num % 2 === 0; }), undefined, 'message: <code>find([1, 3, 5, 9], function(num) { return num % 2 === 0; })</code> should return undefined.');"
       ],
       "MDNlinks": [
-        "Array.some()"
+        "Array.filter()"
       ],
       "type": "bonfire",
       "challengeType": 5,

seed/nonprofits.json

@@ -1,6 +1,5 @@
 [
   {
-    "id": "bd7157d8c441cbafaeb5bdef",
     "whatDoesNonprofitDo": "We help the many less-fortunate Jewish families in our community, by providing them with nutritious food and energy to grow, learn, work, and give them hope for a better and brighter future.",
     "websiteLink": "http://chasdeikaduri.org/",
     "name": "Chasdei Kaduri",
@@ -20,7 +19,6 @@
     "moneySaved": 60000
   },
   {
-    "id": "bd7158d8c464cbafaeb4bdef",
     "whatDoesNonprofitDo": "We connect simple technology with last mile communities to reduce poverty.",
     "websiteLink": "http://kopernik.info/",
     "name": "Kopernik",
@@ -36,7 +34,6 @@
     "moneySaved": 20000
   },
   {
-    "id": "bd1326d9c245cbafaeb4bdef",
     "whatDoesNonprofitDo": "We distribute biodegradable toothbrushes globally to children in need.",
     "websiteLink": "http://www.operationbrush.org/",
     "name": "Operation Brush",
@@ -52,7 +49,6 @@
     "moneySaved": 20000
   },
   {
-    "id": "bd1325d8c464cbafaeb5bdef",
     "whatDoesNonprofitDo": "We are the largest roller derby league in the world with around 250 adults and 150 junior skater members plus 500+ volunteers.",
     "websiteLink": "http://www.rosecityrollers.com/about/our-charities/",
     "name": "Rose City Rollers",
@@ -68,7 +64,6 @@
     "moneySaved": 40000
   },
   {
-    "id": "bd1325d8c464cbafaeb6bde1",
     "whatDoesNonprofitDo": "We provide urgently needed pediatric heart surgery and follow-up care for indigent children from developing countries",
     "websiteLink": "http://www.saveachildsheart.com/global/young-leadership-program/",
     "name": "Save a Child's Heart",
@@ -84,7 +79,6 @@
     "moneySaved": 40000
   },
   {
-    "id": "bd1225d8c464cbafaeb4bdef",
     "whatDoesNonprofitDo": "We empower youth with technology by providing age appropriate resources and education.",
     "websiteLink": "http://savvycyberkids.org/",
     "name": "Savvy Cyber Kids",
@@ -100,7 +94,6 @@
     "moneySaved": 40000
   },
   {
-    "id": "bd1325d8c464cbafaeb7bcef",
     "whatDoesNonprofitDo": "We bring a new edge to arts and medicine in the Bay Area through powerful live performances of new music to those who feel marginalized by their affliction.",
     "websiteLink": "http://transcendentpathways.org/",
     "name": "Transcendent Pathways",
@@ -116,8 +109,7 @@
     "moneySaved": 40000
   },
   {
-    "id": "bd1325d8c464cbafaeb8bdef",
+     "whatDoesNonprofitDo": "We have provide volunteer matching fairs and silent art auctions at events across Canada. Rather than bid money on artwork, participants bid volunteer hours.",
-    "whatDoesNonprofitDo": "We have provide volunteer matching fairs and silent art auctions at events across Canada. Rather than bid money on artwork, participants bid volunteer hours.",
     "websiteLink": "http://www.timeraiser.ca/",
     "name": "Timeraiser",
     "endUser": "Working professionals who want to donate their time and expertise",
@@ -132,7 +124,6 @@
     "moneySaved": 40000
   },
   {
-    "id": "bd1325d8c464cbafaeb7bdef",
     "whatDoesNonprofitDo": "We focus on raising funds to assist injured homeless animals.",
     "websiteLink": "http://www.peoplesavinganimals.org/",
     "name": "People Saving Animals",
@@ -150,7 +141,6 @@
     "moneySaved": 60000
   },
   {
-    "id": "bd1325d8c464cbafaeb6bde2",
     "whatDoesNonprofitDo": "We preserve Florida's health by regulating septic contractors and reviewing logs of sewage collection and disposal.",
     "websiteLink": "http://www.floridahealth.gov/",
     "name": "Florida Department of Health",
@@ -168,8 +158,7 @@
     "moneySaved": 40000
   },
   {
-    "id": "bd1325d8c464cbafaeb6bde3",
+     "whatDoesNonprofitDo": "We strengthen the value of songwriting and independent music in Columbus, Ohio.",
-    "whatDoesNonprofitDo": "We strengthen the value of songwriting and independent music in Columbus, Ohio.",
     "websiteLink": "http://columbussongwritersassociation.com",
     "name": "Columbus Songwriters Association",
     "endUser": "Songwriters and their audiences in the Columbus, Ohio community.",
@@ -184,7 +173,6 @@
     "moneySaved": 20000
   },
   {
-    "id": "bd1325d8c464cbafaeb4bbb",
     "whatDoesNonprofitDo": "We leverage all the benefits of cycling to support and improve the lives of youth and teens in the Triangle region.",
     "websiteLink": "http://www.trianglebikeworks.org",
     "name": "Triangle Bike Works",
@@ -200,7 +188,6 @@
     "moneySaved": 0
   },
   {
-    "id": "bd1325d8c464cbafaeb4bccc",
     "whatDoesNonprofitDo": "We work to eradicate female genital mutilation in the US and Gambia. We work with survivors and communities.",
     "websiteLink": "http://safehandsforgirls.org/",
     "name": "Safe Hands for Girls",
@@ -216,7 +203,6 @@
     "moneySaved": 0
   },
   {
-    "id": "bd1325d8c464cbafaeb4beff",
     "whatDoesNonprofitDo": "We're a part of the Department of Psychiatry at Mass General Hospital. We teach an innovative way for helping people that have challenging behaviors.",
     "websiteLink": "http://www.thinkkids.org/",
     "name": "Think Kids at Massachusetts General Hospital",
@@ -232,7 +218,6 @@
     "moneySaved": 0
   },
   {
-    "id": "bd1325d8c464cbaeaeb4bdef",
     "whatDoesNonprofitDo": "We enable, educate, and empower students from rural backgrounds in Uttar Pradesh, India.",
     "websiteLink": "http://www.milaan.in/",
     "name": "Milaan",
@@ -248,7 +233,6 @@
     "moneySaved": 0
   },
   {
-    "id": "bd1325d8c464cbafaeb4beee",
     "whatDoesNonprofitDo": "We're committed to closing the opportunity gap for children in Baltimore City by providing high quality after school and in-school programs.",
     "websiteLink": "http://childfirstauthority.org/",
     "name": "Child First Authority",
@@ -264,52 +248,42 @@
     "moneySaved": 0
   },
   {
-    "id": "bd1325d8c464cbafaeb4bdef",
     "whatDoesNonprofitDo": "SOLACE Foundation provides drug overdose prevention and awareness training as well as grief support for bereaved families.",
     "websiteLink": "https://www.facebook.com/www.solaceorangecounty.org",
     "name": "The Solace Foundation of Orange County",
     "endUser": "Donors",
-    "approvedDeliverables": ["Website"],
+    "approvedDeliverables": [
+      "Website"
+    ],
     "projectDescription": "Campers will build a basic website that accepts donations.",
     "logoUrl": "http://i.imgur.com/79E3nP0.png",
     "imageUrl": "http://i.imgur.com/kCWN1iT.jpg",
-    "interestedCampers": [],
-    "confirmedCampers": [],
     "estimatedHours": 100
   },
   {
-    "id": "bd1325d8c463cbafaeb4bdef",
     "whatDoesNonprofitDo": "We are an interdisciplinary team that works towards harmony among humans and nature through three distinct branches: sustainable agriculture, environmental education and applied and appropriate technology; focused in Líbano, Tolima, Colombia.",
-    "websiteLink": "string",
+    "websiteLink": "",
     "name": "QET America",
     "endUser": "Donors",
     "approvedDeliverables": ["Website"],
     "projectDescription": "Campers will build a multiple language website (English, Spanish) that accepts donations.",
     "logoUrl": "http://i.imgur.com/jPuiPOy.jpg",
     "imageUrl": "http://i.imgur.com/zaaL2pj.jpg",
-    "interestedCampers": [],
-    "confirmedCampers": [],
     "estimatedHours": 100
   },
   {
-    "id": "bd1325d8c462cbafaeb4bdef",
     "whatDoesNonprofitDo": "1to1 Movement provides free environmental education in schools",
     "websiteLink": "http://1to1movement.org/",
-    "stakeholderName": "string",
-    "stakeholderEmail": "string",
     "name": "1 to 1 Movement",
     "endUser": "Pledgers",
     "approvedDeliverables": ["Web App"],
     "projectDescription": "Campers will build a simple, social, data-driven application that allows people to see the impact of their actions. User can make a pledge and track the outcome. Will make use of the D3.js visualization library.",
     "logoUrl": "http://i.imgur.com/jaqxg0O.png",
     "imageUrl": "http://i.imgur.com/GXSWTZw.jpg",
-    "interestedCampers": [],
-    "confirmedCampers": [],
     "estimatedHours": 300
   },
 
   {
-    "id": "bd1325d8c464cbcfaeb4bdef",
     "whatDoesNonprofitDo": "Our missions is to elevate the national dialogue and engage the American people around climate change policy and the promotion of real clean energy solutions in the United States.",
     "websiteLink": "http://www.usclimateplan.org/",
     "name": "US Climate Plan",
@@ -318,24 +292,17 @@
     "projectDescription": "Campers will build a basic website for sharing information, feeds from different campaign’s websites.",
     "logoUrl": "http://i.imgur.com/uAyUiMN.png",
     "imageUrl": "http://i.imgur.com/2Og5tqy.jpg",
-    "interestedCampers": [],
-    "confirmedCampers": [],
     "estimatedHours": 100
   },
   {
-    "id": "bd1325d8c461cbafaeb4bdef",
     "whatDoesNonprofitDo": "We empower the community through improved literacy.",
     "websiteLink": "http://www.tleliteracy.com/",
-    "stakeholderName": "Darlene Brown",
-    "stakeholderEmail": "string",
     "name": "The Learning Exchange",
-    "endUser": "string",
+    "endUser": "Community members",
     "approvedDeliverables": ["Website"],
     "projectDescription": "Campers will build a simple website to replace essentialskillsquebec.com. Site will host many documents related to the Nine Essential Skills.",
     "logoUrl": "http://i.imgur.com/jXQY01H.png",
     "imageUrl": "http://i.imgur.com/iUXBpeL.jpg",
-    "interestedCampers": [],
-    "confirmedCampers": [],
     "estimatedHours": 100
   }
 ]

server/boot/nonprofits.js

@@ -64,23 +64,6 @@ module.exports = function(app) {
           return res.redirect('../nonprofit/' + dashedNameFull);
         }
 
-        //  We need to create logic that verifies completion.
-        //  Defaulting to false for now.
-        //  var buttonActive = false;
-        //  if (
-        //    req.user &&
-        //    req.user.completedCoursewares.length > 63
-        //  ) {
-        //    var hasShownInterest =
-        //      nonprofit.interestedCampers.filter(function(user) {
-        //        return user.username === req.user.username;
-        //      });
-        //
-        //    if (hasShownInterest.length === 0) {
-        //      buttonActive = true;
-        //    }
-        //  }
-
         res.render('nonprofits/show', {
           dashedName: dashedNameFull,
           title: nonprofit.name,