Skip to content

Reformat venues page #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
smd68 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Reformat venues page #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3afea3a
Added grade token
smd68 Nov 21, 2017
3cbec84
removed extraneous links from navbar and set home index to dishes index
smd68 Nov 21, 2017
297aef7
Merge pull request #1 from smd68/clean-up-navbar
smd68 Nov 21, 2017
b95dc1a
reformated venues page
smd68 Nov 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
166 changes: 58 additions & 108 deletions app/views/venues/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -134,4 +80,8 @@
handler.bounds.extendWith(markers);
handler.fitMapToBounds();
});
</script>
</script>

</div>


2 changes: 1 addition & 1 deletion config/routes.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Rails.application.routes.draw do
root :to => "venues#index"
root :to => "dishes#index"

# Routes for the Bookmark resource:
# CREATE
Expand Down
2 changes: 1 addition & 1 deletion grades.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---
submission_url: https://grades.firstdraft.com
project_token: ''
personal_access_token:
personal_access_token: yYeWb3zbtdJJbzn95FRDuKPw
1 change: 1 addition & 0 deletions whitelist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
- 127.0.0.1
- 10.240.0.0/16
- "::1"
- 38.124.109.21