update controllers and auth

lib/lokal_web/views/error_helpers.ex

@@ -4,22 +4,31 @@ defmodule LokalWeb.ErrorHelpers do
   """
 
   use Phoenix.HTML
+  import Phoenix.LiveView.Helpers
+  alias Ecto.Changeset
+  alias Phoenix.{HTML.Form, LiveView.Rendered}
 
   @doc """
   Generates tag for inlined form input errors.
   """
-  def error_tag(form, field) do
-    Enum.map(Keyword.get_values(form.errors, field), fn error ->
-      content_tag(:span, translate_error(error),
-        class: "invalid-feedback",
-        phx_feedback_for: input_name(form, field)
-      )
-    end)
+  @spec error_tag(Form.t(), Form.field()) :: Rendered.t()
+  @spec error_tag(Form.t(), Form.field(), String.t()) :: Rendered.t()
+  def error_tag(form, field, extra_class \\ "") do
+    assigns = %{extra_class: extra_class, form: form, field: field}
+
+    ~H"""
+    <%= for error <- Keyword.get_values(@form.errors, @field) do %>
+      <span class={"invalid-feedback #{@extra_class}"} phx-feedback-for={input_name(@form, @field)}>
+        <%= translate_error(error) %>
+      </span>
+    <% end %>
+    """
   end
 
   @doc """
   Translates an error message using gettext.
   """
+  @spec translate_error({String.t(), keyword() | map()}) :: String.t()
   def translate_error({msg, opts}) do
     # When using gettext, we typically pass the strings we want
     # to translate as a static argument:
@@ -44,4 +53,30 @@ defmodule LokalWeb.ErrorHelpers do
       Gettext.dgettext(LokalWeb.Gettext, "errors", msg, opts)
     end
   end
+
+  @doc """
+  Displays all errors from a changeset, or just for a single key
+  """
+  @spec changeset_errors(Changeset.t()) :: String.t()
+  @spec changeset_errors(Changeset.t(), key :: atom()) :: [String.t()] | nil
+  def changeset_errors(changeset) do
+    changeset
+    |> changeset_error_map()
+    |> Enum.map_join(". ", fn {key, errors} ->
+      "#{key |> humanize()}: #{errors |> Enum.join(", ")}"
+    end)
+  end
+
+  def changeset_errors(changeset, key) do
+    changeset |> changeset_error_map() |> Map.get(key)
+  end
+
+  @doc """
+  Displays all errors from a changeset in a key value map
+  """
+  @spec changeset_error_map(Changeset.t()) :: %{atom() => [String.t()]}
+  def changeset_error_map(changeset) do
+    changeset
+    |> Changeset.traverse_errors(fn error -> error |> translate_error() end)
+  end
 end

lib/lokal_web/views/error_view.ex

@@ -1,16 +1,16 @@
 defmodule LokalWeb.ErrorView do
   use LokalWeb, :view
+  import LokalWeb.Components.Topbar
+  alias LokalWeb.{Endpoint, PageLive}
 
-  # If you want to customize a particular status code
-  # for a certain format, you may uncomment below.
-  # def render("500.html", _assigns) do
-  #   "Internal Server Error"
-  # end
+  def template_not_found(error_path, _assigns) do
+    error_string =
+      case error_path do
+        "404.html" -> dgettext("errors", "Not found")
+        "401.html" -> dgettext("errors", "Unauthorized")
+        _ -> dgettext("errors", "Internal Server Error")
+      end
 
-  # By default, Phoenix returns the status message from
-  # the template name. For example, "404.html" becomes
-  # "Not Found".
-  def template_not_found(template, _assigns) do
-    Phoenix.Controller.status_message_from_template(template)
+    render("error.html", %{error_string: error_string})
   end
 end

lib/lokal_web/views/user_confirmation_view.ex

@@ -1,3 +1,4 @@
 defmodule LokalWeb.UserConfirmationView do
   use LokalWeb, :view
+  alias Lokal.Accounts
 end

lib/lokal_web/views/user_reset_password_view.ex

@@ -1,3 +1,4 @@
 defmodule LokalWeb.UserResetPasswordView do
   use LokalWeb, :view
+  alias Lokal.Accounts
 end

lib/lokal_web/views/user_session_view.ex

@@ -1,3 +1,4 @@
 defmodule LokalWeb.UserSessionView do
   use LokalWeb, :view
+  alias Lokal.Accounts
 end

lib/lokal_web/views/view_helpers.ex

@@ -1,7 +1,8 @@
 defmodule LokalWeb.ViewHelpers do
   @moduledoc """
   Contains common helpers that can be used in liveviews and regular views. These
-  are automatically imported into any Phoenix View using `use LokalWeb, :view`
+  are automatically imported into any Phoenix View using `use LokalWeb,
+  :view`
   """
 
   import Phoenix.LiveView.Helpers
@@ -10,24 +11,42 @@ defmodule LokalWeb.ViewHelpers do
   Returns a <time> element that renders the naivedatetime in the user's local
   timezone with Alpine.js
   """
-  @spec display_datetime(NaiveDateTime.t()) :: Phoenix.LiveView.Rendered.t()
+  @spec display_datetime(NaiveDateTime.t() | nil) :: Phoenix.LiveView.Rendered.t()
+  def display_datetime(nil), do: ""
+
   def display_datetime(datetime) do
     assigns = %{
       datetime: datetime |> DateTime.from_naive!("Etc/UTC") |> DateTime.to_iso8601(:extended)
     }
 
     ~H"""
-    <time
-      datetime={@datetime}
-      x-data={"{
+    <time datetime={@datetime} x-data={"{
         date:
           Intl.DateTimeFormat([], {dateStyle: 'short', timeStyle: 'long'})
             .format(new Date(\"#{@datetime}\"))
-      }"}
-      x-text="date"
-    >
+      }"} x-text="date">
       <%= @datetime %>
     </time>
     """
   end
+
+  @doc """
+  Returns a <date> element that renders the Date in the user's local
+  timezone with Alpine.js
+  """
+  @spec display_date(Date.t() | nil) :: Phoenix.LiveView.Rendered.t()
+  def display_date(nil), do: ""
+
+  def display_date(date) do
+    assigns = %{date: date |> Date.to_iso8601(:extended)}
+
+    ~H"""
+    <time datetime={@date} x-data={"{
+        date:
+          Intl.DateTimeFormat([], {timeZone: 'Etc/UTC', dateStyle: 'short'}).format(new Date(\"#{@date}\"))
+      }"} x-text="date">
+      <%= @date %>
+    </time>
+    """
+  end
 end