Revert make the last session card sticky

TelosLabs · Sep 10, 2024 · 5d2e954 · 5d2e954
1 parent cc9b4f2
commit 5d2e954
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 22 deletions.
diff --git a/app/views/schedules/show.html.erb b/app/views/schedules/show.html.erb
@@ -10,12 +10,11 @@
       <%= render partial: 'sessions/filters', locals: { resource: :schedule } %>
     </div>
 
-    <div class="flex flex-col w-full h-full">
+    <div class="flex flex-col w-full h-full mb-[12rem]">
       <% if @sessions.present? %>
         <% previous_date = nil %>
-        <% grouped_sessions = @sessions.group_by(&:starts_at) %>
 
-        <% grouped_sessions.each do |starts_at, sessions| %>
+        <% @sessions.group_by(&:starts_at).each do |starts_at, sessions| %>
           <%= content_tag(
                 :div,
                 class: [
@@ -42,14 +41,12 @@
                   locals: {
                     session: session,
                     user_is_an_attendee: true,
-                    id_prefix: "schedule",
-                    last_session: grouped_sessions.keys.last == starts_at && sessions.last == session
+                    id_prefix: "schedule"
                   }
                 ) %>
           <% end %>
           <% previous_date = starts_at.to_date %>
         <% end %>
-      <div class="mb-[17rem]"></div>
       <% elsif params[:starts_at].present? || session_filter_params.present? %>
         <div class="flex flex-col items-center justify-center w-full h-full">
           <p class="max-w-xs mb-4 font-bold text-center">No sessions match your current filters</p>

diff --git a/app/views/sessions/_card.html.erb b/app/views/sessions/_card.html.erb
@@ -1,14 +1,7 @@
 <%# locals: (session:, user_is_an_attendee:, id_prefix: nil, last_session: false) %>
 
-<%= content_tag(
-  :div,
-  id: dom_id(session, id_prefix),
-  class: [
-    "relative flex flex-col w-full p-5 mb-4 bg-white rounded-[20px]",
-     "sticky top-[329px]": last_session && session_filter_params.present?,
-     "sticky top-[296px]": last_session && session_filter_params.blank?
-  ]
-) do %>
+<div class="relative flex flex-col w-full p-5 mb-4 bg-white rounded-[20px]" id="<%= dom_id(session, id_prefix) %>">
+  <a href="<%= session_path(session) %>" class="absolute top-0 bottom-0 left-0 right-0 z-0"></a>
 
   <%= render partial: "sessions/status", locals: { session: session } %>
 
@@ -80,4 +73,5 @@
       <span class="font-sans text-sm text-grey-600"><%= session.location&.name %></span>
     </div>
   </div>
-<% end %>
+</div>
+
diff --git a/app/views/sessions/index.html.erb b/app/views/sessions/index.html.erb
@@ -10,12 +10,11 @@
       <%= render partial: 'sessions/filters', locals: { resource: :sessions } %>
     </div>
 
-    <div class="flex flex-col w-full h-full">
+    <div class="flex flex-col w-full h-full mb-[12rem]">
       <% if @sessions.present? %>
         <% previous_date = nil %>
-        <% grouped_sessions = @sessions.group_by(&:starts_at) %>
 
-        <% grouped_sessions.each do |starts_at, sessions| %>
+        <% @sessions.group_by(&:starts_at).each do |starts_at, sessions| %>
           <%= content_tag(
                 :div,
                 class: [
@@ -41,14 +40,12 @@
                   partial: 'sessions/card',
                   locals: {
                     session: session,
-                    user_is_an_attendee: @user_session_ids&.include?(session.id),
-                    last_session: grouped_sessions.keys.last == starts_at && sessions.last == session
+                    user_is_an_attendee: @user_session_ids&.include?(session.id)
                   }
                 ) %>
           <% end %>
           <% previous_date = starts_at.to_date %>
         <% end %>
-      <div class="mb-[17rem]"></div>
       <% elsif params[:starts_at].present? || session_filter_params.present? %>
         <div class="flex flex-col items-center justify-center w-full h-full">
           <p class="max-w-xs mb-4 font-bold text-center">No sessions match your current filters</p>