Merge branch 'id15-id14-id16' into 'master'

ID15 - ID14 - ID16 See merge request !11

Merge branch 'id15-id14-id16' into 'master'
ID15 - ID14 - ID16 See merge request !11
803abcc4 · Tô Ngọc Ánh · 2f6f57b8 · fb586918 · 803abcc4 · 803abcc4
Commit 803abcc4 authored Aug 13, 2020 by Tô Ngọc Ánh
42 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
 /config/master.key
 /lib/data
+/public/uploads/
--- a/Gemfile
+++ b/Gemfile
@@ -68,4 +68,6 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 gem 'nokogiri'
 gem 'whenever', require: false
 gem 'kaminari'
+gem 'devise'
+gem 'carrierwave', '~> 2.0'
 ##
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -47,6 +47,7 @@ GEM
    archive-zip (0.12.0)
      io-like (~> 0.3.0)
    arel (9.0.0)
+    bcrypt (3.1.13)
    bindex (0.8.1)
    bootsnap (1.4.6)
      msgpack (~> 1.0)
@@ -60,6 +61,13 @@ GEM
      rack-test (>= 0.6.3)
      regexp_parser (~> 1.5)
      xpath (~> 3.2)
+    carrierwave (2.1.0)
+      activemodel (>= 5.0.0)
+      activesupport (>= 5.0.0)
+      addressable (~> 2.6)
+      image_processing (~> 1.1)
+      mimemagic (>= 0.3.0)
+      mini_mime (>= 0.1.3)
    childprocess (3.0.0)
    chromedriver-helper (2.1.1)
      archive-zip (~> 0.10)
@@ -74,6 +82,12 @@ GEM
    coffee-script-source (1.12.2)
    concurrent-ruby (1.1.6)
    crass (1.0.6)
+    devise (4.7.1)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0)
+      responders
+      warden (~> 1.2.3)
    dotenv (2.7.6)
    dotenv-rails (2.7.6)
      dotenv (= 2.7.6)
@@ -85,6 +99,9 @@ GEM
      activesupport (>= 4.2.0)
    i18n (1.8.3)
      concurrent-ruby (~> 1.0)
+    image_processing (1.11.0)
+      mini_magick (>= 4.9.5, < 5)
+      ruby-vips (>= 2.0.17, < 3)
    io-like (0.3.1)
    jbuilder (2.10.0)
      activesupport (>= 5.0.0)
@@ -113,6 +130,7 @@ GEM
      mimemagic (~> 0.3.2)
    method_source (1.0.0)
    mimemagic (0.3.5)
+    mini_magick (4.10.1)
    mini_mime (1.0.2)
    mini_portile2 (2.4.0)
    minitest (5.14.1)
@@ -121,6 +139,7 @@ GEM
    nio4r (2.5.2)
    nokogiri (1.10.10)
      mini_portile2 (~> 2.4.0)
+    orm_adapter (0.5.0)
    public_suffix (4.0.5)
    puma (3.12.6)
    rack (2.2.3)
@@ -155,6 +174,11 @@ GEM
    rb-inotify (0.10.1)
      ffi (~> 1.0)
    regexp_parser (1.7.1)
+    responders (3.0.1)
+      actionpack (>= 5.0)
+      railties (>= 5.0)
+    ruby-vips (2.0.17)
+      ffi (~> 1.9)
    ruby_dep (1.5.0)
    rubyzip (2.3.0)
    sass (3.7.4)
@@ -192,6 +216,8 @@ GEM
      thread_safe (~> 0.1)
    uglifier (4.2.0)
      execjs (>= 0.3.0, < 3)
+    warden (1.2.8)
+      rack (>= 2.0.6)
    web-console (3.7.0)
      actionview (>= 5.0)
      activemodel (>= 5.0)
@@ -212,8 +238,10 @@ DEPENDENCIES
  bootsnap (>= 1.1.0)
  byebug
  capybara (>= 2.15)
+  carrierwave (~> 2.0)
  chromedriver-helper
  coffee-rails (~> 4.2)
+  devise
  dotenv-rails
  jbuilder (~> 2.5)
  kaminari

