continue work on challengeshash
This commit is contained in:
6
app.js
6
app.js
@ -165,20 +165,20 @@ app.get('/account/unlink/:provider', userController.getOauthUnlink);
|
|||||||
* API examples routes.
|
* API examples routes.
|
||||||
*/
|
*/
|
||||||
app.post('/completed_challenge', function(req, res) {
|
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.challengesHash[parseInt(req.body.cn)] = Math.round(+new Date() / 1000);
|
||||||
req.user.challengesCompleted = function() {
|
req.user.challengesCompleted = function() {
|
||||||
var completed = [];
|
var completed = [];
|
||||||
|
var h = req.user.challengesHash;
|
||||||
for (i = 0; i < h.length; i++) {
|
for (i = 0; i < h.length; i++) {
|
||||||
|
console.log(h[i] > 0)
|
||||||
if (h[i] > 0) {
|
if (h[i] > 0) {
|
||||||
|
console.log(h[i]);
|
||||||
completed.push(i);
|
completed.push(i);
|
||||||
}
|
}
|
||||||
return completed;
|
return completed;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
req.user.save();
|
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) {
|
user.save(function(err) {
|
||||||
done(err, user);
|
done(err, user);
|
||||||
});
|
});
|
||||||
if (!user.email) {
|
//if (!user.email) {
|
||||||
res.redirect('/account');
|
// res.redirect('/account');
|
||||||
req.flash('errors', { msg: 'OK, you are signed in. Please add your email address to your profile.' });
|
// 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,
|
video: c.video,
|
||||||
time: c.time,
|
time: c.time,
|
||||||
steps: c.steps,
|
steps: c.steps,
|
||||||
cc: req.user.challengesHash
|
cc: req.user.challengesCompleted,
|
||||||
|
ch: req.user.challengesHash
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
};
|
};
|
@ -6,7 +6,6 @@
|
|||||||
exports.index = function(req, res) {
|
exports.index = function(req, res) {
|
||||||
if (req.user) {
|
if (req.user) {
|
||||||
if (req.user.challengesCompleted.length > 0) {
|
if (req.user.challengesCompleted.length > 0) {
|
||||||
Object.values(req.user.challengesHash);
|
|
||||||
nextChallenge = Math.max.apply(Math, req.user.challengesHash) + 1;
|
nextChallenge = Math.max.apply(Math, req.user.challengesHash) + 1;
|
||||||
res.redirect("challenges/" + nextChallenge);
|
res.redirect("challenges/" + nextChallenge);
|
||||||
} else {
|
} else {
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
img(src='#{user.profile.picture}')
|
img(src='#{user.profile.picture}')
|
||||||
else
|
else
|
||||||
img(src='#{user.gravatar(60)}')
|
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
|
i.caret
|
||||||
ul.dropdown-menu
|
ul.dropdown-menu
|
||||||
li
|
li
|
||||||
|
Reference in New Issue
Block a user