feature/Assign users for connect in before_action

Author: LewisYoul

app/controllers/alerts_controller.rb

@@ -1,3 +1,4 @@
 class AlertsController < ApplicationController
+  skip_before_action :assign_users_for_connect
   layout 'alert'
 end

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
 
   UNAUTHORIZED = 'You do not have access to this page'.freeze
 
@@ -27,4 +28,14 @@ def set_modal_url
       sign_in_sign_up_modals_users_path
     end
   end
+
+  def assign_users_for_connect
+    user_base = User
+    
+    if user_signed_in?
+      user_base = user_base.not_followed_by(current_user)
+    end
+
+    @users_for_connect = user_base.order(Arel.sql('RANDOM()')).limit(3)
+  end
 end

app/controllers/modals_controller.rb

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

app/views/layouts/application.html.erb

@@ -89,23 +89,7 @@
                 %>
               <% end %>
 
-              <%= render 'shared/cards/card_no_padding' do %>
-                <h4 class="text-center pt-2">
-                  <%= link_to 'Connect', connect_path, title: 'Search for people to connect with' %>
-                </h4>
-
-                <ul class="divide-y divide-gray-200" data-infinite-scroll-window-target="entries" data-action="scroll@window->infinite-scroll-window#scroll">
-                  <% if user_signed_in? %>
-                    <% User.not_followed_by(current_user).order(Arel.sql('RANDOM()')).limit(3).each do |user| %>
-                      <%= render partial: 'users/connect', locals: { user: user }%>
-                    <% end %>
-                  <% else %>
-                      <% User.order(Arel.sql('RANDOM()')).limit(3).each do |user| %>
-                        <%= render partial: 'users/connect', locals: { user: user }%>
-                      <% end %>
-                  <% end %>
-                </ul>
-              <% end %>
+              <%= render partial: 'shared/connect' %>
 
               <%# <%= render 'shared/cards/card' do %>
                 <%# <h4 class="text-center">Popular</h4> %>

app/views/shared/_connect.html.erb

@@ -1,11 +1,13 @@
-<% if users_for_connect && users_for_connect.any? %>
-  <div class="card--container card--container-padding-horizontal margin-top" data-controller="list" data-list-url-value="<%= users_path(limit: 5) %>">
-    <h3 class="text-center no-margin-top margin-bottom">Connect</h3>
-    <% users_for_connect.each do |user| %>
-      <%= render partial: 'users/connect', locals: { user: user } %>
-    <% end %>
-    <div class="flex flex-end margin-top">
-      <%= link_to 'More...', connect_path, class: 'padding-right light' %>
-    </div>
-  </div>
+<% if @users_for_connect.any? %>
+  <%= render 'shared/cards/card_no_padding' do %>
+    <h4 class="text-center pt-2">
+      <%= link_to 'Connect', connect_path, title: 'Search for people to connect with' %>
+    </h4>
+
+    <ul class="divide-y divide-gray-200" data-infinite-scroll-window-target="entries" data-action="scroll@window->infinite-scroll-window#scroll">
+      <% @users_for_connect.each do |user| %>
+        <%= render partial: 'users/connect', locals: { user: user }%>
+      <% end %>
+    </ul>
+  <% end %>
 <% end %>