merge master to user_pages branch 2

config/routes.rb

 Rails.application.routes.draw do
 Rails.application.routes.draw do
+
   get 'jobs', to: 'jobs#index'
   get 'jobs', to: 'jobs#index'
   resources :cities, only: [:index]
   resources :cities, only: [:index]
   resources :industries, only: [:index]
   resources :industries, only: [:index]
+  
   devise_for :users
   devise_for :users
-
   as :user do
   as :user do
     get "signin" => "devise/sessions#new"
     get "signin" => "devise/sessions#new"
     post "signin" => "devise/sessions#create"
     post "signin" => "devise/sessions#create"
     delete "signout" => "devise/sessions#destroy"
     delete "signout" => "devise/sessions#destroy"
   end
   end
 
 
-  #get 'jobs', to: 'jobs#index'
   resources :jobs, only: [:index]
   resources :jobs, only: [:index]
   get 'detail/:id', to: 'jobs#show'
   get 'detail/:id', to: 'jobs#show'
   get 'jobs/search' => 'jobs#search', as: :job_search
   get 'jobs/search' => 'jobs#search', as: :job_search
   root 'top_page#index'
   root 'top_page#index'
+
   # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html
   # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html
   resources :top_page
   resources :top_page
 end
 end