Fix review 18/05/2020

f7159414 · Trịnh Hoàng Phúc · 0aeba9ec · f7159414 · f7159414 · f7159414
Commit f7159414 authored May 18, 2020 by Trịnh Hoàng Phúc
28 changed files
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby '2.7.0'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 6.0.2', '>= 6.0.2.2'
+gem 'rails', '~> 6.0', '>= 6.0.3'
 # Use sqlite3 as the database for Active Record
 # gem 'sqlite3', '~> 1.4'
 gem 'mysql2'

--- a/Gemfile.lock
+++ b/Gemfile.lock
 GEM
  remote: https://rubygems.org/
  specs:
-    actioncable (6.0.2.2)
+    actioncable (6.0.3)
-      actionpack (= 6.0.2.2)
+      actionpack (= 6.0.3)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.2.2)
+    actionmailbox (6.0.3)
-      actionpack (= 6.0.2.2)
+      actionpack (= 6.0.3)
-      activejob (= 6.0.2.2)
+      activejob (= 6.0.3)
-      activerecord (= 6.0.2.2)
+      activerecord (= 6.0.3)
-      activestorage (= 6.0.2.2)
+      activestorage (= 6.0.3)
-      activesupport (= 6.0.2.2)
+      activesupport (= 6.0.3)
      mail (>= 2.7.1)
-    actionmailer (6.0.2.2)
+    actionmailer (6.0.3)
-      actionpack (= 6.0.2.2)
+      actionpack (= 6.0.3)
-      actionview (= 6.0.2.2)
+      actionview (= 6.0.3)
-      activejob (= 6.0.2.2)
+      activejob (= 6.0.3)
      mail (~> 2.5, >= 2.5.4)
      rails-dom-testing (~> 2.0)
-    actionpack (6.0.2.2)
+    actionpack (6.0.3)
-      actionview (= 6.0.2.2)
+      actionview (= 6.0.3)
-      activesupport (= 6.0.2.2)
+      activesupport (= 6.0.3)
      rack (~> 2.0, >= 2.0.8)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.2.2)
+    actiontext (6.0.3)
-      actionpack (= 6.0.2.2)
+      actionpack (= 6.0.3)
-      activerecord (= 6.0.2.2)
+      activerecord (= 6.0.3)
-      activestorage (= 6.0.2.2)
+      activestorage (= 6.0.3)
-      activesupport (= 6.0.2.2)
+      activesupport (= 6.0.3)
      nokogiri (>= 1.8.5)
-    actionview (6.0.2.2)
+    actionview (6.0.3)
-      activesupport (= 6.0.2.2)
+      activesupport (= 6.0.3)
      builder (~> 3.1)
      erubi (~> 1.4)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.2.2)
+    activejob (6.0.3)
-      activesupport (= 6.0.2.2)
+      activesupport (= 6.0.3)
      globalid (>= 0.3.6)
-    activemodel (6.0.2.2)
+    activemodel (6.0.3)
-      activesupport (= 6.0.2.2)
+      activesupport (= 6.0.3)
-    activerecord (6.0.2.2)
+    activerecord (6.0.3)
-      activemodel (= 6.0.2.2)
+      activemodel (= 6.0.3)
-      activesupport (= 6.0.2.2)
+      activesupport (= 6.0.3)
    activerecord-import (1.0.4)
      activerecord (>= 3.2)
-    activestorage (6.0.2.2)
+    activestorage (6.0.3)
-      actionpack (= 6.0.2.2)
+      actionpack (= 6.0.3)
-      activejob (= 6.0.2.2)
+      activejob (= 6.0.3)
-      activerecord (= 6.0.2.2)
+      activerecord (= 6.0.3)
      marcel (~> 0.3.1)
-    activesupport (6.0.2.2)
+    activesupport (6.0.3)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 0.7, < 2)
      minitest (~> 5.1)
      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
    addressable (2.7.0)
      public_suffix (>= 2.0.2, < 5.0)
    bcrypt (3.1.13)
@@ -68,8 +68,8 @@ GEM
    bootsnap (1.4.6-java)
      msgpack (~> 1.0)
    builder (3.2.4)
-    byebug (11.1.1)
+    byebug (11.1.3)
-    capybara (3.32.0)
+    capybara (3.32.2)
      addressable
      mini_mime (>= 0.1.3)
      nokogiri (~> 1.8)
@@ -106,7 +106,7 @@ GEM
    hashie (4.1.0)
    i18n (1.8.2)
      concurrent-ruby (~> 1.0)
