From 4becaed7fb1b40f980fc7844ceee94ad2d1aacd6 Mon Sep 17 00:00:00 2001
From: Todd Wacker <twac05@yahoo.com>
Date: Sat, 22 Feb 2014 09:05:47 -0600
Subject: [PATCH 1/5] CSS file updated, put photo in HTML instead

---
 public/application.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/application.css b/public/application.css
index 64c15c2..9c8e244 100644
--- a/public/application.css
+++ b/public/application.css
@@ -3,7 +3,7 @@
 }
 
 #pic_display {
-  background-size: 200px 200px;
-  background-color: blue;
+  height: 200px;
+  width: 200px;
   border: 10px solid black;
 }

From ec51cc60991ad6528590a8ce61e13f58e04775d0 Mon Sep 17 00:00:00 2001
From: Todd Wacker <twac05@yahoo.com>
Date: Sat, 22 Feb 2014 10:03:24 -0600
Subject: [PATCH 2/5] Server and form changes undone

---
 server.rb      |  4 ++++
 views/form.erb | 25 +++++++++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/server.rb b/server.rb
index 7effd05..bf8cb33 100644
--- a/server.rb
+++ b/server.rb
@@ -31,9 +31,13 @@
   @price3 = params[:price3]
   @pic3 = params[:pic3]
   @items = [@item, @item2, @item3]
+
   @serial_numbers = [@serial_number, @serial_number2, @serial_number3]
+
   @prices = [@price, @price2, @price3]
+
   @pics = [@pic, @pic2, @pic3]
+
   erb :inventory
 end
 
diff --git a/views/form.erb b/views/form.erb
index 7ca57ef..ea54943 100644
--- a/views/form.erb
+++ b/views/form.erb
@@ -15,25 +15,26 @@
     <input type="text" value="Phone number" id="phone" name="phone"></input><br>
     <input type="email" value="Email address" id="email" name="email"></input><br>
     <input type="text" value="Zip code" id="zip" name="zip"></input><br>
+
   <div class="row">
     <div class="large-4 columns">
-      <input type="text" value="Item 1 name" id="item" name="item"></input><br>
+      <input type="text" value="Item name" id="item" name="item"></input><br>
       <input type="text" value="Serial number" id="serial_number" name="serial_number"></input><br>
       <input type="text" value="Retail price" id="price" name="price"></input><br>
       <input type="text" value="Upload picture" id="pic" name="pic"></input><br>
     </div>
-    <div class="large-4 columns">
-      <input type="text" value="Item 2 name" id="item" name="item2"></input><br>
-      <input type="text" value="Serial number" id="serial_number" name="serial_number2"></input><br>
-      <input type="text" value="Retail price" id="price" name="price2"></input><br>
-      <input type="text" value="Upload picture" id="pic" name="pic2"></input><br>
-    </div>
-    <div class="large-4 columns">
-      <input type="text" value="Item 3 name" id="item" name="item3"></input><br>
-      <input type="text" value="Serial number" id="serial_number" name="serial_number3"></input><br>
-      <input type="text" value="Retail price" id="price" name="price3"></input><br>
+      <div class="large-4 columns">
+        <input type="text" value="Item 2 name" id="item" name="item2"></input><br>
+       <input type="text" value="Serial number" id="serial_number" name="serial_number2"></input><br>
+        <input type="text" value="Retail price" id="price" name="price2"></input><br>
+       <input type="text" value="Upload picture" id="pic" name="pic2"></input><br>
+     </div>
+     <div class="large-4 columns">
+       <input type="text" value="Item 3 name" id="item" name="item3"></input><br>
+       <input type="text" value="Serial number" id="serial_number" name="serial_number3"></input><br>
+       <input type="text" value="Retail price" id="price" name="price3"></input><br>
       <input type="text" value="Upload picture" id="pic" name="pic3"></input><br>
-    </div>
+     </div>
   </div>
     <input type="submit" value="Submit" id="submit"></input>
 </form>

From a000ce9dad30df7d2c6a6e1b9a15197f4e65e4b3 Mon Sep 17 00:00:00 2001
From: Todd Wacker <twac05@yahoo.com>
Date: Sat, 22 Feb 2014 11:22:04 -0600
Subject: [PATCH 3/5] Remove button added, Add button added, calculates total
 price of items

---
 public/application.js |  5 +++++
 views/inventory.erb   | 44 +++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/public/application.js b/public/application.js
index 2c4c4a4..399f338 100644
--- a/public/application.js
+++ b/public/application.js
@@ -13,3 +13,8 @@ $('.default-value').each(function() {
         }
     });
 });
+
+$('#remove').on('click', function (e) {
+    e.preventDefault();
+    $('.row.item').remove();
+});
diff --git a/views/inventory.erb b/views/inventory.erb
index bb751a4..90692bb 100644
--- a/views/inventory.erb
+++ b/views/inventory.erb
@@ -4,6 +4,7 @@
   <meta charset="UTF-8" />
   <link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/foundation/5.1.1/css/foundation.min.css">
   <link rel="stylesheet" href="/application.css" type="text/css" />
+  <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
 </head>
 <body></a>
   <h1>Summary of Inventory for <%= @user_name %></h1>
@@ -12,14 +13,22 @@
     <p>Phone: <%= @phone %></p>
     <p>Email: <%= @email %></p>
     <p>Zip: <%= @zip %></p>
+    <% @sum = 0.00 %>
+    <p>Total Value: $<% @prices.each do |x| %>
+                      <% @sum += x.to_f.round(2) %>
+                      <% end %>
+                      <%= @sum %>
+                        </p>
   </div>
+  <div class="items">
 <% i = 0 %>
   <% while i < @items.length %>
