Skip to content

Commit 6c941fc

Browse files
feat: add support for multi-day activities (to display date)
1 parent 33f417e commit 6c941fc

3 files changed

Lines changed: 17 additions & 8 deletions

File tree

lib/atomic_web/components/tabs.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ defmodule AtomicWeb.Components.Tabs do
8585
underline_classes =
8686
if active,
8787
do: "bg-orange-100 text-orange-600",
88-
else: "text-zinc-500 bg-zinc-100"
88+
else: "text-zinc-300 bg-zinc-100"
8989

9090
[base_classes, active_classes, underline_classes]
9191
end

lib/atomic_web/live/activity_live/form_component.html.heex

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<label for="description_button" class="atomic-label atomic-label--required">
5050
Description
5151
</label>
52-
<.button id="description_button" class="group atomic-button atomic-button--primary-outline flex flex-col items-start rounded-md border-gray-300 bg-white px-3 py-3 text-gray-300 focus-within:bg-white lg:w-full" type="button" phx-click="toggle_description_modal" phx-target={@myself}>
52+
<.button id="description_button" class="group atomic-button atomic-button--primary-outline flex flex-col items-start rounded-md border-gray-300 bg-white px-3 py-[10px] sm:py-2 text-gray-300 focus-within:bg-white lg:w-full" type="button" phx-click="toggle_description_modal" phx-target={@myself}>
5353
<%= if not @has_description? do %>
5454
<label class="cursor-pointer text-left text-gray-500">
5555
Add description
@@ -72,24 +72,24 @@
7272
</div>
7373
</.button>
7474

75-
<div class="mt-4 flex flex-col justify-center md:flex-row md:justify-start xl:justify-between">
75+
<div class="flex flex-col justify-center md:flex-row md:justify-start xl:justify-between">
7676
<.inputs_for :let={fl} field={@form[:location]}>
77-
<div class="flex flex-col gap-y-1">
77+
<div class="mt-3 sm:mt-4 flex flex-col gap-y-1">
7878
<.field class="atomic-button atomic-button--primary-outline text-gray-900" type="text" field={fl[:name]} label="Location" placeholder="Choose location name" required />
7979
</div>
80-
<div class="mt-4 flex flex-col gap-y-1 sm:mt-0 md:ml-8">
80+
<div class="-mt-2 sm:-mt-2 md:mt-4 flex flex-col gap-y-1 sm:mt-0 md:ml-8">
8181
<.field class="atomic-button atomic-button--primary-outline text-gray-900" type="text" field={fl[:address]} label="Address" placeholder="Address" required />
8282
</div>
8383
</.inputs_for>
8484
</div>
8585

86-
<label for="capacity_button" class="atomic-label atomic-label--required">
86+
<label for="capacity_button" class="atomic-label atomic-label--required -mt-2">
8787
Capacity
8888
</label>
89-
<.button id="capacity_button" type="button" class="group atomic-button atomic-button--primary-outline flex flex-col items-start rounded-md border-gray-300 bg-white px-3 py-3 text-gray-300 focus-within:bg-white lg:w-full" phx-click="toggle_maximum_entries_modal" phx-target={@myself}>
89+
<.button id="capacity_button" type="button" class="group atomic-button atomic-button--primary-outline flex flex-col items-start rounded-md border-gray-300 bg-white px-3 py-[10px] sm:py-2 text-gray-300 focus-within:bg-white lg:w-full" phx-click="toggle_maximum_entries_modal" phx-target={@myself}>
9090
<%= if @has_max_capacity? do %>
9191
<.field
92-
class="cursor-pointer border-none bg-transparent p-0 text-sm text-gray-900 shadow-none focus:border-transparent focus:outline-none focus:ring-0"
92+
class="cursor-pointer border-none bg-transparent p-0 text-sm text-gray-900 shadow-none focus:border-transparent focus:outline-none focus:ring-0 atomic-text-input"
9393
type="number"
9494
field={@form[:maximum_entries]}
9595
label="Maximum entries"

lib/atomic_web/live/activity_live/show.html.heex

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,15 @@
7272
<%= "#{display_time(@activity.start)}-#{display_time(@activity.finish)}" %>
7373
</p>
7474
</div>
75+
<% else %>
76+
<div class="flex flex-col">
77+
<p class="font-medium">
78+
<%= pretty_display_date(@activity.start) %> - <%= pretty_display_date(@activity.finish) %>
79+
</p>
80+
<p>
81+
<%= "#{display_time(@activity.start)}-#{display_time(@activity.finish)}" %>
82+
</p>
83+
</div>
7584
<% end %>
7685
<!-- TODO: Support for multi-day activities -->
7786
</div>

0 commit comments

Comments
 (0)