Skip to content

V
venjob_nth
Commit 6316e281 by Hoang Phuc Do
Options

Merge branch 'ID8_History' into 'master' 

ID8_History

See merge request !12
parents 13a1d576 47acfa03
Pipeline #1000 canceled with stages
in 0 seconds
Showing with 131 additions and 47 deletions
app/assets/javascripts/apply_job.coffee deleted 100644 → 0
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
app/assets/javascripts/city.coffee deleted 100644 → 0
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
app/assets/javascripts/error.coffee deleted 100644 → 0
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
app/assets/javascripts/favorite.coffee deleted 100644 → 0
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
app/assets/javascripts/home.coffee deleted 100644 → 0
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
app/assets/javascripts/industry.coffee deleted 100644 → 0
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
app/assets/javascripts/job.coffee deleted 100644 → 0
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
app/assets/javascripts/registrations.coffee deleted 100644 → 0
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
app/assets/javascripts/users.coffee deleted 100644 → 0
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
app/assets/stylesheets/custom.scss
...@@ -1622,3 +1622,6 @@ $main-color: #23303D; ...@@ -1622,3 +1622,6 @@ $main-color: #23303D;
height: 100%; height: 100%;
z-index: 99999; z-index: 99999;
} }
#label_name_file {
cursor: pointer;
}
\ No newline at end of file
app/assets/stylesheets/error.scss
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
} }
.box_content_404 { .box_content_404 {
width: 100vw; width: 100vw;
height: 100vh; height: auto;
z-index: 2000; z-index: 2000;
// height: 900px; // height: 900px;
position: fixed; position: fixed;
......
app/assets/stylesheets/registrations.scss deleted 100644 → 0
// Place all the styles related to the registrations controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
app/controllers/application_controller.rb
...@@ -19,7 +19,7 @@ class ApplicationController < ActionController::Base ...@@ -19,7 +19,7 @@ class ApplicationController < ActionController::Base
protected protected
def configure_permitted_parameters def configure_permitted_parameters
devise_parameter_sanitizer.permit(:sign_up) { |u| u.permit(:name, :email, :cv, :password) } devise_parameter_sanitizer.permit(:sign_up) { |u| u.permit(:name, :email, :cv, :password, :password_confirmation) }
devise_parameter_sanitizer.permit(:account_update) { |u| u.permit(:name, :email, :cv, :password, :current_password) } devise_parameter_sanitizer.permit(:account_update) { |u| u.permit(:name, :email, :cv, :password, :current_password) }
end end
end end
app/controllers/apply_job_controller.rb
...@@ -6,6 +6,7 @@ class ApplyJobController < ApplicationController ...@@ -6,6 +6,7 @@ class ApplyJobController < ApplicationController
def index def index
@jobs = current_user.applied_jobs.includes(:job).order(created_at: :desc).page(params[:page]).per(6) @jobs = current_user.applied_jobs.includes(:job).order(created_at: :desc).page(params[:page]).per(6)
return render 'error/page_not_found' if @jobs.blank?
end end
def apply def apply
......
app/controllers/histories_controller.rb 0 → 100644
# frozen_string_literal: true
class HistoriesController < ApplicationController
before_action :authenticate_user!
def index
histories = current_user.histories.order(created_at: :desc)
@jobs = histories.map(&:job)
end
end
app/controllers/job_controller.rb
...@@ -3,13 +3,6 @@ ...@@ -3,13 +3,6 @@
# Job controller # Job controller
class JobController < ApplicationController class JobController < ApplicationController
before_action :load_data_dropdown, only: :index before_action :load_data_dropdown, only: :index
# after_action :add_job_to_history, only: :detail
def add_job_to_history
current_user.histories.create(session[:params_job_id]) if user_signed_in?
session.delete(:params_job_id)
end
def index def index
model = params[:model].classify.constantize model = params[:model].classify.constantize
obj = model.find_by(slug: params[:slug]) obj = model.find_by(slug: params[:slug])
...@@ -17,8 +10,10 @@ class JobController < ApplicationController ...@@ -17,8 +10,10 @@ class JobController < ApplicationController
end end
def detail def detail
session[:params_job_id] = params[:id]
@job = Job.find(params[:id]).decorate @job = Job.find(params[:id]).decorate
return render 'error/fage_not_found' if @job.blank?
JobHistory.add_job_to_history(@job.id, current_user) if user_signed_in?
cities = @job.cities.first cities = @job.cities.first
industries = @job.industries.first industries = @job.industries.first
add_breadcrumb t('controller.job.detail.home'), root_path add_breadcrumb t('controller.job.detail.home'), root_path
...@@ -35,6 +30,8 @@ class JobController < ApplicationController ...@@ -35,6 +30,8 @@ class JobController < ApplicationController
def render_result(obj) def render_result(obj)
@keyword = obj.name @keyword = obj.name
@data = obj.jobs.page(params[:page]) @data = obj.jobs.page(params[:page])
return render 'error/page_not_found' if @data.blank?
render 'result_data' render 'result_data'
end end
end end
app/helpers/histories_helper.rb 0 → 100644
module HistoriesHelper
end
app/models/history.rb
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
# Description/Explanation of Person class # Description/Explanation of Person class
class History < ApplicationRecord class History < ApplicationRecord
NUMBER_JOB_LIMIT = 20
belongs_to :user belongs_to :user
belongs_to :job belongs_to :job
end end
app/views/favorite/index.html.erb
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<div class="col-lg-12"> <div class="col-lg-12">
<div class="breadcrumb_total_search"> <div class="breadcrumb_total_search">
<span class="breadcrumb-item active"> <span class="breadcrumb-item active">
<%= t('favorite.list_blank') %> <%= t('favorite.empty') %>
</span> </span>
</div> </div>
</div> </div>
......
app/views/histories/_block_job_mini.html.erb 0 → 100644
<div class="con">
<div class="container">
<div class="row">
<div class="col-sm-12">
<div class="box_jobs mini">
<div class="row">
<div class="d-none d-lg-block col-lg-1 d-md-block col-md-1 d-sm-block col-sm-1">
<div class="box_radio">
<%= form.radio_button(:job_id, data.id) %>
</div>
</div>
<div class="col-lg-10 col-md-10 col-sm-11">
<div class="box_info">
<div class="lol">
<%= link_to data.name, detail_job_path(id: data.id), class: 'job_name' %>
</div>
<div class="cop">
<h5 class="box_info_copany_name"><i class="far fa-building"></i> <%= data.company.name %></h5>
</div>
<div class="loc">
<h5 class="box_info_location"><i class="fas fa-map-marker-alt"></i>
<%= data.cities.map(&:name).join(' | ') %>
</h5>
</div>
<h5 class="box_info_salary"><i class="fas fa-dollar-sign"></i>&nbsp;<%= "#{t('pages.index.salary')}: #{data.salary}" %></h5>
<div class="coc">
<div class="row">
<div class="col-lg-12">
<h5 class="box_info_des"><%= strip_tags(data.description) %></h5>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
app/views/histories/index.html.erb 0 → 100644
<div class="container">
<div class="box_my_page">
<div class="row">
<div class="col-lg-12">
<div class="box_my_page_header">
<h4><%= t('history.list') %></h4>
</div>
</div>
</div>
</div>
</div>
<div class="transform_margin"></div>
<% if @jobs.blank? %>
<div class="col-lg-12">
<div class="breadcrumb_total_search">
<span class="breadcrumb-item active">
<%= t('history.empty') %>
</span>
</div>
</div>
<div style="width: 100%; height: 55vh"></div>
<% else %>
<%= form_with url: apply_path, method: :get, local: true, skip_enforcing_utf8: true do |f| %>
<div class="container">
<div class="box_scroll">
<%= render partial: 'histories/block_job_mini', collection: @jobs, as: :data, locals: { form: f } %>
</div>
</div>
<div class="container">
<div class="row">
<div class="col-lg-12">
<div class="btn_apply_job in_favorite">
<%= f.submit t('pages.detail.btr_text_submit_cv'), name: nil, class: 'btn btn-apply_job in_favorite' %>
</div>
</div>
</div>
</div>
<% end %>
<% end %>
app/views/layouts/_header.html.erb
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
end %> end %>
</li> </li>
<li class="list_item_menu_header_right"> <li class="list_item_menu_header_right">
<%= link_to t('pages.index.history'), '#', class: 'link_item_menu_header_right' %> <%= link_to t('pages.index.history'), list_histories_path, class: 'link_item_menu_header_right' %>
</li> </li>
<li class="list_item_menu_header_right"> <li class="list_item_menu_header_right">
<%= link_to_if(user_signed_in?, t('pages.index.mypage'), my_page_path, class: 'link_item_menu_header_right') do <%= link_to_if(user_signed_in?, t('pages.index.mypage'), my_page_path, class: 'link_item_menu_header_right') do
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
end %> end %>
</li> </li>
<li class = "item_menu_mobile_vertical"> <li class = "item_menu_mobile_vertical">
<%= link_to t('pages.index.history'), '#', class: 'link_item_menu_mobile' %> <%= link_to t('pages.index.history'), list_histories_path, class: 'link_item_menu_mobile' %>
</li> </li>
<li class="item_menu_mobile_vertical"> <li class="item_menu_mobile_vertical">
<%= link_to_if(user_signed_in?, t('pages.index.mypage'), my_page_path, class: 'link_item_menu_mobile') do <%= link_to_if(user_signed_in?, t('pages.index.mypage'), my_page_path, class: 'link_item_menu_mobile') do
......
config/application.rb
...@@ -13,9 +13,10 @@ module Venjob ...@@ -13,9 +13,10 @@ module Venjob
config.exceptions_app = self.routes config.exceptions_app = self.routes
config.autoload_paths << Rails.root.join('lib/service') config.autoload_paths << Rails.root.join('lib/service')
config.autoload_paths << Rails.root.join('lib/src') config.autoload_paths << Rails.root.join('lib/src')
config.autoload_paths << Rails.root.join('lib/business')
# i18n # i18n
config.i18n.available_locales = [:en, :vi] config.i18n.available_locales = [:en, :vi]
config.i18n.default_locale = :en config.i18n.default_locale = :vi
config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')] config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')]
# Settings in config/environments/* take precedence over those specified here. # Settings in config/environments/* take precedence over those specified here.
......
config/environments/development.rb
...@@ -22,7 +22,7 @@ Rails.application.configure do ...@@ -22,7 +22,7 @@ Rails.application.configure do
config.eager_load = false config.eager_load = false
# Show full error reports. # Show full error reports.
config.consider_all_requests_local = true config.consider_all_requests_local = false
# Enable/disable caching. By default caching is disabled. # Enable/disable caching. By default caching is disabled.
# Run rails dev:cache to toggle caching. # Run rails dev:cache to toggle caching.
......
config/locales/en.yml
...@@ -136,7 +136,11 @@ en: ...@@ -136,7 +136,11 @@ en:
favorite: favorite:
liked: 'You have added job to favorites' liked: 'You have added job to favorites'
list: 'List of jobs you liked' list: 'List of jobs you liked'
list_blank: 'You do not have a favorite job!' empty: 'You do not have a favorite job!'
history:
list: 'Histories'
empty: 'You do not have a histories'
seen_at: 'Seen_at: '
activerecord: activerecord:
attributes: attributes:
applied_job: applied_job:
......
config/locales/vn.yml
...@@ -136,7 +136,11 @@ vi: ...@@ -136,7 +136,11 @@ vi:
favorite: favorite:
liked: 'Bạn đã thêm công việc vào yêu thích.' liked: 'Bạn đã thêm công việc vào yêu thích.'
list: 'Danh sách công việc bạn đã thích' list: 'Danh sách công việc bạn đã thích'
list_blank: 'Bạn chưa có công việc yêu thích!' empty: 'Bạn chưa có công việc yêu thích!'
history:
list: 'Lịch sử'
empty: 'Bạn chưa có xem công việc nào luôn á!'
seen_at: 'Đã xem lúc: '
activerecord: activerecord:
attributes: attributes:
applied_job: applied_job:
......
config/routes.rb
...@@ -16,6 +16,8 @@ Rails.application.routes.draw do ...@@ -16,6 +16,8 @@ Rails.application.routes.draw do
get 'my/jobs', to: 'apply_job#index', as: :list_applied_jobs get 'my/jobs', to: 'apply_job#index', as: :list_applied_jobs
# Fovorite # Fovorite
resources :favorite, only: %i[index create destroy] resources :favorite, only: %i[index create destroy]
# History
get 'history', to:'histories#index', as: :list_histories
# Details job # Details job
get 'detail/:id', to: 'job#detail', as: :detail_job get 'detail/:id', to: 'job#detail', as: :detail_job
# Search # Search
......
lib/business/job_history.rb 0 → 100644
# frozen_string_literal: true
class JobHistory
def self.add_job_to_history(job_id, current_user)
current_user.histories.find_or_create_by(job_id: job_id)
counter_history = current_user.histories.count
current_user.histories.destroy(current_user.histories.first) if counter_history > History::NUMBER_JOB_LIMIT
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