upgrade to phoenix 1.7

.formatter.exs

@@ -1,6 +1,6 @@
 [
-  import_deps: [:ecto, :phoenix],
+  import_deps: [:ecto, :ecto_sql, :phoenix],
-  inputs: ["*.{heex,ex,exs}", "priv/*/seeds.exs", "{config,lib,test}/**/*.{heex,ex,exs}"],
+  inputs: ["*.{heex,ex,exs}", "{config,lib,test}/**/*.{heex,ex,exs}", "priv/*/seeds.exs"],
   subdirectories: ["priv/*/migrations"],
   plugins: [Phoenix.LiveView.HTMLFormatter]
 ]

config/dev.exs

@@ -59,8 +59,7 @@ config :cannery, CanneryWeb.Endpoint,
     patterns: [
       ~r"priv/static/.*(js|css|png|jpeg|jpg|gif|svg)$",
       ~r"priv/gettext/.*(po)$",
-      ~r"lib/cannery_web/(live|views)/.*(ex)$",
+      ~r"lib/cannery_web/*/.*(ex)$"
-      ~r"lib/cannery_web/templates/.*(eex)$"
     ]
   ]
 

config/runtime.exs

@@ -12,7 +12,7 @@ if System.get_env("PHX_SERVER") && System.get_env("RELEASE_NAME") do
   config :cannery, CanneryWeb.Endpoint, server: true
 end
 
-config :cannery, CanneryWeb.ViewHelpers, shibao_mode: System.get_env("SHIBAO_MODE") == "true"
+config :cannery, CanneryWeb.HTMLHelpers, shibao_mode: System.get_env("SHIBAO_MODE") == "true"
 
 # Set default locale
 config :gettext, :default_locale, System.get_env("LOCALE", "en_US")

lib/cannery/accounts.ex

@@ -374,8 +374,8 @@ defmodule Cannery.Accounts do
   @doc """
   Deletes the signed token with the given context.
   """
-  @spec delete_session_token(token :: String.t()) :: :ok
+  @spec delete_user_session_token(token :: String.t()) :: :ok
-  def delete_session_token(token) do
+  def delete_user_session_token(token) do
     UserToken.token_and_context_query(token, "session") |> Repo.delete_all()
     :ok
   end

lib/cannery/accounts/email.ex

@@ -3,14 +3,15 @@ defmodule Cannery.Email do
   Emails that can be sent using Swoosh.
 
   You can find the base email templates at
-  `lib/cannery_web/templates/layout/email.html.heex` for html emails and
+  `lib/cannery_web/components/layouts/email_html.html.heex` for html emails and
-  `lib/cannery_web/templates/layout/email.txt.heex` for text emails.
+  `lib/cannery_web/components/layouts/email_text.txt.eex` for text emails.
   """
 
-  use Phoenix.Swoosh, view: CanneryWeb.EmailView, layout: {CanneryWeb.LayoutView, :email}
+  import Swoosh.Email
   import CanneryWeb.Gettext
+  import Phoenix.Template
   alias Cannery.Accounts.User
-  alias CanneryWeb.EmailView
+  alias CanneryWeb.{EmailHTML, Layouts}
 
   @typedoc """
   Represents an HTML and text body email that can be sent
@@ -28,21 +29,33 @@ defmodule Cannery.Email do
   def generate_email("welcome", user, %{"url" => url}) do
     user
     |> base_email(dgettext("emails", "Confirm your Cannery account"))
-    |> render_body("confirm_email.html", %{user: user, url: url})
+    |> html_email(:confirm_email_html, %{user: user, url: url})
-    |> text_body(EmailView.render("confirm_email.txt", %{user: user, url: url}))
+    |> text_email(:confirm_email_text, %{user: user, url: url})
   end
 
   def generate_email("reset_password", user, %{"url" => url}) do
     user
     |> base_email(dgettext("emails", "Reset your Cannery password"))
-    |> render_body("reset_password.html", %{user: user, url: url})
+    |> html_email(:reset_password_html, %{user: user, url: url})
-    |> text_body(EmailView.render("reset_password.txt", %{user: user, url: url}))
+    |> text_email(:reset_password_text, %{user: user, url: url})
   end
 
   def generate_email("update_email", user, %{"url" => url}) do
     user
     |> base_email(dgettext("emails", "Update your Cannery email"))
-    |> render_body("update_email.html", %{user: user, url: url})
+    |> html_email(:update_email_html, %{user: user, url: url})
-    |> text_body(EmailView.render("update_email.txt", %{user: user, url: url}))
+    |> text_email(:update_email_text, %{user: user, url: url})
+  end
+
+  defp html_email(email, atom, assigns) do
+    heex = apply(EmailHTML, atom, [assigns])
+    html = render_to_string(Layouts, "email_html", "html", email: email, inner_content: heex)
+    email |> html_body(html)
+  end
+
+  defp text_email(email, atom, assigns) do
+    heex = apply(EmailHTML, atom, [assigns])
+    text = render_to_string(Layouts, "email_text", "text", email: email, inner_content: heex)
+    email |> text_body(text)
   end
 end

lib/cannery_web.ex

@@ -1,53 +1,61 @@
 defmodule CanneryWeb do
   @moduledoc """
   The entrypoint for defining your web interface, such
-  as controllers, views, channels and so on.
+  as controllers, components, channels, and so on.
 
   This can be used in your application as:
 
       use CanneryWeb, :controller
-      use CanneryWeb, :view
+      use CanneryWeb, :html
 
-  The definitions below will be executed for every view,
+  The definitions below will be executed for every controller,
-  controller, etc, so keep them short and clean, focused
+  component, etc, so keep them short and clean, focused
   on imports, uses and aliases.
 
   Do NOT define functions inside the quoted expressions
-  below. Instead, define any helper function in modules
+  below. Instead, define additional modules and import
-  and import those modules here.
+  those modules here.
   """
 
-  def controller do
+  def static_paths, do: ~w(css js fonts images favicon.ico robots.txt)
-    quote do
-      use Phoenix.Controller, namespace: CanneryWeb
 
+  def router do
+    quote do
+      use Phoenix.Router, helpers: false
+
+      # Import common connection and controller functions to use in pipelines
       import Plug.Conn
-      import CanneryWeb.Gettext
+      import Phoenix.Controller
-      alias CanneryWeb.Router.Helpers, as: Routes
+      import Phoenix.LiveView.Router
     end
   end
 
-  def view do
+  def channel do
     quote do
-      use Phoenix.View,
+      use Phoenix.Channel
-        root: "lib/cannery_web/templates",
+    end
-        namespace: CanneryWeb
+  end
 
-      # Import convenience functions from controllers
+  def controller do
-      import Phoenix.Controller,
+    quote do
-        only: [get_flash: 1, get_flash: 2, view_module: 1, view_template: 1]
+      use Phoenix.Controller,
+        formats: [:html, :json],
+        layouts: [html: CanneryWeb.Layouts]
 
-      # Include shared imports and aliases for views
+      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
-      unquote(view_helpers())
+      import Plug.Conn
+      import CanneryWeb.Gettext
+
+      unquote(verified_routes())
     end
   end
 
   def live_view do
     quote do
-      use Phoenix.LiveView, layout: {CanneryWeb.LayoutView, :live}
+      use Phoenix.LiveView,
+        layout: {CanneryWeb.Layouts, :app}
 
-      on_mount CanneryWeb.InitAssigns
+      unquote(html_helpers())
-      unquote(view_helpers())
     end
   end
 
@@ -55,49 +63,46 @@ defmodule CanneryWeb do
     quote do
       use Phoenix.LiveComponent
 
-      unquote(view_helpers())
+      unquote(html_helpers())
     end
   end
 
-  def component do
+  def html do
     quote do
       use Phoenix.Component
 
-      unquote(view_helpers())
+      # Import convenience functions from controllers
+      import Phoenix.Controller,
+        only: [get_csrf_token: 0, view_module: 1, view_template: 1]
+
+      # Include general helpers for rendering HTML
+      unquote(html_helpers())
     end
   end
 
-  def router do
+  defp html_helpers do
     quote do
-      use Phoenix.Router
-
-      import Phoenix.{Controller, LiveView.Router}
-      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
-      import Plug.Conn
-    end
-  end
-
-  def channel do
-    quote do
-      use Phoenix.Channel
-      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
-      import CanneryWeb.Gettext
-    end
-  end
-
-  defp view_helpers do
-    quote do
-      # Use all HTML functionality (forms, tags, etc)
       # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
       use Phoenix.HTML
 
-      # Import LiveView and .heex helpers (live_render, live_patch, <.form>, etc)
+      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
-      # Import basic rendering functionality (render, render_layout, etc)
+      import Phoenix.Component
-      import CanneryWeb.{ErrorHelpers, Gettext, CoreComponents, ViewHelpers}
+      import CanneryWeb.{ErrorHelpers, Gettext, CoreComponents, HTMLHelpers}
-      import Phoenix.{Component, View}
 
-      alias CanneryWeb.Endpoint
+      # Shortcut for generating JS commands
-      alias CanneryWeb.Router.Helpers, as: Routes
+      alias Phoenix.LiveView.JS
+
+      # Routes generation with the ~p sigil
+      unquote(verified_routes())
+    end
+  end
+
+  def verified_routes do
+    quote do
+      use Phoenix.VerifiedRoutes,
+        endpoint: CanneryWeb.Endpoint,
+        router: CanneryWeb.Router,
+        statics: CanneryWeb.static_paths()
     end
   end
 

lib/cannery_web/components/container_table_component.ex

@@ -109,14 +109,12 @@ defmodule CanneryWeb.Components.ContainerTableComponent do
   end
 
   @spec get_value_for_key(atom(), Container.t(), extra_data :: map) :: any()
-  defp get_value_for_key(:name, %{id: id, name: container_name}, _extra_data) do
+  defp get_value_for_key(:name, %{name: container_name} = assigns, _extra_data) do
-    assigns = %{id: id, container_name: container_name}
-
     {container_name,
      ~H"""
      <div class="flex flex-wrap justify-center items-center">
-       <.link navigate={Routes.container_show_path(Endpoint, :show, @id)} class="link">
+       <.link navigate={~p"/container/#{@id}"} class="link">
-         <%= @container_name %>
+         <%= @name %>
        </.link>
      </div>
      """}

lib/cannery_web/components/core_components.ex

@@ -3,11 +3,11 @@ defmodule CanneryWeb.CoreComponents do
   Provides core UI components.
   """
   use Phoenix.Component
-  import CanneryWeb.{Gettext, ViewHelpers}
+  use CanneryWeb, :verified_routes
+  import CanneryWeb.{Gettext, HTMLHelpers}
   alias Cannery.{Accounts, Accounts.Invite, Accounts.User}
   alias Cannery.{Ammo, Ammo.Pack}
   alias Cannery.{Containers.Container, Containers.Tag}
-  alias CanneryWeb.{Endpoint, HomeLive}
   alias CanneryWeb.Router.Helpers, as: Routes
   alias Phoenix.LiveView.{JS, Rendered}
 
@@ -29,13 +29,13 @@ defmodule CanneryWeb.CoreComponents do
 
   ## Examples
 
-      <.modal return_to={Routes.<%= schema.singular %>_index_path(Endpoint, :index)}>
+      <.modal return_to={~p"/\#{<%= schema.plural %>}"}>
         <.live_component
           module={<%= inspect context.web_module %>.<%= inspect Module.concat(schema.web_namespace, schema.alias) %>Live.FormComponent}
           id={@<%= schema.singular %>.id || :new}
           title={@page_title}
           action={@live_action}
-          return_to={Routes.<%= schema.singular %>_index_path(Endpoint, :index)}
+          return_to={~p"/\#{<%= schema.singular %>}"}
           <%= schema.singular %>: @<%= schema.singular %>
         />
       </.modal>

lib/cannery_web/components/core_components/container_card.html.heex

@@ -5,7 +5,7 @@
     border border-gray-400 rounded-lg shadow-lg hover:shadow-md
     transition-all duration-300 ease-in-out"
 >
-  <.link navigate={Routes.container_show_path(Endpoint, :show, @container)} class="link">
+  <.link navigate={~p"/container/#{@container}"} class="link">
     <h1 class="px-4 py-2 rounded-lg title text-xl">
       <%= @container.name %>
     </h1>

lib/cannery_web/components/core_components/invite_card.html.heex

@@ -23,7 +23,7 @@
   <% end %>
 
   <.qr_code
-    content={Routes.user_registration_url(Endpoint, :new, invite: @invite.token)}
+    content={url(CanneryWeb.Endpoint, ~p"/users/register?invite=#{@invite.token}")}
     filename={@invite.name}
   />
 
@@ -36,7 +36,7 @@
       id={"code-#{@invite.id}"}
       class="mx-2 my-1 text-xs px-4 py-2 rounded-lg text-center break-all text-gray-100 bg-primary-800"
       phx-no-format
-    ><%= Routes.user_registration_url(Endpoint, :new, invite: @invite.token) %></code>
+    ><%= url(CanneryWeb.Endpoint, ~p"/users/register?invite=#{@invite.token}") %></code>
     <%= if @code_actions, do: render_slot(@code_actions) %>
   </div>
 

lib/cannery_web/components/core_components/pack_card.html.heex

@@ -5,7 +5,7 @@
     border border-gray-400 rounded-lg shadow-lg hover:shadow-md
     transition-all duration-300 ease-in-out"
 >
-  <.link navigate={Routes.pack_show_path(Endpoint, :show, @pack)} class="mb-2 link">
+  <.link navigate={~p"/ammo/show/#{@pack}"} class="mb-2 link">
     <h1 class="title text-xl title-primary-500">
       <%= @pack.type.name %>
     </h1>
@@ -55,7 +55,7 @@
     <span :if={@container} class="rounded-lg title text-lg">
       <%= gettext("Container:") %>
 
-      <.link navigate={Routes.container_show_path(Endpoint, :show, @container)} class="link">
+      <.link navigate={~p"/container/#{@container}"} class="link">
         <%= @container.name %>
       </.link>
     </span>

lib/cannery_web/components/core_components/topbar.html.heex

@@ -1,12 +1,9 @@
 <nav role="navigation" class="mb-8 px-8 py-4 w-full bg-primary-500">
   <div class="flex flex-col sm:flex-row justify-between items-center">
     <div class="mb-4 sm:mb-0 sm:mr-8 flex flex-row justify-start items-center space-x-2">
-      <.link
+      <.link navigate={~p"/"} class="inline mx-2 my-1 leading-5 text-xl text-white">
-        navigate={Routes.live_path(Endpoint, HomeLive)}
-        class="inline mx-2 my-1 leading-5 text-xl text-white"
-      >
         <img
-          src={Routes.static_path(Endpoint, "/images/cannery.svg")}
+          src={~p"/images/cannery.svg"}
           alt={gettext("Cannery logo")}
           class="inline-block h-8 mx-1"
         />
@@ -27,64 +24,43 @@
       text-lg text-white text-ellipsis">
       <%= if @current_user do %>
         <li class="mx-2 my-1">
-          <.link
+          <.link navigate={~p"/tags"} class="text-white hover:underline">
-            navigate={Routes.tag_index_path(Endpoint, :index)}
-            class="text-white hover:underline"
-          >
             <%= gettext("Tags") %>
           </.link>
         </li>
         <li class="mx-2 my-1">
-          <.link
+          <.link navigate={~p"/containers"} class="text-white hover:underline">
-            navigate={Routes.container_index_path(Endpoint, :index)}
-            class="text-white hover:underline"
-          >
             <%= gettext("Containers") %>
           </.link>
         </li>
         <li class="mx-2 my-1">
-          <.link
+          <.link navigate={~p"/catalog"} class="text-white hover:underline">
-            navigate={Routes.type_index_path(Endpoint, :index)}
-            class="text-white hover:underline"
-          >
             <%= gettext("Catalog") %>
           </.link>
         </li>
         <li class="mx-2 my-1">
-          <.link
+          <.link navigate={~p"/ammo"} class="text-white hover:underline">
-            navigate={Routes.pack_index_path(Endpoint, :index)}
-            class="text-white hover:underline"
-          >
             <%= gettext("Ammo") %>
           </.link>
         </li>
         <li class="mx-2 my-1">
-          <.link
+          <.link navigate={~p"/range"} class="text-white hover:underline">
-            navigate={Routes.range_index_path(Endpoint, :index)}
-            class="text-white hover:underline"
-          >
             <%= gettext("Range") %>
           </.link>
         </li>
         <li :if={@current_user |> Accounts.is_already_admin?()} class="mx-2 my-1">
-          <.link
+          <.link navigate={~p"/invites"} class="text-white hover:underline">
-            navigate={Routes.invite_index_path(Endpoint, :index)}
-            class="text-white hover:underline"
-          >
             <%= gettext("Invites") %>
           </.link>
         </li>
         <li class="mx-2 my-1">
-          <.link
+          <.link href={~p"/users/settings"} class="text-white hover:underline truncate">
-            href={Routes.user_settings_path(Endpoint, :edit)}
-            class="text-white hover:underline truncate"
-          >
             <%= @current_user.email %>
           </.link>
         </li>
         <li class="mx-2 my-1">
           <.link
-            href={Routes.user_session_path(Endpoint, :delete)}
+            href={~p"/users/log_out"}
             method="delete"
             data-confirm={dgettext("prompts", "Are you sure you want to log out?")}
             aria-label={gettext("Log out")}
@@ -100,7 +76,7 @@
           class="mx-2 my-1"
         >
           <.link
-            navigate={Routes.live_dashboard_path(Endpoint, :home)}
+            navigate={~p"/dashboard"}
             class="text-white hover:underline"
             aria-label={gettext("Live Dashboard")}
           >
@@ -109,18 +85,12 @@
         </li>
       <% else %>
         <li :if={Accounts.allow_registration?()} class="mx-2 my-1">
-          <.link
+          <.link href={~p"/users/register"} class="text-white hover:underline truncate">
-            href={Routes.user_registration_path(Endpoint, :new)}
-            class="text-white hover:underline truncate"
-          >
             <%= dgettext("actions", "Register") %>
           </.link>
         </li>
         <li class="mx-2 my-1">
-          <.link
+          <.link href={~p"/users/log_in"} class="text-white hover:underline truncate">
-            href={Routes.user_session_path(Endpoint, :new)}
-            class="text-white hover:underline truncate"
-          >
             <%= dgettext("actions", "Log in") %>
           </.link>
         </li>

lib/cannery_web/components/email_html.ex

@@ -0,0 +1,10 @@
+defmodule CanneryWeb.EmailHTML do
+  @moduledoc """
+  Renders email templates
+  """
+
+  use CanneryWeb, :html
+
+  embed_templates "email_html/*.html", suffix: "_html"
+  embed_templates "email_html/*.txt", suffix: "_text"
+end

lib/cannery_web/components/email_html/confirm_email.txt.eex

@@ -9,4 +9,4 @@
 
 <%= dgettext("emails",
   "If you didn't create an account at %{url}, please ignore this.",
-  url: Routes.live_url(Endpoint, HomeLive)) %>
+  url: ~p"/") %>

lib/cannery_web/components/email_html/reset_password.txt.eex

@@ -7,4 +7,4 @@
 
 <%= dgettext("emails",
   "If you didn't request this change from %{url}, please ignore this.",
-  url: Routes.live_url(Endpoint, HomeLive)) %>
+  url: ~p"/") %>

lib/cannery_web/components/email_html/update_email.txt.eex

@@ -7,4 +7,4 @@
 
 <%= dgettext("emails",
   "If you didn't request this change from %{url}, please ignore this.",
-  url: Routes.live_url(Endpoint, HomeLive)) %>
+  url: ~p"/") %>

lib/cannery_web/components/layouts.ex

@@ -0,0 +1,17 @@
+defmodule CanneryWeb.Layouts do
+  @moduledoc """
+  The root layouts for the entire application
+  """
+
+  use CanneryWeb, :html
+
+  embed_templates "layouts/*"
+
+  def get_title(%{assigns: %{title: title}}) when title not in [nil, ""] do
+    gettext("Cannery | %{title}", title: title)
+  end
+
+  def get_title(_conn) do
+    gettext("Cannery")
+  end
+end

lib/cannery_web/components/layouts/app.html.heex

@@ -3,11 +3,11 @@
     <.topbar current_user={assigns[:current_user]} />
 
     <div class="mx-8 my-2 flex flex-col space-y-4 text-center">
-      <p :if={get_flash(@conn, :info)} class="alert alert-info" role="alert">
+      <p :if={@flash["info"]} class="alert alert-info" role="alert">
-        <%= get_flash(@conn, :info) %>
+        <%= @flash["info"] %>
       </p>
-      <p :if={get_flash(@conn, :error)} class="alert alert-danger" role="alert">
+      <p :if={@flash["error"]} class="alert alert-danger" role="alert">
-        <%= get_flash(@conn, :error) %>
+        <%= @flash["error"] %>
       </p>
     </div>
   </header>

lib/cannery_web/components/layouts/email_html.html.heex

@@ -9,7 +9,7 @@
 
     <hr style="margin: 2em auto; border-width: 1px; border-color: rgb(212, 212, 216); width: 100%; max-width: 42rem;" />
 
-    <a style="color: rgb(31, 31, 31);" href={Routes.live_url(Endpoint, HomeLive)}>
+    <a style="color: rgb(31, 31, 31);" href={~p"/"}>
       <%= dgettext(
         "emails",
         "This email was sent from Cannery, the self-hosted firearm tracker website."

lib/cannery_web/components/layouts/email_text.txt.eex

@@ -8,4 +8,4 @@
 
 <%= dgettext("emails",
   "This email was sent from Cannery at %{url}, the self-hosted firearm tracker website.",
-  url: Routes.live_url(Endpoint, HomeLive)) %>
+  url: ~p"/") %>

lib/cannery_web/components/layouts/root.html.heex

@@ -5,21 +5,12 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <%= csrf_meta_tag() %>
-    <link
+    <link rel="shortcut icon" type="image/jpg" href={~p"/images/cannery.svg"} />
-      rel="shortcut icon"
-      type="image/jpg"
-      href={Routes.static_path(@conn, "/images/cannery.svg")}
-    />
     <.live_title suffix={" | #{gettext("Cannery")}"}>
       <%= assigns[:page_title] || gettext("Cannery") %>
     </.live_title>
-    <link phx-track-static rel="stylesheet" href={Routes.static_path(@conn, "/css/app.css")} />
+    <link phx-track-static rel="stylesheet" href={~p"/css/app.css"} />
-    <script
+    <script defer phx-track-static type="text/javascript" src={~p"/js/app.js"}>
-      defer
-      phx-track-static
-      type="text/javascript"
-      src={Routes.static_path(@conn, "/js/app.js")}
-    >
     </script>
   </head>
 

lib/cannery_web/components/move_pack_component.ex

@@ -5,7 +5,6 @@ defmodule CanneryWeb.Components.MovePackComponent do
 
   use CanneryWeb, :live_component
   alias Cannery.{Accounts.User, Ammo, Ammo.Pack, Containers, Containers.Container}
-  alias CanneryWeb.Endpoint
   alias Ecto.Changeset
   alias Phoenix.LiveView.Socket
 
@@ -84,7 +83,7 @@ defmodule CanneryWeb.Components.MovePackComponent do
           <%= display_emoji("😔") %>
         </h2>
 
-        <.link navigate={Routes.container_index_path(Endpoint, :new)} class="btn btn-primary">
+        <.link navigate={~p"/containers/new"} class="btn btn-primary">
           <%= dgettext("actions", "Add another container!") %>
         </.link>
       <% else %>

lib/cannery_web/components/shot_record_table_component.ex

@@ -98,7 +98,7 @@ defmodule CanneryWeb.Components.ShotRecordTableComponent do
 
     {pack.type.name,
      ~H"""
-     <.link navigate={Routes.pack_show_path(Endpoint, :show, @pack)} class="link">
+     <.link navigate={~p"/ammo/show/#{@pack}"} class="link">
        <%= @pack.type.name %>
      </.link>
      """}

lib/cannery_web/components/type_table_component.ex

@@ -261,13 +261,11 @@ defmodule CanneryWeb.Components.TypeTableComponent do
     end
   end
 
-  defp get_type_value(:name, _key, %{name: type_name} = type, _other_data) do
+  defp get_type_value(:name, _key, %{name: type_name} = assigns, _other_data) do
-    assigns = %{type: type}
-
     {type_name,
      ~H"""
-     <.link navigate={Routes.type_show_path(Endpoint, :show, @type)} class="link">
+     <.link navigate={~p"/type/#{@id}"} class="link">
-       <%= @type.name %>
+       <%= @name %>
      </.link>
      """}
   end

lib/cannery_web/controllers/email_controller.ex

@@ -6,7 +6,8 @@ defmodule CanneryWeb.EmailController do
   use CanneryWeb, :controller
   alias Cannery.Accounts.User
 
-  plug :put_layout, {CanneryWeb.LayoutView, :email}
+  plug :put_root_layout, html: {CanneryWeb.Layouts, :email_html}
+  plug :put_layout, false
 
   @sample_assigns %{
     email: %{subject: "Example subject"},
@@ -18,6 +19,6 @@ defmodule CanneryWeb.EmailController do
   Debug route used to preview emails
   """
   def preview(conn, %{"id" => template}) do
-    render(conn, "#{template |> to_string()}.html", @sample_assigns)
+    render(conn, String.to_existing_atom(template), @sample_assigns)
   end
 end

lib/cannery_web/controllers/error_html.ex

@@ -0,0 +1,16 @@
+defmodule CanneryWeb.ErrorHTML do
+  use CanneryWeb, :html
+
+  embed_templates "error_html/*"
+
+  def render(template, _assigns) do
+    error_string =
+      case template do
+        "404.html" -> dgettext("errors", "Not found")
+        "401.html" -> dgettext("errors", "Unauthorized")
+        _other_path -> dgettext("errors", "Internal server error")
+      end
+
+    error(%{error_string: error_string})
+  end
+end

lib/cannery_web/controllers/error_html/error.html.heex

@@ -24,10 +24,7 @@
 
         <hr class="w-full hr" />
 
-        <.link
+        <.link href={~p"/"} class="link title text-primary-600 text-lg">
-          href={Routes.live_path(Endpoint, HomeLive)}
-          class="link title text-primary-600 text-lg"
-        >
           <%= dgettext("errors", "Go back home") %>
         </.link>
       </div>

lib/cannery_web/controllers/error_json.ex

@@ -0,0 +1,14 @@
+defmodule CanneryWeb.ErrorJSON do
+  import CanneryWeb.Gettext
+
+  def render(template, _assigns) do
+    error_string =
+      case template do
+        "404.json" -> dgettext("errors", "Not found")
+        "401.json" -> dgettext("errors", "Unauthorized")
+        _other_path -> dgettext("errors", "Internal server error")
+      end
+
+    %{errors: %{detail: error_string}}
+  end
+end

lib/cannery_web/controllers/home_controller.ex

@@ -1,11 +0,0 @@
-defmodule CanneryWeb.HomeController do
-  @moduledoc """
-  Controller for home page
-  """
-
-  use CanneryWeb, :controller
-
-  def index(conn, _params) do
-    render(conn, "index.html")
-  end
-end

lib/cannery_web/controllers/home_html.ex

@@ -0,0 +1,5 @@
+defmodule CanneryWeb.HomeHTML do
+  use CanneryWeb, :html
+
+  embed_templates "home_html/*"
+end

lib/cannery_web/controllers/user_auth.ex

@@ -3,12 +3,11 @@ defmodule CanneryWeb.UserAuth do
   Functions for user session and authentication
   """
 
+  use CanneryWeb, :verified_routes
   import Plug.Conn
   import Phoenix.Controller
   import CanneryWeb.Gettext
   alias Cannery.{Accounts, Accounts.User}
-  alias CanneryWeb.HomeLive
-  alias CanneryWeb.Router.Helpers, as: Routes
 
   # Make the remember me cookie valid for 60 days.
   # If you want bump or reduce this value, also change
@@ -39,7 +38,7 @@ defmodule CanneryWeb.UserAuth do
       dgettext("errors", "You must confirm your account and log in to access this page.")
     )
     |> maybe_store_return_to()
-    |> redirect(to: Routes.user_session_path(conn, :new))
+    |> redirect(to: ~p"/users/log_in")
     |> halt()
   end
 
@@ -49,8 +48,7 @@ defmodule CanneryWeb.UserAuth do
 
     conn
     |> renew_session()
-    |> put_session(:user_token, token)
+    |> put_token_in_session(token)
-    |> put_session(:live_socket_id, "users_sessions:#{Base.url_encode64(token)}")
     |> maybe_write_remember_me_cookie(token, params)
     |> redirect(to: user_return_to || signed_in_path(conn))
   end
@@ -96,7 +94,7 @@ defmodule CanneryWeb.UserAuth do
   """
   def log_out_user(conn) do
     user_token = get_session(conn, :user_token)
-    user_token && Accounts.delete_session_token(user_token)
+    user_token && Accounts.delete_user_session_token(user_token)
 
     if live_socket_id = get_session(conn, :live_socket_id) do
       CanneryWeb.Endpoint.broadcast(live_socket_id, "disconnect", %{})
@@ -105,7 +103,7 @@ defmodule CanneryWeb.UserAuth do
     conn
     |> renew_session()
     |> delete_resp_cookie(@remember_me_cookie)
