From 639b8bfe27ed294e72daf89290cba9bcf7ad3835 Mon Sep 17 00:00:00 2001
From: 5andu <sandugolovatenco@gmail.com>
Date: Fri, 22 Dec 2023 02:15:58 +0100
Subject: [PATCH] devise pages design improvements

---
 app/views/devise/passwords/edit.html.erb       | 18 ++++++++++--------
 app/views/devise/passwords/new.html.erb        |  4 ++--
 app/views/devise/registrations/new.html.erb    | 14 ++++++++++----
 app/views/devise/sessions/new.html.erb         | 18 ++++++++++++------
 .../devise/shared/_devise_sub_heading.html.erb |  5 +++++
 5 files changed, 39 insertions(+), 20 deletions(-)
 create mode 100644 app/views/devise/shared/_devise_sub_heading.html.erb

diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
index 023b0576..a61fa37e 100644
--- a/app/views/devise/passwords/edit.html.erb
+++ b/app/views/devise/passwords/edit.html.erb
@@ -1,30 +1,32 @@
-<%= render 'devise/shared/devise_heading', title: 'Change your password' %>
 <div class="min-h-screen flex justify-center py-12 px-4 sm:px-6 lg:px-8">
   <div class="max-w-md w-full">
+    <%= render 'devise/shared/devise_heading', title: 'Change your password' %>
+
     <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: "mt-8", method: :put }) do |f| %>
       <%= render "devise/shared/error_messages", resource: resource %>
       <%= f.hidden_field :reset_password_token %>
 
-      <div class="field mb-2">
+      <div class="field mb-3">
         <%= f.label :password, "New password" %><br />
         <% if @minimum_password_length %>
           <em>(<%= @minimum_password_length %> characters minimum)</em><br />
         <% end %>
-        <%= f.password_field :password, autofocus: true, autocomplete: "new-password", class: "appearance-none rounded-b-md rounded-t-md relative block w-full px-3 py-2 border border-gray-300 placeholder-gray-500 text-gray-900 focus:outline-none focus:border-primary-300 focus:ring-primary-500 focus:z-10 sm:text-sm sm:leading-5" %>
+        <%= f.password_field :password, autofocus: true, autocomplete: "new-password", class: "my-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-primary-500 focus:ring focus:ring-primary-500 focus:ring-opacity-50" %>
       </div>
 
-      <div class="field mb-2">
+      <div class="field mb-3">
         <%= f.label :password_confirmation, "Confirm new password" %><br />
-        <%= f.password_field :password_confirmation, autocomplete: "new-password", class: "appearance-none rounded-b-md rounded-t-md relative block w-full px-3 py-2 border border-gray-300 placeholder-gray-500 text-gray-900 focus:outline-none focus:border-primary-300 focus:ring-primary-500 focus:z-10 sm:text-sm sm:leading-5" %>
+        <%= f.password_field :password_confirmation, autocomplete: "new-password", class: "my-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-primary-500 focus:ring focus:ring-primary-500 focus:ring-opacity-50" %>
       </div>
 
       <div class="mt-6">
-        <%= f.submit "Change my password", class: "group relative w-full flex justify-center py-2 px-4 border border-transparent text-sm leading-5 font-medium rounded-md text-white bg-primary-600 hover:bg-primary-700 focus:outline-none transition duration-150 ease-in-out cursor-pointer" %>
+        <%= f.submit "Change my password", class: "group relative w-full flex justify-center py-2.5 px-4 border border-transparent text-sm leading-5 font-medium rounded-md text-white bg-primary-600 hover:bg-primary-700 focus:outline-none cursor-pointer" %>
       </div>
     <% end %>
 
-    <div class="flex space-x-3 justify-center">
-      <%= render "devise/shared/links" %>
+    <div class="flex space-x-3 justify-center mt-2">
+      <%= link_to "Log in", new_user_session_path, class: "text-sm leading-5 font-medium text-gray-600 hover:text-gray-500 focus:outline-none focus:underline transition ease-in-out duration-150" %>
+      <%= link_to "Sign up", new_user_registration_path, class: "text-sm leading-5 font-medium text-gray-600 hover:text-gray-500 focus:outline-none focus:underline transition ease-in-out duration-150" %>
     </div>
   </div>
 </div>
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
index f09de441..24bdbf48 100644
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -6,11 +6,11 @@
       <%= render "devise/shared/error_messages", resource: resource %>
 
       <div class="mb-2">
-        <input aria-label="Email address" name="user[email]" id="user_email" type="email" required autofocus class="appearance-none rounded-b-md rounded-t-md relative block w-full px-3 py-2 border border-gray-300 placeholder-gray-500 text-gray-900 focus:outline-none focus:border-primary-300 focus:ring-primary-500 focus:z-10 sm:text-sm sm:leading-5" placeholder="Enter your email" />
+        <input aria-label="Email address" name="user[email]" id="user_email" type="email" required autofocus class="my-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-primary-500 focus:ring focus:ring-primary-500 focus:ring-opacity-50" placeholder="Enter your email" />
       </div>
 
       <div class="mt-6">
