thanhnd · @thanhnd · Thanh Hung Pham · thanhnd · Thanh Hung Pham · thanhnd
--- a/app/views/devise/mailer/email_changed.html.erb 0 → 100644
+++ b/app/views/devise/mailer/email_changed.html.erb 0 → 100644
+<p>Hello <%= @email %>!</p>
+
+<% if @resource.try(:unconfirmed_email?) %>
--- a/app/views/devise/mailer/reset_password_instructions.html.erb 0 → 100644
+++ b/app/views/devise/mailer/reset_password_instructions.html.erb 0 → 100644
+<p>Hello <%= @resource.email %>!</p>
+
+<p>Someone has requested a link to change your password. You can do this through the link below.</p>
+
+<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p>
+
+<p>If you didn't request this, please ignore this email.</p>
--- a/db/migrate/20200309014715_add_devise_to_users.rb 0 → 100644
+++ b/db/migrate/20200309014715_add_devise_to_users.rb 0 → 100644
+
+class AddDeviseToUsers < ActiveRecord::Migration[6.0]
+  def self.up
+    change_table :users do |t|
+      ## Database authenticatable
+      t.string :email,              null: false, default: ""
+      t.string :encrypted_password, null: false, default: ""
+
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+
+      ## Rememberable
+      t.datetime :remember_created_at
+
+      ## Trackable
--- a/db/migrate/20200309014715_add_devise_to_users.rb 0 → 100644
+++ b/db/migrate/20200309014715_add_devise_to_users.rb 0 → 100644
+# frozen_string_literal: true
+
+class AddDeviseToUsers < ActiveRecord::Migration[6.0]
+  def self.up
--- a/config/setting.yml
+++ b/config/setting.yml
 defaults: &defaults
+  cookies:
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
          </div>
        <div class="footer-copyright text-center">© 2020 Copyright: zigexn.vn</div>
      </footer>
+    </div>
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
      <div class="collapse navbar-collapse" id="main-navigation">
--- a/lib/solr.rb 0 → 100644
+++ b/lib/solr.rb 0 → 100644
+require 'rsolr'
+class Solr
+	attr_accessor :response, :solr
+	def initialize
+		# Direct connection
+		@solr = RSolr.connect :url => 'http://localhost:8983/solr/jobs/'
+		@response = nil
+	end
+
+	# send a request to /select
+	def query (cond)
--- a/app/controllers/jobs_controller.rb
+++ b/app/controllers/jobs_controller.rb
  def search
    return redirect_to root_path, alert: "Empty field!" if params[:search].blank?

-    @search_job = Job.includes(:city).where("job_name LIKE ?","%#{params[:search]}%")
-    @pagin_job = @search_job.page(params[:page]).per(Settings.page)
+    #@search_job = Job.includes(:city).where("job_name LIKE ?","%#{params[:search]}%")
+    #@pagin_job = @search_job.page(params[:page]).per(Settings.page)
+    
+    solr_rs = Solr.new
+    @search_job = solr_rs.query(params[:search])
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
 class ApplicationController < ActionController::Base
+  protect_from_forgery with: :exception
+
+  before_action :configure_permitted_parameters, if: :devise_controller?
+
+  protected
+
+  def configure_permitted_parameters
--- a/app/controllers/jobs_controller.rb
+++ b/app/controllers/jobs_controller.rb
  def search
    return redirect_to root_path, alert: "Empty field!" if params[:search].blank?

-    @search_job = Job.includes(:city).where("job_name LIKE ?","%#{params[:search]}%")
-    @pagin_job = @search_job.page(params[:page]).per(Settings.page)
+    #@search_job = Job.includes(:city).where("job_name LIKE ?","%#{params[:search]}%")
--- a/app/controllers/jobs_controller.rb
+++ b/app/controllers/jobs_controller.rb
  def search
    return redirect_to root_path, alert: "Empty field!" if params[:search].blank?

-    @search_job = Job.includes(:city).where("job_name LIKE ?","%#{params[:search]}%")
-    @pagin_job = @search_job.page(params[:page]).per(Settings.page)
+    #@search_job = Job.includes(:city).where("job_name LIKE ?","%#{params[:search]}%")
+    #@pagin_job = @search_job.page(params[:page]).per(Settings.page)
+    
+    solr_rs = Solr.new
+    @search_job = solr_rs.query(params[:search])
+    @pagin_job = @search_job
--- a/app/controllers/jobs_controller.rb
+++ b/app/controllers/jobs_controller.rb
  def search
    return redirect_to root_path, alert: "Empty field!" if params[:search].blank?

-    @search_job = Job.includes(:city).where("job_name LIKE ?","%#{params[:search]}%")
-    @pagin_job = @search_job.page(params[:page]).per(Settings.page)
+    #@search_job = Job.includes(:city).where("job_name LIKE ?","%#{params[:search]}%")
+    #@pagin_job = @search_job.page(params[:page]).per(Settings.page)
+    
+    solr_rs = Solr.new
+    @search_job = solr_rs.query(params[:search])
--- a/app/models/user.rb
+++ b/app/models/user.rb
 class User < ApplicationRecord
-   has_many :applied_jobs
--- a/app/views/jobs/_jobs.html.erb
+++ b/app/views/jobs/_jobs.html.erb
  <font color="red"><b><label > Job List:</label></b></font>
-  <%= paginate @pagin_job %>
--- a/app/views/devise/sessions/new.html.erb 0 → 100644
+++ b/app/views/devise/sessions/new.html.erb 0 → 100644
+<h2>Log in</h2>
+
+<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
+  <div class="field">
--- a/db/migrate/20200204084746_create_users.rb 100755 → 100644
+++ b/db/migrate/20200204084746_create_users.rb 100755 → 100644
 class CreateUsers < ActiveRecord::Migration[6.0]
  def change
    create_table :users do |t|
--- a/lib/solr.rb 0 → 100644
+++ b/lib/solr.rb 0 → 100644
+require 'rsolr'
--- a/lib/solr.rb 0 → 100644
+++ b/lib/solr.rb 0 → 100644
+require 'rsolr'
+class Solr
+	attr_accessor :response, :solr
+	def initialize
+		# Direct connection
+		@solr = RSolr.connect :url => 'http://localhost:8983/solr/jobs/'
+		@response = nil
+	end
+
+	# send a request to /select
+	def query (cond)
+		response = solr.get 'select', :params => {:q => "job_name:#{cond}"}