From fe79da8e8f58500e5f59e47287c52bd184801733 Mon Sep 17 00:00:00 2001
From: Krishna Halaharvi <halaharvi.krishna@gmail.com>
Date: Sun, 10 Apr 2016 14:55:54 -0400
Subject: [PATCH] Issue #18 adding Express.Router (#20)

* Issue #18 adding Express.Router

* Updating failed pull with eslint recomended changes
---
 src/server/app.js          | 21 +++++++++------------
 src/server/routes/call.js  | 23 +++++++++++++++++++++++
 src/server/routes/index.js | 15 +++++++++++++++
 3 files changed, 47 insertions(+), 12 deletions(-)
 create mode 100644 src/server/routes/call.js
 create mode 100644 src/server/routes/index.js

diff --git a/src/server/app.js b/src/server/app.js
index f291c78..fc9470b 100644
--- a/src/server/app.js
+++ b/src/server/app.js
@@ -4,7 +4,10 @@ const express = require('express');
 const handleSocket = require('./socket.js');
 const os = require('os');
 const path = require('path');
-const uuid = require('uuid');
+
+// Require in express.Router Middleware.
+const callRouter = require('./routes/call');
+const siteRouter = require('./routes/index');
 
 const app = express();
 const http = require('http').Server(app);
@@ -33,17 +36,11 @@ if (__dirname.indexOf('/dist/') >= 0 || __dirname.indexOf('\\dist\\') >= 0) {
     path.join(__dirname, '../less/fonts')));
 }
 
-app.get('/', (req, res) => res.render('index'));
-app.get('/call/', (req, res) => {
-  let prefix = 'call/';
-  if (req.url.charAt(req.url.length - 1) === '/') prefix = '';
-  res.redirect(prefix + uuid.v4());
-});
-app.get('/call/:callId', (req, res) => {
-  res.render('call', {
-    callId: encodeURIComponent(req.params.callId)
-  });
-});
+// using Express.Router Middleware
+app.use('/call', callRouter);
+app.use('/', siteRouter);
+
+
 
 io.on('connection', socket => handleSocket(socket, io));
 
diff --git a/src/server/routes/call.js b/src/server/routes/call.js
new file mode 100644
index 0000000..cb5b763
--- /dev/null
+++ b/src/server/routes/call.js
@@ -0,0 +1,23 @@
+#!/usr/bin/env node
+'use strict';
+const express = require('express');
+const router = express.Router();
+const uuid = require('uuid');
+
+router.use((req, res, next) => {
+  next();
+});
+
+router.get('/', (req, res) => {
+	let prefix = 'call/';
+	if (req.url.charAt(req.url.length - 1) === '/') prefix = '';
+	res.redirect(prefix + uuid.v4());
+});
+
+router.get('/:callId', (req, res) => {
+  res.render('call', {
+    callId: encodeURIComponent(req.params.callId)
+  });
+});
+
+module.exports = router;
diff --git a/src/server/routes/index.js b/src/server/routes/index.js
new file mode 100644
index 0000000..1dc2b06
--- /dev/null
+++ b/src/server/routes/index.js
@@ -0,0 +1,15 @@
+#!/usr/bin/env node
+'use strict';
+const express = require('express');
+const router = express.Router();
+
+
+router.use((req, res, next) => {
+	next();
+});
+
+router.get('/', (req, res) => {
+	res.render('index');
+});
+
+module.exports = router;