change logic render collection

parent 76330296
Pipeline #1049 canceled with stages
in 0 seconds
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
.under-descrip { .under-descrip {
text-align: center; text-align: center;
} }
.apply-btn, .favorite-btn { .apply-btn, .favorite-btn, .let-favorite {
margin: 20px; margin: 20px;
padding: 20px; padding: 20px;
} }
......
...@@ -2,7 +2,7 @@ class FavoriteJobsController < ApplicationController ...@@ -2,7 +2,7 @@ class FavoriteJobsController < ApplicationController
before_action :sign_in_favorite_validation, only: %i[create destroy] before_action :sign_in_favorite_validation, only: %i[create destroy]
before_action :sign_in_validation, only: [:show] before_action :sign_in_validation, only: [:show]
def show def index
@count = current_user.favorite_jobs.count @count = current_user.favorite_jobs.count
@favorited_jobs = current_user.favorite_jobs.order_favorite.page(params[:page]).per(Job::LIMIT_PAGE) @favorited_jobs = current_user.favorite_jobs.order_favorite.page(params[:page]).per(Job::LIMIT_PAGE)
end end
......
<div class="job-id-<%= favorited_job.job.id %>"> <div class="job-id-<%= favorite_job.job.id %>">
<div class="border border-dark rounded"> <div class="border border-dark rounded">
<div class="row"> <div class="row">
<div class="radio-btn col-1"> <div class="radio-btn col-1">
<%= radio_button_tag :job_id, favorited_job.job.id %> <%= radio_button_tag :job_id, favorite_job.job.id %>
</div> </div>
<div class="job-details col-10"> <div class="job-details col-10">
<div class="title"> <div class="title">
<%= link_to job_detail_path(favorited_job.job.id) do %><strong> <%= link_to job_detail_path(favorite_job.job.id) do %><strong>
<%= favorited_job.job.title %></strong> <%= favorite_job.job.title %></strong>
<% end %> <% end %>
</div> </div>
<div class="row"> <div class="row">
<div class="introduction col-10"> <div class="introduction col-10">
<%= strip_tags(favorited_job.job.format_desc) %><br> <%= strip_tags(favorite_job.job.format_desc) %><br>
<%= link_to 'Read more..', job_detail_path(favorited_job.job.id) %> <%= link_to 'Read more..', job_detail_path(favorite_job.job.id) %>
</div> </div>
<div class="col-6"> <div class="col-6">
<%= favorited_job.job.cities.map(&:name).join(' | ') %> <%= favorite_job.job.cities.map(&:name).join(' | ') %>
</div> </div>
<div class="salary col-3"> <div class="salary col-3">
Salary: <%= favorited_job.job.salary %> Salary: <%= favorite_job.job.salary %>
</div> </div>
<%= link_to "Remove", unfavorite_job_path(job_id: favorited_job.job.id), method: :delete, remote: true, class: "btn btn-danger", id: "button-remove" %> <%= link_to "Remove", unfavorite_job_path(job_id: favorite_job.job.id), method: :delete, remote: true, class: "btn btn-danger", id: "button-remove" %>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<%= paginate @favorited_jobs, outer_window: 2, window: 1 %> <%= paginate @favorited_jobs, outer_window: 2, window: 1 %>
<div class="favorite-page"> <div class="favorite-page">
<%= form_tag apply_job_path(job_id: params[:job_id]), method: :get, enforce_utf8: false do %> <%= form_tag apply_job_path(job_id: params[:job_id]), method: :get, enforce_utf8: false do %>
<%= render partial: "favorite_jobs/my_favorite_jobs", collection: @favorited_jobs, as: :favorited_job %> <%= render partial: "favorite_jobs/favorite_job", collection: @favorited_jobs %>
<div class="row justify-content-center"> <div class="row justify-content-center">
<%= submit_tag 'Apply Job', name: nil, class: 'btn btn-lg btn-danger' %> <%= submit_tag 'Apply Job', name: nil, class: 'btn btn-lg btn-danger' %>
</div> </div>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<li><%= link_to "Log In", login_path , class: "nav-item nav-link" %></li> <li><%= link_to "Log In", login_path , class: "nav-item nav-link" %></li>
<li><%= link_to "Register", register_step1_path, class: "nav-item nav-link" %></li> <li><%= link_to "Register", register_step1_path, class: "nav-item nav-link" %></li>
<% end %> <% end %>
<li><%= link_to "Favorite", my_favorite_job_path, class: "nav-item nav-link" %></li> <li><%= link_to "Favorite", favorite_jobs_path, class: "nav-item nav-link" %></li>
<li><%= link_to "History", '#', class: "nav-item nav-link" %></li> <li><%= link_to "History", '#', class: "nav-item nav-link" %></li>
</ul> </ul>
</nav> </nav>
......
...@@ -35,7 +35,7 @@ Rails.application.routes.draw do ...@@ -35,7 +35,7 @@ Rails.application.routes.draw do
post 'favorite_job', to: 'favorite_jobs#create', as: :favorite_job post 'favorite_job', to: 'favorite_jobs#create', as: :favorite_job
delete 'unfavorite_job', to: 'favorite_jobs#destroy', as: :unfavorite_job delete 'unfavorite_job', to: 'favorite_jobs#destroy', as: :unfavorite_job
get 'favorite', to: 'favorite_jobs#show', as: :my_favorite_job get 'favorite', to: 'favorite_jobs#index', as: :favorite_jobs
resources :favorite_jobs, only: [:create, :destroy, :show] resources :favorite_jobs, only: [:create, :destroy, :show]
resources :job_applieds,only: [:new, :create] resources :job_applieds,only: [:new, :create]
......
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