Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Multiple fixes #167

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Multiple fixes #167

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c7db874
Update twitter logo
AlanSoto31 Sep 5, 2024
64d0523
Make the last session card sticky
AlanSoto31 Sep 5, 2024
cc9b4f2
Merge branch 'main' into update-twitter-logo
AlanSoto31 Sep 10, 2024
5d2e954
Revert make the last session card sticky
AlanSoto31 Sep 10, 2024
db89e6b
Add mb based on viewport height
AlanSoto31 Sep 10, 2024
eabb322
Merge branch 'main' into update-twitter-logo
LuigiR0jas Sep 10, 2024
4834058
Merge branch 'main' into update-twitter-logo
AlanSoto31 Sep 11, 2024
a4368c2
Merge branch 'main' into update-twitter-logo
AlanSoto31 Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions app/assets/images/twitter.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 6 additions & 2 deletions app/views/schedules/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@
<%= render partial: 'sessions/filters', locals: { resource: :schedule } %>
</div>

<div class="flex flex-col w-full h-full mb-[12rem]">
<div class="flex flex-col w-full h-full">
<% if @sessions.present? %>
<% previous_date = nil %>
<% @sessions.group_by(&:starts_at).each do |starts_at, sessions| %>
<% grouped_sessions = @sessions.group_by(&:starts_at) %>

<% grouped_sessions.each do |starts_at, sessions| %>
<%= content_tag(
:div,
class: [
Expand Down Expand Up @@ -41,11 +43,13 @@
session: session,
user_is_an_attendee: true,
id_prefix: "schedule",
last_session: grouped_sessions.keys.last == starts_at && sessions.last == session
}
) %>
<% 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>
Expand Down
15 changes: 11 additions & 4 deletions app/views/sessions/_card.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
<%# locals: (session:, user_is_an_attendee:, id_prefix: nil) %>
<%# locals: (session:, user_is_an_attendee:, id_prefix: nil, last_session: false) %>

<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>
<%= 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 %>

<%= render partial: "sessions/status", locals: { session: session } %>

Expand Down Expand Up @@ -73,4 +80,4 @@
<span class="font-sans text-sm text-grey-600"><%= session.location&.name %></span>
</div>
</div>
</div>
<% end %>
10 changes: 7 additions & 3 deletions app/views/sessions/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@
<%= render partial: 'sessions/filters', locals: { resource: :sessions } %>
</div>

<div class="flex flex-col w-full h-full mb-[12rem]">
<div class="flex flex-col w-full h-full">
<% if @sessions.present? %>
<% previous_date = nil %>
<% @sessions.group_by(&:starts_at).each do |starts_at, sessions| %>
<% grouped_sessions = @sessions.group_by(&:starts_at) %>

<% grouped_sessions.each do |starts_at, sessions| %>
<%= content_tag(
:div,
class: [
Expand All @@ -39,12 +41,14 @@
partial: 'sessions/card',
locals: {
session: session,
user_is_an_attendee: @user_session_ids&.include?(session.id)
user_is_an_attendee: @user_session_ids&.include?(session.id),
last_session: grouped_sessions.keys.last == starts_at && sessions.last == session
}
) %>
<% 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>
Expand Down