-    image_processing (1.10.3)
+    image_processing (1.11.0)
      mini_magick (>= 4.9.5, < 5)
      ruby-vips (>= 2.0.17, < 3)
    jbuilder (2.10.0)
@@ -128,7 +128,7 @@ GEM
      rb-fsevent (~> 0.9, >= 0.9.4)
      rb-inotify (~> 0.9, >= 0.9.7)
      ruby_dep (~> 1.2)
-    loofah (2.4.0)
+    loofah (2.5.0)
      crass (~> 1.0.2)
      nokogiri (>= 1.5.9)
    mail (2.7.1)
@@ -138,11 +138,11 @@ GEM
    meta-tags (2.13.0)
      actionpack (>= 3.2.0, < 6.1)
    method_source (1.0.0)
-    mimemagic (0.3.4)
+    mimemagic (0.3.5)
    mini_magick (4.10.1)
    mini_mime (1.0.2)
    mini_portile2 (2.4.0)
-    minitest (5.14.0)
+    minitest (5.14.1)
    msgpack (1.3.3)
    msgpack (1.3.3-java)
    msgpack (1.3.3-x64-mingw32)
@@ -179,14 +179,14 @@ GEM
      omniauth (~> 1.9)
    orm_adapter (0.5.0)
    parallel (1.19.1)
-    pry (0.13.0)
+    pry (0.13.1)
      coderay (~> 1.1)
      method_source (~> 1.0)
-    pry (0.13.0-java)
+    pry (0.13.1-java)
      coderay (~> 1.1)
      method_source (~> 1.0)
      spoon (~> 0.0)
-    public_suffix (4.0.3)
+    public_suffix (4.0.5)
    puma (4.3.3)
      nio4r (~> 2.0)
    puma (4.3.3-java)
@@ -196,34 +196,34 @@ GEM
      rack
    rack-test (1.1.0)
      rack (>= 1.0, < 3)
-    rails (6.0.2.2)
+    rails (6.0.3)
-      actioncable (= 6.0.2.2)
+      actioncable (= 6.0.3)
-      actionmailbox (= 6.0.2.2)
+      actionmailbox (= 6.0.3)
-      actionmailer (= 6.0.2.2)
+      actionmailer (= 6.0.3)
-      actionpack (= 6.0.2.2)
+      actionpack (= 6.0.3)
-      actiontext (= 6.0.2.2)
+      actiontext (= 6.0.3)
-      actionview (= 6.0.2.2)
+      actionview (= 6.0.3)
-      activejob (= 6.0.2.2)
+      activejob (= 6.0.3)
-      activemodel (= 6.0.2.2)
+      activemodel (= 6.0.3)
-      activerecord (= 6.0.2.2)
+      activerecord (= 6.0.3)
-      activestorage (= 6.0.2.2)
+      activestorage (= 6.0.3)
-      activesupport (= 6.0.2.2)
+      activesupport (= 6.0.3)
      bundler (>= 1.3.0)
-      railties (= 6.0.2.2)
+      railties (= 6.0.3)
      sprockets-rails (>= 2.0.0)
    rails-dom-testing (2.0.3)
      activesupport (>= 4.2.0)
      nokogiri (>= 1.6)
    rails-html-sanitizer (1.3.0)
      loofah (~> 2.3)
-    railties (6.0.2.2)
+    railties (6.0.3)
-      actionpack (= 6.0.2.2)
+      actionpack (= 6.0.3)
-      activesupport (= 6.0.2.2)
+      activesupport (= 6.0.3)
      method_source
      rake (>= 0.8.7)
      thor (>= 0.20.3, < 2.0)
    rake (13.0.1)
-    rb-fsevent (0.10.3)
+    rb-fsevent (0.10.4)
    rb-inotify (0.10.1)
      ffi (~> 1.0)
    regexp_parser (1.7.0)
@@ -239,11 +239,9 @@ GEM
    rubyzip (2.3.0)
    sass-rails (6.0.0)
      sassc-rails (~> 2.1, >= 2.1.1)
-    sassc (2.2.1)
+    sassc (2.3.0)
      ffi (~> 1.9)
-    sassc (2.2.1-x64-mingw32)
+    sassc (2.3.0-x64-mingw32)
-      ffi (~> 1.9)
-    sassc (2.2.1-x86-mingw32)
      ffi (~> 1.9)
    sassc-rails (2.1.2)
      railties (>= 4.0.0)
@@ -275,18 +273,18 @@ GEM
    turbolinks (5.2.1)
      turbolinks-source (~> 5.2)
    turbolinks-source (5.2.0)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
      thread_safe (~> 0.1)
