Design update, app is complete now

miztrz · Mar 12, 2020 · 2012900 · 2012900
1 parent 86be619
commit 2012900
Show file tree

Hide file tree

Showing 29 changed files with 57 additions and 214 deletions.
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -40,10 +40,6 @@ p, em, strong {
   font-size: small;
   }
 
-.btn {
-  margin: 1vw;
-  }
-
 // Login & user creation screens
 
 .user-screens {

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,6 +1,10 @@
 class ApplicationController < ActionController::Base
 	before_action :configure_permitted_parameters, if: :devise_controller?
 
+	def after_sign_in_path_for(user)
+		stored_location_for(user) || dashboard_path
+	end
+
 	protected
 
 	def configure_permitted_parameters

diff --git a/app/controllers/page_controller.rb b/app/controllers/page_controller.rb
@@ -5,9 +5,4 @@ def dashboard
     @bookings_out = Booking.where(user_id: current_user.id)
   end
 
-  def home
-  end
-
-  def about
-  end
 end
diff --git a/app/views/bookings/_booking-in-flags.html.erb b/app/views/bookings/_booking-in-flags.html.erb
@@ -1,4 +1,4 @@
-<div class="card-text text-center text-primary">
+<div class="card-text text-center text-primary flex-column justify-content-center">
 	<% state = state(booking) %>
 	<% if state.start_with? "error" %>
 		<h5>Please log a ticket <a href="https://github.com/miztrz/kitnappd/issues">here</a> and quote error code <%= state.delete_prefix("error ") %>. We will resolve this as soon as possible.</h5>

diff --git a/app/views/bookings/_booking-out-flags.html.erb b/app/views/bookings/_booking-out-flags.html.erb
@@ -1,4 +1,4 @@
-<div class="card-text text-center text-primary mb-3">
+<div class="card-text text-center text-primary row d-flex justify-content-center">
 	<% state = state(booking) %>
 	<% if state.start_with? "error" %>
 		<h5>Please log a ticket <a href="https://github.com/miztrz/kitnappd/issues">here</a> and quote error code <%= state.delete_prefix("error ") %>. We will resolve this as soon as possible.</h5>

diff --git a/app/views/bookings/_form.html.erb b/app/views/bookings/_form.html.erb
@@ -5,7 +5,7 @@
     <%= form.label 'End date', class: "col-sm-2 col-form-label" %>
     <%= form.date_field :end_time, type:'date', class: "form-control col-sm-4" %>
   </div>
-  <div class="actions">
-    <%= form.submit "Create booking", class: "btn btn-primary btn-block" %>
+  <div class="row d-flex justify-content-center">
+    <%= form.submit "Create booking", class: "btn btn-outline-primary" %>
   </div>
 <% end %>
diff --git a/app/views/bookings/edit.html.erb b/app/views/bookings/edit.html.erb
diff --git a/app/views/bookings/index.html.erb b/app/views/bookings/index.html.erb
diff --git a/app/views/bookings/index.json.jbuilder b/app/views/bookings/index.json.jbuilder
diff --git a/app/views/bookings/new.html.erb b/app/views/bookings/new.html.erb
diff --git a/app/views/bookings/show.html.erb b/app/views/bookings/show.html.erb
diff --git a/app/views/bookings/show.json.jbuilder b/app/views/bookings/show.json.jbuilder
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
@@ -17,10 +17,7 @@
 	  <em class="text-muted col-sm-12">(we need your current password to confirm your changes)</em>
   </div>
   <div class="form-group row d-flex justify-content-around">
-	  <%= f.submit "Update", class: "btn btn-primary btn-block" %>
-  </div>
-	<div class="form-group row d-flex justify-content-around">
-		<%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete, class: "btn btn-primary btn-block"  %>
+	  <%= f.submit "Update", class: "btn btn-outline-primary" %>
 	</div>
 <% end %>
 <%= render "devise/shared/links" %>
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
@@ -22,8 +22,8 @@
     <%= f.label 'Confirm', class: "col-sm-3 col-form-label" %><br />
     <%= f.password_field :password_confirmation, autocomplete: "new-password", class: "form-control col-sm-9", placeholder: "Password confirmation" %>
   </div>
-  <div class="form-group row d-flex justify-content-around">
-	  <%= f.submit "Sign up", class: "btn btn-primary btn-block" %>
+  <div class="form-group row d-flex justify-content-center">
+	  <%= f.submit "Sign up", class: "btn btn-outline-primary" %>
   </div>
 <% end %>
 <%= render "devise/shared/links" %>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
@@ -11,8 +11,8 @@
     <%= f.label :password, class: "col-sm-3 col-form-label" %><br />
     <%= f.password_field :password, autocomplete: "current-password", class: "form-control col-sm-9", placeholder: "Password" %>
   </div>
-  <div class="form-group row d-flex justify-content-around">
-    <%= f.submit "Log in", class: "btn btn-primary btn-block" %>
+  <div class="form-group row d-flex justify-content-center">
+    <%= f.submit "Log in", class: "btn btn-outline-primary mb-3" %>
   </div>
 <% end %>
 <%= render "devise/shared/links" %>
diff --git a/app/views/devise/shared/_links.html.erb b/app/views/devise/shared/_links.html.erb
@@ -1,47 +1,26 @@
+<div class="form-group row d-flex justify-content-around">
 <%- if controller_name != 'sessions' && !user_signed_in? %>
-	<div class="form-group row d-flex justify-content-around">
-    <%= link_to "Log in", new_session_path(resource_name), class: "btn btn-primary btn-block" %>
-	</div>
+    <%= link_to "Log in", new_session_path(resource_name), class: "btn btn-outline-primary" %>
 <% end %>
-
 <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
-	<div class="form-group row d-flex justify-content-around">
-		<%= link_to "Sign up", new_registration_path(resource_name), class: "btn btn-primary btn-block" %>
-	</div>
+		<%= link_to "Sign up", new_registration_path(resource_name), class: "btn btn-outline-primary" %>
 <% end %>
-
 <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
-	<div class="form-group row d-flex justify-content-around">
-		<%= link_to "Forgot your password?", new_password_path(resource_name), class: "btn btn-primary btn-block" %>
-	</div>
+		<%= link_to "Forgot your password?", new_password_path(resource_name), class: "btn btn-outline-primary" %>
 <% end %>
-
 <%- if user_signed_in? && controller_name == 'registrations' %>
-	<div class="form-group row d-flex justify-content-around">
-		<%= link_to "Change password", edit_password_path(resource_name), class: "btn btn-primary btn-block" %>
-	</div>
+		<%= link_to "Change password", edit_password_path(resource_name), class: "btn btn-outline-primary" %>
 <% end %>
-
 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
-	<div class="form-group row d-flex justify-content-around">
-		<%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name), class: "btn btn-primary btn-block" %>
-	</div>
+		<%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name), class: "btn btn-outline-primary" %>
 <% end %>