-        <button type="submit" data-turbo="false" class="group relative w-full flex justify-center py-2 px-4 border border-transparent text-sm leading-5 font-medium rounded-md text-white bg-primary-600 hover:bg-primary-700 focus:outline-none transition duration-150 ease-in-out">
+        <button type="submit" data-turbo="false" class="group relative w-full flex justify-center py-2.5 px-4 border border-transparent text-sm leading-5 font-medium rounded-lg text-white bg-primary-600 hover:bg-primary-700 focus:outline-none transition">
           <span class="absolute left-0 inset-y-0 flex items-center pl-3">
             <svg class="h-5 w-5 transition ease-in-out duration-150" fill="white" viewBox="0 0 20 20">
               <path fill-rule="evenodd" d="M5 9V7a5 5 0 0110 0v2a2 2 0 012 2v5a2 2 0 01-2 2H5a2 2 0 01-2-2v-5a2 2 0 012-2zm8-2v2H7V7a3 3 0 016 0z" clip-rule="evenodd" />
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
index b0dfc535..336b7f9f 100644
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -1,20 +1,21 @@
 <div class="min-h-screen flex justify-center py-12 px-4 sm:px-6 lg:px-8">
   <div class="max-w-md w-full">
-    <%= render 'devise/shared/devise_heading', title: 'Get started' %>
+    <%= render 'devise/shared/devise_heading', title: 'Sign up' %>
+    <%= render "devise/shared/devise_sub_heading", subtitle: "Create your account." %>
 
     <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: {class: "mt-8"}) do |f| %>
       <%= render "devise/shared/error_messages", resource: resource %>
 
       <div class="mb-2">
         <% prefilled_email = params[:email].present? ? params[:email] : '' %>
-        <input aria-label="Email address" name="user[email]" id="user_email" type="email" required value="<%= prefilled_email %>" class="appearance-none rounded-b-md rounded-t-md relative block w-full px-3 py-2 border border-gray-300 placeholder-gray-500 text-gray-900 focus:outline-none focus:border-primary-300 focus:ring-primary-500 focus:z-10 sm:text-sm sm:leading-5" placeholder="Email address" />
+        <input aria-label="Email address" name="user[email]" id="user_email" type="email" required value="<%= prefilled_email %>" class="my-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-primary-500 focus:ring focus:ring-primary-500 focus:ring-opacity-50" placeholder="Email address" />
       </div>
       <div class="mb-2">
-        <input aria-label="Password" name="user[password]" id="user_password" type="password" required <%= "autofocus" if prefilled_email.present? %> class="appearance-none rounded-b-md rounded-t-md relative block w-full px-3 py-2 border border-gray-300 placeholder-gray-500 text-gray-900 focus:outline-none focus:border-primary-300 focus:ring-primary-500 focus:z-10 sm:text-sm sm:leading-5" placeholder="Password" />
+        <input aria-label="Password" name="user[password]" id="user_password" type="password" class="my-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-primary-500 focus:ring focus:ring-primary-500 focus:ring-opacity-50" placeholder="Password" required <%= "autofocus" if prefilled_email.present? %> />
       </div>
 
       <div class="mt-6">
-        <button type="submit" data-turbo="false" class="group relative w-full flex justify-center py-2 px-4 border border-transparent text-sm leading-5 font-medium rounded-md text-white bg-primary-600 hover:bg-primary-700 focus:outline-none transition duration-150 ease-in-out">
+        <button type="submit" data-turbo="false" class="group relative w-full flex justify-center py-2.5 px-4 border border-transparent text-sm leading-5 font-medium rounded-md text-white bg-primary-600 hover:bg-primary-700 focus:outline-none">
           <span class="absolute left-0 inset-y-0 flex items-center pl-3">
             <svg class="h-5 w-5 transition ease-in-out duration-150" fill="white" viewBox="0 0 20 20">
               <path fill-rule="evenodd" d="M5 9V7a5 5 0 0110 0v2a2 2 0 012 2v5a2 2 0 01-2 2H5a2 2 0 01-2-2v-5a2 2 0 012-2zm8-2v2H7V7a3 3 0 016 0z" clip-rule="evenodd" />
@@ -24,5 +25,10 @@
         </button>
       </div>
     <% end %>
+
+    <div class="mt-6 text-center text-gray-400">
+      Already have an account?
+      <%= link_to 'Log in', new_user_session_path, class: 'font-medium text-gray text-gray-500 hover:text-gray-600 focus:outline-none focus:underline transition ease-in-out duration-150' %>
+    </div>
   </div>
 </div>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 265f97c1..8b876eba 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -1,32 +1,33 @@
 <div class="min-h-screen flex justify-center py-12 px-4 sm:px-6 lg:px-8">
   <div class="max-w-md w-full">