-    tzinfo-data (1.2019.3)
+    tzinfo-data (1.2020.1)
      tzinfo (>= 1.0.0)
    warden (1.2.8)
      rack (>= 2.0.6)
-    web-console (4.0.1)
+    web-console (4.0.2)
      actionview (>= 6.0.0)
      activemodel (>= 6.0.0)
      bindex (>= 0.4.0)
      railties (>= 6.0.0)
-    webdrivers (4.2.0)
+    webdrivers (4.3.0)
      nokogiri (~> 1.6)
      rubyzip (>= 1.3.0)
      selenium-webdriver (>= 3.0, < 4.0)
@@ -328,7 +326,7 @@ DEPENDENCIES
  parallel
  pry
  puma (~> 4.1)
-  rails (~> 6.0.2, >= 6.0.2.2)
+  rails (~> 6.0, >= 6.0.3)
  rsolr
  sass-rails (>= 6)
  selenium-webdriver

--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
 class HomeController < ApplicationController
  def index
    @amount_job = Job.count
-    @latest_jobs = Job.last(Settings.home.limit)
+    @latest_jobs = Job.includes(:cities, :company).last(Settings.home.limit)
-    @latest_cities = City.last(Settings.home.limit - 2)
+    @latest_cities = City.includes(:jobs).jobs_count_order_by
-    @latest_industries = Industry.last(Settings.home.limit - 2)
+    @latest_industries = Industry.includes(:jobs).jobs_count_order_by
  end
 end
--- a/app/controllers/jobs_controller.rb
+++ b/app/controllers/jobs_controller.rb
@@ -15,22 +15,20 @@ class JobsController < ApplicationController
    end
  end
  def show
-    @job = Job.find_by(id: params[:id])
+    @job = Job.includes(:cities, :industries, :company).find_by(id: params[:id])
    if @job.present?
      @title = @job.title
      if user_signed_in?
        @apply = Apply.find_by(job_id: params[:id], user_id: current_user.id)
        @favorite = Favorite.find_by(job_id: params[:id], user_id: current_user.id)
      end
-      @relate_jobs = Job.where("company_id = ? and id != ?", @job.company_id, @job.id).order("id DESC")
+      @relate_jobs = Job.includes(:cities, :company).where("company_id = ? and id != ?", @job.company_id, @job.id).order("id DESC").limit(10)
      if cookies[:job_ids_history].nil?
        cookies[:job_ids_history] = {value: @job.id, expires: Time.now + 3600}
      else
        arr_job_ids = cookies[:job_ids_history].split(",")
-        unless arr_job_ids.include?(@job.id.to_s)
+        unless arr_job_ids.include? (@job.id.to_s)
-          if arr_job_ids.count == 10
+          arr_job_ids.shift if arr_job_ids.count == 10
-            arr_job_ids.shift
-          end
          arr_job_ids << @job.id.to_s
        end
        cookies[:job_ids_history] = {value: arr_job_ids.join(","), expires: Time.now + 3600}

--- a/app/models/city.rb
+++ b/app/models/city.rb
@@ -2,4 +2,12 @@ class City < ApplicationRecord
  validates :title, presence: true, uniqueness: true
  has_and_belongs_to_many :jobs
+  def jobs_count
+    @jobs_count ||= jobs.size
+  end
+  def self.jobs_count_order_by
+    @jobs_count_order_by ||= all.sort_by(&:jobs_count).reverse.take(Settings.home.limit + 2)
+  end
 end
--- a/app/models/industry.rb
+++ b/app/models/industry.rb
@@ -2,4 +2,12 @@ class Industry < ApplicationRecord
  validates :title, presence: true, uniqueness: true
  has_and_belongs_to_many :jobs
+  def jobs_count
+    @jobs_count ||= jobs.size
+  end
+  def self.jobs_count_order_by
+    @jobs_count_order_by ||= all.sort_by(&:jobs_count).reverse.take(Settings.home.limit + 2)
+  end
 end
--- a/app/views/admins/applies.html.erb
+++ b/app/views/admins/applies.html.erb
-<%= content_for :title, "VenJob - Admin Applies" %>
+<% set_meta_tags title: "VenJob - Admin Applies",
+                 description: "VenJob - Admin Applies",
+                 keywords: "VenJob - Admin Applies" %>
 <div id="primary" class="content-area container" role="main">
  <div class="row">
    <div class="col-sm-12 col-md-10 col-md-offset-1">

