From 89b926044381e5576a29f5480dd855542e0ff328 Mon Sep 17 00:00:00 2001
From: Chris Sevilleja <chris@scotch.io>
Date: Sat, 7 Dec 2013 21:54:16 -0800
Subject: [PATCH 01/18] working on services

---
 public/core.js    | 20 +++++++++++++++++---
 public/index.html |  2 +-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/public/core.js b/public/core.js
index 8b8889dc0..a19c83d2d 100644
--- a/public/core.js
+++ b/public/core.js
@@ -1,10 +1,24 @@
 var scotchTodo = angular.module('scotchTodo', []);
 
-function mainController($scope, $http) {
+scotchTodo.factory('todoFactory', function($http) {
+	return {
+		get : function() {
+			return $http.get('/api/todos');
+		},
+		create : function() {
+			$http.post('/api/todos', $scope.formData);
+		},
+		delete : function() {
+
+		}
+	}
+});
+
+function mainController($scope, $http, todoFactory) {
 	$scope.formData = {};
 
 	// when landing on the page, get all todos and show them
-	$http.get('/api/todos')
+	todoFactory.get()
 		.success(function(data) {
 			$scope.todos = data;
 		})
@@ -14,7 +28,7 @@ function mainController($scope, $http) {
 
 	// when submitting the add form, send the text to the node API
 	$scope.createTodo = function() {
-		$http.post('/api/todos', $scope.formData)
+		
 			.success(function(data) {
 				$('input').val('');
 				$scope.todos = data;
diff --git a/public/index.html b/public/index.html
index b947c3225..5514859ea 100644
--- a/public/index.html
+++ b/public/index.html
@@ -20,7 +20,7 @@
 
 	<!-- SPELLS -->
 	<script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script><!-- load jquery -->
-	<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.0.8/angular.min.js"></script><!-- load angular -->
+	<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.4/angular.min.js"></script><!-- load angular -->
 	<script src="core.js"></script>
 
 </head>

From 43f111b1193258522d57b3dca35d5474875cf084 Mon Sep 17 00:00:00 2001
From: Chris Sevilleja <chris@scotch.io>
Date: Sun, 8 Dec 2013 21:50:56 -0800
Subject: [PATCH 02/18] working on services

---
 public/core.js                | 52 -----------------------------------
 public/index.html             |  9 ++++--
 public/js/controllers/main.js | 43 +++++++++++++++++++++++++++++
 public/js/core.js             |  1 +
 public/js/services/todos.js   | 17 ++++++++++++
 5 files changed, 67 insertions(+), 55 deletions(-)
 delete mode 100644 public/core.js
 create mode 100644 public/js/controllers/main.js
 create mode 100644 public/js/core.js
 create mode 100644 public/js/services/todos.js

diff --git a/public/core.js b/public/core.js
deleted file mode 100644
index a19c83d2d..000000000
--- a/public/core.js
+++ /dev/null
@@ -1,52 +0,0 @@
-var scotchTodo = angular.module('scotchTodo', []);
-
-scotchTodo.factory('todoFactory', function($http) {
-	return {
-		get : function() {
-			return $http.get('/api/todos');
-		},
-		create : function() {
-			$http.post('/api/todos', $scope.formData);
-		},
-		delete : function() {
-
-		}
-	}
-});
-
-function mainController($scope, $http, todoFactory) {
-	$scope.formData = {};
-
-	// when landing on the page, get all todos and show them
-	todoFactory.get()
-		.success(function(data) {
-			$scope.todos = data;
-		})
-		.error(function(data) {
-			console.log('Error: ' + data);
-		});
-
-	// when submitting the add form, send the text to the node API
-	$scope.createTodo = function() {
-		
-			.success(function(data) {
-				$('input').val('');
-				$scope.todos = data;
-			})
-			.error(function(data) {
-				console.log('Error: ' + data);
-			});
-	};
-
-	// delete a todo after checking it
-	$scope.deleteTodo = function(id) {
-		$http.delete('/api/todos/' + id)
-			.success(function(data) {
-				$scope.todos = data;
-			})
-			.error(function(data) {
-				console.log('Error: ' + data);
-			});
-	};
-
-}
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index 5514859ea..2d7d6d032 100644
--- a/public/index.html
+++ b/public/index.html
@@ -20,11 +20,14 @@
 
 	<!-- SPELLS -->
 	<script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script><!-- load jquery -->
-	<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.4/angular.min.js"></script><!-- load angular -->
-	<script src="core.js"></script>
+	<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.4/angular.min.js"></script><!-- load angular 1.2.4 -->
+
+	<script src="js/controllers/main.js"></script> <!-- load up our controller -->
+	<script src="js/services/todos.js"></script> <!-- load our todo service -->
+	<script src="js/core.js"></script> <!-- load our main application -->
 
 </head>
-<!-- SET THE CONTROLLER AND GET ALL TODOS WITH INITIALIZE FUNCTION -->
+<!-- SET THE CONTROLLER -->
 <body ng-controller="mainController">
 	<div class="container">
 
diff --git a/public/js/controllers/main.js b/public/js/controllers/main.js
new file mode 100644
index 000000000..ccdae788b
--- /dev/null
+++ b/public/js/controllers/main.js
@@ -0,0 +1,43 @@
+angular.module('todoController', [])
+
+	// inject the Todo service factory into our controller
+	.controller('mainController', function($scope, $http, Todos) {
+		$scope.formData = {};
+
+		// GET =====================================================================
+		// when landing on the page, get all todos and show them
+		// use the service to get all the todos
+		Todos.get()
+			.success(function(data) {
+				$scope.todos = data;
+			});
+
+		// CREATE ==================================================================
+		// when submitting the add form, send the text to the node API
+		$scope.createTodo = function() {
+
+			// validate the formData to make sure that something is there
+			// if form is empty, nothing will happen
+			if (!$.isEmptyObject($scope.formData)) {
+
+				// call the create function from our service (returns a promise object)
+				Todos.create($scope.formData)
+
+					// if successful creation, call our get function to get all the new todos
+					.success(function(data) {
+						$scope.formData = {}; // clear the form so our user is ready to enter another
+						$scope.todos = data; // assign our new list of todos
+					});
+			}
+		};
+
+		// DELETE ==================================================================
+		// delete a todo after checking it
+		$scope.deleteTodo = function(id) {
+			Todos.delete(id)
+				// if successful creation, call our get function to get all the new todos
+				.success(function(data) {
+					$scope.todos = data; // assign our new list of todos
+				});
+		};
+	});
\ No newline at end of file
diff --git a/public/js/core.js b/public/js/core.js
new file mode 100644
index 000000000..28dbeed2f
--- /dev/null
+++ b/public/js/core.js
@@ -0,0 +1 @@
+angular.module('scotchTodo', ['todoController', 'todoService']);
diff --git a/public/js/services/todos.js b/public/js/services/todos.js
new file mode 100644
index 000000000..ddf2784c9
--- /dev/null
+++ b/public/js/services/todos.js
@@ -0,0 +1,17 @@
+angular.module('todoService', [])
+
+	// super simple service
+	// each function returns a promise object 
+	.factory('Todos', function($http) {
+		return {
+			get : function() {
+				return $http.get('/api/todos');
+			},
+			create : function(todoData) {
+				return $http.post('/api/todos', todoData);
+			},
+			delete : function(id) {
+				return $http.delete('/api/todos/' + id);
+			}
+		}
+	});
\ No newline at end of file

From 621d73c3997564be635dbb9dbce00603411508b5 Mon Sep 17 00:00:00 2001
From: Chris Sevilleja <chris@scotch.io>
Date: Thu, 17 Apr 2014 10:32:55 -0700
Subject: [PATCH 03/18] Update index.html

---
 public/index.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/index.html b/public/index.html
index 2d7d6d032..78b1ba920 100644
--- a/public/index.html
+++ b/public/index.html
@@ -19,7 +19,6 @@
 	</style>
 
 	<!-- SPELLS -->
-	<script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script><!-- load jquery -->
 	<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.4/angular.min.js"></script><!-- load angular 1.2.4 -->
 
 	<script src="js/controllers/main.js"></script> <!-- load up our controller -->
@@ -74,4 +73,4 @@ <h1>I'm a Todo-aholic <span class="label label-info">{{ todos.length }}</span></
 	</div>
 
 </body>
-</html>
\ No newline at end of file
+</html>

From 049788cb9a6a3cc58289be7b4fb949dc16a1c194 Mon Sep 17 00:00:00 2001
From: Chris Sevilleja <chris@scotch.io>
Date: Thu, 17 Apr 2014 10:39:17 -0700
Subject: [PATCH 04/18] fixing things

---
 public/js/controllers/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/controllers/main.js b/public/js/controllers/main.js
index ccdae788b..13e4f9250 100644
--- a/public/js/controllers/main.js
+++ b/public/js/controllers/main.js
@@ -18,7 +18,7 @@ angular.module('todoController', [])
 
 			// validate the formData to make sure that something is there
 			// if form is empty, nothing will happen
-			if (!$.isEmptyObject($scope.formData)) {
+			if ($scope.formData.text != undefined) {
 
 				// call the create function from our service (returns a promise object)
 				Todos.create($scope.formData)

From c53b479cbc9cc6d705ed5d4c8c9809f23420135d Mon Sep 17 00:00:00 2001
From: Chris Sevilleja <chris@scotch.io>
Date: Fri, 18 Apr 2014 07:42:46 -0700
Subject: [PATCH 05/18] adding loading

---
 public/index.html             | 7 +++++++
 public/js/controllers/main.js | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/public/index.html b/public/index.html
index 9148fc5b9..3bb866403 100644
--- a/public/index.html
+++ b/public/index.html
@@ -11,6 +11,7 @@
 
 	<!-- SCROLLS -->
 	<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css"><!-- load bootstrap -->
+	<link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css">
 	<style>
 		html 					{ overflow-y:scroll; }
 		body 					{ padding-top:50px; }
@@ -39,6 +40,8 @@ <h1>I'm a Todo-aholic <span class="label label-info">{{ todos.length }}</span></
 		<div id="todo-list" class="row">
 			<div class="col-sm-4 col-sm-offset-4">
 
+				
+
 				<!-- LOOP OVER THE TODOS IN $scope.todos -->
 				<div class="checkbox" ng-repeat="todo in todos">
 					<label>
@@ -46,6 +49,10 @@ <h1>I'm a Todo-aholic <span class="label label-info">{{ todos.length }}</span></
 					</label>
 				</div>
 
+				<p class="text-center" ng-show="loading">
+					<span class="fa fa-spinner fa-spin fa-3x"></span>
+				</p>
+
 			</div>
 		</div>
 
diff --git a/public/js/controllers/main.js b/public/js/controllers/main.js
index 13e4f9250..754eb05b6 100644
--- a/public/js/controllers/main.js
+++ b/public/js/controllers/main.js
@@ -3,6 +3,7 @@ angular.module('todoController', [])
 	// inject the Todo service factory into our controller
 	.controller('mainController', function($scope, $http, Todos) {
 		$scope.formData = {};
+		$scope.loading = true;
 
 		// GET =====================================================================
 		// when landing on the page, get all todos and show them
@@ -10,11 +11,13 @@ angular.module('todoController', [])
 		Todos.get()
 			.success(function(data) {
 				$scope.todos = data;
+				$scope.loading = false;
 			});
 
 		// CREATE ==================================================================
 		// when submitting the add form, send the text to the node API
 		$scope.createTodo = function() {
+			$scope.loading = true;
 
 			// validate the formData to make sure that something is there
 			// if form is empty, nothing will happen
@@ -25,6 +28,7 @@ angular.module('todoController', [])
 
 					// if successful creation, call our get function to get all the new todos
 					.success(function(data) {
+						$scope.loading = false;
 						$scope.formData = {}; // clear the form so our user is ready to enter another
 						$scope.todos = data; // assign our new list of todos
 					});
@@ -34,9 +38,12 @@ angular.module('todoController', [])
 		// DELETE ==================================================================
 		// delete a todo after checking it
 		$scope.deleteTodo = function(id) {
+			$scope.loading = true;
+
 			Todos.delete(id)
 				// if successful creation, call our get function to get all the new todos
 				.success(function(data) {
+					$scope.loading = false;
 					$scope.todos = data; // assign our new list of todos
 				});
 		};

From 81e5eed669d9db31715a33811d21bc928485397e Mon Sep 17 00:00:00 2001
From: Caio Mariano <caio.mariano@unicesumar.edu.br>
Date: Tue, 15 Jul 2014 15:28:49 -0300
Subject: [PATCH 06/18] updating to express4, morgan console logger, mongoose
 3.8,body-parser and method-override

---
 package.json |  7 +++++--
 server.js    | 16 ++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 0f84bec6d..4284578e2 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,10 @@
   "main"         : "server.js",
   "author"       : "Scotch",
   "dependencies" : {
-    "express"    : "~3.4.4",
-    "mongoose"   : "~3.6.2"
+    "express"         : "~4.6.1",
+    "mongoose"        : "~3.8.13",
+    "morgan"          : "~1.1.1",
+    "body-parser"     : "~1.4.3",
+    "method-override" : "~2.1.1"
   }
 }
diff --git a/server.js b/server.js
index 9f8736fac..40000f1db 100644
--- a/server.js
+++ b/server.js
@@ -4,16 +4,20 @@ var app      = express(); 								// create our app w/ express
 var mongoose = require('mongoose'); 					// mongoose for mongodb
 var port  	 = process.env.PORT || 8080; 				// set the port
 var database = require('./config/database'); 			// load the database config
+var morgan   = require('morgan');
+var bodyParser = require('body-parser');
+var methodOverride = require('method-override');
 
 // configuration ===============================================================
 mongoose.connect(database.url); 	// connect to mongoDB database on modulus.io
 
-app.configure(function() {
-	app.use(express.static(__dirname + '/public')); 		// set the static files location /public/img will be /img for users
-	app.use(express.logger('dev')); 						// log every request to the console
-	app.use(express.bodyParser()); 							// pull information from html in POST
-	app.use(express.methodOverride()); 						// simulate DELETE and PUT
-});
+app.use(express.static(__dirname + '/public')); 		// set the static files location /public/img will be /img for users
+app.use(morgan()); // log every request to the console
+app.use(bodyParser.urlencoded({'extended':'true'})); // parse application/x-www-form-urlencoded
+app.use(bodyParser.json()); // parse application/json
+app.use(bodyParser.json({ type: 'application/vnd.api+json' })); // parse application/vnd.api+json as json
+app.use(methodOverride('X-HTTP-Method-Override')); // override with the X-HTTP-Method-Override header in the request
+
 
 // routes ======================================================================
 require('./app/routes.js')(app);

From 0eb2ae4295bae6b9ad5c533e2532a1e3ab88b831 Mon Sep 17 00:00:00 2001
From: Caio Mariano <caio.mariano@unicesumar.edu.br>
Date: Wed, 16 Jul 2014 08:42:36 -0300
Subject: [PATCH 07/18] we dont need the filed done on model and added default
 settings to text on model

---
 app/models/todo.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/models/todo.js b/app/models/todo.js
index fc480331d..082a2ee37 100644
--- a/app/models/todo.js
+++ b/app/models/todo.js
@@ -1,6 +1,5 @@
 var mongoose = require('mongoose');
 
 module.exports = mongoose.model('Todo', {
-	text : String,
-	done : Boolean
+	text : {type : String, default: ''}
 });
\ No newline at end of file

From 401fa995bb4238cbd71843830f70d5b8ef1dbf8e Mon Sep 17 00:00:00 2001
From: Caio Mariano <caio.mariano@unicesumar.edu.br>
Date: Wed, 16 Jul 2014 08:55:52 -0300
Subject: [PATCH 08/18] on minified js, we need to put an array with all
 atributes on controller and model

---
 public/js/controllers/main.js | 4 ++--
 public/js/services/todos.js   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/js/controllers/main.js b/public/js/controllers/main.js
index 754eb05b6..a399e2a96 100644
--- a/public/js/controllers/main.js
+++ b/public/js/controllers/main.js
@@ -1,7 +1,7 @@
 angular.module('todoController', [])
 
 	// inject the Todo service factory into our controller
-	.controller('mainController', function($scope, $http, Todos) {
+	.controller('mainController', ['$scope','$http','Todos', function($scope, $http, Todos) {
 		$scope.formData = {};
 		$scope.loading = true;
 
@@ -47,4 +47,4 @@ angular.module('todoController', [])
 					$scope.todos = data; // assign our new list of todos
 				});
 		};
-	});
\ No newline at end of file
+	}]);
\ No newline at end of file
diff --git a/public/js/services/todos.js b/public/js/services/todos.js
index ddf2784c9..49761e727 100644
--- a/public/js/services/todos.js
+++ b/public/js/services/todos.js
@@ -2,7 +2,7 @@ angular.module('todoService', [])
 
 	// super simple service
 	// each function returns a promise object 
-	.factory('Todos', function($http) {
+	.factory('Todos', ['$http',function($http) {
 		return {
 			get : function() {
 				return $http.get('/api/todos');
@@ -14,4 +14,4 @@ angular.module('todoService', [])
 				return $http.delete('/api/todos/' + id);
 			}
 		}
-	});
\ No newline at end of file
+	}]);
\ No newline at end of file

From 7051feb0255734eea73beb2e87931659d6364b09 Mon Sep 17 00:00:00 2001
From: Chris Sevilleja <chris@scotch.io>
Date: Fri, 18 Jul 2014 09:36:17 -0700
Subject: [PATCH 09/18] setting morgan for dev

---
 server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server.js b/server.js
index 40000f1db..2bb0a9bc1 100644
--- a/server.js
+++ b/server.js
@@ -12,7 +12,7 @@ var methodOverride = require('method-override');
 mongoose.connect(database.url); 	// connect to mongoDB database on modulus.io
 
 app.use(express.static(__dirname + '/public')); 		// set the static files location /public/img will be /img for users
-app.use(morgan()); // log every request to the console
+app.use(morgan('dev')); // log every request to the console
 app.use(bodyParser.urlencoded({'extended':'true'})); // parse application/x-www-form-urlencoded
 app.use(bodyParser.json()); // parse application/json
 app.use(bodyParser.json({ type: 'application/vnd.api+json' })); // parse application/vnd.api+json as json

From 007f9f9a0b81409b124cfd0d172aa22e919778db Mon Sep 17 00:00:00 2001
From: Chris Sevilleja <chris@scotch.io>
Date: Mon, 4 Aug 2014 16:35:28 -0700
Subject: [PATCH 10/18] Create license

---
 license | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 license

diff --git a/license b/license
new file mode 100644
index 000000000..766a0a595
--- /dev/null
+++ b/license
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) {{{year}}} {{{fullname}}}
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

From b71ea37b4a2c0482539f24cd8eedb92646c2b975 Mon Sep 17 00:00:00 2001
From: Xuefeng-Zhu <xzhu15@illinois.edu>
Date: Mon, 11 Aug 2014 18:07:59 -0400
Subject: [PATCH 11/18] replace_repeated_code

---
 app/routes.js | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/app/routes.js b/app/routes.js
index a06bd30f6..17a201567 100644
--- a/app/routes.js
+++ b/app/routes.js
@@ -1,13 +1,7 @@
 var Todo = require('./models/todo');
 
-module.exports = function(app) {
-
-	// api ---------------------------------------------------------------------
-	// get all todos
-	app.get('/api/todos', function(req, res) {
-
-		// use mongoose to get all todos in the database
-		Todo.find(function(err, todos) {
+function getTodos(res){
+	Todo.find(function(err, todos) {
 
 			// if there is an error retrieving, send the error. nothing after res.send(err) will execute
 			if (err)
@@ -15,6 +9,16 @@ module.exports = function(app) {
 
 			res.json(todos); // return all todos in JSON format
 		});
+};
+
+module.exports = function(app) {
+
+	// api ---------------------------------------------------------------------
+	// get all todos
+	app.get('/api/todos', function(req, res) {
+
+		// use mongoose to get all todos in the database
+		getTodos(res);
 	});
 
 	// create todo and send back all todos after creation
@@ -29,11 +33,7 @@ module.exports = function(app) {
 				res.send(err);
 
 			// get and return all the todos after you create another
-			Todo.find(function(err, todos) {
-				if (err)
-					res.send(err)
-				res.json(todos);
-			});
+			getTodos(res);
 		});
 
 	});
@@ -46,12 +46,7 @@ module.exports = function(app) {
 			if (err)
 				res.send(err);
 
-			// get and return all the todos after you create another
-			Todo.find(function(err, todos) {
-				if (err)
-					res.send(err)
-				res.json(todos);
-			});
+			getTodos(res);
 		});
 	});
 

From a292d8f17b42e2829f00a6ea4f5809566a525689 Mon Sep 17 00:00:00 2001
From: Xuefeng-Zhu <xzhu15@illinois.edu>
Date: Mon, 11 Aug 2014 18:18:47 -0400
Subject: [PATCH 12/18] fix_empty_entry_issue

---
 public/js/controllers/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/controllers/main.js b/public/js/controllers/main.js
index a399e2a96..7cb2ce277 100644
--- a/public/js/controllers/main.js
+++ b/public/js/controllers/main.js
@@ -17,11 +17,11 @@ angular.module('todoController', [])
 		// CREATE ==================================================================
 		// when submitting the add form, send the text to the node API
 		$scope.createTodo = function() {
-			$scope.loading = true;
 
 			// validate the formData to make sure that something is there
 			// if form is empty, nothing will happen
 			if ($scope.formData.text != undefined) {
+				$scope.loading = true;
 
 				// call the create function from our service (returns a promise object)
 				Todos.create($scope.formData)

From 90b7698d9f38fc2b9d5d1ea93af1faa7a34b073b Mon Sep 17 00:00:00 2001
From: Chris Sevilleja <chris@scotch.io>
Date: Tue, 14 Oct 2014 12:05:07 -0700
Subject: [PATCH 13/18] Update database.js

---
 config/database.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/database.js b/config/database.js
index ed8735ffa..cd3586632 100644
--- a/config/database.js
+++ b/config/database.js
@@ -1,5 +1,5 @@
 module.exports = {
 
 	// the database url to connect
-	url : 'mongodb://node:node@mongo.onmodulus.net:27017/uwO3mypu'
-}
\ No newline at end of file
+	url : 'mongodb://node:nodeuser@mongo.onmodulus.net:27017/uwO3mypu'
+}

From 536a58a734d8cab484245e92f5dc3325aae85d17 Mon Sep 17 00:00:00 2001
From: Jason Rice <jsnrice@gmail.com>
Date: Sat, 6 Feb 2016 21:10:17 -0500
Subject: [PATCH 14/18] Setup local Mongo instance config and remote config.
 Updated dependencies.

---
 app/models/todo.js |   5 ++-
 app/routes.js      | 109 +++++++++++++++++++++++----------------------
 config/database.js |   7 ++-
 package.json       |   7 +--
 server.js          |  16 +++----
 5 files changed, 74 insertions(+), 70 deletions(-)

diff --git a/app/models/todo.js b/app/models/todo.js
index 082a2ee37..770f42a6f 100644
--- a/app/models/todo.js
+++ b/app/models/todo.js
@@ -1,5 +1,8 @@
 var mongoose = require('mongoose');
 
 module.exports = mongoose.model('Todo', {
-	text : {type : String, default: ''}
+    text: {
+        type: String,
+        default: ''
+    }
 });
\ No newline at end of file
diff --git a/app/routes.js b/app/routes.js
index 17a201567..ac14eb29c 100644
--- a/app/routes.js
+++ b/app/routes.js
@@ -1,57 +1,58 @@
 var Todo = require('./models/todo');
 
-function getTodos(res){
-	Todo.find(function(err, todos) {
-
-			// if there is an error retrieving, send the error. nothing after res.send(err) will execute
-			if (err)
-				res.send(err)
-
-			res.json(todos); // return all todos in JSON format
-		});
-};
-
-module.exports = function(app) {
-
-	// api ---------------------------------------------------------------------
-	// get all todos
-	app.get('/api/todos', function(req, res) {
-
-		// use mongoose to get all todos in the database
-		getTodos(res);
-	});
-
-	// create todo and send back all todos after creation
-	app.post('/api/todos', function(req, res) {
-
-		// create a todo, information comes from AJAX request from Angular
-		Todo.create({
-			text : req.body.text,
-			done : false
-		}, function(err, todo) {
-			if (err)
-				res.send(err);
-
-			// get and return all the todos after you create another
-			getTodos(res);
-		});
-
-	});
-
-	// delete a todo
-	app.delete('/api/todos/:todo_id', function(req, res) {
-		Todo.remove({
-			_id : req.params.todo_id
-		}, function(err, todo) {
-			if (err)
-				res.send(err);
-
-			getTodos(res);
-		});
-	});
-
-	// application -------------------------------------------------------------
-	app.get('*', function(req, res) {
-		res.sendfile('./public/index.html'); // load the single view file (angular will handle the page changes on the front-end)
-	});
+function getTodos(res) {
+    Todo.find(function (err, todos) {
+
+        // if there is an error retrieving, send the error. nothing after res.send(err) will execute
+        if (err) {
+            res.send(err);
+        }
+
+        res.json(todos); // return all todos in JSON format
+    });
+}
+;
+
+module.exports = function (app) {
+
+    // api ---------------------------------------------------------------------
+    // get all todos
+    app.get('/api/todos', function (req, res) {
+        // use mongoose to get all todos in the database
+        getTodos(res);
+    });
+
+    // create todo and send back all todos after creation
+    app.post('/api/todos', function (req, res) {
+
+        // create a todo, information comes from AJAX request from Angular
+        Todo.create({
+            text: req.body.text,
+            done: false
+        }, function (err, todo) {
+            if (err)
+                res.send(err);
+
+            // get and return all the todos after you create another
+            getTodos(res);
+        });
+
+    });
+
+    // delete a todo
+    app.delete('/api/todos/:todo_id', function (req, res) {
+        Todo.remove({
+            _id: req.params.todo_id
+        }, function (err, todo) {
+            if (err)
+                res.send(err);
+
+            getTodos(res);
+        });
+    });
+
+    // application -------------------------------------------------------------
+    app.get('*', function (req, res) {
+        res.sendFile(__dirname + '/public/index.html'); // load the single view file (angular will handle the page changes on the front-end)
+    });
 };
\ No newline at end of file
diff --git a/config/database.js b/config/database.js
index cd3586632..1f4cfc593 100644
--- a/config/database.js
+++ b/config/database.js
@@ -1,5 +1,4 @@
 module.exports = {
-
-	// the database url to connect
-	url : 'mongodb://node:nodeuser@mongo.onmodulus.net:27017/uwO3mypu'
-}
+    remoteUrl : 'mongodb://node:nodeuser@mongo.onmodulus.net:27017/uwO3mypu',
+    localUrl: 'mongodb://localhost/meanstacktutorials'
+};
diff --git a/package.json b/package.json
index 4284578e2..b63157c30 100644
--- a/package.json
+++ b/package.json
@@ -1,14 +1,15 @@
 {
   "name"         : "node-todo",
-  "version"      : "0.0.0",
+  "version"      : "0.0.1",
   "description"  : "Simple todo application.",
   "main"         : "server.js",
   "author"       : "Scotch",
   "dependencies" : {
-    "express"         : "~4.6.1",
+    "express"         : "~4.13.4",
     "mongoose"        : "~3.8.13",
     "morgan"          : "~1.1.1",
     "body-parser"     : "~1.4.3",
-    "method-override" : "~2.1.1"
+    "method-override" : "~2.1.1",
+    "electrolyte"     : "~0.2.0"    
   }
 }
diff --git a/server.js b/server.js
index 2bb0a9bc1..737872bae 100644
--- a/server.js
+++ b/server.js
@@ -1,21 +1,21 @@
 // set up ======================================================================
-var express  = require('express');
-var app      = express(); 								// create our app w/ express
-var mongoose = require('mongoose'); 					// mongoose for mongodb
-var port  	 = process.env.PORT || 8080; 				// set the port
+var express = require('express');
+var app = express(); 						// create our app w/ express
+var mongoose = require('mongoose'); 				// mongoose for mongodb
+var port = process.env.PORT || 8080; 				// set the port
 var database = require('./config/database'); 			// load the database config
-var morgan   = require('morgan');
+var morgan = require('morgan');
 var bodyParser = require('body-parser');
 var methodOverride = require('method-override');
 
 // configuration ===============================================================
-mongoose.connect(database.url); 	// connect to mongoDB database on modulus.io
+mongoose.connect(database.localUrl); 	// Connect to local MongoDB instance. A remoteUrl is also available (modulus.io)
 
 app.use(express.static(__dirname + '/public')); 		// set the static files location /public/img will be /img for users
 app.use(morgan('dev')); // log every request to the console
-app.use(bodyParser.urlencoded({'extended':'true'})); // parse application/x-www-form-urlencoded
+app.use(bodyParser.urlencoded({'extended': 'true'})); // parse application/x-www-form-urlencoded
 app.use(bodyParser.json()); // parse application/json
-app.use(bodyParser.json({ type: 'application/vnd.api+json' })); // parse application/vnd.api+json as json
+app.use(bodyParser.json({type: 'application/vnd.api+json'})); // parse application/vnd.api+json as json
 app.use(methodOverride('X-HTTP-Method-Override')); // override with the X-HTTP-Method-Override header in the request
 
 

From c56600e196f726bf7f7c10912249875c59de7e2a Mon Sep 17 00:00:00 2001
From: Jason Rice <jsnrice@gmail.com>
Date: Mon, 8 Feb 2016 15:11:16 -0500
Subject: [PATCH 15/18] Update package.json

Remove electrolyte.
---
 package.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package.json b/package.json
index b63157c30..244d84c08 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,6 @@
     "mongoose"        : "~3.8.13",
     "morgan"          : "~1.1.1",
     "body-parser"     : "~1.4.3",
-    "method-override" : "~2.1.1",
-    "electrolyte"     : "~0.2.0"    
+    "method-override" : "~2.1.1"
   }
 }

From 4a355cefb6b60d1af0a850fc238087962709513f Mon Sep 17 00:00:00 2001
From: Chris Sevilleja <chris@scotch.io>
Date: Tue, 12 Apr 2016 22:19:30 -0700
Subject: [PATCH 16/18] updating dependencies. close #18

---
 README.md    |  9 ++++-----
 package.json | 22 +++++++++++-----------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 301c768ba..5a83fc441 100644
--- a/README.md
+++ b/README.md
@@ -7,11 +7,13 @@ Node provides the RESTful API. Angular provides the frontend and accesses the AP
 ## Requirements
 
 - [Node and npm](http://nodejs.org)
+- MongoDB: Make sure you have your own local or remote MongoDB database URI configured in `config/database.js`
 
 ## Installation
 
 1. Clone the repository: `git clone git@github.com:scotch-io/node-todo`
 2. Install the application: `npm install`
+3. Place your own MongoDB URI in `config/database.js`
 3. Start the server: `node server.js`
 4. View in browser at `http://localhost:8080`
 
@@ -21,11 +23,8 @@ This repo corresponds to the Node Todo Tutorial Series on [scotch.io](http://sco
 
 Each branch represents a certain tutorial.
 - tut1-starter: [Creating a Single Page Todo App with Node and Angular](http://scotch.io/tutorials/javascript/creating-a-single-page-todo-app-with-node-and-angular)
-- tut2-services: Coming Soon
-- tut3-auth: Coming Soon
-- tut4-sockets: Coming Soon
-- tut5-redis: Coming Soon
-- tut6-organization: Coming Soon
+- tut2-organization: [Application Organization and Structure](https://scotch.io/tutorials/node-and-angular-to-do-app-application-organization-and-structure)
+- tut3-services: [Controllers and Services](https://scotch.io/tutorials/node-and-angular-to-do-app-controllers-and-services)
 
 Happy Todo-ing!
 
diff --git a/package.json b/package.json
index 244d84c08..b4584b750 100644
--- a/package.json
+++ b/package.json
@@ -1,14 +1,14 @@
 {
-  "name"         : "node-todo",
-  "version"      : "0.0.1",
-  "description"  : "Simple todo application.",
-  "main"         : "server.js",
-  "author"       : "Scotch",
-  "dependencies" : {
-    "express"         : "~4.13.4",
-    "mongoose"        : "~3.8.13",
-    "morgan"          : "~1.1.1",
-    "body-parser"     : "~1.4.3",
-    "method-override" : "~2.1.1"
+  "name": "node-todo",
+  "version": "0.0.1",
+  "description": "Simple todo application.",
+  "main": "server.js",
+  "author": "Scotch",
+  "dependencies": {
+    "body-parser": "^1.4.3",
+    "express": "^4.13.4",
+    "method-override": "^2.1.3",
+    "mongoose": "^4.4.12",
+    "morgan": "^1.1.1"
   }
 }

From 88c7975d507fea9f01ea517de6ab093dc36376b9 Mon Sep 17 00:00:00 2001
From: Chris Sevilleja <chris@scotch.io>
Date: Thu, 21 Jul 2016 10:32:26 -0700
Subject: [PATCH 17/18] Update server.js

---
 server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server.js b/server.js
index 737872bae..ba5e71a5d 100644
--- a/server.js
+++ b/server.js
@@ -11,7 +11,7 @@ var methodOverride = require('method-override');
 // configuration ===============================================================
 mongoose.connect(database.localUrl); 	// Connect to local MongoDB instance. A remoteUrl is also available (modulus.io)
 
-app.use(express.static(__dirname + '/public')); 		// set the static files location /public/img will be /img for users
+app.use(express.static('./public')); 		// set the static files location /public/img will be /img for users
 app.use(morgan('dev')); // log every request to the console
 app.use(bodyParser.urlencoded({'extended': 'true'})); // parse application/x-www-form-urlencoded
 app.use(bodyParser.json()); // parse application/json

From b518e83a9d3b08ea506479a7427f14423caea1b5 Mon Sep 17 00:00:00 2001
From: Nitin Tulswani <tulswani19@gmail.com>
Date: Mon, 19 Sep 2016 16:44:59 +0530
Subject: [PATCH 18/18] little typo

---
 app/routes.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/routes.js b/app/routes.js
index ac14eb29c..b78dbe4fa 100644
--- a/app/routes.js
+++ b/app/routes.js
@@ -10,8 +10,7 @@ function getTodos(res) {
 
         res.json(todos); // return all todos in JSON format
     });
-}
-;
+};
 
 module.exports = function (app) {
 
@@ -55,4 +54,4 @@ module.exports = function (app) {
     app.get('*', function (req, res) {
         res.sendFile(__dirname + '/public/index.html'); // load the single view file (angular will handle the page changes on the front-end)
     });
-};
\ No newline at end of file
+};