City_Jobs/Indutry_Jobs

app/assets/stylesheets/custom.scss

 /* universal */
 
 $font-stack: Arial,Helvetica, sans-serif;
-$primary-color: rgb(164, 165, 167);
+$primary-color: #B6B6B6;
 $sub-color: gainsboro;
 
 body {
@@ -110,10 +110,3 @@ h1, h2, h3, h4, h5, h6 {
   margin-left: 70px;
   top: 300px;
 }
-
-.jobs-list {
-  color: rgb(4, 4, 14);
-  background-color: rgb(23, 23, 175);
-  display:block;
-
-}

app/controllers/jobs_controller.rb

 class JobsController < ApplicationController
+
   def index
-    @jobs = Job.all.page(params[:page]).per(Settings.all.job.limit)
+    if params[:city_id].present?
+      @jobs = City.find_by(id: params[:city_id]).jobs
+    elsif params[:industry_id].present?
+      @jobs = Industry.find_by(id: params[:industry_id]).jobs
+    else
+      @jobs = Job.all
+    end
+
+    @jobs = @jobs.page(params[:page]).per(Settings.all.job.limit)
   end
 end

app/models/job.rb

 class Job < ApplicationRecord
   has_many :user_jobs
   has_many :city_jobs
+  belongs_to :city
 
   def self.latest_jobs
     @latest ||= order(created_at: :desc).take(Settings.top.job.limit)

app/views/cities/_city.html.erb

 <div class="container">
   <div class="row justify-content-md-center">
     <div class="col text-center">
-      <%= city.name %>
-      (<%= city.jobs_count %> jobs)
+      <%= link_to "#{city.name} (#{city.jobs_count})", city_jobs_path(city) %>
     </div>
   </div>
 </div>

app/views/industries/_industry.html.erb

 <div class="container">
   <div class="row justify-content-md-center">
     <div class="col text-center">
-      <%= industry.name %>
-      (<%= industry.jobs_count %> jobs)
+      <%= link_to "#{industry.name} (#{industry.jobs_count})", industry_jobs_path(industry) %>
     </div>
   </div>
 </div>

app/views/jobs/_jobs_list.html.erb

 <div class="jobs-list">
   <div class="row row-cols">
     <div class="col">
-      Title: <%= jobs_list.title %>
+      <h4><b>Title:</b></h4> <%= simple_format jobs_list.title %>
     </div>
     <div class="col">
-      Salary: <%= jobs_list.salary%>
+      <h4><b>Salary:</b></h4> <%=  jobs_list.salary%>
     </div>
     <div class="col">
-      <%= jobs_list.position %>
+      <h4><b>Level:</b></h4> <%=  simple_format jobs_list.position %>
     </div>
   </div>
   <div class="row row-cols">
     <div class="col">
-      Description: <%= jobs_list.description %>
+      <h4><b>Description:</b></h4>
+      <%= truncate( jobs_list.description, length: 250) %>
     </div>
   </div>
   <div class="row row-cols">
     <div class="col">
-      Requirement: <%= jobs_list.requirement %>
+      <h4> <b>Requirement:</b></h4>
+      <%= ( simple_format jobs_list.requirement) %>
     </div>
   </div>
   </br>

app/views/jobs/index.html.erb

@@ -10,10 +10,10 @@
   <div class="job-title-wrapper">
     <h3>All Jobs</h3>
   </div>
-  <%= paginate @all_jobs %>
+  <%= paginate @jobs %>
   <div class="row row-cols-1">
     <div class="job-content-wrapper">
-      <%= render partial: "jobs/jobs_list", collection: @all_jobs %>
+      <%= render partial: "jobs/jobs_list", collection: @jobs %>
     </div>
   </div>
-<%= paginate @all_jobs %>
+<%= paginate @jobs %>

config/routes.rb

@@ -18,9 +18,12 @@ Rails.application.routes.draw do
     put "reset_password.user", to: "devise/passwords#update"
   end
 
+  get "jobs/city/:city_id", to: "jobs#index", as: "city_jobs"
+  get "jobs/industry/:industry_id", to: "jobs#index", as: "industry_jobs"
+
   concern :paginatable do
     get "(page/:page)", action: :index, on: :collection, as: ""
   end
 
-  resources :jobs, concerns: :paginatable
+  resources :jobs, only: :index, concerns: :paginatable
 end