--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
-<% content_for :title, "VenJob - Edit #{resource_name.to_s.humanize}" %>
+<% set_meta_tags title: "VenJob - Edit #{resource_name.to_s.humanize}",
+                 description: "VenJob - Edit #{resource_name.to_s.humanize}",
+                 keywords: "VenJob - Edit #{resource_name.to_s.humanize}" %>
 <header class="page-header">
  <h2 class="page-title">Edit <%= resource_name.to_s.humanize %></h2>
 </header>

--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -36,6 +36,7 @@
          <p class="actions">
            <%= f.submit "Sign up", class: "button" %>
+            <%= link_to "Sign in with Facebook", user_facebook_omniauth_authorize_path, class: "button" %>
          </p>
        <% end %>
        <p>

--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -30,37 +30,8 @@
          <h3 class="widget-title widget-title--home">Total Jobs: <%= @amount_job %></h3>
          <div class="job_listings">
            <ul class="job_listings">
-              <% @latest_jobs.each do |job| %>
+              <% if @latest_jobs.present? %>
-                <li class="job_listing job-type-part-time post-3354 type-job_listing status-publish has-post-thumbnail hentry job_listing_category-design job_listing_type-part-time">
+                <%= render partial: '/shared/job_item', collection: @latest_jobs %>
-                  <div class="job_listing-logo">
-                    <%= link_to(job) do %>
-                      <img class="company_logo" src="<%= job.company.logo != "" ? job.company.logo : "https://via.placeholder.com/66x38?text=Logo" %>" alt="<%= job.company.title %>" />
-                    <% end %>
-                  </div>
-                  <div class="job_listing-about">
-                    <div class="job_listing-position job_listing__column">
-                      <h3 class="job_listing-title">
-                        <%= link_to job.title, job %>
-                      </h3>
-                      <div class="job_listing-company">
-                        <strong>
-                          <%= link_to job.company.title, jobs_with_company_path(company_id: job.company.id) %>
-                        </strong> 							
-                      </div>
-                    </div>
-                    <div class="job_listing-location job_listing__column">
-                      <% job.cities.each_with_index do |city, index| %>
-                        <%= link_to jobs_with_city_path(city_id: city.id), class: "google_map_link" do %>
-                          <%= city.title %><%= ", " if index != job.cities.size - 1 %>
-                        <% end %>
-                      <% end %>
-                    </div>
-                    <ul class="job_listing-meta job_listing__column">
-                      <li class="job_listing-type job-type part-time"><%= job.salary %></li>
-                      <li class="job_listing-date"><%= job.expiration_date %></li>
-                    </ul>
-                  </div>
-                </li>
              <% end %>
            </ul>
            <%= link_to jobs_path, class: "load_more_jobs" do %>
@@ -95,12 +66,7 @@
        Here we list our cities and how many people we’ve helped find a job and companies have found recruits. It's a pretty awesome stats area!
      </p>
      <ul class="job-stats row showing-4">
-        <% @latest_cities.each do |city| %>
+        <%= render partial: '/shared/latest_industry', collection: @latest_cities %>
-          <li class="job-stat col-md-3 col-sm-6 col-xs-12">
-            <strong><%= city.jobs.count %></strong>
-            <%= link_to city.title, jobs_with_city_path(city_id: city.id) %>
-          </li>
-        <% end %>
      </ul>
      <%= link_to cities_path, class: "load_more_jobs" do %>
        <strong>Load more listings</strong>
@@ -128,12 +94,7 @@
    <div class="container">
      <h3 class="widget-title widget-title--home">Top Industries</h3>
      <ul class="job-stats row showing-4">
-        <% @latest_industries.each do |industry| %>
+        <%= render partial: '/shared/latest_industry', collection: @latest_industries %>
-          <li class="job-stat col-md-3 col-sm-6 col-xs-12">
-            <strong><%= industry.jobs.count %></strong>
-            <%= link_to industry.title, jobs_with_industry_path(industry_id: industry.id) %>
-          </li>
-        <% end %>
      </ul>
      <%= link_to industries_path, class: "load_more_jobs" do %>
        <strong>Load more listings</strong>

--- a/app/views/jobs/index.html.erb
+++ b/app/views/jobs/index.html.erb
@@ -27,38 +27,7 @@
        <noscript>Your browser does not support JavaScript, or it is disabled. JavaScript must be enabled in order to view listings.</noscript>
        <% if @jobs.present? %>
          <ul class="job_listings">
