From e1aee4ed263f9687bc0521145fc636a4719a6198 Mon Sep 17 00:00:00 2001
From: Jessieliuzx <zliu20@chicagobooth.edu>
Date: Tue, 21 Nov 2017 21:41:07 +0000
Subject: [PATCH 01/18] Removed extra items in nav bar

---
 app/views/layouts/application.html.erb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 881e961..f802a74 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -41,13 +41,8 @@
       <!-- Collect the nav links, forms, and other content for toggling -->
       <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
         <ul class="nav navbar-nav">
-          <li><a href="/bookmarks">Bookmarks</a></li>
           <li><a href="/dishes">Dishes</a></li>
           <li><a href="/cuisines">Cuisines</a></li>
-          <li><a href="/neighborhoods">Neighborhoods</a></li>
-          <li><a href="/venues">Venues</a></li>
-          <li><a href="/users">Users</a></li>
-          <li><a href="/rails/info">Sitemap</a></li>
         </ul>
 
         <ul class="nav navbar-nav navbar-right">

From 28af60da5b1eea3c3888c059ba2e3d96b7d7c70c Mon Sep 17 00:00:00 2001
From: Jessieliuzx <zliu20@chicagobooth.edu>
Date: Tue, 21 Nov 2017 21:47:50 +0000
Subject: [PATCH 02/18] Correct Navbar name

---
 app/views/layouts/application.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index f802a74..4847939 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -42,7 +42,7 @@
       <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
         <ul class="nav navbar-nav">
           <li><a href="/dishes">Dishes</a></li>
-          <li><a href="/cuisines">Cuisines</a></li>
+          <li><a href="/cuisines">Venues</a></li>
         </ul>
 
         <ul class="nav navbar-nav navbar-right">

From add16b330a8a09c2f8b4dcd9406273742f0f63f2 Mon Sep 17 00:00:00 2001
From: Jessieliuzx <zliu20@chicagobooth.edu>
Date: Tue, 21 Nov 2017 21:57:06 +0000
Subject: [PATCH 03/18] home page changed to dishes

---
 config/routes.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/routes.rb b/config/routes.rb
index 6f92ce5..4372e87 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,5 @@
 Rails.application.routes.draw do
-  root :to => "venues#index"
+  root :to => "dishes#index"
 
   # Routes for the Bookmark resource:
   # CREATE

From 6c8afc1c1c4e3fbfa9c082b139854a5b859de958 Mon Sep 17 00:00:00 2001
From: Jessieliuzx <zliu20@chicagobooth.edu>
Date: Tue, 21 Nov 2017 22:07:02 +0000
Subject: [PATCH 04/18] link name to dish show page

---
 app/views/dishes/index.html.erb | 5 +++--
 grades.yml                      | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/dishes/index.html.erb b/app/views/dishes/index.html.erb
index bc51992..63d0e3b 100644
--- a/app/views/dishes/index.html.erb
+++ b/app/views/dishes/index.html.erb
@@ -94,7 +94,9 @@
 
       <% @dishes.each do |dish| %>
       <tr>
-        <td><%= dish.name %></td>
+        <td>
+          <a href="/dishes/<%= dish.id %>"><%= dish.name %></a>
+        </td>
         <td>
           <% if dish.cuisine.present? %>
             <a href="/cuisines/<%= dish.cuisine.id %>">
@@ -103,7 +105,6 @@
           <% end %>
         </td>
         <td>
-          <a href="/dishes/<%= dish.id %>" class="btn btn-primary">Show</a>
           <a href="/dishes/<%= dish.id %>/edit" class="btn btn-warning">Edit</a>
           <a href="/delete_dish/<%= dish.id %>" class="btn btn-danger" rel="nofollow">Delete</a>
         </td>
diff --git a/grades.yml b/grades.yml
index 2f40b8d..3558ded 100644
--- a/grades.yml
+++ b/grades.yml
@@ -1,4 +1,4 @@
 ---
 submission_url: https://grades.firstdraft.com
 project_token: ''
-personal_access_token:
+personal_access_token: aENQx7CCKcpTVTKgBU1zXCPE

From 1b39d0d898f51b45490b135d39a2a4216d301f1b Mon Sep 17 00:00:00 2001
From: Jessieliuzx <zliu20@chicagobooth.edu>
Date: Wed, 22 Nov 2017 01:57:03 +0000
Subject: [PATCH 05/18] added bookmarked venue to dishes on dish index page

---
 app/views/dishes/index.html.erb        | 13 ++++++++++---
 app/views/layouts/application.html.erb |  2 +-
 whitelist.yml                          |  1 +
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/views/dishes/index.html.erb b/app/views/dishes/index.html.erb
index 63d0e3b..1c84f9f 100644
--- a/app/views/dishes/index.html.erb
+++ b/app/views/dishes/index.html.erb
@@ -87,9 +87,9 @@
   <div class="col-md-12">
     <table class="table table-striped table-hover">
       <tr>
-        <th>Name</th>
-        <th>Cuisine</th>
-        <th>Actions</th>
+        <th>The very best...</th>
+        <th>is at...</th>
+        <th></th>
       </tr>
 
       <% @dishes.each do |dish| %>
@@ -97,6 +97,13 @@
         <td>
           <a href="/dishes/<%= dish.id %>"><%= dish.name %></a>
         </td>
+        <td>
+          <% if dish.bookmarks.find_by(:dish_id => dish.id).present? %>
+            <a href="/venues/<%= dish.bookmarks.find_by(:dish_id => dish.id).venue.id %>">
+              <%= dish.bookmarks.find_by(:dish_id => dish.id).venue.name %>
+            </a>
+          <% end %>
+        </td>
         <td>
           <% if dish.cuisine.present? %>
             <a href="/cuisines/<%= dish.cuisine.id %>">
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 4847939..b51f355 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -42,7 +42,7 @@
       <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
         <ul class="nav navbar-nav">
           <li><a href="/dishes">Dishes</a></li>
