From ffdb341b1e55364011174e06f26ee5f19f9f18fc Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Wed, 27 Sep 2023 06:42:26 -0500 Subject: [PATCH] Complete Lesson 33 Part 1 --- app/controllers/application_controller.rb | 10 ++++++++++ app/controllers/users_controller.rb | 2 ++ app/helpers/application_helper.rb | 3 --- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 09705d1..bf00341 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,12 @@ class ApplicationController < ActionController::Base + def current_user + @current_user ||= User.find(session[:user_id]) if session[:user_id] + end + helper_method :current_user + + def require_signin + unless current_user + redirect_to new_session_url, alert: "Please sign in first!" + end + end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index a73b63b..4a16916 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,4 +1,6 @@ class UsersController < ApplicationController + before_action :require_signin, except: [:new, :create] + def index @users = User.all end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 3778320..de6be79 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,5 +1,2 @@ module ApplicationHelper - def current_user - @current_user ||= User.find(session[:user_id]) if session[:user_id] - end end