-    |> redirect(to: "/")
+    |> redirect(to: ~p"/")
   end
 
   @doc """
@@ -119,19 +117,110 @@ defmodule CanneryWeb.UserAuth do
   end
 
   defp ensure_user_token(conn) do
-    if user_token = get_session(conn, :user_token) do
+    if token = get_session(conn, :user_token) do
-      {user_token, conn}
+      {token, conn}
     else
       conn = fetch_cookies(conn, signed: [@remember_me_cookie])
 
-      if user_token = conn.cookies[@remember_me_cookie] do
+      if token = conn.cookies[@remember_me_cookie] do
-        {user_token, put_session(conn, :user_token, user_token)}
+        {token, put_token_in_session(conn, token)}
       else
         {nil, conn}
       end
     end
   end
 
+  @doc """
+  Handles mounting and authenticating the current_user in LiveViews.
+
+  ## `on_mount` arguments
+
+    * `:mount_current_user` - Assigns current_user
+      to socket assigns based on user_token, or nil if
+      there's no user_token or no matching user.
+
+    * `:ensure_authenticated` - Authenticates the user from the session,
+      and assigns the current_user to socket assigns based
+      on user_token.
+      Redirects to login page if there's no logged user.
+
+    * `:redirect_if_user_is_authenticated` - Authenticates the user from the session.
+      Redirects to signed_in_path if there's a logged user.
+
+  ## Examples
+
+  Use the `on_mount` lifecycle macro in LiveViews to mount or authenticate
+  the current_user:
+
+      defmodule CanneryWeb.PageLive do
+        use CanneryWeb, :live_view
+
+        on_mount {CanneryWeb.UserAuth, :mount_current_user}
+        ...
+      end
+
+  Or use the `live_session` of your router to invoke the on_mount callback:
+
+      live_session :authenticated, on_mount: [{CanneryWeb.UserAuth, :ensure_authenticated}] do
+        live "/profile", ProfileLive, :index
+      end
+  """
+  def on_mount(:mount_current_user, _params, session, socket) do
+    {:cont, mount_current_user(session, socket)}
+  end
+
+  def on_mount(:ensure_authenticated, _params, session, socket) do
+    socket = mount_current_user(session, socket)
+
+    if socket.assigns.current_user do
+      {:cont, socket}
+    else
+      error_flash = dgettext("errors", "You must log in to access this page.")
+
+      socket =
+        socket
+        |> Phoenix.LiveView.put_flash(:error, error_flash)
+        |> Phoenix.LiveView.redirect(to: ~p"/users/log_in")
+
+      {:halt, socket}
+    end
+  end
+
+  def on_mount(:ensure_admin, _params, session, socket) do
+    socket = mount_current_user(session, socket)
+
+    if socket.assigns.current_user && socket.assigns.current_user.role == :admin do
+      {:cont, socket}
+    else
+      error_flash = dgettext("errors", "You must log in as an administrator to access this page.")
+
+      socket =
+        socket
+        |> Phoenix.LiveView.put_flash(:error, error_flash)
+        |> Phoenix.LiveView.redirect(to: ~p"/users/log_in")
+
+      {:halt, socket}
+    end
+  end
+
+  def on_mount(:redirect_if_user_is_authenticated, _params, session, socket) do
+    socket = mount_current_user(session, socket)
+
+    if socket.assigns.current_user do
+      {:halt, Phoenix.LiveView.redirect(socket, to: signed_in_path(socket))}
+    else
+      {:cont, socket}
+    end
+  end
+
+  defp mount_current_user(session, socket) do
+    Phoenix.Component.assign_new(socket, :current_user, fn ->
+      if user_token = session["user_token"] do
+        Accounts.get_user_by_session_token(user_token)
+      end
+    end)
+  end
+
   @doc """
   Used for routes that require the user to not be authenticated.
   """
@@ -161,7 +250,7 @@ defmodule CanneryWeb.UserAuth do
         dgettext("errors", "You must confirm your account and log in to access this page.")
       )
       |> maybe_store_return_to()
-      |> redirect(to: Routes.user_session_path(conn, :new))
+      |> redirect(to: ~p"/users/log_in")
       |> halt()
     end
   end
@@ -176,16 +265,34 @@ defmodule CanneryWeb.UserAuth do
       conn
       |> put_flash(:error, dgettext("errors", "You are not authorized to view this page."))
       |> maybe_store_return_to()
-      |> redirect(to: Routes.live_path(conn, HomeLive))
+      |> redirect(to: ~p"/")
       |> halt()
     end
   end
 
+  def put_user_locale(%{assigns: %{current_user: %{locale: locale}}} = conn, _opts) do
+    default = Application.fetch_env!(:gettext, :default_locale)
+    Gettext.put_locale(locale || default)
+    conn |> put_session(:locale, locale || default)
+  end
+
+  def put_user_locale(conn, _opts) do
+    default = Application.fetch_env!(:gettext, :default_locale)
+    Gettext.put_locale(default)
+    conn |> put_session(:locale, default)
+  end
+
+  defp put_token_in_session(conn, token) do
+    conn
+    |> put_session(:user_token, token)
+    |> put_session(:live_socket_id, "users_sessions:#{Base.url_encode64(token)}")
+  end
+
   defp maybe_store_return_to(%{method: "GET"} = conn) do
     put_session(conn, :user_return_to, current_path(conn))
   end
 
   defp maybe_store_return_to(conn), do: conn
 
-  defp signed_in_path(_conn), do: "/"
+  defp signed_in_path(_conn), do: ~p"/"
 end

lib/cannery_web/controllers/user_confirmation_controller.ex

@@ -5,14 +5,14 @@ defmodule CanneryWeb.UserConfirmationController do
   alias Cannery.Accounts
 
   def new(conn, _params) do
-    render(conn, "new.html", page_title: gettext("Confirm your account"))
+    render(conn, :new, page_title: gettext("Confirm your account"))
   end
 
   def create(conn, %{"user" => %{"email" => email}}) do
     if user = Accounts.get_user_by_email(email) do
       Accounts.deliver_user_confirmation_instructions(
         user,
-        &Routes.user_confirmation_url(conn, :confirm, &1)
+        fn token -> url(CanneryWeb.Endpoint, ~p"/users/confirm/#{token}") end
       )
     end
 
@@ -22,11 +22,10 @@ defmodule CanneryWeb.UserConfirmationController do
       :info,
       dgettext(
         "prompts",
-        "If your email is in our system and it has not been confirmed yet, " <>
+        "If your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly."
-          "you will receive an email with instructions shortly."
       )
     )
-    |> redirect(to: "/")
+    |> redirect(to: ~p"/")
   end
 
   # Do not log in the user after confirmation to avoid a
@@ -36,7 +35,7 @@ defmodule CanneryWeb.UserConfirmationController do
       {:ok, %{email: email}} ->
         conn
         |> put_flash(:info, dgettext("prompts", "%{email} confirmed successfully.", email: email))
-        |> redirect(to: "/")
+        |> redirect(to: ~p"/")
 
       :error ->
         # If there is a current user and the account was already confirmed,
@@ -45,7 +44,7 @@ defmodule CanneryWeb.UserConfirmationController do
         # a warning message.
         case conn.assigns do
           %{current_user: %{confirmed_at: confirmed_at}} when not is_nil(confirmed_at) ->
-            redirect(conn, to: "/")
+            redirect(conn, to: ~p"/")
 
           %{} ->
             conn
@@ -53,7 +52,7 @@ defmodule CanneryWeb.UserConfirmationController do
               :error,
               dgettext("errors", "User confirmation link is invalid or it has expired.")
             )
-            |> redirect(to: "/")
+            |> redirect(to: ~p"/")
         end
     end
   end

lib/cannery_web/controllers/user_confirmation_html.ex

@@ -0,0 +1,6 @@
+defmodule CanneryWeb.UserConfirmationHTML do
+  use CanneryWeb, :html
+  alias Cannery.Accounts
+
+  embed_templates "user_confirmation_html/*"
+end

lib/cannery_web/controllers/user_confirmation_html/new.html.heex

@@ -7,7 +7,7 @@
     :let={f}
     for={%{}}
     as={:user}
-    action={Routes.user_confirmation_path(@conn, :create)}
+    action={~p"/users/confirm"}
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
     <%= label(f, :email, gettext("Email"), class: "title text-lg text-primary-600") %>
@@ -21,14 +21,10 @@
   <hr class="hr" />
 
   <div class="flex flex-row justify-center items-center space-x-4">
-    <.link
+    <.link :if={Accounts.allow_registration?()} href={~p"/users/register"} class="btn btn-primary">
-      :if={Accounts.allow_registration?()}
-      href={Routes.user_registration_path(@conn, :new)}
-      class="btn btn-primary"
-    >
       <%= dgettext("actions", "Register") %>
     </.link>
-    <.link href={Routes.user_session_path(@conn, :new)} class="btn btn-primary">
+    <.link href={~p"/users/log_in"} class="btn btn-primary">
       <%= dgettext("actions", "Log in") %>
     </.link>
   </div>

lib/cannery_web/controllers/user_registration_controller.ex

@@ -2,7 +2,6 @@ defmodule CanneryWeb.UserRegistrationController do
   use CanneryWeb, :controller
   import CanneryWeb.Gettext
   alias Cannery.{Accounts, Accounts.Invites}
-  alias CanneryWeb.{Endpoint, HomeLive}
   alias Ecto.Changeset
 
   def new(conn, %{"invite" => invite_token}) do
@@ -11,7 +10,7 @@ defmodule CanneryWeb.UserRegistrationController do
     else
       conn
       |> put_flash(:error, dgettext("errors", "Sorry, this invite was not found or expired"))
-      |> redirect(to: Routes.live_path(Endpoint, HomeLive))
+      |> redirect(to: ~p"/")
     end
   end
 
@@ -21,13 +20,13 @@ defmodule CanneryWeb.UserRegistrationController do
     else
       conn
       |> put_flash(:error, dgettext("errors", "Sorry, public registration is disabled"))
-      |> redirect(to: Routes.live_path(Endpoint, HomeLive))
+      |> redirect(to: ~p"/")
     end
   end
 
   # renders new user registration page
   defp render_new(conn, invite_token \\ nil) do
-    render(conn, "new.html",
+    render(conn, :new,
       changeset: Accounts.change_user_registration(),
       invite_token: invite_token,
       page_title: gettext("Register")
@@ -40,7 +39,7 @@ defmodule CanneryWeb.UserRegistrationController do
     else
       conn
       |> put_flash(:error, dgettext("errors", "Sorry, this invite was not found or expired"))
-      |> redirect(to: Routes.live_path(Endpoint, HomeLive))
+      |> redirect(to: ~p"/")
     end
   end
 
@@ -50,7 +49,7 @@ defmodule CanneryWeb.UserRegistrationController do
     else
       conn
       |> put_flash(:error, dgettext("errors", "Sorry, public registration is disabled"))
-      |> redirect(to: Routes.live_path(Endpoint, HomeLive))
+      |> redirect(to: ~p"/")
     end
   end
 
@@ -59,17 +58,17 @@ defmodule CanneryWeb.UserRegistrationController do
       {:ok, user} ->
         Accounts.deliver_user_confirmation_instructions(
           user,
-          &Routes.user_confirmation_url(conn, :confirm, &1)
+          fn token -> url(CanneryWeb.Endpoint, ~p"/users/confirm/#{token}") end
         )
 
         conn
         |> put_flash(:info, dgettext("prompts", "Please check your email to verify your account"))
-        |> redirect(to: Routes.user_session_path(Endpoint, :new))
+        |> redirect(to: ~p"/users/log_in")
 
       {:error, :invalid_token} ->
         conn
         |> put_flash(:error, dgettext("errors", "Sorry, this invite was not found or expired"))
-        |> redirect(to: Routes.live_path(Endpoint, HomeLive))
+        |> redirect(to: ~p"/")
 
       {:error, %Changeset{} = changeset} ->
         conn |> render("new.html", changeset: changeset, invite_token: invite_token)

lib/cannery_web/controllers/user_registration_html.ex

@@ -0,0 +1,5 @@
+defmodule CanneryWeb.UserRegistrationHTML do
+  use CanneryWeb, :html
+
+  embed_templates "user_registration_html/*"
+end

lib/cannery_web/controllers/user_registration_html/new.html.heex

@@ -6,7 +6,7 @@
   <.form
     :let={f}
     for={@changeset}
-    action={Routes.user_registration_path(@conn, :create)}
+    action={~p"/users/register"}
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
     <p :if={@changeset.action && not @changeset.valid?()} class="alert alert-danger col-span-3">
@@ -40,10 +40,10 @@
   <hr class="hr" />
 
   <div class="flex flex-row justify-center items-center space-x-4">
-    <.link href={Routes.user_session_path(@conn, :new)} class="btn btn-primary">
+    <.link href={~p"/users/log_in"} class="btn btn-primary">
       <%= dgettext("actions", "Log in") %>
     </.link>
-    <.link href={Routes.user_reset_password_path(@conn, :new)} class="btn btn-primary">
+    <.link href={~p"/users/reset_password"} class="btn btn-primary">
       <%= dgettext("actions", "Forgot your password?") %>
     </.link>
   </div>

lib/cannery_web/controllers/user_reset_password_controller.ex

@@ -6,14 +6,14 @@ defmodule CanneryWeb.UserResetPasswordController do
   plug :get_user_by_reset_password_token when action in [:edit, :update]
 
   def new(conn, _params) do
-    render(conn, "new.html", page_title: gettext("Forgot your password?"))
+    render(conn, :new, page_title: gettext("Forgot your password?"))
   end
 
   def create(conn, %{"user" => %{"email" => email}}) do
     if user = Accounts.get_user_by_email(email) do
       Accounts.deliver_user_reset_password_instructions(
         user,
-        &Routes.user_reset_password_url(conn, :edit, &1)
+        fn token -> url(CanneryWeb.Endpoint, ~p"/users/reset_password/#{token}") end
       )
     end
 
@@ -23,15 +23,14 @@ defmodule CanneryWeb.UserResetPasswordController do
       :info,
       dgettext(
         "prompts",
-        "If your email is in our system, you will receive instructions to " <>
+        "If your email is in our system, you will receive instructions to reset your password shortly."
-          "reset your password shortly."
       )
     )
-    |> redirect(to: "/")
+    |> redirect(to: ~p"/")
   end
 
   def edit(conn, _params) do
-    render(conn, "edit.html",
+    render(conn, :edit,
       changeset: Accounts.change_user_password(conn.assigns.user),
       page_title: gettext("Reset your password")
     )
@@ -44,10 +43,10 @@ defmodule CanneryWeb.UserResetPasswordController do
       {:ok, _} ->
         conn
         |> put_flash(:info, dgettext("prompts", "Password reset successfully."))
-        |> redirect(to: Routes.user_session_path(conn, :new))
+        |> redirect(to: ~p"/users/log_in")
 
       {:error, changeset} ->
-        render(conn, "edit.html", changeset: changeset)
+        render(conn, :edit, changeset: changeset)
     end
   end
 
@@ -62,7 +61,7 @@ defmodule CanneryWeb.UserResetPasswordController do
         :error,
         dgettext("errors", "Reset password link is invalid or it has expired.")
       )
-      |> redirect(to: "/")
+      |> redirect(to: ~p"/")
       |> halt()
     end
   end

lib/cannery_web/controllers/user_reset_password_html.ex

@@ -0,0 +1,6 @@
+defmodule CanneryWeb.UserResetPasswordHTML do
+  use CanneryWeb, :html
+  alias Cannery.Accounts
+
+  embed_templates "user_reset_password_html/*"
+end

lib/cannery_web/controllers/user_reset_password_html/edit.html.heex

@@ -6,7 +6,7 @@
   <.form
     :let={f}
     for={@changeset}
-    action={Routes.user_reset_password_path(@conn, :update, @token)}
+    action={~p"/users/reset_password/#{@token}"}
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
     <p :if={@changeset.action && not @changeset.valid?()} class="alert alert-danger col-span-3">
@@ -34,14 +34,10 @@
   <hr class="hr" />
 
   <div class="flex flex-row justify-center items-center space-x-4">
-    <.link
+    <.link :if={Accounts.allow_registration?()} href={~p"/users/register"} class="btn btn-primary">
-      :if={Accounts.allow_registration?()}
-      href={Routes.user_registration_path(@conn, :new)}
-      class="btn btn-primary"
-    >
       <%= dgettext("actions", "Register") %>
     </.link>
-    <.link href={Routes.user_session_path(@conn, :new)} class="btn btn-primary">
+    <.link href={~p"/users/log_in"} class="btn btn-primary">
       <%= dgettext("actions", "Log in") %>
     </.link>
   </div>

lib/cannery_web/controllers/user_reset_password_html/new.html.heex

@@ -7,7 +7,7 @@
     :let={f}
     for={%{}}
     as={:user}
-    action={Routes.user_reset_password_path(@conn, :create)}
+    action={~p"/users/reset_password"}
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
     <%= label(f, :email, gettext("Email"), class: "title text-lg text-primary-600") %>
@@ -21,14 +21,10 @@
   <hr class="hr" />
 
   <div class="flex flex-row justify-center items-center space-x-4">
-    <.link
+    <.link :if={Accounts.allow_registration?()} href={~p"/users/register"} class="btn btn-primary">
-      :if={Accounts.allow_registration?()}
-      href={Routes.user_registration_path(@conn, :new)}
-      class="btn btn-primary"
-    >
       <%= dgettext("actions", "Register") %>
     </.link>
-    <.link href={Routes.user_session_path(@conn, :new)} class="btn btn-primary">
+    <.link href={~p"/users/log_in"} class="btn btn-primary">
       <%= dgettext("actions", "Log in") %>
     </.link>
   </div>

lib/cannery_web/controllers/user_session_controller.ex

@@ -5,7 +5,7 @@ defmodule CanneryWeb.UserSessionController do
   alias CanneryWeb.UserAuth
 
   def new(conn, _params) do
-    render(conn, "new.html", error_message: nil, page_title: gettext("Log in"))
+    render(conn, :new, error_message: nil, page_title: gettext("Log in"))
   end
 
   def create(conn, %{"user" => user_params}) do
@@ -14,7 +14,7 @@ defmodule CanneryWeb.UserSessionController do
     if user = Accounts.get_user_by_email_and_password(email, password) do
       UserAuth.log_in_user(conn, user, user_params)
     else
-      render(conn, "new.html", error_message: dgettext("errors", "Invalid email or password"))
+      render(conn, :new, error_message: dgettext("errors", "Invalid email or password"))
     end
   end
 

lib/cannery_web/controllers/user_session_html.ex

@@ -0,0 +1,6 @@
+defmodule CanneryWeb.UserSessionHTML do
+  use CanneryWeb, :html
+  alias Cannery.Accounts
+
+  embed_templates "user_session_html/*"
+end

lib/cannery_web/controllers/user_session_html/new.html.heex

@@ -6,8 +6,8 @@
   <.form
     :let={f}
     for={@conn}
-    action={Routes.user_session_path(@conn, :create)}
+    action={~p"/users/log_in"}
-    as="user"
+    as={:user}
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
     <p :if={@error_message} class="alert alert-danger col-span-3">
@@ -31,14 +31,10 @@
   <hr class="hr" />
 
   <div class="flex flex-row justify-center items-center space-x-4">
-    <.link
+    <.link :if={Accounts.allow_registration?()} href={~p"/users/register"} class="btn btn-primary">
-      :if={Accounts.allow_registration?()}
-      href={Routes.user_registration_path(@conn, :new)}
-      class="btn btn-primary"
-    >
       <%= dgettext("actions", "Register") %>
     </.link>
-    <.link href={Routes.user_reset_password_path(@conn, :new)} class="btn btn-primary">
+    <.link href={~p"/users/reset_password"} class="btn btn-primary">
       <%= dgettext("actions", "Forgot your password?") %>
     </.link>
   </div>

lib/cannery_web/controllers/user_settings_controller.ex

@@ -2,12 +2,12 @@ defmodule CanneryWeb.UserSettingsController do
   use CanneryWeb, :controller
   import CanneryWeb.Gettext
   alias Cannery.Accounts
-  alias CanneryWeb.{HomeLive, UserAuth}
+  alias CanneryWeb.UserAuth
 
   plug :assign_email_and_password_changesets
 
   def edit(conn, _params) do
-    render(conn, "edit.html", page_title: gettext("Settings"))
+    render(conn, :edit, page_title: gettext("Settings"))
   end
 
   def update(%{assigns: %{current_user: user}} = conn, %{
@@ -20,7 +20,7 @@ defmodule CanneryWeb.UserSettingsController do
         Accounts.deliver_update_email_instructions(
           applied_user,
           user.email,
-          &Routes.user_settings_url(conn, :confirm_email, &1)
+          fn token -> url(CanneryWeb.Endpoint, ~p"/users/settings/confirm_email/#{token}") end
         )
 
         conn
@@ -31,10 +31,10 @@ defmodule CanneryWeb.UserSettingsController do
             "A link to confirm your email change has been sent to the new address."
           )
         )
-        |> redirect(to: Routes.user_settings_path(conn, :edit))
+        |> redirect(to: ~p"/users/settings")
 
       {:error, changeset} ->
-        conn |> render("edit.html", email_changeset: changeset)
+        conn |> render(:edit, email_changeset: changeset)
     end
   end
 
@@ -47,11 +47,11 @@ defmodule CanneryWeb.UserSettingsController do
       {:ok, user} ->
         conn
         |> put_flash(:info, dgettext("prompts", "Password updated successfully."))
-        |> put_session(:user_return_to, Routes.user_settings_path(conn, :edit))
+        |> put_session(:user_return_to, ~p"/users/settings")
         |> UserAuth.log_in_user(user)
 
       {:error, changeset} ->
-        conn |> render("edit.html", password_changeset: changeset)
+        conn |> render(:edit, password_changeset: changeset)
     end
   end
 
@@ -63,10 +63,10 @@ defmodule CanneryWeb.UserSettingsController do
       {:ok, _user} ->
         conn
         |> put_flash(:info, dgettext("prompts", "Language updated successfully."))
-        |> redirect(to: Routes.user_settings_path(conn, :edit))
+        |> redirect(to: ~p"/users/settings")
 
       {:error, changeset} ->
-        conn |> render("edit.html", locale_changeset: changeset)
+        conn |> render(:edit, locale_changeset: changeset)
     end
   end
 
@@ -75,7 +75,7 @@ defmodule CanneryWeb.UserSettingsController do
       :ok ->
         conn
         |> put_flash(:info, dgettext("prompts", "Email changed successfully."))
-        |> redirect(to: Routes.user_settings_path(conn, :edit))
+        |> redirect(to: ~p"/users/settings")
 
       :error ->
         conn
@@ -83,7 +83,7 @@ defmodule CanneryWeb.UserSettingsController do
           :error,
           dgettext("errors", "Email change link is invalid or it has expired.")
         )
-        |> redirect(to: Routes.user_settings_path(conn, :edit))
+        |> redirect(to: ~p"/users/settings")
     end
   end
 
@@ -93,11 +93,11 @@ defmodule CanneryWeb.UserSettingsController do
 
       conn
       |> put_flash(:error, dgettext("prompts", "Your account has been deleted"))
-      |> redirect(to: Routes.live_path(conn, HomeLive))
+      |> redirect(to: ~p"/")
     else
       conn
       |> put_flash(:error, dgettext("errors", "Unable to delete user"))
-      |> redirect(to: Routes.user_settings_path(conn, :edit))
+      |> redirect(to: ~p"/users/settings")
     end
   end
 

lib/cannery_web/controllers/user_settings_html.ex

@@ -0,0 +1,5 @@
+defmodule CanneryWeb.UserSettingsHTML do
+  use CanneryWeb, :html
+
+  embed_templates "user_settings_html/*"
+end

lib/cannery_web/controllers/user_settings_html/edit.html.heex

@@ -8,7 +8,7 @@
   <.form
     :let={f}
     for={@email_changeset}
-    action={Routes.user_settings_path(@conn, :update)}
+    action={~p"/users/settings"}
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
     <h3 class="title text-primary-600 text-lg text-center col-span-3">
@@ -50,7 +50,7 @@
   <.form
     :let={f}
     for={@password_changeset}
-    action={Routes.user_settings_path(@conn, :update)}
+    action={~p"/users/settings"}
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
     <h3 class="title text-primary-600 text-lg text-center col-span-3">
@@ -104,7 +104,7 @@
   <.form
     :let={f}
     for={@locale_changeset}
-    action={Routes.user_settings_path(@conn, :update)}
+    action={~p"/users/settings"}
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
     <%= label(f, :locale, dgettext("actions", "Change Language"),
@@ -142,17 +142,13 @@
   <hr class="hr" />
 
   <div class="flex justify-center items-center">
-    <.link
+    <.link href={~p"/export/json"} class="mx-4 my-2 btn btn-primary" target="_blank">
-      href={Routes.export_path(@conn, :export, :json)}
-      class="mx-4 my-2 btn btn-primary"
-      target="_blank"
-    >
       <%= dgettext("actions", "Export Data as JSON") %>
     </.link>
 
     <.link
-      href={Routes.user_settings_path(@conn, :delete, @current_user)}
+      href={~p"/users/settings/#{@current_user}"}
-      method={:delete}
+      method="delete"
       class="mx-4 my-2 btn btn-alert"
       data-confirm={dgettext("prompts", "Are you sure you want to delete your account?")}
     >

lib/cannery_web/endpoint.ex

@@ -20,7 +20,7 @@ defmodule CanneryWeb.Endpoint do
     at: "/",
     from: :cannery,
     gzip: false,
-    only: ~w(css fonts images js favicon.ico robots.txt)
+    only: CanneryWeb.static_paths()
 
   # Code reloading can be explicitly enabled under the
   # :code_reloader configuration of your endpoint.

lib/cannery_web/html_helpers.ex

@@ -1,8 +1,6 @@
-defmodule CanneryWeb.ViewHelpers do
+defmodule CanneryWeb.HTMLHelpers do
   @moduledoc """
