From 3afea3a10c34c530142b6517d906c6d5a2e072aa Mon Sep 17 00:00:00 2001
From: Scott Dotto <sdotto@chicagobooth.edu>
Date: Tue, 21 Nov 2017 15:20:00 +0000
Subject: [PATCH 1/3] Added grade token

---
 grades.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grades.yml b/grades.yml
index 2f40b8d..3e4e34d 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: yYeWb3zbtdJJbzn95FRDuKPw

From 3cbec847432be559cd33e00829a946780dc417cf Mon Sep 17 00:00:00 2001
From: Scott Dotto <sdotto@chicagobooth.edu>
Date: Tue, 21 Nov 2017 15:26:00 +0000
Subject: [PATCH 2/3] removed extraneous links from navbar and set home index
 to dishes index

---
 app/views/layouts/application.html.erb | 5 -----
 config/routes.rb                       | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 881e961..b51f355 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">
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 b95dc1abf43fa44dad6be33c0e64b034e5b07b3e Mon Sep 17 00:00:00 2001
From: Scott Dotto <sdotto@chicagobooth.edu>
Date: Mon, 27 Nov 2017 16:10:41 +0000
Subject: [PATCH 3/3] reformated venues page

---
 app/views/venues/index.html.erb | 166 +++++++++++---------------------
 whitelist.yml                   |   1 +
 2 files changed, 59 insertions(+), 108 deletions(-)

diff --git a/app/views/venues/index.html.erb b/app/views/venues/index.html.erb
index 169f95b..8989935 100644
--- a/app/views/venues/index.html.erb
+++ b/app/views/venues/index.html.erb
@@ -1,129 +1,75 @@
-<div class="page-header">
-  <h1>
-    Venues
-    <a href="/venues/new" class="btn btn-lg btn-success">New Venue</a>
-  </h1>
-</div><div class="row mb-1">
-  <div class="col-md-12">
-    <%= search_form_for @q, :class => "collapse", :id => "venues_filters" do |f| %>
-      <p class="lead">Narrow results:</p>
+  <div class="container">
 
-        <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 :bookmarks_notes_cont, "Bookmark notes contains" %>
-      <%= f.text_field :bookmarks_notes_cont, :class => "form-control", :placeholder => "Bookmark notes contains" %>
-    </div>
+    <div class="row mt-2 mb-1">
+  <div class="col-md-3">
+    <form class="collapse" id="venues_filters" action="/venues" accept-charset="UTF-8" method="get"><input name="utf8" type="hidden" value="&#x2713;" />
+    <p class="lead">Narrow results:</p>
 
-<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 class="form-group">
+      <label for="q_name_cont">Name contains</label>
+      <input class="form-control" placeholder="Name contains" type="text" name="q[name_cont]" id="q_name_cont" />
     </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">
+      <label for="q_bookmarks_notes_or_specialties_name_cont">Bookmarked dish name contains</label>
+      <input class="form-control" placeholder="Bookmarked dish name contains" type="text" name="q[bookmarks_notes_or_specialties_name_cont]" id="q_bookmarks_notes_or_specialties_name_cont" />
     </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" %>
+    <div class="form-group">
+      <label for="q_neighborhood_name_cont">Neighborhood name contains</label>
+      <input class="form-control" placeholder="Neighborhood name contains" type="text" name="q[neighborhood_name_cont]" id="q_neighborhood_name_cont" />
     </div>
 
-      <%= f.submit :class => "btn btn-primary btn-block mb-1" %>
+    <input type="submit" name="commit" value="Search" class="btn btn-primary btn-block mb-1" data-disable-with="Search" />
 
-      <a href="/venues" 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="#venues_filters">
+    <a href="/venues" class="btn btn-default btn-block mb-1">Clear filters</a>
+</form>    <a class="btn btn-default btn-block mb-1" data-toggle="collapse" href="#venues_filters">
       Show Filters
     </a>
   </div>
-</div>
-
-
-<div class="row m-b-2">
-  <div class="col-md-12">
-    <div>
-      <div id="location_map" style="height: 480px;"></div>
-    </div>
-  </div>
-</div>
 
-<div class="row">
-  <div class="col-md-12">
-    <table class="table table-striped table-hover">
-      <tr>
-        <th>Name</th>
-        <th>Address</th>
-        <th>Neighborhood</th>
-        <th>Actions</th>
-      </tr>
+  <div class="col-md-6">
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <h4 class="panel-title">
+          Places you've bookmarked
+        </h4>
+      </div>
 
+      <div class="panel-body">
+        <div id="location_map" style="height: 360px;"></div>
+      </div>
+      
       <% @venues.each do |venue| %>
-      <tr>
-        <td><%= venue.name %></td>
-        <td><%= venue.address %></td>
-        <td>
-          <% if venue.neighborhood.present? %>
-            <a href="/neighborhoods/<%= venue.neighborhood.id %>">
-              <%= venue.neighborhood.name %>
-            </a>
-          <% end %>
-        </td>
-        <td>
-          <a href="/venues/<%= venue.id %>" class="btn btn-primary">Show</a>
-          <a href="/venues/<%= venue.id %>/edit" class="btn btn-warning">Edit</a>
-          <a href="/delete_venue/<%= venue.id %>" class="btn btn-danger" rel="nofollow">Delete</a>
-        </td>
-      </tr>
+        <ul class="list-group">
+            <li class="list-group-item">
+              <a href="/venues/<%=venue.id%>">
+                <%=venue.name%>
+              </a>
+  
+              <small class="text-muted pull-right">
+                <%= venue.neighborhood.name%>,
+                Chicago
+              </small>
+            </li>
+        </ul>
       <% end %>
-    </table>
-    <%= paginate @venues, theme: 'twitter-bootstrap-4' %>
+
+      <div class="panel-footer text-center">
+        
+      </div>
+    </div>
+  </div>
+      
+  <div class="col-md-3">
+    <a href="/venues/new" class="btn btn-block btn-success">
+      Add a new venue
+    </a>
   </div>
 </div>
+      
+
 
 <script src="//maps.google.com/maps/api/js?v=3.24&key=AIzaSyCOTPWiuvyyo6sKoIBzKA4-1ol-vTOIOlM"></script>
 <script src="//cdn.rawgit.com/mahnunchik/markerclustererplus/master/dist/markerclusterer.min.js"></script>
@@ -134,4 +80,8 @@
     handler.bounds.extendWith(markers);
     handler.fitMapToBounds();
   });
-</script>
\ No newline at end of file
+</script>
+
+</div>
+
+
diff --git a/whitelist.yml b/whitelist.yml
index ab11e34..3e16732 100644
--- a/whitelist.yml
+++ b/whitelist.yml
@@ -2,3 +2,4 @@
 - 127.0.0.1
 - 10.240.0.0/16
 - "::1"
+- 38.124.109.21