--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -16,6 +16,9 @@
 $main-color: #1da173;
+ .min-vh-80 {
+   min-height: 80vh;
+ }
 .navbar {
  background-color: $main-color;
 }
@@ -53,3 +56,15 @@
     }
   }
 }
+ .card-img-rounded {
+   border-radius: 50%;
+   background-color: mediumseagreen;
+   height: 220px; width: 220px;
+   margin-top: 50px;
+   padding: 10px;
+   .card-img {
+     margin-top: 40px;
+   }
+ }
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
 class ApplicationController < ActionController::Base
+  before_action :configure_permitted_parameters, if: :devise_controller?
+  protected
+  def configure_permitted_parameters
+    devise_parameter_sanitizer.permit(:sign_up, keys: [:full_name, :curriculum_vitae])
+    devise_parameter_sanitizer.permit(:account_update, keys: [:full_name, :curriculum_vitae])
+  end
 end
--- a/app/controllers/locations_controller.rb
+++ b/app/controllers/locations_controller.rb
 class LocationsController < ApplicationController
  def index
-    @vn_cities_lists = Location.vietnam.with_count_job
+    @vn_cities_list = Location.vietnam.with_count_job
-    @internal_cities_lists = Location.international.with_count_job
+    @internal_cities_list = Location.international.with_count_job
  end
 end
--- a/app/controllers/users/registrations_controller.rb
+++ b/app/controllers/users/registrations_controller.rb
+class Users::RegistrationsController < Devise::RegistrationsController
+  protected
+  def after_update_path_for(resource)
+    my_page_path
+  end
+end
--- a/app/controllers/users/sessions_controller.rb
+++ b/app/controllers/users/sessions_controller.rb
+# frozen_string_literal: true
+class Users::SessionsController < Devise::SessionsController
+  # before_action :configure_sign_in_params, only: [:create]
+  # GET /resource/sign_in
+  # def new
+  #   super
+  # end
+  # POST /resource/sign_in
+  # def create
+  #   super
+  # end
+  # DELETE /resource/sign_out
+  # def destroy
+  #   super
+  # end
+  # protected
+  # If you have extra params to permit, append them to the sanitizer.
+  # def configure_sign_in_params
+  #   devise_parameter_sanitizer.permit(:sign_in, keys: [:attribute])
+  # end
+  def after_sign_in_path_for(resource)
+    my_page_path #your path
+  end
+end
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
+class UsersController < ApplicationController
+  before_action :authenticate_user!, only: :my_page
+  def show
+    @user = User.find_by(id: params[:id])
+  end
+  def my_page
+  end
+end
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
 module ApplicationHelper
+  def is_current_user?(user)
+    current_user == user
+  end
 end
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -2,4 +2,13 @@ class User < ApplicationRecord
  has_many :favorites
  has_many :histories
  has_many :applied_jobs
+  validates :full_name, presence: true
+  mount_uploader :curriculum_vitae, CurriculumVitaeUploader
+  # Include default devise modules. Others available are:
+  # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
+  devise :database_authenticatable, :registerable,
+         :recoverable, :rememberable, :validatable,
+         :confirmable
 end
