Create Job list and Job detail

app/assets/stylesheets/top_pages.scss

@@ -121,5 +121,15 @@
   border: 2px solid #006080;
   border: 2px solid #006080;
   border-radius: 12px;
   border-radius: 12px;
   text-align: center;
   text-align: center;
-  font-size: 32px;
+  font-size: 20px;
+  font-family: Bookman, URW Bookman L, serif;
+}
+.job-details .title a {
+  color: black;
+  text-decoration: none;
+}
+.job-details .title a:hover {
+  color: #e6b800;
+  transition: 1s;
+  text-decoration: none;
 }
 }

app/common/convert.rb

@@ -2,8 +2,4 @@ module Convert
   def self.to_convert(str)
   def self.to_convert(str)
     str.mb_chars.normalize(:kd).gsub(/[Đđ]/, 'd').gsub(/[^\x00-\x7F]/,'').gsub(/[\W+]/,' ').downcase.to_s.split(' ').join('-')
     str.mb_chars.normalize(:kd).gsub(/[Đđ]/, 'd').gsub(/[^\x00-\x7F]/,'').gsub(/[\W+]/,' ').downcase.to_s.split(' ').join('-')
   end
   end
-
-  def self.to_convert_name(name)
-    name.mb_chars.normalize(:kd).gsub(/[Đđ]/, 'd').gsub(/[^\x00-\x7F]/,'').gsub(/[\W+0-9]/,' ').downcase.to_s.split(' ').join('-')
-  end
 end
 end

app/controllers/cities_controller.rb

 class CitiesController < ApplicationController
 class CitiesController < ApplicationController
-    VIETNAM = 1
-    FOREIGN = 0
   def index
   def index
     @cities_vietnam = City.location(City::VIETNAM)
     @cities_vietnam = City.location(City::VIETNAM)
     @cities_international = City.location(City::FOREIGN)
     @cities_international = City.location(City::FOREIGN)

app/controllers/jobs_controller.rb

@@ -17,6 +17,10 @@ class JobsController < ApplicationController
     @result_for_job = @industry.jobs.count
     @result_for_job = @industry.jobs.count
   end
   end
 
 
+  def access_jobs
+    @job_details = Job.find(params[:id])
+  end
+
   def use_variables
   def use_variables
     @cities = City.all
     @cities = City.all
     @industries = Industry.all
     @industries = Industry.all

app/models/city.rb

@@ -8,4 +8,8 @@ class City < ApplicationRecord
 
 
   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 :location, ->(number) { joins(:jobs).group(:city_id).order('count(job_id) DESC').where(location: number) }
   scope :location, ->(number) { joins(:jobs).group(:city_id).order('count(job_id) DESC').where(location: number) }
+
+  def convert_city
+    self.converted_name = Convert.to_convert("#{name} #{rand(10000)}")
+  end
 end
 end

app/models/company.rb

@@ -3,6 +3,6 @@ class Company < ApplicationRecord
   has_many :jobs
   has_many :jobs
 
 
   def convert_company
   def convert_company
-    self.converted_name = Convert.to_convert("#{name}")
+    self.converted_name = Convert.to_convert("#{name} #{rand(10000)}")
   end
   end
 end
 end

app/models/industry.rb

@@ -7,10 +7,6 @@ class Industry < ApplicationRecord
   scope :all_industry, -> { joins(:jobs).group(:industry_id).order('count(job_id) DESC') }
   scope :all_industry, -> { joins(:jobs).group(:industry_id).order('count(job_id) DESC') }
 
 
   def convert_industry
   def convert_industry
-    converted_name = Convert.to_convert("#{name}")
-  end
-
-  def convert_name
-    converted_name = Convert.to_convert_name("#{name}")
+    self.converted_name = Convert.to_convert("#{name} #{rand(10000)}")
   end
   end
 end
 end

app/models/job.rb