-
 <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
-	<div class="form-group row d-flex justify-content-around">
-		<%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name), class: "btn btn-primary btn-block" %>
-	</div>
+		<%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name), class: "btn btn-outline-primary" %>
 <% end %>
-
 <%- if devise_mapping.omniauthable? %>
   <%- resource_class.omniauth_providers.each do |provider| %>
-		<div class="form-group row d-flex justify-content-around">
-			<%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), class: "btn btn-primary btn-block" %>
-		</div>
+			<%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), class: "btn btn-outline-primary" %>
   <% end %>
 <% end %>
-
-<div class="form-group row d-flex justify-content-around">
-	<%= link_to "Back", :back , class: "btn btn-primary btn-block" %>
+<%= link_to "Back", :back , class: "btn btn-outline-primary" %>
 </div>
diff --git a/app/views/kittens/_form.html.erb b/app/views/kittens/_form.html.erb
@@ -1,7 +1,8 @@
-<%= form_with(model: kitten, local: true) do |form| %>
+<section class="container">
+	<%= form_with(model: kitten, local: true) do |form| %>
 	
 	<% if kitten.errors.any? %>
-		<div id="error_explanation" class="alert alert-warning alert-dismissible fade show" role="alert" >
+		<div id="error_explanation" class="alert alert-warning alert-dismissible fade show" role="alert">
 			<h5><%= pluralize(kitten.errors.count, "error") %> prohibited this kitten from being saved:</h5>
 			<ul>
 				<% kitten.errors.full_messages.each do |message| %>
@@ -12,21 +13,21 @@
 				<span aria-hidden="true">&times;</span>
 			</button>
 		</div>
-	<% end %>l
+	<% end %>
   <div class="form-group row">
     <%= form.label :name, class: "col-sm-2 col-form-label"  %>
 	  <div class="input-group col-sm-4 mb-3">
-    <%= form.text_field :name, class: "form-control col-sm-4", placeholder: "Kitten Name" %>
+    <%= form.text_field :name, class: "form-control", placeholder: "Kitten Name" %>
 	  </div>
     <%= form.label :breed, class: "col-sm-2 col-form-label"  %>
 	  <div class="input-group col-sm-4 mb-3">
-    <%= form.text_field :breed, class: "form-control col-sm-4", placeholder: "Kitten Breed" %>
+    <%= form.text_field :breed, class: "form-control", placeholder: "Kitten Breed" %>
 	  </div>
   </div>
   <div class="form-group row">
     <%= form.label :description, class: "col-sm-2 col-form-label"  %>
-	  <div class="input-group col-sm-4 mb-3">
-    <%= form.text_area :description, class: "form-control col-sm-10" %>
+	  <div class="input-group  col-sm-10 mb-3">
+    <%= form.text_area :description, class: "form-control" %>
 	  </div>
   </div>
   <div class="form-group row">