--- a/app/uploaders/curriculum_vitae_uploader.rb
+++ b/app/uploaders/curriculum_vitae_uploader.rb
+class CurriculumVitaeUploader < CarrierWave::Uploader::Base
+  # Include RMagick or MiniMagick support:
+  # include CarrierWave::RMagick
+  # include CarrierWave::MiniMagick
+  # Choose what kind of storage to use for this uploader:
+  storage :file
+  # storage :fog
+  # Override the directory where uploaded files will be stored.
+  # This is a sensible default for uploaders that are meant to be mounted:
+  def store_dir
+    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+  end
+  def size_range
+    0.megabytes..5.megabytes
+  end
+  # Provide a default URL as a default if there hasn't been a file uploaded:
+  # def default_url(*args)
+  #   # For Rails 3.1+ asset pipeline compatibility:
+  #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+  #
+  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+  # end
+  # Process files as they are uploaded:
+  # process scale: [200, 300]
+  #
+  # def scale(width, height)
+  #   # do something
+  # end
+  # Create different versions of your uploaded files:
+  # version :thumb do
+  #   process resize_to_fit: [50, 50]
+  # end
+  # Add a white list of extensions which are allowed to be uploaded.
+  # For images you might use something like this:
+  def extension_whitelist
+    %w(doc pdf xls xlsx zip)
+  end
+  # Override the filename of the uploaded files:
+  # Avoid using model.id or version_name here, see uploader/store.rb for details.
+  # def filename
+  #   "something.jpg" if original_filename
+  # end
+end
--- a/app/views/devise/confirmations/new.html.erb
+++ b/app/views/devise/confirmations/new.html.erb
+<div class="col-md-6 col-sm-12 mx-auto my-5">
+  <h2 class="text-center font-weight-bold">Resend confirmation instructions</h2>
+  <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
+    <%= render "devise/shared/error_messages", resource: resource %>
+    <div class="form-group">
+      <%= f.label :email %><br />
+      <%= f.email_field :email, autofocus: true, autocomplete: 'email',
+      value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email), class: 'form-control' %>
+    </div>
+    <div class="actions text-center">
+      <%= f.submit 'Resend confirmation instructions', class: 'btn btn-outline-success' %>
+    </div>
+  <% end %>
+  <%= render 'devise/shared/links' %>
+</div>
\ No newline at end of file
--- a/app/views/devise/mailer/confirmation_instructions.html.erb
+++ b/app/views/devise/mailer/confirmation_instructions.html.erb
+<p>You're on your way!</p>
+<p>Let's confirm your email address.</p>
+<p>By clicking on the following link, you are confirming 
+  your email address and agreeing to VeNJOB's Terms of Service.
+</p>
+<p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %></p>
--- a/app/views/devise/mailer/email_changed.html.erb
+++ b/app/views/devise/mailer/email_changed.html.erb
+<p>Hello <%= @email %>!</p>
+<% if @resource.try(:unconfirmed_email?) %>
+  <p>We're contacting you to notify you that your email is being changed to <%= @resource.unconfirmed_email %>.</p>
+<% else %>
+  <p>We're contacting you to notify you that your email has been changed to <%= @resource.email %>.</p>
+<% end %>
--- a/app/views/devise/mailer/password_change.html.erb
+++ b/app/views/devise/mailer/password_change.html.erb
+<p>Hello <%= @resource.email %>!</p>
+<p>We're contacting you to notify you that your password has been changed.</p>
--- a/app/views/devise/mailer/reset_password_instructions.html.erb
+++ b/app/views/devise/mailer/reset_password_instructions.html.erb
+<p>Hello <%= @resource.email %>!</p>
+<p>Someone has requested a link to change your password. You can do this through the link below.</p>
+<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p>
+<p>If you didn't request this, please ignore this email.</p>
+<p>Your password won't change until you access the link above and create a new one.</p>
--- a/app/views/devise/mailer/unlock_instructions.html.erb
+++ b/app/views/devise/mailer/unlock_instructions.html.erb
+<p>Hello <%= @resource.email %>!</p>
+<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
+<p>Click the link below to unlock your account:</p>
+<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %></p>
--- a/app/views/devise/passwords/edit.html.erb
+++ b/app/views/devise/passwords/edit.html.erb
+<h2>Change your password</h2>
+<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
+  <%= render 'devise/shared/error_messages', resource: resource %>
+  <%= f.hidden_field :reset_password_token %>
+  <div class="form-group">
+    <%= f.label :password, 'New password' %><br />
+    <% if @minimum_password_length %>
+      <em>(<%= @minimum_password_length %> characters minimum)</em><br />
+    <% end %>
+    <%= f.password_field :password, autofocus: true, autocomplete: 'new-password', class: 'form-control' %>
+  </div>
+  <div class="form-group">
+    <%= f.label :password_confirmation, 'Confirm new password' %><br />
+    <%= f.password_field :password_confirmation, autocomplete: 'new-password', class: 'form-control' %>
+  </div>
+  <div class="actions">
+    <%= f.submit 'Change my password' %>
+  </div>
+<% end %>
+<%= render 'devise/shared/links' %>
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
+<div class="col-md-6 col-sm-12 mx-auto my-5">
+  <h2 class="text-center font-weight-bold">Forgot your password?</h2>
+  <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
+    <%= render 'devise/shared/error_messages', resource: resource %>
+    <div class="form-group">
+      <%= f.label :email %><br />
+      <%= f.email_field :email, autofocus: true, autocomplete: 'email', class: 'form-control' %>
+    </div>
+    <div class="actions text-center">
+      <%= f.submit 'Send me reset password instructions', class: 'btn btn-outline-success' %>
+    </div>
+  <% end %>
+  <%= render 'devise/shared/links' %>
+</div>
\ No newline at end of file
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
+<div class="col-md-7 col-sm-12 mx-auto my-5">
+  <h2 class="text-center font-weight-bold text-success">Edit My Profile</h2>
+  <%= 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="form-group">
+      <%= f.label :email %><br />
+      <%= f.email_field :email, autofocus: true, autocomplete: 'email', class: 'form-control' %>
+    </div>
+    <div class="form-group">
+      <%= f.label :full_name %><br />
+      <%= f.text_field :full_name, required: true, class: 'form-control' %>
+    </div>
+    <div class="form-group">
+      <%= f.label :curriculum_vitae %><br />
+      <%= f.file_field :curriculum_vitae, accept: '.doc, .pdf, .xls, .xlsx, .zip', class: 'form-control' %>
+    </div>
+    <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
+      <div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div>
+    <% end %>
+    <div class="form-group">
+      <%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
+      <%= f.password_field :password, autocomplete: 'new-password', class: 'form-control' %>
+      <% if @minimum_password_length %>
+      <% end %>
+    </div>
+    <div class="form-group">
+      <%= f.label :password_confirmation %><br />
+      <%= f.password_field :password_confirmation, autocomplete: 'new-password', class: 'form-control' %>
+    </div>
+    <div class="form-group">
+      <%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
+      <%= f.password_field :current_password, autocomplete: 'current-password', class: 'form-control' %>
+    </div>
+    <div class="actions text-center">
+      <%= f.submit 'Update', class: 'btn btn-outline-success' %>
+    </div>
+  <% end %>
+  <h3 class="text-center">Unhappy?</h3>
+  <p class="text-center">
+    <%= link_to 'Cancel my account', registration_path(resource_name), data: { confirm: 'Are you sure?' }, method: :delete,
+     class: 'btn btn-outline-danger' %>
+  </p>
+</div>
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
+<div class="col-md-6 col-sm-12 mx-auto my-5">
+  <h2 class="text-center font-weight-bold">Sign up</h2>
+  <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
+    <%= render 'devise/shared/error_messages', resource: resource %>
+    <div class="form-group">
+      <%= f.label :email %><br />
+      <%= f.email_field :email, autofocus: true, autocomplete: 'email', required: true, class: 'form-control' %>
+    </div>
+    <div class="form-group">
+      <%= f.label :full_name %><br />
+      <%= f.text_field :full_name, required: true, class: 'form-control' %>
+    </div>
+    <div class="form-group">
+      <%= f.label :password %>
+      <% if @minimum_password_length %>
+      <em>(<%= @minimum_password_length %> characters minimum)</em>
+      <% end %><br />
+      <%= f.password_field :password, autocomplete: 'new-password', required: true, class: 'form-control' %>
+    </div>
+    <div class="form-group">
+      <%= f.label :password_confirmation %><br />
+      <%= f.password_field :password_confirmation, autocomplete: 'new-password', required: true, class: 'form-control' %>
+    </div>
+    <div class="form-group">
+      <%= f.label :curriculum_vitae %><br />
+      <%= f.file_field :curriculum_vitae, accept: '.doc, .pdf, .xls, .xlsx, .zip', class: 'form-control' %>
+    </div>
+    <div class="actions text-center">
+      <%= f.submit 'Sign up', class: 'btn btn-outline-success' %>
+    </div>
+  <% end %>
+  <%= render 'devise/shared/links' %>
+</div>
\ No newline at end of file
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
+<div class="col-md-6 col-sm-12 mx-auto my-5">
+  <h2 class="text-center font-weight-bold">Log in</h2>
+  <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
+    <div class="form-group">
+      <%= f.label :email %><br />
+      <%= f.email_field :email, autofocus: true, autocomplete: 'email', required: true, class: 'form-control' %>
+    </div>
+    <div class="form-group">
+      <%= f.label :password %><br />
+      <%= f.password_field :password, autocomplete: 'current-password', required: true, class: 'form-control' %>
+    </div>
+    <% if devise_mapping.rememberable? %>
+      <div class="form-group">
+        <%= f.check_box :remember_me %>
+        <%= f.label :remember_me %>
+      </div>
+    <% end %>
+    <div class="actions text-center">
+      <%= f.submit 'Log in', class: 'btn btn-outline-success' %>
+    </div>
+  <% end %>
+  <%= render 'devise/shared/links' %>
+</div>
--- a/app/views/devise/shared/_error_messages.html.erb
+++ b/app/views/devise/shared/_error_messages.html.erb
+<% if resource.errors.any? %>
+  <div id="error_explanation">
+    <h2>
+      <%= I18n.t("errors.messages.not_saved",
+                 count: resource.errors.count,
+                 resource: resource.class.model_name.human.downcase)
+       %>
+    </h2>
+    <ul>
+      <% resource.errors.full_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>
--- a/app/views/devise/shared/_links.html.erb
+++ b/app/views/devise/shared/_links.html.erb
+<div class="text-center">
+  <%- if controller_name != 'sessions' %>
+    <%= link_to "Log in", new_session_path(resource_name) %><br />
+  <% end %>
+  <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
+    <%= link_to "Sign up", new_registration_path(resource_name) %><br />
+  <% end %>
+  <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
+    <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
+  <% end %>
+  <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+    <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
+  <% end %>
+  <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
+    <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
+  <% end %>
+  <%- if devise_mapping.omniauthable? %>
+    <%- resource_class.omniauth_providers.each do |provider| %>
+      <%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider) %><br />
+    <% end %>
+  <% end %>
+</div>
--- a/app/views/devise/shared/_show_errors.html.erb
+++ b/app/views/devise/shared/_show_errors.html.erb
+<% if notice %>
+  <div class="alert alert-success">
+    <a href="#" data-dismiss="alert" class="close">×</a>
+    <p><%= notice %></p>
+  </div>
+<% end %>
+<% if alert %>
+  <div class="alert alert-danger">
+    <a href="#" data-dismiss="alert" class="close">×</a>
+    <p><%= alert %></p>
+  </div>
+<% end %>
--- a/app/views/devise/unlocks/new.html.erb
+++ b/app/views/devise/unlocks/new.html.erb
+<h2>Resend unlock instructions</h2>
+<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
+  <%= render "devise/shared/error_messages", resource: resource %>
+  <div class="field">
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+  </div>
+  <div class="actions">
+    <%= f.submit "Resend unlock instructions" %>
+  </div>
+<% end %>
+<%= render "devise/shared/links" %>
--- a/app/views/jobs/_job.html.erb
+++ b/app/views/jobs/_job.html.erb
 <div class='card flex-md-row align-items-center my-2'>
  <div class='card-body'>
