rename some files

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_industries", collection: @industries, as: :industry %>
+      <%= render partial: "industry", collection: @industries, as: :industry %>
     </div>
     </div>
   </div>
   </div>
 </div>
 </div>

app/views/jobs/index.html.erb

@@ -8,6 +8,6 @@
     <div class="col-4"><strong>Result for: ... jobs</strong></div>
     <div class="col-4"><strong>Result for: ... jobs</strong></div>
   </div>
   </div>
   <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>
 </div>
 </div>

app/views/top_pages/index.html.erb

@@ -10,12 +10,12 @@
     <%= render 'layouts/search_bar' %>
     <%= render 'layouts/search_bar' %>
   </div>
   </div>
   <div class="job-list">
   <div class="job-list">
-    <%= render partial: "layouts/show_jobs", collection: @jobs, as: :job %>
+    <%= render partial: "layouts/show_job", collection: @jobs, as: :job %>
   </div>
   </div>
 
 
   <div class="city-banner rounded">City</div>
   <div class="city-banner rounded">City</div>
   <div class="row">
   <div class="row">
-    <%= render partial: "layouts/show_cities", collection: @jobs_of_cities, as: :city %>
+    <%= render partial: "layouts/show_city", collection: @jobs_of_cities, as: :city %>
   </div>
   </div>
   <div class="all-city">
   <div class="all-city">
     <%= link_to cities_path do %>
     <%= link_to cities_path do %>
@@ -26,7 +26,7 @@
   </div>
   </div>
   <div class="industry-banner rounded">Industry</div>
   <div class="industry-banner rounded">Industry</div>
   <div class="row">
   <div class="row">
-    <%= render partial: "layouts/show_industries", collection: @jobs_of_industries, as: :industry %>
+    <%= render partial: "layouts/show_industry", collection: @jobs_of_industries, as: :industry %>
   </div>
   </div>
   <div class="all-industry">
   <div class="all-industry">
     <%= link_to industries_path do %>
     <%= link_to industries_path do %>

lib/src/crawler.rb

@@ -43,15 +43,21 @@ class Crawler
   def city_relationship(row, job)
   def city_relationship(row, job)
     location_relationship = row.css('div.map p a').children.map { |name_city| name_city.text.strip }
     location_relationship = row.css('div.map p a').children.map { |name_city| name_city.text.strip }
     cities_relationship = City.where(name: location_relationship)
     cities_relationship = City.where(name: location_relationship)
+    city_job_relationship = CityJob.where(job_id: job.id ,city_id: cities_relationship.ids)
 
 
-    job.cities << cities_relationship
+    if city_job_relationship.blank?
+      job.cities << cities_relationship
+    end
   end
   end
 
 
   def industry_relationship(row, job)
   def industry_relationship(row, job)
     industry_relationship = row.css('li a').children.map { |name_industry| name_industry.text.strip }
     industry_relationship = row.css('li a').children.map { |name_industry| name_industry.text.strip }
     industries_relationship = Industry.where(name: industry_relationship)
     industries_relationship = Industry.where(name: industry_relationship)
+    industry_job_relationship = IndustryJob.where(job_id: job.id, industry_id: industries_relationship.ids)
 
 
-    job.industries << industries_relationship
+    if industry_job_relationship.blank?
+      job.industries << industries_relationship
+    end
   end
   end
 
 
   def create_job(title, link_page, row, company)
   def create_job(title, link_page, row, company)
@@ -80,8 +86,8 @@ class Crawler
       links.each do |link|
       links.each do |link|
         begin
         begin
           next if link == 'javascript:void(0);'
           next if link == 'javascript:void(0);'
-            page = Nokogiri::HTML(URI.open(URI.escape(link)))
-            name = page.search('p.name')&.text
+          page = Nokogiri::HTML(URI.open(URI.escape(link)))
+          name = page.search('p.name')&.text
           next if name.blank?
           next if name.blank?
 
 
           address = page.css('div.content p').children[1]&.text
           address = page.css('div.content p').children[1]&.text