-  <div class="row">
+  <div class="row item">
     <div class="large-6 columns">
       <p>Item Name: <%= @items[i] %></p>
       <p>Serial Number: <%= @serial_numbers[i] %></p>
-      <p>Retail Price: <%= @prices[i] %></p>
+      <p>Retail Price: $<%= @prices[i] %></p>
+      <input type="button" value="Remove Item" id="remove"></input>
     </div>
     <div class="large-6 columns">
       <div id="pic_display">
@@ -29,6 +38,37 @@
   </div>
     <%= i += 1 %>
   <% end %>
+</div>
+  <div>
+    <input type="button" value="Add New Item" id="add"></input>
+  </div>
+
+  <script type="text/javascript">
+$('#remove').on('click', function (e) {
+    e.preventDefault();
+    $('.row.item').remove();
+});
+
+$('#add').on('click', function (e) {
+  e.preventDefault();
+  $('.items')
+    .append('<p>Test</p>');
+    .append('<div class="row item">
+              <div class="large-6 columns">
+                <p>Item Name: </p>
+                <p>Serial Number:</p>
+                <p>Retail Price:</p>
+                <input type="button" value="Remove Item" id="remove"></input>
+              </div>
+              <div class="large-6 columns">
+                <div id="pic_display">
+                  <img src="http://http://cdn2.holytaco.com/wp-content/uploads/images/2010/monkey-smoking3.jpg" />
+                </div>
+              </div>
+            </div>')
+    ;
+})
+  </script>
 
 
 </body>

From 697261bf9e5e51bcb78e97d7e6d4c8dd393d77f1 Mon Sep 17 00:00:00 2001
From: Todd Wacker <twac05@yahoo.com>
Date: Sat, 22 Feb 2014 11:39:09 -0600
Subject: [PATCH 4/5] Add new item works on inventory page

---
 views/inventory.erb | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/views/inventory.erb b/views/inventory.erb
index 90692bb..c72c636 100644
--- a/views/inventory.erb
+++ b/views/inventory.erb
@@ -28,7 +28,7 @@
       <p>Item Name: <%= @items[i] %></p>
       <p>Serial Number: <%= @serial_numbers[i] %></p>
       <p>Retail Price: $<%= @prices[i] %></p>
-      <input type="button" value="Remove Item" id="remove"></input>
+      <input type="button" value="Remove Item" class="remove"></input>
     </div>
     <div class="large-6 columns">
       <div id="pic_display">
@@ -44,7 +44,7 @@
   </div>
 
   <script type="text/javascript">
-$('#remove').on('click', function (e) {
+$('.remove').on('click', function (e) {
     e.preventDefault();
     $('.row.item').remove();
 });
@@ -52,21 +52,8 @@ $('#remove').on('click', function (e) {
 $('#add').on('click', function (e) {
   e.preventDefault();
   $('.items')
-    .append('<p>Test</p>');
-    .append('<div class="row item">
-              <div class="large-6 columns">
-                <p>Item Name: </p>
-                <p>Serial Number:</p>
-                <p>Retail Price:</p>
-                <input type="button" value="Remove Item" id="remove"></input>
-              </div>
-              <div class="large-6 columns">
-                <div id="pic_display">
-                  <img src="http://http://cdn2.holytaco.com/wp-content/uploads/images/2010/monkey-smoking3.jpg" />
-                </div>
-              </div>
-            </div>')
-    ;
+    .append('<div class="row item"><div class="large-6 columns"><p>Item Name: </p><p>Serial Number: </p><p>Retail Price: </p><input type="button" value="Remove Item" id="remove"></input></div><div class="large-6 columns"><div id="pic_display"><img src="" /></div></div></div>');
+
 })
   </script>
 

From c66673a4d61d7076746b352942bd4269dff5a2f5 Mon Sep 17 00:00:00 2001
From: Todd Wacker <twac05@yahoo.com>
Date: Sat, 22 Feb 2014 12:05:33 -0600
Subject: [PATCH 5/5] Lunch commit

---
 views/inventory.erb | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/views/inventory.erb b/views/inventory.erb
index c72c636..a637b4e 100644
--- a/views/inventory.erb
+++ b/views/inventory.erb
@@ -13,11 +13,11 @@
     <p>Phone: <%= @phone %></p>
     <p>Email: <%= @email %></p>
     <p>Zip: <%= @zip %></p>
-    <% @sum = 0.00 %>
+    <% @sum = 0.0 %>
     <p>Total Value: $<% @prices.each do |x| %>
-                      <% @sum += x.to_f.round(2) %>
+                      <% @sum += x.to_f %>
                       <% end %>
-                      <%= @sum %>
+                      <%= @sum.round(2) %>
                         </p>
   </div>
   <div class="items">
@@ -52,7 +52,18 @@ $('.remove').on('click', function (e) {
 $('#add').on('click', function (e) {
   e.preventDefault();
   $('.items')
-    .append('<div class="row item"><div class="large-6 columns"><p>Item Name: </p><p>Serial Number: </p><p>Retail Price: </p><input type="button" value="Remove Item" id="remove"></input></div><div class="large-6 columns"><div id="pic_display"><img src="" /></div></div></div>');
+    .append('<div class="row item">' +
+            '<div class="large-6 columns">' +
+                '<p>Item Name: <input type="text" name="item"></input></p>' +
+                '<p>Serial Number: <input type="text" name="serial_number"></input></p>' +
+                '<p>Retail Price: <input type="text" name="price"></input></p>' +
+                'Upload photo: <input type="text" name="pic"></input>'+
+                  '<input type="button" value="Remove Item" id="remove"></input>'+
+                  '</div>'+
+                  '<div class="large-6 columns">'+
+                  '<img src="" />'+
+                  '</div>'+
+                  '</div>');
 
 })
   </script>