Makes welcome screen work using a sessions controller
This commit is contained in:
11
app/controllers/users/sessions_controller.rb
Normal file
11
app/controllers/users/sessions_controller.rb
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
class Users::SessionsController < Devise::SessionsController
|
||||||
|
|
||||||
|
def after_sign_in_path_for(resource)
|
||||||
|
if resource.show_welcome_screen?
|
||||||
|
welcome_path
|
||||||
|
else
|
||||||
|
root_path
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
||||||
@@ -135,4 +135,8 @@ class User < ActiveRecord::Base
|
|||||||
!!(unconfirmed_email && unconfirmed_email !~ OMNIAUTH_EMAIL_REGEX)
|
!!(unconfirmed_email && unconfirmed_email !~ OMNIAUTH_EMAIL_REGEX)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def show_welcome_screen?
|
||||||
|
sign_in_count == 1 && unverified? && !organization
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
Rails.application.routes.draw do
|
Rails.application.routes.draw do
|
||||||
devise_for :users, controllers: {
|
devise_for :users, controllers: {
|
||||||
registrations: 'users/registrations',
|
registrations: 'users/registrations',
|
||||||
|
sessions: 'users/sessions',
|
||||||
omniauth_callbacks: 'users/omniauth_callbacks'
|
omniauth_callbacks: 'users/omniauth_callbacks'
|
||||||
}
|
}
|
||||||
devise_for :organizations, class_name: 'User',
|
devise_for :organizations, class_name: 'User',
|
||||||
@@ -27,6 +28,7 @@ Rails.application.routes.draw do
|
|||||||
root 'welcome#index'
|
root 'welcome#index'
|
||||||
get '/welcome', to: 'welcome#welcome'
|
get '/welcome', to: 'welcome#welcome'
|
||||||
|
|
||||||
|
|
||||||
resources :debates do
|
resources :debates do
|
||||||
member do
|
member do
|
||||||
post :vote
|
post :vote
|
||||||
|
|||||||
Reference in New Issue
Block a user