Skip to content

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

Merge branch 'master' into 'feature/password' 

# Conflicts:
#   app/controllers/users_controller.rb
#   app/views/users/show.html.erb
parents 03c81f9b b5e8f81b
Showing with 108 additions and 52 deletions
app/controllers/application_controller.rb
...@@ -11,4 +11,8 @@ class ApplicationController < ActionController::Base ...@@ -11,4 +11,8 @@ class ApplicationController < ActionController::Base
devise_parameter_sanitizer.permit :sign_up, keys: added_attrs devise_parameter_sanitizer.permit :sign_up, keys: added_attrs
devise_parameter_sanitizer.permit :account_update, keys: added_attrs devise_parameter_sanitizer.permit :account_update, keys: added_attrs
end end
def after_sign_in_path_for(resource)
stored_location_for(resource) || my_path
end
end end
app/controllers/users_controller.rb
class UsersController < ApplicationController class UsersController < ApplicationController
def show def show
@user = User.find(params[:id]) @user = User.find_by(params[:id])
end end
private private
def user_params def user_params
params.require(:user).permit(:username, :first_name, :last_name, :id, :email, :password, :password_confirmation) params.require(:user).permit(:username, :email, :password, :password_confirmation)
end
def correct_user
@user = User.find(params[:id])
redirect_to(root_url) unless current_user?(@user)
end end
end end
app/mailers/application_mailer.rb
class ApplicationMailer < ActionMailer::Base class ApplicationMailer < ActionMailer::Base
default from: 'from@example.com' default from: 'noreply@example.com'
layout 'mailer' layout 'mailer'
end end
app/views/devise/passwords/new.html.erb
<h2>Forgot your password?</h2> </br>
<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> <div class="container">
<div class="d-flex justify-content-center h-100">
<div class="card">
<div class="card-header text-center">
<h2>Forgot your password?</h2>
</div>
<%= 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="field">
...@@ -8,9 +14,12 @@ ...@@ -8,9 +14,12 @@
<%= f.email_field :email, autofocus: true, autocomplete: "email" %> <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
</div> </div>
<div class="actions"> <div class="actions text-center">
<%= f.submit "Send me reset password instructions" %> <%= f.submit "Confirm your email" %>
</div>
<% end %>
</div>
</div> </div>
<% end %> </div>
<%= render "devise/shared/links" %> </br>
app/views/devise/registrations/edit.html.erb
<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 %> <%= render "devise/shared/error_messages", resource: resource %>
<div class="field"> <div class="field">
...@@ -31,13 +37,14 @@ ...@@ -31,13 +37,14 @@
<%= f.password_field :current_password, autocomplete: "current-password" %> <%= f.password_field :current_password, autocomplete: "current-password" %>
</div> </div>
<div class="actions"> </br>
<%= f.submit "Update" %>
</div>
<% end %>
<h3>Cancel my account</h3>
<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>
app/views/devise/registrations/new.html.erb
<h2>Sign up</h2> <div class="container">
<div class="d-flex justify-content-center h-100">
<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> <div class="card">
<div class="card-header text-center">
<h2>Sign up</h2>
</div>
<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
<%= render "devise/shared/error_messages", resource: resource %> <%= render "devise/shared/error_messages", resource: resource %>
<div class="field"> <div class="field">
...@@ -36,9 +40,14 @@ ...@@ -36,9 +40,14 @@
<%= f.password_field :password_confirmation, autocomplete: "new-password" %> <%= f.password_field :password_confirmation, autocomplete: "new-password" %>
</div> </div>
<div class="actions"> </br>
<%= f.submit "Sign up" %>
<div class="actions text-center">
<%= f.submit "Sign up", class: "btn-primary" %>
</div>
<% end %>
</div>
</div> </div>
<% end %> </div>
<%= render "devise/shared/links" %> </br>
app/views/devise/shared/_links.html.erb
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<% end %> <% end %>
<%- if devise_mapping.registerable? && controller_name != 'registrations' %> <%- 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 %> <% end %>
<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
......
app/views/layouts/_header.html.erb
...@@ -2,15 +2,18 @@ ...@@ -2,15 +2,18 @@
<div class="container"> <div class="container">
<%= link_to image_tag("zigexn_logo.png", id: "logo", alt: "Venjob logo") %> <%= link_to image_tag("zigexn_logo.png", id: "logo", alt: "Venjob logo") %>
<nav class="navbar navbar-light bg-light"> <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"> <form class="form-inline">
<%= link_to "Login", login_path, class:"btn btn-outline-success" %> <%= link_to "Login", login_path, class:"btn btn-outline-success" %>
<button class="btn btn-outline-success" type="button">Register</button> <%= 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">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>
<% end %>
</nav> </nav>
<%= link_to image_tag("banner.jpg", id: "banner", alt: "Venjob banner") %> <%= link_to image_tag("banner.jpg", id: "banner", alt: "Venjob banner") %>
</div> </div>
......
app/views/users/show.html.erb
<div> </br>
<div class="container">
<div class="d-flex justify-content-center h-100">
<div class="card">
<div>
<label>Email Address: </label> <label>Email Address: </label>
<%= @user.email %> <%= current_user.email %>
</div> </div>
<div> <div>
<label>Full Name: </label> <label>Full Name: </label>
<%= @user.username %> <%= current_user.username %>
</div> </div>
<div class="actions">
<button type="submit" class="btn btn-primary">Update</button> </br>
<button type="submit" class="btn btn-primary">My Jobs</button>
<div class="actions">
<%= link_to "Update", my_info_path, class: "btn btn-primary" %>
<%= link_to "My Jobs", "#", class: "btn btn-primary" %>
</div>
</div>
</div>
</div> </div>
</br> </br>
config/environments/development.rb
...@@ -36,7 +36,6 @@ Rails.application.configure do ...@@ -36,7 +36,6 @@ Rails.application.configure do
config.action_mailer.perform_caching = false config.action_mailer.perform_caching = false
config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
# Print deprecation notices to the Rails logger. # Print deprecation notices to the Rails logger.
config.active_support.deprecation = :log config.active_support.deprecation = :log
...@@ -60,4 +59,11 @@ Rails.application.configure do ...@@ -60,4 +59,11 @@ Rails.application.configure do
# Use an evented file watcher to asynchronously detect changes in source code, # Use an evented file watcher to asynchronously detect changes in source code,
# routes, locales, etc. This feature depends on the listen gem. # routes, locales, etc. This feature depends on the listen gem.
config.file_watcher = ActiveSupport::EventedFileUpdateChecker config.file_watcher = ActiveSupport::EventedFileUpdateChecker
config.action_mailer.delivery_method = :smtp
# Use this on the cloud IDE.
config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
config.action_mailer.smtp_settings = { address: '127.0.0.1', port: 1025 }
# Use this if developing on localhost.
# config.action_mailer.default_url_options = { host: host, protocol: 'http' }
end end
config/routes.rb
...@@ -3,8 +3,14 @@ Rails.application.routes.draw do ...@@ -3,8 +3,14 @@ Rails.application.routes.draw do
resources :cities, only: :index resources :cities, only: :index
resources :industries, only: :index resources :industries, only: :index
resource :top, only: :index resource :top, only: :index
resource :users, only: :show
devise_for :users devise_for :users
as :user do as :user do
get "login" => "devise/sessions#new", as: :login 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/", to: "users#show"
end end
end end
db/migrate/20191126074641_devise_create_users.rb
# frozen_string_literal: true
class DeviseCreateUsers < ActiveRecord::Migration[6.0] class DeviseCreateUsers < ActiveRecord::Migration[6.0]
def change def change
create_table :users do |t| create_table :users do |t|
...@@ -29,7 +27,7 @@ class DeviseCreateUsers < ActiveRecord::Migration[6.0] ...@@ -29,7 +27,7 @@ class DeviseCreateUsers < ActiveRecord::Migration[6.0]
t.string :remember_digest t.string :remember_digest
t.datetime :activated_at t.datetime :activated_at
t.string :activation_digest t.string :activation_digest
# t.datetime :confirmation_sent_at t.datetime :confirmation_sent_at
# t.string :unconfirmed_email # Only if using reconfirmable # t.string :unconfirmed_email # Only if using reconfirmable
...@@ -44,7 +42,7 @@ class DeviseCreateUsers < ActiveRecord::Migration[6.0] ...@@ -44,7 +42,7 @@ class DeviseCreateUsers < ActiveRecord::Migration[6.0]
add_index :users, :email, unique: true add_index :users, :email, unique: true
add_index :users, :username, unique: true add_index :users, :username, unique: true
add_index :users, :reset_digest, unique: true add_index :users, :reset_digest, unique: true
# add_index :users, :confirmation_token, unique: true add_index :users, :confirmation_token, unique: true
# add_index :users, :unlock_token, unique: true # add_index :users, :unlock_token, unique: true
end end
end end
db/migrate/20200102012922_add_reset_password_to_user.rb 0 → 100644
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
db/schema.rb
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # 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| create_table "cities", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
t.string "name" t.string "name"
...@@ -100,6 +100,8 @@ ActiveRecord::Schema.define(version: 2019_12_26_070737) do ...@@ -100,6 +100,8 @@ ActiveRecord::Schema.define(version: 2019_12_26_070737) do
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.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 ["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