greatbody
/
freeCodeCamp
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cross off completed bonfires in list of all bonfires in modal

pull/120/head
Nathan Leniz 2015-02-22 17:36:43 +09:00
parent 90caed3369
commit b5a449cb1c
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app.js
View File

@ -301,7 +301,7 @@ app.get('/api/trello', resourcesController.trelloCalls);
/** /**
* Bonfire related routes * Bonfire related routes
*/ */
app.get('/bonfires/pooproute', bonfireController.poopRoute);
app.get('/bonfires/getBonfireList', bonfireController.showAllBonfires); app.get('/bonfires/getBonfireList', bonfireController.showAllBonfires);
app.get('/playground', bonfireController.index); app.get('/playground', bonfireController.index);
app.get('/bonfires', bonfireController.returnNextBonfire); app.get('/bonfires', bonfireController.returnNextBonfire);

11
controllers/bonfire.js
View File

@ -2,7 +2,8 @@ var _ = require('lodash'),
debug = require('debug')('freecc:cntr:bonfires'), debug = require('debug')('freecc:cntr:bonfires'),
Bonfire = require('./../models/Bonfire'), Bonfire = require('./../models/Bonfire'),
User = require('./../models/User'), User = require('./../models/User'),
resources = require('./resources'); resources = require('./resources'),
R = require('ramda');
/** /**
* Bonfire controller * Bonfire controller
@ -12,15 +13,13 @@ exports.showAllBonfires = function(req, res) {
var completedBonfires = req.user.completedBonfires.map(function(elem) { var completedBonfires = req.user.completedBonfires.map(function(elem) {
return elem._id; return elem._id;
}); });
var noDuplicateBonfires = R.uniq(completedBonfires);
var data = {}; var data = {};
data.bonfireList = resources.allBonfireNames(); data.bonfireList = resources.allBonfireNames();
//data.completedList = completedBonfires; data.completedList = noDuplicateBonfires;
res.send(data); res.send(data);
}; };
// FIXME: remove this
exports.poopRoute = function(req, res) {
res.render('partials/bonfires.jade');
}
exports.index = function(req, res) { exports.index = function(req, res) {
res.render('bonfire/show.jade', { res.render('bonfire/show.jade', {

10
controllers/resources.js
View File

@ -206,14 +206,18 @@ module.exports = {
return bonfires.map(function(elem) { return bonfires.map(function(elem) {
return { return {
name: elem.name, name: elem.name,
difficulty: elem.difficulty difficulty: elem.difficulty,
_id: elem._id
} }
}) })
.sort(function(a, b) { .sort(function(a, b) {
return a.difficulty - b.difficulty; return a.difficulty - b.difficulty;
}) })
.map(function(elem) { .map (function(elem) {
return elem.name; return {
name : elem.name,
_id: elem._id
}
}); });
}, },

9
views/partials/bonfires.jade
View File

@ -12,9 +12,12 @@ h3
function(data) { function(data) {
for (var i = 0; i < data.bonfireList.length; i++) { for (var i = 0; i < data.bonfireList.length; i++) {
var li = document.createElement('li'); var li = document.createElement('li');
var linkedName = getLinkedName(data.bonfireList[i]); var linkedName = getLinkedName(data.bonfireList[i].name);
$(li) if (R.contains(data.bonfireList[i]._id, data.completedList)) {
.html("<a href='/bonfires/" + linkedName + "'>" + data.bonfireList[i] + "</a>"); $(li).addClass('strikethrough');
}
$(li).html("<a href='/bonfires/" + linkedName + "'>" + data.bonfireList[i].name + "</a>");
$(li).appendTo($('#bonfireList')); $(li).appendTo($('#bonfireList'));
} }
}); });