-    <%= render 'devise/shared/devise_heading', title: 'Log In' %>
+    <%= render 'devise/shared/devise_heading', title: 'Log in to your account' %>
+    <%= render "devise/shared/devise_sub_heading", subtitle: "Welcome back! Please enter your details." %>
 
     <%= form_for(resource, as: resource_name, url: session_path(resource_name), html: {class: "mt-8"}) do |f| %>
       <%= render "devise/shared/error_messages", resource: resource %>
 
       <div class="mb-2">
-        <input aria-label="Email address" autofocus name="user[email]" id="user_email" type="email" required class="appearance-none rounded-b-md rounded-t-md relative block w-full px-3 py-2 border border-gray-300 placeholder-gray-500 text-gray-900 focus:outline-none focus:border-primary-300 focus:ring-primary-500 focus:z-10 sm:text-sm sm:leading-5" placeholder="Email address" />
+        <input aria-label="Email address" autofocus name="user[email]" id="user_email" type="email" required class="my-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-primary-500 focus:ring focus:ring-primary-500 focus:ring-opacity-50" placeholder="Email address" />
       </div>
       <div class="mb-2">
-        <input aria-label="Password" name="user[password]" id="user_password" type="password" required class="appearance-none rounded-b-md rounded-t-md relative block w-full px-3 py-2 border border-gray-300 placeholder-gray-500 text-gray-900 focus:outline-none focus:border-primary-300 focus:ring-primary-500 focus:z-10 sm:text-sm sm:leading-5" placeholder="Password" />
+        <input aria-label="Password" name="user[password]" id="user_password" type="password" required class="my-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-primary-500 focus:ring focus:ring-primary-500 focus:ring-opacity-50" placeholder="Password" />
       </div>
 
       <div class="mt-6 flex items-center justify-between">
         <div class="flex items-center">
-          <input name="user[remember_me]" id="user_remember_me" type="checkbox" class="form-checkbox h-4 w-4 text-primary transition duration-150 ease-in-out text-primary-500 focus:border-primary-300 focus:ring-primary-500 rounded" />
+          <input name="user[remember_me]" id="user_remember_me" type="checkbox" class="form-checkbox h-4 w-4 transition duration-150 ease-in-out text-primary-700 focus:border-primary-300 focus:ring-primary-500 rounded" />
           <label for="user_remember_me" class="ml-2 block text-sm leading-5 text-gray-900">
             Remember Me
           </label>
         </div>
 
         <div class="text-sm leading-5">
-          <%= link_to 'Forgot password?', new_user_password_path, class: 'font-medium text-primary hover:text-primary-500 focus:outline-none focus:underline transition ease-in-out duration-150' %>
+          <%= link_to 'Forgot password?', new_user_password_path, class: 'font-medium hover:text-gray-500 focus:outline-none focus:underline transition ease-in-out duration-150' %>
         </div>
       </div>
 
       <div class="mt-6">
-        <button type="submit" data-turbo="false" class="group relative w-full flex justify-center py-2 px-4 border border-transparent text-sm leading-5 font-medium rounded-md text-white bg-primary-600 hover:bg-primary-700 focus:outline-none transition duration-150 ease-in-out">
+        <button type="submit" data-turbo="false" class="group relative w-full flex justify-center py-2.5 px-4 border border-transparent text-sm leading-5 font-medium rounded-md text-white bg-primary-600 hover:bg-primary-700 focus:outline-none">
           <span class="absolute left-0 inset-y-0 flex items-center pl-3">
             <svg class="h-5 w-5 transition ease-in-out duration-150" fill="white" viewBox="0 0 20 20">
               <path fill-rule="evenodd" d="M5 9V7a5 5 0 0110 0v2a2 2 0 012 2v5a2 2 0 01-2 2H5a2 2 0 01-2-2v-5a2 2 0 012-2zm8-2v2H7V7a3 3 0 016 0z" clip-rule="evenodd" />
@@ -36,5 +37,10 @@
         </button>
       </div>
     <% end %>
+
+    <div class="mt-6 text-center text-gray-400">
+      Don't have an account?
+      <%= link_to 'Sign up', new_user_registration_path, class: 'font-medium text-gray-500 hover:text-gray-600 focus:outline-none focus:underline transition ease-in-out duration-150' %>
+    </div>
   </div>
 </div>
diff --git a/app/views/devise/shared/_devise_sub_heading.html.erb b/app/views/devise/shared/_devise_sub_heading.html.erb
new file mode 100644
index 00000000..652cc32d
--- /dev/null
+++ b/app/views/devise/shared/_devise_sub_heading.html.erb
@@ -0,0 +1,5 @@
+<div class="pt-3">
+  <p class="text-neutral-600 text-center">
+    <%= subtitle %>
+  </p>
+</div>