Tô Ngọc Ánh · @anhtn · Thanh Hung Pham · Tô Ngọc Ánh · Thanh Hung Pham · Tô Ngọc Ánh
--- a/config/database.yml
+++ b/config/database.yml
  database: VeNJob_AnhTN_production
  username: VeNJob_AnhTN
  password: <%= ENV['VENJOB_ANHTN_DATABASE_PASSWORD'] %>
+  url: <%= ENV['JAWSDB_URL'] %>
--- a/app/controllers/jobs_controller.rb 0 → 100644
+++ b/app/controllers/jobs_controller.rb 0 → 100644
+    results(location)
+  end
+
+  def industry_job
+    industry = Industry.find_by_id(params[:id])
+    results(industry)
+  end
+
+  def search
+  end
+
+  private
+
+  def results(object)
+    @keyword = object.try(:name) || object.try(:city)
+    @jobs = object.jobs.all.page(params[:page]).per(20)
--- a/app/views/jobs/_job.html.erb 0 → 100644
+++ b/app/views/jobs/_job.html.erb 0 → 100644
+<div class='card flex-md-row align-items-center my-2'>
+  <div class='card-body'>
+    <%= link_to job.title, '#', class: 'card-title font-weight-bold text-decoration-none' %>
+    <p class='card-text'><%= job.company.name %></p>
+    <p class='mb-0'>
+      <strong>Work place:</strong>
+      <% job.locations.each do |location| %>
+        <%= location.city %>
+      <% end %>
+      <strong>Salary: </strong><%= job.salary %>
+    </p>
+    <p class='card-text'><%= strip_tags(job.description).truncate_words(40) %></p>
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
 <div class='banner_top'>
-  <%= image_tag 'venjob-banner',class: 'banner_img'%>
+  <%= image_tag 'venjob-banner.jpg',class: 'banner_img'%>
--- a/app/views/kaminari/_first_page.html.erb 0 → 100644
+++ b/app/views/kaminari/_first_page.html.erb 0 → 100644
+<li class="page-item">
--- a/app/models/industry.rb
+++ b/app/models/industry.rb
+require './lib/common/convert_slug'
+
 class Industry < ApplicationRecord
+  include ConvertSlug
+
  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
+
+  before_save :add_slug
--- a/lib/tasks/create_slug.rake 0 → 100644
+++ b/lib/tasks/create_slug.rake 0 → 100644
+namespace :create_slug do
+  desc 'Create slug model Location'
+  task locations: :environment do
+    Location.all.each do |location|
+      location.update_attributes(slug: "")
--- a/app/views/jobs/_job.html.erb 0 → 100644
+++ b/app/views/jobs/_job.html.erb 0 → 100644
+<div class='card flex-md-row align-items-center my-2'>
+  <div class='card-body'>
+    <%= link_to job.title, '#', class: 'card-title font-weight-bold text-decoration-none' %>
+    <p class='card-text'><%= job.company.name %></p>
+    <p class='mb-0'>
+      <strong>Work place:</strong>
+      <% job.locations.each do |location| %>
+        <%= location.city %>
+      <% end %>
+    </p>
+    <p><strong>Salary: </strong><%= job.salary %></p>
+    <p class='card-text'><%= strip_tags(job.description).truncate(250) %></p>