Fix order of members on landing page

Move filter to lower location, following UX on job page

Author: constantine-nikolaou

app/controllers/directory/users_controller.rb

@@ -8,6 +8,8 @@ def index
       @members = User.open_profile
     end
 
+    @members = @members.order(:first_name, :last_name)
+
     if (user_params.has_key?(:name) && safe_param)
       search_letter = "^[" + user_params[:name].downcase + "].*"
       @users = @members.where("lower(first_name) ~ ?", search_letter).order(:first_name, :last_name).page(params[:page])

app/views/directory/users/index.html.erb

@@ -21,33 +21,6 @@
             <% end %>
 
             <%= directory_letters(params[:name]) %>
-
-            <div>
-              <h4 class="filter-title">Filter all members by</h4>
-              <%= link_to(directory_users_path(state: 'new_role')) do %>
-                <%= content_tag(:button, class: display_button_filter_class(params, 'new_role')) do %>
-                  Looking for a new role
-                <% end %>
-              <% end %>
-
-              <%= link_to(directory_users_path(state: 'freelance')) do %>
-                <%= content_tag(:button, class: display_button_filter_class(params, 'freelance')) do %>
-                  Available for freelance
-                <% end %>
-              <% end %>
-
-              <%= link_to(directory_users_path(state: 'mentor')) do %>
-                <%= content_tag(:button, class: display_button_filter_class(params, 'mentor')) do %>
-                  Available to mentor
-                <% end %>
-              <% end %>
-
-              <%= link_to(directory_users_path(state: 'mentee')) do %>
-                <%= content_tag(:button, class: display_button_filter_class(params, 'mentee')) do %>
-                  Looking for a mentor
-                <% end %>
-              <% end %>
-            </div>
           </div>
         </div>
 			</div>
@@ -56,8 +29,6 @@
 
 </section><!-- #page-title end -->
 
-<%= content_for :flash %>
-
 <!-- Content
 ============================================= -->
 <section id="content">
@@ -66,6 +37,35 @@
 
     <div class="container clearfix">
 
+      <div>
+        <span>Filter members by</span> &nbsp;
+
+        <%= link_to(directory_users_path(state: 'new_role')) do %>
+          <%= content_tag(:button, class: display_button_filter_class(params, 'new_role')) do %>
+            Looking for a new role
+          <% end %>
+        <% end %>
+
+        <%= link_to(directory_users_path(state: 'freelance')) do %>
+          <%= content_tag(:button, class: display_button_filter_class(params, 'freelance')) do %>
+            Available for freelance
+          <% end %>
+        <% end %>
+
+        <%= link_to(directory_users_path(state: 'mentor')) do %>
+          <%= content_tag(:button, class: display_button_filter_class(params, 'mentor')) do %>
+            Available to mentor
+          <% end %>
+        <% end %>
+
+        <%= link_to(directory_users_path(state: 'mentee')) do %>
+          <%= content_tag(:button, class: display_button_filter_class(params, 'mentee')) do %>
+            Looking for a mentor
+          <% end %>
+        <% end %>
+      </div>
+      <br/>
+
       <% if @users.blank? %>
 
         <div class="alert alert-info alert-dismissible" role="alert">
@@ -74,6 +74,7 @@
         </div>
 
       <% else %>
+
         <%= render(partial: "list_profiles", locals: {users: @users}) %>
 
         <div class="text-center">

app/views/jobs/index.html.erb

@@ -19,8 +19,6 @@
 
 </section><!-- #page-title end -->
 
-<%= render("shared/flash") %>
-
 <!-- Content
 ============================================= -->
 <section id="content">

spec/requests/directory_spec.rb

@@ -52,7 +52,7 @@
         expect(page).to have_content('Available for freelance')
       end
 
-      it "should be able to filter based on interest#freelanc" do
+      it "should be able to filter based on interest#freelance" do
         visit(directory_users_path(state: 'freelance'))
 
         expect(page).not_to have_content(user_1.name)