fix review 20200312 Hau-san 1

Gemfile

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

Gemfile.lock

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

app/controllers/jobs_controller.rb

@@ -4,20 +4,23 @@ class JobsController < ApplicationController
   end
   end
 
 
   def index
   def index
-    @job_list = Job.all
     @job_count = Job.count
     @job_count = Job.count
-    @pagin_job = Job.page(params[:page]).per(20)
+
+    if params[:page].to_i > 0
+      pagin = params[:page].to_i
+    else
+      pagin = 1
+    end
+    @pagin_job = Job.page(pagin).per(Settings.page)
   end
   end
 
 
   def search
   def search
     if params[:search].nil?
     if params[:search].nil?
-      redirect_to(root_path, alert: "Empty field!") and return
+      return redirect_to root_path, alert: "Empty field!"
     else
     else
-      @job_count = Job.count
-      @search_job = Job.where("job_name LIKE '%#{params[:search]}%'")
-      @pagin_job = @search_job.page(params[:page]).per(20)
+      @search_job = Job.where("job_name LIKE ?","%#{params[:search]}%")
+      @pagin_job = @search_job.page(params[:page]).per(Settings.page)
     end
     end
     render :index
     render :index
   end
   end
-
 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 id="job_list" class="container p-5 my-2 bg-secondary text-white">
 
 
   <div class="total_job">
   <div class="total_job">
-    <label> Total Jobs: <%= @job_count %></label>
+    <label> Total Jobs: <%= Job.count %></label>
   </div>
   </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>
 </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">
 <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>
 </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 'bundler/setup' # Set up gems listed in the Gemfile.
 require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
 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
 Rails.application.routes.draw do
-  get '/detail/:id', to: 'jobs#show'
-  get '/joblist', to: 'jobs#index'
-  get '/jobsearch' => 'jobs#search', as: :job_search
+  get 'detail/:id', to: 'jobs#show'
+  get 'jobs', to: 'jobs#index'
+  get 'jobs/search' => 'jobs#search', as: :job_search
 
 
   root 'top_page#index'
   root 'top_page#index'
   # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html
   # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html
   resources :top_page
   resources :top_page
-<<<<<<< HEAD
   resources :jobs, :only => [:show, :index]
   resources :jobs, :only => [:show, :index]
-=======
->>>>>>> master
-end
+  end

config/setting.yml

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