From 01bdbd8f4d7bbcbf2802ff73edfc9a6338b9a706 Mon Sep 17 00:00:00 2001 From: Nathan Leniz Date: Tue, 27 Jan 2015 17:39:53 -0500 Subject: [PATCH] Finishing up pathing issues, writing user object if they haven't visited in a day --- app.js | 7 +++---- controllers/bonfire.js | 7 +++---- public/js/main.js | 10 ++++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app.js b/app.js index 2d089000db..c9e59393f1 100644 --- a/app.js +++ b/app.js @@ -352,11 +352,9 @@ app.post('/completed-bonfire/', function (req, res) { solution: isSolution }) - - debug('saving user with a pair'); req.user.save(); pairedWith.save(); - + res.redirect('/bonfires'); } }) } else { @@ -372,9 +370,10 @@ app.post('/completed-bonfire/', function (req, res) { if (index > -1) { req.user.uncompletedBonfires.splice(index,1) } - debug("Saving user without a pair"); req.user.save(); + res.redirect('/bonfires'); } + }); /** diff --git a/controllers/bonfire.js b/controllers/bonfire.js index 3f7a655453..5eea2483ba 100644 --- a/controllers/bonfire.js +++ b/controllers/bonfire.js @@ -43,16 +43,15 @@ exports.returnNextBonfire = function(req, res, next) { var completed = req.user.completedBonfires.map(function(elem) { return elem._id; }); - // TODO : remove debug statement - debug(req.user, 'this is the user'); + req.user.uncompletedBonfires = resources.allBonfireIds().filter(function(elem) { if (completed.indexOf(elem) === -1) { return elem; } }); + req.user.save(); } - debug('These are completed bonfires', completed); - debug('These are uncompleted bonfires', req.user.uncompletedBonfires); + var uncompletedBonfires = req.user.uncompletedBonfires; diff --git a/public/js/main.js b/public/js/main.js index f9ea38d6ee..99e2ff1c03 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -39,9 +39,6 @@ $(document).ready(function() { $('#complete-bonfire-dialog').modal('show'); // Only post to server if there is an authenticated user if ($('.signup-btn-nav').length < 1) { - l = location.pathname.split('/'); - cn = l[l.length - 1]; - $.ajax({ type: 'POST', data: { @@ -52,7 +49,12 @@ $(document).ready(function() { } }, url: '/completed-bonfire/' - }) + + }); + + //$.post( '/completed-bonfire', function( data ) { + // window.location = '/bonfires'; + //}); } }