-    <%= link_to job.title, '#', class: 'card-title font-weight-bold text-decoration-none' %>
+    <%= link_to job.title, job_path(job), class: 'card-title font-weight-bold text-decoration-none' %>
    <p class='card-text'><%= job.company.name %></p>
    <p class='mb-0'>
      <strong>Work place:</strong>

--- a/app/views/jobs/show.html.erb
+++ b/app/views/jobs/show.html.erb
@@ -12,20 +12,20 @@
    <h4><i class="fas fa-building"></i> 
      <%= link_to @job.company.name, jobs_path(model: 'company', slug: @job.company.slug), class: 'text-decoration-none text-dark' %>
    </h4>
-    <span class="mx-2"><i class="fas fa-map-marker-alt"> </i>
+    <span class="mx-2 d-inline-block"><i class="fas fa-map-marker-alt"> </i>
      <% @job.locations.each do |location| %>
        <%= link_to location.city, jobs_path(model: 'location', slug: location.slug), class: 'vertical-divider text-dark' %>
      <% end %>
    </span>
-    <span class="mx-2"><i class="fas fa-briefcase"> </i>
+    <span class="mx-2 d-inline-block"><i class="fas fa-briefcase"> </i>
      <% @job.industries.each do |industry| %>
        <%= link_to industry.name, jobs_path(model: 'industry', slug: industry.slug), class: 'vertical-divider text-dark' %>
      <% end %>
    </span>