-          <li><a href="/cuisines">Venues</a></li>
+          <li><a href="/venues">Venues</a></li>
         </ul>
 
         <ul class="nav navbar-nav navbar-right">
diff --git a/whitelist.yml b/whitelist.yml
index ab11e34..e0d7945 100644
--- a/whitelist.yml
+++ b/whitelist.yml
@@ -2,3 +2,4 @@
 - 127.0.0.1
 - 10.240.0.0/16
 - "::1"
+- 50.232.11.130

From 04d0ae438efb3ee18f3a117eee9fbf2525cff27d Mon Sep 17 00:00:00 2001
From: Jessieliuzx <zliu20@chicagobooth.edu>
Date: Wed, 22 Nov 2017 02:30:15 +0000
Subject: [PATCH 06/18] add bookmark option for unbooked dish on dish index

---
 app/controllers/cuisines_controller.rb |  2 +-
 app/controllers/dishes_controller.rb   |  2 +-
 app/views/dishes/index.html.erb        | 15 +++++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/controllers/cuisines_controller.rb b/app/controllers/cuisines_controller.rb
index ef26e20..619f6c4 100644
--- a/app/controllers/cuisines_controller.rb
+++ b/app/controllers/cuisines_controller.rb
@@ -2,7 +2,7 @@ class CuisinesController < ApplicationController
   def index
     @q = Cuisine.ransack(params[:q])
     @cuisines = @q.result(:distinct => true).includes(:dishes).page(params[:page]).per(10)
-
+    @bookmark = Bookmark.new
     render("cuisines/index.html.erb")
   end
 
diff --git a/app/controllers/dishes_controller.rb b/app/controllers/dishes_controller.rb
index 84facab..8f3c069 100644
--- a/app/controllers/dishes_controller.rb
+++ b/app/controllers/dishes_controller.rb
@@ -2,7 +2,7 @@ class DishesController < ApplicationController
   def index
     @q = Dish.ransack(params[:q])
     @dishes = @q.result(:distinct => true).includes(:cuisine, :bookmarks, :fans, :specialists).page(params[:page]).per(10)
-
+    @bookmark = Bookmark.new
     render("dishes/index.html.erb")
   end
 
diff --git a/app/views/dishes/index.html.erb b/app/views/dishes/index.html.erb
index 1c84f9f..72127b1 100644
--- a/app/views/dishes/index.html.erb
+++ b/app/views/dishes/index.html.erb
@@ -102,6 +102,21 @@
             <a href="/venues/<%= dish.bookmarks.find_by(:dish_id => dish.id).venue.id %>">
               <%= dish.bookmarks.find_by(:dish_id => dish.id).venue.name %>
             </a>
+          <% else %>
+            <form action="/create_bookmark" method="post">
+              <!-- Hidden input for authenticity token to protect from forgery -->
+              <input name="authenticity_token" type="hidden" value="<%= form_authenticity_token %>">
+        
+              <!-- Label and input for dish_id -->
+              <input type="hidden" name="dish_id" value="<%= dish.id %>">
+        
+              <!-- Label and input for venue_id -->
+              
+              <%= select_tag(:venue_id, options_from_collection_for_select(Venue.all, :id, :name, @bookmark.venue_id), prompt:"Choose a venue...",:class => "form-control") %>
+        
+              <!-- Label and input for user_id -->
+              <input type="hidden" name="user_id" value="<%= current_user.id %>">
+            </form>
           <% end %>
         </td>
         <td>

From 9130094a4f9311ca9d56e6bd6cf9614b83385c74 Mon Sep 17 00:00:00 2001
From: Jessieliuzx <zliu20@chicagobooth.edu>
Date: Wed, 22 Nov 2017 02:41:04 +0000
Subject: [PATCH 07/18] adding bookmark for unbookmarked dish

---
 app/views/dishes/index.html.erb | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/views/dishes/index.html.erb b/app/views/dishes/index.html.erb
index 72127b1..e8e1bb0 100644
--- a/app/views/dishes/index.html.erb
+++ b/app/views/dishes/index.html.erb
@@ -111,11 +111,19 @@
               <input type="hidden" name="dish_id" value="<%= dish.id %>">
         
               <!-- Label and input for venue_id -->
-              
-              <%= select_tag(:venue_id, options_from_collection_for_select(Venue.all, :id, :name, @bookmark.venue_id), prompt:"Choose a venue...",:class => "form-control") %>
-        
+              <div class = "form-group">
+                <label for="venue_id" class="control-label sr-only">
+                    Venue
+                </label>
+                <%= select_tag(:venue_id, options_from_collection_for_select(Venue.all, :id, :name, @bookmark.venue_id), prompt:"Choose a venue...", :class => "form-control input-sm") %>
+              </div>
               <!-- Label and input for user_id -->
               <input type="hidden" name="user_id" value="<%= current_user.id %>">
+              
+              <button class="btn btn-primary btn-sm">
+                <i class="fa fa-heart"></i>
+              </button>
+
             </form>
           <% end %>
         </td>

From 7105be654f3f0b5e531f9462ed8f765be87fcdff Mon Sep 17 00:00:00 2001
From: Jessieliuzx <zliu20@chicagobooth.edu>
Date: Wed, 22 Nov 2017 02:49:31 +0000
Subject: [PATCH 08/18] dish index displaying only signed in users' bookmark

---
 app/views/dishes/index.html.erb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/dishes/index.html.erb b/app/views/dishes/index.html.erb
