update to liveview 0.18 and use elixir 1.14

.drone.yml

@@ -16,7 +16,7 @@ steps:
       - assets/node_modules/
 
 - name: test
-  image: elixir:1.13.4-alpine
+  image: elixir:1.14.1-alpine
   environment:
     TEST_DATABASE_URL: ecto://postgres:postgres@database/cannery_test
     HOST: testing.example.tld
@@ -32,9 +32,13 @@ steps:
   - mix test
 
 - name: build and publish stable
-  image: plugins/docker
+  image: thegeeklab/drone-docker-buildx
+  privileged: true
   settings:
     repo: shibaobun/cannery
+    purge: true
+    compress: true
+    platforms: linux/amd64,linux/arm64,linux/arm/v7
     username:
       from_secret: docker_username
     password:
@@ -45,9 +49,13 @@ steps:
     - stable
 
 - name: build and publish tagged version
-  image: plugins/docker
+  image: thegeeklab/drone-docker-buildx
+  privileged: true
   settings:
     repo: shibaobun/cannery
+    purge: true
+    compress: true
+    platforms: linux/amd64,linux/arm64,linux/arm/v7
     username:
       from_secret: docker_username
     password:

.tool-versions

@@ -1,3 +1,3 @@
-elixir 1.13.4-otp-24
-erlang 24.2
+elixir 1.14.1-otp-25
+erlang 25.1.2
 nodejs 16.13.2

CHANGELOG.md

