diff --git a/bower.json b/bower.json index 70d3574..46d431a 100644 --- a/bower.json +++ b/bower.json @@ -7,7 +7,8 @@ "underscore": "1.8.2", "moment": "2.9.0", "react": "0.13.1", - "requirejs": "2.1.17" + "requirejs": "2.1.17", + "jquery": "1.10.2" }, "moduleType": [ "amd" diff --git a/resources/projects.js b/resources/projects.js index 91c517c..8f70424 100644 --- a/resources/projects.js +++ b/resources/projects.js @@ -9,14 +9,16 @@ var projects, project.loadAll('projects', function(err, loadedProjects) { if (err) throw err; projects = loadedProjects; - projectConfigs = _(projects).pluck('config'); - console.log('Loaded projects: ', _(projectConfigs).pluck('name')); + console.log( + 'Loaded projects: ', + _(projects).chain().pluck('config').pluck('name').value() + ); }); module.exports = function(data) { var resource = data.resource('projects'); resource.use('read', function(req, res) { - res.send(projectConfigs); + res.send(_(projects).pluck('config')); }); }; diff --git a/static/js/app/app.js b/static/js/app/app.js index 1eb69db..63e74bb 100644 --- a/static/js/app/app.js +++ b/static/js/app/app.js @@ -1,18 +1,15 @@ 'use strict'; define([ - 'underscore', 'react', 'socketio', 'dataio' + 'underscore', 'react', 'socketio', 'dataio', 'jquery' ], function( - _, React, socketio, dataio + _, React, socketio, dataio, $ ) { - var contentEl = window.document.getElementById('content'); - - // console.log(React, socketio, dataio); var connect = dataio(socketio.connect()); var projects = connect.resource('projects'); projects.sync('read', function(err, projects) { - contentEl.innerHTML = ( + $('#content').html( (err && err.message) || ('Loaded projects: ' + _(projects).pluck('name').join(', ')) ); diff --git a/static/js/main.js b/static/js/main.js index c3515b3..8629062 100644 --- a/static/js/main.js +++ b/static/js/main.js @@ -6,6 +6,7 @@ require.config({ underscore: 'libs/underscore/underscore', react: 'libs/react/react-with-addons', dataio: '/data.io', - socketio: '/socket.io/socket.io.js' + socketio: '/socket.io/socket.io.js', + jquery: 'libs/jquery/jquery' } });