Merge branch 'favorite-history' into 'master'

favorite-history funtion

See merge request !10

Gemfile

@@ -14,6 +14,7 @@ gem 'babosa'
 gem 'active_storage_validations'
 gem 'mini_magick', '>= 4.9.5'
 gem 'devise'
+
 # Use sqlite3 as the database for Active Record
 gem 'mysql2', '~> 0.5.3'
 # Use Puma as the app server
@@ -52,6 +53,7 @@ group :development do
   gem 'listen', '~> 3.3'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
+  gem 'bullet'
 end
 
 group :test do

Gemfile.lock

@@ -76,6 +76,9 @@ GEM
       popper_js (>= 2.9.2, < 3)
       sassc-rails (>= 2.0.0)
     builder (3.2.4)
+    bullet (6.1.5)
+      activesupport (>= 3.0.0)
+      uniform_notifier (~> 1.11)
     byebug (11.1.3)
     capybara (3.35.3)
       addressable
@@ -221,6 +224,7 @@ GEM
     turbolinks-source (5.2.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
+    uniform_notifier (1.14.2)
     warden (1.2.9)
       rack (>= 2.0.9)
     web-console (4.1.0)
@@ -254,6 +258,7 @@ DEPENDENCIES
   babosa
   bootsnap (>= 1.4.4)
   bootstrap (~> 5.0.1)
+  bullet
   byebug
   capybara (>= 3.26)
   devise

app/controllers/apply_jobs_controller.rb

@@ -60,6 +60,6 @@ class ApplyJobsController < ApplicationController
   private
 
   def apply_params
-    params.require(:apply_job).permit(:name, :email, :cv, :job_id, :id)
+    params.require(:apply_job).permit(:name, :email, :cv, :job_id)
   end
 end
\ No newline at end of file

app/controllers/favorite_jobs_controller.rb

+class FavoriteJobsController < ApplicationController
+  include ApplicationHelper
+
+  before_action :check_params_job, only: %i[update destroy]
+  def index
+    @favorites = favorite_query.order_favorite(current_user).page(params[:page])
+  end
+
+  def update
+    favorite = favorite_query.find_favorite(job_params, current_user)
+    if favorite.nil?
+      FavoriteJob.create(job: @job, user: current_user)
+    else
+      favorite.destroy
+    end
+    respond_to do |format|
+      format.html { redirect_to new_user_session_path, alert: 'You need to sign in or sign up before continuing.' }
+      format.js {}
+    end
+  end
+
+  def destroy
+    @favorite = favorite_query.find_favorite(job_params, current_user).destroy
+    redirect_to favorite_url
+    flash[:success] = "#{@favorite.job.title} was completed and destroyed."
+  end
+
+  private
+
+  def job_params
+    params.permit(:job_id)
+  end
+
+  def favorite_query
+    @favorite_query ||= FavoriteQuery.new
+  end
+
+  def check_params_job
+    @job = Job.find_by(id: params[:job_id]) or not_found
+  end
+end

app/controllers/history_jobs_controller.rb

+class HistoryJobsController < ApplicationController
+  def index
+    @histories = history_query.order_history(current_user)
+  end
+
+  private
+
+  def history_query
+    @history_query ||= HistoryQuery.new
+  end
+end

app/controllers/jobs_controller.rb

 class JobsController < ApplicationController
+  include ApplicationHelper
+
+  after_action :history_action, only: [:show]
   def index
     if params[:city_slug].present?
       city = City.find_by(slug: params[:city_slug])
@@ -8,12 +11,33 @@ class JobsController < ApplicationController
       industry = Industry.find_by(slug: params[:industry_slug])
       jobs = industry.jobs
       @result = industry.name
+
     end
     @total = jobs.count
     @jobs = jobs.latest_jobs.page(params[:page])
   end
 
   def show
-    @job = Job.latest_jobs.find_by(slug: params[:job_slug])
+    @job = Job.find_by(slug: params[:job_slug]) or not_found
+  end
+
+  private
+
+  def history_action
+    history = history_query.find_history(job_params, current_user)
+    if history.nil?
+      HistoryJob.create(job: Job.find(params[:job_slug]), user: current_user)
+    else
+      history.touch(:updated_at)
+    end
+    HistoryJob.first.destroy if HistoryJob.count > HistoryJob::LIMIT_HISTORY
+  end
+
+  def job_params
+    params.permit(:job_slug)
+  end
+
+  def history_query
+    @history_query ||= HistoryQuery.new
   end
-end
\ No newline at end of file
+end

app/helpers/application_helper.rb

@@ -24,4 +24,8 @@ module ApplicationHelper
   def render_404
     render file: "#{Rails.root}/public/404.html", status: :not_found
   end
+
+  def favorite_text(job)
+    FavoriteJob.find_by(job: job, user: current_user).present? ? 'Unfavorite' : 'Favorite'
+  end
 end

app/javascript/packs/application.js

@@ -3,11 +3,17 @@
 // a relevant structure within app/javascript and only use these pack files to reference
 // that code so it'll be compiled.
 
-import Rails from "@rails/ujs"
-import Turbolinks from "turbolinks"
-import * as ActiveStorage from "@rails/activestorage"
-import "channels"
+// import Rails from "@rails/ujs"
+// import Turbolinks from "turbolinks"
+// import * as ActiveStorage from "@rails/activestorage"
+// import "channels"
 
-Rails.start()
-Turbolinks.start()
-ActiveStorage.start()
+// Rails.start()
+// Turbolinks.start()
+// ActiveStorage.start()
+
+require("@rails/ujs").start()
+require("turbolinks").start()
+require("@rails/activestorage").start()
+require("channels")
+require("jquery")

app/models/history_job.rb

 class HistoryJob < ApplicationRecord
   belongs_to :user
   belongs_to :job
+  LIMIT_HISTORY = 20
 end

app/queries/favorite_query.rb

+class FavoriteQuery
+  def initialize(favorites = FavoriteJob)
+    @favorites = favorites.includes(job: %i[cities cities_jobs])
+  end
+
+  def find_favorite(params, current_user)
+    @favorites.find_by(job: Job.find(params[:job_id]), user: current_user)
+  end
+
+  def find_favorite_slug(params, current_user)
+    @favorites.find_by(job: Job.find(params[:job_slug]), user: current_user)
+  end
+
+  def order_favorite(current_user)
+    @favorites.where(user: current_user).order('favorite_jobs.created_at DESC')
+  end
+end
\ No newline at end of file

app/queries/history_query.rb

+class HistoryQuery
+  def initialize(histories = HistoryJob)
+    @histories = histories.includes(job: %i[cities cities_jobs])
+  end
+
+  def order_history(current_user)
+    @histories.where(user: current_user).order('history_jobs.updated_at DESC')
+  end
+
+  def find_history(params, current_user)
+    @histories.find_by(job: Job.find(params[:job_slug]), user: current_user)
+  end
+end
\ No newline at end of file

app/views/apply_jobs/confirm.html.slim

@@ -17,7 +17,6 @@ h2.text-center
     p.my-1
       = f.label :cv, "Your CV" 
       br
-      = f.hidden_field :id, value: @blob.id
       = @apply_job.cv.filename
     .span.p-3.text-center
       = link_to "Back", apply_path(job_id: @apply_job.job_id), class: "btn btn-primary btn-space"

app/views/favorite_jobs/_favorite.slim

+= link_to favorite_text(job), favorite_update_path(job_id: job.id), id: "favorite-#{job.id}", remote: user_signed_in?, class: "btn btn-outline-primary btn-lg"
\ No newline at end of file

app/views/favorite_jobs/index.html.slim

+- provide :title, 'Favorite jobs'
+
+h3.p-3.text-center
+  | Favorite Jobs
+.d-flex.justify-content-center
+  = paginate @favorites, window: 1
+= form_with(url: apply_path, method: :get) do |f|
+  - @favorites.each do |favorite|
+    .row.bg-white
+      .col-1.p-3.card-body.text-dark.text-center.align-self-center
+        = f.radio_button :job_id, favorite.job.id, required: true, class: "form-check-input mt-0"
+      .col-9.p-3.align-self-center
+        h5.mb-1
+          = link_to favorite.job.title, detail_path(favorite.job.slug)
+        p.mb-1
+          i.fas.fa-dollar-sign.m-1
+          | Lương: 
+          = favorite.job.salary
+        p.mb-1
+          i.fas.fa-map-marker-alt.m-1
+          = favorite.job.cities.map(&:name).uniq.join(' | ')
+        p.mb-1
+          = truncate(favorite.job.overview, length: 250)
+      .col-2.p-3.text-center.align-self-center
+        = link_to "Remove", unfavorite_path(job_id: favorite.job.id), method: :delete, data: { confirm: 'Are you sure?' }, class: "btn btn-outline-primary"
+  -if @favorites.any?
+    .d-flex.justify-content-center.p-2
+      = page_entries_info @favorites
+    .d-flex.justify-content-center
+      = paginate @favorites, window: 1
+    .span.p-3.text-center
+      = f.submit "Apply job", class: "btn btn-primary btn-lg"
+  -else
+    h4.text-center
+      | You haven't favorite jobs

app/views/favorite_jobs/update.js.slim

+| $("#favorite-#{@job.id}").text("
+= favorite_text(@job)
+| ");
\ No newline at end of file

app/views/history_jobs/index.html.slim

+- provide :title, 'History jobs'
+
+h3.p-3.text-center
+  | History Jobs
+= form_with(url: apply_path, method: :get) do |f|
+  - @histories.each do |history|
+    .row.bg-white
+      .col-1.p-3.card-body.text-dark.text-center.align-self-center
+        = f.radio_button :job_id, history.job.id, required: true, class: "form-check-input mt-0"
+      .col-11.p-3.align-self-center
+        h5.mb-1
+          = link_to history.job.title, detail_path(history.job.slug)
+        p.mb-1
+          i.fas.fa-dollar-sign.m-1
+          | Lương: 
+          = history.job.salary
+        p.mb-1
+          i.fas.fa-map-marker-alt.m-1
+          = history.job.cities.map(&:name).uniq.join(' | ')
+        p.mb-1
+          = truncate(history.job.overview, length: 250)
+  -if @histories.any?
+    .span.p-3.text-center
+      = f.submit "Apply job", class: "btn btn-primary btn-lg"
+  -else
+    h4.text-center
+      | You haven't history jobs
\ No newline at end of file

app/views/jobs/index.html.slim

@@ -13,7 +13,7 @@
   .job-list
     - @jobs.each do |job| 
       .row.bg-white
-        .col-10.p-3.border.card-body.text-dark
+        .col-10.p-3.card-body.text-dark
           h5.mb-1
             = link_to job.title, detail_path(job.slug)
           p.mb-1
@@ -27,9 +27,9 @@
             = link_to job.cities.map(&:name).uniq.join(' | '), "#"
           p.mb-1
             = truncate(job.overview, length: 250)
-        .col-sm-2.p-3.border.favourite
-          = link_to "Farourite", "#", class: "btn btn-outline-primary"
-  h6.offset-md-4.px-5
+        .col-sm-2.p-3.favourite
+          = render partial: "favorite_jobs/favorite", locals: { job: job }
+  h6.offset-md-4.px
     = page_entries_info @jobs
   h6.offset-md-4
     = paginate @jobs, window: 1
\ No newline at end of file

app/views/jobs/show.html.slim

@@ -50,7 +50,5 @@
 .row.bg-white.p-4
   .col.text-end
     = link_to "Apply this Job", apply_path(job_id: @job.id), class: "btn btn-outline-primary btn-lg"
-  .col
-    = link_to "Favourite", "#", class: "btn btn-outline-primary btn-lg"
-
-  
\ No newline at end of file
+  .col.text-start 
+    = render partial: "favorite_jobs/favorite", locals: { job: @job }

app/views/layouts/_header.html.slim

@@ -8,9 +8,9 @@ header
             li
               = link_to "Profile", my_path
             li
-              = link_to "Favourite",'#'
+              = link_to "Favorite", favorite_path
             li
-              = link_to "History", '#'
+              = link_to "History", history_path
             li
               = link_to('Logout', destroy_user_session_path, method: :delete)
           - else

app/views/users/confirmations/new.html.slim

+- provide :title, 'Reconfirm Email'
+
 .row.p-3
   .col-md-6.offset-md-3.form-apply
     = form_for(resource, as: resource_name) do |f|

app/views/users/passwords/edit.html.slim

+- provide :title, 'Reset Password'
+
 h2.p-3.text-center
   | Change your password
 .row

app/views/users/passwords/new.html.slim

+- provide :title, 'Reset Password'
+
 h2.p-3.text-center
   | Forgot your password
 .row

app/views/users/registrations/edit.html.slim

+- provide :title, 'Edit User'
+
 h2.p-3.text-center
   | Edit My Page
 .row

app/views/users/registrations/new.html.slim

+- provide :title, 'Register'
+
 h2.p-3.text-center
   | Register
 .row

app/views/users/registrations/show.html.slim

+- provide :title, 'Rgister'
+
 h5.p-5.fw-normal.border.bg-white
   | Thank you for register our service, an confirmation email with registration link
       has been sent to your email. Please check your email within 24 hours.

app/views/users/sessions/new.html.slim

+- provide :title, 'Login'
+
 h2.p-3.text-center
   | Log in
 .row

app/views/users/show.html.slim

+- provide :title, 'Profile User'
+
 h2.p-3.text-center
   | My Page
 .row
   .col-md-6.offset-md-3.form-apply
-    = form_with(scope: @user, local:true) do |f|
+    = form_with(scope: :user, local:true) do |f|
       .card
         .card-body
           .field
             = f.label :email
             br
-            = f.email_field :email, disabled: true, class: 'form-control'
+            = f.email_field :email, readonly: true, class: 'form-control'
           .field
             = f.label :name, "Full Name"
             br
-            = f.text_field :name, disabled: true, class: 'form-control'
+            = f.text_field :name, readonly: true, class: 'form-control'
           .field
             -if @user.cv.attached?
               = f.label :cv, "CV" 

config/environments/development.rb

@@ -84,4 +84,11 @@ Rails.application.configure do
 
   # Uncomment if you wish to allow Action Cable access from any origin.
   # config.action_cable.disable_request_forgery_protection = true
+
+  config.after_initialize do
+    Bullet.enable = true
+    Bullet.bullet_logger = true
+    Bullet.raise = true # raise an error if n+1 query occurs
+    Bullet.unused_eager_loading_enable = false
+  end
 end

config/routes.rb

@@ -8,6 +8,10 @@ Rails.application.routes.draw do
   get 'apply', to: 'apply_jobs#new'
   post 'confirm', to: 'apply_jobs#confirm'
   post 'done', to: 'apply_jobs#done'
+  get 'job_favorite', to: 'favorite_jobs#update', as: 'favorite_update'
+  get 'favorite', to: 'favorite_jobs#index', as: 'favorite'
+  delete 'unfavorite', to: 'favorite_jobs#destroy'
+  get 'history', to: 'history_jobs#index', as: 'history'
   devise_for :users, skip: %i[sessions registrations passwords], controllers: { confirmations: 'users/confirmations' }
   get '/my', to: 'users#show'
   devise_scope :user do

config/webpack/environment.js

 const { environment } = require('@rails/webpacker')
-
+const webpack = require('webpack')
+environment.plugins.prepend('Provide',
+  new webpack.ProvidePlugin({
+    $: 'jquery/src/jquery',
+    jQuery: 'jquery/src/jquery'
+  })
+)
 module.exports = environment

package.json

 {
   "name": "ve-njob",
+  "license": "MIT",
   "private": true,
   "dependencies": {
     "@rails/actioncable": "^6.0.0",
@@ -7,12 +8,14 @@
     "@rails/ujs": "^6.0.0",
     "@rails/webpacker": "5.4.0",
     "bootstrap": "^5.0.2",
+    "jquery": "^3.6.0",
     "turbolinks": "^5.2.0",
     "webpack": "^4.46.0",
     "webpack-cli": "^3.3.12"
   },
   "version": "0.1.0",
   "devDependencies": {
-    "webpack-dev-server": "^3.11.2"
+    "@webpack-cli/serve": "^1.5.2",
+    "webpack-dev-server": "^4.0.0"
   }
 }