diff --git a/lib/dotcom_web/components/route_components.ex b/lib/dotcom_web/components/route_components.ex index 29ef589fae..9791425baf 100644 --- a/lib/dotcom_web/components/route_components.ex +++ b/lib/dotcom_web/components/route_components.ex @@ -72,6 +72,7 @@ defmodule DotcomWeb.RouteComponents do attr :route, Route, required: true attr :class, :string, default: "" attr :stop_pin?, :boolean, default: false + attr :stop_cancelled?, :boolean, default: false attr :variant, :string, default: "default", @@ -93,7 +94,10 @@ defmodule DotcomWeb.RouteComponents do
- <.lined_list_marker variant={@variant} route={@route} /> + <.lined_list_marker + variant={if(@stop_cancelled?, do: "blank", else: @variant)} + route={@route} + />
+
{render_slot(@inner_block)} @@ -109,7 +118,7 @@ defmodule DotcomWeb.RouteComponents do end attr :route, Route, required: true - attr :variant, :string, default: "default", values: ["default", "mode", "none"] + attr :variant, :string, default: "default", values: ["blank", "default", "mode", "none"] defp lined_list_marker(%{variant: "none"} = assigns) do ~H"" @@ -141,8 +150,10 @@ defmodule DotcomWeb.RouteComponents do
+ "size-3.5 rounded-full border-xs border-[#00000026]" + ]}> +
+
""" end end diff --git a/lib/dotcom_web/live/schedule_finder_live.ex b/lib/dotcom_web/live/schedule_finder_live.ex index dde71fdbb0..8b5baedddc 100644 --- a/lib/dotcom_web/live/schedule_finder_live.ex +++ b/lib/dotcom_web/live/schedule_finder_live.ex @@ -337,7 +337,7 @@ defmodule DotcomWeb.ScheduleFinderLive do alerts = current_alerts(stop, route) |> Enum.filter(fn %{informed_entity: %{direction_id: direction_id}} -> - direction in direction_id + Enum.any?([nil, direction], &(&1 in direction_id)) end) assign(socket, :alerts, alerts) @@ -922,16 +922,20 @@ defmodule DotcomWeb.ScheduleFinderLive do defp other_stop(assigns) do ~H""" - <.lined_list_item route={@route} class={@class} stop_pin?={@highlight}> -
+ <.lined_list_item + route={@route} + class={@class} + stop_pin?={@highlight} + stop_cancelled?={@other_stop.cancelled?} + > +
<.stop_label stop_name={@other_stop.stop_name} platform_name={@other_stop.platform_name} />
-
- <.trip_stop_time time={@other_stop.time} /> +
+
+ <.trip_stop_time time={@other_stop.time} /> +
+
{~t(Skipped)}
"""