-    <span class="mx-2"><i class="fas fa-user-alt"></i> <%= @job.level %></span>
+    <span class="mx-2 d-inline-block"><i class="fas fa-user-alt"></i> <%= @job.level %></span>
-    <span class="mx-2"><i class="fas fa-business-time"></i> <%= @job.experience %></span>
+    <span class="mx-2 d-inline-block"><i class="fas fa-business-time"></i> <%= @job.experience %></span>
-    <span class="mx-2"><i class="fas fa-wallet"></i> <%= @job.salary %></span>
+    <span class="mx-2 d-inline-block"><i class="fas fa-wallet"></i> <%= @job.salary %></span>
-    <span class="mx-2"><i class="fas fa-calendar-week"></i> <%= @job.expiration_date %></span>
+    <span class="mx-2 d-inline-block"><i class="fas fa-calendar-week"></i> <%= @job.expiration_date %></span>
    <hr>
    <h3><strong>Description:</strong></h3>
    <%= @job.description.html_safe %>

--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -11,7 +11,8 @@
  <body>
    <%= render 'shared/header' %>
-    <div class='container'>
+    <div class='container min-vh-80'>
+      <%= render 'devise/shared/show_errors' %>
      <%= yield %>
    </div>
    <%= render 'shared/footer' %>