-  Contains common helpers that can be used in liveviews and regular views. These
+  Contains common helpers that are used for rendering
-  are automatically imported into any Phoenix View using `use CanneryWeb,
-  :view`
   """
 
   use Phoenix.Component

lib/cannery_web/live/container_live/index.ex

@@ -105,12 +105,11 @@ defmodule CanneryWeb.ContainerLive.Index do
   end
 
   def handle_event("search", %{"search" => %{"search_term" => ""}}, socket) do
-    {:noreply, socket |> push_patch(to: Routes.container_index_path(Endpoint, :index))}
+    {:noreply, socket |> push_patch(to: ~p"/containers")}
   end
 
   def handle_event("search", %{"search" => %{"search_term" => search_term}}, socket) do
-    {:noreply,
+    {:noreply, socket |> push_patch(to: ~p"/containers/search/#{search_term}")}
-     socket |> push_patch(to: Routes.container_index_path(Endpoint, :search, search_term))}
   end
 
   defp display_containers(%{assigns: %{search: search, current_user: current_user}} = socket) do

lib/cannery_web/live/container_live/index.html.heex

@@ -9,11 +9,11 @@
       <%= display_emoji("😔") %>
     </h2>
 
-    <.link patch={Routes.container_index_path(Endpoint, :new)} class="btn btn-primary">
+    <.link patch={~p"/containers/new"} class="btn btn-primary">
       <%= dgettext("actions", "Add your first container!") %>
     </.link>
   <% else %>
-    <.link patch={Routes.container_index_path(Endpoint, :new)} class="btn btn-primary">
+    <.link patch={~p"/containers/new"} class="btn btn-primary">
       <%= dgettext("actions", "New Container") %>
     </.link>
 
@@ -59,7 +59,7 @@
           <:tag_actions :let={container}>
             <div class="mx-4 my-2">
               <.link
-                patch={Routes.container_index_path(Endpoint, :edit_tags, container)}
+                patch={~p"/containers/edit_tags/#{container}"}
                 class="text-primary-600 link"
                 aria-label={
                   dgettext("actions", "Tag %{container_name}", container_name: container.name)
@@ -71,7 +71,7 @@
           </:tag_actions>
           <:actions :let={container}>
             <.link
-              patch={Routes.container_index_path(Endpoint, :edit, container)}
+              patch={~p"/containers/edit/#{container}"}
               class="text-primary-600 link"
               aria-label={
                 dgettext("actions", "Edit %{container_name}", container_name: container.name)
@@ -81,7 +81,7 @@
             </.link>
 
             <.link
-              patch={Routes.container_index_path(Endpoint, :clone, container)}
+              patch={~p"/containers/clone/#{container}"}
               class="text-primary-600 link"
               aria-label={
                 dgettext("actions", "Clone %{container_name}", container_name: container.name)
@@ -118,7 +118,7 @@
             <:tag_actions>
               <div class="mx-4 my-2">
                 <.link
-                  patch={Routes.container_index_path(Endpoint, :edit_tags, container)}
+                  patch={~p"/containers/edit_tags/#{container}"}
                   class="text-primary-600 link"
                   aria-label={
                     dgettext("actions", "Tag %{container_name}", container_name: container.name)
@@ -129,7 +129,7 @@
               </div>
             </:tag_actions>
             <.link
-              patch={Routes.container_index_path(Endpoint, :edit, container)}
+              patch={~p"/containers/edit/#{container}"}
               class="text-primary-600 link"
               aria-label={
                 dgettext("actions", "Edit %{container_name}", container_name: container.name)
@@ -139,7 +139,7 @@
             </.link>
 
             <.link
-              patch={Routes.container_index_path(Endpoint, :clone, container)}
+              patch={~p"/containers/clone/#{container}"}
               class="text-primary-600 link"
               aria-label={
                 dgettext("actions", "Clone %{container_name}", container_name: container.name)
@@ -173,26 +173,26 @@
 
 <%= case @live_action do %>
   <% modifying when modifying in [:new, :edit, :clone] -> %>
-    <.modal return_to={Routes.container_index_path(Endpoint, :index)}>
+    <.modal return_to={~p"/containers"}>
       <.live_component
         module={CanneryWeb.ContainerLive.FormComponent}
         id={@container.id || :new}
         title={@page_title}
         action={@live_action}
         container={@container}
-        return_to={Routes.container_index_path(Endpoint, :index)}
+        return_to={~p"/containers"}
         current_user={@current_user}
       />
     </.modal>
   <% :edit_tags -> %>
-    <.modal return_to={Routes.container_index_path(Endpoint, :index)}>
+    <.modal return_to={~p"/containers"}>
       <.live_component
         module={CanneryWeb.ContainerLive.EditTagsComponent}
         id={@container.id}
         title={@page_title}
         action={@live_action}
         container={@container}
-        current_path={Routes.container_index_path(Endpoint, :edit_tags, @container)}
+        current_path={~p"/containers/edit_tags/#{@container}"}
         current_user={@current_user}
       />
     </.modal>

lib/cannery_web/live/container_live/show.ex

@@ -5,7 +5,6 @@ defmodule CanneryWeb.ContainerLive.Show do
 
   use CanneryWeb, :live_view
   alias Cannery.{Accounts.User, ActivityLog, Ammo, Containers, Containers.Container}
-  alias CanneryWeb.Endpoint
   alias Ecto.Changeset
   alias Phoenix.LiveView.Socket
 
@@ -59,10 +58,7 @@ defmodule CanneryWeb.ContainerLive.Show do
       |> case do
         {:ok, %{name: container_name}} ->
           prompt = dgettext("prompts", "%{name} has been deleted", name: container_name)
-
+          socket |> put_flash(:info, prompt) |> push_navigate(to: ~p"/containers")
-          socket
-          |> put_flash(:info, prompt)
-          |> push_navigate(to: Routes.container_index_path(socket, :index))
 
         {:error, %{action: :delete, errors: [packs: _error], valid?: false} = changeset} ->
           packs_error = changeset |> changeset_errors(:packs) |> Enum.join(", ")

lib/cannery_web/live/container_live/show.html.heex

@@ -30,7 +30,7 @@
 
   <div class="flex space-x-4 justify-center items-center text-primary-600">
     <.link
-      patch={Routes.container_show_path(Endpoint, :edit, @container)}
+      patch={~p"/container/edit/#{@container}"}
       class="text-primary-600 link"
       aria-label={dgettext("actions", "Edit %{container_name}", container_name: @container.name)}
     >
@@ -61,10 +61,7 @@
         <%= display_emoji("😔") %>
       </h2>
 
-      <.link
+      <.link patch={~p"/container/edit_tags/#{@container}"} class="btn btn-primary">
-        patch={Routes.container_show_path(Endpoint, :edit_tags, @container)}
-        class="btn btn-primary"
-      >
         <%= dgettext("actions", "Why not add one?") %>
       </.link>
     </div>
@@ -73,10 +70,7 @@
       <.simple_tag_card :for={tag <- @container.tags} tag={tag} />
 
       <div class="mx-4 my-2">
-        <.link
+        <.link patch={~p"/container/edit_tags/#{@container}"} class="text-primary-600 link">
-          patch={Routes.container_show_path(Endpoint, :edit_tags, @container)}
-          class="text-primary-600 link"
-        >
           <i class="fa-fw fa-lg fas fa-tags"></i>
         </.link>
       </div>
@@ -132,7 +126,7 @@
           show_used={false}
         >
           <:type :let={%{name: type_name} = type}>
-            <.link navigate={Routes.type_show_path(Endpoint, :show, type)} class="link">
+            <.link navigate={~p"/type/#{type}"} class="link">
               <%= type_name %>
             </.link>
           </:type>
@@ -155,27 +149,27 @@
 
 <%= case @live_action do %>
   <% :edit -> %>
-    <.modal return_to={Routes.container_show_path(Endpoint, :show, @container)}>
+    <.modal return_to={~p"/container/#{@container}"}>
       <.live_component
         module={CanneryWeb.ContainerLive.FormComponent}
         id={@container.id}
         title={@page_title}
         action={@live_action}
         container={@container}
-        return_to={Routes.container_show_path(Endpoint, :show, @container)}
+        return_to={~p"/container/#{@container}"}
         current_user={@current_user}
       />
     </.modal>
   <% :edit_tags -> %>
-    <.modal return_to={Routes.container_show_path(Endpoint, :show, @container)}>
+    <.modal return_to={~p"/container/#{@container}"}>
       <.live_component
         module={CanneryWeb.ContainerLive.EditTagsComponent}
         id={@container.id}
         title={@page_title}
         action={@live_action}
         container={@container}
-        return_to={Routes.container_show_path(Endpoint, :show, @container)}
+        return_to={~p"/container/#{@container}"}
-        current_path={Routes.container_show_path(Endpoint, :edit_tags, @container)}
+        current_path={~p"/container/edit_tags/#{@container}"}
         current_user={@current_user}
       />
     </.modal>

lib/cannery_web/live/home_live.ex

@@ -5,7 +5,6 @@ defmodule CanneryWeb.HomeLive do
 
   use CanneryWeb, :live_view
   alias Cannery.Accounts
-  alias CanneryWeb.Endpoint
 
   @version Mix.Project.config()[:version]
 

lib/cannery_web/live/home_live.html.heex

@@ -1,6 +1,6 @@
 <div class="mx-auto px-8 sm:px-16 flex flex-col justify-center items-center text-center space-y-4 max-w-3xl">
   <img
-    src={Routes.static_path(Endpoint, "/images/cannery.svg")}
+    src={~p"/images/cannery.svg"}
     alt={gettext("Cannery logo")}
     class="inline-block w-32 hover:-mt-2 hover:mb-2 transition-all duration-500 ease-in-out"
     title={gettext("isn't he cute >:3")}
@@ -59,7 +59,7 @@
       </b>
       <p>
         <%= if @admins |> Enum.empty?() do %>
-          <.link href={Routes.user_registration_path(Endpoint, :new)} class="hover:underline">
+          <.link href={~p"/users/register"} class="hover:underline">
             <%= dgettext("prompts", "Register to setup Cannery") %>
           </.link>
         <% else %>

lib/cannery_web/live/invite_live/index.html.heex

@@ -9,11 +9,11 @@
       <%= display_emoji("😔") %>
     </h1>
 
-    <.link patch={Routes.invite_index_path(Endpoint, :new)} class="btn btn-primary">
+    <.link patch={~p"/invites/new"} class="btn btn-primary">
       <%= dgettext("actions", "Invite someone new!") %>
     </.link>
   <% else %>
-    <.link patch={Routes.invite_index_path(Endpoint, :new)} class="btn btn-primary">
+    <.link patch={~p"/invites/new"} class="btn btn-primary">
       <%= dgettext("actions", "Create Invite") %>
     </.link>
   <% end %>
@@ -40,7 +40,7 @@
         </form>
       </:code_actions>
       <.link
-        patch={Routes.invite_index_path(Endpoint, :edit, invite)}
+        patch={~p"/invites/#{invite}/edit"}
         class="text-primary-600 link"
         aria-label={
           dgettext("actions", "Edit invite for %{invite_name}", invite_name: invite.name)
@@ -149,14 +149,14 @@
   <% end %>
 </div>
 
-<.modal :if={@live_action in [:new, :edit]} return_to={Routes.invite_index_path(Endpoint, :index)}>
+<.modal :if={@live_action in [:new, :edit]} return_to={~p"/invites"}>
   <.live_component
     module={CanneryWeb.InviteLive.FormComponent}
     id={@invite.id || :new}
     title={@page_title}
     action={@live_action}
     invite={@invite}
-    return_to={Routes.invite_index_path(Endpoint, :index)}
+    return_to={~p"/invites"}
     current_user={@current_user}
   />
 </.modal>

lib/cannery_web/live/pack_live/index.ex

@@ -113,13 +113,11 @@ defmodule CanneryWeb.PackLive.Index do
   end
 
   def handle_event("search", %{"search" => %{"search_term" => ""}}, socket) do
-    {:noreply, socket |> push_patch(to: Routes.pack_index_path(Endpoint, :index))}
+    {:noreply, socket |> push_patch(to: ~p"/ammo")}
   end
 
   def handle_event("search", %{"search" => %{"search_term" => search_term}}, socket) do
-    socket = socket |> push_patch(to: Routes.pack_index_path(Endpoint, :search, search_term))
+    {:noreply, socket |> push_patch(to: ~p"/ammo/search/#{search_term}")}
-
-    {:noreply, socket}
   end
 
   def handle_event("change_class", %{"type" => %{"class" => "rifle"}}, socket) do

lib/cannery_web/live/pack_live/index.html.heex

@@ -10,7 +10,7 @@
           <%= dgettext("prompts", "You'll need to") %>
         </h2>
 
-        <.link navigate={Routes.container_index_path(Endpoint, :new)} class="btn btn-primary">
+        <.link navigate={~p"/containers/new"} class="btn btn-primary">
           <%= dgettext("actions", "add a container first") %>
         </.link>
       </div>
@@ -20,7 +20,7 @@
           <%= dgettext("prompts", "You'll need to") %>
         </h2>
 
-        <.link navigate={Routes.type_index_path(Endpoint, :new)} class="btn btn-primary">
+        <.link navigate={~p"/catalog/new"} class="btn btn-primary">
           <%= dgettext("actions", "add a type first") %>
         </.link>
       </div>
@@ -30,11 +30,11 @@
         <%= display_emoji("😔") %>
       </h2>
 
-      <.link patch={Routes.pack_index_path(Endpoint, :new)} class="btn btn-primary">
+      <.link patch={~p"/ammo/new"} class="btn btn-primary">
         <%= dgettext("actions", "Add your first box!") %>
       </.link>
     <% true -> %>
-      <.link patch={Routes.pack_index_path(Endpoint, :new)} class="btn btn-primary">
+      <.link patch={~p"/ammo/new"} class="btn btn-primary">
         <%= dgettext("actions", "Add Ammo") %>
       </.link>
 
@@ -103,7 +103,7 @@
           show_used={@show_used}
         >
           <:type :let={%{name: type_name} = type}>
-            <.link navigate={Routes.type_show_path(Endpoint, :show, type)} class="link">
+            <.link navigate={~p"/type/#{type}"} class="link">
               <%= type_name %>
             </.link>
           </:type>
@@ -121,7 +121,7 @@
               </button>
 
               <.link
-                patch={Routes.pack_index_path(Endpoint, :add_shot_record, pack)}
+                patch={~p"/ammo/add_shot_record/#{pack}"}
                 class="mx-2 my-1 text-sm btn btn-primary"
               >
                 <%= dgettext("actions", "Record shots") %>
@@ -130,17 +130,11 @@
           </:range>
           <:container :let={{pack, %{name: container_name} = container}}>
             <div class="min-w-20 py-2 px-4 h-full flex flew-wrap justify-center items-center">
-              <.link
+              <.link navigate={~p"/container/#{container}"} class="mx-2 my-1 link">
-                navigate={Routes.container_show_path(Endpoint, :show, container)}
-                class="mx-2 my-1 link"
-              >
                 <%= container_name %>
               </.link>
 
-              <.link
+              <.link patch={~p"/ammo/move/#{pack}"} class="mx-2 my-1 text-sm btn btn-primary">
-                patch={Routes.pack_index_path(Endpoint, :move, pack)}
-                class="mx-2 my-1 text-sm btn btn-primary"
-              >
                 <%= dgettext("actions", "Move ammo") %>
               </.link>
             </div>
@@ -148,7 +142,7 @@
           <:actions :let={%{count: pack_count} = pack}>
             <div class="py-2 px-4 h-full space-x-4 flex justify-center items-center">
               <.link
-                navigate={Routes.pack_show_path(Endpoint, :show, pack)}
+                navigate={~p"/ammo/show/#{pack}"}
                 class="text-primary-600 link"
                 aria-label={
                   dgettext("actions", "View pack of %{pack_count} bullets", pack_count: pack_count)
@@ -158,7 +152,7 @@
               </.link>
 
               <.link
-                patch={Routes.pack_index_path(Endpoint, :edit, pack)}
+                patch={~p"/ammo/edit/#{pack}"}
                 class="text-primary-600 link"
                 aria-label={
                   dgettext("actions", "Edit pack of %{pack_count} bullets", pack_count: pack_count)
@@ -168,7 +162,7 @@
               </.link>
 
               <.link
-                patch={Routes.pack_index_path(Endpoint, :clone, pack)}
+                patch={~p"/ammo/clone/#{pack}"}
                 class="text-primary-600 link"
                 aria-label={
                   dgettext("actions", "Clone pack of %{pack_count} bullets",
@@ -202,38 +196,38 @@
 
 <%= case @live_action do %>
   <% create when create in [:new, :edit, :clone] -> %>
-    <.modal return_to={Routes.pack_index_path(Endpoint, :index)}>
+    <.modal return_to={~p"/ammo"}>
       <.live_component
         module={CanneryWeb.PackLive.FormComponent}
         id={@pack.id || :new}
         title={@page_title}
         action={@live_action}
         pack={@pack}
-        return_to={Routes.pack_index_path(Endpoint, :index)}
+        return_to={~p"/ammo"}
         current_user={@current_user}
       />
     </.modal>
   <% :add_shot_record -> %>
-    <.modal return_to={Routes.pack_index_path(Endpoint, :index)}>
+    <.modal return_to={~p"/ammo"}>
       <.live_component
         module={CanneryWeb.Components.AddShotRecordComponent}
         id={:new}
         title={@page_title}
         action={@live_action}
         pack={@pack}
-        return_to={Routes.pack_index_path(Endpoint, :index)}
+        return_to={~p"/ammo"}
         current_user={@current_user}
       />
     </.modal>
   <% :move -> %>
-    <.modal return_to={Routes.pack_index_path(Endpoint, :index)}>
+    <.modal return_to={~p"/ammo"}>
       <.live_component
         module={CanneryWeb.Components.MovePackComponent}
         id={@pack.id}
         title={@page_title}
         action={@live_action}
         pack={@pack}
-        return_to={Routes.pack_index_path(Endpoint, :index)}
+        return_to={~p"/ammo"}
         current_user={@current_user}
       />
     </.modal>

lib/cannery_web/live/pack_live/show.ex

@@ -7,7 +7,6 @@ defmodule CanneryWeb.PackLive.Show do
   alias Cannery.{ActivityLog, ActivityLog.ShotRecord}
   alias Cannery.{Ammo, Ammo.Pack}
   alias Cannery.{ComparableDate, Containers}
-  alias CanneryWeb.Endpoint
   alias Phoenix.LiveView.Socket
 
   @impl true
@@ -53,7 +52,7 @@ defmodule CanneryWeb.PackLive.Show do
     pack |> Ammo.delete_pack!(current_user)
 
     prompt = dgettext("prompts", "Ammo deleted succesfully")
-    redirect_to = Routes.pack_index_path(socket, :index)
+    redirect_to = ~p"/ammo"
 
     {:noreply, socket |> put_flash(:info, prompt) |> push_navigate(to: redirect_to)}
   end
@@ -139,7 +138,7 @@ defmodule CanneryWeb.PackLive.Show do
             ~H"""
             <div class="px-4 py-2 space-x-4 flex justify-center items-center">
               <.link
