diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 09705d1..4c62843 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,9 @@ +# frozen_string_literal: true + class ApplicationController < ActionController::Base + before_action :require_login + + def require_login + redirect_to new_session_path unless helpers.logged_in? + end end diff --git a/app/controllers/email_confirmations_controller.rb b/app/controllers/email_confirmations_controller.rb index e0197a0..027b03c 100644 --- a/app/controllers/email_confirmations_controller.rb +++ b/app/controllers/email_confirmations_controller.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true class EmailConfirmationsController < ApplicationController + skip_before_action :require_login, only: [:confirm] def confirm @user = User.find_by(email: params[:email]) if params[:confirmation_string] == @user.email_confirmation_string diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index c433184..d79eebe 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class SessionsController < ApplicationController + skip_before_action :require_login, only: [:new, :create] + before_action :set_user, only: [:create] before_action :ensure_email_confirmed, only: [:create] diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index bccf5a5..aacaf16 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class UsersController < ApplicationController + skip_before_action :require_login, only: [:new, :create, :show] + before_action :set_user, only: [:edit, :update, :show] def new diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 224aad3..52ec406 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -13,12 +13,12 @@
<%= link_to root_path do %> -

Summon Player

+

<%= t("site_title") %>

<% end %>