alexdbondoc17
/
cdao-pjet
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #10 from lexintegritastech/feature-enhancement-ui 

Enhancement of login
pull/11/head
Angel Aviel Domaoan 4 years ago committed by GitHub
parent
b22a247833 3b99d40f95
commit
9eb8886578
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      app/views/devise/passwords/new.html.erb
  2. 27
      app/views/devise/sessions/new.html.erb
  3. 9
      app/views/layouts/application.html.erb

12
app/views/devise/passwords/new.html.erb
Unescape View File

@ -1,15 +1,15 @@
<h2>Forgot your password?</h2> <h3 class="text-center mb-3">Forgot your password?</h3>
<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
<%= render "devise/shared/error_messages", resource: resource %> <%= render "devise/shared/error_messages", resource: resource %>
<div class="field"> <div class="mb-3">
<%= f.label :email %><br /> <label for="exampleFormControlInput1" class="form-label"><%= f.label :email %></label>
<%= f.email_field :email, autofocus: true, autocomplete: "email" %> <%= f.email_field :email, autofocus: true, autocomplete: "email", class: "form-control" %>
</div> </div>
<div class="actions"> <div class="d-grid gap-2 mb-3">
<%= f.submit "Send me reset password instructions" %> <%= f.submit "Send me reset password instructions", class: "btn btn-primary" %>
</div> </div>
<% end %> <% end %>

27
app/views/devise/sessions/new.html.erb
Unescape View File

@ -1,25 +1,28 @@
<h2>Log in</h2> <h2 class="text-center">Log in</h2>
<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
<div class="field">
<%= f.label :email %><br /> <div class="mb-3">
<%= f.email_field :email, autofocus: true, autocomplete: "email" %> <label for="exampleFormControlInput1" class="form-label"><%= f.label :email %></label>
<%= f.email_field :email, autofocus: true, autocomplete: "email", class: "form-control" %>
</div> </div>
<div class="field"> <div class="mb-3">
<%= f.label :password %><br /> <label for="exampleFormControlInput1" class="form-label"><%= f.label :password %></label>
<%= f.password_field :password, autocomplete: "current-password" %> <%= f.password_field :password, autocomplete: "current-password", class: "form-control" %>
</div> </div>
<% if devise_mapping.rememberable? %> <% if devise_mapping.rememberable? %>
<div class="field">
<%= f.check_box :remember_me %> <div class="pl-0 mb-3">
<%= f.label :remember_me %> <%= f.check_box :remember_me, class: "orm-check-input" %>
<%= f.label :remember_me, class: "form-check-label" %>
</div> </div>
<% end %> <% end %>
<div class="actions"> <div class="d-grid gap-2 mb-3">
<%= f.submit "Log in" %> <%= f.submit "Log in", class: "btn btn-primary" %>
</div> </div>
<% end %> <% end %>

9
app/views/layouts/application.html.erb
Unescape View File

@ -11,15 +11,16 @@
</head> </head>
<body class="container-fluid h-100 w-100"> <body class="container-fluid h-100 w-100">
<div class="row h-100 w-100 col-sm-12 p-0">
<div class="<%= current_user.present? ? 'row flex-nowrap h-100 w-100 p-0' : 'row h-100 justify-content-center align-items-center' %>">
<% if current_user.present? %> <% if current_user.present? %>
<div class="col-sm-3 p-0"> <div class="col-auto col-md-3 col-xl-2 px-sm-2 px-0 bg-dark">
<%= render(SidenavComponent.new(current_user: current_user))%> <%= render(SidenavComponent.new(current_user: current_user))%>
</div> </div>
<% end %> <% end %>
<div class="col-sm-<%= current_user.present? ? 9 : 12 %>"> <div class="<%= current_user.present? ? 'col py-3' : 'col-sm-3' %>">
<div class="h-100 w-100 col-sm-12"> <div >
<%= yield %> <%= yield %>
</div> </div>
</div> </div>

Write Preview
Loading…
Cancel
Save