diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb index 72bd4ff1..df991056 100644 --- a/app/controllers/auth/sessions_controller.rb +++ b/app/controllers/auth/sessions_controller.rb @@ -52,13 +52,7 @@ class Auth::SessionsController < Devise::SessionsController end def after_sign_in_path_for(resource) - last_url = stored_location_for(:user) - - if home_paths(resource).include?(last_url) - root_path - else - last_url || root_path - end + return '/home' end def after_sign_out_path_for(_resource_or_scope) diff --git a/app/javascript/gabsocial/components/logged_out_navigation_bar.js b/app/javascript/gabsocial/components/logged_out_navigation_bar.js index aa6ebf5c..909bfedf 100644 --- a/app/javascript/gabsocial/components/logged_out_navigation_bar.js +++ b/app/javascript/gabsocial/components/logged_out_navigation_bar.js @@ -50,7 +50,7 @@ export default class LoggedOutNavigationBar extends PureComponent { isOutline color='white' backgroundColor='none' - href='/auth/log_in' + href='/auth/sign_in' className={[_s.borderColorWhite, _s.mr5, _s.flexGrow1, _s.alignItemsCenter, _s.justifyContentCenter, _s.py7].join(' ')} >