@@ -48,7 +49,9 @@
 	<% if kitten.images.attached? %>
 		<%= render 'imagegallery' %>
 	<% end %>
-	<div class="actions">
-    <%= form.submit class:"btn btn-primary btn-block col-12" %>
+	<div class="form-group row d-flex justify-content-around">
+    <%= form.submit class:"btn btn-outline-primary" %>
+		<%= link_to 'Back', kittens_path, class: "btn btn-outline-primary" %>
   </div>
-<% end %>
+<% end %>
+</section>
diff --git a/app/views/kittens/_kitten.json.jbuilder b/app/views/kittens/_kitten.json.jbuilder
diff --git a/app/views/kittens/edit.html.erb b/app/views/kittens/edit.html.erb
@@ -1,6 +1,2 @@
-<h1>Editing </h1>
-
-<%= render 'form', kitten: @kitten %>
-
-<%= link_to 'Show', @kitten %> |
-<%= link_to 'Back', kittens_path %>
+<% @page_title = "Editing #{@kitten.name}" %>
+<%= render 'form', kitten: @kitten %>
diff --git a/app/views/kittens/index.json.jbuilder b/app/views/kittens/index.json.jbuilder
diff --git a/app/views/kittens/new.html.erb b/app/views/kittens/new.html.erb
@@ -1,5 +1,2 @@
-<h1>New Kitten</h1>
-
-<%= render 'form', kitten: @kitten %>
-
-<%= link_to 'Back', kittens_path %>
+<% @page_title = "New Kitten" %>
+<%= render 'form', kitten: @kitten %>
diff --git a/app/views/kittens/show.html.erb b/app/views/kittens/show.html.erb
@@ -12,6 +12,12 @@
 		<h5 class="col-sm-3">Description</h5>
 		<h6 class="col-sm-9"><%= @kitten.description %></h6>
 	</div>
+	<div class="row d-flex justify-content-around mb-3">
+		<% if user_signed_in? && @kitten.user_id == current_user.id %>
+			<%= link_to 'Edit', edit_kitten_path(@kitten), class:"btn btn-outline-primary" %>
+		<% end %>
+		<%= link_to 'Back', _back_url, class:"btn btn-outline-primary" %>
+	</div>
 </section> <!-- kitten-details -->
 
 <section class="container kitten-images">
@@ -39,10 +45,3 @@
 	<%= render 'bookings/form' %>
 <% end %>
 </section>
-
-<section class="container">
-	<% if user_signed_in? && @kitten.user_id == current_user.id %>
-		<%= link_to 'Edit', edit_kitten_path(@kitten), class:"btn btn-primary btn-block" %>
-	<% end %>
-	<%= link_to 'Back', _back_url, class:"btn btn-primary btn-block" %>
-</section>
diff --git a/app/views/kittens/show.json.jbuilder b/app/views/kittens/show.json.jbuilder
diff --git a/app/views/layouts/_nav.html.erb b/app/views/layouts/_nav.html.erb
@@ -17,7 +17,7 @@
 			<ul class="navbar-nav">
 				<% if user_signed_in? %>
 					<li class="nav-item">
-						<%= link_to 'Dashboard', page_dashboard_path, class: 'nav-link' %>
+						<%= link_to 'Dashboard', dashboard_path, class: 'nav-link' %>
 					</li>
 					<li class="nav-item">
 						<%= link_to 'Logout', destroy_user_session_path, method: :delete, class: 'nav-link' %>

diff --git a/app/views/page/about.html.erb b/app/views/page/about.html.erb
diff --git a/app/views/page/dashboard.html.erb b/app/views/page/dashboard.html.erb
@@ -8,9 +8,9 @@
 				<h5 class="col-sm-2">Email:</h5>
 				<h6 class="col-sm-10"><%= current_user.email %></h6>
 			</div>
-			<div class="form-group row d-flex justify-content-between">
-				<%= link_to "Edit details", edit_user_registration_path(current_user), class: "col-md-10 btn btn-primary btn-block" %>
-				<%= link_to "Change password", edit_user_password_path(current_user), class: "col-md-10 btn btn-primary btn-block" %>
+			<div class="form-group row d-flex justify-content-around">
+				<%= link_to "Edit", edit_user_registration_path(current_user), class: "btn btn-outline-primary" %>
+				<%= link_to "Change password", edit_user_password_path(current_user), class: "btn btn-outline-primary" %>
 			</div>
 		</section>
 		<section class="dash-bookings">
@@ -24,8 +24,8 @@
 	</div>
 <section class="dash-kitten-cards">
 	<h2>Your Kittens</h2>
-	<div class="form-group row d-flex justify-content-between">
-		<%= link_to "New kitten", new_kitten_path, class: "btn btn-primary btn-block" %>
+	<div class="form-group row d-flex justify-content-center">
+		<%= link_to "New kitten", new_kitten_path, class: "btn btn-outline-primary" %>
 	</div>
 	<div class="kitten-cards">
 		<% @kittens.each do |kitten| %>