index e8e1bb0..06c8a0a 100644
--- a/app/views/dishes/index.html.erb
+++ b/app/views/dishes/index.html.erb
@@ -98,9 +98,9 @@
           <a href="/dishes/<%= dish.id %>"><%= dish.name %></a>
         </td>
         <td>
-          <% if dish.bookmarks.find_by(:dish_id => dish.id).present? %>
-            <a href="/venues/<%= dish.bookmarks.find_by(:dish_id => dish.id).venue.id %>">
-              <%= dish.bookmarks.find_by(:dish_id => dish.id).venue.name %>
+          <% if dish.bookmarks.find_by(:user_id => current_user.id).present? %>
+            <a href="/venues/<%= dish.bookmarks.find_by(:user_id => current_user.id).venue.id %>">
+              <%= dish.bookmarks.find_by(:user_id => current_user.id).venue.name %>
             </a>
           <% else %>
             <form action="/create_bookmark" method="post">
@@ -109,6 +109,8 @@
         
               <!-- Label and input for dish_id -->
               <input type="hidden" name="dish_id" value="<%= dish.id %>">
+              <!-- Label and input for user_id -->
+              <input type="hidden" name="user_id" value="<%= current_user.id %>">
         
               <!-- Label and input for venue_id -->
               <div class = "form-group">
@@ -117,8 +119,6 @@
                 </label>
                 <%= select_tag(:venue_id, options_from_collection_for_select(Venue.all, :id, :name, @bookmark.venue_id), prompt:"Choose a venue...", :class => "form-control input-sm") %>
               </div>
-              <!-- Label and input for user_id -->
-              <input type="hidden" name="user_id" value="<%= current_user.id %>">
               
               <button class="btn btn-primary btn-sm">
                 <i class="fa fa-heart"></i>

From b295ef830fd4114a94a7b309ec4ee5674b4d3e9c Mon Sep 17 00:00:00 2001
From: Jessieliuzx <zliu20@chicagobooth.edu>
Date: Wed, 22 Nov 2017 02:53:11 +0000
Subject: [PATCH 09/18] recover last edit

---
 app/views/dishes/index.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/dishes/index.html.erb b/app/views/dishes/index.html.erb
index 06c8a0a..01a1117 100644
--- a/app/views/dishes/index.html.erb
+++ b/app/views/dishes/index.html.erb
@@ -117,7 +117,7 @@
                 <label for="venue_id" class="control-label sr-only">
                     Venue
                 </label>
-                <%= select_tag(:venue_id, options_from_collection_for_select(Venue.all, :id, :name, @bookmark.venue_id), prompt:"Choose a venue...", :class => "form-control input-sm") %>
+                <%= select_tag(:venue_id, options_from_collection_for_select(Venue.all, :id, :name, @bookmark.venue_id), prompt:"Choose a venue", :class => "form-control input-sm") %>
               </div>
               
               <button class="btn btn-primary btn-sm">

From cf773df900d0b5e89d2b567f3a55afc7be0cc25d Mon Sep 17 00:00:00 2001
From: Jessieliuzx <zliu20@chicagobooth.edu>
Date: Wed, 22 Nov 2017 02:59:19 +0000
Subject: [PATCH 10/18] clean up dish index display table

---
 app/views/dishes/index.html.erb | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/views/dishes/index.html.erb b/app/views/dishes/index.html.erb
index 01a1117..3bc231c 100644
--- a/app/views/dishes/index.html.erb
+++ b/app/views/dishes/index.html.erb
@@ -117,7 +117,7 @@
                 <label for="venue_id" class="control-label sr-only">
                     Venue
                 </label>
-                <%= select_tag(:venue_id, options_from_collection_for_select(Venue.all, :id, :name, @bookmark.venue_id), prompt:"Choose a venue", :class => "form-control input-sm") %>
+                <%= select_tag(:venue_id, options_from_collection_for_select(Venue.all, :id, :name, @bookmark.venue_id), prompt:"Choose a venue...", :class => "form-control input-sm") %>
               </div>
               
               <button class="btn btn-primary btn-sm">
@@ -127,17 +127,17 @@
             </form>
           <% end %>
         </td>
-        <td>
-          <% if dish.cuisine.present? %>
-            <a href="/cuisines/<%= dish.cuisine.id %>">
-              <%= dish.cuisine.name %>
-            </a>
-          <% end %>
-        </td>
-        <td>
-          <a href="/dishes/<%= dish.id %>/edit" class="btn btn-warning">Edit</a>
-          <a href="/delete_dish/<%= dish.id %>" class="btn btn-danger" rel="nofollow">Delete</a>
+        <td class="text-right">
+          <span class="label">
+            <% if dish.cuisine.present? %>
+              <a href="/cuisines/<%= dish.cuisine.id %>">
+                <%= dish.cuisine.name %>
+              </a>
+            <% end %>
+          </span>
         </td>
+
+
       </tr>
       <% end %>
     </table>

From 312a0375c03163bc001baba541cdcd36d0fc6bf6 Mon Sep 17 00:00:00 2001
From: Jessieliuzx <zliu20@chicagobooth.edu>
Date: Wed, 22 Nov 2017 03:03:27 +0000
Subject: [PATCH 11/18] dish index page can add new venue

---
 app/views/dishes/index.html.erb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/views/dishes/index.html.erb b/app/views/dishes/index.html.erb
index 3bc231c..1f2bd04 100644
--- a/app/views/dishes/index.html.erb
+++ b/app/views/dishes/index.html.erb
@@ -1,7 +1,6 @@
 <div class="page-header">
   <h1>
-    Dishes
-    <a href="/dishes/new" class="btn btn-lg btn-success">New Dish</a>
+    <a href="/venues/new" class="btn btn-lg btn-success">Add a new venue</a>
   </h1>
 </div><div class="row mb-1">
   <div class="col-md-12">

