Compare commits

...

2 Commits

Author SHA1 Message Date
daa50039a7 use .link helpers
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-18 00:47:02 -04:00
98bb99881d add ids to dynamic date and datetime elements 2023-03-18 00:47:02 -04:00
10 changed files with 20 additions and 15 deletions

View File

@ -136,6 +136,7 @@ defmodule MemexWeb.CoreComponents do
""" """
end end
attr :id, :string, required: true
attr :datetime, :any, required: true, doc: "A `DateTime` struct or nil" attr :datetime, :any, required: true, doc: "A `DateTime` struct or nil"
@doc """ @doc """
@ -151,6 +152,7 @@ defmodule MemexWeb.CoreComponents do
defp cast_datetime(_datetime), do: "" defp cast_datetime(_datetime), do: ""
attr :id, :string, required: true
attr :date, :any, required: true, doc: "A `Date` struct or nil" attr :date, :any, required: true, doc: "A `Date` struct or nil"
@doc """ @doc """

View File

@ -1,4 +1,4 @@
<time :if={@date} datetime={@date |> Date.to_iso8601(:extended)} x-data={~s<{ <time :if={@date} id={@id} datetime={@date |> Date.to_iso8601(:extended)} x-data={~s<{
date: date:
Intl.DateTimeFormat([], {timeZone: 'Etc/UTC', dateStyle: 'short'}) Intl.DateTimeFormat([], {timeZone: 'Etc/UTC', dateStyle: 'short'})
.format(new Date("#{Date.to_iso8601(@date, :extended)}")) .format(new Date("#{Date.to_iso8601(@date, :extended)}"))

View File

@ -1,4 +1,4 @@
<time :if={@datetime} datetime={cast_datetime(@datetime)} x-data={~s/{ <time :if={@datetime} id={@id} datetime={cast_datetime(@datetime)} x-data={~s/{
datetime: datetime:
Intl.DateTimeFormat([], {dateStyle: 'short', timeStyle: 'long'}) Intl.DateTimeFormat([], {dateStyle: 'short', timeStyle: 'long'})
.format(new Date("#{cast_datetime(@datetime)}")) .format(new Date("#{cast_datetime(@datetime)}"))

View File

@ -16,7 +16,7 @@
"user confirmed on%{confirmed_datetime}", "user confirmed on%{confirmed_datetime}",
confirmed_datetime: "" confirmed_datetime: ""
) %> ) %>
<.datetime datetime={@user.confirmed_at} /> <.datetime id={"#{@user.id}-confirmed-at"} datetime={@user.confirmed_at} />
<% else %> <% else %>
<%= gettext("email unconfirmed") %> <%= gettext("email unconfirmed") %>
<% end %> <% end %>
@ -27,7 +27,7 @@
"user registered on%{registered_datetime}", "user registered on%{registered_datetime}",
registered_datetime: "" registered_datetime: ""
) %> ) %>
<.datetime datetime={@user.inserted_at} /> <.datetime id={"#{@user.id}-inserted-at"} datetime={@user.inserted_at} />
</p> </p>
</h3> </h3>

View File

@ -90,9 +90,9 @@
<%= dgettext("prompts", "register to setup memEx") %> <%= dgettext("prompts", "register to setup memEx") %>
</.link> </.link>
<% else %> <% else %>
<a :for={%{email: email} <- @admins} class="link" href={"mailto:#{email}"}> <.link :for={%{email: email} <- @admins} class="link" href={"mailto:#{email}"}>
<%= email %> <%= email %>
</a> </.link>
<% end %> <% end %>
</p> </p>
</li> </li>

View File

@ -56,16 +56,16 @@
<i class="fa-fw fa-lg fas fa-trash"></i> <i class="fa-fw fa-lg fas fa-trash"></i>
</.link> </.link>
<a <.link
href="#" href="#"
class="btn btn-secondary" class="btn btn-secondary"
phx-click={if invite.disabled_at, do: "enable_invite", else: "disable_invite"} phx-click={if invite.disabled_at, do: "enable_invite", else: "disable_invite"}
phx-value-id={invite.id} phx-value-id={invite.id}
> >
<%= if invite.disabled_at, do: gettext("enable"), else: gettext("disable") %> <%= if invite.disabled_at, do: gettext("enable"), else: gettext("disable") %>
</a> </.link>
<a <.link
:if={invite.disabled_at |> is_nil() and not (invite.uses_left |> is_nil())} :if={invite.disabled_at |> is_nil() and not (invite.uses_left |> is_nil())}
href="#" href="#"
class="btn btn-secondary" class="btn btn-secondary"
@ -78,7 +78,7 @@
} }
> >
<%= gettext("set unlimited") %> <%= gettext("set unlimited") %>
</a> </.link>
</.invite_card> </.invite_card>
<.link <.link

View File

@ -24,9 +24,12 @@
<hr class="w-full hr" /> <hr class="w-full hr" />
<a href={Routes.live_path(Endpoint, HomeLive)} class="link title text-primary-400 text-lg"> <.link
href={Routes.live_path(Endpoint, HomeLive)}
class="link title text-primary-400 text-lg"
>
<%= dgettext("errors", "go back home") %> <%= dgettext("errors", "go back home") %>
</a> </.link>
</div> </div>
</div> </div>
</body> </body>

View File

@ -83,7 +83,7 @@ msgstr ""
msgid "invalid format: only numbers, letters and hyphen are accepted" msgid "invalid format: only numbers, letters and hyphen are accepted"
msgstr "" msgstr ""
#: lib/memex_web/templates/error/error.html.heex:28 #: lib/memex_web/templates/error/error.html.heex:31
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "go back home" msgid "go back home"
msgstr "" msgstr ""

View File

@ -84,7 +84,7 @@ msgstr ""
msgid "invalid format: only numbers, letters and hyphen are accepted" msgid "invalid format: only numbers, letters and hyphen are accepted"
msgstr "" msgstr ""
#: lib/memex_web/templates/error/error.html.heex:28 #: lib/memex_web/templates/error/error.html.heex:31
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "go back home" msgid "go back home"
msgstr "" msgstr ""

View File

@ -83,7 +83,7 @@ msgstr ""
msgid "invalid format: only numbers, letters and hyphen are accepted" msgid "invalid format: only numbers, letters and hyphen are accepted"
msgstr "" msgstr ""
#: lib/memex_web/templates/error/error.html.heex:28 #: lib/memex_web/templates/error/error.html.heex:31
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "go back home" msgid "go back home"
msgstr "" msgstr ""