-            <% @jobs.each do |job| %>
+            <%= render partial: '/shared/job_item', collection: @jobs %>
-              <li class="job_listing job-type-part-time post-3354 type-job_listing status-publish has-post-thumbnail hentry job_listing_category-design job_listing_type-part-time">
-                <div class="job_listing-logo">
-                  <%= link_to(job) do %>
-                    <img class="company_logo" src="<%= job.company.logo != "" ? job.company.logo : "https://via.placeholder.com/66x38?text=Logo" %>" alt="<%= job.company.title %>">
-                  <% end %>
-                </div>
-                <div class="job_listing-about">
-                  <div class="job_listing-position job_listing__column">
-                    <h3 class="job_listing-title">
-                      <%= link_to job.title, job %>
-                    </h3>
-                    <div class="job_listing-company">
-                      <strong>
-                        <%= link_to job.company.title, jobs_with_company_path(company_id: job.company.id) %>
-                      </strong>			
-                    </div>
-                  </div>
-                  <div class="job_listing-location job_listing__column">
-                    <% job.cities.each_with_index do |city, index| %>
-                      <%= link_to jobs_with_city_path(city_id: city.id), class: "google_map_link" do %>
-                        <%= city.title %><%= ", " if index != job.cities.size - 1 %>
-                      <% end %>		
-                    <% end %>
-                  </div>
-                  <ul class="job_listing-meta job_listing__column">
-                    <li class="job_listing-type job-type part-time"><%= job.salary %></li>
-                    <li class="job_listing-date"><%= job.expiration_date %></li>
-                  </ul>
-                </div>
-              </li>
-            <% end %>
          </ul>
          <div class="job-manager-pagination">
            <%= paginate @jobs %>

--- a/app/views/jobs/search.html.erb
+++ b/app/views/jobs/search.html.erb
@@ -10,11 +10,11 @@
  <div class="container content-area">
    <div class="entry-content">
      <div class="job_listings">
-        <%= form_tag(search_jobs_path, :method => "get", :class => "job_filters") do %>
+        <%= form_tag(search_jobs_path, :method => "get") do %>
          <div class="search_jobs">
            <div class="search_keywords">
              <label for="keyword">Keywords</label>
-              <input type="text" name="keyword" id="keyword" placeholder="Keywords" value="<%= params[:keyword]%>" />
+              <input type="search" name="keyword" id="keyword" placeholder="Keywords" value="<%= params[:keyword]%>" />
            </div>
            <div class="search_submit">
              <%= submit_tag "Search Jobs", name: nil %>
@@ -24,7 +24,6 @@
            <span>Search completed. Found <%= @amount_job %> matching records.</span>
          </div>
        <% end %>
-        <noscript>Your browser does not support JavaScript, or it is disabled. JavaScript must be enabled in order to view listings.</noscript>
        <% if @jobs.present? %>
          <ul class="job_listings">
            <% @jobs.each do |job| %>

--- a/app/views/jobs/show.html.erb
+++ b/app/views/jobs/show.html.erb
@@ -42,14 +42,14 @@
          </aside>
          <aside class="widget widget--job_listing">
            <div class="job_application application" style="margin-bottom: 15px;">
-              <% unless @apply.present? %>
+              <% if @apply.blank? %>
                <input type="button" class="application_button button apply-or-favorite-jobs" value="Apply for job" data-id="<%= @job.id %>" data-type="apply"/>
              <% else %>
                <input type="button" class="application_button button" value="Apply for job" disabled/>
              <% end %>
            </div>
            <div class="job_application application">
-              <% unless @favorite.present? %>
+              <% if @favorite.blank? %>
                <input type="button" class="application_button button apply-or-favorite-jobs" value="Favorite" data-id="<%= @job.id %>" data-type="favorite"/>
              <% else %>
                <input type="button" class="application_button button" value="Favorite" disabled/>
@@ -61,7 +61,7 @@
            <ul>
              <li>Name: <%= @job.company.title %></li>
              <li>Address: <%= @job.company.address %></li>
-              <li>Description: <%= raw(@job.company.description) %></li>
+              <%= raw(@job.company.description) %>
            </ul>
          </aside>
          <aside class="widget widget--job_listing">
@@ -78,37 +78,8 @@
    <div class="related-jobs container">
      <h3 class="widget-title widget--title-job_listing-top">Related Jobs</h3>
      <ul class="job_listings related">
