Skip to content

V
VenJob
Commit 22462b9f by Đường Sỹ Hoàng
Options

Fixed industry list

parent 07fcf73b
Showing with 121 additions and 16 deletions
Gemfile
...@@ -34,6 +34,7 @@ gem "rubysl-open-uri" ...@@ -34,6 +34,7 @@ gem "rubysl-open-uri"
gem "whenever", require: false gem "whenever", require: false
gem "activerecord-import" gem "activerecord-import"
gem "config" gem "config"
gem 'counter_culture', '~> 0.1.33'
group :development, :test do group :development, :test do
# Call "byebug" anywhere in the code to stop execution and get a debugger console # Call "byebug" anywhere in the code to stop execution and get a debugger console
......
Gemfile.lock
...@@ -60,6 +60,9 @@ GEM ...@@ -60,6 +60,9 @@ GEM
zeitwerk (~> 2.2) zeitwerk (~> 2.2)
addressable (2.7.0) addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0) public_suffix (>= 2.0.2, < 5.0)
after_commit_action (1.0.1)
activerecord (>= 3.0.0)
activesupport (>= 3.0.0)
bcrypt (3.1.13) bcrypt (3.1.13)
bindex (0.8.1) bindex (0.8.1)
bootsnap (1.4.5) bootsnap (1.4.5)
...@@ -83,6 +86,10 @@ GEM ...@@ -83,6 +86,10 @@ GEM
deep_merge (~> 1.2, >= 1.2.1) deep_merge (~> 1.2, >= 1.2.1)
dry-schema (~> 1.0) dry-schema (~> 1.0)
connection_pool (2.2.2) connection_pool (2.2.2)
counter_culture (0.1.34)
activerecord (>= 3.0.0)
activesupport (>= 3.0.0)
after_commit_action (~> 1.0.0)
crass (1.0.5) crass (1.0.5)
deep_merge (1.2.1) deep_merge (1.2.1)
devise (4.7.1) devise (4.7.1)
...@@ -288,6 +295,7 @@ DEPENDENCIES ...@@ -288,6 +295,7 @@ DEPENDENCIES
byebug byebug
capybara (>= 2.15) capybara (>= 2.15)
config config
counter_culture (~> 0.1.33)
devise devise
jbuilder (~> 2.7) jbuilder (~> 2.7)
listen (>= 3.0.5, < 3.2) listen (>= 3.0.5, < 3.2)
......
app/assets/stylesheets/custom.scss
...@@ -71,3 +71,50 @@ h1, h2, h3, h4, h5, h6 { ...@@ -71,3 +71,50 @@ h1, h2, h3, h4, h5, h6 {
.form-inline-industry { .form-inline-industry {
padding: 5px; padding: 5px;
} }
.container{
height: 100%;
align-content: center;
}
.card-body{
background-color: rgba(211, 211, 223, 0.829);
}
.card-footer {
background-color: rgba(211, 211, 223, 0.829);
}
.card-header h3{
color: gainsboro;
text-align: center;
}
.card-header {
background-color: rgb(18, 121, 255);
}
.card-footer {
border: none;
margin: 20px;
}
.input-group-prepend span{
width: 70px;
background-color: rgb(54, 134, 240);
color: black;
}
.login_btn{
color: gainsboro;
background-color: rgb(54, 134, 240);
width: 100px;
}
.login_btn:hover{
color: black;
background-color: aqua;
}
.d-flex {
height: 10px;
}
app/controllers/cities_controller.rb
...@@ -3,4 +3,5 @@ class CitiesController < ApplicationController ...@@ -3,4 +3,5 @@ class CitiesController < ApplicationController
@top_vn_cities = City.sort_top_vn_cities @top_vn_cities = City.sort_top_vn_cities
@top_inter_cities = City.sort_top_inter_cities @top_inter_cities = City.sort_top_inter_cities
@top_cities = City.sort_top_cities @top_cities = City.sort_top_cities
end
end end
app/controllers/login_controller.rb 0 → 100644
class LoginController < ApplicationController
end
app/helpers/login_helper.rb 0 → 100644
module LoginHelper
end
app/models/city.rb
...@@ -3,15 +3,15 @@ class City < ApplicationRecord ...@@ -3,15 +3,15 @@ class City < ApplicationRecord
has_many :jobs, through: :city_jobs has_many :jobs, through: :city_jobs
def self.sort_top_cities def self.sort_top_cities
@cities ||= all.sort_by(&:jobs_count).reject{ |city| city.jobs_count.zero? }.reverse.take(Settings.top.city.limit) @cities ||= includes(city_jobs: :job).all.sort_by(&:jobs_count).reject{ |city| city.jobs_count.zero? }.reverse.take(Settings.top.city.limit)
end end
def self.sort_top_vn_cities def self.sort_top_vn_cities
@vn_cities ||= where(region: 0).sort_by(&:jobs_count).reject{ |city| city.jobs_count.zero? }.reverse.take(Settings.top.city.limit) @vn_cities ||= City.where(region: 0).includes(:city_jobs).sort_by(&:jobs_count).reject{ |city| city.jobs_count.zero? }.reverse.take(Settings.top.city.limit)
end end
def self.sort_top_inter_cities def self.sort_top_inter_cities
@inter_cities ||= where(region: 1).sort_by(&:jobs_count).reject{ |city| city.jobs_count.zero? }.reverse.take(Settings.top.city.limit) @inter_cities ||= City.where(region: 1).includes(:city_jobs).sort_by(&:jobs_count).reject{ |city| city.jobs_count.zero? }.reverse.take(Settings.top.city.limit)
end end
def jobs_count def jobs_count
......
app/views/cities/_cities_list.html.erb
<div class="container"> <div class="container">
<div class="row justify-content-md-center"> <div class="row justify-content-md-center">
<div class="col-sm"> <div class="col-sm text-center">
<div class="text-center"> <%= cities_list.name %>
<%= cities_list.name %> (<%= cities_list.jobs_count %>)
(<%= cities_list.jobs_count %>)
</div>
</div> </div>
</div> </div>
</div> </div>
app/views/cities/_city.html.erb
<div class="container"> <div class="container">
<div class="row justify-content-md-center"> <div class="row justify-content-md-center">
<div class="col text-center"> <div class="col text-center">
<%= city.name %> <%= city.name %>
(<%= city.jobs_count %>) (<%= city.jobs_count %> jobs)
</div> </div>
</div> </div>
</div> </div>
app/views/industries/_industries_list.html.erb
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="col-sm"> <div class="col-sm">
<div class="text-center"> <div class="text-center">
<%= industries_list.name %> <%= industries_list.name %>
(<%= industries_list.jobs_count %>) (<%= industries_list.jobs_count %> jobs)
</div> </div>
</div> </div>
</div> </div>
......
app/views/industries/_industry.html.erb
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="col"> <div class="col">
<div class="text-center"> <div class="text-center">
<%= industry.name %> <%= industry.name %>
(<%= industry.jobs_count %>) (<%= industry.jobs_count %> jobs)
</div> </div>
</div> </div>
</div> </div>
......
app/views/layouts/_footer.html.erb
<div class="card text-center"> <div class="card text-center">
<div class="card-header">
Footer
</div>
<div class="card-body"> <div class="card-body">
<h5 class="card-title">Venjob project</h5> <h5 class="card-title">Venjob project</h5>
<a href="#">@Copyright Zigexn Ventura 2019</a> <a href="#">@Copyright Zigexn Ventura 2019</a>
......
app/views/layouts/_header.html.erb
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<%= link_to image_tag("zigexn_logo.png", id: "logo", alt: "Venjob logo") %> <%= link_to image_tag("zigexn_logo.png", id: "logo", alt: "Venjob logo") %>
<nav class="navbar navbar-light bg-light"> <nav class="navbar navbar-light bg-light">
<form class="form-inline"> <form class="form-inline">
<button class="btn btn-outline-success" type="button">Login</button> <%= link_to "Login", login_index_path, class:"btn btn-outline-success" %>
<button class="btn btn-outline-success" type="button">Register</button> <button class="btn btn-outline-success" type="button">Register</button>
<button class="btn btn-outline-success" type="button">Favorite</button> <button class="btn btn-outline-success" type="button">Favorite</button>
<button class="btn btn-outline-success" type="button">History</button> <button class="btn btn-outline-success" type="button">History</button>
......
app/views/login/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>
<div class="container">
<div class="d-flex justify-content-center h-100">
<div class="card">
<div class="card-header">
<h3>Login</h3>
</div>
<div class="card-body">
<form>
<div class="input-group form-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fas fa-user"></i></span>
</div>
<input type="text" class="form-control" placeholder="email">
</div>
<div class="input-group form-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fas fa-key"></i></span>
</div>
<input type="password" class="form-control" placeholder="password">
</div>
<div class="card-footer">
<div class="d-flex justify-content-center">
<a href="#">Forgot your password?</a>
</div>
</div>
<div class="form-group">
<input type="submit" value="Login" class="btn float-left login_btn">
<input type="submit" value="Register" class="btn float-right login_btn">
</div>
</form>
</div>
</div>
</div>
</div>
</br>
</br>
app/views/top/index.html.erb
...@@ -49,3 +49,5 @@ ...@@ -49,3 +49,5 @@
</div> </div>
</div> </div>
</div> </div>
</br>
config/routes.rb
...@@ -2,6 +2,7 @@ Rails.application.routes.draw do ...@@ -2,6 +2,7 @@ Rails.application.routes.draw do
root "top#index" root "top#index"
resources :cities, only: :index resources :cities, only: :index
resources :industries, only: :index resources :industries, only: :index
resources :login, only: :index
resource :top, only: :index resource :top, only: :index
devise_for :users devise_for :users
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