Commit 8610e37c by Đường Sỹ Hoàng

Update user_login/my_page/my_info_page

parent e2042cdf
......@@ -11,4 +11,8 @@ class ApplicationController < ActionController::Base
devise_parameter_sanitizer.permit :sign_up, keys: added_attrs
devise_parameter_sanitizer.permit :account_update, keys: added_attrs
end
def after_sign_in_path_for(resource)
stored_location_for(resource) || my_path
end
end
class UsersController < ApplicationController
def show
@user = User.find_by(params[:id])
end
private
def user_params
params.require(:user).permit(:username, :email, :password, :password_confirmation)
end
end
<h2>Edit <%= resource_name.to_s.humanize %></h2>
</br>
<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
<div class="container">
<div class="d-flex justify-content-center h-100">
<div class="card">
<div class="card-header text-center">
<h2>Edit <%= resource_name.to_s.humanize %></h2>
</div>
<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
<%= render "devise/shared/error_messages", resource: resource %>
<div class="field">
......@@ -31,13 +37,14 @@
<%= f.password_field :current_password, autocomplete: "current-password" %>
</div>
<div class="actions">
<%= f.submit "Update" %>
</div>
<% end %>
<h3>Cancel my account</h3>
</br>
<p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %></p>
<div class="actions text-center">
<%= f.submit "Update", class: "btn btn-primary" %>
</div>
<% end %>
</div>
</div>
</div>
<%= link_to "Back", :back %>
</br>
......@@ -3,7 +3,7 @@
<% end %>
<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
<%= link_to "Register", new_registration_path(resource_name), class: "btn float-right login_btn" %><br />
<%= link_to "Register", registration_path, class:" btn float-right login_btn" %>
<% end %>
<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
......
......@@ -2,15 +2,18 @@
<div class="container">
<%= link_to image_tag("zigexn_logo.png", id: "logo", alt: "Venjob logo") %>
<nav class="navbar navbar-light bg-light">
<% if user_signed_in? %>
<%= link_to "Log out", destroy_user_session_path, method: :delete, class: "btn btn-outline-success" %>
<button class="btn btn-outline-success" type="button">Favorite</button>
<button class="btn btn-outline-success" type="button">History</button>
<% else %>
<form class="form-inline">
<%= link_to "Login", login_path, class:"btn btn-outline-success" %>
<%= link_to "Register", registration_path, class:"btn btn-outline-success" %>
<button class="btn btn-outline-success" type="button">Favorite</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, class: "btn btn-outline-success" %>
<% end %>
</form>
<% end %>
</nav>
<%= link_to image_tag("banner.jpg", id: "banner", alt: "Venjob banner") %>
</div>
......
</br>
<div class="container">
<div class="d-flex justify-content-center h-100">
<div class="card">
<div>
<label>Email Address: </label>
<%= current_user.email %>
</div>
<div>
<label>Full Name: </label>
<%= current_user.username %>
</div>
</br>
<div class="actions">
<%= form_for(@user, url: my_path(params[:id])) do |f| %>
<%= f.submit "Update", class: "btn btn-primary" %>
<%= f.submit "My Jobs", class: "btn btn-primary" %>
<% end %>
</div>
</div>
</div>
</div>
</br>
......@@ -8,7 +8,9 @@ Rails.application.routes.draw do
as :user do
get "login" , to: "devise/sessions#new"
get "registration/", to: "devise/registrations#new"
post "registration.user/", to: "devise/registrations#create"
put "registration.user/", to: "devise/registrations#update"
get "my/info", to: "devise/registrations#edit"
get "my/:id", to: "users#show"
get "my/", to: "users#show"
end
end
class AddResetPasswordTouser < ActiveRecord::Migration[6.0]
def change
add_column :users, :reset_password_token, :string
add_column :users, :reset_password_sent_at, :datetime
end
end
......@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 2019_12_26_070737) do
ActiveRecord::Schema.define(version: 2020_01_02_012922) do
create_table "cities", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
t.string "name"
......@@ -100,6 +100,8 @@ ActiveRecord::Schema.define(version: 2019_12_26_070737) do
t.datetime "updated_at", precision: 6, null: false
t.string "encrypted_password"
t.datetime "remember_created_at"
t.string "reset_password_token"
t.datetime "reset_password_sent_at"
t.index ["email"], name: "index_users_on_email", unique: true
t.index ["reset_digest"], name: "index_users_on_reset_digest", 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