@@ -20,7 +20,7 @@ class Job < ApplicationRecord
   scope :all_job, -> { limit(20).order(created_at: :desc) }
   scope :all_job, -> { limit(20).order(created_at: :desc) }
 
 
   def convert_job
   def convert_job
-    converted_name = Convert.to_convert("#{title}")
+    converted_name = Convert.to_convert("#{title} #{rand(10000)}")
   end
   end
 
 
   def company_name
   def company_name

app/views/cities/_vietnam.html.erb

 <div class="col-3 remove-decoration">
 <div class="col-3 remove-decoration">
-  <%= link_to city_jobs_path(converted_name: city.convert_name) do %>
+  <%= link_to city_jobs_path(converted_name: city.converted_name) do %>
     <div class="border border-dark rounded international-name">
     <div class="border border-dark rounded international-name">
       <div>
       <div>
         <strong><%= city.name %></strong>
         <strong><%= city.name %></strong>

app/views/cities/index.html.erb

@@ -18,13 +18,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: "vietnam", collection: @cities_vietnam, as: :city %>
+      <%= render partial: "vietnam", collection: @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: "international", collection: @cities_international, as: :city %>
+      <%= render partial: "international", collection: @international, as: :city %>
     </div>
     </div>
   </div>
   </div>
 </div>
 </div>

app/views/jobs/_job.html.erb

 <% if job.cities.present? %>
 <% if job.cities.present? %>
   <div class="border border-dark rounded">
   <div class="border border-dark rounded">
     <div class="job-details">
     <div class="job-details">
-      <div class="title"><strong><%= job.title %></strong></div>
+      <div class="title">
+        <%= link_to job_detail_path(job.id) do %><strong>
+          <%= job.title %></strong>
+        <% end %>
+      </div>
       <div class="row">
       <div class="row">
         <div class="col-5">▼
         <div class="col-5">▼
           <%= job.cities.map(&:name).join(' | ') %>
           <%= job.cities.map(&:name).join(' | ') %>

app/views/jobs/access_jobs.html.erb

+<div class="container">
+  <%= @job_details.title %>
+</div>

app/views/layouts/_show_job.html.erb

 <% if job.cities.present? %>
 <% if job.cities.present? %>
   <div class="border border-dark rounded">
   <div class="border border-dark rounded">
     <div class="job-details">
     <div class="job-details">
-      <div class="title"><strong><%= job.title %></strong></div>
+      <div class="title">
+        <%= link_to job_detail_path(job.id) do %><strong>
+          <%= job.title %></strong>
+        <% end %>
+      </div>
       <div><%= job.company_name %></div>
       <div><%= job.company_name %></div>
       <div class="salary">💲 Salary: <%= job.salary %></div>
       <div class="salary">💲 Salary: <%= job.salary %></div>
       <div>▼
       <div>▼

config/routes.rb

@@ -3,6 +3,7 @@ Rails.application.routes.draw do
   resources :jobs
   resources :jobs
   get 'jobs/city/:converted_name', to: 'jobs#city_jobs', as: :city_jobs
   get 'jobs/city/:converted_name', to: 'jobs#city_jobs', as: :city_jobs
   get 'jobs/industry/:converted_name', to: 'jobs#industry_jobs', as: :industry_jobs
   get 'jobs/industry/:converted_name', to: 'jobs#industry_jobs', as: :industry_jobs
+  get 'detail/:id', to: 'jobs#access_jobs', as: :job_detail
 
 
   resources :top_pages
   resources :top_pages
   resources :industries
   resources :industries

lib/src/crawler.rb

@@ -75,6 +75,7 @@ class Crawler
                                  expiration_date: expiration_date,
                                  expiration_date: expiration_date,
                                  description: description,
                                  description: description,
                                  company_id: company.id)
                                  company_id: company.id)
+
     city_relationship(row, job)
     city_relationship(row, job)
     industry_relationship(row, job)
     industry_relationship(row, job)
   end
   end