jprdonnelly/freeCodeCamp
1
0
Fork 0
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git synced 2026-04-22 13:00:56 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'timestamp' into challenges

Browse Source 
Conflicts:
	config/passport.js
	public/css/main.less
This commit is contained in:
Michael Q Larson
2014-12-13 21:09:11 -08:00
parent 675b0ebd47 bedddde945
commit c7a5a51c8d
12 changed files with 319 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/challenges.js
View File

@@ -19,7 +19,7 @@ exports.returnChallenge = function(req, res, next) {
video: c.video,
time: c.time,
steps: c.steps,
cc: req.user.challengesCompleted
cc: req.user.challengesHash
});
});
};

2
controllers/home.js
View File

@@ -6,7 +6,7 @@
exports.index = function(req, res) {
if (req.user) {
if (req.user.challengesCompleted.length > 0) {
nextChallenge = Math.max.apply(Math, req.user.challengesCompleted) + 1;
nextChallenge = Math.max.apply(Math, req.user.challengesHash) + 1;
res.redirect("challenges/" + nextChallenge);
} else {
res.redirect("challenges/0");

5
controllers/user.js
View File

@@ -5,6 +5,7 @@ var nodemailer = require('nodemailer');
var passport = require('passport');
var User = require('../models/User');
var secrets = require('../config/secrets');
var moment = require('moment');
/**
* GET /login
@@ -130,7 +131,9 @@ exports.postEmailSignup = function(req, res, next) {
exports.getAccount = function(req, res) {
res.render('account/profile', {
title: 'Manage your Free Code Camp Account'
title: 'Manage your Free Code Camp Account',
cc: req.user.challengesHash,
moment: moment
});
};