Skip to content

V
VenJob
Commit c3933c99 by Đường Sỹ Hoàng
Options

Fix devise default view

parent 89ccbb41
Showing with 50 additions and 24 deletions
app/controllers/application_controller.rb
class ApplicationController < ActionController::Base class ApplicationController < ActionController::Base
# Prevent CSRF attacks by raising an exception.
# For APIs, you may want to use :null_session instead.
protect_from_forgery with: :exception
before_action :configure_permitted_parameters, if: :devise_controller?
protected
def configure_permitted_parameters
added_attrs = [:remember_me, :username, :first_name, :last_name]
devise_parameter_sanitizer.permit :sign_up, keys: added_attrs
devise_parameter_sanitizer.permit :account_update, keys: added_attrs
end
end end
app/views/devise/registrations/new.html.erb
...@@ -9,6 +9,21 @@ ...@@ -9,6 +9,21 @@
</div> </div>
<div class="field"> <div class="field">
<%= f.label :username %><br />
<%= f.text_field :username, autofocus: true %>
</div>
<div class="field">
<%= f.label :first_name %><br />
<%= f.text_field :first_name, autofocus: true %>
</div>
<div class="field">
<%= f.label :last_name %><br />
<%= f.text_field :last_name, autofocus: true %>
</div>
<div class="field">
<%= f.label :password %> <%= f.label :password %>
<% if @minimum_password_length %> <% if @minimum_password_length %>
<em>(<%= @minimum_password_length %> characters minimum)</em> <em>(<%= @minimum_password_length %> characters minimum)</em>
......
app/views/devise/sessions/new.html.erb
<div class="container"> <div class="container">
<div class="d-flex justify-content-center h-100"> <div class="d-flex justify-content-center h-100">
<div class="card"> <div class="card">
...@@ -7,36 +5,31 @@ ...@@ -7,36 +5,31 @@
<h2>Log in</h2> <h2>Log in</h2>
</div> </div>
<div class="card-body-form"> <div class="card-body-form">
<form>
<div class="input-group form-group">
<%= 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"> <div class="field">
<%= f.label :email %><br /> <%= f.label :email %><br />
<%= f.email_field :email, autofocus: true, autocomplete: "email", :class => 'form-control' %> <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
</div> </div>
</div>
<div class="input-group form-group">
<div class="field"> <div class="field">
<%= f.label :password %><br /> <%= f.label :password %><br />
<%= f.password_field :password, autocomplete: "current-password", :class => 'form-control' %> <%= f.password_field :password, autocomplete: "current-password" %>
</div> </div>
<% if devise_mapping.rememberable? %>
<div class="field">
<%= f.check_box :remember_me %>
<%= f.label :remember_me %>
</div> </div>
<%= render "devise/shared/links" %> <% end %>
<div class="card-footer-form">
<div class="d-flex justify-content-center">
<div class="actions">
<%= f.submit "Log in", class: 'btn float-left login_btn'%>
</div>
<div class="actions"> <div class="actions">
<%= f.submit "Register", class: 'btn float-right login_btn'%> <%= f.submit "Log in" %>
</div> </div>
<% end %> <% end %>
</div>
</div> <%= render "devise/shared/links" %>
</form>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</br>
app/views/devise/shared/_links.html.erb
...@@ -2,12 +2,13 @@ ...@@ -2,12 +2,13 @@
<%= link_to "Log in", new_session_path(resource_name) %><br /> <%= link_to "Log in", new_session_path(resource_name) %><br />
<% end %> <% end %>
<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
<%= link_to "Register", new_registration_path(resource_name) %><br />
<% end %>
<div class="d-flex justify-content-center">
<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
<%= link_to "Forgot your password?", new_password_path(resource_name) %><br /> <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
<% end %> <% end %>
</div>
<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
<%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br /> <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
......
app/views/layouts/_header.html.erb
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
<button class="btn btn-outline-success" type="button">Register</button> <button class="btn btn-outline-success" type="button">Register</button>
<button class="btn btn-outline-success" type="button">Favorite</button> <button class="btn btn-outline-success" type="button">Favorite</button>
<button class="btn btn-outline-success" type="button">History</button> <button class="btn btn-outline-success" type="button">History</button>
<% if user_signed_in? %>
<%= link_to "Log out", destroy_user_session_path, method: :delete %>
<% end %>
</form> </form>
</nav> </nav>
<%= link_to image_tag("banner.jpg", id: "banner", alt: "Venjob banner") %> <%= link_to image_tag("banner.jpg", id: "banner", alt: "Venjob banner") %>
......
config/routes.rb
...@@ -6,7 +6,7 @@ Rails.application.routes.draw do ...@@ -6,7 +6,7 @@ Rails.application.routes.draw do
devise_for :users devise_for :users
as :user do as :user do
get "login" => "devise/sessions#new" get "login" => "devise/sessions#new"
post "login" => "devise/sessions#create" # post "login" => "devise/sessions#create"
delete "logout" => "devise/sessions#destroy" # delete "logout" => "devise/sessions#destroy"
end end
end end
db/migrate/20191226070737_add_encrypted_password_to_user.rb
class AddEncryptedPasswordToUser < ActiveRecord::Migration[6.0] class AddEncryptedPasswordToUser < ActiveRecord::Migration[6.0]
def change def change
add_column :users, :encrypted_password, :string add_column :users, :encrypted_password, :string
add_column :users, :remember_created_at, :datetime
end end
end end
db/schema.rb
...@@ -99,6 +99,7 @@ ActiveRecord::Schema.define(version: 2019_12_26_070737) do ...@@ -99,6 +99,7 @@ ActiveRecord::Schema.define(version: 2019_12_26_070737) do
t.datetime "created_at", precision: 6, null: false t.datetime "created_at", precision: 6, null: false
t.datetime "updated_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false
t.string "encrypted_password" t.string "encrypted_password"
t.datetime "remember_created_at"
t.index ["email"], name: "index_users_on_email", unique: true t.index ["email"], name: "index_users_on_email", unique: true
t.index ["reset_digest"], name: "index_users_on_reset_digest", unique: true t.index ["reset_digest"], name: "index_users_on_reset_digest", unique: true
t.index ["username"], name: "index_users_on_username", unique: true t.index ["username"], name: "index_users_on_username", unique: true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment