diff --git a/controllers/sites.js b/controllers/sites.js index 4c5fb24..acfb396 100644 --- a/controllers/sites.js +++ b/controllers/sites.js @@ -11,5 +11,11 @@ module.exports = { res.render('site', { title: site.site, site: site }); } }); + }, + getAll: function(req, res){ + Site.getAll(function(err, sites){ + if(err) throw err; + res.render('index', { title: "Home", sites: sites }); + }); } } diff --git a/model/Site.js b/model/Site.js index 32f67c6..2d00b2f 100644 --- a/model/Site.js +++ b/model/Site.js @@ -30,4 +30,15 @@ Site.findById = function(id, callback){ }); }; +// get a listing of all sites +Site.getAll = function(callback){ + var sql = "SELECT * FROM sites"; + + con.query(sql, function(err, result){ + if (err) return callback(err); + console.log("Site.getAll retrieved: " + result.length + "records."); + callback(err, result); + }); +} + module.exports = Site; diff --git a/routes/index.js b/routes/index.js index 2831016..5314356 100644 --- a/routes/index.js +++ b/routes/index.js @@ -1,9 +1,13 @@ var express = require('express'); var router = express.Router(); +var sitesController = require('../controllers/sites') + /* GET home page. */ -router.get('/', function(req, res, next) { - res.render('index', { title: 'UNESCO Tracker - Sean Clarke' }); -}); +// router.get('/', function(req, res, next) { +// res.render('index', { title: 'UNESCO Tracker - Sean Clarke' }); +// }); + +router.get('/', sitesController.getAll); module.exports = router; diff --git a/views/index.pug b/views/index.pug index 6d5a3a2..ee5e0b2 100644 --- a/views/index.pug +++ b/views/index.pug @@ -3,5 +3,8 @@ extends layout block content h1= title p Welcome to #{title} + + each site in sites + h3= site.site include footer.pug diff --git a/views/site.pug b/views/site.pug index 97edebb..64f4747 100644 --- a/views/site.pug +++ b/views/site.pug @@ -2,6 +2,7 @@ extends layout block content h1= site.site + img(src= site.img_url alt= site.site) h3= "Date Inscribed: " + site.date_inscribed h4= "Located: " + site.latitude + " " + site.longitude