change logic city

app/controllers/cities_controller.rb

 class CitiesController < ApplicationController
 class CitiesController < ApplicationController
   def index
   def index
-    @cities_vietnam = City.vietnam
-    @cities_international = City.international
+    @cities_vietnam = City.location(1)
+    @cities_international = City.location(0)
   end
   end
 end
 end

app/models/city.rb

@@ -4,8 +4,7 @@ class City < ApplicationRecord
   has_many :jobs, through: :city_jobs
   has_many :jobs, through: :city_jobs
 
 
   scope :top_city, -> { joins(:jobs).group(:city_id).order('count(job_id) DESC').limit(9) }
   scope :top_city, -> { joins(:jobs).group(:city_id).order('count(job_id) DESC').limit(9) }
-  scope :vietnam, -> { joins(:jobs).group(:city_id).order('count(job_id) DESC').where('location = 1') }
-  scope :international, -> { joins(:jobs).group(:city_id).order('count(job_id) DESC').where('location = 0') }
+  scope :location, ->(number) { joins(:jobs).group(:city_id).order('count(job_id) DESC').where(location: number) }
 
 
   def convert_city
   def convert_city
     converted_name = Convert.to_convert("#{name}")
     converted_name = Convert.to_convert("#{name}")

app/views/cities/index.html.erb

@@ -14,13 +14,13 @@
   <div class="city-banner rounded vietnam-area">Việt Nam</div>
   <div class="city-banner rounded vietnam-area">Việt Nam</div>
   <div class="city-vietnam">
   <div class="city-vietnam">
     <div class="row">
     <div class="row">
-      <%= render partial: "city_vietnam", collection: @cities_vietnam, as: :city %>
+      <%= render partial: "vietnam", collection: @cities_vietnam, as: :city %>
     </div>
     </div>
   </div>
   </div>
   <div class="city-banner rounded international-area">International</div>
   <div class="city-banner rounded international-area">International</div>
   <div class="city-international">
   <div class="city-international">
     <div class="row">
     <div class="row">
-      <%= render partial: "city_international", collection: @cities_international, as: :city %>
+      <%= render partial: "international", collection: @cities_international, as: :city %>
     </div>
     </div>
   </div>
   </div>
 </div>
 </div>

app/views/industries/index.html.erb

@@ -3,7 +3,7 @@
   <div class="all-industries">
   <div class="all-industries">
     <div class="industry-banner rounded">Industry List</div>
     <div class="industry-banner rounded">Industry List</div>
     <div class="row">
     <div class="row">
-      <%= render partial: "all_industry", collection: @industries, as: :industry %>
+      <%= render partial: "industry", collection: @industries, as: :industry %>
     </div>
     </div>
   </div>
   </div>
 </div>
 </div>

app/views/jobs/city_jobs.html.erb

@@ -8,7 +8,7 @@
   </div>
   </div>
   <%= render "jobs/pagination" %>
   <%= render "jobs/pagination" %>
   <div class="job-list">
   <div class="job-list">
-    <%= render partial: "all_jobs", collection: @jobs_list, as: :job %>
+    <%= render partial: "job", collection: @jobs_list, as: :job %>
   </div>
   </div>
   <%= render "jobs/pagination" %>
   <%= render "jobs/pagination" %>
 </div>
 </div>

app/views/jobs/index.html.erb

@@ -8,7 +8,7 @@
   </div>
   </div>
   <%= render "jobs/pagination" %>
   <%= render "jobs/pagination" %>
   <div class="job-list">
   <div class="job-list">
-    <%= render partial: "all_jobs", collection: @jobs_list, as: :job %>
+    <%= render partial: "job", collection: @jobs_list, as: :job %>
   </div>
   </div>
   <%= render "jobs/pagination" %>
   <%= render "jobs/pagination" %>
 </div>
 </div>

app/views/jobs/industry_jobs.html.erb

@@ -8,7 +8,7 @@
   </div>
   </div>
   <%= render "jobs/pagination" %>
   <%= render "jobs/pagination" %>
   <div class="job-list">
   <div class="job-list">
-    <%= render partial: "all_jobs", collection: @jobs_list, as: :job %>
+    <%= render partial: "job", collection: @jobs_list, as: :job %>
   </div>
   </div>
   <%= render "jobs/pagination" %>
   <%= render "jobs/pagination" %>
 </div>
 </div>