Skip to content

Commit

Permalink
Updated
Browse files Browse the repository at this point in the history
  • Loading branch information
Bianca committed Mar 9, 2020
1 parent 557ce61 commit 0e939c8
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 4 deletions.
30 changes: 30 additions & 0 deletions app/assets/stylesheets/sass/bookings.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// Booking in

// Use Bootstrap breakpoints for consistency.
$bootstrap-sm: 576px;
$bootstrap-md: 768px;
$bootstrap-lg: 992px;
$bootstrap-xl: 1200px;

.booking-in-cards {
display: grid;
grid-gap: 2rem;
grid-template-columns: 1fr;
margin: 0 auto 0 auto;
}

.booking-in-card {
place-self: center stretch;
box-shadow: 0 0 .5rem $secondary;
border-color: $primary;
border-width: 1px;
border-style: solid;
border-radius: .5rem;
a:hover {
text-decoration: none;
};
}

.booking-in-card:hover {
box-shadow: 0 0 1rem $primary;
}
1 change: 1 addition & 0 deletions app/assets/stylesheets/sass/kitten-cards.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ $bootstrap-xl: 1200px;

@media (min-width: $bootstrap-lg) {
width: 75vw;
grid-template-columns: 1fr 1fr 1fr 1fr;
}
}

Expand Down
18 changes: 18 additions & 0 deletions app/views/bookings/_booking-in.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<% if @kittens.joins(:bookings).where(bookings: { kitten_id: @kittens.ids} ).exists? %>
<div class="booking-in-cards">
<% @kittens.joins(:bookings).where(bookings: { kitten_id: @kittens.ids} ).each do |kitten| %>
<div class="booking-in-card card border-primary mb-3">
<a href="<%= url_for(kitten_path(kitten)) %>">
<div class="booking-in-card-img" style="background-image: url(<%= card_image_url(kitten) %>)">
</div>
<div class="card-header">
<h4><%= kitten.name %></h4>
</div>
<div class="card-body">
<h5><%= kitten.breed %></h5>
</div>
</a>
</div>
<% end %>
</div>
<% end %>
Empty file.
6 changes: 2 additions & 4 deletions app/views/kittens/dashboard.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@
<% Booking.where(user_id: current_user.id).each do |booking| %>
<%= render 'bookings/booking', booking: booking %>
<% end %>
<!-- <h3>Requested kitties</h3>-->
<%# @kittens.join(:bookings).where(user_id: current_user.id).each do |kitten| %>
<%#= render 'cards', kitten: kitten %>
<%# end %>
<h3>Booking requests</h3>
<%= render 'bookings/booking-in', kitten: @kittens %>
</section>
</div>
<section class="dash-kitten-cards">
Expand Down

0 comments on commit 0e939c8

Please sign in to comment.