use strict context boundaries and remove all n+1 queries

CHANGELOG.md

@@ -3,6 +3,8 @@
 - Code quality improvements
 - Fix dead link of example bullet abbreviations
 - Fix inaccurate error message when updating shot records
+- Fix tables not sorting dates correctly
+- Fix container table not displaying all fields
 
 # v0.8.3
 - Improve some styles

lib/cannery/accounts.ex

@@ -385,8 +385,18 @@ defmodule Cannery.Accounts do
   """
   @spec allow_registration?() :: boolean()
   def allow_registration? do
-    Application.get_env(:cannery, Cannery.Accounts)[:registration] == "public" or
-      list_users_by_role(:admin) |> Enum.empty?()
+    registration_mode() == :public or list_users_by_role(:admin) |> Enum.empty?()
+  end
+
+  @doc """
+  Returns an atom representing the current configured registration mode
+  """
+  @spec registration_mode() :: :public | :invite_only
+  def registration_mode do
+    case Application.get_env(:cannery, Cannery.Accounts)[:registration] do
+      "public" -> :public
+      _other -> :invite_only
+    end
   end
 
   @doc """

lib/cannery/accounts/invites.ex

@@ -100,13 +100,23 @@ defmodule Cannery.Accounts.Invites do
     end
   end
 
-  @spec get_use_count(Invite.t(), User.t()) :: non_neg_integer()
-  def get_use_count(%Invite{id: invite_id}, %User{role: :admin}) do
-    Repo.one(
+  @spec get_use_count(Invite.t(), User.t()) :: non_neg_integer() | nil
+  def get_use_count(%Invite{id: invite_id} = invite, user) do
+    [invite] |> get_use_counts(user) |> Map.get(invite_id)
+  end
+
+  @spec get_use_counts([Invite.t()], User.t()) ::
+          %{optional(Invite.id()) => non_neg_integer()}
+  def get_use_counts(invites, %User{role: :admin}) do
+    invite_ids = invites |> Enum.map(fn %{id: invite_id} -> invite_id end)
+
+    Repo.all(
       from u in User,
-        where: u.invite_id == ^invite_id,
-        select: count(u.id)
+        where: u.invite_id in ^invite_ids,
+        group_by: u.invite_id,
+        select: {u.invite_id, count(u.id)}
     )
+    |> Map.new()
   end
 
   @spec decrement_invite_changeset(Invite.t()) :: Invite.changeset()

lib/cannery/activity_log.ex

@@ -4,7 +4,8 @@ defmodule Cannery.ActivityLog do
   """
 
   import Ecto.Query, warn: false
-  alias Cannery.{Accounts.User, ActivityLog.ShotGroup, Ammo.AmmoGroup, Repo}
+  alias Cannery.Ammo.{AmmoGroup, AmmoType}
+  alias Cannery.{Accounts.User, ActivityLog.ShotGroup, Repo}
   alias Ecto.Multi
 
   @doc """
@@ -31,8 +32,10 @@ defmodule Cannery.ActivityLog do
 
     Repo.all(
       from sg in ShotGroup,
-        left_join: ag in assoc(sg, :ammo_group),
-        left_join: at in assoc(ag, :ammo_type),
+        left_join: ag in AmmoGroup,
+        on: sg.ammo_group_id == ag.id,
+        left_join: at in AmmoType,
+        on: ag.ammo_type_id == at.id,
         where: sg.user_id == ^user_id,
         where:
           fragment(
@@ -61,6 +64,18 @@ defmodule Cannery.ActivityLog do
     )
   end
 
+  @spec list_shot_groups_for_ammo_group(AmmoGroup.t(), User.t()) :: [ShotGroup.t()]
+  def list_shot_groups_for_ammo_group(
+        %AmmoGroup{id: ammo_group_id, user_id: user_id},
+        %User{id: user_id}
+      ) do
+    Repo.all(
+      from sg in ShotGroup,
+        where: sg.ammo_group_id == ^ammo_group_id,
+        where: sg.user_id == ^user_id
+    )
+  end
+
   @doc """
   Gets a single shot_group.
 
@@ -107,9 +122,15 @@ defmodule Cannery.ActivityLog do
     )
     |> 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)}
+      fn _repo, %{create_shot_group: %{ammo_group_id: ammo_group_id, user_id: user_id}} ->
+        ammo_group =
+          Repo.one(
+            from ag in AmmoGroup,
+              where: ag.id == ^ammo_group_id,
+              where: ag.user_id == ^user_id
+          )
+
+        {:ok, ammo_group}
       end
     )
     |> Multi.update(
@@ -220,4 +241,112 @@ defmodule Cannery.ActivityLog do
       {:error, _other_transaction, _value, _changes_so_far} -> {:error, nil}
     end
   end
+
+  @doc """
+  Returns the number of shot rounds for an ammo group
+  """
+  @spec get_used_count(AmmoGroup.t(), User.t()) :: non_neg_integer()
+  def get_used_count(%AmmoGroup{id: ammo_group_id} = ammo_group, user) do
+    [ammo_group]
+    |> get_used_counts(user)
+    |> Map.get(ammo_group_id, 0)
+  end
+
+  @doc """
+  Returns the number of shot rounds for multiple ammo groups
+  """
+  @spec get_used_counts([AmmoGroup.t()], User.t()) ::
+          %{optional(AmmoGroup.id()) => non_neg_integer()}
+  def get_used_counts(ammo_groups, %User{id: user_id}) do
+    ammo_group_ids =
+      ammo_groups
+      |> Enum.map(fn %{id: ammo_group_id} -> ammo_group_id end)
+
+    Repo.all(
+      from sg in ShotGroup,
+        where: sg.ammo_group_id in ^ammo_group_ids,
+        where: sg.user_id == ^user_id,
+        group_by: sg.ammo_group_id,
+        select: {sg.ammo_group_id, sum(sg.count)}
+    )
+    |> Map.new()
+  end
+
+  @doc """
+  Returns the last entered shot group date for an ammo group
+  """
+  @spec get_last_used_date(AmmoGroup.t(), User.t()) :: Date.t() | nil
+  def get_last_used_date(%AmmoGroup{id: ammo_group_id} = ammo_group, user) do
+    [ammo_group]
+    |> get_last_used_dates(user)
+    |> Map.get(ammo_group_id)
+  end
+
+  @doc """
+  Returns the last entered shot group date for an ammo group
+  """
+  @spec get_last_used_dates([AmmoGroup.t()], User.t()) :: %{optional(AmmoGroup.id()) => Date.t()}
+  def get_last_used_dates(ammo_groups, %User{id: user_id}) do
+    ammo_group_ids =
+      ammo_groups
+      |> Enum.map(fn %AmmoGroup{id: ammo_group_id, user_id: ^user_id} -> ammo_group_id end)
+
+    Repo.all(
+      from sg in ShotGroup,
+        where: sg.ammo_group_id in ^ammo_group_ids,
+        where: sg.user_id == ^user_id,
+        group_by: sg.ammo_group_id,
+        select: {sg.ammo_group_id, max(sg.date)}
+    )
+    |> Map.new()
+  end
+
+  @doc """
+  Gets the total number of rounds shot for an ammo type
+
+  Raises `Ecto.NoResultsError` if the Ammo type does not exist.
+
+  ## Examples
+
+      iex> get_used_count_for_ammo_type(123, %User{id: 123})
+      35
+
+      iex> get_used_count_for_ammo_type(456, %User{id: 123})
+      ** (Ecto.NoResultsError)
+
+  """
+  @spec get_used_count_for_ammo_type(AmmoType.t(), User.t()) :: non_neg_integer()
+  def get_used_count_for_ammo_type(%AmmoType{id: ammo_type_id} = ammo_type, user) do
+    [ammo_type]
+    |> get_used_count_for_ammo_types(user)
+    |> Map.get(ammo_type_id, 0)
+  end
+
+  @doc """
+  Gets the total number of rounds shot for multiple ammo types
+
+  ## Examples
+
+      iex> get_used_count_for_ammo_types(123, %User{id: 123})
+      35
+
+  """
+  @spec get_used_count_for_ammo_types([AmmoType.t()], User.t()) ::
+          %{optional(AmmoType.id()) => non_neg_integer()}
+  def get_used_count_for_ammo_types(ammo_types, %User{id: user_id}) do
+    ammo_type_ids =
+      ammo_types
+      |> Enum.map(fn %AmmoType{id: ammo_type_id, user_id: ^user_id} -> ammo_type_id end)
+
+    Repo.all(
+      from ag in AmmoGroup,
+        left_join: sg in ShotGroup,
+        on: ag.id == sg.ammo_group_id,
+        where: ag.ammo_type_id in ^ammo_type_ids,
+        where: not (sg.count |> is_nil()),
+        group_by: ag.ammo_type_id,
+        select: {ag.ammo_type_id, sum(sg.count)}
+    )
+    |> Map.new()
+  end
 end

lib/cannery/activity_log/shot_group.ex

@@ -6,7 +6,7 @@ defmodule Cannery.ActivityLog.ShotGroup do
   use Ecto.Schema
   import CanneryWeb.Gettext
   import Ecto.Changeset
-  alias Cannery.{Accounts.User, ActivityLog.ShotGroup, Ammo.AmmoGroup, Repo}
+  alias Cannery.{Accounts.User, Ammo, Ammo.AmmoGroup}
   alias Ecto.{Changeset, UUID}
 
   @derive {Jason.Encoder,
@@ -24,25 +24,23 @@ defmodule Cannery.ActivityLog.ShotGroup do
     field :date, :date
     field :notes, :string
 
-    belongs_to :user, User
-    belongs_to :ammo_group, AmmoGroup
+    field :user_id, :binary_id
+    field :ammo_group_id, :binary_id
 
     timestamps()
   end
 
-  @type t :: %ShotGroup{
+  @type t :: %__MODULE__{
           id: id(),
           count: integer,
           notes: String.t() | nil,
           date: Date.t() | nil,
-          ammo_group: AmmoGroup.t() | nil,
           ammo_group_id: AmmoGroup.id(),
-          user: User.t() | nil,
           user_id: User.id(),
           inserted_at: NaiveDateTime.t(),
           updated_at: NaiveDateTime.t()
         }
-  @type new_shot_group :: %ShotGroup{}
+  @type new_shot_group :: %__MODULE__{}
   @type id :: UUID.t()
   @type changeset :: Changeset.t(t() | new_shot_group())
 
@@ -58,44 +56,47 @@ defmodule Cannery.ActivityLog.ShotGroup do
         %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
+      ) do
     shot_group
     |> 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, :date, :ammo_group_id, :user_id])
+    |> validate_required([:date, :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])
+    |> validate_required([:ammo_group_id, :user_id])
     |> add_error(:invalid, dgettext("errors", "Please select a valid user and ammo pack"))
   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} shots", count: ammo_group_count)
+    case changeset |> Changeset.get_field(:count) do
+      nil ->
+        changeset |> Changeset.add_error(:ammo_left, dgettext("errors", "can't be blank"))
 
-      changeset |> Changeset.add_error(:count, error)
-    else
-      changeset
+      count when count > ammo_group_count ->
+        changeset
+        |> Changeset.add_error(:ammo_left, dgettext("errors", "Ammo left must be at least 0"))
+
+      count when count <= 0 ->
+        error =
+          dgettext("errors", "Ammo left can be at most %{count} rounds",
+            count: ammo_group_count - 1
+          )
+
+        changeset |> Changeset.add_error(:ammo_left, error)
+
+      _valid_count ->
+        changeset
     end
   end
 
   @doc false
   @spec update_changeset(t() | new_shot_group(), User.t(), attrs :: map()) :: changeset()
-  def update_changeset(
-        %ShotGroup{user_id: user_id} = shot_group,
-        %User{id: user_id} = user,
-        attrs
-      )
-      when not (user_id |> is_nil()) do
+  def update_changeset(%__MODULE__{} = shot_group, user, attrs) do
     shot_group
     |> cast(attrs, [:count, :notes, :date])
     |> validate_number(:count, greater_than: 0)
@@ -105,12 +106,10 @@ defmodule Cannery.ActivityLog.ShotGroup do
 
   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)
+         %__MODULE__{ammo_group_id: ammo_group_id, count: count},
+         user
+       ) do
+    %{count: ammo_group_count} = Ammo.get_ammo_group!(ammo_group_id, user)
 
     new_shot_group_count = changeset |> Changeset.get_field(:count)
     shot_diff_to_add = new_shot_group_count - count

lib/cannery/ammo/ammo_group.ex

@@ -9,8 +9,8 @@ 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, Containers.Container}
+  alias Cannery.Ammo.AmmoType
+  alias Cannery.{Accounts.User, Containers, Containers.Container}
   alias Ecto.{Changeset, UUID}
 
   @derive {Jason.Encoder,
@@ -33,15 +33,13 @@ defmodule Cannery.Ammo.AmmoGroup do
     field :purchased_on, :date
 
     belongs_to :ammo_type, AmmoType
-    belongs_to :container, Container
-    belongs_to :user, User
-
-    has_many :shot_groups, ShotGroup
+    field :container_id, :binary_id
+    field :user_id, :binary_id
 
     timestamps()
   end
 
-  @type t :: %AmmoGroup{
+  @type t :: %__MODULE__{
           id: id(),
           count: integer,
           notes: String.t() | nil,
@@ -50,14 +48,12 @@ defmodule Cannery.Ammo.AmmoGroup do
           purchased_on: Date.t(),
           ammo_type: AmmoType.t() | nil,
           ammo_type_id: AmmoType.id(),
-          container: Container.t() | nil,
           container_id: Container.id(),
-          user: User.t() | nil,
           user_id: User.id(),
           inserted_at: NaiveDateTime.t(),
           updated_at: NaiveDateTime.t()
         }
-  @type new_ammo_group :: %AmmoGroup{}
+  @type new_ammo_group :: %__MODULE__{}
   @type id :: UUID.t()
   @type changeset :: Changeset.t(t() | new_ammo_group())
 
@@ -76,8 +72,7 @@ defmodule Cannery.Ammo.AmmoGroup do
         %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
+      when is_binary(ammo_type_id) and is_binary(container_id) and is_binary(user_id) do
     ammo_group
     |> change(ammo_type_id: ammo_type_id)
     |> change(user_id: user_id)

lib/cannery/ammo/ammo_type.ex

@@ -8,7 +8,7 @@ defmodule Cannery.Ammo.AmmoType do
   use Ecto.Schema
   import Ecto.Changeset
   alias Cannery.Accounts.User
-  alias Cannery.Ammo.{AmmoGroup, AmmoType}
+  alias Cannery.Ammo.AmmoGroup
   alias Ecto.{Changeset, UUID}
 
   @derive {Jason.Encoder,
@@ -64,14 +64,14 @@ defmodule Cannery.Ammo.AmmoType do
     field :manufacturer, :string
     field :upc, :string
 
-    belongs_to :user, User
+    field :user_id, :binary_id
 
     has_many :ammo_groups, AmmoGroup
 
     timestamps()
   end
 
-  @type t :: %AmmoType{
+  @type t :: %__MODULE__{
           id: id(),
           name: String.t(),
           desc: String.t() | nil,
@@ -95,12 +95,11 @@ defmodule Cannery.Ammo.AmmoType do
           manufacturer: String.t() | nil,
           upc: String.t() | nil,
           user_id: User.id(),
-          user: User.t() | nil,
           ammo_groups: [AmmoGroup.t()] | nil,
           inserted_at: NaiveDateTime.t(),
           updated_at: NaiveDateTime.t()
         }
-  @type new_ammo_type :: %AmmoType{}
+  @type new_ammo_type :: %__MODULE__{}
   @type id :: UUID.t()
   @type changeset :: Changeset.t(t() | new_ammo_type())
 

lib/cannery/containers.ex

@@ -5,10 +5,12 @@ defmodule Cannery.Containers do
 
   import CanneryWeb.Gettext
   import Ecto.Query, warn: false
-  alias Cannery.{Accounts.User, Ammo.AmmoGroup, Repo, Tags.Tag}
-  alias Cannery.Containers.{Container, ContainerTag}
+  alias Cannery.{Accounts.User, Ammo.AmmoGroup, Repo}
+  alias Cannery.Containers.{Container, ContainerTag, Tag}
   alias Ecto.Changeset
 
+  @container_preloads [:tags]
+
   @doc """
   Returns the list of containers.
 
@@ -28,11 +30,9 @@ defmodule Cannery.Containers do
       as: :c,
       left_join: t in assoc(c, :tags),
       as: :t,
-      left_join: ag in assoc(c, :ammo_groups),
-      as: :ag,
       where: c.user_id == ^user_id,
       order_by: c.name,
-      preload: [tags: t, ammo_groups: ag]
+      preload: ^@container_preloads
     )
     |> list_containers_search(search)
     |> Repo.all()
@@ -106,12 +106,10 @@ defmodule Cannery.Containers do
   def get_container!(id, %User{id: user_id}) do
     Repo.one!(
       from c in Container,
-        left_join: t in assoc(c, :tags),
-        left_join: ag in assoc(c, :ammo_groups),
         where: c.user_id == ^user_id,
         where: c.id == ^id,
         order_by: c.name,
-        preload: [tags: t, ammo_groups: ag]
+        preload: ^@container_preloads
     )
   end
 
@@ -130,7 +128,19 @@ defmodule Cannery.Containers do
   @spec create_container(attrs :: map(), User.t()) ::
           {:ok, Container.t()} | {:error, Container.changeset()}
   def create_container(attrs, %User{} = user) do
-    %Container{} |> Container.create_changeset(user, attrs) |> Repo.insert()
+    %Container{}
+    |> Container.create_changeset(user, attrs)
+    |> Repo.insert()
+    |> case do
+      {:ok, container} -> {:ok, container |> preload_container()}
+      {:error, changeset} -> {:error, changeset}
+    end
+  end
+
+  @spec preload_container(Container.t()) :: Container.t()
+  @spec preload_container([Container.t()]) :: [Container.t()]
+  def preload_container(container) do
+    container |> Repo.preload(@container_preloads)
   end
 
   @doc """
@@ -148,7 +158,13 @@ defmodule Cannery.Containers do
   @spec update_container(Container.t(), User.t(), attrs :: map()) ::
           {:ok, Container.t()} | {:error, Container.changeset()}
   def update_container(%Container{user_id: user_id} = container, %User{id: user_id}, attrs) do
-    container |> Container.update_changeset(attrs) |> Repo.update()
+    container
+    |> Container.update_changeset(attrs)
+    |> Repo.update()
+    |> case do
+      {:ok, container} -> {:ok, container |> preload_container()}
+      {:error, changeset} -> {:error, changeset}
+    end
   end
 
   @doc """
@@ -173,7 +189,12 @@ defmodule Cannery.Containers do
     )
     |> case do
       0 ->
-        container |> Repo.delete()
+        container
+        |> Repo.delete()
+        |> case do
+          {:ok, container} -> {:ok, container |> preload_container()}
+          {:error, changeset} -> {:error, changeset}
+        end
 
       _amount ->
         error = dgettext("errors", "Container must be empty before deleting")
@@ -214,8 +235,11 @@ defmodule Cannery.Containers do
         %Container{user_id: user_id} = container,
         %Tag{user_id: user_id} = tag,
         %User{id: user_id}
-      ),
-      do: %ContainerTag{} |> ContainerTag.create_changeset(tag, container) |> Repo.insert!()
+      ) do
+    %ContainerTag{}
+    |> ContainerTag.create_changeset(tag, container)
+    |> Repo.insert!()
+  end
 
   @doc """
   Removes a tag from a container
@@ -226,45 +250,175 @@ defmodule Cannery.Containers do
       %Container{}
 
   """
-  @spec remove_tag!(Container.t(), Tag.t(), User.t()) :: non_neg_integer()
+  @spec remove_tag!(Container.t(), Tag.t(), User.t()) :: {non_neg_integer(), [ContainerTag.t()]}
   def remove_tag!(
         %Container{id: container_id, user_id: user_id},
         %Tag{id: tag_id, user_id: user_id},
         %User{id: user_id}
       ) do
-    {count, _} =
+    {count, results} =
       Repo.delete_all(
         from ct in ContainerTag,
           where: ct.container_id == ^container_id,
-          where: ct.tag_id == ^tag_id
+          where: ct.tag_id == ^tag_id,
+          select: ct
       )
 
-    if count == 0, do: raise("could not delete container tag"), else: count
+    if count == 0, do: raise("could not delete container tag"), else: {count, results}
+  end
+
+  # Container Tags
+
+  @doc """
+  Returns the list of tags.
+
+  ## Examples
+
+      iex> list_tags(%User{id: 123})
+      [%Tag{}, ...]
+
+      iex> list_tags("cool", %User{id: 123})
+      [%Tag{name: "my cool tag"}, ...]
+
+  """
+  @spec list_tags(User.t()) :: [Tag.t()]
+  @spec list_tags(search :: nil | String.t(), User.t()) :: [Tag.t()]
+  def list_tags(search \\ nil, user)
+
+  def list_tags(search, %{id: user_id}) when search |> is_nil() or search == "",
+    do: Repo.all(from t in Tag, where: t.user_id == ^user_id, order_by: t.name)
+
+  def list_tags(search, %{id: user_id}) when search |> is_binary() do
+    trimmed_search = String.trim(search)
+
+    Repo.all(
+      from t in Tag,
+        where: t.user_id == ^user_id,
+        where:
+          fragment(
+            "? @@ websearch_to_tsquery('english', ?)",
+            t.search,
+            ^trimmed_search
+          ),
+        order_by: {
+          :desc,
+          fragment(
+            "ts_rank_cd(?, websearch_to_tsquery('english', ?), 4)",
+            t.search,
+            ^trimmed_search
+          )
+        }
+    )
   end
 
   @doc """
-  Returns number of rounds in container. If data is already preloaded, then
-  there will be no db hit.
+  Gets a single tag.
+
+  ## Examples
+
+      iex> get_tag(123, %User{id: 123})
+      {:ok, %Tag{}}
+
+      iex> get_tag(456, %User{id: 123})
+      {:error, :not_found}
+
   """
-  @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()
+  @spec get_tag(Tag.id(), User.t()) :: {:ok, Tag.t()} | {:error, :not_found}
+  def get_tag(id, %User{id: user_id}) do
+    Repo.one(from t in Tag, where: t.id == ^id and t.user_id == ^user_id)
+    |> case do
+      nil -> {:error, :not_found}
+      tag -> {:ok, tag}
+    end
   end
 
   @doc """
-  Returns number of rounds in container. If data is already preloaded, then
-  there will be no db hit.
+  Gets a single tag.
+
+  Raises `Ecto.NoResultsError` if the Tag does not exist.
+
+  ## Examples
+
+      iex> get_tag!(123, %User{id: 123})
+      %Tag{}
+
+      iex> get_tag!(456, %User{id: 123})
+      ** (Ecto.NoResultsError)
+
   """
-  @spec get_container_rounds!(Container.t()) :: non_neg_integer()
-  def get_container_rounds!(%Container{} = container) do
-    container
-    |> Repo.preload(:ammo_groups)
-    |> Map.fetch!(:ammo_groups)
-    |> Enum.map(fn %{count: count} -> count end)
-    |> Enum.sum()
+  @spec get_tag!(Tag.id(), User.t()) :: Tag.t()
+  def get_tag!(id, %User{id: user_id}) do
+    Repo.one!(
+      from t in Tag,
+        where: t.id == ^id,
+        where: t.user_id == ^user_id
+    )
+  end
+
+  @doc """
+  Creates a tag.
+
+  ## Examples
+
+      iex> create_tag(%{field: value}, %User{id: 123})
+      {:ok, %Tag{}}
+
+      iex> create_tag(%{field: bad_value}, %User{id: 123})
+      {:error, %Changeset{}}
+
+  """
+  @spec create_tag(attrs :: map(), User.t()) ::
+          {:ok, Tag.t()} | {:error, Tag.changeset()}
+  def create_tag(attrs, %User{} = user) do
+    %Tag{} |> Tag.create_changeset(user, attrs) |> Repo.insert()
+  end
+
+  @doc """
+  Updates a tag.
+
+  ## Examples
+
+      iex> update_tag(tag, %{field: new_value}, %User{id: 123})
+      {:ok, %Tag{}}
+
+      iex> update_tag(tag, %{field: bad_value}, %User{id: 123})
+      {:error, %Changeset{}}
+
+  """
+  @spec update_tag(Tag.t(), attrs :: map(), User.t()) ::
+          {:ok, Tag.t()} | {:error, Tag.changeset()}
+  def update_tag(%Tag{user_id: user_id} = tag, attrs, %User{id: user_id}) do
+    tag |> Tag.update_changeset(attrs) |> Repo.update()
+  end
+
+  @doc """
+  Deletes a tag.
+
+  ## Examples
+
+      iex> delete_tag(tag, %User{id: 123})
+      {:ok, %Tag{}}
+
+      iex> delete_tag(tag, %User{id: 123})
+      {:error, %Changeset{}}
+
+  """
+  @spec delete_tag(Tag.t(), User.t()) :: {:ok, Tag.t()} | {:error, Tag.changeset()}
+  def delete_tag(%Tag{user_id: user_id} = tag, %User{id: user_id}) do
+    tag |> Repo.delete()
+  end
+
+  @doc """
+  Deletes a tag.
+
+  ## Examples
+
+      iex> delete_tag!(tag, %User{id: 123})
+      %Tag{}
+
+  """
+  @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!()
   end
 end

lib/cannery/containers/container.ex

@@ -6,8 +6,7 @@ defmodule Cannery.Containers.Container do
   use Ecto.Schema
   import Ecto.Changeset
   alias Ecto.{Changeset, UUID}
