Skip to content

Melhorias na pagina de login e cadastro de usuário #158

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

Merged
Fabio-k merged 2 commits into from
Feb 10, 2025
Merged

Melhorias na pagina de login e cadastro de usuário #158

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
a06590a
refactor: improve login page
Fabio-k Feb 9, 2025
c0d0b9d
refactor sign up page style
Fabio-k Feb 9, 2025
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
107 changes: 69 additions & 38 deletions app/views/devise/registrations/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,78 @@
<h1>Criar Minha Conta</h1>
<div class="mx-auto flex flex-col justify-center min-w-[30vw]">
<section class="bg-white shadow-md rounded p-10">
<h1>Criar Minha Conta</h1>
<p class="mb-10">Já possui conta? <%= link_to "Entrar", new_session_path(resource_name), class: 'hover:underline font-bold' %></p>

<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
<%= render "devise/shared/error_messages", resource: resource %>
<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
<div class="flex flex-col gap-4">
<div class="input_container">
<%= f.label :name, class: 'input_label' %>
<%= f.text_field :name, autofocus: true, autocomplete: "username", class: 'input' %>
<% if resource.errors[:name].any? %>
<% resource.errors.full_messages_for(:name).each do |e| %>
<span class="form_error"><%= e %></span>
<% end %>
<% end %>
</div>

<div class="form">
<div class="input_container">
<%= f.label :name, class: 'input_label' %>
<%= f.text_field :name, autofocus: true, autocomplete: "username", class: 'input' %>
</div>

<div class="input_container">
<%= f.label :family_name, class: 'input_label' %>
<%= f.text_field :family_name, autocomplete: "family-name", class: 'input' %>
</div>

<div class="input_container">
<%= f.label :email, class: 'input_label' %>
<%= f.email_field :email, autocomplete: "email", class: 'input' %>
</div>
<div class="input_container">
<%= f.label :family_name, class: 'input_label' %>
<%= f.text_field :family_name, autocomplete: "family-name", class: 'input' %>
<% if resource.errors[:family_name].any? %>
<% resource.errors.full_messages_for(:family_name).each do |e| %>
<span class="form_error"><%= e %></span>
<% end %>
<% end %>
</div>

<div class="input_container">
<%= f.label :registration_number, class: 'input_label' %>
<%= f.text_field :registration_number, class: 'input' %>
</div>
<div class="input_container">
<%= f.label :email, class: 'input_label' %>
<%= f.email_field :email, autocomplete: "email", class: 'input' %>
<% if resource.errors[:email].any? %>
<% resource.errors.full_messages_for(:email).each do |e| %>
<span class="form_error"><%= e %></span>
<% end %>
<% end %>
</div>

<div class="input_container">
<%= f.label :password, class: 'input_label' %>
<% if @minimum_password_length %>
<em>(Mínimo de <%= @minimum_password_length %> caracteres)</em>
<% end %>
<%= f.password_field :password, autocomplete: "new-password", class: 'input' %>
</div>
<div class="input_container">
<%= f.label :registration_number, class: 'input_label' %>
<%= f.text_field :registration_number, class: 'input' %>
<% if resource.errors[:registration_number].any? %>
<% resource.errors.full_messages_for(:registration_number).each do |e| %>
<span class="form_error"><%= e %></span>
<% end %>
<% end %>
</div>

<div class="input_container">
<%= f.label :password_confirmation, class: 'input_label' %>
<%= f.password_field :password_confirmation, autocomplete: "new-password", class: 'input' %>
</div>
<div class="input_container">
<%= f.label :password, class: 'input_label' %>
<% if @minimum_password_length %>
<em>(Mínimo de <%= @minimum_password_length %> caracteres)</em>
<% end %>
<%= f.password_field :password, autocomplete: "new-password", class: 'input' %>
<% if resource.errors[:password].any? %>
<% resource.errors.full_messages_for(:password).each do |e| %>
<span class="form_error"><%= e %></span>
<% end %>
<% end %>
</div>

<div class="input_container">
<%= f.label :password_confirmation, class: 'input_label' %>
<%= f.password_field :password_confirmation, autocomplete: "new-password", class: 'input' %>
<% if resource.errors[:password_confirmation].any? %>
<% resource.errors.full_messages_for(:password_confirmation).each do |e| %>
<span class="form_error"><%= e %></span>
<% end %>
<% end %>
</div>

<%= f.submit "Criar Conta", class: 'form_button' %>
</div>
<% end %>

<div class="grid grid-cols-2 gap-4 w-2/3 mt-12">
<%= render "devise/shared/links" %>
<%= f.submit "Criar Conta", class: 'form_button' %>
</div>
<% end %>
</section>
<p class="mt-8 text-center">Não recebeu instruções de confirmação? <%= link_to "reenviar", new_confirmation_path(resource_name), class: 'hover:underline font-bold' %></p>
</div>

51 changes: 28 additions & 23 deletions app/views/devise/sessions/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,34 @@
<h1>Log in</h1>
<div class="mx-auto flex flex-col justify-center min-w-[30vw]">
<section class="bg-white shadow-md rounded p-10">
<h1 class="mb-10">Login</h1>
<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
<div class="flex flex-col gap-4">
<div class="w-full max-w-sm min-w-[200px]">
<%= f.label :email, class: "input_label" %>
<%= f.email_field :email, autofocus: true, class: "input" %>
</div>

<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
<div class="form">
<div class="input_container">
<%= f.label :email, "E-mail", class: 'input_label' %>
<%= f.email_field :email, autofocus: true, autocomplete: "email", class: 'input' %>
</div>
<div class="w-full max-w-sm min-w-[200px]">
<%= f.label :password, class: "input_label" %>
<%= f.password_field :password, class: "input" %>
</div>
<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
<%= link_to "Esqueceu sua Senha?", new_password_path(resource_name), class: 'hover:underline font-bold' %>
<% end %>

<div class="input_container">
<%= f.label :password, "Senha", class: 'input_label' %>
<%= f.password_field :password, autocomplete: "current-password", class: 'input' %>
</div>
<% if devise_mapping.rememberable? %>
<div class="flex gap-2 items-center">
<%= f.check_box :remember_me, class: 'text-primary h-5 w-5' %>
<%= f.label :remember_me, class: 'input_label' %>
</div>
<% end %>

<% if devise_mapping.rememberable? %>
<div class="flex gap-2 items-center">
<%= f.check_box :remember_me, class: 'text-primary h-5 w-5' %>
<%= f.label :remember_me, class: 'input_label' %>

<%= f.submit "Entrar", class: 'form_button mt-2' %>
</div>
<% end %>


<%= f.submit "Entrar", class: 'form_button' %>
</div>
<% end %>

<div class="grid grid-cols-3 gap-4 w-2/3 mt-12">
<%= render "devise/shared/links" %>
</section>
<p class="mt-8 text-center">Não possui conta? <%= link_to "Cadastrar", new_registration_path(resource_name), class: 'hover:underline font-bold' %></p>
<p class="mt-2 text-center">Não recebeu instruções de confirmação? <%= link_to "reenviar", new_confirmation_path(resource_name), class: 'hover:underline font-bold' %></p>
</div>

2 changes: 1 addition & 1 deletion spec/system/authentication/user_sign_in_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
click_on 'Entrar'

expect(current_path).to eq new_user_session_path
expect(page).to have_content "Log in"
expect(page).to have_content "Login"
expect(page).to have_selector 'form'
expect(page).to have_field 'E-mail'
expect(page).to have_field 'Senha'
Expand Down