Merge branch 'master' into nonprofit-show

Conflicts:
	controllers/challenges.js
	controllers/courseware.js

controllers/challenges.js

@@ -0,0 +1,75 @@
+/**
+ * GET /
+ * Challenges.
+ */
+var _ = require('lodash'),
+    debug = require('debug')('freecc:cntr:challenges'),
+    Challenge = require('./../models/Challenge'),
+    resources = require('./resources');
+
+var highestChallengeNumber = 53;
+
+
+exports.returnNextChallenge = function(req, res) {
+    if (req.user) {
+        ch = req.user.challengesHash;
+        if (req.user.challengesHash[0] > 0) {
+            var max = Object.keys(ch).reduce(function(max, key) {
+                return (max === undefined || ch[key] > ch[max]) ? +key : max;
+            });
+            nextChallenge = max + 1;
+            res.redirect('challenges/' + nextChallenge);
+        } else {
+            res.redirect('challenges/0');
+        }
+    } else {
+        return res.redirect('../challenges/0');
+    }
+};
+
+exports.returnChallenge = function(req, res) {
+    var challengeNumber = parseInt(req.params.challengeNumber) || 0;
+    if (challengeNumber === 2) {
+        req.user.challengesHash[challengeNumber] = Math.round(+new Date() / 1000);
+        var timestamp = req.user.challengesHash;
+        var points = 0;
+        for (var key in timestamp) {
+            if (timestamp[key] > 0 && req.body.challengeNumber < 54) {
+                points += 1;
+            }
+        }
+        req.user.points = points;
+        req.user.save(function(err) {
+            if (err) { return done(err); }
+        });
+
+        return res.redirect('../challenges/3');
+    }
+
+    if (challengeNumber > highestChallengeNumber) {
+        req.flash('errors', {
+            msg: "It looks like you've either completed all the challenges we have available or requested a challenge we don't have."
+        });
+        return res.redirect('../challenges/0');
+    }
+    Challenge.find({}, null, { sort: { challengeNumber: 1 } }, function(err, c) {
+        if (err) {
+            debug('Challenge err: ', err);
+            next(err);
+        }
+        res.render('challenges/show', {
+            title: 'Challenge: ' + c[challengeNumber].name,
+            name: c[challengeNumber].name,
+            video: c[challengeNumber].video,
+            time: c[challengeNumber].time,
+            steps: c[challengeNumber].steps,
+            number: challengeNumber,
+            cc: req.user ? req.user.challengesHash : undefined,
+            points: req.user ? req.user.points : undefined,
+            verb: resources.randomVerb(),
+            phrase: resources.randomPhrase(),
+            compliment: resources.randomCompliment(),
+            challenges: c
+        });
+    });
+};