From 099af8218f83faa6ac95d40101858fdabf385523 Mon Sep 17 00:00:00 2001
From: Jessieliuzx <zliu20@chicagobooth.edu>
Date: Wed, 22 Nov 2017 04:25:05 +0000
Subject: [PATCH 12/18] add cuisine option to filter and deleted extra filters

---
 app/controllers/dishes_controller.rb |  1 +
 app/views/dishes/index.html.erb      | 76 +++++-----------------------
 2 files changed, 15 insertions(+), 62 deletions(-)

diff --git a/app/controllers/dishes_controller.rb b/app/controllers/dishes_controller.rb
index 8f3c069..49747c8 100644
--- a/app/controllers/dishes_controller.rb
+++ b/app/controllers/dishes_controller.rb
@@ -3,6 +3,7 @@ def index
     @q = Dish.ransack(params[:q])
     @dishes = @q.result(:distinct => true).includes(:cuisine, :bookmarks, :fans, :specialists).page(params[:page]).per(10)
     @bookmark = Bookmark.new
+    @cuisines = Cuisine.all
     render("dishes/index.html.erb")
   end
 
diff --git a/app/views/dishes/index.html.erb b/app/views/dishes/index.html.erb
index 1f2bd04..e5a7459 100644
--- a/app/views/dishes/index.html.erb
+++ b/app/views/dishes/index.html.erb
@@ -3,74 +3,25 @@
     <a href="/venues/new" class="btn btn-lg btn-success">Add a new venue</a>
   </h1>
 </div><div class="row mb-1">
-  <div class="col-md-12">
+  <div class="col-md-3">
     <%= search_form_for @q, :class => "collapse", :id => "dishes_filters" do |f| %>
       <p class="lead">Narrow results:</p>
 
-        <div class="form-group">
-    <%= f.label :name_cont, "Name contains" %>
-    <%= f.text_field :name_cont, :class => "form-control", :placeholder => "Name contains" %>
-  </div>
-
-<div class="form-group">
-          <%= f.label :created_at, "Created at" %>
-          <div class="row">
-            <div class='col-md-6 mb-1'>
-              <div class='input-group date' id='created_atgteqPicker'>
-                  <%= f.text_field :created_at_gteq, :class => "form-control", :placeholder => "Created at greater than or equal to" %>
-                  <span class="input-group-addon">
-                      <span class="glyphicon glyphicon-calendar"></span>
-                  </span>
-              </div>
-            </div>
-
-            <div class='col-md-6'>
-              <div class='input-group date' id='created_atlteqPicker'>
-                  <%= f.text_field :created_at_lteq, :class => "form-control", :placeholder => "Created at less than or equal to" %>
-                  <span class="input-group-addon">
-                      <span class="glyphicon glyphicon-calendar"></span>
-                  </span>
-              </div>
-            </div>
-          </div>
-      </div>
-      <script type="text/javascript">
-          $(function () {
-              $('#created_atgteqPicker').datetimepicker({
-                  format: 'YYYY-MM-DD hh:mm:SS'
-              });
-              $('#created_atlteqPicker').datetimepicker({
-                  useCurrent: false,
-                  format: 'YYYY-MM-DD hh:mm:SS'
-              });
-              $('#created_atgteqPicker').on("dp.change", function (e) {
-                  $('#created_atlteqPicker').data("DateTimePicker").minDate(e.date);
-              });
-              $('#created_atlteqPicker').on("dp.change", function (e) {
-                  $('#created_atgteqPicker').data("DateTimePicker").maxDate(e.date);
-              });
-          });
-      </script>
-
-        <div class="form-group">
-      <%= f.label :cuisine_name_cont, "Cuisine name contains" %>
-      <%= f.text_field :cuisine_name_cont, :class => "form-control", :placeholder => "Cuisine name contains" %>
+    <div class="form-group">
+      <%= f.label :name_cont, "Name contains" %>
+      <%= f.text_field :name_cont, :class => "form-control", :placeholder => "Name contains" %>
     </div>
-
-<div class="form-group">
-      <%= f.label :bookmarks_notes_cont, "Bookmark notes contains" %>
-      <%= f.text_field :bookmarks_notes_cont, :class => "form-control", :placeholder => "Bookmark notes contains" %>
-    </div>
-
-<div class="form-group">
-      <%= f.label :fans_username_cont, "User username contains" %>
-      <%= f.text_field :fans_username_cont, :class => "form-control", :placeholder => "User username contains" %>
+    <div class="form-group">
+      <%= f.label :cuisine_name, "Cuisine" %>
+      
+      <div class = 'checkbox'>
+          <% @cuisines.each do |cuisine|%>
+            <%= f.check_box :cuisine_name %>
+            <p><%= cuisine.name%></P>
+          <% end %>
+      </div>
     </div>
 
-<div class="form-group">
-      <%= f.label :specialists_name_cont, "Venue name contains" %>
-      <%= f.text_field :specialists_name_cont, :class => "form-control", :placeholder => "Venue name contains" %>
-    </div>
 
       <%= f.submit :class => "btn btn-primary btn-block mb-1" %>
 
@@ -80,6 +31,7 @@
       Show Filters
     </a>
   </div>
+
 </div>
 
 <div class="row">

From 2c647a1f75f74907f934f7c933c1aec6898f25d0 Mon Sep 17 00:00:00 2001
From: Jessieliuzx <zliu20@chicagobooth.edu>
Date: Wed, 22 Nov 2017 05:01:31 +0000
Subject: [PATCH 13/18] Attempt to make filter by cuisine work

---
 app/views/dishes/index.html.erb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/dishes/index.html.erb b/app/views/dishes/index.html.erb
