Merge branch 'master' into 'csv'
# Conflicts: # app/models/city.rb # config/application.rb
Showing
| ... | ... | @@ -26,7 +26,8 @@ gem 'jbuilder', '~> 2.5' |
| # gem 'redis', '~> 4.0' | ||
| # Use ActiveModel has_secure_password | ||
| # gem 'bcrypt', '~> 3.1.7' | ||
| gem 'nokogiri' | ||
| gem 'whenever' | ||
| # Use ActiveStorage variant | ||
| # gem 'mini_magick', '~> 4.8' | ||
| ... | ... |
app/assets/images/avatar.png
0 → 100644
24.5 KB
app/assets/images/banner-search-box-home.png
0 → 100644
532 KB
app/assets/images/icontitle.png
0 → 100644
49.8 KB
app/assets/images/logo.png
0 → 100644
163 KB
app/assets/javascripts/ajquery.min.js
0 → 100644
app/assets/javascripts/city.coffee
0 → 100644
app/assets/javascripts/custom.js
0 → 100644
app/assets/javascripts/home.coffee
0 → 100644
app/assets/javascripts/industry.coffee
0 → 100644
app/assets/javascripts/job.coffee
0 → 100644
app/assets/stylesheets/custom.scss
0 → 100644
app/assets/stylesheets/custom_btn.scss
0 → 100644
app/assets/stylesheets/home.scss
0 → 100644
app/assets/stylesheets/industry.scss
0 → 100644
app/assets/stylesheets/job.scss
0 → 100644
app/controllers/city_controller.rb
0 → 100644
app/controllers/home_controller.rb
0 → 100644
app/controllers/industry_controller.rb
0 → 100644
app/controllers/job_controller.rb
0 → 100644
app/helpers/city_helper.rb
0 → 100644
app/helpers/home_helper.rb
0 → 100644
app/helpers/industry_helper.rb
0 → 100644
app/helpers/job_helper.rb
0 → 100644
app/views/city/_block_city_jobs.html.erb
0 → 100644
app/views/city/index.html.erb
0 → 100644
app/views/home/_banner_and_search.html.erb
0 → 100644
app/views/home/_box_five_job.html.erb
0 → 100644
app/views/home/_box_nine_city.html.erb
0 → 100644
app/views/home/_box_nine_industries.html.erb
0 → 100644
app/views/home/index.html.erb
0 → 100644
app/views/industry/_block_industry.html.erb
0 → 100644
app/views/industry/index.html.erb
0 → 100644
app/views/job/_modal_login.html.erb
0 → 100644
app/views/layouts/_footer.html.erb
0 → 100644
app/views/layouts/_header.html.erb
0 → 100644
app/views/layouts/_padding.html.erb
0 → 100644
app/views/shared/_scroll_top.html.erb
0 → 100644
app/views/shared/_shim.html.erb
0 → 100644
config/schedule.rb
0 → 100644
lib/src/base/base.rb
0 → 100644
lib/src/crawler.rb
0 → 100644
lib/src/crawler_job.rb
0 → 100644
lib/src/interface/blue_interface.rb
0 → 100644
lib/src/interface/green_interface.rb
0 → 100644
lib/src/interface/red_interface.rb
0 → 100644
lib/tasks/crawler.rake
0 → 100644
test/controllers/city_controller_test.rb
0 → 100644
test/controllers/home_controller_test.rb
0 → 100644
test/controllers/industry_controller_test.rb
0 → 100644
test/controllers/job_controller_test.rb
0 → 100644
Please
register
or
sign in
to comment