fix/display sidebar when logged out

Author: LewisYoul

app/controllers/application_controller.rb

@@ -3,6 +3,7 @@ class ApplicationController < ActionController::Base
   serialization_scope :view_context
   before_action :configure_permitted_parameters, if: :devise_controller?
   before_action :set_toast_message, if: -> { params[:notice].present? || params[:alert].present? }
+  before_action :assign_users_for_connect, :set_modal_url
 
   UNAUTHORIZED = 'You do not have access to this page'.freeze
 
@@ -19,4 +20,20 @@ def configure_permitted_parameters
   def set_toast_message
     flash[:notice] = params[:notice] || params[:alert]
   end
+
+  def assign_users_for_connect
+    if user_signed_in?
+      @users_for_connect = User.where.not(id: current_user.following.pluck(:id) << current_user.id).limit(5)
+    else
+      @users_for_connect = User.limit(5)
+    end
+  end
+
+  def set_modal_url
+    @modal_url = if user_signed_in?
+      new_modals_snippet_path
+    else
+      sign_in_sign_up_modals_users_path
+    end
+  end
 end

app/controllers/modals_controller.rb

@@ -1,3 +1,5 @@
 class ModalsController < ApplicationController
+  skip_before_action :assign_users_for_connect
+
   layout 'modal'
 end

app/views/shared/_sidebar.html.erb

@@ -25,20 +25,19 @@
         <% end %>
       </div>
     </div>
-
+  <% end %>
     <div class="card--container card--container-padding" style="text-align: center;">
-      <%= link_to(new_modals_snippet_path, data: { controller: 'modal', action: 'modal#present', modal_url_value: new_modals_snippet_path }, class: 'sidebar--new-snippet') do %>
+      <%= link_to(@modal_url, data: { controller: 'modal', action: 'modal#present', modal_url_value: @modal_url }, class: 'sidebar--new-snippet') do %>
         <span>NEW SNIPPET</span>
       <% end %>
     </div>
 
-    <div class="card--container card--container-padding-horizontal" data-controller="list" data-list-url-value="<%= users_path(limit: 5) %>">
+    <div class="card--container card--container-padding" data-controller="list" data-list-url-value="<%= users_path(limit: 5) %>">
       <h3 class="text-center no-margin-top margin-bottom">Connect</h3>
       <div>
-        <% User.where.not(id: current_user.following.pluck(:id) << current_user.id). limit(3).each do |user| %>
+        <% @users_for_connect.each do |user| %>
           <%= render partial: 'users/connect', locals: { user: user } %>
         <% end %>
       </div>
     </div>
-  <% end %>
 </div>