From 0d45e6fce95bccb90d86846fe33c60d7acb5cd1d Mon Sep 17 00:00:00 2001
From: Teddy Wing
Date: Sat, 27 Apr 2013 19:26:25 -0400
Subject: Update routing system. Add character images endpoint

Now includes an endpoint to get character images using dummy data.
---
 app.js                     |  4 +---
 routes/character-images.js | 28 ++++++++++++++++++++++++++++
 routes/home.js             |  8 ++++++++
 routes/index.js            | 13 ++++++-------
 routes/user.js             |  8 --------
 views/character-images.ejs |  1 +
 views/index.ejs            | 20 --------------------
 7 files changed, 44 insertions(+), 38 deletions(-)
 create mode 100644 routes/character-images.js
 create mode 100644 routes/home.js
 delete mode 100644 routes/user.js
 create mode 100644 views/character-images.ejs

diff --git a/app.js b/app.js
index 877b5ed..2558885 100644
--- a/app.js
+++ b/app.js
@@ -5,7 +5,6 @@
 
 var express = require('express')
   , routes = require('./routes')
-  , user = require('./routes/user')
   , http = require('http')
   , path = require('path');
 
@@ -27,8 +26,7 @@ if ('development' == app.get('env')) {
   app.use(express.errorHandler());
 }
 
-app.get('/', routes.index);
-app.get('/users', user.list);
+routes(app);
 
 http.createServer(app).listen(app.get('port'), function(){
   console.log('Express server listening on port ' + app.get('port'));
diff --git a/routes/character-images.js b/routes/character-images.js
new file mode 100644
index 0000000..1927b04
--- /dev/null
+++ b/routes/character-images.js
@@ -0,0 +1,28 @@
+module.exports = function(req, res) {
+	var data = {};
+	
+	data.character_images = [
+		{
+			image: '/images/characters-sample/homer.png',
+			name: 'Homer'
+		},
+		{
+			image: '/images/characters-sample/marge.png',
+			name: 'Marge'
+		},
+		{
+			image: '/images/characters-sample/lisa.png',
+			name: 'Lisa'
+		},
+		{
+			image: '/images/characters-sample/bart.png',
+			name: 'Bart'
+		},
+		{
+			image: '/images/characters-sample/maggie.png',
+			name: 'Maggie'
+		}
+	];
+	
+	res.render('character-images', data);
+};
\ No newline at end of file
diff --git a/routes/home.js b/routes/home.js
new file mode 100644
index 0000000..2c1be44
--- /dev/null
+++ b/routes/home.js
@@ -0,0 +1,8 @@
+
+/*
+ * GET home page.
+ */
+
+module.exports = function(req, res){
+  res.render('index');
+};
\ No newline at end of file
diff --git a/routes/index.js b/routes/index.js
index f296005..7d9dd59 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -1,8 +1,7 @@
-
-/*
- * GET home page.
- */
-
-exports.index = function(req, res){
-  res.render('index', { title: 'Express' });
+module.exports = function(app) {
+	var index = require('./home')
+	  , character_images = require('./character-images');
+	
+	app.get('/', index);
+	app.get('/character-images', character_images);
 };
\ No newline at end of file
diff --git a/routes/user.js b/routes/user.js
deleted file mode 100644
index d5b34aa..0000000
--- a/routes/user.js
+++ /dev/null
@@ -1,8 +0,0 @@
-
-/*
- * GET users listing.
- */
-
-exports.list = function(req, res){
-  res.send("respond with a resource");
-};
\ No newline at end of file
diff --git a/views/character-images.ejs b/views/character-images.ejs
new file mode 100644
index 0000000..fd7c8be
--- /dev/null
+++ b/views/character-images.ejs
@@ -0,0 +1 @@
+<%- JSON.stringify(character_images) %>
\ No newline at end of file
diff --git a/views/index.ejs b/views/index.ejs
index d07a1c0..c903502 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -30,26 +30,6 @@
 					<img class="content" src="/images/characters-sample/homer.png" alt="Homer" />
 					<div class="caption">Homer</div>
 				</div>
-				
-				<div class="item">
-					<img class="content" src="/images/characters-sample/marge.png" alt="Marge" />
-					<div class="caption">Marge</div>
-				</div>
-				
-				<div class="item">
-					<img class="content" src="/images/characters-sample/lisa.png" alt="Lisa" />
-					<div class="caption">Lisa</div>
-				</div>
-				
-				<div class="item">
-					<img class="content" src="/images/characters-sample/bart.png" alt="Bart" />
-					<div class="caption">Bart</div>
-				</div>
-				
-				<div class="item">
-					<img class="content" src="/images/characters-sample/maggie.png" alt="Maggie" />
-					<div class="caption">Maggie</div>
-				</div>
 			</div>
 			
 	        <div class="globalCaption"></div>
-- 
cgit v1.2.3