From 0e939c8550c3096489448a7cce8a26e7f6f3d07b Mon Sep 17 00:00:00 2001 From: Bianca Date: Mon, 9 Mar 2020 23:19:42 +1100 Subject: [PATCH] Updated --- app/assets/stylesheets/sass/bookings.scss | 30 +++++++++++++++++++ app/assets/stylesheets/sass/kitten-cards.scss | 1 + app/views/bookings/_booking-in.html.erb | 18 +++++++++++ app/views/bookings/_booking-out.html.erb | 0 app/views/kittens/dashboard.html.erb | 6 ++-- 5 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 app/views/bookings/_booking-in.html.erb create mode 100644 app/views/bookings/_booking-out.html.erb diff --git a/app/assets/stylesheets/sass/bookings.scss b/app/assets/stylesheets/sass/bookings.scss index e69de29..bcf05ef 100644 --- a/app/assets/stylesheets/sass/bookings.scss +++ b/app/assets/stylesheets/sass/bookings.scss @@ -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; + } \ No newline at end of file diff --git a/app/assets/stylesheets/sass/kitten-cards.scss b/app/assets/stylesheets/sass/kitten-cards.scss index 26cd771..08e27b8 100644 --- a/app/assets/stylesheets/sass/kitten-cards.scss +++ b/app/assets/stylesheets/sass/kitten-cards.scss @@ -22,6 +22,7 @@ $bootstrap-xl: 1200px; @media (min-width: $bootstrap-lg) { width: 75vw; + grid-template-columns: 1fr 1fr 1fr 1fr; } } diff --git a/app/views/bookings/_booking-in.html.erb b/app/views/bookings/_booking-in.html.erb new file mode 100644 index 0000000..5ed5a85 --- /dev/null +++ b/app/views/bookings/_booking-in.html.erb @@ -0,0 +1,18 @@ +<% if @kittens.joins(:bookings).where(bookings: { kitten_id: @kittens.ids} ).exists? %> +
+ <% @kittens.joins(:bookings).where(bookings: { kitten_id: @kittens.ids} ).each do |kitten| %> + + <% end %> +
+<% end %> \ No newline at end of file diff --git a/app/views/bookings/_booking-out.html.erb b/app/views/bookings/_booking-out.html.erb new file mode 100644 index 0000000..e69de29 diff --git a/app/views/kittens/dashboard.html.erb b/app/views/kittens/dashboard.html.erb index f8882bc..d680eeb 100644 --- a/app/views/kittens/dashboard.html.erb +++ b/app/views/kittens/dashboard.html.erb @@ -20,10 +20,8 @@ <% Booking.where(user_id: current_user.id).each do |booking| %> <%= render 'bookings/booking', booking: booking %> <% end %> - - <%# @kittens.join(:bookings).where(user_id: current_user.id).each do |kitten| %> - <%#= render 'cards', kitten: kitten %> - <%# end %> +

Booking requests

+ <%= render 'bookings/booking-in', kitten: @kittens %>