bump version

.credo.exs

@@ -157,17 +157,17 @@
         #
         # Controversial and experimental checks (opt-in, just replace `false` with `[]`)
         #
-        {Credo.Check.Consistency.MultiAliasImportRequireUse, false},
+        {Credo.Check.Consistency.MultiAliasImportRequireUse, []},
-        {Credo.Check.Consistency.UnusedVariableNames, false},
+        {Credo.Check.Consistency.UnusedVariableNames, [force: :meaningful]},
         {Credo.Check.Design.DuplicatedCode, false},
         {Credo.Check.Readability.AliasAs, false},
         {Credo.Check.Readability.BlockPipe, false},
         {Credo.Check.Readability.ImplTrue, false},
         {Credo.Check.Readability.MultiAlias, false},
-        {Credo.Check.Readability.SeparateAliasRequire, false},
+        {Credo.Check.Readability.SeparateAliasRequire, []},
         {Credo.Check.Readability.SinglePipe, false},
         {Credo.Check.Readability.Specs, false},
-        {Credo.Check.Readability.StrictModuleLayout, false},
+        {Credo.Check.Readability.StrictModuleLayout, []},
         {Credo.Check.Readability.WithCustomTaggedTuple, false},
         {Credo.Check.Refactor.ABCSize, false},
         {Credo.Check.Refactor.AppendSingleItem, false},
@@ -176,9 +176,9 @@
         {Credo.Check.Refactor.NegatedIsNil, false},
         {Credo.Check.Refactor.PipeChainStart, false},
         {Credo.Check.Refactor.VariableRebinding, false},
-        {Credo.Check.Warning.LeakyEnvironment, false},
+        {Credo.Check.Warning.LeakyEnvironment, []},
-        {Credo.Check.Warning.MapGetUnsafePass, false},
+        {Credo.Check.Warning.MapGetUnsafePass, []},
-        {Credo.Check.Warning.UnsafeToAtom, false}
+        {Credo.Check.Warning.UnsafeToAtom, []}
 
         #
         # Custom checks can be created using `mix credo.gen.check`.

.drone.yml

@@ -77,7 +77,7 @@ services:
 volumes:
   - name: cache
     host:
-      path: /tmp/drone-cache
+      path: /run/media/default/ssdsrv/gitea/drone-cache
   - name: docker_sock
     host:
       path: /var/run/docker.sock

CHANGELOG.md

@@ -1,3 +1,26 @@
+# v0.4.1
+- Fix button and tag text wrapping
+- Code quality fixes
+
+# v0.4.0
+- Make tables sortable
+- Add link to changelog from version number
+- Fix some elements flashing with black background
+- Fix bug with moving ammo group to new container
+- Fix bug with no error showing up for create ammo group form
+
+# v0.3.0
+- Fix ammo type counts not showing when count is 0
+- Add prompt to create first container before first ammo group
+- Edit and delete shot groups from ammo group show page
+- Use today's date when adding new shot groups
+- Create multiple ammo groups at one time
+
+# v0.2.3
+- Fix modals with overflowing forms
+- Fix grids having uneven margins in phone mode
+- Add page titles to registration and setting pages
+
 # v0.2.2
 - Fix loading and reconnecting pages not being fixed
 - Fix closing modal in some cases not triggering a page reload

assets/css/components.scss

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

assets/js/maintain_attrs.js

@@ -2,7 +2,10 @@
 // update. https://github.com/phoenixframework/phoenix_live_view/issues/1011
 
 export default {
-  attrs () { return this.el.getAttribute('data-attrs').split(', ') },
+  attrs () {
+    const attrs = this.el.getAttribute('data-attrs')
+    if (attrs) { return attrs.split(', ') } else { return [] }
+  },
   beforeUpdate () { this.prevAttrs = this.attrs().map(name => [name, this.el.getAttribute(name)]) },
   updated () { this.prevAttrs.forEach(([name, val]) => this.el.setAttribute(name, val)) }
 }

assets/tailwind.config.js

@@ -28,6 +28,20 @@ module.exports = {
         128: '32rem',
         192: '48rem',
         256: '64rem'
+      },
+      minWidth: {
+        4: '1rem',
+        8: '2rem',
+        12: '3rem',
+        16: '4rem',
+        20: '8rem'
+      },
+      maxWidth: {
+        4: '1rem',
+        8: '2rem',
+        12: '3rem',
+        16: '4rem',
+        20: '8rem'
       }
     }
   },

lib/cannery/accounts.ex

@@ -196,7 +196,7 @@ defmodule Cannery.Accounts do
          {:ok, _} <- Repo.transaction(user_email_multi(user, email, context)) do
       :ok
     else
-      _ -> :error
+      _error_tuple -> :error
     end
   end
 
@@ -265,7 +265,7 @@ defmodule Cannery.Accounts do
     |> Repo.transaction()
     |> case do
       {:ok, %{user: user}} -> {:ok, user}
-      {:error, :user, changeset, _} -> {:error, changeset}
+      {:error, :user, changeset, _changes_so_far} -> {:error, changeset}
     end
   end
 
@@ -372,7 +372,7 @@ defmodule Cannery.Accounts do
          {:ok, %{user: user}} <- Repo.transaction(confirm_user_multi(user)) do
       {:ok, user}
     else
-      _ -> :error
+      _error_tuple -> :error
     end
   end
 
@@ -420,7 +420,7 @@ defmodule Cannery.Accounts do
          %User{} = user <- Repo.one(query) do
       user
     else
-      _ -> nil
+      _error_tuple -> nil
     end
   end
 
@@ -444,7 +444,7 @@ defmodule Cannery.Accounts do
     |> Repo.transaction()
     |> case do
       {:ok, %{user: user}} -> {:ok, user}
-      {:error, :user, changeset, _} -> {:error, changeset}
+      {:error, :user, changeset, _changes_so_far} -> {:error, changeset}
     end
   end
 end

lib/cannery/accounts/user.ex

@@ -171,7 +171,7 @@ defmodule Cannery.Accounts.User do
     Bcrypt.verify_pass(password, hashed_password)
   end
 
-  def valid_password?(_, _) do
+  def valid_password?(_invalid_user, _invalid_password) do
     Bcrypt.no_user_verify()
     false
   end

lib/cannery/ammo.ex

@@ -8,6 +8,8 @@ defmodule Cannery.Ammo do
   alias Cannery.Ammo.{AmmoGroup, AmmoType}
   alias Ecto.Changeset
 
+  @ammo_group_create_limit 10_000
+
   @doc """
   Returns the list of ammo_types.
 
@@ -90,7 +92,7 @@ defmodule Cannery.Ammo do
       from ag in AmmoGroup,
         where: ag.ammo_type_id == ^ammo_type_id,
         select: sum(ag.count)
-    )
+    ) || 0
   end
 
   @doc """
@@ -117,7 +119,7 @@ defmodule Cannery.Ammo do
         left_join: sg in assoc(ag, :shot_groups),
         where: ag.ammo_type_id == ^ammo_type_id,
         select: sum(sg.count)
-    )
+    ) || 0
   end
 
   @doc """
@@ -306,7 +308,7 @@ defmodule Cannery.Ammo do
   def get_used_count(%AmmoGroup{} = ammo_group) do
     ammo_group
     |> Repo.preload(:shot_groups)
-    |> Map.get(:shot_groups)
+    |> Map.fetch!(:shot_groups)
     |> Enum.map(fn %{count: count} -> count end)
     |> Enum.sum()
   end
@@ -327,36 +329,61 @@ defmodule Cannery.Ammo do
   end
 
   @doc """
-  Creates a ammo_group.
+  Creates multiple ammo_groups at once.
 
   ## Examples
 
-      iex> create_ammo_group(%{field: value}, %User{id: 123})
+      iex> create_ammo_groups(%{field: value}, 3, %User{id: 123})
-      {:ok, %AmmoGroup{}}
+      {:ok, {3, [%AmmoGroup{}]}}
 
-      iex> create_ammo_group(%{field: bad_value}, %User{id: 123})
+      iex> create_ammo_groups(%{field: bad_value}, 3, %User{id: 123})
       {:error, %Changeset{}}
 
   """
-  @spec create_ammo_group(attrs :: map(), User.t()) ::
+  @spec create_ammo_groups(attrs :: map(), multiplier :: non_neg_integer(), User.t()) ::
-          {:ok, AmmoGroup.t()} | {:error, Changeset.t(AmmoGroup.new_ammo_group())}
+          {:ok, {count :: non_neg_integer(), [AmmoGroup.t()] | nil}}
-  def create_ammo_group(
+          | {:error, Changeset.t(AmmoGroup.new_ammo_group())}
+  def create_ammo_groups(
         %{"ammo_type_id" => ammo_type_id, "container_id" => container_id} = attrs,
+        multiplier,
         %User{id: user_id} = user
-      ) do
+      )
+      when multiplier >= 1 and multiplier <= @ammo_group_create_limit do
     # validate ammo type and container ids belong to user
     _valid_ammo_type = get_ammo_type!(ammo_type_id, user)
     _valid_container = Containers.get_container!(container_id, user)
 
-    %AmmoGroup{}
+    now = NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second)
-    |> AmmoGroup.create_changeset(attrs |> Map.put("user_id", user_id))
+
-    |> Repo.insert()
+    changesets =
+      Enum.map(1..multiplier, fn _count ->
+        %AmmoGroup{} |> AmmoGroup.create_changeset(attrs |> Map.put("user_id", user_id))
+      end)
+
+    if changesets |> Enum.all?(fn %{valid?: valid} -> valid end) do
+      {count, inserted_ammo_groups} =
+        Repo.insert_all(
+          AmmoGroup,
+          changesets
+          |> Enum.map(fn changeset ->
+            changeset
+            |> Map.get(:changes)
+            |> Map.merge(%{inserted_at: now, updated_at: now})
+          end),
+          returning: true
+        )
+
+      {:ok, {count, inserted_ammo_groups}}
+    else
+      changesets
+      |> Enum.reject(fn %{valid?: valid} -> valid end)
+      |> List.first()
+      |> Changeset.apply_action(:insert)
+    end
   end
 
-  def create_ammo_group(invalid_attrs, _user) do
+  def create_ammo_groups(invalid_attrs, _multiplier, _user) do
-    %AmmoGroup{}
+    {:error, %AmmoGroup{} |> AmmoGroup.create_changeset(invalid_attrs)}
-    |> AmmoGroup.create_changeset(invalid_attrs |> Map.put("user_id", "-1"))
-    |> Repo.insert()
   end
 
   @doc """

lib/cannery/containers.ex

@@ -215,7 +215,7 @@ defmodule Cannery.Containers do
   def get_container_rounds!(%Container{} = container) do
     container
     |> Repo.preload(:ammo_groups)
-    |> Map.get(:ammo_groups)
+    |> Map.fetch!(:ammo_groups)
     |> Enum.map(fn %{count: count} -> count end)
     |> Enum.sum()
   end

lib/cannery/release.ex

@@ -9,7 +9,7 @@ defmodule Cannery.Release do
 
   def rollback(repo, version) do
     load_app()
-    {:ok, _, _} = Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :down, to: version))
+    {:ok, _fun, _opts} = Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :down, to: version))
   end
 
   defp load_app do
@@ -20,7 +20,7 @@ defmodule Cannery.Release do
     load_app()
 
     for repo <- Application.fetch_env!(@app, :ecto_repos) do
-      {:ok, _, _} = Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :up, all: true))
+      {:ok, _fun, _opts} = Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :up, all: true))
     end
   end
 end

lib/cannery/repo/migrator.ex

@@ -6,11 +6,11 @@ defmodule Cannery.Repo.Migrator do
   use GenServer
   require Logger
 
-  def start_link(_) do
+  def start_link(_opts) do
     GenServer.start_link(__MODULE__, [], [])
   end
 
-  def init(_) do
+  def init(_opts) do
     migrate!()
     {:ok, nil}
   end

lib/cannery_web.ex

@@ -71,6 +71,7 @@ defmodule CanneryWeb do
     quote do
       use Phoenix.Router
 
+      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
       import Plug.Conn
       import Phoenix.Controller
       import Phoenix.LiveView.Router
@@ -79,7 +80,9 @@ defmodule CanneryWeb do
 
   def channel do
     quote do
+      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
       use Phoenix.Channel
+      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
       import CanneryWeb.Gettext
     end
   end
@@ -87,14 +90,18 @@ defmodule CanneryWeb do
   defp view_helpers do
     quote do
       # Use all HTML functionality (forms, tags, etc)
+      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
       use Phoenix.HTML
 
       # Import LiveView and .heex helpers (live_render, live_patch, <.form>, etc)
+      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
       import Phoenix.LiveView.Helpers
 
       # Import basic rendering functionality (render, render_layout, etc)
+      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
       import Phoenix.View
 
+      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
       import CanneryWeb.{ErrorHelpers, Gettext, LiveHelpers, ViewHelpers}
       alias CanneryWeb.Router.Helpers, as: Routes
     end

lib/cannery_web/components/add_shot_group_component.html.heex

@@ -36,7 +36,11 @@
     <%= error_tag(f, :notes, "col-span-3") %>
 
     <%= label(f, :date, gettext("Date (UTC)"), class: "title text-lg text-primary-600") %>
-    <%= date_input(f, :date, class: "input input-primary col-span-2") %>
+    <%= date_input(f, :date,
+      class: "input input-primary col-span-2",
+      phx_update: "ignore",
+      value: Date.utc_today()
+    ) %>
     <%= error_tag(f, :notes, "col-span-3") %>
 
     <%= submit(dgettext("actions", "Save"),

lib/cannery_web/components/container_card.ex

@@ -14,11 +14,11 @@ defmodule CanneryWeb.Components.ContainerCard do
     ~H"""
     <div
       id={"container-#{@container.id}"}
-      class="mx-4 my-2 px-8 py-4 flex flex-col justify-center items-center space-y-4
+      class="overflow-hidden max-w-full 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"
     >
-      <div class="mb-4 flex flex-col justify-center items-center space-y-2">
+      <div class="max-w-full mb-4 flex flex-col justify-center items-center space-y-2">
         <%= live_redirect to: Routes.container_show_path(Endpoint, :show, @container),
                       class: "link" do %>
           <h1 class="px-4 py-2 rounded-lg title text-xl">

lib/cannery_web/components/move_ammo_group_component.ex

@@ -4,7 +4,8 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
   """
 
   use CanneryWeb, :live_component
-  alias Cannery.{Accounts.User, Ammo, Ammo.AmmoGroup, Containers}
+  alias Cannery.{Accounts.User, Ammo, Ammo.AmmoGroup, Containers, Containers.Container}
+  alias CanneryWeb.Endpoint
   alias Phoenix.LiveView.Socket
 
   @impl true
@@ -27,7 +28,12 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
       Containers.list_containers(current_user)
       |> Enum.reject(fn %{id: id} -> id == container_id end)
 
-    {:ok, socket |> assign(assigns) |> assign(changeset: changeset, containers: containers)}
+    socket =
+      socket
+      |> assign(assigns)
+      |> assign(changeset: changeset, containers: containers)
+
+    {:ok, socket}
   end
 
   @impl true
@@ -54,4 +60,76 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
 
     {:noreply, socket}
   end
+
+  @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}
+    ]
+
+    rows = containers |> get_rows_for_containers(assigns, columns)
+
+    assigns = assigns |> Map.merge(%{columns: columns, rows: rows})
+
+    ~H"""
+    <div class="w-full flex flex-col space-y-8 justify-center items-center">
+      <h2 class="mb-8 text-center title text-xl text-primary-600">
+        <%= gettext("Move ammo") %>
+      </h2>
+
+      <%= if @containers |> Enum.empty?() do %>
+        <h2 class="title text-xl text-primary-600">
+          <%= gettext("No other containers") %>
+          <%= display_emoji("😔") %>
+        </h2>
+
+        <%= live_patch(dgettext("actions", "Add another container!"),
+          to: Routes.container_index_path(Endpoint, :new),
+          class: "btn btn-primary"
+        ) %>
+      <% else %>
+        <.live_component
+          module={CanneryWeb.Components.TableComponent}
+          id="move_ammo_group_table"
+          columns={@columns}
+          rows={@rows}
+        />
+      <% end %>
+    </div>
+    """
+  end
+
+  @spec get_rows_for_containers([Container.t()], map(), [map()]) :: [map()]
+  defp get_rows_for_containers(containers, assigns, columns) do
+    containers
+    |> Enum.map(fn container ->
+      columns
+      |> Enum.into(%{}, fn %{key: key} -> {key, get_row_value_by_key(key, container, assigns)} end)
+    end)
+  end
+
+  @spec get_row_value_by_key(String.t(), Container.t(), map()) :: any()
+  defp get_row_value_by_key("actions", container, assigns) do
+    assigns = assigns |> Map.put(:container, container)
+
+    ~H"""
+    <div class="px-4 py-2 space-x-4 flex justify-center items-center">
+      <button
+        type="button"
+        class="btn btn-primary"
+        phx-click="move"
+        phx-target={@myself}
+        phx-value-container_id={container.id}
+      >
+        <%= dgettext("actions", "Select") %>
+      </button>
+    </div>
+    """
+  end
+
+  defp get_row_value_by_key(key, container, _assigns),
+    do: container |> Map.get(key |> String.to_existing_atom())
 end

lib/cannery_web/components/move_ammo_group_component.html.heex

@@ -1,70 +0,0 @@
-<div class="w-full flex flex-col space-y-8 justify-center items-center">
-  <h2 class="mb-8 text-center title text-xl text-primary-600">
-    <%= gettext("Move ammo") %>
-  </h2>
-
-  <%= if @containers |> Enum.empty?() do %>
-    <h2 class="title text-xl text-primary-600">
-      <%= gettext("No other containers") %>
-      <%= display_emoji("😔") %>
-    </h2>
-
-    <%= live_patch(dgettext("actions", "Add another container!"),
-      to: Routes.container_index_path(Endpoint, :new),
-      class: "btn btn-primary"
-    ) %>
-  <% else %>
-    <div class="w-full overflow-x-auto border border-gray-600 rounded-lg shadow-lg bg-black">
-      <table class="min-w-full table-auto text-center bg-white">
-        <thead class="border-b border-primary-600">
-          <tr>
-            <th class="p-2">
-              <%= gettext("Container") %>
-            </th>
-
-            <th class="p-2">
-              <%= gettext("Type") %>
-            </th>
-
-            <th class="p-2">
-              <%= gettext("Location") %>
-            </th>
-
-            <th class="p-2"></th>
-          </tr>
-        </thead>
-        <tbody id="containers">
-          <%= for container <- @containers do %>
-            <tr id={"container-#{container.id}"}>
-              <td class="p-2">
-                <%= container.name %>
-              </td>
-
-              <td class="p-2">
-                <%= container.type %>
-              </td>
-
-              <td class="p-2">
-                <%= container.location %>
-              </td>
-
-              <td class="p-2">
-                <div class="px-4 py-2 space-x-4 flex justify-center items-center">
-                  <button
-                    type="button"
-                    class="btn btn-primary"
-                    phx-click="move"
-                    phx-target={@myself}
-                    phx-value-container_id={container.id}
-                  >
-                    <%= dgettext("actions", "Select") %>
-                  </button>
-                </div>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-    </div>
-  <% end %>
-</div>

lib/cannery_web/components/table_component.ex

@@ -0,0 +1,87 @@
+defmodule CanneryWeb.Components.TableComponent do
+  @moduledoc """
+  Livecomponent that presents a resortable table
+
+  It takes the following required assigns:
+    - `:columns`: An array of maps containing the following keys
+      - `:label`: A gettext'd or otherwise user-facing string label for the
+        column. Can be nil
+      - `:key`: A string key used for sorting
+      - `:class`: Extra classes to be applied to the column element, if desired.
+        Optional
+      - `:sortable`: If false, will prevent the user from sorting with it.
+        Optional
+    - `:values`: An array of maps containing data for each row. Each map is
+      string-keyed with the associated column key to the following values:
+      - A single element, like string, integer or Phoenix.LiveView.Rendered
+        object, like returned from the ~H sigil
+      - A tuple, containing a custom value used for sorting, and the displayed
+        content.
+  """
+
+  use CanneryWeb, :live_component
+  alias Phoenix.LiveView.Socket
+
+  @impl true
+  @spec update(
+          %{
+            required(:columns) =>
+              list(%{
+                required(:label) => String.t() | nil,
+                required(:key) => String.t() | nil,
+                optional(:class) => String.t(),
+                optional(:sortable) => false
+              }),
+            required(:rows) =>
+              list(%{
+                (key :: String.t()) => any() | {custom_sort_value :: String.t(), value :: any()}
+              }),
+            optional(any()) => any()
+          },
+          Socket.t()
+        ) :: {:ok, Socket.t()}
+  def update(%{columns: columns, rows: rows} = assigns, socket) do
+    initial_key = columns |> List.first() |> Map.get(:key)
+    rows = rows |> Enum.sort_by(fn row -> row |> Map.get(initial_key) end, :asc)
+
+    socket =
+      socket
+      |> assign(assigns)
+      |> assign(columns: columns, rows: rows, last_sort_key: initial_key, sort_mode: :asc)
+
+    {:ok, socket}
+  end
+
+  @impl true
+  def handle_event(
+        "sort_by",
+        %{"sort-key" => key},
+        %{assigns: %{rows: rows, last_sort_key: key, sort_mode: sort_mode}} = socket
+      ) do
+    sort_mode = if sort_mode == :asc, do: :desc, else: :asc
+    rows = rows |> sort_by_custom_sort_value_or_value(key, sort_mode)
+    {:noreply, socket |> assign(sort_mode: sort_mode, rows: rows)}
+  end
+
+  def handle_event(
+        "sort_by",
+        %{"sort-key" => key},
+        %{assigns: %{rows: rows}} = socket
+      ) do
+    rows = rows |> sort_by_custom_sort_value_or_value(key, :asc)
+    {:noreply, socket |> assign(last_sort_key: key, sort_mode: :asc, rows: rows)}
+  end
+
+  defp sort_by_custom_sort_value_or_value(rows, key, sort_mode) 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
+    )
+  end
+end

lib/cannery_web/components/table_component.html.heex

@@ -0,0 +1,52 @@
+<div class="w-full overflow-x-auto border border-gray-600 rounded-lg shadow-lg bg-black">
+  <table class="min-w-full table-auto text-center bg-white">
+    <thead class="border-b border-primary-600">
+      <tr>
+        <%= for %{key: key, label: label} = column <- @columns do %>
+          <%= if column |> Map.get(:sortable, true) do %>
+            <th class={"p-2 #{column[:class]}"}>
+              <span
+                class="cursor-pointer"
+                phx-click="sort_by"
+                phx-value-sort-key={key}
+                phx-target={@myself}
+              >
+                <span class="underline"><%= label %></span>
+                <%= if @last_sort_key == key do %>
+                  <%= case @sort_mode do %>
+                    <% :asc -> %>
+                      <i class="fas fa-sm fa-chevron-down"></i>
+                    <% :desc -> %>
+                      <i class="fas fa-sm fa-chevron-up"></i>
+                  <% end %>
+                <% else %>
+                  <i class="fas fa-sm fa-chevron-up opacity-0"></i>
+                <% end %>
+              </span>
+            </th>
+          <% else %>
+            <th class={"p-2 #{column[:class]}"}>
+              <%= label %>
+            </th>
+          <% end %>
+        <% end %>
+      </tr>
+    </thead>
+    <tbody>
+      <%= for values <- @rows do %>
+        <tr>
+          <%= for %{key: key} = value <- @columns do %>
+            <td class={"p-2 #{value[:class]}"}>
+              <%= case values |> Map.get(key) do %>
+                <% {_custom_sort_value, value} -> %>
+                  <%= value %>
+                <% value -> %>
+                  <%= value %>
+              <% end %>
+            </td>
+          <% end %>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

lib/cannery_web/components/tag_card.ex

@@ -22,7 +22,7 @@ defmodule CanneryWeb.Components.TagCard do
   def simple_tag_card(assigns) do
     ~H"""
     <h1
-      class="mx-2 my-1 px-4 py-2 rounded-lg title text-xl"
+      class="inline-block break-all mx-2 my-1 px-4 py-2 rounded-lg title text-xl"
       style={"color: #{@tag.text_color}; background-color: #{@tag.bg_color}"}
     >
       <%= @tag.name %>

lib/cannery_web/controllers/user_confirmation_controller.ex

@@ -1,10 +1,11 @@
 defmodule CanneryWeb.UserConfirmationController do
   use CanneryWeb, :controller
 
+  import CanneryWeb.Gettext
   alias Cannery.Accounts
 
   def new(conn, _params) do
-    render(conn, "new.html")
+    render(conn, "new.html", page_title: gettext("Confirm your account"))
   end
 
   def create(conn, %{"user" => %{"email" => email}}) do

lib/cannery_web/controllers/user_registration_controller.ex

@@ -29,8 +29,11 @@ defmodule CanneryWeb.UserRegistrationController do
 
   # renders new user registration page
   defp render_new(conn, invite \\ nil) do
-    changeset = Accounts.change_user_registration(%User{})
+    render(conn, "new.html",
-    conn |> render("new.html", changeset: changeset, invite: invite)
+      changeset: Accounts.change_user_registration(%User{}),
+      invite: invite,
+      page_title: gettext("Register")
+    )
   end
 
   def create(conn, %{"user" => %{"invite_token" => invite_token}} = attrs) do

lib/cannery_web/controllers/user_reset_password_controller.ex

@@ -6,7 +6,7 @@ defmodule CanneryWeb.UserResetPasswordController do
   plug :get_user_by_reset_password_token when action in [:edit, :update]
 
   def new(conn, _params) do
-    render(conn, "new.html")
+    render(conn, "new.html", page_title: gettext("Forgot your password?"))
   end
 
   def create(conn, %{"user" => %{"email" => email}}) do
@@ -31,7 +31,10 @@ defmodule CanneryWeb.UserResetPasswordController do
   end
 
   def edit(conn, _params) do
-    render(conn, "edit.html", changeset: Accounts.change_user_password(conn.assigns.user))
+    render(conn, "edit.html",
+      changeset: Accounts.change_user_password(conn.assigns.user),
+      page_title: gettext("Reset your password")
+    )
   end
 
   # Do not log in the user after reset password to avoid a

lib/cannery_web/controllers/user_session_controller.ex

@@ -5,7 +5,7 @@ defmodule CanneryWeb.UserSessionController do
   alias CanneryWeb.UserAuth
 
   def new(conn, _params) do
-    render(conn, "new.html", error_message: nil)
+    render(conn, "new.html", error_message: nil, page_title: gettext("Log in"))
   end
 
   def create(conn, %{"user" => user_params}) do

lib/cannery_web/controllers/user_settings_controller.ex

@@ -1,13 +1,13 @@
 defmodule CanneryWeb.UserSettingsController do
   use CanneryWeb, :controller
-
+  import CanneryWeb.Gettext
   alias Cannery.Accounts
   alias CanneryWeb.{HomeLive, UserAuth}
 
   plug :assign_email_and_password_changesets
 
   def edit(conn, _params) do
-    render(conn, "edit.html")
+    render(conn, "edit.html", page_title: gettext("Settings"))
   end
 
   def update(conn, %{"action" => "update_email"} = params) do

lib/cannery_web/live/ammo_group_live/form_component.ex

@@ -9,6 +9,8 @@ defmodule CanneryWeb.AmmoGroupLive.FormComponent do
   alias Ecto.Changeset
   alias Phoenix.LiveView.Socket
 
+  @ammo_group_create_limit 10_000
+
   @impl true
   @spec update(
           %{:ammo_group => AmmoGroup.t(), :current_user => User.t(), optional(any) => any},
@@ -20,20 +22,37 @@ defmodule CanneryWeb.AmmoGroupLive.FormComponent do
 
   @spec update(Socket.t()) :: {:ok, Socket.t()}
   def update(%{assigns: %{ammo_group: ammo_group, current_user: current_user}} = socket) do
-    changeset = Ammo.change_ammo_group(ammo_group)
+    socket =
-    containers = Containers.list_containers(current_user)
+      socket
-    ammo_types = Ammo.list_ammo_types(current_user)
+      |> assign(:ammo_group_create_limit, @ammo_group_create_limit)
-    {:ok, socket |> assign(changeset: changeset, containers: containers, ammo_types: ammo_types)}
+      |> assign(:changeset, Ammo.change_ammo_group(ammo_group))
+      |> assign(:ammo_types, Ammo.list_ammo_types(current_user))
+      |> assign_new(:containers, fn -> Containers.list_containers(current_user) end)
+
+    {:ok, socket}
   end
 
   @impl true
   def handle_event(
         "validate",
         %{"ammo_group" => ammo_group_params},
-        %{assigns: %{ammo_group: ammo_group}} = socket
+        %{assigns: %{action: action, ammo_group: ammo_group}} = socket
       ) do
-    socket = socket |> assign(:changeset, ammo_group |> Ammo.change_ammo_group(ammo_group_params))
+    changeset_action =
-    {:noreply, socket}
+      case action do
+        :new -> :insert
+        :edit -> :update
+      end
+
+    changeset = ammo_group |> Ammo.change_ammo_group(ammo_group_params)
+
+    changeset =
+      case changeset |> Changeset.apply_action(changeset_action) do
+        {:ok, _data} -> changeset
+        {:error, changeset} -> changeset
+      end
+
+    {:noreply, socket |> assign(:changeset, changeset)}
   end
 
   def handle_event(
@@ -77,20 +96,65 @@ defmodule CanneryWeb.AmmoGroupLive.FormComponent do
   end
 
   defp save_ammo_group(
-         %{assigns: %{current_user: current_user, return_to: return_to}} = socket,
+         %{assigns: %{changeset: changeset}} = socket,
          :new,
-         ammo_group_params
+         %{"multiplier" => multiplier_str} = ammo_group_params
        ) do
     socket =
-      case Ammo.create_ammo_group(ammo_group_params, current_user) do
+      case multiplier_str |> Integer.parse() do
-        {:ok, _ammo_group} ->
+        {multiplier, _remainder}
-          prompt = dgettext("prompts", "Ammo group created successfully")
+        when multiplier >= 1 and multiplier <= @ammo_group_create_limit ->
-          socket |> put_flash(:info, prompt) |> push_redirect(to: return_to)
+          socket |> create_multiple(ammo_group_params, multiplier)
 
-        {:error, %Changeset{} = changeset} ->
+        {multiplier, _remainder} ->
-          socket |> assign(changeset: changeset)
+          error_msg =
+            dgettext(
+              "errors",
+              "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}",
+              max: @ammo_group_create_limit,
+              multiplier: multiplier
+            )
+
+          {:error, changeset} =
+            changeset
+            |> Changeset.add_error(:multiplier, error_msg)
+            |> Changeset.apply_action(:insert)
+
+          socket |> assign(:changeset, changeset)
+
+        :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)
       end
 
     {:noreply, socket}
   end
+
+  defp create_multiple(
+         %{assigns: %{current_user: current_user, return_to: return_to}} = socket,
+         ammo_group_params,
+         multiplier
+       ) do
+    case Ammo.create_ammo_groups(ammo_group_params, multiplier, current_user) do
+      {:ok, {count, _ammo_groups}} ->
+        prompt =
+          dngettext(
+            "prompts",
+            "Ammo group created successfully",
+            "Ammo groups created successfully",
+            count
+          )
+
+        socket |> put_flash(:info, prompt) |> push_redirect(to: return_to)
+
+      {:error, %Changeset{} = changeset} ->
+        socket |> assign(changeset: changeset)
+    end
+  end
 end

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

@@ -18,42 +18,62 @@
       </div>
     <% end %>
 
-    <%= label(f, :ammo_type_id, gettext("Ammo type"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :ammo_type_id, gettext("Ammo type"), class: "title text-lg text-primary-600") %>
     <%= select(f, :ammo_type_id, ammo_type_options(@ammo_types),
       class: "text-center col-span-2 input input-primary"
     ) %>
     <%= error_tag(f, :ammo_type_id, "col-span-3 text-center") %>
 
-    <%= label(f, :count, gettext("Count"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :count, gettext("Count"), class: "title text-lg text-primary-600") %>
     <%= number_input(f, :count,
       class: "text-center col-span-2 input input-primary",
       min: 1
     ) %>
     <%= error_tag(f, :count, "col-span-3 text-center") %>
 
-    <%= label(f, :price_paid, gettext("Price paid"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :price_paid, gettext("Price paid"), class: "title text-lg text-primary-600") %>
     <%= number_input(f, :price_paid,
-      step: "0.01",
+      step: 0.01,
       class: "text-center col-span-2 input input-primary"
     ) %>
     <%= error_tag(f, :price_paid, "col-span-3 text-center") %>
 
-    <%= label(f, :notes, gettext("Notes"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :notes, gettext("Notes"), class: "title text-lg text-primary-600") %>
     <%= textarea(f, :notes,
       class: "text-center col-span-2 input input-primary",
       phx_hook: "MaintainAttrs"
     ) %>
     <%= error_tag(f, :notes, "col-span-3 text-center") %>
 
-    <%= label(f, :container, gettext("Container"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :container, gettext("Container"), class: "title text-lg text-primary-600") %>
     <%= select(f, :container_id, container_options(@containers),
       class: "text-center col-span-2 input input-primary"
     ) %>
     <%= error_tag(f, :container_id, "col-span-3 text-center") %>
 
-    <%= submit(dgettext("actions", "Save"),
+    <%= case @action do %>
-      phx_disable_with: dgettext("prompts", "Saving..."),
+      <% :new -> %>
-      class: "mx-auto col-span-3 btn btn-primary"
+        <hr class="hr col-span-3" />
-    ) %>
+
+        <%= label(f, :multiplier, gettext("Copies"), class: "title text-lg text-primary-600") %>
+        <%= number_input(f, :multiplier,
+          max: @ammo_group_create_limit,
+          class: "text-center input input-primary",
+          value: 1,
+          phx_update: "ignore"
+        ) %>
+
+        <%= submit(dgettext("actions", "Create"),
+          phx_disable_with: dgettext("prompts", "Creating..."),
+          class: "mx-auto btn btn-primary"
+        ) %>
+
+        <%= error_tag(f, :multiplier, "col-span-3 text-center") %>
+      <% :edit -> %>
+        <%= submit(dgettext("actions", "Save"),
+          phx_disable_with: dgettext("prompts", "Saving..."),
+          class: "mx-auto col-span-3 btn btn-primary"
+        ) %>
+    <% end %>
   </.form>
 </div>

lib/cannery_web/live/ammo_group_live/index.ex

@@ -4,7 +4,7 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
   """
 
   use CanneryWeb, :live_view
-  alias Cannery.{Ammo, Ammo.AmmoGroup, Repo}
+  alias Cannery.{Ammo, Ammo.AmmoGroup, Containers, Repo}
   alias CanneryWeb.Endpoint
 
   @impl true
@@ -17,9 +17,11 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
     {:noreply, apply_action(socket, live_action, params)}
   end
 
-  defp apply_action(%{assigns: %{current_user: current_user}} = socket, :add_shot_group, %{
+  defp apply_action(
-         "id" => id
+         %{assigns: %{current_user: current_user}} = socket,
-       }) do
+         :add_shot_group,
+         %{"id" => id}
+       ) do
     socket
     |> assign(:page_title, gettext("Record shots"))
     |> assign(:ammo_group, Ammo.get_ammo_group!(id, current_user))
@@ -72,6 +74,121 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
 
   defp display_ammo_groups(%{assigns: %{current_user: current_user}} = socket) do
     ammo_groups = Ammo.list_ammo_groups(current_user) |> Repo.preload([:ammo_type, :container])
