Skip to content

V
venjob_nth
Commit dc3976f3 by Ngô Trung Hưng
Options

fix view _ribbon

parent 7f10504a
Pipeline #954 canceled with stages
in 0 seconds
Showing with 83 additions and 80 deletions
app/assets/javascripts/custom.js
...@@ -39,6 +39,19 @@ $(document).on("turbolinks:load", function(){ ...@@ -39,6 +39,19 @@ $(document).on("turbolinks:load", function(){
document.getElementById ("label_name_file").innerHTML = this.files[0].name; document.getElementById ("label_name_file").innerHTML = this.files[0].name;
}); });
// show & hide password
$(".icon_show_password").on('click',function() {
$(".input_password").attr('type', 'text');
$(".icon_show_password").css('display', 'none')
Please register or sign in to reply
$(".icon_hide_password").css('display', 'block')
});
$(".icon_hide_password").on('click',function() {
$(".input_password").attr('type', 'password');
$(".icon_hide_password").css('display', 'none')
$(".icon_show_password").css('display', 'block')
});
}); });
$(document).on("turbolinks:click", function(){ $(document).on("turbolinks:click", function(){
$(".box_loading").show(); $(".box_loading").show();
......
app/assets/stylesheets/users.scss
// Place all the styles related to the users controller here. // Place all the styles related to the users controller here.
// They will automatically be included in application.css. // They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/ // You can use Sass (SCSS) here: http://sass-lang.com/
.input_password {
position: relative;
}
@mixin icon_password {
font-size: 14px;
position: absolute;
right: 4%;
top: 50%;
transform: translateY(-50%);
&:hover {
cursor: pointer;
}
}
.icon_show_password {
@include icon_password;
display: block;
}
.icon_hide_password {
@include icon_password;
display: none;
}
@media only screen and (max-width: 992px) {
.icon_show_password {
right: 6%;
}
.icon_hide_password {
right: 6%;
}
}
\ No newline at end of file
app/decorators/applied_job_decorator.rb
# frozen_string_literal: true
class AppliedJobDecorator < Draper::Decorator class AppliedJobDecorator < Draper::Decorator
delegate_all delegate_all
def applied_at def applied_at
......
app/helpers/apply_job_helper.rb
#frozen_string_literal: true # frozen_string_literal: true
module ApplyJobHelper module ApplyJobHelper
def render_errors(obj) def render_errors(obj)
......
app/views/applied_mailer/applied_job_mail_to.html.erb
...@@ -15,10 +15,9 @@ ...@@ -15,10 +15,9 @@
<span>Company: <%= @applied_job.job.company.name %></span><br><br> <span>Company: <%= @applied_job.job.company.name %></span><br><br>
<span>Name: <%= @applied_job.name %></span><br> <span>Name: <%= @applied_job.name %></span><br>
<span>Email: <%= @applied_job.email %></span><br> <span>Email: <%= @applied_job.email %></span><br>
CV: <%= link_to @applied_job.cv.identifier, root_url(@applied_job.cv.url) , target: '_blank' %> CV: <%= link_to @applied_job.cv.identifier, root_url(@applied_job.cv.url), target: '_blank' %>
<p>Best</p> <p>Best</p>
</div> </div>
</div> </div>
</body> </body>
</html> </html>
app/views/apply_job/_form.html.erb
...@@ -40,4 +40,4 @@ ...@@ -40,4 +40,4 @@
</div> </div>
</div> </div>
<% end %> <% end %>
<hr> <hr>
\ No newline at end of file
app/views/apply_job/_ribbon.html.erb
<div class="ribbon"> <div class="ribbon">
<div class="row"> <div class="row">
<div class="col-lg-4 col-md-12"> <div class="col-lg-4 col-md-12">
<div class="ribbon_item active"> <div class="ribbon_item <%= attr_active_1 %>">
<span class="custom_badges active">1</span> <%= t('pages.apply.ribon_1') %> <span class="custom_badges <%= attr_active_1 %>">1</span> <%= t('pages.apply.ribon_1') %>
</div> </div>
</div> </div>
<div class="col-lg-4 col-md-12"> <div class="col-lg-4 col-md-12">
<div class="ribbon_item"> <div class="ribbon_item <%= attr_active_2 %>">
<span class="custom_badges">2</span> <%= t('pages.apply.ribon_2') %> <span class="custom_badges <%= attr_active_2 %>">2</span> <%= t('pages.apply.ribon_2') %>
</div> </div>
</div> </div>
<div class="col-lg-4 col-md-12"> <div class="col-lg-4 col-md-12">
<div class="ribbon_item"> <div class="ribbon_item <%= attr_active_3 %>">
<span class="custom_badges">3</span> <%= t('pages.apply.ribon_3') %> <span class="custom_badges <%= attr_active_3 %>">3</span> <%= t('pages.apply.ribon_3') %>
</div> </div>
</div> </div>
</div> </div>
<hr> <hr>
</div> </div>
\ No newline at end of file
app/views/apply_job/apply.html.erb
<div class="container"> <div class="container">
<div class="box_job_apply"> <div class="box_job_apply">
<%= render 'ribbon' %> <%= render 'ribbon', attr_active_1: 'active', attr_active_2: '', attr_active_3: '' %>
<div class="form_apply_job"> <div class="form_apply_job">
<span style="font-size:20px"> <%= t('apply_job.job')%>: </span><span style="font-size: 26px; color: red; font-weight:bold;"><%= @job.name %></span><br><br> <span style="font-size:20px"> <%= t('apply_job.job')%>: </span><span style="font-size: 26px; color: red; font-weight:bold;"><%= @job.name %></span><br><br>
<span class="span_second"><%= t('pages.apply.title_input_1') %></span><br> <span class="span_second"><%= t('pages.apply.title_input_1') %></span><br>
...@@ -9,4 +9,4 @@ ...@@ -9,4 +9,4 @@
</div> </div>
</div> </div>
</div> </div>
<div style="width: 100%; height: 25vh"></div> <div style="width: 100%; height: 25vh"></div>
\ No newline at end of file
app/views/apply_job/confirm.html.erb
<div class="container"> <div class="container">
<div class="box_job_apply"> <div class="box_job_apply">
<div class="ribbon"> <%= render 'ribbon', attr_active_1: 'active', attr_active_2: 'active', attr_active_3: '' %>
<div class="row">
<div class="col-lg-4 col-md-12">
<div class="ribbon_item active">
<span class="custom_badges active">1</span> <%= t('pages.apply.ribon_1') %>
</div>
</div>
<div class="col-lg-4 col-md-12">
<div class="ribbon_item active">
<span class="custom_badges active">2</span> <%= t('pages.apply.ribon_2') %>
</div>
</div>
<div class="col-lg-4 col-md-12">
<div class="ribbon_item">
<span class="custom_badges">3</span> <%= t('pages.apply.ribon_3') %>
</div>
</div>
</div>
<hr>
</div>
<div class="form_apply_job"> <div class="form_apply_job">
<span class="span_second"><%= t('apply_job.confirm') %></span> <span class="span_second"><%= t('apply_job.confirm') %></span>
<br><br> <br><br>
......
app/views/apply_job/done.html.erb
<% provide(:title, "#{t('apply_job.done')}") %> <% provide(:title, "#{t('apply_job.done')}") %>
<div class="container"> <div class="container">
<div class="box_job_apply"> <div class="box_job_apply">
<div class="ribbon"> <%= render 'ribbon', attr_active_1: 'active', attr_active_2: 'active', attr_active_3: 'active' %>
<div class="row">
<div class="col-lg-4 col-md-12">
<div class="ribbon_item active">
<span class="custom_badges active">1</span> <%= t('pages.apply.ribon_1') %>
</div>
</div>
<div class="col-lg-4 col-md-12">
<div class="ribbon_item active">
<span class="custom_badges active">2</span> <%= t('pages.apply.ribon_2') %>
</div>
</div>
<div class="col-lg-4 col-md-12">
<div class="ribbon_item active">
<span class="custom_badges active">3</span> <%= t('pages.apply.ribon_3') %>
</div>
</div>
</div>
<hr>
</div>
<span style="font-size: 22px;"><%= t('apply_job.thanks') %></span><hr> <span style="font-size: 22px;"><%= t('apply_job.thanks') %></span><hr>
<%= link_to t('apply_job.backtotop'), root_path, class: 'link_ct' %> <%= link_to t('apply_job.backtotop'), root_path, class: 'link_ct' %>
</div> </div>
</div> </div>
app/views/apply_job/index.html.erb
...@@ -28,4 +28,4 @@ ...@@ -28,4 +28,4 @@
</div> </div>
<% end %> <% end %>
</div> </div>
</div> </div>
\ No newline at end of file
app/views/devise/sessions/new.html.erb
...@@ -25,7 +25,9 @@ ...@@ -25,7 +25,9 @@
<%= f.label :password, t('devise.pass_word') %> <%= f.label :password, t('devise.pass_word') %>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<%= f.password_field :password, autocomplete: 'new-password', class: 'form-control' %> <%= f.password_field :password, autocomplete: 'new-password', class: 'form-control input_password' %>
<span class="icon_show_password"><i class="far fa-eye"></i></span>
<span class="icon_hide_password"><i class="far fa-eye-slash"></i></span>
</div> </div>
</div><br> </div><br>
<div class="row"> <div class="row">
......
app/views/job/detail.html.erb
...@@ -24,9 +24,13 @@ ...@@ -24,9 +24,13 @@
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<div class="btn_apply_job"> <div class="btn_apply_job">
<%= link_to_if(current_user.applied_jobs.find_by(job_id: @job.id).present?, t('apply_job.applied'), '#', class: 'btn btn-apply_job inactive') do <% if user_signed_in? %>
link_to t('pages.detail.btr_text_submit_cv'), apply_path(job_id: @job.id), class: 'btn btn-apply_job' <%= link_to_if(current_user.applied_jobs.find_by(job_id: @job.id).present?, t('apply_job.applied'), '#', class: 'btn btn-apply_job inactive') do
end %> link_to t('pages.detail.btr_text_submit_cv'), apply_path(job_id: @job.id), class: 'btn btn-apply_job'
end %>
<% else %>
<%= link_to t('pages.detail.btr_text_submit_cv'), apply_path(job_id: @job.id), class: 'btn btn-apply_job' %>
<% end %>
</div> </div>
</div> </div>
<div class="col-lg-12 col-md-12"> <div class="col-lg-12 col-md-12">
...@@ -82,9 +86,13 @@ ...@@ -82,9 +86,13 @@
<div class="row"> <div class="row">
<div class="col-lg-6 col-md-6"> <div class="col-lg-6 col-md-6">
<div class="btn_apply_job"> <div class="btn_apply_job">
<%= link_to_if(current_user.applied_jobs.find_by(job_id: @job.id), t('apply_job.applied'), '#', class: 'btn btn-apply_job inactive') do <% if user_signed_in? %>
link_to t('pages.detail.btr_text_submit_cv'), apply_path(job_id: @job.id), class: 'btn btn-apply_job' <%= link_to_if(current_user.applied_jobs.find_by(job_id: @job.id), t('apply_job.applied'), '#', class: 'btn btn-apply_job inactive') do
end %> link_to t('pages.detail.btr_text_submit_cv'), apply_path(job_id: @job.id), class: 'btn btn-apply_job'
end %>
<% else %>
<%= link_to t('pages.detail.btr_text_submit_cv'), apply_path(job_id: @job.id), class: 'btn btn-apply_job' %>
<% end %>
</div> </div>
</div> </div>
<div class="col-lg-6 col-md-6"> <div class="col-lg-6 col-md-6">
......
config/locales/en.yml
...@@ -130,4 +130,3 @@ en: ...@@ -130,4 +130,3 @@ en:
attributes: attributes:
applied_job: applied_job:
user_id: '' user_id: ''
config/routes.rb
...@@ -3,10 +3,9 @@ ...@@ -3,10 +3,9 @@
Rails.application.routes.draw do Rails.application.routes.draw do
get 'setting', to: 'users#set_lang', as: :set_lang get 'setting', to: 'users#set_lang', as: :set_lang
scope '(:locale)', locale: /en|vi/ do scope '(:locale)', locale: /en|vi/ do
devise_for :users, controllers: {registrations: 'registrations'} devise_for :users, controllers: { registrations: 'registrations' }
root 'home#index' root 'home#index'
get 'register/:code', to: 'users#confirm_sign_up', as: :confirm_sign_up get 'register/:code', to: 'users#confirm_sign_up', as: :confirm_sign_up
get 'industries', to: 'industry#index', as: :industry_index get 'industries', to: 'industry#index', as: :industry_index
get 'cities', to: 'city#index', as: :city_index get 'cities', to: 'city#index', as: :city_index
......
config/schedule.rb
...@@ -21,4 +21,4 @@ ...@@ -21,4 +21,4 @@
env :PATH, ENV['PATH'] env :PATH, ENV['PATH']
every 10.minute do every 10.minute do
rake 'crawler:populate' rake 'crawler:populate'
end end
\ No newline at end of file
test/decorators/applied_job_decorator_test.rb deleted 100644 → 0
require 'test_helper'
class AppliedJobDecoratorTest < Draper::TestCase
end
test/decorators/paginating_decorator_test.rb deleted 100644 → 0
require 'test_helper'
class PaginatingDecoratorTest < Draper::TestCase
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