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

ui(TripPlanner): Fix margins, paddings, and borders for results panel #2276

Merged
merged 2 commits into from
Dec 19, 2024
Merged

ui(TripPlanner): Fix margins, paddings, and borders for results panel #2276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d49b6d1
ui(TripPlanner): Fix margins, paddings, and borders for results panel
joshlarson Dec 18, 2024
532cd90
ui: Increase trip-planner map size on desktop
joshlarson Dec 18, 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
61 changes: 30 additions & 31 deletions lib/dotcom_web/components/trip_planner/results.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@ defmodule DotcomWeb.Components.TripPlanner.Results do
~H"""
<section class={[
"w-full",
"border border-solid border-slate-400",
@class
]}>
<div
:if={Enum.count(@results.itinerary_groups) > 0 && @results.itinerary_group_selection}
class="h-min w-full p-4"
class="h-min w-full mb-3.5"
Copy link
Collaborator

Choose a reason for hiding this comment

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

we have a 3.5?!?1

>
<button type="button" phx-click="reset_itinerary_group" class="btn-link">
<span class="flex flex-row items-center">
Expand All @@ -26,7 +25,7 @@ defmodule DotcomWeb.Components.TripPlanner.Results do
</span>
</button>
</div>
<div :if={Enum.count(@results.itinerary_groups) > 0} class="w-full p-4 row-start-2 col-start-1">
<div :if={Enum.count(@results.itinerary_groups) > 0} class="w-full">
<.itinerary_panel results={@results} />
</div>
</section>
Expand All @@ -35,32 +34,34 @@ defmodule DotcomWeb.Components.TripPlanner.Results do

defp itinerary_panel(%{results: %{itinerary_group_selection: nil}} = assigns) do
~H"""
<div
:for={{%{summary: summary}, index} <- Enum.with_index(@results.itinerary_groups)}
class="border border-solid m-4 p-4"
>
<div class="flex flex-col gap-4">
<div
:if={summary.tag}
class="whitespace-nowrap leading-none font-bold font-heading text-sm uppercase bg-brand-primary-darkest text-white px-3 py-2 mb-3 -ml-4 -mt-4 rounded-br-lg w-min"
:for={{%{summary: summary}, index} <- Enum.with_index(@results.itinerary_groups)}
class="border border-solid border-gray-lighter p-4"
>
{summary.tag}
</div>
<.itinerary_summary summary={summary} />
<div class="flex justify-end items-center">
<div :if={Enum.count(summary.next_starts) > 0} class="grow text-sm text-grey-dark">
Similar trips depart at {Enum.map(
summary.next_starts,
&Timex.format!(&1, "%-I:%M", :strftime)
)
|> Enum.join(", ")}
</div>
<button
class="btn-link font-semibold underline"
phx-click="select_itinerary_group"
phx-value-index={index}
<div
:if={summary.tag}
class="whitespace-nowrap leading-none font-bold font-heading text-sm uppercase bg-brand-primary-darkest text-white px-3 py-2 mb-3 -ml-4 -mt-4 rounded-br-lg w-min"
>
Details
</button>
{summary.tag}
</div>
<.itinerary_summary summary={summary} />
<div class="flex justify-end items-center">
<div :if={Enum.count(summary.next_starts) > 0} class="grow text-sm text-grey-dark">
Similar trips depart at {Enum.map(
summary.next_starts,
&Timex.format!(&1, "%-I:%M", :strftime)
)
|> Enum.join(", ")}
</div>
<button
class="btn-link font-semibold underline"
phx-click="select_itinerary_group"
phx-value-index={index}
>
Details
</button>
</div>
</div>
</div>
"""
Expand All @@ -76,11 +77,9 @@ defmodule DotcomWeb.Components.TripPlanner.Results do
}

~H"""
<div class="mt-30">
<div class="border-b-[1px] border-gray-lighter">
<.itinerary_summary summary={@summary} />
<.itinerary_detail results={@results} />
</div>
<div>
<.itinerary_summary summary={@summary} />
<.itinerary_detail results={@results} />
</div>
"""
end
Expand Down
13 changes: 8 additions & 5 deletions lib/dotcom_web/live/trip_planner.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,14 @@ defmodule DotcomWeb.Live.TripPlanner do
<.input_form changeset={@input_form.changeset} />
<.results_summary changeset={@input_form.changeset} results={@results} />
<div class={[
"flex flex-col md:grid",
Enum.count(@results.itinerary_groups) > 0 && "md:grid-cols-2",
Enum.count(@results.itinerary_groups) == 0 && "md:grid-cols-1"
"flex flex-col gap-4 md:flex-row md:gap-7"
]}>
<.live_component
module={MbtaMetro.Live.Map}
id="trip-planner-map"
class={[
"h-64 md:h-96 w-full",
"md:order-last",
"h-64 md:h-[32rem] w-full",
@results.itinerary_group_selection == nil && "hidden md:block",
@results.itinerary_group_selection != nil && "block"
]}
Expand All @@ -84,7 +83,11 @@ defmodule DotcomWeb.Live.TripPlanner do
pins={@map.pins}
points={@map.points}
/>
<.results class="row-start-1 col-start-1" results={@results} />
<.results
:if={Enum.count(@results.itinerary_groups) > 0}
class="md:max-w-[25rem]"
results={@results}
/>
</div>
</div>
"""
Expand Down
Loading