-    socket |> assign(:ammo_groups, ammo_groups)
+    containers = Containers.list_containers(current_user)
+
+    columns = [
+      %{label: gettext("Ammo type"), key: "ammo_type"},
+      %{label: gettext("Count"), key: "count"},
+      %{label: gettext("Price paid"), key: "price_paid"},
+      %{label: gettext("% left"), key: "remaining"},
+      %{label: gettext("Range"), key: "range"},
+      %{label: gettext("Container"), key: "container"},
+      %{label: nil, key: "actions", sortable: false}
+    ]
+
+    rows =
+      ammo_groups
+      |> Enum.map(fn ammo_group -> ammo_group |> get_row_data_for_ammo_group(columns) end)
+
+    socket
+    |> assign(ammo_groups: ammo_groups, containers: containers, columns: columns, rows: rows)
   end
+
+  @spec get_row_data_for_ammo_group(AmmoGroup.t(), [map()]) :: [map()]
+  defp get_row_data_for_ammo_group(ammo_group, columns) do
+    ammo_group = ammo_group |> Repo.preload([:ammo_type, :container])
+
+    columns
+    |> Enum.into(%{}, fn %{key: key} -> {key, get_value_for_key(key, ammo_group)} end)
+  end
+
+  @spec get_value_for_key(String.t(), AmmoGroup.t()) :: any()
+  defp get_value_for_key("ammo_type", %{ammo_type: ammo_type}) do
+    {ammo_type.name,
+     live_patch(ammo_type.name,
+       to: Routes.ammo_type_show_path(Endpoint, :show, ammo_type),
+       class: "link"
+     )}
+  end
+
+  defp get_value_for_key("price_paid", %{price_paid: nil}), do: {"a", nil}
+
+  defp get_value_for_key("price_paid", %{price_paid: price_paid}),
+    do: gettext("$%{amount}", amount: price_paid |> :erlang.float_to_binary(decimals: 2))
+
+  defp get_value_for_key("range", %{staged: staged} = ammo_group) do
+    assigns = %{ammo_group: ammo_group}
+
+    {staged,
+     ~H"""
+     <div class="min-w-20 py-2 px-4 h-full flex flex-col justify-center items-center">
+       <button
+         type="button"
+         class="mx-2 my-1 btn btn-primary"
+         phx-click="toggle_staged"
+         phx-value-ammo_group_id={ammo_group.id}
+       >
+         <%= if ammo_group.staged, do: gettext("Unstage"), else: gettext("Stage") %>
+       </button>
+
+       <%= live_patch(dgettext("actions", "Record shots"),
+         to: Routes.ammo_group_index_path(Endpoint, :add_shot_group, ammo_group),
+         class: "mx-2 my-1 btn btn-primary"
+       ) %>
+     </div>
+     """}
+  end
+
+  defp get_value_for_key("remaining", ammo_group),
+    do: "#{ammo_group |> Ammo.get_percentage_remaining()}%"
+
+  defp get_value_for_key("actions", ammo_group) do
+    assigns = %{ammo_group: ammo_group}
+
+    ~H"""
+    <div class="py-2 px-4 h-full space-x-4 flex justify-center items-center">
+      <%= live_redirect to: Routes.ammo_group_show_path(Endpoint, :show, ammo_group),
+                    class: "text-primary-600 link",
+                    data: [qa: "view-#{ammo_group.id}"] do %>
+        <i class="fa-fw fa-lg fas fa-eye"></i>
+      <% end %>
+
+      <%= live_patch to: Routes.ammo_group_index_path(Endpoint, :edit, ammo_group),
+                  class: "text-primary-600 link",
+                  data: [qa: "edit-#{ammo_group.id}"] do %>
+        <i class="fa-fw fa-lg fas fa-edit"></i>
+      <% end %>
+
+      <%= link to: "#",
+            class: "text-primary-600 link",
+            phx_click: "delete",
+            phx_value_id: ammo_group.id,
+            data: [
+              confirm: dgettext("prompts", "Are you sure you want to delete this ammo?"),
+              qa: "delete-#{ammo_group.id}"
+            ] do %>
+        <i class="fa-fw fa-lg fas fa-trash"></i>
+      <% end %>
+    </div>
+    """
+  end
+
+  defp get_value_for_key("container", %{container: nil}), do: {nil, nil}
+
+  defp get_value_for_key("container", %{container: %{name: container_name}} = ammo_group) do
+    assigns = %{ammo_group: ammo_group}
+
+    {container_name,
+     ~H"""
+     <div class="min-w-20 py-2 px-4 h-full space-x-4 flex justify-center items-center">
+       <%= live_patch(@ammo_group.container.name,
+         to: Routes.ammo_group_index_path(Endpoint, :move, @ammo_group),
+         class: "btn btn-primary"
+       ) %>
+     </div>
+     """}
+  end
+
+  defp get_value_for_key(key, ammo_group),
+    do: ammo_group |> Map.get(key |> String.to_existing_atom())
 end

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

@@ -9,126 +9,49 @@
       <%= display_emoji("😔") %>
     </h2>
 
-    <%= live_patch(dgettext("actions", "Add your first box!"),
+    <%= if @containers |> Enum.empty?() do %>
-      to: Routes.ammo_group_index_path(Endpoint, :new),
+      <div class="flex justify-center items-center">
-      class: "btn btn-primary"
+        <h2 class="m-2 title text-md text-primary-600">
-    ) %>
+          <%= dgettext("prompts", "You'll need to") %>
+        </h2>
+
+        <%= live_patch(dgettext("actions", "add a container first"),
+          to: Routes.container_index_path(Endpoint, :new),
+          class: "btn btn-primary"
+        ) %>
+      </div>
+    <% else %>
+      <%= live_patch(dgettext("actions", "Add your first box!"),
+        to: Routes.ammo_group_index_path(Endpoint, :new),
+        class: "btn btn-primary"
+      ) %>
+    <% end %>
   <% else %>
-    <%= live_patch(dgettext("actions", "New Ammo group"),
+    <%= if @containers |> Enum.empty?() do %>
-      to: Routes.ammo_group_index_path(Endpoint, :new),
+      <div class="flex justify-center items-center">
-      class: "btn btn-primary"
+        <h2 class="m-2 title text-md text-primary-600">
-    ) %>
+          <%= dgettext("prompts", "You'll need to") %>
+        </h2>
 
-    <div class="w-full overflow-x-auto border border-gray-600 rounded-lg shadow-lg bg-black">
+        <%= live_patch(dgettext("actions", "add a container first"),
-      <table class="min-w-full table-auto text-center bg-white">
+          to: Routes.container_index_path(Endpoint, :new),
-        <thead class="border-b border-primary-600">
+          class: "btn btn-primary"
-          <tr>
+        ) %>
-            <th class="p-2">
+      </div>
-              <%= gettext("Ammo type") %>
+    <% else %>
-            </th>
+      <%= live_patch(dgettext("actions", "New Ammo group"),
-            <th class="p-2">
+        to: Routes.ammo_group_index_path(Endpoint, :new),
-              <%= gettext("Count") %>
+        class: "btn btn-primary"
-            </th>
+      ) %>
-            <th class="p-2">
+    <% end %>
-              <%= gettext("Price paid") %>
-            </th>
-            <th class="p-2">
-              <%= gettext("% left") %>
-            </th>
-            <th class="p-2">
-              <%= gettext("Range") %>
-            </th>
-            <th class="p-2">
-              <%= gettext("Container") %>
-            </th>
 
-            <th class="p-2"></th>
+    <.live_component
-          </tr>
+      module={CanneryWeb.Components.TableComponent}
-        </thead>
+      id="ammo_groups_index_table"
-        <tbody id="ammo_groups">
+      action={@live_action}
-          <%= for ammo_group <- @ammo_groups do %>
+      columns={@columns}
-            <tr id={"ammo_group-#{ammo_group.id}"}>
+      rows={@rows}
-              <td class="p-2">
+    />
-                <%= live_patch(ammo_group.ammo_type.name,
-                  to: Routes.ammo_type_show_path(Endpoint, :show, ammo_group.ammo_type),
-                  class: "link"
-                ) %>
-              </td>
-
-              <td class="p-2">
-                <%= ammo_group.count %>
-              </td>
-
-              <td class="p-2">
-                <%= if ammo_group.price_paid do %>
-                  <%= gettext("$%{amount}",
-                    amount: ammo_group.price_paid |> :erlang.float_to_binary(decimals: 2)
-                  ) %>
-                <% end %>
-              </td>
-
-              <td class="p-2">
-                <%= "#{ammo_group |> Ammo.get_percentage_remaining()}%" %>
-              </td>
-
-              <td class="p-2">
-                <div class="px-4 py-2 space-x-4 flex justify-center items-center">
-                  <button
-                    type="button"
-                    class="btn btn-primary"
-                    phx-click="toggle_staged"
-                    phx-value-ammo_group_id={ammo_group.id}
-                  >
-                    <%= if ammo_group.staged, do: gettext("Unstage"), else: gettext("Stage") %>
-                  </button>
-
-                  <%= live_patch(dgettext("actions", "Record shots"),
-                    to: Routes.ammo_group_index_path(Endpoint, :add_shot_group, ammo_group),
-                    class: "btn btn-primary"
-                  ) %>
-                </div>
-              </td>
-
-              <td class="p-2">
-                <%= if ammo_group.container do %>
-                  <%= live_patch(ammo_group.container.name,
-                    to: Routes.ammo_group_index_path(Endpoint, :move, ammo_group),
-                    class: "btn btn-primary"
-                  ) %>
-                <% end %>
-              </td>
-
-              <td class="p-2">
-                <div class="px-4 py-2 space-x-4 flex justify-center items-center">
-                  <%= live_redirect to: Routes.ammo_group_show_path(Endpoint, :show, ammo_group),
-                                class: "text-primary-600 link",
-                                data: [qa: "view-#{ammo_group.id}"] do %>
-                    <i class="fa-fw fa-lg fas fa-eye"></i>
-                  <% end %>
-
-                  <%= live_patch to: Routes.ammo_group_index_path(Endpoint, :edit, ammo_group),
-                             class: "text-primary-600 link",
-                             data: [qa: "edit-#{ammo_group.id}"] do %>
-                    <i class="fa-fw fa-lg fas fa-edit"></i>
-                  <% end %>
-
-                  <%= link to: "#",
-                       class: "text-primary-600 link",
-                       phx_click: "delete",
-                       phx_value_id: ammo_group.id,
-                       data: [
-                         confirm: dgettext("prompts", "Are you sure you want to delete this ammo?"),
-                         qa: "delete-#{ammo_group.id}"
-                       ] do %>
-                    <i class="fa-fw fa-lg fas fa-trash"></i>
-                  <% end %>
-                </div>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-    </div>
   <% end %>
 </div>
 
@@ -143,6 +66,7 @@
         ammo_group={@ammo_group}
         return_to={Routes.ammo_group_index_path(Endpoint, :index)}
         current_user={@current_user}
+        containers={@containers}
       />
     </.modal>
   <% @live_action == :add_shot_group -> %>
@@ -170,4 +94,5 @@
       />
     </.modal>
   <% true -> %>
-  <% end %>
+    <%= nil %>
+<% end %>

lib/cannery_web/live/ammo_group_live/show.ex

@@ -5,8 +5,9 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
 
   use CanneryWeb, :live_view
   import CanneryWeb.Components.ContainerCard
-  alias Cannery.{Ammo, Repo}
+  alias Cannery.{ActivityLog, ActivityLog.ShotGroup, Ammo, Ammo.AmmoGroup, Repo}
   alias CanneryWeb.Endpoint
+  alias Phoenix.LiveView.Socket
 
   @impl true
   def mount(_params, session, socket) do
@@ -15,18 +16,35 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
 
   @impl true
   def handle_params(
-        %{"id" => id},
+        %{"id" => id, "shot_group_id" => shot_group_id},
         _url,
         %{assigns: %{live_action: live_action, current_user: current_user}} = socket
       ) do
-    ammo_group = Ammo.get_ammo_group!(id, current_user) |> Repo.preload([:container, :ammo_type])
+    shot_group = ActivityLog.get_shot_group!(shot_group_id, current_user)
-    {:noreply, socket |> assign(page_title: page_title(live_action), ammo_group: ammo_group)}
+
+    socket =
+      socket
+      |> assign(page_title: page_title(live_action), shot_group: shot_group)
+      |> display_ammo_group(id)
+
+    {:noreply, socket}
   end
 
+  @impl true
+  def handle_params(%{"id" => id}, _url, %{assigns: %{live_action: live_action}} = socket) do
+    {:noreply, socket |> assign(page_title: page_title(live_action)) |> display_ammo_group(id)}
+  end
+
+  defp page_title(:add_shot_group), do: gettext("Record Shots")
+  defp page_title(:edit_shot_group), do: gettext("Edit Shot Records")
+  defp page_title(:move), do: gettext("Move Ammo group")
+  defp page_title(:show), do: gettext("Show Ammo group")
+  defp page_title(:edit), do: gettext("Edit Ammo group")
+
   @impl true
   def handle_event(
         "delete",
-        _,
+        _params,
         %{assigns: %{ammo_group: ammo_group, current_user: current_user}} = socket
       ) do
     ammo_group |> Ammo.delete_ammo_group!(current_user)
@@ -40,17 +58,90 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
   @impl true
   def handle_event(
         "toggle_staged",
-        _,
+        _params,
         %{assigns: %{ammo_group: ammo_group, current_user: current_user}} = socket
       ) do
     {:ok, ammo_group} =
       ammo_group |> Ammo.update_ammo_group(%{"staged" => !ammo_group.staged}, current_user)
 
-    {:noreply, socket |> assign(ammo_group: ammo_group)}
+    {:noreply, socket |> display_ammo_group(ammo_group)}
   end
 
-  defp page_title(:add_shot_group), do: gettext("Add Shot group")
+  @impl true
-  defp page_title(:move), do: gettext("Move Ammo group")
+  def handle_event(
-  defp page_title(:show), do: gettext("Show Ammo group")
+        "delete_shot_group",
-  defp page_title(:edit), do: gettext("Edit Ammo group")
+        %{"id" => id},
+        %{assigns: %{ammo_group: ammo_group, current_user: current_user}} = socket
+      ) do
+    {:ok, _} =
+      ActivityLog.get_shot_group!(id, current_user)
+      |> ActivityLog.delete_shot_group(current_user)
+
+    prompt = dgettext("prompts", "Shot records deleted succesfully")
+    {:noreply, socket |> put_flash(:info, prompt) |> display_ammo_group(ammo_group)}
+  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)
+
+    columns = [
+      %{label: gettext("Rounds shot"), key: "count"},
+      %{label: gettext("Notes"), key: "notes"},
+      %{label: gettext("Date"), key: "date"},
+      %{label: nil, key: "actions", sortable: false}
+    ]
+
+    rows =
+      ammo_group.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)
+  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 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
+    assigns = %{ammo_group: ammo_group, shot_group: shot_group}
+
+    columns
+    |> Enum.into(%{}, fn %{key: key} ->
+      value =
+        case key do
+          "date" ->
+            {date, date |> display_date()}
+
+          "actions" ->
+            ~H"""
+            <div class="px-4 py-2 space-x-4 flex justify-center items-center">
+              <%= live_patch to: Routes.ammo_group_show_path(Endpoint, :edit_shot_group, @ammo_group, shot_group),
+                          class: "text-primary-600 link",
+                          data: [qa: "edit-#{shot_group.id}"] do %>
+                <i class="fa-fw fa-lg fas fa-edit"></i>
+              <% end %>
+
+              <%= link to: "#",
+                    class: "text-primary-600 link",
+                    phx_click: "delete_shot_group",
+                    phx_value_id: shot_group.id,
+                    data: [
+                      confirm: dgettext("prompts", "Are you sure you want to delete this shot record?"),
+                      qa: "delete-#{shot_group.id}"
+                    ] do %>
+                <i class="fa-fw fa-lg fas fa-trash"></i>
+              <% end %>
+            </div>
+            """
+
+          key ->
+            shot_group |> Map.get(key |> String.to_existing_atom())
+        end
+
+      {key, value}
+    end)
+  end
 end

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

@@ -111,38 +111,12 @@
       <%= gettext("Rounds used") %>
     </h1>
 
-    <div class="w-full overflow-x-auto border border-gray-600 rounded-lg shadow-lg bg-black">
+    <.live_component
-      <table class="min-w-full table-auto text-center bg-white">
+      module={CanneryWeb.Components.TableComponent}
-        <thead class="border-b border-primary-600">
+      id="ammo_group_shot_groups_table"
-          <tr>
+      columns={@columns}
-            <th class="p-2">
+      rows={@rows}
-              <%= gettext("Rounds shot") %>
+    />
-            </th>
-            <th class="p-2">
-              <%= gettext("Notes") %>
-            </th>
-            <th class="p-2">
-              <%= gettext("Date") %>
-            </th>
-          </tr>
-        </thead>
-        <tbody id="shot_groups">
-          <%= for shot_group <- @ammo_group.shot_groups do %>
-            <tr id={"shot_group-#{shot_group.id}"}>
-              <td class="p-2">
-                <%= shot_group.count %>
-              </td>
-              <td class="p-2">
-                <%= shot_group.notes %>
-              </td>
-              <td class="p-2">
-                <%= shot_group.date |> display_date() %>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-    </div>
   <% end %>
 </div>
 
@@ -159,6 +133,18 @@
         current_user={@current_user}
       />
     </.modal>
+  <% :edit_shot_group -> %>
+    <.modal return_to={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)}>
+      <.live_component
+        module={CanneryWeb.RangeLive.FormComponent}
+        id={@shot_group.id}
+        title={@page_title}
+        action={@live_action}
+        shot_group={@shot_group}
+        return_to={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)}
+        current_user={@current_user}
+      />
+    </.modal>
   <% :add_shot_group -> %>
     <.modal return_to={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)}>
       <.live_component

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