-        <% @relate_jobs.each do |job| %>
+        <% if @relate_jobs.present? %>
-          <li class="job_listing job-type-part-time post-3354 type-job_listing status-publish has-post-thumbnail hentry job_listing_category-design job_listing_type-part-time">
+          <%= render partial: '/shared/job_item', collection: @relate_jobs %>
-            <div class="job_listing-logo">
-              <%= link_to(job) do %>
-                <img class="company_logo" src="<%= job.company.logo != "" ? job.company.logo : "https://via.placeholder.com/66x38?text=Logo" %>" alt="<%= job.company.title %>" />
-              <% end %>
-            </div>
-            <div class="job_listing-about">
-              <div class="job_listing-position job_listing__column">
-                <h3 class="job_listing-title">
-                  <%= link_to job.title, job %>
-                </h3>
-                <div class="job_listing-company">
-                  <strong>
-                    <%= link_to job.company.title, jobs_with_company_path(company_id: job.company.id) %>
-                  </strong> 							
-                </div>
-              </div>
-              <div class="job_listing-location job_listing__column">
-                <% job.cities.each_with_index do |city, index| %>
-                  <%= link_to jobs_with_city_path(city_id: city.id), class: "google_map_link" do %>
-                    <%= city.title %><%= ", " if index != job.cities.size - 1 %>
-                  <% end %>
-                <% end %>
-              </div>
-              <ul class="job_listing-meta job_listing__column">
-                <li class="job_listing-type job-type part-time"><%= job.salary %></li>
-                <li class="job_listing-date"><%= job.expiration_date %></li>
-              </ul>
-            </div>
-          </li>
        <% end %>
      </ul>
    </div>

--- a/app/views/shared/_job_item.html.erb
+++ b/app/views/shared/_job_item.html.erb
+<li class="job_listing job-type-part-time post-3354 type-job_listing status-publish has-post-thumbnail hentry job_listing_category-design job_listing_type-part-time">
+    <div class="job_listing-logo">
+      <%= link_to(job_item) do %>
+        <img class="company_logo" src="<%= job_item.company.logo != "" ? job_item.company.logo : "https://via.placeholder.com/66x38?text=Logo" %>" alt="<%= job_item.company.title %>">
+      <% end %>
+    </div>
+    <div class="job_listing-about">
+      <div class="job_listing-position job_listing__column">
+        <h3 class="job_listing-title">
+          <%= link_to job_item.title, job_item %>
+        </h3>
+        <div class="job_listing-company">
+          <strong>
+            <%= link_to job_item.company.title, jobs_with_company_path(company_id: job_item.company.id) %>
+          </strong>			
+        </div>
+      </div>
+      <div class="job_listing-location job_listing__column">
+        <% job_item.cities.each_with_index do |city, index| %>
+          <%= link_to jobs_with_city_path(city_id: city.id), class: "google_map_link" do %>
+            <%= city.title %><%= ", " if index != job_item.cities.size - 1 %>
+          <% end %>		
+        <% end %>
+      </div>
+      <ul class="job_listing-meta job_listing__column">
+        <li class="job_listing-type job-type part-time"><%= job_item.salary %></li>
+        <li class="job_listing-date"><%= job_item.expiration_date %></li>
+      </ul>
+    </div>
+  </li>
\ No newline at end of file
--- a/app/views/shared/_latest_city.html.erb
+++ b/app/views/shared/_latest_city.html.erb
+<li class="job-stat col-md-3 col-sm-6 col-xs-12">
+  <strong><%= latest_city.jobs_count %></strong>
+  <%= link_to latest_city.title, jobs_with_city_path(city_id: latest_city.id) %>
+</li>
\ No newline at end of file
--- a/app/views/shared/_latest_industry.html.erb
+++ b/app/views/shared/_latest_industry.html.erb
+<li class="job-stat col-md-3 col-sm-6 col-xs-12">
+  <strong><%= latest_industry.jobs_count %></strong>
+  <%= link_to latest_industry.title, jobs_with_industry_path(industry_id: latest_industry.id) %>
+</li>
\ No newline at end of file
--- a/app/views/users/apply_jobs.html.erb
+++ b/app/views/users/apply_jobs.html.erb
-<% content_for :title, "VenJob - Appied Jobs" %>
+<% set_meta_tags title: "VenJob - Applied Jobs",
+                 description: "VenJob - Applied Jobs",
+                 keywords: "VenJob - Applied Jobs" %>
 <header class="page-header">
-  <h2 class="page-title">Appied Jobs</h2>
+  <h2 class="page-title">Applied Jobs</h2>
 </header>
 <div id="primary" class="content-area container" role="main">
  <article id="post-1673" class="post-1673 page type-page status-publish hentry">

--- a/app/views/users/favorite_jobs.html.erb
+++ b/app/views/users/favorite_jobs.html.erb
-<%= content_for :title, "VenJob - Favorite jobs" %>
+<% set_meta_tags title: "VenJob - Favorite Jobs",
+                 description: "VenJob - Favorite Jobs",
+                 keywords: "VenJob - Favorite Jobs" %>
 <header class="page-header">
  <h2 class="page-title">Favorite jobs</h2>
 </header>

