From dac43a3a473923f2f0b0e2e0da55c3db9f9c7562 Mon Sep 17 00:00:00 2001
From: joewaa <joewaa@users.noreply.github.com>
Date: Sat, 10 Jun 2017 23:44:16 +0800
Subject: [PATCH] server.js updated.

---
 server.js | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/server.js b/server.js
index 7b2ee7a..ee2286a 100644
--- a/server.js
+++ b/server.js
@@ -1,15 +1,18 @@
 //  OpenShift sample Node application
 var express = require('express'),
-    fs      = require('fs'),
+    //fs      = require('fs'),
     app     = express(),
-    eps     = require('ejs'),
-    morgan  = require('morgan');
+    //eps     = require('ejs'),
+    //morgan  = require('morgan'),
+    mongoose = require('mongoose'),
+    Task = require('./api/models/todoListModel'),
+    bodyParser = require('body-parser');
     
-Object.assign=require('object-assign')
-
+//Object.assign=require('object-assign')
+/*
 app.engine('html', require('ejs').renderFile);
 app.use(morgan('combined'))
-
+*/
 var port = process.env.PORT || process.env.OPENSHIFT_NODEJS_PORT || 8080,
     ip   = process.env.IP   || process.env.OPENSHIFT_NODEJS_IP || '0.0.0.0',
     mongoURL = process.env.OPENSHIFT_MONGODB_DB_URL || process.env.MONGO_URL,
@@ -34,6 +37,16 @@ if (mongoURL == null && process.env.DATABASE_SERVICE_NAME) {
 
   }
 }
+
+mongoose.Promise = global.Promise;
+mongoose.connect(mongoURL)
+
+app.use(bodyParser.urlencoded({ extended: true}));
+app.use(bodyParser.json());
+
+var routes = require('./api/routes/todoListRoutes');
+routes(app);
+/*
 var db = null,
     dbDetails = new Object();
 
@@ -100,7 +113,7 @@ app.use(function(err, req, res, next){
 initDb(function(err){
   console.log('Error connecting to Mongo. Message:\n'+err);
 });
-
+*/
 app.listen(port, ip);
 console.log('Server running on http://%s:%s', ip, port);