Skip to content

V
venjob
Commit 6c0bf9ac by Huỳnh Thiên Phước
Options

Show Industries

parent 019a82d8
Pipeline #790 failed with stages
in 0 seconds
Showing with 77 additions and 21 deletions
app/assets/javascripts/application.js
...@@ -13,5 +13,6 @@ ...@@ -13,5 +13,6 @@
//= require rails-ujs //= require rails-ujs
//= require activestorage //= require activestorage
//= require jquery-3.5.1.slim.min.js //= require jquery-3.5.1.slim.min.js
//= require jquery-3.5.1.min.js
//= require turbolinks //= require turbolinks
//= require_tree . //= require_tree .
app/assets/stylesheets/cities.scss
...@@ -6,7 +6,11 @@ ...@@ -6,7 +6,11 @@
font-style: italic; font-style: italic;
font-family: Bookman, URW Bookman L, serif; font-family: Bookman, URW Bookman L, serif;
} }
.city-name { .vn-name, .international-name{
text-decoration: none;
color: black;
}
.vn-name, .international-name {
margin: 10px; margin: 10px;
padding: 10px; padding: 10px;
text-align: center; text-align: center;
......
app/assets/stylesheets/industries.scss 0 → 100644
.industry-banner{
background: linear-gradient(to top, #33ccff 0%, #006600 100%);
font-size: 38px;
text-align: center;
color: white;
font-style: italic;
font-family: Bookman, URW Bookman L, serif;
}
.industry-details {
margin: 20px;
padding: 15px;
text-align: center;
}
.industry-details {
text-decoration: none;
color: black;
}
.remove-decoration {
&:hover{
a {
text-decoration: none;
}
}
}
app/controllers/industries_controller.rb
class IndustriesController < ApplicationController class IndustriesController < ApplicationController
def index
@industries = Industry.all_industry
end
end end
app/helpers/jobs_helper.rb
module JobsHelper module JobsHelper
def job_description(description)
strip_tags(description).truncate_words(30)
end
end end
app/models/city.rb
...@@ -5,6 +5,7 @@ class City < ApplicationRecord ...@@ -5,6 +5,7 @@ class City < ApplicationRecord
def self.top_city def self.top_city
joins(:jobs).group(:city_id).order('count(job_id) DESC').limit(9) joins(:jobs).group(:city_id).order('count(job_id) DESC').limit(9)
end end
def self.all_city def self.all_city
joins(:jobs).group(:city_id).order('count(job_id) DESC') joins(:jobs).group(:city_id).order('count(job_id) DESC')
end end
......
app/models/industry.rb
...@@ -5,4 +5,8 @@ class Industry < ApplicationRecord ...@@ -5,4 +5,8 @@ class Industry < ApplicationRecord
def self.top_industry def self.top_industry
joins(:jobs).group(:industry_id).order('count(job_id) DESC').limit(9) joins(:jobs).group(:industry_id).order('count(job_id) DESC').limit(9)
end end
def self.all_industry
joins(:jobs).group(:industry_id).order('count(job_id) DESC')
end
end end
app/models/job.rb
...@@ -16,7 +16,7 @@ class Job < ApplicationRecord ...@@ -16,7 +16,7 @@ class Job < ApplicationRecord
has_many :users, through: :histories has_many :users, through: :histories
def company_name def company_name
@company_name ||= company&.name company&.name
end end
end end
app/views/cities/_cities_international.html.erb
<% @cities_international.each do |city| %> <% @cities_international.each do |city| %>
<div class="col-3 remove-decoration"> <div class="col-3 remove-decoration">
<%= link_to '#' do %> <%= link_to '#' do %>
<div class="border border-dark rounded city-name"> <div class="border border-dark rounded vn-name">
<div> <div>
<strong><%= city.name %></strong> <strong><%= city.name %></strong>
</div> </div>
......
app/views/cities/_cities_vietnam.html.erb
<% @cities_vietnam.each do |city| %> <% @cities_vietnam.each do |city| %>
<div class="col-3 remove-decoration"> <div class="col-3 remove-decoration">
<%= link_to '#' do %> <%= link_to '#' do %>
<div class="border border-dark rounded city-name"> <div class="border border-dark rounded international-name">
<div> <div>
<strong><%= city.name %></strong> <strong><%= city.name %></strong>
</div> </div>
......
app/views/cities/index.html.erb
<% provide(:title, 'All Cities') %> <% provide(:title, 'All Cities') %>
<div class="container"> <div class="container">
<div class="all-cities"> <div class="all-cities">
<div class="city-banner rounded">City list</div> <div class="city-banner rounded">City List</div>
<div class="row"> <div class="row">
<div class="col-6"> <div class="col-6">
<div class="row-table border border-dark rounded viet-nam">Việt Nam</div> <div class="row-table border border-dark rounded viet-nam">Việt Nam</div>
......
app/views/industries/index.html.erb
asdasasd <% provide(:title, 'All Industries') %>
<div class="container">
<div class="all-industries">
<div class="industry-banner rounded">Industry List</div>
<div class="row">
<% @industries.each do |industry| %>
<div class="col-3 remove-decoration">
<%= link_to '#' do %>
<div class="border border-dark rounded industry-details">
<div>
<strong><%= industry.name %></strong>
</div>
<div>
<%= industry.jobs.count %>
</div>
</div>
<% end %>
</div>
<% end %>
</div>
</div>
</div>
app/views/layouts/_show_jobs.html.erb
...@@ -10,6 +10,10 @@ ...@@ -10,6 +10,10 @@
<%= city.name %> <%= city.name %>
<% end %> <% end %>
</div> </div>
<div class="introduction">
<%= job_description(job.description) %>
<%= link_to 'Read more..', '#'%>
</div>
<button type="button" class="btn btn-primary" id="button-follow">♥ Follow</button> <button type="button" class="btn btn-primary" id="button-follow">♥ Follow</button>
</div> </div>
</div> </div>
......
db/migrate/20200723071239_create_top_pages.rb deleted 100644 → 0
class CreateTopPages < ActiveRecord::Migration[5.2]
def change
create_table :top_pages do |t|
t.timestamps
end
end
end
lib/src/csv_importer.rb
...@@ -3,17 +3,17 @@ require 'csv' ...@@ -3,17 +3,17 @@ require 'csv'
require 'zip' require 'zip'
class CSVImporter class CSVImporter
NAME_DOMAIN = '192.168.1.156'.freeze
FTP_USERNAME = 'training'.freeze
FTP_PASSWORD = 'training'.freeze
def initialize(logger) def initialize(logger)
@logger = logger @logger = logger
NAME_DOMAIN = '192.168.1.156'.freeze
USERNAME_FTP = 'training'.freeze
PASSWORD_FTP = 'training'.freeze
@extracting_directory = Rails.root.join('lib', 'csv') @extracting_directory = Rails.root.join('lib', 'csv')
@zip_directory = Rails.root.join('jobs.zip') @zip_directory = Rails.root.join('jobs.zip')
@importer = Rails.root.join('lib', 'csv', 'jobs.csv') @importer = Rails.root.join('lib', 'csv', 'jobs.csv')
end end
def import def import
get_file_csv get_file_csv
extract_zip extract_zip
import_file_csv import_file_csv
...@@ -73,4 +73,4 @@ class CSVImporter ...@@ -73,4 +73,4 @@ class CSVImporter
end end
end end
end end
end end
\ No newline at end of file
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