--- a/app/views/users/info.html.erb
+++ b/app/views/users/info.html.erb
-<% content_for :title, "VenJob - User info" %>
+<% set_meta_tags title: "VenJob - User information",
+                 description: "VenJob - User information",
+                 keywords: "VenJob - User information" %>
 <header class="page-header">
-  <h2 class="page-title">User info</h2>
+  <h2 class="page-title">User information</h2>
 </header>
 <div id="primary" class="content-area container" role="main">
  <article id="post-1673" class="post-1673 page type-page status-publish hentry">

--- a/bin/rails
+++ b/bin/rails
 #!/usr/bin/env ruby
-begin
-  load File.expand_path('../spring', __FILE__)
-rescue LoadError => e
-  raise unless e.message.include?('spring')
-end
 APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'
--- a/bin/rake
+++ b/bin/rake
 #!/usr/bin/env ruby
-begin
-  load File.expand_path('../spring', __FILE__)
-rescue LoadError => e
-  raise unless e.message.include?('spring')
-end
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -7,7 +7,7 @@ Rails.application.configure do
  config.cache_classes = false
  # Do not eager load code on boot.
-  config.eager_load = false
+  config.eager_load = true
  # Show full error reports.
  config.consider_all_requests_local = true
@@ -59,8 +59,4 @@ Rails.application.configure do
  # Use an evented file watcher to asynchronously detect changes in source code,
  # routes, locales, etc. This feature depends on the listen gem.
  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
-  config.action_mailer.default_url_options = { :host => 'localhost:3000' }
-  config.action_mailer.delivery_method = :smtp
-  config.action_mailer.smtp_settings = {:address => "localhost", :port => 1025}
 end
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -7,6 +7,7 @@ Rails.application.configure do
  # Settings specified here will take precedence over those in config/application.rb.
  config.cache_classes = false
+  config.action_view.cache_template_loading = true
  # Do not eager load code on boot. This avoids loading your whole application
  # just for the purpose of running a single test. If you are using a tool that

--- a/config/initializers/new_framework_defaults_6_0.rb
+++ b/config/initializers/new_framework_defaults_6_0.rb
+# Be sure to restart your server when you modify this file.
+#
+# This file contains migration options to ease your Rails 6.0 upgrade.
+#
+# Once upgraded flip defaults one by one to migrate to the new default.
+#
+# Read the Guide for Upgrading Ruby on Rails for more info on each option.
+# Don't force requests from old versions of IE to be UTF-8 encoded.
+# Rails.application.config.action_view.default_enforce_utf8 = false
+# Embed purpose and expiry metadata inside signed and encrypted
+# cookies for increased security.
+#
+# This option is not backwards compatible with earlier Rails versions.
+# It's best enabled when your entire app is migrated and stable on 6.0.
+# Rails.application.config.action_dispatch.use_cookies_with_metadata = true
+# Change the return value of `ActionDispatch::Response#content_type` to Content-Type header without modification.
+# Rails.application.config.action_dispatch.return_only_media_type_on_content_type = false
+# Return false instead of self when enqueuing is aborted from a callback.
+# Rails.application.config.active_job.return_false_on_aborted_enqueue = true
+# Send Active Storage analysis and purge jobs to dedicated queues.
+# Rails.application.config.active_storage.queues.analysis = :active_storage_analysis
+# Rails.application.config.active_storage.queues.purge    = :active_storage_purge
+# When assigning to a collection of attachments declared via `has_many_attached`, replace existing
+# attachments instead of appending. Use #attach to add new attachments without replacing existing ones.
+# Rails.application.config.active_storage.replace_on_assign_to_many = true
+# Use ActionMailer::MailDeliveryJob for sending parameterized and normal mail.
+#
+# The default delivery jobs (ActionMailer::Parameterized::DeliveryJob, ActionMailer::DeliveryJob),
+# will be removed in Rails 6.1. This setting is not backwards compatible with earlier Rails versions.
+# If you send mail in the background, job workers need to have a copy of
+# MailDeliveryJob to ensure all delivery jobs are processed properly.
+# Make sure your entire app is migrated and stable on 6.0 before using this setting.
+# Rails.application.config.action_mailer.delivery_job = "ActionMailer::MailDeliveryJob"
+# Enable the same cache key to be reused when the object being cached of type
+# `ActiveRecord::Relation` changes by moving the volatile information (max updated at and count)
+# of the relation's cache key into the cache version to support recycling cache key.
+# Rails.application.config.active_record.collection_cache_versioning = true
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -31,10 +31,3 @@
 en:
  hello: "Hello world"
