done city_list and industry_list

app/assets/stylesheets/cities.scss

+// Place all the styles related to the cities controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: https://sass-lang.com/

app/assets/stylesheets/industries.scss

+// Place all the styles related to the industries controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: https://sass-lang.com/

app/controllers/cities_controller.rb

+class CitiesController < ApplicationController
+  def index
+    @top_cities_vn = City.top_city_by_job
+    @top_cities_nn = City.top_city_by_job_nn
+    @all_top_cities_vn = City.all_city_by_job
+    @all_top_cities_nn = City.all_city_by_job_nn
+  end
+end

app/controllers/industries_controller.rb

+class IndustriesController < ApplicationController
+  def index
+    @all_industry = Industry.all_industry_by_job
+  end
+end

app/helpers/cities_helper.rb

+module CitiesHelper
+end

app/helpers/industries_helper.rb

+module IndustriesHelper
+end

app/models/city.rb

@@ -2,5 +2,9 @@ class City < ApplicationRecord
    belongs_to :area
    belongs_to :area
    has_many :jobs
    has_many :jobs
    validates_presence_of :city_name
    validates_presence_of :city_name
-   scope :top_city_by_job, ->{joins(:jobs).select('cities.*, COUNT(jobs.id) as job_count').group('jobs.city_id').order(:job_count).last(9)}
+   scope :top_city_by_job, ->{joins(:jobs).select('cities.*, COUNT(jobs.id) as job_count').group('jobs.city_id').order(:job_count).reverse_order.first(9)}
+   scope :top_city_by_job_nn, ->{joins(:jobs).where("cities.area_id = 2").select('cities.*, COUNT(jobs.id) as job_count').group('jobs.city_id').order(:job_count).reverse_order.first(9)}
+
+   scope :all_city_by_job, ->{joins(:jobs).select('cities.*, COUNT(jobs.id) as job_count').group('jobs.city_id').order(:job_count).reverse_order}
+   scope :all_city_by_job_nn, ->{joins(:jobs).where("cities.area_id = 2").select('cities.*, COUNT(jobs.id) as job_count').group('jobs.city_id').order(:job_count).reverse_order}
 end
 end

app/models/industry.rb

@@ -3,4 +3,5 @@ class Industry < ApplicationRecord
    has_many :jobs
    has_many :jobs
    validates_presence_of :industry_name
    validates_presence_of :industry_name
    scope :top_industry_by_job, ->{joins(:jobs).select('industries.*, COUNT(jobs.id) as job_count').group('jobs.industry_id').order(:job_count).last(9)}
    scope :top_industry_by_job, ->{joins(:jobs).select('industries.*, COUNT(jobs.id) as job_count').group('jobs.industry_id').order(:job_count).last(9)}
+   scope :all_industry_by_job, ->{joins(:jobs).select('industries.*, COUNT(jobs.id) as job_count').group('jobs.industry_id').order(:job_count).reverse_order}
 end
 end

app/views/cities/index.html.erb

+
+<div id="search" class="container p-5 my-2 bg-secondary text-white">
+  <%= form_tag job_search_path, method: :get do %>
+    <p>
+      <%= text_field_tag :search, params[:search] %>
+      <%= button_tag "Search", name: nil %>
+    </p>
+  <% end %>
+</div>
+
+<div id="city_list"class="container p-5 my-2 bg-secondary text-white">
+  <font color="red"><b><label > City List:</label></b></font>
+  <br>
+  <label><a href="#topcity_vn">Viet Nam</a></label>
+  <br>
+  <label><a href="#topcity_nn">International</a></label>
+
+
+
+</div>
+
+<div id="topcity_vn" class="container p-5 my-2 bg-secondary text-white">
+  <font color="red"><b><label > Viet Nam:</label></b></font>
+  <% @all_top_cities_vn.each do |city_vn| %>
+  <ul>
+    <li><%= city_vn.city_name  %>   <br /> Total jobs in this city:   <%= city_vn.job_count  %> </li>
+  </ul>
+  <% end %>
+</div>
+
+
+<div id="topcity_nn" class="container p-5 my-2 bg-secondary text-white">
+  <font color="red"><b><label > Nuoc Ngoai:</label></b></font>
+  <% @all_top_cities_nn.each do |city_nn| %>
+    <ul>
+      <li><%= city_nn.city_name  %>   <br /> Total jobs in this city:   <%= city_nn.job_count  %> </li>
+    </ul>
+  <% end %>
+</div>

app/views/industries/index.html.erb

+
+<div id="search" class="container p-5 my-2 bg-secondary text-white">
+  <%= form_tag job_search_path, method: :get do %>
+    <p>
+      <%= text_field_tag :search, params[:search] %>
+      <%= button_tag "Search", name: nil %>
+    </p>
+  <% end %>
+</div>
+
+
+<div id="industry_list" class="container p-5 my-2 bg-secondary text-white">
+  <font color="red"><b><label > Industry List:</label></b></font>
+  <% @all_industry.each do |industry| %>
+  <ul>
+    <li><%= industry.industry_name  %>  <br /> Total jobs in this industry:   <%= industry.job_count  %> </li>
+  </ul>
+  <% end %>
+</div>
+
+

config/routes.rb

 Rails.application.routes.draw do
 Rails.application.routes.draw do
+  get 'industries/index'
+  get 'cities/index'
   get '/detail/:id', to: 'jobs#show'
   get '/detail/:id', to: 'jobs#show'
   get '/joblist', to: 'jobs#index'
   get '/joblist', to: 'jobs#index'
+  get '/citylist', to: 'cities#index'
+  get '/industrylist', to: 'industries#index'
   get '/jobsearch' => 'jobs#search', as: :job_search
   get '/jobsearch' => 'jobs#search', as: :job_search
 
 
   root 'top_page#index'
   root 'top_page#index'
   # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html
   # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html
   resources :top_page
   resources :top_page
-  resources :jobs, :only => [:show, :index]
 end
 end

test/controllers/industries_controller_test.rb

+require 'test_helper'
+
+class IndustriesControllerTest < ActionDispatch::IntegrationTest
+  test "should get index" do
+    get industries_index_url
+    assert_response :success
+  end
+
+end