Skip to content

V
Venjob_HungNT
Commit b3581cb3 by Hung0326 Committed by GitHub
Options

Merge pull request #7 from Hung0326/dev 

optimization code
parents 8c61ffb4 73474939
Showing with 56 additions and 56 deletions
Gemfile
...@@ -13,7 +13,7 @@ gem 'sass-rails', '~> 5.0' ...@@ -13,7 +13,7 @@ gem 'sass-rails', '~> 5.0'
gem 'uglifier', '>= 1.3.0' gem 'uglifier', '>= 1.3.0'
# See https://github.com/rails/execjs#readme for more supported runtimes # See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'mini_racer', platforms: :ruby # gem 'mini_racer', platforms: :ruby
gem 'pry'
# Use CoffeeScript for .coffee assets and views # Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 4.2' gem 'coffee-rails', '~> 4.2'
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
...@@ -43,6 +43,7 @@ end ...@@ -43,6 +43,7 @@ end
group :development do group :development do
gem 'rubocop' gem 'rubocop'
gem 'pry'
# Access an interactive console on exception pages or by calling 'console' anywhere in the code. # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
gem 'web-console', '>= 3.3.0' gem 'web-console', '>= 3.3.0'
gem 'listen', '>= 3.0.5', '< 3.2' gem 'listen', '>= 3.0.5', '< 3.2'
......
app/assets/stylesheets/custom.scss
...@@ -791,6 +791,17 @@ $main-color: #221f20; ...@@ -791,6 +791,17 @@ $main-color: #221f20;
width: 80%; width: 80%;
display: block; display: block;
} }
.cop {
width: 90%;
height: 24px;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
background-color: white;
margin-bottom: 10px;
}
} }
@media only screen and (max-width: 768px) { @media only screen and (max-width: 768px) {
...@@ -827,7 +838,6 @@ $main-color: #221f20; ...@@ -827,7 +838,6 @@ $main-color: #221f20;
-webkit-line-clamp: 1; -webkit-line-clamp: 1;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
background-color: white; background-color: white;
} }
.loc { .loc {
margin-top: 5px; margin-top: 5px;
......
app/controllers/home_controller.rb
class HomeController < ApplicationController class HomeController < ApplicationController
def index def index
@data_industries = Industry.sort_asc.all @industries = Industry.sort_asc.all
@data_total_job = Job.all.count @job_count = Job.all.count
@data_five_jobs = Job.order(created_at: :asc).where(newdata: 1).limit(5) @five_jobs = Job.order(created_at: :asc).where(newdata: 1).limit(50)
@data_cities = City.all @cities = City.all
end end
end end
app/views/home/_banner_and_search.html.erb
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<div class="box-search"> <div class="box-search">
<div class="search_scaffold"> <div class="search_scaffold">
<div class = "total_job"> <div class = "total_job">
<h4 class="show_total_job">Khám phá ngay <b><%=@data_total_job%></b> việc làm tốt nhất trên VenJob</h4> <h4 class="show_total_job">Khám phá ngay <b><%=@job_count%></b> việc làm tốt nhất trên VenJob</h4>
</div> </div>
<div class="filter_box"> <div class="filter_box">
<div class="search_input"> <div class="search_input">
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</div> </div>
<select class="show_list_industries"> <select class="show_list_industries">
<option value="*" selected disabled hidden class="select_first">Tất cả ngành nghề</option> <option value="*" selected disabled hidden class="select_first">Tất cả ngành nghề</option>
<% @data_industries.each do |val| %> <% @industries.each do |val| %>
<option value="<%= val.id %>"><%= val.name %></option> <option value="<%= val.id %>"><%= val.name %></option>
<% end %> <% end %>
</select> </select>
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</div> </div>
<select class="show_list_cities"> <select class="show_list_cities">
<option value="*" selected disabled hidden class="select_first">Tất cả Tỉnh thành</option> <option value="*" selected disabled hidden class="select_first">Tất cả Tỉnh thành</option>
<% @data_cities.each do |val| %> <% @cities.each do |val| %>
<option value="<%= val.id %>"><%= val.name %></option> <option value="<%= val.id %>"><%= val.name %></option>
<% end %> <% end %>
</select> </select>
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<div class="box-search-tablet"> <div class="box-search-tablet">
<div class="search_scaffold-tablet"> <div class="search_scaffold-tablet">
<div class = "total_job"> <div class = "total_job">
<h4 class="show_total_job">Khám phá ngay <b><%=@data_total_job%></b> việc làm tốt nhất trên VenJob</h4> <h4 class="show_total_job">Khám phá ngay <b><%=@job_count%></b> việc làm tốt nhất trên VenJob</h4>
</div> </div>
<div class="filter_box filter_box_tablet"> <div class="filter_box filter_box_tablet">
<div class="search_input"> <div class="search_input">
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
</div> </div>
<select class="show_list_industries"> <select class="show_list_industries">
<option value="*" selected disabled hidden class="select_first">Tất cả ngành nghề</option> <option value="*" selected disabled hidden class="select_first">Tất cả ngành nghề</option>
<% @data_industries.each do |val| %> <% @industries.each do |val| %>
<option value="<%= val.id %>"><%= val.name %></option> <option value="<%= val.id %>"><%= val.name %></option>
<% end %> <% end %>
</select> </select>
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
</div> </div>
<select class="show_list_cities"> <select class="show_list_cities">
<option value="*" selected disabled hidden class="select_first">Tất cả Tỉnh thành</option> <option value="*" selected disabled hidden class="select_first">Tất cả Tỉnh thành</option>
<% @data_cities.each do |val| %> <% @cities.each do |val| %>
<option value="<%= val.id %>"><%= val.name %></option> <option value="<%= val.id %>"><%= val.name %></option>
<% end %> <% end %>
</select> </select>
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
</div> </div>
</div> </div>
<div class="box-show-total-jobs-mobile"> <div class="box-show-total-jobs-mobile">
<span>Khám phá ngay <%=@data_total_job%></b> việc làm tốt nhất trên VenJob</span> <span>Khám phá ngay <%=@job_count%></b> việc làm tốt nhất trên VenJob</span>
</div> </div>
<!-- Process search mobile--> <!-- Process search mobile-->
<div class="box-search-mobile"> <div class="box-search-mobile">
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
<div class="search_industries_mobile"> <div class="search_industries_mobile">
<select class="show_list_industries_mobile"> <select class="show_list_industries_mobile">
<option value="*" selected disabled hidden class="select_first">Tất cả ngành nghề</option> <option value="*" selected disabled hidden class="select_first">Tất cả ngành nghề</option>
<% @data_industries.each do |val| %> <% @industries.each do |val| %>
<option value="<%= val.id %>"><%= val.name %></option> <option value="<%= val.id %>"><%= val.name %></option>
<% end %> <% end %>
</select> </select>
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
<div class="search_location_mobile"> <div class="search_location_mobile">
<select class="show_list_cities_mobile"> <select class="show_list_cities_mobile">
<option value="*" selected disabled hidden class="select_first">Tất cả Tỉnh thành</option> <option value="*" selected disabled hidden class="select_first">Tất cả Tỉnh thành</option>
<% @data_cities.each do |val| %> <% @cities.each do |val| %>
<option value="<%= val.id %>"><%= val.name %></option> <option value="<%= val.id %>"><%= val.name %></option>
<% end %> <% end %>
</select> </select>
......
app/views/shared/_box_five_job.html.erb
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<% i = 0%> <% i = 0%>
<% @data_five_jobs.each do |val| %> <% @five_jobs.each do |val| %>
<div class="box_jobs"> <div class="box_jobs">
<div class="col-sm-12 d-block d-sm-none"> <div class="col-sm-12 d-block d-sm-none">
...@@ -16,23 +16,23 @@ ...@@ -16,23 +16,23 @@
<div class="col-sm-10 col-md-9 col-lg-10"> <div class="col-sm-10 col-md-9 col-lg-10">
<div class="box_info"> <div class="box_info">
<div class="lol"> <div class="lol">
<%= link_to "#{val.name}", "#", class: "job_name" %> <%= link_to val.name, '#', class: 'job_name' %>
<%= image_tag 'trophy',class: "img_job_name" %> <%= image_tag 'trophy',class: 'img_job_name' %>
</div> </div>
<div class = "cop"> <div class="cop">
<h5 class="box_info_copany_name"><i class="far fa-building"></i> <%= val.company.name %></h5> <h5 class="box_info_copany_name"><i class="far fa-building"></i> <%= val.company.name %></h5>
</div> </div>
<div class="loc"> <div class="loc">
<h5 class="box_info_location"><i class="fas fa-map-marker-alt"></i> <h5 class="box_info_location"><i class="fas fa-map-marker-alt"></i>
<% @dt = [] %> <% dt = [] %>
<% val.cities.each do |x| %> <% val.cities.each do |x| %>
<% @dt << (x.name << ' | ') %> <% dt << (x.name << ' | ') %>
<% end %> <% end %>
<%= @dt.join('').chomp('| ')%> <%= dt.join('').chomp('| ')%>
</h5> </h5>
</div> </div>
<h5 class="box_info_salary"><i class="fas fa-dollar-sign"></i> Lương: <%= val.salary %></h5> <h5 class="box_info_salary"><i class="fas fa-dollar-sign"></i> Lương: <%= val.salary %></h5>
<div class="coc" > <div class="coc">
<h5 class="box_info_des"><%= strip_tags(val.description) %></h5> <h5 class="box_info_des"><%= strip_tags(val.description) %></h5>
</div> </div>
</div> </div>
......
config/database.yml
...@@ -14,7 +14,7 @@ default: &default ...@@ -14,7 +14,7 @@ default: &default
encoding: utf8 encoding: utf8
pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
username: root username: root
password: '1' password: '12345678'
socket: /var/run/mysqld/mysqld.sock socket: /var/run/mysqld/mysqld.sock
...@@ -50,7 +50,6 @@ test: ...@@ -50,7 +50,6 @@ test:
# #
production: production:
<<: *default <<: *default
adapter: postgresql
database: hungnt_venjob_production database: hungnt_venjob_production
username: hungnt_venjob username: hungnt_venjob
password: <%= ENV['HUNGNT_VENJOB_DATABASE_PASSWORD'] %> password: <%= ENV['HUNGNT_VENJOB_DATABASE_PASSWORD'] %>
lib/src/Linkcrawl.rb deleted 100644 → 0
class Linkcrawl
# CRAWLER LINK JOB & COMPANIES
end
\ No newline at end of file
lib/src/crawler.rb
...@@ -13,15 +13,11 @@ class Clawler ...@@ -13,15 +13,11 @@ class Clawler
end end
@data_list_cities.length.times do |i| @data_list_cities.length.times do |i|
if i <= 69 area = i > 69 ? 0 : 1
name = (@data_list_cities[i].to_s)
City.create!(name: name, area: 1)
elsif i > 69
name = (@data_list_cities[i].to_s) name = (@data_list_cities[i].to_s)
City.create!(name: name, area: 0) City.create!(name: name, area: 0)
end end
end end
end
#PIL DATA INDUSTRIES #PIL DATA INDUSTRIES
def self.make_industries def self.make_industries
...@@ -33,7 +29,7 @@ class Clawler ...@@ -33,7 +29,7 @@ class Clawler
end end
@data_list_industries.length.times do |i| @data_list_industries.length.times do |i|
name = (@data_list_industries[i].to_s) name = @data_list_industries[i].to_s
if name.include?('&amp;') if name.include?('&amp;')
name.gsub!('&amp;','&') name.gsub!('&amp;','&')
end end
...@@ -48,16 +44,16 @@ class Clawler ...@@ -48,16 +44,16 @@ class Clawler
short_description: "Vui lòng xem trong mô tả công việc") short_description: "Vui lòng xem trong mô tả công việc")
@data = Interface_web.craw_data_companies() @data = Interface_web.craw_data_companies()
puts 'Save info companies to database . . .' puts 'Save info companies to database . . .'
i = @data[:name].length i = 0
i.times do |n| @data[:name].each do |n|
name = @data[:name][n] if Company.find_by(name: n).blank?
unless Company.find_by(name: name).present? address = @data[:address][i]
address = @data[:address][n] short_description = @data[:description][i]
short_description = @data[:description][n] Company.create!(name: n,
Company.create!(name: name,
address: address, address: address,
short_description: short_description) short_description: short_description)
end end
i += 1
end end
end end
# FILL DATA JOBS # FILL DATA JOBS
...@@ -114,13 +110,13 @@ class Clawler ...@@ -114,13 +110,13 @@ class Clawler
end end
def self.make_foreign_cities_table(data,id_job) def self.make_foreign_cities_table(data,id_job)
@list_city = data.split(',') @cities = data.split(',')
length = @list_city.length # length = @cities.length
length.times do |n| @cities.each do |city|
id_cities = City.find_by name: @list_city[n].strip id_cities = City.find_by name: city.strip
if !id_cities if !id_cities
id_cities = City.create!(name: @list_city[n].strip).id id_cities = City.create!(name: city.strip).id
else else
id_cities = id_cities.id id_cities = id_cities.id
end end
......
lib/src/interface_web.rb
...@@ -21,9 +21,9 @@ class Interface_web ...@@ -21,9 +21,9 @@ class Interface_web
data << website_companies << website_jobs data << website_companies << website_jobs
end end
@crawl_link_for_companies_jobs = crawl_link_for_companies_jobs(1) @crawl_link_for_companies_jobs = crawl_link_for_companies_jobs(5)
def self.get_link_job_and_companies def self.get_link_job_and_companies
@crawl_link_for_companies_jobs ||= crawl_link_for_companies_jobs(1) @crawl_link_for_companies_jobs ||= crawl_link_for_companies_jobs(5)
end end
def self.base_link(url) def self.base_link(url)
...@@ -54,8 +54,8 @@ class Interface_web ...@@ -54,8 +54,8 @@ class Interface_web
end end
if (name != "" && address != "" && desc != "") if (name != "" && address != "" && desc != "")
@data_companies_name << name.to_s.rstrip @data_companies_name << name.to_s.strip
@data_companies_address << address.to_s.rstrip @data_companies_address << address.to_s.strip
@data_companies_description << desc @data_companies_description << desc
@current_company += 1 @current_company += 1
end end
......
lib/tasks/crawler.rake
require 'src/crawler' require 'src/crawler'
namespace :db do namespace :db do
task populate: :environment do task populate: :environment do
# Clawler.make_industries Clawler.make_industries
# Clawler.make_cities Clawler.make_cities
Clawler.make_companies Clawler.make_companies
# Clawler.make_jobs Clawler.make_jobs
end end
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