@@ -1,3 +1,28 @@
+# v0.5.5
+- Update translations
+- Display used-up date on used-up ammo
+- Make ammo index page a bit more compact
+- Make ammo index page filter used-up ammo
+- Make ammo catalog page include ammo count
+- Make ammo type show page a bit more compact
+- Make ammo type show page include container names for each ammo
+- Make ammo type show page filter used-up ammo
+- Make container show page a bit more compact
+- Make container show page filter used-up ammo
+- Forgot to add the logo as the favicon whoops
+- Update project dependencies, use Elixir v1.14.1
+
+# v0.5.4
+- Rename "Ammo" tab to "Catalog", and "Manage" tab is now "Ammo"
+- Ammo groups are now just referred to as Ammo or "Packs"
+- URL paths now reflect new names
+- Add pack and round count to container information
+- Add cute logo >:3 Thank you [kalli](https://twitter.com/t0kkuro)!
+- Add note about deleting an ammo type deleting all ammo of that type as well
+- Prompt to create first ammo type before trying to create first ammo
+- Add note about creating unlimited invites
+- Update screenshot lol
+
 # v0.5.3
 - Update French translation: Thank you [duponin](https://udongein.xyz/users/duponin)!
 - Update German translation: Thank you [Kaia](https://shitposter.club/users/kaia)!

CONTRIBUTING.md

@@ -143,3 +143,4 @@ Thank you so much for your contributions!
 - shibao (https://misskey.bubbletea.dev/@shibao)
 - kaia (https://shitposter.club/users/kaia)
 - duponin (https://udongein.xyz/users/duponin)
+- kalli (https://twitter.com/t0kkuro)

Dockerfile

@@ -1,4 +1,4 @@
-FROM elixir:1.13.4-alpine AS build
+FROM elixir:1.14.1-alpine AS build
 
 # install build dependencies
 RUN apk add --no-cache build-base npm git python3

README.md

@@ -1,6 +1,6 @@
 # Cannery
 
-![screenshot](https://gitea.bubbletea.dev/shibao/cannery/raw/branch/stable/home.png)
+![old screenshot](https://gitea.bubbletea.dev/shibao/cannery/raw/branch/stable/home.png)
 
 The self-hosted firearm tracker website.
 

assets/css/components.scss

@@ -25,7 +25,7 @@
   }
 
   .btn {
-    @apply inline-block break-words min-w-4;
+    @apply inline-block break-words;
     @apply focus:outline-none px-4 py-2 rounded-lg;
     @apply shadow-sm focus:shadow-lg;
     @apply transition-all duration-300 ease-in-out;
@@ -52,7 +52,7 @@
   }
 
   .link {
-    @apply inline-block break-all min-w-4;
+    @apply inline-block break-words;
     @apply hover:underline;
     @apply transition-colors duration-500 ease-in-out;
   }

assets/package.json

@@ -30,6 +30,7 @@
     "postcss-import": "^14.1.0",
     "postcss-loader": "^6.2.1",
     "postcss-preset-env": "^7.5.0",
+    "sass": "^1.56.0",
     "sass-loader": "^12.6.0",
     "standard": "^17.0.0",
     "tailwindcss": "^3.0.24",

lib/cannery/activity_log.ex

@@ -4,8 +4,7 @@ defmodule Cannery.ActivityLog do
   """
 
   import Ecto.Query, warn: false
-  import CanneryWeb.Gettext
-  alias Cannery.{Accounts.User, ActivityLog.ShotGroup, Ammo, Ammo.AmmoGroup, Repo}
+  alias Cannery.{Accounts.User, ActivityLog.ShotGroup, Ammo.AmmoGroup, Repo}
   alias Ecto.{Changeset, Multi}
 
   @doc """
@@ -60,32 +59,30 @@ defmodule Cannery.ActivityLog do
   """
   @spec create_shot_group(attrs :: map(), User.t(), AmmoGroup.t()) ::
           {:ok, ShotGroup.t()} | {:error, Changeset.t(ShotGroup.t()) | nil}
-  def create_shot_group(
-        attrs,
-        %User{id: user_id},
-        %AmmoGroup{id: ammo_group_id, count: ammo_group_count, user_id: user_id} = ammo_group
-      ) do
-    attrs = attrs |> Map.merge(%{"user_id" => user_id, "ammo_group_id" => ammo_group_id})
-    changeset = %ShotGroup{} |> ShotGroup.create_changeset(attrs)
-    shot_group_count = changeset |> Changeset.get_field(:count)
-
-    if shot_group_count > ammo_group_count do
-      error = dgettext("errors", "Count must be less than %{count}", count: ammo_group_count)
-      changeset = changeset |> Changeset.add_error(:count, error)
-      {:error, changeset}
-    else
-      Multi.new()
-      |> Multi.insert(:create_shot_group, changeset)
-      |> Multi.update(
-        :update_ammo_group,
-        ammo_group |> AmmoGroup.range_changeset(%{"count" => ammo_group_count - shot_group_count})
-      )
-      |> Repo.transaction()
-      |> case do
-        {:ok, %{create_shot_group: shot_group}} -> {:ok, shot_group}
-        {:error, :create_shot_group, changeset, _changes_so_far} -> {:error, changeset}
-        {:error, _other_transaction, _value, _changes_so_far} -> {:error, nil}
+  def create_shot_group(attrs, user, ammo_group) do
+    Multi.new()
+    |> Multi.insert(
+      :create_shot_group,
+      %ShotGroup{} |> ShotGroup.create_changeset(user, ammo_group, attrs)
+    )
+    |> Multi.run(
+      :ammo_group,
+      fn repo, %{create_shot_group: %{ammo_group_id: ammo_group_id, user_id: user_id}} ->
+        {:ok,
+         repo.one(from ag in AmmoGroup, where: ag.id == ^ammo_group_id and ag.user_id == ^user_id)}
       end
+    )
+    |> Multi.update(
+      :update_ammo_group,
+      fn %{create_shot_group: %{count: shot_group_count}, ammo_group: %{count: ammo_group_count}} ->
+        ammo_group |> AmmoGroup.range_changeset(%{"count" => ammo_group_count - shot_group_count})
+      end
+    )
+    |> Repo.transaction()
+    |> case do
+      {:ok, %{create_shot_group: shot_group}} -> {:ok, shot_group}
+      {:error, :create_shot_group, changeset, _changes_so_far} -> {:error, changeset}
+      {:error, _other_transaction, _value, _changes_so_far} -> {:error, nil}
     end
   end
 
@@ -104,42 +101,38 @@ defmodule Cannery.ActivityLog do
   @spec update_shot_group(ShotGroup.t(), attrs :: map(), User.t()) ::
           {:ok, ShotGroup.t()} | {:error, Changeset.t(ShotGroup.t()) | nil}
   def update_shot_group(
-        %ShotGroup{count: count, user_id: user_id, ammo_group_id: ammo_group_id} = shot_group,
+        %ShotGroup{count: count, user_id: user_id} = shot_group,
         attrs,
         %User{id: user_id} = user
       ) do
-    %{count: ammo_group_count, user_id: ^user_id} =
-      ammo_group = ammo_group_id |> Ammo.get_ammo_group!(user)
-
-    changeset = shot_group |> ShotGroup.update_changeset(attrs)
-    new_shot_group_count = changeset |> Changeset.get_field(:count)
-    shot_diff_to_add = new_shot_group_count - count
-
-    cond do
-      shot_diff_to_add > ammo_group_count ->
-        error = dgettext("errors", "Count must be less than %{count}", count: ammo_group_count)
-        changeset = changeset |> Changeset.add_error(:count, error)
-        {:error, changeset}
-
-      new_shot_group_count <= 0 ->
-        error = dgettext("errors", "Count must be at least 1")
-        changeset = changeset |> Changeset.add_error(:count, error)
-        {:error, changeset}
-
-      true ->
-        Multi.new()
-        |> Multi.update(:update_shot_group, changeset)
-        |> Multi.update(
-          :update_ammo_group,
-          ammo_group
-          |> AmmoGroup.range_changeset(%{"count" => ammo_group_count - shot_diff_to_add})
-        )
-        |> Repo.transaction()
-        |> case do
-          {:ok, %{update_shot_group: shot_group}} -> {:ok, shot_group}
-          {:error, :update_shot_group, changeset, _changes_so_far} -> {:error, changeset}
-          {:error, _other_transaction, _value, _changes_so_far} -> {:error, nil}
-        end
+    Multi.new()
+    |> Multi.update(
+      :update_shot_group,
+      shot_group |> ShotGroup.update_changeset(user, attrs)
+    )
+    |> Multi.run(
+      :ammo_group,
+      fn repo, %{update_shot_group: %{ammo_group_id: ammo_group_id, user_id: user_id}} ->
+        {:ok,
+         repo.one(from ag in AmmoGroup, where: ag.id == ^ammo_group_id and ag.user_id == ^user_id)}
+      end
+    )
+    |> Multi.update(
+      :update_ammo_group,
+      fn %{
+           update_shot_group: %{count: new_count},
+           ammo_group: %{count: ammo_group_count} = ammo_group
+         } ->
+        shot_diff_to_add = new_count - count
+        new_ammo_group_count = ammo_group_count - shot_diff_to_add
+        ammo_group |> AmmoGroup.range_changeset(%{"count" => new_ammo_group_count})
+      end
+    )
+    |> Repo.transaction()
+    |> case do
+      {:ok, %{update_shot_group: shot_group}} -> {:ok, shot_group}
+      {:error, :update_shot_group, changeset, _changes_so_far} -> {:error, changeset}
+      {:error, _other_transaction, _value, _changes_so_far} -> {:error, nil}
     end
   end
 
@@ -158,18 +151,27 @@ defmodule Cannery.ActivityLog do
   @spec delete_shot_group(ShotGroup.t(), User.t()) ::
           {:ok, ShotGroup.t()} | {:error, Changeset.t(ShotGroup.t())}
   def delete_shot_group(
-        %ShotGroup{count: count, user_id: user_id, ammo_group_id: ammo_group_id} = shot_group,
-        %User{id: user_id} = user
+        %ShotGroup{user_id: user_id} = shot_group,
+        %User{id: user_id}
       ) do
-    %{count: ammo_group_count, user_id: ^user_id} =
-      ammo_group = ammo_group_id |> Ammo.get_ammo_group!(user)
-
     Multi.new()
     |> Multi.delete(:delete_shot_group, shot_group)
+    |> Multi.run(
+      :ammo_group,
+      fn repo, %{delete_shot_group: %{ammo_group_id: ammo_group_id, user_id: user_id}} ->
+        {:ok,
+         repo.one(from ag in AmmoGroup, where: ag.id == ^ammo_group_id and ag.user_id == ^user_id)}
+      end
+    )
     |> Multi.update(
       :update_ammo_group,
-      ammo_group
-      |> AmmoGroup.range_changeset(%{"count" => ammo_group_count + count})
+      fn %{
+           delete_shot_group: %{count: count},
+           ammo_group: %{count: ammo_group_count} = ammo_group
+         } ->
+        new_ammo_group_count = ammo_group_count + count
+        ammo_group |> AmmoGroup.range_changeset(%{"count" => new_ammo_group_count})
+      end
     )
     |> Repo.transaction()
     |> case do
@@ -178,21 +180,4 @@ defmodule Cannery.ActivityLog do
       {:error, _other_transaction, _value, _changes_so_far} -> {:error, nil}
     end
   end
-
-  @doc """
-  Returns an `%Ecto.Changeset{}` for tracking shot_group changes.
-
-  ## Examples
-
-      iex> change_shot_group(shot_group)
-      %Ecto.Changeset{data: %ShotGroup{}}
-
-  """
-  @spec change_shot_group(ShotGroup.t() | ShotGroup.new_shot_group()) ::
-          Changeset.t(ShotGroup.t() | ShotGroup.new_shot_group())
-  @spec change_shot_group(ShotGroup.t() | ShotGroup.new_shot_group(), attrs :: map()) ::
-          Changeset.t(ShotGroup.t() | ShotGroup.new_shot_group())
-  def change_shot_group(%ShotGroup{} = shot_group, attrs \\ %{}) do
-    shot_group |> ShotGroup.update_changeset(attrs)
-  end
 end

lib/cannery/activity_log/shot_group.ex

@@ -4,8 +4,9 @@ defmodule Cannery.ActivityLog.ShotGroup do
   """
 
   use Ecto.Schema
+  import CanneryWeb.Gettext
   import Ecto.Changeset
-  alias Cannery.{Accounts.User, ActivityLog.ShotGroup, Ammo.AmmoGroup}
+  alias Cannery.{Accounts.User, ActivityLog.ShotGroup, Ammo.AmmoGroup, Repo}
   alias Ecto.{Changeset, UUID}
 
   @primary_key {:id, :binary_id, autogenerate: true}
@@ -37,21 +38,84 @@ defmodule Cannery.ActivityLog.ShotGroup do
   @type id :: UUID.t()
 
   @doc false
-  @spec create_changeset(new_shot_group(), attrs :: map()) :: Changeset.t(new_shot_group())
-  def create_changeset(shot_group, attrs) do
+  @spec create_changeset(
+          new_shot_group(),
+          User.t() | any(),
+          AmmoGroup.t() | any(),
+          attrs :: map()
+        ) ::
+          Changeset.t(new_shot_group())
+  def create_changeset(
+        shot_group,
+        %User{id: user_id},
+        %AmmoGroup{id: ammo_group_id, user_id: user_id} = ammo_group,
+        attrs
+      )
+      when not (user_id |> is_nil()) and not (ammo_group_id |> is_nil()) do
     shot_group
-    |> cast(attrs, [:count, :notes, :date, :ammo_group_id, :user_id])
+    |> change(user_id: user_id)
+    |> change(ammo_group_id: ammo_group_id)
+    |> cast(attrs, [:count, :notes, :date])
     |> validate_number(:count, greater_than: 0)
+    |> validate_create_shot_group_count(ammo_group)
     |> validate_required([:count, :ammo_group_id, :user_id])
   end
 
+  def create_changeset(shot_group, _invalid_user, _invalid_ammo_group, attrs) do
+    shot_group
+    |> cast(attrs, [:count, :notes, :date])
+    |> validate_number(:count, greater_than: 0)
+    |> validate_required([:count, :ammo_group_id, :user_id])
+    |> add_error(:invalid, dgettext("errors", "Please select a valid user and ammo group"))
+  end
+
+  defp validate_create_shot_group_count(changeset, %AmmoGroup{count: ammo_group_count}) do
+    if changeset |> Changeset.get_field(:count) > ammo_group_count do
+      error = dgettext("errors", "Count must be less than %{count}", count: ammo_group_count)
+      changeset |> Changeset.add_error(:count, error)
+    else
+      changeset
+    end
+  end
+
   @doc false
-  @spec update_changeset(t() | new_shot_group(), attrs :: map()) ::
+  @spec update_changeset(t() | new_shot_group(), User.t(), attrs :: map()) ::
           Changeset.t(t() | new_shot_group())
-  def update_changeset(shot_group, attrs) do
+  def update_changeset(
+        %ShotGroup{user_id: user_id} = shot_group,
+        %User{id: user_id} = user,
+        attrs
+      )
+      when not (user_id |> is_nil()) do
     shot_group
     |> cast(attrs, [:count, :notes, :date])
     |> validate_number(:count, greater_than: 0)
     |> validate_required([:count])
+    |> validate_update_shot_group_count(shot_group, user)
+  end
+
+  defp validate_update_shot_group_count(
+         changeset,
+         %ShotGroup{count: count} = shot_group,
+         %User{id: user_id}
+       )
+       when not (user_id |> is_nil()) do
+    %{ammo_group: %AmmoGroup{count: ammo_group_count, user_id: ^user_id}} =
+      shot_group |> Repo.preload(:ammo_group)
+
+    new_shot_group_count = changeset |> Changeset.get_field(:count)
+    shot_diff_to_add = new_shot_group_count - count
+
+    cond do
+      shot_diff_to_add > ammo_group_count ->
+        error = dgettext("errors", "Count must be less than %{count}", count: ammo_group_count)
+        changeset |> Changeset.add_error(:count, error)
+
+      new_shot_group_count <= 0 ->
+        changeset |> Changeset.add_error(:count, dgettext("errors", "Count must be at least 1"))
+
+      true ->
+        changeset
+    end
   end
 end

lib/cannery/ammo.ex

@@ -3,8 +3,9 @@ defmodule Cannery.Ammo do
   The Ammo context.
   """
 
+  import CanneryWeb.Gettext
   import Ecto.Query, warn: false
-  alias Cannery.{Accounts.User, Containers, Repo}
+  alias Cannery.{Accounts.User, Containers, Containers.Container, Repo}
   alias Cannery.ActivityLog.ShotGroup
   alias Cannery.Ammo.{AmmoGroup, AmmoType}
   alias Ecto.Changeset
@@ -24,6 +25,25 @@ defmodule Cannery.Ammo do
   def list_ammo_types(%User{id: user_id}),
     do: Repo.all(from at in AmmoType, where: at.user_id == ^user_id, order_by: at.name)
 
+  @doc """
+  Returns a count of ammo_types.
+
+  ## Examples
+
+      iex> get_ammo_types_count!(%User{id: 123})
+      3
+
+  """
+  @spec get_ammo_types_count!(User.t()) :: integer()
+  def get_ammo_types_count!(%User{id: user_id}) do
+    Repo.one(
+      from at in AmmoType,
+        where: at.user_id == ^user_id,
+        select: count(at.id),
+        distinct: true
+    )
+  end
+
   @doc """
   Gets a single ammo_type.
 
@@ -140,11 +160,8 @@ defmodule Cannery.Ammo do
   """
   @spec create_ammo_type(attrs :: map(), User.t()) ::
           {:ok, AmmoType.t()} | {:error, Changeset.t(AmmoType.new_ammo_type())}
-  def create_ammo_type(attrs \\ %{}, %User{id: user_id}) do
-    %AmmoType{}
-    |> AmmoType.create_changeset(attrs |> Map.put("user_id", user_id))
-    |> Repo.insert()
-  end
+  def create_ammo_type(attrs \\ %{}, %User{} = user),
+    do: %AmmoType{} |> AmmoType.create_changeset(user, attrs) |> Repo.insert()
 
   @doc """
   Updates a ammo_type.
@@ -193,22 +210,6 @@ defmodule Cannery.Ammo do
   def delete_ammo_type!(%AmmoType{user_id: user_id} = ammo_type, %User{id: user_id}),
     do: ammo_type |> Repo.delete!()
 
-  @doc """
-  Returns an `%Changeset{}` for tracking ammo_type changes.
-
-  ## Examples
-
-      iex> change_ammo_type(ammo_type)
-      %Changeset{data: %AmmoType{}}
-
-  """
-  @spec change_ammo_type(AmmoType.t() | AmmoType.new_ammo_type()) ::
-          Changeset.t(AmmoType.t() | AmmoType.new_ammo_type())
-  @spec change_ammo_type(AmmoType.t() | AmmoType.new_ammo_type(), attrs :: map()) ::
-          Changeset.t(AmmoType.t() | AmmoType.new_ammo_type())
-  def change_ammo_type(%AmmoType{} = ammo_type, attrs \\ %{}),
-    do: AmmoType.update_changeset(ammo_type, attrs)
-
   @doc """
   Returns the list of ammo_groups for a user and type.
 
@@ -219,7 +220,15 @@ defmodule Cannery.Ammo do
 
   """
   @spec list_ammo_groups_for_type(AmmoType.t(), User.t()) :: [AmmoGroup.t()]
-  def list_ammo_groups_for_type(%AmmoType{id: ammo_type_id, user_id: user_id}, %User{id: user_id}) do
+  @spec list_ammo_groups_for_type(AmmoType.t(), User.t(), include_empty :: boolean()) ::
+          [AmmoGroup.t()]
+  def list_ammo_groups_for_type(ammo_type, user, include_empty \\ false)
+
+  def list_ammo_groups_for_type(
+        %AmmoType{id: ammo_type_id, user_id: user_id},
+        %User{id: user_id},
+        true = _include_empty
+      ) do
     Repo.all(
       from ag in AmmoGroup,
         left_join: sg in assoc(ag, :shot_groups),
@@ -230,6 +239,110 @@ defmodule Cannery.Ammo do
     )
   end
 
+  def list_ammo_groups_for_type(
+        %AmmoType{id: ammo_type_id, user_id: user_id},
+        %User{id: user_id},
+        false = _include_empty
+      ) do
+    Repo.all(
+      from ag in AmmoGroup,
+        left_join: sg in assoc(ag, :shot_groups),
+        where: ag.ammo_type_id == ^ammo_type_id,
+        where: ag.user_id == ^user_id,
+        where: not (ag.count == 0),
+        preload: [shot_groups: sg],
+        order_by: ag.id
+    )
+  end
+
+  @doc """
+  Returns the list of ammo_groups for a user and container.
+
+  ## Examples
+
+      iex> list_ammo_groups_for_container(%AmmoType{id: 123}, %User{id: 123})
+      [%AmmoGroup{}, ...]
+
+  """
+  @spec list_ammo_groups_for_container(Container.t(), User.t()) :: [AmmoGroup.t()]
+  @spec list_ammo_groups_for_container(Container.t(), User.t(), include_empty :: boolean()) ::
+          [AmmoGroup.t()]
+  def list_ammo_groups_for_container(container, user, include_empty \\ false)
+
+  def list_ammo_groups_for_container(
+        %Container{id: container_id, user_id: user_id},
+        %User{id: user_id},
+        true = _include_empty
+      ) do
+    Repo.all(
+      from ag in AmmoGroup,
+        left_join: sg in assoc(ag, :shot_groups),
+        where: ag.container_id == ^container_id,
+        where: ag.user_id == ^user_id,
+        preload: [shot_groups: sg],
+        order_by: ag.id
+    )
+  end
+
+  def list_ammo_groups_for_container(
+        %Container{id: container_id, user_id: user_id},
+        %User{id: user_id},
+        false = _include_empty
+      ) do
+    Repo.all(
+      from ag in AmmoGroup,
+        left_join: sg in assoc(ag, :shot_groups),
+        where: ag.container_id == ^container_id,
+        where: ag.user_id == ^user_id,
+        where: not (ag.count == 0),
+        preload: [shot_groups: sg],
+        order_by: ag.id
+    )
+  end
+
+  @doc """
+  Returns the count of ammo_groups for an ammo type.
+
+  ## Examples
+
+      iex> get_ammo_groups_count_for_type(%User{id: 123})
+      3
+
+  """
+  @spec get_ammo_groups_count_for_type(AmmoType.t(), User.t()) :: [AmmoGroup.t()]
+  @spec get_ammo_groups_count_for_type(AmmoType.t(), User.t(), include_empty :: boolean()) ::
+          [AmmoGroup.t()]
+  def get_ammo_groups_count_for_type(ammo_type, user, include_empty \\ false)
+
+  def get_ammo_groups_count_for_type(
+        %AmmoType{id: ammo_type_id, user_id: user_id},
+        %User{id: user_id},
+        true = _include_empty
+      ) do
+    Repo.one!(
+      from ag in AmmoGroup,
+        where: ag.user_id == ^user_id,
+        where: ag.ammo_type_id == ^ammo_type_id,
+        distinct: true,
+        select: count(ag.id)
+    ) || 0
+  end
+
+  def get_ammo_groups_count_for_type(
+        %AmmoType{id: ammo_type_id, user_id: user_id},
+        %User{id: user_id},
+        false = _include_empty
+      ) do
+    Repo.one!(
+      from ag in AmmoGroup,
+        where: ag.user_id == ^user_id,
+        where: ag.ammo_type_id == ^ammo_type_id,
+        where: not (ag.count == 0),
+        distinct: true,
+        select: count(ag.id)
+    ) || 0
+  end
+
   @doc """
   Returns the list of ammo_groups for a user.
 
@@ -241,22 +354,27 @@ defmodule Cannery.Ammo do
   """
   @spec list_ammo_groups(User.t()) :: [AmmoGroup.t()]
   @spec list_ammo_groups(User.t(), include_empty :: boolean()) :: [AmmoGroup.t()]
-  def list_ammo_groups(%User{id: user_id}, include_empty \\ false) do
-    if include_empty do
+  def list_ammo_groups(user, include_empty \\ false)
+
+  def list_ammo_groups(%User{id: user_id}, true = _include_empty) do
+    Repo.all(
       from ag in AmmoGroup,
         left_join: sg in assoc(ag, :shot_groups),
         where: ag.user_id == ^user_id,
         preload: [shot_groups: sg],
         order_by: ag.id
-    else
+    )
+  end
+
+  def list_ammo_groups(%User{id: user_id}, false = _include_empty) do
+    Repo.all(
       from ag in AmmoGroup,
         left_join: sg in assoc(ag, :shot_groups),
         where: ag.user_id == ^user_id,
         where: not (ag.count == 0),
         preload: [shot_groups: sg],
         order_by: ag.id
-    end
-    |> Repo.all()
+    )
   end
 
   @doc """
@@ -317,6 +435,17 @@ defmodule Cannery.Ammo do
     |> Enum.sum()
   end
 
+  @doc """
+  Returns the last entered shot group for an ammo group
+  """
+  @spec get_last_used_shot_group(AmmoGroup.t()) :: ShotGroup.t() | nil
+  def get_last_used_shot_group(%AmmoGroup{} = ammo_group) do
+    ammo_group
+    |> Repo.preload(:shot_groups)
+    |> Map.fetch!(:shot_groups)
+    |> Enum.max_by(fn %{date: date} -> date end, Date, fn -> nil end)
+  end
+
   @doc """
   Calculates the percentage remaining of an ammo group out of 100
   """
@@ -350,18 +479,21 @@ defmodule Cannery.Ammo do
   def create_ammo_groups(
         %{"ammo_type_id" => ammo_type_id, "container_id" => container_id} = attrs,
         multiplier,
-        %User{id: user_id} = user
+        %User{} = user
       )
-      when multiplier >= 1 and multiplier <= @ammo_group_create_limit do
-    # validate ammo type and container ids belong to user
-    _valid_ammo_type = get_ammo_type!(ammo_type_id, user)
-    _valid_container = Containers.get_container!(container_id, user)
-
+      when multiplier >= 1 and multiplier <= @ammo_group_create_limit and
+             not (ammo_type_id |> is_nil()) and not (container_id |> is_nil()) do
     now = NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second)
 
     changesets =
       Enum.map(1..multiplier, fn _count ->
-        %AmmoGroup{} |> AmmoGroup.create_changeset(attrs |> Map.put("user_id", user_id))
+        %AmmoGroup{}
+        |> AmmoGroup.create_changeset(
+          get_ammo_type!(ammo_type_id, user),
+          Containers.get_container!(container_id, user),
+          user,
+          attrs
+        )
       end)
 
     if changesets |> Enum.all?(fn %{valid?: valid} -> valid end) do
@@ -386,8 +518,27 @@ defmodule Cannery.Ammo do
     end
   end
 
-  def create_ammo_groups(invalid_attrs, _multiplier, _user) do
-    {:error, %AmmoGroup{} |> AmmoGroup.create_changeset(invalid_attrs)}
+  def create_ammo_groups(
+        %{"ammo_type_id" => ammo_type_id, "container_id" => container_id} = attrs,
+        _multiplier,
+        user
+      )
+      when not (ammo_type_id |> is_nil()) and not (container_id |> is_nil()) do
+    changeset =
+      %AmmoGroup{}
+      |> AmmoGroup.create_changeset(
+        get_ammo_type!(ammo_type_id, user),
+        Containers.get_container!(container_id, user),
+        user,
+        attrs
+      )
+      |> Changeset.add_error(:multiplier, dgettext("errors", "Invalid multiplier"))
+
+    {:error, changeset}
+  end
+
+  def create_ammo_groups(invalid_attrs, _multiplier, user) do
+    {:error, %AmmoGroup{} |> AmmoGroup.create_changeset(nil, nil, user, invalid_attrs)}
   end
 
   @doc """
@@ -436,18 +587,4 @@ defmodule Cannery.Ammo do
   @spec delete_ammo_group!(AmmoGroup.t(), User.t()) :: AmmoGroup.t()
   def delete_ammo_group!(%AmmoGroup{user_id: user_id} = ammo_group, %User{id: user_id}),
     do: ammo_group |> Repo.delete!()
-
-  @doc """
-  Returns an `%Changeset{}` for tracking ammo_group changes.
-
-  ## Examples
-
-      iex> change_ammo_group(ammo_group)
-      %Changeset{data: %AmmoGroup{}}
-
-  """
-  @spec change_ammo_group(AmmoGroup.t()) :: Changeset.t(AmmoGroup.t())
-  @spec change_ammo_group(AmmoGroup.t(), attrs :: map()) :: Changeset.t(AmmoGroup.t())
-  def change_ammo_group(%AmmoGroup{} = ammo_group, attrs \\ %{}),
-    do: AmmoGroup.update_changeset(ammo_group, attrs)
 end

lib/cannery/ammo/ammo_group.ex

@@ -7,6 +7,7 @@ defmodule Cannery.Ammo.AmmoGroup do
   """
 
   use Ecto.Schema
+  import CanneryWeb.Gettext
   import Ecto.Changeset
   alias Cannery.Ammo.{AmmoGroup, AmmoType}
   alias Cannery.{Accounts.User, ActivityLog.ShotGroup, Containers.Container}
@@ -48,22 +49,49 @@ defmodule Cannery.Ammo.AmmoGroup do
   @type id :: UUID.t()
 
   @doc false
-  @spec create_changeset(new_ammo_group(), attrs :: map()) :: Changeset.t(new_ammo_group())
-  def create_changeset(ammo_group, attrs) do
+  @spec create_changeset(
+          new_ammo_group(),
+          AmmoType.t() | nil,
+          Container.t() | nil,
+          User.t(),
+          attrs :: map()
+        ) :: Changeset.t(new_ammo_group())
+  def create_changeset(
+        ammo_group,
+        %AmmoType{id: ammo_type_id},
+        %Container{id: container_id, user_id: user_id},
+        %User{id: user_id},
+        attrs
+      )
+      when not (ammo_type_id |> is_nil()) and not (container_id |> is_nil()) and
+             not (user_id |> is_nil()) do
     ammo_group
-    |> cast(attrs, [:count, :price_paid, :notes, :staged, :ammo_type_id, :container_id, :user_id])
+    |> change(ammo_type_id: ammo_type_id)
+    |> change(user_id: user_id)
+    |> change(container_id: container_id)
+    |> cast(attrs, [:count, :price_paid, :notes, :staged])
     |> validate_number(:count, greater_than: 0)
     |> validate_required([:count, :staged, :ammo_type_id, :container_id, :user_id])
   end
 
+  @doc """
+  Invalid changeset, used to prompt user to select ammo type and container
+  """
+  def create_changeset(ammo_group, _invalid_ammo_type, _invalid_container, _invalid_user, attrs) do
+    ammo_group
+    |> cast(attrs, [:ammo_type_id, :container_id])
+    |> validate_required([:ammo_type_id, :container_id])
+    |> add_error(:invalid, dgettext("errors", "Please select an ammo type and container"))
+  end
+
   @doc false
   @spec update_changeset(t() | new_ammo_group(), attrs :: map()) ::
           Changeset.t(t() | new_ammo_group())
   def update_changeset(ammo_group, attrs) do
     ammo_group
-    |> cast(attrs, [:count, :price_paid, :notes, :staged, :ammo_type_id, :container_id])
+    |> cast(attrs, [:count, :price_paid, :notes, :staged])
     |> validate_number(:count, greater_than_or_equal_to: 0)
-    |> validate_required([:count, :staged, :ammo_type_id, :container_id, :user_id])
+    |> validate_required([:count, :staged])
   end
 
   @doc """
@@ -75,6 +103,6 @@ defmodule Cannery.Ammo.AmmoGroup do
   def range_changeset(ammo_group, attrs) do
     ammo_group
     |> cast(attrs, [:count, :staged])
-    |> validate_required([:count, :staged, :ammo_type_id, :container_id, :user_id])
+    |> validate_required([:count, :staged])
   end
 end

lib/cannery/ammo/ammo_type.ex

@@ -105,10 +105,12 @@ defmodule Cannery.Ammo.AmmoType do
     ]
 
   @doc false
-  @spec create_changeset(new_ammo_type(), attrs :: map()) :: Changeset.t(new_ammo_type())
-  def create_changeset(ammo_type, attrs) do
+  @spec create_changeset(new_ammo_type(), User.t(), attrs :: map()) ::
+          Changeset.t(new_ammo_type())
+  def create_changeset(ammo_type, %User{id: user_id}, attrs) do
     ammo_type
-    |> cast(attrs, [:user_id | changeset_fields()])
+    |> change(user_id: user_id)
+    |> cast(attrs, changeset_fields())
     |> validate_required([:name, :user_id])
   end
 
@@ -118,6 +120,6 @@ defmodule Cannery.Ammo.AmmoType do
   def update_changeset(ammo_type, attrs) do
     ammo_type
     |> cast(attrs, changeset_fields())
-    |> validate_required([:name, :user_id])
+    |> validate_required(:name)
   end
 end

lib/cannery/containers.ex

@@ -30,6 +30,25 @@ defmodule Cannery.Containers do
     )
   end
 
+  @doc """
+  Returns a count of containers.
+
+  ## Examples
+
+      iex> get_containers_count!(%User{id: 123})
+      3
+
+  """
+  @spec get_containers_count!(User.t()) :: integer()
+  def get_containers_count!(%User{id: user_id}) do
+    Repo.one(
+      from c in Container,
+        where: c.user_id == ^user_id,
+        select: count(c.id),
+        distinct: true
+    )
+  end
+
   @doc """
   Gets a single container.
 
@@ -71,9 +90,8 @@ defmodule Cannery.Containers do
   """
   @spec create_container(attrs :: map(), User.t()) ::
           {:ok, Container.t()} | {:error, Changeset.t(Container.new_container())}
-  def create_container(attrs, %User{id: user_id}) do
-    attrs = attrs |> Map.put("user_id", user_id)
-    %Container{} |> Container.create_changeset(attrs) |> Repo.insert()
+  def create_container(attrs, %User{} = user) do
+    %Container{} |> Container.create_changeset(user, attrs) |> Repo.insert()
   end
 
   @doc """
@@ -122,7 +140,7 @@ defmodule Cannery.Containers do
         error = dgettext("errors", "Container must be empty before deleting")
 
         container
-        |> change_container()
+        |> Container.update_changeset(%{})
         |> Changeset.add_error(:ammo_groups, error)
         |> Changeset.apply_action(:delete)
     end
@@ -143,25 +161,6 @@ defmodule Cannery.Containers do
     container
   end
 
-  @doc """
-  Returns an `%Changeset{}` for tracking container changes.
-
-  ## Examples
-
-      iex> change_container(container)
-      %Changeset{data: %Container{}}
-
-      iex> change_container(%Changeset{})
-      %Changeset{data: %Container{}}
-
-  """
-  @spec change_container(Container.t() | Container.new_container()) ::
-          Changeset.t(Container.t() | Container.new_container())
-  @spec change_container(Container.t() | Container.new_container(), attrs :: map()) ::
-          Changeset.t(Container.t() | Container.new_container())
-  def change_container(container, attrs \\ %{}),
-    do: container |> Container.update_changeset(attrs)
-
   @doc """
   Adds a tag to a container
 
@@ -173,14 +172,11 @@ defmodule Cannery.Containers do
   """
   @spec add_tag!(Container.t(), Tag.t(), User.t()) :: ContainerTag.t()
   def add_tag!(
-        %Container{id: container_id, user_id: user_id},
-        %Tag{id: tag_id, user_id: user_id},
+        %Container{user_id: user_id} = container,
+        %Tag{user_id: user_id} = tag,
         %User{id: user_id}
-      ) do
-    %ContainerTag{}
-    |> ContainerTag.changeset(%{"container_id" => container_id, "tag_id" => tag_id})
-    |> Repo.insert!()
-  end
+      ),
+      do: %ContainerTag{} |> ContainerTag.create_changeset(tag, container) |> Repo.insert!()
 
   @doc """
   Removes a tag from a container
@@ -207,6 +203,19 @@ defmodule Cannery.Containers do
     if count == 0, do: raise("could not delete container tag"), else: count
   end
 
+  @doc """
+  Returns number of rounds in container. If data is already preloaded, then
+  there will be no db hit.
+  """
+  @spec get_container_ammo_group_count!(Container.t()) :: non_neg_integer()
+  def get_container_ammo_group_count!(%Container{} = container) do
+    container
+    |> Repo.preload(:ammo_groups)
+    |> Map.fetch!(:ammo_groups)
+    |> Enum.reject(fn %{count: count} -> count == 0 end)
+    |> Enum.count()
+  end
+
   @doc """
   Returns number of rounds in container. If data is already preloaded, then
   there will be no db hit.

lib/cannery/containers/container.ex

@@ -42,10 +42,12 @@ defmodule Cannery.Containers.Container do
   @type id :: UUID.t()
 
   @doc false
-  @spec create_changeset(new_container(), attrs :: map()) :: Changeset.t(new_container())
-  def create_changeset(container, attrs) do
+  @spec create_changeset(new_container(), User.t(), attrs :: map()) ::
+          Changeset.t(new_container())
+  def create_changeset(container, %User{id: user_id}, attrs) do
     container
-    |> cast(attrs, [:name, :desc, :type, :location, :user_id])
+    |> change(user_id: user_id)
+    |> cast(attrs, [:name, :desc, :type, :location])
     |> validate_required([:name, :type, :user_id])
   end
 
@@ -55,6 +57,6 @@ defmodule Cannery.Containers.Container do
   def update_changeset(container, attrs) do
     container
     |> cast(attrs, [:name, :desc, :type, :location])
-    |> validate_required([:name, :type, :user_id])
+    |> validate_required([:name, :type])
   end
 end

lib/cannery/containers/container_tag.ex

@@ -31,10 +31,16 @@ defmodule Cannery.Containers.ContainerTag do
   @type id :: UUID.t()
 
   @doc false
-  @spec changeset(new_container_tag(), attrs :: map()) :: Changeset.t(new_container_tag())
-  def changeset(container_tag, attrs) do
+  @spec create_changeset(new_container_tag(), Tag.t(), Container.t()) ::
+          Changeset.t(new_container_tag())
+  def create_changeset(
+        container_tag,
+        %Tag{id: tag_id, user_id: user_id},
+        %Container{id: container_id, user_id: user_id}
+      ) do
     container_tag
-    |> cast(attrs, [:tag_id, :container_id])
+    |> change(tag_id: tag_id)
+    |> change(container_id: container_id)
     |> validate_required([:tag_id, :container_id])
   end
 end

lib/cannery/invites.ex

@@ -100,15 +100,13 @@ defmodule Cannery.Invites do
   """
   @spec create_invite(User.t(), attrs :: map()) ::
           {:ok, Invite.t()} | {:error, Changeset.t(Invite.new_invite())}
-  def create_invite(%User{id: user_id, role: :admin}, attrs) do
+  def create_invite(%User{role: :admin} = user, attrs) do
     token =
       :crypto.strong_rand_bytes(@invite_token_length)
       |> Base.url_encode64()
       |> binary_part(0, @invite_token_length)
 
-    attrs = attrs |> Map.merge(%{"user_id" => user_id, "token" => token})
-
-    %Invite{} |> Invite.create_changeset(attrs) |> Repo.insert()
+    %Invite{} |> Invite.create_changeset(user, token, attrs) |> Repo.insert()
   end
 
   @doc """
@@ -155,19 +153,4 @@ defmodule Cannery.Invites do
   """
   @spec delete_invite!(Invite.t(), User.t()) :: Invite.t()
   def delete_invite!(invite, %User{role: :admin}), do: invite |> Repo.delete!()
-
-  @doc """
-  Returns an `%Changeset{}` for tracking invite changes.
-
-  ## Examples
-
-      iex> change_invite(invite)
-      %Changeset{data: %Invite{}}
-
-  """
-  @spec change_invite(Invite.t() | Invite.new_invite()) ::
-          Changeset.t(Invite.t() | Invite.new_invite())
-  @spec change_invite(Invite.t() | Invite.new_invite(), attrs :: map()) ::
-          Changeset.t(Invite.t() | Invite.new_invite())
-  def change_invite(invite, attrs \\ %{}), do: invite |> Invite.update_changeset(attrs)
 end

lib/cannery/invites/invite.ex

@@ -38,10 +38,12 @@ defmodule Cannery.Invites.Invite do
   @type id :: UUID.t()
 
   @doc false
-  @spec create_changeset(new_invite(), attrs :: map()) :: Changeset.t(new_invite())
-  def create_changeset(invite, attrs) do
+  @spec create_changeset(new_invite(), User.t(), token :: binary(), attrs :: map()) ::
+          Changeset.t(new_invite())
+  def create_changeset(invite, %User{id: user_id}, token, attrs) do
     invite
-    |> cast(attrs, [:name, :token, :uses_left, :disabled_at, :user_id])
+    |> change(token: token, user_id: user_id)
+    |> cast(attrs, [:name, :uses_left, :disabled_at])
     |> validate_required([:name, :token, :user_id])
     |> validate_number(:uses_left, greater_than_or_equal_to: 0)
   end
@@ -51,7 +53,7 @@ defmodule Cannery.Invites.Invite do
   def update_changeset(invite, attrs) do
     invite
     |> cast(attrs, [:name, :uses_left, :disabled_at])
-    |> validate_required([:name, :token, :user_id])
+    |> validate_required([:name])
     |> validate_number(:uses_left, greater_than_or_equal_to: 0)
   end
 end

lib/cannery/tags.ex

@@ -74,8 +74,8 @@ defmodule Cannery.Tags do
   """
   @spec create_tag(attrs :: map(), User.t()) ::
           {:ok, Tag.t()} | {:error, Changeset.t(Tag.new_tag())}
-  def create_tag(attrs, %User{id: user_id}),
-    do: %Tag{} |> Tag.create_changeset(attrs |> Map.put("user_id", user_id)) |> Repo.insert()
+  def create_tag(attrs, %User{} = user),
+    do: %Tag{} |> Tag.create_changeset(user, attrs) |> Repo.insert()
 
   @doc """
   Updates a tag.
@@ -121,20 +121,6 @@ defmodule Cannery.Tags do
   @spec delete_tag!(Tag.t(), User.t()) :: Tag.t()
   def delete_tag!(%Tag{user_id: user_id} = tag, %User{id: user_id}), do: tag |> Repo.delete!()
 
-  @doc """
-  Returns an `%Changeset{}` for tracking tag changes.
-
-  ## Examples
-
-      iex> change_tag(tag)
-      %Changeset{data: %Tag{}}
-
-  """
-  @spec change_tag(Tag.t() | Tag.new_tag()) :: Changeset.t(Tag.t() | Tag.new_tag())
-  @spec change_tag(Tag.t() | Tag.new_tag(), attrs :: map()) ::
-          Changeset.t(Tag.t() | Tag.new_tag())
-  def change_tag(tag, attrs \\ %{}), do: Tag.update_changeset(tag, attrs)
-
   @doc """
   Get a random tag bg_color in `#ffffff` hex format
 

lib/cannery/tags/tag.ex

@@ -35,10 +35,11 @@ defmodule Cannery.Tags.Tag do
   @type id() :: UUID.t()
 
   @doc false
-  @spec create_changeset(new_tag(), attrs :: map()) :: Changeset.t(new_tag())
-  def create_changeset(tag, attrs) do
+  @spec create_changeset(new_tag(), User.t(), attrs :: map()) :: Changeset.t(new_tag())
+  def create_changeset(tag, %User{id: user_id}, attrs) do
     tag
-    |> cast(attrs, [:name, :bg_color, :text_color, :user_id])
+    |> change(user_id: user_id)
+    |> cast(attrs, [:name, :bg_color, :text_color])
     |> validate_required([:name, :bg_color, :text_color, :user_id])
   end
 
@@ -47,6 +48,6 @@ defmodule Cannery.Tags.Tag do
   def update_changeset(tag, attrs) do
     tag
     |> cast(attrs, [:name, :bg_color, :text_color])
-    |> validate_required([:name, :bg_color, :text_color, :user_id])
+    |> validate_required([:name, :bg_color, :text_color])
   end
 end

lib/cannery_web.ex

@@ -96,7 +96,7 @@ defmodule CanneryWeb do
 
       # Import LiveView and .heex helpers (live_render, live_patch, <.form>, etc)
       # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
-      import Phoenix.LiveView.Helpers
+      import Phoenix.Component
 
       # Import basic rendering functionality (render, render_layout, etc)
       # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse

lib/cannery_web/components/add_shot_group_component.ex

@@ -16,9 +16,10 @@ defmodule CanneryWeb.Components.AddShotGroupComponent do
           },
           Socket.t()
         ) :: {:ok, Socket.t()}
-  def update(%{ammo_group: _ammo_group, current_user: _current_user} = assigns, socket) do
+  def update(%{ammo_group: ammo_group, current_user: current_user} = assigns, socket) do
     changeset =
-      %ShotGroup{date: NaiveDateTime.utc_now(), count: 1} |> ActivityLog.change_shot_group()
+      %ShotGroup{date: NaiveDateTime.utc_now(), count: 1}
+      |> ShotGroup.create_changeset(current_user, ammo_group, %{})
 
     {:ok, socket |> assign(assigns) |> assign(:changeset, changeset)}
   end
@@ -27,21 +28,13 @@ defmodule CanneryWeb.Components.AddShotGroupComponent do
   def handle_event(
         "validate",
         %{"shot_group" => shot_group_params},
-        %{
-          assigns: %{
-            ammo_group: %AmmoGroup{id: ammo_group_id} = ammo_group,
-            current_user: %User{id: user_id}
-          }
-        } = socket
+        %{assigns: %{ammo_group: ammo_group, current_user: current_user}} = socket
       ) do
-    shot_group_params =
-      shot_group_params
-      |> process_params(ammo_group)
-      |> Map.merge(%{"ammo_group_id" => ammo_group_id, "user_id" => user_id})
+    params = shot_group_params |> process_params(ammo_group)
 
     changeset =
       %ShotGroup{}
-      |> ActivityLog.change_shot_group(shot_group_params)
+      |> ShotGroup.create_changeset(current_user, ammo_group, params)
       |> Map.put(:action, :validate)
 
     {:noreply, socket |> assign(:changeset, changeset)}
@@ -51,22 +44,17 @@ defmodule CanneryWeb.Components.AddShotGroupComponent do
         "save",
         %{"shot_group" => shot_group_params},
         %{
-          assigns: %{
-            ammo_group: %{id: ammo_group_id} = ammo_group,
-            current_user: %{id: user_id} = current_user,
-            return_to: return_to
-          }
+          assigns: %{ammo_group: ammo_group, current_user: current_user, return_to: return_to}
         } = socket
       ) do
     socket =
       shot_group_params
       |> process_params(ammo_group)
-      |> Map.merge(%{"ammo_group_id" => ammo_group_id, "user_id" => user_id})
       |> ActivityLog.create_shot_group(current_user, ammo_group)
       |> case do
         {:ok, _shot_group} ->
           prompt = dgettext("prompts", "Shots recorded successfully")
-          socket |> put_flash(:info, prompt) |> push_redirect(to: return_to)
+          socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
 
         {:error, %Ecto.Changeset{} = changeset} ->
           socket |> assign(changeset: changeset)

lib/cannery_web/components/add_shot_group_component.html.heex

@@ -4,7 +4,7 @@
   </h2>
 
   <.form
-    let={f}
+    :let={f}
     for={@changeset}
     id="shot-group-form"
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"

lib/cannery_web/components/ammo_group_card.ex

@@ -4,11 +4,16 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
   """
 
   use CanneryWeb, :component
-  alias Cannery.Repo
+  alias Cannery.{Ammo, Repo}
   alias CanneryWeb.Endpoint
 
-  def ammo_group_card(assigns) do
-    assigns = assigns |> assign(:ammo_group, assigns.ammo_group |> Repo.preload(:ammo_type))
+  def ammo_group_card(%{ammo_group: ammo_group} = assigns) do
+    assigns =
+      %{show_container: show_container} = assigns |> assign_new(:show_container, fn -> false end)
+
+    preloads = if show_container, do: [:ammo_type, :container], else: [:ammo_type]
+    ammo_group = ammo_group |> Repo.preload(preloads)
+    assigns = assigns |> assign(:ammo_group, ammo_group)
 
     ~H"""
     <div
@@ -17,17 +22,16 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
             border border-gray-400 rounded-lg shadow-lg hover:shadow-md
             transition-all duration-300 ease-in-out"
     >
-      <%= live_redirect to: Routes.ammo_group_show_path(Endpoint, :show, @ammo_group),
-                    class: "mb-2 link" do %>
+      <.link patch={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)} class="mb-2 link">
         <h1 class="title text-xl title-primary-500">
           <%= @ammo_group.ammo_type.name %>
         </h1>
-      <% end %>
+      </.link>
 
       <div class="flex flex-col justify-center items-center">
         <span class="rounded-lg title text-lg">
           <%= gettext("Count:") %>
-          <%= @ammo_group.count %>
+          <%= if @ammo_group.count == 0, do: "Empty", else: @ammo_group.count %>
         </span>
 
         <%= if @ammo_group.notes do %>
@@ -42,6 +46,13 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
           <%= @ammo_group.inserted_at |> display_datetime() %>
         </span>
 
+        <%= if @ammo_group.count == 0 do %>
+          <span class="rounded-lg title text-lg">
+            <%= gettext("Used up on:") %>
+            <%= @ammo_group |> Ammo.get_last_used_shot_group() |> Map.get(:date) |> display_date() %>
+          </span>
+        <% end %>
+
         <%= if @ammo_group.price_paid do %>
           <span class="rounded-lg title text-lg">
             <%= gettext("Price paid:") %>
@@ -50,6 +61,19 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
             ) %>
           </span>
         <% end %>
+
+        <%= if @show_container and @ammo_group.container do %>
+          <span class="rounded-lg title text-lg">
+            <%= gettext("Container:") %>
+
+            <.link
+              patch={Routes.container_show_path(Endpoint, :show, @ammo_group.container)}
+              class="link"
+            >
+              <%= @ammo_group.container.name %>
+            </.link>
+          </span>
+        <% end %>
       </div>
 
       <%= if assigns |> Map.has_key?(:inner_block) do %>

lib/cannery_web/components/container_card.ex

@@ -19,12 +19,11 @@ defmodule CanneryWeb.Components.ContainerCard do
         transition-all duration-300 ease-in-out"
     >
       <div class="max-w-full mb-4 flex flex-col justify-center items-center space-y-2">
-        <%= live_redirect to: Routes.container_show_path(Endpoint, :show, @container),
-                      class: "link" do %>
+        <.link navigate={Routes.container_show_path(Endpoint, :show, @container)} class="link">
           <h1 class="px-4 py-2 rounded-lg title text-xl">
             <%= @container.name %>
           </h1>
-        <% end %>
+        </.link>
 
         <%= if @container.desc do %>
           <span class="rounded-lg title text-lg">
@@ -45,7 +44,12 @@ defmodule CanneryWeb.Components.ContainerCard do
           </span>
         <% end %>
 
-        <%= if @container.ammo_groups do %>
+        <%= unless @container.ammo_groups |> Enum.empty?() do %>
+          <span class="rounded-lg title text-lg">
+            <%= gettext("Packs:") %>
+            <%= @container |> Containers.get_container_ammo_group_count!() %>
+          </span>
+
           <span class="rounded-lg title text-lg">
             <%= gettext("Rounds:") %>
             <%= @container |> Containers.get_container_rounds!() %>

lib/cannery_web/components/move_ammo_group_component.ex

@@ -22,7 +22,7 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
           assigns,
         socket
       ) do
-    changeset = Ammo.change_ammo_group(ammo_group)
+    changeset = ammo_group |> AmmoGroup.update_changeset(%{})
 
     containers =
       Containers.list_containers(current_user)
@@ -52,7 +52,7 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
         {:ok, _ammo_group} ->
           prompt = dgettext("prompts", "Ammo moved to %{name} successfully", name: container_name)
 
-          socket |> put_flash(:info, prompt) |> push_redirect(to: return_to)
+          socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
 
         {:error, %Ecto.Changeset{} = changeset} ->
           socket |> assign(changeset: changeset)
@@ -86,10 +86,9 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
           <%= display_emoji("😔") %>
         </h2>
 
-        <%= live_patch(dgettext("actions", "Add another container!"),
-          to: Routes.container_index_path(Endpoint, :new),
-          class: "btn btn-primary"
-        ) %>
+        <.link patch={Routes.container_index_path(Endpoint, :new)} class="btn btn-primary">
+          <%= dgettext("actions", "Add another container!") %>
+        </.link>
       <% else %>
         <.live_component
           module={CanneryWeb.Components.TableComponent}
@@ -122,7 +121,7 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
         class="btn btn-primary"
         phx-click="move"
         phx-target={@myself}
-        phx-value-container_id={container.id}
+        phx-value-container_id={@container.id}
       >
         <%= dgettext("actions", "Select") %>
       </button>

lib/cannery_web/components/table_component.ex

@@ -6,7 +6,7 @@ defmodule CanneryWeb.Components.TableComponent do
     - `:columns`: An array of maps containing the following keys
       - `:label`: A gettext'd or otherwise user-facing string label for the
         column. Can be nil
-      - `:key`: A string key used for sorting
+      - `:key`: An atom key used for sorting
       - `:class`: Extra classes to be applied to the column element, if desired.
         Optional
       - `:sortable`: If false, will prevent the user from sorting with it.
@@ -28,13 +28,13 @@ defmodule CanneryWeb.Components.TableComponent do
             required(:columns) =>
               list(%{
                 required(:label) => String.t() | nil,
-                required(:key) => String.t() | nil,
+                required(:key) => atom() | nil,
                 optional(:class) => String.t(),
                 optional(:sortable) => false
               }),
             required(:rows) =>
               list(%{
-                (key :: String.t()) => any() | {custom_sort_value :: String.t(), value :: any()}
+                (key :: atom()) => any() | {custom_sort_value :: String.t(), value :: any()}
               }),
             optional(any()) => any()
           },
@@ -56,20 +56,19 @@ defmodule CanneryWeb.Components.TableComponent do
   def handle_event(
         "sort_by",
         %{"sort-key" => key},
-        %{assigns: %{rows: rows, last_sort_key: key, sort_mode: sort_mode}} = socket
+        %{assigns: %{rows: rows, last_sort_key: last_sort_key, sort_mode: sort_mode}} = socket
       ) do
-    sort_mode = if sort_mode == :asc, do: :desc, else: :asc
-    rows = rows |> sort_by_custom_sort_value_or_value(key, sort_mode)
-    {:noreply, socket |> assign(sort_mode: sort_mode, rows: rows)}
-  end
+    key = key |> String.to_existing_atom()
 
-  def handle_event(
-        "sort_by",
-        %{"sort-key" => key},
-        %{assigns: %{rows: rows}} = socket
-      ) do
-    rows = rows |> sort_by_custom_sort_value_or_value(key, :asc)
-    {:noreply, socket |> assign(last_sort_key: key, sort_mode: :asc, rows: rows)}
+    sort_mode =
+      case {key, sort_mode} do
+        {^last_sort_key, :asc} -> :desc
+        {^last_sort_key, :desc} -> :asc
+        {_new_sort_key, _last_sort_mode} -> :asc
+      end
+
+    rows = rows |> sort_by_custom_sort_value_or_value(key, sort_mode)
+    {:noreply, socket |> assign(last_sort_key: key, sort_mode: sort_mode, rows: rows)}
   end
 
   defp sort_by_custom_sort_value_or_value(rows, key, sort_mode) do

lib/cannery_web/components/table_component.html.heex

@@ -1,4 +1,4 @@
-<div class="w-full overflow-x-auto border border-gray-600 rounded-lg shadow-lg bg-black">
+<div id={@id} class="w-full overflow-x-auto border border-gray-600 rounded-lg shadow-lg bg-black">
   <table class="min-w-full table-auto text-center bg-white">
     <thead class="border-b border-primary-600">
       <tr>

lib/cannery_web/components/topbar.ex

@@ -16,10 +16,17 @@ defmodule CanneryWeb.Components.Topbar do
     <nav role="navigation" class="mb-8 px-8 py-4 w-full bg-primary-400">
       <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">
-          <%= live_redirect("Cannery",
-            to: Routes.live_path(Endpoint, HomeLive),
-            class: "mx-2 my-1 leading-5 text-xl text-white hover:underline"
-          ) %>
+          <.link
+            patch={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")}
+              alt={gettext("Cannery logo")}
+              class="inline-block h-8 mx-1"
+            />
+            <h1 class="inline hover:underline">Cannery</h1>
+          </.link>
 
           <%= if @title_content do %>
             <span class="mx-2 my-1">
@@ -35,78 +42,100 @@ defmodule CanneryWeb.Components.Topbar do
           text-lg text-white text-ellipsis">
           <%= if @current_user do %>
             <li class="mx-2 my-1">
-              <%= live_redirect(gettext("Tags"),
-                to: Routes.tag_index_path(Endpoint, :index),
-                class: "text-primary-600 text-white hover:underline"
-              ) %>
+              <.link
+                patch={Routes.tag_index_path(Endpoint, :index)}
+                class="text-primary-600 text-white hover:underline"
+              >
+                <%= gettext("Tags") %>
+              </.link>
             </li>
             <li class="mx-2 my-1">
-              <%= live_redirect(gettext("Containers"),
-                to: Routes.container_index_path(Endpoint, :index),
-                class: "text-primary-600 text-white hover:underline"
-              ) %>
+              <.link
+                patch={Routes.container_index_path(Endpoint, :index)}
+                class="text-primary-600 text-white hover:underline"
+              >
+                <%= gettext("Containers") %>
+              </.link>
             </li>
             <li class="mx-2 my-1">
-              <%= live_redirect(gettext("Ammo"),
-                to: Routes.ammo_type_index_path(Endpoint, :index),
-                class: "text-primary-600 text-white hover:underline"
-              ) %>
+              <.link
+                patch={Routes.ammo_type_index_path(Endpoint, :index)}
+                class="text-primary-600 text-white hover:underline"
+              >
+                <%= gettext("Catalog") %>
+              </.link>
             </li>
             <li class="mx-2 my-1">
-              <%= live_redirect(gettext("Manage"),
-                to: Routes.ammo_group_index_path(Endpoint, :index),
-                class: "text-primary-600 text-white hover:underline"
-              ) %>
+              <.link
+                patch={Routes.ammo_group_index_path(Endpoint, :index)}
+                class="text-primary-600 text-white hover:underline"
+              >
+                <%= gettext("Ammo") %>
+              </.link>
             </li>
             <li class="mx-2 my-1">
-              <%= live_redirect(gettext("Range"),
-                to: Routes.range_index_path(Endpoint, :index),
-                class: "text-primary-600 text-white hover:underline"
-              ) %>
+              <.link
+                patch={Routes.range_index_path(Endpoint, :index)}
+                class="text-primary-600 text-white hover:underline"
+              >
+                <%= gettext("Range") %>
+              </.link>
             </li>
             <%= if @current_user.role == :admin do %>
               <li class="mx-2 my-1">
-                <%= live_redirect(gettext("Invites"),
-                  to: Routes.invite_index_path(Endpoint, :index),
-                  class: "text-primary-600 text-white hover:underline"
-                ) %>
+                <.link
+                  patch={Routes.invite_index_path(Endpoint, :index)}
+                  class="text-primary-600 text-white hover:underline"
+                >
+                  <%= gettext("Invites") %>
+                </.link>
               </li>
             <% end %>
             <li class="mx-2 my-1">
-              <%= live_redirect(@current_user.email,
-                to: Routes.user_settings_path(Endpoint, :edit),
-                class: "text-primary-600 text-white hover:underline truncate"
-              ) %>
+              <.link
+                patch={Routes.user_settings_path(Endpoint, :edit)}
+                class="text-primary-600 text-white hover:underline truncate"
+              >
+                <%= @current_user.email %>
+              </.link>
             </li>
             <li class="mx-2 my-1">
-              <%= link to: Routes.user_session_path(Endpoint, :delete),
-                   method: :delete,
-                   data: [confirm: dgettext("prompts", "Are you sure you want to log out?")] do %>
+              <.link
+                href={Routes.user_session_path(Endpoint, :delete)}
+                method="delete"
+                data-confirm={dgettext("prompts", "Are you sure you want to log out?")}
+              >
                 <i class="fas fa-sign-out-alt"></i>
-              <% end %>
+              </.link>
             </li>
             <%= if @current_user.role == :admin and function_exported?(Routes, :live_dashboard_path, 2) do %>
               <li class="mx-2 my-1">
-                <%= live_redirect to: Routes.live_dashboard_path(Endpoint, :home),
-                  class: "text-primary-600 text-white hover:underline" do %>
+                <.link
+                  patch={Routes.live_dashboard_path(Endpoint, :home)}
+                  class="text-primary-600 text-white hover:underline"
+                >
                   <i class="fas fa-gauge"></i>
-                <% end %>
+                </.link>
               </li>
             <% end %>
           <% else %>
             <%= if Accounts.allow_registration?() do %>
               <li class="mx-2 my-1">
-                <%= live_redirect(dgettext("actions", "Register"),
-                  to: Routes.user_registration_path(Endpoint, :new),
-                  class: "text-primary-600 text-white hover:underline truncate"
-                ) %>
+                <.link
+                  patch={Routes.user_registration_path(Endpoint, :new)}
+                  class="text-primary-600 text-white hover:underline truncate"
+                >
+                  <%= dgettext("actions", "Register") %>
+                </.link>
               </li>
             <% end %>
             <li class="mx-2 my-1">
-              <%= live_redirect(dgettext("actions", "Log in"),
-                to: Routes.user_session_path(Endpoint, :new),
-                class: "text-primary-600 text-white hover:underline truncate"
-              ) %>
+              <.link
+                patch={Routes.user_session_path(Endpoint, :new)}
+                class="text-primary-600 text-white hover:underline truncate"
+              >
+                <%= dgettext("actions", "Log in") %>
+              </.link>
             </li>
           <% end %>
         </ul>

lib/cannery_web/live/ammo_group_live/form_component.ex

@@ -21,38 +21,30 @@ defmodule CanneryWeb.AmmoGroupLive.FormComponent do
   end
 
   @spec update(Socket.t()) :: {:ok, Socket.t()}
-  def update(%{assigns: %{ammo_group: ammo_group, current_user: current_user}} = socket) do
-    socket =
+  def update(%{assigns: %{current_user: current_user}} = socket) do
+    %{assigns: %{ammo_types: ammo_types, containers: containers}} =
+      socket =
       socket
       |> assign(:ammo_group_create_limit, @ammo_group_create_limit)
-      |> assign(:changeset, Ammo.change_ammo_group(ammo_group))
       |> assign(:ammo_types, Ammo.list_ammo_types(current_user))
       |> assign_new(:containers, fn -> Containers.list_containers(current_user) end)
 
-    {:ok, socket}
+    params =
+      if ammo_types |> List.first() |> is_nil(),
+        do: %{},
+        else: %{} |> Map.put("ammo_type_id", ammo_types |> List.first() |> Map.get(:id))
+
+    params =
+      if containers |> List.first() |> is_nil(),
+        do: params,
+        else: params |> Map.put("container_id", containers |> List.first() |> Map.get(:id))
+
+    {:ok, socket |> assign_changeset(params)}
   end
 
   @impl true
-  def handle_event(
-        "validate",
-        %{"ammo_group" => ammo_group_params},
-        %{assigns: %{action: action, ammo_group: ammo_group}} = socket
-      ) do
-    changeset_action =
-      case action do
-        :new -> :insert
-        :edit -> :update
-      end
-
-    changeset = ammo_group |> Ammo.change_ammo_group(ammo_group_params)
-
-    changeset =
-      case changeset |> Changeset.apply_action(changeset_action) do
-        {:ok, _data} -> changeset
-        {:error, changeset} -> changeset
-      end
-
-    {:noreply, socket |> assign(:changeset, changeset)}
+  def handle_event("validate", %{"ammo_group" => ammo_group_params}, socket) do
+    {:noreply, socket |> assign_changeset(ammo_group_params)}
   end
 
   def handle_event(
@@ -76,6 +68,44 @@ defmodule CanneryWeb.AmmoGroupLive.FormComponent do
 
   # Save Helpers
 
+  defp assign_changeset(
+         %{assigns: %{action: action, ammo_group: ammo_group, current_user: user}} = socket,
+         ammo_group_params
+       ) do
+    changeset_action =
+      case action do
+        :new -> :insert
+        :edit -> :update
+      end
+
+    changeset =
+      case action do
+        :new ->
+          ammo_type =
+            if ammo_group_params |> Map.has_key?("ammo_type_id"),
+              do: ammo_group_params |> Map.get("ammo_type_id") |> Ammo.get_ammo_type!(user),
+              else: nil
+
+          container =
+            if ammo_group_params |> Map.has_key?("container_id"),
+              do: ammo_group_params |> Map.get("container_id") |> Containers.get_container!(user),
+              else: nil
+
+          ammo_group |> AmmoGroup.create_changeset(ammo_type, container, user, ammo_group_params)
+
+        :edit ->
+          ammo_group |> AmmoGroup.update_changeset(ammo_group_params)
+      end
+
+    changeset =
+      case changeset |> Changeset.apply_action(changeset_action) do
+        {:ok, _data} -> changeset
+        {:error, changeset} -> changeset
+      end
+
+    socket |> assign(:changeset, changeset)
+  end
+
   defp save_ammo_group(
          %{assigns: %{ammo_group: ammo_group, current_user: current_user, return_to: return_to}} =
            socket,
@@ -85,8 +115,8 @@ defmodule CanneryWeb.AmmoGroupLive.FormComponent do
     socket =
       case Ammo.update_ammo_group(ammo_group, ammo_group_params, current_user) do
         {:ok, _ammo_group} ->
-          prompt = dgettext("prompts", "Ammo group updated successfully")
-          socket |> put_flash(:info, prompt) |> push_redirect(to: return_to)
+          prompt = dgettext("prompts", "Ammo updated successfully")
+          socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
 
         {:error, %Changeset{} = changeset} ->
           socket |> assign(:changeset, changeset)
@@ -146,12 +176,12 @@ defmodule CanneryWeb.AmmoGroupLive.FormComponent do
         prompt =
           dngettext(
             "prompts",
-            "Ammo group created successfully",
-            "Ammo groups created successfully",
+            "Ammo added successfully",
+            "Ammo added successfully",
             count
           )
 
-        socket |> put_flash(:info, prompt) |> push_redirect(to: return_to)
+        socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
 
       {:error, %Changeset{} = changeset} ->
         socket |> assign(changeset: changeset)

lib/cannery_web/live/ammo_group_live/form_component.html.heex

@@ -4,7 +4,7 @@
   </h2>
 
   <.form
-    let={f}
+    :let={f}
     for={@changeset}
     id="ammo_group-form"
     phx-target={@myself}

lib/cannery_web/live/ammo_group_live/index.ex

@@ -9,7 +9,7 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
 
   @impl true
   def mount(_params, _session, socket) do
-    {:ok, socket |> display_ammo_groups()}
+    {:ok, socket |> assign(show_used: false) |> display_ammo_groups()}
   end
 
   @impl true
@@ -72,27 +72,51 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
     {:noreply, socket |> display_ammo_groups()}
   end
 
-  defp display_ammo_groups(%{assigns: %{current_user: current_user}} = socket) do
-    ammo_groups = Ammo.list_ammo_groups(current_user) |> Repo.preload([:ammo_type, :container])
-    containers = Containers.list_containers(current_user)
+  @impl true
+  def handle_event("toggle_show_used", _params, %{assigns: %{show_used: show_used}} = socket) do
+    {:noreply, socket |> assign(:show_used, !show_used) |> display_ammo_groups()}
+  end
+
+  defp display_ammo_groups(
+         %{assigns: %{current_user: current_user, show_used: show_used}} = socket
+       ) do
+    ammo_groups =
+      Ammo.list_ammo_groups(current_user, show_used) |> Repo.preload([:ammo_type, :container])
+
+    ammo_types_count = Ammo.get_ammo_types_count!(current_user)
+    containers_count = Containers.get_containers_count!(current_user)
 
     columns = [
-      %{label: gettext("Ammo type"), key: "ammo_type"},
-      %{label: gettext("Count"), key: "count"},
-      %{label: gettext("Price paid"), key: "price_paid"},
-      %{label: gettext("% left"), key: "remaining"},
-      %{label: gettext("Range"), key: "range"},
-      %{label: gettext("Container"), key: "container"},
-      %{label: gettext("Added on"), key: "added_on"},
-      %{label: nil, key: "actions", sortable: false}
+      %{label: gettext("Ammo type"), key: :ammo_type},
+      %{label: gettext("Count"), key: :count},
+      %{label: gettext("Price paid"), key: :price_paid},
+      %{label: gettext("% left"), key: :remaining},
+      %{label: gettext("Range"), key: :range},
+      %{label: gettext("Container"), key: :container},
+      %{label: gettext("Added on"), key: :added_on}
     ]
 
+    columns =
+      if show_used do
+        columns ++ [%{label: gettext("Used up on"), key: :used_up_on}]
+      else
+        columns
+      end
+
+    columns = columns ++ [%{label: nil, key: :actions, sortable: false}]
+
     rows =
       ammo_groups
       |> Enum.map(fn ammo_group -> ammo_group |> get_row_data_for_ammo_group(columns) end)
 
     socket
-    |> assign(ammo_groups: ammo_groups, containers: containers, columns: columns, rows: rows)
+    |> assign(
+      ammo_groups: ammo_groups,
+      ammo_types_count: ammo_types_count,
+      containers_count: containers_count,
+      columns: columns,
+      rows: rows
+    )
   end
 
   @spec get_row_data_for_ammo_group(AmmoGroup.t(), [map()]) :: [map()]
@@ -103,21 +127,24 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
     |> Enum.into(%{}, fn %{key: key} -> {key, get_value_for_key(key, ammo_group)} end)
   end
 
-  @spec get_value_for_key(String.t(), AmmoGroup.t()) :: any()
-  defp get_value_for_key("ammo_type", %{ammo_type: ammo_type}) do
+  @spec get_value_for_key(atom(), AmmoGroup.t()) :: any()
+  defp get_value_for_key(:ammo_type, %{ammo_type: ammo_type}) do
+    assigns = %{ammo_type: ammo_type}
+
     {ammo_type.name,
-     live_patch(ammo_type.name,
-       to: Routes.ammo_type_show_path(Endpoint, :show, ammo_type),
-       class: "link"
-     )}
+     ~H"""
+     <.link patch={Routes.ammo_type_show_path(Endpoint, :show, @ammo_type)} class="link">
+       <%= @ammo_type.name %>
+     </.link>
+     """}
   end
 
-  defp get_value_for_key("price_paid", %{price_paid: nil}), do: {"a", nil}
+  defp get_value_for_key(:price_paid, %{price_paid: nil}), do: {"a", nil}
 
-  defp get_value_for_key("price_paid", %{price_paid: price_paid}),
+  defp get_value_for_key(:price_paid, %{price_paid: price_paid}),
     do: gettext("$%{amount}", amount: price_paid |> :erlang.float_to_binary(decimals: 2))
 
-  defp get_value_for_key("added_on", %{inserted_at: inserted_at}) do
+  defp get_value_for_key(:added_on, %{inserted_at: inserted_at}) do
     assigns = %{inserted_at: inserted_at}
 
     {inserted_at,
@@ -126,79 +153,108 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
      """}
   end
 
-  defp get_value_for_key("range", %{staged: staged} = ammo_group) do
+  defp get_value_for_key(:used_up_on, ammo_group) do
+    last_shot_group_date =
+      case ammo_group |> Ammo.get_last_used_shot_group() do
+        %{date: last_shot_group_date} -> last_shot_group_date
+        _no_shot_groups -> nil
+      end
+
+    assigns = %{last_shot_group_date: last_shot_group_date}
+
+    {last_shot_group_date,
+     ~H"""
+     <%= @last_shot_group_date |> display_date() %>
+     """}
+  end
+
+  defp get_value_for_key(:range, %{staged: staged} = ammo_group) do
     assigns = %{ammo_group: ammo_group}
 
     {staged,
      ~H"""
-     <div class="min-w-20 py-2 px-4 h-full flex flex-col justify-center items-center">
+     <div class="min-w-20 py-2 px-4 h-full flex flew-wrap justify-center items-center">
        <button
          type="button"
-         class="mx-2 my-1 btn btn-primary"
+         class="mx-2 my-1 text-sm btn btn-primary"
          phx-click="toggle_staged"
-         phx-value-ammo_group_id={ammo_group.id}
+         phx-value-ammo_group_id={@ammo_group.id}
        >
-         <%= if ammo_group.staged, do: gettext("Unstage"), else: gettext("Stage") %>
+         <%= if @ammo_group.staged, do: gettext("Unstage"), else: gettext("Stage") %>
        </button>
 
-       <%= live_patch(dgettext("actions", "Record shots"),
-         to: Routes.ammo_group_index_path(Endpoint, :add_shot_group, ammo_group),
-         class: "mx-2 my-1 btn btn-primary"
-       ) %>
+       <.link
+         patch={Routes.ammo_group_index_path(Endpoint, :add_shot_group, @ammo_group)}
+         class="mx-2 my-1 text-sm btn btn-primary"
+       >
+         <%= dgettext("actions", "Record shots") %>
+       </.link>
      </div>
      """}
   end
 
-  defp get_value_for_key("remaining", ammo_group),
+  defp get_value_for_key(:remaining, ammo_group),
     do: "#{ammo_group |> Ammo.get_percentage_remaining()}%"
 
-  defp get_value_for_key("actions", ammo_group) do
+  defp get_value_for_key(:actions, ammo_group) do
     assigns = %{ammo_group: ammo_group}
 
     ~H"""
     <div class="py-2 px-4 h-full space-x-4 flex justify-center items-center">
-      <%= live_redirect to: Routes.ammo_group_show_path(Endpoint, :show, ammo_group),
-                    class: "text-primary-600 link",
-                    data: [qa: "view-#{ammo_group.id}"] do %>
+      <.link
+        patch={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)}
+        class="text-primary-600 link"
+        data-qa={"view-#{@ammo_group.id}"}
+      >
         <i class="fa-fw fa-lg fas fa-eye"></i>
-      <% end %>
+      </.link>
 
-      <%= live_patch to: Routes.ammo_group_index_path(Endpoint, :edit, ammo_group),
-                  class: "text-primary-600 link",
-                  data: [qa: "edit-#{ammo_group.id}"] do %>
+      <.link
+        patch={Routes.ammo_group_index_path(Endpoint, :edit, @ammo_group)}
+        class="text-primary-600 link"
+        data-qa={"edit-#{@ammo_group.id}"}
+      >
         <i class="fa-fw fa-lg fas fa-edit"></i>
-      <% end %>
+      </.link>
 
-      <%= link to: "#",
-            class: "text-primary-600 link",
-            phx_click: "delete",
-            phx_value_id: ammo_group.id,
-            data: [
-              confirm: dgettext("prompts", "Are you sure you want to delete this ammo?"),
-              qa: "delete-#{ammo_group.id}"
-            ] do %>
+      <.link
+        href="#"
+        class="text-primary-600 link"
+        phx-click="delete"
+        phx-value-id={@ammo_group.id}
+        data-confirm={dgettext("prompts", "Are you sure you want to delete this ammo?")}
+        data-qa={"delete-#{@ammo_group.id}"}
+      >
         <i class="fa-fw fa-lg fas fa-trash"></i>
-      <% end %>
+      </.link>
     </div>
     """
   end
 
-  defp get_value_for_key("container", %{container: nil}), do: {nil, nil}
+  defp get_value_for_key(:container, %{container: nil}), do: {nil, nil}
 
-  defp get_value_for_key("container", %{container: %{name: container_name}} = ammo_group) do
+  defp get_value_for_key(:container, %{container: %{name: container_name}} = ammo_group) do
     assigns = %{ammo_group: ammo_group}
 
     {container_name,
      ~H"""
-     <div class="min-w-20 py-2 px-4 h-full space-x-4 flex justify-center items-center">
-       <%= live_patch(@ammo_group.container.name,
-         to: Routes.ammo_group_index_path(Endpoint, :move, @ammo_group),
-         class: "btn btn-primary"
-       ) %>
+     <div class="min-w-20 py-2 px-4 h-full flex flew-wrap justify-center items-center">
+       <.link
+         patch={Routes.container_show_path(Endpoint, :show, @ammo_group.container)}
+         class="mx-2 my-1 link"
+       >
+         <%= @ammo_group.container.name %>
+       </.link>
+
+       <.link
+         patch={Routes.ammo_group_index_path(Endpoint, :move, @ammo_group)}
+         class="mx-2 my-1 text-sm btn btn-primary"
+       >
+         <%= gettext("Move ammo") %>
+       </.link>
      </div>
      """}
   end
 
-  defp get_value_for_key(key, ammo_group),
-    do: ammo_group |> Map.get(key |> String.to_existing_atom())
+  defp get_value_for_key(key, ammo_group), do: ammo_group |> Map.get(key)
 end

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

@@ -8,42 +8,47 @@
       <%= gettext("No Ammo") %>
       <%= display_emoji("😔") %>
     </h2>
+  <% end %>
 
-    <%= if @containers |> Enum.empty?() do %>
+  <%= cond do %>
+    <% @containers_count == 0 -> %>
       <div class="flex justify-center items-center">
         <h2 class="m-2 title text-md text-primary-600">
           <%= dgettext("prompts", "You'll need to") %>
         </h2>
 
-        <%= live_patch(dgettext("actions", "add a container first"),
-          to: Routes.container_index_path(Endpoint, :new),
-          class: "btn btn-primary"
-        ) %>
+        <.link patch={Routes.container_index_path(Endpoint, :new)} class="btn btn-primary">
+          <%= dgettext("actions", "add a container first") %>
+        </.link>
       </div>
-    <% else %>
-      <%= live_patch(dgettext("actions", "Add your first box!"),
-        to: Routes.ammo_group_index_path(Endpoint, :new),
-        class: "btn btn-primary"
-      ) %>
-    <% end %>
-  <% else %>
-    <%= if @containers |> Enum.empty?() do %>
+    <% @ammo_types_count == 0 -> %>
       <div class="flex justify-center items-center">
         <h2 class="m-2 title text-md text-primary-600">
           <%= dgettext("prompts", "You'll need to") %>
         </h2>
 
-        <%= live_patch(dgettext("actions", "add a container first"),
-          to: Routes.container_index_path(Endpoint, :new),
-          class: "btn btn-primary"
-        ) %>
+        <.link patch={Routes.ammo_type_index_path(Endpoint, :new)} class="btn btn-primary">
+          <%= dgettext("actions", "add an ammo type first") %>
+        </.link>
       </div>
-    <% else %>
-      <%= live_patch(dgettext("actions", "New Ammo group"),
-        to: Routes.ammo_group_index_path(Endpoint, :new),
-        class: "btn btn-primary"
-      ) %>
-    <% end %>
+    <% @ammo_groups |> Enum.empty?() -> %>
+      <.link patch={Routes.ammo_group_index_path(Endpoint, :new)} class="btn btn-primary">
+        <%= dgettext("actions", "Add your first box!") %>
+      </.link>
+    <% true -> %>
+      <.link patch={Routes.ammo_group_index_path(Endpoint, :new)} class="btn btn-primary">
+        <%= dgettext("actions", "Add Ammo") %>
+      </.link>
+  <% end %>
+
+  <%= unless @ammo_groups |> Enum.empty?() do %>
+    <div class="flex flex-col justify-center items-center">
+      <.toggle_button action="toggle_show_used" value={@show_used}>
+        <span class="title text-lg text-primary-600">
+          <%= gettext("Show used") %>
+        </span>
+      </.toggle_button>
+    </div>
 
     <.live_component
       module={CanneryWeb.Components.TableComponent}
@@ -66,7 +71,6 @@
         ammo_group={@ammo_group}
         return_to={Routes.ammo_group_index_path(Endpoint, :index)}
         current_user={@current_user}
-        containers={@containers}
       />
     </.modal>
   <% @live_action == :add_shot_group -> %>

lib/cannery_web/live/ammo_group_live/show.ex

@@ -35,9 +35,9 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
 
   defp page_title(:add_shot_group), do: gettext("Record Shots")
   defp page_title(:edit_shot_group), do: gettext("Edit Shot Records")
-  defp page_title(:move), do: gettext("Move Ammo group")
-  defp page_title(:show), do: gettext("Show Ammo group")
-  defp page_title(:edit), do: gettext("Edit Ammo group")
+  defp page_title(:move), do: gettext("Move Ammo")
+  defp page_title(:show), do: gettext("Show Ammo")
+  defp page_title(:edit), do: gettext("Edit Ammo")
 
   @impl true
   def handle_event(
@@ -47,10 +47,10 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
       ) do
     ammo_group |> Ammo.delete_ammo_group!(current_user)
 
-    prompt = dgettext("prompts", "Ammo group deleted succesfully")
+    prompt = dgettext("prompts", "Ammo deleted succesfully")
     redirect_to = Routes.ammo_group_index_path(socket, :index)
 
-    {:noreply, socket |> put_flash(:info, prompt) |> push_redirect(to: redirect_to)}
+    {:noreply, socket |> put_flash(:info, prompt) |> push_navigate(to: redirect_to)}
   end
 
   @impl true
@@ -84,10 +84,10 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
     ammo_group = ammo_group |> Repo.preload([:container, :ammo_type, :shot_groups], force: true)
 
     columns = [
-      %{label: gettext("Rounds shot"), key: "count"},
-      %{label: gettext("Notes"), key: "notes"},
-      %{label: gettext("Date"), key: "date"},
-      %{label: nil, key: "actions", sortable: false}
+      %{label: gettext("Rounds shot"), key: :count},
+      %{label: gettext("Notes"), key: :notes},
+      %{label: gettext("Date"), key: :date},
+      %{label: nil, key: :actions, sortable: false}
     ]
 
     rows =
@@ -110,33 +110,35 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
     |> Enum.into(%{}, fn %{key: key} ->
       value =
         case key do
-          "date" ->
+          :date ->
             {date, date |> display_date()}
 
-          "actions" ->
+          :actions ->
             ~H"""
             <div class="px-4 py-2 space-x-4 flex justify-center items-center">
-              <%= live_patch to: Routes.ammo_group_show_path(Endpoint, :edit_shot_group, @ammo_group, shot_group),
-                          class: "text-primary-600 link",
-                          data: [qa: "edit-#{shot_group.id}"] do %>
+              <.link
+                patch={Routes.ammo_group_show_path(Endpoint, :edit_shot_group, @ammo_group, @shot_group)}
+                class="text-primary-600 link"
+                data-qa={"edit-#{@shot_group.id}"}
+              >
                 <i class="fa-fw fa-lg fas fa-edit"></i>
-              <% end %>
+              </.link>
 
-              <%= link to: "#",
-                    class: "text-primary-600 link",
-                    phx_click: "delete_shot_group",
-                    phx_value_id: shot_group.id,
-                    data: [
-                      confirm: dgettext("prompts", "Are you sure you want to delete this shot record?"),
-                      qa: "delete-#{shot_group.id}"
-                    ] do %>
+              <.link
+                href="#"
+                class="text-primary-600 link"
+                phx-click="delete_shot_group"
+                phx-value-id={@shot_group.id}
+                data-confirm={dgettext("prompts", "Are you sure you want to delete this shot record?")}
+                data-qa={"delete-#{@shot_group.id}"}
+              >
                 <i class="fa-fw fa-lg fas fa-trash"></i>
-              <% end %>
+              </.link>
             </div>
             """
 
           key ->
-            shot_group |> Map.get(key |> String.to_existing_atom())
+            shot_group |> Map.get(key)
         end
 
       {key, value}

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

@@ -52,27 +52,31 @@
 
   <div class="flex flex-col justify-center items-center">
     <div class="flex flex-wrap justify-center items-center text-primary-600">
-      <%= live_patch(dgettext("actions", "Ammo Details"),
-        to: Routes.ammo_type_show_path(Endpoint, :show, @ammo_group.ammo_type),
-        class: "mx-4 my-2 btn btn-primary",
-        data: [qa: "details"]
-      ) %>
+      <.link
+        patch={Routes.ammo_type_show_path(Endpoint, :show, @ammo_group.ammo_type)}
+        class="mx-4 my-2 btn btn-primary"
+        data-qa="details"
+      >
+        <%= dgettext("actions", "View in Catalog") %>
+      </.link>
 
-      <%= live_patch to: Routes.ammo_group_show_path(Endpoint, :edit, @ammo_group),
-                 class: "mx-4 my-2 text-primary-600 link",
-                 data: [qa: "edit"] do %>
+      <.link
+        patch={Routes.ammo_group_show_path(Endpoint, :edit, @ammo_group)}
+        class="mx-4 my-2 text-primary-600 link"
+        data-qa="edit"
+      >
         <i class="fa-fw fa-lg fas fa-edit"></i>
-      <% end %>
+      </.link>
 
-      <%= link to: "#",
-           class: "mx-4 my-2 text-primary-600 link",
-           phx_click: "delete",
-           data: [
-             confirm: dgettext("prompts", "Are you sure you want to delete this ammo?"),
-             qa: "delete"
-           ] do %>
+      <.link
+        href="#"
+        class="mx-4 my-2 text-primary-600 link"
+        phx-click="delete"
+        data-confirm={dgettext("prompts", "Are you sure you want to delete this ammo?")}
+        data-qa="delete"
+      >
         <i class="fa-fw fa-lg fas fa-trash"></i>
-      <% end %>
+      </.link>
     </div>
 
     <div class="flex flex-wrap justify-center items-center text-primary-600">
@@ -82,16 +86,20 @@
           else: gettext("Stage for range") %>
       </button>
 
-      <%= live_patch(dgettext("actions", "Move containers"),
-        to: Routes.ammo_group_show_path(Endpoint, :move, @ammo_group),
-        class: "btn btn-primary",
-        data: [qa: "move"]
-      ) %>
+      <.link
+        patch={Routes.ammo_group_show_path(Endpoint, :move, @ammo_group)}
+        class="btn btn-primary"
+        data-qa="move"
+      >
+        <%= dgettext("actions", "Move containers") %>
+      </.link>
 
-      <%= live_patch(dgettext("actions", "Record shots"),
-        to: Routes.ammo_group_show_path(Endpoint, :add_shot_group, @ammo_group),
-        class: "mx-4 my-2 btn btn-primary"
-      ) %>
+      <.link
+        patch={Routes.ammo_group_show_path(Endpoint, :add_shot_group, @ammo_group)}
+        class="mx-4 my-2 btn btn-primary"
+      >
+        <%= dgettext("actions", "Record shots") %>
+      </.link>
     </div>
   </div>
 
@@ -105,7 +113,7 @@
 
       <.container_card container={@ammo_group.container} />
     <% else %>
-      <%= gettext("This ammo group is not in a container") %>
+      <%= gettext("This ammo is not in a container") %>
     <% end %>
   </div>
 

lib/cannery_web/live/ammo_type_live/form_component.ex

@@ -13,17 +13,13 @@ defmodule CanneryWeb.AmmoTypeLive.FormComponent do
           %{:ammo_type => AmmoType.t(), :current_user => User.t(), optional(any) => any},
           Socket.t()
         ) :: {:ok, Socket.t()}
-  def update(%{ammo_type: ammo_type, current_user: _current_user} = assigns, socket) do
-    {:ok, socket |> assign(assigns) |> assign(:changeset, Ammo.change_ammo_type(ammo_type))}
+  def update(%{current_user: _current_user} = assigns, socket) do
+    {:ok, socket |> assign(assigns) |> assign_changeset(%{})}
   end
 
   @impl true
-  def handle_event(
-        "validate",
-        %{"ammo_type" => ammo_type_params},
-        %{assigns: %{ammo_type: ammo_type}} = socket
-      ) do
-    {:noreply, socket |> assign(:changeset, ammo_type |> Ammo.change_ammo_type(ammo_type_params))}
+  def handle_event("validate", %{"ammo_type" => ammo_type_params}, socket) do
+    {:noreply, socket |> assign_changeset(ammo_type_params)}
   end
 
   def handle_event(
@@ -34,6 +30,31 @@ defmodule CanneryWeb.AmmoTypeLive.FormComponent do
     save_ammo_type(socket, action, ammo_type_params)
   end
 
+  defp assign_changeset(
+         %{assigns: %{action: action, ammo_type: ammo_type, current_user: user}} = socket,
+         ammo_type_params
+       ) do
+    changeset_action =
+      case action do
+        :new -> :insert
+        :edit -> :update
+      end
+
+    changeset =
+      case action do
+        :new -> ammo_type |> AmmoType.create_changeset(user, ammo_type_params)
+        :edit -> ammo_type |> AmmoType.update_changeset(ammo_type_params)
+      end
+
+    changeset =
+      case changeset |> Changeset.apply_action(changeset_action) do
+        {:ok, _data} -> changeset
+        {:error, changeset} -> changeset
+      end
+
+    socket |> assign(changeset: changeset)
+  end
+
   defp save_ammo_type(
          %{assigns: %{ammo_type: ammo_type, current_user: current_user, return_to: return_to}} =
            socket,
@@ -44,7 +65,7 @@ defmodule CanneryWeb.AmmoTypeLive.FormComponent do
       case Ammo.update_ammo_type(ammo_type, ammo_type_params, current_user) do
         {:ok, %{name: ammo_type_name}} ->
           prompt = dgettext("prompts", "%{name} updated successfully", name: ammo_type_name)
-          socket |> put_flash(:info, prompt) |> push_redirect(to: return_to)
+          socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
 
         {:error, %Changeset{} = changeset} ->
           socket |> assign(:changeset, changeset)
@@ -62,7 +83,7 @@ defmodule CanneryWeb.AmmoTypeLive.FormComponent do
       case Ammo.create_ammo_type(ammo_type_params, current_user) do
         {:ok, %{name: ammo_type_name}} ->
           prompt = dgettext("prompts", "%{name} created successfully", name: ammo_type_name)
-          socket |> put_flash(:info, prompt) |> push_redirect(to: return_to)
+          socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
 
         {:error, %Changeset{} = changeset} ->
           socket |> assign(changeset: changeset)

lib/cannery_web/live/ammo_type_live/form_component.html.heex

@@ -3,7 +3,7 @@
     <%= @title %>
   </h2>
   <.form
-    let={f}
+    :let={f}
     for={@changeset}
     id="ammo_type-form"
     phx-target={@myself}

lib/cannery_web/live/ammo_type_live/index.ex

@@ -48,29 +48,29 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
 
     columns =
       [
-        %{label: gettext("Name"), key: "name", type: :string},
-        %{label: gettext("Bullet type"), key: "bullet_type", type: :string},
-        %{label: gettext("Bullet core"), key: "bullet_core", type: :string},
-        %{label: gettext("Cartridge"), key: "cartridge", type: :string},
-        %{label: gettext("Caliber"), key: "caliber", type: :string},
-        %{label: gettext("Case material"), key: "case_material", type: :string},
-        %{label: gettext("Jacket type"), key: "jacket_type", type: :string},
-        %{label: gettext("Muzzle velocity"), key: "muzzle_velocity", type: :string},
-        %{label: gettext("Powder type"), key: "powder_type", type: :string},
+        %{label: gettext("Name"), key: :name, type: :name},
+        %{label: gettext("Bullet type"), key: :bullet_type, type: :string},
+        %{label: gettext("Bullet core"), key: :bullet_core, type: :string},
+        %{label: gettext("Cartridge"), key: :cartridge, type: :string},
+        %{label: gettext("Caliber"), key: :caliber, type: :string},
+        %{label: gettext("Case material"), key: :case_material, type: :string},
+        %{label: gettext("Jacket type"), key: :jacket_type, type: :string},
+        %{label: gettext("Muzzle velocity"), key: :muzzle_velocity, type: :string},
+        %{label: gettext("Powder type"), key: :powder_type, type: :string},
         %{
           label: gettext("Powder grains per charge"),
-          key: "powder_grains_per_charge",
+          key: :powder_grains_per_charge,
           type: :string
         },
-        %{label: gettext("Grains"), key: "grains", type: :string},
-        %{label: gettext("Pressure"), key: "pressure", type: :string},
-        %{label: gettext("Primer type"), key: "primer_type", type: :string},
-        %{label: gettext("Firing type"), key: "firing_type", type: :string},
-        %{label: gettext("Tracer"), key: "tracer", type: :boolean},
-        %{label: gettext("Incendiary"), key: "incendiary", type: :boolean},
-        %{label: gettext("Blank"), key: "blank", type: :boolean},
-        %{label: gettext("Corrosive"), key: "corrosive", type: :boolean},
-        %{label: gettext("Manufacturer"), key: "manufacturer", type: :string},
+        %{label: gettext("Grains"), key: :grains, type: :string},
+        %{label: gettext("Pressure"), key: :pressure, type: :string},
+        %{label: gettext("Primer type"), key: :primer_type, type: :string},
+        %{label: gettext("Firing type"), key: :firing_type, type: :string},
+        %{label: gettext("Tracer"), key: :tracer, type: :boolean},
+        %{label: gettext("Incendiary"), key: :incendiary, type: :boolean},
+        %{label: gettext("Blank"), key: :blank, type: :boolean},
+        %{label: gettext("Corrosive"), key: :corrosive, type: :boolean},
+        %{label: gettext("Manufacturer"), key: :manufacturer, type: :string},
         %{label: gettext("UPC"), key: "upc", type: :string}
       ]
       |> Enum.filter(fn %{key: key, type: type} ->
@@ -79,12 +79,13 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
 
         ammo_types
         |> Enum.any?(fn ammo_type ->
-          not (ammo_type |> Map.get(key |> String.to_existing_atom()) == default_value)
+          not (ammo_type |> Map.get(key) == default_value)
         end)
       end)
       |> Kernel.++([
-        %{label: gettext("Total # of rounds"), key: "round_count", type: :round_count},
-        %{label: gettext("Average Price paid"), key: "avg_price_paid", type: :avg_price_paid},
+        %{label: gettext("Total # of rounds"), key: :round_count, type: :round_count},
+        %{label: gettext("Total # of ammo"), key: :ammo_count, type: :ammo_count},
+        %{label: gettext("Average Price paid"), key: :avg_price_paid, type: :avg_price_paid},
         %{label: nil, key: "actions", type: :actions, sortable: false}
       ])
 
@@ -103,11 +104,14 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
   end
 
   defp get_ammo_type_value(:boolean, key, ammo_type, _current_user),
-    do: ammo_type |> Map.get(key |> String.to_existing_atom()) |> humanize()
+    do: ammo_type |> Map.get(key) |> humanize()
 
   defp get_ammo_type_value(:round_count, _key, ammo_type, current_user),
     do: ammo_type |> Ammo.get_round_count_for_ammo_type(current_user)
 
+  defp get_ammo_type_value(:ammo_count, _key, ammo_type, current_user),
+    do: ammo_type |> Ammo.get_ammo_groups_count_for_type(current_user)
+
   defp get_ammo_type_value(:avg_price_paid, _key, ammo_type, current_user) do
     case ammo_type |> Ammo.get_average_cost_for_ammo_type!(current_user) do
       nil -> gettext("No cost information")
@@ -115,39 +119,62 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
     end
   end
 
+  defp get_ammo_type_value(:name, _key, ammo_type, _current_user) do
+    assigns = %{ammo_type: ammo_type}
+
+    ~H"""
+    <.link
+      patch={Routes.ammo_type_show_path(Endpoint, :show, @ammo_type)}
+      class="link"
+      data-qa={"view-name-#{@ammo_type.id}"}
+    >
+      <%= @ammo_type.name %>
+    </.link>
+    """
+  end
+
   defp get_ammo_type_value(:actions, _key, ammo_type, _current_user) do
     assigns = %{ammo_type: ammo_type}
 
     ~H"""
     <div class="px-4 py-2 space-x-4 flex justify-center items-center">
-      <%= live_redirect to: Routes.ammo_type_show_path(Endpoint, :show, ammo_type),
-                    class: "text-primary-600 link",
-                    data: [qa: "view-#{ammo_type.id}"] do %>
+      <.link
+        patch={Routes.ammo_type_show_path(Endpoint, :show, @ammo_type)}
+        class="text-primary-600 link"
+        data-qa={"view-#{@ammo_type.id}"}
+      >
         <i class="fa-fw fa-lg fas fa-eye"></i>
-      <% end %>
+      </.link>
 
-      <%= live_patch to: Routes.ammo_type_index_path(Endpoint, :edit, ammo_type),
-                  class: "text-primary-600 link",
-                  data: [qa: "edit-#{ammo_type.id}"] do %>
+      <.link
+        patch={Routes.ammo_type_index_path(Endpoint, :edit, @ammo_type)}
+        class="text-primary-600 link"
+        data-qa={"edit-#{@ammo_type.id}"}
+      >
         <i class="fa-fw fa-lg fas fa-edit"></i>
-      <% end %>
+      </.link>
 
-      <%= link to: "#",
-            class: "text-primary-600 link",
-            phx_click: "delete",
-            phx_value_id: ammo_type.id,
-            data: [
-              confirm: dgettext("prompts", "Are you sure you want to delete this ammo?"),
-              qa: "delete-#{ammo_type.id}"
-            ] do %>
+      <.link
+        href="#"
+        class="text-primary-600 link"
+        phx-click="delete"
+        phx-value-id={@ammo_type.id}
+        data-confirm={
+          dgettext(
+            "prompts",
+            "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!",
+            name: @ammo_type.name
+          )
+        }
+        data-qa={"delete-#{@ammo_type.id}"}
+      >
         <i class="fa-lg fas fa-trash"></i>
-      <% end %>
+      </.link>
     </div>
     """
   end
 
   defp get_ammo_type_value(nil, _key, _ammo_type, _current_user), do: nil
 
-  defp get_ammo_type_value(_other, key, ammo_type, _current_user),
-    do: ammo_type |> Map.get(key |> String.to_existing_atom())
+  defp get_ammo_type_value(_other, key, ammo_type, _current_user), do: ammo_type |> Map.get(key)
 end

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

@@ -1,6 +1,6 @@
 <div class="flex flex-col space-y-8 justify-center items-center">
   <h1 class="title text-2xl title-primary-500">
-    <%= gettext("Ammo Types") %>
+    <%= gettext("Catalog") %>
   </h1>
 
   <%= if @rows |> Enum.empty?() do %>
@@ -9,15 +9,13 @@
       <%= display_emoji("😔") %>
     </h2>
 
-    <%= live_patch(dgettext("actions", "Add your first type!"),
-      to: Routes.ammo_type_index_path(Endpoint, :new),
-      class: "btn btn-primary"
-    ) %>
+    <.link patch={Routes.ammo_type_index_path(Endpoint, :new)} class="btn btn-primary">
+      <%= dgettext("actions", "Add your first type!") %>
+    </.link>
   <% else %>
-    <%= live_patch(dgettext("actions", "New Ammo type"),
-      to: Routes.ammo_type_index_path(Endpoint, :new),
-      class: "btn btn-primary"
-    ) %>
+    <.link patch={Routes.ammo_type_index_path(Endpoint, :new)} class="btn btn-primary">
+      <%= dgettext("actions", "New Ammo type") %>
+    </.link>
 
     <.live_component
       module={CanneryWeb.Components.TableComponent}

lib/cannery_web/live/ammo_type_live/show.ex

@@ -9,22 +9,12 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
   alias CanneryWeb.Endpoint
 
   @impl true
-  def mount(_params, _session, socket), do: {:ok, socket}
+  def mount(_params, _session, socket), do: {:ok, socket |> assign(show_used: false)}
 
   @impl true
   def handle_params(%{"id" => id}, _params, %{assigns: %{current_user: current_user}} = socket) do
     ammo_type = Ammo.get_ammo_type!(id, current_user)
-
-    socket =
-      socket
-      |> assign(
-        page_title: page_title(socket.assigns.live_action),
-        ammo_type: ammo_type,
-        ammo_groups: ammo_type |> Ammo.list_ammo_groups_for_type(current_user),
-        avg_cost_per_round: ammo_type |> Ammo.get_average_cost_for_ammo_type!(current_user)
-      )
-
-    {:noreply, socket}
+    {:noreply, socket |> display_ammo_type(ammo_type)}
   end
 
   @impl true
@@ -38,7 +28,35 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
     prompt = dgettext("prompts", "%{name} deleted succesfully", name: ammo_type_name)
     redirect_to = Routes.ammo_type_index_path(socket, :index)
 
-    {:noreply, socket |> put_flash(:info, prompt) |> push_redirect(to: redirect_to)}
+    {:noreply, socket |> put_flash(:info, prompt) |> push_navigate(to: redirect_to)}
+  end
+
+  @impl true
+  def handle_event("toggle_show_used", _params, %{assigns: %{show_used: show_used}} = socket) do
+    {:noreply, socket |> assign(:show_used, !show_used) |> display_ammo_type()}
+  end
+
+  defp display_ammo_type(
+         %{
+           assigns: %{
+             live_action: live_action,
+             current_user: current_user,
+             show_used: show_used
+           }
+         } = socket,
+         ammo_type
+       ) do
+    socket
+    |> assign(
+      page_title: page_title(live_action),
+      ammo_type: ammo_type,
+      ammo_groups: ammo_type |> Ammo.list_ammo_groups_for_type(current_user, show_used),
+      avg_cost_per_round: ammo_type |> Ammo.get_average_cost_for_ammo_type!(current_user)
+    )
+  end
+
+  defp display_ammo_type(%{assigns: %{ammo_type: ammo_type}} = socket) do
+    socket |> display_ammo_type(ammo_type)
   end
 
   defp page_title(:show), do: gettext("Show Ammo type")

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

@@ -1,5 +1,4 @@
-<div class="mx-auto px-4 sm:px-8 space-y-4 max-w-3xl
-  flex flex-col justify-center items-center">
+<div class="space-y-4 flex flex-col justify-center items-center">
   <h1 class="title text-2xl title-primary-500">
     <%= @ammo_type.name %>
   </h1>
@@ -13,22 +12,29 @@
   <% end %>
 
   <div class="flex space-x-4 justify-center items-center text-primary-600">
-    <%= live_patch to: Routes.ammo_type_show_path(Endpoint, :edit, @ammo_type),
-               class: "text-primary-600 link",
-               data: [qa: "edit"] do %>
+    <.link
+      patch={Routes.ammo_type_show_path(Endpoint, :edit, @ammo_type)}
+      class="text-primary-600 link"
+      data-qa="edit"
+    >
       <i class="fa-fw fa-lg fas fa-edit"></i>
-    <% end %>
+    </.link>
 
-    <%= link to: "#",
-         class: "text-primary-600 link",
-         phx_click: "delete",
-         data: [
-           confirm:
-             dgettext("prompts", "Are you sure you want to delete %{name}?", name: @ammo_type.name),
-           qa: "delete"
-         ] do %>
+    <.link
+      href="#"
+      class="text-primary-600 link"
+      phx-click="delete"
+      data-confirm={
+        dgettext(
+          "prompts",
+          "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!",
+          name: @ammo_type.name
+        )
+      }
+      data-qa="delete"
+    >
       <i class="fa-fw fa-lg fas fa-trash"></i>
-    <% end %>
+    </.link>
   </div>
 
   <hr class="hr" />
@@ -114,6 +120,14 @@
 
   <hr class="hr" />
 
+  <div class="flex flex-col justify-center items-center">
+    <.toggle_button action="toggle_show_used" value={@show_used}>
+      <span class="title text-lg text-primary-600">
+        <%= gettext("Show used") %>
+      </span>
+    </.toggle_button>
+  </div>
+
   <div>
     <%= if @ammo_groups |> Enum.empty?() do %>
       <h2 class="mx-8 my-4 title text-lg text-primary-600">
@@ -123,7 +137,7 @@
     <% else %>
       <div class="flex flex-wrap justify-center items-center">
         <%= for ammo_group <- @ammo_groups do %>
-          <.ammo_group_card ammo_group={ammo_group} />
+          <.ammo_group_card ammo_group={ammo_group} show_container={true} />
         <% end %>
       </div>
     <% end %>

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

@@ -5,24 +5,25 @@
 
   <div class="flex flex-wrap justify-center items-center">
     <%= for tag <- @container.tags do %>
-      <%= link to: "#",
-            class: "mx-2 my-1 px-4 py-2 rounded-lg title text-xl",
-            style: "color: #{tag.text_color}; background-color: #{tag.bg_color}",
-            phx_click: "delete",
-            phx_value_tag_id: tag.id,
-            phx_target: @myself,
-            data: [
-              confirm:
-                dgettext(
-                  "prompts",
-                  "Are you sure you want to remove the %{tag_name} tag from %{container_name}?",
-                  tag_name: tag.name,
-                  container_name: @container.name
-                )
-            ] do %>
+      <.link
+        href="#"
+        class="mx-2 my-1 px-4 py-2 rounded-lg title text-xl"
+        style={"color: #{tag.text_color}; background-color: #{tag.bg_color}"}
+        phx-click="delete"
+        phx-value-tag-id={tag.id}
+        phx-target={@myself}
+        data-confirm={
+          dgettext(
+            "prompts",
+            "Are you sure you want to remove the %{tag_name} tag from %{container_name}?",
+            tag_name: tag.name,
+            container_name: @container.name
+          )
+        }
+      >
         <%= tag.name %>
         <i class="fa-fw fa-sm fas fa-trash"></i>
-      <% end %>
+      </.link>
     <% end %>
 
     <%= if @container.tags |> Enum.empty?() do %>
@@ -37,7 +38,7 @@
     <hr class="hr" />
 
     <.form
-      let={f}
+      :let={f}
       for={:tag}
       id="add-tag-to-container-form"
       class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"

lib/cannery_web/live/container_live/form_component.ex

@@ -13,18 +13,13 @@ defmodule CanneryWeb.ContainerLive.FormComponent do
           %{:container => Container.t(), :current_user => User.t(), optional(any) => any},
           Socket.t()
         ) :: {:ok, Socket.t()}
-  def update(%{container: container} = assigns, socket) do
-    {:ok, socket |> assign(assigns) |> assign(:changeset, Containers.change_container(container))}
+  def update(%{container: _container} = assigns, socket) do
+    {:ok, socket |> assign(assigns) |> assign_changeset(%{})}
   end
 
   @impl true
-  def handle_event(
-        "validate",
-        %{"container" => container_params},
-        %{assigns: %{container: container}} = socket
-      ) do
-    changeset = container |> Containers.change_container(container_params)
-    {:noreply, socket |> assign(:changeset, changeset)}
+  def handle_event("validate", %{"container" => container_params}, socket) do
+    {:noreply, socket |> assign_changeset(container_params)}
   end
 
   def handle_event(
@@ -35,6 +30,31 @@ defmodule CanneryWeb.ContainerLive.FormComponent do
     save_container(socket, action, container_params)
   end
 
+  defp assign_changeset(
+         %{assigns: %{action: action, container: container, current_user: user}} = socket,
+         container_params
+       ) do
+    changeset_action =
+      case action do
+        :new -> :insert
+        :edit -> :update
+      end
+
+    changeset =
+      case action do
+        :new -> container |> Container.create_changeset(user, container_params)
+        :edit -> container |> Container.update_changeset(container_params)
+      end
+
+    changeset =
+      case changeset |> Changeset.apply_action(changeset_action) do
+        {:ok, _data} -> changeset
+        {:error, changeset} -> changeset
+      end
+
+    socket |> assign(:changeset, changeset)
+  end
+
   defp save_container(
          %{assigns: %{container: container, current_user: current_user, return_to: return_to}} =
            socket,
@@ -45,7 +65,7 @@ defmodule CanneryWeb.ContainerLive.FormComponent do
       case Containers.update_container(container, current_user, container_params) do
         {:ok, %{name: container_name}} ->
           prompt = dgettext("prompts", "%{name} updated successfully", name: container_name)
-          socket |> put_flash(:info, prompt) |> push_redirect(to: return_to)
+          socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
 
         {:error, %Changeset{} = changeset} ->
           socket |> assign(:changeset, changeset)
@@ -63,7 +83,7 @@ defmodule CanneryWeb.ContainerLive.FormComponent do
       case Containers.create_container(container_params, current_user) do
         {:ok, %{name: container_name}} ->
           prompt = dgettext("prompts", "%{name} created successfully", name: container_name)
-          socket |> put_flash(:info, prompt) |> push_redirect(to: return_to)
+          socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
 
         {:error, %Changeset{} = changeset} ->
           socket |> assign(changeset: changeset)

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

@@ -3,7 +3,7 @@
     <%= @title %>
   </h2>
   <.form
-    let={f}
+    :let={f}
     for={@changeset}
     id="container-form"
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"

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

@@ -9,15 +9,13 @@
       <%= display_emoji("😔") %>
     </h2>
 
-    <%= live_patch(dgettext("actions", "Add your first container!"),
-      to: Routes.container_index_path(Endpoint, :new),
-      class: "btn btn-primary"
-    ) %>
+    <.link patch={Routes.container_index_path(Endpoint, :new)} class="btn btn-primary">
+      <%= dgettext("actions", "Add your first container!") %>
+    </.link>
   <% else %>
-    <%= live_patch(dgettext("actions", "New Container"),
-      to: Routes.container_index_path(Endpoint, :new),
-      class: "btn btn-primary"
-    ) %>
+    <.link patch={Routes.container_index_path(Endpoint, :new)} class="btn btn-primary">
+      <%= dgettext("actions", "New Container") %>
+    </.link>
   <% end %>
 
   <div class="max-w-full flex flex-row flex-wrap justify-center items-center">
@@ -25,29 +23,34 @@
       <.container_card container={container}>
         <:tag_actions>
           <div class="mx-4 my-2">
-            <%= live_patch to: Routes.container_index_path(Endpoint, :edit_tags, container),
-              class: "text-primary-600 link" do %>
+            <.link
+              patch={Routes.container_index_path(Endpoint, :edit_tags, container)}
+              class="text-primary-600 link"
+            >
               <i class="fa-fw fa-lg fas fa-tags"></i>
-            <% end %>
+            </.link>
           </div>
         </:tag_actions>
-        <%= live_patch to: Routes.container_index_path(Endpoint, :edit, container),
-                   class: "text-primary-600 link",
-                   data: [qa: "edit-#{container.id}"] do %>
+        <.link
+          patch={Routes.container_index_path(Endpoint, :edit, container)}
+          class="text-primary-600 link"
+          data-qa={"edit-#{container.id}"}
+        >
           <i class="fa-fw fa-lg fas fa-edit"></i>
-        <% end %>
+        </.link>
 
-        <%= link to: "#",
-             class: "text-primary-600 link",
-             phx_click: "delete",
-             phx_value_id: container.id,
-             data: [
-               confirm:
-                 dgettext("prompts", "Are you sure you want to delete %{name}?", name: container.name),
-               qa: "delete-#{container.id}"
-             ] do %>
+        <.link
+          href="#"
+          class="text-primary-600 link"
+          phx-click="delete"
+          phx-value-id={container.id}
+          data-confirm={
+            dgettext("prompts", "Are you sure you want to delete %{name}?", name: container.name)
+          }
+          data-qa={"delete-#{container.id}"}
+        >
           <i class="fa-fw fa-lg fas fa-trash"></i>
-        <% end %>
+        </.link>
       </.container_card>
     <% end %>
   </div>

lib/cannery_web/live/container_live/show.ex

@@ -5,13 +5,13 @@ defmodule CanneryWeb.ContainerLive.Show do
 
   use CanneryWeb, :live_view
   import CanneryWeb.Components.{AmmoGroupCard, TagCard}
-  alias Cannery.{Accounts.User, Containers, Containers.Container, Repo, Tags}
+  alias Cannery.{Accounts.User, Ammo, Containers, Containers.Container, Repo, Tags}
   alias CanneryWeb.Endpoint
   alias Ecto.Changeset
   alias Phoenix.LiveView.Socket
 
   @impl true
-  def mount(_params, _session, socket), do: {:ok, socket}
+  def mount(_params, _session, socket), do: {:ok, socket |> assign(show_used: false)}
 
   @impl true
   def handle_params(
@@ -39,7 +39,7 @@ defmodule CanneryWeb.ContainerLive.Show do
               container_name: container.name
             )
 
-          socket |> put_flash(:info, prompt) |> render_container(container.id, current_user)
+          socket |> put_flash(:info, prompt) |> render_container()
 
         {:error, error_string} ->
           socket |> put_flash(:error, error_string)
@@ -62,7 +62,7 @@ defmodule CanneryWeb.ContainerLive.Show do
 
           socket
           |> put_flash(:info, prompt)
-          |> push_redirect(to: Routes.container_index_path(socket, :index))
+          |> push_navigate(to: Routes.container_index_path(socket, :index))
 
         {:error, %{action: :delete, errors: [ammo_groups: _error], valid?: false} = changeset} ->
           ammo_groups_error = changeset |> changeset_errors(:ammo_groups) |> Enum.join(", ")
@@ -82,12 +82,23 @@ defmodule CanneryWeb.ContainerLive.Show do
     {:noreply, socket}
   end
 
+  @impl true
+  def handle_event("toggle_show_used", _params, %{assigns: %{show_used: show_used}} = socket) do
+    {:noreply, socket |> assign(:show_used, !show_used) |> render_container()}
+  end
+
   @spec render_container(Socket.t(), Container.id(), User.t()) :: Socket.t()
-  defp render_container(%{assigns: %{live_action: live_action}} = socket, id, current_user) do
+  defp render_container(
+         %{assigns: %{live_action: live_action, show_used: show_used}} = socket,
+         id,
+         current_user
+       ) do
     %{name: container_name} =
       container =
       Containers.get_container!(id, current_user)
-      |> Repo.preload([:ammo_groups, :tags], force: true)
+      |> Repo.preload([:tags], force: true)
+
+    ammo_groups = Ammo.list_ammo_groups_for_container(container, current_user, show_used)
 
     page_title =
       case live_action do
@@ -96,6 +107,13 @@ defmodule CanneryWeb.ContainerLive.Show do
         :edit_tags -> gettext("Edit %{name} tags", name: container_name)
       end
 
-    socket |> assign(container: container, page_title: page_title)
+    socket |> assign(container: container, ammo_groups: ammo_groups, page_title: page_title)
+  end
+
+  @spec render_container(Socket.t()) :: Socket.t()
+  defp render_container(
+         %{assigns: %{container: %{id: container_id}, current_user: current_user}} = socket
+       ) do
+    socket |> render_container(container_id, current_user)
   end
 end

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

@@ -1,4 +1,4 @@
-<div class="mx-auto space-y-4 max-w-3xl flex flex-col justify-center items-center">
+<div class="space-y-4 flex flex-col justify-center items-center">
   <h1 class="title text-2xl title-primary-500">
     <%= @container.name %>
   </h1>
@@ -22,23 +22,38 @@
     </span>
   <% end %>
 
-  <div class="flex space-x-4 justify-center items-center text-primary-600">
-    <%= live_patch to: Routes.container_show_path(Endpoint, :edit, @container),
-               class: "text-primary-600 link",
-               data: [qa: "edit"] do %>
-      <i class="fa-fw fa-lg fas fa-edit"></i>
-    <% end %>
+  <%= unless @ammo_groups |> Enum.empty?() do %>
+    <span class="rounded-lg title text-lg">
+      <%= gettext("Packs:") %>
+      <%= Enum.count(@ammo_groups) %>
+    </span>
 
-    <%= link to: "#",
-         class: "text-primary-600 link",
-         phx_click: "delete_container",
-         data: [
-           confirm:
-             dgettext("prompts", "Are you sure you want to delete %{name}?", name: @container.name),
-           qa: "delete"
-         ] do %>
+    <span class="rounded-lg title text-lg">
+      <%= gettext("Rounds:") %>
+      <%= @container |> Containers.get_container_rounds!() %>
+    </span>
+  <% end %>
+
+  <div class="flex space-x-4 justify-center items-center text-primary-600">
+    <.link
+      patch={Routes.container_show_path(Endpoint, :edit, @container)}
+      class="text-primary-600 link"
+      data-qa="edit"
+    >
+      <i class="fa-fw fa-lg fas fa-edit"></i>
+    </.link>
+
+    <.link
+      href="#"
+      class="text-primary-600 link"
+      phx-click="delete_container"
+      data-confirm={
+        dgettext("prompts", "Are you sure you want to delete %{name}?", name: @container.name)
+      }
+      data-qa="delete"
+    >
       <i class="fa-fw fa-lg fas fa-trash"></i>
-    <% end %>
+    </.link>
   </div>
 
   <hr class="mb-4 hr" />
@@ -50,10 +65,12 @@
         <%= display_emoji("😔") %>
       </h2>
 
-      <%= live_patch(dgettext("actions", "Why not add one?"),
-        to: Routes.container_show_path(Endpoint, :edit_tags, @container),
-        class: "btn btn-primary"
-      ) %>
+      <.link
+        patch={Routes.container_show_path(Endpoint, :edit_tags, @container)}
+        class="btn btn-primary"
+      >
+        <%= dgettext("actions", "Why not add one?") %>
+      </.link>
     </div>
   <% else %>
     <div class="flex flex-wrap justify-center items-center">
@@ -62,24 +79,34 @@
       <% end %>
 
       <div class="mx-4 my-2">
-        <%= live_patch to: Routes.container_show_path(Endpoint, :edit_tags, @container),
-          class: "text-primary-600 link" do %>
+        <.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>
-        <% end %>
+        </.link>
       </div>
     </div>
   <% end %>
 
   <hr class="mb-4 hr" />
 
+  <div class="flex flex-col justify-center items-center">
+    <.toggle_button action="toggle_show_used" value={@show_used}>
+      <span class="title text-lg text-primary-600">
+        <%= gettext("Show used") %>
+      </span>
+    </.toggle_button>
+  </div>
+
   <div>
-    <%= if @container.ammo_groups |> Enum.empty?() do %>
+    <%= if @ammo_groups |> Enum.empty?() do %>
       <h2 class="mx-8 my-4 title text-lg text-primary-600">
-        <%= gettext("No ammo groups in this container") %>
+        <%= gettext("No ammo in this container") %>
       </h2>
     <% else %>
       <div class="flex flex-wrap justify-center items-center">
-        <%= for ammo_group <- @container.ammo_groups do %>
+        <%= for ammo_group <- @ammo_groups do %>
           <.ammo_group_card ammo_group={ammo_group} />
         <% end %>
       </div>

lib/cannery_web/live/home_live.ex

@@ -5,6 +5,7 @@ defmodule CanneryWeb.HomeLive do
 
   use CanneryWeb, :live_view
   alias Cannery.Accounts
+  alias CanneryWeb.Endpoint
 
   @impl true
   def mount(_params, _session, socket) do
@@ -36,6 +37,13 @@ defmodule CanneryWeb.HomeLive do
   def render(assigns) do
     ~H"""
     <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")}
+        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")}
+      />
+
       <h1 class="title text-primary-600 text-2xl">
         <%= gettext("Welcome to %{name}", name: "Cannery") %>
       </h1>
@@ -93,10 +101,12 @@ defmodule CanneryWeb.HomeLive do
           </b>
           <p>
             <%= if @admins |> Enum.empty?() do %>
-              <%= link(dgettext("prompts", "Register to setup %{name}", name: "Cannery"),
-                class: "hover:underline",
-                to: Routes.user_registration_path(CanneryWeb.Endpoint, :new)
-              ) %>
+              <.link
+                href={Routes.user_registration_path(CanneryWeb.Endpoint, :new)}
+                class="hover:underline"
+              >
+                <%= dgettext("prompts", "Register to setup %{name}", name: "Cannery") %>
+              </.link>
             <% else %>
               <div class="flex flex-wrap justify-center space-x-2">
                 <%= for admin <- @admins do %>
@@ -122,13 +132,15 @@ defmodule CanneryWeb.HomeLive do
 
         <li class="flex flex-row justify-center items-center space-x-2">
           <b>Version:</b>
-          <%= link class: "flex flex-row justify-center items-center space-x-2 hover:underline",
-                to: "https://gitea.bubbletea.dev/shibao/cannery/src/branch/stable/CHANGELOG.md",
-                target: "_blank",
-                rel: "noopener noreferrer" do %>
-            <p>0.5.3</p>
+          <.link
+            href="https://gitea.bubbletea.dev/shibao/cannery/src/branch/stable/CHANGELOG.md"
+            class="flex flex-row justify-center items-center space-x-2 hover:underline"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            <p>0.5.5</p>
             <i class="fas fa-md fa-info-circle"></i>
-          <% end %>
+          </.link>
         </li>
       </ul>
 
@@ -140,31 +152,37 @@ defmodule CanneryWeb.HomeLive do
         </h2>
 
         <li class="flex flex-col justify-center space-x-2">
-          <%= link class: "flex flex-row justify-center items-center space-x-2 hover:underline",
-                to: "https://gitea.bubbletea.dev/shibao/cannery",
-                target: "_blank",
-                rel: "noopener noreferrer" do %>
+          <.link
+            class="flex flex-row justify-center items-center space-x-2 hover:underline"
+            href="https://gitea.bubbletea.dev/shibao/cannery"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
             <p><%= gettext("View the source code") %></p>
             <i class="fas fa-md fa-code"></i>
-          <% end %>
+          </.link>
         </li>
         <li class="flex flex-col justify-center space-x-2">
-          <%= link class: "flex flex-row justify-center items-center space-x-2 hover:underline",
-              to: "https://weblate.bubbletea.dev/engage/cannery",
-              target: "_blank",
-              rel: "noopener noreferrer" do %>
+          <.link
+            class="flex flex-row justify-center items-center space-x-2 hover:underline"
+            href="https://weblate.bubbletea.dev/engage/cannery"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
             <p><%= gettext("Help translate") %></p>
             <i class="fas fa-md fa-language"></i>
-          <% end %>
+          </.link>
         </li>
         <li class="flex flex-col justify-center space-x-2">
-          <%= link class: "flex flex-row justify-center items-center space-x-2 hover:underline",
-              to: "https://gitea.bubbletea.dev/shibao/cannery/issues/new",
-              target: "_blank",
-              rel: "noopener noreferrer" do %>
+          <.link
+            class="flex flex-row justify-center items-center space-x-2 hover:underline"
+            href="https://gitea.bubbletea.dev/shibao/cannery/issues/new"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
             <p><%= gettext("Report bugs or request features") %></p>
             <i class="fas fa-md fa-spider"></i>
-          <% end %>
+          </.link>
         </li>
       </ul>
     </div>

lib/cannery_web/live/init_assigns.ex

@@ -2,7 +2,7 @@ defmodule CanneryWeb.InitAssigns do
   @moduledoc """
   Ensures common `assigns` are applied to all LiveViews attaching this hook.
   """
-  import Phoenix.LiveView
+  import Phoenix.Component
   alias Cannery.Accounts
 
   def on_mount(:default, _params, %{"locale" => locale, "user_token" => user_token}, socket) do

lib/cannery_web/live/invite_live/form_component.ex

@@ -13,23 +13,44 @@ defmodule CanneryWeb.InviteLive.FormComponent do
           %{:invite => Invite.t(), :current_user => User.t(), optional(any) => any},
           Socket.t()
         ) :: {:ok, Socket.t()}
-  def update(%{invite: invite} = assigns, socket) do
-    {:ok, socket |> assign(assigns) |> assign(:changeset, Invites.change_invite(invite))}
+  def update(%{invite: _invite} = assigns, socket) do
+    {:ok, socket |> assign(assigns) |> assign_changeset(%{})}
   end
 
   @impl true
-  def handle_event(
-        "validate",
-        %{"invite" => invite_params},
-        %{assigns: %{invite: invite}} = socket
-      ) do
-    {:noreply, socket |> assign(:changeset, invite |> Invites.change_invite(invite_params))}
+  def handle_event("validate", %{"invite" => invite_params}, socket) do
+    {:noreply, socket |> assign_changeset(invite_params)}
   end
 
   def handle_event("save", %{"invite" => invite_params}, %{assigns: %{action: action}} = socket) do
     save_invite(socket, action, invite_params)
   end
 
+  defp assign_changeset(
+         %{assigns: %{action: action, current_user: user, invite: invite}} = socket,
+         invite_params
+       ) do
+    changeset_action =
+      case action do
+        :new -> :insert
+        :edit -> :update
+      end
+
+    changeset =
+      case action do
+        :new -> invite |> Invite.create_changeset(user, "example_token", invite_params)
+        :edit -> invite |> Invite.update_changeset(invite_params)
+      end
+
+    changeset =
+      case changeset |> Changeset.apply_action(changeset_action) do
+        {:ok, _data} -> changeset
+        {:error, changeset} -> changeset
+      end
+
+    socket |> assign(:changeset, changeset)
+  end
+
   defp save_invite(
          %{assigns: %{current_user: current_user, invite: invite, return_to: return_to}} = socket,
          :edit,
@@ -39,7 +60,7 @@ defmodule CanneryWeb.InviteLive.FormComponent do
       case invite |> Invites.update_invite(invite_params, current_user) do
         {:ok, %{name: invite_name}} ->
           prompt = dgettext("prompts", "%{name} updated successfully", name: invite_name)
-          socket |> put_flash(:info, prompt) |> push_redirect(to: return_to)
+          socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
 
         {:error, %Changeset{} = changeset} ->
           socket |> assign(:changeset, changeset)
@@ -57,7 +78,7 @@ defmodule CanneryWeb.InviteLive.FormComponent do
       case current_user |> Invites.create_invite(invite_params) do
         {:ok, %{name: invite_name}} ->
           prompt = dgettext("prompts", "%{name} created successfully", name: invite_name)
-          socket |> put_flash(:info, prompt) |> push_redirect(to: return_to)
+          socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
 
         {:error, %Changeset{} = changeset} ->
           socket |> assign(changeset: changeset)

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

@@ -3,7 +3,7 @@
     <%= @title %>
   </h2>
   <.form
-    let={f}
+    :let={f}
     for={@changeset}
     id="invite-form"
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
@@ -24,6 +24,9 @@
     <%= label(f, :uses_left, gettext("Uses left"), class: "title text-lg text-primary-600") %>
     <%= number_input(f, :uses_left, min: 0, class: "input input-primary col-span-2") %>
     <%= error_tag(f, :uses_left, "col-span-3") %>
+    <span class="col-span-3 text-primary-400 italic text-center">
+      <%= gettext("Leave \"Uses left\" blank to make invite unlimited") %>
+    </span>
 
     <%= submit(dgettext("actions", "Save"),
       class: "mx-auto btn btn-primary col-span-3",

lib/cannery_web/live/invite_live/index.ex

@@ -17,7 +17,7 @@ defmodule CanneryWeb.InviteLive.Index do
       else
         prompt = dgettext("errors", "You are not authorized to view this page")
         return_to = Routes.live_path(Endpoint, HomeLive)
-        socket |> put_flash(:error, prompt) |> push_redirect(to: return_to)
+        socket |> put_flash(:error, prompt) |> push_navigate(to: return_to)
       end
 
     {:ok, socket}

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

@@ -9,15 +9,13 @@
       <%= display_emoji("😔") %>
     </h1>
 
-    <%= live_patch(dgettext("actions", "Invite someone new!"),
-      to: Routes.invite_index_path(Endpoint, :new),
-      class: "btn btn-primary"
-    ) %>
+    <.link patch={Routes.invite_index_path(Endpoint, :new)} class="btn btn-primary">
+      <%= dgettext("actions", "Invite someone new!") %>
+    </.link>
   <% else %>
-    <%= live_patch(dgettext("actions", "Create Invite"),
-      to: Routes.invite_index_path(Endpoint, :new),
-      class: "btn btn-primary"
-    ) %>
+    <.link patch={Routes.invite_index_path(Endpoint, :new)} class="btn btn-primary">
+      <%= dgettext("actions", "Create Invite") %>
+    </.link>
   <% end %>
 
   <div class="w-full flex flex-row flex-wrap justify-center items-center">
@@ -34,25 +32,28 @@
             </button>
           </form>
         </:code_actions>
-        <%= live_patch to: Routes.invite_index_path(Endpoint, :edit, invite),
-                   class: "text-primary-600 link",
-                   data: [qa: "edit-#{invite.id}"] do %>
+        <.link
+          patch={Routes.invite_index_path(Endpoint, :edit, invite)}
+          class="text-primary-600 link"
+          data-qa={"edit-#{invite.id}"}
+        >
           <i class="fa-fw fa-lg fas fa-edit"></i>
-        <% end %>
+        </.link>
 
-        <%= link to: "#",
-             class: "text-primary-600 link",
-             phx_click: "delete_invite",
-             phx_value_id: invite.id,
-             data: [
-               confirm:
-                 dgettext("prompts", "Are you sure you want to delete the invite for %{name}?",
-                   name: invite.name
-                 ),
-               qa: "delete-#{invite.id}"
-             ] do %>
+        <.link
+          href="#"
+          class="text-primary-600 link"
+          phx-click="delete_invite"
+          phx-value-id={invite.id}
+          data-confirm={
+            dgettext("prompts", "Are you sure you want to delete the invite for %{name}?",
+              name: invite.name
+            )
+          }
+          data-qa={"delete-#{invite.id}"}
+        >
           <i class="fa-fw fa-lg fas fa-trash"></i>
-        <% end %>
+        </.link>
 
         <%= if invite.disabled_at |> is_nil() do %>
           <a href="#" class="btn btn-primary" phx-click="disable_invite" phx-value-id={invite.id}>
@@ -93,20 +94,21 @@
     <div class="w-full flex flex-row flex-wrap justify-center items-center">
       <%= for admin <- @admins do %>
         <.user_card user={admin}>
-          <%= link to: "#",
-               class: "text-primary-600 link",
-               phx_click: "delete_user",
-               phx_value_id: admin.id,
-               data: [
-                 confirm:
-                   dgettext(
-                     "prompts",
-                     "Are you sure you want to delete %{email}? This action is permanent!",
-                     email: admin.email
-                   )
-               ] do %>
+          <.link
+            href="#"
+            class="text-primary-600 link"
+            phx-click="delete_user"
+            phx-value-id={admin.id}
+            data-confirm={
+              dgettext(
+                "prompts",
+                "Are you sure you want to delete %{email}? This action is permanent!",
+                email: admin.email
+              )
+            }
+          >
             <i class="fa-fw fa-lg fas fa-trash"></i>
-          <% end %>
+          </.link>
         </.user_card>
       <% end %>
     </div>
@@ -122,20 +124,21 @@
     <div class="w-full flex flex-row flex-wrap justify-center items-center">
       <%= for user <- @users do %>
         <.user_card user={user}>
-          <%= link to: "#",
-               class: "text-primary-600 link",
-               phx_click: "delete_user",
-               phx_value_id: user.id,
-               data: [
-                 confirm:
-                   dgettext(
-                     "prompts",
-                     "Are you sure you want to delete %{email}? This action is permanent!",
-                     email: user.email
-                   )
-               ] do %>
+          <.link
+            href="#"
+            class="text-primary-600 link"
+            phx-click="delete_user"
+            phx-value-id={user.id}
+            data-confirm={
+              dgettext(
+                "prompts",
+                "Are you sure you want to delete %{email}? This action is permanent!",
+                email: user.email
+              )
+            }
+          >
             <i class="fa-fw fa-lg fas fa-trash"></i>
-          <% end %>
+          </.link>
         </.user_card>
       <% end %>
     </div>

lib/cannery_web/live/live_helpers.ex

@@ -3,7 +3,7 @@ defmodule CanneryWeb.LiveHelpers do
   Contains common helper functions for liveviews
   """
 
-  import Phoenix.LiveView.Helpers
+  import Phoenix.Component
   alias Phoenix.LiveView.JS
 
   @doc """
@@ -27,17 +27,17 @@ defmodule CanneryWeb.LiveHelpers do
   """
   def modal(assigns) do
     ~H"""
-    <%= live_patch to: @return_to,
-      id: "modal-bg",
-      class:
-        "fade-in fixed z-10 left-0 top-0
+    <.link
+      patch={@return_to}
+      id="modal-bg"
+      class="fade-in fixed z-10 left-0 top-0
          w-full h-full overflow-hidden
-         p-8 flex flex-col justify-center items-center cursor-auto",
-      style: "background-color: rgba(0,0,0,0.4);",
-      phx_remove: hide_modal()
-    do %>
+         p-8 flex flex-col justify-center items-center cursor-auto"
+      style="background-color: rgba(0,0,0,0.4);"
+      phx_remove={hide_modal()}
+    >
       <span class="hidden"></span>
-    <% end %>
+    </.link>
 
     <div
       id="modal"
@@ -53,15 +53,16 @@ defmodule CanneryWeb.LiveHelpers do
         flex flex-col justify-start items-center
         bg-white border-2 rounded-lg"
       >
-        <%= live_patch to: @return_to,
-                   id: "close",
-                   class:
-                     "absolute top-8 right-10
+        <.link
+          patch={@return_to}
+          id="close"
+          class="absolute top-8 right-10
                       text-gray-500 hover:text-gray-800
-                      transition-all duration-500 ease-in-out",
-                   phx_remove: hide_modal() do %>
+                      transition-all duration-500 ease-in-out"
+          phx_remove={hide_modal()}
+        >
           <i class="fa-fw fa-lg fas fa-times"></i>
-        <% end %>
+        </.link>
 
         <div class="overflow-x-hidden overflow-y-auto w-full p-8 flex flex-col space-y-4 justify-start items-center">
           <%= render_slot(@inner_block) %>

lib/cannery_web/live/range_live/form_component.ex

@@ -1,6 +1,6 @@
 defmodule CanneryWeb.RangeLive.FormComponent do
   @moduledoc """
-  Livecomponent that can update or create a ShotGroup
+  Livecomponent that can update a ShotGroup
   """
 
   use CanneryWeb, :live_component
@@ -24,7 +24,7 @@ defmodule CanneryWeb.RangeLive.FormComponent do
         } = assigns,
         socket
       ) do
-    changeset = shot_group |> ActivityLog.change_shot_group()
+    changeset = shot_group |> ShotGroup.update_changeset(current_user, %{})
     ammo_group = Ammo.get_ammo_group!(ammo_group_id, current_user)
     {:ok, socket |> assign(assigns) |> assign(ammo_group: ammo_group, changeset: changeset)}
   end
@@ -33,11 +33,11 @@ defmodule CanneryWeb.RangeLive.FormComponent do
   def handle_event(
         "validate",
         %{"shot_group" => shot_group_params},
-        %{assigns: %{shot_group: shot_group}} = socket
+        %{assigns: %{current_user: current_user, shot_group: shot_group}} = socket
       ) do
     changeset =
       shot_group
-      |> ActivityLog.change_shot_group(shot_group_params)
+      |> ShotGroup.update_changeset(current_user, shot_group_params)
       |> Map.put(:action, :validate)
 
     {:noreply, assign(socket, :changeset, changeset)}
@@ -53,7 +53,7 @@ defmodule CanneryWeb.RangeLive.FormComponent do
       case ActivityLog.update_shot_group(shot_group, shot_group_params, current_user) do
         {:ok, _shot_group} ->
           prompt = dgettext("prompts", "Shot records updated successfully")
-          socket |> put_flash(:info, prompt) |> push_redirect(to: return_to)
+          socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
 
         {:error, %Ecto.Changeset{} = changeset} ->
           socket |> assign(:changeset, changeset)

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

@@ -4,7 +4,7 @@
   </h2>
 
   <.form
-    let={f}
+    :let={f}
     for={@changeset}
     id="shot-group-form"
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"

lib/cannery_web/live/range_live/index.ex

@@ -65,7 +65,7 @@ defmodule CanneryWeb.RangeLive.Index do
     {:ok, _ammo_group} =
       ammo_group |> Ammo.update_ammo_group(%{"staged" => !ammo_group.staged}, current_user)
 
-    prompt = dgettext("prompts", "Ammo group unstaged succesfully")
+    prompt = dgettext("prompts", "Ammo unstaged succesfully")
     {:noreply, socket |> put_flash(:info, prompt) |> display_shot_groups()}
   end
 
@@ -77,11 +77,11 @@ defmodule CanneryWeb.RangeLive.Index do
     ammo_groups = Ammo.list_staged_ammo_groups(current_user)
 
     columns = [
-      %{label: gettext("Ammo"), key: "name"},
-      %{label: gettext("Rounds shot"), key: "count"},
-      %{label: gettext("Notes"), key: "notes"},
-      %{label: gettext("Date"), key: "date"},
-      %{label: nil, key: "actions", sortable: false}
+      %{label: gettext("Ammo"), key: :name},
+      %{label: gettext("Rounds shot"), key: :count},
+      %{label: gettext("Notes"), key: :notes},
+      %{label: gettext("Date"), key: :date},
+      %{label: nil, key: :actions, sortable: false}
     ]
 
     rows =
@@ -101,40 +101,43 @@ defmodule CanneryWeb.RangeLive.Index do
     |> Enum.into(%{}, fn %{key: key} ->
       value =
         case key do
-          "name" ->
+          :name ->
             {shot_group.ammo_group.ammo_type.name,
-             live_patch(shot_group.ammo_group.ammo_type.name,
-               to: Routes.ammo_group_show_path(Endpoint, :show, shot_group.ammo_group),
-               class: "link"
-             )}
+             ~H"""
+             <.link patch={Routes.ammo_group_show_path(Endpoint, :show, @shot_group.ammo_group)} class="link">
+               <%= @shot_group.ammo_group.ammo_type.name %>
+             </.link>
+             """}
 
-          "date" ->
+          :date ->
             date |> display_date()
 
-          "actions" ->
+          :actions ->
             ~H"""
             <div class="px-4 py-2 space-x-4 flex justify-center items-center">
-              <%= live_patch to: Routes.range_index_path(Endpoint, :edit, shot_group),
-                          class: "text-primary-600 link",
-                          data: [qa: "edit-#{shot_group.id}"] do %>
+              <.link
+                patch={Routes.range_index_path(Endpoint, :edit, @shot_group)}
+                class="text-primary-600 link"
+                data-qa={"edit-#{@shot_group.id}"}
+              >
                 <i class="fa-fw fa-lg fas fa-edit"></i>
-              <% end %>
+              </.link>
 
-              <%= link to: "#",
-                    class: "text-primary-600 link",
-                    phx_click: "delete",
-                    phx_value_id: shot_group.id,
-                    data: [
-                      confirm: dgettext("prompts", "Are you sure you want to delete this shot record?"),
-                      qa: "delete-#{shot_group.id}"
-                    ] do %>
+              <.link
+                href="#"
+                class="text-primary-600 link"
+                phx-click="delete"
+                phx-value-id={@shot_group.id}
+                data-confirm={dgettext("prompts", "Are you sure you want to delete this shot record?")}
+                data-qa={"delete-#{@shot_group.id}"}
+              >
                 <i class="fa-fw fa-lg fas fa-trash"></i>
-              <% end %>
+              </.link>
             </div>
             """
 
           key ->
-            shot_group |> Map.get(key |> String.to_existing_atom())
+            shot_group |> Map.get(key)
         end
 
       {key, value}

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

@@ -9,15 +9,13 @@
       <%= display_emoji("😔") %>
     </h1>
 
-    <%= live_patch(dgettext("actions", "Why not get some ready to shoot?"),
-      to: Routes.ammo_group_index_path(Endpoint, :index),
-      class: "btn btn-primary"
-    ) %>
+    <.link patch={Routes.ammo_group_index_path(Endpoint, :index)} class="btn btn-primary">
+      <%= dgettext("actions", "Why not get some ready to shoot?") %>
+    </.link>
   <% else %>
-    <%= live_patch(dgettext("actions", "Stage ammo"),
-      to: Routes.ammo_group_index_path(Endpoint, :index),
-      class: "btn btn-primary"
-    ) %>
+    <.link patch={Routes.ammo_group_index_path(Endpoint, :index)} class="btn btn-primary">
+      <%= dgettext("actions", "Stage ammo") %>
+    </.link>
 
     <%= for ammo_group <- @ammo_groups do %>
       <.ammo_group_card ammo_group={ammo_group}>
@@ -33,10 +31,12 @@
             else: gettext("Stage for range") %>
         </button>
 
-        <%= live_patch(dgettext("actions", "Record shots"),
-          to: Routes.range_index_path(Endpoint, :add_shot_group, ammo_group),
-          class: "btn btn-primary"
-        ) %>
+        <.link
+          patch={Routes.range_index_path(Endpoint, :add_shot_group, ammo_group)}
+          class="btn btn-primary"
+        >
+          <%= dgettext("actions", "Record shots") %>
+        </.link>
       </.ammo_group_card>
     <% end %>
   <% end %>

lib/cannery_web/live/tag_live/form_component.ex

@@ -12,19 +12,44 @@ defmodule CanneryWeb.TagLive.FormComponent do
   @impl true
   @spec update(%{:tag => Tag.t(), :current_user => User.t(), optional(any) => any}, Socket.t()) ::
           {:ok, Socket.t()}
-  def update(%{tag: tag} = assigns, socket) do
-    {:ok, socket |> assign(assigns) |> assign(:changeset, Tags.change_tag(tag))}
+  def update(%{tag: _tag} = assigns, socket) do
+    {:ok, socket |> assign(assigns) |> assign_changeset(%{})}
   end
 
   @impl true
-  def handle_event("validate", %{"tag" => tag_params}, %{assigns: %{tag: tag}} = socket) do
-    {:noreply, socket |> assign(:changeset, tag |> Tags.change_tag(tag_params))}
+  def handle_event("validate", %{"tag" => tag_params}, socket) do
+    {:noreply, socket |> assign_changeset(tag_params)}
   end
 
   def handle_event("save", %{"tag" => tag_params}, %{assigns: %{action: action}} = socket) do
     save_tag(socket, action, tag_params)
   end
 
+  defp assign_changeset(
+         %{assigns: %{action: action, current_user: user, tag: tag}} = socket,
+         tag_params
+       ) do
+    changeset_action =
+      case action do
+        :new -> :insert
+        :edit -> :update
+      end
+
+    changeset =
+      case action do
+        :new -> tag |> Tag.create_changeset(user, tag_params)
+        :edit -> tag |> Tag.update_changeset(tag_params)
+      end
+
+    changeset =
+      case changeset |> Changeset.apply_action(changeset_action) do
+        {:ok, _data} -> changeset
+        {:error, changeset} -> changeset
+      end
+
+    socket |> assign(:changeset, changeset)
+  end
+
   @impl true
   def render(assigns) do
     ~H"""
@@ -33,7 +58,7 @@ defmodule CanneryWeb.TagLive.FormComponent do
         <%= @title %>
       </h2>
       <.form
-        let={f}
+        :let={f}
         for={@changeset}
         id="tag-form"
         class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
@@ -81,7 +106,7 @@ defmodule CanneryWeb.TagLive.FormComponent do
       case Tags.update_tag(tag, tag_params, current_user) do
         {:ok, %{name: tag_name}} ->
           prompt = dgettext("prompts", "%{name} updated successfully", name: tag_name)
-          socket |> put_flash(:info, prompt) |> push_redirect(to: return_to)
+          socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
 
         {:error, %Changeset{} = changeset} ->
           socket |> assign(:changeset, changeset)
@@ -99,7 +124,7 @@ defmodule CanneryWeb.TagLive.FormComponent do
       case Tags.create_tag(tag_params, current_user) do
         {:ok, %{name: tag_name}} ->
           prompt = dgettext("prompts", "%{name} created successfully", name: tag_name)
-          socket |> put_flash(:info, prompt) |> push_redirect(to: return_to)
+          socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
 
         {:error, %Changeset{} = changeset} ->
           socket |> assign(changeset: changeset)

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

@@ -11,35 +11,37 @@
       <%= display_emoji("😔") %>
     </h2>
 
-    <%= live_patch(dgettext("actions", "Make your first tag!"),
-      to: Routes.tag_index_path(Endpoint, :new),
-      class: "btn btn-primary"
-    ) %>
+    <.link patch={Routes.tag_index_path(Endpoint, :new)} class="btn btn-primary">
+      <%= dgettext("actions", "Make your first tag!") %>
+    </.link>
   <% else %>
-    <%= live_patch(dgettext("actions", "New Tag"),
-      to: Routes.tag_index_path(Endpoint, :new),
-      class: "btn btn-primary"
-    ) %>
+    <.link patch={Routes.tag_index_path(Endpoint, :new)} class="btn btn-primary">
+      <%= dgettext("actions", "New Tag") %>
+    </.link>
   <% end %>
   <div class="flex flex-row flex-wrap justify-center items-center">
     <%= for tag <- @tags do %>
       <.tag_card tag={tag}>
-        <%= live_patch to: Routes.tag_index_path(Endpoint, :edit, tag),
-                   class: "text-primary-600 link",
-                   data: [qa: "edit-#{tag.id}"] do %>
+        <.link
+          patch={Routes.tag_index_path(Endpoint, :edit, tag)}
+          class="text-primary-600 link"
+          data-qa={"edit-#{tag.id}"}
+        >
           <i class="fa-fw fa-lg fas fa-edit"></i>
-        <% end %>
+        </.link>
 
-        <%= link to: "#",
-             class: "text-primary-600 link",
-             phx_click: "delete",
-             phx_value_id: tag.id,
-             data: [
-               confirm: dgettext("prompts", "Are you sure you want to delete %{name}?", name: tag.name),
-               qa: "delete-#{tag.id}"
-             ] do %>
+        <.link
+          href="#"
+          class="text-primary-600 link"
+          phx-click="delete"
+          phx-value-id={tag.id}
+          data-confirm={
+            dgettext("prompts", "Are you sure you want to delete %{name}?", name: tag.name)
+          }
+          data-qa={"delete-#{tag.id}"}
+        >
           <i class="fa-fw fa-lg fas fa-trash"></i>
-        <% end %>
+        </.link>
       </.tag_card>
     <% end %>
   </div>

lib/cannery_web/router.ex

@@ -11,7 +11,7 @@ defmodule CanneryWeb.Router do
     plug :protect_from_forgery
     plug :put_secure_browser_headers
     plug :fetch_current_user
-    plug :put_user_locale, default: Application.get_env(:gettext, :default_locale, "en_US")
+    plug :put_user_locale, default: Application.compile_env(:gettext, :default_locale, "en_US")
   end
 
   defp put_user_locale(%{assigns: %{current_user: %{locale: locale}}} = conn, default: default) do
@@ -65,12 +65,12 @@ defmodule CanneryWeb.Router do
     live "/tags/new", TagLive.Index, :new
     live "/tags/:id/edit", TagLive.Index, :edit
 
-    live "/ammo_types", AmmoTypeLive.Index, :index
-    live "/ammo_types/new", AmmoTypeLive.Index, :new
-    live "/ammo_types/:id/edit", AmmoTypeLive.Index, :edit
+    live "/catalog", AmmoTypeLive.Index, :index
+    live "/catalog/new", AmmoTypeLive.Index, :new
+    live "/catalog/:id/edit", AmmoTypeLive.Index, :edit
 
-    live "/ammo_types/:id", AmmoTypeLive.Show, :show
-    live "/ammo_types/:id/show/edit", AmmoTypeLive.Show, :edit
+    live "/catalog/:id", AmmoTypeLive.Show, :show
+    live "/catalog/:id/show/edit", AmmoTypeLive.Show, :edit
 
     live "/containers", ContainerLive.Index, :index
     live "/containers/new", ContainerLive.Index, :new
@@ -81,17 +81,17 @@ defmodule CanneryWeb.Router do
     live "/containers/:id/show/edit", ContainerLive.Show, :edit
     live "/containers/:id/show/edit_tags", ContainerLive.Show, :edit_tags
 
-    live "/ammo_groups", AmmoGroupLive.Index, :index
-    live "/ammo_groups/new", AmmoGroupLive.Index, :new
-    live "/ammo_groups/:id/edit", AmmoGroupLive.Index, :edit
-    live "/ammo_groups/:id/add_shot_group", AmmoGroupLive.Index, :add_shot_group
-    live "/ammo_groups/:id/move", AmmoGroupLive.Index, :move
+    live "/ammo", AmmoGroupLive.Index, :index
+    live "/ammo/new", AmmoGroupLive.Index, :new
+    live "/ammo/:id/edit", AmmoGroupLive.Index, :edit
+    live "/ammo/:id/add_shot_group", AmmoGroupLive.Index, :add_shot_group
+    live "/ammo/:id/move", AmmoGroupLive.Index, :move
 
-    live "/ammo_groups/:id", AmmoGroupLive.Show, :show
-    live "/ammo_groups/:id/show/edit", AmmoGroupLive.Show, :edit
-    live "/ammo_groups/:id/show/add_shot_group", AmmoGroupLive.Show, :add_shot_group
-    live "/ammo_groups/:id/show/move", AmmoGroupLive.Show, :move
-    live "/ammo_groups/:id/show/:shot_group_id/edit", AmmoGroupLive.Show, :edit_shot_group
+    live "/ammo/:id", AmmoGroupLive.Show, :show
+    live "/ammo/:id/show/edit", AmmoGroupLive.Show, :edit
+    live "/ammo/:id/show/add_shot_group", AmmoGroupLive.Show, :add_shot_group
+    live "/ammo/:id/show/move", AmmoGroupLive.Show, :move
+    live "/ammo/:id/show/:shot_group_id/edit", AmmoGroupLive.Show, :edit_shot_group
 
     live "/range", RangeLive.Index, :index
     live "/range/:id/edit", RangeLive.Index, :edit

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

@@ -22,7 +22,7 @@
     </div>
   </header>
 
-  <div class="mx-4 sm:mx-8 md:mx-16">
+  <div class="mx-4 sm:mx-8 md:mx-16 flex flex-col justify-center items-stretch">
     <%= @inner_content %>
   </div>
 </main>

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

@@ -5,8 +5,14 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <%= csrf_meta_tag() %>
-    <%= if(assigns |> Map.has_key?(:page_title), do: @page_title, else: "Cannery")
-    |> live_title_tag(suffix: " | Cannery") %>
+    <link
+      rel="shortcut icon"
+      type="image/jpg"
+      href={Routes.static_path(@conn, "/images/cannery.svg")}
+    />
+    <.live_title suffix=" | Cannery">
+      <%= assigns[:page_title] || "Cannery" %>
+    </.live_title>
     <link phx-track-static rel="stylesheet" href={Routes.static_path(@conn, "/css/app.css")} />
     <script
       defer

lib/cannery_web/templates/user_confirmation/new.html.heex

@@ -22,14 +22,12 @@
 
   <div class="flex flex-row justify-center items-center space-x-4">
     <%= if Accounts.allow_registration?() do %>
-      <%= link(dgettext("actions", "Register"),
-        to: Routes.user_registration_path(@conn, :new),
-        class: "btn btn-primary"
-      ) %>
+      <.link href={Routes.user_registration_path(@conn, :new)} class="btn btn-primary">
+        <%= dgettext("actions", "Register") %>
+      </.link>
     <% end %>
-    <%= link(dgettext("actions", "Log in"),
-      to: Routes.user_session_path(@conn, :new),
-      class: "btn btn-primary"
-    ) %>
+    <.link href={Routes.user_session_path(@conn, :new)} class="btn btn-primary">
+      <%= dgettext("actions", "Log in") %>
+    </.link>
   </div>
 </div>

lib/cannery_web/templates/user_registration/new.html.heex

@@ -45,13 +45,11 @@
   <hr class="hr" />
 
   <div class="flex flex-row justify-center items-center space-x-4">
-    <%= link(dgettext("actions", "Log in"),
-      to: Routes.user_session_path(@conn, :new),
-      class: "btn btn-primary"
-    ) %>
-    <%= link(dgettext("actions", "Forgot your password?"),
-      to: Routes.user_reset_password_path(@conn, :new),
-      class: "btn btn-primary"
-    ) %>
+    <.link href={Routes.user_session_path(@conn, :new)} class="btn btn-primary">
+      <%= dgettext("actions", "Log in") %>
+    </.link>
+    <.link href={Routes.user_reset_password_path(@conn, :new)} class="btn btn-primary">
+      <%= dgettext("actions", "Forgot your password?") %>
+    </.link>
   </div>
 </div>

lib/cannery_web/templates/user_reset_password/edit.html.heex

@@ -40,14 +40,12 @@
 
   <div class="flex flex-row justify-center items-center space-x-4">
     <%= if Accounts.allow_registration?() do %>
-      <%= link(dgettext("actions", "Register"),
-        to: Routes.user_registration_path(@conn, :new),
-        class: "btn btn-primary"
-      ) %>
+      <.link href={Routes.user_registration_path(@conn, :new)} class="btn btn-primary">
+        <%= dgettext("actions", "Register") %>
+      </.link>
     <% end %>
-    <%= link(dgettext("actions", "Log in"),
-      to: Routes.user_session_path(@conn, :new),
-      class: "btn btn-primary"
-    ) %>
+    <.link href={Routes.user_session_path(@conn, :new)} class="btn btn-primary">
+      <%= dgettext("actions", "Log in") %>
+    </.link>
   </div>
 </div>

lib/cannery_web/templates/user_reset_password/new.html.heex

@@ -22,14 +22,12 @@
 
   <div class="flex flex-row justify-center items-center space-x-4">
     <%= if Accounts.allow_registration?() do %>
-      <%= link(dgettext("actions", "Register"),
-        to: Routes.user_registration_path(@conn, :new),
-        class: "btn btn-primary"
-      ) %>
+      <.link href={Routes.user_registration_path(@conn, :new)} class="btn btn-primary">
+        <%= dgettext("actions", "Register") %>
+      </.link>
     <% end %>
-    <%= link(dgettext("actions", "Log in"),
-      to: Routes.user_session_path(@conn, :new),
-      class: "btn btn-primary"
-    ) %>
+    <.link href={Routes.user_session_path(@conn, :new)} class="btn btn-primary">
+      <%= dgettext("actions", "Log in") %>
+    </.link>
   </div>
 </div>

lib/cannery_web/templates/user_session/new.html.heex

@@ -37,14 +37,12 @@
 
   <div class="flex flex-row justify-center items-center space-x-4">
     <%= if Accounts.allow_registration?() do %>
-      <%= link(dgettext("actions", "Register"),
-        to: Routes.user_registration_path(@conn, :new),
-        class: "btn btn-primary"
-      ) %>
+      <.link href={Routes.user_registration_path(@conn, :new)} class="btn btn-primary">
+        <%= dgettext("actions", "Register") %>
+      </.link>
     <% end %>
-    <%= link(dgettext("actions", "Forgot your password?"),
-      to: Routes.user_reset_password_path(@conn, :new),
-      class: "btn btn-primary"
-    ) %>
+    <.link href={Routes.user_reset_password_path(@conn, :new)} class="btn btn-primary">
+      <%= dgettext("actions", "Forgot your password?") %>
+    </.link>
   </div>
 </div>

lib/cannery_web/templates/user_settings/edit.html.heex

@@ -6,7 +6,7 @@
   <hr class="hr" />
 
   <.form
-    let={f}
+    :let={f}
     for={@email_changeset}
     action={Routes.user_settings_path(@conn, :update)}
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
@@ -49,7 +49,7 @@
   <hr class="hr" />
 
   <.form
-    let={f}
+    :let={f}
     for={@password_changeset}
     action={Routes.user_settings_path(@conn, :update)}
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
@@ -104,7 +104,7 @@
   <hr class="hr" />
 
   <.form
-    let={f}
+    :let={f}
     for={@locale_changeset}
     action={Routes.user_settings_path(@conn, :update)}
     class="flex flex-col space-y-4 justify-center items-center"
@@ -139,10 +139,12 @@
 
   <hr class="hr" />
 
-  <%= link(dgettext("actions", "Delete User"),
-    to: Routes.user_settings_path(@conn, :delete, @current_user),
-    method: :delete,
-    class: "btn btn-alert",
-    data: [confirm: dgettext("prompts", "Are you sure you want to delete your account?")]
-  ) %>
+  <.link
+    href={Routes.user_settings_path(@conn, :delete, @current_user)}
+    method={:delete}
+    class="btn btn-alert"
+    data-confirm={dgettext("prompts", "Are you sure you want to delete your account?")}
+  >
+    <%= dgettext("actions", "Delete User") %>
+  </.link>
 </div>

lib/cannery_web/views/error_helpers.ex

@@ -4,7 +4,7 @@ defmodule CanneryWeb.ErrorHelpers do
   """
 
   use Phoenix.HTML
-  import Phoenix.LiveView.Helpers
+  import Phoenix.Component
   alias Ecto.Changeset
   alias Phoenix.{HTML.Form, LiveView.Rendered}
 

lib/cannery_web/views/view_helpers.ex

@@ -5,7 +5,7 @@ defmodule CanneryWeb.ViewHelpers do
   :view`
   """
 
-  import Phoenix.LiveView.Helpers
+  import Phoenix.Component
 
   @id_length 16
 
@@ -23,11 +23,16 @@ defmodule CanneryWeb.ViewHelpers do
     }
 
     ~H"""
-    <time id={@id} datetime={@datetime} x-data={"{
+    <time
+      id={@id}
+      datetime={@datetime}
+      x-data={"{
         date:
           Intl.DateTimeFormat([], {dateStyle: 'short', timeStyle: 'long'})
             .format(new Date(\"#{@datetime}\"))
-      }"} x-text="date">
+      }"}
+      x-text="date"
+    >
       <%= @datetime %>
     </time>
     """
@@ -47,10 +52,15 @@ defmodule CanneryWeb.ViewHelpers do
     }
 
     ~H"""
-    <time id={@id} datetime={@date} x-data={"{
+    <time
+      id={@id}
+      datetime={@date}
+      x-data={"{
         date:
           Intl.DateTimeFormat([], {timeZone: 'Etc/UTC', dateStyle: 'short'}).format(new Date(\"#{@date}\"))
-      }"} x-text="date">
+      }"}
+      x-text="date"
+    >
       <%= @date %>
     </time>
     """
@@ -65,4 +75,43 @@ defmodule CanneryWeb.ViewHelpers do
       if(Application.get_env(:cannery, CanneryWeb.ViewHelpers)[:shibao_mode], do: "q_q", else: "😔")
 
   def display_emoji(other_emoji), do: other_emoji
+
+  @doc """
+  A toggle button element that can be directed to a liveview or a
+  live_component's `handle_event/3`.
+
+  ## Examples
+
+  <.toggle_button action="my_liveview_action" value={@some_value}>
+    <span>Toggle me!</span>
+  </.toggle_button>
+  <.toggle_button action="my_live_component_action" target={@myself} value={@some_value}>
+    <span>Whatever you want</span>
+  </.toggle_button>
+  """
+  def toggle_button(assigns) do
+    assigns = assigns |> assign_new(:id, fn -> assigns.action end)
+
+    ~H"""
+    <label for={@id} class="inline-flex relative items-center cursor-pointer">
+      <input
+        type="checkbox"
+        value={@value}
+        checked={@value}
+        id={@id}
+        class="sr-only peer"
+        {
+          if assigns |> Map.has_key?(:target),
+            do: %{"phx-click" => @action, "phx-value-value" => @value, "phx-target" => @target},
+            else: %{"phx-click" => @action, "phx-value-value" => @value}
+        }
+      />
+      <div class="w-11 h-6 bg-gray-200 rounded-full peer dark:bg-gray-700 peer-focus:ring-4 peer-focus:ring-teal-300 dark:peer-focus:ring-teal-800 peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-1 after:left-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-teal-600">
+      </div>
+      <span class="ml-3 text-sm font-medium text-gray-900 dark:text-gray-300">
+        <%= render_slot(@inner_block) %>
+      </span>
+    </label>
+    """
+  end
 end

mix.exs

@@ -4,10 +4,10 @@ defmodule Cannery.MixProject do
   def project do
     [
       app: :cannery,
-      version: "0.5.3",
-      elixir: "1.13.4",
+      version: "0.6.0",
+      elixir: "1.14.1",
       elixirc_paths: elixirc_paths(Mix.env()),
-      compilers: [:gettext] ++ Mix.compilers(),
+      compilers: Mix.compilers(),
       start_permanent: Mix.env() == :prod,
       aliases: aliases(),
       deps: deps(),
@@ -48,11 +48,11 @@ defmodule Cannery.MixProject do
   defp deps do
     [
       {:bcrypt_elixir, "~> 2.0"},
-      {:phoenix, "~> 1.6"},
+      {:phoenix, "~> 1.6.0"},
       {:phoenix_ecto, "~> 4.4"},
       {:phoenix_html, "~> 3.0"},
       {:phoenix_live_reload, "~> 1.2", only: :dev},
-      {:phoenix_live_view, "~> 0.17"},
+      {:phoenix_live_view, "~> 0.18.0"},
       {:phoenix_view, "~> 1.1"},
       {:phoenix_live_dashboard, "~> 0.6"},
       {:ecto_sql, "~> 3.6"},

mix.lock

@@ -1,54 +1,54 @@
 %{
   "bcrypt_elixir": {:hex, :bcrypt_elixir, "2.3.1", "5114d780459a04f2b4aeef52307de23de961b69e13a5cd98a911e39fda13f420", [:make, :mix], [{:comeonin, "~> 5.3", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "42182d5f46764def15bf9af83739e3bf4ad22661b1c34fc3e88558efced07279"},
-  "bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm", "7af5c7e09fe1d40f76c8e4f9dd2be7cebd83909f31fee7cd0e9eadc567da8353"},
-  "castore": {:hex, :castore, "0.1.14", "3f6d7c7c1574c402fef29559d3f1a7389ba3524bc6a090a5e9e6abc3af65dcca", [:mix], [], "hexpm", "b34af542eadb727e6c8b37fdf73e18b2e02eb483a4ea0b52fd500bc23f052b7b"},
+  "bunt": {:hex, :bunt, "0.2.1", "e2d4792f7bc0ced7583ab54922808919518d0e57ee162901a16a1b6664ef3b14", [:mix], [], "hexpm", "a330bfb4245239787b15005e66ae6845c9cd524a288f0d141c148b02603777a5"},
+  "castore": {:hex, :castore, "0.1.18", "deb5b9ab02400561b6f5708f3e7660fc35ca2d51bfc6a940d2f513f89c2975fc", [:mix], [], "hexpm", "61bbaf6452b782ef80b33cdb45701afbcf0a918a45ebe7e73f1130d661e66a06"},
   "comeonin": {:hex, :comeonin, "5.3.3", "2c564dac95a35650e9b6acfe6d2952083d8a08e4a89b93a481acb552b325892e", [:mix], [], "hexpm", "3e38c9c2cb080828116597ca8807bb482618a315bfafd98c90bc22a821cc84df"},
   "connection": {:hex, :connection, "1.1.0", "ff2a49c4b75b6fb3e674bfc5536451607270aac754ffd1bdfe175abe4a6d7a68", [:mix], [], "hexpm", "722c1eb0a418fbe91ba7bd59a47e28008a189d47e37e0e7bb85585a016b2869c"},
   "cowboy": {:hex, :cowboy, "2.9.0", "865dd8b6607e14cf03282e10e934023a1bd8be6f6bacf921a7e2a96d800cd452", [:make, :rebar3], [{:cowlib, "2.11.0", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "2c729f934b4e1aa149aff882f57c6372c15399a20d54f65c8d67bef583021bde"},
   "cowboy_telemetry": {:hex, :cowboy_telemetry, "0.4.0", "f239f68b588efa7707abce16a84d0d2acf3a0f50571f8bb7f56a15865aae820c", [:rebar3], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7d98bac1ee4565d31b62d59f8823dfd8356a169e7fcbb83831b8a5397404c9de"},
   "cowlib": {:hex, :cowlib, "2.11.0", "0b9ff9c346629256c42ebe1eeb769a83c6cb771a6ee5960bd110ab0b9b872063", [:make, :rebar3], [], "hexpm", "2b3e9da0b21c4565751a6d4901c20d1b4cc25cbb7fd50d91d2ab6dd287bc86a9"},
-  "credo": {:hex, :credo, "1.6.4", "ddd474afb6e8c240313f3a7b0d025cc3213f0d171879429bf8535d7021d9ad78", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2.8", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "c28f910b61e1ff829bffa056ef7293a8db50e87f2c57a9b5c3f57eee124536b7"},
+  "credo": {:hex, :credo, "1.6.7", "323f5734350fd23a456f2688b9430e7d517afb313fbd38671b8a4449798a7854", [:mix], [{:bunt, "~> 0.2.1", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2.8", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "41e110bfb007f7eda7f897c10bf019ceab9a0b269ce79f015d54b0dcf4fc7dd3"},
   "db_connection": {:hex, :db_connection, "2.4.2", "f92e79aff2375299a16bcb069a14ee8615c3414863a6fef93156aee8e86c2ff3", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "4fe53ca91b99f55ea249693a0229356a08f4d1a7931d8ffa79289b145fe83668"},
   "decimal": {:hex, :decimal, "2.0.0", "a78296e617b0f5dd4c6caf57c714431347912ffb1d0842e998e9792b5642d697", [:mix], [], "hexpm", "34666e9c55dea81013e77d9d87370fe6cb6291d1ef32f46a1600230b1d44f577"},
-  "dialyxir": {:hex, :dialyxir, "1.1.0", "c5aab0d6e71e5522e77beff7ba9e08f8e02bad90dfbeffae60eaf0cb47e29488", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "07ea8e49c45f15264ebe6d5b93799d4dd56a44036cf42d0ad9c960bc266c0b9a"},
-  "earmark_parser": {:hex, :earmark_parser, "1.4.25", "2024618731c55ebfcc5439d756852ec4e85978a39d0d58593763924d9a15916f", [:mix], [], "hexpm", "56749c5e1c59447f7b7a23ddb235e4b3defe276afc220a6227237f3efe83f51e"},
-  "ecto": {:hex, :ecto, "3.8.2", "7b9aca632f9da80ffed525354e4de466a66e042abcbc8509b6b600072c8d8ee0", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "afe2912cc23f61a6a8466c158331d54e0f427029dd97ca936644bc116d6599b3"},
+  "dialyxir": {:hex, :dialyxir, "1.2.0", "58344b3e87c2e7095304c81a9ae65cb68b613e28340690dfe1a5597fd08dec37", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "61072136427a851674cab81762be4dbeae7679f85b1272b6d25c3a839aff8463"},
+  "earmark_parser": {:hex, :earmark_parser, "1.4.29", "149d50dcb3a93d9f3d6f3ecf18c918fb5a2d3c001b5d3305c926cddfbd33355b", [:mix], [], "hexpm", "4902af1b3eb139016aed210888748db8070b8125c2342ce3dcae4f38dcc63503"},
+  "ecto": {:hex, :ecto, "3.9.1", "67173b1687afeb68ce805ee7420b4261649d5e2deed8fe5550df23bab0bc4396", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c80bb3d736648df790f7f92f81b36c922d9dd3203ca65be4ff01d067f54eb304"},
   "ecto_psql_extras": {:hex, :ecto_psql_extras, "0.7.4", "5d43fd088d39a158c860b17e8d210669587f63ec89ea122a4654861c8c6e2db4", [:mix], [{:ecto_sql, "~> 3.4", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:postgrex, ">= 0.15.7", [hex: :postgrex, repo: "hexpm", optional: false]}, {:table_rex, "~> 3.1.1", [hex: :table_rex, repo: "hexpm", optional: false]}], "hexpm", "311db02f1b772e3d0dc7f56a05044b5e1499d78ed6abf38885e1ca70059449e5"},
-  "ecto_sql": {:hex, :ecto_sql, "3.8.1", "1acaaba32ca0551fd19e492fc7c80414e72fc1a7140fc9395aaa53c2e8629798", [:mix], [{:db_connection, "~> 2.5 or ~> 2.4.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.8.1", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.15.0 or ~> 0.16.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ba7fc75882edce6f2ceca047315d5db27ead773cafea47f1724e35f1e7964525"},
+  "ecto_sql": {:hex, :ecto_sql, "3.9.0", "2bb21210a2a13317e098a420a8c1cc58b0c3421ab8e3acfa96417dab7817918c", [:mix], [{:db_connection, "~> 2.5 or ~> 2.4.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.9.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a8f3f720073b8b1ac4c978be25fa7960ed7fd44997420c304a4a2e200b596453"},
   "elixir_make": {:hex, :elixir_make, "0.6.3", "bc07d53221216838d79e03a8019d0839786703129599e9619f4ab74c8c096eac", [:mix], [], "hexpm", "f5cbd651c5678bcaabdbb7857658ee106b12509cd976c2c2fca99688e1daf716"},
   "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
   "esbuild": {:hex, :esbuild, "0.4.0", "9f17db148aead4cf1e6e6a584214357287a93407b5fb51a031f122b61385d4c2", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}], "hexpm", "b61e4e6b92ffe45e4ee4755a22de6211a67c67987dc02afb35a425a0add1d447"},
-  "ex_doc": {:hex, :ex_doc, "0.28.4", "001a0ea6beac2f810f1abc3dbf4b123e9593eaa5f00dd13ded024eae7c523298", [:mix], [{:earmark_parser, "~> 1.4.19", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "bf85d003dd34911d89c8ddb8bda1a958af3471a274a4c2150a9c01c78ac3f8ed"},
+  "ex_doc": {:hex, :ex_doc, "0.29.0", "4a1cb903ce746aceef9c1f9ae8a6c12b742a5461e6959b9d3b24d813ffbea146", [:mix], [{:earmark_parser, "~> 1.4.19", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "f096adb8bbca677d35d278223361c7792d496b3fc0d0224c9d4bc2f651af5db1"},
   "file_system": {:hex, :file_system, "0.2.10", "fb082005a9cd1711c05b5248710f8826b02d7d1784e7c3451f9c1231d4fc162d", [:mix], [], "hexpm", "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"},
-  "floki": {:hex, :floki, "0.32.1", "dfe3b8db3b793939c264e6f785bca01753d17318d144bd44b407fb3493acaa87", [:mix], [{:html_entities, "~> 0.5.0", [hex: :html_entities, repo: "hexpm", optional: false]}], "hexpm", "d4b91c713e4a784a3f7b1e3cc016eefc619f6b1c3898464222867cafd3c681a3"},
+  "floki": {:hex, :floki, "0.34.0", "002d0cc194b48794d74711731db004fafeb328fe676976f160685262d43706a8", [:mix], [], "hexpm", "9c3a9f43f40dde00332a589bd9d389b90c1f518aef500364d00636acc5ebc99c"},
   "gen_smtp": {:hex, :gen_smtp, "1.2.0", "9cfc75c72a8821588b9b9fe947ae5ab2aed95a052b81237e0928633a13276fd3", [:rebar3], [{:ranch, ">= 1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "5ee0375680bca8f20c4d85f58c2894441443a743355430ff33a783fe03296779"},
-  "gettext": {:hex, :gettext, "0.19.1", "564953fd21f29358e68b91634799d9d26989f8d039d7512622efb3c3b1c97892", [:mix], [], "hexpm", "10c656c0912b8299adba9b061c06947511e3f109ab0d18b44a866a4498e77222"},
+  "gettext": {:hex, :gettext, "0.20.0", "75ad71de05f2ef56991dbae224d35c68b098dd0e26918def5bb45591d5c8d429", [:mix], [], "hexpm", "1c03b177435e93a47441d7f681a7040bd2a816ece9e2666d1c9001035121eb3d"},
   "heex_formatter": {:git, "https://github.com/feliperenan/heex_formatter.git", "dfefc9ae267fb0874c287ceb6c47dda106c59552", []},
   "html_entities": {:hex, :html_entities, "0.5.2", "9e47e70598da7de2a9ff6af8758399251db6dbb7eebe2b013f2bbd2515895c3c", [:mix], [], "hexpm", "c53ba390403485615623b9531e97696f076ed415e8d8058b1dbaa28181f4fdcc"},
   "hut": {:hex, :hut, "1.3.0", "71f2f054e657c03f959cf1acc43f436ea87580696528ca2a55c8afb1b06c85e7", [:"erlang.mk", :rebar, :rebar3], [], "hexpm", "7e15d28555d8a1f2b5a3a931ec120af0753e4853a4c66053db354f35bf9ab563"},
-  "jason": {:hex, :jason, "1.3.0", "fa6b82a934feb176263ad2df0dbd91bf633d4a46ebfdffea0c8ae82953714946", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "53fc1f51255390e0ec7e50f9cb41e751c260d065dcba2bf0d08dc51a4002c2ac"},
+  "jason": {:hex, :jason, "1.4.0", "e855647bc964a44e2f67df589ccf49105ae039d4179db7f6271dfd3843dc27e6", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "79a3791085b2a0f743ca04cec0f7be26443738779d09302e01318f97bdb82121"},
   "makeup": {:hex, :makeup, "1.1.0", "6b67c8bc2882a6b6a445859952a602afc1a41c2e08379ca057c0f525366fc3ca", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "0a45ed501f4a8897f580eabf99a2e5234ea3e75a4373c8a52824f6e873be57a6"},
   "makeup_elixir": {:hex, :makeup_elixir, "0.16.0", "f8c570a0d33f8039513fbccaf7108c5d750f47d8defd44088371191b76492b0b", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "28b2cbdc13960a46ae9a8858c4bebdec3c9a6d7b4b9e7f4ed1502f8159f338e7"},
   "makeup_erlang": {:hex, :makeup_erlang, "0.1.1", "3fcb7f09eb9d98dc4d208f49cc955a34218fc41ff6b84df7c75b3e6e533cc65f", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "174d0809e98a4ef0b3309256cbf97101c6ec01c4ab0b23e926a9e17df2077cbb"},
-  "mime": {:hex, :mime, "2.0.2", "0b9e1a4c840eafb68d820b0e2158ef5c49385d17fb36855ac6e7e087d4b1dcc5", [:mix], [], "hexpm", "e6a3f76b4c277739e36c2e21a2c640778ba4c3846189d5ab19f97f126df5f9b7"},
+  "mime": {:hex, :mime, "2.0.3", "3676436d3d1f7b81b5a2d2bd8405f412c677558c81b1c92be58c00562bb59095", [:mix], [], "hexpm", "27a30bf0db44d25eecba73755acf4068cbfe26a4372f9eb3e4ea3a45956bff6b"},
   "nimble_parsec": {:hex, :nimble_parsec, "1.2.3", "244836e6e3f1200c7f30cb56733fd808744eca61fd182f731eac4af635cc6d0b", [:mix], [], "hexpm", "c8d789e39b9131acf7b99291e93dae60ab48ef14a7ee9d58c6964f59efb570b0"},
-  "oban": {:hex, :oban, "2.12.0", "bd5a283770c6ab1284aad81e5566cfb89f4119b08f52508d92d73551283c8789", [:mix], [{:ecto_sql, "~> 3.6", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.16", [hex: :postgrex, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "1557b7b046b13c0b5360f55a9fb7e56975f6b5f8247e56f2c54575bd95435ca0"},
-  "phoenix": {:hex, :phoenix, "1.6.8", "9a34e5f4dd3ba959176c199fd5b2277b02e64005462428b71cf6ce9cb5e09cb4", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 1.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", "9f4d616aeb9c5e019bddfc1f9078b8c06f852ffa838e67f925559cc0993e9f71"},
+  "oban": {:hex, :oban, "2.13.4", "b4c4f48f4c89cc01036670eefa28aa9c03d09aadd402655475b936983d597006", [:mix], [{:ecto_sql, "~> 3.6", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.16", [hex: :postgrex, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a7d26f82b409e2d7928fbb75a17716e06ad3f783ebe9af260e3dd23abed7f124"},
+  "phoenix": {:hex, :phoenix, "1.6.15", "0a1d96bbc10747fd83525370d691953cdb6f3ccbac61aa01b4acb012474b047d", [: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", "d70ab9fbf6b394755ea88b644d34d79d8b146e490973151f248cacd122d20672"},
   "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.2.0", "1c1219d4b6cb22ac72f12f73dc5fad6c7563104d083f711c3fcd8551a1f4ae11", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "36ec97ba56d25c0136ef1992c37957e4246b649d620958a1f9fa86165f8bc54f"},
-  "phoenix_live_dashboard": {:hex, :phoenix_live_dashboard, "0.6.5", "1495bb014be12c9a9252eca04b9af54246f6b5c1e4cd1f30210cd00ec540cf8e", [:mix], [{:ecto, "~> 3.6.2 or ~> 3.7", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_mysql_extras, "~> 0.3", [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.17.7", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:telemetry_metrics, "~> 0.6.0", [hex: :telemetry_metrics, repo: "hexpm", optional: false]}], "hexpm", "ef4fa50dd78364409039c99cf6f98ab5209b4c5f8796c17f4db118324f0db852"},
-  "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.3.3", "3a53772a6118d5679bf50fc1670505a290e32a1d195df9e069d8c53ab040c054", [: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", "766796676e5f558dbae5d1bdb066849673e956005e3730dfd5affd7a6da4abac"},
-  "phoenix_live_view": {:hex, :phoenix_live_view, "0.17.9", "36b5aa812bc3ccd64c9630f6b3234d9ea21105493237e927aae19d0ba758f0db", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.1", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "f7ebc3e0ba0c5f6b6996ed6c901ddbfdaba59a6d09b569e7cb2f2f7d693b4455"},
+  "phoenix_live_dashboard": {:hex, :phoenix_live_dashboard, "0.7.1", "b0bf8f3348dec4910907a2ad1453e642f6fe4d444376c1c9b26222d63c73cf97", [: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.0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:telemetry_metrics, "~> 0.6 or ~> 1.0", [hex: :telemetry_metrics, repo: "hexpm", optional: false]}], "hexpm", "b6c5d744bf4b40692b1b361d3608bdfd05aeab83e17c7bc217d730f007f31abf"},
+  "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.4.0", "4fe222c0be55fdc3f9c711e24955fc42a7cd9b7a2f5f406f2580a567c335a573", [: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", "bebf0fc2d2113b61cb5968f585367234b7b4c21d963d691de7b4b2dc6cdaae6f"},
+  "phoenix_live_view": {:hex, :phoenix_live_view, "0.18.2", "635cf07de947235deb030cd6b776c71a3b790ab04cebf526aa8c879fe17c7784", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6 or ~> 1.7", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.1", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "da287a77327e996cc166e4c440c3ad5ab33ccdb151b91c793209b39ebbce5b75"},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.1", "ba04e489ef03763bf28a17eb2eaddc2c20c6d217e2150a61e3298b0f4c2012b5", [:mix], [], "hexpm", "81367c6d1eea5878ad726be80808eb5a787a23dee699f96e72b1109c57cdd8d9"},
-  "phoenix_swoosh": {:hex, :phoenix_swoosh, "1.0.1", "0db6eb6405a6b06cae4fdf4144659b3f4fee4553e2856fe8a53ba12e9fb21a74", [: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", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:swoosh, "~> 1.5", [hex: :swoosh, repo: "hexpm", optional: false]}], "hexpm", "e34890004baec08f0fa12bd8c77bf64bfb4156b84a07fb79da9322fa94bc3781"},
+  "phoenix_swoosh": {:hex, :phoenix_swoosh, "1.1.0", "f8e4780705c9f254cc853f7a40e25f7198ba4d91102bcfad2226669b69766b35", [: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", "aa82f10afd9a4b6080fdf3274dbb9432b25b210d42b4b6b55308f6e59cd87c3d"},
   "phoenix_view": {:hex, :phoenix_view, "1.1.2", "1b82764a065fb41051637872c7bd07ed2fdb6f5c3bd89684d4dca6e10115c95a", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "7ae90ad27b09091266f6adbb61e1d2516a7c3d7062c6789d46a7554ec40f3a56"},
-  "plug": {:hex, :plug, "1.13.6", "187beb6b67c6cec50503e940f0434ea4692b19384d47e5fdfd701e93cadb4cc2", [: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", "02b9c6b9955bce92c829f31d6284bf53c591ca63c4fb9ff81dfd0418667a34ff"},
-  "plug_cowboy": {:hex, :plug_cowboy, "2.5.2", "62894ccd601cf9597e2c23911ff12798a8a18d237e9739f58a6b04e4988899fe", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "ea6e87f774c8608d60c8d34022a7d073bd7680a0a013f049fc62bf35efea1044"},
-  "plug_crypto": {:hex, :plug_crypto, "1.2.2", "05654514ac717ff3a1843204b424477d9e60c143406aa94daf2274fdd280794d", [:mix], [], "hexpm", "87631c7ad914a5a445f0a3809f99b079113ae4ed4b867348dd9eec288cecb6db"},
-  "postgrex": {:hex, :postgrex, "0.16.3", "fac79a81a9a234b11c44235a4494d8565303fa4b9147acf57e48978a074971db", [:mix], [{:connection, "~> 1.1", [hex: :connection, repo: "hexpm", optional: false]}, {:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "aeaae1d2d1322da4e5fe90d241b0a564ce03a3add09d7270fb85362166194590"},
+  "plug": {:hex, :plug, "1.14.0", "ba4f558468f69cbd9f6b356d25443d0b796fbdc887e03fa89001384a9cac638f", [: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", "bf020432c7d4feb7b3af16a0c2701455cbbbb95e5b6866132cb09eb0c29adc14"},
+  "plug_cowboy": {:hex, :plug_cowboy, "2.6.0", "d1cf12ff96a1ca4f52207c5271a6c351a4733f413803488d75b70ccf44aebec2", [: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", "073cf20b753ce6682ed72905cd62a2d4bd9bad1bf9f7feb02a1b8e525bd94fa6"},
+  "plug_crypto": {:hex, :plug_crypto, "1.2.3", "8f77d13aeb32bfd9e654cb68f0af517b371fb34c56c9f2b58fe3df1235c1251a", [:mix], [], "hexpm", "b5672099c6ad5c202c45f5a403f21a3411247f164e4a8fab056e5cd8a290f4a2"},
+  "postgrex": {:hex, :postgrex, "0.16.5", "fcc4035cc90e23933c5d69a9cd686e329469446ef7abba2cf70f08e2c4b69810", [:mix], [{:connection, "~> 1.1", [hex: :connection, repo: "hexpm", optional: false]}, {:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "edead639dc6e882618c01d8fc891214c481ab9a3788dfe38dd5e37fd1d5fb2e8"},
   "ranch": {:hex, :ranch, "1.8.0", "8c7a100a139fd57f17327b6413e4167ac559fbc04ca7448e9be9057311597a1d", [:make, :rebar3], [], "hexpm", "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"},
   "set_locale": {:hex, :set_locale, "0.2.9", "33350ba3c66f1c560dffc43019eea4b573f91c5cbe3e461fe0e5395d2d6ba2c3", [:mix], [{:gettext, "~>0.14", [hex: :gettext, repo: "hexpm", optional: false]}, {:phoenix, ">1.3.0", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "e46348b64b7c5d725d0c90a6524942a19b65e6ce27372ddf9a727dfb64ba236c"},
-  "swoosh": {:hex, :swoosh, "1.6.6", "6018c6f4659ac0b4f30684982993b7812b2bb97436d39f76fcfa8c9e3ae74f85", [:mix], [{:cowboy, "~> 1.1 or ~> 2.4", [hex: :cowboy, repo: "hexpm", optional: true]}, {:ex_aws, "~> 2.1", [hex: :ex_aws, repo: "hexpm", optional: true]}, {:finch, "~> 0.6", [hex: :finch, repo: "hexpm", optional: true]}, {:gen_smtp, "~> 0.13 or ~> 1.0", [hex: :gen_smtp, repo: "hexpm", optional: true]}, {:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mail, "~> 0.2", [hex: :mail, repo: "hexpm", optional: true]}, {:mime, "~> 1.1 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_cowboy, ">= 1.0.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "e92c7206efd442f08484993676ab072afab2f2bb1e87e604230bb1183c5980de"},
+  "swoosh": {:hex, :swoosh, "1.8.2", "af9a22ab2c0d20b266f61acca737fa11a121902de9466a39e91bacdce012101c", [:mix], [{:cowboy, "~> 1.1 or ~> 2.4", [hex: :cowboy, repo: "hexpm", optional: true]}, {:ex_aws, "~> 2.1", [hex: :ex_aws, repo: "hexpm", optional: true]}, {:finch, "~> 0.6", [hex: :finch, repo: "hexpm", optional: true]}, {:gen_smtp, "~> 0.13 or ~> 1.0", [hex: :gen_smtp, repo: "hexpm", optional: true]}, {:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mail, "~> 0.2", [hex: :mail, repo: "hexpm", optional: true]}, {:mime, "~> 1.1 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_cowboy, ">= 1.0.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "d058ba750eafadb6c09a84a352c14c5d1eeeda6e84945fcc95785b7f3067b7db"},
   "table_rex": {:hex, :table_rex, "3.1.1", "0c67164d1714b5e806d5067c1e96ff098ba7ae79413cc075973e17c38a587caa", [:mix], [], "hexpm", "678a23aba4d670419c23c17790f9dcd635a4a89022040df7d5d772cb21012490"},
   "telemetry": {:hex, :telemetry, "1.1.0", "a589817034a27eab11144ad24d5c0f9fab1f58173274b1e9bae7074af9cbee51", [:rebar3], [], "hexpm", "b727b2a1f75614774cff2d7565b64d0dfa5bd52ba517f16543e6fc7efcc0df48"},
   "telemetry_metrics": {:hex, :telemetry_metrics, "0.6.1", "315d9163a1d4660aedc3fee73f33f1d355dcc76c5c3ab3d59e76e3edf80eef1f", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7be9e0871c41732c233be71e4be11b96e56177bf15dde64a8ac9ce72ac9834c6"},

priv/gettext/actions.pot

@@ -10,204 +10,204 @@
 msgid ""
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:44
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:40
+#, elixir-autogen, elixir-format
 msgid "Add Ammo"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:36
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:24
 msgid "Add your first box!"
 msgstr ""
 
+#: lib/cannery_web/live/container_live/index.html.heex:13
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/index.html.heex:12
 msgid "Add your first container!"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:13
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:12
 msgid "Add your first type!"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:15
 #: lib/cannery_web/templates/user_settings/edit.html.heex:44
+#, elixir-autogen, elixir-format
 msgid "Change email"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:58
 #: lib/cannery_web/templates/user_settings/edit.html.heex:99
+#, elixir-autogen, elixir-format
 msgid "Change password"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.html.heex:17
+#, elixir-autogen, elixir-format
 msgid "Create Invite"
 msgstr ""
 
+#: lib/cannery_web/templates/user_settings/edit.html.heex:148
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:142
 msgid "Delete User"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_registration/new.html.heex:52
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:3
 #: lib/cannery_web/templates/user_session/new.html.heex:45
+#, elixir-autogen, elixir-format
 msgid "Forgot your password?"
 msgstr ""
 
+#: lib/cannery_web/live/invite_live/index.html.heex:13
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.html.heex:12
 msgid "Invite someone new!"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:106
+#: lib/cannery_web/components/topbar.ex:137
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:30
-#: lib/cannery_web/templates/user_registration/new.html.heex:48
+#: lib/cannery_web/templates/user_registration/new.html.heex:49
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:48
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:30
 #: lib/cannery_web/templates/user_session/new.html.heex:3
 #: lib/cannery_web/templates/user_session/new.html.heex:33
+#, elixir-autogen, elixir-format
 msgid "Log in"
 msgstr ""
 
+#: lib/cannery_web/live/tag_live/index.html.heex:15
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/tag_live/index.html.heex:14
 msgid "Make your first tag!"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:42
-msgid "New Ammo group"
-msgstr ""
-
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:17
+#, elixir-autogen, elixir-format
 msgid "New Ammo type"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/index.html.heex:17
+#, elixir-autogen, elixir-format
 msgid "New Container"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/tag_live/index.html.heex:19
+#, elixir-autogen, elixir-format
 msgid "New Tag"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:99
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:25
+#: lib/cannery_web/components/topbar.ex:128
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:26
 #: lib/cannery_web/templates/user_registration/new.html.heex:3
 #: lib/cannery_web/templates/user_registration/new.html.heex:42
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:43
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:25
-#: lib/cannery_web/templates/user_session/new.html.heex:40
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:44
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:26
+#: lib/cannery_web/templates/user_session/new.html.heex:41
+#, elixir-autogen, elixir-format
 msgid "Register"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:3
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:16
+#, elixir-autogen, elixir-format
 msgid "Resend confirmation instructions"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:3
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:34
+#, elixir-autogen, elixir-format
 msgid "Reset password"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/components/add_shot_group_component.html.heex:46
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:73
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:156
 #: lib/cannery_web/live/container_live/form_component.html.heex:50
-#: lib/cannery_web/live/invite_live/form_component.html.heex:28
+#: lib/cannery_web/live/invite_live/form_component.html.heex:31
 #: lib/cannery_web/live/range_live/form_component.html.heex:40
-#: lib/cannery_web/live/tag_live/form_component.ex:66
+#: lib/cannery_web/live/tag_live/form_component.ex:91
+#, elixir-autogen, elixir-format
 msgid "Save"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:16
+#, elixir-autogen, elixir-format
 msgid "Send instructions to reset password"
 msgstr ""
 
+#: lib/cannery_web/live/container_live/show.html.heex:72
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/show.html.heex:53
 msgid "Why not add one?"
 msgstr ""
 
+#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:53
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:52
 msgid "Add"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/range_live/index.html.heex:17
+#, elixir-autogen, elixir-format
 msgid "Stage ammo"
 msgstr ""
 
+#: lib/cannery_web/live/range_live/index.html.heex:13
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.html.heex:12
 msgid "Why not get some ready to shoot?"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.ex:190
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:101
+#: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:144
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:91
-#: lib/cannery_web/live/range_live/index.html.heex:36
 msgid "Record shots"
 msgstr ""
 
+#: lib/cannery_web/components/move_ammo_group_component.ex:90
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:55
-msgid "Ammo Details"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/components/move_ammo_group_component.ex:89
 msgid "Add another container!"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:94
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:85
 msgid "Move containers"
 msgstr ""
 
+#: lib/cannery_web/components/move_ammo_group_component.ex:126
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/move_ammo_group_component.ex:127
 msgid "Select"
 msgstr ""
 
+#: lib/cannery_web/live/invite_live/index.html.heex:31
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.html.heex:33
 msgid "Copy to clipboard"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:21
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:18
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:36
 msgid "add a container first"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:66
+#, elixir-autogen, elixir-format
 msgid "Create"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:113
+#, elixir-autogen, elixir-format
 msgid "Change Language"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:134
+#, elixir-autogen, elixir-format
 msgid "Change language"
 msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:60
+#, elixir-autogen, elixir-format
+msgid "View in Catalog"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:31
+#, elixir-autogen, elixir-format
+msgid "add an ammo type first"
+msgstr ""

priv/gettext/de/LC_MESSAGES/actions.po

@@ -23,204 +23,204 @@ msgstr ""
 ## 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.
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:44
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:40
+#, elixir-autogen, elixir-format
 msgid "Add Ammo"
 msgstr "Munition hinzufügen"
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:36
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:24
 msgid "Add your first box!"
 msgstr "Fügen Sie ihre erste Box hinzu!"
 
+#: lib/cannery_web/live/container_live/index.html.heex:13
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/index.html.heex:12
 msgid "Add your first container!"
 msgstr "Fügen Sie ihren ersten Behälter hinzu!"
 
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:13
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:12
 msgid "Add your first type!"
 msgstr "Fügen Sie ihre erste Munitionsart hinzu!"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:15
 #: lib/cannery_web/templates/user_settings/edit.html.heex:44
+#, elixir-autogen, elixir-format
 msgid "Change email"
 msgstr "Mailadresse ändern"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:58
 #: lib/cannery_web/templates/user_settings/edit.html.heex:99
+#, elixir-autogen, elixir-format
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.html.heex:17
+#, elixir-autogen, elixir-format
 msgid "Create Invite"
 msgstr "Einladung erstellen"
 
+#: lib/cannery_web/templates/user_settings/edit.html.heex:148
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:142
 msgid "Delete User"
 msgstr "Benutzer löschen"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_registration/new.html.heex:52
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:3
 #: lib/cannery_web/templates/user_session/new.html.heex:45
+#, elixir-autogen, elixir-format
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
+#: lib/cannery_web/live/invite_live/index.html.heex:13
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.html.heex:12
 msgid "Invite someone new!"
 msgstr "Laden Sie jemanden ein!"
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:106
+#: lib/cannery_web/components/topbar.ex:137
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:30
-#: lib/cannery_web/templates/user_registration/new.html.heex:48
+#: lib/cannery_web/templates/user_registration/new.html.heex:49
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:48
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:30
 #: lib/cannery_web/templates/user_session/new.html.heex:3
 #: lib/cannery_web/templates/user_session/new.html.heex:33
+#, elixir-autogen, elixir-format
 msgid "Log in"
 msgstr "Einloggen"
 
+#: lib/cannery_web/live/tag_live/index.html.heex:15
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/tag_live/index.html.heex:14
 msgid "Make your first tag!"
 msgstr "Erstellen Sie ihren ersten Tag!"
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:42
-msgid "New Ammo group"
-msgstr "Neue Munitionsgruppe"
-
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:17
+#, elixir-autogen, elixir-format
 msgid "New Ammo type"
 msgstr "Neue Munitionsart"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/index.html.heex:17
+#, elixir-autogen, elixir-format
 msgid "New Container"
 msgstr "Neuer Behälter"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/tag_live/index.html.heex:19
+#, elixir-autogen, elixir-format
 msgid "New Tag"
 msgstr "Neuer Tag"
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:99
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:25
+#: lib/cannery_web/components/topbar.ex:128
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:26
 #: lib/cannery_web/templates/user_registration/new.html.heex:3
 #: lib/cannery_web/templates/user_registration/new.html.heex:42
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:43
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:25
-#: lib/cannery_web/templates/user_session/new.html.heex:40
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:44
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:26
+#: lib/cannery_web/templates/user_session/new.html.heex:41
+#, elixir-autogen, elixir-format
 msgid "Register"
 msgstr "Registrieren"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:3
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:16
+#, elixir-autogen, elixir-format
 msgid "Resend confirmation instructions"
 msgstr "Bestätigungsmail erneut senden"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:3
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:34
+#, elixir-autogen, elixir-format
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/components/add_shot_group_component.html.heex:46
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:73
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:156
 #: lib/cannery_web/live/container_live/form_component.html.heex:50
-#: lib/cannery_web/live/invite_live/form_component.html.heex:28
+#: lib/cannery_web/live/invite_live/form_component.html.heex:31
 #: lib/cannery_web/live/range_live/form_component.html.heex:40
-#: lib/cannery_web/live/tag_live/form_component.ex:66
+#: lib/cannery_web/live/tag_live/form_component.ex:91
+#, elixir-autogen, elixir-format
 msgid "Save"
 msgstr "Speichern"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_reset_password/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:72
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/show.html.heex:53
 msgid "Why not add one?"
 msgstr "Warum fügen Sie keine hinzu?"
 
+#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:53
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:52
 msgid "Add"
 msgstr "Hinzufügen"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/range_live/index.html.heex:17
+#, elixir-autogen, elixir-format
 msgid "Stage ammo"
 msgstr "Munition markieren"
 
+#: lib/cannery_web/live/range_live/index.html.heex:13
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.html.heex:12
 msgid "Why not get some ready to shoot?"
 msgstr "Warum nicht einige für den Schießstand auswählen?"
 
+#: lib/cannery_web/live/ammo_group_live/index.ex:190
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:101
+#: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:144
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:91
-#: lib/cannery_web/live/range_live/index.html.heex:36
 msgid "Record shots"
 msgstr "Schüsse dokumentieren"
 
+#: lib/cannery_web/components/move_ammo_group_component.ex:90
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:55
-msgid "Ammo Details"
-msgstr "Munitionsdetails"
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/components/move_ammo_group_component.ex:89
 msgid "Add another container!"
 msgstr "Einen weiteren Behälter hinzufügen!"
 
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:94
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:85
 msgid "Move containers"
 msgstr "Behälter verschieben"
 
+#: lib/cannery_web/components/move_ammo_group_component.ex:126
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/move_ammo_group_component.ex:127
 msgid "Select"
 msgstr "Markieren"
 
+#: lib/cannery_web/live/invite_live/index.html.heex:31
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.html.heex:33
 msgid "Copy to clipboard"
 msgstr "In die Zwischenablage kopieren"
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:21
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:18
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:36
 msgid "add a container first"
 msgstr "Zuerst einen Behälter hinzufügen"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:66
+#, elixir-autogen, elixir-format
 msgid "Create"
 msgstr "Erstellen"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:113
+#, elixir-autogen, elixir-format
 msgid "Change Language"
 msgstr "Sprache wechseln"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:134
+#, elixir-autogen, elixir-format
 msgid "Change language"
 msgstr "Sprache wechseln"
+
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:60
+#, elixir-autogen, elixir-format
+msgid "View in Catalog"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:31
+#, elixir-autogen, elixir-format
+msgid "add an ammo type first"
+msgstr ""

priv/gettext/de/LC_MESSAGES/emails.po

@@ -23,98 +23,98 @@ msgstr ""
 ## 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.
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/email.ex:30
+#, elixir-autogen, elixir-format
 msgid "Confirm your %{name} account"
 msgstr "Bestätigen Sie ihr %{name} Nutzerkonto"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/confirm_email.html.eex:3
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:2
 #: lib/cannery_web/templates/email/reset_password.html.eex:3
 #: lib/cannery_web/templates/email/reset_password.txt.eex:2
 #: lib/cannery_web/templates/email/update_email.html.eex:3
 #: lib/cannery_web/templates/email/update_email.txt.eex:2
+#, elixir-autogen, elixir-format
 msgid "Hi %{email},"
 msgstr "Hallo %{email},"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/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."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/reset_password.txt.eex:8
 #: lib/cannery_web/templates/email/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."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/email.ex:37
+#, elixir-autogen, elixir-format
 msgid "Reset your %{name} password"
 msgstr "Passwort für %{name} zurücksetzen"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/email.ex:44
+#, elixir-autogen, elixir-format
 msgid "Update your %{name} email"
 msgstr "Aktualisieren Sie %{name} Mailadresse"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/confirm_email.html.eex:9
+#, elixir-autogen, elixir-format
 msgid "Welcome to %{name}!"
 msgstr "Willkommen %{name}!"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:4
+#, elixir-autogen, elixir-format
 msgid "Welcome to %{name}%!"
 msgstr "Willkommen %{name}%!"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/update_email.html.eex:8
 #: lib/cannery_web/templates/email/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:"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/confirm_email.html.eex:14
 #: lib/cannery_web/templates/email/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:"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/reset_password.html.eex:8
 #: lib/cannery_web/templates/email/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:"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/confirm_email.html.eex:22
+#, elixir-autogen, elixir-format
 msgid "If you didn't create an account at %{name}, please ignore this."
 msgstr ""
 "Falls SIe dieses Nutzerkonto unter %{name}, nicht erstellt haben, ignorieren "
 "Sie diese Nachricht bitte."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/reset_password.html.eex:16
 #: lib/cannery_web/templates/email/update_email.html.eex:16
+#, elixir-autogen, elixir-format
 msgid "If you didn't request this change from %{name}, please ignore this."
 msgstr ""
 "Falls Sie die Änderung von %{name} nicht angefragt haben, ignorieren Sie "
 "diese Nachricht bitte."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/layout/email.txt.eex:9
+#, elixir-autogen, elixir-format
 msgid "This email was sent from %{name} at %{url}, the self-hosted firearm tracker website."
 msgstr ""
 "Diese Nachricht wurde von %{name} unter %{url} gesandt, einem selbst-"
 "gehosteten Schusswaffenmanager."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/layout/email.html.heex:13
+#, elixir-autogen, elixir-format
 msgid "This email was sent from %{name}, the self-hosted firearm tracker website."
 msgstr ""
 "Diese Nachricht wurde von %{name} gesandt, einem selbst-gehosteten "

priv/gettext/de/LC_MESSAGES/errors.po

@@ -23,166 +23,181 @@ msgstr ""
 ## 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/containers.ex:140
 #, elixir-autogen, elixir-format
-#: lib/cannery/containers.ex:122
 msgid "Container must be empty before deleting"
 msgstr "Behälter muss vor dem Löschen leer sein"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/index.ex:69
 #: lib/cannery_web/live/container_live/show.ex:71
+#, elixir-autogen, elixir-format
 msgid "Could not delete %{name}: %{error}"
 msgstr "Konnte %{name} nicht löschen: %{error}"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/index.ex:57
+#, elixir-autogen, elixir-format
 msgid "Could not find that container"
 msgstr "Konnte Behälter nicht finden"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_settings_controller.ex:84
+#, elixir-autogen, elixir-format
 msgid "Email change link is invalid or it has expired."
 msgstr "Mailadressenänderungs-Link ist ungültig oder abgelaufen."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/error/error.html.heex:8
+#, elixir-autogen, elixir-format
 msgid "Error"
 msgstr "Fehler"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/error/error.html.heex:28
+#, elixir-autogen, elixir-format
 msgid "Go back home"
 msgstr "Zur Hauptseite zurückkehren"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/views/error_view.ex:11
+#, elixir-autogen, elixir-format
 msgid "Internal Server Error"
 msgstr "Interner Serverfehler"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_session_controller.ex:17
+#, elixir-autogen, elixir-format
 msgid "Invalid email or password"
 msgstr "Ungültige Mailadresse oder Passwort"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/views/error_view.ex:9
+#, elixir-autogen, elixir-format
 msgid "Not found"
 msgstr "Nicht gefunden"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_registration/new.html.heex:16
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:16
 #: lib/cannery_web/templates/user_settings/edit.html.heex:21
 #: lib/cannery_web/templates/user_settings/edit.html.heex:64
 #: lib/cannery_web/templates/user_settings/edit.html.heex:119
+#, 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."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_reset_password_controller.ex:63
+#, 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."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:25
 #: lib/cannery_web/controllers/user_registration_controller.ex:56
+#, elixir-autogen, elixir-format
 msgid "Sorry, public registration is disabled"
 msgstr "Entschuldigung, aber öffentliche Registrierung ist deaktiviert"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:15
 #: lib/cannery_web/controllers/user_registration_controller.ex:46
+#, elixir-autogen, elixir-format
 msgid "Sorry, this invite was not found or expired"
 msgstr ""
 "Entschuldigung, aber diese Einladung wurde nicht gefunden oder ist abgelaufen"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_settings_controller.ex:99
+#, elixir-autogen, elixir-format
 msgid "Unable to delete user"
 msgstr "Dieser Nutzer konnte nicht gelöscht werden"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/views/error_view.ex:10
+#, elixir-autogen, elixir-format
 msgid "Unauthorized"
 msgstr "Unbefugt"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_confirmation_controller.ex:54
+#, elixir-autogen, elixir-format
 msgid "User confirmation link is invalid or it has expired."
 msgstr "Nutzerkonto Bestätigungslink ist ungültig oder abgelaufen."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.ex:18
+#, elixir-autogen, elixir-format
 msgid "You are not authorized to view this page"
 msgstr "Sie sind nicht berechtigt, diese Seite aufzurufen"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_auth.ex:177
+#, elixir-autogen, elixir-format
 msgid "You are not authorized to view this page."
 msgstr "Sie sind nicht berechtigt, diese Seite aufzurufen."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/user.ex:130
+#, elixir-autogen, elixir-format
 msgid "did not change"
 msgstr "hat sich nicht geändert"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/user.ex:151
+#, elixir-autogen, elixir-format
 msgid "does not match password"
 msgstr "Passwort stimmt nicht überein"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/user.ex:188
+#, elixir-autogen, elixir-format
 msgid "is not valid"
 msgstr "ist nicht gültig"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/user.ex:84
+#, elixir-autogen, elixir-format
 msgid "must have the @ sign and no spaces"
 msgstr "Muss ein @ Zeichen und keine Leerzeichen haben"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/tags.ex:40
+#, elixir-autogen, elixir-format
 msgid "Tag not found"
 msgstr "Tag nicht gefunden"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:30
+#, elixir-autogen, elixir-format
 msgid "Tag could not be added"
 msgstr "Tag konnte nicht hinzugefügt werden"
 
+#: lib/cannery/activity_log/shot_group.ex:115
 #, elixir-autogen, elixir-format
-#: lib/cannery/activity_log.ex:125
 msgid "Count must be at least 1"
 msgstr "Anzahl muss mindestens 1 sein"
 
+#: lib/cannery/activity_log/shot_group.ex:74
+#: lib/cannery/activity_log/shot_group.ex:111
 #, elixir-autogen, elixir-format
-#: lib/cannery/activity_log.ex:73
-#: lib/cannery/activity_log.ex:120
 msgid "Count must be less than %{count}"
 msgstr "Anzahl muss weniger als %{count} betragen"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_auth.ex:39
 #: lib/cannery_web/controllers/user_auth.ex:161
+#, elixir-autogen, elixir-format
 msgid "You must confirm your account and log in to access this page."
 msgstr ""
 "Sie müssen ihr Nutzerkonto bestätigen und einloggen, um diese Seite "
 "anzuzeigen."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:52
+#, elixir-autogen, elixir-format
 msgid "Tag could not be removed"
 msgstr "Tag konnte nicht gelöscht werden"
 
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:156
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:126
 msgid "Could not parse number of copies"
 msgstr "Konnte die Anzahl der Kopien nicht verstehen"
 
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:141
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:111
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""
 "Ungültige Nummer an Kopien. Muss zwischen 1 and %{max} liegen. War "
 "%{multiplier}"
+
+#: lib/cannery/ammo.ex:535
+#, elixir-autogen, elixir-format
+msgid "Invalid multiplier"
+msgstr ""
+
+#: lib/cannery/ammo/ammo_group.ex:84
+#, elixir-autogen, elixir-format
+msgid "Please select an ammo type and container"
+msgstr ""
+
+#: lib/cannery/activity_log/shot_group.ex:69
+#, elixir-autogen, elixir-format
+msgid "Please select a valid user and ammo group"
+msgstr ""

priv/gettext/de/LC_MESSAGES/prompts.po

@@ -23,269 +23,277 @@ msgstr ""
 ## 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_web/live/ammo_type_live/form_component.ex:85
+#: lib/cannery_web/live/container_live/form_component.ex:85
+#: lib/cannery_web/live/invite_live/form_component.ex:80
+#: lib/cannery_web/live/tag_live/form_component.ex:126
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.ex:64
-#: lib/cannery_web/live/container_live/form_component.ex:65
-#: lib/cannery_web/live/invite_live/form_component.ex:59
-#: lib/cannery_web/live/tag_live/form_component.ex:101
 msgid "%{name} created successfully"
 msgstr "%{name} erfolgreich erstellt"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/index.ex:41
-#: lib/cannery_web/live/ammo_type_live/show.ex:38
+#: lib/cannery_web/live/ammo_type_live/show.ex:28
 #: lib/cannery_web/live/invite_live/index.ex:53
 #: lib/cannery_web/live/invite_live/index.ex:133
 #: lib/cannery_web/live/tag_live/index.ex:38
+#, elixir-autogen, elixir-format
 msgid "%{name} deleted succesfully"
 msgstr "%{name} erfolgreich gelöscht"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.ex:109
+#, elixir-autogen, elixir-format
 msgid "%{name} disabled succesfully"
 msgstr "%{name} erfolgreich deaktiviert"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.ex:87
+#, elixir-autogen, elixir-format
 msgid "%{name} enabled succesfully"
 msgstr "%{name} erfolgreich aktiviert"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/index.ex:62
 #: lib/cannery_web/live/container_live/show.ex:61
+#, elixir-autogen, elixir-format
 msgid "%{name} has been deleted"
 msgstr "%{name} wurde gelöscht"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.ex:67
+#, elixir-autogen, elixir-format
 msgid "%{name} updated succesfully"
 msgstr "%{name} erfolgreich aktualisiert"
 
+#: lib/cannery_web/live/ammo_type_live/form_component.ex:67
+#: lib/cannery_web/live/container_live/form_component.ex:67
+#: lib/cannery_web/live/invite_live/form_component.ex:62
+#: lib/cannery_web/live/tag_live/form_component.ex:108
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.ex:46
-#: lib/cannery_web/live/container_live/form_component.ex:47
-#: lib/cannery_web/live/invite_live/form_component.ex:41
-#: lib/cannery_web/live/tag_live/form_component.ex:83
 msgid "%{name} updated successfully"
 msgstr "%{name} erfolgreich aktualisiert"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_settings_controller.ex:29
+#, elixir-autogen, elixir-format
 msgid "A link to confirm your email change has been sent to the new address."
 msgstr "Eine Mail zum Bestätigen ihre Mailadresse wurde Ihnen zugesandt."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:56
-#: lib/cannery_web/live/ammo_group_live/show.ex:50
+#, elixir-autogen, elixir-format
 msgid "Ammo group deleted succesfully"
 msgstr "Munitionsgruppe erfolgreich gelöscht"
 
+#: lib/cannery_web/live/invite_live/index.html.heex:103
+#: lib/cannery_web/live/invite_live/index.html.heex:133
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:88
-msgid "Ammo group updated successfully"
-msgstr "Munitionsgruppe erfolgreich aktualisiert"
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.html.heex:102
-#: lib/cannery_web/live/invite_live/index.html.heex:131
 msgid "Are you sure you want to delete %{email}? This action is permanent!"
 msgstr ""
 "Sind Sie sicher, dass sie %{email} löschen möchten? Dies kann nicht "
 "zurückgenommen werden!"
 
+#: lib/cannery_web/live/container_live/index.html.heex:48
+#: lib/cannery_web/live/container_live/show.html.heex:51
+#: lib/cannery_web/live/tag_live/index.html.heex:39
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:27
-#: lib/cannery_web/live/container_live/index.html.heex:46
-#: lib/cannery_web/live/container_live/show.html.heex:37
-#: lib/cannery_web/live/tag_live/index.html.heex:38
 msgid "Are you sure you want to delete %{name}?"
 msgstr "Sind Sie sicher, dass sie %{name} löschen möchten?"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.html.heex:49
+#, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete the invite for %{name}?"
 msgstr "Sind Sie sicher, dass sie die Einladung für %{name} löschen möchten?"
 
+#: lib/cannery_web/live/ammo_group_live/index.ex:225
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:75
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:177
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:71
-#: lib/cannery_web/live/ammo_type_live/index.ex:140
 msgid "Are you sure you want to delete this ammo?"
 msgstr "Sind Sie sicher, dass sie diese Munition löschen möchten?"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:146
+#, 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/topbar.ex:106
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:84
 msgid "Are you sure you want to log out?"
 msgstr "Wirklich ausloggen?"
 
+#: lib/cannery_web/live/invite_live/index.html.heex:75
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.html.heex:74
 msgid "Are you sure you want to make %{name} unlimited?"
 msgstr "Sind Sie sicher, dass sie %{name} auf unbegrenzt setzen möchten?"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_settings_controller.ex:77
+#, elixir-autogen, elixir-format
 msgid "Email changed successfully."
 msgstr "Mailadresse erfolgreich geändert."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_confirmation_controller.ex:23
+#, elixir-autogen, elixir-format
 msgid "If your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly."
 msgstr ""
 "Falls Ihre Mailadresse bereits in unserer Datenbank ist und noch nicht "
 "bestätigt wurde, erhalten Sie gleich eine Mail mit Anweisungen."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_reset_password_controller.ex:24
+#, elixir-autogen, elixir-format
 msgid "If your email is in our system, you will receive instructions to reset your password shortly."
 msgstr ""
 "Falls Ihre Mailadresse bereits in unserer Datenbank ist, erhalten Sie gleich "
 "eine Mail mit Anweisungen zum Ändern ihres Passworts."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_session_controller.ex:23
+#, elixir-autogen, elixir-format
 msgid "Logged out successfully."
 msgstr "Erfolgreich ausgeloggt."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_reset_password_controller.ex:46
+#, elixir-autogen, elixir-format
 msgid "Password reset successfully."
 msgstr "Passwort erfolgreich zurückgesetzt."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_settings_controller.ex:49
+#, elixir-autogen, elixir-format
 msgid "Password updated successfully."
 msgstr "Passwort erfolgreich geändert."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:74
+#, 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"
 
+#: lib/cannery_web/live/home_live.ex:108
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:96
 msgid "Register to setup %{name}"
 msgstr "Registrieren Sie sich, um %{name} zu bearbeiten"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/components/add_shot_group_component.html.heex:48
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:74
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:157
 #: lib/cannery_web/live/container_live/form_component.html.heex:52
-#: lib/cannery_web/live/invite_live/form_component.html.heex:30
+#: lib/cannery_web/live/invite_live/form_component.html.heex:33
 #: lib/cannery_web/live/range_live/form_component.html.heex:42
-#: lib/cannery_web/live/tag_live/form_component.ex:68
+#: lib/cannery_web/live/tag_live/form_component.ex:93
+#, elixir-autogen, elixir-format
 msgid "Saving..."
 msgstr "Speichere..."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_settings_controller.ex:95
+#, elixir-autogen, elixir-format
 msgid "Your account has been deleted"
 msgstr "Ihr Nutzerkonto wurde gelöscht"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.html.heex:16
+#, elixir-autogen, elixir-format
 msgid "Are you sure you want to remove the %{tag_name} tag from %{container_name}?"
 msgstr ""
 "Sind Sie sicher, dass sie %{tag_name} Tag von %{container_name} entfernen "
 "wollen?"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:36
+#, elixir-autogen, elixir-format
 msgid "%{name} added successfully"
 msgstr "%{name} erfolgreich hinzugefügt"
 
-#, elixir-autogen, elixir-format
 #: 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"
 
+#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:55
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:54
 msgid "Adding..."
 msgstr "Füge hinzu..."
 
+#: lib/cannery_web/components/add_shot_group_component.ex:56
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/add_shot_group_component.ex:68
 msgid "Shots recorded successfully"
 msgstr "Schüsse erfolgreich dokumentiert"
 
+#: lib/cannery_web/live/range_live/index.html.heex:27
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.html.heex:29
 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/ammo_group_live/show.ex:132
+#: lib/cannery_web/live/range_live/index.ex:131
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.ex:68
-msgid "Ammo group unstaged succesfully"
-msgstr "Munition erfolgreich demarkiert"
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.ex:130
-#: lib/cannery_web/live/range_live/index.ex:128
 msgid "Are you sure you want to delete this shot record?"
 msgstr "Sind sie sicher, dass sie die Schießkladde löschen möchten?"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/show.ex:78
 #: lib/cannery_web/live/range_live/index.ex:54
+#, elixir-autogen, elixir-format
 msgid "Shot records deleted succesfully"
 msgstr "Schießkladde erfolgreich gelöscht"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/range_live/form_component.ex:55
+#, elixir-autogen, elixir-format
 msgid "Shot records updated successfully"
 msgstr "Schießkladde erfolgreich aktualisiert"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_confirmation_controller.ex:38
+#, elixir-autogen, elixir-format
 msgid "%{email} confirmed successfully."
 msgstr "%{email} erfolgreich bestätigt."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/components/move_ammo_group_component.ex:53
+#, elixir-autogen, elixir-format
 msgid "Ammo moved to %{name} successfully"
 msgstr "Munition erfolgreich zu %{name} verschoben"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.ex:121
+#, elixir-autogen, elixir-format
 msgid "Copied to clipboard"
 msgstr "Der Zwischenablage hinzugefügt"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:58
+#, elixir-autogen, elixir-format
 msgid "%{name} removed successfully"
 msgstr "%{name} erfolgreich entfernt"
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:17
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:27
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:15
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:33
 msgid "You'll need to"
 msgstr "Sie müssen"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:67
+#, elixir-autogen, elixir-format
 msgid "Creating..."
 msgstr "Erstellen..."
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:147
-msgid "Ammo group created successfully"
-msgid_plural "Ammo groups created successfully"
-msgstr[0] "Munitionsgruppe erfolgreich erstellt"
-msgstr[1] "Munitionsgruppen erfolgreich erstellt"
-
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:136
+#, elixir-autogen, elixir-format
 msgid "Are you sure you want to change your language?"
 msgstr "Möchten Sie die Sprache wechseln?"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_settings_controller.ex:65
+#, elixir-autogen, elixir-format
 msgid "Language updated successfully."
 msgstr "Spracheinstellung gespeichert."
+
+#: lib/cannery_web/live/ammo_group_live/show.ex:50
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Ammo deleted succesfully"
+msgstr "Munitionsgruppe erfolgreich gelöscht"
+
+#: lib/cannery_web/live/range_live/index.ex:68
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Ammo unstaged succesfully"
+msgstr "Munition erfolgreich demarkiert"
+
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:118
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Ammo updated successfully"
+msgstr "Munitionsgruppe erfolgreich aktualisiert"
+
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:177
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Ammo added successfully"
+msgid_plural "Ammo added successfully"
+msgstr[0] "Munitionsgruppe erfolgreich aktualisiert"
+msgstr[1] "Munitionsgruppe erfolgreich aktualisiert"
+
+#: lib/cannery_web/live/ammo_type_live/index.ex:163
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:28
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!"
+msgstr "Sind Sie sicher, dass sie %{name} löschen möchten?"

priv/gettext/emails.pot

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

priv/gettext/en/LC_MESSAGES/actions.po

@@ -11,204 +11,204 @@ msgstr ""
 "Language: en\n"
 "Plural-Forms: nplurals=2\n"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:44
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:40
+#, elixir-autogen, elixir-format
 msgid "Add Ammo"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:36
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:24
 msgid "Add your first box!"
 msgstr ""
 
+#: lib/cannery_web/live/container_live/index.html.heex:13
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/index.html.heex:12
 msgid "Add your first container!"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:13
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:12
 msgid "Add your first type!"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:15
 #: lib/cannery_web/templates/user_settings/edit.html.heex:44
+#, elixir-autogen, elixir-format
 msgid "Change email"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:58
 #: lib/cannery_web/templates/user_settings/edit.html.heex:99
+#, elixir-autogen, elixir-format
 msgid "Change password"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.html.heex:17
+#, elixir-autogen, elixir-format
 msgid "Create Invite"
 msgstr ""
 
+#: lib/cannery_web/templates/user_settings/edit.html.heex:148
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:142
 msgid "Delete User"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_registration/new.html.heex:52
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:3
 #: lib/cannery_web/templates/user_session/new.html.heex:45
+#, elixir-autogen, elixir-format
 msgid "Forgot your password?"
 msgstr ""
 
+#: lib/cannery_web/live/invite_live/index.html.heex:13
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.html.heex:12
 msgid "Invite someone new!"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:106
+#: lib/cannery_web/components/topbar.ex:137
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:30
-#: lib/cannery_web/templates/user_registration/new.html.heex:48
+#: lib/cannery_web/templates/user_registration/new.html.heex:49
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:48
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:30
 #: lib/cannery_web/templates/user_session/new.html.heex:3
 #: lib/cannery_web/templates/user_session/new.html.heex:33
+#, elixir-autogen, elixir-format
 msgid "Log in"
 msgstr ""
 
+#: lib/cannery_web/live/tag_live/index.html.heex:15
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/tag_live/index.html.heex:14
 msgid "Make your first tag!"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:42
-msgid "New Ammo group"
-msgstr ""
-
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:17
+#, elixir-autogen, elixir-format
 msgid "New Ammo type"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/index.html.heex:17
+#, elixir-autogen, elixir-format
 msgid "New Container"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/tag_live/index.html.heex:19
+#, elixir-autogen, elixir-format
 msgid "New Tag"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:99
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:25
+#: lib/cannery_web/components/topbar.ex:128
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:26
 #: lib/cannery_web/templates/user_registration/new.html.heex:3
 #: lib/cannery_web/templates/user_registration/new.html.heex:42
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:43
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:25
-#: lib/cannery_web/templates/user_session/new.html.heex:40
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:44
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:26
+#: lib/cannery_web/templates/user_session/new.html.heex:41
+#, elixir-autogen, elixir-format
 msgid "Register"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:3
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:16
+#, elixir-autogen, elixir-format
 msgid "Resend confirmation instructions"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:3
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:34
+#, elixir-autogen, elixir-format
 msgid "Reset password"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/components/add_shot_group_component.html.heex:46
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:73
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:156
 #: lib/cannery_web/live/container_live/form_component.html.heex:50
-#: lib/cannery_web/live/invite_live/form_component.html.heex:28
+#: lib/cannery_web/live/invite_live/form_component.html.heex:31
 #: lib/cannery_web/live/range_live/form_component.html.heex:40
-#: lib/cannery_web/live/tag_live/form_component.ex:66
+#: lib/cannery_web/live/tag_live/form_component.ex:91
+#, elixir-autogen, elixir-format
 msgid "Save"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:16
+#, elixir-autogen, elixir-format
 msgid "Send instructions to reset password"
 msgstr ""
 
+#: lib/cannery_web/live/container_live/show.html.heex:72
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/show.html.heex:53
 msgid "Why not add one?"
 msgstr ""
 
+#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:53
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:52
 msgid "Add"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/range_live/index.html.heex:17
+#, elixir-autogen, elixir-format
 msgid "Stage ammo"
 msgstr ""
 
+#: lib/cannery_web/live/range_live/index.html.heex:13
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.html.heex:12
 msgid "Why not get some ready to shoot?"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.ex:190
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:101
+#: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:144
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:91
-#: lib/cannery_web/live/range_live/index.html.heex:36
 msgid "Record shots"
 msgstr ""
 
+#: lib/cannery_web/components/move_ammo_group_component.ex:90
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:55
-msgid "Ammo Details"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/components/move_ammo_group_component.ex:89
 msgid "Add another container!"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:94
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:85
 msgid "Move containers"
 msgstr ""
 
+#: lib/cannery_web/components/move_ammo_group_component.ex:126
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/move_ammo_group_component.ex:127
 msgid "Select"
 msgstr ""
 
+#: lib/cannery_web/live/invite_live/index.html.heex:31
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.html.heex:33
 msgid "Copy to clipboard"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:21
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:18
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:36
 msgid "add a container first"
 msgstr ""
 
-#, elixir-autogen, elixir-format, fuzzy
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:66
+#, elixir-autogen, elixir-format, fuzzy
 msgid "Create"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:113
+#, elixir-autogen, elixir-format
 msgid "Change Language"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:134
+#, elixir-autogen, elixir-format
 msgid "Change language"
 msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:60
+#, elixir-autogen, elixir-format
+msgid "View in Catalog"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:31
+#, elixir-autogen, elixir-format
+msgid "add an ammo type first"
+msgstr ""

priv/gettext/en/LC_MESSAGES/emails.po

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

priv/gettext/en/LC_MESSAGES/errors.po

@@ -10,162 +10,177 @@ msgid ""
 msgstr ""
 "Language: en\n"
 
+#: lib/cannery/containers.ex:140
 #, elixir-autogen, elixir-format
-#: lib/cannery/containers.ex:122
 msgid "Container must be empty before deleting"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/index.ex:69
 #: lib/cannery_web/live/container_live/show.ex:71
+#, elixir-autogen, elixir-format
 msgid "Could not delete %{name}: %{error}"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/index.ex:57
+#, elixir-autogen, elixir-format
 msgid "Could not find that container"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_settings_controller.ex:84
+#, elixir-autogen, elixir-format
 msgid "Email change link is invalid or it has expired."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/error/error.html.heex:8
+#, elixir-autogen, elixir-format
 msgid "Error"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/error/error.html.heex:28
+#, elixir-autogen, elixir-format
 msgid "Go back home"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/views/error_view.ex:11
+#, elixir-autogen, elixir-format
 msgid "Internal Server Error"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_session_controller.ex:17
+#, elixir-autogen, elixir-format
 msgid "Invalid email or password"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/views/error_view.ex:9
+#, elixir-autogen, elixir-format
 msgid "Not found"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_registration/new.html.heex:16
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:16
 #: lib/cannery_web/templates/user_settings/edit.html.heex:21
 #: lib/cannery_web/templates/user_settings/edit.html.heex:64
 #: lib/cannery_web/templates/user_settings/edit.html.heex:119
+#, elixir-autogen, elixir-format
 msgid "Oops, something went wrong! Please check the errors below."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_reset_password_controller.ex:63
+#, elixir-autogen, elixir-format
 msgid "Reset password link is invalid or it has expired."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:25
 #: lib/cannery_web/controllers/user_registration_controller.ex:56
+#, elixir-autogen, elixir-format
 msgid "Sorry, public registration is disabled"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:15
 #: lib/cannery_web/controllers/user_registration_controller.ex:46
+#, elixir-autogen, elixir-format
 msgid "Sorry, this invite was not found or expired"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_settings_controller.ex:99
+#, elixir-autogen, elixir-format
 msgid "Unable to delete user"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/views/error_view.ex:10
+#, elixir-autogen, elixir-format
 msgid "Unauthorized"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_confirmation_controller.ex:54
+#, elixir-autogen, elixir-format
 msgid "User confirmation link is invalid or it has expired."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.ex:18
+#, elixir-autogen, elixir-format
 msgid "You are not authorized to view this page"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_auth.ex:177
+#, elixir-autogen, elixir-format
 msgid "You are not authorized to view this page."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/user.ex:130
+#, elixir-autogen, elixir-format
 msgid "did not change"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/user.ex:151
+#, elixir-autogen, elixir-format
 msgid "does not match password"
 msgstr ""
 
 ## From Ecto.Changeset.put_change/3
-#, elixir-autogen, elixir-format, fuzzy
 #: lib/cannery/accounts/user.ex:188
+#, elixir-autogen, elixir-format, fuzzy
 msgid "is not valid"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/user.ex:84
+#, elixir-autogen, elixir-format
 msgid "must have the @ sign and no spaces"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/tags.ex:40
+#, elixir-autogen, elixir-format
 msgid "Tag not found"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:30
+#, elixir-autogen, elixir-format
 msgid "Tag could not be added"
 msgstr ""
 
+#: lib/cannery/activity_log/shot_group.ex:115
 #, elixir-autogen, elixir-format
-#: lib/cannery/activity_log.ex:125
 msgid "Count must be at least 1"
 msgstr ""
 
+#: lib/cannery/activity_log/shot_group.ex:74
+#: lib/cannery/activity_log/shot_group.ex:111
 #, elixir-autogen, elixir-format
-#: lib/cannery/activity_log.ex:73
-#: lib/cannery/activity_log.ex:120
 msgid "Count must be less than %{count}"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_auth.ex:39
 #: lib/cannery_web/controllers/user_auth.ex:161
+#, elixir-autogen, elixir-format
 msgid "You must confirm your account and log in to access this page."
 msgstr ""
 
-#, elixir-autogen, elixir-format, fuzzy
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:52
+#, elixir-autogen, elixir-format, fuzzy
 msgid "Tag could not be removed"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:156
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:126
 msgid "Could not parse number of copies"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:141
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:111
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""
+
+#: lib/cannery/ammo.ex:535
+#, elixir-autogen, elixir-format
+msgid "Invalid multiplier"
+msgstr ""
+
+#: lib/cannery/ammo/ammo_group.ex:84
+#, elixir-autogen, elixir-format
+msgid "Please select an ammo type and container"
+msgstr ""
+
+#: lib/cannery/activity_log/shot_group.ex:69
+#, elixir-autogen, elixir-format
+msgid "Please select a valid user and ammo group"
+msgstr ""

priv/gettext/en/LC_MESSAGES/prompts.po

@@ -11,261 +11,269 @@ msgstr ""
 "Language: en\n"
 "Plural-Forms: nplurals=2\n"
 
+#: lib/cannery_web/live/ammo_type_live/form_component.ex:85
+#: lib/cannery_web/live/container_live/form_component.ex:85
+#: lib/cannery_web/live/invite_live/form_component.ex:80
+#: lib/cannery_web/live/tag_live/form_component.ex:126
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.ex:64
-#: lib/cannery_web/live/container_live/form_component.ex:65
-#: lib/cannery_web/live/invite_live/form_component.ex:59
-#: lib/cannery_web/live/tag_live/form_component.ex:101
 msgid "%{name} created successfully"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/index.ex:41
-#: lib/cannery_web/live/ammo_type_live/show.ex:38
+#: lib/cannery_web/live/ammo_type_live/show.ex:28
 #: lib/cannery_web/live/invite_live/index.ex:53
 #: lib/cannery_web/live/invite_live/index.ex:133
 #: lib/cannery_web/live/tag_live/index.ex:38
+#, elixir-autogen, elixir-format
 msgid "%{name} deleted succesfully"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.ex:109
+#, elixir-autogen, elixir-format
 msgid "%{name} disabled succesfully"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.ex:87
+#, elixir-autogen, elixir-format
 msgid "%{name} enabled succesfully"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/index.ex:62
 #: lib/cannery_web/live/container_live/show.ex:61
+#, elixir-autogen, elixir-format
 msgid "%{name} has been deleted"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.ex:67
+#, elixir-autogen, elixir-format
 msgid "%{name} updated succesfully"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_type_live/form_component.ex:67
+#: lib/cannery_web/live/container_live/form_component.ex:67
+#: lib/cannery_web/live/invite_live/form_component.ex:62
+#: lib/cannery_web/live/tag_live/form_component.ex:108
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.ex:46
-#: lib/cannery_web/live/container_live/form_component.ex:47
-#: lib/cannery_web/live/invite_live/form_component.ex:41
-#: lib/cannery_web/live/tag_live/form_component.ex:83
 msgid "%{name} updated successfully"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_settings_controller.ex:29
+#, elixir-autogen, elixir-format
 msgid "A link to confirm your email change has been sent to the new address."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:56
-#: lib/cannery_web/live/ammo_group_live/show.ex:50
+#, elixir-autogen, elixir-format
 msgid "Ammo group deleted succesfully"
 msgstr ""
 
+#: lib/cannery_web/live/invite_live/index.html.heex:103
+#: lib/cannery_web/live/invite_live/index.html.heex:133
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:88
-msgid "Ammo group updated successfully"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.html.heex:102
-#: lib/cannery_web/live/invite_live/index.html.heex:131
 msgid "Are you sure you want to delete %{email}? This action is permanent!"
 msgstr ""
 
+#: lib/cannery_web/live/container_live/index.html.heex:48
+#: lib/cannery_web/live/container_live/show.html.heex:51
+#: lib/cannery_web/live/tag_live/index.html.heex:39
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:27
-#: lib/cannery_web/live/container_live/index.html.heex:46
-#: lib/cannery_web/live/container_live/show.html.heex:37
-#: lib/cannery_web/live/tag_live/index.html.heex:38
 msgid "Are you sure you want to delete %{name}?"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.html.heex:49
+#, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete the invite for %{name}?"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.ex:225
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:75
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:177
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:71
-#: lib/cannery_web/live/ammo_type_live/index.ex:140
 msgid "Are you sure you want to delete this ammo?"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:146
+#, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete your account?"
 msgstr ""
 
+#: lib/cannery_web/components/topbar.ex:106
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:84
 msgid "Are you sure you want to log out?"
 msgstr ""
 
+#: lib/cannery_web/live/invite_live/index.html.heex:75
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.html.heex:74
 msgid "Are you sure you want to make %{name} unlimited?"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_settings_controller.ex:77
+#, elixir-autogen, elixir-format
 msgid "Email changed successfully."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_confirmation_controller.ex:23
+#, elixir-autogen, elixir-format
 msgid "If your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_reset_password_controller.ex:24
+#, elixir-autogen, elixir-format
 msgid "If your email is in our system, you will receive instructions to reset your password shortly."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_session_controller.ex:23
+#, elixir-autogen, elixir-format
 msgid "Logged out successfully."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_reset_password_controller.ex:46
+#, elixir-autogen, elixir-format
 msgid "Password reset successfully."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_settings_controller.ex:49
+#, elixir-autogen, elixir-format
 msgid "Password updated successfully."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:74
+#, elixir-autogen, elixir-format
 msgid "Please check your email to verify your account"
 msgstr ""
 
+#: lib/cannery_web/live/home_live.ex:108
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:96
 msgid "Register to setup %{name}"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/components/add_shot_group_component.html.heex:48
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:74
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:157
 #: lib/cannery_web/live/container_live/form_component.html.heex:52
-#: lib/cannery_web/live/invite_live/form_component.html.heex:30
+#: lib/cannery_web/live/invite_live/form_component.html.heex:33
 #: lib/cannery_web/live/range_live/form_component.html.heex:42
-#: lib/cannery_web/live/tag_live/form_component.ex:68
+#: lib/cannery_web/live/tag_live/form_component.ex:93
+#, elixir-autogen, elixir-format
 msgid "Saving..."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_settings_controller.ex:95
+#, elixir-autogen, elixir-format
 msgid "Your account has been deleted"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.html.heex:16
+#, elixir-autogen, elixir-format
 msgid "Are you sure you want to remove the %{tag_name} tag from %{container_name}?"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:36
+#, elixir-autogen, elixir-format
 msgid "%{name} added successfully"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/show.ex:37
+#, elixir-autogen, elixir-format
 msgid "%{tag_name} has been removed from %{container_name}"
 msgstr ""
 
+#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:55
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:54
 msgid "Adding..."
 msgstr ""
 
+#: lib/cannery_web/components/add_shot_group_component.ex:56
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/add_shot_group_component.ex:68
 msgid "Shots recorded successfully"
 msgstr ""
 
+#: lib/cannery_web/live/range_live/index.html.heex:27
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.html.heex:29
 msgid "Are you sure you want to unstage this ammo?"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/show.ex:132
+#: lib/cannery_web/live/range_live/index.ex:131
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.ex:68
-msgid "Ammo group unstaged succesfully"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.ex:130
-#: lib/cannery_web/live/range_live/index.ex:128
 msgid "Are you sure you want to delete this shot record?"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/show.ex:78
 #: lib/cannery_web/live/range_live/index.ex:54
+#, elixir-autogen, elixir-format
 msgid "Shot records deleted succesfully"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/range_live/form_component.ex:55
+#, elixir-autogen, elixir-format
 msgid "Shot records updated successfully"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_confirmation_controller.ex:38
+#, elixir-autogen, elixir-format
 msgid "%{email} confirmed successfully."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/components/move_ammo_group_component.ex:53
+#, elixir-autogen, elixir-format
 msgid "Ammo moved to %{name} successfully"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.ex:121
+#, elixir-autogen, elixir-format
 msgid "Copied to clipboard"
 msgstr ""
 
-#, elixir-autogen, elixir-format, fuzzy
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:58
+#, elixir-autogen, elixir-format, fuzzy
 msgid "%{name} removed successfully"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:17
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:27
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:15
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:33
 msgid "You'll need to"
 msgstr ""
 
-#, elixir-autogen, elixir-format, fuzzy
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:67
+#, elixir-autogen, elixir-format, fuzzy
 msgid "Creating..."
 msgstr ""
 
-#, elixir-autogen, elixir-format, fuzzy
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:147
-msgid "Ammo group created successfully"
-msgid_plural "Ammo groups created successfully"
-msgstr[0] ""
-msgstr[1] ""
-
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:136
+#, elixir-autogen, elixir-format
 msgid "Are you sure you want to change your language?"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_settings_controller.ex:65
+#, elixir-autogen, elixir-format
 msgid "Language updated successfully."
 msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/show.ex:50
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Ammo deleted succesfully"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/index.ex:68
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Ammo unstaged succesfully"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:118
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Ammo updated successfully"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:177
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Ammo added successfully"
+msgid_plural "Ammo added successfully"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/cannery_web/live/ammo_type_live/index.ex:163
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:28
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!"
+msgstr ""

priv/gettext/errors.pot

@@ -10,161 +10,176 @@
 msgid ""
 msgstr ""
 
+#: lib/cannery/containers.ex:140
 #, elixir-autogen, elixir-format
-#: lib/cannery/containers.ex:122
 msgid "Container must be empty before deleting"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/index.ex:69
 #: lib/cannery_web/live/container_live/show.ex:71
+#, elixir-autogen, elixir-format
 msgid "Could not delete %{name}: %{error}"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/index.ex:57
+#, elixir-autogen, elixir-format
 msgid "Could not find that container"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_settings_controller.ex:84
+#, elixir-autogen, elixir-format
 msgid "Email change link is invalid or it has expired."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/error/error.html.heex:8
+#, elixir-autogen, elixir-format
 msgid "Error"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/error/error.html.heex:28
+#, elixir-autogen, elixir-format
 msgid "Go back home"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/views/error_view.ex:11
+#, elixir-autogen, elixir-format
 msgid "Internal Server Error"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_session_controller.ex:17
+#, elixir-autogen, elixir-format
 msgid "Invalid email or password"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/views/error_view.ex:9
+#, elixir-autogen, elixir-format
 msgid "Not found"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_registration/new.html.heex:16
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:16
 #: lib/cannery_web/templates/user_settings/edit.html.heex:21
 #: lib/cannery_web/templates/user_settings/edit.html.heex:64
 #: lib/cannery_web/templates/user_settings/edit.html.heex:119
+#, elixir-autogen, elixir-format
 msgid "Oops, something went wrong! Please check the errors below."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_reset_password_controller.ex:63
+#, elixir-autogen, elixir-format
 msgid "Reset password link is invalid or it has expired."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:25
 #: lib/cannery_web/controllers/user_registration_controller.ex:56
+#, elixir-autogen, elixir-format
 msgid "Sorry, public registration is disabled"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:15
 #: lib/cannery_web/controllers/user_registration_controller.ex:46
+#, elixir-autogen, elixir-format
 msgid "Sorry, this invite was not found or expired"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_settings_controller.ex:99
+#, elixir-autogen, elixir-format
 msgid "Unable to delete user"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/views/error_view.ex:10
+#, elixir-autogen, elixir-format
 msgid "Unauthorized"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_confirmation_controller.ex:54
+#, elixir-autogen, elixir-format
 msgid "User confirmation link is invalid or it has expired."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.ex:18
+#, elixir-autogen, elixir-format
 msgid "You are not authorized to view this page"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_auth.ex:177
+#, elixir-autogen, elixir-format
 msgid "You are not authorized to view this page."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/user.ex:130
+#, elixir-autogen, elixir-format
 msgid "did not change"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/user.ex:151
+#, elixir-autogen, elixir-format
 msgid "does not match password"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/user.ex:188
+#, elixir-autogen, elixir-format
 msgid "is not valid"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/user.ex:84
+#, elixir-autogen, elixir-format
 msgid "must have the @ sign and no spaces"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/tags.ex:40
+#, elixir-autogen, elixir-format
 msgid "Tag not found"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:30
+#, elixir-autogen, elixir-format
 msgid "Tag could not be added"
 msgstr ""
 
+#: lib/cannery/activity_log/shot_group.ex:115
 #, elixir-autogen, elixir-format
-#: lib/cannery/activity_log.ex:125
 msgid "Count must be at least 1"
 msgstr ""
 
+#: lib/cannery/activity_log/shot_group.ex:74
+#: lib/cannery/activity_log/shot_group.ex:111
 #, elixir-autogen, elixir-format
-#: lib/cannery/activity_log.ex:73
-#: lib/cannery/activity_log.ex:120
 msgid "Count must be less than %{count}"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_auth.ex:39
 #: lib/cannery_web/controllers/user_auth.ex:161
+#, elixir-autogen, elixir-format
 msgid "You must confirm your account and log in to access this page."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:52
+#, elixir-autogen, elixir-format
 msgid "Tag could not be removed"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:156
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:126
 msgid "Could not parse number of copies"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:141
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:111
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""
+
+#: lib/cannery/ammo.ex:535
+#, elixir-autogen, elixir-format
+msgid "Invalid multiplier"
+msgstr ""
+
+#: lib/cannery/ammo/ammo_group.ex:84
+#, elixir-autogen, elixir-format
+msgid "Please select an ammo type and container"
+msgstr ""
+
+#: lib/cannery/activity_log/shot_group.ex:69
+#, elixir-autogen, elixir-format
+msgid "Please select a valid user and ammo group"
+msgstr ""

priv/gettext/es/LC_MESSAGES/actions.po

@@ -3,14 +3,16 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-05-21 19:45+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2022-05-22 22:52+0000\n"
+"Last-Translator: Hannah Winter <konhat@hotmail.es>\n"
+"Language-Team: Spanish <https://weblate.bubbletea.dev/projects/cannery/"
+"actions/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 3.6.2\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.12.2\n"
 
 ## This file is a PO Template file.
 ##
@@ -21,204 +23,204 @@ msgstr ""
 ## 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.
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:44
-msgid "Add Ammo"
-msgstr ""
-
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:40
+#, elixir-autogen, elixir-format
+msgid "Add Ammo"
+msgstr "Añadir Munición"
+
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:36
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:24
 msgid "Add your first box!"
 msgstr ""
 
+#: lib/cannery_web/live/container_live/index.html.heex:13
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/index.html.heex:12
 msgid "Add your first container!"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:13
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:12
 msgid "Add your first type!"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:15
 #: lib/cannery_web/templates/user_settings/edit.html.heex:44
-msgid "Change email"
-msgstr ""
-
 #, elixir-autogen, elixir-format
+msgid "Change email"
+msgstr "Cambiar correo electrónico"
+
 #: lib/cannery_web/templates/user_settings/edit.html.heex:58
 #: lib/cannery_web/templates/user_settings/edit.html.heex:99
+#, elixir-autogen, elixir-format
 msgid "Change password"
-msgstr ""
+msgstr "Cambiar contraseña"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.html.heex:17
+#, elixir-autogen, elixir-format
 msgid "Create Invite"
-msgstr ""
+msgstr "Crear Invitación"
 
+#: lib/cannery_web/templates/user_settings/edit.html.heex:148
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:142
 msgid "Delete User"
-msgstr ""
+msgstr "Eliminar cuenta de Usuario"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_registration/new.html.heex:52
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:3
 #: lib/cannery_web/templates/user_session/new.html.heex:45
-msgid "Forgot your password?"
-msgstr ""
-
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.html.heex:12
+msgid "Forgot your password?"
+msgstr "¿Has olvidado tu contraseña?"
+
+#: lib/cannery_web/live/invite_live/index.html.heex:13
+#, elixir-autogen, elixir-format
 msgid "Invite someone new!"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:106
+#: lib/cannery_web/components/topbar.ex:137
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:30
-#: lib/cannery_web/templates/user_registration/new.html.heex:48
+#: lib/cannery_web/templates/user_registration/new.html.heex:49
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:48
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:30
 #: lib/cannery_web/templates/user_session/new.html.heex:3
 #: lib/cannery_web/templates/user_session/new.html.heex:33
+#, elixir-autogen, elixir-format
 msgid "Log in"
 msgstr ""
 
+#: lib/cannery_web/live/tag_live/index.html.heex:15
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/tag_live/index.html.heex:14
 msgid "Make your first tag!"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:42
-msgid "New Ammo group"
-msgstr ""
-
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:17
+#, elixir-autogen, elixir-format
 msgid "New Ammo type"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/index.html.heex:17
+#, elixir-autogen, elixir-format
 msgid "New Container"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/tag_live/index.html.heex:19
+#, elixir-autogen, elixir-format
 msgid "New Tag"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:99
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:25
+#: lib/cannery_web/components/topbar.ex:128
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:26
 #: lib/cannery_web/templates/user_registration/new.html.heex:3
 #: lib/cannery_web/templates/user_registration/new.html.heex:42
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:43
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:25
-#: lib/cannery_web/templates/user_session/new.html.heex:40
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:44
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:26
+#: lib/cannery_web/templates/user_session/new.html.heex:41
+#, elixir-autogen, elixir-format
 msgid "Register"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:3
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:16
+#, elixir-autogen, elixir-format
 msgid "Resend confirmation instructions"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:3
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:34
+#, elixir-autogen, elixir-format
 msgid "Reset password"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/components/add_shot_group_component.html.heex:46
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:73
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:156
 #: lib/cannery_web/live/container_live/form_component.html.heex:50
-#: lib/cannery_web/live/invite_live/form_component.html.heex:28
+#: lib/cannery_web/live/invite_live/form_component.html.heex:31
 #: lib/cannery_web/live/range_live/form_component.html.heex:40
-#: lib/cannery_web/live/tag_live/form_component.ex:66
+#: lib/cannery_web/live/tag_live/form_component.ex:91
+#, elixir-autogen, elixir-format
 msgid "Save"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:16
-msgid "Send instructions to reset password"
-msgstr ""
-
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/show.html.heex:53
+msgid "Send instructions to reset password"
+msgstr "Enviar instrucciones para reestablecer contraseña"
+
+#: lib/cannery_web/live/container_live/show.html.heex:72
+#, elixir-autogen, elixir-format
 msgid "Why not add one?"
 msgstr ""
 
+#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:53
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:52
 msgid "Add"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/range_live/index.html.heex:17
+#, elixir-autogen, elixir-format
 msgid "Stage ammo"
 msgstr ""
 
+#: lib/cannery_web/live/range_live/index.html.heex:13
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.html.heex:12
 msgid "Why not get some ready to shoot?"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.ex:190
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:101
+#: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:144
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:91
-#: lib/cannery_web/live/range_live/index.html.heex:36
 msgid "Record shots"
 msgstr ""
 
+#: lib/cannery_web/components/move_ammo_group_component.ex:90
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:55
-msgid "Ammo Details"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/components/move_ammo_group_component.ex:89
 msgid "Add another container!"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:94
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:85
 msgid "Move containers"
 msgstr ""
 
+#: lib/cannery_web/components/move_ammo_group_component.ex:126
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/move_ammo_group_component.ex:127
 msgid "Select"
 msgstr ""
 
+#: lib/cannery_web/live/invite_live/index.html.heex:31
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.html.heex:33
 msgid "Copy to clipboard"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:21
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:18
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:36
 msgid "add a container first"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:66
+#, elixir-autogen, elixir-format
 msgid "Create"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:113
+#, elixir-autogen, elixir-format
 msgid "Change Language"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:134
+#, elixir-autogen, elixir-format
 msgid "Change language"
 msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:60
+#, elixir-autogen, elixir-format
+msgid "View in Catalog"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:31
+#, elixir-autogen, elixir-format
+msgid "add an ammo type first"
+msgstr ""

priv/gettext/es/LC_MESSAGES/emails.po

@@ -3,14 +3,16 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-05-21 19:44+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2022-05-22 22:52+0000\n"
+"Last-Translator: Ed <ed.ylles1997@gmail.com>\n"
+"Language-Team: Spanish <https://weblate.bubbletea.dev/projects/cannery/"
+"emails/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 3.6.2\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.12.2\n"
 
 ## This file is a PO Template file.
 ##
@@ -21,87 +23,92 @@ msgstr ""
 ## 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.
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/email.ex:30
-msgid "Confirm your %{name} account"
-msgstr ""
-
 #, elixir-autogen, elixir-format
+msgid "Confirm your %{name} account"
+msgstr "Confirma el %{name} de la cuenta"
+
 #: lib/cannery_web/templates/email/confirm_email.html.eex:3
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:2
 #: lib/cannery_web/templates/email/reset_password.html.eex:3
 #: lib/cannery_web/templates/email/reset_password.txt.eex:2
 #: lib/cannery_web/templates/email/update_email.html.eex:3
 #: lib/cannery_web/templates/email/update_email.txt.eex:2
-msgid "Hi %{email},"
-msgstr ""
-
 #, elixir-autogen, elixir-format
+msgid "Hi %{email},"
+msgstr "Hola %{email},"
+
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:10
+#, elixir-autogen, elixir-format
 msgid "If you didn't create an account at %{url}, please ignore this."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/reset_password.txt.eex:8
 #: lib/cannery_web/templates/email/update_email.txt.eex:8
+#, elixir-autogen, elixir-format
 msgid "If you didn't request this change from %{url}, please ignore this."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/email.ex:37
+#, elixir-autogen, elixir-format
 msgid "Reset your %{name} password"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/email.ex:44
+#, elixir-autogen, elixir-format
 msgid "Update your %{name} email"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/confirm_email.html.eex:9
+#, elixir-autogen, elixir-format
 msgid "Welcome to %{name}!"
-msgstr ""
+msgstr "¡Bienvenide a %{name}!"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:4
-msgid "Welcome to %{name}%!"
-msgstr ""
-
 #, elixir-autogen, elixir-format
+msgid "Welcome to %{name}%!"
+msgstr "¡Bienvenide a %{name}%!"
+
 #: lib/cannery_web/templates/email/update_email.html.eex:8
 #: lib/cannery_web/templates/email/update_email.txt.eex:4
+#, elixir-autogen, elixir-format
 msgid "You can change your email by visiting the URL below:"
 msgstr ""
+"Puede cambiar su correo electrónico visitando el enlace que se muestra a "
+"continuación:"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/confirm_email.html.eex:14
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:6
+#, elixir-autogen, elixir-format
 msgid "You can confirm your account by visiting the URL below:"
 msgstr ""
+"Puede confirmar su cuenta visitando el enlace que se muestra a continuación:"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/reset_password.html.eex:8
 #: lib/cannery_web/templates/email/reset_password.txt.eex:4
+#, elixir-autogen, elixir-format
 msgid "You can reset your password by visiting the URL below:"
 msgstr ""
+"Puede reestablecer su contraseña visitando el enlace que se muestra a "
+"continuación:"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/confirm_email.html.eex:22
+#, elixir-autogen, elixir-format
 msgid "If you didn't create an account at %{name}, please ignore this."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/reset_password.html.eex:16
 #: lib/cannery_web/templates/email/update_email.html.eex:16
+#, elixir-autogen, elixir-format
 msgid "If you didn't request this change from %{name}, please ignore this."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/layout/email.txt.eex:9
+#, elixir-autogen, elixir-format
 msgid "This email was sent from %{name} at %{url}, the self-hosted firearm tracker website."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/layout/email.html.heex:13
+#, elixir-autogen, elixir-format
 msgid "This email was sent from %{name}, the self-hosted firearm tracker website."
 msgstr ""

priv/gettext/es/LC_MESSAGES/errors.po

@@ -3,14 +3,16 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-05-21 19:44+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2022-05-22 22:52+0000\n"
+"Last-Translator: Ed <ed.ylles1997@gmail.com>\n"
+"Language-Team: Spanish <https://weblate.bubbletea.dev/projects/cannery/"
+"errors/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 3.6.2\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.12.2\n"
 
 ## This file is a PO Template file.
 ##
@@ -21,161 +23,179 @@ msgstr ""
 ## 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/containers.ex:140
 #, elixir-autogen, elixir-format
-#: lib/cannery/containers.ex:122
 msgid "Container must be empty before deleting"
-msgstr ""
+msgstr "el Contenedor debe estar vació antes de borrarlo"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/index.ex:69
 #: lib/cannery_web/live/container_live/show.ex:71
-msgid "Could not delete %{name}: %{error}"
-msgstr ""
-
 #, elixir-autogen, elixir-format
+msgid "Could not delete %{name}: %{error}"
+msgstr "No se pudo eliminar %{name}: %{error}"
+
 #: lib/cannery_web/live/container_live/index.ex:57
+#, elixir-autogen, elixir-format
 msgid "Could not find that container"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_settings_controller.ex:84
+#, elixir-autogen, elixir-format
 msgid "Email change link is invalid or it has expired."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/error/error.html.heex:8
-msgid "Error"
-msgstr ""
-
 #, elixir-autogen, elixir-format
+msgid "Error"
+msgstr "Error"
+
 #: lib/cannery_web/templates/error/error.html.heex:28
+#, elixir-autogen, elixir-format
 msgid "Go back home"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/views/error_view.ex:11
+#, elixir-autogen, elixir-format
 msgid "Internal Server Error"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_session_controller.ex:17
+#, elixir-autogen, elixir-format
 msgid "Invalid email or password"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/views/error_view.ex:9
+#, elixir-autogen, elixir-format
 msgid "Not found"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_registration/new.html.heex:16
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:16
 #: lib/cannery_web/templates/user_settings/edit.html.heex:21
 #: lib/cannery_web/templates/user_settings/edit.html.heex:64
 #: lib/cannery_web/templates/user_settings/edit.html.heex:119
+#, elixir-autogen, elixir-format
 msgid "Oops, something went wrong! Please check the errors below."
 msgstr ""
+"¡Ups, algo ha ido mal! Por favor, compruebe los errores que se muestran a "
+"continuación."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_reset_password_controller.ex:63
+#, elixir-autogen, elixir-format
 msgid "Reset password link is invalid or it has expired."
 msgstr ""
+"El enlace de reestablecimiento de la contraseña es inválido o ha caducado."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:25
 #: lib/cannery_web/controllers/user_registration_controller.ex:56
+#, elixir-autogen, elixir-format
 msgid "Sorry, public registration is disabled"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:15
 #: lib/cannery_web/controllers/user_registration_controller.ex:46
+#, elixir-autogen, elixir-format
 msgid "Sorry, this invite was not found or expired"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_settings_controller.ex:99
+#, elixir-autogen, elixir-format
 msgid "Unable to delete user"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/views/error_view.ex:10
+#, elixir-autogen, elixir-format
 msgid "Unauthorized"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_confirmation_controller.ex:54
+#, elixir-autogen, elixir-format
 msgid "User confirmation link is invalid or it has expired."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.ex:18
+#, elixir-autogen, elixir-format
 msgid "You are not authorized to view this page"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_auth.ex:177
+#, elixir-autogen, elixir-format
 msgid "You are not authorized to view this page."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/user.ex:130
+#, elixir-autogen, elixir-format
 msgid "did not change"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/user.ex:151
+#, elixir-autogen, elixir-format
 msgid "does not match password"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/user.ex:188
+#, elixir-autogen, elixir-format
 msgid "is not valid"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/user.ex:84
+#, elixir-autogen, elixir-format
 msgid "must have the @ sign and no spaces"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/tags.ex:40
+#, elixir-autogen, elixir-format
 msgid "Tag not found"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:30
+#, elixir-autogen, elixir-format
 msgid "Tag could not be added"
 msgstr ""
 
+#: lib/cannery/activity_log/shot_group.ex:115
 #, elixir-autogen, elixir-format
-#: lib/cannery/activity_log.ex:125
 msgid "Count must be at least 1"
 msgstr ""
 
+#: lib/cannery/activity_log/shot_group.ex:74
+#: lib/cannery/activity_log/shot_group.ex:111
 #, elixir-autogen, elixir-format
-#: lib/cannery/activity_log.ex:73
-#: lib/cannery/activity_log.ex:120
 msgid "Count must be less than %{count}"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_auth.ex:39
 #: lib/cannery_web/controllers/user_auth.ex:161
+#, elixir-autogen, elixir-format
 msgid "You must confirm your account and log in to access this page."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:52
+#, elixir-autogen, elixir-format
 msgid "Tag could not be removed"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:156
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:126
 msgid "Could not parse number of copies"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:141
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:111
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""
+
+#: lib/cannery/ammo.ex:535
+#, elixir-autogen, elixir-format
+msgid "Invalid multiplier"
+msgstr ""
+
+#: lib/cannery/ammo/ammo_group.ex:84
+#, elixir-autogen, elixir-format
+msgid "Please select an ammo type and container"
+msgstr ""
+
+#: lib/cannery/activity_log/shot_group.ex:69
+#, elixir-autogen, elixir-format
+msgid "Please select a valid user and ammo group"
+msgstr ""

priv/gettext/es/LC_MESSAGES/prompts.po

@@ -3,14 +3,16 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-05-21 19:44+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2022-06-06 19:05+0000\n"
+"Last-Translator: Ed <ed.ylles1997@gmail.com>\n"
+"Language-Team: Spanish <https://weblate.bubbletea.dev/projects/cannery/"
+"prompts/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 3.6.2\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.12.2\n"
 
 ## This file is a PO Template file.
 ##
@@ -21,261 +23,276 @@ msgstr ""
 ## 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_web/live/ammo_type_live/form_component.ex:85
+#: lib/cannery_web/live/container_live/form_component.ex:85
+#: lib/cannery_web/live/invite_live/form_component.ex:80
+#: lib/cannery_web/live/tag_live/form_component.ex:126
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.ex:64
-#: lib/cannery_web/live/container_live/form_component.ex:65
-#: lib/cannery_web/live/invite_live/form_component.ex:59
-#: lib/cannery_web/live/tag_live/form_component.ex:101
 msgid "%{name} created successfully"
-msgstr ""
+msgstr "%{name} creado exitosamente"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/index.ex:41
-#: lib/cannery_web/live/ammo_type_live/show.ex:38
+#: lib/cannery_web/live/ammo_type_live/show.ex:28
 #: lib/cannery_web/live/invite_live/index.ex:53
 #: lib/cannery_web/live/invite_live/index.ex:133
 #: lib/cannery_web/live/tag_live/index.ex:38
+#, elixir-autogen, elixir-format
 msgid "%{name} deleted succesfully"
-msgstr ""
+msgstr "%{name} borrado exitosamente"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.ex:109
+#, elixir-autogen, elixir-format
 msgid "%{name} disabled succesfully"
-msgstr ""
+msgstr "%{name} desactivado exitosamente"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.ex:87
-msgid "%{name} enabled succesfully"
-msgstr ""
-
 #, elixir-autogen, elixir-format
+msgid "%{name} enabled succesfully"
+msgstr "%{name} activado exitosamente"
+
 #: lib/cannery_web/live/container_live/index.ex:62
 #: lib/cannery_web/live/container_live/show.ex:61
+#, elixir-autogen, elixir-format
 msgid "%{name} has been deleted"
-msgstr ""
+msgstr "%{name} ha sido borrado"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.ex:67
+#, elixir-autogen, elixir-format
 msgid "%{name} updated succesfully"
-msgstr ""
+msgstr "%{name} actualizado exitosamente"
 
+#: lib/cannery_web/live/ammo_type_live/form_component.ex:67
+#: lib/cannery_web/live/container_live/form_component.ex:67
+#: lib/cannery_web/live/invite_live/form_component.ex:62
+#: lib/cannery_web/live/tag_live/form_component.ex:108
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.ex:46
-#: lib/cannery_web/live/container_live/form_component.ex:47
-#: lib/cannery_web/live/invite_live/form_component.ex:41
-#: lib/cannery_web/live/tag_live/form_component.ex:83
 msgid "%{name} updated successfully"
-msgstr ""
+msgstr "%{name} actualizado exitosamente"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_settings_controller.ex:29
+#, elixir-autogen, elixir-format
 msgid "A link to confirm your email change has been sent to the new address."
 msgstr ""
+"Un enlace para confirmar el correo electrónico ha sido enviado a la nueva "
+"dirección."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:56
-#: lib/cannery_web/live/ammo_group_live/show.ex:50
+#, elixir-autogen, elixir-format
 msgid "Ammo group deleted succesfully"
-msgstr ""
+msgstr "Grupo de Munición borrado exitosamente"
 
+#: lib/cannery_web/live/invite_live/index.html.heex:103
+#: lib/cannery_web/live/invite_live/index.html.heex:133
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:88
-msgid "Ammo group updated successfully"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.html.heex:102
-#: lib/cannery_web/live/invite_live/index.html.heex:131
 msgid "Are you sure you want to delete %{email}? This action is permanent!"
-msgstr ""
+msgstr "Está seguro que desea eliminar %{email}? Esta acción es permanente!"
 
+#: lib/cannery_web/live/container_live/index.html.heex:48
+#: lib/cannery_web/live/container_live/show.html.heex:51
+#: lib/cannery_web/live/tag_live/index.html.heex:39
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:27
-#: lib/cannery_web/live/container_live/index.html.heex:46
-#: lib/cannery_web/live/container_live/show.html.heex:37
-#: lib/cannery_web/live/tag_live/index.html.heex:38
 msgid "Are you sure you want to delete %{name}?"
-msgstr ""
+msgstr "Está seguro que desea eliminar %{name}?"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.html.heex:49
+#, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete the invite for %{name}?"
-msgstr ""
+msgstr "Está seguro que quiere eliminar la invitación para %{name}?"
 
+#: lib/cannery_web/live/ammo_group_live/index.ex:225
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:75
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:177
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:71
-#: lib/cannery_web/live/ammo_type_live/index.ex:140
 msgid "Are you sure you want to delete this ammo?"
-msgstr ""
+msgstr "Está seguro que desea eliminar esta munición?"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:146
+#, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete your account?"
-msgstr ""
+msgstr "Está seguro que desea eliminar su cuenta?"
 
+#: lib/cannery_web/components/topbar.ex:106
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:84
 msgid "Are you sure you want to log out?"
-msgstr ""
+msgstr "Está seguro que desea cerrar sesión?"
 
+#: lib/cannery_web/live/invite_live/index.html.heex:75
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.html.heex:74
 msgid "Are you sure you want to make %{name} unlimited?"
-msgstr ""
+msgstr "Está seguro que desea hacer %{name} ilimitado?"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_settings_controller.ex:77
-msgid "Email changed successfully."
-msgstr ""
-
 #, elixir-autogen, elixir-format
+msgid "Email changed successfully."
+msgstr "Correo electrónico cambiado exitosamente."
+
 #: lib/cannery_web/controllers/user_confirmation_controller.ex:23
+#, elixir-autogen, elixir-format
 msgid "If your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly."
 msgstr ""
+"Si su correo electrónico está en nuestro sistema y no ha sido confirmado "
+"aun, recibirá un correo con instrucciones en breve."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_reset_password_controller.ex:24
+#, elixir-autogen, elixir-format
 msgid "If your email is in our system, you will receive instructions to reset your password shortly."
 msgstr ""
+"Si su correo electrónico está en nuestro sistema, recibirá instrucciones "
+"para reiniciar la contraseña en breve."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_session_controller.ex:23
+#, elixir-autogen, elixir-format
 msgid "Logged out successfully."
-msgstr ""
+msgstr "Sesión cerrada exitosamente."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_reset_password_controller.ex:46
+#, elixir-autogen, elixir-format
 msgid "Password reset successfully."
-msgstr ""
+msgstr "Contraseña reiniciada exitosamente."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_settings_controller.ex:49
+#, elixir-autogen, elixir-format
 msgid "Password updated successfully."
-msgstr ""
+msgstr "Contraseña cambiada exitosamente."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:74
+#, elixir-autogen, elixir-format
 msgid "Please check your email to verify your account"
-msgstr ""
+msgstr "Por favor chequea el correo para verificar tu cuenta"
 
+#: lib/cannery_web/live/home_live.ex:108
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:96
 msgid "Register to setup %{name}"
-msgstr ""
+msgstr "Regístrese para configurar %{name}"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/components/add_shot_group_component.html.heex:48
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:74
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:157
 #: lib/cannery_web/live/container_live/form_component.html.heex:52
-#: lib/cannery_web/live/invite_live/form_component.html.heex:30
+#: lib/cannery_web/live/invite_live/form_component.html.heex:33
 #: lib/cannery_web/live/range_live/form_component.html.heex:42
-#: lib/cannery_web/live/tag_live/form_component.ex:68
+#: lib/cannery_web/live/tag_live/form_component.ex:93
+#, elixir-autogen, elixir-format
 msgid "Saving..."
-msgstr ""
+msgstr "Guardando..."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_settings_controller.ex:95
-msgid "Your account has been deleted"
-msgstr ""
-
 #, elixir-autogen, elixir-format
+msgid "Your account has been deleted"
+msgstr "Su cuenta ha sido eliminada"
+
 #: lib/cannery_web/live/container_live/edit_tags_component.html.heex:16
+#, elixir-autogen, elixir-format
 msgid "Are you sure you want to remove the %{tag_name} tag from %{container_name}?"
 msgstr ""
+"Está seguro que desea remover la etiqueta %{tag_name} de %{container_name}?"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:36
+#, elixir-autogen, elixir-format
 msgid "%{name} added successfully"
-msgstr ""
+msgstr "%{name} añadido exitosamente"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/show.ex:37
+#, elixir-autogen, elixir-format
 msgid "%{tag_name} has been removed from %{container_name}"
-msgstr ""
+msgstr "se ha removido %{tag_name} de %{container_name}"
 
+#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:55
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:54
 msgid "Adding..."
-msgstr ""
+msgstr "Añadiendo..."
 
+#: lib/cannery_web/components/add_shot_group_component.ex:56
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/add_shot_group_component.ex:68
 msgid "Shots recorded successfully"
-msgstr ""
+msgstr "Tiros registrados exitosamente"
 
+#: lib/cannery_web/live/range_live/index.html.heex:27
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.html.heex:29
 msgid "Are you sure you want to unstage this ammo?"
-msgstr ""
+msgstr "Está seguro que desea desmontar esta munición?"
 
+#: lib/cannery_web/live/ammo_group_live/show.ex:132
+#: lib/cannery_web/live/range_live/index.ex:131
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.ex:68
-msgid "Ammo group unstaged succesfully"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.ex:130
-#: lib/cannery_web/live/range_live/index.ex:128
 msgid "Are you sure you want to delete this shot record?"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/show.ex:78
 #: lib/cannery_web/live/range_live/index.ex:54
+#, elixir-autogen, elixir-format
 msgid "Shot records deleted succesfully"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/range_live/form_component.ex:55
+#, elixir-autogen, elixir-format
 msgid "Shot records updated successfully"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_confirmation_controller.ex:38
+#, elixir-autogen, elixir-format
 msgid "%{email} confirmed successfully."
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/components/move_ammo_group_component.ex:53
+#, elixir-autogen, elixir-format
 msgid "Ammo moved to %{name} successfully"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.ex:121
+#, elixir-autogen, elixir-format
 msgid "Copied to clipboard"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:58
+#, elixir-autogen, elixir-format
 msgid "%{name} removed successfully"
 msgstr ""
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:17
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:27
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:15
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:33
 msgid "You'll need to"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:67
+#, elixir-autogen, elixir-format
 msgid "Creating..."
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:147
-msgid "Ammo group created successfully"
-msgid_plural "Ammo groups created successfully"
-msgstr[0] ""
-msgstr[1] ""
-
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:136
+#, elixir-autogen, elixir-format
 msgid "Are you sure you want to change your language?"
 msgstr ""
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_settings_controller.ex:65
+#, elixir-autogen, elixir-format
 msgid "Language updated successfully."
 msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/show.ex:50
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Ammo deleted succesfully"
+msgstr ""
+
+#: lib/cannery_web/live/range_live/index.ex:68
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Ammo unstaged succesfully"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:118
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Ammo updated successfully"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:177
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Ammo added successfully"
+msgid_plural "Ammo added successfully"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/cannery_web/live/ammo_type_live/index.ex:163
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:28
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!"
+msgstr ""

priv/gettext/fr/LC_MESSAGES/actions.po

@@ -23,204 +23,204 @@ msgstr ""
 ## 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.
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/index.ex:44
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:40
+#, elixir-autogen, elixir-format
 msgid "Add Ammo"
 msgstr "ajouter munition"
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:36
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:24
 msgid "Add your first box!"
 msgstr "Ajoutez votre première caisse !"
 
+#: lib/cannery_web/live/container_live/index.html.heex:13
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/index.html.heex:12
 msgid "Add your first container!"
 msgstr "Ajoutez votre premier conteneur !"
 
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:13
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:12
 msgid "Add your first type!"
 msgstr "Ajoutez votre premier type !"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:15
 #: lib/cannery_web/templates/user_settings/edit.html.heex:44
+#, elixir-autogen, elixir-format
 msgid "Change email"
 msgstr "Changer le mél"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:58
 #: lib/cannery_web/templates/user_settings/edit.html.heex:99
+#, elixir-autogen, elixir-format
 msgid "Change password"
 msgstr "Changer le mot de passe"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.html.heex:17
+#, elixir-autogen, elixir-format
 msgid "Create Invite"
 msgstr "Créer une invitation"
 
+#: lib/cannery_web/templates/user_settings/edit.html.heex:148
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:142
 msgid "Delete User"
 msgstr "Supprimer utilisateur"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_registration/new.html.heex:52
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:3
 #: lib/cannery_web/templates/user_session/new.html.heex:45
+#, elixir-autogen, elixir-format
 msgid "Forgot your password?"
 msgstr "Mot de passe oublié ?"
 
+#: lib/cannery_web/live/invite_live/index.html.heex:13
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.html.heex:12
 msgid "Invite someone new!"
 msgstr "Invitez une nouvelle personne !"
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:106
+#: lib/cannery_web/components/topbar.ex:137
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:30
-#: lib/cannery_web/templates/user_registration/new.html.heex:48
+#: lib/cannery_web/templates/user_registration/new.html.heex:49
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:48
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:30
 #: lib/cannery_web/templates/user_session/new.html.heex:3
 #: lib/cannery_web/templates/user_session/new.html.heex:33
+#, elixir-autogen, elixir-format
 msgid "Log in"
 msgstr "Se connecter"
 
+#: lib/cannery_web/live/tag_live/index.html.heex:15
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/tag_live/index.html.heex:14
 msgid "Make your first tag!"
 msgstr "Faîtes votre premier tag !"
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:42
-msgid "New Ammo group"
-msgstr "Nouveau groupe de munition"
-
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:17
+#, elixir-autogen, elixir-format
 msgid "New Ammo type"
 msgstr "Nouveau type de munition"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/index.html.heex:17
+#, elixir-autogen, elixir-format
 msgid "New Container"
 msgstr "Nouveau conteneur"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/tag_live/index.html.heex:19
+#, elixir-autogen, elixir-format
 msgid "New Tag"
 msgstr "Nouveau tag"
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:99
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:25
+#: lib/cannery_web/components/topbar.ex:128
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:26
 #: lib/cannery_web/templates/user_registration/new.html.heex:3
 #: lib/cannery_web/templates/user_registration/new.html.heex:42
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:43
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:25
-#: lib/cannery_web/templates/user_session/new.html.heex:40
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:44
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:26
+#: lib/cannery_web/templates/user_session/new.html.heex:41
+#, elixir-autogen, elixir-format
 msgid "Register"
 msgstr "S’enregistrer"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:3
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:16
+#, elixir-autogen, elixir-format
 msgid "Resend confirmation instructions"
 msgstr "Renvoyer les instructions de confirmation"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:3
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:34
+#, elixir-autogen, elixir-format
 msgid "Reset password"
 msgstr "Réinitialisé le mot de passe"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/components/add_shot_group_component.html.heex:46
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:73
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:156
 #: lib/cannery_web/live/container_live/form_component.html.heex:50
-#: lib/cannery_web/live/invite_live/form_component.html.heex:28
+#: lib/cannery_web/live/invite_live/form_component.html.heex:31
 #: lib/cannery_web/live/range_live/form_component.html.heex:40
-#: lib/cannery_web/live/tag_live/form_component.ex:66
+#: lib/cannery_web/live/tag_live/form_component.ex:91
+#, elixir-autogen, elixir-format
 msgid "Save"
 msgstr "Sauvegarder"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:16
+#, elixir-autogen, elixir-format
 msgid "Send instructions to reset password"
 msgstr "Envoyer les instructions pour réinitialiser le mot de passe"
 
+#: lib/cannery_web/live/container_live/show.html.heex:72
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/show.html.heex:53
 msgid "Why not add one?"
 msgstr "Pourquoi pas en ajouter un ?"
 
+#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:53
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:52
 msgid "Add"
 msgstr "Ajouter"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/range_live/index.html.heex:17
+#, elixir-autogen, elixir-format
 msgid "Stage ammo"
 msgstr "Munition préparée"
 
+#: lib/cannery_web/live/range_live/index.html.heex:13
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.html.heex:12
 msgid "Why not get some ready to shoot?"
 msgstr "Pourquoi pas en préparer pour tirer ?"
 
+#: lib/cannery_web/live/ammo_group_live/index.ex:190
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:101
+#: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:144
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:91
-#: lib/cannery_web/live/range_live/index.html.heex:36
 msgid "Record shots"
 msgstr "Enregistrer des tirs"
 
+#: lib/cannery_web/components/move_ammo_group_component.ex:90
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:55
-msgid "Ammo Details"
-msgstr "Détails de la munition"
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/components/move_ammo_group_component.ex:89
 msgid "Add another container!"
 msgstr "Ajoutez un autre conteneur !"
 
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:94
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:85
 msgid "Move containers"
 msgstr "Déplacer les conteneurs"
 
+#: lib/cannery_web/components/move_ammo_group_component.ex:126
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/move_ammo_group_component.ex:127
 msgid "Select"
 msgstr "Sélectionner"
 
+#: lib/cannery_web/live/invite_live/index.html.heex:31
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.html.heex:33
 msgid "Copy to clipboard"
 msgstr "Copier dans le presse-papier"
 
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:21
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:18
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:36
 msgid "add a container first"
 msgstr "ajouter un conteneur en premier"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:66
+#, elixir-autogen, elixir-format
 msgid "Create"
 msgstr "Créer"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:113
+#, elixir-autogen, elixir-format
 msgid "Change Language"
 msgstr "Changer la langue"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:134
+#, elixir-autogen, elixir-format
 msgid "Change language"
 msgstr "Changer la langue"
+
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:60
+#, elixir-autogen, elixir-format
+msgid "View in Catalog"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:31
+#, elixir-autogen, elixir-format
+msgid "add an ammo type first"
+msgstr ""

priv/gettext/fr/LC_MESSAGES/emails.po

@@ -23,94 +23,94 @@ msgstr ""
 ## 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.
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/email.ex:30
+#, elixir-autogen, elixir-format
 msgid "Confirm your %{name} account"
 msgstr "Confirmer votre compte %{name}"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/confirm_email.html.eex:3
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:2
 #: lib/cannery_web/templates/email/reset_password.html.eex:3
 #: lib/cannery_web/templates/email/reset_password.txt.eex:2
 #: lib/cannery_web/templates/email/update_email.html.eex:3
 #: lib/cannery_web/templates/email/update_email.txt.eex:2
+#, elixir-autogen, elixir-format
 msgid "Hi %{email},"
 msgstr "Salut %{email},"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:10
+#, elixir-autogen, elixir-format
 msgid "If you didn't create an account at %{url}, please ignore this."
 msgstr "Si vous n’avez créé un compte à %{url}, veuillez ignorer ceci."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/reset_password.txt.eex:8
 #: lib/cannery_web/templates/email/update_email.txt.eex:8
+#, elixir-autogen, elixir-format
 msgid "If you didn't request this change from %{url}, please ignore this."
 msgstr ""
 "Si vous n’avez pas demandé ce changement depuis %{url}, veuillez ignorer "
 "ceci."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/email.ex:37
+#, elixir-autogen, elixir-format
 msgid "Reset your %{name} password"
 msgstr "Réinitialiser votre mot de passe %{name}"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/email.ex:44
+#, elixir-autogen, elixir-format
 msgid "Update your %{name} email"
 msgstr "Mettre à jour votre mél %{name}"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/confirm_email.html.eex:9
+#, elixir-autogen, elixir-format
 msgid "Welcome to %{name}!"
 msgstr "Bienvenue à %{name} !"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:4
+#, elixir-autogen, elixir-format
 msgid "Welcome to %{name}%!"
 msgstr "Bienvenue à %{name}% !"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/update_email.html.eex:8
 #: lib/cannery_web/templates/email/update_email.txt.eex:4
+#, elixir-autogen, elixir-format
 msgid "You can change your email by visiting the URL below:"
 msgstr "Vous pouvez changer votre mél en consultant l’URL ci-dessous :"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/confirm_email.html.eex:14
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:6
+#, elixir-autogen, elixir-format
 msgid "You can confirm your account by visiting the URL below:"
 msgstr "Vous pouvez confirmer votre compte en consultant l’URL ci-dessous :"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/reset_password.html.eex:8
 #: lib/cannery_web/templates/email/reset_password.txt.eex:4
+#, elixir-autogen, elixir-format
 msgid "You can reset your password by visiting the URL below:"
 msgstr ""
 "Vous pouvez réinitialiser votre mot de passe en visitant l’URL ci-dessous :"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/confirm_email.html.eex:22
+#, elixir-autogen, elixir-format
 msgid "If you didn't create an account at %{name}, please ignore this."
 msgstr "Si vous n’avez pas créé de compte à %{name}, veuillez ignorer ceci."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/email/reset_password.html.eex:16
 #: lib/cannery_web/templates/email/update_email.html.eex:16
+#, elixir-autogen, elixir-format
 msgid "If you didn't request this change from %{name}, please ignore this."
 msgstr ""
 "Si vous n’avez pas demandé ce changement depuis %{name}, veuillez ignorer "
 "ceci."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/layout/email.txt.eex:9
+#, elixir-autogen, elixir-format
 msgid "This email was sent from %{name} at %{url}, the self-hosted firearm tracker website."
 msgstr ""
 "Ce mél a été envoyé depuis %{name} à %{url}, le site web de suivi d’arme à "
 "feux."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/layout/email.html.heex:13
+#, elixir-autogen, elixir-format
 msgid "This email was sent from %{name}, the self-hosted firearm tracker website."
 msgstr "Ce mél a été envoyé depuis %{name}, le site web de suivi d’arme à feu."

priv/gettext/fr/LC_MESSAGES/errors.po

@@ -23,165 +23,180 @@ msgstr ""
 ## 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/containers.ex:140
 #, elixir-autogen, elixir-format
-#: lib/cannery/containers.ex:122
 msgid "Container must be empty before deleting"
 msgstr "Le conteneur doit être vide pour être supprimé"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/index.ex:69
 #: lib/cannery_web/live/container_live/show.ex:71
+#, elixir-autogen, elixir-format
 msgid "Could not delete %{name}: %{error}"
 msgstr "Impossible de supprimer %{name} : %{error}"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/index.ex:57
+#, elixir-autogen, elixir-format
 msgid "Could not find that container"
 msgstr "Impossible de trouver ce conteneur"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_settings_controller.ex:84
+#, elixir-autogen, elixir-format
 msgid "Email change link is invalid or it has expired."
 msgstr "Le lien de changement de mél est invalide ou a expiré."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/error/error.html.heex:8
+#, elixir-autogen, elixir-format
 msgid "Error"
 msgstr "Erreur"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/error/error.html.heex:28
+#, elixir-autogen, elixir-format
 msgid "Go back home"
 msgstr "Retour au menu principal"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/views/error_view.ex:11
+#, elixir-autogen, elixir-format
 msgid "Internal Server Error"
 msgstr "Erreur interne du serveur"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_session_controller.ex:17
+#, elixir-autogen, elixir-format
 msgid "Invalid email or password"
 msgstr "Mél ou mot de passe invalide"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/views/error_view.ex:9
+#, elixir-autogen, elixir-format
 msgid "Not found"
 msgstr "Pas trouvé"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_registration/new.html.heex:16
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:16
 #: lib/cannery_web/templates/user_settings/edit.html.heex:21
 #: lib/cannery_web/templates/user_settings/edit.html.heex:64
 #: lib/cannery_web/templates/user_settings/edit.html.heex:119
+#, elixir-autogen, elixir-format
 msgid "Oops, something went wrong! Please check the errors below."
 msgstr ""
 "Oups, quelque chose s’est mal passé ! Veuillez vérifier les erreurs en "
 "dessous."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_reset_password_controller.ex:63
+#, elixir-autogen, elixir-format
 msgid "Reset password link is invalid or it has expired."
 msgstr "Le lien de réinitialisation de mot de passe est invalide ou expiré."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:25
 #: lib/cannery_web/controllers/user_registration_controller.ex:56
+#, elixir-autogen, elixir-format
 msgid "Sorry, public registration is disabled"
 msgstr "Désolé, l’enregistrement public est désactivé"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:15
 #: lib/cannery_web/controllers/user_registration_controller.ex:46
+#, elixir-autogen, elixir-format
 msgid "Sorry, this invite was not found or expired"
 msgstr "Désolé, cette invitation n’est pas trouvée ou est expirée"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_settings_controller.ex:99
+#, elixir-autogen, elixir-format
 msgid "Unable to delete user"
 msgstr "Impossible de supprimer l’utilisateur·ice"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/views/error_view.ex:10
+#, elixir-autogen, elixir-format
 msgid "Unauthorized"
 msgstr "Non autorisé·e"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_confirmation_controller.ex:54
+#, elixir-autogen, elixir-format
 msgid "User confirmation link is invalid or it has expired."
 msgstr "Le lien de confirmation d’utilisateur·ice est invalide ou a expiré."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/invite_live/index.ex:18
+#, elixir-autogen, elixir-format
 msgid "You are not authorized to view this page"
 msgstr "Vous n’êtes pas autorisé·e à voir cette page"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_auth.ex:177
+#, elixir-autogen, elixir-format
 msgid "You are not authorized to view this page."
 msgstr "Vous n’êtes pas autorisé·e à voir cette page."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/user.ex:130
+#, elixir-autogen, elixir-format
 msgid "did not change"
 msgstr "est inchangé"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/user.ex:151
+#, elixir-autogen, elixir-format
 msgid "does not match password"
 msgstr "le mot de passe ne correspond pas"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/user.ex:188
+#, elixir-autogen, elixir-format
 msgid "is not valid"
 msgstr "n’est pas valide"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/accounts/user.ex:84
+#, elixir-autogen, elixir-format
 msgid "must have the @ sign and no spaces"
 msgstr "doit contenir le symbole @ et aucune espace"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery/tags.ex:40
+#, elixir-autogen, elixir-format
 msgid "Tag not found"
 msgstr "Tag pas trouvé"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:30
+#, elixir-autogen, elixir-format
 msgid "Tag could not be added"
 msgstr "Le tag n’a pas pu être ajouté"
 
+#: lib/cannery/activity_log/shot_group.ex:115
 #, elixir-autogen, elixir-format
-#: lib/cannery/activity_log.ex:125
 msgid "Count must be at least 1"
 msgstr "Le nombre doit être au moins égal à 1"
 
+#: lib/cannery/activity_log/shot_group.ex:74
+#: lib/cannery/activity_log/shot_group.ex:111
 #, elixir-autogen, elixir-format
-#: lib/cannery/activity_log.ex:73
-#: lib/cannery/activity_log.ex:120
 msgid "Count must be less than %{count}"
 msgstr "La quantité doit être inférieur à %{count}"
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_auth.ex:39
 #: lib/cannery_web/controllers/user_auth.ex:161
+#, elixir-autogen, elixir-format
 msgid "You must confirm your account and log in to access this page."
 msgstr ""
 "Vous devez d’abord confirmer votre compte et vous connecter pour accéder à "
 "cette page."
 
-#, elixir-autogen, elixir-format
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:52
+#, elixir-autogen, elixir-format
 msgid "Tag could not be removed"
 msgstr "Le tag n’a pas pu être retiré"
 
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:156
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:126
 msgid "Could not parse number of copies"
 msgstr "Impossible d'analyser le nombre de copies"
 
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:141
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:111
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr "Nombre de copies invalide, doit être 1 et %{max}. Été %{multiplier}"
+
+#: lib/cannery/ammo.ex:535
+#, elixir-autogen, elixir-format
+msgid "Invalid multiplier"
+msgstr ""
+
+#: lib/cannery/ammo/ammo_group.ex:84
+#, elixir-autogen, elixir-format
+msgid "Please select an ammo type and container"
+msgstr ""
+
+#: lib/cannery/activity_log/shot_group.ex:69
+#, elixir-autogen, elixir-format
+msgid "Please select a valid user and ammo group"
+msgstr ""