diff --git a/app.js b/app.js index 9ed01a4f1e8..530d5b2c018 100644 --- a/app.js +++ b/app.js @@ -301,7 +301,7 @@ app.get('/api/trello', resourcesController.trelloCalls); /** * Bonfire related routes */ -app.get('/bonfires/pooproute', bonfireController.poopRoute); + app.get('/bonfires/getBonfireList', bonfireController.showAllBonfires); app.get('/playground', bonfireController.index); app.get('/bonfires', bonfireController.returnNextBonfire); diff --git a/controllers/bonfire.js b/controllers/bonfire.js index d18ca1a8bdf..e36be01ccd6 100644 --- a/controllers/bonfire.js +++ b/controllers/bonfire.js @@ -2,7 +2,8 @@ var _ = require('lodash'), debug = require('debug')('freecc:cntr:bonfires'), Bonfire = require('./../models/Bonfire'), User = require('./../models/User'), - resources = require('./resources'); + resources = require('./resources'), + R = require('ramda'); /** * Bonfire controller @@ -12,15 +13,13 @@ exports.showAllBonfires = function(req, res) { var completedBonfires = req.user.completedBonfires.map(function(elem) { return elem._id; }); + + var noDuplicateBonfires = R.uniq(completedBonfires); var data = {}; data.bonfireList = resources.allBonfireNames(); - //data.completedList = completedBonfires; + data.completedList = noDuplicateBonfires; res.send(data); }; -// FIXME: remove this -exports.poopRoute = function(req, res) { - res.render('partials/bonfires.jade'); -} exports.index = function(req, res) { res.render('bonfire/show.jade', { diff --git a/controllers/resources.js b/controllers/resources.js index 99844a30957..e02680289ec 100644 --- a/controllers/resources.js +++ b/controllers/resources.js @@ -206,14 +206,18 @@ module.exports = { return bonfires.map(function(elem) { return { name: elem.name, - difficulty: elem.difficulty + difficulty: elem.difficulty, + _id: elem._id } }) .sort(function(a, b) { return a.difficulty - b.difficulty; }) - .map(function(elem) { - return elem.name; + .map (function(elem) { + return { + name : elem.name, + _id: elem._id + } }); }, diff --git a/views/partials/bonfires.jade b/views/partials/bonfires.jade index c856ea9bf66..3dfb6da0300 100644 --- a/views/partials/bonfires.jade +++ b/views/partials/bonfires.jade @@ -12,9 +12,12 @@ h3 function(data) { for (var i = 0; i < data.bonfireList.length; i++) { var li = document.createElement('li'); - var linkedName = getLinkedName(data.bonfireList[i]); - $(li) - .html("" + data.bonfireList[i] + ""); + var linkedName = getLinkedName(data.bonfireList[i].name); + if (R.contains(data.bonfireList[i]._id, data.completedList)) { + $(li).addClass('strikethrough'); + } + $(li).html("" + data.bonfireList[i].name + ""); $(li).appendTo($('#bonfireList')); + } });