Skip to content
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

Login and Signup pages UI update to better support social signin links #404

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Login and Signup pages UI update to better support social signin links #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf8f4e1
UI updates to support social auth extension - #395
rahulsingh321 Dec 19, 2024
9297b7f
Align remember me checkbox and forgot password link
rahulsingh321 Dec 23, 2024
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
2 changes: 1 addition & 1 deletion templates/app/views/user_passwords/edit.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div class="text-center flex flex-col gap-6 items-center">
<%= f.button t("spree.update"),
name: :commit,
class: 'w-fit py-3 px-7 rounded-full text-body-sm font-bold leading-none uppercase whitespace-nowrap transiton-colors duration-200 bg-red-500 text-white hover:bg-red-700'
class: 'w-full w-fit py-3 px-7 rounded-full text-body-sm font-bold leading-none uppercase whitespace-nowrap transiton-colors duration-200 bg-red-500 text-white hover:bg-red-700'
%>
</div>

Expand Down
2 changes: 1 addition & 1 deletion templates/app/views/user_passwords/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<div class="text-center flex flex-col gap-6 items-center">
<%= f.button(
t("spree.reset_password"),
class: 'w-fit py-3 px-7 rounded-full text-body-sm font-bold leading-none uppercase whitespace-nowrap transiton-colors duration-200 bg-red-500 text-white hover:bg-red-700',
class: 'w-full w-fit py-3 px-7 rounded-full text-body-sm font-bold leading-none uppercase whitespace-nowrap transiton-colors duration-200 bg-red-500 text-white hover:bg-red-700',
name: :commit
) %>
</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/app/views/user_registrations/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<div class="text-center flex flex-col gap-6 items-center">
<%= f.button t("spree.create"),
name: :commit,
class: 'w-fit py-3 px-7 rounded-full text-body-sm font-bold leading-none uppercase whitespace-nowrap transiton-colors duration-200 bg-red-500 text-white hover:bg-red-700'
class: 'w-full w-fit py-3 px-7 rounded-full text-body-sm font-bold leading-none uppercase whitespace-nowrap transiton-colors duration-200 bg-red-500 text-white hover:bg-red-700'
%>
</div>

Expand Down
24 changes: 13 additions & 11 deletions templates/app/views/user_sessions/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@

<article class="wrapper grid-container py-12" id="existing-customer">
<div class="col-span-full md:col-start-5 md:col-span-4">
<h1 class="font-serif text-h4 md:text-h3 text-center"><%= I18n.t('spree.login_as_existing') %></h1>
<h1 class="font-serif text-h4 md:text-h3"><%= I18n.t('spree.login_as_existing') %></h1>
<div class="mt-6">
<%= I18n.t("spree.or") %> <%= link_to I18n.t("spree.create_a_new_account"), signup_path, class:"transition-all duration-300 text-black hover:!text-red-500 dark:text-sand underline" %>
</div>

<%= form_for Spree::User.new, as: :spree_user, url: create_new_session_path, html: { class: "space-y-6 mb-12" } do |f| %>
<%= form_for Spree::User.new, as: :spree_user, url: create_new_session_path, html: { class: "space-y-6" } do |f| %>
<div class="text-input">
<%= f.label :email, "#{t("spree.email")}:" %>
<%= f.email_field :email, placeholder: '[email protected]' %>
Expand All @@ -15,22 +18,21 @@
<%= f.password_field :password, placeholder: "p455w0rd" %>
</div>

<div class="flex items-center leading-none gap-2">
<%= f.check_box :remember_me, tabindex: 3 %>
<%= f.label :remember_me, I18n.t("spree.remember_me"), class: "mb-0" %>
<div class="flex justify-between">
<div class="items-center leading-none py-1">
<%= f.check_box :remember_me, tabindex: 3 %>
<%= f.label :remember_me, I18n.t("spree.remember_me"), class: "mb-0" %>
</div>
<div></div>
<%= link_to I18n.t("spree.forgot_password"), recover_password_path, class:"transition-all duration-300 text-black hover:!text-red-500 dark:text-sand underline" %>
</div>

<div class="text-center flex flex-col gap-6 items-center">
<%= f.button(
t("spree.login"),
class: 'w-fit py-3 px-7 rounded-full text-body-sm font-bold leading-none uppercase whitespace-nowrap transiton-colors duration-200 bg-red-500 text-white hover:bg-red-700',
class: 'w-full py-3 px-7 rounded-full text-body-sm font-bold leading-none uppercase whitespace-nowrap transiton-colors duration-200 bg-red-500 text-white hover:bg-red-700',
name: :commit
) %>
<%= link_to I18n.t("spree.forgot_password"), recover_password_path, class:"transition-all duration-300 text-black hover:!text-red-500 dark:text-sand underline" %>
</div>

<div class="mt-12 text-center">
<%= I18n.t("spree.or") %> <%= link_to I18n.t("spree.create_a_new_account"), signup_path, class:"transition-all duration-300 text-black hover:!text-red-500 dark:text-sand underline" %>
</div>

<% end %>
Expand Down