gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into refactor

Browse Source 
Conflicts:
	app.js
	controllers/api.js
	controllers/challenges.js
	gulpfile.js
This commit is contained in:
Michael Q Larson
2014-12-23 12:34:09 -08:00
parent 86fcfe8296 3ac4ecdd08
commit ef2eba7b14
9 changed files with 243 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
controllers/user.js
View File

@ -6,6 +6,7 @@ var passport = require('passport');
var User = require('../models/User');
var secrets = require('../config/secrets');
var moment = require('moment');
var Challenge = require('./../models/Challenge');
//TODO(Berks): Refactor to use module.exports = {} pattern.
/**
@ -133,10 +134,17 @@ exports.postEmailSignup = function(req, res, next) {
*/
exports.getAccount = function(req, res) {
res.render('account/profile', {
title: 'Manage your Free Code Camp Account',
cc: req.user.challengesHash,
moment: moment
Challenge.find({}, function (err, c) {
if (err) {
console.error('Challenge err: ', err);
next(err);
}
res.render('account/profile', {
title: 'Manage your Free Code Camp Account',
cc: c,
ch: req.user.challengesHash,
moment: moment
});
});
};