Merge branch 'courseware' into challenge-restructure

app.js

@@ -335,6 +335,8 @@ app.get('/privacy', function(req, res) {
   res.redirect(301, '/field-guide/what-is-the-free-code-camp-privacy-policy?');
 });
 
+app.get('/submit-cat-photo', resourcesController.catPhotoSubmit);
+
 app.get('/api/slack', function(req, res) {
   if (req.user) {
     if (req.user.email) {

bower.json

@@ -25,6 +25,7 @@
     "font-awesome": "~4.3.0",
     "moment": "~2.10.2",
     "angular-bootstrap": "~0.13.0",
-    "ramda": "~0.13.0"
+    "ramda": "~0.13.0",
+    "jshint": "~2.7.0"
   }
 }

controllers/challengeMap.js

@@ -43,7 +43,7 @@ module.exports = {
     coursewareList = resources.allCoursewareNames();
     completedCoursewareList = noDuplicatedCoursewares;
     waypoints = coursewareList.filter(function(challenge) {
-      if (challenge.challengeType === 2) { return challenge }
+      if (challenge.challengeType === 2 || challenge.challengeType === 0) { return challenge }
     });
     ziplines = coursewareList.filter(function(challenge) {
       if (challenge.challengeType === 3) { return challenge }

controllers/courseware.js

@@ -28,9 +28,6 @@ exports.returnNextCourseware = function(req, res, next) {
   if (!req.user) {
     return res.redirect('../challenges/learn-how-free-code-camp-works');
   }
-  if (req.user.finishedWaypoints && req.user.uncompletedBonfires.length > 0) {
-    return res.redirect('../bonfires')
-  }
 
   var completed = req.user.completedCoursewares.map(function (elem) {
     return elem._id;
@@ -46,7 +43,6 @@ exports.returnNextCourseware = function(req, res, next) {
 
   var uncompletedCoursewares = req.user.uncompletedCoursewares[0];
 
-
   var displayedCoursewares = Courseware.find({'_id': uncompletedCoursewares});
   displayedCoursewares.exec(function(err, courseware) {
     if (err) {

controllers/resources.js

@@ -207,6 +207,10 @@ module.exports = {
     }
   },
 
+  catPhotoSubmit: function catPhotoSubmit(req, res) {
+    res.send('Success! You have submitted your cat photo. Return to your website by typing any letter into your code editor.')
+  },
+
   nonprofits: function nonprofits(req, res) {
     res.render('resources/nonprofits', {
       title: 'A guide to our Nonprofit Projects'

public/js/lib/coursewares/coursewaresHCJQFramework_0.1.1.js

@@ -107,11 +107,11 @@ var tests = tests || [];
 var allSeeds = '';
 (function() {
     challengeSeed.forEach(function(elem) {
-        allSeeds += elem + '\n';
+        allSeeds += elem.replace(/fccss/g, '<script>').replace(/fcces/g,'</script>') + '\n';
     });
+  editor.setValue(allSeeds);
 })();
 
-editor.setValue(allSeeds);
 
 function doLinting () {
     editor.operation(function () {

views/bonfire/show.jade

@@ -6,7 +6,7 @@ block content
     script(type='text/javascript', src='/js/lib/codemirror/addon/edit/matchbrackets.js')
     script(type='text/javascript', src='/js/lib/codemirror/addon/lint/lint.js')
     script(type='text/javascript', src='/js/lib/codemirror/addon/lint/javascript-lint.js')
-    script(type='text/javascript', src='//ajax.aspnetcdn.com/ajax/jshint/r07/jshint.js')
+    script(type='text/javascript', src='/bower_components/jshint/dist/jshint.js')
     script(type='text/javascript', src='/js/lib/chai/chai.js')
     link(rel='stylesheet', href='/js/lib/codemirror/lib/codemirror.css')
     link(rel='stylesheet', href='/js/lib/codemirror/addon/lint/lint.css')

views/coursewares/showHTML.jade

@@ -5,7 +5,7 @@ block content
     script(src='/js/lib/codemirror/addon/edit/matchbrackets.js')
     script(src='/js/lib/codemirror/addon/lint/lint.js')
     script(src='/js/lib/codemirror/addon/lint/javascript-lint.js')
-    script(src='//ajax.aspnetcdn.com/ajax/jshint/r07/jshint.js')
+    script(src='/bower_components/jshint/dist/jshint.js')
     script(src='/js/lib/chai/chai.js')
     script(src='/js/lib/chai/chai-jquery.js')
     link(rel='stylesheet', href='/js/lib/codemirror/lib/codemirror.css')

views/coursewares/showJS.jade

@@ -5,7 +5,7 @@ block content
     script(src='/js/lib/codemirror/addon/edit/matchbrackets.js')
     script(src='/js/lib/codemirror/addon/lint/lint.js')
     script(src='/js/lib/codemirror/addon/lint/javascript-lint.js')
-    script(src='//ajax.aspnetcdn.com/ajax/jshint/r07/jshint.js')
+    script(src='/bower_components/jshint/dist/jshint.js')
     script(src='/js/lib/chai/chai.js')
     link(rel='stylesheet', href='/js/lib/codemirror/lib/codemirror.css')
     link(rel='stylesheet', href='/js/lib/codemirror/addon/lint/lint.css')

views/coursewares/showZiplineOrBasejump.jade

@@ -3,6 +3,11 @@ block content
     .row
         .col-xs-12.col-sm-12.col-md-4.bonfire-top
             h1.text-center= name
+            p.text-center Tips: Use 
+                a(href='/field-guide/how-do-i-get-help-when-I-get-stuck' target='_blank') RSAP
+                | . Try using  
+                a(href='http://api.jquery.com/jquery.each/' target='_blank') jQuery's $.getJSON()
+                |  to consume APIs.
             .well
                 h4
                     ol