From 2879be0b27bfcd51956c97d9da77a8ada25b6b18 Mon Sep 17 00:00:00 2001
From: MaryChes <chessie4907@gmail.com>
Date: Thu, 8 Sep 2016 16:36:15 -0400
Subject: [PATCH 1/6] reconfigured the create and read .ejs and controller
 files to sync with movie database api

---
 ...ployeeController.js => MovieController.js} | 14 +++---
 config/routes.js                              |  8 ++--
 views/create.ejs                              | 48 +++++++------------
 views/layout.ejs                              |  2 +-
 views/read.ejs                                | 34 +++++++------
 5 files changed, 44 insertions(+), 62 deletions(-)
 rename api/controllers/{EmployeeController.js => MovieController.js} (84%)

diff --git a/api/controllers/EmployeeController.js b/api/controllers/MovieController.js
similarity index 84%
rename from api/controllers/EmployeeController.js
rename to api/controllers/MovieController.js
index 080fe65..c9f00da 100644
--- a/api/controllers/EmployeeController.js
+++ b/api/controllers/MovieController.js
@@ -7,12 +7,12 @@
 
 var Client = require('node-rest-client').Client;
 var client = new Client();
-var endpoint = "http://localhost:1337/employee"
+var endpoint = "http://localhost:1337/movies"
 
 module.exports = {
 
   /**
-   * `EmployeeController.create()`
+   * `MovieController.create()`
    */
   create: function (req, res) {
         
@@ -39,21 +39,21 @@ module.exports = {
 
 
   /**
-   * `EmployeeController.read()`
+   * `MovieController.read()`
    */
   read: function (req, res) {
 
     client.get(endpoint, function (data, response) {
-        return res.view('read', {employees: data});
+        return res.view('read', {movies: data});
     }).on('error', function (err) {
-        return res.view('read', {error: { message: "There was an error getting the employees"}});
+        return res.view('read', {error: { message: "There was an error getting the records"}});
     });
 
   },
 
 
   /**
-   * `EmployeeController.update()`
+   * `MovieController.update()`
    */
   update: function (req, res) {
     return res.json({
@@ -63,7 +63,7 @@ module.exports = {
 
 
   /**
-   * `EmployeeController.delete()`
+   * `MovieController.delete()`
    */
   delete: function (req, res) {
     return res.json({
diff --git a/config/routes.js b/config/routes.js
index 1910d03..b1af5fb 100644
--- a/config/routes.js
+++ b/config/routes.js
@@ -32,10 +32,10 @@ module.exports.routes = {
   *                                                                          *
   ***************************************************************************/
 
-  '/create':'EmployeeController.create',
-  '/'      :'EmployeeController.read',
-  '/update':'EmployeeController.update',
-  '/delete':'EmployeeController.delete'
+  '/create':'MovieController.create',
+  '/'      :'MovieController.read',
+  '/update':'MovieController.update',
+  '/delete':'MovieController.delete'
 
   /***************************************************************************
   *                                                                          *
diff --git a/views/create.ejs b/views/create.ejs
index 9c8491f..c8a5b8f 100644
--- a/views/create.ejs
+++ b/views/create.ejs
@@ -1,69 +1,53 @@
 <ol class="breadcrumb">
     <li><a href="/">Home</a></li>
-    <li class="active">Add Employee</a></li>
+    <li class="active">Add A Movie</a></li>
 </ol>
 
 <br/>
 <%- partial ('partials/statusmessage.ejs') %>
 
-<h2>Add Employee</h2>
+<h2>Add Movie</h2>
 <form action="/create" method="POST" class="form-horizontal">
   <div class="form-group">
-    <label for="firstName" class="col-sm-2 control-label">First Name</label>
+    <label for="title" class="col-sm-2 control-label">Movie Title</label>
     <div class="col-sm-10">
-      <input type="text" class="form-control" id="firstName" name="firstName" placeholder="First Name">
+      <input type="text" class="form-control" id="title" name="title" placeholder="Movie Title">
     </div>
   </div>
   <div class="form-group">
-    <label for="lastName" class="col-sm-2 control-label">First Name</label>
+    <label for="rating" class="col-sm-2 control-label">MPAA Rating</label>
     <div class="col-sm-10">
-      <input type="text" class="form-control" id="lastName" name="lastName"  placeholder="Last Name">
+      <input type="text" class="form-control" id="rating" name="rating"  placeholder="MPAA Rating">
     </div>
   </div>
   <div class="form-group">
-    <label for="email" class="col-sm-2 control-label">Email Address</label>
+    <label for="year" class="col-sm-2 control-label">Release Year</label>
     <div class="col-sm-10">
-      <input type="email" class="form-control" id="email" name="email" placeholder="user@example.com">
+      <input type="text" class="form-control" id="year" name="year" placeholder="Release Year">
     </div>
   </div>
   <div class="form-group">
-    <label for="homePhone" class="col-sm-2 control-label">Home Phone</label>
+    <label for="genre" class="col-sm-2 control-label">Genre</label>
     <div class="col-sm-10">
-      <input type="phone" class="form-control" id="homePhone" name="homePhone" placeholder="###-###-####">
+      <input type="text" class="form-control" id="genre" name="genre" placeholder="Genre">
     </div>
   </div>
   <div class="form-group">
-    <label for="cellPhone" class="col-sm-2 control-label">Cell Phone</label>
+    <label for="director" class="col-sm-2 control-label">Director</label>
     <div class="col-sm-10">
-      <input type="phone" class="form-control" id="cellPhone" name="cellPhone" placeholder="###-###-####">
+      <input type="text" class="form-control" id="director" name="director" placeholder="Director">
     </div>
   </div>
   <div class="form-group">
-    <label for="password" class="col-sm-2 control-label">Password</label>
+    <label for="imbdRating" class="col-sm-2 control-label">IMBD Rating</label>
     <div class="col-sm-10">
-      <input type="text" class="form-control" id="password" name="password" aria-describedby="helpBlock">
-      <span id="helpBlock" class="help-block">Password at least 8 characters, 1 upppercase, 1 lowercase, and one number</span>
+      <input type="text" class="form-control" id="imbdRating" name="imbdRating" aria-describedby="helpBlock">
+      <span id="helpBlock" class="help-block">Score must be entered as a rational number between 0-10. (#.#)</span>
     </div>
   </div>
   <div class="form-group">
     <div class="col-sm-offset-2 col-sm-10">
-      <div class="radio">
-        <label>
-          <input type="radio" name="active" id="active1" value="1" checked>
-          Active
-        </label>
-      </div>
-      <div class="radio">
-        <label>
-          <input type="radio" name="active" id="active2" value="0">
-          Inactive
-        </label>
-      </div>
-    </div>
-  </div>
-  <div class="form-group">
-    <div class="col-sm-offset-2 col-sm-10">
-      <button type="submit" class="btn btn-default">Add Employee</button>
+      <button type="submit" class="btn btn-default">Add Movie</button>
     </div>
   </div>
 </form>
\ No newline at end of file
diff --git a/views/layout.ejs b/views/layout.ejs
index 9a06b59..bac8464 100644
--- a/views/layout.ejs
+++ b/views/layout.ejs
@@ -4,7 +4,7 @@
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <title>Employee Admin</title>
+        <title>Movie IMBD Database</title>
          <!-- Bootstrap core CSS -->
         <link href="css/bootstrap.min.css" rel="stylesheet">
         <style>
diff --git a/views/read.ejs b/views/read.ejs
index e49c182..e2f4eac 100644
--- a/views/read.ejs
+++ b/views/read.ejs
@@ -10,30 +10,28 @@
 <table class="table table-striped table-bordered">
   <tr>
     <th>ID</th>
-    <th>First Name</th>
-    <th>Last Name</th>
-    <th>Email</th>
-    <th>Home Phone</th>
-    <th>Cell Phone</th>
-    <th>Password</th>
-    <th>Active</th>
+    <th>Movie Title</th>
+    <th>MPAA Rating</th>
+    <th>Release Yearl</th>
+    <th>Genre</th>
+    <th>Director</th>
+    <th>IMBD Rating (score/10)</th>
   </tr>
-  <% if(typeof employees != "undefined" && employees.length > 0){ %>
-    <% employees.forEach(function(employee){ %>
+  <% if(typeof movies != "undefined" && movies.length > 0){ %>
+    <% movies.forEach(function(movie){ %>
       <tr>
-        <td><%= employee.id %></td>
-        <td><%= employee.firstName %></td>
-        <td><%= employee.lastName %></td>
-        <td><%= employee.email %></td>
-        <td><%= employee.homePhone %></td>
-        <td><%= employee.cellPhone %></td>
-        <td><%= employee.password %></td>
-        <td><%= employee.active %></td>
+        <td><%= movie.id %></td>
+        <td><%= movie.title %></td>
+        <td><%= movie.rating %></td>
+        <td><%= movie.year %></td>
+        <td><%= movie.genre %></td>
+        <td><%= movie.director %></td>
+        <td><%= movie.imbdRating %></td>
       </tr>
     <% }) %>
   <% }else{ %>
       <tr>
-        <td colspan="8">0 records found</td>
+        <td colspan="7">0 records found</td>
       </tr>
   <% } %>
   

From ac85700fe5bbe29e76a0ab28f652691901b7e107 Mon Sep 17 00:00:00 2001
From: MaryChes <chessie4907@gmail.com>
Date: Fri, 9 Sep 2016 13:05:30 -0400
Subject: [PATCH 2/6] added delete controller and delete.ejs

---
 api/controllers/MovieController.js | 73 ++++++++++++++++++++++++------
 views/create.ejs                   |  2 +-
 views/delete.ejs                   | 23 ++++++++++
 views/partials/navigation.ejs      | 14 +++---
 views/read.ejs                     |  4 +-
 5 files changed, 92 insertions(+), 24 deletions(-)
 create mode 100644 views/delete.ejs

diff --git a/api/controllers/MovieController.js b/api/controllers/MovieController.js
index c9f00da..b9d57cd 100644
--- a/api/controllers/MovieController.js
+++ b/api/controllers/MovieController.js
@@ -14,20 +14,25 @@ module.exports = {
   /**
    * `MovieController.create()`
    */
-  create: function (req, res) {
+  create: function (req, res) 
+  {
         
-        if(req.method != "POST"){
+        if(req.method != "POST")
+        {
           return res.view('create');
         }
 
-        var args = {
+        var args = 
+        {
             data: req.body,
             headers: { "Content-Type": "application/json" }
         };
          
-        client.post(endpoint, args, function (data, response) {
-            // return res.view('create', {success: { message: "Record added successfully"}});
-            if(response.statusCode != "201"){
+        client.post(endpoint, args, function (data, response) 
+        {
+            //return res.view('create', {success: { message: "Record added successfully"}});
+            if(response.statusCode != "201")
+            {
                 return res.view('create', {error:{message: response.statusMessage + ": " + data.reason}});
             }
 
@@ -38,12 +43,18 @@ module.exports = {
   },
 
 
+
+
+
+
   /**
    * `MovieController.read()`
    */
-  read: function (req, res) {
+  read: function (req, res) 
+  {
 
-    client.get(endpoint, function (data, response) {
+    client.get(endpoint, function (data, response) 
+    {
         return res.view('read', {movies: data});
     }).on('error', function (err) {
         return res.view('read', {error: { message: "There was an error getting the records"}});
@@ -52,6 +63,9 @@ module.exports = {
   },
 
 
+
+
+
   /**
    * `MovieController.update()`
    */
@@ -62,13 +76,44 @@ module.exports = {
   },
 
 
+
+
+
+
+
+
+
+
+
   /**
    * `MovieController.delete()`
    */
-  delete: function (req, res) {
-    return res.json({
-      todo: 'delete() is not implemented yet!'
-    });
-  }
-};
+  delete: function (req, res)  {
+
+      var values = req.allParams();
+      var modifiedEndpoint = "http://localhost:1337/movies/" + values.id;
+       //this calls the data you need to delete 
+        if(req.method != "POST"){
+          return res.view('delete');}
+
+         
+
+        var args = {
+            data: req.body,
+            headers: { "Content-Type": "application/json" }
+        };
+         //this actually deletes
+        client.delete(modifiedEndpoint, args, function (data, response) {
+            //return res.view('create', {success: { message: "Record delete successfully"}});
+            if(response.statusCode != "200"){
+                return res.view('delete', {error:{message: response.statusMessage + ": " + data.reason}});
+            }
+
+            return res.view('delete', {success:{message: "Record deleted successfully"}});
+
+        })
+      }
+ 
+  };
+
 
diff --git a/views/create.ejs b/views/create.ejs
index c8a5b8f..27288ae 100644
--- a/views/create.ejs
+++ b/views/create.ejs
@@ -1,5 +1,5 @@
 <ol class="breadcrumb">
-    <li><a href="/">Home</a></li>
+    <li><a href="/">Add a Movie</a></li>
     <li class="active">Add A Movie</a></li>
 </ol>
 
diff --git a/views/delete.ejs b/views/delete.ejs
new file mode 100644
index 0000000..bed43d7
--- /dev/null
+++ b/views/delete.ejs
@@ -0,0 +1,23 @@
+<ol class="breadcrumb">
+    <li><a href="/">Delete A Movie</a></li>
+    <li class="active">Delete A Movie</a></li>
+</ol>
+
+<br/>
+<%- partial ('partials/statusmessage.ejs') %>
+
+
+<h2>Delete Movie</h2>
+<form action="/delete" method="POST" class="form-horizontal">
+  <div class="form-group">
+    <label for="id" class="col-sm-2 control-label">Movie ID</label>
+    <div class="col-sm-10">
+      <input type="text" class="form-control" id="id" name="id" placeholder="Movie ID">
+    </div>
+    </div>
+   <div class="form-group">
+    <div class="col-sm-offset-2 col-sm-10">
+      <button type="submit" class="btn btn-default">Delete Movie</button>
+    </div>
+  </div>
+</form>
\ No newline at end of file
diff --git a/views/partials/navigation.ejs b/views/partials/navigation.ejs
index dd52ad6..0b10b12 100644
--- a/views/partials/navigation.ejs
+++ b/views/partials/navigation.ejs
@@ -7,20 +7,20 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="#"><img alt="The Iron Yard" src="img/tiy_logo.png"/></a>
+            <a class="navbar-brand" href="#"><img alt="Popcorn" src=""/></a>
         </div>
         <div id="navbar" class="navbar-collapse collapse">
             <ul class="nav navbar-nav">
                 <li class="active"><a href="/">Home</a></li>
-                <li><a href="/create">Add Employee</a></li>
-                <li><a href="#">Edit Employee</a></li>
-                <li><a href="#">Delete Employee</a></li>
+                <li><a href="/create">Add Movie</a></li>
+                <li><a href="/update">Edit Movie</a></li>
+                <li><a href="/delete">Delete Movie</a></li>
                 <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>
                 <ul class="dropdown-menu">
-                    <li><a href="/create">Add Employee</a></li>
-                    <li><a href="#">Edit Employee</a></li>
-                    <li><a href="#">Delete Employee</a></li>
+                    <li><a href="/create">Add Movie</a></li>
+                    <li><a href="/update">Edit Movie</a></li>
+                    <li><a href="/delete">Delete Movie</a></li>
                 </ul>
                 </li>
             </ul>
diff --git a/views/read.ejs b/views/read.ejs
index e2f4eac..40fe725 100644
--- a/views/read.ejs
+++ b/views/read.ejs
@@ -6,13 +6,13 @@
 
 <%- partial ('partials/statusmessage.ejs') %>
 
-<h2>Employees</h2>
+<h2>Movie Database</h2>
 <table class="table table-striped table-bordered">
   <tr>
     <th>ID</th>
     <th>Movie Title</th>
     <th>MPAA Rating</th>
-    <th>Release Yearl</th>
+    <th>Release Year</th>
     <th>Genre</th>
     <th>Director</th>
     <th>IMBD Rating (score/10)</th>

From c0be580d65a156ec4ecd5c2a6f1121b1fd1b5799 Mon Sep 17 00:00:00 2001
From: MaryChes <chessie4907@gmail.com>
Date: Fri, 9 Sep 2016 14:04:57 -0400
Subject: [PATCH 3/6] created update method in controller and update.ejs API
 finctionality is complete...not pretty but complete.

---
 api/controllers/MovieController.js | 27 +++++++++++---
 views/update.ejs                   | 59 ++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 6 deletions(-)
 create mode 100644 views/update.ejs

diff --git a/api/controllers/MovieController.js b/api/controllers/MovieController.js
index b9d57cd..3d5d980 100644
--- a/api/controllers/MovieController.js
+++ b/api/controllers/MovieController.js
@@ -70,11 +70,28 @@ module.exports = {
    * `MovieController.update()`
    */
   update: function (req, res) {
-    return res.json({
-      todo: 'update() is not implemented yet!'
-    });
-  },
 
+      var values = req.allParams();
+      var modifiedEndpoint = "http://localhost:1337/movies/" + values.id;
+       //this calls the data you need to update
+        if(req.method != "POST"){
+          return res.view('update');}
+          
+        var args = {
+            data: req.body,
+            headers: { "Content-Type": "application/json" }
+        };
+         //this actually deletes
+        client.put(modifiedEndpoint, args, function (data, response) {
+            //return res.view('create', {success: { message: "Record edited successfully"}});
+            if(response.statusCode != "200"){
+                return res.view('update', {error:{message: response.statusMessage + ": " + data.reason}});
+            }
+
+            return res.view('update', {success:{message: "Record edited successfully"}});
+
+        })
+      },
 
 
 
@@ -96,8 +113,6 @@ module.exports = {
         if(req.method != "POST"){
           return res.view('delete');}
 
-         
-
         var args = {
             data: req.body,
             headers: { "Content-Type": "application/json" }
diff --git a/views/update.ejs b/views/update.ejs
new file mode 100644
index 0000000..446a8e6
--- /dev/null
+++ b/views/update.ejs
@@ -0,0 +1,59 @@
+<ol class="breadcrumb">
+    <li><a href="/">Edit a Movie</a></li>
+    <li class="active">Edit A Movie</a></li>
+</ol>
+
+<br/>
+<%- partial ('partials/statusmessage.ejs') %>
+
+<h2>Edit Movie</h2>
+<form action="/update" method="POST" class="form-horizontal">
+ <div class="form-group">
+    <label for="id" class="col-sm-2 control-label">Movie ID</label>
+    <div class="col-sm-10">
+      <input type="text" class="form-control" id="id" name="id" placeholder="Movie ID">
+    </div>
+  </div>
+  <div class="form-group">
+    <label for="title" class="col-sm-2 control-label">Movie Title</label>
+    <div class="col-sm-10">
+      <input type="text" class="form-control" id="title" name="title" placeholder="Movie Title">
+    </div>
+  </div>
+  <div class="form-group">
+    <label for="rating" class="col-sm-2 control-label">MPAA Rating</label>
+    <div class="col-sm-10">
+      <input type="text" class="form-control" id="rating" name="rating"  placeholder="MPAA Rating">
+    </div>
+  </div>
+  <div class="form-group">
+    <label for="year" class="col-sm-2 control-label">Release Year</label>
+    <div class="col-sm-10">
+      <input type="text" class="form-control" id="year" name="year" placeholder="Release Year">
+    </div>
+  </div>
+  <div class="form-group">
+    <label for="genre" class="col-sm-2 control-label">Genre</label>
+    <div class="col-sm-10">
+      <input type="text" class="form-control" id="genre" name="genre" placeholder="Genre">
+    </div>
+  </div>
+  <div class="form-group">
+    <label for="director" class="col-sm-2 control-label">Director</label>
+    <div class="col-sm-10">
+      <input type="text" class="form-control" id="director" name="director" placeholder="Director">
+    </div>
+  </div>
+  <div class="form-group">
+    <label for="imbdRating" class="col-sm-2 control-label">IMBD Rating</label>
+    <div class="col-sm-10">
+      <input type="text" class="form-control" id="imbdRating" name="imbdRating" aria-describedby="helpBlock">
+      <span id="helpBlock" class="help-block">Score must be entered as a rational number between 0-10. (#.#)</span>
+    </div>
+  </div>
+  <div class="form-group">
+    <div class="col-sm-offset-2 col-sm-10">
+      <button type="submit" class="btn btn-default">Edit Movie</button>
+    </div>
+  </div>
+</form>
\ No newline at end of file

From b029001551465b6af2d7e94d4f1cddbaf1e87f85 Mon Sep 17 00:00:00 2001
From: MaryChes <chessie4907@gmail.com>
Date: Fri, 9 Sep 2016 15:34:14 -0400
Subject: [PATCH 4/6] added read table to update and delete ejs files edited
 the update controller to populate the table in edit ejs before and after an
 edit...again it works great but it is uglygit statusgit status!

---
 api/controllers/MovieController.js | 20 ++++++---
 views/create.ejs                   | 33 ++++++++++++++-
 views/delete.ejs                   | 65 ++++++++++++++++++++++++++++--
 views/update.ejs                   | 31 +++++++++++++-
 4 files changed, 138 insertions(+), 11 deletions(-)

diff --git a/api/controllers/MovieController.js b/api/controllers/MovieController.js
index 3d5d980..2bb6ba4 100644
--- a/api/controllers/MovieController.js
+++ b/api/controllers/MovieController.js
@@ -39,7 +39,6 @@ module.exports = {
             return res.view('create', {success:{message: "Record created successfully"}});
 
         })
- 
   },
 
 
@@ -73,11 +72,17 @@ module.exports = {
 
       var values = req.allParams();
       var modifiedEndpoint = "http://localhost:1337/movies/" + values.id;
+       
        //this calls the data you need to update
         if(req.method != "POST"){
-          return res.view('update');}
-          
-        var args = {
+          client.get(endpoint, function (data, response) {
+            return res.view('update', {movies: data});
+          }).on('error', function (err) {
+            return res.view('update', {error: { message: "There was an error getting the records"}});
+          });
+
+        }else{
+          var args = {
             data: req.body,
             headers: { "Content-Type": "application/json" }
         };
@@ -87,10 +92,13 @@ module.exports = {
             if(response.statusCode != "200"){
                 return res.view('update', {error:{message: response.statusMessage + ": " + data.reason}});
             }
-
-            return res.view('update', {success:{message: "Record edited successfully"}});
+            return res.redirect('back');
+            //return res.view('update', {success:{message: "Record edited successfully"}});
 
         })
+        }
+          
+        
       },
 
 
diff --git a/views/create.ejs b/views/create.ejs
index 27288ae..4ad0907 100644
--- a/views/create.ejs
+++ b/views/create.ejs
@@ -50,4 +50,35 @@
       <button type="submit" class="btn btn-default">Add Movie</button>
     </div>
   </div>
-</form>
\ No newline at end of file
+</form>
+<br>
+<h2>Movie Database</h2>
+<table class="table table-striped table-bordered">
+  <tr>
+    <th>ID</th>
+    <th>Movie Title</th>
+    <th>MPAA Rating</th>
+    <th>Release Year</th>
+    <th>Genre</th>
+    <th>Director</th>
+    <th>IMBD Rating (score/10)</th>
+  </tr>
+  <% if(typeof movies != "undefined" && movies.length > 0){ %>
+    <% movies.forEach(function(movie){ %>
+      <tr>
+        <td><%= movie.id %></td>
+        <td><%= movie.title %></td>
+        <td><%= movie.rating %></td>
+        <td><%= movie.year %></td>
+        <td><%= movie.genre %></td>
+        <td><%= movie.director %></td>
+        <td><%= movie.imbdRating %></td>
+      </tr>
+    <% }) %>
+  <% }else{ %>
+      <tr>
+        <td colspan="7">0 records found</td>
+      </tr>
+  <% } %>
+  
+</table>
\ No newline at end of file
diff --git a/views/delete.ejs b/views/delete.ejs
index bed43d7..fa83627 100644
--- a/views/delete.ejs
+++ b/views/delete.ejs
@@ -5,8 +5,37 @@
 
 <br/>
 <%- partial ('partials/statusmessage.ejs') %>
-
-
+<h2>Movie Database</h2>
+<table class="table table-striped table-bordered">
+  <tr>
+    <th>ID</th>
+    <th>Movie Title</th>
+    <th>MPAA Rating</th>
+    <th>Release Year</th>
+    <th>Genre</th>
+    <th>Director</th>
+    <th>IMBD Rating (score/10)</th>
+  </tr>
+  <% if(typeof movies != "undefined" && movies.length > 0){ %>
+    <% movies.forEach(function(movie){ %>
+      <tr>
+        <td><%= movie.id %></td>
+        <td><%= movie.title %></td>
+        <td><%= movie.rating %></td>
+        <td><%= movie.year %></td>
+        <td><%= movie.genre %></td>
+        <td><%= movie.director %></td>
+        <td><%= movie.imbdRating %></td>
+      </tr>
+    <% }) %>
+  <% }else{ %>
+      <tr>
+        <td colspan="7">0 records found</td>
+      </tr>
+  <% } %>
+  
+</table>
+<br>
 <h2>Delete Movie</h2>
 <form action="/delete" method="POST" class="form-horizontal">
   <div class="form-group">
@@ -20,4 +49,34 @@
       <button type="submit" class="btn btn-default">Delete Movie</button>
     </div>
   </div>
-</form>
\ No newline at end of file
+</form>
+<h2>Movie Database</h2>
+<table class="table table-striped table-bordered">
+  <tr>
+    <th>ID</th>
+    <th>Movie Title</th>
+    <th>MPAA Rating</th>
+    <th>Release Year</th>
+    <th>Genre</th>
+    <th>Director</th>
+    <th>IMBD Rating (score/10)</th>
+  </tr>
+  <% if(typeof movies != "undefined" && movies.length > 0){ %>
+    <% movies.forEach(function(movie){ %>
+      <tr>
+        <td><%= movie.id %></td>
+        <td><%= movie.title %></td>
+        <td><%= movie.rating %></td>
+        <td><%= movie.year %></td>
+        <td><%= movie.genre %></td>
+        <td><%= movie.director %></td>
+        <td><%= movie.imbdRating %></td>
+      </tr>
+    <% }) %>
+  <% }else{ %>
+      <tr>
+        <td colspan="7">0 records found</td>
+      </tr>
+  <% } %>
+  
+</table>
\ No newline at end of file
diff --git a/views/update.ejs b/views/update.ejs
index 446a8e6..74987a2 100644
--- a/views/update.ejs
+++ b/views/update.ejs
@@ -56,4 +56,33 @@
       <button type="submit" class="btn btn-default">Edit Movie</button>
     </div>
   </div>
-</form>
\ No newline at end of file
+</form><h2>Movie Database</h2>
+<table class="table table-striped table-bordered">
+  <tr>
+    <th>ID</th>
+    <th>Movie Title</th>
+    <th>MPAA Rating</th>
+    <th>Release Year</th>
+    <th>Genre</th>
+    <th>Director</th>
+    <th>IMBD Rating (score/10)</th>
+  </tr>
+  <% if(typeof movies != "undefined" && movies.length > 0){ %>
+    <% movies.forEach(function(movie){ %>
+      <tr>
+        <td><%= movie.id %></td>
+        <td><%= movie.title %></td>
+        <td><%= movie.rating %></td>
+        <td><%= movie.year %></td>
+        <td><%= movie.genre %></td>
+        <td><%= movie.director %></td>
+        <td><%= movie.imbdRating %></td>
+      </tr>
+    <% }) %>
+  <% }else{ %>
+      <tr>
+        <td colspan="7">0 records found</td>
+      </tr>
+  <% } %>
+  
+</table>

From 1d372d88911fc9a721824bac53692ee889e791a4 Mon Sep 17 00:00:00 2001
From: MaryChes <chessie4907@gmail.com>
Date: Fri, 9 Sep 2016 15:53:23 -0400
Subject: [PATCH 5/6] updated delete controller and delete ejs to refresh table
 upon deletion

---
 api/controllers/MovieController.js | 23 ++++++++++++++--------
 views/create.ejs                   | 31 ------------------------------
 views/delete.ejs                   | 30 -----------------------------
 3 files changed, 15 insertions(+), 69 deletions(-)

diff --git a/api/controllers/MovieController.js b/api/controllers/MovieController.js
index 2bb6ba4..2bf77e5 100644
--- a/api/controllers/MovieController.js
+++ b/api/controllers/MovieController.js
@@ -35,7 +35,7 @@ module.exports = {
             {
                 return res.view('create', {error:{message: response.statusMessage + ": " + data.reason}});
             }
-
+            
             return res.view('create', {success:{message: "Record created successfully"}});
 
         })
@@ -86,14 +86,14 @@ module.exports = {
             data: req.body,
             headers: { "Content-Type": "application/json" }
         };
-         //this actually deletes
+         //this actually updates
         client.put(modifiedEndpoint, args, function (data, response) {
             //return res.view('create', {success: { message: "Record edited successfully"}});
             if(response.statusCode != "200"){
                 return res.view('update', {error:{message: response.statusMessage + ": " + data.reason}});
             }
             return res.redirect('back');
-            //return res.view('update', {success:{message: "Record edited successfully"}});
+            return res.view('update', {success:{message: "Record edited successfully"}});
 
         })
         }
@@ -115,13 +115,20 @@ module.exports = {
    */
   delete: function (req, res)  {
 
+     
       var values = req.allParams();
       var modifiedEndpoint = "http://localhost:1337/movies/" + values.id;
-       //this calls the data you need to delete 
+       
+       //this calls the data you need to delete and populates the table
         if(req.method != "POST"){
-          return res.view('delete');}
+          client.get(endpoint, function (data, response) {
+            return res.view('delete', {movies: data});
+          }).on('error', function (err) {
+            return res.view('delete', {error: { message: "There was an error getting the records"}});
+          });
 
-        var args = {
+        }else{
+          var args = {
             data: req.body,
             headers: { "Content-Type": "application/json" }
         };
@@ -131,12 +138,12 @@ module.exports = {
             if(response.statusCode != "200"){
                 return res.view('delete', {error:{message: response.statusMessage + ": " + data.reason}});
             }
-
+            return res.redirect('back');
             return res.view('delete', {success:{message: "Record deleted successfully"}});
 
         })
       }
- 
+ }
   };
 
 
diff --git a/views/create.ejs b/views/create.ejs
index 4ad0907..ea21f5e 100644
--- a/views/create.ejs
+++ b/views/create.ejs
@@ -51,34 +51,3 @@
     </div>
   </div>
 </form>
-<br>
-<h2>Movie Database</h2>
-<table class="table table-striped table-bordered">
-  <tr>
-    <th>ID</th>
-    <th>Movie Title</th>
-    <th>MPAA Rating</th>
-    <th>Release Year</th>
-    <th>Genre</th>
-    <th>Director</th>
-    <th>IMBD Rating (score/10)</th>
-  </tr>
-  <% if(typeof movies != "undefined" && movies.length > 0){ %>
-    <% movies.forEach(function(movie){ %>
-      <tr>
-        <td><%= movie.id %></td>
-        <td><%= movie.title %></td>
-        <td><%= movie.rating %></td>
-        <td><%= movie.year %></td>
-        <td><%= movie.genre %></td>
-        <td><%= movie.director %></td>
-        <td><%= movie.imbdRating %></td>
-      </tr>
-    <% }) %>
-  <% }else{ %>
-      <tr>
-        <td colspan="7">0 records found</td>
-      </tr>
-  <% } %>
-  
-</table>
\ No newline at end of file
diff --git a/views/delete.ejs b/views/delete.ejs
index fa83627..0b3de52 100644
--- a/views/delete.ejs
+++ b/views/delete.ejs
@@ -50,33 +50,3 @@
     </div>
   </div>
 </form>
-<h2>Movie Database</h2>
-<table class="table table-striped table-bordered">
-  <tr>
-    <th>ID</th>
-    <th>Movie Title</th>
-    <th>MPAA Rating</th>
-    <th>Release Year</th>
-    <th>Genre</th>
-    <th>Director</th>
-    <th>IMBD Rating (score/10)</th>
-  </tr>
-  <% if(typeof movies != "undefined" && movies.length > 0){ %>
-    <% movies.forEach(function(movie){ %>
-      <tr>
-        <td><%= movie.id %></td>
-        <td><%= movie.title %></td>
-        <td><%= movie.rating %></td>
-        <td><%= movie.year %></td>
-        <td><%= movie.genre %></td>
-        <td><%= movie.director %></td>
-        <td><%= movie.imbdRating %></td>
-      </tr>
-    <% }) %>
-  <% }else{ %>
-      <tr>
-        <td colspan="7">0 records found</td>
-      </tr>
-  <% } %>
-  
-</table>
\ No newline at end of file

From 9d3f72cbc6f75ea0e95e34d24e4ffbb9bc2133ed Mon Sep 17 00:00:00 2001
From: MaryChes <chessie4907@gmail.com>
Date: Fri, 9 Sep 2016 16:30:11 -0400
Subject: [PATCH 6/6] Tried to make it look pretty, it doesn't I'll work more
 later

---
 views/layout.ejs              |  2 +-
 views/partials/navigation.ejs | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/views/layout.ejs b/views/layout.ejs
index bac8464..93f833c 100644
--- a/views/layout.ejs
+++ b/views/layout.ejs
@@ -25,7 +25,7 @@
             }
         </style>
     </head>
-    <body>
+    <body style="background-color: 784100">
 
         <!-- Fixed navbar -->
         <%- partial ('partials/navigation.ejs') %>
diff --git a/views/partials/navigation.ejs b/views/partials/navigation.ejs
index 0b10b12..ae15dd0 100644
--- a/views/partials/navigation.ejs
+++ b/views/partials/navigation.ejs
@@ -1,4 +1,4 @@
-<nav class="navbar navbar-inverse navbar-fixed-top">
+<nav class="navbar navbar-fixed-top" style= "background-color: #950000">
     <div class="container-fluid">
         <div class="navbar-header">
             <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
@@ -7,16 +7,16 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="#"><img alt="Popcorn" src=""/></a>
+            <a class="navbar-brand" href="#"><img alt="Movie Night" src="http://i.imgur.com/BKAa7wm.png"/></a>
         </div>
         <div id="navbar" class="navbar-collapse collapse">
             <ul class="nav navbar-nav">
-                <li class="active"><a href="/">Home</a></li>
-                <li><a href="/create">Add Movie</a></li>
-                <li><a href="/update">Edit Movie</a></li>
-                <li><a href="/delete">Delete Movie</a></li>
+                <li class="active"><a href="/"><font color = "black">Home</font></a></li>
+                <li><a href="/create"><font color = "black">Add Movie</font></a></li>
+                <li><a href="/update"><font color = "black">Edit Movie</font></a></li>
+                <li><a href="/delete"><font color = "black">Delete Movie</font></a></li>
                 <li class="dropdown">
-                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><font color = "black">Dropdown </font><span class="caret"></span></a>
                 <ul class="dropdown-menu">
                     <li><a href="/create">Add Movie</a></li>
                     <li><a href="/update">Edit Movie</a></li>