Skip to content

V
VenJob
Commit 8aa62865 by Đường Sỹ Hoàng
Options

Updated city list

parent 152daa6c
Showing with 100 additions and 11 deletions
app/assets/stylesheets/city.scss 0 → 100644
// Place all the styles related to the city controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: https://sass-lang.com/
app/assets/stylesheets/industries.scss 0 → 100644
// Place all the styles related to the Industries controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: https://sass-lang.com/
app/controllers/cities_controller.rb 0 → 100644
class CitiesController < ApplicationController
def index
@top_vn_cities = City.sort_top_vn_cities
@top_inter_cities = City.sort_top_inter_cities
end
def vn_cities
@top_vn_cities = City.sort_top_vn_cities
end
def inter_cities
@top_inter_cities = City.sort_top_inter_cities
end
end
app/controllers/industries_controller.rb 0 → 100644
class IndustriesController < ApplicationController
def index
@top_industries = Industry.sort_top_industries
end
end
app/helpers/city_helper.rb 0 → 100644
module CityHelper
end
app/helpers/industries_helper.rb 0 → 100644
module IndustriesHelper
end
app/models/city.rb
......@@ -3,7 +3,16 @@ class City < ApplicationRecord
has_many :jobs, through: :city_jobs
def self.sort_top_cities
@cities ||= all.sort_by(&:jobs_count).reject{ |city| city.jobs_count ==0 }.reverse.take(Settings.top.city.limit)
@cities ||= all.sort_by(&:jobs_count).reject{ |city| city.jobs_count.zero? }.reverse.take(Settings.top.city.limit)
end
def self.sort_top_vn_cities
@vn_cities ||= City.where(region: 0).sort_by(&:jobs_count).reject{ |city| city.jobs_count.zero? }.reverse.take(Settings.top.city.limit)
end
def self.sort_top_inter_cities
@inter_cities ||= City.where(region: 1).sort_by(&:jobs_count).reject{ |city| city.jobs_count.zero? }.reverse.take(Settings.top.city.limit)
end
def jobs_count
......
app/views/cities/_city.html.erb
<div class="container">
<div class="row justify-content-md-center">
<div class="col">
<div class="text-center">
<div class="col text-center">
<%= city.name %>
(<%= city.jobs_count %>)
</div>
</div>
</div>
</div>
app/views/cities/_international_cities.html.erb 0 → 100644
<div class="container">
<div class="row justify-content-md-center">
<div class="col-sm text-center">
<%= international_cities.name %>
(<%= international_cities.jobs_count %>)
</div>
</div>
</div>
app/views/cities/_vn_cities.html.erb 0 → 100644
<div class="container">
<div class="row justify-content-md-center">
<div class="col-sm text-center">
<%= vn_cities.name %>
(<%= vn_cities.jobs_count %>)
</div>
</div>
</div>
app/views/top/cities.html.erb → app/views/cities/index.html.erb
......@@ -24,7 +24,7 @@
</div>
<div id="vietnam">
<div class="row row-cols-3">
<%= render partial: "cities/cities_list", collection: @top_cities %>
<%= render partial: "cities/vn_cities", collection: @top_vn_cities %>
</div>
</div>
......@@ -36,6 +36,6 @@
</div>
<div id="international">
<div class="row row-cols-3">
<%= render partial: "cities/international_list" %>
<%= render partial: "cities/international_cities", collection: @top_inter_cities %>
</div>
</div>
app/views/cities/_international_list.html.erb → app/views/industries/_industries_list.html.erb
<div class="container">
<div class="row justify-content-md-center">
<div class="col-sm">
<div class="text-center">
<%= industries_list.name %>
(<%= industries_list.jobs_count %>)
</div>
</div>
</div>
</div>
app/views/industries/index.html.erb 0 → 100644
<div class="center jumbotron">
<head>
<title><%= yield(:title) %> Venjob</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
</head>
</div>
</br>
<!--Display industries list-->
<div class="area-title-wrapper">
<h3>Industry List</h3>
</div>
<div id="industry">
<div class="row row-cols-3">
<%= render partial: "industries/industries_list", collection: @top_industries %>
</div>
</div>
app/views/top/_job.html.erb
<div class="row align-items-center">
<div class="col">
<div class="text-center"><%= job.title %></div>
<div class="col text-center">
<%= job.title %>
</div>
</div>
</br>
app/views/top/index.html.erb
......@@ -29,7 +29,7 @@
<div class="row row-cols-3">
<%= render partial: "cities/city", collection: @top_cities %>
<form class="form-inline-city">
<%= link_to "All cties", cities_path, class:"btn btn-outline-success" %>
<%= link_to "All cities", cities_path, class:"btn btn-outline-success" %>
</form>
</div>
</div>
......@@ -44,7 +44,7 @@
<div class="row row-cols-3">
<%= render partial: "industries/industry", collection: @top_industries %>
<form class="form-inline-industry">
<button class="btn btn-outline-success" type="button">All industries</button>
<%= link_to "All industries", industries_path, class:"btn btn-outline-success" %>
</form>
</div>
</div>
......
config/routes.rb
Rails.application.routes.draw do
root "top#index"
get "/cities", to: "top#cities"
resources :cities, only: :index
resources :industries, only: :index
resource :top, only: :index
devise_for :users
end
test/controllers/city_controller_test.rb 0 → 100644
require 'test_helper'
class CityControllerTest < ActionDispatch::IntegrationTest
# test "the truth" do
# assert true
# end
end
test/controllers/industries_controller_test.rb 0 → 100644
require 'test_helper'
class IndustriesControllerTest < ActionDispatch::IntegrationTest
# test "the truth" do
# assert true
# end
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment