diff --git a/controllers/runs.js b/controllers/runs.js index ea0b3f9..4c35ac3 100644 --- a/controllers/runs.js +++ b/controllers/runs.js @@ -1,9 +1,9 @@ var express = require('express'); var controller = express.Router(); +var runs = require('../models/runs.js'); controller.get('/', function(req, res){ - console.log(req.query.foo); - res.send('run index page'); + res.json(runs); }); controller.get('/new', function(req, res){ diff --git a/models/fakearray.js b/models/fakearray.js deleted file mode 100644 index d8358fc..0000000 --- a/models/fakearray.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = [1,'some string', 2345]; diff --git a/models/runs.js b/models/runs.js new file mode 100644 index 0000000..8231785 --- /dev/null +++ b/models/runs.js @@ -0,0 +1,17 @@ +module.exports = [ + { + id:1, + distance: 0.5, + date: new Date('2016-1-1') + }, + { + id:2, + distance: 1.5, + date: new Date('2016-2-1') + }, + { + id:1, + distance: 2.5, + date: new Date('2016-3-1') + }, +]; diff --git a/server.js b/server.js index f963ab1..d6daf2e 100644 --- a/server.js +++ b/server.js @@ -1,15 +1,12 @@ var express = require('express'); //require express package var app = express(); //create application variable -var fakeArray = require('./models/fakearray.js'); var PORT = process.env.PORT || 3000; var runController = require('./controllers/runs.js'); app.use('/runs', runController); app.get('/', function(request, response){ - response.render('index.ejs', { - dataArray: fakeArray - }); + response.render('index.ejs'); }); //params: port, callback to execute once listening has begun