-  alias Cannery.Containers.{Container, ContainerTag}
-  alias Cannery.{Accounts.User, Ammo.AmmoGroup, Tags.Tag}
+  alias Cannery.{Accounts.User, Containers.ContainerTag, Containers.Tag}
 
   @derive {Jason.Encoder,
            only: [
@@ -26,28 +25,25 @@ defmodule Cannery.Containers.Container do
     field :location, :string
     field :type, :string
 
-    belongs_to :user, User
+    field :user_id, :binary_id
 
-    has_many :ammo_groups, AmmoGroup
     many_to_many :tags, Tag, join_through: ContainerTag
 
     timestamps()
   end
 
-  @type t :: %Container{
+  @type t :: %__MODULE__{
           id: id(),
           name: String.t(),
           desc: String.t(),
           location: String.t(),
           type: String.t(),
-          user: User.t(),
           user_id: User.id(),
-          ammo_groups: [AmmoGroup.t()] | nil,
           tags: [Tag.t()] | nil,
           inserted_at: NaiveDateTime.t(),
           updated_at: NaiveDateTime.t()
         }
-  @type new_container :: %Container{}
+  @type new_container :: %__MODULE__{}
   @type id :: UUID.t()
   @type changeset :: Changeset.t(t() | new_container())
 

lib/cannery/containers/container_tag.ex

@@ -1,12 +1,12 @@
 defmodule Cannery.Containers.ContainerTag do
   @moduledoc """
   Thru-table struct for associating Cannery.Containers.Container and
-  Cannery.Tags.Tag.
+  Cannery.Containers.Tag.
   """
 
   use Ecto.Schema
   import Ecto.Changeset
-  alias Cannery.{Containers.Container, Containers.ContainerTag, Tags.Tag}
+  alias Cannery.Containers.{Container, Tag}
   alias Ecto.{Changeset, UUID}
 
   @primary_key {:id, :binary_id, autogenerate: true}
@@ -18,7 +18,7 @@ defmodule Cannery.Containers.ContainerTag do
     timestamps()
   end
 
-  @type t :: %ContainerTag{
+  @type t :: %__MODULE__{
           id: id(),
           container: Container.t(),
           container_id: Container.id(),
@@ -27,7 +27,7 @@ defmodule Cannery.Containers.ContainerTag do
           inserted_at: NaiveDateTime.t(),
           updated_at: NaiveDateTime.t()
         }
-  @type new_container_tag :: %ContainerTag{}
+  @type new_container_tag :: %__MODULE__{}
   @type id :: UUID.t()
   @type changeset :: Changeset.t(t() | new_container_tag())
 

lib/cannery/containers/tag.ex

@@ -1,4 +1,4 @@
-defmodule Cannery.Tags.Tag do
+defmodule Cannery.Containers.Tag do
   @moduledoc """
   Tags are added to containers to help organize, and can include custom-defined
   text and bg colors.
@@ -6,8 +6,8 @@ defmodule Cannery.Tags.Tag do
 
   use Ecto.Schema
   import Ecto.Changeset
+  alias Cannery.Accounts.User
   alias Ecto.{Changeset, UUID}
-  alias Cannery.{Accounts.User, Tags.Tag}
 
   @derive {Jason.Encoder,
            only: [
@@ -23,22 +23,21 @@ defmodule Cannery.Tags.Tag do
     field :bg_color, :string
     field :text_color, :string
 
-    belongs_to :user, User
+    field :user_id, :binary_id
 
     timestamps()
   end
 
-  @type t :: %Tag{
+  @type t :: %__MODULE__{
           id: id(),
           name: String.t(),
           bg_color: String.t(),
           text_color: String.t(),
-          user: User.t() | nil,
           user_id: User.id(),
           inserted_at: NaiveDateTime.t(),
           updated_at: NaiveDateTime.t()
         }
-  @type new_tag() :: %Tag{}
+  @type new_tag() :: %__MODULE__{}
   @type id() :: UUID.t()
   @type changeset() :: Changeset.t(t() | new_tag())
 

lib/cannery/tags.ex

@@ -1,149 +0,0 @@
-defmodule Cannery.Tags do
-  @moduledoc """
-  The Tags context.
-  """
-
-  import Ecto.Query, warn: false
-  import CanneryWeb.Gettext
-  alias Cannery.{Accounts.User, Repo, Tags.Tag}
-
-  @doc """
-  Returns the list of tags.
-
-  ## Examples
-
-      iex> list_tags(%User{id: 123})
-      [%Tag{}, ...]
-
-      iex> list_tags("cool", %User{id: 123})
-      [%Tag{name: "my cool tag"}, ...]
-
-  """
-  @spec list_tags(User.t()) :: [Tag.t()]
-  @spec list_tags(search :: nil | String.t(), User.t()) :: [Tag.t()]
-  def list_tags(search \\ nil, user)
-
-  def list_tags(search, %{id: user_id}) when search |> is_nil() or search == "",
-    do: Repo.all(from t in Tag, where: t.user_id == ^user_id, order_by: t.name)
-
-  def list_tags(search, %{id: user_id}) when search |> is_binary() do
-    trimmed_search = String.trim(search)
-
-    Repo.all(
-      from t in Tag,
-        where: t.user_id == ^user_id,
-        where:
-          fragment(
-            "search @@ websearch_to_tsquery('english', ?)",
-            ^trimmed_search
-          ),
-        order_by: {
-          :desc,
-          fragment(
-            "ts_rank_cd(search, websearch_to_tsquery('english', ?), 4)",
-            ^trimmed_search
-          )
-        }
-    )
-  end
-
-  @doc """
-  Gets a single tag.
-
-  ## Examples
-
-      iex> get_tag(123, %User{id: 123})
-      {:ok, %Tag{}}
-
-      iex> get_tag(456, %User{id: 123})
-      {:error, "tag not found"}
-
-  """
-  @spec get_tag(Tag.id(), User.t()) :: {:ok, Tag.t()} | {:error, String.t()}
-  def get_tag(id, %User{id: user_id}) do
-    Repo.one(from t in Tag, where: t.id == ^id and t.user_id == ^user_id)
-    |> case do
-      nil -> {:error, dgettext("errors", "Tag not found")}
-      tag -> {:ok, tag}
-    end
-  end
-
-  @doc """
-  Gets a single tag.
-
-  Raises `Ecto.NoResultsError` if the Tag does not exist.
-
-  ## Examples
-
-      iex> get_tag!(123, %User{id: 123})
-      %Tag{}
-
-      iex> get_tag!(456, %User{id: 123})
-      ** (Ecto.NoResultsError)
-
-  """
-  @spec get_tag!(Tag.id(), User.t()) :: Tag.t()
-  def get_tag!(id, %User{id: user_id}),
-    do: Repo.one!(from t in Tag, where: t.id == ^id and t.user_id == ^user_id)
-
-  @doc """
-  Creates a tag.
-
-  ## Examples
-
-      iex> create_tag(%{field: value}, %User{id: 123})
-      {:ok, %Tag{}}
-
-      iex> create_tag(%{field: bad_value}, %User{id: 123})
-      {:error, %Changeset{}}
-
-  """
-  @spec create_tag(attrs :: map(), User.t()) ::
-          {:ok, Tag.t()} | {:error, Tag.changeset()}
-  def create_tag(attrs, %User{} = user),
-    do: %Tag{} |> Tag.create_changeset(user, attrs) |> Repo.insert()
-
-  @doc """
-  Updates a tag.
-
-  ## Examples
-
-      iex> update_tag(tag, %{field: new_value}, %User{id: 123})
-      {:ok, %Tag{}}
-
-      iex> update_tag(tag, %{field: bad_value}, %User{id: 123})
-      {:error, %Changeset{}}
-
-  """
-  @spec update_tag(Tag.t(), attrs :: map(), User.t()) ::
-          {:ok, Tag.t()} | {:error, Tag.changeset()}
-  def update_tag(%Tag{user_id: user_id} = tag, attrs, %User{id: user_id}),
-    do: tag |> Tag.update_changeset(attrs) |> Repo.update()
-
-  @doc """
-  Deletes a tag.
-
-  ## Examples
-
-      iex> delete_tag(tag, %User{id: 123})
-      {:ok, %Tag{}}
-
-      iex> delete_tag(tag, %User{id: 123})
-      {:error, %Changeset{}}
-
-  """
-  @spec delete_tag(Tag.t(), User.t()) :: {:ok, Tag.t()} | {:error, Tag.changeset()}
-  def delete_tag(%Tag{user_id: user_id} = tag, %User{id: user_id}), do: tag |> Repo.delete()
-
-  @doc """
-  Deletes a tag.
-
-  ## Examples
-
-      iex> delete_tag!(tag, %User{id: 123})
-      %Tag{}
-
-  """
-  @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!()
-end

lib/cannery_web/components/add_shot_group_component.ex

@@ -5,6 +5,7 @@ defmodule CanneryWeb.Components.AddShotGroupComponent do
 
   use CanneryWeb, :live_component
   alias Cannery.{Accounts.User, ActivityLog, ActivityLog.ShotGroup, Ammo.AmmoGroup}
+  alias Ecto.Changeset
   alias Phoenix.LiveView.{JS, Socket}
 
   @impl true
@@ -18,7 +19,7 @@ defmodule CanneryWeb.Components.AddShotGroupComponent do
         ) :: {:ok, Socket.t()}
   def update(%{ammo_group: ammo_group, current_user: current_user} = assigns, socket) do
     changeset =
-      %ShotGroup{date: NaiveDateTime.utc_now(), count: 1}
+      %ShotGroup{date: Date.utc_today()}
       |> ShotGroup.create_changeset(current_user, ammo_group, %{})
 
     {:ok, socket |> assign(assigns) |> assign(:changeset, changeset)}
@@ -32,10 +33,13 @@ defmodule CanneryWeb.Components.AddShotGroupComponent do
       ) do
     params = shot_group_params |> process_params(ammo_group)
 
+    changeset = %ShotGroup{} |> ShotGroup.create_changeset(current_user, ammo_group, params)
+
     changeset =
-      %ShotGroup{}
-      |> ShotGroup.create_changeset(current_user, ammo_group, params)
-      |> Map.put(:action, :validate)
+      case changeset |> Changeset.apply_action(:validate) do
+        {:ok, _data} -> changeset
+        {:error, changeset} -> changeset
+      end
 
     {:noreply, socket |> assign(:changeset, changeset)}
   end
@@ -56,7 +60,7 @@ defmodule CanneryWeb.Components.AddShotGroupComponent do
           prompt = dgettext("prompts", "Shots recorded successfully")
           socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
 
-        {:error, %Ecto.Changeset{} = changeset} ->
+        {:error, %Changeset{} = changeset} ->
           socket |> assign(changeset: changeset)
       end
 
@@ -65,14 +69,14 @@ defmodule CanneryWeb.Components.AddShotGroupComponent do
 
   # calculate count from shots left
   defp process_params(params, %AmmoGroup{count: count}) do
-    new_count =
-      if params |> Map.get("ammo_left", "0") == "" do
-        "0"
+    shot_group_count =
+      if params |> Map.get("ammo_left", "") == "" do
+        nil
       else
-        params |> Map.get("ammo_left", "0")
+        new_count = params |> Map.get("ammo_left") |> String.to_integer()
+        count - new_count
       end
-      |> String.to_integer()
 
-    params |> Map.put("count", count - new_count)
+    params |> Map.put("count", shot_group_count)
   end
 end

lib/cannery_web/components/ammo_group_table_component.ex

@@ -3,7 +3,7 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do
   A component that displays a list of ammo groups
   """
   use CanneryWeb, :live_component
-  alias Cannery.{Accounts.User, Ammo, Ammo.AmmoGroup, Repo}
+  alias Cannery.{Accounts.User, ActivityLog, Ammo, Ammo.AmmoGroup, Containers}
   alias Ecto.UUID
   alias Phoenix.LiveView.{Rendered, Socket}
 
@@ -54,8 +54,8 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do
       end
 
     columns = [
-      %{label: gettext("Purchased on"), key: :purchased_on},
-      %{label: gettext("Last used on"), key: :used_up_on} | columns
+      %{label: gettext("Purchased on"), key: :purchased_on, type: Date},
+      %{label: gettext("Last used on"), key: :used_up_on, type: Date} | columns
     ]
 
     columns =
@@ -94,13 +94,15 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do
       ammo_type: ammo_type,
       columns: columns,
       container: container,
+      original_counts: Ammo.get_original_counts(ammo_groups, current_user),
+      cprs: Ammo.get_cprs(ammo_groups, current_user),
+      last_used_dates: ActivityLog.get_last_used_dates(ammo_groups, current_user),
       actions: actions,
       range: range
     }
 
     rows =
       ammo_groups
-      |> Repo.preload([:ammo_type, :container])
       |> Enum.map(fn ammo_group ->
         ammo_group |> get_row_data_for_ammo_group(extra_data)
       end)
@@ -124,8 +126,6 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do
 
   @spec get_row_data_for_ammo_group(AmmoGroup.t(), additional_data :: map()) :: map()
   defp get_row_data_for_ammo_group(ammo_group, %{columns: columns} = additional_data) do
-    ammo_group = ammo_group |> Repo.preload([:ammo_type, :container])
-
     columns
     |> Map.new(fn %{key: key} ->
       {key, get_value_for_key(key, ammo_group, additional_data)}
@@ -150,30 +150,23 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do
   defp get_value_for_key(:price_paid, %{price_paid: nil}, _additional_data), do: {"", nil}
 
   defp get_value_for_key(:price_paid, %{price_paid: price_paid}, _additional_data),
-    do: gettext("$%{amount}", amount: price_paid |> :erlang.float_to_binary(decimals: 2))
-
-  defp get_value_for_key(:purchased_on, %{purchased_on: purchased_on}, _additional_data) do
-    assigns = %{purchased_on: purchased_on}
+    do: gettext("$%{amount}", amount: display_currency(price_paid))
 
+  defp get_value_for_key(:purchased_on, %{purchased_on: purchased_on} = assigns, _additional_data) do
     {purchased_on,
      ~H"""
-     <.date date={@purchased_on} />
+     <.date id={"#{@id}-purchased-on"} date={@purchased_on} />
      """}
   end
 
-  defp get_value_for_key(:used_up_on, ammo_group, _additional_data) 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
+  defp get_value_for_key(:used_up_on, %{id: ammo_group_id}, %{last_used_dates: last_used_dates}) do
+    last_used_date = last_used_dates |> Map.get(ammo_group_id)
+    assigns = %{id: ammo_group_id, last_used_date: last_used_date}
 
-    assigns = %{last_shot_group_date: last_shot_group_date}
-
-    {last_shot_group_date,
+    {last_used_date,
      ~H"""
-     <%= if @last_shot_group_date do %>
-       <.date date={@last_shot_group_date} />
+     <%= if @last_used_date do %>
+       <.date id={"#{@id}-last-used-date"} date={@last_used_date} />
      <% else %>
        <%= gettext("Never used") %>
      <% end %>
@@ -189,8 +182,11 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do
      """}
   end
 
-  defp get_value_for_key(:remaining, ammo_group, _additional_data),
-    do: gettext("%{percentage}%", percentage: ammo_group |> Ammo.get_percentage_remaining())
+  defp get_value_for_key(:remaining, ammo_group, %{current_user: current_user}),
+    do:
+      gettext("%{percentage}%",
+        percentage: ammo_group |> Ammo.get_percentage_remaining(current_user)
+      )
 
   defp get_value_for_key(:actions, ammo_group, %{actions: actions}) do
     assigns = %{actions: actions, ammo_group: ammo_group}
@@ -204,31 +200,40 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do
 
   defp get_value_for_key(
          :container,
-         %{container: %{name: container_name}} = ammo_group,
-         %{container: container}
+         %{container_id: container_id} = ammo_group,
+         %{container: container, current_user: current_user}
        ) do
-    assigns = %{container: container, ammo_group: ammo_group}
+    assigns = %{
+      container:
+        %{name: container_name} = container_id |> Containers.get_container!(current_user),
+      container_block: container,
+      ammo_group: ammo_group
+    }
 
     {container_name,
      ~H"""
-     <%= render_slot(@container, @ammo_group) %>
+     <%= render_slot(@container_block, {@ammo_group, @container}) %>
      """}
   end
 
-  defp get_value_for_key(:original_count, ammo_group, _additional_data),
-    do: ammo_group |> Ammo.get_original_count()
+  defp get_value_for_key(:original_count, %{id: ammo_group_id}, %{
+         original_counts: original_counts
+       }) do
+    Map.fetch!(original_counts, ammo_group_id)
+  end
 
   defp get_value_for_key(:cpr, %{price_paid: nil}, _additional_data),
     do: gettext("No cost information")
 
-  defp get_value_for_key(:cpr, ammo_group, _additional_data) do
-    gettext("$%{amount}",
-      amount: ammo_group |> Ammo.get_cpr() |> :erlang.float_to_binary(decimals: 2)
-    )
+  defp get_value_for_key(:cpr, %{id: ammo_group_id}, %{cprs: cprs}) do
+    gettext("$%{amount}", amount: display_currency(Map.fetch!(cprs, ammo_group_id)))
   end
 
   defp get_value_for_key(:count, %{count: count}, _additional_data),
     do: if(count == 0, do: gettext("Empty"), else: count)
 
   defp get_value_for_key(key, ammo_group, _additional_data), do: ammo_group |> Map.get(key)
+
+  @spec display_currency(float()) :: String.t()
+  defp display_currency(float), do: :erlang.float_to_binary(float, decimals: 2)
 end

lib/cannery_web/components/ammo_type_table_component.ex

@@ -3,7 +3,7 @@ defmodule CanneryWeb.Components.AmmoTypeTableComponent do
   A component that displays a list of ammo type
   """
   use CanneryWeb, :live_component
-  alias Cannery.{Accounts.User, Ammo, Ammo.AmmoType}
+  alias Cannery.{Accounts.User, ActivityLog, Ammo, Ammo.AmmoType}
   alias Ecto.UUID
   alias Phoenix.LiveView.{Rendered, Socket}
 
@@ -103,13 +103,13 @@ defmodule CanneryWeb.Components.AmmoTypeTableComponent do
           [
             %{
               label: gettext("Used packs"),
-              key: :used_ammo_count,
-              type: :used_ammo_count
+              key: :used_packs_count,
+              type: :used_packs_count
             },
             %{
               label: gettext("Total ever packs"),
-              key: :historical_ammo_count,
-              type: :historical_ammo_count
+              key: :historical_packs_count,
+              type: :historical_packs_count
             }
           ]
         else
@@ -121,7 +121,35 @@ defmodule CanneryWeb.Components.AmmoTypeTableComponent do
         %{label: nil, key: "actions", type: :actions, sortable: false}
       ])
 
-    extra_data = %{actions: actions, current_user: current_user}
+    round_counts = ammo_types |> Ammo.get_round_count_for_ammo_types(current_user)
+
+    used_counts =
+      show_used && ammo_types |> ActivityLog.get_used_count_for_ammo_types(current_user)
+
+    historical_round_counts =
+      show_used && ammo_types |> Ammo.get_historical_count_for_ammo_types(current_user)
+
+    packs_count = ammo_types |> Ammo.get_ammo_groups_count_for_types(current_user)
+
+    historical_packs_count =
+      show_used && ammo_types |> Ammo.get_ammo_groups_count_for_types(current_user, true)
+
+    used_packs_count =
+      show_used && ammo_types |> Ammo.get_used_ammo_groups_count_for_types(current_user)
+
+    average_costs = ammo_types |> Ammo.get_average_cost_for_ammo_types(current_user)
+
+    extra_data = %{
+      actions: actions,
+      current_user: current_user,
+      used_counts: used_counts,
+      round_counts: round_counts,
+      historical_round_counts: historical_round_counts,
+      packs_count: packs_count,
+      used_packs_count: used_packs_count,
+      historical_packs_count: historical_packs_count,
+      average_costs: average_costs
+    }
 
     rows =
       ammo_types
@@ -156,28 +184,44 @@ defmodule CanneryWeb.Components.AmmoTypeTableComponent do
   defp get_ammo_type_value(:boolean, key, ammo_type, _other_data),
     do: ammo_type |> Map.get(key) |> humanize()
 
-  defp get_ammo_type_value(:round_count, _key, ammo_type, %{current_user: current_user}),
-    do: ammo_type |> Ammo.get_round_count_for_ammo_type(current_user)
+  defp get_ammo_type_value(:round_count, _key, %{id: ammo_type_id}, %{round_counts: round_counts}),
+    do: Map.get(round_counts, ammo_type_id)
 
-  defp get_ammo_type_value(:historical_round_count, _key, ammo_type, %{current_user: current_user}),
-       do: ammo_type |> Ammo.get_historical_count_for_ammo_type(current_user)
+  defp get_ammo_type_value(
+         :historical_round_count,
+         _key,
+         %{id: ammo_type_id},
+         %{historical_round_counts: historical_round_counts}
+       ),
+       do: Map.get(historical_round_counts, ammo_type_id)
 
-  defp get_ammo_type_value(:used_round_count, _key, ammo_type, %{current_user: current_user}),
-    do: ammo_type |> Ammo.get_used_count_for_ammo_type(current_user)
+  defp get_ammo_type_value(:used_round_count, _key, %{id: ammo_type_id}, %{
+         used_counts: used_counts
+       }),
+       do: Map.get(used_counts, ammo_type_id)
 
-  defp get_ammo_type_value(:historical_ammo_count, _key, ammo_type, %{current_user: current_user}),
-    do: ammo_type |> Ammo.get_ammo_groups_count_for_type(current_user, true)
+  defp get_ammo_type_value(
+         :historical_packs_count,
+         _key,
+         %{id: ammo_type_id},
+         %{historical_packs_count: historical_packs_count}
+       ),
+       do: Map.get(historical_packs_count, ammo_type_id)
 
-  defp get_ammo_type_value(:used_ammo_count, _key, ammo_type, %{current_user: current_user}),
-    do: ammo_type |> Ammo.get_used_ammo_groups_count_for_type(current_user)
+  defp get_ammo_type_value(:used_packs_count, _key, %{id: ammo_type_id}, %{
+         used_packs_count: used_packs_count
+       }),
+       do: Map.get(used_packs_count, ammo_type_id)
 
-  defp get_ammo_type_value(:ammo_count, _key, ammo_type, %{current_user: current_user}),
-    do: ammo_type |> Ammo.get_ammo_groups_count_for_type(current_user)
+  defp get_ammo_type_value(:ammo_count, _key, %{id: ammo_type_id}, %{packs_count: packs_count}),
+    do: Map.get(packs_count, ammo_type_id)
 
-  defp get_ammo_type_value(:avg_price_paid, _key, ammo_type, %{current_user: current_user}) do
-    case ammo_type |> Ammo.get_average_cost_for_ammo_type!(current_user) do
+  defp get_ammo_type_value(:avg_price_paid, _key, %{id: ammo_type_id}, %{
+         average_costs: average_costs
+       }) do
+    case Map.get(average_costs, ammo_type_id) do
       nil -> gettext("No cost information")
-      count -> gettext("$%{amount}", amount: count |> :erlang.float_to_binary(decimals: 2))
+      count -> gettext("$%{amount}", amount: display_currency(count))
     end
   end
 
@@ -202,4 +246,7 @@ defmodule CanneryWeb.Components.AmmoTypeTableComponent do
   defp get_ammo_type_value(nil, _key, _ammo_type, _other_data), do: nil
 
   defp get_ammo_type_value(_other, key, ammo_type, _other_data), do: ammo_type |> Map.get(key)
+
+  @spec display_currency(float()) :: String.t()
+  defp display_currency(float), do: :erlang.float_to_binary(float, decimals: 2)
 end

lib/cannery_web/components/container_table_component.ex

@@ -3,7 +3,7 @@ defmodule CanneryWeb.Components.ContainerTableComponent do
   A component that displays a list of containers
   """
   use CanneryWeb, :live_component
-  alias Cannery.{Accounts.User, Containers, Containers.Container, Repo}
+  alias Cannery.{Accounts.User, Ammo, Containers.Container}
   alias Ecto.UUID
   alias Phoenix.LiveView.{Rendered, Socket}
 
@@ -45,11 +45,7 @@ defmodule CanneryWeb.Components.ContainerTableComponent do
         %{label: gettext("Name"), key: :name, type: :string},
         %{label: gettext("Description"), key: :desc, type: :string},
         %{label: gettext("Location"), key: :location, type: :string},
-        %{label: gettext("Type"), key: :type, type: :string},
-        %{label: gettext("Packs"), key: :packs, type: :integer},
-        %{label: gettext("Rounds"), key: :rounds, type: :string},
-        %{label: gettext("Tags"), key: :tags, type: :tags},
-        %{label: nil, key: :actions, sortable: false, type: :actions}
+        %{label: gettext("Type"), key: :type, type: :string}
       ]
       |> Enum.filter(fn %{key: key, type: type} ->
         # remove columns if all values match defaults
@@ -64,11 +60,19 @@ defmodule CanneryWeb.Components.ContainerTableComponent do
           type in [:tags, :actions] or not (container |> Map.get(key) == default_value)
         end)
       end)
+      |> Enum.concat([
+        %{label: gettext("Packs"), key: :packs, type: :integer},
+        %{label: gettext("Rounds"), key: :rounds, type: :integer},
+        %{label: gettext("Tags"), key: :tags, type: :tags},
+        %{label: nil, key: :actions, sortable: false, type: :actions}
+      ])
 
     extra_data = %{
       current_user: current_user,
       tag_actions: tag_actions,
-      actions: actions
+      actions: actions,
+      pack_count: Ammo.get_ammo_groups_count_for_containers(containers, current_user),
+      round_count: Ammo.get_round_count_for_containers(containers, current_user)
     }
 
     rows =
@@ -100,8 +104,6 @@ defmodule CanneryWeb.Components.ContainerTableComponent do
 
   @spec get_row_data_for_container(Container.t(), columns :: [map()], extra_data :: map) :: map()
   defp get_row_data_for_container(container, columns, extra_data) do
-    container = container |> Repo.preload([:ammo_groups, :tags])
-
     columns
     |> Map.new(fn %{key: key} -> {key, get_value_for_key(key, container, extra_data)} end)
   end
@@ -120,18 +122,24 @@ defmodule CanneryWeb.Components.ContainerTableComponent do
      """}
   end
 
-  defp get_value_for_key(:packs, container, _extra_data) do
-    container |> Containers.get_container_ammo_group_count!()
+  defp get_value_for_key(:packs, %{id: container_id}, %{pack_count: pack_count}) do
+    pack_count |> Map.get(container_id, 0)
   end
 
-  defp get_value_for_key(:rounds, container, _extra_data) do
-    container |> Containers.get_container_rounds!()
+  defp get_value_for_key(:rounds, %{id: container_id}, %{round_count: round_count}) do
+    round_count |> Map.get(container_id, 0)
   end
 
   defp get_value_for_key(:tags, container, %{tag_actions: tag_actions}) do
     assigns = %{tag_actions: tag_actions, container: container}
 
-    {container.tags |> Enum.map(fn %{name: name} -> name end),
+    tag_names =
+      container.tags
+      |> Enum.map(fn %{name: name} -> name end)
+      |> Enum.sort()
+      |> Enum.join(" ")
+
+    {tag_names,
      ~H"""
      <div class="flex flex-wrap justify-center items-center">
        <.simple_tag_card :for={tag <- @container.tags} :if={@container.tags} tag={tag} />

lib/cannery_web/components/core_components.ex

@@ -4,9 +4,9 @@ defmodule CanneryWeb.CoreComponents do
   """
   use Phoenix.Component
   import CanneryWeb.{Gettext, ViewHelpers}
-  alias Cannery.{Accounts, Ammo, Ammo.AmmoGroup}
-  alias Cannery.Accounts.{Invite, Invites, User}
-  alias Cannery.{Containers, Containers.Container, Tags.Tag}
+  alias Cannery.{Accounts, Accounts.Invite, Accounts.User}
+  alias Cannery.{Ammo, Ammo.AmmoGroup}
+  alias Cannery.{Containers, Containers.Container, Containers.Tag}
   alias CanneryWeb.{Endpoint, HomeLive}
   alias CanneryWeb.Router.Helpers, as: Routes
   alias Phoenix.LiveView.{JS, Rendered}
@@ -70,6 +70,7 @@ defmodule CanneryWeb.CoreComponents do
   def toggle_button(assigns)
 
   attr :container, Container, required: true
+  attr :current_user, User, required: true
   slot(:tag_actions)
   slot(:inner_block)
 
@@ -86,73 +87,30 @@ defmodule CanneryWeb.CoreComponents do
   def simple_tag_card(assigns)
 
   attr :ammo_group, AmmoGroup, required: true
+  attr :current_user, User, required: true
+  attr :original_count, :integer, default: nil
+  attr :cpr, :integer, default: nil
+  attr :last_used_date, Date, default: nil
   attr :show_container, :boolean, default: false
   slot(:inner_block)
 
   def ammo_group_card(assigns)
 
+  @spec display_currency(float()) :: String.t()
+  defp display_currency(float), do: :erlang.float_to_binary(float, decimals: 2)
+
   attr :user, User, required: true
   slot(:inner_block, required: true)
 
   def user_card(assigns)
 
   attr :invite, Invite, required: true
+  attr :use_count, :integer, default: nil
   attr :current_user, User, required: true
   slot(:inner_block)
   slot(:code_actions)
 
-  def invite_card(%{invite: invite, current_user: current_user} = assigns) do
-    assigns = assigns |> assign(:use_count, Invites.get_use_count(invite, current_user))
-
-    ~H"""
-    <div class="mx-4 my-2 px-8 py-4 flex flex-col justify-center items-center space-y-4
-      border border-gray-400 rounded-lg shadow-lg hover:shadow-md
-      transition-all duration-300 ease-in-out">
-      <h1 class="title text-xl">
-        <%= @invite.name %>
-      </h1>
-
-      <%= if @invite.disabled_at |> is_nil() do %>
-        <h2 class="title text-md">
-          <%= if @invite.uses_left do %>
-            <%= gettext(
-              "Uses Left: %{uses_left_count}",
-              uses_left_count: @invite.uses_left
-            ) %>
-          <% else %>
-            <%= gettext("Uses Left: Unlimited") %>
-          <% end %>
-        </h2>
-      <% else %>
-        <h2 class="title text-md">
-          <%= gettext("Invite Disabled") %>
-        </h2>
-      <% end %>
-
-      <.qr_code
-        content={Routes.user_registration_url(Endpoint, :new, invite: @invite.token)}
-        filename={@invite.name}
-      />
-
-      <h2 :if={@use_count != 0} class="title text-md">
-        <%= gettext("Uses: %{uses_count}", uses_count: @use_count) %>
-      </h2>
-
-      <div class="flex flex-row flex-wrap justify-center items-center">
-        <code
-          id={"code-#{@invite.id}"}
-          class="mx-2 my-1 text-xs px-4 py-2 rounded-lg text-center break-all text-gray-100 bg-primary-800"
-          phx-no-format
-        ><%= Routes.user_registration_url(Endpoint, :new, invite: @invite.token) %></code>
-        <%= if @code_actions, do: render_slot(@code_actions) %>
-      </div>
-
-      <div :if={@inner_block} class="flex space-x-4 justify-center items-center">
-        <%= render_slot(@inner_block) %>
-      </div>
-    </div>
-    """
-  end
+  def invite_card(assigns)
 
   attr :content, :string, required: true
   attr :filename, :string, default: "qrcode", doc: "filename without .png extension"
@@ -164,6 +122,7 @@ defmodule CanneryWeb.CoreComponents do
   """
   def qr_code(assigns)
 
+  attr :id, :string, required: true
   attr :date, :any, required: true, doc: "A `Date` struct or nil"
 
   @doc """
@@ -172,6 +131,7 @@ defmodule CanneryWeb.CoreComponents do
   """
   def date(assigns)
 
+  attr :id, :string, required: true
   attr :datetime, :any, required: true, doc: "A `DateTime` struct or nil"
 
   @doc """

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

@@ -17,12 +17,9 @@
       <%= if @ammo_group.count == 0, do: gettext("Empty"), else: @ammo_group.count %>
     </span>
 
-    <span
-      :if={@ammo_group |> Ammo.get_original_count() != @ammo_group.count}
-      class="rounded-lg title text-lg"
-    >
+    <span :if={@original_count != @ammo_group.count} class="rounded-lg title text-lg">
       <%= gettext("Original Count:") %>
-      <%= @ammo_group |> Ammo.get_original_count() %>
+      <%= @original_count %>
     </span>
 
     <span :if={@ammo_group.notes} class="rounded-lg title text-lg">
@@ -32,38 +29,35 @@
 
     <span class="rounded-lg title text-lg">
       <%= gettext("Purchased on:") %>
-      <.date date={@ammo_group.purchased_on} />
+      <.date id={"#{@ammo_group.id}-purchased-on"} date={@ammo_group.purchased_on} />
     </span>
 
-    <span :if={@ammo_group |> Ammo.get_last_used_shot_group()} class="rounded-lg title text-lg">
+    <span :if={@last_used_date} class="rounded-lg title text-lg">
       <%= gettext("Last used on:") %>
-      <.date date={@ammo_group |> Ammo.get_last_used_shot_group() |> Map.get(:date)} />
+      <.date id={"#{@ammo_group.id}-last-used-on"} date={@last_used_date} />
     </span>
 
-    <%= if @ammo_group.price_paid do %>
-      <span class="rounded-lg title text-lg">
-        <%= gettext("Price paid:") %>
-        <%= gettext("$%{amount}",
-          amount: @ammo_group.price_paid |> :erlang.float_to_binary(decimals: 2)
-        ) %>
-      </span>
+    <span :if={@ammo_group.price_paid} class="rounded-lg title text-lg">
+      <%= gettext("Price paid:") %>
+      <%= gettext("$%{amount}", amount: display_currency(@ammo_group.price_paid)) %>
+    </span>
 
-      <span class="rounded-lg title text-lg">
-        <%= gettext("CPR:") %>
-        <%= gettext("$%{amount}",
-          amount: @ammo_group |> Ammo.get_cpr() |> :erlang.float_to_binary(decimals: 2)
-        ) %>
-      </span>
-    <% end %>
+    <span :if={@cpr} class="rounded-lg title text-lg">
+      <%= gettext("CPR:") %>
+      <%= gettext("$%{amount}", amount: display_currency(@cpr)) %>
+    </span>
 
-    <span :if={@show_container and @ammo_group.container} class="rounded-lg title text-lg">
+    <span
+      :if={@show_container && Containers.get_container!(@ammo_group.container_id, @current_user)}
+      class="rounded-lg title text-lg"
+    >
       <%= gettext("Container:") %>
 
       <.link
-        navigate={Routes.container_show_path(Endpoint, :show, @ammo_group.container)}
+        navigate={Routes.container_show_path(Endpoint, :show, @ammo_group.container_id)}
         class="link"
       >
-        <%= @ammo_group.container.name %>
+        <%= Containers.get_container!(@ammo_group.container_id, @current_user).name %>
       </.link>
     </span>
   </div>

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

@@ -1,17 +1,17 @@
 <div
   id={"container-#{@container.id}"}
   class="overflow-hidden max-w-full mx-4 mb-4 px-8 py-4
-    flex flex-col justify-center items-center space-y-4
+    flex flex-col justify-around items-center space-y-4
     border border-gray-400 rounded-lg shadow-lg hover:shadow-md
     transition-all duration-300 ease-in-out"
 >
-  <div class="max-w-full mb-4 flex flex-col justify-center items-center space-y-2">
-    <.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>
-    </.link>
+  <.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>
+  </.link>
 
+  <div class="flex flex-col justify-center items-center space-y-2">
     <span :if={@container.desc} class="rounded-lg title text-lg">
       <%= gettext("Description:") %>
       <%= @container.desc %>
@@ -27,20 +27,23 @@
       <%= @container.location %>
     </span>
 
-    <%= unless @container.ammo_groups |> Enum.empty?() do %>
+    <%= if @container |> Ammo.get_ammo_groups_count_for_container!(@current_user) != 0 do %>
       <span class="rounded-lg title text-lg">
         <%= gettext("Packs:") %>
-        <%= @container |> Containers.get_container_ammo_group_count!() %>
+        <%= @container |> Ammo.get_ammo_groups_count_for_container!(@current_user) %>
       </span>
 
       <span class="rounded-lg title text-lg">
         <%= gettext("Rounds:") %>
-        <%= @container |> Containers.get_container_rounds!() %>
+        <%= @container |> Ammo.get_round_count_for_container!(@current_user) %>
       </span>
     <% end %>
 
-    <div class="flex flex-wrap justify-center items-center">
-      <.simple_tag_card :for={tag <- @container.tags} :if={@container.tags} tag={tag} />
+    <div
+      :if={@tag_actions || @container.tags != []}
+      class="flex flex-wrap justify-center items-center"
+    >
+      <.simple_tag_card :for={tag <- @container.tags} tag={tag} />
 
       <%= if @tag_actions, do: render_slot(@tag_actions) %>
     </div>

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

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

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

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

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

@@ -0,0 +1,46 @@
+<div class="mx-4 my-2 px-8 py-4 flex flex-col justify-center items-center space-y-4
+  border border-gray-400 rounded-lg shadow-lg hover:shadow-md
+  transition-all duration-300 ease-in-out">
+  <h1 class="title text-xl">
+    <%= @invite.name %>
+  </h1>
+
+  <%= if @invite.disabled_at |> is_nil() do %>
+    <h2 class="title text-md">
+      <%= if @invite.uses_left do %>
+        <%= gettext(
+          "Uses Left: %{uses_left_count}",
+          uses_left_count: @invite.uses_left
+        ) %>
+      <% else %>
+        <%= gettext("Uses Left: Unlimited") %>
+      <% end %>
+    </h2>
+  <% else %>
+    <h2 class="title text-md">
+      <%= gettext("Invite Disabled") %>
+    </h2>
+  <% end %>
+
+  <.qr_code
+    content={Routes.user_registration_url(Endpoint, :new, invite: @invite.token)}
+    filename={@invite.name}
+  />
+
+  <h2 :if={@use_count && @use_count != 0} class="title text-md">
+    <%= gettext("Uses: %{uses_count}", uses_count: @use_count) %>
+  </h2>
+
+  <div class="flex flex-row flex-wrap justify-center items-center">
+    <code
+      id={"code-#{@invite.id}"}
+      class="mx-2 my-1 text-xs px-4 py-2 rounded-lg text-center break-all text-gray-100 bg-primary-800"
+      phx-no-format
+    ><%= Routes.user_registration_url(Endpoint, :new, invite: @invite.token) %></code>
+    <%= if @code_actions, do: render_slot(@code_actions) %>
+  </div>
+
+  <div :if={@inner_block} class="flex space-x-4 justify-center items-center">
+    <%= render_slot(@inner_block) %>
+  </div>
+</div>

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

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

lib/cannery_web/components/move_ammo_group_component.ex

@@ -6,6 +6,7 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
   use CanneryWeb, :live_component
   alias Cannery.{Accounts.User, Ammo, Ammo.AmmoGroup, Containers, Containers.Container}
   alias CanneryWeb.Endpoint
+  alias Ecto.Changeset
   alias Phoenix.LiveView.Socket
 
   @impl true
@@ -51,10 +52,9 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
       |> case do
         {:ok, _ammo_group} ->
           prompt = dgettext("prompts", "Ammo moved to %{name} successfully", name: container_name)
-
           socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
 
-        {:error, %Ecto.Changeset{} = changeset} ->
+        {:error, %Changeset{} = changeset} ->
           socket |> assign(changeset: changeset)
       end
 
@@ -64,10 +64,10 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
   @impl true
   def render(%{containers: containers} = assigns) do
     columns = [
-      %{label: gettext("Container"), key: "name"},
-      %{label: gettext("Type"), key: "type"},
-      %{label: gettext("Location"), key: "location"},
-      %{label: nil, key: "actions", sortable: false}
+      %{label: gettext("Container"), key: :name},
+      %{label: gettext("Type"), key: :type},
+      %{label: gettext("Location"), key: :location},
+      %{label: nil, key: :actions, sortable: false}
     ]
 
     rows = containers |> get_rows_for_containers(assigns, columns)
@@ -110,8 +110,8 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
     end)
   end
 
-  @spec get_row_value_by_key(String.t(), Container.t(), map()) :: any()
-  defp get_row_value_by_key("actions", container, assigns) do
+  @spec get_row_value_by_key(atom(), Container.t(), map()) :: any()
+  defp get_row_value_by_key(:actions, container, assigns) do
     assigns = assigns |> Map.put(:container, container)
 
     ~H"""
@@ -129,6 +129,5 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
     """
   end
 
-  defp get_row_value_by_key(key, container, _assigns),
-    do: container |> Map.get(key |> String.to_existing_atom())
+  defp get_row_value_by_key(key, container, _assigns), do: container |> Map.get(key)
 end

lib/cannery_web/components/shot_group_table_component.ex

@@ -3,7 +3,7 @@ defmodule CanneryWeb.Components.ShotGroupTableComponent do
   A component that displays a list of shot groups
   """
   use CanneryWeb, :live_component
-  alias Cannery.{Accounts.User, ActivityLog.ShotGroup, Repo}
+  alias Cannery.{Accounts.User, ActivityLog.ShotGroup, Ammo}
   alias Ecto.UUID
   alias Phoenix.LiveView.{Rendered, Socket}
 
@@ -41,11 +41,16 @@ defmodule CanneryWeb.Components.ShotGroupTableComponent do
       %{label: gettext("Ammo"), key: :name},
       %{label: gettext("Rounds shot"), key: :count},
       %{label: gettext("Notes"), key: :notes},
-      %{label: gettext("Date"), key: :date},
+      %{label: gettext("Date"), key: :date, type: Date},
       %{label: nil, key: :actions, sortable: false}
     ]
 
-    extra_data = %{current_user: current_user, actions: actions}
+    ammo_groups =
+      shot_groups
+      |> Enum.map(fn %{ammo_group_id: ammo_group_id} -> ammo_group_id end)
+      |> Ammo.get_ammo_groups(current_user)
+
+    extra_data = %{current_user: current_user, actions: actions, ammo_groups: ammo_groups}
 
     rows =
       shot_groups
@@ -79,34 +84,28 @@ defmodule CanneryWeb.Components.ShotGroupTableComponent do
   @spec get_row_data_for_shot_group(ShotGroup.t(), columns :: [map()], extra_data :: map()) ::
           map()
   defp get_row_data_for_shot_group(shot_group, columns, extra_data) do
-    shot_group = shot_group |> Repo.preload(ammo_group: :ammo_type)
-
     columns
     |> Map.new(fn %{key: key} ->
       {key, get_row_value(key, shot_group, extra_data)}
     end)
   end
 
-  defp get_row_value(
-         :name,
-         %{ammo_group: %{ammo_type: %{name: ammo_type_name} = ammo_group}},
-         _extra_data
-       ) do
-    assigns = %{ammo_group: ammo_group, ammo_type_name: ammo_type_name}
+  defp get_row_value(:name, %{ammo_group_id: ammo_group_id}, %{ammo_groups: ammo_groups}) do
+    assigns = %{ammo_group: ammo_group = Map.fetch!(ammo_groups, ammo_group_id)}
 
-    name_block = ~H"""
-    <.link navigate={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)} class="link">
-      <%= @ammo_type_name %>
-    </.link>
-    """
-
-    {ammo_type_name, name_block}
+    {ammo_group.ammo_type.name,
+     ~H"""
+     <.link navigate={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)} class="link">
+       <%= @ammo_group.ammo_type.name %>
+     </.link>
+     """}
   end
 
-  defp get_row_value(:date, %{date: _date} = assigns, _extra_data) do
-    ~H"""
-    <.date date={@date} />
-    """
+  defp get_row_value(:date, %{date: date} = assigns, _extra_data) do
+    {date,
+     ~H"""
+     <.date id={"#{@id}-date"} date={@date} />
+     """}
   end
 
   defp get_row_value(:actions, shot_group, %{actions: actions}) do

lib/cannery_web/components/table_component.ex

@@ -33,7 +33,8 @@ defmodule CanneryWeb.Components.TableComponent do
                 optional(:class) => String.t(),
                 optional(:row_class) => String.t(),
                 optional(:alternate_row_class) => String.t(),
-                optional(:sortable) => false
+                optional(:sortable) => false,
+                optional(:type) => module()
               }),
             required(:rows) =>
               list(%{
@@ -60,7 +61,8 @@ defmodule CanneryWeb.Components.TableComponent do
         :asc
       end
 
-    rows = rows |> sort_by_custom_sort_value_or_value(initial_key, initial_sort_mode)
+    type = columns |> Enum.find(%{}, fn %{key: key} -> key == initial_key end) |> Map.get(:type)
+    rows = rows |> sort_by_custom_sort_value_or_value(initial_key, initial_sort_mode, type)
 
     socket =
       socket
@@ -68,6 +70,7 @@ defmodule CanneryWeb.Components.TableComponent do
       |> assign(
         columns: columns,
         rows: rows,
+        key: initial_key,
         last_sort_key: initial_key,
         sort_mode: initial_sort_mode
       )
@@ -81,7 +84,14 @@ defmodule CanneryWeb.Components.TableComponent do
   def handle_event(
         "sort_by",
         %{"sort-key" => key},
-        %{assigns: %{rows: rows, last_sort_key: last_sort_key, sort_mode: sort_mode}} = socket
+        %{
+          assigns: %{
+            columns: columns,
+            rows: rows,
+            last_sort_key: last_sort_key,
+            sort_mode: sort_mode
+          }
+        } = socket
       ) do
     key = key |> String.to_existing_atom()
 
@@ -92,11 +102,28 @@ defmodule CanneryWeb.Components.TableComponent do
         {_new_sort_key, _last_sort_mode} -> :asc
       end
 
-    rows = rows |> sort_by_custom_sort_value_or_value(key, sort_mode)
+    type =
+      columns |> Enum.find(%{}, fn %{key: column_key} -> column_key == key end) |> Map.get(:type)
+
+    rows = rows |> sort_by_custom_sort_value_or_value(key, sort_mode, type)
     {: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
+  defp sort_by_custom_sort_value_or_value(rows, key, sort_mode, type)
+       when type in [Date, DateTime] do
+    rows
+    |> Enum.sort_by(
+      fn row ->
+        case row |> Map.get(key) do
+          {custom_sort_key, _value} -> custom_sort_key
+          value -> value
+        end
+      end,
+      {sort_mode, type}
+    )
+  end
+
+  defp sort_by_custom_sort_value_or_value(rows, key, sort_mode, _type) do
     rows
     |> Enum.sort_by(
       fn row ->

lib/cannery_web/controllers/export_controller.ex

@@ -3,41 +3,49 @@ defmodule CanneryWeb.ExportController do
   alias Cannery.{ActivityLog, Ammo, Containers}
 
   def export(%{assigns: %{current_user: current_user}} = conn, %{"mode" => "json"}) do
-    ammo_types =
-      Ammo.list_ammo_types(current_user)
-      |> Enum.map(fn ammo_type ->
-        average_cost = ammo_type |> Ammo.get_average_cost_for_ammo_type!(current_user)
-        round_count = ammo_type |> Ammo.get_round_count_for_ammo_type(current_user)
-        used_count = ammo_type |> Ammo.get_used_count_for_ammo_type(current_user)
-        ammo_group_count = ammo_type |> Ammo.get_ammo_groups_count_for_type(current_user, true)
+    ammo_types = Ammo.list_ammo_types(current_user)
+    used_counts = ammo_types |> ActivityLog.get_used_count_for_ammo_types(current_user)
+    round_counts = ammo_types |> Ammo.get_round_count_for_ammo_types(current_user)
+    ammo_group_counts = ammo_types |> Ammo.get_ammo_groups_count_for_types(current_user)
 
+    total_ammo_group_counts =
+      ammo_types |> Ammo.get_ammo_groups_count_for_types(current_user, true)
+
+    average_costs = ammo_types |> Ammo.get_average_cost_for_ammo_types(current_user)
+
+    ammo_types =
+      ammo_types
+      |> Enum.map(fn %{id: ammo_type_id} = ammo_type ->
         ammo_type
         |> Jason.encode!()
         |> Jason.decode!()
         |> Map.merge(%{
-          "average_cost" => average_cost,
-          "round_count" => round_count,
-          "used_count" => used_count,
-          "ammo_group_count" => ammo_group_count
+          "average_cost" => Map.get(average_costs, ammo_type_id),
+          "round_count" => Map.get(round_counts, ammo_type_id, 0),
+          "used_count" => Map.get(used_counts, ammo_type_id, 0),
+          "ammo_group_count" => Map.get(ammo_group_counts, ammo_type_id, 0),
+          "total_ammo_group_count" => Map.get(total_ammo_group_counts, ammo_type_id, 0)
         })
       end)
 
+    ammo_groups = Ammo.list_ammo_groups(nil, true, current_user)
+    used_counts = ammo_groups |> ActivityLog.get_used_counts(current_user)
+    original_counts = ammo_groups |> Ammo.get_original_counts(current_user)
+    cprs = ammo_groups |> Ammo.get_cprs(current_user)
+
     ammo_groups =
-      Ammo.list_ammo_groups(nil, true, current_user)
-      |> Enum.map(fn ammo_group ->
-        cpr = ammo_group |> Ammo.get_cpr()
-        used_count = ammo_group |> Ammo.get_used_count()
-        original_count = ammo_group |> Ammo.get_original_count()
-        percentage_remaining = ammo_group |> Ammo.get_percentage_remaining()
+      ammo_groups
+      |> Enum.map(fn %{id: ammo_group_id} = ammo_group ->
+        percentage_remaining = ammo_group |> Ammo.get_percentage_remaining(current_user)
 
         ammo_group
         |> Jason.encode!()
         |> Jason.decode!()
         |> Map.merge(%{
-          "used_count" => used_count,
+          "used_count" => Map.get(used_counts, ammo_group_id),
           "percentage_remaining" => percentage_remaining,
-          "original_count" => original_count,
-          "cpr" => cpr
+          "original_count" => Map.get(original_counts, ammo_group_id),
+          "cpr" => Map.get(cprs, ammo_group_id)
         })
       end)
 
@@ -46,8 +54,8 @@ defmodule CanneryWeb.ExportController do
     containers =
       Containers.list_containers(current_user)
       |> Enum.map(fn container ->
-        ammo_group_count = container |> Containers.get_container_ammo_group_count!()
-        round_count = container |> Containers.get_container_rounds!()
+        ammo_group_count = container |> Ammo.get_ammo_groups_count_for_container!(current_user)
+        round_count = container |> Ammo.get_round_count_for_container!(current_user)
 
         container
         |> Jason.encode!()

lib/cannery_web/controllers/user_registration_controller.ex

@@ -3,6 +3,7 @@ defmodule CanneryWeb.UserRegistrationController do
   import CanneryWeb.Gettext
   alias Cannery.{Accounts, Accounts.Invites}
   alias CanneryWeb.{Endpoint, HomeLive}
+  alias Ecto.Changeset
 
   def new(conn, %{"invite" => invite_token}) do
     if Invites.valid_invite_token?(invite_token) do
@@ -70,7 +71,7 @@ defmodule CanneryWeb.UserRegistrationController do
         |> put_flash(:error, dgettext("errors", "Sorry, this invite was not found or expired"))
         |> redirect(to: Routes.live_path(Endpoint, HomeLive))
 
-      {:error, %Ecto.Changeset{} = changeset} ->
+      {:error, %Changeset{} = changeset} ->
         conn |> render("new.html", changeset: changeset, invite_token: invite_token)
     end
   end

lib/cannery_web/live/ammo_group_live/form_component.ex

@@ -44,7 +44,7 @@ defmodule CanneryWeb.AmmoGroupLive.FormComponent do
 
   @impl true
   def handle_event("validate", %{"ammo_group" => ammo_group_params}, socket) do
-    {:noreply, socket |> assign_changeset(ammo_group_params)}
+    {:noreply, socket |> assign_changeset(ammo_group_params, :validate)}
   end
 
   def handle_event(
@@ -56,6 +56,7 @@ defmodule CanneryWeb.AmmoGroupLive.FormComponent do
   end
 
   # HTML Helpers
+
   @spec container_options([Container.t()]) :: [{String.t(), Container.id()}]
   defp container_options(containers) do
     containers |> Enum.map(fn %{id: id, name: name} -> {name, id} end)
@@ -70,35 +71,28 @@ defmodule CanneryWeb.AmmoGroupLive.FormComponent do
 
   defp assign_changeset(
          %{assigns: %{action: action, ammo_group: ammo_group, current_user: user}} = socket,
-         ammo_group_params
+         ammo_group_params,
+         changeset_action \\ nil
        ) do
-    changeset_action =
-      cond do
-        action in [:new, :clone] -> :insert
-        action == :edit -> :update
+    default_action =
+      case action do
+        create when create in [:new, :clone] -> :insert
+        :edit -> :update
       end
 
     changeset =
-      cond do
-        action in [:new, :clone] ->
-          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
-
+      case default_action do
+        :insert ->
+          ammo_type = maybe_get_ammo_type(ammo_group_params, user)
+          container = maybe_get_container(ammo_group_params, user)
           ammo_group |> AmmoGroup.create_changeset(ammo_type, container, user, ammo_group_params)
 
-        action == :edit ->
+        :update ->
           ammo_group |> AmmoGroup.update_changeset(ammo_group_params, user)
       end
 
     changeset =
-      case changeset |> Changeset.apply_action(changeset_action) do
+      case changeset |> Changeset.apply_action(changeset_action || default_action) do
         {:ok, _data} -> changeset
         {:error, changeset} -> changeset
       end
@@ -106,6 +100,20 @@ defmodule CanneryWeb.AmmoGroupLive.FormComponent do
     socket |> assign(:changeset, changeset)
   end
 
+  defp maybe_get_container(%{"container_id" => container_id}, user)
+       when is_binary(container_id) do
+    container_id |> Containers.get_container!(user)
+  end
+
+  defp maybe_get_container(_params_not_found, _user), do: nil
+
+  defp maybe_get_ammo_type(%{"ammo_type_id" => ammo_type_id}, user)
+       when is_binary(ammo_type_id) do
+    ammo_type_id |> Ammo.get_ammo_type!(user)
+  end
+
+  defp maybe_get_ammo_type(_params_not_found, _user), do: nil
+
   defp save_ammo_group(
          %{assigns: %{ammo_group: ammo_group, current_user: current_user, return_to: return_to}} =
            socket,
@@ -146,27 +154,26 @@ defmodule CanneryWeb.AmmoGroupLive.FormComponent do
               multiplier: multiplier
             )
 
-          {:error, changeset} =
-            changeset
-            |> Changeset.add_error(:multiplier, error_msg)
-            |> Changeset.apply_action(:insert)
-
-          socket |> assign(:changeset, changeset)
+          save_multiplier_error(socket, changeset, error_msg)
 
         :error ->
           error_msg = dgettext("errors", "Could not parse number of copies")
-
-          {:error, changeset} =
-            changeset
-            |> Changeset.add_error(:multiplier, error_msg)
-            |> Changeset.apply_action(:insert)
-
-          socket |> assign(:changeset, changeset)
+          save_multiplier_error(socket, changeset, error_msg)
       end
 
     {:noreply, socket}
   end
 
+  @spec save_multiplier_error(Socket.t(), Changeset.t(), String.t()) :: Socket.t()
+  defp save_multiplier_error(socket, changeset, error_msg) do
+    {:error, changeset} =
+      changeset
+      |> Changeset.add_error(:multiplier, error_msg)
+      |> Changeset.apply_action(:insert)
+
+    socket |> assign(:changeset, changeset)
+  end
+
   defp create_multiple(
          %{assigns: %{current_user: current_user, return_to: return_to}} = socket,
          ammo_group_params,

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

@@ -104,7 +104,7 @@
           </.link>
         </div>
       </:range>
-      <:container :let={%{container: %{name: container_name} = container} = ammo_group}>
+      <:container :let={{ammo_group, %{name: container_name} = container}}>
         <div class="min-w-20 py-2 px-4 h-full flex flew-wrap justify-center items-center">
           <.link
             navigate={Routes.container_show_path(Endpoint, :show, container)}
@@ -117,18 +117,18 @@
             patch={Routes.ammo_group_index_path(Endpoint, :move, ammo_group)}
             class="mx-2 my-1 text-sm btn btn-primary"
           >
-            <%= gettext("Move ammo") %>
+            <%= dgettext("actions", "Move ammo") %>
           </.link>
         </div>
       </:container>
-      <:actions :let={ammo_group}>
+      <:actions :let={%{count: ammo_group_count} = ammo_group}>
         <div class="py-2 px-4 h-full space-x-4 flex justify-center items-center">
           <.link
             navigate={Routes.ammo_group_show_path(Endpoint, :show, ammo_group)}
             class="text-primary-600 link"
             aria-label={
-              gettext("View ammo group of %{ammo_group_count} bullets",
-                ammo_group_count: ammo_group.count
+              dgettext("actions", "View ammo group of %{ammo_group_count} bullets",
+                ammo_group_count: ammo_group_count
               )
             }
           >
@@ -139,8 +139,8 @@
             patch={Routes.ammo_group_index_path(Endpoint, :edit, ammo_group)}
             class="text-primary-600 link"
             aria-label={
-              gettext("Edit ammo group of %{ammo_group_count} bullets",
-                ammo_group_count: ammo_group.count
+              dgettext("actions", "Edit ammo group of %{ammo_group_count} bullets",
+                ammo_group_count: ammo_group_count
               )
             }
           >
@@ -151,8 +151,8 @@
             patch={Routes.ammo_group_index_path(Endpoint, :clone, ammo_group)}
             class="text-primary-600 link"
             aria-label={
-              gettext("Clone ammo group of %{ammo_group_count} bullets",
-                ammo_group_count: ammo_group.count
+              dgettext("actions", "Clone ammo group of %{ammo_group_count} bullets",
+                ammo_group_count: ammo_group_count
               )
             }
           >
@@ -166,8 +166,8 @@
             phx-value-id={ammo_group.id}
             data-confirm={dgettext("prompts", "Are you sure you want to delete this ammo?")}
             aria-label={
-              gettext("Delete ammo group of %{ammo_group_count} bullets",
-                ammo_group_count: ammo_group.count
+              dgettext("actions", "Delete ammo group of %{ammo_group_count} bullets",
+                ammo_group_count: ammo_group_count
               )
             }
           >
@@ -179,8 +179,8 @@
   <% end %>
 </div>
 
-<%= cond do %>
-  <% @live_action in [:new, :edit, :clone] -> %>
+<%= case @live_action do %>
+  <% create when create in [:new, :edit, :clone] -> %>
     <.modal return_to={Routes.ammo_group_index_path(Endpoint, :index)}>
       <.live_component
         module={CanneryWeb.AmmoGroupLive.FormComponent}
@@ -192,7 +192,7 @@
         current_user={@current_user}
       />
     </.modal>
-  <% @live_action == :add_shot_group -> %>
+  <% :add_shot_group -> %>
     <.modal return_to={Routes.ammo_group_index_path(Endpoint, :index)}>
       <.live_component
         module={CanneryWeb.Components.AddShotGroupComponent}
@@ -204,7 +204,7 @@
         current_user={@current_user}
       />
     </.modal>
-  <% @live_action == :move -> %>
+  <% :move -> %>
     <.modal return_to={Routes.ammo_group_index_path(Endpoint, :index)}>
       <.live_component
         module={CanneryWeb.Components.MoveAmmoGroupComponent}
@@ -216,6 +216,5 @@
         current_user={@current_user}
       />
     </.modal>
-  <% true -> %>
-    <%= nil %>
+  <% _ -> %>
 <% end %>

lib/cannery_web/live/ammo_group_live/show.ex

@@ -4,7 +4,9 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
   """
 
   use CanneryWeb, :live_view
-  alias Cannery.{ActivityLog, ActivityLog.ShotGroup, Ammo, Ammo.AmmoGroup, Repo}
+  alias Cannery.{ActivityLog, ActivityLog.ShotGroup}
+  alias Cannery.{Ammo, Ammo.AmmoGroup}
+  alias Cannery.Containers
   alias CanneryWeb.Endpoint
   alias Phoenix.LiveView.Socket
 
@@ -81,30 +83,45 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
   end
 
   @spec display_ammo_group(Socket.t(), AmmoGroup.t() | AmmoGroup.id()) :: Socket.t()
-  defp display_ammo_group(socket, %AmmoGroup{} = ammo_group) do
-    ammo_group = ammo_group |> Repo.preload([:container, :ammo_type, :shot_groups], force: true)
-
+  defp display_ammo_group(
+         %{assigns: %{current_user: current_user}} = socket,
+         %AmmoGroup{container_id: container_id} = ammo_group
+       ) do
     columns = [
       %{label: gettext("Rounds shot"), key: :count},
       %{label: gettext("Notes"), key: :notes},
-      %{label: gettext("Date"), key: :date},
+      %{label: gettext("Date"), key: :date, type: Date},
       %{label: nil, key: :actions, sortable: false}
     ]
 
+    shot_groups = ActivityLog.list_shot_groups_for_ammo_group(ammo_group, current_user)
+
     rows =
-      ammo_group.shot_groups
+      shot_groups
       |> Enum.map(fn shot_group ->
         ammo_group |> get_table_row_for_shot_group(shot_group, columns)
       end)
 
-    socket |> assign(ammo_group: ammo_group, columns: columns, rows: rows)
+    socket
+    |> assign(
+      ammo_group: ammo_group,
+      original_count: Ammo.get_original_count(ammo_group, current_user),
+      percentage_remaining: Ammo.get_percentage_remaining(ammo_group, current_user),
+      container: container_id && Containers.get_container!(container_id, current_user),
+      shot_groups: shot_groups,
+      columns: columns,
+      rows: rows
+    )
   end
 
   defp display_ammo_group(%{assigns: %{current_user: current_user}} = socket, id),
     do: display_ammo_group(socket, Ammo.get_ammo_group!(id, current_user))
 
+  @spec display_currency(float()) :: String.t()
+  defp display_currency(float), do: :erlang.float_to_binary(float, decimals: 2)
+
   @spec get_table_row_for_shot_group(AmmoGroup.t(), ShotGroup.t(), [map()]) :: map()
-  defp get_table_row_for_shot_group(ammo_group, %{date: date} = shot_group, columns) do
+  defp get_table_row_for_shot_group(ammo_group, %{id: id, date: date} = shot_group, columns) do
     assigns = %{ammo_group: ammo_group, shot_group: shot_group}
 
     columns
@@ -112,11 +129,11 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
       value =
         case key do
           :date ->
-            assigns = %{date: date}
+            assigns = %{id: id, date: date}
 
             {date,
              ~H"""
-             <.date date={@date} />
+             <.date id={"#{@id}-date"} date={@date} />
              """}
 
           :actions ->

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

@@ -11,12 +11,12 @@
 
     <span class="rounded-lg title text-lg">
       <%= gettext("Original count:") %>
-      <%= Ammo.get_original_count(@ammo_group) %>
+      <%= @original_count %>
     </span>
 
     <span class="rounded-lg title text-lg">
       <%= gettext("Percentage left:") %>
-      <%= gettext("%{percentage}%", percentage: @ammo_group |> Ammo.get_percentage_remaining()) %>
+      <%= gettext("%{percentage}%", percentage: @percentage_remaining) %>
     </span>
 
     <%= if @ammo_group.notes do %>
@@ -28,23 +28,19 @@
 
     <span class="rounded-lg title text-lg">
       <%= gettext("Purchased on:") %>
-      <.date date={@ammo_group.purchased_on} />
+      <.date id={"#{@ammo_group.id}-purchased-on"} date={@ammo_group.purchased_on} />
     </span>
 
     <%= if @ammo_group.price_paid do %>
       <span class="rounded-lg title text-lg">
         <%= gettext("Original cost:") %>
-        <%= gettext("$%{amount}",
-          amount: @ammo_group.price_paid |> :erlang.float_to_binary(decimals: 2)
-        ) %>
+        <%= gettext("$%{amount}", amount: display_currency(@ammo_group.price_paid)) %>
       </span>
 
       <span class="rounded-lg title text-lg">
         <%= gettext("Current value:") %>
         <%= gettext("$%{amount}",
-          amount:
-            (@ammo_group.price_paid * Ammo.get_percentage_remaining(@ammo_group) / 100)
-            |> :erlang.float_to_binary(decimals: 2)
+          amount: display_currency(@ammo_group.price_paid * @percentage_remaining / 100)
         ) %>
       </span>
     <% end %>
@@ -77,7 +73,7 @@
         phx-click="delete"
         data-confirm={dgettext("prompts", "Are you sure you want to delete this ammo?")}
         aria-label={
-          gettext("Delete ammo group of %{ammo_group_count} bullets",
+          dgettext("actions", "Delete ammo group of %{ammo_group_count} bullets",
             ammo_group_count: @ammo_group.count
           )
         }
@@ -97,7 +93,7 @@
         patch={Routes.ammo_group_show_path(Endpoint, :move, @ammo_group)}
         class="btn btn-primary"
       >
-        <%= dgettext("actions", "Move containers") %>
+        <%= dgettext("actions", "Move ammo") %>
       </.link>
 
       <.link
@@ -112,18 +108,18 @@
   <hr class="mb-4 w-full" />
 
   <div>
-    <%= if @ammo_group.container do %>
+    <%= if @container do %>
       <h1 class="mb-4 px-4 py-2 text-center rounded-lg title text-xl">
         <%= gettext("Stored in") %>
       </h1>
 
-      <.container_card container={@ammo_group.container} />
+      <.container_card container={@container} current_user={@current_user} />
     <% else %>
       <%= gettext("This ammo is not in a container") %>
     <% end %>
   </div>
 
-  <%= unless @ammo_group.shot_groups |> Enum.empty?() do %>
+  <%= unless @shot_groups |> Enum.empty?() do %>
     <hr class="mb-4 w-full" />
 
     <h1 class="mb-4 px-4 py-2 text-center rounded-lg title text-xl">

lib/cannery_web/live/ammo_type_live/form_component.ex

@@ -35,15 +35,18 @@ defmodule CanneryWeb.AmmoTypeLive.FormComponent do
          ammo_type_params
        ) do
     changeset_action =
-      cond do
-        action in [:new, :clone] -> :insert
-        action == :edit -> :update
+      case action do
+        create when create in [:new, :clone] -> :insert
+        :edit -> :update
       end
 
     changeset =
-      cond do
-        action in [:new, :clone] -> ammo_type |> AmmoType.create_changeset(user, ammo_type_params)
-        action == :edit -> ammo_type |> AmmoType.update_changeset(ammo_type_params)
+      case action do
+        create when create in [:new, :clone] ->
+          ammo_type |> AmmoType.create_changeset(user, ammo_type_params)
+
+        :edit ->
+          ammo_type |> AmmoType.update_changeset(ammo_type_params)
       end
 
     changeset =

lib/cannery_web/live/ammo_type_live/index.ex

@@ -69,9 +69,7 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
   @impl true
   def handle_event("delete", %{"id" => id}, %{assigns: %{current_user: current_user}} = socket) do
     %{name: name} = Ammo.get_ammo_type!(id, current_user) |> Ammo.delete_ammo_type!(current_user)
-
     prompt = dgettext("prompts", "%{name} deleted succesfully", name: name)
-
     {:noreply, socket |> put_flash(:info, prompt) |> list_ammo_types()}
   end
 
@@ -84,8 +82,8 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
   end
 
   def handle_event("search", %{"search" => %{"search_term" => search_term}}, socket) do
-    {:noreply,
-     socket |> push_patch(to: Routes.ammo_type_index_path(Endpoint, :search, search_term))}
+    search_path = Routes.ammo_type_index_path(Endpoint, :search, search_term)
+    {:noreply, socket |> push_patch(to: search_path)}
   end
 
   defp list_ammo_types(%{assigns: %{search: search, current_user: current_user}} = socket) do

lib/cannery_web/live/ammo_type_live/show.ex

@@ -4,7 +4,7 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
   """
 
   use CanneryWeb, :live_view
-  alias Cannery.{Ammo, Ammo.AmmoType}
+  alias Cannery.{ActivityLog, Ammo, Ammo.AmmoType}
   alias CanneryWeb.Endpoint
 
   @fields_list [
@@ -91,12 +91,27 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
         ammo_type |> Map.get(field) != default_value
       end)
 
+    ammo_groups = ammo_type |> Ammo.list_ammo_groups_for_type(current_user, show_used)
+    original_counts = ammo_groups |> Ammo.get_original_counts(current_user)
+    cprs = ammo_groups |> Ammo.get_cprs(current_user)
+    historical_packs_count = ammo_type |> Ammo.get_ammo_groups_count_for_type(current_user, true)
+    last_used_dates = ammo_groups |> ActivityLog.get_last_used_dates(current_user)
+
     socket
     |> assign(
       page_title: page_title(live_action, ammo_type),
       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),
+      ammo_groups: ammo_groups,
+      original_counts: original_counts,
+      cprs: cprs,
+      last_used_dates: last_used_dates,
+      avg_cost_per_round: ammo_type |> Ammo.get_average_cost_for_ammo_type(current_user),
+      rounds: ammo_type |> Ammo.get_round_count_for_ammo_type(current_user),
+      used_rounds: ammo_type |> ActivityLog.get_used_count_for_ammo_type(current_user),
+      historical_round_count: ammo_type |> Ammo.get_historical_count_for_ammo_type(current_user),
+      packs_count: ammo_type |> Ammo.get_ammo_groups_count_for_type(current_user),
+      used_packs_count: ammo_type |> Ammo.get_used_ammo_groups_count_for_type(current_user),
+      historical_packs_count: historical_packs_count,
       fields_list: @fields_list,
       fields_to_display: fields_to_display
     )
@@ -110,6 +125,9 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
     socket |> display_ammo_type(ammo_type)
   end
 
+  @spec display_currency(float()) :: String.t()
+  defp display_currency(float), do: :erlang.float_to_binary(float, decimals: 2)
+
   defp page_title(action, %{name: ammo_type_name}) when action in [:show, :table],
     do: ammo_type_name
 

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

@@ -6,8 +6,8 @@
   <span
     :if={@ammo_type.desc}
     class="max-w-2xl w-full px-8 py-4 rounded-lg
-    text-center title text-lg
-    border border-primary-600"
+      text-center title text-lg
+      border border-primary-600"
   >
     <%= @ammo_type.desc %>
   </span>
@@ -71,7 +71,7 @@
     </h3>
 
     <span class="text-primary-600">
-      <%= @ammo_type |> Ammo.get_round_count_for_ammo_type(@current_user) %>
+      <%= @rounds %>
     </span>
 
     <h3 class="title text-lg">
@@ -79,7 +79,7 @@
     </h3>
 
     <span class="text-primary-600">
-      <%= @ammo_type |> Ammo.get_used_count_for_ammo_type(@current_user) %>
+      <%= @used_rounds %>
     </span>
 
     <h3 class="title text-lg">
@@ -87,7 +87,7 @@
     </h3>
 
     <span class="text-primary-600">
-      <%= @ammo_type |> Ammo.get_historical_count_for_ammo_type(@current_user) %>
+      <%= @historical_round_count %>
     </span>
   </div>
 
@@ -99,7 +99,7 @@
     </h3>
 
     <span class="text-primary-600">
-      <%= @ammo_type |> Ammo.get_ammo_groups_count_for_type(@current_user) %>
+      <%= @packs_count %>
     </span>
 
     <h3 class="title text-lg">
@@ -107,7 +107,7 @@
     </h3>
 
     <span class="text-primary-600">
-      <%= @ammo_type |> Ammo.get_used_ammo_groups_count_for_type(@current_user) %>
+      <%= @used_packs_count %>
     </span>
 
     <h3 class="title text-lg">
@@ -115,7 +115,7 @@
     </h3>
 
     <span class="text-primary-600">
-      <%= @ammo_type |> Ammo.get_ammo_groups_count_for_type(@current_user, true) %>
+      <%= @historical_packs_count %>
     </span>
   </div>
 
@@ -127,7 +127,7 @@
     </h3>
 
     <span class="text-primary-600">
-      <.datetime datetime={@ammo_type.inserted_at} />
+      <.datetime id={"#{@ammo_type.id}-inserted-at"} datetime={@ammo_type.inserted_at} />
     </span>
 
     <%= if @avg_cost_per_round do %>
@@ -136,9 +136,7 @@
       </h3>
 
       <span class="text-primary-600">
-        <%= gettext("$%{amount}",
-          amount: @avg_cost_per_round |> :erlang.float_to_binary(decimals: 2)
-        ) %>
+        <%= gettext("$%{amount}", amount: display_currency(@avg_cost_per_round)) %>
       </span>
     <% else %>
       <h3 class="mx-8 my-4 title text-lg text-primary-600 col-span-2">
@@ -177,7 +175,7 @@
           ammo_groups={@ammo_groups}
           current_user={@current_user}
         >
-          <:container :let={%{container: %{name: container_name} = container}}>
+          <:container :let={{_ammo_group, %{name: container_name} = container}}>
             <.link
               navigate={Routes.container_show_path(Endpoint, :show, container)}
               class="mx-2 my-1 link"
@@ -189,8 +187,12 @@
       <% else %>
         <div class="flex flex-wrap justify-center items-stretch">
           <.ammo_group_card
-            :for={ammo_group <- @ammo_groups}
+            :for={%{id: ammo_group_id} = ammo_group <- @ammo_groups}
             ammo_group={ammo_group}
+            original_count={Map.fetch!(@original_counts, ammo_group_id)}
+            cpr={Map.get(@cprs, ammo_group_id)}
+            last_used_date={Map.get(@last_used_dates, ammo_group_id)}
+            current_user={@current_user}
             show_container={true}
           />
         </div>

lib/cannery_web/live/container_live/edit_tags_component.ex

@@ -4,7 +4,8 @@ defmodule CanneryWeb.ContainerLive.EditTagsComponent do
   """
 
   use CanneryWeb, :live_component
-  alias Cannery.{Accounts.User, Containers, Containers.Container, Tags, Tags.Tag}
+  alias Cannery.{Accounts.User, Containers}
+  alias Cannery.Containers.{Container, Tag}
   alias Phoenix.LiveView.Socket
 
   @impl true
@@ -22,7 +23,7 @@ defmodule CanneryWeb.ContainerLive.EditTagsComponent do
           assigns,
         socket
       ) do
-    tags = Tags.list_tags(current_user)
+    tags = Containers.list_tags(current_user)
     {:ok, socket |> assign(assigns) |> assign(:tags, tags)}
   end
 

lib/cannery_web/live/container_live/form_component.ex

@@ -35,17 +35,17 @@ defmodule CanneryWeb.ContainerLive.FormComponent do
          container_params
        ) do
     changeset_action =
-      cond do
-        action in [:new, :clone] -> :insert
-        action == :edit -> :update
+      case action do
+        create when create in [:new, :clone] -> :insert
+        :edit -> :update
       end
 
     changeset =
-      cond do
-        action in [:new, :clone] ->
+      case action do
+        create when create in [:new, :clone] ->
           container |> Container.create_changeset(user, container_params)
 
-        action == :edit ->
+        :edit ->
           container |> Container.update_changeset(container_params)
       end
 

lib/cannery_web/live/container_live/index.ex

@@ -4,7 +4,7 @@ defmodule CanneryWeb.ContainerLive.Index do
   """
 
   use CanneryWeb, :live_view
-  alias Cannery.{Containers, Containers.Container, Repo}
+  alias Cannery.{Containers, Containers.Container}
   alias Ecto.Changeset
 
   @impl true
@@ -22,10 +22,7 @@ defmodule CanneryWeb.ContainerLive.Index do
   end
 
   defp apply_action(%{assigns: %{current_user: current_user}} = socket, :edit, %{"id" => id}) do
-    %{name: container_name} =
-      container =
-      Containers.get_container!(id, current_user)
-      |> Repo.preload([:tags, :ammo_groups])
+    %{name: container_name} = container = Containers.get_container!(id, current_user)
 
     socket
     |> assign(page_title: gettext("Edit %{name}", name: container_name), container: container)
@@ -61,9 +58,7 @@ defmodule CanneryWeb.ContainerLive.Index do
   end
 
   defp apply_action(%{assigns: %{current_user: current_user}} = socket, :edit_tags, %{"id" => id}) do
-    %{name: container_name} =
-      container =
-      Containers.get_container!(id, current_user) |> Repo.preload([:tags, :ammo_groups])
+    %{name: container_name} = container = Containers.get_container!(id, current_user)
 
     page_title = gettext("Edit %{name} tags", name: container_name)
     socket |> assign(page_title: page_title, container: container)
@@ -119,10 +114,6 @@ defmodule CanneryWeb.ContainerLive.Index do
   end
 
   defp display_containers(%{assigns: %{search: search, current_user: current_user}} = socket) do
-    containers =
-      Containers.list_containers(search, current_user)
-      |> Repo.preload([:tags, :ammo_groups])
-
-    socket |> assign(:containers, containers)
+    socket |> assign(:containers, Containers.list_containers(search, current_user))
   end
 end

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

@@ -108,7 +108,11 @@
       </.live_component>
     <% else %>
       <div class="w-full flex flex-row flex-wrap justify-center items-stretch">
-        <.container_card :for={container <- @containers} container={container}>
+        <.container_card
+          :for={container <- @containers}
+          container={container}
+          current_user={@current_user}
+        >
           <:tag_actions>
             <div class="mx-4 my-2">
               <.link
@@ -162,29 +166,30 @@
   <% end %>
 </div>
 
-<.modal
-  :if={@live_action in [:new, :edit, :clone]}
-  return_to={Routes.container_index_path(Endpoint, :index)}
->
-  <.live_component
-    module={CanneryWeb.ContainerLive.FormComponent}
-    id={@container.id || :new}
-    title={@page_title}
-    action={@live_action}
-    container={@container}
-    return_to={Routes.container_index_path(Endpoint, :index)}
-    current_user={@current_user}
-  />
-</.modal>
-
-<.modal :if={@live_action == :edit_tags} return_to={Routes.container_index_path(Endpoint, :index)}>
-  <.live_component
-    module={CanneryWeb.ContainerLive.EditTagsComponent}
-    id={@container.id}
-    title={@page_title}
-    action={@live_action}
-    container={@container}
-    current_path={Routes.container_index_path(Endpoint, :edit_tags, @container)}
-    current_user={@current_user}
-  />
-</.modal>
+<%= case @live_action do %>
+  <% modifying when modifying in [:new, :edit, :clone] -> %>
+    <.modal return_to={Routes.container_index_path(Endpoint, :index)}>
+      <.live_component
+        module={CanneryWeb.ContainerLive.FormComponent}
+        id={@container.id || :new}
+        title={@page_title}
+        action={@live_action}
+        container={@container}
+        return_to={Routes.container_index_path(Endpoint, :index)}
+        current_user={@current_user}
+      />
+    </.modal>
+  <% :edit_tags -> %>
+    <.modal return_to={Routes.container_index_path(Endpoint, :index)}>
+      <.live_component
+        module={CanneryWeb.ContainerLive.EditTagsComponent}
+        id={@container.id}
+        title={@page_title}
+        action={@live_action}
+        container={@container}
+        current_path={Routes.container_index_path(Endpoint, :edit_tags, @container)}
+        current_user={@current_user}
+      />
+    </.modal>
+  <% _ -> %>
+<% end %>

lib/cannery_web/live/container_live/show.ex

@@ -4,7 +4,7 @@ defmodule CanneryWeb.ContainerLive.Show do
   """
 
   use CanneryWeb, :live_view
-  alias Cannery.{Accounts.User, Ammo, Containers, Containers.Container, Repo, Tags}
+  alias Cannery.{Accounts.User, ActivityLog, Ammo, Containers, Containers.Container}
   alias CanneryWeb.Endpoint
   alias Ecto.Changeset
   alias Phoenix.LiveView.Socket
@@ -30,7 +30,7 @@ defmodule CanneryWeb.ContainerLive.Show do
         %{assigns: %{container: container, current_user: current_user}} = socket
       ) do
     socket =
-      case Tags.get_tag(tag_id, current_user) do
+      case Containers.get_tag(tag_id, current_user) do
         {:ok, tag} ->
           _count = Containers.remove_tag!(container, tag, current_user)
 
@@ -42,8 +42,8 @@ defmodule CanneryWeb.ContainerLive.Show do
 
           socket |> put_flash(:info, prompt) |> render_container()
 
-        {:error, error_string} ->
-          socket |> put_flash(:error, error_string)
+        {:error, :not_found} ->
+          socket |> put_flash(:error, dgettext("errors", "Tag not found"))
       end
 
     {:noreply, socket}
@@ -96,12 +96,11 @@ defmodule CanneryWeb.ContainerLive.Show do
          id,
          current_user
        ) do
-    %{name: container_name} =
-      container =
-      Containers.get_container!(id, current_user)
-      |> Repo.preload([:tags], force: true)
-
+    %{name: container_name} = container = Containers.get_container!(id, current_user)
     ammo_groups = Ammo.list_ammo_groups_for_container(container, current_user, show_used)
+    original_counts = ammo_groups |> Ammo.get_original_counts(current_user)
+    cprs = ammo_groups |> Ammo.get_cprs(current_user)
+    last_used_dates = ammo_groups |> ActivityLog.get_last_used_dates(current_user)
 
     page_title =
       case live_action do
@@ -110,7 +109,16 @@ defmodule CanneryWeb.ContainerLive.Show do
         :edit_tags -> gettext("Edit %{name} tags", name: container_name)
       end
 
-    socket |> assign(container: container, ammo_groups: ammo_groups, page_title: page_title)
+    socket
+    |> assign(
+      container: container,
+      round_count: Ammo.get_round_count_for_container!(container, current_user),
+      ammo_groups: ammo_groups,
+      original_counts: original_counts,
+      cprs: cprs,
+      last_used_dates: last_used_dates,
+      page_title: page_title
+    )
   end
 
   @spec render_container(Socket.t()) :: Socket.t()

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

@@ -20,21 +20,18 @@
 
   <%= unless @ammo_groups |> Enum.empty?() do %>
     <span class="rounded-lg title text-lg">
-      <%= if @show_used do %>
-        <%= gettext("Total packs:") %>
-      <% else %>
-        <%= gettext("Packs:") %>
-      <% end %>
+      <%= gettext("Packs:") %>
+      <%= @ammo_groups |> Enum.reject(fn %{count: count} -> count in [0, nil] end) |> Enum.count() %>
+    </span>
+
+    <span :if={@show_used} class="rounded-lg title text-lg">
+      <%= gettext("Total packs:") %>
       <%= Enum.count(@ammo_groups) %>
     </span>
 
     <span class="rounded-lg title text-lg">
-      <%= if @show_used do %>
-        <%= gettext("Total rounds:") %>
-      <% else %>
-        <%= gettext("Rounds:") %>
-      <% end %>
-      <%= @container |> Containers.get_container_rounds!() %>
+      <%= gettext("Rounds:") %>
+      <%= @round_count %>
     </span>
   <% end %>
 
@@ -130,40 +127,45 @@
         </.live_component>
       <% else %>
         <div class="flex flex-wrap justify-center items-stretch">
-          <.ammo_group_card :for={ammo_group <- @ammo_groups} ammo_group={ammo_group} />
+          <.ammo_group_card
+            :for={%{id: ammo_group_id} = ammo_group <- @ammo_groups}
+            ammo_group={ammo_group}
+            original_count={Map.fetch!(@original_counts, ammo_group_id)}
+            cpr={Map.get(@cprs, ammo_group_id)}
+            last_used_date={Map.get(@last_used_dates, ammo_group_id)}
+            current_user={@current_user}
+          />
         </div>
       <% end %>
     <% end %>
   </div>
 </div>
 
-<.modal
-  :if={@live_action == :edit}
-  return_to={Routes.container_show_path(Endpoint, :show, @container)}
->
-  <.live_component
-    module={CanneryWeb.ContainerLive.FormComponent}
-    id={@container.id}
-    title={@page_title}
-    action={@live_action}
-    container={@container}
-    return_to={Routes.container_show_path(Endpoint, :show, @container)}
-    current_user={@current_user}
-  />
-</.modal>
-
-<.modal
-  :if={@live_action == :edit_tags}
-  return_to={Routes.container_show_path(Endpoint, :show, @container)}
->
-  <.live_component
-    module={CanneryWeb.ContainerLive.EditTagsComponent}
-    id={@container.id}
-    title={@page_title}
-    action={@live_action}
-    container={@container}
-    return_to={Routes.container_show_path(Endpoint, :show, @container)}
-    current_path={Routes.container_show_path(Endpoint, :edit_tags, @container)}
-    current_user={@current_user}
-  />
-</.modal>
+<%= case @live_action do %>
+  <% :edit -> %>
+    <.modal return_to={Routes.container_show_path(Endpoint, :show, @container)}>
+      <.live_component
+        module={CanneryWeb.ContainerLive.FormComponent}
+        id={@container.id}
+        title={@page_title}
+        action={@live_action}
+        container={@container}
+        return_to={Routes.container_show_path(Endpoint, :show, @container)}
+        current_user={@current_user}
+      />
+    </.modal>
+  <% :edit_tags -> %>
+    <.modal return_to={Routes.container_show_path(Endpoint, :show, @container)}>
+      <.live_component
+        module={CanneryWeb.ContainerLive.EditTagsComponent}
+        id={@container.id}
+        title={@page_title}
+        action={@live_action}
+        container={@container}
+        return_to={Routes.container_show_path(Endpoint, :show, @container)}
+        current_path={Routes.container_show_path(Endpoint, :edit_tags, @container)}
+        current_user={@current_user}
+      />
+    </.modal>
+  <% _ -> %>
+<% end %>

lib/cannery_web/live/home_live.ex

@@ -12,7 +12,6 @@ defmodule CanneryWeb.HomeLive do
   @impl true
   def mount(_params, _session, socket) do
     admins = Accounts.list_users_by_role(:admin)
-    socket = socket |> assign(page_title: gettext("Home"), admins: admins, version: @version)
-    {:ok, socket}
+    {:ok, socket |> assign(page_title: gettext("Home"), admins: admins, version: @version)}
   end
 end

lib/cannery_web/live/home_live.html.heex

@@ -17,8 +17,7 @@
   <hr class="hr" />
 
   <ul class="flex flex-col space-y-4 text-center">
-    <li class="flex flex-col justify-center items-center
-      space-y-2">
+    <li class="flex flex-col justify-center items-center space-y-2">
       <b class="whitespace-nowrap">
         <%= gettext("Easy to Use:") %>
       </b>
@@ -37,8 +36,7 @@
         <%= gettext("Your data stays with you, period") %>
       </p>
     </li>
-    <li class="flex flex-col justify-center items-center
-      space-y-2">
+    <li class="flex flex-col justify-center items-center space-y-2">
       <b class="whitespace-nowrap">
         <%= gettext("Simple:") %>
       </b>
@@ -81,9 +79,9 @@
     <li class="flex flex-row justify-center space-x-2">
       <b><%= gettext("Registration:") %></b>
       <p>
-        <%= case Application.get_env(:cannery, Cannery.Accounts)[:registration] do
-          "public" -> gettext("Public Signups")
-          _ -> gettext("Invite Only")
+        <%= case Accounts.registration_mode() do
+          :public -> gettext("Public Signups")
+          :invite_only -> gettext("Invite Only")
         end %>
       </p>
     </li>

lib/cannery_web/live/invite_live/index.ex

@@ -29,8 +29,8 @@ defmodule CanneryWeb.InviteLive.Index do
   end
 
   defp apply_action(%{assigns: %{current_user: current_user}} = socket, :edit, %{"id" => id}) do
-    socket
-    |> assign(page_title: gettext("Edit Invite"), invite: Invites.get_invite!(id, current_user))
+    invite = Invites.get_invite!(id, current_user)
+    socket |> assign(page_title: gettext("Edit Invite"), invite: invite)
   end
 
   defp apply_action(socket, :new, _params) do
@@ -123,8 +123,7 @@ defmodule CanneryWeb.InviteLive.Index do
   end
 
   def handle_event("copy_to_clipboard", _params, socket) do
-    prompt = dgettext("prompts", "Copied to clipboard")
-    {:noreply, socket |> put_flash(:info, prompt)}
+    {:noreply, socket |> put_flash(:info, dgettext("prompts", "Copied to clipboard"))}
   end
 
   def handle_event(
@@ -133,9 +132,7 @@ defmodule CanneryWeb.InviteLive.Index do
         %{assigns: %{current_user: current_user}} = socket
       ) do
     %{email: user_email} = Accounts.get_user!(id) |> Accounts.delete_user!(current_user)
-
     prompt = dgettext("prompts", "%{user_email} deleted succesfully", user_email: user_email)
-
     {:noreply, socket |> put_flash(:info, prompt) |> display_invites()}
   end
 
@@ -148,7 +145,8 @@ defmodule CanneryWeb.InviteLive.Index do
       |> Map.get(:admin, [])
       |> Enum.reject(fn %{id: user_id} -> user_id == current_user.id end)
 
+    use_counts = invites |> Invites.get_use_counts(current_user)
     users = all_users |> Map.get(:user, [])
-    socket |> assign(invites: invites, admins: admins, users: users)
+    socket |> assign(invites: invites, use_counts: use_counts, admins: admins, users: users)
   end
 end

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

@@ -19,7 +19,12 @@
   <% end %>
 
   <div class="flex flex-col justify-center items-stretch space-y-4">
-    <.invite_card :for={invite <- @invites} invite={invite} current_user={@current_user}>
+    <.invite_card
+      :for={invite <- @invites}
+      invite={invite}
+      current_user={@current_user}
+      use_count={Map.get(@use_counts, invite.id)}
+    >
       <:code_actions>
         <form phx-submit="copy_to_clipboard">
           <button

lib/cannery_web/live/range_live/form_component.ex

@@ -5,8 +5,12 @@ defmodule CanneryWeb.RangeLive.FormComponent do
 
   use CanneryWeb, :live_component
   alias Cannery.{Accounts.User, ActivityLog, ActivityLog.ShotGroup, Ammo, Ammo.AmmoGroup}
+  alias Ecto.Changeset
   alias Phoenix.LiveView.Socket
 
+  @impl true
+  def mount(socket), do: {:ok, socket |> assign(:ammo_group, nil)}
+
   @impl true
   @spec update(
           %{
@@ -19,28 +23,23 @@ defmodule CanneryWeb.RangeLive.FormComponent do
         ) :: {:ok, Socket.t()}
   def update(
         %{
-          shot_group: %ShotGroup{ammo_group_id: ammo_group_id} = shot_group,
+          shot_group: %ShotGroup{ammo_group_id: ammo_group_id},
           current_user: current_user
         } = assigns,
         socket
-      ) do
-    changeset = shot_group |> ShotGroup.update_changeset(current_user, %{})
+      )
+      when is_binary(ammo_group_id) do
     ammo_group = Ammo.get_ammo_group!(ammo_group_id, current_user)
-    {:ok, socket |> assign(assigns) |> assign(ammo_group: ammo_group, changeset: changeset)}
+    {:ok, socket |> assign(assigns) |> assign(:ammo_group, ammo_group) |> assign_changeset(%{})}
+  end
+
+  def update(%{shot_group: %ShotGroup{}} = assigns, socket) do
+    {:ok, socket |> assign(assigns) |> assign_changeset(%{})}
   end
 
   @impl true
-  def handle_event(
-        "validate",
-        %{"shot_group" => shot_group_params},
-        %{assigns: %{current_user: current_user, shot_group: shot_group}} = socket
-      ) do
-    changeset =
-      shot_group
-      |> ShotGroup.update_changeset(current_user, shot_group_params)
-      |> Map.put(:action, :validate)
-
-    {:noreply, assign(socket, :changeset, changeset)}
+  def handle_event("validate", %{"shot_group" => shot_group_params}, socket) do
+    {:noreply, socket |> assign_changeset(shot_group_params, :validate)}
   end
 
   def handle_event(
@@ -61,4 +60,37 @@ defmodule CanneryWeb.RangeLive.FormComponent do
 
     {:noreply, socket}
   end
+
+  defp assign_changeset(
+         %{
+           assigns: %{
+             action: live_action,
+             current_user: user,
+             ammo_group: ammo_group,
+             shot_group: shot_group
+           }
+         } = socket,
+         shot_group_params,
+         action \\ nil
+       ) do
+    default_action =
+      case live_action do
+        :add_shot_group -> :insert
+        editing when editing in [:edit, :edit_shot_group] -> :update
+      end
+
+    changeset =
+      case default_action do
+        :insert -> shot_group |> ShotGroup.create_changeset(user, ammo_group, shot_group_params)
+        :update -> shot_group |> ShotGroup.update_changeset(user, shot_group_params)
+      end
+
+    changeset =
+      case changeset |> Changeset.apply_action(action || default_action) do
+        {:ok, _data} -> changeset
+        {:error, changeset} -> changeset
+      end
+
+    socket |> assign(:changeset, changeset)
+  end
 end

lib/cannery_web/live/range_live/index.ex

@@ -4,7 +4,7 @@ defmodule CanneryWeb.RangeLive.Index do
   """
 
   use CanneryWeb, :live_view
-  alias Cannery.{ActivityLog, ActivityLog.ShotGroup, Ammo, Repo}
+  alias Cannery.{ActivityLog, ActivityLog.ShotGroup, Ammo}
   alias CanneryWeb.Endpoint
   alias Phoenix.LiveView.Socket
 
@@ -104,16 +104,19 @@ defmodule CanneryWeb.RangeLive.Index do
 
   @spec display_shot_groups(Socket.t()) :: Socket.t()
   defp display_shot_groups(%{assigns: %{search: search, current_user: current_user}} = socket) do
-    shot_groups =
-      ActivityLog.list_shot_groups(search, current_user)
-      |> Repo.preload(ammo_group: :ammo_type)
-
+    shot_groups = ActivityLog.list_shot_groups(search, current_user)
     ammo_groups = Ammo.list_staged_ammo_groups(current_user)
     chart_data = shot_groups |> get_chart_data_for_shot_group()
+    original_counts = ammo_groups |> Ammo.get_original_counts(current_user)
+    cprs = ammo_groups |> Ammo.get_cprs(current_user)
+    last_used_dates = ammo_groups |> ActivityLog.get_last_used_dates(current_user)
 
     socket
     |> assign(
       ammo_groups: ammo_groups,
+      original_counts: original_counts,
+      cprs: cprs,
+      last_used_dates: last_used_dates,
       chart_data: chart_data,
       shot_groups: shot_groups
     )
@@ -122,7 +125,6 @@ defmodule CanneryWeb.RangeLive.Index do
   @spec get_chart_data_for_shot_group([ShotGroup.t()]) :: [map()]
   defp get_chart_data_for_shot_group(shot_groups) do
     shot_groups
-    |> Repo.preload(ammo_group: :ammo_type)
     |> Enum.group_by(fn %{date: date} -> date end, fn %{count: count} -> count end)
     |> Enum.map(fn {date, rounds} ->
       sum = Enum.sum(rounds)

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

@@ -18,7 +18,14 @@
     </.link>
 
     <div class="w-full flex flex-row flex-wrap justify-center items-stretch">
-      <.ammo_group_card :for={ammo_group <- @ammo_groups} ammo_group={ammo_group}>
+      <.ammo_group_card
+        :for={%{id: ammo_group_id} = ammo_group <- @ammo_groups}
+        ammo_group={ammo_group}
+        original_count={Map.fetch!(@original_counts, ammo_group_id)}
+        cpr={Map.get(@cprs, ammo_group_id)}
+        last_used_date={Map.get(@last_used_dates, ammo_group_id)}
+        current_user={@current_user}
+      >
         <button
           type="button"
           class="btn btn-primary"
@@ -134,29 +141,30 @@
   <% end %>
 </div>
 
-<.modal :if={@live_action == :edit} return_to={Routes.range_index_path(Endpoint, :index)}>
-  <.live_component
-    module={CanneryWeb.RangeLive.FormComponent}
-    id={@shot_group.id}
-    title={@page_title}
-    action={@live_action}
-    shot_group={@shot_group}
-    return_to={Routes.range_index_path(Endpoint, :index)}
-    current_user={@current_user}
-  />
-</.modal>
-
-<.modal
-  :if={@live_action == :add_shot_group}
-  return_to={Routes.range_index_path(Endpoint, :index)}
->
-  <.live_component
-    module={CanneryWeb.Components.AddShotGroupComponent}
-    id={:new}
-    title={@page_title}
-    action={@live_action}
-    ammo_group={@ammo_group}
-    return_to={Routes.range_index_path(Endpoint, :index)}
-    current_user={@current_user}
-  />
-</.modal>
+<%= case @live_action do %>
+  <% :edit -> %>
+    <.modal return_to={Routes.range_index_path(Endpoint, :index)}>
+      <.live_component
+        module={CanneryWeb.RangeLive.FormComponent}
+        id={@shot_group.id}
+        title={@page_title}
+        action={@live_action}
+        shot_group={@shot_group}
+        return_to={Routes.range_index_path(Endpoint, :index)}
+        current_user={@current_user}
+      />
+    </.modal>
+  <% :add_shot_group -> %>
+    <.modal return_to={Routes.range_index_path(Endpoint, :index)}>
+      <.live_component
+        module={CanneryWeb.Components.AddShotGroupComponent}
+        id={:new}
+        title={@page_title}
+        action={@live_action}
+        ammo_group={@ammo_group}
+        return_to={Routes.range_index_path(Endpoint, :index)}
+        current_user={@current_user}
+      />
+    </.modal>
+  <% _ -> %>
+<% end %>

lib/cannery_web/live/tag_live/form_component.ex

@@ -1,11 +1,10 @@
 defmodule CanneryWeb.TagLive.FormComponent do
   @moduledoc """
-  Livecomponent that can update or create an Cannery.Tags.Tag
+  Livecomponent that can update or create an Cannery.Containers.Tag
   """
 
   use CanneryWeb, :live_component
-  alias Cannery.Tags
-  alias Cannery.{Accounts.User, Tags.Tag}
+  alias Cannery.{Accounts.User, Containers, Containers.Tag}
   alias Ecto.Changeset
   alias Phoenix.LiveView.Socket
 
@@ -56,7 +55,7 @@ defmodule CanneryWeb.TagLive.FormComponent do
          tag_params
        ) do
     socket =
-      case Tags.update_tag(tag, tag_params, current_user) do
+      case Containers.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_navigate(to: return_to)
@@ -74,7 +73,7 @@ defmodule CanneryWeb.TagLive.FormComponent do
          tag_params
        ) do
     socket =
-      case Tags.create_tag(tag_params, current_user) do
+      case Containers.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_navigate(to: return_to)

lib/cannery_web/live/tag_live/index.ex

@@ -1,10 +1,10 @@
 defmodule CanneryWeb.TagLive.Index do
   @moduledoc """
-  Liveview to show a Cannery.Tags.Tag index
+  Liveview to show a Cannery.Containers.Tag index
   """
 
   use CanneryWeb, :live_view
-  alias Cannery.{Tags, Tags.Tag}
+  alias Cannery.{Containers, Containers.Tag}
   alias CanneryWeb.ViewHelpers
 
   @impl true
@@ -25,7 +25,7 @@ defmodule CanneryWeb.TagLive.Index do
     socket
     |> assign(
       page_title: gettext("Edit Tag"),
-      tag: Tags.get_tag!(id, current_user)
+      tag: Containers.get_tag!(id, current_user)
     )
   end
 
@@ -59,7 +59,9 @@ defmodule CanneryWeb.TagLive.Index do
 
   @impl true
   def handle_event("delete", %{"id" => id}, %{assigns: %{current_user: current_user}} = socket) do
-    %{name: tag_name} = Tags.get_tag!(id, current_user) |> Tags.delete_tag!(current_user)
+    %{name: tag_name} =
+      Containers.get_tag!(id, current_user) |> Containers.delete_tag!(current_user)
+
     prompt = dgettext("prompts", "%{name} deleted succesfully", name: tag_name)
     {:noreply, socket |> put_flash(:info, prompt) |> display_tags()}
   end
@@ -73,6 +75,6 @@ defmodule CanneryWeb.TagLive.Index do
   end
 
   defp display_tags(%{assigns: %{search: search, current_user: current_user}} = socket) do
-    socket |> assign(tags: Tags.list_tags(search, current_user))
+    socket |> assign(tags: Containers.list_tags(search, current_user))
   end
 end

priv/gettext/actions.pot

@@ -66,11 +66,11 @@ msgstr ""
 msgid "Invite someone new!"
 msgstr ""
 
-#: lib/cannery_web/components/topbar.ex:137
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:31
+#: lib/cannery_web/components/core_components/topbar.html.heex:122
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:32
 #: lib/cannery_web/templates/user_registration/new.html.heex:44
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:45
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:31
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:32
 #: lib/cannery_web/templates/user_session/new.html.heex:3
 #: lib/cannery_web/templates/user_session/new.html.heex:28
 #, elixir-autogen, elixir-format
@@ -97,19 +97,19 @@ msgstr ""
 msgid "New Tag"
 msgstr ""
 
-#: lib/cannery_web/components/topbar.ex:129
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:28
+#: lib/cannery_web/components/core_components/topbar.html.heex:114
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:29
 #: lib/cannery_web/templates/user_registration/new.html.heex:3
 #: lib/cannery_web/templates/user_registration/new.html.heex:37
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:42
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:28
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:29
 #: lib/cannery_web/templates/user_session/new.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Register"
 msgstr ""
 
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:3
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:15
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:16
 #, elixir-autogen, elixir-format
 msgid "Resend confirmation instructions"
 msgstr ""
@@ -131,17 +131,17 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:15
+#: 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:78
+#: lib/cannery_web/live/container_live/show.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Why not add one?"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:50
+#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:51
 #, elixir-autogen, elixir-format
 msgid "Add"
 msgstr ""
@@ -156,9 +156,9 @@ msgstr ""
 msgid "Why not get some ready to shoot?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:102
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:107
-#: lib/cannery_web/live/range_live/index.html.heex:38
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:103
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:103
+#: lib/cannery_web/live/range_live/index.html.heex:45
 #, elixir-autogen, elixir-format
 msgid "Record shots"
 msgstr ""
@@ -168,17 +168,12 @@ msgstr ""
 msgid "Add another container!"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:100
-#, elixir-autogen, elixir-format
-msgid "Move containers"
-msgstr ""
-
 #: lib/cannery_web/components/move_ammo_group_component.ex:126
 #, elixir-autogen, elixir-format
 msgid "Select"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:33
+#: lib/cannery_web/live/invite_live/index.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Copy to clipboard"
 msgstr ""
@@ -203,7 +198,7 @@ msgstr ""
 msgid "Change language"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:59
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "View in Catalog"
 msgstr ""
@@ -214,23 +209,25 @@ msgid "add an ammo type first"
 msgstr ""
 
 #: lib/cannery_web/components/move_ammo_group_component.ex:80
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:120
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:96
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:85
+#: lib/cannery_web/live/invite_live/index.html.heex:90
 #, elixir-autogen, elixir-format
 msgid "Set Unlimited"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:93
-#: lib/cannery_web/live/range_live/index.html.heex:31
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:89
+#: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Stage for range"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:92
-#: lib/cannery_web/live/range_live/index.html.heex:30
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:88
+#: lib/cannery_web/live/range_live/index.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Unstage from range"
 msgstr ""
@@ -240,106 +237,123 @@ msgstr ""
 msgid "Export Data as JSON"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:83
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:84
 #, elixir-autogen, elixir-format
 msgid "Clone %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:86
-#: lib/cannery_web/live/container_live/index.html.heex:138
+#: lib/cannery_web/live/container_live/index.html.heex:87
+#: lib/cannery_web/live/container_live/index.html.heex:143
 #, elixir-autogen, elixir-format
 msgid "Clone %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:30
+#: lib/cannery_web/live/invite_live/index.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Copy invite link for %{invite_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:102
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:103
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Delete %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:101
-#: lib/cannery_web/live/container_live/index.html.heex:153
-#: lib/cannery_web/live/container_live/show.html.heex:58
+#: lib/cannery_web/live/container_live/index.html.heex:102
+#: lib/cannery_web/live/container_live/index.html.heex:158
+#: lib/cannery_web/live/container_live/show.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "Delete %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/index.html.heex:64
+#: lib/cannery_web/live/tag_live/index.html.heex:65
 #, elixir-autogen, elixir-format
 msgid "Delete %{tag_name}"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:58
+#: lib/cannery_web/live/invite_live/index.html.heex:63
 #, elixir-autogen, elixir-format
 msgid "Delete invite for %{invite_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:145
-#: lib/cannery_web/live/range_live/index.html.heex:122
+#: lib/cannery_web/live/ammo_group_live/show.ex:161
+#: lib/cannery_web/live/range_live/index.html.heex:130
 #, elixir-autogen, elixir-format
 msgid "Delete shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:73
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:74
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "Edit %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:76
-#: lib/cannery_web/live/container_live/index.html.heex:128
-#: lib/cannery_web/live/container_live/show.html.heex:45
+#: lib/cannery_web/live/container_live/index.html.heex:77
+#: lib/cannery_web/live/container_live/index.html.heex:133
+#: lib/cannery_web/live/container_live/show.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Edit %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/index.html.heex:51
+#: lib/cannery_web/live/tag_live/index.html.heex:52
 #, elixir-autogen, elixir-format
 msgid "Edit %{tag_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:66
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:142
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "Edit ammo group of %{ammo_group_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:41
+#: lib/cannery_web/live/invite_live/index.html.heex:46
 #, elixir-autogen, elixir-format
 msgid "Edit invite for %{invite_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:130
+#: lib/cannery_web/live/ammo_group_live/show.ex:146
 #, elixir-autogen, elixir-format
 msgid "Edit shot group of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:105
+#: lib/cannery_web/live/range_live/index.html.heex:113
 #, elixir-autogen, elixir-format
 msgid "Edit shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:95
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:96
 #, elixir-autogen, elixir-format
 msgid "Stage"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:64
-#: lib/cannery_web/live/container_live/index.html.heex:117
+#: lib/cannery_web/live/container_live/index.html.heex:65
+#: lib/cannery_web/live/container_live/index.html.heex:122
 #, elixir-autogen, elixir-format
 msgid "Tag %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:94
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:95
 #, elixir-autogen, elixir-format
 msgid "Unstage"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:63
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:64
 #, elixir-autogen, elixir-format
 msgid "View %{ammo_type_name}"
 msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:154
+#, elixir-autogen, elixir-format
+msgid "Clone ammo group of %{ammo_group_count} bullets"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:169
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:76
+#, elixir-autogen, elixir-format
+msgid "Delete ammo group of %{ammo_group_count} bullets"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:130
+#, elixir-autogen, elixir-format
+msgid "View ammo group of %{ammo_group_count} bullets"
+msgstr ""

priv/gettext/de/LC_MESSAGES/actions.po

@@ -79,11 +79,11 @@ msgstr "Passwort vergessen?"
 msgid "Invite someone new!"
 msgstr "Laden Sie jemanden ein!"
 
-#: lib/cannery_web/components/topbar.ex:137
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:31
+#: lib/cannery_web/components/core_components/topbar.html.heex:122
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:32
 #: lib/cannery_web/templates/user_registration/new.html.heex:44
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:45
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:31
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:32
 #: lib/cannery_web/templates/user_session/new.html.heex:3
 #: lib/cannery_web/templates/user_session/new.html.heex:28
 #, elixir-autogen, elixir-format
@@ -110,19 +110,19 @@ msgstr "Neuer Behälter"
 msgid "New Tag"
 msgstr "Neuer Tag"
 
-#: lib/cannery_web/components/topbar.ex:129
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:28
+#: lib/cannery_web/components/core_components/topbar.html.heex:114
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:29
 #: lib/cannery_web/templates/user_registration/new.html.heex:3
 #: lib/cannery_web/templates/user_registration/new.html.heex:37
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:42
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:28
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:29
 #: lib/cannery_web/templates/user_session/new.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Register"
 msgstr "Registrieren"
 
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:3
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:15
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:16
 #, elixir-autogen, elixir-format
 msgid "Resend confirmation instructions"
 msgstr "Bestätigungsmail erneut senden"
@@ -144,17 +144,17 @@ msgstr "Passwort zurücksetzen"
 msgid "Save"
 msgstr "Speichern"
 
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:15
+#: 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:78
+#: lib/cannery_web/live/container_live/show.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Why not add one?"
 msgstr "Warum fügen Sie keine hinzu?"
 
-#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:50
+#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:51
 #, elixir-autogen, elixir-format
 msgid "Add"
 msgstr "Hinzufügen"
@@ -169,9 +169,9 @@ msgstr "Munition markieren"
 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.html.heex:102
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:107
-#: lib/cannery_web/live/range_live/index.html.heex:38
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:103
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:103
+#: lib/cannery_web/live/range_live/index.html.heex:45
 #, elixir-autogen, elixir-format
 msgid "Record shots"
 msgstr "Schüsse dokumentieren"
@@ -181,17 +181,12 @@ msgstr "Schüsse dokumentieren"
 msgid "Add another container!"
 msgstr "Einen weiteren Behälter hinzufügen!"
 
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:100
-#, elixir-autogen, elixir-format
-msgid "Move containers"
-msgstr "Behälter verschieben"
-
 #: lib/cannery_web/components/move_ammo_group_component.ex:126
 #, elixir-autogen, elixir-format
 msgid "Select"
 msgstr "Markieren"
 
-#: lib/cannery_web/live/invite_live/index.html.heex:33
+#: lib/cannery_web/live/invite_live/index.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Copy to clipboard"
 msgstr "In die Zwischenablage kopieren"
@@ -216,7 +211,7 @@ msgstr "Sprache wechseln"
 msgid "Change language"
 msgstr "Sprache wechseln"
 
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:59
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "View in Catalog"
 msgstr ""
@@ -227,23 +222,25 @@ msgid "add an ammo type first"
 msgstr ""
 
 #: lib/cannery_web/components/move_ammo_group_component.ex:80
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:120
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:96
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:85
+#: lib/cannery_web/live/invite_live/index.html.heex:90
 #, elixir-autogen, elixir-format
 msgid "Set Unlimited"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:93
-#: lib/cannery_web/live/range_live/index.html.heex:31
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:89
+#: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Stage for range"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:92
-#: lib/cannery_web/live/range_live/index.html.heex:30
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:88
+#: lib/cannery_web/live/range_live/index.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Unstage from range"
 msgstr ""
@@ -253,106 +250,123 @@ msgstr ""
 msgid "Export Data as JSON"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:83
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:84
 #, elixir-autogen, elixir-format
 msgid "Clone %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:86
-#: lib/cannery_web/live/container_live/index.html.heex:138
+#: lib/cannery_web/live/container_live/index.html.heex:87
+#: lib/cannery_web/live/container_live/index.html.heex:143
 #, elixir-autogen, elixir-format
 msgid "Clone %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:30
+#: lib/cannery_web/live/invite_live/index.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Copy invite link for %{invite_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:102
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:103
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Delete %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:101
-#: lib/cannery_web/live/container_live/index.html.heex:153
-#: lib/cannery_web/live/container_live/show.html.heex:58
+#: lib/cannery_web/live/container_live/index.html.heex:102
+#: lib/cannery_web/live/container_live/index.html.heex:158
+#: lib/cannery_web/live/container_live/show.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "Delete %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/index.html.heex:64
+#: lib/cannery_web/live/tag_live/index.html.heex:65
 #, elixir-autogen, elixir-format
 msgid "Delete %{tag_name}"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:58
+#: lib/cannery_web/live/invite_live/index.html.heex:63
 #, elixir-autogen, elixir-format
 msgid "Delete invite for %{invite_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:145
-#: lib/cannery_web/live/range_live/index.html.heex:122
+#: lib/cannery_web/live/ammo_group_live/show.ex:161
+#: lib/cannery_web/live/range_live/index.html.heex:130
 #, elixir-autogen, elixir-format
 msgid "Delete shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:73
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:74
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "Edit %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:76
-#: lib/cannery_web/live/container_live/index.html.heex:128
-#: lib/cannery_web/live/container_live/show.html.heex:45
+#: lib/cannery_web/live/container_live/index.html.heex:77
+#: lib/cannery_web/live/container_live/index.html.heex:133
+#: lib/cannery_web/live/container_live/show.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Edit %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/index.html.heex:51
+#: lib/cannery_web/live/tag_live/index.html.heex:52
 #, elixir-autogen, elixir-format
 msgid "Edit %{tag_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:66
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:142
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "Edit ammo group of %{ammo_group_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:41
+#: lib/cannery_web/live/invite_live/index.html.heex:46
 #, elixir-autogen, elixir-format
 msgid "Edit invite for %{invite_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:130
+#: lib/cannery_web/live/ammo_group_live/show.ex:146
 #, elixir-autogen, elixir-format
 msgid "Edit shot group of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:105
+#: lib/cannery_web/live/range_live/index.html.heex:113
 #, elixir-autogen, elixir-format
 msgid "Edit shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:95
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:96
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Stage"
 msgstr "Munition markieren"
 
-#: lib/cannery_web/live/container_live/index.html.heex:64
-#: lib/cannery_web/live/container_live/index.html.heex:117
+#: lib/cannery_web/live/container_live/index.html.heex:65
+#: lib/cannery_web/live/container_live/index.html.heex:122
 #, elixir-autogen, elixir-format
 msgid "Tag %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:94
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:95
 #, elixir-autogen, elixir-format
 msgid "Unstage"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:63
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:64
 #, elixir-autogen, elixir-format
 msgid "View %{ammo_type_name}"
 msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:154
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Clone ammo group of %{ammo_group_count} bullets"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:169
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:76
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Delete ammo group of %{ammo_group_count} bullets"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:130
+#, elixir-autogen, elixir-format, fuzzy
+msgid "View ammo group of %{ammo_group_count} bullets"
+msgstr ""

priv/gettext/de/LC_MESSAGES/default.po

@@ -14,23 +14,23 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.12.1\n"
 
-#: lib/cannery_web/live/home_live.html.heex:46
+#: lib/cannery_web/live/home_live.html.heex:44
 #, elixir-autogen, elixir-format
 msgid "Access from any internet-capable device"
 msgstr "Zugriff von jedem Internet-fähigen Gerät"
 
-#: lib/cannery_web/live/invite_live/index.html.heex:94
+#: lib/cannery_web/live/invite_live/index.html.heex:99
 #, elixir-autogen, elixir-format
 msgid "Admins"
 msgstr "Admins"
 
-#: lib/cannery_web/live/home_live.html.heex:60
+#: lib/cannery_web/live/home_live.html.heex:58
 #, elixir-autogen, elixir-format
 msgid "Admins:"
 msgstr "Admins:"
 
+#: lib/cannery_web/components/core_components/topbar.html.heex:58
 #: lib/cannery_web/components/shot_group_table_component.ex:41
-#: lib/cannery_web/components/topbar.ex:73
 #: lib/cannery_web/live/ammo_group_live/index.ex:70
 #: lib/cannery_web/live/ammo_group_live/index.ex:79
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:3
@@ -97,9 +97,9 @@ msgstr "Gehäusematerial"
 msgid "Container"
 msgstr "Behälter"
 
-#: lib/cannery_web/components/topbar.ex:57
-#: lib/cannery_web/live/container_live/index.ex:49
-#: lib/cannery_web/live/container_live/index.ex:58
+#: lib/cannery_web/components/core_components/topbar.html.heex:42
+#: lib/cannery_web/live/container_live/index.ex:45
+#: lib/cannery_web/live/container_live/index.ex:54
 #: lib/cannery_web/live/container_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Containers"
@@ -117,36 +117,36 @@ msgstr "Korrosiv"
 msgid "Count"
 msgstr "Anzahl"
 
-#: lib/cannery_web/components/ammo_group_card.ex:39
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:16
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:8
 #, elixir-autogen, elixir-format
 msgid "Count:"
 msgstr "Anzahl:"
 
-#: lib/cannery_web/components/container_table_component.ex:47
+#: lib/cannery_web/components/container_table_component.ex:46
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
 #: lib/cannery_web/live/container_live/form_component.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr "Beschreibung"
 
-#: lib/cannery_web/components/container_card.ex:39
+#: lib/cannery_web/components/core_components/container_card.html.heex:16
 #: lib/cannery_web/live/container_live/show.html.heex:7
 #, elixir-autogen, elixir-format
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: lib/cannery_web/live/home_live.html.heex:23
+#: lib/cannery_web/live/home_live.html.heex:22
 #, elixir-autogen, elixir-format
 msgid "Easy to Use:"
 msgstr "Einfache Anwendung:"
 
-#: lib/cannery_web/live/invite_live/index.ex:34
+#: lib/cannery_web/live/invite_live/index.ex:33
 #, elixir-autogen, elixir-format
 msgid "Edit Invite"
 msgstr "Einladung bearbeiten"
 
-#: lib/cannery_web/live/tag_live/index.ex:28
+#: lib/cannery_web/live/tag_live/index.ex:27
 #, elixir-autogen, elixir-format
 msgid "Edit Tag"
 msgstr "Tag bearbeiten"
@@ -173,23 +173,23 @@ msgstr "Körner"
 msgid "Incendiary"
 msgstr "Brandmunition"
 
-#: lib/cannery_web/live/home_live.html.heex:55
+#: lib/cannery_web/live/home_live.html.heex:53
 #, elixir-autogen, elixir-format
 msgid "Instance Information"
 msgstr "Instanzinformationen"
 
-#: lib/cannery_web/components/invite_card.ex:42
+#: lib/cannery_web/components/core_components/invite_card.html.heex:21
 #, elixir-autogen, elixir-format
 msgid "Invite Disabled"
 msgstr "Einladung deaktiviert"
 
-#: lib/cannery_web/live/home_live.html.heex:82
+#: lib/cannery_web/live/home_live.html.heex:84
 #, elixir-autogen, elixir-format
 msgid "Invite Only"
 msgstr "Nur mit Einladung"
 
-#: lib/cannery_web/components/topbar.ex:89
-#: lib/cannery_web/live/invite_live/index.ex:42
+#: lib/cannery_web/components/core_components/topbar.html.heex:74
+#: lib/cannery_web/live/invite_live/index.ex:41
 #: lib/cannery_web/live/invite_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Invites"
@@ -200,14 +200,14 @@ msgstr "Einladungen"
 msgid "Keep me logged in for 60 days"
 msgstr "Für 60 Tage eingeloggt bleiben"
 
-#: lib/cannery_web/components/container_table_component.ex:48
+#: lib/cannery_web/components/container_table_component.ex:47
 #: lib/cannery_web/components/move_ammo_group_component.ex:69
 #: lib/cannery_web/live/container_live/form_component.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Location"
 msgstr "Standort"
 
-#: lib/cannery_web/components/container_card.ex:49
+#: lib/cannery_web/components/core_components/container_card.html.heex:26
 #: lib/cannery_web/live/container_live/show.html.heex:17
 #, elixir-autogen, elixir-format
 msgid "Location:"
@@ -235,7 +235,7 @@ msgid "My cool ammo can"
 msgstr "Meine coole Munitionskiste"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:45
-#: lib/cannery_web/components/container_table_component.ex:46
+#: lib/cannery_web/components/container_table_component.ex:45
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:21
 #: lib/cannery_web/live/container_live/form_component.html.heex:21
 #: lib/cannery_web/live/invite_live/form_component.html.heex:21
@@ -250,35 +250,35 @@ msgstr "Name"
 msgid "New Ammo type"
 msgstr "Neuer Munitionstyp"
 
-#: lib/cannery_web/live/container_live/index.ex:36
-#: lib/cannery_web/live/container_live/index.ex:43
+#: lib/cannery_web/live/container_live/index.ex:32
+#: lib/cannery_web/live/container_live/index.ex:39
 #, elixir-autogen, elixir-format
 msgid "New Container"
 msgstr "Neuer Behälter"
 
-#: lib/cannery_web/live/invite_live/index.ex:38
+#: lib/cannery_web/live/invite_live/index.ex:37
 #, elixir-autogen, elixir-format
 msgid "New Invite"
 msgstr "Neue Einladung"
 
-#: lib/cannery_web/live/tag_live/index.ex:36
+#: lib/cannery_web/live/tag_live/index.ex:35
 #, elixir-autogen, elixir-format
 msgid "New Tag"
 msgstr "Neuer Tag"
 
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:10
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:70
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:71
 #, elixir-autogen, elixir-format
 msgid "No Ammo"
 msgstr "Keine Munition"
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:169
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:167
 #, elixir-autogen, elixir-format
 msgid "No ammo for this type"
 msgstr "Keine Munition dieser Art"
 
 #: lib/cannery_web/live/container_live/index.html.heex:8
-#: lib/cannery_web/live/container_live/index.html.heex:46
+#: lib/cannery_web/live/container_live/index.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "No containers"
 msgstr "Kein Behälter"
@@ -290,7 +290,7 @@ msgstr "Keine Einladung"
 
 #: lib/cannery_web/live/container_live/edit_tags_component.html.heex:29
 #: lib/cannery_web/live/tag_live/index.html.heex:10
-#: lib/cannery_web/live/tag_live/index.html.heex:42
+#: lib/cannery_web/live/tag_live/index.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "No tags"
 msgstr "Keine Tags"
@@ -299,13 +299,13 @@ msgstr "Keine Tags"
 #: lib/cannery_web/components/ammo_group_table_component.ex:81
 #: lib/cannery_web/components/shot_group_table_component.ex:43
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:50
-#: lib/cannery_web/live/ammo_group_live/show.ex:90
+#: lib/cannery_web/live/ammo_group_live/show.ex:92
 #: lib/cannery_web/live/range_live/form_component.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Notes"
 msgstr "Bemerkungen"
 
-#: lib/cannery_web/components/ammo_group_card.ex:52
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:26
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:24
 #, elixir-autogen, elixir-format
 msgid "Notes:"
@@ -328,7 +328,7 @@ msgstr "Druck"
 msgid "Price paid"
 msgstr "Kaufpreis"
 
-#: lib/cannery_web/components/ammo_group_card.ex:68
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Price paid:"
 msgstr "Kaufpreis:"
@@ -339,17 +339,17 @@ msgstr "Kaufpreis:"
 msgid "Primer type"
 msgstr "Zündertyp"
 
-#: lib/cannery_web/live/home_live.html.heex:81
+#: lib/cannery_web/live/home_live.html.heex:83
 #, elixir-autogen, elixir-format
 msgid "Public Signups"
 msgstr "Öffentliche Registrierung"
 
-#: lib/cannery_web/live/home_live.html.heex:33
+#: lib/cannery_web/live/home_live.html.heex:32
 #, elixir-autogen, elixir-format
 msgid "Secure:"
 msgstr "Sicher:"
 
-#: lib/cannery_web/live/home_live.html.heex:36
+#: lib/cannery_web/live/home_live.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Self-host your own instance, or use an instance from someone you trust."
 msgstr ""
@@ -362,7 +362,7 @@ msgstr ""
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: lib/cannery_web/live/home_live.html.heex:43
+#: lib/cannery_web/live/home_live.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Simple:"
 msgstr "Einfach:"
@@ -372,15 +372,15 @@ msgstr "Einfach:"
 msgid "Steel"
 msgstr "Stahl"
 
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:117
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:113
 #, elixir-autogen, elixir-format
 msgid "Stored in"
 msgstr "Gelagert in"
 
-#: lib/cannery_web/components/container_table_component.ex:52
-#: lib/cannery_web/components/topbar.ex:49
-#: lib/cannery_web/live/tag_live/index.ex:44
-#: lib/cannery_web/live/tag_live/index.ex:54
+#: lib/cannery_web/components/container_table_component.ex:66
+#: lib/cannery_web/components/core_components/topbar.html.heex:34
+#: lib/cannery_web/live/tag_live/index.ex:43
+#: lib/cannery_web/live/tag_live/index.ex:53
 #: lib/cannery_web/live/tag_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Tags"
@@ -407,20 +407,20 @@ msgstr "Die selbst-gehostete Website zur Verwaltung von Schusswaffen"
 msgid "Tracer"
 msgstr "Leuchtspur"
 
-#: lib/cannery_web/components/container_table_component.ex:49
+#: lib/cannery_web/components/container_table_component.ex:48
 #: lib/cannery_web/components/move_ammo_group_component.ex:68
 #: lib/cannery_web/live/container_live/form_component.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Type"
 msgstr "Art"
 
-#: lib/cannery_web/components/container_card.ex:44
+#: lib/cannery_web/components/core_components/container_card.html.heex:21
 #: lib/cannery_web/live/container_live/show.html.heex:12
 #, elixir-autogen, elixir-format
 msgid "Type:"
 msgstr "Art:"
 
-#: lib/cannery_web/live/invite_live/index.html.heex:122
+#: lib/cannery_web/live/invite_live/index.html.heex:127
 #, elixir-autogen, elixir-format
 msgid "Users"
 msgstr "Benutzer"
@@ -430,18 +430,18 @@ msgstr "Benutzer"
 msgid "Uses left"
 msgstr "Verbleibende Nutzung"
 
-#: lib/cannery_web/live/home_live.html.heex:37
+#: lib/cannery_web/live/home_live.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Your data stays with you, period"
 msgstr "Ihre Daten bleiben bei Ihnen, Punkt"
 
-#: lib/cannery_web/live/container_live/show.html.heex:70
+#: lib/cannery_web/live/container_live/show.html.heex:67
 #, elixir-autogen, elixir-format
 msgid "No tags for this container"
 msgstr "Keine Tags für diesen Behälter"
 
 #: lib/cannery_web/components/ammo_group_table_component.ex:72
-#: lib/cannery_web/components/topbar.ex:81
+#: lib/cannery_web/components/core_components/topbar.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Range"
 msgstr "Schießplatz"
@@ -453,7 +453,7 @@ msgstr "Range Day"
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:46
 #: lib/cannery_web/components/shot_group_table_component.ex:44
-#: lib/cannery_web/live/ammo_group_live/show.ex:91
+#: lib/cannery_web/live/ammo_group_live/show.ex:93
 #: lib/cannery_web/live/range_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Date"
@@ -475,19 +475,19 @@ msgstr "Keine Munition selektiert"
 msgid "Record shots"
 msgstr "Schüsse dokumentieren"
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:41
-#: lib/cannery_web/live/range_live/index.ex:41
+#: lib/cannery_web/live/ammo_group_live/show.ex:42
+#: lib/cannery_web/live/range_live/index.ex:40
 #, elixir-autogen, elixir-format
 msgid "Edit Shot Records"
 msgstr "Schießkladde editieren"
 
-#: lib/cannery_web/live/range_live/index.ex:49
+#: lib/cannery_web/live/range_live/index.ex:48
 #, elixir-autogen, elixir-format
 msgid "New Shot Records"
 msgstr "Neue Schießkladde"
 
-#: lib/cannery_web/live/range_live/index.html.heex:48
-#: lib/cannery_web/live/range_live/index.html.heex:89
+#: lib/cannery_web/live/range_live/index.html.heex:55
+#: lib/cannery_web/live/range_live/index.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "No shots recorded"
 msgstr "Keine Schüsse dokumentiert"
@@ -499,20 +499,19 @@ msgid "Rounds left"
 msgstr "Patronen verbleibend"
 
 #: lib/cannery_web/components/shot_group_table_component.ex:42
-#: lib/cannery_web/live/ammo_group_live/show.ex:89
-#: lib/cannery_web/live/range_live/index.html.heex:62
+#: lib/cannery_web/live/ammo_group_live/show.ex:91
+#: lib/cannery_web/live/range_live/index.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "Rounds shot"
 msgstr "Patronen abgefeuert"
 
-#: lib/cannery_web/live/range_live/index.ex:57
-#: lib/cannery_web/live/range_live/index.ex:67
+#: lib/cannery_web/live/range_live/index.ex:56
+#: lib/cannery_web/live/range_live/index.ex:66
 #, elixir-autogen, elixir-format
 msgid "Shot Records"
 msgstr "Schießkladde"
 
 #: lib/cannery_web/live/ammo_group_live/index.ex:38
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:119
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr "Munition verschieben"
@@ -522,18 +521,18 @@ msgstr "Munition verschieben"
 msgid "No other containers"
 msgstr "Kein weiterer Behälter"
 
-#: lib/cannery_web/live/range_live/index.html.heex:53
+#: lib/cannery_web/live/range_live/index.html.heex:60
 #, elixir-autogen, elixir-format
 msgid "Shot log"
 msgstr "Schießkladde"
 
-#: lib/cannery_web/components/ammo_group_card.ex:69
-#: lib/cannery_web/components/ammo_group_card.ex:76
 #: lib/cannery_web/components/ammo_group_table_component.ex:153
-#: lib/cannery_web/components/ammo_group_table_component.ex:225
-#: lib/cannery_web/components/ammo_type_table_component.ex:180
+#: lib/cannery_web/components/ammo_group_table_component.ex:229
+#: lib/cannery_web/components/ammo_type_table_component.ex:224
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:42
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:47
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:37
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:44
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:42
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:139
 #, elixir-autogen, elixir-format
 msgid "$%{amount}"
@@ -603,28 +602,28 @@ msgstr "Patronenhülsenform"
 msgid "Reconnecting..."
 msgstr "Neu verbinden..."
 
-#: lib/cannery_web/live/container_live/index.ex:32
-#: lib/cannery_web/live/container_live/show.ex:110
+#: lib/cannery_web/live/container_live/index.ex:28
+#: lib/cannery_web/live/container_live/show.ex:108
 #, elixir-autogen, elixir-format
 msgid "Edit %{name}"
 msgstr "%{name} bearbeiten"
 
-#: lib/cannery_web/live/container_live/index.ex:69
-#: lib/cannery_web/live/container_live/show.ex:111
+#: lib/cannery_web/live/container_live/index.ex:63
+#: lib/cannery_web/live/container_live/show.ex:109
 #, elixir-autogen, elixir-format
 msgid "Edit %{name} tags"
 msgstr "Editiere %{name} Tags"
 
-#: lib/cannery_web/components/container_card.ex:60
+#: lib/cannery_web/components/core_components/container_card.html.heex:37
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:70
-#: lib/cannery_web/live/container_live/show.html.heex:35
+#: lib/cannery_web/live/container_live/show.html.heex:33
 #, elixir-autogen, elixir-format
 msgid "Rounds:"
 msgstr "Patronen:"
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:222
-#: lib/cannery_web/components/ammo_type_table_component.ex:179
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:145
+#: lib/cannery_web/components/ammo_group_table_component.ex:226
+#: lib/cannery_web/components/ammo_type_table_component.ex:223
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:143
 #, elixir-autogen, elixir-format
 msgid "No cost information"
 msgstr "Keine Preisinformationen"
@@ -634,7 +633,7 @@ msgstr "Keine Preisinformationen"
 msgid "% left"
 msgstr "% verbleibend"
 
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:43
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Current value:"
 msgstr "Derzeitiger Wert:"
@@ -654,7 +653,7 @@ msgstr "Ursprüngliche Anzahl:"
 msgid "Percentage left:"
 msgstr "Prozent verbleibend:"
 
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:130
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:126
 #, elixir-autogen, elixir-format
 msgid "Rounds used"
 msgstr "Patronen verbraucht"
@@ -674,7 +673,7 @@ msgstr "Passwort vergessen?"
 msgid "Log in"
 msgstr "Einloggen"
 
-#: lib/cannery_web/controllers/user_registration_controller.ex:32
+#: lib/cannery_web/controllers/user_registration_controller.ex:33
 #, elixir-autogen, elixir-format
 msgid "Register"
 msgstr "Registrieren"
@@ -684,8 +683,8 @@ msgstr "Registrieren"
 msgid "Reset your password"
 msgstr "Passwort zurücksetzen"
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:40
-#: lib/cannery_web/live/range_live/index.ex:33
+#: lib/cannery_web/live/ammo_group_live/show.ex:41
+#: lib/cannery_web/live/range_live/index.ex:32
 #, elixir-autogen, elixir-format
 msgid "Record Shots"
 msgstr "Schüsse dokumentieren"
@@ -721,27 +720,27 @@ msgstr "Deutsch"
 msgid "Language"
 msgstr "Sprache"
 
-#: lib/cannery_web/live/home_live.html.heex:107
+#: lib/cannery_web/live/home_live.html.heex:109
 #, elixir-autogen, elixir-format
 msgid "Get involved!"
 msgstr "Mach mit!"
 
-#: lib/cannery_web/live/home_live.html.heex:128
+#: lib/cannery_web/live/home_live.html.heex:130
 #, elixir-autogen, elixir-format
 msgid "Help translate"
 msgstr "Hilf beim Übersetzen"
 
-#: lib/cannery_web/live/home_live.html.heex:139
+#: lib/cannery_web/live/home_live.html.heex:141
 #, elixir-autogen, elixir-format
 msgid "Report bugs or request features"
 msgstr "Sende Bugs oder Erweiterungsvorschläge"
 
-#: lib/cannery_web/live/home_live.html.heex:117
+#: lib/cannery_web/live/home_live.html.heex:119
 #, elixir-autogen, elixir-format
 msgid "View the source code"
 msgstr "Quellcode ansehen"
 
-#: lib/cannery_web/components/topbar.ex:65
+#: lib/cannery_web/components/core_components/topbar.html.heex:50
 #: lib/cannery_web/live/ammo_type_live/index.ex:52
 #: lib/cannery_web/live/ammo_type_live/index.ex:62
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:3
@@ -749,39 +748,39 @@ msgstr "Quellcode ansehen"
 msgid "Catalog"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:44
+#: lib/cannery_web/live/ammo_group_live/show.ex:45
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit Ammo"
 msgstr "Munitionstyp bearbeiten"
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:42
+#: lib/cannery_web/live/ammo_group_live/show.ex:43
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Move Ammo"
 msgstr "Munition verschieben"
 
-#: lib/cannery_web/live/container_live/show.html.heex:115
+#: lib/cannery_web/live/container_live/show.html.heex:112
 #, elixir-autogen, elixir-format, fuzzy
 msgid "No ammo in this container"
 msgstr "Keine Munitionsgruppe in diesem Behälter"
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:43
+#: lib/cannery_web/live/ammo_group_live/show.ex:44
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show Ammo"
 msgstr "Zeige Munitionsarten"
 
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:122
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:118
 #, elixir-autogen, elixir-format, fuzzy
 msgid "This ammo is not in a container"
 msgstr "Diese Munitionsgruppe ist nicht in einem Behälter"
 
-#: lib/cannery_web/components/container_card.ex:55
+#: lib/cannery_web/components/core_components/container_card.html.heex:32
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:98
-#: lib/cannery_web/live/container_live/show.html.heex:26
+#: lib/cannery_web/live/container_live/show.html.heex:23
 #, elixir-autogen, elixir-format
 msgid "Packs:"
 msgstr ""
 
-#: lib/cannery_web/components/topbar.ex:25
+#: lib/cannery_web/components/core_components/topbar.html.heex:10
 #: lib/cannery_web/live/home_live.html.heex:4
 #, elixir-autogen, elixir-format
 msgid "Cannery logo"
@@ -797,45 +796,45 @@ msgstr ""
 msgid "Leave \"Uses left\" blank to make invite unlimited"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:83
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:54
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Container:"
 msgstr "Behälter"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:63
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:38
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:155
-#: lib/cannery_web/live/container_live/show.html.heex:101
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:64
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:39
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:153
+#: lib/cannery_web/live/container_live/show.html.heex:98
 #, elixir-autogen, elixir-format
 msgid "Show used"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:193
+#: lib/cannery_web/components/ammo_group_table_component.ex:187
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "%{percentage}%"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:134
+#: lib/cannery_web/live/range_live/index.ex:135
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Rounds shot: %{count}"
 msgstr "Patronen abgefeuert"
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:100
-#: lib/cannery_web/components/container_table_component.ex:50
+#: lib/cannery_web/components/container_table_component.ex:64
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Packs"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:80
-#: lib/cannery_web/components/container_table_component.ex:51
+#: lib/cannery_web/components/container_table_component.ex:65
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Rounds"
 msgstr "Patronen:"
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:161
-#: lib/cannery_web/live/container_live/index.html.heex:38
-#: lib/cannery_web/live/container_live/show.html.heex:107
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:159
+#: lib/cannery_web/live/container_live/index.html.heex:39
+#: lib/cannery_web/live/container_live/show.html.heex:104
 #, elixir-autogen, elixir-format
 msgid "View as table"
 msgstr ""
@@ -885,102 +884,102 @@ msgstr ""
 msgid "Used up!"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:64
+#: lib/cannery_web/live/range_live/index.html.heex:71
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Rounds shot chart"
 msgstr "Patronen abgefeuert"
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:27
+#: lib/cannery_web/live/ammo_type_live/show.ex:26
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Blank:"
 msgstr "Knallpatrone"
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:13
+#: lib/cannery_web/live/ammo_type_live/show.ex:12
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Bullet core:"
 msgstr "Projektilkern"
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:12
+#: lib/cannery_web/live/ammo_type_live/show.ex:11
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Bullet type:"
 msgstr "Patronenart"
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:15
+#: lib/cannery_web/live/ammo_type_live/show.ex:14
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Caliber:"
 msgstr "Kaliber"
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:14
+#: lib/cannery_web/live/ammo_type_live/show.ex:13
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Cartridge:"
 msgstr "Patrone"
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:16
+#: lib/cannery_web/live/ammo_type_live/show.ex:15
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Case material:"
 msgstr "Gehäusematerial"
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:28
+#: lib/cannery_web/live/ammo_type_live/show.ex:27
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Corrosive:"
 msgstr "Korrosiv"
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:24
+#: lib/cannery_web/live/ammo_type_live/show.ex:23
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Firing type:"
 msgstr "Patronenhülsenform"
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:21
+#: lib/cannery_web/live/ammo_type_live/show.ex:20
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Grains:"
 msgstr "Körner"
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:26
+#: lib/cannery_web/live/ammo_type_live/show.ex:25
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Incendiary:"
 msgstr "Brandmunition"
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:17
+#: lib/cannery_web/live/ammo_type_live/show.ex:16
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Jacket type:"
 msgstr "Patronenhülse"
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:29
+#: lib/cannery_web/live/ammo_type_live/show.ex:28
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Manufacturer:"
 msgstr "Hersteller"
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:18
+#: lib/cannery_web/live/ammo_type_live/show.ex:17
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Muzzle velocity:"
 msgstr "Mündungsgeschwindigkeit"
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:20
+#: lib/cannery_web/live/ammo_type_live/show.ex:19
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Powder grains per charge:"
 msgstr "Pulverkörner pro Ladung"
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:19
+#: lib/cannery_web/live/ammo_type_live/show.ex:18
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Powder type:"
 msgstr "Pulverart"
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:22
+#: lib/cannery_web/live/ammo_type_live/show.ex:21
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Pressure:"
 msgstr "Druck"
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:23
+#: lib/cannery_web/live/ammo_type_live/show.ex:22
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Primer type:"
 msgstr "Zündertyp"
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:25
+#: lib/cannery_web/live/ammo_type_live/show.ex:24
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Tracer:"
 msgstr "Leuchtspur"
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:30
+#: lib/cannery_web/live/ammo_type_live/show.ex:29
 #, elixir-autogen, elixir-format, fuzzy
 msgid "UPC:"
 msgstr "UPC"
@@ -992,13 +991,13 @@ msgid "Average CPR"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/index.ex:28
-#: lib/cannery_web/live/ammo_type_live/show.ex:118
+#: lib/cannery_web/live/ammo_type_live/show.ex:135
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit %{ammo_type_name}"
 msgstr "%{name} bearbeiten"
 
-#: lib/cannery_web/components/ammo_group_card.ex:40
-#: lib/cannery_web/components/ammo_group_table_component.ex:231
+#: lib/cannery_web/components/ammo_group_table_component.ex:233
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:17
 #, elixir-autogen, elixir-format
 msgid "Empty"
 msgstr ""
@@ -1008,7 +1007,7 @@ msgstr ""
 msgid "CPR"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:75
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:46
 #, elixir-autogen, elixir-format
 msgid "CPR:"
 msgstr ""
@@ -1018,7 +1017,7 @@ msgstr ""
 msgid "Original Count"
 msgstr "Ursprüngliche Anzahl:"
 
-#: lib/cannery_web/components/ammo_group_card.ex:47
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:21
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Original Count:"
 msgstr "Ursprüngliche Anzahl:"
@@ -1028,27 +1027,22 @@ msgstr "Ursprüngliche Anzahl:"
 msgid "Home"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:24
+#: lib/cannery_web/live/container_live/show.html.heex:28
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Total packs:"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:33
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Total rounds:"
-msgstr "Summe abgegebener Schüsse:"
-
 #: lib/cannery_web/components/ammo_group_table_component.ex:58
 #, elixir-autogen, elixir-format
 msgid "Last used on"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:62
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Last used on:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:178
+#: lib/cannery_web/components/ammo_group_table_component.ex:171
 #, elixir-autogen, elixir-format
 msgid "Never used"
 msgstr ""
@@ -1059,7 +1053,7 @@ msgstr ""
 msgid "Purchased on"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:57
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:31
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Purchased on:"
@@ -1071,32 +1065,32 @@ msgid "Edit ammo"
 msgstr "Munitionstyp bearbeiten"
 
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:8
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:45
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:46
 #, elixir-autogen, elixir-format, fuzzy
 msgid "No Ammo types"
 msgstr "Keine Munitionsarten"
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:32
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:33
 #, elixir-autogen, elixir-format
 msgid "Search catalog"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:57
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:58
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Search ammo"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:32
+#: lib/cannery_web/live/container_live/index.html.heex:33
 #, elixir-autogen, elixir-format
 msgid "Search containers"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/index.html.heex:35
+#: lib/cannery_web/live/tag_live/index.html.heex:36
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Search tags"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:82
+#: lib/cannery_web/live/range_live/index.html.heex:90
 #, elixir-autogen, elixir-format
 msgid "Search shot records"
 msgstr ""
@@ -1109,27 +1103,27 @@ msgstr ""
 #: lib/cannery_web/templates/error/error.html.heex:8
 #: lib/cannery_web/templates/layout/root.html.heex:13
 #: lib/cannery_web/templates/layout/root.html.heex:14
-#: lib/cannery_web/views/layout_view.ex:15
+#: lib/cannery_web/views/layout_view.ex:14
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Cannery"
 msgstr ""
 
-#: lib/cannery_web/components/user_card.ex:33
+#: lib/cannery_web/components/core_components/user_card.html.heex:20
 #, elixir-autogen, elixir-format
 msgid "Email unconfirmed"
 msgstr ""
 
-#: lib/cannery_web/components/user_card.ex:38
+#: lib/cannery_web/components/core_components/user_card.html.heex:25
 #, elixir-autogen, elixir-format, fuzzy
 msgid "User registered on%{registered_datetime}"
 msgstr "Benutzer registriert am"
 
-#: lib/cannery_web/components/user_card.ex:27
+#: lib/cannery_web/components/core_components/user_card.html.heex:14
 #, elixir-autogen, elixir-format
 msgid "User was confirmed at%{confirmed_datetime}"
 msgstr ""
 
-#: lib/cannery_web/components/invite_card.ex:37
+#: lib/cannery_web/components/core_components/invite_card.html.heex:16
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Uses Left: Unlimited"
 msgstr "Verbleibende Nutzung:"
@@ -1143,24 +1137,24 @@ msgstr "Verbleibende Nutzung:"
 ## 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/home_live.html.heex:26
+#: lib/cannery_web/live/home_live.html.heex:25
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Cannery lets you easily keep an eye on your ammo levels before and after range day"
 msgstr ""
 "Mit %{name} können Sie ihren Munitionsbestand vor und nach dem Schießen "
 "leicht im Auge behalten"
 
-#: lib/cannery_web/views/layout_view.ex:11
+#: lib/cannery_web/views/layout_view.ex:10
 #, elixir-autogen, elixir-format
 msgid "Cannery | %{title}"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:78
+#: lib/cannery_web/live/home_live.html.heex:80
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Registration:"
 msgstr "Registrieren"
 
-#: lib/cannery_web/live/home_live.html.heex:88
+#: lib/cannery_web/live/home_live.html.heex:90
 #, elixir-autogen, elixir-format
 msgid "Version:"
 msgstr ""
@@ -1170,29 +1164,29 @@ msgstr ""
 msgid "Welcome to Cannery"
 msgstr "Willkommen %{name}"
 
-#: lib/cannery_web/live/invite_live/index.html.heex:70
+#: lib/cannery_web/live/invite_live/index.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Disable"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:70
+#: lib/cannery_web/live/invite_live/index.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Enable"
 msgstr ""
 
-#: lib/cannery_web/components/invite_card.ex:32
+#: lib/cannery_web/components/core_components/invite_card.html.heex:11
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Uses Left: %{uses_left_count}"
 msgstr "Verbleibende Nutzung:"
 
-#: lib/cannery_web/components/invite_card.ex:52
+#: lib/cannery_web/components/core_components/invite_card.html.heex:31
 #, elixir-autogen, elixir-format
 msgid "Uses: %{uses_count}"
 msgstr ""
 
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:12
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:13
 #: lib/cannery_web/templates/user_registration/new.html.heex:20
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:12
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:13
 #: lib/cannery_web/templates/user_session/new.html.heex:17
 #: lib/cannery_web/templates/user_settings/edit.html.heex:27
 #, elixir-autogen, elixir-format
@@ -1204,24 +1198,3 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Password"
 msgstr ""
-
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:153
-#, elixir-autogen, elixir-format
-msgid "Clone ammo group of %{ammo_group_count} bullets"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:168
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:80
-#, elixir-autogen, elixir-format
-msgid "Delete ammo group of %{ammo_group_count} bullets"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:141
-#, elixir-autogen, elixir-format
-msgid "Edit ammo group of %{ammo_group_count} bullets"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:129
-#, elixir-autogen, elixir-format
-msgid "View ammo group of %{ammo_group_count} bullets"
-msgstr ""

priv/gettext/de/LC_MESSAGES/errors.po

@@ -23,18 +23,18 @@ 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:179
+#: lib/cannery/containers.ex:200
 #, elixir-autogen, elixir-format
 msgid "Container must be empty before deleting"
 msgstr "Behälter muss vor dem Löschen leer sein"
 
-#: lib/cannery_web/live/container_live/index.ex:92
-#: lib/cannery_web/live/container_live/show.ex:72
+#: lib/cannery_web/live/container_live/index.ex:86
+#: 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}"
 
-#: lib/cannery_web/live/container_live/index.ex:80
+#: lib/cannery_web/live/container_live/index.ex:74
 #, elixir-autogen, elixir-format
 msgid "Could not find that container"
 msgstr "Konnte Behälter nicht finden"
@@ -49,12 +49,12 @@ msgstr "Mailadressenänderungs-Link ist ungültig oder abgelaufen."
 msgid "Error"
 msgstr "Fehler"
 
-#: lib/cannery_web/templates/error/error.html.heex:28
+#: lib/cannery_web/templates/error/error.html.heex:31
 #, elixir-autogen, elixir-format
 msgid "Go back home"
 msgstr "Zur Hauptseite zurückkehren"
 
-#: lib/cannery_web/views/error_view.ex:11
+#: lib/cannery_web/views/error_view.ex:10
 #, elixir-autogen, elixir-format
 msgid "Internal Server Error"
 msgstr "Interner Serverfehler"
@@ -64,7 +64,7 @@ msgstr "Interner Serverfehler"
 msgid "Invalid email or password"
 msgstr "Ungültige Mailadresse oder Passwort"
 
-#: lib/cannery_web/views/error_view.ex:9
+#: lib/cannery_web/views/error_view.ex:8
 #, elixir-autogen, elixir-format
 msgid "Not found"
 msgstr "Nicht gefunden"
@@ -83,15 +83,15 @@ msgstr "Oops, etwas ist schiefgegangen. Bitte beachten Sie den Fehler unten."
 msgid "Reset password link is invalid or it has expired."
 msgstr "Link zum Passwort zurücksetzen ist ungültig oder abgelaufen."
 
-#: lib/cannery_web/controllers/user_registration_controller.ex:22
-#: lib/cannery_web/controllers/user_registration_controller.ex:51
+#: lib/cannery_web/controllers/user_registration_controller.ex:23
+#: lib/cannery_web/controllers/user_registration_controller.ex:52
 #, elixir-autogen, elixir-format
 msgid "Sorry, public registration is disabled"
 msgstr "Entschuldigung, aber öffentliche Registrierung ist deaktiviert"
 
-#: lib/cannery_web/controllers/user_registration_controller.ex:12
-#: lib/cannery_web/controllers/user_registration_controller.ex:41
-#: lib/cannery_web/controllers/user_registration_controller.ex:70
+#: lib/cannery_web/controllers/user_registration_controller.ex:13
+#: lib/cannery_web/controllers/user_registration_controller.ex:42
+#: lib/cannery_web/controllers/user_registration_controller.ex:71
 #, elixir-autogen, elixir-format
 msgid "Sorry, this invite was not found or expired"
 msgstr ""
@@ -102,7 +102,7 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr "Dieser Nutzer konnte nicht gelöscht werden"
 
-#: lib/cannery_web/views/error_view.ex:10
+#: lib/cannery_web/views/error_view.ex:9
 #, elixir-autogen, elixir-format
 msgid "Unauthorized"
 msgstr "Unbefugt"
@@ -112,7 +112,7 @@ msgstr "Unbefugt"
 msgid "User confirmation link is invalid or it has expired."
 msgstr "Nutzerkonto Bestätigungslink ist ungültig oder abgelaufen."
 
-#: lib/cannery_web/live/invite_live/index.ex:19
+#: 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"
@@ -142,21 +142,16 @@ msgstr "ist nicht gültig"
 msgid "must have the @ sign and no spaces"
 msgstr "Muss ein @ Zeichen und keine Leerzeichen haben"
 
-#: lib/cannery/tags.ex:66
+#: lib/cannery_web/live/container_live/show.ex:46
 #, elixir-autogen, elixir-format
 msgid "Tag not found"
 msgstr "Tag nicht gefunden"
 
-#: lib/cannery_web/live/container_live/edit_tags_component.ex:45
+#: lib/cannery_web/live/container_live/edit_tags_component.ex:46
 #, elixir-autogen, elixir-format
 msgid "Tag could not be added"
 msgstr "Tag konnte nicht hinzugefügt werden"
 
-#: lib/cannery/activity_log/shot_group.ex:126
-#, elixir-autogen, elixir-format
-msgid "Count must be at least 1"
-msgstr "Anzahl muss mindestens 1 sein"
-
 #: lib/cannery_web/controllers/user_auth.ex:39
 #: lib/cannery_web/controllers/user_auth.ex:161
 #, elixir-autogen, elixir-format
@@ -165,45 +160,59 @@ msgstr ""
 "Sie müssen ihr Nutzerkonto bestätigen und einloggen, um diese Seite "
 "anzuzeigen."
 
-#: lib/cannery_web/live/container_live/edit_tags_component.ex:72
+#: lib/cannery_web/live/container_live/edit_tags_component.ex:73
 #, 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:157
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:160
 #, elixir-autogen, elixir-format
 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:142
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:150
 #, elixir-autogen, elixir-format
 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:686
+#: lib/cannery/ammo.ex:1015
 #, elixir-autogen, elixir-format
 msgid "Invalid multiplier"
 msgstr ""
 
-#: lib/cannery/ammo/ammo_group.ex:97
+#: lib/cannery/ammo/ammo_group.ex:92
 #, elixir-autogen, elixir-format
 msgid "Please select an ammo type and container"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:67
+#: lib/cannery_web/live/range_live/index.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "Your browser does not support the canvas element."
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:77
+#: lib/cannery/activity_log/shot_group.ex:72
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Please select a valid user and ammo pack"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_group.ex:83
-#: lib/cannery/activity_log/shot_group.ex:121
+#: lib/cannery/activity_log/shot_group.ex:86
+#, elixir-autogen, elixir-format
+msgid "Ammo left can be at most %{count} rounds"
+msgstr ""
+
+#: lib/cannery/activity_log/shot_group.ex:82
+#, elixir-autogen, elixir-format
+msgid "Ammo left must be at least 0"
+msgstr ""
+
+#: lib/cannery/activity_log/shot_group.ex:119
 #, elixir-autogen, elixir-format, fuzzy
-msgid "Count must be less than %{count} shots"
+msgid "Count can be at most %{count} shots"
 msgstr "Anzahl muss weniger als %{count} betragen"
+
+#: lib/cannery/activity_log/shot_group.ex:78
+#, elixir-autogen, elixir-format
+msgid "can't be blank"
+msgstr ""

priv/gettext/de/LC_MESSAGES/prompts.po

@@ -23,31 +23,31 @@ 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:86
+#: lib/cannery_web/live/ammo_type_live/form_component.ex:89
 #: lib/cannery_web/live/container_live/form_component.ex:89
 #: lib/cannery_web/live/invite_live/form_component.ex:80
-#: lib/cannery_web/live/tag_live/form_component.ex:79
+#: lib/cannery_web/live/tag_live/form_component.ex:78
 #, elixir-autogen, elixir-format
 msgid "%{name} created successfully"
 msgstr "%{name} erfolgreich erstellt"
 
-#: lib/cannery_web/live/ammo_type_live/index.ex:73
-#: lib/cannery_web/live/ammo_type_live/show.ex:55
-#: lib/cannery_web/live/tag_live/index.ex:64
+#: lib/cannery_web/live/ammo_type_live/index.ex:72
+#: lib/cannery_web/live/ammo_type_live/show.ex:54
+#: lib/cannery_web/live/tag_live/index.ex:65
 #, elixir-autogen, elixir-format
 msgid "%{name} deleted succesfully"
 msgstr "%{name} erfolgreich gelöscht"
 
-#: lib/cannery_web/live/container_live/index.ex:85
-#: lib/cannery_web/live/container_live/show.ex:62
+#: lib/cannery_web/live/container_live/index.ex:79
+#: lib/cannery_web/live/container_live/show.ex:61
 #, elixir-autogen, elixir-format
 msgid "%{name} has been deleted"
 msgstr "%{name} wurde gelöscht"
 
-#: lib/cannery_web/live/ammo_type_live/form_component.ex:67
+#: lib/cannery_web/live/ammo_type_live/form_component.ex:70
 #: lib/cannery_web/live/container_live/form_component.ex:70
 #: lib/cannery_web/live/invite_live/form_component.ex:62
-#: lib/cannery_web/live/tag_live/form_component.ex:61
+#: lib/cannery_web/live/tag_live/form_component.ex:60
 #, elixir-autogen, elixir-format
 msgid "%{name} updated successfully"
 msgstr "%{name} erfolgreich aktualisiert"
@@ -57,24 +57,24 @@ msgstr "%{name} erfolgreich aktualisiert"
 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."
 
-#: lib/cannery_web/live/invite_live/index.html.heex:105
-#: lib/cannery_web/live/invite_live/index.html.heex:133
+#: lib/cannery_web/live/invite_live/index.html.heex:110
+#: lib/cannery_web/live/invite_live/index.html.heex:138
 #, elixir-autogen, elixir-format
 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:98
-#: lib/cannery_web/live/container_live/index.html.heex:150
-#: lib/cannery_web/live/container_live/show.html.heex:55
-#: lib/cannery_web/live/tag_live/index.html.heex:62
+#: lib/cannery_web/live/container_live/index.html.heex:99
+#: lib/cannery_web/live/container_live/index.html.heex:155
+#: lib/cannery_web/live/container_live/show.html.heex:52
+#: lib/cannery_web/live/tag_live/index.html.heex:63
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete %{name}?"
 msgstr "Sind Sie sicher, dass sie %{name} löschen möchten?"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:166
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:78
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:167
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this ammo?"
 msgstr "Sind Sie sicher, dass sie diese Munition löschen möchten?"
@@ -84,7 +84,7 @@ msgstr "Sind Sie sicher, dass sie diese Munition löschen möchten?"
 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:104
+#: lib/cannery_web/components/core_components/topbar.html.heex:89
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to log out?"
 msgstr "Wirklich ausloggen?"
@@ -123,7 +123,7 @@ msgstr "Passwort erfolgreich zurückgesetzt."
 msgid "Password updated successfully."
 msgstr "Passwort erfolgreich geändert."
 
-#: lib/cannery_web/controllers/user_registration_controller.ex:65
+#: lib/cannery_web/controllers/user_registration_controller.ex:66
 #, 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"
@@ -151,44 +151,44 @@ msgstr ""
 "Sind Sie sicher, dass sie %{tag_name} Tag von %{container_name} entfernen "
 "wollen?"
 
-#: lib/cannery_web/live/container_live/edit_tags_component.ex:50
+#: lib/cannery_web/live/container_live/edit_tags_component.ex:51
 #, elixir-autogen, elixir-format
 msgid "%{name} added successfully"
 msgstr "%{name} erfolgreich hinzugefügt"
 
-#: lib/cannery_web/live/container_live/show.ex:39
+#: lib/cannery_web/live/container_live/show.ex:38
 #, 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:52
+#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:53
 #, elixir-autogen, elixir-format
 msgid "Adding..."
 msgstr "Füge hinzu..."
 
-#: lib/cannery_web/components/add_shot_group_component.ex:56
+#: lib/cannery_web/components/add_shot_group_component.ex:60
 #, elixir-autogen, elixir-format
 msgid "Shots recorded successfully"
 msgstr "Schüsse erfolgreich dokumentiert"
 
-#: lib/cannery_web/live/range_live/index.html.heex:27
+#: lib/cannery_web/live/range_live/index.html.heex:34
 #, elixir-autogen, elixir-format
 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:143
-#: lib/cannery_web/live/range_live/index.html.heex:119
+#: lib/cannery_web/live/ammo_group_live/show.ex:159
+#: lib/cannery_web/live/range_live/index.html.heex:127
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this shot record?"
 msgstr "Sind sie sicher, dass sie die Schießkladde löschen möchten?"
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:80
-#: lib/cannery_web/live/range_live/index.ex:80
+#: lib/cannery_web/live/ammo_group_live/show.ex:81
+#: lib/cannery_web/live/range_live/index.ex:79
 #, elixir-autogen, elixir-format
 msgid "Shot records deleted succesfully"
 msgstr "Schießkladde erfolgreich gelöscht"
 
-#: lib/cannery_web/live/range_live/form_component.ex:55
+#: lib/cannery_web/live/range_live/form_component.ex:54
 #, elixir-autogen, elixir-format
 msgid "Shot records updated successfully"
 msgstr "Schießkladde erfolgreich aktualisiert"
@@ -198,17 +198,17 @@ msgstr "Schießkladde erfolgreich aktualisiert"
 msgid "%{email} confirmed successfully."
 msgstr "%{email} erfolgreich bestätigt."
 
-#: lib/cannery_web/components/move_ammo_group_component.ex:53
+#: lib/cannery_web/components/move_ammo_group_component.ex:54
 #, elixir-autogen, elixir-format
 msgid "Ammo moved to %{name} successfully"
 msgstr "Munition erfolgreich zu %{name} verschoben"
 
-#: lib/cannery_web/live/invite_live/index.ex:127
+#: lib/cannery_web/live/invite_live/index.ex:126
 #, elixir-autogen, elixir-format
 msgid "Copied to clipboard"
 msgstr "Der Zwischenablage hinzugefügt"
 
-#: lib/cannery_web/live/container_live/edit_tags_component.ex:77
+#: lib/cannery_web/live/container_live/edit_tags_component.ex:78
 #, elixir-autogen, elixir-format
 msgid "%{name} removed successfully"
 msgstr "%{name} erfolgreich entfernt"
@@ -235,70 +235,70 @@ msgid "Language updated successfully."
 msgstr "Spracheinstellung gespeichert."
 
 #: lib/cannery_web/live/ammo_group_live/index.ex:89
-#: lib/cannery_web/live/ammo_group_live/show.ex:54
+#: lib/cannery_web/live/ammo_group_live/show.ex:55
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo deleted succesfully"
 msgstr "Munitionsgruppe erfolgreich gelöscht"
 
-#: lib/cannery_web/live/range_live/index.ex:94
+#: lib/cannery_web/live/range_live/index.ex:93
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo unstaged succesfully"
 msgstr "Munition erfolgreich demarkiert"
 
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:118
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:126
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo updated successfully"
 msgstr "Munitionsgruppe erfolgreich aktualisiert"
 
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:178
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:185
 #, 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.html.heex:95
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:96
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:29
 #, 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?"
 
-#: lib/cannery_web/live/home_live.html.heex:65
+#: lib/cannery_web/live/home_live.html.heex:63
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Register to setup Cannery"
 msgstr "Registrieren Sie sich, um %{name} zu bearbeiten"
 
-#: lib/cannery_web/live/invite_live/index.ex:54
+#: lib/cannery_web/live/invite_live/index.ex:53
 #, elixir-autogen, elixir-format, fuzzy
 msgid "%{invite_name} deleted succesfully"
 msgstr "%{name} erfolgreich gelöscht"
 
-#: lib/cannery_web/live/invite_live/index.ex:115
+#: lib/cannery_web/live/invite_live/index.ex:114
 #, elixir-autogen, elixir-format, fuzzy
 msgid "%{invite_name} disabled succesfully"
 msgstr "%{name} erfolgreich deaktiviert"
 
-#: lib/cannery_web/live/invite_live/index.ex:91
+#: lib/cannery_web/live/invite_live/index.ex:90
 #, elixir-autogen, elixir-format, fuzzy
 msgid "%{invite_name} enabled succesfully"
 msgstr "%{name} erfolgreich aktiviert"
 
-#: lib/cannery_web/live/invite_live/index.ex:69
+#: lib/cannery_web/live/invite_live/index.ex:68
 #, elixir-autogen, elixir-format, fuzzy
 msgid "%{invite_name} updated succesfully"
 msgstr "%{name} erfolgreich aktualisiert"
 
-#: lib/cannery_web/live/invite_live/index.ex:138
+#: lib/cannery_web/live/invite_live/index.ex:135
 #, elixir-autogen, elixir-format, fuzzy
 msgid "%{user_email} deleted succesfully"
 msgstr "%{name} erfolgreich gelöscht"
 
-#: lib/cannery_web/live/invite_live/index.html.heex:53
+#: lib/cannery_web/live/invite_live/index.html.heex:58
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Are you sure you want to delete the invite for %{invite_name}?"
 msgstr "Sind Sie sicher, dass sie die Einladung für %{name} löschen möchten?"
 
-#: lib/cannery_web/live/invite_live/index.html.heex:80
+#: lib/cannery_web/live/invite_live/index.html.heex:85
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Are you sure you want to make %{invite_name} unlimited?"
 msgstr "Sind Sie sicher, dass sie %{name} auf unbegrenzt setzen möchten?"

priv/gettext/default.pot

@@ -10,23 +10,23 @@
 msgid ""
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:46
+#: lib/cannery_web/live/home_live.html.heex:44
 #, elixir-autogen, elixir-format
 msgid "Access from any internet-capable device"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:94
+#: lib/cannery_web/live/invite_live/index.html.heex:99
 #, elixir-autogen, elixir-format
 msgid "Admins"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:60
+#: lib/cannery_web/live/home_live.html.heex:58
 #, elixir-autogen, elixir-format
 msgid "Admins:"
 msgstr ""
 
+#: lib/cannery_web/components/core_components/topbar.html.heex:58
 #: lib/cannery_web/components/shot_group_table_component.ex:41
-#: lib/cannery_web/components/topbar.ex:73
 #: lib/cannery_web/live/ammo_group_live/index.ex:70
 #: lib/cannery_web/live/ammo_group_live/index.ex:79
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:3
@@ -93,9 +93,9 @@ msgstr ""
 msgid "Container"
 msgstr ""
 
-#: lib/cannery_web/components/topbar.ex:57
-#: lib/cannery_web/live/container_live/index.ex:49
-#: lib/cannery_web/live/container_live/index.ex:58
+#: lib/cannery_web/components/core_components/topbar.html.heex:42
+#: lib/cannery_web/live/container_live/index.ex:45
+#: lib/cannery_web/live/container_live/index.ex:54
 #: lib/cannery_web/live/container_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Containers"
@@ -113,36 +113,36 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:39
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:16
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:8
 #, elixir-autogen, elixir-format
 msgid "Count:"
 msgstr ""
 
-#: lib/cannery_web/components/container_table_component.ex:47
+#: lib/cannery_web/components/container_table_component.ex:46
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
 #: lib/cannery_web/live/container_live/form_component.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr ""
 
-#: lib/cannery_web/components/container_card.ex:39
+#: lib/cannery_web/components/core_components/container_card.html.heex:16
 #: lib/cannery_web/live/container_live/show.html.heex:7
 #, elixir-autogen, elixir-format
 msgid "Description:"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:23
+#: lib/cannery_web/live/home_live.html.heex:22
 #, elixir-autogen, elixir-format
 msgid "Easy to Use:"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.ex:34
+#: lib/cannery_web/live/invite_live/index.ex:33
 #, elixir-autogen, elixir-format
 msgid "Edit Invite"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/index.ex:28
+#: lib/cannery_web/live/tag_live/index.ex:27
 #, elixir-autogen, elixir-format
 msgid "Edit Tag"
 msgstr ""
@@ -169,23 +169,23 @@ msgstr ""
 msgid "Incendiary"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:55
+#: lib/cannery_web/live/home_live.html.heex:53
 #, elixir-autogen, elixir-format
 msgid "Instance Information"
 msgstr ""
 
-#: lib/cannery_web/components/invite_card.ex:42
+#: lib/cannery_web/components/core_components/invite_card.html.heex:21
 #, elixir-autogen, elixir-format
 msgid "Invite Disabled"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:82
+#: lib/cannery_web/live/home_live.html.heex:84
 #, elixir-autogen, elixir-format
 msgid "Invite Only"
 msgstr ""
 
-#: lib/cannery_web/components/topbar.ex:89
-#: lib/cannery_web/live/invite_live/index.ex:42
+#: lib/cannery_web/components/core_components/topbar.html.heex:74
+#: lib/cannery_web/live/invite_live/index.ex:41
 #: lib/cannery_web/live/invite_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Invites"
@@ -196,14 +196,14 @@ msgstr ""
 msgid "Keep me logged in for 60 days"
 msgstr ""
 
-#: lib/cannery_web/components/container_table_component.ex:48
+#: lib/cannery_web/components/container_table_component.ex:47
 #: lib/cannery_web/components/move_ammo_group_component.ex:69
 #: lib/cannery_web/live/container_live/form_component.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Location"
 msgstr ""
 
-#: lib/cannery_web/components/container_card.ex:49
+#: lib/cannery_web/components/core_components/container_card.html.heex:26
 #: lib/cannery_web/live/container_live/show.html.heex:17
 #, elixir-autogen, elixir-format
 msgid "Location:"
@@ -231,7 +231,7 @@ msgid "My cool ammo can"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:45
-#: lib/cannery_web/components/container_table_component.ex:46
+#: lib/cannery_web/components/container_table_component.ex:45
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:21
 #: lib/cannery_web/live/container_live/form_component.html.heex:21
 #: lib/cannery_web/live/invite_live/form_component.html.heex:21
@@ -246,35 +246,35 @@ msgstr ""
 msgid "New Ammo type"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.ex:36
-#: lib/cannery_web/live/container_live/index.ex:43
+#: lib/cannery_web/live/container_live/index.ex:32
+#: lib/cannery_web/live/container_live/index.ex:39
 #, elixir-autogen, elixir-format
 msgid "New Container"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.ex:38
+#: lib/cannery_web/live/invite_live/index.ex:37
 #, elixir-autogen, elixir-format
 msgid "New Invite"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/index.ex:36
+#: lib/cannery_web/live/tag_live/index.ex:35
 #, elixir-autogen, elixir-format
 msgid "New Tag"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:10
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:70
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:71
 #, elixir-autogen, elixir-format
 msgid "No Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:169
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:167
 #, elixir-autogen, elixir-format
 msgid "No ammo for this type"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/index.html.heex:8
-#: lib/cannery_web/live/container_live/index.html.heex:46
+#: lib/cannery_web/live/container_live/index.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "No containers"
 msgstr ""
@@ -286,7 +286,7 @@ msgstr ""
 
 #: lib/cannery_web/live/container_live/edit_tags_component.html.heex:29
 #: lib/cannery_web/live/tag_live/index.html.heex:10
-#: lib/cannery_web/live/tag_live/index.html.heex:42
+#: lib/cannery_web/live/tag_live/index.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "No tags"
 msgstr ""
@@ -295,13 +295,13 @@ msgstr ""
 #: lib/cannery_web/components/ammo_group_table_component.ex:81
 #: lib/cannery_web/components/shot_group_table_component.ex:43
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:50
-#: lib/cannery_web/live/ammo_group_live/show.ex:90
+#: lib/cannery_web/live/ammo_group_live/show.ex:92
 #: lib/cannery_web/live/range_live/form_component.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Notes"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:52
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:26
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:24
 #, elixir-autogen, elixir-format
 msgid "Notes:"
@@ -324,7 +324,7 @@ msgstr ""
 msgid "Price paid"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:68
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Price paid:"
 msgstr ""
@@ -335,17 +335,17 @@ msgstr ""
 msgid "Primer type"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:81
+#: lib/cannery_web/live/home_live.html.heex:83
 #, elixir-autogen, elixir-format
 msgid "Public Signups"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:33
+#: lib/cannery_web/live/home_live.html.heex:32
 #, elixir-autogen, elixir-format
 msgid "Secure:"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:36
+#: lib/cannery_web/live/home_live.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Self-host your own instance, or use an instance from someone you trust."
 msgstr ""
@@ -356,7 +356,7 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:43
+#: lib/cannery_web/live/home_live.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Simple:"
 msgstr ""
@@ -366,15 +366,15 @@ msgstr ""
 msgid "Steel"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:117
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:113
 #, elixir-autogen, elixir-format
 msgid "Stored in"
 msgstr ""
 
-#: lib/cannery_web/components/container_table_component.ex:52
-#: lib/cannery_web/components/topbar.ex:49
-#: lib/cannery_web/live/tag_live/index.ex:44
-#: lib/cannery_web/live/tag_live/index.ex:54
+#: lib/cannery_web/components/container_table_component.ex:66
+#: lib/cannery_web/components/core_components/topbar.html.heex:34
+#: lib/cannery_web/live/tag_live/index.ex:43
+#: lib/cannery_web/live/tag_live/index.ex:53
 #: lib/cannery_web/live/tag_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Tags"
@@ -401,20 +401,20 @@ msgstr ""
 msgid "Tracer"
 msgstr ""
 
-#: lib/cannery_web/components/container_table_component.ex:49
+#: lib/cannery_web/components/container_table_component.ex:48
 #: lib/cannery_web/components/move_ammo_group_component.ex:68
 #: lib/cannery_web/live/container_live/form_component.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Type"
 msgstr ""
 
-#: lib/cannery_web/components/container_card.ex:44
+#: lib/cannery_web/components/core_components/container_card.html.heex:21
 #: lib/cannery_web/live/container_live/show.html.heex:12
 #, elixir-autogen, elixir-format
 msgid "Type:"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:122
+#: lib/cannery_web/live/invite_live/index.html.heex:127
 #, elixir-autogen, elixir-format
 msgid "Users"
 msgstr ""
@@ -424,18 +424,18 @@ msgstr ""
 msgid "Uses left"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:37
+#: lib/cannery_web/live/home_live.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Your data stays with you, period"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:70
+#: lib/cannery_web/live/container_live/show.html.heex:67
 #, elixir-autogen, elixir-format
 msgid "No tags for this container"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_group_table_component.ex:72
-#: lib/cannery_web/components/topbar.ex:81
+#: lib/cannery_web/components/core_components/topbar.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Range"
 msgstr ""
@@ -447,7 +447,7 @@ msgstr ""
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:46
 #: lib/cannery_web/components/shot_group_table_component.ex:44
-#: lib/cannery_web/live/ammo_group_live/show.ex:91
+#: lib/cannery_web/live/ammo_group_live/show.ex:93
 #: lib/cannery_web/live/range_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Date"
@@ -469,19 +469,19 @@ msgstr ""
 msgid "Record shots"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:41
-#: lib/cannery_web/live/range_live/index.ex:41
+#: lib/cannery_web/live/ammo_group_live/show.ex:42
+#: lib/cannery_web/live/range_live/index.ex:40
 #, elixir-autogen, elixir-format
 msgid "Edit Shot Records"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:49
+#: lib/cannery_web/live/range_live/index.ex:48
 #, elixir-autogen, elixir-format
 msgid "New Shot Records"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:48
-#: lib/cannery_web/live/range_live/index.html.heex:89
+#: lib/cannery_web/live/range_live/index.html.heex:55
+#: lib/cannery_web/live/range_live/index.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "No shots recorded"
 msgstr ""
@@ -493,20 +493,19 @@ msgid "Rounds left"
 msgstr ""
 
 #: lib/cannery_web/components/shot_group_table_component.ex:42
-#: lib/cannery_web/live/ammo_group_live/show.ex:89
-#: lib/cannery_web/live/range_live/index.html.heex:62
+#: lib/cannery_web/live/ammo_group_live/show.ex:91
+#: lib/cannery_web/live/range_live/index.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "Rounds shot"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:57
-#: lib/cannery_web/live/range_live/index.ex:67
+#: lib/cannery_web/live/range_live/index.ex:56
+#: lib/cannery_web/live/range_live/index.ex:66
 #, elixir-autogen, elixir-format
 msgid "Shot Records"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/index.ex:38
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:119
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr ""
@@ -516,18 +515,18 @@ msgstr ""
 msgid "No other containers"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:53
+#: lib/cannery_web/live/range_live/index.html.heex:60
 #, elixir-autogen, elixir-format
 msgid "Shot log"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:69
-#: lib/cannery_web/components/ammo_group_card.ex:76
 #: lib/cannery_web/components/ammo_group_table_component.ex:153
-#: lib/cannery_web/components/ammo_group_table_component.ex:225
-#: lib/cannery_web/components/ammo_type_table_component.ex:180
+#: lib/cannery_web/components/ammo_group_table_component.ex:229
+#: lib/cannery_web/components/ammo_type_table_component.ex:224
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:42
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:47
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:37
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:44
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:42
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:139
 #, elixir-autogen, elixir-format
 msgid "$%{amount}"
@@ -597,28 +596,28 @@ msgstr ""
 msgid "Reconnecting..."
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.ex:32
-#: lib/cannery_web/live/container_live/show.ex:110
+#: lib/cannery_web/live/container_live/index.ex:28
+#: lib/cannery_web/live/container_live/show.ex:108
 #, elixir-autogen, elixir-format
 msgid "Edit %{name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.ex:69
-#: lib/cannery_web/live/container_live/show.ex:111
+#: lib/cannery_web/live/container_live/index.ex:63
+#: lib/cannery_web/live/container_live/show.ex:109
 #, elixir-autogen, elixir-format
 msgid "Edit %{name} tags"
 msgstr ""
 
-#: lib/cannery_web/components/container_card.ex:60
+#: lib/cannery_web/components/core_components/container_card.html.heex:37
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:70
-#: lib/cannery_web/live/container_live/show.html.heex:35
+#: lib/cannery_web/live/container_live/show.html.heex:33
 #, elixir-autogen, elixir-format
 msgid "Rounds:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:222
-#: lib/cannery_web/components/ammo_type_table_component.ex:179
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:145
+#: lib/cannery_web/components/ammo_group_table_component.ex:226
+#: lib/cannery_web/components/ammo_type_table_component.ex:223
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:143
 #, elixir-autogen, elixir-format
 msgid "No cost information"
 msgstr ""
@@ -628,7 +627,7 @@ msgstr ""
 msgid "% left"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:43
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Current value:"
 msgstr ""
@@ -648,7 +647,7 @@ msgstr ""
 msgid "Percentage left:"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:130
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:126
 #, elixir-autogen, elixir-format
 msgid "Rounds used"
 msgstr ""
@@ -668,7 +667,7 @@ msgstr ""
 msgid "Log in"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_registration_controller.ex:32
+#: lib/cannery_web/controllers/user_registration_controller.ex:33
 #, elixir-autogen, elixir-format
 msgid "Register"
 msgstr ""
@@ -678,8 +677,8 @@ msgstr ""
 msgid "Reset your password"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:40
-#: lib/cannery_web/live/range_live/index.ex:33
+#: lib/cannery_web/live/ammo_group_live/show.ex:41
+#: lib/cannery_web/live/range_live/index.ex:32
 #, elixir-autogen, elixir-format
 msgid "Record Shots"
 msgstr ""
@@ -715,27 +714,27 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:107
+#: lib/cannery_web/live/home_live.html.heex:109
 #, elixir-autogen, elixir-format
 msgid "Get involved!"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:128
+#: lib/cannery_web/live/home_live.html.heex:130
 #, elixir-autogen, elixir-format
 msgid "Help translate"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:139
+#: lib/cannery_web/live/home_live.html.heex:141
 #, elixir-autogen, elixir-format
 msgid "Report bugs or request features"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:117
+#: lib/cannery_web/live/home_live.html.heex:119
 #, elixir-autogen, elixir-format
 msgid "View the source code"
 msgstr ""
 
-#: lib/cannery_web/components/topbar.ex:65
+#: lib/cannery_web/components/core_components/topbar.html.heex:50
 #: lib/cannery_web/live/ammo_type_live/index.ex:52
 #: lib/cannery_web/live/ammo_type_live/index.ex:62
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:3
@@ -743,39 +742,39 @@ msgstr ""
 msgid "Catalog"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:44
+#: lib/cannery_web/live/ammo_group_live/show.ex:45
 #, elixir-autogen, elixir-format
 msgid "Edit Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:42
+#: lib/cannery_web/live/ammo_group_live/show.ex:43
 #, elixir-autogen, elixir-format
 msgid "Move Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:115
+#: lib/cannery_web/live/container_live/show.html.heex:112
 #, elixir-autogen, elixir-format
 msgid "No ammo in this container"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:43
+#: lib/cannery_web/live/ammo_group_live/show.ex:44
 #, elixir-autogen, elixir-format
 msgid "Show Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:122
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:118
 #, elixir-autogen, elixir-format
 msgid "This ammo is not in a container"
 msgstr ""
 
-#: lib/cannery_web/components/container_card.ex:55
+#: lib/cannery_web/components/core_components/container_card.html.heex:32
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:98
-#: lib/cannery_web/live/container_live/show.html.heex:26
+#: lib/cannery_web/live/container_live/show.html.heex:23
 #, elixir-autogen, elixir-format
 msgid "Packs:"
 msgstr ""
 
-#: lib/cannery_web/components/topbar.ex:25
+#: lib/cannery_web/components/core_components/topbar.html.heex:10
 #: lib/cannery_web/live/home_live.html.heex:4
 #, elixir-autogen, elixir-format
 msgid "Cannery logo"
@@ -791,45 +790,45 @@ msgstr ""
 msgid "Leave \"Uses left\" blank to make invite unlimited"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:83
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:54
 #, elixir-autogen, elixir-format
 msgid "Container:"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:63
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:38
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:155
-#: lib/cannery_web/live/container_live/show.html.heex:101
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:64
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:39
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:153
+#: lib/cannery_web/live/container_live/show.html.heex:98
 #, elixir-autogen, elixir-format
 msgid "Show used"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:193
+#: lib/cannery_web/components/ammo_group_table_component.ex:187
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "%{percentage}%"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:134
+#: lib/cannery_web/live/range_live/index.ex:135
 #, elixir-autogen, elixir-format
 msgid "Rounds shot: %{count}"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:100
-#: lib/cannery_web/components/container_table_component.ex:50
+#: lib/cannery_web/components/container_table_component.ex:64
 #, elixir-autogen, elixir-format
 msgid "Packs"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:80
-#: lib/cannery_web/components/container_table_component.ex:51
+#: lib/cannery_web/components/container_table_component.ex:65
 #, elixir-autogen, elixir-format
 msgid "Rounds"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:161
-#: lib/cannery_web/live/container_live/index.html.heex:38
-#: lib/cannery_web/live/container_live/show.html.heex:107
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:159
+#: lib/cannery_web/live/container_live/index.html.heex:39
+#: lib/cannery_web/live/container_live/show.html.heex:104
 #, elixir-autogen, elixir-format
 msgid "View as table"
 msgstr ""
@@ -879,102 +878,102 @@ msgstr ""
 msgid "Used up!"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:64
+#: lib/cannery_web/live/range_live/index.html.heex:71
 #, elixir-autogen, elixir-format
 msgid "Rounds shot chart"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:27
+#: lib/cannery_web/live/ammo_type_live/show.ex:26
 #, elixir-autogen, elixir-format
 msgid "Blank:"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:13
+#: lib/cannery_web/live/ammo_type_live/show.ex:12
 #, elixir-autogen, elixir-format
 msgid "Bullet core:"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:12
+#: lib/cannery_web/live/ammo_type_live/show.ex:11
 #, elixir-autogen, elixir-format
 msgid "Bullet type:"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:15
+#: lib/cannery_web/live/ammo_type_live/show.ex:14
 #, elixir-autogen, elixir-format
 msgid "Caliber:"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:14
+#: lib/cannery_web/live/ammo_type_live/show.ex:13
 #, elixir-autogen, elixir-format
 msgid "Cartridge:"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:16
+#: lib/cannery_web/live/ammo_type_live/show.ex:15
 #, elixir-autogen, elixir-format
 msgid "Case material:"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:28
+#: lib/cannery_web/live/ammo_type_live/show.ex:27
 #, elixir-autogen, elixir-format
 msgid "Corrosive:"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:24
+#: lib/cannery_web/live/ammo_type_live/show.ex:23
 #, elixir-autogen, elixir-format
 msgid "Firing type:"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:21
+#: lib/cannery_web/live/ammo_type_live/show.ex:20
 #, elixir-autogen, elixir-format
 msgid "Grains:"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:26
+#: lib/cannery_web/live/ammo_type_live/show.ex:25
 #, elixir-autogen, elixir-format
 msgid "Incendiary:"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:17
+#: lib/cannery_web/live/ammo_type_live/show.ex:16
 #, elixir-autogen, elixir-format
 msgid "Jacket type:"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:29
+#: lib/cannery_web/live/ammo_type_live/show.ex:28
 #, elixir-autogen, elixir-format
 msgid "Manufacturer:"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:18
+#: lib/cannery_web/live/ammo_type_live/show.ex:17
 #, elixir-autogen, elixir-format
 msgid "Muzzle velocity:"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:20
+#: lib/cannery_web/live/ammo_type_live/show.ex:19
 #, elixir-autogen, elixir-format
 msgid "Powder grains per charge:"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:19
+#: lib/cannery_web/live/ammo_type_live/show.ex:18
 #, elixir-autogen, elixir-format
 msgid "Powder type:"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:22
+#: lib/cannery_web/live/ammo_type_live/show.ex:21
 #, elixir-autogen, elixir-format
 msgid "Pressure:"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:23
+#: lib/cannery_web/live/ammo_type_live/show.ex:22
 #, elixir-autogen, elixir-format
 msgid "Primer type:"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:25
+#: lib/cannery_web/live/ammo_type_live/show.ex:24
 #, elixir-autogen, elixir-format
 msgid "Tracer:"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.ex:30
+#: lib/cannery_web/live/ammo_type_live/show.ex:29
 #, elixir-autogen, elixir-format
 msgid "UPC:"
 msgstr ""
@@ -986,13 +985,13 @@ msgid "Average CPR"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/index.ex:28
-#: lib/cannery_web/live/ammo_type_live/show.ex:118
+#: lib/cannery_web/live/ammo_type_live/show.ex:135
 #, elixir-autogen, elixir-format
 msgid "Edit %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:40
-#: lib/cannery_web/components/ammo_group_table_component.ex:231
+#: lib/cannery_web/components/ammo_group_table_component.ex:233
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:17
 #, elixir-autogen, elixir-format
 msgid "Empty"
 msgstr ""
@@ -1002,7 +1001,7 @@ msgstr ""
 msgid "CPR"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:75
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:46
 #, elixir-autogen, elixir-format
 msgid "CPR:"
 msgstr ""
@@ -1012,7 +1011,7 @@ msgstr ""
 msgid "Original Count"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:47
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:21
 #, elixir-autogen, elixir-format
 msgid "Original Count:"
 msgstr ""
@@ -1022,27 +1021,22 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:24
+#: lib/cannery_web/live/container_live/show.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Total packs:"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:33
-#, elixir-autogen, elixir-format
-msgid "Total rounds:"
-msgstr ""
-
 #: lib/cannery_web/components/ammo_group_table_component.ex:58
 #, elixir-autogen, elixir-format
 msgid "Last used on"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:62
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Last used on:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:178
+#: lib/cannery_web/components/ammo_group_table_component.ex:171
 #, elixir-autogen, elixir-format
 msgid "Never used"
 msgstr ""
@@ -1053,7 +1047,7 @@ msgstr ""
 msgid "Purchased on"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:57
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:31
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Purchased on:"
@@ -1065,32 +1059,32 @@ msgid "Edit ammo"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:8
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:45
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:46
 #, elixir-autogen, elixir-format
 msgid "No Ammo types"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:32
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:33
 #, elixir-autogen, elixir-format
 msgid "Search catalog"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:57
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:58
 #, elixir-autogen, elixir-format
 msgid "Search ammo"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:32
+#: lib/cannery_web/live/container_live/index.html.heex:33
 #, elixir-autogen, elixir-format
 msgid "Search containers"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/index.html.heex:35
+#: lib/cannery_web/live/tag_live/index.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Search tags"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:82
+#: lib/cannery_web/live/range_live/index.html.heex:90
 #, elixir-autogen, elixir-format
 msgid "Search shot records"
 msgstr ""
@@ -1103,47 +1097,47 @@ msgstr ""
 #: lib/cannery_web/templates/error/error.html.heex:8
 #: lib/cannery_web/templates/layout/root.html.heex:13
 #: lib/cannery_web/templates/layout/root.html.heex:14
-#: lib/cannery_web/views/layout_view.ex:15
+#: lib/cannery_web/views/layout_view.ex:14
 #, elixir-autogen, elixir-format
 msgid "Cannery"
 msgstr ""
 
-#: lib/cannery_web/components/user_card.ex:33
+#: lib/cannery_web/components/core_components/user_card.html.heex:20
 #, elixir-autogen, elixir-format
 msgid "Email unconfirmed"
 msgstr ""
 
-#: lib/cannery_web/components/user_card.ex:38
+#: lib/cannery_web/components/core_components/user_card.html.heex:25
 #, elixir-autogen, elixir-format
 msgid "User registered on%{registered_datetime}"
 msgstr ""
 
-#: lib/cannery_web/components/user_card.ex:27
+#: lib/cannery_web/components/core_components/user_card.html.heex:14
 #, elixir-autogen, elixir-format
 msgid "User was confirmed at%{confirmed_datetime}"
 msgstr ""
 
-#: lib/cannery_web/components/invite_card.ex:37
+#: lib/cannery_web/components/core_components/invite_card.html.heex:16
 #, elixir-autogen, elixir-format
 msgid "Uses Left: Unlimited"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:26
+#: lib/cannery_web/live/home_live.html.heex:25
 #, elixir-autogen, elixir-format
 msgid "Cannery lets you easily keep an eye on your ammo levels before and after range day"
 msgstr ""
 
-#: lib/cannery_web/views/layout_view.ex:11
+#: lib/cannery_web/views/layout_view.ex:10
 #, elixir-autogen, elixir-format
 msgid "Cannery | %{title}"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:78
+#: lib/cannery_web/live/home_live.html.heex:80
 #, elixir-autogen, elixir-format
 msgid "Registration:"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:88
+#: lib/cannery_web/live/home_live.html.heex:90
 #, elixir-autogen, elixir-format
 msgid "Version:"
 msgstr ""
@@ -1153,29 +1147,29 @@ msgstr ""
 msgid "Welcome to Cannery"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:70
+#: lib/cannery_web/live/invite_live/index.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Disable"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:70
+#: lib/cannery_web/live/invite_live/index.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Enable"
 msgstr ""
 
-#: lib/cannery_web/components/invite_card.ex:32
+#: lib/cannery_web/components/core_components/invite_card.html.heex:11
 #, elixir-autogen, elixir-format
 msgid "Uses Left: %{uses_left_count}"
 msgstr ""
 
-#: lib/cannery_web/components/invite_card.ex:52
+#: lib/cannery_web/components/core_components/invite_card.html.heex:31
 #, elixir-autogen, elixir-format
 msgid "Uses: %{uses_count}"
 msgstr ""
 
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:12
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:13
 #: lib/cannery_web/templates/user_registration/new.html.heex:20
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:12
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:13
 #: lib/cannery_web/templates/user_session/new.html.heex:17
 #: lib/cannery_web/templates/user_settings/edit.html.heex:27
 #, elixir-autogen, elixir-format
@@ -1187,24 +1181,3 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Password"
 msgstr ""
-
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:153
-#, elixir-autogen, elixir-format
-msgid "Clone ammo group of %{ammo_group_count} bullets"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:168
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:80
-#, elixir-autogen, elixir-format
-msgid "Delete ammo group of %{ammo_group_count} bullets"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:141
-#, elixir-autogen, elixir-format
-msgid "Edit ammo group of %{ammo_group_count} bullets"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:129
-#, elixir-autogen, elixir-format
-msgid "View ammo group of %{ammo_group_count} bullets"
-msgstr ""

priv/gettext/en/LC_MESSAGES/actions.po

@@ -66,11 +66,11 @@ msgstr ""
 msgid "Invite someone new!"
 msgstr ""
 
-#: lib/cannery_web/components/topbar.ex:137
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:31
+#: lib/cannery_web/components/core_components/topbar.html.heex:122
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:32
 #: lib/cannery_web/templates/user_registration/new.html.heex:44
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:45
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:31
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:32
 #: lib/cannery_web/templates/user_session/new.html.heex:3
 #: lib/cannery_web/templates/user_session/new.html.heex:28
 #, elixir-autogen, elixir-format
@@ -97,19 +97,19 @@ msgstr ""
 msgid "New Tag"
 msgstr ""
 
-#: lib/cannery_web/components/topbar.ex:129
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:28
+#: lib/cannery_web/components/core_components/topbar.html.heex:114
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:29
 #: lib/cannery_web/templates/user_registration/new.html.heex:3
 #: lib/cannery_web/templates/user_registration/new.html.heex:37
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:42
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:28
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:29
 #: lib/cannery_web/templates/user_session/new.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Register"
 msgstr ""
 
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:3
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:15
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:16
 #, elixir-autogen, elixir-format
 msgid "Resend confirmation instructions"
 msgstr ""
@@ -131,17 +131,17 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:15
+#: 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:78
+#: lib/cannery_web/live/container_live/show.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Why not add one?"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:50
+#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:51
 #, elixir-autogen, elixir-format
 msgid "Add"
 msgstr ""
@@ -156,9 +156,9 @@ msgstr ""
 msgid "Why not get some ready to shoot?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:102
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:107
-#: lib/cannery_web/live/range_live/index.html.heex:38
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:103
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:103
+#: lib/cannery_web/live/range_live/index.html.heex:45
 #, elixir-autogen, elixir-format
 msgid "Record shots"
 msgstr ""
@@ -168,17 +168,12 @@ msgstr ""
 msgid "Add another container!"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:100
-#, elixir-autogen, elixir-format
-msgid "Move containers"
-msgstr ""
-
 #: lib/cannery_web/components/move_ammo_group_component.ex:126
 #, elixir-autogen, elixir-format
 msgid "Select"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:33
+#: lib/cannery_web/live/invite_live/index.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Copy to clipboard"
 msgstr ""
@@ -203,7 +198,7 @@ msgstr ""
 msgid "Change language"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:59
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "View in Catalog"
 msgstr ""
@@ -214,23 +209,25 @@ msgid "add an ammo type first"
 msgstr ""
 
 #: lib/cannery_web/components/move_ammo_group_component.ex:80
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:120
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:96
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:85
+#: lib/cannery_web/live/invite_live/index.html.heex:90
 #, elixir-autogen, elixir-format
 msgid "Set Unlimited"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:93
-#: lib/cannery_web/live/range_live/index.html.heex:31
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:89
+#: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Stage for range"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:92
-#: lib/cannery_web/live/range_live/index.html.heex:30
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:88
+#: lib/cannery_web/live/range_live/index.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Unstage from range"
 msgstr ""
@@ -240,106 +237,123 @@ msgstr ""
 msgid "Export Data as JSON"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:83
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:84
 #, elixir-autogen, elixir-format
 msgid "Clone %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:86
-#: lib/cannery_web/live/container_live/index.html.heex:138
+#: lib/cannery_web/live/container_live/index.html.heex:87
+#: lib/cannery_web/live/container_live/index.html.heex:143
 #, elixir-autogen, elixir-format
 msgid "Clone %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:30
+#: lib/cannery_web/live/invite_live/index.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Copy invite link for %{invite_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:102
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:103
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Delete %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:101
-#: lib/cannery_web/live/container_live/index.html.heex:153
-#: lib/cannery_web/live/container_live/show.html.heex:58
+#: lib/cannery_web/live/container_live/index.html.heex:102
+#: lib/cannery_web/live/container_live/index.html.heex:158
+#: lib/cannery_web/live/container_live/show.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "Delete %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/index.html.heex:64
+#: lib/cannery_web/live/tag_live/index.html.heex:65
 #, elixir-autogen, elixir-format
 msgid "Delete %{tag_name}"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:58
+#: lib/cannery_web/live/invite_live/index.html.heex:63
 #, elixir-autogen, elixir-format
 msgid "Delete invite for %{invite_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:145
-#: lib/cannery_web/live/range_live/index.html.heex:122
+#: lib/cannery_web/live/ammo_group_live/show.ex:161
+#: lib/cannery_web/live/range_live/index.html.heex:130
 #, elixir-autogen, elixir-format
 msgid "Delete shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:73
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:74
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "Edit %{ammo_type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:76
-#: lib/cannery_web/live/container_live/index.html.heex:128
-#: lib/cannery_web/live/container_live/show.html.heex:45
+#: lib/cannery_web/live/container_live/index.html.heex:77
+#: lib/cannery_web/live/container_live/index.html.heex:133
+#: lib/cannery_web/live/container_live/show.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Edit %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/index.html.heex:51
+#: lib/cannery_web/live/tag_live/index.html.heex:52
 #, elixir-autogen, elixir-format
 msgid "Edit %{tag_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:66
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:142
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "Edit ammo group of %{ammo_group_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:41
+#: lib/cannery_web/live/invite_live/index.html.heex:46
 #, elixir-autogen, elixir-format
 msgid "Edit invite for %{invite_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:130
+#: lib/cannery_web/live/ammo_group_live/show.ex:146
 #, elixir-autogen, elixir-format
 msgid "Edit shot group of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:105
+#: lib/cannery_web/live/range_live/index.html.heex:113
 #, elixir-autogen, elixir-format
 msgid "Edit shot record of %{shot_group_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:95
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:96
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Stage"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:64
-#: lib/cannery_web/live/container_live/index.html.heex:117
+#: lib/cannery_web/live/container_live/index.html.heex:65
+#: lib/cannery_web/live/container_live/index.html.heex:122
 #, elixir-autogen, elixir-format
 msgid "Tag %{container_name}"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:94
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:95
 #, elixir-autogen, elixir-format
 msgid "Unstage"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:63
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:64
 #, elixir-autogen, elixir-format
 msgid "View %{ammo_type_name}"
 msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:154
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Clone ammo group of %{ammo_group_count} bullets"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:169
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:76
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Delete ammo group of %{ammo_group_count} bullets"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:130
+#, elixir-autogen, elixir-format, fuzzy
+msgid "View ammo group of %{ammo_group_count} bullets"
+msgstr ""

priv/gettext/en/LC_MESSAGES/default.po

@@ -10,23 +10,23 @@ msgid ""
 msgstr ""
 "Language: en\n"
 
-#: lib/cannery_web/live/home_live.html.heex:46
+#: lib/cannery_web/live/home_live.html.heex:44
 #, elixir-autogen, elixir-format
 msgid "Access from any internet-capable device"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:94
+#: lib/cannery_web/live/invite_live/index.html.heex:99
 #, elixir-autogen, elixir-format
 msgid "Admins"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:60
+#: lib/cannery_web/live/home_live.html.heex:58
 #, elixir-autogen, elixir-format
 msgid "Admins:"
 msgstr ""
 
+#: lib/cannery_web/components/core_components/topbar.html.heex:58
 #: lib/cannery_web/components/shot_group_table_component.ex:41
-#: lib/cannery_web/components/topbar.ex:73
 #: lib/cannery_web/live/ammo_group_live/index.ex:70
 #: lib/cannery_web/live/ammo_group_live/index.ex:79
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:3
@@ -93,9 +93,9 @@ msgstr ""
 msgid "Container"
 msgstr ""
 
-#: lib/cannery_web/components/topbar.ex:57
-#: lib/cannery_web/live/container_live/index.ex:49
-#: lib/cannery_web/live/container_live/index.ex:58
+#: lib/cannery_web/components/core_components/topbar.html.heex:42
+#: lib/cannery_web/live/container_live/index.ex:45
+#: lib/cannery_web/live/container_live/index.ex:54
 #: lib/cannery_web/live/container_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Containers"
@@ -113,36 +113,36 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:39
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:16
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:8
 #, elixir-autogen, elixir-format
 msgid "Count:"
 msgstr ""
 
-#: lib/cannery_web/components/container_table_component.ex:47
+#: lib/cannery_web/components/container_table_component.ex:46
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
 #: lib/cannery_web/live/container_live/form_component.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr ""
 
-#: lib/cannery_web/components/container_card.ex:39
+#: lib/cannery_web/components/core_components/container_card.html.heex:16
 #: lib/cannery_web/live/container_live/show.html.heex:7
 #, elixir-autogen, elixir-format
 msgid "Description:"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:23
+#: lib/cannery_web/live/home_live.html.heex:22
 #, elixir-autogen, elixir-format
 msgid "Easy to Use:"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.ex:34
+#: lib/cannery_web/live/invite_live/index.ex:33
 #, elixir-autogen, elixir-format
 msgid "Edit Invite"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/index.ex:28
+#: lib/cannery_web/live/tag_live/index.ex:27
 #, elixir-autogen, elixir-format
 msgid "Edit Tag"
 msgstr ""
@@ -169,23 +169,23 @@ msgstr ""
 msgid "Incendiary"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:55
+#: lib/cannery_web/live/home_live.html.heex:53
 #, elixir-autogen, elixir-format
 msgid "Instance Information"
 msgstr ""
 
-#: lib/cannery_web/components/invite_card.ex:42
+#: lib/cannery_web/components/core_components/invite_card.html.heex:21
 #, elixir-autogen, elixir-format
 msgid "Invite Disabled"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:82
+#: lib/cannery_web/live/home_live.html.heex:84
 #, elixir-autogen, elixir-format
 msgid "Invite Only"
 msgstr ""
 
-#: lib/cannery_web/components/topbar.ex:89
-#: lib/cannery_web/live/invite_live/index.ex:42
+#: lib/cannery_web/components/core_components/topbar.html.heex:74
+#: lib/cannery_web/live/invite_live/index.ex:41
 #: lib/cannery_web/live/invite_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Invites"
@@ -196,14 +196,14 @@ msgstr ""
 msgid "Keep me logged in for 60 days"
 msgstr ""
 
-#: lib/cannery_web/components/container_table_component.ex:48
+#: lib/cannery_web/components/container_table_component.ex:47
 #: lib/cannery_web/components/move_ammo_group_component.ex:69
 #: lib/cannery_web/live/container_live/form_component.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Location"
 msgstr ""
 
-#: lib/cannery_web/components/container_card.ex:49
+#: lib/cannery_web/components/core_components/container_card.html.heex:26
 #: lib/cannery_web/live/container_live/show.html.heex:17
 #, elixir-autogen, elixir-format
 msgid "Location:"
@@ -231,7 +231,7 @@ msgid "My cool ammo can"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_type_table_component.ex:45
-#: lib/cannery_web/components/container_table_component.ex:46
+#: lib/cannery_web/components/container_table_component.ex:45
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:21
 #: lib/cannery_web/live/container_live/form_component.html.heex:21
 #: lib/cannery_web/live/invite_live/form_component.html.heex:21
@@ -246,35 +246,35 @@ msgstr ""
 msgid "New Ammo type"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.ex:36
-#: lib/cannery_web/live/container_live/index.ex:43
+#: lib/cannery_web/live/container_live/index.ex:32
+#: lib/cannery_web/live/container_live/index.ex:39
 #, elixir-autogen, elixir-format
 msgid "New Container"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.ex:38
+#: lib/cannery_web/live/invite_live/index.ex:37
 #, elixir-autogen, elixir-format
 msgid "New Invite"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/index.ex:36
+#: lib/cannery_web/live/tag_live/index.ex:35
 #, elixir-autogen, elixir-format
 msgid "New Tag"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:10
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:70
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:71
 #, elixir-autogen, elixir-format
 msgid "No Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:169
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:167
 #, elixir-autogen, elixir-format
 msgid "No ammo for this type"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/index.html.heex:8
-#: lib/cannery_web/live/container_live/index.html.heex:46
+#: lib/cannery_web/live/container_live/index.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "No containers"
 msgstr ""
@@ -286,7 +286,7 @@ msgstr ""
 
 #: lib/cannery_web/live/container_live/edit_tags_component.html.heex:29
 #: lib/cannery_web/live/tag_live/index.html.heex:10
-#: lib/cannery_web/live/tag_live/index.html.heex:42
+#: lib/cannery_web/live/tag_live/index.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "No tags"
 msgstr ""
@@ -295,13 +295,13 @@ msgstr ""
 #: lib/cannery_web/components/ammo_group_table_component.ex:81
 #: lib/cannery_web/components/shot_group_table_component.ex:43
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:50
-#: lib/cannery_web/live/ammo_group_live/show.ex:90
+#: lib/cannery_web/live/ammo_group_live/show.ex:92
 #: lib/cannery_web/live/range_live/form_component.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Notes"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:52
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:26
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:24
 #, elixir-autogen, elixir-format
 msgid "Notes:"
@@ -324,7 +324,7 @@ msgstr ""
 msgid "Price paid"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:68
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Price paid:"
 msgstr ""
@@ -335,17 +335,17 @@ msgstr ""
 msgid "Primer type"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:81
+#: lib/cannery_web/live/home_live.html.heex:83
 #, elixir-autogen, elixir-format
 msgid "Public Signups"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:33
+#: lib/cannery_web/live/home_live.html.heex:32
 #, elixir-autogen, elixir-format
 msgid "Secure:"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:36
+#: lib/cannery_web/live/home_live.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Self-host your own instance, or use an instance from someone you trust."
 msgstr ""
@@ -356,7 +356,7 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:43
+#: lib/cannery_web/live/home_live.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Simple:"
 msgstr ""
@@ -366,15 +366,15 @@ msgstr ""
 msgid "Steel"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:117
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:113
 #, elixir-autogen, elixir-format
 msgid "Stored in"
 msgstr ""
 
-#: lib/cannery_web/components/container_table_component.ex:52
-#: lib/cannery_web/components/topbar.ex:49
-#: lib/cannery_web/live/tag_live/index.ex:44
-#: lib/cannery_web/live/tag_live/index.ex:54
+#: lib/cannery_web/components/container_table_component.ex:66
+#: lib/cannery_web/components/core_components/topbar.html.heex:34
+#: lib/cannery_web/live/tag_live/index.ex:43
+#: lib/cannery_web/live/tag_live/index.ex:53
 #: lib/cannery_web/live/tag_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Tags"
@@ -401,20 +401,20 @@ msgstr ""
 msgid "Tracer"
 msgstr ""
 
-#: lib/cannery_web/components/container_table_component.ex:49
+#: lib/cannery_web/components/container_table_component.ex:48
 #: lib/cannery_web/components/move_ammo_group_component.ex:68
 #: lib/cannery_web/live/container_live/form_component.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Type"
 msgstr ""
 
-#: lib/cannery_web/components/container_card.ex:44
+#: lib/cannery_web/components/core_components/container_card.html.heex:21
 #: lib/cannery_web/live/container_live/show.html.heex:12
 #, elixir-autogen, elixir-format
 msgid "Type:"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:122
+#: lib/cannery_web/live/invite_live/index.html.heex:127
 #, elixir-autogen, elixir-format
 msgid "Users"
 msgstr ""
@@ -424,18 +424,18 @@ msgstr ""
 msgid "Uses left"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:37
+#: lib/cannery_web/live/home_live.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Your data stays with you, period"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:70
+#: lib/cannery_web/live/container_live/show.html.heex:67
 #, elixir-autogen, elixir-format
 msgid "No tags for this container"
 msgstr ""
 
 #: lib/cannery_web/components/ammo_group_table_component.ex:72
-#: lib/cannery_web/components/topbar.ex:81
+#: lib/cannery_web/components/core_components/topbar.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Range"
 msgstr ""
@@ -447,7 +447,7 @@ msgstr ""
 
 #: lib/cannery_web/components/add_shot_group_component.html.heex:46
 #: lib/cannery_web/components/shot_group_table_component.ex:44
-#: lib/cannery_web/live/ammo_group_live/show.ex:91
+#: lib/cannery_web/live/ammo_group_live/show.ex:93
 #: lib/cannery_web/live/range_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Date"
@@ -469,19 +469,19 @@ msgstr ""
 msgid "Record shots"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:41
-#: lib/cannery_web/live/range_live/index.ex:41
+#: lib/cannery_web/live/ammo_group_live/show.ex:42
+#: lib/cannery_web/live/range_live/index.ex:40
 #, elixir-autogen, elixir-format
 msgid "Edit Shot Records"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:49
+#: lib/cannery_web/live/range_live/index.ex:48
 #, elixir-autogen, elixir-format
 msgid "New Shot Records"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:48
-#: lib/cannery_web/live/range_live/index.html.heex:89
+#: lib/cannery_web/live/range_live/index.html.heex:55
+#: lib/cannery_web/live/range_live/index.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "No shots recorded"
 msgstr ""
@@ -493,20 +493,19 @@ msgid "Rounds left"
 msgstr ""
 
 #: lib/cannery_web/components/shot_group_table_component.ex:42
-#: lib/cannery_web/live/ammo_group_live/show.ex:89
-#: lib/cannery_web/live/range_live/index.html.heex:62
+#: lib/cannery_web/live/ammo_group_live/show.ex:91
+#: lib/cannery_web/live/range_live/index.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "Rounds shot"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:57
-#: lib/cannery_web/live/range_live/index.ex:67
+#: lib/cannery_web/live/range_live/index.ex:56
+#: lib/cannery_web/live/range_live/index.ex:66
 #, elixir-autogen, elixir-format
 msgid "Shot Records"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/index.ex:38
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:119
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr ""
@@ -516,18 +515,18 @@ msgstr ""
 msgid "No other containers"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:53
+#: lib/cannery_web/live/range_live/index.html.heex:60
 #, elixir-autogen, elixir-format
 msgid "Shot log"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:69
-#: lib/cannery_web/components/ammo_group_card.ex:76
 #: lib/cannery_web/components/ammo_group_table_component.ex:153
-#: lib/cannery_web/components/ammo_group_table_component.ex:225
-#: lib/cannery_web/components/ammo_type_table_component.ex:180
+#: lib/cannery_web/components/ammo_group_table_component.ex:229
+#: lib/cannery_web/components/ammo_type_table_component.ex:224
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:42
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:47
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:37
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:44
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:42
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:139
 #, elixir-autogen, elixir-format
 msgid "$%{amount}"
@@ -597,28 +596,28 @@ msgstr ""
 msgid "Reconnecting..."
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.ex:32
-#: lib/cannery_web/live/container_live/show.ex:110
+#: lib/cannery_web/live/container_live/index.ex:28
+#: lib/cannery_web/live/container_live/show.ex:108
 #, elixir-autogen, elixir-format
 msgid "Edit %{name}"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.ex:69
-#: lib/cannery_web/live/container_live/show.ex:111
+#: lib/cannery_web/live/container_live/index.ex:63
+#: lib/cannery_web/live/container_live/show.ex:109
 #, elixir-autogen, elixir-format
 msgid "Edit %{name} tags"
 msgstr ""
 
-#: lib/cannery_web/components/container_card.ex:60
+#: lib/cannery_web/components/core_components/container_card.html.heex:37
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:70
-#: lib/cannery_web/live/container_live/show.html.heex:35
+#: lib/cannery_web/live/container_live/show.html.heex:33
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Rounds:"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_table_component.ex:222
-#: lib/cannery_web/components/ammo_type_table_component.ex:179
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:145
+#: lib/cannery_web/components/ammo_group_table_component.ex:226
+#: lib/cannery_web/components/ammo_type_table_component.ex:223
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:143
 #, elixir-autogen, elixir-format
 msgid "No cost information"
 msgstr ""
@@ -628,7 +627,7 @@ msgstr ""
 msgid "% left"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:43
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Current value:"
 msgstr ""
@@ -648,7 +647,7 @@ msgstr ""
 msgid "Percentage left:"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:130
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:126
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Rounds used"
 msgstr ""
@@ -668,7 +667,7 @@ msgstr ""
 msgid "Log in"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_registration_controller.ex:32
+#: lib/cannery_web/controllers/user_registration_controller.ex:33
 #, elixir-autogen, elixir-format
 msgid "Register"
 msgstr ""
@@ -678,8 +677,8 @@ msgstr ""
 msgid "Reset your password"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:40
-#: lib/cannery_web/live/range_live/index.ex:33
+#: lib/cannery_web/live/ammo_group_live/show.ex:41
+#: lib/cannery_web/live/range_live/index.ex:32
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Record Shots"
 msgstr ""
@@ -715,27 +714,27 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:107
+#: lib/cannery_web/live/home_live.html.heex:109
 #, elixir-autogen, elixir-format
 msgid "Get involved!"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:128
+#: lib/cannery_web/live/home_live.html.heex:130
 #, elixir-autogen, elixir-format
 msgid "Help translate"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:139
+#: lib/cannery_web/live/home_live.html.heex:141
 #, elixir-autogen, elixir-format
 msgid "Report bugs or request features"
 msgstr ""
 
-#: lib/cannery_web/live/home_live.html.heex:117
+#: lib/cannery_web/live/home_live.html.heex:119
 #, elixir-autogen, elixir-format
 msgid "View the source code"
 msgstr ""
 
-#: lib/cannery_web/components/topbar.ex:65
+#: lib/cannery_web/components/core_components/topbar.html.heex:50
 #: lib/cannery_web/live/ammo_type_live/index.ex:52
 #: lib/cannery_web/live/ammo_type_live/index.ex:62
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:3
@@ -743,39 +742,39 @@ msgstr ""
 msgid "Catalog"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:44
+#: lib/cannery_web/live/ammo_group_live/show.ex:45
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:42
+#: lib/cannery_web/live/ammo_group_live/show.ex:43
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Move Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:115
+#: lib/cannery_web/live/container_live/show.html.heex:112
 #, elixir-autogen, elixir-format, fuzzy
 msgid "No ammo in this container"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:43
+#: lib/cannery_web/live/ammo_group_live/show.ex:44
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:122
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:118
 #, elixir-autogen, elixir-format, fuzzy
 msgid "This ammo is not in a container"
 msgstr ""
 
-#: lib/cannery_web/components/container_card.ex:55
+#: lib/cannery_web/components/core_components/container_card.html.heex:32
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:98
-#: lib/cannery_web/live/container_live/show.html.heex:26
+#: lib/cannery_web/live/container_live/show.html.heex:23
 #, elixir-autogen, elixir-format
 msgid "Packs:"
 msgstr ""
 
-#: lib/cannery_web/components/topbar.ex:25
+#: lib/cannery_web/components/core_components/topbar.html.heex:10
 #: lib/cannery_web/live/home_live.html.heex:4
 #, elixir-autogen, elixir-format
 msgid "Cannery logo"
@@ -791,45 +790,45 @@ msgstr ""
 msgid "Leave \"Uses left\" blank to make invite unlimited"
 msgstr ""
 
-#: lib/cannery_web/components/ammo_group_card.ex:83
+#: lib/cannery_web/components/core_components/ammo_group_card.html.heex:54
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Container:"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:63