--- a/app/views/locations/index.html.erb
+++ b/app/views/locations/index.html.erb
@@ -14,13 +14,13 @@
  <h2>Vietnam</h2>
  <hr class="divider">
  <div class='row'>
-    <%= render partial: 'locations/location', collection: @vn_cities_lists %>
+    <%= render partial: 'locations/location', collection: @vn_cities_list %>
  </div>
 </div>
 <div id='international' class='text-center'>
  <h2>International</h2>
  <hr class="divider">
  <div class="row">
-    <%= render partial: 'locations/location', collection: @internal_cities_lists %>
+    <%= render partial: 'locations/location', collection: @internal_cities_list %>
  </div>
 </div>
--- a/app/views/shared/_header.html.erb
+++ b/app/views/shared/_header.html.erb
-<nav class='navbar navbar-expand-lg navbar-light sticky-top'>
+<nav class='navbar navbar-expand-md navbar-light sticky-top'>
  <%= link_to root_path, class: 'navbar-brand' do %>
    <%= image_tag 'venjob-logo.png', alt: 'VeNJob', size: '120x50' %>
  <% end %>
@@ -8,12 +8,31 @@
  <div class='collapse navbar-collapse' id='navbarSupportedContent'>
    <ul class='navbar-nav ml-auto'>