index e5a7459..1c6f98e 100644
--- a/app/views/dishes/index.html.erb
+++ b/app/views/dishes/index.html.erb
@@ -14,16 +14,16 @@
     <div class="form-group">
       <%= f.label :cuisine_name, "Cuisine" %>
       
-      <div class = 'checkbox'>
-          <% @cuisines.each do |cuisine|%>
-            <%= f.check_box :cuisine_name %>
-            <p><%= cuisine.name%></P>
-          <% end %>
-      </div>
+    <div class = 'checkbox'>
+      <% @cuisines.each do |cuisine|%>
+        <%= f.check_box :cuisine_name, :id => "cuisine_id", :value => cuisine.id%>
+        <p><%= cuisine.name%></P>
+      <% end %>
+    </div>
     </div>
 
 
-      <%= f.submit :class => "btn btn-primary btn-block mb-1" %>
+    <%= f.submit :class => "btn btn-primary btn-block mb-1", :name=>"commit", :value=>"Search" %>
 
       <a href="/dishes" class="btn btn-default btn-block mb-1">Clear filters</a>
     <% end %>

From 81a5421b32037fc5601927bec3c0b325db1b3131 Mon Sep 17 00:00:00 2001
From: Jessieliuzx <zliu20@chicagobooth.edu>
Date: Wed, 22 Nov 2017 16:33:32 +0000
Subject: [PATCH 14/18] venue index only shows logged in users' preference

---
 app/views/dishes/show.html.erb  | 6 +-----
 app/views/venues/index.html.erb | 6 ++++--
 app/views/venues/show.html.erb  | 2 +-
 whitelist.yml                   | 1 +
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/views/dishes/show.html.erb b/app/views/dishes/show.html.erb
index 36415db..0d1b040 100644
--- a/app/views/dishes/show.html.erb
+++ b/app/views/dishes/show.html.erb
@@ -1,7 +1,3 @@
-<div class="page-header">
-  <h3>Dish #<%= @dish.id %></h3>
-</div>
-
 <div class="row">
   <div class="col-md-12 mb-2">
     <dl class="dl-horizontal">
@@ -21,7 +17,7 @@
 
     <div class="btn-group btn-group-justified">
       <a href="/dishes" class="btn btn-primary">
-        Back
+        <i class="fa fa-chevron-left"></i>
       </a>
       <a href="/dishes/<%= @dish.id %>/edit" class="btn btn-warning">
         Edit
diff --git a/app/views/venues/index.html.erb b/app/views/venues/index.html.erb
index 169f95b..02e1ed3 100644
--- a/app/views/venues/index.html.erb
+++ b/app/views/venues/index.html.erb
@@ -101,9 +101,10 @@
         <th>Neighborhood</th>
         <th>Actions</th>
       </tr>
-
+      
       <% @venues.each do |venue| %>
-      <tr>
+        <% if venue.bookmarks.find_by(:user_id => current_user.id).present? %>
+          <tr>
         <td><%= venue.name %></td>
         <td><%= venue.address %></td>
         <td>
@@ -119,6 +120,7 @@
           <a href="/delete_venue/<%= venue.id %>" class="btn btn-danger" rel="nofollow">Delete</a>
         </td>
       </tr>
+        <%end%>
       <% end %>
     </table>
     <%= paginate @venues, theme: 'twitter-bootstrap-4' %>
diff --git a/app/views/venues/show.html.erb b/app/views/venues/show.html.erb
index 3fc6f2d..12cea5d 100644
--- a/app/views/venues/show.html.erb
+++ b/app/views/venues/show.html.erb
@@ -48,7 +48,7 @@
       <li class="list-group-item list-group-item-info">
         Bookmarks
       </li>
-
+    
       <% @venue.bookmarks.each do |bookmark| %>
         <li class="list-group-item">
           <a href="/bookmarks/<%= bookmark.id %>">
diff --git a/whitelist.yml b/whitelist.yml
index e0d7945..8db53fa 100644
--- a/whitelist.yml
+++ b/whitelist.yml
@@ -3,3 +3,4 @@
 - 10.240.0.0/16
 - "::1"
 - 50.232.11.130
+- 128.135.98.148

From ebd2c4194a29272d50863cbac7f9c52ceab50943 Mon Sep 17 00:00:00 2001
From: Jessieliuzx <zliu20@chicagobooth.edu>
Date: Fri, 24 Nov 2017 01:54:02 +0000
Subject: [PATCH 15/18] filter by dish on venue index page

---
 app/views/dishes/index.html.erb | 10 +++----
 app/views/venues/index.html.erb | 53 ++-------------------------------
 2 files changed, 8 insertions(+), 55 deletions(-)

diff --git a/app/views/dishes/index.html.erb b/app/views/dishes/index.html.erb
index 1c6f98e..b75c871 100644
--- a/app/views/dishes/index.html.erb
+++ b/app/views/dishes/index.html.erb
@@ -15,15 +15,15 @@
       <%= f.label :cuisine_name, "Cuisine" %>
       
     <div class = 'checkbox'>
-      <% @cuisines.each do |cuisine|%>
-        <%= f.check_box :cuisine_name, :id => "cuisine_id", :value => cuisine.id%>
-        <p><%= cuisine.name%></P>
-      <% end %>
+    <% @cuisines.each do |cuisine|%>
+      <%= f.check_box :cuisine_name, :id => "cuisine_id", :value => cuisine.id%>
+      <p><%= cuisine.name%></P>
+    <% end %>
     </div>
     </div>
 
 
-    <%= f.submit :class => "btn btn-primary btn-block mb-1", :name=>"commit", :value=>"Search" %>
+    <%= f.submit :class => "btn btn-primary btn-block mb-1" %>
 
       <a href="/dishes" class="btn btn-default btn-block mb-1">Clear filters</a>
     <% end %>
