Tô Ngọc Ánh · @anhtn · Hoang Phuc Do · Tô Ngọc Ánh · Thanh Hung Pham · Tô Ngọc Ánh
--- a/app/views/shared/_header.html.erb
+++ b/app/views/shared/_header.html.erb
 <nav class='navbar navbar-expand-lg navbar-light sticky-top'>
-  <a class='navbar-brand' href='#'>
+  <a class='navbar-brand' href='<%= root_path %>'>
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
  <h1>Latest Jobs</h1>
+  <hr>
  <div class='row'>
    <%= render partial: 'home/job', collection: @jobs %>
  </div>
-  <a href='#'>All Jobs</a>
 </div>
 <div id='top-cities' class='my-4 text-center'>
  <h1>Top Cities</h1>
+  <hr>
  <div class='row'>
-    <%= render partial: 'home/city', collection: @top_cities, as: :location %>
+    <%= render partial: 'locations/city', collection: @top_cities, as: :location %>
  </div>
-  <a href='#'>All Cities</a>
+  <a href='<%= cities_path %>'>All Cities</a>
--- a/app/controllers/locations_controller.rb 0 → 100644
+++ b/app/controllers/locations_controller.rb 0 → 100644
+class LocationsController < ApplicationController
+  def index
+    @vn_cities_lists = Location.vietnam.count_job
--- a/app/views/locations/index.html.erb 0 → 100644
+++ b/app/views/locations/index.html.erb 0 → 100644
+  <ul class='list-group list-group-horizontal'>
+    <li class='list-group-item'>
+      <a href='#vietnam'>Việt Nam</a>
+      <span class='badge badge-primary badge-pill'><%= @vn_cities_lists.length %></span>
+    </li>
+    <li class='list-group-item'>
+      <a href='#international'>International</a>
+      <span class='badge badge-primary badge-pill'><%= @internal_cities_lists.length %></span>
+    </li>
+  </ul>
+</div>
+<div id='vietnam' class='text-center'>
+  <h2>Vietnam</h2>
+  <hr>
+  <div class='row'>
+    <%= render partial: 'locations/city', collection: @vn_cities_lists, as: :location %>
--- a/app/views/locations/index.html.erb 0 → 100644
+++ b/app/views/locations/index.html.erb 0 → 100644
+      <span class='badge badge-primary badge-pill'><%= @internal_cities_lists.length %></span>
+    </li>
+  </ul>
+</div>
+<div id='vietnam' class='text-center'>
+  <h2>Vietnam</h2>
+  <hr>
+  <div class='row'>
+    <%= render partial: 'locations/city', collection: @vn_cities_lists, as: :location %>
+  </div>
+</div>
+<div id='international' class='text-center'>
+  <h2>International</h2>
+  <hr>
+  <div class="row">
+    <%= render partial: 'locations/city', collection: @internal_cities_lists, as: :location %>
--- a/app/views/home/_industry.html.erb → app/views/industries/_industry.html.erb
+++ b/app/views/home/_industry.html.erb → app/views/industries/_industry.html.erb
  <div class='card'>
    <%= link_to '#', class: 'card-body text-decoration-none' do %>
      <h5 class='card-title font-weight-bold'><%= industry.name %></h5>
-      <p class='card-text'><%= industry.jobs.size %> Jobs</p>
+      <p class='card-text'><%= industry.job_count %> Jobs</p>
--- a/app/models/industry.rb
+++ b/app/models/industry.rb
 class Industry < ApplicationRecord
-  scope :top_industries, ->(number) { joins(:jobs)
-                                      .group(:industry_id)
-                                      .order(Arel.sql('count(jobs.id) DESC'))
-                                      .take(number) }
-
+  scope :count_job, -> { joins(:jobs).group(:industry_id).select('industries.*, count(jobs.id) as job_count') }
+  scope :top_industries, ->(number) { count_job.order(Arel.sql('count(jobs.id) DESC')).limit(number) }
--- a/app/models/location.rb
+++ b/app/models/location.rb
 class Location < ApplicationRecord
-  scope :top_locations, ->(number) { joins(:jobs)
-                                    .group(:location_id)
-                                    .order(Arel.sql('count(jobs.id) DESC'))
-                                    .take(number) }
-
+  scope :count_job, -> { joins(:jobs).group(:location_id).select('locations.*, count(jobs.id) as job_count') }
+  scope :top_locations, ->(number) { count_job.order(Arel.sql('job_count DESC')).limit(number) }