Merge branch 'master' of gitlab.zigexn.vn:anhtn/VeNJob

app/assets/stylesheets/application.scss

@@ -26,3 +26,8 @@
    background-color: $main-color;
  }
 
+ hr {
+   width: 100px;
+   border-top: 2px solid $main-color
+ }
+ 
\ No newline at end of file

app/controllers/home_controller.rb

 class HomeController < ApplicationController
   def index
     @total_jobs = Job.count
-    @locations = Location.all
-    @industries = Industry.all
-    @jobs = Job.order(created_at: :desc).limit(Job::NUMBER_LATEST_JOB)
+    @locations = Location.select(:id, :city)
+    @industries = Industry.select(:id, :name)
+    @jobs = Job.includes(:company, :locations).order(created_at: :desc).limit(Job::NUMBER_LATEST_JOB)
     @top_cities = Location.top_locations(9)
     @top_industries = Industry.top_industries(9)
   end

app/controllers/industries_controller.rb

+class IndustriesController < ApplicationController
+  def index
+    @industries = Industry.with_count_job
+  end
+end

app/controllers/locations_controller.rb

+class LocationsController < ApplicationController
+  def index
+    @vn_cities_lists = Location.vietnam.with_count_job
+    @internal_cities_lists = Location.international.with_count_job
+  end
+end

app/models/industry.rb

 class Industry < ApplicationRecord
-  scope :top_industries, ->(number) { joins(:jobs)
-                                      .group(:industry_id)
-                                      .order(Arel.sql('count(jobs.id) DESC'))
-                                      .take(number) }
-
+  scope :with_count_job, -> { joins(:jobs).group(:industry_id).select('industries.*, count(jobs.id) as job_count') }
+  scope :top_industries, ->(number) { with_count_job.order(Arel.sql('job_count DESC')).limit(number) }
   has_and_belongs_to_many :jobs
 end

app/models/location.rb

 class Location < ApplicationRecord
-  scope :top_locations, ->(number) { joins(:jobs)
-                                    .group(:location_id)
-                                    .order(Arel.sql('count(jobs.id) DESC'))
-                                    .take(number) }
+  scope :with_count_job, -> { joins(:jobs).group(:location_id).select('locations.*, count(jobs.id) as job_count') }
+  scope :top_locations, ->(number) { with_count_job.order(Arel.sql('job_count DESC')).limit(number) }
+  scope :international, -> { where(oversea: true) }
+  scope :vietnam, -> { where(oversea: false) }
 
   CITY_VIETNAM_NUMBER = 70
 

app/views/home/index.html.erb

@@ -8,22 +8,24 @@
 </div>
 <div id='latest-jobs' class='my-4 text-center'>
   <h1>Latest Jobs</h1>
+  <hr>
   <div class='row'>
     <%= render partial: 'home/job', collection: @jobs %>
   </div>
-  <a href='#'>All Jobs</a>
 </div>
 <div id='top-cities' class='my-4 text-center'>
   <h1>Top Cities</h1>
+  <hr>
   <div class='row'>
-    <%= render partial: 'home/city', collection: @top_cities, as: :location %>
+    <%= render partial: 'locations/location', collection: @top_cities %>
   </div>
-  <a href='#'>All Cities</a>
+  <%= link_to 'All Citites', cities_path %>
 </div>
 <div id='top-industries' class='my-4 text-center'>
   <h1>Top Industries</h1>
+  <hr>
   <div class='row'>
-    <%= render partial: 'home/industry', collection: @top_industries, as: :industry %>
+    <%= render partial: 'industries/industry', collection: @top_industries %>
   </div>
-  <a href='#'>All Industries</a>
+  <%= link_to 'All Industries', industries_path %>
 </div>

app/views/home/_industry.html.erb → app/views/industries/_industry.html.erb

@@ -2,7 +2,7 @@
   <div class='card'>
     <%= link_to '#', class: 'card-body text-decoration-none' do %>
       <h5 class='card-title font-weight-bold'><%= industry.name %></h5>
-      <p class='card-text'><%= industry.jobs.size %> Jobs</p>
+      <p class='card-text'><%= pluralize(industry.job_count, 'Job') %></p>
     <% end %>
   </div>
 </div>

app/views/industries/index.html.erb

+<div id='industries' class='text-center my-3'>
+  <h2>Industries List</h2>
+  <hr>
+  <div class='row'>
+    <%= render partial: 'industries/industry', collection: @industries %>
+  </div>
+</div>
\ No newline at end of file

app/views/home/_city.html.erb → app/views/locations/_location.html.erb

@@ -2,7 +2,7 @@
   <div class='card'>
     <%= link_to '#', class: 'card-body text-decoration-none' do %>
       <h5 class='card-title font-weight-bold'><%= location.city %></h5>
-      <p class='card-text'><%= location.jobs.size %> Jobs</p>
+      <p class='card-text'><%= pluralize(location.job_count, 'Job') %></p>
     <% end %>
   </div>
 </div>

app/views/locations/index.html.erb

+<div class='list my-3 text-center'>
+  <h2>Area List</h2>
+  <hr>
+  <ul class='list-group list-group-horizontal justify-content-center'>
+    <li class='list-group-item'>
+      <a href='#vietnam'>Việt Nam</a>
+    </li>
+    <li class='list-group-item'>
+      <a href='#international'>International</a>
+    </li>
+  </ul>
+</div>
+<div id='vietnam' class='text-center'>
+  <h2>Vietnam</h2>
+  <hr>
+  <div class='row'>
+    <%= render partial: 'locations/location', collection: @vn_cities_lists %>
+  </div>
+</div>
+<div id='international' class='text-center'>
+  <h2>International</h2>
+  <hr>
+  <div class="row">
+    <%= render partial: 'locations/location', collection: @internal_cities_lists %>
+  </div>
+</div>

app/views/shared/_header.html.erb

 <nav class='navbar navbar-expand-lg navbar-light sticky-top'>
-  <a class='navbar-brand' href='#'>
+  <%= link_to root_path, class: 'navbar-brand' do %>
     <%= image_tag 'venjob-logo.png', alt: 'VeNJob', size: '120x50' %>
-  </a>
+  <% end %>
   <button class='navbar-toggler' type='button' data-toggle='collapse' data-target='#navbarSupportedContent' aria-controls='navbarSupportedContent' aria-expanded='false' aria-label='Toggle navigation'>
     <span class='navbar-toggler-icon'></span>
   </button>
@@ -9,10 +9,10 @@
   <div class='collapse navbar-collapse' id='navbarSupportedContent'>
     <ul class='navbar-nav ml-auto'>
       <li class='nav-item active'>
-        <a class='nav-link text-white' href='#'>Sign in</a>
+        <%= link_to 'Sign in', '#', class: 'nav-link text-white' %>
       </li>
       <li class='nav-item'>
-        <a class='nav-link text-white' href='#'>Sign up</a>
+        <%= link_to 'Sign up', '#', class: 'nav-link text-white' %>
       </li>
     </ul>
   </div>

config/routes.rb

 Rails.application.routes.draw do
   root to: 'home#index'
+  get 'cities', to: 'locations#index'
+  get 'industries', to: 'industries#index'
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 end