upgraded to latest versions of node, express, and angular

Author: mjhea0

.jshintrc

@@ -0,0 +1,46 @@
+
+{
+  "globals": {
+    "esnext": true,
+    "jasmine": false,
+    "spyOn": false,
+    "it": false,
+    "console": false,
+    "describe": false,
+    "expect": false,
+    "before": false,
+    "after": false,
+    "beforeEach": false,
+    "afterEach": false,
+    "waits": false,
+    "waitsFor": false,
+    "runs": false,
+    "$": false,
+    "confirm": false
+  },
+  "esnext": true,
+  "node" : true,
+  "browser" : true,
+  "boss" : false,
+  "curly": false,
+  "debug": false,
+  "devel": false,
+  "eqeqeq": true,
+  "evil": true,
+  "forin": false,
+  "immed": true,
+  "laxbreak": false,
+  "newcap": true,
+  "noarg": true,
+  "noempty": false,
+  "nonew": false,
+  "nomen": false,
+  "onevar": true,
+  "plusplus": false,
+  "regexp": false,
+  "undef": true,
+  "sub": true,
+  "strict": false,
+  "white": true,
+  "unused": false
+}

LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2015 Michael Herman http://www.mherman.org/
+Copyright (c) 2016 Michael Herman http://www.mherman.org/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

app.js

@@ -1,57 +1,59 @@
-var express = require('express');
-var path = require('path');
-var favicon = require('serve-favicon');
-var logger = require('morgan');
-var cookieParser = require('cookie-parser');
-var bodyParser = require('body-parser');
+const express = require('express');
+const path = require('path');
+const favicon = require('serve-favicon');
+const logger = require('morgan');
+const cookieParser = require('cookie-parser');
+const bodyParser = require('body-parser');
 
-var routes = require('./server/routes/index');
+const routes = require('./server/routes/index');
+// var users = require('./routes/users');
 
-var app = express();
+const app = express();
 
 // view engine setup
-app.set('views', path.join(__dirname, 'views'));
-app.set('view engine', 'jade');
+// app.set('views', path.join(__dirname, 'views'));
+// app.set('view engine', 'html');
 
 // uncomment after placing your favicon in /public
-//app.use(favicon(__dirname + '/public/favicon.ico'));
+//app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
 app.use(logger('dev'));
 app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({ extended: false }));
 app.use(cookieParser());
-app.use(express.static(path.join(__dirname, './client', 'public')));
+app.use(express.static(path.join(__dirname, 'client')));
 
 app.use('/', routes);
+// app.use('/users', users);
 
 // catch 404 and forward to error handler