diff --git a/app/views/venues/index.html.erb b/app/views/venues/index.html.erb
index 02e1ed3..e8f428f 100644
--- a/app/views/venues/index.html.erb
+++ b/app/views/venues/index.html.erb
@@ -13,64 +13,17 @@
     <%= f.text_field :name_cont, :class => "form-control", :placeholder => "Name contains" %>
   </div>
 
-<div class="form-group">
-          <%= f.label :created_at, "Created at" %>
-          <div class="row">
-            <div class='col-md-6 mb-1'>
-              <div class='input-group date' id='created_atgteqPicker'>
-                  <%= f.text_field :created_at_gteq, :class => "form-control", :placeholder => "Created at greater than or equal to" %>
-                  <span class="input-group-addon">
-                      <span class="glyphicon glyphicon-calendar"></span>
-                  </span>
-              </div>
-            </div>
-
-            <div class='col-md-6'>
-              <div class='input-group date' id='created_atlteqPicker'>
-                  <%= f.text_field :created_at_lteq, :class => "form-control", :placeholder => "Created at less than or equal to" %>
-                  <span class="input-group-addon">
-                      <span class="glyphicon glyphicon-calendar"></span>
-                  </span>
-              </div>
-            </div>
-          </div>
-      </div>
-      <script type="text/javascript">
-          $(function () {
-              $('#created_atgteqPicker').datetimepicker({
-                  format: 'YYYY-MM-DD hh:mm:SS'
-              });
-              $('#created_atlteqPicker').datetimepicker({
-                  useCurrent: false,
-                  format: 'YYYY-MM-DD hh:mm:SS'
-              });
-              $('#created_atgteqPicker').on("dp.change", function (e) {
-                  $('#created_atlteqPicker').data("DateTimePicker").minDate(e.date);
-              });
-              $('#created_atlteqPicker').on("dp.change", function (e) {
-                  $('#created_atgteqPicker').data("DateTimePicker").maxDate(e.date);
-              });
-          });
-      </script>
-
-        <div class="form-group">
-      <%= f.label :bookmarks_notes_cont, "Bookmark notes contains" %>
-      <%= f.text_field :bookmarks_notes_cont, :class => "form-control", :placeholder => "Bookmark notes contains" %>
-    </div>
 
 <div class="form-group">
       <%= f.label :neighborhood_name_cont, "Neighborhood name contains" %>
       <%= f.text_field :neighborhood_name_cont, :class => "form-control", :placeholder => "Neighborhood name contains" %>
     </div>
 
-<div class="form-group">
-      <%= f.label :fans_username_cont, "User username contains" %>
-      <%= f.text_field :fans_username_cont, :class => "form-control", :placeholder => "User username contains" %>
-    </div>
+
 
 <div class="form-group">
-      <%= f.label :specialties_name_cont, "Dish name contains" %>
-      <%= f.text_field :specialties_name_cont, :class => "form-control", :placeholder => "Dish name contains" %>
+      <%= f.label :specialties_name_cont, "Bookmarked dish name contains" %>
+      <%= f.text_field :specialties_name_cont, :class => "form-control", :placeholder => "Bookmarked dish name contains" %>
     </div>
 
       <%= f.submit :class => "btn btn-primary btn-block mb-1" %>

From 3776dae1f58a22fce18398a5e1a593cfc779bdcc Mon Sep 17 00:00:00 2001
From: Jessieliuzx <zliu20@chicagobooth.edu>
Date: Fri, 24 Nov 2017 03:05:46 +0000
Subject: [PATCH 16/18] dish show page show all past venues

---
 app/views/dishes/show.html.erb | 38 +++++-----------------------------
 whitelist.yml                  |  1 +
 2 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/app/views/dishes/show.html.erb b/app/views/dishes/show.html.erb
index 0d1b040..9d255e4 100644
--- a/app/views/dishes/show.html.erb
+++ b/app/views/dishes/show.html.erb
@@ -95,36 +95,6 @@
   </div>
 </div>
 
-<!-- A Dish has many fans -->
-
-<div class="row">
-  <div class="col-md-12">
-    <ul class="list-group">
-      <li class="list-group-item list-group-item-info">
-        Fans
-      </li>
-
-      <% @dish.fans.each do |user| %>
-        <li class="list-group-item">
-          <a href="/users/<%= user.id %>">
-            <%= user.username %>
-          </a>
-          <div class="btn-group btn-group-xs pull-right">
-            <a href="/users/<%= user.id %>" class="btn btn-primary">
-              <i class="fa fa-search-plus"></i>
-            </a>
-            <a href="/users/<%= user.id %>/edit" class="btn btn-warning">
-              <i class="fa fa-edit"></i>
-            </a>
-            <a href="/delete_user/<%= user.id %>" class="btn btn-danger" rel="nofollow">
-              <i class="fa fa-trash-o"></i>
-            </a>
-          </div>
-        </li>
-      <% end %>
-    </ul>
-  </div>
-</div>
 
 <!-- A Dish has many specialists -->
 
@@ -136,10 +106,11 @@
       </li>
 
       <% @dish.specialists.each do |venue| %>
-        <li class="list-group-item">
-          <a href="/venues/<%= venue.id %>">
+        <% if venue.bookmarks.find_by(:user_id => current_user.id).present? %>
+          <li class="list-group-item">
+          <p><a href="/venues/<%= venue.id %>">
             <%= venue.name %>
-          </a>
+          </a></p>
           <div class="btn-group btn-group-xs pull-right">
             <a href="/venues/<%= venue.id %>" class="btn btn-primary">
               <i class="fa fa-search-plus"></i>
@@ -152,6 +123,7 @@
             </a>
           </div>
         </li>
+        <% end %>
       <% end %>
     </ul>
   </div>
