Skip to content

Commit

Permalink
adapt login to new layout
Browse files Browse the repository at this point in the history
  • Loading branch information
Crashillo authored and entantoencuanto committed Jul 18, 2022
1 parent 005ba96 commit 01bfae9
Showing 1 changed file with 51 additions and 56 deletions.
107 changes: 51 additions & 56 deletions decidim-core/app/views/decidim/devise/sessions/new.html.erb
@@ -1,62 +1,57 @@
<% add_decidim_page_title(t("devise.sessions.new.sign_in")) %>
<%= render layout: "layouts/decidim/shared/layout_one_col" do %>

<div class="grid grid-cols-8">
<div class="col-start-2 col-span-6 grid grid-cols-6">
<h1 class="h1 decorator my-12 col-start-3 col-span-2"><%= t("devise.sessions.new.sign_in") %></h1>

<div class="col-span-6">
<div class="text-lg font-semibold prose-a:text-secondary prose-a:underline mb-10">
<% if current_organization.sign_up_enabled? %>
<p>
<%= t("decidim.devise.sessions.new.are_you_new?") %>
<%= link_to t("decidim.devise.sessions.new.register"), new_user_registration_path %>
</p>
<% elsif current_organization.sign_in_enabled? %>
<p>
<%= t("decidim.devise.sessions.new.sign_up_disabled") %>
</p>
<% else %>
<p>
<%= t("decidim.devise.sessions.new.sign_in_disabled") %>
</p>
<% end %>
</div>

<div class="border-t-2 border-background">
<% cache current_organization do %>
<%= render "decidim/devise/shared/omniauth_buttons" %>
<% end %>
</div>

<% if current_organization.sign_in_enabled? %>
<%= decidim_form_for(resource, namespace: "session", as: resource_name, url: session_path(resource_name), html: { class: "form" } ) do |f| %>
<div class="flex flex-col py-10 gap-10">
<!-- TODO: move the input classes to the base component -->
<%= f.email_field :email, autocomplete: "email", placeholder: "hi@email.com", class: "w-full block rounded border border-gray px-4 py-2 bg-background-2 mt-3", label_options: { class: "font-semibold text-lg" } %>
<%= f.password_field :password, autocomplete: "current-password", placeholder: "******", class: "w-full block rounded border border-gray px-4 py-2 bg-background-2 mt-3", label_options: { class: "font-semibold text-lg" } %>
<% if devise_mapping.rememberable? %>
<%= f.check_box :remember_me, class: "mr-1 cursor-pointer" %>
<% end %>
</div>

<div class="text-right py-10 border-t-2 border-background">
<button type="submit" class="button lg secondary">
<%= t("devise.sessions.new.sign_in") %>
<%= icon "arrow-right-line", class: "fill-current" %>
</button>
</div>
<% end %>

<div class="flex flex-col gap-4 py-10 border-t-2 border-background">
<%= render "decidim/devise/shared/redesigned_links" %>
</div>
<%= render layout: "layouts/decidim/shared/layout_center" do %>

<div class="flex justify-center">
<h1 class="h1 decorator my-12"><%= t("devise.sessions.new.sign_in") %></h1>
</div>

<div class="text-lg font-semibold prose-a:text-secondary prose-a:underline mb-10">
<% if current_organization.sign_up_enabled? %>
<p>
<%= t("decidim.devise.sessions.new.are_you_new?") %>
<%= link_to t("decidim.devise.sessions.new.register"), new_user_registration_path %>
</p>
<% elsif current_organization.sign_in_enabled? %>
<p>
<%= t("decidim.devise.sessions.new.sign_up_disabled") %>
</p>
<% else %>
<p>
<%= t("decidim.devise.sessions.new.sign_in_disabled") %>
</p>
<% end %>
</div>

<div class="border-t-2 border-background">
<% cache current_organization do %>
<%= render "decidim/devise/shared/omniauth_buttons" %>
<% end %>
</div>

<% if current_organization.sign_in_enabled? %>
<%= decidim_form_for(resource, namespace: "session", as: resource_name, url: session_path(resource_name), html: { class: "form" } ) do |f| %>
<div class="flex flex-col py-10 gap-10">
<!-- TODO: move the input classes to the base component -->
<%= f.email_field :email, autocomplete: "email", placeholder: "hi@email.com", class: "w-full block rounded border border-gray px-4 py-2 bg-background-2 mt-3", label_options: { class: "font-semibold text-lg" } %>
<%= f.password_field :password, autocomplete: "current-password", placeholder: "******", class: "w-full block rounded border border-gray px-4 py-2 bg-background-2 mt-3", label_options: { class: "font-semibold text-lg" } %>
<% if devise_mapping.rememberable? %>
<%= f.check_box :remember_me, class: "mr-1 cursor-pointer" %>
<% end %>
</div>
</div>
</div>

<div class="text-right py-10 border-t-2 border-background">
<button type="submit" class="button lg secondary">
<%= t("devise.sessions.new.sign_in") %>
<%= icon "arrow-right-line", class: "fill-current" %>
</button>
</div>
<% end %>

<div class="flex flex-col gap-4 py-10 border-t-2 border-background">
<%= render "decidim/devise/shared/redesigned_links" %>
</div>
<% end %>
<% end %>

0 comments on commit 01bfae9

Please sign in to comment.