Create Job list and Job detail

e70e49e8 · Huỳnh Thiên Phước · 36463e25 · e70e49e8 · e70e49e8 · e70e49e8
Commit e70e49e8 authored Aug 10, 2020 by Huỳnh Thiên Phước
15 changed files
--- a/app/assets/stylesheets/top_pages.scss
+++ b/app/assets/stylesheets/top_pages.scss
@@ -121,5 +121,15 @@
  border: 2px solid #006080;
  border-radius: 12px;
  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;
 }
--- a/app/common/convert.rb
+++ b/app/common/convert.rb
@@ -2,8 +2,4 @@ module Convert
  def self.to_convert(str)
    str.mb_chars.normalize(:kd).gsub(/[Đđ]/, 'd').gsub(/[^\x00-\x7F]/,'').gsub(/[\W+]/,' ').downcase.to_s.split(' ').join('-')
  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
--- a/app/controllers/cities_controller.rb
+++ b/app/controllers/cities_controller.rb
 class CitiesController < ApplicationController
-    VIETNAM = 1
-    FOREIGN = 0
  def index
    @cities_vietnam = City.location(City::VIETNAM)
    @cities_international = City.location(City::FOREIGN)

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

--- a/app/models/city.rb
+++ b/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 :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
--- a/app/models/company.rb
+++ b/app/models/company.rb
@@ -3,6 +3,6 @@ class Company < ApplicationRecord
  has_many :jobs
  def convert_company
-    self.converted_name = Convert.to_convert("#{name}")
+    self.converted_name = Convert.to_convert("#{name} #{rand(10000)}")
  end
 end
--- a/app/models/industry.rb
+++ b/app/models/industry.rb
@@ -7,10 +7,6 @@ class Industry < ApplicationRecord
  scope :all_industry, -> { joins(:jobs).group(:industry_id).order('count(job_id) DESC') }
  def convert_industry
-    converted_name = Convert.to_convert("#{name}")
+    self.converted_name = Convert.to_convert("#{name} #{rand(10000)}")
-  end
-  def convert_name
-    converted_name = Convert.to_convert_name("#{name}")
  end
 end
--- a/app/models/job.rb
+++ b/app/models/job.rb
@@ -20,7 +20,7 @@ class Job < ApplicationRecord
  scope :all_job, -> { limit(20).order(created_at: :desc) }
  def convert_job
-    converted_name = Convert.to_convert("#{title}")
+    converted_name = Convert.to_convert("#{title} #{rand(10000)}")
  end
  def company_name

--- a/app/views/cities/_vietnam.html.erb
+++ b/app/views/cities/_vietnam.html.erb
 <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>
        <strong><%= city.name %></strong>

--- a/app/views/cities/index.html.erb
+++ b/app/views/cities/index.html.erb
@@ -18,13 +18,13 @@
  <div class="city-banner rounded vietnam-area">Việt Nam</div>
  <div class="city-vietnam">
    <div class="row">
-      <%= render partial: "vietnam", collection: @cities_vietnam, as: :city %>
+      <%= render partial: "vietnam", collection: @vietnam, as: :city %>
    </div>
  </div>
  <div class="city-banner rounded international-area">International</div>
  <div class="city-international">
    <div class="row">
-      <%= render partial: "international", collection: @cities_international, as: :city %>
+      <%= render partial: "international", collection: @international, as: :city %>
    </div>
  </div>
 </div>
--- a/app/views/jobs/_job.html.erb
+++ b/app/views/jobs/_job.html.erb
 <% if job.cities.present? %>
  <div class="border border-dark rounded">
    <div class="job-details">
-      <div class="title"><strong><%= job.title %></strong></div>
+      <div class="title">
-        <div class="row">
+        <%= link_to job_detail_path(job.id) do %><strong>
-          <div class="col-5">▼
+          <%= job.title %></strong>
-            <%= job.cities.map(&:name).join(' | ') %>
+        <% end %>
-          </div>
+      </div>
-          <div class="col-5 salary">💲 Salary: <%= job.salary %></div>
+      <div class="row">
-          <div class="col-10 introduction">
+        <div class="col-5">▼
-            <%= job_description(job.description) %><br>
+          <%= job.cities.map(&:name).join(' | ') %>
-            <%= link_to 'Read more..', '#'%>
-          </div>
        </div>
+        <div class="col-5 salary">💲 Salary: <%= job.salary %></div>
+        <div class="col-10 introduction">
+          <%= job_description(job.description) %><br>
+          <%= link_to 'Read more..', '#'%>
+        </div>
+      </div>
      <button type="button" class="btn btn-success" id="button-follow">♥ Favorite</button>
    </div>
  </div>

--- a/app/views/jobs/access_jobs.html.erb
+++ b/app/views/jobs/access_jobs.html.erb
+<div class="container">
+  <%= @job_details.title %>
+</div>
--- a/app/views/layouts/_show_job.html.erb
+++ b/app/views/layouts/_show_job.html.erb
 <% if job.cities.present? %>
  <div class="border border-dark rounded">
    <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 class="salary">💲 Salary: <%= job.salary %></div>
      <div>▼

--- a/config/routes.rb
+++ b/config/routes.rb
@@ -3,6 +3,7 @@ Rails.application.routes.draw do
  resources :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 'detail/:id', to: 'jobs#access_jobs', as: :job_detail
  resources :top_pages
  resources :industries

--- a/lib/src/crawler.rb
+++ b/lib/src/crawler.rb
@@ -75,6 +75,7 @@ class Crawler
                                 expiration_date: expiration_date,
                                 description: description,
                                 company_id: company.id)
    city_relationship(row, job)
    industry_relationship(row, job)
  end