Merged master

Gemfile

@@ -63,3 +63,6 @@ gem 'mysql2'
 #paginator
 gem 'kaminari'
 gem 'kaminari-bootstrap'
+
+#setting file yml
+gem 'settingslogic'

Gemfile.lock

@@ -184,6 +184,7 @@ GEM
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
+    settingslogic (2.0.9)
     spring (2.1.0)
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
@@ -242,6 +243,7 @@ DEPENDENCIES
   rails (~> 6.0.2, >= 6.0.2.1)
   sass-rails (>= 6)
   selenium-webdriver
+  settingslogic
   spring
   spring-watcher-listen (~> 2.0.0)
   sprockets (~> 3.7.2)

app/controllers/jobs_controller.rb

 class JobsController < ApplicationController
   def show
-    @job_detail = Job.find(params[:id])
+    @job_detail = Job.find_by_id(params[:id])
   end
 
   def index
-    @job_list = Job.all
     @job_count = Job.count
-    @pagin_job = Job.page(params[:page]).per(20)
+    pagin = params[:page].to_i > 0 ? params[:page].to_i : 1
+    @pagin_job = Job.page(pagin).per(Settings.page)
   end
 
   def search
-    if params[:search].nil?
-      redirect_to(root_path, alert: "Empty field!") and return
-    else
-      @job_count = Job.count
-      @search_job = Job.where("job_name LIKE '%#{params[:search]}%'")
-      @pagin_job = @search_job.page(params[:page]).per(20)
-    end
-    render :index
-  end
+    return redirect_to root_path, alert: "Empty field!" if params[:search].blank?
 
+    @search_job = Job.includes(:city).where("job_name LIKE ?","%#{params[:search]}%")
+    @pagin_job = @search_job.page(params[:page]).per(Settings.page)
+  end
 end

app/models/settings.rb

+class Settings < Settingslogic
+  source "#{Rails.root}/config/setting.yml"
+  namespace Rails.env
+end

app/views/jobs/_jobs.html.erb

+  <font color="red"><b><label > Job List:</label></b></font>
+  <%= paginate @pagin_job %>
+
+  <% @pagin_job.each do |job| %>
+    <ul>
+      <button class="button button2">Favorites</button>
+      <li><%= job.job_name  %></li>
+      <li><%= job.city.city_name  %></li>
+      <li ><span class="text"><%= job.description  %></span></li>
+    </ul>
+  <% end %>
+  <%= paginate @pagin_job %>

app/views/jobs/index.html.erb

@@ -13,21 +13,10 @@
 <div id="job_list" class="container p-5 my-2 bg-secondary text-white">
 
   <div class="total_job">
-    <label> Total Jobs: <%= @job_count %></label>
+    <label> Total Jobs: <%= Job.count %></label>
   </div>
 
-  <font color="red"><b><label > Job List:</label></b></font>
-  <%= paginate @pagin_job %>
-
-  <% @pagin_job.each do |job| %>
-    <ul>
-      <button class="button button2">Favorites</button>
-      <li><%= job.job_name  %></li>
-      <li><%= job.city.city_name  %></li>
-      <li ><span class="text"><%= job.description  %></span></li>
-    </ul>
-  <% end %>
-  <%= paginate @pagin_job %>
+    <%= render partial: "jobs"%>
 
 </div>
 

app/views/jobs/search.html.erb

@@ -11,17 +11,6 @@
 
 <div id="job_list" class="container p-5 my-2 bg-secondary text-white">
 
-  <font color="red"><b><label > Job List:</label></b></font>
-  <%= paginate @pagin_job %>
-
-  <% @pagin_job.each do |job| %>
-    <ul>
-      <button class="button button2">Favorites</button>
-      <li><%= job.job_name  %></li>
-      <li><%= job.city.city_name  %></li>
-      <li ><span class="text"><%= job.description  %></span></li>
-    </ul>
-  <% end %>
-  <%= paginate @pagin_job %>
+    <%= render partial: "jobs" %>
 
 </div>

app/views/jobs/show.html.erb

@@ -9,6 +9,11 @@
 </div>
 
 <div id="job_detail"class="container p-5 my-2 bg-secondary text-white">
+
+<% if @job_detail.nil? == true %>
+    <div> This id is not available. </div>
+<% else %>
+
 <ul class="breadcrumb">
   <li><a href="#">Top</a></li>
   <li><a href="#">City</a></li>
@@ -16,7 +21,6 @@
   <li><%= @job_detail.job_name  %></li>
 </ul>
 
-
   <font color="red"><b><label > Job Detail:</label></b></font>
   <ul>
     <li><%= @job_detail.job_name  %></li>
@@ -26,10 +30,9 @@
     <li ><span class="text"><%= @job_detail.description  %></span>
     </li>
   </ul>
-
   <button class="button button1">Apply</button>
   <button class="button button2">Favorites</button>
-
+<% end %>
 </div>
 
 

config/boot.rb

@@ -2,3 +2,5 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
 require 'bundler/setup' # Set up gems listed in the Gemfile.
 require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
+require 'yaml'
+#YAML::ENGINE.yamler= 'syck'

config/routes.rb

 Rails.application.routes.draw do
-  get 'industries/index'
-  get 'cities/index'
-  get '/detail/:id', to: 'jobs#show'
-  get '/joblist', to: 'jobs#index'
-  get '/citylist', to: 'cities#index'
-  get '/industrylist', to: 'industries#index'
-  get '/jobsearch' => 'jobs#search', as: :job_search
-
+  get 'cities', to: 'cities#index'
+  get 'industries', to: 'industries#index'
+  get 'detail/:id', to: 'jobs#show'
+  get 'jobs', to: 'jobs#index'
+  get 'jobs/search' => 'jobs#search', as: :job_search
   root 'top_page#index'
   # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html
   resources :top_page

config/setting.yml

+defaults: &defaults
+
+development:
+  <<: *defaults
+  page: 5