-      <li class='nav-item active'>
+      <% if user_signed_in? %>
-        <%= link_to 'Sign in', '#', class: 'nav-link text-white' %>
+        <li class="nav-item">
-      </li>
+          <%= link_to '#', class: 'nav-link text-white', title: 'Favorite' do %>
-      <li class='nav-item'>
+            <i class="fas fa-heart"></i>
-        <%= link_to 'Sign up', '#', class: 'nav-link text-white' %>
+          <% end %>
-      </li>
+        </li>
+        <li class="nav-item">
+          <%= link_to '#', class: 'nav-link text-white', title: 'History' do %>
+            <i class="fas fa-history"></i>
+          <% end %>
+        </li>
+        <li class="nav-item">
+          <%= link_to 'My Page', my_page_path, class: 'nav-link text-white' %>
+        </li>
+        <li class="nav-item">
+          <%= link_to 'Log out', destroy_user_session_path, method: :delete, class: 'nav-link text-white' %>
+        </li>
+      <% else %>
+        <li class='nav-item'>
+          <%= link_to 'Sign in', new_user_session_path, class: 'nav-link text-white' %>
+        </li>
+        <li class='nav-item'>
+          <%= link_to 'Sign up', new_user_registration_path, class: 'nav-link text-white' %>
+        </li>
+      <% end %>
    </ul>
  </div>
 </nav>
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
+<div class="col-lg-8 col-md-12 mx-auto">
+  <div class="card my-3">
+    <div class="row no-gutters">
+      <div class="col-md-4">
+        <div class="card-img-rounded mx-auto">
+          <%= image_tag 'venjob-logo.png', class: 'card-img' %>
+        </div>
+      </div>
+      <div class="col-md-8">
+        <div class="card-body">
+          <p class="card-title font-weight-bold text-center my-2 color-success display-4">Profile</p>
+          <p class="card-text"><strong>Email:</strong> <%= user.email %></p>
+          <p class="card-text"><strong>Full Name:</strong> <%= user.full_name %></p>
+          <p class="card-text"><strong>Curriculum Vitae:</strong>
+            <% if user.curriculum_vitae.present? %>
+              <%= link_to user.curriculum_vitae.identifier, user.curriculum_vitae.url, download: user.curriculum_vitae.identifier %>
+              <%= link_to user.curriculum_vitae.url, target: '_blank', class: 'text-dark' do %>
+                <i class="fas fa-eye"></i>
+              <% end %>
+            <% else %>
+              You don't have any curriculum vitae
+            <% end %>
+          </p>
+          <% if is_current_user?(user) %>
+            <div class="row">
+              <div class="col text-right">
+                <%= link_to 'Update', edit_user_registration_path, class: 'btn btn-outline-primary btn-lg' %>
+              </div>
+              <div class="col text-left">
+                <%= link_to 'My Jobs', '#', class: 'btn btn-outline-primary btn-lg' %>
+              </div>
+            </div>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
--- a/app/views/users/my_page.html.erb
+++ b/app/views/users/my_page.html.erb
+<%= render 'users/user', user: current_user %>
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
+<%= render 'users/user', user: @user %>
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -30,6 +30,9 @@ Rails.application.configure do
  # Store uploaded files on the local file system (see config/storage.yml for options)
  config.active_storage.service = :local
+  config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
+  config.action_mailer.delivery_method = :smtp
+  config.action_mailer.smtp_settings = { address: 'localhost', port: 1025 }
  # Don't care if the mailer can't send.
  config.action_mailer.raise_delivery_errors = false

--- a/config/environments/production.rb
+++ b/config/environments/production.rb
 Rails.application.configure do
+  config.action_mailer.smtp_settings = {
+    address: 'smtp.gmail.com',
+    port: 587,
+    domain: 'venjob-anhtn.herokuapp.com',
+    authentication: 'plain',
+    enable_starttls_auto: true,
+    user_name: ENV['GMAIL_USERNAME'],
+    password: ENV['GMAIL_PASSWORD']
+  }
+  config.action_mailer.default_url_options = { host: 'venjob-anhtn.herokuapp.com' }
  # Settings specified here will take precedence over those in config/application.rb.
  # Code is not reloaded between requests.