@@ -17,11 +17,11 @@
       </div>
     <% end %>
 
-    <%= label(f, :name, gettext("Name"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :name, gettext("Name"), class: "title text-lg text-primary-600") %>
     <%= text_input(f, :name, class: "text-center col-span-2 input input-primary") %>
     <%= error_tag(f, :name, "col-span-3 text-center") %>
 
-    <%= label(f, :desc, gettext("Description"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :desc, gettext("Description"), class: "title text-lg text-primary-600") %>
     <%= textarea(f, :desc,
       class: "text-center col-span-2 input input-primary",
       phx_hook: "MaintainAttrs"
@@ -34,50 +34,42 @@
     >
       <%= gettext("Example bullet type abbreviations") %>
     </a>
-    <%= label(f, :bullet_type, gettext("Bullet type"),
+    <%= label(f, :bullet_type, gettext("Bullet type"), class: "title text-lg text-primary-600") %>
-      class: "mr-4 title text-lg text-primary-600"
-    ) %>
     <%= text_input(f, :bullet_type,
       class: "text-center col-span-2 input input-primary",
       placeholder: gettext("FMJ")
     ) %>
     <%= error_tag(f, :bullet_type, "col-span-3 text-center") %>
 
-    <%= label(f, :bullet_core, gettext("Bullet core"),
+    <%= label(f, :bullet_core, gettext("Bullet core"), class: "title text-lg text-primary-600") %>
-      class: "mr-4 title text-lg text-primary-600"
-    ) %>
     <%= text_input(f, :bullet_core,
       class: "text-center col-span-2 input input-primary",
       placeholder: gettext("Steel")
     ) %>
     <%= error_tag(f, :bullet_core, "col-span-3 text-center") %>
 
-    <%= label(f, :cartridge, gettext("Cartridge"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :cartridge, gettext("Cartridge"), class: "title text-lg text-primary-600") %>
     <%= text_input(f, :cartridge,
       class: "text-center col-span-2 input input-primary",
       placeholder: "5.56x46mm NATO"
     ) %>
     <%= error_tag(f, :cartridge, "col-span-3 text-center") %>
 
-    <%= label(f, :caliber, gettext("Caliber"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :caliber, gettext("Caliber"), class: "title text-lg text-primary-600") %>
     <%= text_input(f, :caliber,
       class: "text-center col-span-2 input input-primary",
       placeholder: ".223"
     ) %>
     <%= error_tag(f, :caliber, "col-span-3 text-center") %>
 
-    <%= label(f, :case_material, gettext("Case material"),
+    <%= label(f, :case_material, gettext("Case material"), class: "title text-lg text-primary-600") %>
-      class: "mr-4 title text-lg text-primary-600"
-    ) %>
     <%= text_input(f, :case_material,
       class: "text-center col-span-2 input input-primary",
       placeholder: gettext("Brass")
     ) %>
     <%= error_tag(f, :case_material, "col-span-3 text-center") %>
 
-    <%= label(f, :jacket_type, gettext("Jacket type"),
+    <%= label(f, :jacket_type, gettext("Jacket type"), class: "title text-lg text-primary-600") %>
-      class: "mr-4 title text-lg text-primary-600"
-    ) %>
     <%= text_input(f, :jacket_type,
       class: "text-center col-span-2 input input-primary",
       placeholder: gettext("Bimetal")
@@ -85,7 +77,7 @@
     <%= error_tag(f, :case_material, "col-span-3 text-center") %>
 
     <%= label(f, :muzzle_velocity, gettext("Muzzle velocity"),
-      class: "mr-4 title text-lg text-primary-600"
+      class: "title text-lg text-primary-600"
     ) %>
     <%= number_input(f, :muzzle_velocity,
       step: "1",
@@ -94,14 +86,12 @@
     ) %>
     <%= error_tag(f, :muzzle_velocity, "col-span-3 text-center") %>
 
-    <%= label(f, :powder_type, gettext("Powder type"),
+    <%= label(f, :powder_type, gettext("Powder type"), class: "title text-lg text-primary-600") %>
-      class: "mr-4 title text-lg text-primary-600"
-    ) %>
     <%= text_input(f, :powder_type, class: "text-center col-span-2 input input-primary") %>
     <%= error_tag(f, :powder_type, "col-span-3 text-center") %>
 
     <%= label(f, :powder_grains_per_charge, gettext("Powder grains per charge"),
-      class: "mr-4 title text-lg text-primary-600"
+      class: "title text-lg text-primary-600"
     ) %>
     <%= number_input(f, :powder_grains_per_charge,
       step: "1",
@@ -110,7 +100,7 @@
     ) %>
     <%= error_tag(f, :powder_grains_per_charge, "col-span-3 text-center") %>
 
-    <%= label(f, :grains, gettext("Grains"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :grains, gettext("Grains"), class: "title text-lg text-primary-600") %>
     <%= number_input(f, :grains,
       step: "1",
       class: "text-center col-span-2 input input-primary",
@@ -118,54 +108,48 @@
     ) %>
     <%= error_tag(f, :grains, "col-span-3 text-center") %>
 
-    <%= label(f, :pressure, gettext("Pressure"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :pressure, gettext("Pressure"), class: "title text-lg text-primary-600") %>
     <%= text_input(f, :pressure,
       class: "text-center col-span-2 input input-primary",
       placeholder: "+P"
     ) %>
     <%= error_tag(f, :pressure, "col-span-3 text-center") %>
 
-    <%= label(f, :primer_type, gettext("Primer type"),
+    <%= label(f, :primer_type, gettext("Primer type"), class: "title text-lg text-primary-600") %>
-      class: "mr-4 title text-lg text-primary-600"
-    ) %>
     <%= text_input(f, :primer_type,
       class: "text-center col-span-2 input input-primary",
       placeholder: "Boxer"
     ) %>
     <%= error_tag(f, :primer_type, "col-span-3 text-center") %>
 
-    <%= label(f, :firing_type, gettext("Firing type"),
+    <%= label(f, :firing_type, gettext("Firing type"), class: "title text-lg text-primary-600") %>
-      class: "mr-4 title text-lg text-primary-600"
-    ) %>
     <%= text_input(f, :firing_type,
       class: "text-center col-span-2 input input-primary",
       placeholder: "Centerfire"
     ) %>
     <%= error_tag(f, :firing_type, "col-span-3 text-center") %>
 
-    <%= label(f, :tracer, gettext("Tracer"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :tracer, gettext("Tracer"), class: "title text-lg text-primary-600") %>
     <%= checkbox(f, :tracer, class: "text-center col-span-2 checkbox") %>
     <%= error_tag(f, :tracer, "col-span-3 text-center") %>
 
-    <%= label(f, :incendiary, gettext("Incendiary"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :incendiary, gettext("Incendiary"), class: "title text-lg text-primary-600") %>
     <%= checkbox(f, :incendiary, class: "text-center col-span-2 checkbox") %>
     <%= error_tag(f, :incendiary, "col-span-3 text-center") %>
 
-    <%= label(f, :blank, gettext("Blank"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :blank, gettext("Blank"), class: "title text-lg text-primary-600") %>
     <%= checkbox(f, :blank, class: "text-center col-span-2 checkbox") %>
     <%= error_tag(f, :blank, "col-span-3 text-center") %>
 
-    <%= label(f, :corrosive, gettext("Corrosive"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :corrosive, gettext("Corrosive"), class: "title text-lg text-primary-600") %>
     <%= checkbox(f, :corrosive, class: "text-center col-span-2 checkbox") %>
     <%= error_tag(f, :corrosive, "col-span-3 text-center") %>
 
-    <%= label(f, :manufacturer, gettext("Manufacturer"),
+    <%= label(f, :manufacturer, gettext("Manufacturer"), class: "title text-lg text-primary-600") %>
-      class: "mr-4 title text-lg text-primary-600"
-    ) %>
     <%= text_input(f, :manufacturer, class: "text-center col-span-2 input input-primary") %>
     <%= error_tag(f, :manufacturer, "col-span-3 text-center") %>
 
-    <%= label(f, :upc, gettext("UPC"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :upc, gettext("UPC"), class: "title text-lg text-primary-600") %>
     <%= text_input(f, :upc, class: "text-center col-span-2 input input-primary") %>
     <%= error_tag(f, :upc, "col-span-3 text-center") %>
 

lib/cannery_web/live/ammo_type_live/index.ex

@@ -31,7 +31,7 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
   end
 
   defp apply_action(socket, :index, _params) do
-    socket |> assign(:page_title, gettext("Listing Ammo types")) |> assign(:ammo_type, nil)
+    socket |> assign(:page_title, gettext("Ammo types")) |> assign(:ammo_type, nil)
   end
 
   @impl true
@@ -46,37 +46,103 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
   defp list_ammo_types(%{assigns: %{current_user: current_user}} = socket) do
     ammo_types = Ammo.list_ammo_types(current_user)
 
-    columns_to_display =
+    columns =
       [
-        {gettext("Name"), :name, :string},
+        %{label: gettext("Name"), key: "name", type: :string},
-        {gettext("Bullet type"), :bullet_type, :string},
+        %{label: gettext("Bullet type"), key: "bullet_type", type: :string},
-        {gettext("Bullet core"), :bullet_core, :string},
+        %{label: gettext("Bullet core"), key: "bullet_core", type: :string},
-        {gettext("Cartridge"), :cartridge, :string},
+        %{label: gettext("Cartridge"), key: "cartridge", type: :string},
-        {gettext("Caliber"), :caliber, :string},
+        %{label: gettext("Caliber"), key: "caliber", type: :string},
-        {gettext("Case material"), :case_material, :string},
+        %{label: gettext("Case material"), key: "case_material", type: :string},
-        {gettext("Jacket type"), :jacket_type, :string},
+        %{label: gettext("Jacket type"), key: "jacket_type", type: :string},
-        {gettext("Muzzle velocity"), :muzzle_velocity, :string},
+        %{label: gettext("Muzzle velocity"), key: "muzzle_velocity", type: :string},
-        {gettext("Powder type"), :powder_type, :string},
+        %{label: gettext("Powder type"), key: "powder_type", type: :string},
-        {gettext("Powder grains per charge"), :powder_grains_per_charge, :string},
+        %{
-        {gettext("Grains"), :grains, :string},
+          label: gettext("Powder grains per charge"),
-        {gettext("Pressure"), :pressure, :string},
+          key: "powder_grains_per_charge",
-        {gettext("Primer type"), :primer_type, :string},
+          type: :string
-        {gettext("Firing type"), :firing_type, :string},
+        },
-        {gettext("Tracer"), :tracer, :boolean},
+        %{label: gettext("Grains"), key: "grains", type: :string},
-        {gettext("Incendiary"), :incendiary, :boolean},
+        %{label: gettext("Pressure"), key: "pressure", type: :string},
-        {gettext("Blank"), :blank, :boolean},
+        %{label: gettext("Primer type"), key: "primer_type", type: :string},
-        {gettext("Corrosive"), :corrosive, :boolean},
+        %{label: gettext("Firing type"), key: "firing_type", type: :string},
-        {gettext("Manufacturer"), :manufacturer, :string},
+        %{label: gettext("Tracer"), key: "tracer", type: :boolean},
-        {gettext("UPC"), :upc, :string}
+        %{label: gettext("Incendiary"), key: "incendiary", type: :boolean},
+        %{label: gettext("Blank"), key: "blank", type: :boolean},
+        %{label: gettext("Corrosive"), key: "corrosive", type: :boolean},
+        %{label: gettext("Manufacturer"), key: "manufacturer", type: :string},
+        %{label: gettext("UPC"), key: "upc", type: :string}
       ]
-      |> Enum.filter(fn {_label, field, type} ->
+      |> Enum.filter(fn %{key: key, type: type} ->
         # remove columns if all values match defaults
         default_value = if type == :boolean, do: false, else: nil
 
         ammo_types
-        |> Enum.any?(fn ammo_type -> not (ammo_type |> Map.get(field) == default_value) end)
+        |> Enum.any?(fn ammo_type ->
+          not (ammo_type |> Map.get(key |> String.to_existing_atom()) == default_value)
+        end)
       end)
+      |> Kernel.++([
+        %{label: gettext("Total # of rounds"), key: "round_count", type: :round_count},
+        %{label: nil, key: "actions", type: :actions, sortable: false}
+      ])
 
-    socket |> assign(ammo_types: ammo_types, columns_to_display: columns_to_display)
+    rows =
+      ammo_types
+      |> Enum.map(fn ammo_type -> ammo_type |> get_ammo_type_values(columns, current_user) end)
+
+    socket |> assign(columns: columns, rows: rows)
+  end
+
+  defp get_ammo_type_values(ammo_type, columns, current_user) do
+    assigns = %{ammo_type: ammo_type}
+
+    columns
+    |> Enum.into(%{}, fn %{key: key, type: type} ->
+      value =
+        case type do
+          :boolean ->
+            ammo_type |> Map.get(key |> String.to_existing_atom()) |> humanize()
+
+          :round_count ->
+            ammo_type |> Ammo.get_round_count_for_ammo_type(current_user)
+
+          :actions ->
+            ~H"""
+            <div class="px-4 py-2 space-x-4 flex justify-center items-center">
+              <%= live_redirect to: Routes.ammo_type_show_path(Endpoint, :show, ammo_type),
+                            class: "text-primary-600 link",
+                            data: [qa: "view-#{ammo_type.id}"] do %>
+                <i class="fa-fw fa-lg fas fa-eye"></i>
+              <% end %>
+
+              <%= live_patch to: Routes.ammo_type_index_path(Endpoint, :edit, ammo_type),
+                          class: "text-primary-600 link",
+                          data: [qa: "edit-#{ammo_type.id}"] do %>
+                <i class="fa-fw fa-lg fas fa-edit"></i>
+              <% end %>
+
+              <%= link to: "#",
+                    class: "text-primary-600 link",
+                    phx_click: "delete",
+                    phx_value_id: ammo_type.id,
+                    data: [
+                      confirm: dgettext("prompts", "Are you sure you want to delete this ammo?"),
+                      qa: "delete-#{ammo_type.id}"
+                    ] do %>
+                <i class="fa-lg fas fa-trash"></i>
+              <% end %>
+            </div>
+            """
+
+          nil ->
+            nil
+
+          _other ->
+            ammo_type |> Map.get(key |> String.to_existing_atom())
+        end
+
+      {key, value}
+    end)
   end
 end

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

@@ -3,7 +3,7 @@
     <%= gettext("Ammo Types") %>
   </h1>
 
-  <%= if @ammo_types |> Enum.empty?() do %>
+  <%= if @rows |> Enum.empty?() do %>
     <h2 class="title text-xl text-primary-600">
       <%= gettext("No Ammo Types") %>
       <%= display_emoji("😔") %>
@@ -19,71 +19,13 @@
       class: "btn btn-primary"
     ) %>
 
-    <div class="w-full overflow-x-auto border border-gray-600 rounded-lg shadow-lg bg-black">
+    <.live_component
-      <table class="min-w-full table-auto text-center bg-white">
+      module={CanneryWeb.Components.TableComponent}
-        <thead class="border-b border-primary-600">
+      id="ammo_types_index_table"
-          <tr>
+      action={@live_action}
-            <%= for {field_name, _field, _type} <- @columns_to_display do %>
+      columns={@columns}
-              <th class="p-2">
+      rows={@rows}
-                <%= field_name %>
+    />
-              </th>
-            <% end %>
-            <th class="p-2">
-              <%= gettext("Total # of rounds") %>
-            </th>
-
-            <th class="p-2"></th>
-          </tr>
-        </thead>
-        <tbody>
-          <%= for ammo_type <- @ammo_types do %>
-            <tr id={"ammo_type-#{ammo_type.id}"}>
-              <%= for {_label, field, type} <- @columns_to_display do %>
-                <td class="p-2">
-                  <%= case type do %>
-                    <% :boolean -> %>
-                      <%= ammo_type |> Map.get(field) |> humanize() %>
-                    <% _other -> %>
-                      <%= ammo_type |> Map.get(field) %>
-                  <% end %>
-                </td>
-              <% end %>
-
-              <td class="p-2">
-                <%= ammo_type |> Ammo.get_round_count_for_ammo_type(@current_user) %>
-              </td>
-
-              <td class="p-2">
-                <div class="px-4 py-2 space-x-4 flex justify-center items-center">
-                  <%= live_redirect to: Routes.ammo_type_show_path(Endpoint, :show, ammo_type),
-                                class: "text-primary-600 link",
-                                data: [qa: "view-#{ammo_type.id}"] do %>
-                    <i class="fa-fw fa-lg fas fa-eye"></i>
-                  <% end %>
-
-                  <%= live_patch to: Routes.ammo_type_index_path(Endpoint, :edit, ammo_type),
-                             class: "text-primary-600 link",
-                             data: [qa: "edit-#{ammo_type.id}"] do %>
-                    <i class="fa-fw fa-lg fas fa-edit"></i>
-                  <% end %>
-
-                  <%= link to: "#",
-                       class: "text-primary-600 link",
-                       phx_click: "delete",
-                       phx_value_id: ammo_type.id,
-                       data: [
-                         confirm: dgettext("prompts", "Are you sure you want to delete this ammo?"),
-                         qa: "delete-#{ammo_type.id}"
-                       ] do %>
-                    <i class="fa-lg fas fa-trash"></i>
-                  <% end %>
-                </div>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-    </div>
   <% end %>
 </div>
 

lib/cannery_web/live/ammo_type_live/show.ex

@@ -14,7 +14,7 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
   end
 
   @impl true
-  def handle_params(%{"id" => id}, _, %{assigns: %{current_user: current_user}} = socket) do
+  def handle_params(%{"id" => id}, _params, %{assigns: %{current_user: current_user}} = socket) do
     ammo_type = Ammo.get_ammo_type!(id, current_user)
 
     socket =
@@ -32,7 +32,7 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
   @impl true
   def handle_event(
         "delete",
-        _,
+        _params,
         %{assigns: %{ammo_type: ammo_type, current_user: current_user}} = socket
       ) do
     %{name: ammo_type_name} = ammo_type |> Ammo.delete_ammo_type!(current_user)

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

@@ -100,9 +100,8 @@
         ) %>
       </span>
     <% else %>
-      <h3 class="title text-lg col-span-2">
+      <h3 class="mx-8 my-4 title text-lg text-primary-600 col-span-2">
         <%= gettext("No cost information") %>
-        <%= display_emoji("😔") %>
       </h3>
     <% end %>
   </div>
@@ -111,8 +110,10 @@
 
   <div>
     <%= if @ammo_groups |> Enum.empty?() do %>
-      <%= gettext("No ammo for this type") %>
+      <h2 class="mx-8 my-4 title text-lg text-primary-600">
-      <%= display_emoji("😔") %>
+        <%= gettext("No ammo for this type") %>
+        <%= display_emoji("😔") %>
+      </h2>
     <% else %>
       <div class="flex flex-wrap justify-center items-center">
         <%= for ammo_group <- @ammo_groups do %>

lib/cannery_web/live/container_live/index.ex

@@ -35,7 +35,7 @@ defmodule CanneryWeb.ContainerLive.Index do
 
   defp apply_action(socket, :index, _params) do
     socket
-    |> assign(:page_title, gettext("Listing Containers"))
+    |> assign(:page_title, gettext("Containers"))
     |> assign(:container, nil)
     |> display_containers()
   end

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

@@ -20,7 +20,7 @@
     ) %>
   <% end %>
 
-  <div class="flex flex-row flex-wrap justify-center items-center">
+  <div class="max-w-full flex flex-row flex-wrap justify-center items-center">
     <%= for container <- @containers do %>
       <.container_card container={container}>
         <:tag_actions>

lib/cannery_web/live/container_live/show.ex

@@ -18,7 +18,7 @@ defmodule CanneryWeb.ContainerLive.Show do
   @impl true
   def handle_params(
         %{"id" => id},
-        _,
+        _session,
         %{assigns: %{current_user: current_user}} = socket
       ) do
     {:noreply, socket |> render_container(id, current_user)}
@@ -53,7 +53,7 @@ defmodule CanneryWeb.ContainerLive.Show do
   @impl true
   def handle_event(
         "delete_container",
-        _,
+        _params,
         %{assigns: %{container: container, current_user: current_user}} = socket
       ) do
     socket =

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

@@ -72,9 +72,11 @@
 
   <hr class="mb-4 hr" />
 
-  <p>
+  <div>
     <%= if @container.ammo_groups |> Enum.empty?() do %>
-      <%= gettext("No ammo groups in this container") %>
+      <h2 class="mx-8 my-4 title text-lg text-primary-600">
+        <%= gettext("No ammo groups in this container") %>
+      </h2>
     <% else %>
       <div class="flex flex-wrap justify-center items-center">
         <%= for ammo_group <- @container.ammo_groups do %>
@@ -82,7 +84,7 @@
         <% end %>
       </div>
     <% end %>
-  </p>
+  </div>
 </div>
 
 <%= if @live_action in [:edit] do %>

lib/cannery_web/live/home_live.ex

@@ -29,7 +29,7 @@ defmodule CanneryWeb.HomeLive do
       %{^query => vsn} ->
         {:noreply, redirect(socket, external: "https://hexdocs.pm/#{query}/#{vsn}")}
 
-      _ ->
+      _no_query ->
         {:noreply,
          socket
          |> put_flash(:error, "No dependencies found matching \"#{query}\"")
@@ -127,11 +127,15 @@ defmodule CanneryWeb.HomeLive do
           </p>
         </li>
 
-        <li class="flex flex-row justify-center space-x-2">
+        <li class="flex flex-row justify-center items-center space-x-2">
           <b>Version:</b>
-          <p>
+          <%= link class: "flex flex-row justify-center items-center space-x-2 hover:underline",
-            0.2.2
+                to: "https://gitea.bubbletea.dev/shibao/cannery/src/branch/stable/CHANGELOG.md",
-          </p>
+                target: "_blank",
+                rel: "noopener noreferrer" do %>
+            <p>0.4.1</p>
+            <i class="fas fa-md fa-info-circle"></i>
+          <% end %>
         </li>
       </ul>
     </div>

lib/cannery_web/live/invite_live/index.ex

@@ -40,7 +40,7 @@ defmodule CanneryWeb.InviteLive.Index do
   end
 
   defp apply_action(socket, :index, _params) do
-    socket |> assign(page_title: gettext("Listing Invites"), invite: nil)
+    socket |> assign(page_title: gettext("Invites"), invite: nil)
   end
 
   @impl true
@@ -119,7 +119,7 @@ defmodule CanneryWeb.InviteLive.Index do
   end
 
   @impl true
-  def handle_event("copy_to_clipboard", _, socket) do
+  def handle_event("copy_to_clipboard", _params, socket) do
     prompt = dgettext("prompts", "Copied to clipboard")
     {:noreply, socket |> put_flash(:info, prompt)}
   end

lib/cannery_web/live/live_helpers.ex

@@ -54,12 +54,13 @@ defmodule CanneryWeb.LiveHelpers do
       id="modal"
       class="fixed z-10 left-0 top-0 pointer-events-none
         w-full h-full overflow-hidden
-        p-8 flex flex-col justify-center items-center"
+        p-4 sm:p-8 flex flex-col justify-center items-center"
     >
       <div
         id="modal-content"
-        class="fade-in-scale w-full max-w-3xl max-h-128 relative pointer-events-auto overflow-y-auto
+        class="fade-in-scale w-full max-w-3xl relative
-        p-8 flex flex-col justify-center items-center
+        pointer-events-auto overflow-hidden
+        px-8 py-4 sm:py-8 flex flex-col justify-center items-center
         flex flex-col justify-start items-center
         bg-white border-2 rounded-lg"
       >
@@ -69,12 +70,13 @@ defmodule CanneryWeb.LiveHelpers do
                      "absolute top-8 right-10
                       text-gray-500 hover:text-gray-800
                       transition-all duration-500 ease-in-out",
-      phx_remove: hide_modal()
+                   phx_remove: hide_modal() do %>
-      do %>
           <i class="fa-fw fa-lg fas fa-times"></i>
         <% end %>
 
-        <div class="w-full p-8 flex flex-col space-y-4 justify-start items-center">
+        <div
+          class="overflow-x-hidden overflow-y-auto w-full p-8 flex flex-col space-y-4 justify-start items-center"
+        >
           <%= render_slot(@inner_block) %>
         </div>
       </div>

lib/cannery_web/live/range_live/index.ex

@@ -25,7 +25,7 @@ defmodule CanneryWeb.RangeLive.Index do
          %{"id" => id}
        ) do
     socket
-    |> assign(:page_title, gettext("Record shots"))
+    |> assign(:page_title, gettext("Record Shots"))
     |> assign(:ammo_group, Ammo.get_ammo_group!(id, current_user))
   end
 
@@ -77,6 +77,69 @@ defmodule CanneryWeb.RangeLive.Index do
       ActivityLog.list_shot_groups(current_user) |> Repo.preload(ammo_group: :ammo_type)
 
     ammo_groups = Ammo.list_staged_ammo_groups(current_user)
-    socket |> assign(shot_groups: shot_groups, ammo_groups: ammo_groups)
+
+    columns = [
+      %{label: gettext("Ammo"), key: "name"},
+      %{label: gettext("Rounds shot"), key: "count"},
+      %{label: gettext("Notes"), key: "notes"},
+      %{label: gettext("Date"), key: "date"},
+      %{label: nil, key: "actions", sortable: false}
+    ]
+
+    rows =
+      shot_groups
+      |> Enum.map(fn shot_group -> shot_group |> get_row_data_for_shot_group(columns) end)
+
+    socket
+    |> assign(ammo_groups: ammo_groups, columns: columns, rows: rows, shot_groups: shot_groups)
+  end
+
+  @spec get_row_data_for_shot_group(ShotGroup.t(), [map()]) :: [map()]
+  defp get_row_data_for_shot_group(%{date: date} = shot_group, columns) do
+    shot_group = shot_group |> Repo.preload(ammo_group: :ammo_type)
+    assigns = %{shot_group: shot_group}
+
+    columns
+    |> Enum.into(%{}, fn %{key: key} ->
+      value =
+        case key do
+          "name" ->
+            {shot_group.ammo_group.ammo_type.name,
+             live_patch(shot_group.ammo_group.ammo_type.name,
+               to: Routes.ammo_group_show_path(Endpoint, :show, shot_group.ammo_group),
+               class: "link"
+             )}
+
+          "date" ->
+            date |> display_date()
+
+          "actions" ->
+            ~H"""
+            <div class="px-4 py-2 space-x-4 flex justify-center items-center">
+              <%= live_patch to: Routes.range_index_path(Endpoint, :edit, shot_group),
+                          class: "text-primary-600 link",
+                          data: [qa: "edit-#{shot_group.id}"] do %>
+                <i class="fa-fw fa-lg fas fa-edit"></i>
+              <% end %>
+
+              <%= link to: "#",
+                    class: "text-primary-600 link",
+                    phx_click: "delete",
+                    phx_value_id: shot_group.id,
+                    data: [
+                      confirm: dgettext("prompts", "Are you sure you want to delete this shot record?"),
+                      qa: "delete-#{shot_group.id}"
+                    ] do %>
+                <i class="fa-fw fa-lg fas fa-trash"></i>
+              <% end %>
+            </div>
+            """
+
+          key ->
+            shot_group |> Map.get(key |> String.to_existing_atom())
+        end
+
+      {key, value}
+    end)
   end
 end

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

@@ -53,70 +53,12 @@
       <%= gettext("Shot log") %>
     </h1>
 
-    <div class="w-full overflow-x-auto border border-gray-600 rounded-lg shadow-lg bg-black">
+    <.live_component
-      <table class="min-w-full table-auto text-center bg-white">
+      module={CanneryWeb.Components.TableComponent}
-        <thead class="border-b border-primary-600">
+      id="shot_groups_index_table"
-          <tr>
+      columns={@columns}
-            <th class="p-2">
+      rows={@rows}
-              <%= gettext("Ammo") %>
+    />
-            </th>
-            <th class="p-2">
-              <%= gettext("Rounds shot") %>
-            </th>
-            <th class="p-2">
-              <%= gettext("Notes") %>
-            </th>
-            <th class="p-2">
-              <%= gettext("Date") %>
-            </th>
-
-            <th class="p-2"></th>
-          </tr>
-        </thead>
-        <tbody id="shot_groups">
-          <%= for shot_group <- @shot_groups do %>
-            <tr id={"shot_group-#{shot_group.id}"}>
-              <td class="p-2">
-                <%= live_patch(shot_group.ammo_group.ammo_type.name,
-                  to: Routes.ammo_group_show_path(Endpoint, :show, shot_group.ammo_group),
-                  class: "link"
-                ) %>
-              </td>
-              <td class="p-2">
-                <%= shot_group.count %>
-              </td>
-              <td class="p-2">
-                <%= shot_group.notes %>
-              </td>
-              <td class="p-2">
-                <%= shot_group.date |> display_date() %>
-              </td>
-
-              <td class="p-2 w-full h-full space-x-2 flex justify-center items-center">
-                <div class="px-4 py-2 space-x-4 flex justify-center items-center">
-                  <%= live_patch to: Routes.range_index_path(Endpoint, :edit, shot_group),
-                             class: "text-primary-600 link",
-                             data: [qa: "edit-#{shot_group.id}"] do %>
-                    <i class="fa-fw fa-lg fas fa-edit"></i>
-                  <% end %>
-
-                  <%= link to: "#",
-                       class: "text-primary-600 link",
-                       phx_click: "delete",
-                       phx_value_id: shot_group.id,
-                       data: [
-                         confirm: dgettext("prompts", "Are you sure you want to delete this shot record?"),
-                         qa: "delete-#{shot_group.id}"
-                       ] do %>
-                    <i class="fa-fw fa-lg fas fa-trash"></i>
-                  <% end %>
-                </div>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-    </div>
   <% end %>
 </div>
 

lib/cannery_web/live/tag_live/index.ex

@@ -31,7 +31,7 @@ defmodule CanneryWeb.TagLive.Index do
   end
 
   defp apply_action(socket, :index, _params) do
-    socket |> assign(:page_title, gettext("Listing Tags")) |> assign(:tag, nil)
+    socket |> assign(:page_title, gettext("Tags")) |> assign(:tag, nil)
   end
 
   @impl true

lib/cannery_web/router.ex

@@ -80,6 +80,7 @@ defmodule CanneryWeb.Router do
     live "/ammo_groups/:id/show/edit", AmmoGroupLive.Show, :edit
     live "/ammo_groups/:id/show/add_shot_group", AmmoGroupLive.Show, :add_shot_group
     live "/ammo_groups/:id/show/move", AmmoGroupLive.Show, :move
+    live "/ammo_groups/:id/show/:shot_group_id/edit", AmmoGroupLive.Show, :edit_shot_group
 
     live "/range", RangeLive.Index, :index
     live "/range/:id/edit", RangeLive.Index, :edit

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

@@ -1,15 +1,12 @@
 <!DOCTYPE html>
-<html lang="en" class="m-0 p-0 w-full h-full">
+<html lang="en" class="m-0 p-0 w-full h-full bg-white">
   <head>
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <%= csrf_meta_tag() %>
-    <%= if(assigns |> Map.has_key?(:page_title),
+    <%= if(assigns |> Map.has_key?(:page_title), do: @page_title, else: "Cannery")
-      do: "#{assigns.page_title} | Cannery",
+    |> live_title_tag(suffix: " | Cannery") %>
-      else: "Cannery"
-    )
-    |> live_title_tag(suffix: "") %>
     <link phx-track-static rel="stylesheet" href={Routes.static_path(@conn, "/css/app.css")} />
     <script
       defer
@@ -20,7 +17,7 @@
     </script>
   </head>
 
-  <body class="m-0 p-0 w-full h-full">
+  <body class="m-0 p-0 w-full h-full bg-white">
     <%= @inner_content %>
   </body>
 </html>

lib/cannery_web/views/email_view.ex

@@ -2,7 +2,6 @@ defmodule CanneryWeb.EmailView do
   @moduledoc """
   A view for email-related helper functions
   """
-  alias CanneryWeb.{Endpoint, HomeLive}
-
   use CanneryWeb, :view
+  alias CanneryWeb.{Endpoint, HomeLive}
 end

lib/cannery_web/views/error_view.ex

@@ -8,7 +8,7 @@ defmodule CanneryWeb.ErrorView do
       case error_path do
         "404.html" -> dgettext("errors", "Not found")
         "401.html" -> dgettext("errors", "Unauthorized")
-        _ -> dgettext("errors", "Internal Server Error")
+        _other_template -> dgettext("errors", "Internal Server Error")
       end
 
     render("error.html", %{error_string: error_string})

lib/cannery_web/views/view_helpers.ex

@@ -7,6 +7,8 @@ defmodule CanneryWeb.ViewHelpers do
 
   import Phoenix.LiveView.Helpers
 
+  @id_length 16
+
   @doc """
   Returns a <time> element that renders the naivedatetime in the user's local
   timezone with Alpine.js
@@ -16,11 +18,12 @@ defmodule CanneryWeb.ViewHelpers do
 
   def display_datetime(datetime) do
     assigns = %{
+      id: :crypto.strong_rand_bytes(@id_length) |> Base.url_encode64(),
       datetime: datetime |> DateTime.from_naive!("Etc/UTC") |> DateTime.to_iso8601(:extended)
     }
 
     ~H"""
-    <time datetime={@datetime} x-data={"{
+    <time id={@id} datetime={@datetime} x-data={"{
         date:
           Intl.DateTimeFormat([], {dateStyle: 'short', timeStyle: 'long'})
             .format(new Date(\"#{@datetime}\"))
@@ -38,10 +41,13 @@ defmodule CanneryWeb.ViewHelpers do
   def display_date(nil), do: ""
 
   def display_date(date) do
-    assigns = %{date: date |> Date.to_iso8601(:extended)}
+    assigns = %{
+      id: :crypto.strong_rand_bytes(@id_length) |> Base.url_encode64(),
+      date: date |> Date.to_iso8601(:extended)
+    }
 
     ~H"""
-    <time datetime={@date} x-data={"{
+    <time id={@id} datetime={@date} x-data={"{
         date:
           Intl.DateTimeFormat([], {timeZone: 'Etc/UTC', dateStyle: 'short'}).format(new Date(\"#{@date}\"))
       }"} x-text="date">

mix.exs

@@ -4,7 +4,7 @@ defmodule Cannery.MixProject do
   def project do
     [
       app: :cannery,
-      version: "0.2.2",
+      version: "0.4.1",
       elixir: "~> 1.12",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: [:gettext] ++ Mix.compilers(),

priv/gettext/actions.pot

@@ -11,12 +11,12 @@ msgid ""
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:42
+#: lib/cannery_web/live/ammo_group_live/index.ex:44
 msgid "Add Ammo"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:12
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:24
 msgid "Add your first box!"
 msgstr ""
 
@@ -81,7 +81,7 @@ msgid "Make your first tag!"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:17
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:42
 msgid "New Ammo group"
 msgstr ""
 
@@ -124,9 +124,9 @@ msgid "Reset password"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/add_shot_group_component.html.heex:42
+#: lib/cannery_web/components/add_shot_group_component.html.heex:46
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:54
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:73
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:172
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:156
 #: lib/cannery_web/live/container_live/form_component.html.heex:50
 #: lib/cannery_web/live/invite_live/form_component.html.heex:28
 #: lib/cannery_web/live/range_live/form_component.html.heex:40
@@ -160,7 +160,7 @@ msgid "Why not get some ready to shoot?"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:85
+#: lib/cannery_web/live/ammo_group_live/index.ex:134
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:86
 #: lib/cannery_web/live/range_live/index.html.heex:36
 msgid "Record shots"
@@ -172,7 +172,7 @@ msgid "Ammo Details"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/move_ammo_group_component.html.heex:12
+#: lib/cannery_web/components/move_ammo_group_component.ex:89
 msgid "Add another container!"
 msgstr ""
 
@@ -182,7 +182,7 @@ msgid "Move containers"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/move_ammo_group_component.html.heex:60
+#: lib/cannery_web/components/move_ammo_group_component.ex:127
 msgid "Select"
 msgstr ""
 
@@ -190,3 +190,14 @@ msgstr ""
 #: lib/cannery_web/live/invite_live/index.html.heex:33
 msgid "Copy to clipboard"
 msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:18
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:36
+msgid "add a container first"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:66
+msgid "Create"
+msgstr ""

priv/gettext/default.pot

@@ -33,13 +33,13 @@ msgstr ""
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/topbar.ex:52
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:3
-#: lib/cannery_web/live/range_live/index.html.heex:61
+#: lib/cannery_web/live/range_live/index.ex:82
 msgid "Ammo"
 msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:21
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:27
+#: lib/cannery_web/live/ammo_group_live/index.ex:80
 msgid "Ammo type"
 msgstr ""
 
@@ -54,19 +54,19 @@ msgid "Background color"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:154
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:140
-#: lib/cannery_web/live/ammo_type_live/index.ex:67
+#: lib/cannery_web/live/ammo_type_live/index.ex:71
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:55
 msgid "Blank"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:74
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:68
 msgid "Brass"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:46
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:44
 #: lib/cannery_web/live/ammo_type_live/index.ex:53
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:41
 msgid "Bullet core"
@@ -80,49 +80,50 @@ msgid "Bullet type"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:62
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:58
 #: lib/cannery_web/live/ammo_type_live/index.ex:55
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:43
 msgid "Caliber"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:55
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:51
 #: lib/cannery_web/live/ammo_type_live/index.ex:54
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:42
 msgid "Cartridge"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:69
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:65
 #: lib/cannery_web/live/ammo_type_live/index.ex:56
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:44
 msgid "Case material"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/move_ammo_group_component.html.heex:22
+#: lib/cannery_web/components/move_ammo_group_component.ex:67
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:48
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:42
+#: lib/cannery_web/live/ammo_group_live/index.ex:85
 msgid "Container"
 msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/topbar.ex:46
+#: lib/cannery_web/live/container_live/index.ex:38
 #: lib/cannery_web/live/container_live/index.html.heex:3
 msgid "Containers"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:158
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:144
-#: lib/cannery_web/live/ammo_type_live/index.ex:68
+#: lib/cannery_web/live/ammo_type_live/index.ex:72
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:56
 msgid "Corrosive"
 msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:27
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:30
+#: lib/cannery_web/live/ammo_group_live/index.ex:81
 msgid "Count"
 msgstr ""
 
@@ -155,8 +156,8 @@ msgid "Easy to Use:"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:36
+#: lib/cannery_web/live/ammo_group_live/index.ex:38
-#: lib/cannery_web/live/ammo_group_live/show.ex:55
+#: lib/cannery_web/live/ammo_group_live/show.ex:42
 msgid "Edit Ammo group"
 msgstr ""
 
@@ -187,20 +188,20 @@ msgid "Example bullet type abbreviations"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:42
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:40
 msgid "FMJ"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:113
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:103
-#: lib/cannery_web/live/ammo_type_live/index.ex:61
+#: lib/cannery_web/live/ammo_type_live/index.ex:65
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:49
 msgid "Grains"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:150
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:136
-#: lib/cannery_web/live/ammo_type_live/index.ex:66
+#: lib/cannery_web/live/ammo_type_live/index.ex:70
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:54
 msgid "Incendiary"
 msgstr ""
@@ -222,6 +223,7 @@ msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/topbar.ex:71
+#: lib/cannery_web/live/invite_live/index.ex:43
 #: lib/cannery_web/live/invite_live/index.html.heex:3
 msgid "Invites"
 msgstr ""
@@ -232,27 +234,7 @@ msgid "Keep me logged in for 60 days"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/index.ex:34
+#: lib/cannery_web/components/move_ammo_group_component.ex:69
-msgid "Listing Ammo types"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/index.ex:38
-msgid "Listing Containers"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.ex:43
-msgid "Listing Invites"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/tag_live/index.ex:34
-msgid "Listing Tags"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/components/move_ammo_group_component.html.heex:30
 #: lib/cannery_web/live/container_live/form_component.html.heex:42
 msgid "Location"
 msgstr ""
@@ -274,8 +256,8 @@ msgid "Manage"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:162
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:148
-#: lib/cannery_web/live/ammo_type_live/index.ex:69
+#: lib/cannery_web/live/ammo_type_live/index.ex:73
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:57
 msgid "Manufacturer"
 msgstr ""
@@ -335,7 +317,7 @@ msgid "No ammo for this type"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/show.html.heex:77
+#: lib/cannery_web/live/container_live/show.html.heex:78
 msgid "No ammo groups in this container"
 msgstr ""
 
@@ -358,9 +340,9 @@ msgstr ""
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/add_shot_group_component.html.heex:30
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:41
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:122
+#: lib/cannery_web/live/ammo_group_live/show.ex:90
 #: lib/cannery_web/live/range_live/form_component.html.heex:29
-#: lib/cannery_web/live/range_live/index.html.heex:67
+#: lib/cannery_web/live/range_live/index.ex:84
 msgid "Notes"
 msgstr ""
 
@@ -376,15 +358,15 @@ msgid "On the bookshelf"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:121
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:111
-#: lib/cannery_web/live/ammo_type_live/index.ex:62
+#: lib/cannery_web/live/ammo_type_live/index.ex:66
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:50
 msgid "Pressure"
 msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:34
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:33
+#: lib/cannery_web/live/ammo_group_live/index.ex:82
 msgid "Price paid"
 msgstr ""
 
@@ -394,8 +376,8 @@ msgid "Price paid:"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:128
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:118
-#: lib/cannery_web/live/ammo_type_live/index.ex:63
+#: lib/cannery_web/live/ammo_type_live/index.ex:67
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:51
 msgid "Primer type"
 msgstr ""
@@ -421,12 +403,13 @@ msgid "Set Unlimited"
 msgstr ""
 
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_settings_controller.ex:10
 #: lib/cannery_web/templates/user_settings/edit.html.heex:3
 msgid "Settings"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.ex:54
+#: lib/cannery_web/live/ammo_group_live/show.ex:41
 msgid "Show Ammo group"
 msgstr ""
 
@@ -441,7 +424,7 @@ msgid "Simple:"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:51
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:47
 msgid "Steel"
 msgstr ""
 
@@ -452,6 +435,7 @@ msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/topbar.ex:40
+#: lib/cannery_web/live/tag_live/index.ex:34
 #: lib/cannery_web/live/tag_live/index.html.heex:3
 msgid "Tags"
 msgstr ""
@@ -477,14 +461,14 @@ msgid "This ammo group is not in a container"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:146
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:132
-#: lib/cannery_web/live/ammo_type_live/index.ex:65
+#: lib/cannery_web/live/ammo_type_live/index.ex:69
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:53
 msgid "Tracer"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/move_ammo_group_component.html.heex:26
+#: lib/cannery_web/components/move_ammo_group_component.ex:68
 #: lib/cannery_web/live/container_live/form_component.html.heex:35
 msgid "Type"
 msgstr ""
@@ -527,7 +511,7 @@ msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/topbar.ex:64
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:39
+#: lib/cannery_web/live/ammo_group_live/index.ex:84
 msgid "Range"
 msgstr ""
 
@@ -537,8 +521,8 @@ msgid "Range day"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:125
+#: lib/cannery_web/live/ammo_group_live/show.ex:91
-#: lib/cannery_web/live/range_live/index.html.heex:70
+#: lib/cannery_web/live/range_live/index.ex:85
 msgid "Date"
 msgstr ""
 
@@ -564,15 +548,9 @@ msgstr ""
 msgid "Unstage from range"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.ex:52
-msgid "Add Shot group"
-msgstr ""
-
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/add_shot_group_component.html.heex:3
-#: lib/cannery_web/live/ammo_group_live/index.ex:24
+#: lib/cannery_web/live/ammo_group_live/index.ex:26
-#: lib/cannery_web/live/range_live/index.ex:28
 msgid "Record shots"
 msgstr ""
 
@@ -582,7 +560,7 @@ msgid "Ammo Types"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:47
+#: lib/cannery_web/live/ammo_group_live/index.ex:49
 msgid "Ammo groups"
 msgstr ""
 
@@ -593,6 +571,7 @@ msgid "Date (UTC)"
 msgstr ""
 
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/show.ex:39
 #: lib/cannery_web/live/range_live/index.ex:34
 msgid "Edit Shot Records"
 msgstr ""
@@ -613,8 +592,8 @@ msgid "Rounds left"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:119
+#: lib/cannery_web/live/ammo_group_live/show.ex:89
-#: lib/cannery_web/live/range_live/index.html.heex:64
+#: lib/cannery_web/live/range_live/index.ex:83
 msgid "Rounds shot"
 msgstr ""
 
@@ -624,18 +603,18 @@ msgid "Shot Records"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:30
+#: lib/cannery_web/live/ammo_group_live/index.ex:32
-#: lib/cannery_web/live/ammo_group_live/show.ex:53
+#: lib/cannery_web/live/ammo_group_live/show.ex:40
 msgid "Move Ammo group"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/move_ammo_group_component.html.heex:3
+#: lib/cannery_web/components/move_ammo_group_component.ex:80
 msgid "Move ammo"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/move_ammo_group_component.html.heex:8
+#: lib/cannery_web/components/move_ammo_group_component.ex:85
 msgid "No other containers"
 msgstr ""
 
@@ -646,7 +625,7 @@ msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/ammo_group_card.ex:43
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:64
+#: lib/cannery_web/live/ammo_group_live/index.ex:117
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:32
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:39
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:98
@@ -654,41 +633,41 @@ msgid "$%{amount}"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:83
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:75
 msgid "Bimetal"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:78
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:72
 #: lib/cannery_web/live/ammo_type_live/index.ex:57
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:45
 msgid "Jacket type"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:87
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:79
 #: lib/cannery_web/live/ammo_type_live/index.ex:58
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:46
 msgid "Muzzle velocity"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:103
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:93
-#: lib/cannery_web/live/ammo_type_live/index.ex:60
+#: lib/cannery_web/live/ammo_type_live/index.ex:61
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:48
 msgid "Powder grains per charge"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:97
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:89
 #: lib/cannery_web/live/ammo_type_live/index.ex:59
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:47
 msgid "Powder type"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:168
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:152
-#: lib/cannery_web/live/ammo_type_live/index.ex:70
+#: lib/cannery_web/live/ammo_type_live/index.ex:74
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:58
 msgid "UPC"
 msgstr ""
@@ -710,18 +689,18 @@ msgid "New password"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:82
+#: lib/cannery_web/live/ammo_group_live/index.ex:131
 msgid "Stage"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:82
+#: lib/cannery_web/live/ammo_group_live/index.ex:131
 msgid "Unstage"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:137
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:125
-#: lib/cannery_web/live/ammo_type_live/index.ex:64
+#: lib/cannery_web/live/ammo_type_live/index.ex:68
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:52
 msgid "Firing type"
 msgstr ""
@@ -764,7 +743,7 @@ msgid "No cost information"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:36
+#: lib/cannery_web/live/ammo_group_live/index.ex:83
 msgid "% left"
 msgstr ""
 
@@ -799,7 +778,7 @@ msgid "Current # of rounds:"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:32
+#: lib/cannery_web/live/ammo_type_live/index.ex:86
 msgid "Total # of rounds"
 msgstr ""
 
@@ -807,3 +786,44 @@ msgstr ""
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:85
 msgid "Total rounds shot:"
 msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:8
+msgid "Confirm your account"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:9
+msgid "Forgot your password?"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_session_controller.ex:8
+msgid "Log in"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_registration_controller.ex:35
+msgid "Register"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:36
+msgid "Reset your password"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/show.ex:38
+#: lib/cannery_web/live/range_live/index.ex:28
+msgid "Record Shots"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:58
+msgid "Copies"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_type_live/index.ex:34
+msgid "Ammo types"
+msgstr ""

priv/gettext/en/LC_MESSAGES/actions.po

@@ -12,12 +12,12 @@ msgstr ""
 "Plural-Forms: nplurals=2\n"
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:42
+#: lib/cannery_web/live/ammo_group_live/index.ex:44
 msgid "Add Ammo"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:12
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:24
 msgid "Add your first box!"
 msgstr ""
 
@@ -82,7 +82,7 @@ msgid "Make your first tag!"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:17
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:42
 msgid "New Ammo group"
 msgstr ""
 
@@ -125,9 +125,9 @@ msgid "Reset password"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/add_shot_group_component.html.heex:42
+#: lib/cannery_web/components/add_shot_group_component.html.heex:46
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:54
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:73
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:172
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:156
 #: lib/cannery_web/live/container_live/form_component.html.heex:50
 #: lib/cannery_web/live/invite_live/form_component.html.heex:28
 #: lib/cannery_web/live/range_live/form_component.html.heex:40
@@ -161,7 +161,7 @@ msgid "Why not get some ready to shoot?"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:85
+#: lib/cannery_web/live/ammo_group_live/index.ex:133
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:86
 #: lib/cannery_web/live/range_live/index.html.heex:36
 msgid "Record shots"
@@ -173,7 +173,7 @@ msgid "Ammo Details"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/move_ammo_group_component.html.heex:12
+#: lib/cannery_web/components/move_ammo_group_component.ex:89
 msgid "Add another container!"
 msgstr ""
 
@@ -183,7 +183,7 @@ msgid "Move containers"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/move_ammo_group_component.html.heex:60
+#: lib/cannery_web/components/move_ammo_group_component.ex:127
 msgid "Select"
 msgstr ""
 
@@ -191,3 +191,14 @@ msgstr ""
 #: lib/cannery_web/live/invite_live/index.html.heex:33
 msgid "Copy to clipboard"
 msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:18
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:36
+msgid "add a container first"
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:66
+msgid "Create"
+msgstr ""

priv/gettext/en/LC_MESSAGES/default.po

@@ -34,13 +34,13 @@ msgstr ""
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/topbar.ex:52
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:3
-#: lib/cannery_web/live/range_live/index.html.heex:61
+#: lib/cannery_web/live/range_live/index.ex:82
 msgid "Ammo"
 msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:21
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:27
+#: lib/cannery_web/live/ammo_group_live/index.ex:80
 msgid "Ammo type"
 msgstr ""
 
@@ -55,19 +55,19 @@ msgid "Background color"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:154
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:140
-#: lib/cannery_web/live/ammo_type_live/index.ex:67
+#: lib/cannery_web/live/ammo_type_live/index.ex:71
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:55
 msgid "Blank"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:74
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:68
 msgid "Brass"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:46
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:44
 #: lib/cannery_web/live/ammo_type_live/index.ex:53
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:41
 msgid "Bullet core"
@@ -81,49 +81,50 @@ msgid "Bullet type"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:62
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:58
 #: lib/cannery_web/live/ammo_type_live/index.ex:55
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:43
 msgid "Caliber"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:55
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:51
 #: lib/cannery_web/live/ammo_type_live/index.ex:54
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:42
 msgid "Cartridge"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:69
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:65
 #: lib/cannery_web/live/ammo_type_live/index.ex:56
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:44
 msgid "Case material"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/move_ammo_group_component.html.heex:22
+#: lib/cannery_web/components/move_ammo_group_component.ex:67
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:48
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:42
+#: lib/cannery_web/live/ammo_group_live/index.ex:85
 msgid "Container"
 msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/topbar.ex:46
+#: lib/cannery_web/live/container_live/index.ex:38
 #: lib/cannery_web/live/container_live/index.html.heex:3
 msgid "Containers"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:158
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:144
-#: lib/cannery_web/live/ammo_type_live/index.ex:68
+#: lib/cannery_web/live/ammo_type_live/index.ex:72
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:56
 msgid "Corrosive"
 msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:27
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:30
+#: lib/cannery_web/live/ammo_group_live/index.ex:81
 msgid "Count"
 msgstr ""
 
@@ -156,8 +157,8 @@ msgid "Easy to Use:"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:36
+#: lib/cannery_web/live/ammo_group_live/index.ex:38
-#: lib/cannery_web/live/ammo_group_live/show.ex:55
+#: lib/cannery_web/live/ammo_group_live/show.ex:42
 msgid "Edit Ammo group"
 msgstr ""
 
@@ -188,20 +189,20 @@ msgid "Example bullet type abbreviations"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:42
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:40
 msgid "FMJ"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:113
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:103
-#: lib/cannery_web/live/ammo_type_live/index.ex:61
+#: lib/cannery_web/live/ammo_type_live/index.ex:65
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:49
 msgid "Grains"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:150
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:136
-#: lib/cannery_web/live/ammo_type_live/index.ex:66
+#: lib/cannery_web/live/ammo_type_live/index.ex:70
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:54
 msgid "Incendiary"
 msgstr ""
@@ -223,6 +224,7 @@ msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/topbar.ex:71
+#: lib/cannery_web/live/invite_live/index.ex:43
 #: lib/cannery_web/live/invite_live/index.html.heex:3
 msgid "Invites"
 msgstr ""
@@ -233,27 +235,7 @@ msgid "Keep me logged in for 60 days"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/index.ex:34
+#: lib/cannery_web/components/move_ammo_group_component.ex:69
-msgid "Listing Ammo types"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/index.ex:38
-msgid "Listing Containers"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.ex:43
-msgid "Listing Invites"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/tag_live/index.ex:34
-msgid "Listing Tags"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/components/move_ammo_group_component.html.heex:30
 #: lib/cannery_web/live/container_live/form_component.html.heex:42
 msgid "Location"
 msgstr ""
@@ -275,8 +257,8 @@ msgid "Manage"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:162
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:148
-#: lib/cannery_web/live/ammo_type_live/index.ex:69
+#: lib/cannery_web/live/ammo_type_live/index.ex:73
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:57
 msgid "Manufacturer"
 msgstr ""
@@ -336,7 +318,7 @@ msgid "No ammo for this type"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/container_live/show.html.heex:77
+#: lib/cannery_web/live/container_live/show.html.heex:78
 msgid "No ammo groups in this container"
 msgstr ""
 
@@ -359,9 +341,9 @@ msgstr ""
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/add_shot_group_component.html.heex:30
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:41
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:122
+#: lib/cannery_web/live/ammo_group_live/show.ex:90
 #: lib/cannery_web/live/range_live/form_component.html.heex:29
-#: lib/cannery_web/live/range_live/index.html.heex:67
+#: lib/cannery_web/live/range_live/index.ex:84
 msgid "Notes"
 msgstr ""
 
@@ -377,15 +359,15 @@ msgid "On the bookshelf"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:121
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:111
-#: lib/cannery_web/live/ammo_type_live/index.ex:62
+#: lib/cannery_web/live/ammo_type_live/index.ex:66
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:50
 msgid "Pressure"
 msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:34
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:33
+#: lib/cannery_web/live/ammo_group_live/index.ex:82
 msgid "Price paid"
 msgstr ""
 
@@ -395,8 +377,8 @@ msgid "Price paid:"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:128
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:118
-#: lib/cannery_web/live/ammo_type_live/index.ex:63
+#: lib/cannery_web/live/ammo_type_live/index.ex:67
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:51
 msgid "Primer type"
 msgstr ""
@@ -422,12 +404,13 @@ msgid "Set Unlimited"
 msgstr ""
 
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_settings_controller.ex:10
 #: lib/cannery_web/templates/user_settings/edit.html.heex:3
 msgid "Settings"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.ex:54
+#: lib/cannery_web/live/ammo_group_live/show.ex:41
 msgid "Show Ammo group"
 msgstr ""
 
@@ -442,7 +425,7 @@ msgid "Simple:"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:51
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:47
 msgid "Steel"
 msgstr ""
 
@@ -453,6 +436,7 @@ msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/topbar.ex:40
+#: lib/cannery_web/live/tag_live/index.ex:34
 #: lib/cannery_web/live/tag_live/index.html.heex:3
 msgid "Tags"
 msgstr ""
@@ -478,14 +462,14 @@ msgid "This ammo group is not in a container"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:146
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:132
-#: lib/cannery_web/live/ammo_type_live/index.ex:65
+#: lib/cannery_web/live/ammo_type_live/index.ex:69
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:53
 msgid "Tracer"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/move_ammo_group_component.html.heex:26
+#: lib/cannery_web/components/move_ammo_group_component.ex:68
 #: lib/cannery_web/live/container_live/form_component.html.heex:35
 msgid "Type"
 msgstr ""
@@ -528,7 +512,7 @@ msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/topbar.ex:64
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:39
+#: lib/cannery_web/live/ammo_group_live/index.ex:84
 msgid "Range"
 msgstr ""
 
@@ -538,8 +522,8 @@ msgid "Range day"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:125
+#: lib/cannery_web/live/ammo_group_live/show.ex:91
-#: lib/cannery_web/live/range_live/index.html.heex:70
+#: lib/cannery_web/live/range_live/index.ex:85
 msgid "Date"
 msgstr ""
 
@@ -565,15 +549,9 @@ msgstr ""
 msgid "Unstage from range"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.ex:52
-msgid "Add Shot group"
-msgstr ""
-
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/add_shot_group_component.html.heex:3
-#: lib/cannery_web/live/ammo_group_live/index.ex:24
+#: lib/cannery_web/live/ammo_group_live/index.ex:26
-#: lib/cannery_web/live/range_live/index.ex:28
 msgid "Record shots"
 msgstr ""
 
@@ -583,7 +561,7 @@ msgid "Ammo Types"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:47
+#: lib/cannery_web/live/ammo_group_live/index.ex:49
 msgid "Ammo groups"
 msgstr ""
 
@@ -594,6 +572,7 @@ msgid "Date (UTC)"
 msgstr ""
 
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/show.ex:39
 #: lib/cannery_web/live/range_live/index.ex:34
 msgid "Edit Shot Records"
 msgstr ""
@@ -614,8 +593,8 @@ msgid "Rounds left"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:119
+#: lib/cannery_web/live/ammo_group_live/show.ex:89
-#: lib/cannery_web/live/range_live/index.html.heex:64
+#: lib/cannery_web/live/range_live/index.ex:83
 msgid "Rounds shot"
 msgstr ""
 
@@ -625,18 +604,18 @@ msgid "Shot Records"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:30
+#: lib/cannery_web/live/ammo_group_live/index.ex:32
-#: lib/cannery_web/live/ammo_group_live/show.ex:53
+#: lib/cannery_web/live/ammo_group_live/show.ex:40
 msgid "Move Ammo group"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/move_ammo_group_component.html.heex:3
+#: lib/cannery_web/components/move_ammo_group_component.ex:80
 msgid "Move ammo"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/move_ammo_group_component.html.heex:8
+#: lib/cannery_web/components/move_ammo_group_component.ex:85
 msgid "No other containers"
 msgstr ""
 
@@ -647,7 +626,7 @@ msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/ammo_group_card.ex:43
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:64
+#: lib/cannery_web/live/ammo_group_live/index.ex:117
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:32
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:39
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:98
@@ -655,41 +634,41 @@ msgid "$%{amount}"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:83
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:75
 msgid "Bimetal"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:78
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:72
 #: lib/cannery_web/live/ammo_type_live/index.ex:57
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:45
 msgid "Jacket type"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:87
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:79
 #: lib/cannery_web/live/ammo_type_live/index.ex:58
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:46
 msgid "Muzzle velocity"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:103
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:93
-#: lib/cannery_web/live/ammo_type_live/index.ex:60
+#: lib/cannery_web/live/ammo_type_live/index.ex:61
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:48
 msgid "Powder grains per charge"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:97
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:89
 #: lib/cannery_web/live/ammo_type_live/index.ex:59
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:47
 msgid "Powder type"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:168
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:152
-#: lib/cannery_web/live/ammo_type_live/index.ex:70
+#: lib/cannery_web/live/ammo_type_live/index.ex:74
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:58
 msgid "UPC"
 msgstr ""
@@ -711,18 +690,18 @@ msgid "New password"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:82
+#: lib/cannery_web/live/ammo_group_live/index.ex:130
 msgid "Stage"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:82
+#: lib/cannery_web/live/ammo_group_live/index.ex:130
 msgid "Unstage"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:137
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:125
-#: lib/cannery_web/live/ammo_type_live/index.ex:64
+#: lib/cannery_web/live/ammo_type_live/index.ex:68
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:52
 msgid "Firing type"
 msgstr ""
@@ -765,7 +744,7 @@ msgid "No cost information"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:36
+#: lib/cannery_web/live/ammo_group_live/index.ex:83
 msgid "% left"
 msgstr ""
 
@@ -800,7 +779,7 @@ msgid "Current # of rounds:"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:32
+#: lib/cannery_web/live/ammo_type_live/index.ex:86
 msgid "Total # of rounds"
 msgstr ""
 
@@ -808,3 +787,44 @@ msgstr ""
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:85
 msgid "Total rounds shot:"
 msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:8
+msgid "Confirm your account"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:9
+msgid "Forgot your password?"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_session_controller.ex:8
+msgid "Log in"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_registration_controller.ex:35
+msgid "Register"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:36
+msgid "Reset your password"
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/show.ex:38
+#: lib/cannery_web/live/range_live/index.ex:28
+msgid "Record Shots"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:58
+msgid "Copies"
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_type_live/index.ex:34
+msgid "Ammo types"
+msgstr ""

priv/gettext/en/LC_MESSAGES/errors.po

@@ -65,19 +65,19 @@ msgid "Oops, something went wrong! Please check the errors below."
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_reset_password_controller.ex:60
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:63
 msgid "Reset password link is invalid or it has expired."
 msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:25
-#: lib/cannery_web/controllers/user_registration_controller.ex:53
+#: lib/cannery_web/controllers/user_registration_controller.ex:56
 msgid "Sorry, public registration is disabled"
 msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:15
-#: lib/cannery_web/controllers/user_registration_controller.ex:43
+#: lib/cannery_web/controllers/user_registration_controller.ex:46
 msgid "Sorry, this invite was not found or expired"
 msgstr ""
 
@@ -92,7 +92,7 @@ msgid "Unauthorized"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_confirmation_controller.ex:53
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:54
 msgid "User confirmation link is invalid or it has expired."
 msgstr ""
 
@@ -158,3 +158,13 @@ msgstr ""
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:52
 msgid "Tag could not be removed"
 msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:113
+msgid "Could not parse number of copies"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:98
+msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
+msgstr ""

priv/gettext/en/LC_MESSAGES/prompts.po

@@ -63,18 +63,13 @@ msgid "A link to confirm your email change has been sent to the new address."
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:87
+#: lib/cannery_web/live/ammo_group_live/index.ex:56
-msgid "Ammo group created successfully"
+#: lib/cannery_web/live/ammo_group_live/show.ex:52
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:54
-#: lib/cannery_web/live/ammo_group_live/show.ex:34
 msgid "Ammo group deleted succesfully"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:69
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:75
 msgid "Ammo group updated successfully"
 msgstr ""
 
@@ -98,9 +93,9 @@ msgid "Are you sure you want to delete the invite for %{name}?"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:120
+#: lib/cannery_web/live/ammo_group_live/index.ex:165
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:66
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:75
+#: lib/cannery_web/live/ammo_type_live/index.ex:130
 msgid "Are you sure you want to delete this ammo?"
 msgstr ""
 
@@ -125,7 +120,7 @@ msgid "Email changed successfully."
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_confirmation_controller.ex:22
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:23
 msgid "If your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly."
 msgstr ""
 
@@ -140,7 +135,7 @@ msgid "Logged out successfully."
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_reset_password_controller.ex:43
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:46
 msgid "Password reset successfully."
 msgstr ""
 
@@ -150,7 +145,7 @@ msgid "Password updated successfully."
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_registration_controller.ex:71
+#: lib/cannery_web/controllers/user_registration_controller.ex:74
 msgid "Please check your email to verify your account"
 msgstr ""
 
@@ -160,9 +155,9 @@ msgid "Register to setup %{name}"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/add_shot_group_component.html.heex:44
+#: lib/cannery_web/components/add_shot_group_component.html.heex:48
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:55
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:74
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:173
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:157
 #: lib/cannery_web/live/container_live/form_component.html.heex:52
 #: lib/cannery_web/live/invite_live/form_component.html.heex:30
 #: lib/cannery_web/live/range_live/form_component.html.heex:42
@@ -211,11 +206,13 @@ msgid "Ammo group unstaged succesfully"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.html.heex:108
+#: lib/cannery_web/live/ammo_group_live/show.ex:132
+#: lib/cannery_web/live/range_live/index.ex:130
 msgid "Are you sure you want to delete this shot record?"
 msgstr ""
 
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/show.ex:80
 #: lib/cannery_web/live/range_live/index.ex:56
 msgid "Shot records deleted succesfully"
 msgstr ""
@@ -226,12 +223,12 @@ msgid "Shot records updated successfully"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_confirmation_controller.ex:37
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:38
 msgid "%{email} confirmed successfully."
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/move_ammo_group_component.ex:47
+#: lib/cannery_web/components/move_ammo_group_component.ex:53
 msgid "Ammo moved to %{name} successfully"
 msgstr ""
 
@@ -244,3 +241,21 @@ msgstr ""
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:58
 msgid "%{name} removed successfully"
 msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:15
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:33
+msgid "You'll need to"
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:67
+msgid "Creating..."
+msgstr ""
+
+#, elixir-autogen, elixir-format, fuzzy
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:134
+msgid "Ammo group created successfully"
+msgid_plural "Ammo groups created successfully"
+msgstr[0] ""
+msgstr[1] ""

priv/gettext/errors.pot

@@ -65,19 +65,19 @@ msgid "Oops, something went wrong! Please check the errors below."
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_reset_password_controller.ex:60
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:63
 msgid "Reset password link is invalid or it has expired."
 msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:25
-#: lib/cannery_web/controllers/user_registration_controller.ex:53
+#: lib/cannery_web/controllers/user_registration_controller.ex:56
 msgid "Sorry, public registration is disabled"
 msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:15
-#: lib/cannery_web/controllers/user_registration_controller.ex:43
+#: lib/cannery_web/controllers/user_registration_controller.ex:46
 msgid "Sorry, this invite was not found or expired"
 msgstr ""
 
@@ -92,7 +92,7 @@ msgid "Unauthorized"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_confirmation_controller.ex:53
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:54
 msgid "User confirmation link is invalid or it has expired."
 msgstr ""
 
@@ -157,3 +157,13 @@ msgstr ""
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:52
 msgid "Tag could not be removed"
 msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:126
+msgid "Could not parse number of copies"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:111
+msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
+msgstr ""

priv/gettext/prompts.pot

@@ -62,18 +62,13 @@ msgid "A link to confirm your email change has been sent to the new address."
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:87
+#: lib/cannery_web/live/ammo_group_live/index.ex:56
-msgid "Ammo group created successfully"
+#: lib/cannery_web/live/ammo_group_live/show.ex:52
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.ex:54
-#: lib/cannery_web/live/ammo_group_live/show.ex:34
 msgid "Ammo group deleted succesfully"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:69
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:88
 msgid "Ammo group updated successfully"
 msgstr ""
 
@@ -97,9 +92,9 @@ msgid "Are you sure you want to delete the invite for %{name}?"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:120
+#: lib/cannery_web/live/ammo_group_live/index.ex:167
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:66
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:75
+#: lib/cannery_web/live/ammo_type_live/index.ex:130
 msgid "Are you sure you want to delete this ammo?"
 msgstr ""
 
@@ -124,7 +119,7 @@ msgid "Email changed successfully."
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_confirmation_controller.ex:22
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:23
 msgid "If your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly."
 msgstr ""
 
@@ -139,7 +134,7 @@ msgid "Logged out successfully."
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_reset_password_controller.ex:43
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:46
 msgid "Password reset successfully."
 msgstr ""
 
@@ -149,7 +144,7 @@ msgid "Password updated successfully."
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_registration_controller.ex:71
+#: lib/cannery_web/controllers/user_registration_controller.ex:74
 msgid "Please check your email to verify your account"
 msgstr ""
 
@@ -159,9 +154,9 @@ msgid "Register to setup %{name}"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/add_shot_group_component.html.heex:44
+#: lib/cannery_web/components/add_shot_group_component.html.heex:48
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:55
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:74
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:173
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:157
 #: lib/cannery_web/live/container_live/form_component.html.heex:52
 #: lib/cannery_web/live/invite_live/form_component.html.heex:30
 #: lib/cannery_web/live/range_live/form_component.html.heex:42
@@ -210,11 +205,13 @@ msgid "Ammo group unstaged succesfully"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.html.heex:108
+#: lib/cannery_web/live/ammo_group_live/show.ex:132
+#: lib/cannery_web/live/range_live/index.ex:130
 msgid "Are you sure you want to delete this shot record?"
 msgstr ""
 
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/show.ex:80
 #: lib/cannery_web/live/range_live/index.ex:56
 msgid "Shot records deleted succesfully"
 msgstr ""
@@ -225,12 +222,12 @@ msgid "Shot records updated successfully"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_confirmation_controller.ex:37
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:38
 msgid "%{email} confirmed successfully."
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/move_ammo_group_component.ex:47
+#: lib/cannery_web/components/move_ammo_group_component.ex:53
 msgid "Ammo moved to %{name} successfully"
 msgstr ""
 
@@ -243,3 +240,21 @@ msgstr ""
 #: lib/cannery_web/live/container_live/edit_tags_component.ex:58
 msgid "%{name} removed successfully"
 msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:15
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:33
+msgid "You'll need to"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:67
+msgid "Creating..."
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:147
+msgid "Ammo group created successfully"
+msgid_plural "Ammo groups created successfully"
+msgstr[0] ""
+msgstr[1] ""

test/cannery/accounts_test.exs

@@ -304,9 +304,9 @@ defmodule Cannery.AccountsTest do
     end
 
     test "deletes all tokens for the given user", %{user: user} do
-      _ = Accounts.generate_user_session_token(user)
+      _token = Accounts.generate_user_session_token(user)
 
-      {:ok, _} =
+      {:ok, _user} =
         Accounts.update_user_password(user, valid_user_password(), %{
           "password" => "new valid password"
         })
@@ -501,8 +501,8 @@ defmodule Cannery.AccountsTest do
     end
 
     test "deletes all tokens for the given user", %{user: user} do
-      _ = Accounts.generate_user_session_token(user)
+      _token = Accounts.generate_user_session_token(user)
-      {:ok, _} = Accounts.reset_user_password(user, %{"password" => "new valid password"})
+      {:ok, _user} = Accounts.reset_user_password(user, %{"password" => "new valid password"})
       refute Repo.get_by(UserToken, user_id: user.id)
     end
   end

test/cannery/activity_log_test.exs

@@ -20,8 +20,8 @@ defmodule Cannery.ActivityLogTest do
       container = container_fixture(current_user)
       ammo_type = ammo_type_fixture(current_user)
 
-      %{id: ammo_group_id} =
+      {1, [%{id: ammo_group_id} = ammo_group]} =
-        ammo_group = ammo_group_fixture(%{"count" => 25}, ammo_type, container, current_user)
+        ammo_group_fixture(%{"count" => 25}, ammo_type, container, current_user)
 
       shot_group =
         %{"count" => 5, "date" => ~N[2022-02-13 03:17:00], "notes" => "some notes"}

test/cannery/ammo_test.exs

@@ -108,7 +108,7 @@ defmodule Cannery.AmmoTest do
       current_user = user_fixture()
       ammo_type = ammo_type_fixture(current_user)
       container = container_fixture(current_user)
-      ammo_group = ammo_group_fixture(ammo_type, container, current_user)
+      {1, [ammo_group]} = ammo_group_fixture(ammo_type, container, current_user)
 
       [
         ammo_type: ammo_type,
@@ -129,28 +129,28 @@ defmodule Cannery.AmmoTest do
                ammo_group |> Repo.preload(:shot_groups)
     end
 
-    test "create_ammo_group/1 with valid data creates a ammo_group",
+    test "create_ammo_groups/3 with valid data creates a ammo_group",
          %{
            ammo_type: ammo_type,
            container: container,
            current_user: current_user
          } do
-      assert {:ok, %AmmoGroup{} = ammo_group} =
+      assert {:ok, {1, [%AmmoGroup{} = ammo_group]}} =
                @valid_attrs
                |> Map.merge(%{"ammo_type_id" => ammo_type.id, "container_id" => container.id})
-               |> Ammo.create_ammo_group(current_user)
+               |> Ammo.create_ammo_groups(1, current_user)
 
       assert ammo_group.count == 42
       assert ammo_group.notes == "some notes"
       assert ammo_group.price_paid == 120.5
     end
 
-    test "create_ammo_group/1 with invalid data returns error changeset",
+    test "create_ammo_groups/3 with invalid data returns error changeset",
          %{ammo_type: ammo_type, container: container, current_user: current_user} do
       assert {:error, %Changeset{}} =
                @invalid_attrs
                |> Map.merge(%{"ammo_type_id" => ammo_type.id, "container_id" => container.id})
-               |> Ammo.create_ammo_group(current_user)
+               |> Ammo.create_ammo_groups(1, current_user)
     end
 
     test "update_ammo_group/2 with valid data updates the ammo_group",

test/cannery_web/controllers/user_auth_test.exs

@@ -116,7 +116,7 @@ defmodule CanneryWeb.UserAuthTest do
     end
 
     test "does not authenticate if data is missing", %{conn: conn, current_user: current_user} do
-      _ = Accounts.generate_user_session_token(current_user)
+      _token = Accounts.generate_user_session_token(current_user)
       conn = UserAuth.fetch_current_user(conn, [])
       refute get_session(conn, :user_token)
       refute conn.assigns.current_user

test/cannery_web/controllers/user_confirmation_controller_test.exs

@@ -5,8 +5,7 @@ defmodule CanneryWeb.UserConfirmationControllerTest do
 
   use CanneryWeb.ConnCase, async: true
   import CanneryWeb.Gettext
-  alias Cannery.Accounts
+  alias Cannery.{Accounts, Repo}
-  alias Cannery.Repo
 
   @moduletag :user_confirmation_controller_test
 

test/cannery_web/live/ammo_group_live_test.exs

@@ -6,18 +6,26 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
   use CanneryWeb.ConnCase
   import Phoenix.LiveViewTest
   import CanneryWeb.Gettext
-  alias Cannery.Repo
+  alias Cannery.{Ammo, Repo}
 
   @moduletag :ammo_group_live_test
   @shot_group_create_attrs %{"ammo_left" => 5, "notes" => "some notes"}
-  @create_attrs %{count: 42, notes: "some notes", price_paid: 120.5}
+  @shot_group_update_attrs %{"count" => 5, "notes" => "some updated notes"}
-  @update_attrs %{count: 43, notes: "some updated notes", price_paid: 456.7}
+  @create_attrs %{"count" => 42, "notes" => "some notes", "price_paid" => 120.5}
+  @update_attrs %{"count" => 43, "notes" => "some updated notes", "price_paid" => 456.7}
+  @ammo_group_create_limit 10_000
   # @invalid_attrs %{count: -1, notes: nil, price_paid: nil}
 
   defp create_ammo_group(%{current_user: current_user}) do
     ammo_type = ammo_type_fixture(current_user)
     container = container_fixture(current_user)
-    %{ammo_group: ammo_group_fixture(ammo_type, container, current_user)}
+    {1, [ammo_group]} = ammo_group_fixture(ammo_type, container, current_user)
+
+    shot_group =
+      %{"count" => 5, "date" => ~N[2022-02-13 03:17:00], "notes" => "some notes"}
+      |> shot_group_fixture(current_user, ammo_group)
+
+    %{ammo_group: ammo_group, shot_group: shot_group}
   end
 
   describe "Index" do
@@ -31,7 +39,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
       assert html =~ ammo_group.ammo_type.name
     end
 
-    test "saves new ammo_group", %{conn: conn} do
+    test "saves a single new ammo_group", %{conn: conn} do
       {:ok, index_live, _html} = live(conn, Routes.ammo_group_index_path(conn, :index))
 
       assert index_live |> element("a", dgettext("actions", "New Ammo group")) |> render_click() =~
@@ -43,7 +51,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
       #        |> form("#ammo_group-form", ammo_group: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _, html} =
+      {:ok, _view, html} =
         index_live
         |> form("#ammo_group-form", ammo_group: @create_attrs)
         |> render_submit()
@@ -53,6 +61,68 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
       assert html =~ "42"
     end
 
+    test "saves multiple new ammo_groups", %{conn: conn, current_user: current_user} do
+      multiplier = 25
+
+      {:ok, index_live, _html} = live(conn, Routes.ammo_group_index_path(conn, :index))
+
+      assert index_live |> element("a", dgettext("actions", "New Ammo group")) |> render_click() =~
+               gettext("New Ammo group")
+
+      assert_patch(index_live, Routes.ammo_group_index_path(conn, :new))
+
+      # assert index_live
+      #        |> form("#ammo_group-form", ammo_group: @invalid_attrs)
+      #        |> render_change() =~ dgettext("errors", "can't be blank")
+
+      {:ok, _view, html} =
+        index_live
+        |> form("#ammo_group-form",
+          ammo_group: @create_attrs |> Map.put("multiplier", to_string(multiplier))
+        )
+        |> render_submit()
+        |> follow_redirect(conn, Routes.ammo_group_index_path(conn, :index))
+
+      assert html =~ dgettext("prompts", "Ammo groups created successfully")
+      assert Ammo.list_ammo_groups(current_user) |> Enum.count() == multiplier + 1
+    end
+
+    test "does not save invalid number of new ammo_groups", %{conn: conn} do
+      {:ok, index_live, _html} = live(conn, Routes.ammo_group_index_path(conn, :index))
+
+      assert index_live |> element("a", dgettext("actions", "New Ammo group")) |> render_click() =~
+               gettext("New Ammo group")
+
+      assert_patch(index_live, Routes.ammo_group_index_path(conn, :new))
+
+      # assert index_live
+      #        |> form("#ammo_group-form", ammo_group: @invalid_attrs)
+      #        |> render_change() =~ dgettext("errors", "can't be blank")
+
+      assert index_live
+             |> form("#ammo_group-form", ammo_group: @create_attrs |> Map.put("multiplier", "0"))
+             |> render_submit() =~
+               dgettext(
+                 "errors",
+                 "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}",
+                 multiplier: 0,
+                 max: @ammo_group_create_limit
+               )
+
+      assert index_live
+             |> form("#ammo_group-form",
+               ammo_group:
+                 @create_attrs |> Map.put("multiplier", to_string(@ammo_group_create_limit + 1))
+             )
+             |> render_submit() =~
+               dgettext(
+                 "errors",
+                 "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}",
+                 multiplier: @ammo_group_create_limit + 1,
+                 max: @ammo_group_create_limit
+               )
+    end
+
     test "saves new shot_group", %{conn: conn, ammo_group: ammo_group} do
       {:ok, index_live, _html} = live(conn, Routes.ammo_group_index_path(conn, :index))
 
@@ -65,7 +135,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
       #        |> form("#shot_group-form", shot_group: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "is invalid")
 
-      {:ok, _, html} =
+      {:ok, _view, html} =
         index_live
         |> form("#shot-group-form", shot_group: @shot_group_create_attrs)
         |> render_submit()
@@ -88,7 +158,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
       #        |> form("#ammo_group-form", ammo_group: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _, html} =
+      {:ok, _view, html} =
         index_live
         |> form("#ammo_group-form", ammo_group: @update_attrs)
         |> render_submit()
@@ -134,7 +204,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
       #        |> form("#ammo_group-form", ammo_group: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _, html} =
+      {:ok, _view, html} =
         show_live
         |> form("#ammo_group-form", ammo_group: @update_attrs)
         |> render_submit()
@@ -156,7 +226,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
       #        |> form("#shot_group-form", shot_group: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "is invalid")
 
-      {:ok, _, html} =
+      {:ok, _view, html} =
         index_live
         |> form("#shot-group-form", shot_group: @shot_group_create_attrs)
         |> render_submit()
@@ -164,5 +234,40 @@ defmodule CanneryWeb.AmmoGroupLiveTest do
 
       assert html =~ dgettext("prompts", "Shots recorded successfully")
     end
+
+    test "updates shot_group in listing",
+         %{conn: conn, ammo_group: ammo_group, shot_group: shot_group} do
+      {:ok, index_live, _html} = live(conn, Routes.ammo_group_show_path(conn, :edit, ammo_group))
+
+      assert index_live |> element("[data-qa=\"edit-#{shot_group.id}\"]") |> render_click() =~
+               gettext("Edit Shot Records")
+
+      assert_patch(
+        index_live,
+        Routes.ammo_group_show_path(conn, :edit_shot_group, ammo_group, shot_group)
+      )
+
+      # assert index_live
+      #        |> form("#shot_group-form", shot_group: @invalid_attrs)
+      #        |> render_change() =~ dgettext("errors", "is invalid")
+
+      {:ok, _view, html} =
+        index_live
+        |> form("#shot-group-form", shot_group: @shot_group_update_attrs)
+        |> render_submit()
+        |> follow_redirect(conn, Routes.ammo_group_show_path(conn, :show, ammo_group))
+
+      assert html =~ dgettext("actions", "Shot records updated successfully")
+      assert html =~ "some updated notes"
+    end
+
+    test "deletes shot_group in listing",
+         %{conn: conn, ammo_group: ammo_group, shot_group: shot_group} do
+      {:ok, index_live, _html} =
+        live(conn, Routes.ammo_group_show_path(conn, :edit_shot_group, ammo_group, shot_group))
+
+      assert index_live |> element("[data-qa=\"delete-#{shot_group.id}\"]") |> render_click()
+      refute has_element?(index_live, "#shot_group-#{shot_group.id}")
+    end
   end
 end

test/cannery_web/live/ammo_type_live_test.exs

@@ -62,7 +62,7 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
       #        |> form("#ammo_type-form", ammo_type: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _, html} =
+      {:ok, _view, html} =
         index_live
         |> form("#ammo_type-form", ammo_type: @create_attrs)
         |> render_submit()
@@ -86,7 +86,7 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
       #        |> form("#ammo_type-form", ammo_type: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _, html} =
+      {:ok, _view, html} =
         index_live
         |> form("#ammo_type-form", ammo_type: @update_attrs)
         |> render_submit()
@@ -128,7 +128,7 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
       #        |> form("#ammo_type-form", ammo_type: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _, html} =
+      {:ok, _view, html} =
         show_live
         |> form("#ammo_type-form", ammo_type: @update_attrs)
         |> render_submit()

test/cannery_web/live/container_live_test.exs

@@ -52,7 +52,7 @@ defmodule CanneryWeb.ContainerLiveTest do
       #        |> form("#container-form", container: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _, html} =
+      {:ok, _view, html} =
         index_live
         |> form("#container-form", container: @create_attrs)
         |> render_submit()
@@ -78,7 +78,7 @@ defmodule CanneryWeb.ContainerLiveTest do
       #        |> form("#container-form", container: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _, html} =
+      {:ok, _view, html} =
         index_live
         |> form("#container-form", container: @update_attrs)
         |> render_submit()
@@ -123,7 +123,7 @@ defmodule CanneryWeb.ContainerLiveTest do
       #        |> form("#container-form", container: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _, html} =
+      {:ok, _view, html} =
         show_live
         |> form("#container-form", container: @update_attrs)
         |> render_submit()

test/cannery_web/live/invite_live_test.exs

@@ -40,7 +40,7 @@ defmodule CanneryWeb.InviteLiveTest do
       #        |> form("#invite-form", invite: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _, html} =
+      {:ok, _view, html} =
         index_live
         |> form("#invite-form", invite: @create_attrs)
         |> render_submit()
@@ -63,7 +63,7 @@ defmodule CanneryWeb.InviteLiveTest do
       #        |> form("#invite-form", invite: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _, html} =
+      {:ok, _view, html} =
         index_live
         |> form("#invite-form", invite: @update_attrs)
         |> render_submit()

test/cannery_web/live/range_live_test.exs

@@ -16,7 +16,9 @@ defmodule CanneryWeb.RangeLiveTest do
   defp create_shot_group(%{current_user: current_user}) do
     container = container_fixture(%{"staged" => true}, current_user)
     ammo_type = ammo_type_fixture(current_user)
-    ammo_group = ammo_group_fixture(%{"staged" => true}, ammo_type, container, current_user)
+
+    {1, [ammo_group]} =
+      ammo_group_fixture(%{"staged" => true}, ammo_type, container, current_user)
 
     shot_group =
       %{"count" => 5, "date" => ~N[2022-02-13 03:17:00], "notes" => "some notes"}
@@ -47,7 +49,7 @@ defmodule CanneryWeb.RangeLiveTest do
       #        |> form("#shot_group-form", shot_group: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "is invalid")
 
-      {:ok, _, html} =
+      {:ok, _view, html} =
         index_live
         |> form("#shot-group-form", shot_group: @create_attrs)
         |> render_submit()
@@ -69,7 +71,7 @@ defmodule CanneryWeb.RangeLiveTest do
       #        |> form("#shot_group-form", shot_group: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "is invalid")
 
-      {:ok, _, html} =
+      {:ok, _view, html} =
         index_live
         |> form("#shot-group-form", shot_group: @update_attrs)
         |> render_submit()

test/cannery_web/live/tag_live_test.exs

@@ -53,7 +53,7 @@ defmodule CanneryWeb.TagLiveTest do
       #        |> form("#tag-form", tag: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _, html} =
+      {:ok, _view, html} =
         index_live
         |> form("#tag-form", tag: @create_attrs)
         |> render_submit()
@@ -75,7 +75,7 @@ defmodule CanneryWeb.TagLiveTest do
       #        |> form("#tag-form", tag: @invalid_attrs)
       #        |> render_change() =~ dgettext("errors", "can't be blank")
 
-      {:ok, _, html} =
+      {:ok, _view, html} =
         index_live
         |> form("#tag-form", tag: @update_attrs)
         |> render_submit()

test/cannery_web/views/error_view_test.exs

@@ -5,12 +5,11 @@ defmodule CanneryWeb.ErrorViewTest do
 
   use CanneryWeb.ConnCase, async: true
   import CanneryWeb.Gettext
-
-  @moduletag :error_view_test
-
   # Bring render/3 and render_to_string/3 for testing custom views
   import Phoenix.View
 
+  @moduletag :error_view_test
+
   test "renders 404.html" do
     assert render_to_string(CanneryWeb.ErrorView, "404.html", []) =~
              dgettext("errors", "Not found")

test/support/conn_case.ex

@@ -25,6 +25,7 @@ defmodule CanneryWeb.ConnCase do
       # Import conveniences for testing with connections
       import Plug.Conn
       import Phoenix.ConnTest
+      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
       import Cannery.Fixtures
       import CanneryWeb.ConnCase
 

test/support/data_case.ex

@@ -22,10 +22,8 @@ defmodule Cannery.DataCase do
       alias Cannery.Repo
 
       import Ecto
-      import Ecto.Changeset
+      import Ecto.{Changeset, Query}
-      import Ecto.Query
+      import Cannery.{DataCase, Fixtures}
-      import Cannery.DataCase
-      import Cannery.Fixtures
     end
   end
 
@@ -45,7 +43,7 @@ defmodule Cannery.DataCase do
   """
   def errors_on(changeset) do
     Ecto.Changeset.traverse_errors(changeset, fn {message, opts} ->
-      Regex.replace(~r"%{(\w+)}", message, fn _, key ->
+      Regex.replace(~r"%{(\w+)}", message, fn _content, key ->
         opts |> Keyword.get(String.to_existing_atom(key), key) |> to_string()
       end)
     end)

test/support/fixtures.ex

@@ -111,10 +111,20 @@ defmodule Cannery.Fixtures do
   @doc """
   Generate a AmmoGroup
   """
-  @spec ammo_group_fixture(AmmoType.t(), Container.t(), User.t()) :: AmmoGroup.t()
+  @spec ammo_group_fixture(AmmoType.t(), Container.t(), User.t()) ::
-  @spec ammo_group_fixture(attrs :: map(), AmmoType.t(), Container.t(), User.t()) :: AmmoGroup.t()
+          {count :: non_neg_integer(), [AmmoGroup.t()]}
+  @spec ammo_group_fixture(attrs :: map(), AmmoType.t(), Container.t(), User.t()) ::
+          {count :: non_neg_integer(), [AmmoGroup.t()]}
+  @spec ammo_group_fixture(
+          attrs :: map(),
+          multiplier :: non_neg_integer(),
+          AmmoType.t(),
+          Container.t(),
+          User.t()
+        ) :: {count :: non_neg_integer(), [AmmoGroup.t()]}
   def ammo_group_fixture(
         attrs \\ %{},
+        multiplier \\ 1,
         %AmmoType{id: ammo_type_id},
         %Container{id: container_id},
         %User{} = user
@@ -125,7 +135,7 @@ defmodule Cannery.Fixtures do
       "container_id" => container_id,
       "count" => 20
     })
-    |> Ammo.create_ammo_group(user)
+    |> Ammo.create_ammo_groups(multiplier, user)
     |> unwrap_ok_tuple()
   end