-  header_csv:
-    title: Title
-    updated_date_job: Updated date job
-    level: Level
-    years_of_experience: Years of experience
-    salary: Salary
-    expiration_date: Expiration date
\ No newline at end of file
--- a/db/migrate/20200518023337_add_foreign_key_constraint_to_active_storage_attachments_for_blob_id.active_storage.rb
+++ b/db/migrate/20200518023337_add_foreign_key_constraint_to_active_storage_attachments_for_blob_id.active_storage.rb
+# This migration comes from active_storage (originally 20180723000244)
+class AddForeignKeyConstraintToActiveStorageAttachmentsForBlobId < ActiveRecord::Migration[6.0]
+  def up
+    return if foreign_key_exists?(:active_storage_attachments, column: :blob_id)
+    if table_exists?(:active_storage_blobs)
+      add_foreign_key :active_storage_attachments, :active_storage_blobs, column: :blob_id
+    end
+  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_05_15_033747) do
+ActiveRecord::Schema.define(version: 2020_05_18_023337) do
  create_table "admins", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
    t.string "email", default: "", null: false

--- a/lib/tasks/solr.rake
+++ b/lib/tasks/solr.rake
@@ -3,63 +3,44 @@ namespace :solr do
  desc "Solr management"
  solr_job = RSolr.connect :url => "http://localhost:8983/solr/job"
-  solr_apply = RSolr.connect :url => "http://localhost:8983/solr/apply"
  task import_job: :environment do
-    jobs = Job.all
+    hash_jobs = []
-    hash_jobs = jobs.map { |item|
+    Job.find_each do |item|
-      { 
+      job = { 
-        apply_count: Apply.where("job_id = ?", item.id).count,
+        apply_count: item.applies.size,
-        city_ids: item.cities.map { |city| city.id },
+        city_ids: item.cities.pluck(:id),
-        city_names: item.cities.map { |city| city.title },
+        city_names: item.cities.pluck(:title),
        company_id: item.company_id,
        company_name: item.company.title,
        company_address: item.company.address,
        company_description: item.company.description,
        company_logo: item.company.logo,
        created_at: item.created_at.to_i,
-        expiration_date: item.expiration_date.nil? ? 0 : DateTime.parse(item.expiration_date).to_i,
+        expiration_date: DateTime.parse(item.expiration_date).to_i,
-        favorite_count: Favorite.where("job_id = ?", item.id).count,
+        favorite_count: item.favorites.size,
-        industry_ids: item.industries.map { |industry| industry.id },
+        industry_ids: item.industries.pluck(:id),
-        industry_names: item.industries.map { |industry| industry.title },
+        industry_names: item.industries.pluck(:title),
        job_description: item.job_description,
+        job_benefit: item.benefit,
        job_id: item.id, 
+        job_other_information: item.other_information,
+        job_requirements: item.job_requirements,
        job_title: item.title,
        level: item.level,
+        max_salary: item.max_salary,
+        min_salary: item.min_salary,
        salary: item.salary,
-        updated_date_job: item.updated_date_job.nil? ? 0 : DateTime.parse(item.updated_date_job).to_i,
+        updated_date_job: DateTime.parse(item.updated_date_job).to_i,
        years_of_experience: item.years_of_experience
      } 
-    }
+      hash_jobs << job
+    end
    solr_job.add hash_jobs
    solr_job.commit
  end
-  task import_apply: :environment do
-    applies = Apply.all
-    hash_applies = applies.map { |item|
-      { 
-        apply_id: item.id,
-        job_id: item.job.id, 
-        job_title: item.job.title,
-        industry_ids: item.job.industries.map { |industry| industry.id },
-        industry_names: item.job.industries.map { |industry| industry.title },
-        city_ids: item.job.cities.map { |city| city.id },
-        city_names: item.job.cities.map { |city| city.title },
-        user_full_name: item.user.full_name,
-        user_email: item.user.email,
-        user_cv: item.user.cv.nil? ? "" : item.user.cv.to_s,
-        applied_at: item.created_at.to_i,
-      } 
-    }
-    solr_apply.add hash_applies
-    solr_apply.commit
-  end
  task delete_all_job: :environment do
    solr_job.delete_by_query "*:*"
    solr_job.commit
  end
-  task delete_all_apply: :environment do
-    solr_apply.delete_by_query "*:*"
-    solr_apply.commit
-  end
 end