diff --git a/whitelist.yml b/whitelist.yml
index 8db53fa..d152ac8 100644
--- a/whitelist.yml
+++ b/whitelist.yml
@@ -4,3 +4,4 @@
 - "::1"
 - 50.232.11.130
 - 128.135.98.148
+- 96.47.146.150

From 4ac62689e758bf7071f3eacf4abc3fd3865f3e01 Mon Sep 17 00:00:00 2001
From: elizabeth campbell <elizabeth.lisa.campbell@gmail.com>
Date: Tue, 28 Nov 2017 15:20:21 +0000
Subject: [PATCH 17/18] Filtering dishes by cuisine type

Checkbox for filtering on /dishes now works by cuisine
---
 app/views/dishes/index.html.erb | 32 +++++++++++++++++++++-----------
 whitelist.yml                   |  1 +
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/app/views/dishes/index.html.erb b/app/views/dishes/index.html.erb
index b75c871..0f16f4f 100644
--- a/app/views/dishes/index.html.erb
+++ b/app/views/dishes/index.html.erb
@@ -2,34 +2,41 @@
   <h1>
     <a href="/venues/new" class="btn btn-lg btn-success">Add a new venue</a>
   </h1>
-</div><div class="row mb-1">
+</div>
+<div class="row mb-1">
+  
   <div class="col-md-3">
     <%= search_form_for @q, :class => "collapse", :id => "dishes_filters" do |f| %>
+      
       <p class="lead">Narrow results:</p>
 
     <div class="form-group">
       <%= f.label :name_cont, "Name contains" %>
       <%= f.text_field :name_cont, :class => "form-control", :placeholder => "Name contains" %>
     </div>
-    <div class="form-group">
-      <%= f.label :cuisine_name, "Cuisine" %>
-      
-    <div class = 'checkbox'>
-    <% @cuisines.each do |cuisine|%>
-      <%= f.check_box :cuisine_name, :id => "cuisine_id", :value => cuisine.id%>
-      <p><%= cuisine.name%></P>
+    
+     <div class="form-group">
+
+      <%= f.label :cuisine_id_eq_any, "Cuisine" %>
+          <% @cuisines.each do |cuisine| %>
+          <div class="checkbox">
+            <label>
+              <%= f.check_box :cuisine_id_eq_any, {multiple: true}, cuisine.id, nil %>
+              <%= cuisine.name %>
+            </label>
+          </div>
     <% end %>
     </div>
-    </div>
-
 
     <%= f.submit :class => "btn btn-primary btn-block mb-1" %>
-
+    
       <a href="/dishes" class="btn btn-default btn-block mb-1">Clear filters</a>
+              
     <% end %>
     <a class="btn btn-default btn-block mb-1" data-toggle="collapse" href="#dishes_filters">
       Show Filters
     </a>
+
   </div>
 
 </div>
@@ -53,6 +60,8 @@
             <a href="/venues/<%= dish.bookmarks.find_by(:user_id => current_user.id).venue.id %>">
               <%= dish.bookmarks.find_by(:user_id => current_user.id).venue.name %>
             </a>
+        
+            
           <% else %>
             <form action="/create_bookmark" method="post">
               <!-- Hidden input for authenticity token to protect from forgery -->
@@ -75,6 +84,7 @@
                 <i class="fa fa-heart"></i>
               </button>
 
+      
             </form>
           <% end %>
         </td>
diff --git a/whitelist.yml b/whitelist.yml
index d152ac8..0b3d452 100644
--- a/whitelist.yml
+++ b/whitelist.yml
@@ -5,3 +5,4 @@
 - 50.232.11.130
 - 128.135.98.148
 - 96.47.146.150
+- 203.141.155.157

From 90d51d4b4d43ed63f4b35a9b1ff02ad3e16d9116 Mon Sep 17 00:00:00 2001
From: Larry <larryt10@chicagobooth.edu>
Date: Tue, 28 Nov 2017 20:33:30 +0000
Subject: [PATCH 18/18] Dish show page matches target

Page after selecting a dish from dishes index
---
 app/views/dishes/show.html.erb | 185 ++++++++++++---------------------
 whitelist.yml                  |   1 +
 2 files changed, 69 insertions(+), 117 deletions(-)

diff --git a/app/views/dishes/show.html.erb b/app/views/dishes/show.html.erb
index 9d255e4..9825abb 100644
--- a/app/views/dishes/show.html.erb
+++ b/app/views/dishes/show.html.erb
@@ -1,130 +1,81 @@
-<div class="row">
-  <div class="col-md-12 mb-2">
-    <dl class="dl-horizontal">
-      <dt>Name</dt>
-      <dd><%= @dish.name %></dd>
-
-      <dt>Cuisine</dt>
-      <dd>
-        <% if @dish.cuisine.present? %>
-          <a href="/cuisines/<%= @dish.cuisine_id %>">
-            <%= @dish.cuisine.name %>
-          </a>
-        <% end %>
-      </dd>
-
-    </dl>
-
-    <div class="btn-group btn-group-justified">
-      <a href="/dishes" class="btn btn-primary">
-        <i class="fa fa-chevron-left"></i>
-      </a>
-      <a href="/dishes/<%= @dish.id %>/edit" class="btn btn-warning">
-        Edit
-      </a>
-      <a href="/delete_dish/<%= @dish.id %>" class="btn btn-danger" rel="nofollow">
-        Delete
-      </a>
-    </div>
-  </div>
-</div>
-
 <!-- A Dish has many bookmarks -->
-
 <div class="row">
-  <div class="col-md-12">
+<div class="container-fluid">
+  <div class="col-md-6 col-md-offset-3">
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <h4 class="panel-title">You loved the <%= @dish.name %> at...
+        
+          <span class="label label-danger pull-right"> <%= @dish.cuisine.name %> </span>
+        </h4>
+      </div>
+    
     <ul class="list-group">