-                patch={Routes.pack_show_path(Endpoint, :edit_shot_record, @pack, @shot_record)}
+                patch={~p"/ammo/show/#{@pack}/edit/#{@shot_record}"}
                 class="text-primary-600 link"
                 aria-label={
                   dgettext("actions", "Edit shot record of %{shot_record_count} shots",

lib/cannery_web/live/pack_live/show.html.heex

@@ -48,15 +48,12 @@
 
   <div class="flex flex-col justify-center items-center">
     <div class="flex flex-wrap justify-center items-center text-primary-600">
-      <.link
+      <.link navigate={~p"/type/#{@pack.type}"} class="mx-4 my-2 btn btn-primary">
-        navigate={Routes.type_show_path(Endpoint, :show, @pack.type)}
-        class="mx-4 my-2 btn btn-primary"
-      >
         <%= dgettext("actions", "View in Catalog") %>
       </.link>
 
       <.link
-        patch={Routes.pack_show_path(Endpoint, :edit, @pack)}
+        patch={~p"/ammo/show/edit/#{@pack}"}
         class="mx-4 my-2 text-primary-600 link"
         aria-label={
           dgettext("actions", "Edit pack of %{pack_count} bullets", pack_count: @pack.count)
@@ -85,14 +82,11 @@
           else: dgettext("actions", "Stage for range") %>
       </button>
 
-      <.link patch={Routes.pack_show_path(Endpoint, :move, @pack)} class="btn btn-primary">
+      <.link patch={~p"/ammo/show/move/#{@pack}"} class="btn btn-primary">
         <%= dgettext("actions", "Move ammo") %>
       </.link>
 
-      <.link
+      <.link patch={~p"/ammo/show/add_shot_record/#{@pack}"} class="mx-4 my-2 btn btn-primary">
-        patch={Routes.pack_show_path(Endpoint, :add_shot_record, @pack)}
-        class="mx-4 my-2 btn btn-primary"
-      >
         <%= dgettext("actions", "Record shots") %>
       </.link>
     </div>
@@ -130,50 +124,50 @@
 
 <%= case @live_action do %>
   <% :edit -> %>
-    <.modal return_to={Routes.pack_show_path(Endpoint, :show, @pack)}>
+    <.modal return_to={~p"/ammo/show/#{@pack}"}>
       <.live_component
         module={CanneryWeb.PackLive.FormComponent}
         id={@pack.id}
         title={@page_title}
         action={@live_action}
         pack={@pack}
-        return_to={Routes.pack_show_path(Endpoint, :show, @pack)}
+        return_to={~p"/ammo/show/#{@pack}"}
         current_user={@current_user}
       />
     </.modal>
   <% :edit_shot_record -> %>
-    <.modal return_to={Routes.pack_show_path(Endpoint, :show, @pack)}>
+    <.modal return_to={~p"/ammo/show/#{@pack}"}>
       <.live_component
         module={CanneryWeb.RangeLive.FormComponent}
         id={@shot_record.id}
         title={@page_title}
         action={@live_action}
         shot_record={@shot_record}
-        return_to={Routes.pack_show_path(Endpoint, :show, @pack)}
+        return_to={~p"/ammo/show/#{@pack}"}
         current_user={@current_user}
       />
     </.modal>
   <% :add_shot_record -> %>
-    <.modal return_to={Routes.pack_show_path(Endpoint, :show, @pack)}>
+    <.modal return_to={~p"/ammo/show/#{@pack}"}>
       <.live_component
         module={CanneryWeb.Components.AddShotRecordComponent}
         id={:new}
         title={@page_title}
         action={@live_action}
         pack={@pack}
-        return_to={Routes.pack_show_path(Endpoint, :show, @pack)}
+        return_to={~p"/ammo/show/#{@pack}"}
         current_user={@current_user}
       />
     </.modal>
   <% :move -> %>
-    <.modal return_to={Routes.pack_show_path(Endpoint, :show, @pack)}>
+    <.modal return_to={~p"/ammo/show/#{@pack}"}>
       <.live_component
         module={CanneryWeb.Components.MovePackComponent}
         id={@pack.id}
         title={@page_title}
         action={@live_action}
         pack={@pack}
-        return_to={Routes.pack_show_path(Endpoint, :show, @pack)}
+        return_to={~p"/ammo/show/#{@pack}"}
         current_user={@current_user}
       />
     </.modal>

lib/cannery_web/live/range_live/index.ex

@@ -5,7 +5,6 @@ defmodule CanneryWeb.RangeLive.Index do
 
   use CanneryWeb, :live_view
   alias Cannery.{ActivityLog, ActivityLog.ShotRecord, Ammo}
-  alias CanneryWeb.Endpoint
   alias Phoenix.LiveView.Socket
 
   @impl true
@@ -94,11 +93,11 @@ defmodule CanneryWeb.RangeLive.Index do
   end
 
   def handle_event("search", %{"search" => %{"search_term" => ""}}, socket) do
-    {:noreply, socket |> push_patch(to: Routes.range_index_path(Endpoint, :index))}
+    {:noreply, socket |> push_patch(to: ~p"/range")}
   end
 
   def handle_event("search", %{"search" => %{"search_term" => search_term}}, socket) do
-    {:noreply, socket |> push_patch(to: Routes.range_index_path(Endpoint, :search, search_term))}
+    {:noreply, socket |> push_patch(to: ~p"/range/search/#{search_term}")}
   end
 
   def handle_event("change_class", %{"type" => %{"class" => "rifle"}}, socket) do

lib/cannery_web/live/range_live/index.html.heex

@@ -9,11 +9,11 @@
       <%= display_emoji("😔") %>
     </h1>
 
-    <.link navigate={Routes.pack_index_path(Endpoint, :index)} class="btn btn-primary">
+    <.link navigate={~p"/ammo"} class="btn btn-primary">
       <%= dgettext("actions", "Why not get some ready to shoot?") %>
     </.link>
   <% else %>
-    <.link navigate={Routes.pack_index_path(Endpoint, :index)} class="btn btn-primary">
+    <.link navigate={~p"/ammo"} class="btn btn-primary">
       <%= dgettext("actions", "Stage ammo") %>
     </.link>
 
@@ -38,10 +38,7 @@
             else: dgettext("actions", "Stage for range") %>
         </button>
 
-        <.link
+        <.link patch={~p"/range/add_shot_record/#{pack}"} class="btn btn-primary">
-          patch={Routes.range_index_path(Endpoint, :add_shot_record, pack)}
-          class="btn btn-primary"
-        >
           <%= dgettext("actions", "Record shots") %>
         </.link>
       </.pack_card>
@@ -132,7 +129,7 @@
         <:actions :let={shot_record}>
           <div class="px-4 py-2 space-x-4 flex justify-center items-center">
             <.link
-              patch={Routes.range_index_path(Endpoint, :edit, shot_record)}
+              patch={~p"/range/edit/#{shot_record}"}
               class="text-primary-600 link"
               aria-label={
                 dgettext("actions", "Edit shot record of %{shot_record_count} shots",
@@ -168,26 +165,26 @@
 
 <%= case @live_action do %>
   <% :edit -> %>
-    <.modal return_to={Routes.range_index_path(Endpoint, :index)}>
+    <.modal return_to={~p"/range"}>
       <.live_component
         module={CanneryWeb.RangeLive.FormComponent}
         id={@shot_record.id}
         title={@page_title}
         action={@live_action}
         shot_record={@shot_record}
-        return_to={Routes.range_index_path(Endpoint, :index)}
+        return_to={~p"/range"}
         current_user={@current_user}
       />
     </.modal>
   <% :add_shot_record -> %>
-    <.modal return_to={Routes.range_index_path(Endpoint, :index)}>
+    <.modal return_to={~p"/range"}>
       <.live_component
         module={CanneryWeb.Components.AddShotRecordComponent}
         id={:new}
         title={@page_title}
         action={@live_action}
         pack={@pack}
-        return_to={Routes.range_index_path(Endpoint, :index)}
+        return_to={~p"/range"}
         current_user={@current_user}
       />
     </.modal>

lib/cannery_web/live/tag_live/index.ex

@@ -5,7 +5,7 @@ defmodule CanneryWeb.TagLive.Index do
 
   use CanneryWeb, :live_view
   alias Cannery.{Containers, Containers.Tag}
-  alias CanneryWeb.ViewHelpers
+  alias CanneryWeb.HTMLHelpers
 
   @impl true
   def mount(%{"search" => search}, _session, socket) do
@@ -33,7 +33,7 @@ defmodule CanneryWeb.TagLive.Index do
     socket
     |> assign(
       page_title: gettext("New Tag"),
-      tag: %Tag{bg_color: ViewHelpers.random_color(), text_color: "#ffffff"}
+      tag: %Tag{bg_color: HTMLHelpers.random_color(), text_color: "#ffffff"}
     )
   end
 
@@ -67,11 +67,11 @@ defmodule CanneryWeb.TagLive.Index do
   end
 
   def handle_event("search", %{"search" => %{"search_term" => ""}}, socket) do
-    {:noreply, socket |> push_patch(to: Routes.tag_index_path(Endpoint, :index))}
+    {:noreply, socket |> push_patch(to: ~p"/tags")}
   end
 
   def handle_event("search", %{"search" => %{"search_term" => search_term}}, socket) do
-    {:noreply, socket |> push_patch(to: Routes.tag_index_path(Endpoint, :search, search_term))}
+    {:noreply, socket |> push_patch(to: ~p"/tags/search/#{search_term}")}
   end
 
   defp display_tags(%{assigns: %{search: search, current_user: current_user}} = socket) do

lib/cannery_web/live/tag_live/index.html.heex

@@ -11,11 +11,11 @@
       <%= display_emoji("😔") %>
     </h2>
 
-    <.link patch={Routes.tag_index_path(Endpoint, :new)} class="btn btn-primary">
+    <.link patch={~p"/tags/new"} class="btn btn-primary">
       <%= dgettext("actions", "Make your first tag!") %>
     </.link>
   <% else %>
-    <.link patch={Routes.tag_index_path(Endpoint, :new)} class="btn btn-primary">
+    <.link patch={~p"/tags/new"} class="btn btn-primary">
       <%= dgettext("actions", "New Tag") %>
     </.link>
 
@@ -47,7 +47,7 @@
       <div class="flex flex-row flex-wrap justify-center items-stretch">
         <.tag_card :for={tag <- @tags} tag={tag}>
           <.link
-            patch={Routes.tag_index_path(Endpoint, :edit, tag)}
+            patch={~p"/tags/edit/#{tag}"}
             class="text-primary-600 link"
             aria-label={dgettext("actions", "Edit %{tag_name}", tag_name: tag.name)}
           >
@@ -72,14 +72,14 @@
   <% end %>
 </div>
 
-<.modal :if={@live_action in [:new, :edit]} return_to={Routes.tag_index_path(Endpoint, :index)}>
+<.modal :if={@live_action in [:new, :edit]} return_to={~p"/tags"}>
   <.live_component
     module={CanneryWeb.TagLive.FormComponent}
     id={@tag.id || :new}
     title={@page_title}
     action={@live_action}
     tag={@tag}
-    return_to={Routes.tag_index_path(Endpoint, :index)}
+    return_to={~p"/tags"}
     current_user={@current_user}
   />
 </.modal>

lib/cannery_web/live/type_live/index.ex

@@ -78,12 +78,11 @@ defmodule CanneryWeb.TypeLive.Index do
   end
 
   def handle_event("search", %{"search" => %{"search_term" => ""}}, socket) do
-    {:noreply, socket |> push_patch(to: Routes.type_index_path(Endpoint, :index))}
+    {:noreply, socket |> push_patch(to: ~p"/catalog")}
   end
 
   def handle_event("search", %{"search" => %{"search_term" => search_term}}, socket) do
-    search_path = Routes.type_index_path(Endpoint, :search, search_term)
+    {:noreply, socket |> push_patch(to: ~p"/catalog/search/#{search_term}")}
-    {:noreply, socket |> push_patch(to: search_path)}
   end
 
   def handle_event("change_class", %{"type" => %{"class" => "rifle"}}, socket) do

lib/cannery_web/live/type_live/index.html.heex

@@ -9,11 +9,11 @@
       <%= display_emoji("😔") %>
     </h2>
 
-    <.link patch={Routes.type_index_path(Endpoint, :new)} class="btn btn-primary">
+    <.link patch={~p"/catalog/new"} class="btn btn-primary">
       <%= dgettext("actions", "Add your first type!") %>
     </.link>
   <% else %>
-    <.link patch={Routes.type_index_path(Endpoint, :new)} class="btn btn-primary">
+    <.link patch={~p"/catalog/new"} class="btn btn-primary">
       <%= dgettext("actions", "New Type") %>
     </.link>
 
@@ -84,7 +84,7 @@
         <:actions :let={type}>
           <div class="px-4 py-2 space-x-4 flex justify-center items-center">
             <.link
-              navigate={Routes.type_show_path(Endpoint, :show, type)}
+              navigate={~p"/type/#{type}"}
               class="text-primary-600 link"
               aria-label={dgettext("actions", "View %{type_name}", type_name: type.name)}
             >
@@ -92,7 +92,7 @@
             </.link>
 
             <.link
-              patch={Routes.type_index_path(Endpoint, :edit, type)}
+              patch={~p"/catalog/edit/#{type}"}
               class="text-primary-600 link"
               aria-label={dgettext("actions", "Edit %{type_name}", type_name: type.name)}
             >
@@ -100,7 +100,7 @@
             </.link>
 
             <.link
-              patch={Routes.type_index_path(Endpoint, :clone, type)}
+              patch={~p"/catalog/clone/#{type}"}
               class="text-primary-600 link"
               aria-label={dgettext("actions", "Clone %{type_name}", type_name: type.name)}
             >
@@ -130,17 +130,14 @@
   <% end %>
 </div>
 
-<.modal
+<.modal :if={@live_action in [:new, :edit, :clone]} return_to={~p"/catalog"}>
-  :if={@live_action in [:new, :edit, :clone]}
-  return_to={Routes.type_index_path(Endpoint, :index)}
->
   <.live_component
     module={CanneryWeb.TypeLive.FormComponent}
     id={@type.id || :new}
     title={@page_title}
     action={@live_action}
     type={@type}
-    return_to={Routes.type_index_path(Endpoint, :index)}
+    return_to={~p"/catalog"}
     current_user={@current_user}
     }
   />

lib/cannery_web/live/type_live/show.ex

@@ -5,7 +5,6 @@ defmodule CanneryWeb.TypeLive.Show do
 
   use CanneryWeb, :live_view
   alias Cannery.{ActivityLog, Ammo, Ammo.Type, Containers}
-  alias CanneryWeb.Endpoint
 
   @impl true
   def mount(_params, _session, socket),
@@ -25,7 +24,7 @@ defmodule CanneryWeb.TypeLive.Show do
     %{name: type_name} = type |> Ammo.delete_type!(current_user)
 
     prompt = dgettext("prompts", "%{name} deleted succesfully", name: type_name)
-    redirect_to = Routes.type_index_path(socket, :index)
+    redirect_to = ~p"/catalog"
 
     {:noreply, socket |> put_flash(:info, prompt) |> push_navigate(to: redirect_to)}
   end

lib/cannery_web/live/type_live/show.html.heex

@@ -14,7 +14,7 @@
 
   <div class="flex space-x-4 justify-center items-center text-primary-600">
     <.link
-      patch={Routes.type_show_path(Endpoint, :edit, @type)}
+      patch={~p"/type/#{@type}/edit"}
       class="text-primary-600 link"
       aria-label={dgettext("actions", "Edit %{type_name}", type_name: @type.name)}
     >
@@ -188,17 +188,14 @@
           show_used={@show_used}
         >
           <:container :let={{_pack, %{name: container_name} = container}}>
-            <.link
+            <.link navigate={~p"/container/#{container}"} class="mx-2 my-1 link">
-              navigate={Routes.container_show_path(Endpoint, :show, container)}
-              class="mx-2 my-1 link"
-            >
               <%= container_name %>
             </.link>
           </:container>
           <:actions :let={%{count: pack_count} = pack}>
             <div class="py-2 px-4 h-full space-x-4 flex justify-center items-center">
               <.link
-                navigate={Routes.pack_show_path(Endpoint, :show, pack)}
+                navigate={~p"/ammo/show/#{pack}"}
                 class="text-primary-600 link"
                 aria-label={
                   dgettext("actions", "View pack of %{pack_count} bullets", pack_count: pack_count)
@@ -226,14 +223,14 @@
   </div>
 </div>
 
-<.modal :if={@live_action == :edit} return_to={Routes.type_show_path(Endpoint, :show, @type)}>
+<.modal :if={@live_action == :edit} return_to={~p"/type/#{@type}"}>
   <.live_component
     module={CanneryWeb.TypeLive.FormComponent}
     id={@type.id}
     title={@page_title}
     action={@live_action}
     type={@type}
-    return_to={Routes.type_show_path(Endpoint, :show, @type)}
+    return_to={~p"/type/#{@type}"}
     current_user={@current_user}
   />
 </.modal>

lib/cannery_web/router.ex

@@ -7,25 +7,13 @@ defmodule CanneryWeb.Router do
     plug :accepts, ["html"]
     plug :fetch_session
     plug :fetch_live_flash
-    plug :put_root_layout, {CanneryWeb.LayoutView, :root}
+    plug :put_root_layout, {CanneryWeb.Layouts, :root}
     plug :protect_from_forgery
     plug :put_secure_browser_headers
     plug :fetch_current_user
     plug :put_user_locale
   end
 
-  defp put_user_locale(%{assigns: %{current_user: %{locale: locale}}} = conn, _opts) do
-    default = Application.fetch_env!(:gettext, :default_locale)
-    Gettext.put_locale(locale || default)
-    conn |> put_session(:locale, locale || default)
-  end
-
-  defp put_user_locale(conn, _opts) do
-    default = Application.fetch_env!(:gettext, :default_locale)
-    Gettext.put_locale(default)
-    conn |> put_session(:locale, default)
-  end
-
   pipeline :require_admin do
     plug :require_role, role: :admin
   end
@@ -34,14 +22,6 @@ defmodule CanneryWeb.Router do
     plug :accepts, ["json"]
   end
 
-  scope "/", CanneryWeb do
-    pipe_through :browser
-
-    live "/", HomeLive
-  end
-
-  ## Authentication routes
-
   scope "/", CanneryWeb do
     pipe_through [:browser, :redirect_if_user_is_authenticated]
 
@@ -64,59 +44,51 @@ defmodule CanneryWeb.Router do
     get "/users/settings/confirm_email/:token", UserSettingsController, :confirm_email
     get "/export/:mode", ExportController, :export
 
-    live "/tags", TagLive.Index, :index
+    live_session :default, on_mount: [{CanneryWeb.UserAuth, :ensure_authenticated}] do
-    live "/tags/new", TagLive.Index, :new
+      live "/tags", TagLive.Index, :index
-    live "/tags/edit/:id", TagLive.Index, :edit
+      live "/tags/new", TagLive.Index, :new
-    live "/tags/search/:search", TagLive.Index, :search
+      live "/tags/edit/:id", TagLive.Index, :edit
+      live "/tags/search/:search", TagLive.Index, :search
 
-    live "/catalog", TypeLive.Index, :index
+      live "/catalog", TypeLive.Index, :index
-    live "/catalog/new", TypeLive.Index, :new
+      live "/catalog/new", TypeLive.Index, :new
-    live "/catalog/clone/:id", TypeLive.Index, :clone
+      live "/catalog/clone/:id", TypeLive.Index, :clone
-    live "/catalog/edit/:id", TypeLive.Index, :edit
+      live "/catalog/edit/:id", TypeLive.Index, :edit
-    live "/catalog/search/:search", TypeLive.Index, :search
+      live "/catalog/search/:search", TypeLive.Index, :search
 
-    live "/type/:id", TypeLive.Show, :show
+      live "/type/:id", TypeLive.Show, :show
-    live "/type/:id/edit", TypeLive.Show, :edit
+      live "/type/:id/edit", TypeLive.Show, :edit
 
-    live "/containers", ContainerLive.Index, :index
+      live "/containers", ContainerLive.Index, :index
-    live "/containers/new", ContainerLive.Index, :new
+      live "/containers/new", ContainerLive.Index, :new
-    live "/containers/edit/:id", ContainerLive.Index, :edit
+      live "/containers/edit/:id", ContainerLive.Index, :edit
-    live "/containers/clone/:id", ContainerLive.Index, :clone
+      live "/containers/clone/:id", ContainerLive.Index, :clone
-    live "/containers/edit_tags/:id", ContainerLive.Index, :edit_tags
+      live "/containers/edit_tags/:id", ContainerLive.Index, :edit_tags
-    live "/containers/search/:search", ContainerLive.Index, :search
+      live "/containers/search/:search", ContainerLive.Index, :search
 
-    live "/container/:id", ContainerLive.Show, :show
+      live "/container/:id", ContainerLive.Show, :show
-    live "/container/edit/:id", ContainerLive.Show, :edit
+      live "/container/edit/:id", ContainerLive.Show, :edit
-    live "/container/edit_tags/:id", ContainerLive.Show, :edit_tags
+      live "/container/edit_tags/:id", ContainerLive.Show, :edit_tags
 
-    live "/ammo", PackLive.Index, :index
+      live "/ammo", PackLive.Index, :index
-    live "/ammo/new", PackLive.Index, :new
+      live "/ammo/new", PackLive.Index, :new
-    live "/ammo/edit/:id", PackLive.Index, :edit
+      live "/ammo/edit/:id", PackLive.Index, :edit
-    live "/ammo/clone/:id", PackLive.Index, :clone
+      live "/ammo/clone/:id", PackLive.Index, :clone
-    live "/ammo/add_shot_record/:id", PackLive.Index, :add_shot_record
+      live "/ammo/add_shot_record/:id", PackLive.Index, :add_shot_record
-    live "/ammo/move/:id", PackLive.Index, :move
+      live "/ammo/move/:id", PackLive.Index, :move
-    live "/ammo/search/:search", PackLive.Index, :search
+      live "/ammo/search/:search", PackLive.Index, :search
 
-    live "/ammo/show/:id", PackLive.Show, :show
+      live "/ammo/show/:id", PackLive.Show, :show
-    live "/ammo/show/edit/:id", PackLive.Show, :edit
+      live "/ammo/show/edit/:id", PackLive.Show, :edit
-    live "/ammo/show/add_shot_record/:id", PackLive.Show, :add_shot_record
+      live "/ammo/show/add_shot_record/:id", PackLive.Show, :add_shot_record
-    live "/ammo/show/move/:id", PackLive.Show, :move
+      live "/ammo/show/move/:id", PackLive.Show, :move
-    live "/ammo/show/:id/edit/:shot_record_id", PackLive.Show, :edit_shot_record
+      live "/ammo/show/:id/edit/:shot_record_id", PackLive.Show, :edit_shot_record
 
-    live "/range", RangeLive.Index, :index
+      live "/range", RangeLive.Index, :index
-    live "/range/edit/:id", RangeLive.Index, :edit
+      live "/range/edit/:id", RangeLive.Index, :edit
-    live "/range/add_shot_record/:id", RangeLive.Index, :add_shot_record
+      live "/range/add_shot_record/:id", RangeLive.Index, :add_shot_record
-    live "/range/search/:search", RangeLive.Index, :search
+      live "/range/search/:search", RangeLive.Index, :search
-  end
+    end
-
-  scope "/", CanneryWeb do
-    pipe_through [:browser, :require_authenticated_user, :require_admin]
-
-    live_dashboard "/dashboard", metrics: CanneryWeb.Telemetry, ecto_repos: [Cannery.Repo]
-
-    live "/invites", InviteLive.Index, :index
-    live "/invites/new", InviteLive.Index, :new
-    live "/invites/:id/edit", InviteLive.Index, :edit
   end
 
   scope "/", CanneryWeb do
@@ -126,6 +98,22 @@ defmodule CanneryWeb.Router do
     get "/users/confirm", UserConfirmationController, :new
     post "/users/confirm", UserConfirmationController, :create
     get "/users/confirm/:token", UserConfirmationController, :confirm
+
+    live_session :public, on_mount: [{CanneryWeb.UserAuth, :mount_current_user}] do
+      live "/", HomeLive
+    end
+  end
+
+  scope "/", CanneryWeb do
+    pipe_through [:browser, :require_authenticated_user, :require_admin]
+
+    live_dashboard "/dashboard", metrics: CanneryWeb.Telemetry, ecto_repos: [Cannery.Repo]
+
+    live_session :admin, on_mount: [{CanneryWeb.UserAuth, :ensure_admin}] do
+      live "/invites", InviteLive.Index, :index
+      live "/invites/new", InviteLive.Index, :new
+      live "/invites/:id/edit", InviteLive.Index, :edit
+    end
   end
 
   # Enables the Swoosh mailbox preview in development.
@@ -137,9 +125,6 @@ defmodule CanneryWeb.Router do
       pipe_through :browser
 
       forward "/mailbox", Plug.Swoosh.MailboxPreview
-    end
-
-    scope "/dev" do
       get "/preview/:id", CanneryWeb.EmailController, :preview
     end
   end

lib/cannery_web/templates/layout/empty.html.heex

@@ -1 +0,0 @@
-<%= @inner_content %>

lib/cannery_web/views/email_view.ex

@@ -1,7 +0,0 @@
-defmodule CanneryWeb.EmailView do
-  @moduledoc """
-  A view for email-related helper functions
-  """
-  use CanneryWeb, :view
-  alias CanneryWeb.HomeLive
-end

lib/cannery_web/views/error_view.ex

@@ -1,15 +0,0 @@
-defmodule CanneryWeb.ErrorView do
-  use CanneryWeb, :view
-  alias CanneryWeb.HomeLive
-
-  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")
-        _other_path -> dgettext("errors", "Internal Server Error")
-      end
-
-    render("error.html", %{error_string: error_string})
-  end
-end

lib/cannery_web/views/home_view.ex

@@ -1,3 +0,0 @@
-defmodule CanneryWeb.HomeView do
-  use CanneryWeb, :view
-end

lib/cannery_web/views/layout_view.ex

@@ -1,16 +0,0 @@
-defmodule CanneryWeb.LayoutView do
-  use CanneryWeb, :view
-  alias CanneryWeb.HomeLive
-
-  # Phoenix LiveDashboard is available only in development by default,
-  # so we instruct Elixir to not warn if the dashboard route is missing.
-  @compile {:no_warn_undefined, {Routes, :live_dashboard_path, 2}}
-
-  def get_title(%{assigns: %{title: title}}) when title not in [nil, ""] do
-    gettext("Cannery | %{title}", title: title)
-  end
-
-  def get_title(_conn) do
-    gettext("Cannery")
-  end
-end

lib/cannery_web/views/user_confirmation_view.ex

@@ -1,4 +0,0 @@
-defmodule CanneryWeb.UserConfirmationView do
-  use CanneryWeb, :view
-  alias Cannery.Accounts
-end

lib/cannery_web/views/user_registration_view.ex

@@ -1,3 +0,0 @@
-defmodule CanneryWeb.UserRegistrationView do
-  use CanneryWeb, :view
-end

lib/cannery_web/views/user_reset_password_view.ex

@@ -1,4 +0,0 @@
-defmodule CanneryWeb.UserResetPasswordView do
-  use CanneryWeb, :view
-  alias Cannery.Accounts
-end

lib/cannery_web/views/user_session_view.ex

@@ -1,4 +0,0 @@
-defmodule CanneryWeb.UserSessionView do
-  use CanneryWeb, :view
-  alias Cannery.Accounts
-end

lib/cannery_web/views/user_settings_view.ex

@@ -1,3 +0,0 @@
-defmodule CanneryWeb.UserSettingsView do
-  use CanneryWeb, :view
-end

mix.exs

@@ -7,7 +7,6 @@ defmodule Cannery.MixProject do
       version: "0.9.3",
       elixir: "1.14.4",
       elixirc_paths: elixirc_paths(Mix.env()),
-      compilers: Mix.compilers(),
       start_permanent: Mix.env() == :prod,
       aliases: aliases(),
       deps: deps(),
@@ -48,12 +47,11 @@ defmodule Cannery.MixProject do
   defp deps do
     [
       {:bcrypt_elixir, "~> 3.0"},
-      {:phoenix, "~> 1.6.0"},
+      {:phoenix, "~> 1.7.0"},
       {:phoenix_ecto, "~> 4.4"},
       {:phoenix_html, "~> 3.0"},
       {:phoenix_live_reload, "~> 1.2", only: :dev},
       {:phoenix_live_view, "~> 0.18.0"},
-      {:phoenix_view, "~> 2.0"},
       {:phoenix_live_dashboard, "~> 0.6"},
       {:ecto_sql, "~> 3.6"},
       {:postgrex, ">= 0.0.0"},
@@ -62,7 +60,6 @@ defmodule Cannery.MixProject do
       {:ex_doc, "~> 0.27", only: :dev, runtime: false},
       {:swoosh, "~> 1.6"},
       {:gen_smtp, "~> 1.0"},
-      {:phoenix_swoosh, "~> 1.0"},
       {:oban, "~> 2.10"},
       {:telemetry_metrics, "~> 0.6"},
       {:telemetry_poller, "~> 1.0"},

mix.lock

@@ -31,16 +31,14 @@
   "mime": {:hex, :mime, "2.0.3", "3676436d3d1f7b81b5a2d2bd8405f412c677558c81b1c92be58c00562bb59095", [:mix], [], "hexpm", "27a30bf0db44d25eecba73755acf4068cbfe26a4372f9eb3e4ea3a45956bff6b"},
   "nimble_parsec": {:hex, :nimble_parsec, "1.3.0", "9e18a119d9efc3370a3ef2a937bf0b24c088d9c4bf0ba9d7c3751d49d347d035", [:mix], [], "hexpm", "7977f183127a7cbe9346981e2f480dc04c55ffddaef746bd58debd566070eef8"},
   "oban": {:hex, :oban, "2.15.0", "27b9c2845cdff30c98c8060b11a64318e79bbc1bd32b8dc95fa59a1580a8d90c", [:mix], [{:ecto_sql, "~> 3.6", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:ecto_sqlite3, "~> 0.9", [hex: :ecto_sqlite3, repo: "hexpm", optional: true]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.16", [hex: :postgrex, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "22e181c540335d1dd5c995be00435927075519207d62b3de32477d95dbf9dfd3"},
-  "phoenix": {:hex, :phoenix, "1.6.16", "e5bdd18c7a06da5852a25c7befb72246de4ddc289182285f8685a40b7b5f5451", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 1.0 or ~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "e15989ff34f670a96b95ef6d1d25bad0d9c50df5df40b671d8f4a669e050ac39"},
+  "phoenix": {:hex, :phoenix, "1.7.2", "c375ffb482beb4e3d20894f84dd7920442884f5f5b70b9f4528cbe0cedefec63", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.4", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "1ebca94b32b4d0e097ab2444a9742ed8ff3361acad17365e4e6b2e79b4792159"},
   "phoenix_ecto": {:hex, :phoenix_ecto, "4.4.0", "0672ed4e4808b3fbed494dded89958e22fb882de47a97634c0b13e7b0b5f7720", [:mix], [{:ecto, "~> 3.3", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "09864e558ed31ee00bd48fcc1d4fc58ae9678c9e81649075431e69dbabb43cc1"},
   "phoenix_html": {:hex, :phoenix_html, "3.3.1", "4788757e804a30baac6b3fc9695bf5562465dd3f1da8eb8460ad5b404d9a2178", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "bed1906edd4906a15fd7b412b85b05e521e1f67c9a85418c55999277e553d0d3"},
   "phoenix_live_dashboard": {:hex, :phoenix_live_dashboard, "0.7.2", "97cc4ff2dba1ebe504db72cb45098cb8e91f11160528b980bd282cc45c73b29c", [:mix], [{:ecto, "~> 3.6.2 or ~> 3.7", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_mysql_extras, "~> 0.5", [hex: :ecto_mysql_extras, repo: "hexpm", optional: true]}, {:ecto_psql_extras, "~> 0.7", [hex: :ecto_psql_extras, repo: "hexpm", optional: true]}, {:mime, "~> 1.6 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.18.3", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:telemetry_metrics, "~> 0.6 or ~> 1.0", [hex: :telemetry_metrics, repo: "hexpm", optional: false]}], "hexpm", "0e5fdf063c7a3b620c566a30fcf68b7ee02e5e46fe48ee46a6ec3ba382dc05b7"},
   "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.4.1", "2aff698f5e47369decde4357ba91fc9c37c6487a512b41732818f2204a8ef1d3", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "9bffb834e7ddf08467fe54ae58b5785507aaba6255568ae22b4d46e2bb3615ab"},
   "phoenix_live_view": {:hex, :phoenix_live_view, "0.18.18", "1f38fbd7c363723f19aad1a04b5490ff3a178e37daaf6999594d5f34796c47fc", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a5810d0472f3189ede6d2a95bda7f31c6113156b91784a3426cb0ab6a6d85214"},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.1", "ba04e489ef03763bf28a17eb2eaddc2c20c6d217e2150a61e3298b0f4c2012b5", [:mix], [], "hexpm", "81367c6d1eea5878ad726be80808eb5a787a23dee699f96e72b1109c57cdd8d9"},
-  "phoenix_swoosh": {:hex, :phoenix_swoosh, "1.2.0", "a544d83fde4a767efb78f45404a74c9e37b2a9c5ea3339692e65a6966731f935", [:mix], [{:finch, "~> 0.8", [hex: :finch, repo: "hexpm", optional: true]}, {:hackney, "~> 1.10", [hex: :hackney, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6", [hex: :phoenix, repo: "hexpm", optional: true]}, {:phoenix_html, "~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_view, "~> 1.0 or ~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:swoosh, "~> 1.5", [hex: :swoosh, repo: "hexpm", optional: false]}], "hexpm", "e88d117251e89a16b92222415a6d87b99a96747ddf674fc5c7631de734811dba"},
   "phoenix_template": {:hex, :phoenix_template, "1.0.1", "85f79e3ad1b0180abb43f9725973e3b8c2c3354a87245f91431eec60553ed3ef", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "157dc078f6226334c91cb32c1865bf3911686f8bcd6bcff86736f6253e6993ee"},
-  "phoenix_view": {:hex, :phoenix_view, "2.0.2", "6bd4d2fd595ef80d33b439ede6a19326b78f0f1d8d62b9a318e3d9c1af351098", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}], "hexpm", "a929e7230ea5c7ee0e149ffcf44ce7cf7f4b6d2bfe1752dd7c084cdff152d36f"},
   "plug": {:hex, :plug, "1.14.2", "cff7d4ec45b4ae176a227acd94a7ab536d9b37b942c8e8fa6dfc0fff98ff4d80", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "842fc50187e13cf4ac3b253d47d9474ed6c296a8732752835ce4a86acdf68d13"},
   "plug_cowboy": {:hex, :plug_cowboy, "2.6.1", "9a3bbfceeb65eff5f39dab529e5cd79137ac36e913c02067dba3963a26efe9b2", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "de36e1a21f451a18b790f37765db198075c25875c64834bcc82d90b309eb6613"},
   "plug_crypto": {:hex, :plug_crypto, "1.2.5", "918772575e48e81e455818229bf719d4ab4181fcbf7f85b68a35620f78d89ced", [:mix], [], "hexpm", "26549a1d6345e2172eb1c233866756ae44a9609bd33ee6f99147ab3fd87fd842"},
@@ -51,4 +49,6 @@
   "telemetry": {:hex, :telemetry, "1.2.1", "68fdfe8d8f05a8428483a97d7aab2f268aaff24b49e0f599faa091f1d4e7f61c", [:rebar3], [], "hexpm", "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"},
   "telemetry_metrics": {:hex, :telemetry_metrics, "0.6.1", "315d9163a1d4660aedc3fee73f33f1d355dcc76c5c3ab3d59e76e3edf80eef1f", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7be9e0871c41732c233be71e4be11b96e56177bf15dde64a8ac9ce72ac9834c6"},
   "telemetry_poller": {:hex, :telemetry_poller, "1.0.0", "db91bb424e07f2bb6e73926fcafbfcbcb295f0193e0a00e825e589a0a47e8453", [:rebar3], [{:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "b3a24eafd66c3f42da30fc3ca7dda1e9d546c12250a2d60d7b81d264fbec4f6e"},
+  "websock": {:hex, :websock, "0.5.0", "f6bbce90226121d62a0715bca7c986c5e43de0ccc9475d79c55381d1796368cc", [:mix], [], "hexpm", "b51ac706df8a7a48a2c622ee02d09d68be8c40418698ffa909d73ae207eb5fb8"},
+  "websock_adapter": {:hex, :websock_adapter, "0.5.0", "cea35d8bbf1a6964e32d4b02ceb561dfb769c04f16d60d743885587e7d2ca55b", [:mix], [{:bandit, "~> 0.6", [hex: :bandit, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "16318b124effab8209b1eb7906c636374f623dc9511a8278ad09c083cea5bb83"},
 }

priv/gettext/actions.pot

@@ -32,14 +32,14 @@ msgstr ""
 msgid "Add your first type!"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:15
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:15
-#: lib/cannery_web/templates/user_settings/edit.html.heex:43
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Change email"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:57
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:57
-#: lib/cannery_web/templates/user_settings/edit.html.heex:97
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Change password"
 msgstr ""
@@ -49,14 +49,14 @@ msgstr ""
 msgid "Create Invite"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:159
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:155
 #, elixir-autogen, elixir-format
 msgid "Delete User"
 msgstr ""
 
-#: lib/cannery_web/templates/user_registration/new.html.heex:47
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:47
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:3
+#: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:3
-#: lib/cannery_web/templates/user_session/new.html.heex:42
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Forgot your password?"
 msgstr ""
@@ -66,13 +66,13 @@ msgstr ""
 msgid "Invite someone new!"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:124
+#: lib/cannery_web/components/core_components/topbar.html.heex:94
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:32
+#: lib/cannery_web/controllers/user_confirmation_html/new.html.heex:28
-#: lib/cannery_web/templates/user_registration/new.html.heex:44
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:44
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:45
+#: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:41
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:32
+#: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:28
-#: lib/cannery_web/templates/user_session/new.html.heex:3
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:3
-#: lib/cannery_web/templates/user_session/new.html.heex:28
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Log in"
 msgstr ""
@@ -92,25 +92,25 @@ msgstr ""
 msgid "New Tag"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:116
+#: lib/cannery_web/components/core_components/topbar.html.heex:89
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:29
+#: lib/cannery_web/controllers/user_confirmation_html/new.html.heex:25
-#: lib/cannery_web/templates/user_registration/new.html.heex:3
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:3
-#: lib/cannery_web/templates/user_registration/new.html.heex:37
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:37
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:42
+#: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:38
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:29
+#: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:25
-#: lib/cannery_web/templates/user_session/new.html.heex:39
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Register"
 msgstr ""
 
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:3
+#: lib/cannery_web/controllers/user_confirmation_html/new.html.heex:3
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:16
+#: lib/cannery_web/controllers/user_confirmation_html/new.html.heex:16
 #, elixir-autogen, elixir-format
 msgid "Resend confirmation instructions"
 msgstr ""
 
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:3
+#: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:3
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:29
+#: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "Reset password"
 msgstr ""
@@ -126,12 +126,12 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:16
+#: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:16
 #, elixir-autogen, elixir-format
 msgid "Send instructions to reset password"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:68
+#: lib/cannery_web/live/container_live/show.html.heex:65
 #, elixir-autogen, elixir-format
 msgid "Why not add one?"
 msgstr ""
@@ -152,18 +152,18 @@ msgid "Why not get some ready to shoot?"
 msgstr ""
 
 #: lib/cannery_web/live/pack_live/index.html.heex:127
-#: lib/cannery_web/live/pack_live/show.html.heex:96
+#: lib/cannery_web/live/pack_live/show.html.heex:90
-#: lib/cannery_web/live/range_live/index.html.heex:45
+#: lib/cannery_web/live/range_live/index.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Record shots"
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:88
+#: lib/cannery_web/components/move_pack_component.ex:87
 #, elixir-autogen, elixir-format
 msgid "Add another container!"
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:124
+#: lib/cannery_web/components/move_pack_component.ex:123
 #, elixir-autogen, elixir-format
 msgid "Select"
 msgstr ""
@@ -183,24 +183,24 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:110
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:110
 #, elixir-autogen, elixir-format
 msgid "Change Language"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:136
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:136
 #, elixir-autogen, elixir-format
 msgid "Change language"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:55
+#: lib/cannery_web/live/pack_live/show.html.heex:52
 #, elixir-autogen, elixir-format
 msgid "View in Catalog"
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:78
+#: lib/cannery_web/components/move_pack_component.ex:77
-#: lib/cannery_web/live/pack_live/index.html.heex:144
+#: lib/cannery_web/live/pack_live/index.html.heex:138
-#: lib/cannery_web/live/pack_live/show.html.heex:89
+#: lib/cannery_web/live/pack_live/show.html.heex:86
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr ""
@@ -210,19 +210,19 @@ msgstr ""
 msgid "Set Unlimited"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:85
+#: lib/cannery_web/live/pack_live/show.html.heex:82
 #: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Stage for range"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:84
+#: lib/cannery_web/live/pack_live/show.html.heex:81
 #: lib/cannery_web/live/range_live/index.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Unstage from range"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:150
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:146
 #, elixir-autogen, elixir-format
 msgid "Export Data as JSON"
 msgstr ""
@@ -288,37 +288,37 @@ msgstr ""
 msgid "Unstage"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:174
+#: lib/cannery_web/live/pack_live/index.html.heex:168
 #, elixir-autogen, elixir-format
 msgid "Clone pack of %{pack_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:189
+#: lib/cannery_web/live/pack_live/index.html.heex:183
-#: lib/cannery_web/live/pack_live/show.html.heex:74
+#: lib/cannery_web/live/pack_live/show.html.heex:71
 #, elixir-autogen, elixir-format
 msgid "Delete pack of %{pack_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:164
+#: lib/cannery_web/live/pack_live/index.html.heex:158
-#: lib/cannery_web/live/pack_live/show.html.heex:62
+#: lib/cannery_web/live/pack_live/show.html.heex:59
 #, elixir-autogen, elixir-format
 msgid "Edit pack of %{pack_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:154
+#: lib/cannery_web/live/pack_live/index.html.heex:148
-#: lib/cannery_web/live/type_live/show.html.heex:204
+#: lib/cannery_web/live/type_live/show.html.heex:201
 #, elixir-autogen, elixir-format
 msgid "View pack of %{pack_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:160
+#: lib/cannery_web/live/pack_live/show.ex:159
-#: lib/cannery_web/live/range_live/index.html.heex:155
+#: lib/cannery_web/live/range_live/index.html.heex:152
 #, elixir-autogen, elixir-format
 msgid "Delete shot record of %{shot_record_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:145
+#: lib/cannery_web/live/pack_live/show.ex:144
-#: lib/cannery_web/live/range_live/index.html.heex:138
+#: lib/cannery_web/live/range_live/index.html.heex:135
 #, elixir-autogen, elixir-format
 msgid "Edit shot record of %{shot_record_count} shots"
 msgstr ""

priv/gettext/de/LC_MESSAGES/actions.po

@@ -45,14 +45,14 @@ msgstr "Fügen Sie ihren ersten Behälter hinzu!"
 msgid "Add your first type!"
 msgstr "Fügen Sie ihre erste Munitionsart hinzu!"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:15
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:15
-#: lib/cannery_web/templates/user_settings/edit.html.heex:43
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Change email"
 msgstr "Mailadresse ändern"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:57
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:57
-#: lib/cannery_web/templates/user_settings/edit.html.heex:97
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Change password"
 msgstr "Passwort ändern"
@@ -62,14 +62,14 @@ msgstr "Passwort ändern"
 msgid "Create Invite"
 msgstr "Einladung erstellen"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:159
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:155
 #, elixir-autogen, elixir-format
 msgid "Delete User"
 msgstr "Benutzer löschen"
 
-#: lib/cannery_web/templates/user_registration/new.html.heex:47
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:47
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:3
+#: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:3
-#: lib/cannery_web/templates/user_session/new.html.heex:42
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
@@ -79,13 +79,13 @@ msgstr "Passwort vergessen?"
 msgid "Invite someone new!"
 msgstr "Laden Sie jemanden ein!"
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:124
+#: lib/cannery_web/components/core_components/topbar.html.heex:94
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:32
+#: lib/cannery_web/controllers/user_confirmation_html/new.html.heex:28
-#: lib/cannery_web/templates/user_registration/new.html.heex:44
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:44
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:45
+#: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:41
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:32
+#: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:28
-#: lib/cannery_web/templates/user_session/new.html.heex:3
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:3
-#: lib/cannery_web/templates/user_session/new.html.heex:28
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Log in"
 msgstr "Einloggen"
@@ -105,25 +105,25 @@ msgstr "Neuer Behälter"
 msgid "New Tag"
 msgstr "Neuer Tag"
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:116
+#: lib/cannery_web/components/core_components/topbar.html.heex:89
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:29
+#: lib/cannery_web/controllers/user_confirmation_html/new.html.heex:25
-#: lib/cannery_web/templates/user_registration/new.html.heex:3
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:3
-#: lib/cannery_web/templates/user_registration/new.html.heex:37
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:37
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:42
+#: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:38
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:29
+#: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:25
-#: lib/cannery_web/templates/user_session/new.html.heex:39
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Register"
 msgstr "Registrieren"
 
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:3
+#: lib/cannery_web/controllers/user_confirmation_html/new.html.heex:3
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:16
+#: lib/cannery_web/controllers/user_confirmation_html/new.html.heex:16
 #, elixir-autogen, elixir-format
 msgid "Resend confirmation instructions"
 msgstr "Bestätigungsmail erneut senden"
 
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:3
+#: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:3
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:29
+#: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
@@ -139,12 +139,12 @@ msgstr "Passwort zurücksetzen"
 msgid "Save"
 msgstr "Speichern"
 
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:16
+#: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:16
 #, elixir-autogen, elixir-format
 msgid "Send instructions to reset password"
 msgstr "Anleitung zum Passwort zurücksetzen zusenden"
 
-#: lib/cannery_web/live/container_live/show.html.heex:68
+#: lib/cannery_web/live/container_live/show.html.heex:65
 #, elixir-autogen, elixir-format
 msgid "Why not add one?"
 msgstr "Warum fügen Sie keine hinzu?"
@@ -165,18 +165,18 @@ msgid "Why not get some ready to shoot?"
 msgstr "Warum nicht einige für den Schießstand auswählen?"
 
 #: lib/cannery_web/live/pack_live/index.html.heex:127
-#: lib/cannery_web/live/pack_live/show.html.heex:96
+#: lib/cannery_web/live/pack_live/show.html.heex:90
-#: lib/cannery_web/live/range_live/index.html.heex:45
+#: lib/cannery_web/live/range_live/index.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Record shots"
 msgstr "Schüsse dokumentieren"
 
-#: lib/cannery_web/components/move_pack_component.ex:88
+#: lib/cannery_web/components/move_pack_component.ex:87
 #, elixir-autogen, elixir-format
 msgid "Add another container!"
 msgstr "Einen weiteren Behälter hinzufügen!"
 
-#: lib/cannery_web/components/move_pack_component.ex:124
+#: lib/cannery_web/components/move_pack_component.ex:123
 #, elixir-autogen, elixir-format
 msgid "Select"
 msgstr "Markieren"
@@ -196,24 +196,24 @@ msgstr "Zuerst einen Behälter hinzufügen"
 msgid "Create"
 msgstr "Erstellen"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:110
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:110
 #, elixir-autogen, elixir-format
 msgid "Change Language"
 msgstr "Sprache wechseln"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:136
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:136
 #, elixir-autogen, elixir-format
 msgid "Change language"
 msgstr "Sprache wechseln"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:55
+#: lib/cannery_web/live/pack_live/show.html.heex:52
 #, elixir-autogen, elixir-format
 msgid "View in Catalog"
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:78
+#: lib/cannery_web/components/move_pack_component.ex:77
-#: lib/cannery_web/live/pack_live/index.html.heex:144
+#: lib/cannery_web/live/pack_live/index.html.heex:138
-#: lib/cannery_web/live/pack_live/show.html.heex:89
+#: lib/cannery_web/live/pack_live/show.html.heex:86
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr ""
@@ -223,19 +223,19 @@ msgstr ""
 msgid "Set Unlimited"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:85
+#: lib/cannery_web/live/pack_live/show.html.heex:82
 #: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Stage for range"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:84
+#: lib/cannery_web/live/pack_live/show.html.heex:81
 #: lib/cannery_web/live/range_live/index.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Unstage from range"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:150
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:146
 #, elixir-autogen, elixir-format
 msgid "Export Data as JSON"
 msgstr ""
@@ -301,37 +301,37 @@ msgstr ""
 msgid "Unstage"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:174
+#: lib/cannery_web/live/pack_live/index.html.heex:168
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Clone pack of %{pack_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:189
+#: lib/cannery_web/live/pack_live/index.html.heex:183
-#: lib/cannery_web/live/pack_live/show.html.heex:74
+#: lib/cannery_web/live/pack_live/show.html.heex:71
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Delete pack of %{pack_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:164
+#: lib/cannery_web/live/pack_live/index.html.heex:158
-#: lib/cannery_web/live/pack_live/show.html.heex:62
+#: lib/cannery_web/live/pack_live/show.html.heex:59
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit pack of %{pack_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:154
+#: lib/cannery_web/live/pack_live/index.html.heex:148
-#: lib/cannery_web/live/type_live/show.html.heex:204
+#: lib/cannery_web/live/type_live/show.html.heex:201
 #, elixir-autogen, elixir-format, fuzzy
 msgid "View pack of %{pack_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:160
+#: lib/cannery_web/live/pack_live/show.ex:159
-#: lib/cannery_web/live/range_live/index.html.heex:155
+#: lib/cannery_web/live/range_live/index.html.heex:152
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Delete shot record of %{shot_record_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:145
+#: lib/cannery_web/live/pack_live/show.ex:144
-#: lib/cannery_web/live/range_live/index.html.heex:138
+#: lib/cannery_web/live/range_live/index.html.heex:135
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit shot record of %{shot_record_count} shots"
 msgstr ""

priv/gettext/de/LC_MESSAGES/default.po

@@ -29,7 +29,7 @@ msgstr "Admins"
 msgid "Admins:"
 msgstr "Admins:"
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:58
+#: lib/cannery_web/components/core_components/topbar.html.heex:43
 #: lib/cannery_web/components/shot_record_table_component.ex:44
 #: lib/cannery_web/live/pack_live/index.ex:75
 #: lib/cannery_web/live/pack_live/index.ex:84
@@ -84,14 +84,14 @@ msgstr "Patrone"
 msgid "Case material"
 msgstr "Gehäusematerial"
 
-#: lib/cannery_web/components/move_pack_component.ex:65
+#: lib/cannery_web/components/move_pack_component.ex:64
 #: lib/cannery_web/components/pack_table_component.ex:76
 #: lib/cannery_web/live/pack_live/form_component.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Container"
 msgstr "Behälter"
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:42
+#: lib/cannery_web/components/core_components/topbar.html.heex:33
 #: lib/cannery_web/live/container_live/index.ex:45
 #: lib/cannery_web/live/container_live/index.ex:54
 #: lib/cannery_web/live/container_live/index.html.heex:3
@@ -177,20 +177,20 @@ msgstr "Einladung deaktiviert"
 msgid "Invite Only"
 msgstr "Nur mit Einladung"
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:74
+#: lib/cannery_web/components/core_components/topbar.html.heex:53
 #: lib/cannery_web/live/invite_live/index.ex:31
 #: lib/cannery_web/live/invite_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Invites"
 msgstr "Einladungen"
 
-#: lib/cannery_web/templates/user_session/new.html.heex:23
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:23
 #, elixir-autogen, elixir-format
 msgid "Keep me logged in for 60 days"
 msgstr "Für 60 Tage eingeloggt bleiben"
 
 #: lib/cannery_web/components/container_table_component.ex:47
-#: lib/cannery_web/components/move_pack_component.ex:67
+#: lib/cannery_web/components/move_pack_component.ex:66
 #: lib/cannery_web/live/container_live/form_component.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "Location"
@@ -281,7 +281,7 @@ msgstr "Keine Tags"
 #: lib/cannery_web/components/add_shot_record_component.html.heex:38
 #: lib/cannery_web/components/shot_record_table_component.ex:46
 #: lib/cannery_web/live/pack_live/form_component.html.heex:57
-#: lib/cannery_web/live/pack_live/show.ex:91
+#: lib/cannery_web/live/pack_live/show.ex:90
 #: lib/cannery_web/live/range_live/form_component.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Notes"
@@ -339,7 +339,7 @@ msgstr ""
 "vertrauen."
 
 #: lib/cannery_web/controllers/user_settings_controller.ex:10
-#: lib/cannery_web/templates/user_settings/edit.html.heex:3
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr "Einstellungen"
@@ -354,13 +354,13 @@ msgstr "Einfach:"
 msgid "Steel"
 msgstr "Stahl"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:106
+#: lib/cannery_web/live/pack_live/show.html.heex:100
 #, elixir-autogen, elixir-format
 msgid "Stored in"
 msgstr "Gelagert in"
 
 #: lib/cannery_web/components/container_table_component.ex:66
-#: lib/cannery_web/components/core_components/topbar.html.heex:34
+#: lib/cannery_web/components/core_components/topbar.html.heex:28
 #: lib/cannery_web/live/tag_live/index.ex:43
 #: lib/cannery_web/live/tag_live/index.ex:53
 #: lib/cannery_web/live/tag_live/index.html.heex:3
@@ -390,7 +390,7 @@ msgid "Tracer"
 msgstr "Leuchtspur"
 
 #: lib/cannery_web/components/container_table_component.ex:48
-#: lib/cannery_web/components/move_pack_component.ex:66
+#: lib/cannery_web/components/move_pack_component.ex:65
 #: lib/cannery_web/components/pack_table_component.ex:108
 #: lib/cannery_web/live/container_live/form_component.html.heex:39
 #: lib/cannery_web/live/pack_live/form_component.html.heex:22
@@ -424,7 +424,7 @@ msgstr "Ihre Daten bleiben bei Ihnen, Punkt"
 msgid "No tags for this container"
 msgstr "Keine Tags für diesen Behälter"
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:66
+#: lib/cannery_web/components/core_components/topbar.html.heex:48
 #: lib/cannery_web/components/pack_table_component.ex:80
 #, elixir-autogen, elixir-format
 msgid "Range"
@@ -437,7 +437,7 @@ msgstr "Range Day"
 
 #: lib/cannery_web/components/add_shot_record_component.html.heex:49
 #: lib/cannery_web/components/shot_record_table_component.ex:47
-#: lib/cannery_web/live/pack_live/show.ex:92
+#: lib/cannery_web/live/pack_live/show.ex:91
 #: lib/cannery_web/live/range_live/form_component.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Date"
@@ -459,26 +459,26 @@ msgstr "Keine Munition selektiert"
 msgid "Record shots"
 msgstr "Schüsse dokumentieren"
 
-#: lib/cannery_web/live/range_live/index.ex:48
+#: lib/cannery_web/live/range_live/index.ex:47
 #, elixir-autogen, elixir-format
 msgid "New Shot Records"
 msgstr "Neue Schießkladde"
 
-#: lib/cannery_web/live/range_live/index.html.heex:55
+#: lib/cannery_web/live/range_live/index.html.heex:52
-#: lib/cannery_web/live/range_live/index.html.heex:122
+#: lib/cannery_web/live/range_live/index.html.heex:119
 #, elixir-autogen, elixir-format
 msgid "No shots recorded"
 msgstr "Keine Schüsse dokumentiert"
 
 #: lib/cannery_web/components/shot_record_table_component.ex:45
-#: lib/cannery_web/live/pack_live/show.ex:90
+#: lib/cannery_web/live/pack_live/show.ex:89
-#: lib/cannery_web/live/range_live/index.html.heex:69
+#: lib/cannery_web/live/range_live/index.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Rounds shot"
 msgstr "Patronen abgefeuert"
 
-#: lib/cannery_web/live/range_live/index.ex:56
+#: lib/cannery_web/live/range_live/index.ex:55
-#: lib/cannery_web/live/range_live/index.ex:66
+#: lib/cannery_web/live/range_live/index.ex:65
 #, elixir-autogen, elixir-format
 msgid "Shot Records"
 msgstr "Schießkladde"
@@ -488,12 +488,12 @@ msgstr "Schießkladde"
 msgid "Move ammo"
 msgstr "Munition verschieben"
 
-#: lib/cannery_web/components/move_pack_component.ex:83
+#: lib/cannery_web/components/move_pack_component.ex:82
 #, elixir-autogen, elixir-format
 msgid "No other containers"
 msgstr "Kein weiterer Behälter"
 
-#: lib/cannery_web/live/range_live/index.html.heex:60
+#: lib/cannery_web/live/range_live/index.html.heex:57
 #, elixir-autogen, elixir-format
 msgid "Shot log"
 msgstr "Schießkladde"
@@ -544,20 +544,20 @@ msgstr "Pulverart"
 msgid "UPC"
 msgstr "UPC"
 
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:20
+#: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:20
-#: lib/cannery_web/templates/user_settings/edit.html.heex:76
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:76
 #, elixir-autogen, elixir-format
 msgid "Confirm new password"
 msgstr "Passwort bestätigen"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:31
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:31
-#: lib/cannery_web/templates/user_settings/edit.html.heex:85
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:85
 #, elixir-autogen, elixir-format
 msgid "Current password"
 msgstr "Derzeitiges Passwort"
 
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:16
+#: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:16
-#: lib/cannery_web/templates/user_settings/edit.html.heex:69
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "New password"
 msgstr "Neues Passwort"
@@ -568,19 +568,19 @@ msgstr "Neues Passwort"
 msgid "Firing type"
 msgstr "Patronenhülsenform"
 
-#: lib/cannery_web/templates/layout/live.html.heex:43
+#: lib/cannery_web/components/layouts/live.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Reconnecting..."
 msgstr "Neu verbinden..."
 
 #: lib/cannery_web/live/container_live/index.ex:28
-#: lib/cannery_web/live/container_live/show.ex:120
+#: lib/cannery_web/live/container_live/show.ex:116
 #, elixir-autogen, elixir-format
 msgid "Edit %{name}"
 msgstr "%{name} bearbeiten"
 
 #: lib/cannery_web/live/container_live/index.ex:63
-#: lib/cannery_web/live/container_live/show.ex:121
+#: lib/cannery_web/live/container_live/show.ex:117
 #, elixir-autogen, elixir-format
 msgid "Edit %{name} tags"
 msgstr "Editiere %{name} Tags"
@@ -625,7 +625,7 @@ msgstr "Ursprüngliche Anzahl:"
 msgid "Percentage left:"
 msgstr "Prozent verbleibend:"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:119
+#: lib/cannery_web/live/pack_live/show.html.heex:113
 #, elixir-autogen, elixir-format
 msgid "Rounds used"
 msgstr "Patronen verbraucht"
@@ -645,18 +645,18 @@ msgstr "Passwort vergessen?"
 msgid "Log in"
 msgstr "Einloggen"
 
-#: lib/cannery_web/controllers/user_registration_controller.ex:33
+#: lib/cannery_web/controllers/user_registration_controller.ex:32
 #, elixir-autogen, elixir-format
 msgid "Register"
 msgstr "Registrieren"
 
-#: lib/cannery_web/controllers/user_reset_password_controller.ex:36
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:35
 #, elixir-autogen, elixir-format
 msgid "Reset your password"
 msgstr "Passwort zurücksetzen"
 
-#: lib/cannery_web/live/pack_live/show.ex:41
+#: lib/cannery_web/live/pack_live/show.ex:40
-#: lib/cannery_web/live/range_live/index.ex:32
+#: lib/cannery_web/live/range_live/index.ex:31
 #, elixir-autogen, elixir-format
 msgid "Record Shots"
 msgstr "Schüsse dokumentieren"
@@ -671,23 +671,23 @@ msgstr "Kopien"
 msgid "Added on:"
 msgstr "Hinzugefügt am:"
 
-#: lib/cannery_web/templates/user_registration/new.html.heex:32
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:32
-#: lib/cannery_web/templates/user_settings/edit.html.heex:127
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:127
 #, elixir-autogen, elixir-format
 msgid "English"
 msgstr "Englisch"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:129
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:129
 #, elixir-autogen, elixir-format
 msgid "French"
 msgstr "Französisch"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:128
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:128
 #, elixir-autogen, elixir-format
 msgid "German"
 msgstr "Deutsch"
 
-#: lib/cannery_web/templates/user_registration/new.html.heex:28
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Language"
 msgstr "Sprache"
@@ -712,7 +712,7 @@ msgstr "Sende Bugs oder Erweiterungsvorschläge"
 msgid "View the source code"
 msgstr "Quellcode ansehen"
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:50
+#: lib/cannery_web/components/core_components/topbar.html.heex:38
 #: lib/cannery_web/live/type_live/index.ex:52
 #: lib/cannery_web/live/type_live/index.ex:62
 #: lib/cannery_web/live/type_live/index.html.heex:3
@@ -720,27 +720,27 @@ msgstr "Quellcode ansehen"
 msgid "Catalog"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:45
+#: lib/cannery_web/live/pack_live/show.ex:44
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit Ammo"
 msgstr "Munitionstyp bearbeiten"
 
-#: lib/cannery_web/live/pack_live/show.ex:43
+#: lib/cannery_web/live/pack_live/show.ex:42
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Move Ammo"
 msgstr "Munition verschieben"
 
-#: lib/cannery_web/live/container_live/show.html.heex:123
+#: lib/cannery_web/live/container_live/show.html.heex:117
 #, elixir-autogen, elixir-format, fuzzy
 msgid "No ammo in this container"
 msgstr "Keine Munitionsgruppe in diesem Behälter"
 
-#: lib/cannery_web/live/pack_live/show.ex:44
+#: lib/cannery_web/live/pack_live/show.ex:43
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show Ammo"
 msgstr "Zeige Munitionsarten"
 
-#: lib/cannery_web/live/pack_live/show.html.heex:111
+#: lib/cannery_web/live/pack_live/show.html.heex:105
 #, elixir-autogen, elixir-format, fuzzy
 msgid "This ammo is not in a container"
 msgstr "Diese Munitionsgruppe ist nicht in einem Behälter"
@@ -752,7 +752,7 @@ msgstr "Diese Munitionsgruppe ist nicht in einem Behälter"
 msgid "Packs:"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:10
+#: lib/cannery_web/components/core_components/topbar.html.heex:7
 #: lib/cannery_web/live/home_live.html.heex:4
 #, elixir-autogen, elixir-format
 msgid "Cannery logo"
@@ -786,7 +786,7 @@ msgstr ""
 msgid "%{percentage}%"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:154
+#: lib/cannery_web/live/range_live/index.ex:153
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Rounds shot: %{count}"
 msgstr "Patronen abgefeuert"
@@ -804,7 +804,7 @@ msgid "Rounds"
 msgstr "Patronen:"
 
 #: lib/cannery_web/live/container_live/index.html.heex:40
-#: lib/cannery_web/live/container_live/show.html.heex:115
+#: lib/cannery_web/live/container_live/show.html.heex:109
 #: lib/cannery_web/live/type_live/show.html.heex:170
 #, elixir-autogen, elixir-format
 msgid "View as table"
@@ -850,102 +850,102 @@ msgstr ""
 msgid "Used rounds:"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:71
+#: lib/cannery_web/live/range_live/index.html.heex:68
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Rounds shot chart"
 msgstr "Patronen abgefeuert"
 
-#: lib/cannery_web/live/type_live/show.ex:154
+#: lib/cannery_web/live/type_live/show.ex:153
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Blank:"
 msgstr "Knallpatrone"
 
-#: lib/cannery_web/live/type_live/show.ex:132
+#: lib/cannery_web/live/type_live/show.ex:131
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Bullet core:"
 msgstr "Projektilkern"
 
-#: lib/cannery_web/live/type_live/show.ex:131
+#: lib/cannery_web/live/type_live/show.ex:130
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Bullet type:"
 msgstr "Patronenart"
 
-#: lib/cannery_web/live/type_live/show.ex:123
+#: lib/cannery_web/live/type_live/show.ex:122
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Caliber:"
 msgstr "Kaliber"
 
-#: lib/cannery_web/live/type_live/show.ex:121
+#: lib/cannery_web/live/type_live/show.ex:120
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Cartridge:"
 msgstr "Patrone"
 
-#: lib/cannery_web/live/type_live/show.ex:134
+#: lib/cannery_web/live/type_live/show.ex:133
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Case material:"
 msgstr "Gehäusematerial"
 
-#: lib/cannery_web/live/type_live/show.ex:155
+#: lib/cannery_web/live/type_live/show.ex:154
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Corrosive:"
 msgstr "Korrosiv"
 
-#: lib/cannery_web/live/type_live/show.ex:151
+#: lib/cannery_web/live/type_live/show.ex:150
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Firing type:"
 msgstr "Patronenhülsenform"
 
-#: lib/cannery_web/live/type_live/show.ex:130
+#: lib/cannery_web/live/type_live/show.ex:129
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Grains:"
 msgstr "Körner"
 
-#: lib/cannery_web/live/type_live/show.ex:153
+#: lib/cannery_web/live/type_live/show.ex:152
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Incendiary:"
 msgstr "Brandmunition"
 
-#: lib/cannery_web/live/type_live/show.ex:133
+#: lib/cannery_web/live/type_live/show.ex:132
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Jacket type:"
 msgstr "Patronenhülse"
 
-#: lib/cannery_web/live/type_live/show.ex:156
+#: lib/cannery_web/live/type_live/show.ex:155
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Manufacturer:"
 msgstr "Hersteller"
 
-#: lib/cannery_web/live/type_live/show.ex:149
+#: lib/cannery_web/live/type_live/show.ex:148
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Muzzle velocity:"
 msgstr "Mündungsgeschwindigkeit"
 
-#: lib/cannery_web/live/type_live/show.ex:143
+#: lib/cannery_web/live/type_live/show.ex:142
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Powder grains per charge:"
 msgstr "Pulverkörner pro Ladung"
 
-#: lib/cannery_web/live/type_live/show.ex:141
+#: lib/cannery_web/live/type_live/show.ex:140
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Powder type:"
 msgstr "Pulverart"
 
-#: lib/cannery_web/live/type_live/show.ex:147
+#: lib/cannery_web/live/type_live/show.ex:146
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Pressure:"
 msgstr "Druck"
 
-#: lib/cannery_web/live/type_live/show.ex:150
+#: lib/cannery_web/live/type_live/show.ex:149
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Primer type:"
 msgstr "Zündertyp"
 
-#: lib/cannery_web/live/type_live/show.ex:152
+#: lib/cannery_web/live/type_live/show.ex:151
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Tracer:"
 msgstr "Leuchtspur"
 
-#: lib/cannery_web/live/type_live/show.ex:157
+#: lib/cannery_web/live/type_live/show.ex:156
 #, elixir-autogen, elixir-format, fuzzy
 msgid "UPC:"
 msgstr "UPC"
@@ -982,7 +982,7 @@ msgstr "Ursprüngliche Anzahl:"
 msgid "Original Count:"
 msgstr "Ursprüngliche Anzahl:"
 
-#: lib/cannery_web/live/home_live.ex:15
+#: lib/cannery_web/live/home_live.ex:14
 #, elixir-autogen, elixir-format
 msgid "Home"
 msgstr ""
@@ -1039,20 +1039,20 @@ msgstr ""
 msgid "Search tags"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:115
+#: lib/cannery_web/live/range_live/index.html.heex:112
 #, elixir-autogen, elixir-format
 msgid "Search shot records"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:130
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:130
 #, elixir-autogen, elixir-format
 msgid "Spanish"
 msgstr ""
 
-#: lib/cannery_web/templates/error/error.html.heex:8
+#: lib/cannery_web/components/layouts.ex:15
-#: lib/cannery_web/templates/layout/root.html.heex:13
+#: lib/cannery_web/components/layouts/root.html.heex:9
-#: lib/cannery_web/templates/layout/root.html.heex:14
+#: lib/cannery_web/components/layouts/root.html.heex:10
-#: lib/cannery_web/views/layout_view.ex:14
+#: lib/cannery_web/controllers/error_html/error.html.heex:8
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Cannery"
 msgstr ""
@@ -1093,7 +1093,7 @@ msgstr ""
 "Mit %{name} können Sie ihren Munitionsbestand vor und nach dem Schießen "
 "leicht im Auge behalten"
 
-#: lib/cannery_web/views/layout_view.ex:10
+#: lib/cannery_web/components/layouts.ex:11
 #, elixir-autogen, elixir-format
 msgid "Cannery | %{title}"
 msgstr ""
@@ -1133,17 +1133,17 @@ msgstr "Verbleibende Nutzung:"
 msgid "Uses: %{uses_count}"
 msgstr ""
 
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:13
+#: lib/cannery_web/controllers/user_confirmation_html/new.html.heex:13
-#: lib/cannery_web/templates/user_registration/new.html.heex:20
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:20
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:13
+#: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:13
-#: lib/cannery_web/templates/user_session/new.html.heex:17
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:17
-#: lib/cannery_web/templates/user_settings/edit.html.heex:27
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:27
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr ""
 
-#: lib/cannery_web/templates/user_registration/new.html.heex:24
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:24
-#: lib/cannery_web/templates/user_session/new.html.heex:20
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:20
 #, elixir-autogen, elixir-format
 msgid "Password"
 msgstr ""
@@ -1180,21 +1180,21 @@ msgid "Really great weather"
 msgstr ""
 
 #: lib/cannery_web/components/container_table_component.ex:67
-#: lib/cannery_web/components/move_pack_component.ex:68
+#: lib/cannery_web/components/move_pack_component.ex:67
 #: lib/cannery_web/components/pack_table_component.ex:62
 #: lib/cannery_web/components/shot_record_table_component.ex:48
 #: lib/cannery_web/components/type_table_component.ex:99
-#: lib/cannery_web/live/pack_live/show.ex:93
+#: lib/cannery_web/live/pack_live/show.ex:92
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:105
+#: lib/cannery_web/components/core_components/topbar.html.heex:81
 #, elixir-autogen, elixir-format
 msgid "Live Dashboard"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:90
+#: lib/cannery_web/components/core_components/topbar.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Log out"
 msgstr ""
@@ -1210,9 +1210,9 @@ msgstr ""
 msgid "Close modal"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:103
+#: lib/cannery_web/live/container_live/show.html.heex:97
 #: lib/cannery_web/live/pack_live/index.html.heex:58
-#: lib/cannery_web/live/range_live/index.html.heex:92
+#: lib/cannery_web/live/range_live/index.html.heex:89
 #: lib/cannery_web/live/type_live/index.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "All"
@@ -1229,7 +1229,7 @@ msgstr ""
 msgid "Brass height"
 msgstr "Messing"
 
-#: lib/cannery_web/live/type_live/show.ex:128
+#: lib/cannery_web/live/type_live/show.ex:127
 #, elixir-autogen, elixir-format
 msgid "Brass height:"
 msgstr ""
@@ -1240,7 +1240,7 @@ msgstr ""
 msgid "Chamber size"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:129
+#: lib/cannery_web/live/type_live/show.ex:128
 #, elixir-autogen, elixir-format
 msgid "Chamber size:"
 msgstr ""
@@ -1256,7 +1256,7 @@ msgstr ""
 msgid "Dram equivalent"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:148
+#: lib/cannery_web/live/type_live/show.ex:147
 #, elixir-autogen, elixir-format
 msgid "Dram equivalent:"
 msgstr ""
@@ -1267,7 +1267,7 @@ msgstr ""
 msgid "Gauge"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:123
+#: lib/cannery_web/live/type_live/show.ex:122
 #, elixir-autogen, elixir-format
 msgid "Gauge:"
 msgstr ""
@@ -1278,7 +1278,7 @@ msgstr ""
 msgid "Load grains"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:139
+#: lib/cannery_web/live/type_live/show.ex:138
 #, elixir-autogen, elixir-format
 msgid "Load grains:"
 msgstr ""
@@ -1293,9 +1293,9 @@ msgstr "Keine Munition"
 msgid "None specified"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:106
+#: lib/cannery_web/live/container_live/show.html.heex:100
 #: lib/cannery_web/live/pack_live/index.html.heex:61
-#: lib/cannery_web/live/range_live/index.html.heex:95
+#: lib/cannery_web/live/range_live/index.html.heex:92
 #: lib/cannery_web/live/type_live/form_component.html.heex:25
 #: lib/cannery_web/live/type_live/index.html.heex:38
 #: lib/cannery_web/live/type_live/show.html.heex:56
@@ -1318,9 +1318,9 @@ msgstr "Zündertyp"
 msgid "Projectile"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:104
+#: lib/cannery_web/live/container_live/show.html.heex:98
 #: lib/cannery_web/live/pack_live/index.html.heex:59
-#: lib/cannery_web/live/range_live/index.html.heex:93
+#: lib/cannery_web/live/range_live/index.html.heex:90
 #: lib/cannery_web/live/type_live/form_component.html.heex:25
 #: lib/cannery_web/live/type_live/index.html.heex:36
 #: lib/cannery_web/live/type_live/show.html.heex:54
@@ -1334,7 +1334,7 @@ msgstr ""
 msgid "Shot charge weight"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:140
+#: lib/cannery_web/live/type_live/show.ex:139
 #, elixir-autogen, elixir-format
 msgid "Shot charge weight:"
 msgstr ""
@@ -1345,7 +1345,7 @@ msgstr ""
 msgid "Shot material"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:137
+#: lib/cannery_web/live/type_live/show.ex:136
 #, elixir-autogen, elixir-format
 msgid "Shot material:"
 msgstr ""
@@ -1356,7 +1356,7 @@ msgstr ""
 msgid "Shot size"
 msgstr "Schüsse abgegeben"
 
-#: lib/cannery_web/live/type_live/show.ex:138
+#: lib/cannery_web/live/type_live/show.ex:137
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Shot size:"
 msgstr "Schüsse abgegeben"
@@ -1367,14 +1367,14 @@ msgstr "Schüsse abgegeben"
 msgid "Shot type"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:136
+#: lib/cannery_web/live/type_live/show.ex:135
 #, elixir-autogen, elixir-format
 msgid "Shot type:"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:105
+#: lib/cannery_web/live/container_live/show.html.heex:99
 #: lib/cannery_web/live/pack_live/index.html.heex:60
-#: lib/cannery_web/live/range_live/index.html.heex:94
+#: lib/cannery_web/live/range_live/index.html.heex:91
 #: lib/cannery_web/live/type_live/form_component.html.heex:25
 #: lib/cannery_web/live/type_live/index.html.heex:37
 #: lib/cannery_web/live/type_live/show.html.heex:52
@@ -1393,7 +1393,7 @@ msgstr ""
 msgid "Target, bird, buck, etc"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:127
+#: lib/cannery_web/live/type_live/show.ex:126
 #, elixir-autogen, elixir-format
 msgid "Unfired length:"
 msgstr ""
@@ -1410,15 +1410,15 @@ msgstr ""
 msgid "Wadding"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:135
+#: lib/cannery_web/live/type_live/show.ex:134
 #, elixir-autogen, elixir-format
 msgid "Wadding:"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:149
-#: lib/cannery_web/live/container_live/show.html.heex:97
+#: lib/cannery_web/live/container_live/show.html.heex:91
 #: lib/cannery_web/live/pack_live/index.html.heex:50
-#: lib/cannery_web/live/range_live/index.html.heex:86
+#: lib/cannery_web/live/range_live/index.html.heex:83
 #: lib/cannery_web/live/type_live/form_component.html.heex:21
 #: lib/cannery_web/live/type_live/index.html.heex:29
 #: lib/cannery_web/live/type_live/show.html.heex:46
@@ -1437,14 +1437,14 @@ msgstr "Patronen:"
 msgid "Used up!"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:42
+#: lib/cannery_web/live/pack_live/show.ex:41
-#: lib/cannery_web/live/range_live/index.ex:40
+#: lib/cannery_web/live/range_live/index.ex:39
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit Shot Record"
 msgstr "Schießkladde editieren"
 
 #: lib/cannery_web/live/type_live/index.ex:28
-#: lib/cannery_web/live/type_live/show.ex:82
+#: lib/cannery_web/live/type_live/show.ex:81
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit %{type_name}"
 msgstr "%{name} bearbeiten"

priv/gettext/de/LC_MESSAGES/emails.po

@@ -14,45 +14,45 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.11.2\n"
 
-#: lib/cannery_web/templates/email/confirm_email.html.heex:3
+#: lib/cannery_web/components/email_html/confirm_email.html.heex:3
-#: lib/cannery_web/templates/email/confirm_email.txt.eex:2
+#: lib/cannery_web/components/email_html/confirm_email.txt.eex:2
-#: lib/cannery_web/templates/email/reset_password.html.heex:3
+#: lib/cannery_web/components/email_html/reset_password.html.heex:3
-#: lib/cannery_web/templates/email/reset_password.txt.eex:2
+#: lib/cannery_web/components/email_html/reset_password.txt.eex:2
-#: lib/cannery_web/templates/email/update_email.html.heex:3
+#: lib/cannery_web/components/email_html/update_email.html.heex:3
-#: lib/cannery_web/templates/email/update_email.txt.eex:2
+#: lib/cannery_web/components/email_html/update_email.txt.eex:2
 #, elixir-autogen, elixir-format
 msgid "Hi %{email},"
 msgstr "Hallo %{email},"
 
-#: lib/cannery_web/templates/email/confirm_email.txt.eex:10
+#: lib/cannery_web/components/email_html/confirm_email.txt.eex:10
 #, elixir-autogen, elixir-format
 msgid "If you didn't create an account at %{url}, please ignore this."
 msgstr ""
 "Falls Sie dieses Nutzerkonto bei %{url} nicht erstellt haben, ignorieren Sie "
 "diese Nachricht bitte."
 
-#: lib/cannery_web/templates/email/reset_password.txt.eex:8
+#: lib/cannery_web/components/email_html/reset_password.txt.eex:8
-#: lib/cannery_web/templates/email/update_email.txt.eex:8
+#: lib/cannery_web/components/email_html/update_email.txt.eex:8
 #, elixir-autogen, elixir-format
 msgid "If you didn't request this change from %{url}, please ignore this."
 msgstr ""
 "Falls Sie diese Änderung von %{url} nicht angefordert haben, ignorieren Sie "
 "bitte diese Nachricht."
 
-#: lib/cannery_web/templates/email/update_email.html.heex:8
+#: lib/cannery_web/components/email_html/update_email.html.heex:8
-#: lib/cannery_web/templates/email/update_email.txt.eex:4
+#: lib/cannery_web/components/email_html/update_email.txt.eex:4
 #, elixir-autogen, elixir-format
 msgid "You can change your email by visiting the URL below:"
 msgstr "Sie können Ihre Mailadresse unter folgender URL ändern:"
 
-#: lib/cannery_web/templates/email/confirm_email.html.heex:14
+#: lib/cannery_web/components/email_html/confirm_email.html.heex:14
-#: lib/cannery_web/templates/email/confirm_email.txt.eex:6
+#: lib/cannery_web/components/email_html/confirm_email.txt.eex:6
 #, elixir-autogen, elixir-format
 msgid "You can confirm your account by visiting the URL below:"
 msgstr "Sie können Ihr Nutzerkonto unter folgender URL bestätigen:"
 
-#: lib/cannery_web/templates/email/reset_password.html.heex:8
+#: lib/cannery_web/components/email_html/reset_password.html.heex:8
-#: lib/cannery_web/templates/email/reset_password.txt.eex:4
+#: lib/cannery_web/components/email_html/reset_password.txt.eex:4
 #, elixir-autogen, elixir-format
 msgid "You can reset your password by visiting the URL below:"
 msgstr "Sie können ihr Passwort unter folgender URL zurücksetzen:"
@@ -66,52 +66,52 @@ msgstr "Sie können ihr Passwort unter folgender URL zurücksetzen:"
 ## Run "mix gettext.extract" to bring this file up to
 ## date. Leave "msgstr"s empty as changing them here has no
 ## effect: edit them in PO (.po) files instead.
-#: lib/cannery/accounts/email.ex:30
+#: lib/cannery/accounts/email.ex:31
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Confirm your Cannery account"
 msgstr "Bestätigen Sie ihr %{name} Nutzerkonto"
 
-#: lib/cannery_web/templates/email/confirm_email.html.heex:22
+#: lib/cannery_web/components/email_html/confirm_email.html.heex:22
 #, elixir-autogen, elixir-format, fuzzy
 msgid "If you didn't create an account at Cannery, please ignore this."
 msgstr ""
 "Falls SIe dieses Nutzerkonto unter %{name}, nicht erstellt haben, ignorieren "
 "Sie diese Nachricht bitte."
 
-#: lib/cannery_web/templates/email/reset_password.html.heex:16
+#: lib/cannery_web/components/email_html/reset_password.html.heex:16
-#: lib/cannery_web/templates/email/update_email.html.heex:16
+#: lib/cannery_web/components/email_html/update_email.html.heex:16
 #, elixir-autogen, elixir-format, fuzzy
 msgid "If you didn't request this change from Cannery, please ignore this."
 msgstr ""
 "Falls Sie die Änderung von %{name} nicht angefragt haben, ignorieren Sie "
 "diese Nachricht bitte."
 
-#: lib/cannery/accounts/email.ex:37
+#: lib/cannery/accounts/email.ex:38
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Reset your Cannery password"
 msgstr "Passwort für %{name} zurücksetzen"
 
-#: lib/cannery_web/templates/layout/email.txt.eex:9
+#: lib/cannery_web/components/layouts/email_text.txt.eex:9
 #, elixir-autogen, elixir-format, fuzzy
 msgid "This email was sent from Cannery at %{url}, the self-hosted firearm tracker website."
 msgstr ""
 "Diese Nachricht wurde von %{name} unter %{url} gesandt, einem selbst-"
 "gehosteten Schusswaffenmanager."
 
-#: lib/cannery_web/templates/layout/email.html.heex:13
+#: lib/cannery_web/components/layouts/email_html.html.heex:13
 #, elixir-autogen, elixir-format, fuzzy
 msgid "This email was sent from Cannery, the self-hosted firearm tracker website."
 msgstr ""
 "Diese Nachricht wurde von %{name} gesandt, einem selbst-gehosteten "
 "Schusswaffenmanager."
 
-#: lib/cannery/accounts/email.ex:44
+#: lib/cannery/accounts/email.ex:45
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Update your Cannery email"
 msgstr "Aktualisieren Sie %{name} Mailadresse"
 
-#: lib/cannery_web/templates/email/confirm_email.html.heex:9
+#: lib/cannery_web/components/email_html/confirm_email.html.heex:9
-#: lib/cannery_web/templates/email/confirm_email.txt.eex:4
+#: lib/cannery_web/components/email_html/confirm_email.txt.eex:4
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Welcome to Cannery"
 msgstr "Willkommen %{name}!"

priv/gettext/de/LC_MESSAGES/errors.po

@@ -29,7 +29,7 @@ msgid "Container must be empty before deleting"
 msgstr "Behälter muss vor dem Löschen leer sein"
 
 #: lib/cannery_web/live/container_live/index.ex:86
-#: lib/cannery_web/live/container_live/show.ex:71
+#: lib/cannery_web/live/container_live/show.ex:67
 #, elixir-autogen, elixir-format
 msgid "Could not delete %{name}: %{error}"
 msgstr "Konnte %{name} nicht löschen: %{error}"
@@ -44,55 +44,51 @@ msgstr "Konnte Behälter nicht finden"
 msgid "Email change link is invalid or it has expired."
 msgstr "Mailadressenänderungs-Link ist ungültig oder abgelaufen."
 
-#: lib/cannery_web/templates/error/error.html.heex:8
+#: lib/cannery_web/controllers/error_html/error.html.heex:8
 #, elixir-autogen, elixir-format
 msgid "Error"
 msgstr "Fehler"
 
-#: lib/cannery_web/templates/error/error.html.heex:31
+#: lib/cannery_web/controllers/error_html/error.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Go back home"
 msgstr "Zur Hauptseite zurückkehren"
 
-#: lib/cannery_web/views/error_view.ex:10
-#, elixir-autogen, elixir-format
-msgid "Internal Server Error"
-msgstr "Interner Serverfehler"
-
 #: lib/cannery_web/controllers/user_session_controller.ex:17
 #, elixir-autogen, elixir-format
 msgid "Invalid email or password"
 msgstr "Ungültige Mailadresse oder Passwort"
 
-#: lib/cannery_web/views/error_view.ex:8
+#: lib/cannery_web/controllers/error_html.ex:9
+#: lib/cannery_web/controllers/error_json.ex:7
 #, elixir-autogen, elixir-format
 msgid "Not found"
 msgstr "Nicht gefunden"
 
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:13
+#: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:13
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:22
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:64
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:118
 #: lib/cannery_web/live/type_live/form_component.html.heex:18
-#: lib/cannery_web/templates/user_registration/new.html.heex:13
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:13
-#: lib/cannery_web/templates/user_settings/edit.html.heex:22
-#: lib/cannery_web/templates/user_settings/edit.html.heex:64
-#: lib/cannery_web/templates/user_settings/edit.html.heex:118
 #, elixir-autogen, elixir-format
 msgid "Oops, something went wrong! Please check the errors below."
 msgstr "Oops, etwas ist schiefgegangen. Bitte beachten Sie den Fehler unten."
 
-#: lib/cannery_web/controllers/user_reset_password_controller.ex:63
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:62
 #, elixir-autogen, elixir-format
 msgid "Reset password link is invalid or it has expired."
 msgstr "Link zum Passwort zurücksetzen ist ungültig oder abgelaufen."
 
-#: lib/cannery_web/controllers/user_registration_controller.ex:23
+#: lib/cannery_web/controllers/user_registration_controller.ex:22
-#: lib/cannery_web/controllers/user_registration_controller.ex:52
+#: lib/cannery_web/controllers/user_registration_controller.ex:51
 #, elixir-autogen, elixir-format
 msgid "Sorry, public registration is disabled"
 msgstr "Entschuldigung, aber öffentliche Registrierung ist deaktiviert"
 
-#: lib/cannery_web/controllers/user_registration_controller.ex:13
+#: lib/cannery_web/controllers/user_registration_controller.ex:12
-#: lib/cannery_web/controllers/user_registration_controller.ex:42
+#: lib/cannery_web/controllers/user_registration_controller.ex:41
-#: lib/cannery_web/controllers/user_registration_controller.ex:71
+#: lib/cannery_web/controllers/user_registration_controller.ex:70
 #, elixir-autogen, elixir-format
 msgid "Sorry, this invite was not found or expired"
 msgstr ""
@@ -103,17 +99,18 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr "Dieser Nutzer konnte nicht gelöscht werden"
 
-#: lib/cannery_web/views/error_view.ex:9
+#: lib/cannery_web/controllers/error_html.ex:10
+#: lib/cannery_web/controllers/error_json.ex:8
 #, elixir-autogen, elixir-format
 msgid "Unauthorized"
 msgstr "Unbefugt"
 
-#: lib/cannery_web/controllers/user_confirmation_controller.ex:54
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:53
 #, elixir-autogen, elixir-format
 msgid "User confirmation link is invalid or it has expired."
 msgstr "Nutzerkonto Bestätigungslink ist ungültig oder abgelaufen."
 
-#: lib/cannery_web/controllers/user_auth.ex:177
+#: lib/cannery_web/controllers/user_auth.ex:266
 #, elixir-autogen, elixir-format
 msgid "You are not authorized to view this page."
 msgstr "Sie sind nicht berechtigt, diese Seite aufzurufen."
@@ -138,7 +135,7 @@ msgstr "ist nicht gültig"
 msgid "must have the @ sign and no spaces"
 msgstr "Muss ein @ Zeichen und keine Leerzeichen haben"
 
-#: lib/cannery_web/live/container_live/show.ex:46
+#: lib/cannery_web/live/container_live/show.ex:45
 #, elixir-autogen, elixir-format
 msgid "Tag not found"
 msgstr "Tag nicht gefunden"
@@ -148,8 +145,8 @@ msgstr "Tag nicht gefunden"
 msgid "Tag could not be added"
 msgstr "Tag konnte nicht hinzugefügt werden"
 
-#: lib/cannery_web/controllers/user_auth.ex:39
+#: lib/cannery_web/controllers/user_auth.ex:38
-#: lib/cannery_web/controllers/user_auth.ex:161
+#: lib/cannery_web/controllers/user_auth.ex:250
 #, elixir-autogen, elixir-format
 msgid "You must confirm your account and log in to access this page."
 msgstr ""
@@ -178,7 +175,7 @@ msgstr ""
 msgid "Invalid multiplier"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:74
+#: lib/cannery_web/live/range_live/index.html.heex:71
 #, elixir-autogen, elixir-format
 msgid "Your browser does not support the canvas element."
 msgstr ""
@@ -212,3 +209,19 @@ msgstr ""
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Please select a type and container"
 msgstr ""
+
+#: lib/cannery_web/controllers/error_html.ex:11
+#: lib/cannery_web/controllers/error_json.ex:9
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Internal server error"
+msgstr "Interner Serverfehler"
+
+#: lib/cannery_web/controllers/user_auth.ex:195
+#, elixir-autogen, elixir-format
+msgid "You must log in as an administrator to access this page."
+msgstr ""
+
+#: lib/cannery_web/controllers/user_auth.ex:178
+#, elixir-autogen, elixir-format
+msgid "You must log in to access this page."
+msgstr ""

priv/gettext/de/LC_MESSAGES/prompts.po

@@ -33,13 +33,13 @@ msgstr "%{name} erfolgreich erstellt"
 
 #: lib/cannery_web/live/tag_live/index.ex:65
 #: lib/cannery_web/live/type_live/index.ex:72
-#: lib/cannery_web/live/type_live/show.ex:27
+#: lib/cannery_web/live/type_live/show.ex:26
 #, elixir-autogen, elixir-format
 msgid "%{name} deleted succesfully"
 msgstr "%{name} erfolgreich gelöscht"
 
 #: lib/cannery_web/live/container_live/index.ex:79
-#: lib/cannery_web/live/container_live/show.ex:61
+#: lib/cannery_web/live/container_live/show.ex:60
 #, elixir-autogen, elixir-format
 msgid "%{name} has been deleted"
 msgstr "%{name} wurde gelöscht"
@@ -73,18 +73,18 @@ msgstr ""
 msgid "Are you sure you want to delete %{name}?"
 msgstr "Sind Sie sicher, dass sie %{name} löschen möchten?"
 
-#: lib/cannery_web/live/pack_live/index.html.heex:187
+#: lib/cannery_web/live/pack_live/index.html.heex:181
-#: lib/cannery_web/live/pack_live/show.html.heex:72
+#: lib/cannery_web/live/pack_live/show.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this ammo?"
 msgstr "Sind Sie sicher, dass sie diese Munition löschen möchten?"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:157
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:153
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete your account?"
 msgstr "Sind Sie sicher, dass sie Ihren Account löschen möchten?"
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:89
+#: lib/cannery_web/components/core_components/topbar.html.heex:65
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to log out?"
 msgstr "Wirklich ausloggen?"
@@ -113,7 +113,7 @@ msgstr ""
 msgid "Logged out successfully."
 msgstr "Erfolgreich ausgeloggt."
 
-#: lib/cannery_web/controllers/user_reset_password_controller.ex:46
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:45
 #, elixir-autogen, elixir-format
 msgid "Password reset successfully."
 msgstr "Passwort erfolgreich zurückgesetzt."
@@ -123,7 +123,7 @@ msgstr "Passwort erfolgreich zurückgesetzt."
 msgid "Password updated successfully."
 msgstr "Passwort erfolgreich geändert."
 
-#: lib/cannery_web/controllers/user_registration_controller.ex:66
+#: lib/cannery_web/controllers/user_registration_controller.ex:65
 #, elixir-autogen, elixir-format
 msgid "Please check your email to verify your account"
 msgstr "Bitte überprüfen Sie ihre Mailbox und bestätigen Sie das Nutzerkonto"
@@ -156,7 +156,7 @@ msgstr ""
 msgid "%{name} added successfully"
 msgstr "%{name} erfolgreich hinzugefügt"
 
-#: lib/cannery_web/live/container_live/show.ex:38
+#: lib/cannery_web/live/container_live/show.ex:37
 #, elixir-autogen, elixir-format
 msgid "%{tag_name} has been removed from %{container_name}"
 msgstr "%{tag_name} wurde von %{container_name} entfernt"
@@ -176,14 +176,14 @@ msgstr "Schüsse erfolgreich dokumentiert"
 msgid "Are you sure you want to unstage this ammo?"
 msgstr "Sind sie sicher, dass Sie diese Munition demarkieren möchten?"
 
-#: lib/cannery_web/live/pack_live/show.ex:158
+#: lib/cannery_web/live/pack_live/show.ex:157
-#: lib/cannery_web/live/range_live/index.html.heex:152
+#: lib/cannery_web/live/range_live/index.html.heex:149
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this shot record?"
 msgstr "Sind sie sicher, dass sie die Schießkladde löschen möchten?"
 
-#: lib/cannery_web/live/pack_live/show.ex:80
+#: lib/cannery_web/live/pack_live/show.ex:79
-#: lib/cannery_web/live/range_live/index.ex:79
+#: lib/cannery_web/live/range_live/index.ex:78
 #, elixir-autogen, elixir-format
 msgid "Shot records deleted succesfully"
 msgstr "Schießkladde erfolgreich gelöscht"
@@ -193,12 +193,12 @@ msgstr "Schießkladde erfolgreich gelöscht"
 msgid "Shot records updated successfully"
 msgstr "Schießkladde erfolgreich aktualisiert"
 
-#: lib/cannery_web/controllers/user_confirmation_controller.ex:38
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:37
 #, elixir-autogen, elixir-format
 msgid "%{email} confirmed successfully."
 msgstr "%{email} erfolgreich bestätigt."
 
-#: lib/cannery_web/components/move_pack_component.ex:52
+#: lib/cannery_web/components/move_pack_component.ex:51
 #, elixir-autogen, elixir-format
 msgid "Ammo moved to %{name} successfully"
 msgstr "Munition erfolgreich zu %{name} verschoben"
@@ -224,7 +224,7 @@ msgstr "Sie müssen"
 msgid "Creating..."
 msgstr "Erstellen..."
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:138
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:138
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to change your language?"
 msgstr "Möchten Sie die Sprache wechseln?"
@@ -235,12 +235,12 @@ msgid "Language updated successfully."
 msgstr "Spracheinstellung gespeichert."
 
 #: lib/cannery_web/live/pack_live/index.ex:94
-#: lib/cannery_web/live/pack_live/show.ex:55
+#: lib/cannery_web/live/pack_live/show.ex:54
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo deleted succesfully"
 msgstr "Munitionsgruppe erfolgreich gelöscht"
 
-#: lib/cannery_web/live/range_live/index.ex:92
+#: lib/cannery_web/live/range_live/index.ex:91
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo unstaged succesfully"
 msgstr "Munition erfolgreich demarkiert"

priv/gettext/default.pot

@@ -25,7 +25,7 @@ msgstr ""
 msgid "Admins:"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:58
+#: lib/cannery_web/components/core_components/topbar.html.heex:43
 #: lib/cannery_web/components/shot_record_table_component.ex:44
 #: lib/cannery_web/live/pack_live/index.ex:75
 #: lib/cannery_web/live/pack_live/index.ex:84
@@ -80,14 +80,14 @@ msgstr ""
 msgid "Case material"
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:65
+#: lib/cannery_web/components/move_pack_component.ex:64
 #: lib/cannery_web/components/pack_table_component.ex:76
 #: lib/cannery_web/live/pack_live/form_component.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Container"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:42
+#: lib/cannery_web/components/core_components/topbar.html.heex:33
 #: lib/cannery_web/live/container_live/index.ex:45
 #: lib/cannery_web/live/container_live/index.ex:54
 #: lib/cannery_web/live/container_live/index.html.heex:3
@@ -173,20 +173,20 @@ msgstr ""
 msgid "Invite Only"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:74
+#: lib/cannery_web/components/core_components/topbar.html.heex:53
 #: lib/cannery_web/live/invite_live/index.ex:31
 #: lib/cannery_web/live/invite_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Invites"
 msgstr ""
 
-#: lib/cannery_web/templates/user_session/new.html.heex:23
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:23
 #, elixir-autogen, elixir-format
 msgid "Keep me logged in for 60 days"
 msgstr ""
 
 #: lib/cannery_web/components/container_table_component.ex:47
-#: lib/cannery_web/components/move_pack_component.ex:67
+#: lib/cannery_web/components/move_pack_component.ex:66
 #: lib/cannery_web/live/container_live/form_component.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "Location"
@@ -277,7 +277,7 @@ msgstr ""
 #: lib/cannery_web/components/add_shot_record_component.html.heex:38
 #: lib/cannery_web/components/shot_record_table_component.ex:46
 #: lib/cannery_web/live/pack_live/form_component.html.heex:57
-#: lib/cannery_web/live/pack_live/show.ex:91
+#: lib/cannery_web/live/pack_live/show.ex:90
 #: lib/cannery_web/live/range_live/form_component.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Notes"
@@ -333,7 +333,7 @@ msgid "Self-host your own instance, or use an instance from someone you trust."
 msgstr ""
 
 #: lib/cannery_web/controllers/user_settings_controller.ex:10
-#: lib/cannery_web/templates/user_settings/edit.html.heex:3
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr ""
@@ -348,13 +348,13 @@ msgstr ""
 msgid "Steel"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:106
+#: lib/cannery_web/live/pack_live/show.html.heex:100
 #, elixir-autogen, elixir-format
 msgid "Stored in"
 msgstr ""
 
 #: lib/cannery_web/components/container_table_component.ex:66
-#: lib/cannery_web/components/core_components/topbar.html.heex:34
+#: lib/cannery_web/components/core_components/topbar.html.heex:28
 #: lib/cannery_web/live/tag_live/index.ex:43
 #: lib/cannery_web/live/tag_live/index.ex:53
 #: lib/cannery_web/live/tag_live/index.html.heex:3
@@ -384,7 +384,7 @@ msgid "Tracer"
 msgstr ""
 
 #: lib/cannery_web/components/container_table_component.ex:48
-#: lib/cannery_web/components/move_pack_component.ex:66
+#: lib/cannery_web/components/move_pack_component.ex:65
 #: lib/cannery_web/components/pack_table_component.ex:108
 #: lib/cannery_web/live/container_live/form_component.html.heex:39
 #: lib/cannery_web/live/pack_live/form_component.html.heex:22
@@ -418,7 +418,7 @@ msgstr ""
 msgid "No tags for this container"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:66
+#: lib/cannery_web/components/core_components/topbar.html.heex:48
 #: lib/cannery_web/components/pack_table_component.ex:80
 #, elixir-autogen, elixir-format
 msgid "Range"
@@ -431,7 +431,7 @@ msgstr ""
 
 #: lib/cannery_web/components/add_shot_record_component.html.heex:49
 #: lib/cannery_web/components/shot_record_table_component.ex:47
-#: lib/cannery_web/live/pack_live/show.ex:92
+#: lib/cannery_web/live/pack_live/show.ex:91
 #: lib/cannery_web/live/range_live/form_component.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Date"
@@ -453,26 +453,26 @@ msgstr ""
 msgid "Record shots"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:48
+#: lib/cannery_web/live/range_live/index.ex:47
 #, elixir-autogen, elixir-format
 msgid "New Shot Records"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:55
+#: lib/cannery_web/live/range_live/index.html.heex:52
-#: lib/cannery_web/live/range_live/index.html.heex:122
+#: lib/cannery_web/live/range_live/index.html.heex:119
 #, elixir-autogen, elixir-format
 msgid "No shots recorded"
 msgstr ""
 
 #: lib/cannery_web/components/shot_record_table_component.ex:45
-#: lib/cannery_web/live/pack_live/show.ex:90
+#: lib/cannery_web/live/pack_live/show.ex:89
-#: lib/cannery_web/live/range_live/index.html.heex:69
+#: lib/cannery_web/live/range_live/index.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Rounds shot"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:56
+#: lib/cannery_web/live/range_live/index.ex:55
-#: lib/cannery_web/live/range_live/index.ex:66
+#: lib/cannery_web/live/range_live/index.ex:65
 #, elixir-autogen, elixir-format
 msgid "Shot Records"
 msgstr ""
@@ -482,12 +482,12 @@ msgstr ""
 msgid "Move ammo"
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:83
+#: lib/cannery_web/components/move_pack_component.ex:82
 #, elixir-autogen, elixir-format
 msgid "No other containers"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:60
+#: lib/cannery_web/live/range_live/index.html.heex:57
 #, elixir-autogen, elixir-format
 msgid "Shot log"
 msgstr ""
@@ -538,20 +538,20 @@ msgstr ""
 msgid "UPC"
 msgstr ""
 
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:20
+#: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:20
-#: lib/cannery_web/templates/user_settings/edit.html.heex:76
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:76
 #, elixir-autogen, elixir-format
 msgid "Confirm new password"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:31
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:31
-#: lib/cannery_web/templates/user_settings/edit.html.heex:85
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:85
 #, elixir-autogen, elixir-format
 msgid "Current password"
 msgstr ""
 
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:16
+#: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:16
-#: lib/cannery_web/templates/user_settings/edit.html.heex:69
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "New password"
 msgstr ""
@@ -562,19 +562,19 @@ msgstr ""
 msgid "Firing type"
 msgstr ""
 
-#: lib/cannery_web/templates/layout/live.html.heex:43
+#: lib/cannery_web/components/layouts/live.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Reconnecting..."
 msgstr ""
 
 #: lib/cannery_web/live/container_live/index.ex:28
-#: lib/cannery_web/live/container_live/show.ex:120
+#: lib/cannery_web/live/container_live/show.ex:116
 #, elixir-autogen, elixir-format
 msgid "Edit %{name}"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/index.ex:63
-#: lib/cannery_web/live/container_live/show.ex:121
+#: lib/cannery_web/live/container_live/show.ex:117
 #, elixir-autogen, elixir-format
 msgid "Edit %{name} tags"
 msgstr ""
@@ -619,7 +619,7 @@ msgstr ""
 msgid "Percentage left:"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:119
+#: lib/cannery_web/live/pack_live/show.html.heex:113
 #, elixir-autogen, elixir-format
 msgid "Rounds used"
 msgstr ""
@@ -639,18 +639,18 @@ msgstr ""
 msgid "Log in"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_registration_controller.ex:33
+#: lib/cannery_web/controllers/user_registration_controller.ex:32
 #, elixir-autogen, elixir-format
 msgid "Register"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_reset_password_controller.ex:36
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:35
 #, elixir-autogen, elixir-format
 msgid "Reset your password"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:41
+#: lib/cannery_web/live/pack_live/show.ex:40
-#: lib/cannery_web/live/range_live/index.ex:32
+#: lib/cannery_web/live/range_live/index.ex:31
 #, elixir-autogen, elixir-format
 msgid "Record Shots"
 msgstr ""
@@ -665,23 +665,23 @@ msgstr ""
 msgid "Added on:"
 msgstr ""
 
-#: lib/cannery_web/templates/user_registration/new.html.heex:32
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:32
-#: lib/cannery_web/templates/user_settings/edit.html.heex:127
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:127
 #, elixir-autogen, elixir-format
 msgid "English"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:129
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:129
 #, elixir-autogen, elixir-format
 msgid "French"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:128
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:128
 #, elixir-autogen, elixir-format
 msgid "German"
 msgstr ""
 
-#: lib/cannery_web/templates/user_registration/new.html.heex:28
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Language"
 msgstr ""
@@ -706,7 +706,7 @@ msgstr ""
 msgid "View the source code"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:50
+#: lib/cannery_web/components/core_components/topbar.html.heex:38
 #: lib/cannery_web/live/type_live/index.ex:52
 #: lib/cannery_web/live/type_live/index.ex:62
 #: lib/cannery_web/live/type_live/index.html.heex:3
@@ -714,27 +714,27 @@ msgstr ""
 msgid "Catalog"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:45
+#: lib/cannery_web/live/pack_live/show.ex:44
 #, elixir-autogen, elixir-format
 msgid "Edit Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:43
+#: lib/cannery_web/live/pack_live/show.ex:42
 #, elixir-autogen, elixir-format
 msgid "Move Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:123
+#: lib/cannery_web/live/container_live/show.html.heex:117
 #, elixir-autogen, elixir-format
 msgid "No ammo in this container"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:44
+#: lib/cannery_web/live/pack_live/show.ex:43
 #, elixir-autogen, elixir-format
 msgid "Show Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:111
+#: lib/cannery_web/live/pack_live/show.html.heex:105
 #, elixir-autogen, elixir-format
 msgid "This ammo is not in a container"
 msgstr ""
@@ -746,7 +746,7 @@ msgstr ""
 msgid "Packs:"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:10
+#: lib/cannery_web/components/core_components/topbar.html.heex:7
 #: lib/cannery_web/live/home_live.html.heex:4
 #, elixir-autogen, elixir-format
 msgid "Cannery logo"
@@ -780,7 +780,7 @@ msgstr ""
 msgid "%{percentage}%"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:154
+#: lib/cannery_web/live/range_live/index.ex:153
 #, elixir-autogen, elixir-format
 msgid "Rounds shot: %{count}"
 msgstr ""
@@ -798,7 +798,7 @@ msgid "Rounds"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/index.html.heex:40
-#: lib/cannery_web/live/container_live/show.html.heex:115
+#: lib/cannery_web/live/container_live/show.html.heex:109
 #: lib/cannery_web/live/type_live/show.html.heex:170
 #, elixir-autogen, elixir-format
 msgid "View as table"
@@ -844,102 +844,102 @@ msgstr ""
 msgid "Used rounds:"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:71
+#: lib/cannery_web/live/range_live/index.html.heex:68
 #, elixir-autogen, elixir-format
 msgid "Rounds shot chart"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:154
+#: lib/cannery_web/live/type_live/show.ex:153
 #, elixir-autogen, elixir-format
 msgid "Blank:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:132
+#: lib/cannery_web/live/type_live/show.ex:131
 #, elixir-autogen, elixir-format
 msgid "Bullet core:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:131
+#: lib/cannery_web/live/type_live/show.ex:130
 #, elixir-autogen, elixir-format
 msgid "Bullet type:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:123
+#: lib/cannery_web/live/type_live/show.ex:122
 #, elixir-autogen, elixir-format
 msgid "Caliber:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:121
+#: lib/cannery_web/live/type_live/show.ex:120
 #, elixir-autogen, elixir-format
 msgid "Cartridge:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:134
+#: lib/cannery_web/live/type_live/show.ex:133
 #, elixir-autogen, elixir-format
 msgid "Case material:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:155
+#: lib/cannery_web/live/type_live/show.ex:154
 #, elixir-autogen, elixir-format
 msgid "Corrosive:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:151
+#: lib/cannery_web/live/type_live/show.ex:150
 #, elixir-autogen, elixir-format
 msgid "Firing type:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:130
+#: lib/cannery_web/live/type_live/show.ex:129
 #, elixir-autogen, elixir-format
 msgid "Grains:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:153
+#: lib/cannery_web/live/type_live/show.ex:152
 #, elixir-autogen, elixir-format
 msgid "Incendiary:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:133
+#: lib/cannery_web/live/type_live/show.ex:132
 #, elixir-autogen, elixir-format
 msgid "Jacket type:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:156
+#: lib/cannery_web/live/type_live/show.ex:155
 #, elixir-autogen, elixir-format
 msgid "Manufacturer:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:149
+#: lib/cannery_web/live/type_live/show.ex:148
 #, elixir-autogen, elixir-format
 msgid "Muzzle velocity:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:143
+#: lib/cannery_web/live/type_live/show.ex:142
 #, elixir-autogen, elixir-format
 msgid "Powder grains per charge:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:141
+#: lib/cannery_web/live/type_live/show.ex:140
 #, elixir-autogen, elixir-format
 msgid "Powder type:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:147
+#: lib/cannery_web/live/type_live/show.ex:146
 #, elixir-autogen, elixir-format
 msgid "Pressure:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:150
+#: lib/cannery_web/live/type_live/show.ex:149
 #, elixir-autogen, elixir-format
 msgid "Primer type:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:152
+#: lib/cannery_web/live/type_live/show.ex:151
 #, elixir-autogen, elixir-format
 msgid "Tracer:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:157
+#: lib/cannery_web/live/type_live/show.ex:156
 #, elixir-autogen, elixir-format
 msgid "UPC:"
 msgstr ""
@@ -976,7 +976,7 @@ msgstr ""
 msgid "Original Count:"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.ex:15
+#: lib/cannery_web/live/home_live.ex:14
 #, elixir-autogen, elixir-format
 msgid "Home"
 msgstr ""
@@ -1033,20 +1033,20 @@ msgstr ""
 msgid "Search tags"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:115
+#: lib/cannery_web/live/range_live/index.html.heex:112
 #, elixir-autogen, elixir-format
 msgid "Search shot records"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:130
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:130
 #, elixir-autogen, elixir-format
 msgid "Spanish"
 msgstr ""
 
-#: lib/cannery_web/templates/error/error.html.heex:8
+#: lib/cannery_web/components/layouts.ex:15
-#: lib/cannery_web/templates/layout/root.html.heex:13
+#: lib/cannery_web/components/layouts/root.html.heex:9
-#: lib/cannery_web/templates/layout/root.html.heex:14
+#: lib/cannery_web/components/layouts/root.html.heex:10
-#: lib/cannery_web/views/layout_view.ex:14
+#: lib/cannery_web/controllers/error_html/error.html.heex:8
 #, elixir-autogen, elixir-format
 msgid "Cannery"
 msgstr ""
@@ -1076,7 +1076,7 @@ msgstr ""
 msgid "Cannery lets you easily keep an eye on your ammo levels before and after range day"
 msgstr ""
 
-#: lib/cannery_web/views/layout_view.ex:10
+#: lib/cannery_web/components/layouts.ex:11
 #, elixir-autogen, elixir-format
 msgid "Cannery | %{title}"
 msgstr ""
@@ -1116,17 +1116,17 @@ msgstr ""
 msgid "Uses: %{uses_count}"
 msgstr ""
 
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:13
+#: lib/cannery_web/controllers/user_confirmation_html/new.html.heex:13
-#: lib/cannery_web/templates/user_registration/new.html.heex:20
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:20
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:13
+#: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:13
-#: lib/cannery_web/templates/user_session/new.html.heex:17
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:17
-#: lib/cannery_web/templates/user_settings/edit.html.heex:27
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:27
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr ""
 
-#: lib/cannery_web/templates/user_registration/new.html.heex:24
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:24
-#: lib/cannery_web/templates/user_session/new.html.heex:20
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:20
 #, elixir-autogen, elixir-format
 msgid "Password"
 msgstr ""
@@ -1163,21 +1163,21 @@ msgid "Really great weather"
 msgstr ""
 
 #: lib/cannery_web/components/container_table_component.ex:67
-#: lib/cannery_web/components/move_pack_component.ex:68
+#: lib/cannery_web/components/move_pack_component.ex:67
 #: lib/cannery_web/components/pack_table_component.ex:62
 #: lib/cannery_web/components/shot_record_table_component.ex:48
 #: lib/cannery_web/components/type_table_component.ex:99
-#: lib/cannery_web/live/pack_live/show.ex:93
+#: lib/cannery_web/live/pack_live/show.ex:92
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:105
+#: lib/cannery_web/components/core_components/topbar.html.heex:81
 #, elixir-autogen, elixir-format
 msgid "Live Dashboard"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:90
+#: lib/cannery_web/components/core_components/topbar.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Log out"
 msgstr ""
@@ -1193,9 +1193,9 @@ msgstr ""
 msgid "Close modal"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:103
+#: lib/cannery_web/live/container_live/show.html.heex:97
 #: lib/cannery_web/live/pack_live/index.html.heex:58
-#: lib/cannery_web/live/range_live/index.html.heex:92
+#: lib/cannery_web/live/range_live/index.html.heex:89
 #: lib/cannery_web/live/type_live/index.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "All"
@@ -1212,7 +1212,7 @@ msgstr ""
 msgid "Brass height"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:128
+#: lib/cannery_web/live/type_live/show.ex:127
 #, elixir-autogen, elixir-format
 msgid "Brass height:"
 msgstr ""
@@ -1223,7 +1223,7 @@ msgstr ""
 msgid "Chamber size"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:129
+#: lib/cannery_web/live/type_live/show.ex:128
 #, elixir-autogen, elixir-format
 msgid "Chamber size:"
 msgstr ""
@@ -1239,7 +1239,7 @@ msgstr ""
 msgid "Dram equivalent"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:148
+#: lib/cannery_web/live/type_live/show.ex:147
 #, elixir-autogen, elixir-format
 msgid "Dram equivalent:"
 msgstr ""
@@ -1250,7 +1250,7 @@ msgstr ""
 msgid "Gauge"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:123
+#: lib/cannery_web/live/type_live/show.ex:122
 #, elixir-autogen, elixir-format
 msgid "Gauge:"
 msgstr ""
@@ -1261,7 +1261,7 @@ msgstr ""
 msgid "Load grains"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:139
+#: lib/cannery_web/live/type_live/show.ex:138
 #, elixir-autogen, elixir-format
 msgid "Load grains:"
 msgstr ""
@@ -1276,9 +1276,9 @@ msgstr ""
 msgid "None specified"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:106
+#: lib/cannery_web/live/container_live/show.html.heex:100
 #: lib/cannery_web/live/pack_live/index.html.heex:61
-#: lib/cannery_web/live/range_live/index.html.heex:95
+#: lib/cannery_web/live/range_live/index.html.heex:92
 #: lib/cannery_web/live/type_live/form_component.html.heex:25
 #: lib/cannery_web/live/type_live/index.html.heex:38
 #: lib/cannery_web/live/type_live/show.html.heex:56
@@ -1301,9 +1301,9 @@ msgstr ""
 msgid "Projectile"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:104
+#: lib/cannery_web/live/container_live/show.html.heex:98
 #: lib/cannery_web/live/pack_live/index.html.heex:59
-#: lib/cannery_web/live/range_live/index.html.heex:93
+#: lib/cannery_web/live/range_live/index.html.heex:90
 #: lib/cannery_web/live/type_live/form_component.html.heex:25
 #: lib/cannery_web/live/type_live/index.html.heex:36
 #: lib/cannery_web/live/type_live/show.html.heex:54
@@ -1317,7 +1317,7 @@ msgstr ""
 msgid "Shot charge weight"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:140
+#: lib/cannery_web/live/type_live/show.ex:139
 #, elixir-autogen, elixir-format
 msgid "Shot charge weight:"
 msgstr ""
@@ -1328,7 +1328,7 @@ msgstr ""
 msgid "Shot material"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:137
+#: lib/cannery_web/live/type_live/show.ex:136
 #, elixir-autogen, elixir-format
 msgid "Shot material:"
 msgstr ""
@@ -1339,7 +1339,7 @@ msgstr ""
 msgid "Shot size"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:138
+#: lib/cannery_web/live/type_live/show.ex:137
 #, elixir-autogen, elixir-format
 msgid "Shot size:"
 msgstr ""
@@ -1350,14 +1350,14 @@ msgstr ""
 msgid "Shot type"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:136
+#: lib/cannery_web/live/type_live/show.ex:135
 #, elixir-autogen, elixir-format
 msgid "Shot type:"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:105
+#: lib/cannery_web/live/container_live/show.html.heex:99
 #: lib/cannery_web/live/pack_live/index.html.heex:60
-#: lib/cannery_web/live/range_live/index.html.heex:94
+#: lib/cannery_web/live/range_live/index.html.heex:91
 #: lib/cannery_web/live/type_live/form_component.html.heex:25
 #: lib/cannery_web/live/type_live/index.html.heex:37
 #: lib/cannery_web/live/type_live/show.html.heex:52
@@ -1376,7 +1376,7 @@ msgstr ""
 msgid "Target, bird, buck, etc"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:127
+#: lib/cannery_web/live/type_live/show.ex:126
 #, elixir-autogen, elixir-format
 msgid "Unfired length:"
 msgstr ""
@@ -1393,15 +1393,15 @@ msgstr ""
 msgid "Wadding"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:135
+#: lib/cannery_web/live/type_live/show.ex:134
 #, elixir-autogen, elixir-format
 msgid "Wadding:"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:149
-#: lib/cannery_web/live/container_live/show.html.heex:97
+#: lib/cannery_web/live/container_live/show.html.heex:91
 #: lib/cannery_web/live/pack_live/index.html.heex:50
-#: lib/cannery_web/live/range_live/index.html.heex:86
+#: lib/cannery_web/live/range_live/index.html.heex:83
 #: lib/cannery_web/live/type_live/form_component.html.heex:21
 #: lib/cannery_web/live/type_live/index.html.heex:29
 #: lib/cannery_web/live/type_live/show.html.heex:46
@@ -1420,14 +1420,14 @@ msgstr ""
 msgid "Used up!"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:42
+#: lib/cannery_web/live/pack_live/show.ex:41
-#: lib/cannery_web/live/range_live/index.ex:40
+#: lib/cannery_web/live/range_live/index.ex:39
 #, elixir-autogen, elixir-format
 msgid "Edit Shot Record"
 msgstr ""
 
 #: lib/cannery_web/live/type_live/index.ex:28
-#: lib/cannery_web/live/type_live/show.ex:82
+#: lib/cannery_web/live/type_live/show.ex:81
 #, elixir-autogen, elixir-format
 msgid "Edit %{type_name}"
 msgstr ""

priv/gettext/emails.pot

@@ -10,83 +10,83 @@
 msgid ""
 msgstr ""
 
-#: lib/cannery_web/templates/email/confirm_email.html.heex:3
+#: lib/cannery_web/components/email_html/confirm_email.html.heex:3
-#: lib/cannery_web/templates/email/confirm_email.txt.eex:2
+#: lib/cannery_web/components/email_html/confirm_email.txt.eex:2
-#: lib/cannery_web/templates/email/reset_password.html.heex:3
+#: lib/cannery_web/components/email_html/reset_password.html.heex:3
-#: lib/cannery_web/templates/email/reset_password.txt.eex:2
+#: lib/cannery_web/components/email_html/reset_password.txt.eex:2
-#: lib/cannery_web/templates/email/update_email.html.heex:3
+#: lib/cannery_web/components/email_html/update_email.html.heex:3
-#: lib/cannery_web/templates/email/update_email.txt.eex:2
+#: lib/cannery_web/components/email_html/update_email.txt.eex:2
 #, elixir-autogen, elixir-format
 msgid "Hi %{email},"
 msgstr ""
 
-#: lib/cannery_web/templates/email/confirm_email.txt.eex:10
+#: lib/cannery_web/components/email_html/confirm_email.txt.eex:10
 #, elixir-autogen, elixir-format
 msgid "If you didn't create an account at %{url}, please ignore this."
 msgstr ""
 
-#: lib/cannery_web/templates/email/reset_password.txt.eex:8
+#: lib/cannery_web/components/email_html/reset_password.txt.eex:8
-#: lib/cannery_web/templates/email/update_email.txt.eex:8
+#: lib/cannery_web/components/email_html/update_email.txt.eex:8
 #, elixir-autogen, elixir-format
 msgid "If you didn't request this change from %{url}, please ignore this."
 msgstr ""
 
-#: lib/cannery_web/templates/email/update_email.html.heex:8
+#: lib/cannery_web/components/email_html/update_email.html.heex:8
-#: lib/cannery_web/templates/email/update_email.txt.eex:4
+#: lib/cannery_web/components/email_html/update_email.txt.eex:4
 #, elixir-autogen, elixir-format
 msgid "You can change your email by visiting the URL below:"
 msgstr ""
 
-#: lib/cannery_web/templates/email/confirm_email.html.heex:14
+#: lib/cannery_web/components/email_html/confirm_email.html.heex:14
-#: lib/cannery_web/templates/email/confirm_email.txt.eex:6
+#: lib/cannery_web/components/email_html/confirm_email.txt.eex:6
 #, elixir-autogen, elixir-format
 msgid "You can confirm your account by visiting the URL below:"
 msgstr ""
 
-#: lib/cannery_web/templates/email/reset_password.html.heex:8
+#: lib/cannery_web/components/email_html/reset_password.html.heex:8
-#: lib/cannery_web/templates/email/reset_password.txt.eex:4
+#: lib/cannery_web/components/email_html/reset_password.txt.eex:4
 #, elixir-autogen, elixir-format
 msgid "You can reset your password by visiting the URL below:"
 msgstr ""
 
-#: lib/cannery/accounts/email.ex:30
+#: lib/cannery/accounts/email.ex:31
 #, elixir-autogen, elixir-format
 msgid "Confirm your Cannery account"
 msgstr ""
 
-#: lib/cannery_web/templates/email/confirm_email.html.heex:22
+#: lib/cannery_web/components/email_html/confirm_email.html.heex:22
 #, elixir-autogen, elixir-format
 msgid "If you didn't create an account at Cannery, please ignore this."
 msgstr ""
 
-#: lib/cannery_web/templates/email/reset_password.html.heex:16
+#: lib/cannery_web/components/email_html/reset_password.html.heex:16
-#: lib/cannery_web/templates/email/update_email.html.heex:16
+#: lib/cannery_web/components/email_html/update_email.html.heex:16
 #, elixir-autogen, elixir-format
 msgid "If you didn't request this change from Cannery, please ignore this."
 msgstr ""
 
-#: lib/cannery/accounts/email.ex:37
+#: lib/cannery/accounts/email.ex:38
 #, elixir-autogen, elixir-format
 msgid "Reset your Cannery password"
 msgstr ""
 
-#: lib/cannery_web/templates/layout/email.txt.eex:9
+#: lib/cannery_web/components/layouts/email_text.txt.eex:9
 #, elixir-autogen, elixir-format
 msgid "This email was sent from Cannery at %{url}, the self-hosted firearm tracker website."
 msgstr ""
 
-#: lib/cannery_web/templates/layout/email.html.heex:13
+#: lib/cannery_web/components/layouts/email_html.html.heex:13
 #, elixir-autogen, elixir-format
 msgid "This email was sent from Cannery, the self-hosted firearm tracker website."
 msgstr ""
 
-#: lib/cannery/accounts/email.ex:44
+#: lib/cannery/accounts/email.ex:45
 #, elixir-autogen, elixir-format
 msgid "Update your Cannery email"
 msgstr ""
 
-#: lib/cannery_web/templates/email/confirm_email.html.heex:9
+#: lib/cannery_web/components/email_html/confirm_email.html.heex:9
-#: lib/cannery_web/templates/email/confirm_email.txt.eex:4
+#: lib/cannery_web/components/email_html/confirm_email.txt.eex:4
 #, elixir-autogen, elixir-format
 msgid "Welcome to Cannery"
 msgstr ""

priv/gettext/en/LC_MESSAGES/actions.po

@@ -32,14 +32,14 @@ msgstr ""
 msgid "Add your first type!"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:15
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:15
-#: lib/cannery_web/templates/user_settings/edit.html.heex:43
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Change email"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:57
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:57
-#: lib/cannery_web/templates/user_settings/edit.html.heex:97
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Change password"
 msgstr ""
@@ -49,14 +49,14 @@ msgstr ""
 msgid "Create Invite"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:159
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:155
 #, elixir-autogen, elixir-format
 msgid "Delete User"
 msgstr ""
 
-#: lib/cannery_web/templates/user_registration/new.html.heex:47
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:47
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:3
+#: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:3
-#: lib/cannery_web/templates/user_session/new.html.heex:42
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Forgot your password?"
 msgstr ""
@@ -66,13 +66,13 @@ msgstr ""
 msgid "Invite someone new!"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:124
+#: lib/cannery_web/components/core_components/topbar.html.heex:94
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:32
+#: lib/cannery_web/controllers/user_confirmation_html/new.html.heex:28
-#: lib/cannery_web/templates/user_registration/new.html.heex:44
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:44
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:45
+#: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:41
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:32
+#: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:28
-#: lib/cannery_web/templates/user_session/new.html.heex:3
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:3
-#: lib/cannery_web/templates/user_session/new.html.heex:28
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Log in"
 msgstr ""
@@ -92,25 +92,25 @@ msgstr ""
 msgid "New Tag"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:116
+#: lib/cannery_web/components/core_components/topbar.html.heex:89
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:29
+#: lib/cannery_web/controllers/user_confirmation_html/new.html.heex:25
-#: lib/cannery_web/templates/user_registration/new.html.heex:3
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:3
-#: lib/cannery_web/templates/user_registration/new.html.heex:37
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:37
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:42
+#: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:38
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:29
+#: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:25
-#: lib/cannery_web/templates/user_session/new.html.heex:39
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Register"
 msgstr ""
 
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:3
+#: lib/cannery_web/controllers/user_confirmation_html/new.html.heex:3
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:16
+#: lib/cannery_web/controllers/user_confirmation_html/new.html.heex:16
 #, elixir-autogen, elixir-format
 msgid "Resend confirmation instructions"
 msgstr ""
 
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:3
+#: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:3
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:29
+#: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "Reset password"
 msgstr ""
@@ -126,12 +126,12 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:16
+#: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:16
 #, elixir-autogen, elixir-format
 msgid "Send instructions to reset password"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:68
+#: lib/cannery_web/live/container_live/show.html.heex:65
 #, elixir-autogen, elixir-format
 msgid "Why not add one?"
 msgstr ""
@@ -152,18 +152,18 @@ msgid "Why not get some ready to shoot?"
 msgstr ""
 
 #: lib/cannery_web/live/pack_live/index.html.heex:127
-#: lib/cannery_web/live/pack_live/show.html.heex:96
+#: lib/cannery_web/live/pack_live/show.html.heex:90
-#: lib/cannery_web/live/range_live/index.html.heex:45
+#: lib/cannery_web/live/range_live/index.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Record shots"
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:88
+#: lib/cannery_web/components/move_pack_component.ex:87
 #, elixir-autogen, elixir-format
 msgid "Add another container!"
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:124
+#: lib/cannery_web/components/move_pack_component.ex:123
 #, elixir-autogen, elixir-format
 msgid "Select"
 msgstr ""
@@ -183,24 +183,24 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:110
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:110
 #, elixir-autogen, elixir-format
 msgid "Change Language"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:136
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:136
 #, elixir-autogen, elixir-format
 msgid "Change language"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:55
+#: lib/cannery_web/live/pack_live/show.html.heex:52
 #, elixir-autogen, elixir-format
 msgid "View in Catalog"
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:78
+#: lib/cannery_web/components/move_pack_component.ex:77
-#: lib/cannery_web/live/pack_live/index.html.heex:144
+#: lib/cannery_web/live/pack_live/index.html.heex:138
-#: lib/cannery_web/live/pack_live/show.html.heex:89
+#: lib/cannery_web/live/pack_live/show.html.heex:86
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr ""
@@ -210,19 +210,19 @@ msgstr ""
 msgid "Set Unlimited"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:85
+#: lib/cannery_web/live/pack_live/show.html.heex:82
 #: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Stage for range"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:84
+#: lib/cannery_web/live/pack_live/show.html.heex:81
 #: lib/cannery_web/live/range_live/index.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Unstage from range"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:150
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:146
 #, elixir-autogen, elixir-format
 msgid "Export Data as JSON"
 msgstr ""
@@ -288,37 +288,37 @@ msgstr ""
 msgid "Unstage"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:174
+#: lib/cannery_web/live/pack_live/index.html.heex:168
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Clone pack of %{pack_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:189
+#: lib/cannery_web/live/pack_live/index.html.heex:183
-#: lib/cannery_web/live/pack_live/show.html.heex:74
+#: lib/cannery_web/live/pack_live/show.html.heex:71
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Delete pack of %{pack_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:164
+#: lib/cannery_web/live/pack_live/index.html.heex:158
-#: lib/cannery_web/live/pack_live/show.html.heex:62
+#: lib/cannery_web/live/pack_live/show.html.heex:59
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit pack of %{pack_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:154
+#: lib/cannery_web/live/pack_live/index.html.heex:148
-#: lib/cannery_web/live/type_live/show.html.heex:204
+#: lib/cannery_web/live/type_live/show.html.heex:201
 #, elixir-autogen, elixir-format, fuzzy
 msgid "View pack of %{pack_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:160
+#: lib/cannery_web/live/pack_live/show.ex:159
-#: lib/cannery_web/live/range_live/index.html.heex:155
+#: lib/cannery_web/live/range_live/index.html.heex:152
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Delete shot record of %{shot_record_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:145
+#: lib/cannery_web/live/pack_live/show.ex:144
-#: lib/cannery_web/live/range_live/index.html.heex:138
+#: lib/cannery_web/live/range_live/index.html.heex:135
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit shot record of %{shot_record_count} shots"
 msgstr ""

priv/gettext/en/LC_MESSAGES/default.po

@@ -25,7 +25,7 @@ msgstr ""
 msgid "Admins:"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:58
+#: lib/cannery_web/components/core_components/topbar.html.heex:43
 #: lib/cannery_web/components/shot_record_table_component.ex:44
 #: lib/cannery_web/live/pack_live/index.ex:75
 #: lib/cannery_web/live/pack_live/index.ex:84
@@ -80,14 +80,14 @@ msgstr ""
 msgid "Case material"
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:65
+#: lib/cannery_web/components/move_pack_component.ex:64
 #: lib/cannery_web/components/pack_table_component.ex:76
 #: lib/cannery_web/live/pack_live/form_component.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Container"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:42
+#: lib/cannery_web/components/core_components/topbar.html.heex:33
 #: lib/cannery_web/live/container_live/index.ex:45
 #: lib/cannery_web/live/container_live/index.ex:54
 #: lib/cannery_web/live/container_live/index.html.heex:3
@@ -173,20 +173,20 @@ msgstr ""
 msgid "Invite Only"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:74
+#: lib/cannery_web/components/core_components/topbar.html.heex:53
 #: lib/cannery_web/live/invite_live/index.ex:31
 #: lib/cannery_web/live/invite_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Invites"
 msgstr ""
 
-#: lib/cannery_web/templates/user_session/new.html.heex:23
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:23
 #, elixir-autogen, elixir-format
 msgid "Keep me logged in for 60 days"
 msgstr ""
 
 #: lib/cannery_web/components/container_table_component.ex:47
-#: lib/cannery_web/components/move_pack_component.ex:67
+#: lib/cannery_web/components/move_pack_component.ex:66
 #: lib/cannery_web/live/container_live/form_component.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "Location"
@@ -277,7 +277,7 @@ msgstr ""
 #: lib/cannery_web/components/add_shot_record_component.html.heex:38
 #: lib/cannery_web/components/shot_record_table_component.ex:46
 #: lib/cannery_web/live/pack_live/form_component.html.heex:57
-#: lib/cannery_web/live/pack_live/show.ex:91
+#: lib/cannery_web/live/pack_live/show.ex:90
 #: lib/cannery_web/live/range_live/form_component.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Notes"
@@ -333,7 +333,7 @@ msgid "Self-host your own instance, or use an instance from someone you trust."
 msgstr ""
 
 #: lib/cannery_web/controllers/user_settings_controller.ex:10
-#: lib/cannery_web/templates/user_settings/edit.html.heex:3
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr ""
@@ -348,13 +348,13 @@ msgstr ""
 msgid "Steel"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:106
+#: lib/cannery_web/live/pack_live/show.html.heex:100
 #, elixir-autogen, elixir-format
 msgid "Stored in"
 msgstr ""
 
 #: lib/cannery_web/components/container_table_component.ex:66
-#: lib/cannery_web/components/core_components/topbar.html.heex:34
+#: lib/cannery_web/components/core_components/topbar.html.heex:28
 #: lib/cannery_web/live/tag_live/index.ex:43
 #: lib/cannery_web/live/tag_live/index.ex:53
 #: lib/cannery_web/live/tag_live/index.html.heex:3
@@ -384,7 +384,7 @@ msgid "Tracer"
 msgstr ""
 
 #: lib/cannery_web/components/container_table_component.ex:48
-#: lib/cannery_web/components/move_pack_component.ex:66
+#: lib/cannery_web/components/move_pack_component.ex:65
 #: lib/cannery_web/components/pack_table_component.ex:108
 #: lib/cannery_web/live/container_live/form_component.html.heex:39
 #: lib/cannery_web/live/pack_live/form_component.html.heex:22
@@ -418,7 +418,7 @@ msgstr ""
 msgid "No tags for this container"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:66
+#: lib/cannery_web/components/core_components/topbar.html.heex:48
 #: lib/cannery_web/components/pack_table_component.ex:80
 #, elixir-autogen, elixir-format
 msgid "Range"
@@ -431,7 +431,7 @@ msgstr ""
 
 #: lib/cannery_web/components/add_shot_record_component.html.heex:49
 #: lib/cannery_web/components/shot_record_table_component.ex:47
-#: lib/cannery_web/live/pack_live/show.ex:92
+#: lib/cannery_web/live/pack_live/show.ex:91
 #: lib/cannery_web/live/range_live/form_component.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Date"
@@ -453,26 +453,26 @@ msgstr ""
 msgid "Record shots"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:48
+#: lib/cannery_web/live/range_live/index.ex:47
 #, elixir-autogen, elixir-format
 msgid "New Shot Records"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:55
+#: lib/cannery_web/live/range_live/index.html.heex:52
-#: lib/cannery_web/live/range_live/index.html.heex:122
+#: lib/cannery_web/live/range_live/index.html.heex:119
 #, elixir-autogen, elixir-format
 msgid "No shots recorded"
 msgstr ""
 
 #: lib/cannery_web/components/shot_record_table_component.ex:45
-#: lib/cannery_web/live/pack_live/show.ex:90
+#: lib/cannery_web/live/pack_live/show.ex:89
-#: lib/cannery_web/live/range_live/index.html.heex:69
+#: lib/cannery_web/live/range_live/index.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Rounds shot"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:56
+#: lib/cannery_web/live/range_live/index.ex:55
-#: lib/cannery_web/live/range_live/index.ex:66
+#: lib/cannery_web/live/range_live/index.ex:65
 #, elixir-autogen, elixir-format
 msgid "Shot Records"
 msgstr ""
@@ -482,12 +482,12 @@ msgstr ""
 msgid "Move ammo"
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:83
+#: lib/cannery_web/components/move_pack_component.ex:82
 #, elixir-autogen, elixir-format
 msgid "No other containers"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:60
+#: lib/cannery_web/live/range_live/index.html.heex:57
 #, elixir-autogen, elixir-format
 msgid "Shot log"
 msgstr ""
@@ -538,20 +538,20 @@ msgstr ""
 msgid "UPC"
 msgstr ""
 
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:20
+#: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:20
-#: lib/cannery_web/templates/user_settings/edit.html.heex:76
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:76
 #, elixir-autogen, elixir-format
 msgid "Confirm new password"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:31
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:31
-#: lib/cannery_web/templates/user_settings/edit.html.heex:85
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:85
 #, elixir-autogen, elixir-format
 msgid "Current password"
 msgstr ""
 
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:16
+#: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:16
-#: lib/cannery_web/templates/user_settings/edit.html.heex:69
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "New password"
 msgstr ""
@@ -562,19 +562,19 @@ msgstr ""
 msgid "Firing type"
 msgstr ""
 
-#: lib/cannery_web/templates/layout/live.html.heex:43
+#: lib/cannery_web/components/layouts/live.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Reconnecting..."
 msgstr ""
 
 #: lib/cannery_web/live/container_live/index.ex:28
-#: lib/cannery_web/live/container_live/show.ex:120
+#: lib/cannery_web/live/container_live/show.ex:116
 #, elixir-autogen, elixir-format
 msgid "Edit %{name}"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/index.ex:63
-#: lib/cannery_web/live/container_live/show.ex:121
+#: lib/cannery_web/live/container_live/show.ex:117
 #, elixir-autogen, elixir-format
 msgid "Edit %{name} tags"
 msgstr ""
@@ -619,7 +619,7 @@ msgstr ""
 msgid "Percentage left:"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:119
+#: lib/cannery_web/live/pack_live/show.html.heex:113
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Rounds used"
 msgstr ""
@@ -639,18 +639,18 @@ msgstr ""
 msgid "Log in"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_registration_controller.ex:33
+#: lib/cannery_web/controllers/user_registration_controller.ex:32
 #, elixir-autogen, elixir-format
 msgid "Register"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_reset_password_controller.ex:36
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:35
 #, elixir-autogen, elixir-format
 msgid "Reset your password"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:41
+#: lib/cannery_web/live/pack_live/show.ex:40
-#: lib/cannery_web/live/range_live/index.ex:32
+#: lib/cannery_web/live/range_live/index.ex:31
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Record Shots"
 msgstr ""
@@ -665,23 +665,23 @@ msgstr ""
 msgid "Added on:"
 msgstr ""
 
-#: lib/cannery_web/templates/user_registration/new.html.heex:32
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:32
-#: lib/cannery_web/templates/user_settings/edit.html.heex:127
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:127
 #, elixir-autogen, elixir-format
 msgid "English"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:129
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:129
 #, elixir-autogen, elixir-format
 msgid "French"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:128
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:128
 #, elixir-autogen, elixir-format
 msgid "German"
 msgstr ""
 
-#: lib/cannery_web/templates/user_registration/new.html.heex:28
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Language"
 msgstr ""
@@ -706,7 +706,7 @@ msgstr ""
 msgid "View the source code"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:50
+#: lib/cannery_web/components/core_components/topbar.html.heex:38
 #: lib/cannery_web/live/type_live/index.ex:52
 #: lib/cannery_web/live/type_live/index.ex:62
 #: lib/cannery_web/live/type_live/index.html.heex:3
@@ -714,27 +714,27 @@ msgstr ""
 msgid "Catalog"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:45
+#: lib/cannery_web/live/pack_live/show.ex:44
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:43
+#: lib/cannery_web/live/pack_live/show.ex:42
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Move Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:123
+#: lib/cannery_web/live/container_live/show.html.heex:117
 #, elixir-autogen, elixir-format, fuzzy
 msgid "No ammo in this container"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:44
+#: lib/cannery_web/live/pack_live/show.ex:43
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.html.heex:111
+#: lib/cannery_web/live/pack_live/show.html.heex:105
 #, elixir-autogen, elixir-format, fuzzy
 msgid "This ammo is not in a container"
 msgstr ""
@@ -746,7 +746,7 @@ msgstr ""
 msgid "Packs:"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:10
+#: lib/cannery_web/components/core_components/topbar.html.heex:7
 #: lib/cannery_web/live/home_live.html.heex:4
 #, elixir-autogen, elixir-format
 msgid "Cannery logo"
@@ -780,7 +780,7 @@ msgstr ""
 msgid "%{percentage}%"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:154
+#: lib/cannery_web/live/range_live/index.ex:153
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Rounds shot: %{count}"
 msgstr ""
@@ -798,7 +798,7 @@ msgid "Rounds"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/index.html.heex:40
-#: lib/cannery_web/live/container_live/show.html.heex:115
+#: lib/cannery_web/live/container_live/show.html.heex:109
 #: lib/cannery_web/live/type_live/show.html.heex:170
 #, elixir-autogen, elixir-format
 msgid "View as table"
@@ -844,102 +844,102 @@ msgstr ""
 msgid "Used rounds:"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:71
+#: lib/cannery_web/live/range_live/index.html.heex:68
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Rounds shot chart"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:154
+#: lib/cannery_web/live/type_live/show.ex:153
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Blank:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:132
+#: lib/cannery_web/live/type_live/show.ex:131
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Bullet core:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:131
+#: lib/cannery_web/live/type_live/show.ex:130
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Bullet type:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:123
+#: lib/cannery_web/live/type_live/show.ex:122
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Caliber:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:121
+#: lib/cannery_web/live/type_live/show.ex:120
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Cartridge:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:134
+#: lib/cannery_web/live/type_live/show.ex:133
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Case material:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:155
+#: lib/cannery_web/live/type_live/show.ex:154
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Corrosive:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:151
+#: lib/cannery_web/live/type_live/show.ex:150
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Firing type:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:130
+#: lib/cannery_web/live/type_live/show.ex:129
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Grains:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:153
+#: lib/cannery_web/live/type_live/show.ex:152
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Incendiary:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:133
+#: lib/cannery_web/live/type_live/show.ex:132
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Jacket type:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:156
+#: lib/cannery_web/live/type_live/show.ex:155
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Manufacturer:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:149
+#: lib/cannery_web/live/type_live/show.ex:148
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Muzzle velocity:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:143
+#: lib/cannery_web/live/type_live/show.ex:142
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Powder grains per charge:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:141
+#: lib/cannery_web/live/type_live/show.ex:140
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Powder type:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:147
+#: lib/cannery_web/live/type_live/show.ex:146
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Pressure:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:150
+#: lib/cannery_web/live/type_live/show.ex:149
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Primer type:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:152
+#: lib/cannery_web/live/type_live/show.ex:151
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Tracer:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:157
+#: lib/cannery_web/live/type_live/show.ex:156
 #, elixir-autogen, elixir-format, fuzzy
 msgid "UPC:"
 msgstr ""
@@ -976,7 +976,7 @@ msgstr ""
 msgid "Original Count:"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.ex:15
+#: lib/cannery_web/live/home_live.ex:14
 #, elixir-autogen, elixir-format
 msgid "Home"
 msgstr ""
@@ -1033,20 +1033,20 @@ msgstr ""
 msgid "Search tags"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:115
+#: lib/cannery_web/live/range_live/index.html.heex:112
 #, elixir-autogen, elixir-format
 msgid "Search shot records"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:130
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:130
 #, elixir-autogen, elixir-format
 msgid "Spanish"
 msgstr ""
 
-#: lib/cannery_web/templates/error/error.html.heex:8
+#: lib/cannery_web/components/layouts.ex:15
-#: lib/cannery_web/templates/layout/root.html.heex:13
+#: lib/cannery_web/components/layouts/root.html.heex:9
-#: lib/cannery_web/templates/layout/root.html.heex:14
+#: lib/cannery_web/components/layouts/root.html.heex:10
-#: lib/cannery_web/views/layout_view.ex:14
+#: lib/cannery_web/controllers/error_html/error.html.heex:8
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Cannery"
 msgstr ""
@@ -1076,7 +1076,7 @@ msgstr ""
 msgid "Cannery lets you easily keep an eye on your ammo levels before and after range day"
 msgstr ""
 
-#: lib/cannery_web/views/layout_view.ex:10
+#: lib/cannery_web/components/layouts.ex:11
 #, elixir-autogen, elixir-format
 msgid "Cannery | %{title}"
 msgstr ""
@@ -1116,17 +1116,17 @@ msgstr ""
 msgid "Uses: %{uses_count}"
 msgstr ""
 
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:13
+#: lib/cannery_web/controllers/user_confirmation_html/new.html.heex:13
-#: lib/cannery_web/templates/user_registration/new.html.heex:20
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:20
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:13
+#: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:13
-#: lib/cannery_web/templates/user_session/new.html.heex:17
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:17
-#: lib/cannery_web/templates/user_settings/edit.html.heex:27
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:27
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr ""
 
-#: lib/cannery_web/templates/user_registration/new.html.heex:24
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:24
-#: lib/cannery_web/templates/user_session/new.html.heex:20
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:20
 #, elixir-autogen, elixir-format
 msgid "Password"
 msgstr ""
@@ -1163,21 +1163,21 @@ msgid "Really great weather"
 msgstr ""
 
 #: lib/cannery_web/components/container_table_component.ex:67
-#: lib/cannery_web/components/move_pack_component.ex:68
+#: lib/cannery_web/components/move_pack_component.ex:67
 #: lib/cannery_web/components/pack_table_component.ex:62
 #: lib/cannery_web/components/shot_record_table_component.ex:48
 #: lib/cannery_web/components/type_table_component.ex:99
-#: lib/cannery_web/live/pack_live/show.ex:93
+#: lib/cannery_web/live/pack_live/show.ex:92
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:105
+#: lib/cannery_web/components/core_components/topbar.html.heex:81
 #, elixir-autogen, elixir-format
 msgid "Live Dashboard"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:90
+#: lib/cannery_web/components/core_components/topbar.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Log out"
 msgstr ""
@@ -1193,9 +1193,9 @@ msgstr ""
 msgid "Close modal"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:103
+#: lib/cannery_web/live/container_live/show.html.heex:97
 #: lib/cannery_web/live/pack_live/index.html.heex:58
-#: lib/cannery_web/live/range_live/index.html.heex:92
+#: lib/cannery_web/live/range_live/index.html.heex:89
 #: lib/cannery_web/live/type_live/index.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "All"
@@ -1212,7 +1212,7 @@ msgstr ""
 msgid "Brass height"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:128
+#: lib/cannery_web/live/type_live/show.ex:127
 #, elixir-autogen, elixir-format
 msgid "Brass height:"
 msgstr ""
@@ -1223,7 +1223,7 @@ msgstr ""
 msgid "Chamber size"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:129
+#: lib/cannery_web/live/type_live/show.ex:128
 #, elixir-autogen, elixir-format
 msgid "Chamber size:"
 msgstr ""
@@ -1239,7 +1239,7 @@ msgstr ""
 msgid "Dram equivalent"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:148
+#: lib/cannery_web/live/type_live/show.ex:147
 #, elixir-autogen, elixir-format
 msgid "Dram equivalent:"
 msgstr ""
@@ -1250,7 +1250,7 @@ msgstr ""
 msgid "Gauge"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:123
+#: lib/cannery_web/live/type_live/show.ex:122
 #, elixir-autogen, elixir-format
 msgid "Gauge:"
 msgstr ""
@@ -1261,7 +1261,7 @@ msgstr ""
 msgid "Load grains"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:139
+#: lib/cannery_web/live/type_live/show.ex:138
 #, elixir-autogen, elixir-format
 msgid "Load grains:"
 msgstr ""
@@ -1276,9 +1276,9 @@ msgstr ""
 msgid "None specified"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:106
+#: lib/cannery_web/live/container_live/show.html.heex:100
 #: lib/cannery_web/live/pack_live/index.html.heex:61
-#: lib/cannery_web/live/range_live/index.html.heex:95
+#: lib/cannery_web/live/range_live/index.html.heex:92
 #: lib/cannery_web/live/type_live/form_component.html.heex:25
 #: lib/cannery_web/live/type_live/index.html.heex:38
 #: lib/cannery_web/live/type_live/show.html.heex:56
@@ -1301,9 +1301,9 @@ msgstr ""
 msgid "Projectile"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:104
+#: lib/cannery_web/live/container_live/show.html.heex:98
 #: lib/cannery_web/live/pack_live/index.html.heex:59
-#: lib/cannery_web/live/range_live/index.html.heex:93
+#: lib/cannery_web/live/range_live/index.html.heex:90
 #: lib/cannery_web/live/type_live/form_component.html.heex:25
 #: lib/cannery_web/live/type_live/index.html.heex:36
 #: lib/cannery_web/live/type_live/show.html.heex:54
@@ -1317,7 +1317,7 @@ msgstr ""
 msgid "Shot charge weight"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:140
+#: lib/cannery_web/live/type_live/show.ex:139
 #, elixir-autogen, elixir-format
 msgid "Shot charge weight:"
 msgstr ""
@@ -1328,7 +1328,7 @@ msgstr ""
 msgid "Shot material"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:137
+#: lib/cannery_web/live/type_live/show.ex:136
 #, elixir-autogen, elixir-format
 msgid "Shot material:"
 msgstr ""
@@ -1339,7 +1339,7 @@ msgstr ""
 msgid "Shot size"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:138
+#: lib/cannery_web/live/type_live/show.ex:137
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Shot size:"
 msgstr ""
@@ -1350,14 +1350,14 @@ msgstr ""
 msgid "Shot type"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:136
+#: lib/cannery_web/live/type_live/show.ex:135
 #, elixir-autogen, elixir-format
 msgid "Shot type:"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:105
+#: lib/cannery_web/live/container_live/show.html.heex:99
 #: lib/cannery_web/live/pack_live/index.html.heex:60
-#: lib/cannery_web/live/range_live/index.html.heex:94
+#: lib/cannery_web/live/range_live/index.html.heex:91
 #: lib/cannery_web/live/type_live/form_component.html.heex:25
 #: lib/cannery_web/live/type_live/index.html.heex:37
 #: lib/cannery_web/live/type_live/show.html.heex:52
@@ -1376,7 +1376,7 @@ msgstr ""
 msgid "Target, bird, buck, etc"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:127
+#: lib/cannery_web/live/type_live/show.ex:126
 #, elixir-autogen, elixir-format
 msgid "Unfired length:"
 msgstr ""
@@ -1393,15 +1393,15 @@ msgstr ""
 msgid "Wadding"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/show.ex:135
+#: lib/cannery_web/live/type_live/show.ex:134
 #, elixir-autogen, elixir-format
 msgid "Wadding:"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:149
-#: lib/cannery_web/live/container_live/show.html.heex:97
+#: lib/cannery_web/live/container_live/show.html.heex:91
 #: lib/cannery_web/live/pack_live/index.html.heex:50
-#: lib/cannery_web/live/range_live/index.html.heex:86
+#: lib/cannery_web/live/range_live/index.html.heex:83
 #: lib/cannery_web/live/type_live/form_component.html.heex:21
 #: lib/cannery_web/live/type_live/index.html.heex:29
 #: lib/cannery_web/live/type_live/show.html.heex:46
@@ -1420,14 +1420,14 @@ msgstr ""
 msgid "Used up!"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:42
+#: lib/cannery_web/live/pack_live/show.ex:41
-#: lib/cannery_web/live/range_live/index.ex:40
+#: lib/cannery_web/live/range_live/index.ex:39
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit Shot Record"
 msgstr ""
 
 #: lib/cannery_web/live/type_live/index.ex:28
-#: lib/cannery_web/live/type_live/show.ex:82
+#: lib/cannery_web/live/type_live/show.ex:81
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit %{type_name}"
 msgstr ""

priv/gettext/en/LC_MESSAGES/emails.po

@@ -10,83 +10,83 @@ msgid ""
 msgstr ""
 "Language: en\n"
 
-#: lib/cannery_web/templates/email/confirm_email.html.heex:3
+#: lib/cannery_web/components/email_html/confirm_email.html.heex:3
-#: lib/cannery_web/templates/email/confirm_email.txt.eex:2
+#: lib/cannery_web/components/email_html/confirm_email.txt.eex:2
-#: lib/cannery_web/templates/email/reset_password.html.heex:3
+#: lib/cannery_web/components/email_html/reset_password.html.heex:3
-#: lib/cannery_web/templates/email/reset_password.txt.eex:2
+#: lib/cannery_web/components/email_html/reset_password.txt.eex:2
-#: lib/cannery_web/templates/email/update_email.html.heex:3
+#: lib/cannery_web/components/email_html/update_email.html.heex:3
-#: lib/cannery_web/templates/email/update_email.txt.eex:2
+#: lib/cannery_web/components/email_html/update_email.txt.eex:2
 #, elixir-autogen, elixir-format
 msgid "Hi %{email},"
 msgstr ""
 
-#: lib/cannery_web/templates/email/confirm_email.txt.eex:10
+#: lib/cannery_web/components/email_html/confirm_email.txt.eex:10
 #, elixir-autogen, elixir-format
 msgid "If you didn't create an account at %{url}, please ignore this."
 msgstr ""
 
-#: lib/cannery_web/templates/email/reset_password.txt.eex:8
+#: lib/cannery_web/components/email_html/reset_password.txt.eex:8
-#: lib/cannery_web/templates/email/update_email.txt.eex:8
+#: lib/cannery_web/components/email_html/update_email.txt.eex:8
 #, elixir-autogen, elixir-format
 msgid "If you didn't request this change from %{url}, please ignore this."
 msgstr ""
 
-#: lib/cannery_web/templates/email/update_email.html.heex:8
+#: lib/cannery_web/components/email_html/update_email.html.heex:8
-#: lib/cannery_web/templates/email/update_email.txt.eex:4
+#: lib/cannery_web/components/email_html/update_email.txt.eex:4
 #, elixir-autogen, elixir-format
 msgid "You can change your email by visiting the URL below:"
 msgstr ""
 
-#: lib/cannery_web/templates/email/confirm_email.html.heex:14
+#: lib/cannery_web/components/email_html/confirm_email.html.heex:14
-#: lib/cannery_web/templates/email/confirm_email.txt.eex:6
+#: lib/cannery_web/components/email_html/confirm_email.txt.eex:6
 #, elixir-autogen, elixir-format
 msgid "You can confirm your account by visiting the URL below:"
 msgstr ""
 
-#: lib/cannery_web/templates/email/reset_password.html.heex:8
+#: lib/cannery_web/components/email_html/reset_password.html.heex:8
-#: lib/cannery_web/templates/email/reset_password.txt.eex:4
+#: lib/cannery_web/components/email_html/reset_password.txt.eex:4
 #, elixir-autogen, elixir-format
 msgid "You can reset your password by visiting the URL below:"
 msgstr ""
 
-#: lib/cannery/accounts/email.ex:30
+#: lib/cannery/accounts/email.ex:31
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Confirm your Cannery account"
 msgstr ""
 
-#: lib/cannery_web/templates/email/confirm_email.html.heex:22
+#: lib/cannery_web/components/email_html/confirm_email.html.heex:22
 #, elixir-autogen, elixir-format, fuzzy
 msgid "If you didn't create an account at Cannery, please ignore this."
 msgstr ""
 
-#: lib/cannery_web/templates/email/reset_password.html.heex:16
+#: lib/cannery_web/components/email_html/reset_password.html.heex:16
-#: lib/cannery_web/templates/email/update_email.html.heex:16
+#: lib/cannery_web/components/email_html/update_email.html.heex:16
 #, elixir-autogen, elixir-format, fuzzy
 msgid "If you didn't request this change from Cannery, please ignore this."
 msgstr ""
 
-#: lib/cannery/accounts/email.ex:37
+#: lib/cannery/accounts/email.ex:38
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Reset your Cannery password"
 msgstr ""
 
-#: lib/cannery_web/templates/layout/email.txt.eex:9
+#: lib/cannery_web/components/layouts/email_text.txt.eex:9
 #, elixir-autogen, elixir-format, fuzzy
 msgid "This email was sent from Cannery at %{url}, the self-hosted firearm tracker website."
 msgstr ""
 
-#: lib/cannery_web/templates/layout/email.html.heex:13
+#: lib/cannery_web/components/layouts/email_html.html.heex:13
 #, elixir-autogen, elixir-format, fuzzy
 msgid "This email was sent from Cannery, the self-hosted firearm tracker website."
 msgstr ""
 
-#: lib/cannery/accounts/email.ex:44
+#: lib/cannery/accounts/email.ex:45
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Update your Cannery email"
 msgstr ""
 
-#: lib/cannery_web/templates/email/confirm_email.html.heex:9
+#: lib/cannery_web/components/email_html/confirm_email.html.heex:9
-#: lib/cannery_web/templates/email/confirm_email.txt.eex:4
+#: lib/cannery_web/components/email_html/confirm_email.txt.eex:4
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Welcome to Cannery"
 msgstr ""

priv/gettext/en/LC_MESSAGES/errors.po

@@ -16,7 +16,7 @@ msgid "Container must be empty before deleting"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/index.ex:86
-#: lib/cannery_web/live/container_live/show.ex:71
+#: lib/cannery_web/live/container_live/show.ex:67
 #, elixir-autogen, elixir-format
 msgid "Could not delete %{name}: %{error}"
 msgstr ""
@@ -31,55 +31,51 @@ msgstr ""
 msgid "Email change link is invalid or it has expired."
 msgstr ""
 
-#: lib/cannery_web/templates/error/error.html.heex:8
+#: lib/cannery_web/controllers/error_html/error.html.heex:8
 #, elixir-autogen, elixir-format
 msgid "Error"
 msgstr ""
 
-#: lib/cannery_web/templates/error/error.html.heex:31
+#: lib/cannery_web/controllers/error_html/error.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Go back home"
 msgstr ""
 
-#: lib/cannery_web/views/error_view.ex:10
-#, elixir-autogen, elixir-format
-msgid "Internal Server Error"
-msgstr ""
-
 #: lib/cannery_web/controllers/user_session_controller.ex:17
 #, elixir-autogen, elixir-format
 msgid "Invalid email or password"
 msgstr ""
 
-#: lib/cannery_web/views/error_view.ex:8
+#: lib/cannery_web/controllers/error_html.ex:9
+#: lib/cannery_web/controllers/error_json.ex:7
 #, elixir-autogen, elixir-format
 msgid "Not found"
 msgstr ""
 
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:13
+#: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:13
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:22
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:64
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:118
 #: lib/cannery_web/live/type_live/form_component.html.heex:18
-#: lib/cannery_web/templates/user_registration/new.html.heex:13
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:13
-#: lib/cannery_web/templates/user_settings/edit.html.heex:22
-#: lib/cannery_web/templates/user_settings/edit.html.heex:64
-#: lib/cannery_web/templates/user_settings/edit.html.heex:118
 #, elixir-autogen, elixir-format
 msgid "Oops, something went wrong! Please check the errors below."
 msgstr ""
 
-#: lib/cannery_web/controllers/user_reset_password_controller.ex:63
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:62
 #, elixir-autogen, elixir-format
 msgid "Reset password link is invalid or it has expired."
 msgstr ""
 
-#: lib/cannery_web/controllers/user_registration_controller.ex:23
+#: lib/cannery_web/controllers/user_registration_controller.ex:22
-#: lib/cannery_web/controllers/user_registration_controller.ex:52
+#: lib/cannery_web/controllers/user_registration_controller.ex:51
 #, elixir-autogen, elixir-format
 msgid "Sorry, public registration is disabled"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_registration_controller.ex:13
+#: lib/cannery_web/controllers/user_registration_controller.ex:12
-#: lib/cannery_web/controllers/user_registration_controller.ex:42
+#: lib/cannery_web/controllers/user_registration_controller.ex:41
-#: lib/cannery_web/controllers/user_registration_controller.ex:71
+#: lib/cannery_web/controllers/user_registration_controller.ex:70
 #, elixir-autogen, elixir-format
 msgid "Sorry, this invite was not found or expired"
 msgstr ""
@@ -89,17 +85,18 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
-#: lib/cannery_web/views/error_view.ex:9
+#: lib/cannery_web/controllers/error_html.ex:10
+#: lib/cannery_web/controllers/error_json.ex:8
 #, elixir-autogen, elixir-format
 msgid "Unauthorized"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_confirmation_controller.ex:54
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:53
 #, elixir-autogen, elixir-format
 msgid "User confirmation link is invalid or it has expired."
 msgstr ""
 
-#: lib/cannery_web/controllers/user_auth.ex:177
+#: lib/cannery_web/controllers/user_auth.ex:266
 #, elixir-autogen, elixir-format
 msgid "You are not authorized to view this page."
 msgstr ""
@@ -125,7 +122,7 @@ msgstr ""
 msgid "must have the @ sign and no spaces"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.ex:46
+#: lib/cannery_web/live/container_live/show.ex:45
 #, elixir-autogen, elixir-format
 msgid "Tag not found"
 msgstr ""
@@ -135,8 +132,8 @@ msgstr ""
 msgid "Tag could not be added"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_auth.ex:39
+#: lib/cannery_web/controllers/user_auth.ex:38
-#: lib/cannery_web/controllers/user_auth.ex:161
+#: lib/cannery_web/controllers/user_auth.ex:250
 #, elixir-autogen, elixir-format
 msgid "You must confirm your account and log in to access this page."
 msgstr ""
@@ -161,7 +158,7 @@ msgstr ""
 msgid "Invalid multiplier"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:74
+#: lib/cannery_web/live/range_live/index.html.heex:71
 #, elixir-autogen, elixir-format
 msgid "Your browser does not support the canvas element."
 msgstr ""
@@ -195,3 +192,19 @@ msgstr ""
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Please select a type and container"
 msgstr ""
+
+#: lib/cannery_web/controllers/error_html.ex:11
+#: lib/cannery_web/controllers/error_json.ex:9
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Internal server error"
+msgstr ""
+
+#: lib/cannery_web/controllers/user_auth.ex:195
+#, elixir-autogen, elixir-format
+msgid "You must log in as an administrator to access this page."
+msgstr ""
+
+#: lib/cannery_web/controllers/user_auth.ex:178
+#, elixir-autogen, elixir-format
+msgid "You must log in to access this page."
+msgstr ""

priv/gettext/en/LC_MESSAGES/prompts.po

@@ -20,13 +20,13 @@ msgstr ""
 
 #: lib/cannery_web/live/tag_live/index.ex:65
 #: lib/cannery_web/live/type_live/index.ex:72
-#: lib/cannery_web/live/type_live/show.ex:27
+#: lib/cannery_web/live/type_live/show.ex:26
 #, elixir-autogen, elixir-format
 msgid "%{name} deleted succesfully"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/index.ex:79
-#: lib/cannery_web/live/container_live/show.ex:61
+#: lib/cannery_web/live/container_live/show.ex:60
 #, elixir-autogen, elixir-format
 msgid "%{name} has been deleted"
 msgstr ""
@@ -58,18 +58,18 @@ msgstr ""
 msgid "Are you sure you want to delete %{name}?"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:187
+#: lib/cannery_web/live/pack_live/index.html.heex:181
-#: lib/cannery_web/live/pack_live/show.html.heex:72
+#: lib/cannery_web/live/pack_live/show.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this ammo?"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:157
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:153
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete your account?"
 msgstr ""
 
-#: lib/cannery_web/components/core_components/topbar.html.heex:89
+#: lib/cannery_web/components/core_components/topbar.html.heex:65
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to log out?"
 msgstr ""
@@ -94,7 +94,7 @@ msgstr ""
 msgid "Logged out successfully."
 msgstr ""
 
-#: lib/cannery_web/controllers/user_reset_password_controller.ex:46
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:45
 #, elixir-autogen, elixir-format
 msgid "Password reset successfully."
 msgstr ""
@@ -104,7 +104,7 @@ msgstr ""
 msgid "Password updated successfully."
 msgstr ""
 
-#: lib/cannery_web/controllers/user_registration_controller.ex:66
+#: lib/cannery_web/controllers/user_registration_controller.ex:65
 #, elixir-autogen, elixir-format
 msgid "Please check your email to verify your account"
 msgstr ""
@@ -135,7 +135,7 @@ msgstr ""
 msgid "%{name} added successfully"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.ex:38
+#: lib/cannery_web/live/container_live/show.ex:37
 #, elixir-autogen, elixir-format
 msgid "%{tag_name} has been removed from %{container_name}"
 msgstr ""
@@ -155,14 +155,14 @@ msgstr ""
 msgid "Are you sure you want to unstage this ammo?"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:158
+#: lib/cannery_web/live/pack_live/show.ex:157
-#: lib/cannery_web/live/range_live/index.html.heex:152
+#: lib/cannery_web/live/range_live/index.html.heex:149
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this shot record?"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/show.ex:80
+#: lib/cannery_web/live/pack_live/show.ex:79
-#: lib/cannery_web/live/range_live/index.ex:79
+#: lib/cannery_web/live/range_live/index.ex:78
 #, elixir-autogen, elixir-format
 msgid "Shot records deleted succesfully"
 msgstr ""
@@ -172,12 +172,12 @@ msgstr ""
 msgid "Shot records updated successfully"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_confirmation_controller.ex:38
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:37
 #, elixir-autogen, elixir-format
 msgid "%{email} confirmed successfully."
 msgstr ""
 
-#: lib/cannery_web/components/move_pack_component.ex:52
+#: lib/cannery_web/components/move_pack_component.ex:51
 #, elixir-autogen, elixir-format
 msgid "Ammo moved to %{name} successfully"
 msgstr ""
@@ -203,7 +203,7 @@ msgstr ""
 msgid "Creating..."
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:138
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:138
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to change your language?"
 msgstr ""
@@ -214,12 +214,12 @@ msgid "Language updated successfully."
 msgstr ""
 
 #: lib/cannery_web/live/pack_live/index.ex:94
-#: lib/cannery_web/live/pack_live/show.ex:55
+#: lib/cannery_web/live/pack_live/show.ex:54
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo deleted succesfully"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:92
+#: lib/cannery_web/live/range_live/index.ex:91
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo unstaged succesfully"
 msgstr ""

priv/gettext/errors.pot

@@ -16,7 +16,7 @@ msgid "Container must be empty before deleting"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/index.ex:86
-#: lib/cannery_web/live/container_live/show.ex:71
+#: lib/cannery_web/live/container_live/show.ex:67
 #, elixir-autogen, elixir-format
 msgid "Could not delete %{name}: %{error}"
 msgstr ""
@@ -31,55 +31,51 @@ msgstr ""
 msgid "Email change link is invalid or it has expired."
 msgstr ""
 
-#: lib/cannery_web/templates/error/error.html.heex:8
+#: lib/cannery_web/controllers/error_html/error.html.heex:8
 #, elixir-autogen, elixir-format
 msgid "Error"
 msgstr ""
 
-#: lib/cannery_web/templates/error/error.html.heex:31
+#: lib/cannery_web/controllers/error_html/error.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Go back home"
 msgstr ""
 
-#: lib/cannery_web/views/error_view.ex:10
-#, elixir-autogen, elixir-format
-msgid "Internal Server Error"
-msgstr ""
-
 #: lib/cannery_web/controllers/user_session_controller.ex:17
 #, elixir-autogen, elixir-format
 msgid "Invalid email or password"
 msgstr ""
 
-#: lib/cannery_web/views/error_view.ex:8
+#: lib/cannery_web/controllers/error_html.ex:9
+#: lib/cannery_web/controllers/error_json.ex:7
 #, elixir-autogen, elixir-format
 msgid "Not found"
 msgstr ""
 
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:13
+#: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:13
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:22
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:64
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:118
 #: lib/cannery_web/live/type_live/form_component.html.heex:18
-#: lib/cannery_web/templates/user_registration/new.html.heex:13
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:13
-#: lib/cannery_web/templates/user_settings/edit.html.heex:22
-#: lib/cannery_web/templates/user_settings/edit.html.heex:64
-#: lib/cannery_web/templates/user_settings/edit.html.heex:118
 #, elixir-autogen, elixir-format
 msgid "Oops, something went wrong! Please check the errors below."
 msgstr ""
 
-#: lib/cannery_web/controllers/user_reset_password_controller.ex:63
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:62
 #, elixir-autogen, elixir-format
 msgid "Reset password link is invalid or it has expired."
 msgstr ""
 
-#: lib/cannery_web/controllers/user_registration_controller.ex:23
+#: lib/cannery_web/controllers/user_registration_controller.ex:22
-#: lib/cannery_web/controllers/user_registration_controller.ex:52
+#: lib/cannery_web/controllers/user_registration_controller.ex:51
 #, elixir-autogen, elixir-format
 msgid "Sorry, public registration is disabled"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_registration_controller.ex:13
+#: lib/cannery_web/controllers/user_registration_controller.ex:12
-#: lib/cannery_web/controllers/user_registration_controller.ex:42
+#: lib/cannery_web/controllers/user_registration_controller.ex:41
-#: lib/cannery_web/controllers/user_registration_controller.ex:71
+#: lib/cannery_web/controllers/user_registration_controller.ex:70
 #, elixir-autogen, elixir-format
 msgid "Sorry, this invite was not found or expired"
 msgstr ""
@@ -89,17 +85,18 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""
 
-#: lib/cannery_web/views/error_view.ex:9
+#: lib/cannery_web/controllers/error_html.ex:10
+#: lib/cannery_web/controllers/error_json.ex:8
 #, elixir-autogen, elixir-format
 msgid "Unauthorized"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_confirmation_controller.ex:54
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:53
 #, elixir-autogen, elixir-format
 msgid "User confirmation link is invalid or it has expired."
 msgstr ""
 
-#: lib/cannery_web/controllers/user_auth.ex:177
+#: lib/cannery_web/controllers/user_auth.ex:266
 #, elixir-autogen, elixir-format
 msgid "You are not authorized to view this page."
 msgstr ""
@@ -124,7 +121,7 @@ msgstr ""
 msgid "must have the @ sign and no spaces"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.ex:46
+#: lib/cannery_web/live/container_live/show.ex:45
 #, elixir-autogen, elixir-format
 msgid "Tag not found"
 msgstr ""
@@ -134,8 +131,8 @@ msgstr ""
 msgid "Tag could not be added"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_auth.ex:39
+#: lib/cannery_web/controllers/user_auth.ex:38
-#: lib/cannery_web/controllers/user_auth.ex:161
+#: lib/cannery_web/controllers/user_auth.ex:250
 #, elixir-autogen, elixir-format
 msgid "You must confirm your account and log in to access this page."
 msgstr ""
@@ -160,7 +157,7 @@ msgstr ""
 msgid "Invalid multiplier"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:74
+#: lib/cannery_web/live/range_live/index.html.heex:71
 #, elixir-autogen, elixir-format
 msgid "Your browser does not support the canvas element."
 msgstr ""
@@ -194,3 +191,19 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Please select a type and container"
 msgstr ""
+
+#: lib/cannery_web/controllers/error_html.ex:11
+#: lib/cannery_web/controllers/error_json.ex:9
+#, elixir-autogen, elixir-format
+msgid "Internal server error"
+msgstr ""
+
+#: lib/cannery_web/controllers/user_auth.ex:195
+#, elixir-autogen, elixir-format
+msgid "You must log in as an administrator to access this page."
+msgstr ""
+
+#: lib/cannery_web/controllers/user_auth.ex:178
+#, elixir-autogen, elixir-format
+msgid "You must log in to access this page."
+msgstr ""