continue work on challengeshash
parent
5c54fddaec
commit
07ba7e4fcb
6
app.js
6
app.js
|
@ -165,20 +165,20 @@ app.get('/account/unlink/:provider', userController.getOauthUnlink);
|
|||
* API examples routes.
|
||||
*/
|
||||
app.post('/completed_challenge', function(req, res) {
|
||||
console.log(req.user);
|
||||
req.user.challengesHash[parseInt(req.body.cn)] = Math.round(+new Date() / 1000);
|
||||
req.user.challengesCompleted = function() {
|
||||
var completed = [];
|
||||
var h = req.user.challengesHash;
|
||||
for (i = 0; i < h.length; i++) {
|
||||
console.log(h[i] > 0)
|
||||
if (h[i] > 0) {
|
||||
console.log(h[i]);
|
||||
completed.push(i);
|
||||
}
|
||||
return completed;
|
||||
}
|
||||
}
|
||||
req.user.save();
|
||||
console.log(req.user.challengesHash);
|
||||
console.log(req.user.challengesCompleted);
|
||||
});
|
||||
|
||||
/**
|
||||
|
|
|
@ -77,10 +77,10 @@ passport.use(new TwitterStrategy(secrets.twitter, function(req, accessToken, tok
|
|||
user.save(function(err) {
|
||||
done(err, user);
|
||||
});
|
||||
if (!user.email) {
|
||||
res.redirect('/account');
|
||||
req.flash('errors', { msg: 'OK, you are signed in. Please add your email address to your profile.' });
|
||||
}
|
||||
//if (!user.email) {
|
||||
// res.redirect('/account');
|
||||
// req.flash('errors', { msg: 'OK, you are signed in. Please add your email address to your profile.' });
|
||||
//}
|
||||
});
|
||||
}
|
||||
}));
|
||||
|
|
|
@ -19,7 +19,8 @@ exports.returnChallenge = function(req, res, next) {
|
|||
video: c.video,
|
||||
time: c.time,
|
||||
steps: c.steps,
|
||||
cc: req.user.challengesHash
|
||||
cc: req.user.challengesCompleted,
|
||||
ch: req.user.challengesHash
|
||||
});
|
||||
});
|
||||
};
|
|
@ -6,7 +6,6 @@
|
|||
exports.index = function(req, res) {
|
||||
if (req.user) {
|
||||
if (req.user.challengesCompleted.length > 0) {
|
||||
Object.values(req.user.challengesHash);
|
||||
nextChallenge = Math.max.apply(Math, req.user.challengesHash) + 1;
|
||||
res.redirect("challenges/" + nextChallenge);
|
||||
} else {
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
img(src='#{user.profile.picture}')
|
||||
else
|
||||
img(src='#{user.gravatar(60)}')
|
||||
| #{user.profile.name || user.email || user.id} [ #{user.completedChallengeCount)} ]
|
||||
| #{user.profile.name || user.email || user.id} [ #{user.challengesCompleted.length} ]
|
||||
i.caret
|
||||
ul.dropdown-menu
|
||||
li
|
||||
|
|
Loading…
Reference in New Issue