diff --git a/lib/memex_web.ex b/lib/memex_web.ex index 8c93c39..852e878 100644 --- a/lib/memex_web.ex +++ b/lib/memex_web.ex @@ -46,7 +46,7 @@ defmodule MemexWeb do def live_view do quote do use Phoenix.LiveView, - layout: {MemexWeb.LayoutView, :live} + layout: {MemexWeb.LayoutView, "live.html"} on_mount MemexWeb.InitAssigns unquote(view_helpers()) diff --git a/lib/memex_web/components/invite_card.ex b/lib/memex_web/components/invite_card.ex index 4e21987..598851a 100644 --- a/lib/memex_web/components/invite_card.ex +++ b/lib/memex_web/components/invite_card.ex @@ -6,6 +6,8 @@ defmodule MemexWeb.Components.InviteCard do use MemexWeb, :component def invite_card(assigns) do + assigns = assigns |> assign_new(:code_actions, fn -> [] end) + ~H"""
- <%= gettext("Uses Left:") %> - <%= @invite.uses_left || gettext("unlimited") %> + <%= if @invite.uses_left do %> + <%= gettext( + "uses left: %{uses_left}", + uses_left: @invite.uses_left + ) %> + <% else %> + <%= gettext("uses left: unlimited") %> + <% end %> <% else %>

@@ -29,13 +37,9 @@ defmodule MemexWeb.Components.InviteCard do - <%= Routes.user_registration_url(Endpoint, :new, invite: @invite.token) %> - - - <%= if @code_actions do %> - <%= render_slot(@code_actions) %> - <% end %> + phx-no-format + ><%= Routes.user_registration_url(Endpoint, :new, invite: @invite.token) %> + <%= render_slot(@code_actions) %>

<%= if @inner_block do %> diff --git a/lib/memex_web/components/user_card.ex b/lib/memex_web/components/user_card.ex index f3d2017..37d7233 100644 --- a/lib/memex_web/components/user_card.ex +++ b/lib/memex_web/components/user_card.ex @@ -19,19 +19,23 @@ defmodule MemexWeb.Components.UserCard do

- <%= if @user.confirmed_at |> is_nil() do %> - <%= gettext("email unconfirmed") %> + <%= if @user.confirmed_at do %> + <%= gettext( + "user confirmed on%{confirmed_datetime}", + confirmed_datetime: "" + ) %> + <.datetime datetime={@user.confirmed_at} /> <% else %> -

- <%= gettext("user confirmed on") %> - <%= @user.confirmed_at |> display_datetime() %> -

+ <%= gettext("email unconfirmed") %> <% end %>

- <%= gettext("user registered on") %> - <%= @user.inserted_at |> display_datetime() %> + <%= gettext( + "user registered on%{registered_datetime}", + registered_datetime: "" + ) %> + <.datetime datetime={@user.inserted_at} />

diff --git a/lib/memex_web/views/view_helpers.ex b/lib/memex_web/views/view_helpers.ex index 6b03eaa..44d8955 100644 --- a/lib/memex_web/views/view_helpers.ex +++ b/lib/memex_web/views/view_helpers.ex @@ -5,56 +5,62 @@ defmodule MemexWeb.ViewHelpers do :view` """ - import Phoenix.Component + use Phoenix.Component @doc """ - Returns a