Merge branch 'feature/industry_page' into 'master'

Feature/industry page

See merge request !14

app/assets/stylesheets/custom.scss

@@ -109,3 +109,17 @@ footer {
 html {
 html {
   scroll-behavior: smooth;
   scroll-behavior: smooth;
 }
 }
+
+/* banner */
+
+.banner {
+  img {
+    width: 75%;
+  }
+}
+
+/* top page */
+
+.top_cities {
+  margin: 20px;
+}

app/controllers/companies_controller.rb

 class CompaniesController < ApplicationController
 class CompaniesController < ApplicationController
   def index
   def index
-    @companies = Company.all
+    @companies = Company.page(params[:page]).per(Settings.table.page.per)
   end
   end
 end
 end

app/controllers/tops_controller.rb

 class TopsController < ApplicationController
 class TopsController < ApplicationController
   def index
   def index
     @vn_cities = City.city_order.take(Settings.top.city.limit)
     @vn_cities = City.city_order.take(Settings.top.city.limit)
-    @industries  = Industry.all
+    @industries = Industry.industry_order.take(Settings.top.city.limit)
     @jobs = Job.page(params[:page]).per(Settings.job.per_page)
     @jobs = Job.page(params[:page]).per(Settings.job.per_page)
   end
   end
 end
 end

app/models/industry.rb

@@ -15,4 +15,12 @@
 class Industry < ApplicationRecord
 class Industry < ApplicationRecord
   has_many :industry_jobs
   has_many :industry_jobs
   has_many :jobs, through: :industry_jobs
   has_many :jobs, through: :industry_jobs
+
+  def job_count
+    @job_count ||= jobs.count
+  end
+
+  def self.industry_order
+    @industry_order ||= all.sort_by(&:job_count).reverse
+  end
 end
 end

app/views/companies/index.html.erb

@@ -5,3 +5,4 @@
     </ul>
     </ul>
   </tbody>
   </tbody>
 </table>
 </table>
+<%= paginate @companies %>

app/views/industries/_industry.html.erb

-<li class="list-group-item"><%= industry.name %></li>
+<div class="col-md-3">
+  <div class="col-show">
+    <%= industry.name %> (<%= (industry.job_count) %>)
+  </div>
+</div>

app/views/industries/index.html.erb

-<%= render partial: "industries/industry", collection: @industries %>
+<div class="row row-cols-5">
+  <%= render partial: "industries/industry", collection: @industries %>
+</div>

app/views/shared/_top_cities.html.erb

@@ -4,5 +4,5 @@
   <div class="row row-cols-4">
   <div class="row row-cols-4">
     <%= render partial: "cities/city", collection: @vn_cities %>
     <%= render partial: "cities/city", collection: @vn_cities %>
   </div>
   </div>
-  <%= link_to "All cities", cities_path, class: "btn btn-lg btn-primary" %>
+  <%= link_to "All cities", cities_path, class: "btn btn-lg btn-info" %>
 </div>
 </div>

app/views/shared/_top_industries.html.erb

+<h3>Top industries</h3>
+
+<div class="container">
+  <div class="row row-cols-5">
+    <%= render partial: "industries/industry", collection: @industries %>
+  </div>
+  <%= link_to "All industries", industries_path, class: "btn btn-lg btn-info" %>
+</div>

app/views/tops/index.html.erb

@@ -2,9 +2,11 @@
 
 
 <div class="center jumbotron">
 <div class="center jumbotron">
   <div class="banner">
   <div class="banner">
-    <img src="banner.png" alt="Banner">
+    <%= image_tag ("skyline_darker.jpg") %>
   </div>
   </div>
 
 
+  <h2>Total jobs: <%= Job.count %></h2>
+
   <div class="search"></div>
   <div class="search"></div>
 
 
   <div class="lastest_jobs">
   <div class="lastest_jobs">
@@ -17,14 +19,10 @@
   </div>
   </div>
 
 
   <div class="top_cities">
   <div class="top_cities">
-    <%= render partial: "shared/top_cities" %>
+    <%= render "shared/top_cities" %>
   </div>
   </div>
 
 
   <div class="top_industries">
   <div class="top_industries">
-    <h3>Top industries</h3>
-
-    <ul class="list-group list-group-horizontal">
-      <%= render partial: "industries/industry", collection: @industries %>
-    </ul>
+    <%= render "shared/top_industries"%>
   </div>
   </div>
 </div>
 </div>

app/views/users/mailer/confirmation_instructions.html.erb

+<p>Welcome <%= @email %>!</p>
+
+<p>You can confirm your account email through the link below:</p>
+
+<p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %></p>