-      <li class="list-group-item list-group-item-info">
-        Bookmarks
-      </li>
-
-      <% @dish.bookmarks.each do |bookmark| %>
-        <li class="list-group-item">
-          <a href="/bookmarks/<%= bookmark.id %>">
-            <%= bookmark.notes %>
-          </a>
-          <div class="btn-group btn-group-xs pull-right">
-            <a href="/bookmarks/<%= bookmark.id %>" class="btn btn-primary">
-              <i class="fa fa-search-plus"></i>
-            </a>
-            <a href="/bookmarks/<%= bookmark.id %>/edit" class="btn btn-warning">
-              <i class="fa fa-edit"></i>
-            </a>
-            <a href="/delete_bookmark/<%= bookmark.id %>" class="btn btn-danger" rel="nofollow">
-              <i class="fa fa-trash-o"></i>
-            </a>
-          </div>
-        </li>
-      <% end %>
-
       <li class="list-group-item">
         <form action="/create_bookmark" method="post">
-      <!-- Hidden input for authenticity token to protect from forgery -->
-      <input name="authenticity_token" type="hidden" value="<%= form_authenticity_token %>">
-
-      <!-- Label and input for dish_id -->
-      <input type="hidden" name="dish_id" value="<%= @dish.id %>">
-
-      <!-- Label and input for venue_id -->
-      <div class="form-group">
-        <label for="venue_id" class="control-label">
-          Venue
-        </label>
-
-        <%= select_tag(:venue_id, options_from_collection_for_select(Venue.all, :id, :name), :class => "form-control") %>
-      </div>
-
-      <!-- Label and input for user_id -->
-      <input type="hidden" name="user_id" value="<%= current_user.id %>">
-
-      <!-- Label and input for notes -->
-      <div class="form-group">
-        <label for="notes" class="control-label">
-          Notes
-        </label>
-
-        <textarea id="notes" name="notes" placeholder="Notes" class="form-control" rows="3"></textarea>
-      </div>
-
-      <button class="btn btn-block btn-success">
-        Create Bookmark
-      </button>
-    </form>
-      </li>
-    </ul>
-  </div>
-</div>
-
-
-<!-- A Dish has many specialists -->
-
-<div class="row">
-  <div class="col-md-12">
-    <ul class="list-group">
-      <li class="list-group-item list-group-item-info">
-        Specialists
+          <!-- Hidden input for authenticity token to protect from forgery -->
+          <input name="authenticity_token" type="hidden" value="<%= form_authenticity_token %>">
+    
+          <!-- Label and input for dish_id -->
+          <input type="hidden" name="dish_id" value="<%= @dish.id %>">
+  
+          <!-- Label and input for venue_id -->
+          <div class="form-group" >
+            <label for="venue_id" class="control-label">
+            </label>
+            
+          <!-- Label and input for user_id -->
+          <input type="hidden" name="user_id" value="<%= current_user.id %>">
+          
+          <%= select_tag(:venue_id, options_from_collection_for_select(Venue.all, :id, :name), :class => "form-control", :prompt => "Choose a venue...") %>
+          </div>
+          
+          <button class="btn btn-danger btn">
+            <span class="glyphicon glyphicon-heart" aria-hidden="true"> </span>
+          </button>
+    
+          <small class="pull-right text-muted">
+              right now
+          </small>
+        </form>
       </li>
+       
+      <!-- A Dish has many specialists -->
 
-      <% @dish.specialists.each do |venue| %>
-        <% if venue.bookmarks.find_by(:user_id => current_user.id).present? %>
+      <% @dish.bookmarks.each do |bookmark| %>
+        <% if bookmark.user_id == current_user.id %>
           <li class="list-group-item">
-          <p><a href="/venues/<%= venue.id %>">
-            <%= venue.name %>
-          </a></p>
-          <div class="btn-group btn-group-xs pull-right">
-            <a href="/venues/<%= venue.id %>" class="btn btn-primary">
-              <i class="fa fa-search-plus"></i>
-            </a>
-            <a href="/venues/<%= venue.id %>/edit" class="btn btn-warning">
-              <i class="fa fa-edit"></i>
-            </a>
-            <a href="/delete_venue/<%= venue.id %>" class="btn btn-danger" rel="nofollow">
-              <i class="fa fa-trash-o"></i>
-            </a>
-          </div>
-        </li>
+            <p>
+              <a href="/bookmarks/<%= bookmark.id %>">
+                <%= bookmark.venue.name %>
+              </a>
+              
+              <small class="pull-right text-muted">
+                <%= time_ago_in_words(bookmark.created_at) %>
+                  <a href="/bookmarks/<%= bookmark.id %>/edit" >
+                    <i class="glyphicon glyphicon-edit"></i>
+                  </a>
+                  <a href="/delete_bookmark/<%= bookmark.id %>" rel="nofollow">
+                    <i class="glyphicon glyphicon-trash"></i>
+                  </a>
+              </small>
+            </p>
+          </li>
         <% end %>
       <% end %>
+      
+        <div class="panel-footer">
+          <div class="btn-group btn-group-justified">
+            <a href="/dishes" class="btn btn-block btn-default">
+              <i class="fa fa-chevron-left"></i>
+            </a>
+          </div>
+        </div>
+    </div>
     </ul>
+    
+
+   
   </div>
 </div>
+</div>
diff --git a/whitelist.yml b/whitelist.yml
index 0b3d452..6f0f67f 100644
--- a/whitelist.yml
+++ b/whitelist.yml
@@ -6,3 +6,4 @@
 - 128.135.98.148
 - 96.47.146.150
 - 203.141.155.157
+- 108.75.174.66