Skip to content

feat(SF2.0/UpcomingDepartures): Show more trips for non-subway #2852

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

Merged
joshlarson merged 1 commit into from
Dec 30, 2025
Merged

feat(SF2.0/UpcomingDepartures): Show more trips for non-subway #2852

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 22 additions & 10 deletions lib/dotcom_web/live/schedule_finder_live.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,14 @@ defmodule DotcomWeb.ScheduleFinderLive do
vehicle_name={@vehicle_name}
/>
<.remaining_service
:if={departures = @departures.ok? && @departures.result}
route_type={@route.type}
:if={departures = @stop && @departures.ok? && @departures.result}
Copy link
Collaborator

@thecristen thecristen Dec 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was departures = @stop a mistake??

Copy link
Contributor Author

@joshlarson joshlarson Dec 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noooo - it's probably not the best way to do it, but I was assigning departures to that I could use it in end_of_service(departures).

end_of_service={end_of_service(departures)}
now={@now}
remaining_departures={@upcoming_departures |> Enum.drop(5)}
route={@route}
route_type={@route.type}
stop_id={@stop.id}
vehicle_name={@vehicle_name}
/>
</section>
<section>
Expand Down Expand Up @@ -591,22 +596,29 @@ defmodule DotcomWeb.ScheduleFinderLive do
"""
end

defp remaining_service(%{remaining_departures: []} = assigns), do: ~H""

defp remaining_service(assigns) do
~H"""
<details class="group">
<details class="group/remaining-service">
<summary class="flex bg-gray-lightest w-full py-3 cursor-pointer">
<span class="px-2 font-medium text-sm">More trips later today</span>
<span class="px-2 ml-auto font-medium text-sm text-brand-primary hover:underline group-open:hidden">
<span class="px-2 font-medium text-sm">
{Enum.count(@remaining_departures)} trips later today
</span>
<span class="px-2 ml-auto font-medium text-sm text-brand-primary hover:underline group-open/remaining-service:hidden">
Show
</span>
<span class="px-2 ml-auto font-medium text-sm text-brand-primary hover:underline hidden group-open:block">
<span class="px-2 ml-auto font-medium text-sm text-brand-primary hover:underline hidden group-open/remaining-service:block">
Hide
</span>
</summary>
<div class="flex gap-2 px-2 py-3 border-gray-lightest border-xs">
<.icon type="solid" name="person-digging" class="size-6" />
<span>This part's not quite ready yet!</span>
</div>
<.upcoming_departures_table
now={@now}
route={@route}
stop_id={@stop_id}
upcoming_departures={@remaining_departures}
vehicle_name={@vehicle_name}
/>
</details>
"""
end
Expand Down