--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
--- a/config/locales/devise.en.yml
+++ b/config/locales/devise.en.yml
+# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+en:
+  devise:
+    confirmations:
+      confirmed: "Your email address has been successfully confirmed."
+      send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
+    failure:
+      already_authenticated: "You are already signed in."
+      inactive: "Your account is not activated yet."
+      invalid: "Invalid %{authentication_keys} or password."
+      locked: "Your account is locked."
+      last_attempt: "You have one more attempt before your account is locked."
+      not_found_in_database: "Invalid %{authentication_keys} or password."
+      timeout: "Your session expired. Please sign in again to continue."
+      unauthenticated: "You need to sign in or sign up before continuing."
+      unconfirmed: "You have to confirm your email address before continuing."
+    mailer:
+      confirmation_instructions:
+        subject: "Confirmation instructions"
+      reset_password_instructions:
+        subject: "Reset password instructions"
+      unlock_instructions:
+        subject: "Unlock instructions"
+      email_changed:
+        subject: "Email Changed"
+      password_change:
+        subject: "Password Changed"
+    omniauth_callbacks:
+      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
+      success: "Successfully authenticated from %{kind} account."
+    passwords:
+      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+      send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+      updated: "Your password has been changed successfully. You are now signed in."
+      updated_not_active: "Your password has been changed successfully."
+    registrations:
+      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
+      signed_up: "Welcome! You have signed up successfully."
+      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
+      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
+      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirmation link to confirm your new email address."
+      updated: "Your account has been updated successfully."
+      updated_but_not_signed_in: "Your account has been updated successfully, but since your password was changed, you need to sign in again"
+    sessions:
+      signed_in: "Signed in successfully."
+      signed_out: "Signed out successfully."
+      already_signed_out: "Signed out successfully."
+    unlocks:
+      send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
+      send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
+      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
+  errors:
+    messages:
+      already_confirmed: "was already confirmed, please try signing in"
+      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
+      expired: "has expired, please request a new one"
+      not_found: "not found"
+      not_locked: "was not locked"
+      not_saved:
+        one: "1 error prohibited this %{resource} from being saved:"
+        other: "%{count} errors prohibited this %{resource} from being saved:"
--- a/config/routes.rb
+++ b/config/routes.rb
 Rails.application.routes.draw do
+  devise_for :users, controllers: { sessions: 'users/sessions', registrations: 'users/registrations' }
  root to: 'home#index'
  get 'cities', to: 'locations#index'
  get 'industries', to: 'industries#index'
  get 'detail/:id', to: 'jobs#show', as: :job
  get 'jobs/:model/:slug', to: 'jobs#index', as: :jobs
+  get 'my', to: 'users#my_page', as: :my_page
+  resources :users, only: :show
  # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 end
--- a/db/migrate/20200807062519_add_devise_to_users.rb
+++ b/db/migrate/20200807062519_add_devise_to_users.rb
+class AddDeviseToUsers < ActiveRecord::Migration[5.2]
+  def change
+    change_table :users do |t|
+      ## Database authenticatable
+      # t.string :email,              null: false, default: ""
+      t.string :encrypted_password, null: false, default: ""
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+      ## Rememberable
+      t.datetime :remember_created_at
+      ## Trackable
+      # t.integer  :sign_in_count, default: 0, null: false
+      # t.datetime :current_sign_in_at
+      # t.datetime :last_sign_in_at
+      # t.inet     :current_sign_in_ip
+      # t.inet     :last_sign_in_ip
+      ## Confirmable
+      t.string   :confirmation_token
+      t.datetime :confirmed_at
+      t.datetime :confirmation_sent_at
+      t.string   :unconfirmed_email # Only if using reconfirmable
+      ## Lockable
+      # t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
+      # t.string   :unlock_token # Only if unlock strategy is :email or :both
+      # t.datetime :locked_at
+    end
+    remove_column :users, :password, :string
+    add_index :users, :email,                unique: true
+    add_index :users, :reset_password_token, unique: true
+    # add_index :users, :confirmation_token,   unique: true
+    # add_index :users, :unlock_token,         unique: true
+  end
+end
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2020_08_06_093557) do
+ActiveRecord::Schema.define(version: 2020_08_07_062519) do
  create_table "applied_jobs", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
    t.bigint "user_id"
@@ -103,10 +103,19 @@ ActiveRecord::Schema.define(version: 2020_08_06_093557) do
    t.string "email"
    t.string "full_name"
    t.string "curriculum_vitae"
-    t.string "password"
    t.boolean "admin"
    t.datetime "created_at", null: false
    t.datetime "updated_at", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.string "reset_password_token"
+    t.datetime "reset_password_sent_at"
+    t.datetime "remember_created_at"
+    t.string "confirmation_token"
+    t.datetime "confirmed_at"
+    t.datetime "confirmation_sent_at"
+    t.string "unconfirmed_email"
+    t.index ["email"], name: "index_users_on_email", unique: true
+    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
  end
  add_foreign_key "applied_jobs", "jobs"