-app.use(function(req, res, next) {
-    var err = new Error('Not Found');
-    err.status = 404;
-    next(err);
+app.use((req, res, next) => {
+  var err = new Error('Not Found');
+  err.status = 404;
+  next(err);
 });
 
 // error handlers
 
 // development error handler
 // will print stacktrace
 if (app.get('env') === 'development') {
-    app.use(function(err, req, res, next) {
-        res.status(err.status || 500);
-        res.render('error', {
-            message: err.message,
-            error: err
-        });
+  app.use((err, req, res, next) => {
+    res.status(err.status || 500);
+    res.json({
+      message: err.message,
+      error: err
     });
+  });
 }
 
 // production error handler
 // no stacktraces leaked to user
-app.use(function(err, req, res, next) {
-    res.status(err.status || 500);
-    res.render('error', {
-        message: err.message,
-        error: {}
-    });
+app.use((err, req, res, next) => {
+  res.status(err.status || 500);
+  res.json({
+    message: err.message,
+    error: {}
+  });
 });
 
 

bin/www

@@ -5,7 +5,7 @@
  */
 
 var app = require('../app');
-var debug = require('debug')('todo-node-postgres:server');
+var debug = require('debug')('node-postgres-todo:server');
 var http = require('http');
 
 /**
@@ -60,7 +60,7 @@ function onError(error) {
 
   var bind = typeof port === 'string'
     ? 'Pipe ' + port
-    : 'Port ' + port
+    : 'Port ' + port;
 
   // handle specific listen errors with friendly messages
   switch (error.code) {

client/javascripts/app.js

@@ -0,0 +1,37 @@
+angular.module('nodeTodo', [])
+.controller('mainController', ($scope, $http) => {
+  $scope.formData = {};
+  $scope.todoData = {};
+  // Get all todos
+  $http.get('/api/v1/todos')
+  .success((data) => {
+    $scope.todoData = data;
+    console.log(data);
+  })
+  .error((error) => {
+    console.log('Error: ' + error);
+  });
+  // Create a new todo
+  $scope.createTodo = () => {
+    $http.post('/api/v1/todos', $scope.formData)
+    .success((data) => {
+      $scope.formData = {};
+      $scope.todoData = data;
+      console.log(data);
+    })
+    .error((error) => {
+      console.log('Error: ' + error);
+    });
+  };
+  // Delete a todo
+  $scope.deleteTodo = (todoID) => {
+    $http.delete('/api/v1/todos/' + todoID)
+    .success((data) => {
+      $scope.todoData = data;
+      console.log(data);
+    })
+    .error((data) => {
+      console.log('Error: ' + data);
+    });
+  };
+});

client/public/javascripts/app.js

@@ -20,4 +20,4 @@ ul {
 
 .header {
   text-align: center;
-}
+}

client/public/stylesheets/style.css renamed to client/stylesheets/style.css

@@ -3,20 +3,16 @@
   <head>
     <title>Todo App - with Node + Express + Angular + PostgreSQL</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <!-- styles -->
-    <link href="http://netdna.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css" rel="stylesheet" media="screen">
-    <link href="stylesheets/style.css" rel="stylesheet" media="screen">
+    <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" media="screen">
+    <link rel="stylesheet" href="/stylesheets/style.css" media="screen">
   </head>
   <body ng-controller="mainController">
-
     <div class="container">
-
       <div class="header">
         <h1>Todo App</h1>
         <hr>
         <h1 class="lead">Node + Express + Angular + PostgreSQL</h1>
       </div>
-
       <div class="todo-form">
         <form>
           <div class="form-group">
@@ -25,21 +21,16 @@ <h1 class="lead">Node + Express + Angular + PostgreSQL</h1>
           <button type="submit" class="btn btn-primary btn-lg btn-block" ng-click="createTodo()">Add Todo</button>
         </form>
       </div>
-
       <br>
-
       <div class="todo-list">
         <ul ng-repeat="todo in todoData">
-          <li><h3><input class="lead" type="checkbox" ng-click="deleteTodo(todo.id)">&nbsp;{{ todo.text }}</li></h3><hr>
+          <li><h3><input class="lead" type="checkbox" ng-click="deleteTodo(todo.id)">&nbsp;{{ todo.text }}</h3></li><hr>
         </ul>
       </div>
-
     </div>
-
-    <!-- scripts -->
-    <script src="http://code.jquery.com/jquery-1.11.2.min.js" type="text/javascript"></script>
-    <script src="http://netdna.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js" type="text/javascript"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.12/angular.min.js"></script>
+    <script src="//code.jquery.com/jquery-2.2.4.min.js" type="text/javascript"></script>
+    <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" type="text/javascript"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.6/angular.min.js"></script>
     <script src="javascripts/app.js"></script>
   </body>
-</html>
+</html>

client/views/index.html

@@ -1,21 +1,18 @@
 {
-  "name": "todo-node-postgres",
+  "name": "node-postgres-todo",
   "version": "0.0.0",
   "private": true,
   "scripts": {
     "start": "supervisor ./bin/www"
   },
   "dependencies": {
-    "body-parser": "~1.10.2",
-    "cookie-parser": "~1.3.3",
-    "debug": "~2.1.1",
-    "express": "~4.11.1",
-    "jade": "~1.9.1",
-    "morgan": "~1.5.1",
-    "pg": "^4.2.0",
-    "serve-favicon": "~2.2.0"
-  },
-  "devDependencies": {
-    "supervisor": "~0.7.1"
+    "body-parser": "~1.15.1",
+    "cookie-parser": "~1.4.3",
+    "debug": "~2.2.0",
+    "express": "~4.13.4",
+    "jade": "~1.11.0",
+    "morgan": "~1.7.0",
+    "pg": "^6.1.0",
+    "serve-favicon": "~2.3.0"
   }
 }

config.js

@@ -1,8 +1,8 @@
-var pg = require('pg');
-var path = require('path');
-var connectionString = require(path.join(__dirname, '../', '../', 'config'));
+const pg = require('pg');
+const connectionString = process.env.DATABASE_URL || 'postgres://localhost:5432/todo';
 
-var client = new pg.Client(connectionString);
+const client = new pg.Client(connectionString);
 client.connect();
-var query = client.query('CREATE TABLE items(id SERIAL PRIMARY KEY, text VARCHAR(40) not null, complete BOOLEAN)');
-query.on('end', function() { client.end(); });
+const query = client.query(
+  'CREATE TABLE items(id SERIAL PRIMARY KEY, text VARCHAR(40) not null, complete BOOLEAN)');
+query.on('end', () => { client.end(); });