Merge pull request #126 from yasmine-glitch/anyone-access-index

anyone can see the index, no need to log in ;)
yasmine-glitch · Jan 17, 2022 · b5e9d06 · b5e9d06
2 parents 35a8b39 + c7ff163
commit b5e9d06
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
@@ -1,8 +1,8 @@
 class ActivitiesController < ApplicationController
   def index
     @activities = policy_scope(Activity).order(start_date: :asc)
-    @user_hobbies = current_user.hobby_list
     params[:categories] ||= []
+    @user_hobbies = current_user.present? ? current_user.hobby_list : params[:categories]
 
     ## RETURN THE RESULTS FROM THE HOMEPAGE SEARCH
 

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,5 +1,6 @@
 class ApplicationController < ActionController::Base
   before_action :authenticate_user!
+  skip_before_action :authenticate_user!, only: :index
   before_action :configure_permitted_parameters, if: :devise_controller?
   include Pundit