Translated using Weblate (Spanish)

Currently translated at 73.9% (34 of 46 strings)

Translation: cannery/prompts
Translate-URL: https://weblate.bubbletea.dev/projects/cannery/prompts/es/

.drone.yml

@@ -16,7 +16,7 @@ steps:
       - assets/node_modules/
 
 - name: test
-  image: elixir:1.14.1-alpine
+  image: elixir:1.13.4-alpine
   environment:
     TEST_DATABASE_URL: ecto://postgres:postgres@database/cannery_test
     HOST: testing.example.tld
@@ -29,16 +29,12 @@ steps:
   - npm --prefix ./assets ci --progress=false --no-audit --loglevel=error
   - npm run --prefix ./assets deploy
   - mix do phx.digest, gettext.extract
-  - mix test.all
+  - mix test
 
 - name: build and publish stable
-  image: thegeeklab/drone-docker-buildx
-  privileged: true
+  image: plugins/docker
   settings:
     repo: shibaobun/cannery
-    purge: true
-    compress: true
-    platforms: linux/amd64,linux/arm/v7
     username:
       from_secret: docker_username
     password:
@@ -49,13 +45,9 @@ steps:
     - stable
 
 - name: build and publish tagged version
-  image: thegeeklab/drone-docker-buildx
-  privileged: true
+  image: plugins/docker
   settings:
     repo: shibaobun/cannery
-    purge: true
-    compress: true
-    platforms: linux/amd64,linux/arm/v7
     username:
       from_secret: docker_username
     password:

.tool-versions

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

CHANGELOG.md

@@ -1,56 +1,3 @@
-# v0.7.1
-- Fix table component alignment and styling
-- Fix toggle button styling
-- Miscellanous code improvements
-- Improve container index table
-- Fix bug with ammo not updating after deleting shot group
-- Replace ammo "added on" with "purchased on"
-- Miscellaneous wording improvements
-- Update translations
-
-# v0.7.0
-- Add shading to table component
-- Fix chart to sum by day
-- Fix whitespace when copying invite url
-- Make ammo type show page also display ammo groups as table
-- Make container show page also display ammo groups as table
-- Display CPR for ammo packs
-- Add original count for ammo packs
-- Add ammo pack CPR and original count to json export
-
-# v0.6.0
-- Update translations
-- Display used-up date on used-up ammo
-- Make ammo index page a bit more compact
-- Make ammo index page filter used-up ammo
-- Make ammo catalog page include ammo count
-- Make ammo type show page a bit more compact
-- Make ammo type show page include container names for each ammo
-- Make ammo type show page filter used-up ammo
-- Make container index page optionally display a table
-- Make container show page a bit more compact
-- Make container show page filter used-up ammo
-- Forgot to add the logo as the favicon whoops
-- Add graph to range page
-- Add JSON export of data
-- Add ammo cloning
-- Add ammo type cloning
-- Add container cloning
-- Fix bug with moving ammo packs between containers
-- Add button to set rounds left to 0 when creating a shot group
-- Update project dependencies
-
-# v0.5.4
-- Rename "Ammo" tab to "Catalog", and "Manage" tab is now "Ammo"
-- Ammo groups are now just referred to as Ammo or "Packs"
-- URL paths now reflect new names
-- Add pack and round count to container information
-- Add cute logo >:3 Thank you [kalli](https://twitter.com/t0kkuro)!
-- Add note about deleting an ammo type deleting all ammo of that type as well
-- Prompt to create first ammo type before trying to create first ammo
-- Add note about creating unlimited invites
-- Update screenshot lol
-
 # v0.5.3
 - Update French translation: Thank you [duponin](https://udongein.xyz/users/duponin)!
 - Update German translation: Thank you [Kaia](https://shitposter.club/users/kaia)!

CONTRIBUTING.md

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

Dockerfile

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

README.md

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

assets/css/components.scss

@@ -25,7 +25,7 @@
   }
 
   .btn {
-    @apply inline-block break-words;
+    @apply inline-block break-words 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;
@@ -52,7 +52,7 @@
   }
 
   .link {
-    @apply inline-block break-words;
+    @apply inline-block break-all min-w-4;
     @apply hover:underline;
     @apply transition-colors duration-500 ease-in-out;
   }

assets/js/app.js

@@ -26,7 +26,6 @@ import { Socket } from 'phoenix'
 import { LiveSocket } from 'phoenix_live_view'
 import topbar from '../vendor/topbar'
 import MaintainAttrs from './maintain_attrs'
-import ShotLogChart from './shot_log_chart'
 import Alpine from 'alpinejs'
 
 const csrfToken = document.querySelector("meta[name='csrf-token']").getAttribute('content')
@@ -37,7 +36,7 @@ const liveSocket = new LiveSocket('/live', Socket, {
     }
   },
   params: { _csrf_token: csrfToken },
-  hooks: { MaintainAttrs, ShotLogChart }
+  hooks: { MaintainAttrs }
 })
 
 // alpine.js
@@ -67,8 +66,3 @@ window.addEventListener('cannery:clipcopy', (event) => {
     window.alert('Sorry, your browser does not support clipboard copy.')
   }
 })
-
-// Set input value to 0
-window.addEventListener('cannery:set-zero', (event) => {
-  event.target.value = 0
-})

assets/js/shot_log_chart.js

@@ -1,85 +0,0 @@
-import { Chart, Title, Tooltip, Legend, LineController, LineElement, PointElement, TimeScale, LinearScale } from 'chart.js'
-import 'chartjs-adapter-date-fns'
-Chart.register(Title, Tooltip, Legend, LineController, LineElement, PointElement, TimeScale, LinearScale)
-
-export default {
-  initalizeChart (el) {
-    const data = JSON.parse(el.dataset.chartData)
-
-    this.el.chart = new Chart(el, {
-      type: 'line',
-      data: {
-        datasets: [{
-          label: el.dataset.label,
-          data: data.map(({ date, count, label }) => ({
-            label,
-            x: date,
-            y: count
-          })),
-          backgroundColor: `${el.dataset.color}77`,
-          borderColor: el.dataset.color,
-          fill: true,
-          borderWidth: 3,
-          pointBorderWidth: 1
-        }]
-      },
-      options: {
-        elements: {
-          point: {
-            radius: 9,
-            hoverRadius: 12
-          }
-        },
-        plugins: {
-          legend: {
-            position: 'bottom',
-            labels: {
-              padding: 20
-            }
-          },
-          tooltip: {
-            displayColors: false,
-            callbacks: {
-              title: (contexts) => contexts.map(({ raw: { x } }) => Intl.DateTimeFormat([], { timeZone: 'Etc/UTC', dateStyle: 'short' }).format(new Date(x))),
-              label: ({ raw: { label } }) => label
-            }
-          }
-        },
-        scales: {
-          y: {
-            beginAtZero: true,
-            stacked: true,
-            grace: '15%',
-            ticks: {
-              padding: 15
-            }
-          },
-          x: {
-            type: 'time',
-            time: {
-              unit: 'day'
-            }
-          }
-        },
-        transitions: {
-          show: {
-            animations: {
-              x: {
-                from: 0
-              }
-            }
-          },
-          hide: {
-            animations: {
-              x: {
-                to: 0
-              }
-            }
-          }
-        }
-      }
-    })
-  },
-  mounted () { this.initalizeChart(this.el) },
-  updated () { this.initalizeChart(this.el) }
-}

assets/package.json

@@ -2,10 +2,6 @@
   "repository": {},
   "description": " ",
   "license": "MIT",
-  "engines": {
-    "node": "18.12.1",
-    "npm": "8.19.2"
-  },
   "scripts": {
     "deploy": "NODE_ENV=production webpack --mode production",
     "watch": "webpack --mode development --watch --watch-options-stdin",
@@ -15,9 +11,6 @@
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.1.1",
     "alpinejs": "^3.10.2",
-    "chart.js": "^3.9.1",
-    "chartjs-adapter-date-fns": "^2.0.0",
-    "date-fns": "^2.29.3",
     "phoenix": "file:../deps/phoenix",
     "phoenix_html": "file:../deps/phoenix_html",
     "phoenix_live_view": "file:../deps/phoenix_live_view",
@@ -37,7 +30,6 @@
     "postcss-import": "^14.1.0",
     "postcss-loader": "^6.2.1",
     "postcss-preset-env": "^7.5.0",
-    "sass": "^1.56.0",
     "sass-loader": "^12.6.0",
     "standard": "^17.0.0",
     "tailwindcss": "^3.0.24",

lib/cannery/accounts/user.ex

@@ -9,14 +9,6 @@ defmodule Cannery.Accounts.User do
   alias Ecto.{Changeset, UUID}
   alias Cannery.{Accounts.User, Invites.Invite}
 
-  @derive {Jason.Encoder,
-           only: [
-             :id,
-             :email,
-             :confirmed_at,
-             :role,
-             :locale
-           ]}
   @derive {Inspect, except: [:password]}
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id

lib/cannery/activity_log.ex

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

lib/cannery/activity_log/shot_group.ex

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

lib/cannery/ammo.ex

@@ -3,9 +3,8 @@ defmodule Cannery.Ammo do
   The Ammo context.
   """
 
-  import CanneryWeb.Gettext
   import Ecto.Query, warn: false
-  alias Cannery.{Accounts.User, Containers, Containers.Container, Repo}
+  alias Cannery.{Accounts.User, Containers, Repo}
   alias Cannery.ActivityLog.ShotGroup
   alias Cannery.Ammo.{AmmoGroup, AmmoType}
   alias Ecto.Changeset
@@ -25,25 +24,6 @@ defmodule Cannery.Ammo do
   def list_ammo_types(%User{id: user_id}),
     do: Repo.all(from at in AmmoType, where: at.user_id == ^user_id, order_by: at.name)
 
-  @doc """
-  Returns a count of ammo_types.
-
-  ## Examples
-
-      iex> get_ammo_types_count!(%User{id: 123})
-      3
-
-  """
-  @spec get_ammo_types_count!(User.t()) :: integer()
-  def get_ammo_types_count!(%User{id: user_id}) do
-    Repo.one(
-      from at in AmmoType,
-        where: at.user_id == ^user_id,
-        select: count(at.id),
-        distinct: true
-    )
-  end
-
   @doc """
   Gets a single ammo_type.
 
@@ -101,7 +81,7 @@ defmodule Cannery.Ammo do
   ## Examples
 
       iex> get_round_count_for_ammo_type(123, %User{id: 123})
-      35
+      %AmmoType{}
 
       iex> get_round_count_for_ammo_type(456, %User{id: 123})
       ** (Ecto.NoResultsError)
@@ -127,7 +107,7 @@ defmodule Cannery.Ammo do
   ## Examples
 
       iex> get_used_count_for_ammo_type(123, %User{id: 123})
-      35
+      %AmmoType{}
 
       iex> get_used_count_for_ammo_type(456, %User{id: 123})
       ** (Ecto.NoResultsError)
@@ -146,29 +126,6 @@ defmodule Cannery.Ammo do
     ) || 0
   end
 
-  @doc """
-  Gets the total number of ammo ever bought for an ammo type
-
-  Raises `Ecto.NoResultsError` if the Ammo type does not exist.
-
-  ## Examples
-
-      iex> get_historical_count_for_ammo_type(123, %User{id: 123})
-      %AmmoType{}
-
-      iex> get_historical_count_for_ammo_type(456, %User{id: 123})
-      ** (Ecto.NoResultsError)
-
-  """
-  @spec get_historical_count_for_ammo_type(AmmoType.t(), User.t()) :: non_neg_integer()
-  def get_historical_count_for_ammo_type(
-        %AmmoType{user_id: user_id} = ammo_type,
-        %User{id: user_id} = user
-      ) do
-    get_round_count_for_ammo_type(ammo_type, user) +
-      get_used_count_for_ammo_type(ammo_type, user)
-  end
-
   @doc """
   Creates a ammo_type.
 
@@ -183,8 +140,11 @@ defmodule Cannery.Ammo do
   """
   @spec create_ammo_type(attrs :: map(), User.t()) ::
           {:ok, AmmoType.t()} | {:error, Changeset.t(AmmoType.new_ammo_type())}
-  def create_ammo_type(attrs \\ %{}, %User{} = user),
-    do: %AmmoType{} |> AmmoType.create_changeset(user, attrs) |> Repo.insert()
+  def create_ammo_type(attrs \\ %{}, %User{id: user_id}) do
+    %AmmoType{}
+    |> AmmoType.create_changeset(attrs |> Map.put("user_id", user_id))
+    |> Repo.insert()
+  end
 
   @doc """
   Updates a ammo_type.
@@ -233,6 +193,22 @@ defmodule Cannery.Ammo do
   def delete_ammo_type!(%AmmoType{user_id: user_id} = ammo_type, %User{id: user_id}),
     do: ammo_type |> Repo.delete!()
 
+  @doc """
+  Returns an `%Changeset{}` for tracking ammo_type changes.
+
+  ## Examples
+
+      iex> change_ammo_type(ammo_type)
+      %Changeset{data: %AmmoType{}}
+
+  """
+  @spec change_ammo_type(AmmoType.t() | AmmoType.new_ammo_type()) ::
+          Changeset.t(AmmoType.t() | AmmoType.new_ammo_type())
+  @spec change_ammo_type(AmmoType.t() | AmmoType.new_ammo_type(), attrs :: map()) ::
+          Changeset.t(AmmoType.t() | AmmoType.new_ammo_type())
+  def change_ammo_type(%AmmoType{} = ammo_type, attrs \\ %{}),
+    do: AmmoType.update_changeset(ammo_type, attrs)
+
   @doc """
   Returns the list of ammo_groups for a user and type.
 
@@ -243,15 +219,7 @@ defmodule Cannery.Ammo do
 
   """
   @spec list_ammo_groups_for_type(AmmoType.t(), User.t()) :: [AmmoGroup.t()]
-  @spec list_ammo_groups_for_type(AmmoType.t(), User.t(), include_empty :: boolean()) ::
-          [AmmoGroup.t()]
-  def list_ammo_groups_for_type(ammo_type, user, include_empty \\ false)
-
-  def list_ammo_groups_for_type(
-        %AmmoType{id: ammo_type_id, user_id: user_id},
-        %User{id: user_id},
-        true = _include_empty
-      ) do
+  def list_ammo_groups_for_type(%AmmoType{id: ammo_type_id, user_id: user_id}, %User{id: user_id}) do
     Repo.all(
       from ag in AmmoGroup,
         left_join: sg in assoc(ag, :shot_groups),
@@ -262,137 +230,6 @@ defmodule Cannery.Ammo do
     )
   end
 
-  def list_ammo_groups_for_type(
-        %AmmoType{id: ammo_type_id, user_id: user_id},
-        %User{id: user_id},
-        false = _include_empty
-      ) do
-    Repo.all(
-      from ag in AmmoGroup,
-        left_join: sg in assoc(ag, :shot_groups),
-        where: ag.ammo_type_id == ^ammo_type_id,
-        where: ag.user_id == ^user_id,
-        where: not (ag.count == 0),
-        preload: [shot_groups: sg],
-        order_by: ag.id
-    )
-  end
-
-  @doc """
-  Returns the list of ammo_groups for a user and container.
-
-  ## Examples
-
-      iex> list_ammo_groups_for_container(%AmmoType{id: 123}, %User{id: 123})
-      [%AmmoGroup{}, ...]
-
-  """
-  @spec list_ammo_groups_for_container(Container.t(), User.t()) :: [AmmoGroup.t()]
-  @spec list_ammo_groups_for_container(Container.t(), User.t(), include_empty :: boolean()) ::
-          [AmmoGroup.t()]
-  def list_ammo_groups_for_container(container, user, include_empty \\ false)
-
-  def list_ammo_groups_for_container(
-        %Container{id: container_id, user_id: user_id},
-        %User{id: user_id},
-        true = _include_empty
-      ) do
-    Repo.all(
-      from ag in AmmoGroup,
-        left_join: sg in assoc(ag, :shot_groups),
-        where: ag.container_id == ^container_id,
-        where: ag.user_id == ^user_id,
-        preload: [shot_groups: sg],
-        order_by: ag.id
-    )
-  end
-
-  def list_ammo_groups_for_container(
-        %Container{id: container_id, user_id: user_id},
-        %User{id: user_id},
-        false = _include_empty
-      ) do
-    Repo.all(
-      from ag in AmmoGroup,
-        left_join: sg in assoc(ag, :shot_groups),
-        where: ag.container_id == ^container_id,
-        where: ag.user_id == ^user_id,
-        where: not (ag.count == 0),
-        preload: [shot_groups: sg],
-        order_by: ag.id
-    )
-  end
-
-  @doc """
-  Returns the count of ammo_groups for an ammo type.
-
-  ## Examples
-
-      iex> get_ammo_groups_count_for_type(%AmmoType{id: 123}, %User{id: 123})
-      3
-
-      iex> get_ammo_groups_count_for_type(%AmmoType{id: 123}, %User{id: 123}, true)
-      5
-
-  """
-  @spec get_ammo_groups_count_for_type(AmmoType.t(), User.t()) :: [AmmoGroup.t()]
-  @spec get_ammo_groups_count_for_type(AmmoType.t(), User.t(), include_empty :: boolean()) ::
-          [AmmoGroup.t()]
-  def get_ammo_groups_count_for_type(ammo_type, user, include_empty \\ false)
-
-  def get_ammo_groups_count_for_type(
-        %AmmoType{id: ammo_type_id, user_id: user_id},
-        %User{id: user_id},
-        true = _include_empty
-      ) do
-    Repo.one!(
-      from ag in AmmoGroup,
-        where: ag.user_id == ^user_id,
-        where: ag.ammo_type_id == ^ammo_type_id,
-        distinct: true,
-        select: count(ag.id)
-    ) || 0
-  end
-
-  def get_ammo_groups_count_for_type(
-        %AmmoType{id: ammo_type_id, user_id: user_id},
-        %User{id: user_id},
-        false = _include_empty
-      ) do
-    Repo.one!(
-      from ag in AmmoGroup,
-        where: ag.user_id == ^user_id,
-        where: ag.ammo_type_id == ^ammo_type_id,
-        where: not (ag.count == 0),
-        distinct: true,
-        select: count(ag.id)
-    ) || 0
-  end
-
-  @doc """
-  Returns the count of used ammo_groups for an ammo type.
-
-  ## Examples
-
-      iex> get_used_ammo_groups_count_for_type(%AmmoType{id: 123}, %User{id: 123})
-      3
-
-  """
-  @spec get_used_ammo_groups_count_for_type(AmmoType.t(), User.t()) :: [AmmoGroup.t()]
-  def get_used_ammo_groups_count_for_type(
-        %AmmoType{id: ammo_type_id, user_id: user_id},
-        %User{id: user_id}
-      ) do
-    Repo.one!(
-      from ag in AmmoGroup,
-        where: ag.user_id == ^user_id,
-        where: ag.ammo_type_id == ^ammo_type_id,
-        where: ag.count == 0,
-        distinct: true,
-        select: count(ag.id)
-    ) || 0
-  end
-
   @doc """
   Returns the list of ammo_groups for a user.
 
@@ -404,27 +241,22 @@ defmodule Cannery.Ammo do
   """
   @spec list_ammo_groups(User.t()) :: [AmmoGroup.t()]
   @spec list_ammo_groups(User.t(), include_empty :: boolean()) :: [AmmoGroup.t()]
-  def list_ammo_groups(user, include_empty \\ false)
-
-  def list_ammo_groups(%User{id: user_id}, true = _include_empty) do
-    Repo.all(
+  def list_ammo_groups(%User{id: user_id}, include_empty \\ false) do
+    if include_empty do
       from ag in AmmoGroup,
         left_join: sg in assoc(ag, :shot_groups),
         where: ag.user_id == ^user_id,
         preload: [shot_groups: sg],
         order_by: ag.id
-    )
-  end
-
-  def list_ammo_groups(%User{id: user_id}, false = _include_empty) do
-    Repo.all(
+    else
       from ag in AmmoGroup,
         left_join: sg in assoc(ag, :shot_groups),
         where: ag.user_id == ^user_id,
         where: not (ag.count == 0),
         preload: [shot_groups: sg],
         order_by: ag.id
-    )
+    end
+    |> Repo.all()
   end
 
   @doc """
@@ -485,17 +317,6 @@ defmodule Cannery.Ammo do
     |> Enum.sum()
   end
 
-  @doc """
-  Returns the last entered shot group for an ammo group
-  """
-  @spec get_last_used_shot_group(AmmoGroup.t()) :: ShotGroup.t() | nil
-  def get_last_used_shot_group(%AmmoGroup{} = ammo_group) do
-    ammo_group
-    |> Repo.preload(:shot_groups)
-    |> Map.fetch!(:shot_groups)
-    |> Enum.max_by(fn %{date: date} -> date end, Date, fn -> nil end)
-  end
-
   @doc """
   Calculates the percentage remaining of an ammo group out of 100
   """
@@ -506,35 +327,11 @@ defmodule Cannery.Ammo do
     ammo_group = ammo_group |> Repo.preload(:shot_groups)
 
     shot_group_sum =
-      ammo_group.shot_groups
-      |> Enum.map(fn %{count: count} -> count end)
-      |> Enum.sum()
+      ammo_group.shot_groups |> Enum.map(fn %{count: count} -> count end) |> Enum.sum()
 
     round(count / (count + shot_group_sum) * 100)
   end
 
-  @doc """
-  Gets the original count for an ammo group
-  """
-  @spec get_original_count(AmmoGroup.t()) :: non_neg_integer()
-  def get_original_count(%AmmoGroup{count: count} = ammo_group) do
-    count + get_used_count(ammo_group)
-  end
-
-  @doc """
-  Calculates the CPR for a single ammo group
-  """
-  @spec get_cpr(AmmoGroup.t()) :: nil | float()
-  def get_cpr(%AmmoGroup{price_paid: nil}), do: nil
-
-  def get_cpr(%AmmoGroup{price_paid: price_paid} = ammo_group),
-    do: calculate_cpr(price_paid, get_original_count(ammo_group))
-
-  @spec calculate_cpr(price_paid :: float() | nil, count :: integer()) :: float() | nil
-  defp calculate_cpr(nil, _count), do: nil
-  defp calculate_cpr(_price_paid, 0), do: nil
-  defp calculate_cpr(price_paid, total_count), do: price_paid / total_count
-
   @doc """
   Creates multiple ammo_groups at once.
 
@@ -553,21 +350,18 @@ defmodule Cannery.Ammo do
   def create_ammo_groups(
         %{"ammo_type_id" => ammo_type_id, "container_id" => container_id} = attrs,
         multiplier,
-        %User{} = user
+        %User{id: user_id} = user
       )
-      when multiplier >= 1 and multiplier <= @ammo_group_create_limit and
-             not (ammo_type_id |> is_nil()) and not (container_id |> is_nil()) do
+      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)
+
     now = NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second)
 
     changesets =
       Enum.map(1..multiplier, fn _count ->
-        %AmmoGroup{}
-        |> AmmoGroup.create_changeset(
-          get_ammo_type!(ammo_type_id, user),
-          Containers.get_container!(container_id, user),
-          user,
-          attrs
-        )
+        %AmmoGroup{} |> AmmoGroup.create_changeset(attrs |> Map.put("user_id", user_id))
       end)
 
     if changesets |> Enum.all?(fn %{valid?: valid} -> valid end) do
@@ -592,27 +386,8 @@ defmodule Cannery.Ammo do
     end
   end
 
-  def create_ammo_groups(
-        %{"ammo_type_id" => ammo_type_id, "container_id" => container_id} = attrs,
-        _multiplier,
-        user
-      )
-      when not (ammo_type_id |> is_nil()) and not (container_id |> is_nil()) do
-    changeset =
-      %AmmoGroup{}
-      |> AmmoGroup.create_changeset(
-        get_ammo_type!(ammo_type_id, user),
-        Containers.get_container!(container_id, user),
-        user,
-        attrs
-      )
-      |> Changeset.add_error(:multiplier, dgettext("errors", "Invalid multiplier"))
-
-    {:error, changeset}
-  end
-
-  def create_ammo_groups(invalid_attrs, _multiplier, user) do
-    {:error, %AmmoGroup{} |> AmmoGroup.create_changeset(nil, nil, user, invalid_attrs)}
+  def create_ammo_groups(invalid_attrs, _multiplier, _user) do
+    {:error, %AmmoGroup{} |> AmmoGroup.create_changeset(invalid_attrs)}
   end
 
   @doc """
@@ -629,12 +404,8 @@ defmodule Cannery.Ammo do
   """
   @spec update_ammo_group(AmmoGroup.t(), attrs :: map(), User.t()) ::
           {:ok, AmmoGroup.t()} | {:error, Changeset.t(AmmoGroup.t())}
-  def update_ammo_group(
-        %AmmoGroup{user_id: user_id} = ammo_group,
-        attrs,
-        %User{id: user_id} = user
-      ),
-      do: ammo_group |> AmmoGroup.update_changeset(attrs, user) |> Repo.update()
+  def update_ammo_group(%AmmoGroup{user_id: user_id} = ammo_group, attrs, %User{id: user_id}),
+    do: ammo_group |> AmmoGroup.update_changeset(attrs) |> Repo.update()
 
   @doc """
   Deletes a ammo_group.
@@ -665,4 +436,18 @@ defmodule Cannery.Ammo do
   @spec delete_ammo_group!(AmmoGroup.t(), User.t()) :: AmmoGroup.t()
   def delete_ammo_group!(%AmmoGroup{user_id: user_id} = ammo_group, %User{id: user_id}),
     do: ammo_group |> Repo.delete!()
+
+  @doc """
+  Returns an `%Changeset{}` for tracking ammo_group changes.
+
+  ## Examples
+
+      iex> change_ammo_group(ammo_group)
+      %Changeset{data: %AmmoGroup{}}
+
+  """
+  @spec change_ammo_group(AmmoGroup.t()) :: Changeset.t(AmmoGroup.t())
+  @spec change_ammo_group(AmmoGroup.t(), attrs :: map()) :: Changeset.t(AmmoGroup.t())
+  def change_ammo_group(%AmmoGroup{} = ammo_group, attrs \\ %{}),
+    do: AmmoGroup.update_changeset(ammo_group, attrs)
 end

lib/cannery/ammo/ammo_group.ex

@@ -7,22 +7,11 @@ defmodule Cannery.Ammo.AmmoGroup do
   """
 
   use Ecto.Schema
-  import CanneryWeb.Gettext
   import Ecto.Changeset
   alias Cannery.Ammo.{AmmoGroup, AmmoType}
-  alias Cannery.{Accounts.User, ActivityLog.ShotGroup, Containers, Containers.Container}
+  alias Cannery.{Accounts.User, ActivityLog.ShotGroup, Containers.Container}
   alias Ecto.{Changeset, UUID}
 
-  @derive {Jason.Encoder,
-           only: [
-             :id,
-             :count,
-             :notes,
-             :price_paid,
-             :staged,
-             :ammo_type_id,
-             :container_id
-           ]}
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
   schema "ammo_groups" do
@@ -30,7 +19,6 @@ defmodule Cannery.Ammo.AmmoGroup do
     field :notes, :string
     field :price_paid, :float
     field :staged, :boolean, default: false
-    field :purchased_on, :date
 
     belongs_to :ammo_type, AmmoType
     belongs_to :container, Container
@@ -47,7 +35,6 @@ defmodule Cannery.Ammo.AmmoGroup do
           notes: String.t() | nil,
           price_paid: float() | nil,
           staged: boolean(),
-          purchased_on: Date.t(),
           ammo_type: AmmoType.t() | nil,
           ammo_type_id: AmmoType.id(),
           container: Container.t() | nil,
@@ -61,60 +48,22 @@ defmodule Cannery.Ammo.AmmoGroup do
   @type id :: UUID.t()
 
   @doc false
-  @spec create_changeset(
-          new_ammo_group(),
-          AmmoType.t() | nil,
-          Container.t() | nil,
-          User.t(),
-          attrs :: map()
-        ) :: Changeset.t(new_ammo_group())
-  def create_changeset(
-        ammo_group,
-        %AmmoType{id: ammo_type_id},
-        %Container{id: container_id, user_id: user_id},
-        %User{id: user_id},
-        attrs
-      )
-      when not (ammo_type_id |> is_nil()) and not (container_id |> is_nil()) and
-             not (user_id |> is_nil()) do
+  @spec create_changeset(new_ammo_group(), attrs :: map()) :: Changeset.t(new_ammo_group())
+  def create_changeset(ammo_group, attrs) do
     ammo_group
-    |> change(ammo_type_id: ammo_type_id)
-    |> change(user_id: user_id)
-    |> change(container_id: container_id)
-    |> cast(attrs, [:count, :price_paid, :notes, :staged, :purchased_on])
+    |> cast(attrs, [:count, :price_paid, :notes, :staged, :ammo_type_id, :container_id, :user_id])
     |> validate_number(:count, greater_than: 0)
-    |> validate_required([:count, :staged, :purchased_on, :ammo_type_id, :container_id, :user_id])
-  end
-
-  @doc """
-  Invalid changeset, used to prompt user to select ammo type and container
-  """
-  def create_changeset(ammo_group, _invalid_ammo_type, _invalid_container, _invalid_user, attrs) do
-    ammo_group
-    |> cast(attrs, [:ammo_type_id, :container_id])
-    |> validate_required([:ammo_type_id, :container_id])
-    |> add_error(:invalid, dgettext("errors", "Please select an ammo type and container"))
+    |> validate_required([:count, :staged, :ammo_type_id, :container_id, :user_id])
   end
 
   @doc false
-  @spec update_changeset(t() | new_ammo_group(), attrs :: map(), User.t()) ::
+  @spec update_changeset(t() | new_ammo_group(), attrs :: map()) ::
           Changeset.t(t() | new_ammo_group())
-  def update_changeset(ammo_group, attrs, user) do
+  def update_changeset(ammo_group, attrs) do
     ammo_group
-    |> cast(attrs, [:count, :price_paid, :notes, :staged, :purchased_on, :container_id])
+    |> cast(attrs, [:count, :price_paid, :notes, :staged, :ammo_type_id, :container_id])
     |> validate_number(:count, greater_than_or_equal_to: 0)
-    |> validate_container_id(user)
-    |> validate_required([:count, :staged, :purchased_on, :container_id])
-  end
-
-  defp validate_container_id(changeset, user) do
-    container_id = changeset |> Changeset.get_field(:container_id)
-
-    if container_id do
-      Containers.get_container!(container_id, user)
-    end
-
-    changeset
+    |> validate_required([:count, :staged, :ammo_type_id, :container_id, :user_id])
   end
 
   @doc """
@@ -126,6 +75,6 @@ defmodule Cannery.Ammo.AmmoGroup do
   def range_changeset(ammo_group, attrs) do
     ammo_group
     |> cast(attrs, [:count, :staged])
-    |> validate_required([:count, :staged])
+    |> validate_required([:count, :staged, :ammo_type_id, :container_id, :user_id])
   end
 end

lib/cannery/ammo/ammo_type.ex

@@ -11,31 +11,6 @@ defmodule Cannery.Ammo.AmmoType do
   alias Cannery.Ammo.{AmmoGroup, AmmoType}
   alias Ecto.{Changeset, UUID}
 
-  @derive {Jason.Encoder,
-           only: [
-             :id,
-             :name,
-             :desc,
-             :bullet_type,
-             :bullet_core,
-             :cartridge,
-             :caliber,
-             :case_material,
-             :jacket_type,
-             :muzzle_velocity,
-             :powder_type,
-             :powder_grains_per_charge,
-             :grains,
-             :pressure,
-             :primer_type,
-             :firing_type,
-             :tracer,
-             :incendiary,
-             :blank,
-             :corrosive,
-             :manufacturer,
-             :upc
-           ]}
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
   schema "ammo_types" do
@@ -130,12 +105,10 @@ defmodule Cannery.Ammo.AmmoType do
     ]
 
   @doc false
-  @spec create_changeset(new_ammo_type(), User.t(), attrs :: map()) ::
-          Changeset.t(new_ammo_type())
-  def create_changeset(ammo_type, %User{id: user_id}, attrs) do
+  @spec create_changeset(new_ammo_type(), attrs :: map()) :: Changeset.t(new_ammo_type())
+  def create_changeset(ammo_type, attrs) do
     ammo_type
-    |> change(user_id: user_id)
-    |> cast(attrs, changeset_fields())
+    |> cast(attrs, [:user_id | changeset_fields()])
     |> validate_required([:name, :user_id])
   end
 
@@ -145,6 +118,6 @@ defmodule Cannery.Ammo.AmmoType do
   def update_changeset(ammo_type, attrs) do
     ammo_type
     |> cast(attrs, changeset_fields())
-    |> validate_required(:name)
+    |> validate_required([:name, :user_id])
   end
 end

lib/cannery/containers.ex

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

lib/cannery/containers/container.ex

@@ -9,15 +9,6 @@ defmodule Cannery.Containers.Container do
   alias Cannery.Containers.{Container, ContainerTag}
   alias Cannery.{Accounts.User, Ammo.AmmoGroup, Tags.Tag}
 
-  @derive {Jason.Encoder,
-           only: [
-             :id,
-             :name,
-             :desc,
-             :location,
-             :type,
-             :tags
-           ]}
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
   schema "containers" do
@@ -51,12 +42,10 @@ defmodule Cannery.Containers.Container do
   @type id :: UUID.t()
 
   @doc false
-  @spec create_changeset(new_container(), User.t(), attrs :: map()) ::
-          Changeset.t(new_container())
-  def create_changeset(container, %User{id: user_id}, attrs) do
+  @spec create_changeset(new_container(), attrs :: map()) :: Changeset.t(new_container())
+  def create_changeset(container, attrs) do
     container
-    |> change(user_id: user_id)
-    |> cast(attrs, [:name, :desc, :type, :location])
+    |> cast(attrs, [:name, :desc, :type, :location, :user_id])
     |> validate_required([:name, :type, :user_id])
   end
 
@@ -66,6 +55,6 @@ defmodule Cannery.Containers.Container do
   def update_changeset(container, attrs) do
     container
     |> cast(attrs, [:name, :desc, :type, :location])
-    |> validate_required([:name, :type])
+    |> validate_required([:name, :type, :user_id])
   end
 end

lib/cannery/containers/container_tag.ex

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

lib/cannery/invites.ex

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

lib/cannery/invites/invite.ex

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

lib/cannery/tags.ex

@@ -74,8 +74,8 @@ defmodule Cannery.Tags do
   """
   @spec create_tag(attrs :: map(), User.t()) ::
           {:ok, Tag.t()} | {:error, Changeset.t(Tag.new_tag())}
-  def create_tag(attrs, %User{} = user),
-    do: %Tag{} |> Tag.create_changeset(user, attrs) |> Repo.insert()
+  def create_tag(attrs, %User{id: user_id}),
+    do: %Tag{} |> Tag.create_changeset(attrs |> Map.put("user_id", user_id)) |> Repo.insert()
 
   @doc """
   Updates a tag.
@@ -120,4 +120,32 @@ defmodule Cannery.Tags do
   """
   @spec delete_tag!(Tag.t(), User.t()) :: Tag.t()
   def delete_tag!(%Tag{user_id: user_id} = tag, %User{id: user_id}), do: tag |> Repo.delete!()
+
+  @doc """
+  Returns an `%Changeset{}` for tracking tag changes.
+
+  ## Examples
+
+      iex> change_tag(tag)
+      %Changeset{data: %Tag{}}
+
+  """
+  @spec change_tag(Tag.t() | Tag.new_tag()) :: Changeset.t(Tag.t() | Tag.new_tag())
+  @spec change_tag(Tag.t() | Tag.new_tag(), attrs :: map()) ::
+          Changeset.t(Tag.t() | Tag.new_tag())
+  def change_tag(tag, attrs \\ %{}), do: Tag.update_changeset(tag, attrs)
+
+  @doc """
+  Get a random tag bg_color in `#ffffff` hex format
+
+  ## Examples
+
+      iex> random_color()
+      "#cc0066"
+  """
+  @spec random_bg_color() :: <<_::7>>
+  def random_bg_color do
+    ["#cc0066", "#ff6699", "#6666ff", "#0066cc", "#00cc66", "#669900", "#ff9900", "#996633"]
+    |> Enum.random()
+  end
 end

lib/cannery/tags/tag.ex

@@ -9,13 +9,6 @@ defmodule Cannery.Tags.Tag do
   alias Ecto.{Changeset, UUID}
   alias Cannery.{Accounts.User, Tags.Tag}
 
-  @derive {Jason.Encoder,
-           only: [
-             :id,
-             :name,
-             :bg_color,
-             :text_color
-           ]}
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
   schema "tags" do
@@ -42,11 +35,10 @@ defmodule Cannery.Tags.Tag do
   @type id() :: UUID.t()
 
   @doc false
-  @spec create_changeset(new_tag(), User.t(), attrs :: map()) :: Changeset.t(new_tag())
-  def create_changeset(tag, %User{id: user_id}, attrs) do
+  @spec create_changeset(new_tag(), attrs :: map()) :: Changeset.t(new_tag())
+  def create_changeset(tag, attrs) do
     tag
-    |> change(user_id: user_id)
-    |> cast(attrs, [:name, :bg_color, :text_color])
+    |> cast(attrs, [:name, :bg_color, :text_color, :user_id])
     |> validate_required([:name, :bg_color, :text_color, :user_id])
   end
 
@@ -55,6 +47,6 @@ defmodule Cannery.Tags.Tag do
   def update_changeset(tag, attrs) do
     tag
     |> cast(attrs, [:name, :bg_color, :text_color])
-    |> validate_required([:name, :bg_color, :text_color])
+    |> validate_required([:name, :bg_color, :text_color, :user_id])
   end
 end

lib/cannery_web.ex

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

lib/cannery_web/components/add_shot_group_component.ex

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

lib/cannery_web/components/add_shot_group_component.html.heex

@@ -4,7 +4,7 @@
   </h2>
 
   <.form
-    :let={f}
+    let={f}
     for={@changeset}
     id="shot-group-form"
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
@@ -22,16 +22,9 @@
     <%= number_input(f, :ammo_left,
       min: 0,
       max: @ammo_group.count - 1,
-      placeholder: gettext("Rounds left"),
-      class: "input input-primary"
+      placeholder: 0,
+      class: "input input-primary col-span-2"
     ) %>
-    <button
-      type="button"
-      class="mx-2 my-1 text-sm btn btn-primary"
-      phx-click={JS.dispatch("cannery:set-zero", to: "#shot-group-form_ammo_left")}
-    >
-      <%= gettext("Used up!") %>
-    </button>
     <%= error_tag(f, :ammo_left, "col-span-3") %>
 
     <%= label(f, :notes, gettext("Notes"), class: "title text-lg text-primary-600") %>
@@ -42,7 +35,7 @@
     ) %>
     <%= error_tag(f, :notes, "col-span-3") %>
 
-    <%= label(f, :date, gettext("Date"), class: "title text-lg text-primary-600") %>
+    <%= label(f, :date, gettext("Date (UTC)"), class: "title text-lg text-primary-600") %>
     <%= date_input(f, :date,
       class: "input input-primary col-span-2",
       phx_update: "ignore",

lib/cannery_web/components/ammo_group_card.ex

@@ -4,21 +4,11 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
   """
 
   use CanneryWeb, :component
-  alias Cannery.{Ammo, Ammo.AmmoGroup, Repo}
+  alias Cannery.Repo
   alias CanneryWeb.Endpoint
 
-  attr :ammo_group, AmmoGroup, required: true
-  attr :show_container, :boolean, default: false
-  slot(:inner_block)
-
-  def ammo_group_card(%{ammo_group: ammo_group} = assigns) do
-    assigns =
-      %{show_container: show_container} = assigns |> assign_new(:show_container, fn -> false end)
-
-    preloads = if show_container, do: [:ammo_type, :container], else: [:ammo_type]
-    ammo_group = ammo_group |> Repo.preload(preloads)
-
-    assigns = assigns |> assign(:ammo_group, ammo_group)
+  def ammo_group_card(assigns) do
+    assigns = assigns |> assign(:ammo_group, assigns.ammo_group |> Repo.preload(:ammo_type))
 
     ~H"""
     <div
@@ -27,25 +17,19 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
             border border-gray-400 rounded-lg shadow-lg hover:shadow-md
             transition-all duration-300 ease-in-out"
     >
-      <.link navigate={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)} class="mb-2 link">
+      <%= live_redirect to: Routes.ammo_group_show_path(Endpoint, :show, @ammo_group),
+                    class: "mb-2 link" do %>
         <h1 class="title text-xl title-primary-500">
           <%= @ammo_group.ammo_type.name %>
         </h1>
-      </.link>
+      <% end %>
 
       <div class="flex flex-col justify-center items-center">
         <span class="rounded-lg title text-lg">
           <%= gettext("Count:") %>
-          <%= if @ammo_group.count == 0, do: gettext("Empty"), else: @ammo_group.count %>
+          <%= @ammo_group.count %>
         </span>
 
-        <%= if @ammo_group |> Ammo.get_original_count() != @ammo_group.count do %>
-          <span class="rounded-lg title text-lg">
-            <%= gettext("Original Count:") %>
-            <%= @ammo_group |> Ammo.get_original_count() %>
-          </span>
-        <% end %>
-
         <%= if @ammo_group.notes do %>
           <span class="rounded-lg title text-lg">
             <%= gettext("Notes:") %>
@@ -54,17 +38,10 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
         <% end %>
 
         <span class="rounded-lg title text-lg">
-          <%= gettext("Purchased on:") %>
-          <%= @ammo_group.purchased_on |> display_date() %>
+          <%= gettext("Added on:") %>
+          <%= @ammo_group.inserted_at |> display_datetime() %>
         </span>
 
-        <%= if @ammo_group |> Ammo.get_last_used_shot_group() do %>
-          <span class="rounded-lg title text-lg">
-            <%= gettext("Last used on:") %>
-            <%= @ammo_group |> Ammo.get_last_used_shot_group() |> Map.get(:date) |> display_date() %>
-          </span>
-        <% end %>
-
         <%= if @ammo_group.price_paid do %>
           <span class="rounded-lg title text-lg">
             <%= gettext("Price paid:") %>
@@ -72,26 +49,6 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
               amount: @ammo_group.price_paid |> :erlang.float_to_binary(decimals: 2)
             ) %>
           </span>
-
-          <span class="rounded-lg title text-lg">
-            <%= gettext("CPR:") %>
-            <%= gettext("$%{amount}",
-              amount: @ammo_group |> Ammo.get_cpr() |> :erlang.float_to_binary(decimals: 2)
-            ) %>
-          </span>
-        <% end %>
-
-        <%= if @show_container and @ammo_group.container do %>
-          <span class="rounded-lg title text-lg">
-            <%= gettext("Container:") %>
-
-            <.link
-              navigate={Routes.container_show_path(Endpoint, :show, @ammo_group.container)}
-              class="link"
-            >
-              <%= @ammo_group.container.name %>
-            </.link>
-          </span>
         <% end %>
       </div>
 

lib/cannery_web/components/ammo_group_table_component.ex

@@ -1,233 +0,0 @@
-defmodule CanneryWeb.Components.AmmoGroupTableComponent do
-  @moduledoc """
-  A component that displays a list of ammo groups
-  """
-  use CanneryWeb, :live_component
-  alias Cannery.{Accounts.User, Ammo, Ammo.AmmoGroup, Repo}
-  alias Ecto.UUID
-  alias Phoenix.LiveView.{Rendered, Socket}
-
-  @impl true
-  @spec update(
-          %{
-            required(:id) => UUID.t(),
-            required(:current_user) => User.t(),
-            required(:ammo_groups) => [AmmoGroup.t()],
-            optional(:ammo_type) => Rendered.t(),
-            optional(:range) => Rendered.t(),
-            optional(:container) => Rendered.t(),
-            optional(:actions) => Rendered.t(),
-            optional(any()) => any()
-          },
-          Socket.t()
-        ) :: {:ok, Socket.t()}
-  def update(%{id: _id, ammo_groups: _ammo_group, current_user: _current_user} = assigns, socket) do
-    socket =
-      socket
-      |> assign(assigns)
-      |> assign_new(:ammo_type, fn -> [] end)
-      |> assign_new(:range, fn -> [] end)
-      |> assign_new(:container, fn -> [] end)
-      |> assign_new(:actions, fn -> [] end)
-      |> display_ammo_groups()
-
-    {:ok, socket}
-  end
-
-  defp display_ammo_groups(
-         %{
-           assigns: %{
-             ammo_groups: ammo_groups,
-             current_user: current_user,
-             ammo_type: ammo_type,
-             range: range,
-             container: container,
-             actions: actions
-           }
-         } = socket
-       ) do
-    columns =
-      if actions == [] do
-        []
-      else
-        [%{label: nil, key: :actions, sortable: false}]
-      end
-
-    columns = [
-      %{label: gettext("Purchased on"), key: :purchased_on},
-      %{label: gettext("Last used on"), key: :used_up_on} | columns
-    ]
-
-    columns =
-      if container == [] do
-        columns
-      else
-        [%{label: gettext("Container"), key: :container} | columns]
-      end
-
-    columns =
-      if range == [] do
-        columns
-      else
-        [%{label: gettext("Range"), key: :range} | columns]
-      end
-
-    columns = [
-      %{label: gettext("Count"), key: :count},
-      %{label: gettext("Original Count"), key: :original_count},
-      %{label: gettext("Price paid"), key: :price_paid},
-      %{label: gettext("CPR"), key: :cpr},
-      %{label: gettext("% left"), key: :remaining},
-      %{label: gettext("Notes"), key: :notes}
-      | columns
-    ]
-
-    columns =
-      if ammo_type == [] do
-        columns
-      else
-        [%{label: gettext("Ammo type"), key: :ammo_type} | columns]
-      end
-
-    rows =
-      ammo_groups
-      |> Repo.preload([:ammo_type, :container])
-      |> Enum.map(fn ammo_group ->
-        ammo_group
-        |> get_row_data_for_ammo_group(%{
-          current_user: current_user,
-          ammo_type: ammo_type,
-          columns: columns,
-          container: container,
-          actions: actions,
-          range: range
-        })
-      end)
-
-    socket |> assign(columns: columns, rows: rows)
-  end
-
-  @impl true
-  def render(assigns) do
-    ~H"""
-    <div id={@id} class="w-full">
-      <.live_component
-        module={CanneryWeb.Components.TableComponent}
-        id={"table-#{@id}"}
-        columns={@columns}
-        rows={@rows}
-      />
-    </div>
-    """
-  end
-
-  @spec get_row_data_for_ammo_group(AmmoGroup.t(), additional_data :: map()) :: map()
-  defp get_row_data_for_ammo_group(ammo_group, %{columns: columns} = additional_data) do
-    ammo_group = ammo_group |> Repo.preload([:ammo_type, :container])
-
-    columns
-    |> Map.new(fn %{key: key} ->
-      {key, get_value_for_key(key, ammo_group, additional_data)}
-    end)
-  end
-
-  @spec get_value_for_key(atom(), AmmoGroup.t(), additional_data :: map()) ::
-          any() | {any(), Rendered.t()}
-  defp get_value_for_key(
-         :ammo_type,
-         %{ammo_type: %{name: ammo_type_name} = ammo_type},
-         %{ammo_type: ammo_type_block}
-       ) do
-    assigns = %{ammo_type: ammo_type, ammo_type_block: ammo_type_block}
-
-    {ammo_type_name,
-     ~H"""
-     <%= render_slot(@ammo_type_block, @ammo_type) %>
-     """}
-  end
-
-  defp get_value_for_key(:price_paid, %{price_paid: nil}, _additional_data), do: {"", nil}
-
-  defp get_value_for_key(:price_paid, %{price_paid: price_paid}, _additional_data),
-    do: gettext("$%{amount}", amount: price_paid |> :erlang.float_to_binary(decimals: 2))
-
-  defp get_value_for_key(:purchased_on, %{purchased_on: purchased_on}, _additional_data) do
-    assigns = %{purchased_on: purchased_on}
-
-    {purchased_on,
-     ~H"""
-     <%= @purchased_on |> display_date() %>
-     """}
-  end
-
-  defp get_value_for_key(:used_up_on, ammo_group, _additional_data) do
-    last_shot_group_date =
-      case ammo_group |> Ammo.get_last_used_shot_group() do
-        %{date: last_shot_group_date} -> last_shot_group_date
-        _no_shot_groups -> nil
-      end
-
-    assigns = %{last_shot_group_date: last_shot_group_date}
-
-    {last_shot_group_date,
-     ~H"""
-     <%= if @last_shot_group_date do %>
-       <%= @last_shot_group_date |> display_date() %>
-     <% else %>
-       <%= gettext("Never used") %>
-     <% end %>
-     """}
-  end
-
-  defp get_value_for_key(:range, %{staged: staged} = ammo_group, %{range: range}) do
-    assigns = %{range: range, ammo_group: ammo_group}
-
-    {staged,
-     ~H"""
-     <%= render_slot(@range, @ammo_group) %>
-     """}
-  end
-
-  defp get_value_for_key(:remaining, ammo_group, _additional_data),
-    do: gettext("%{percentage}%", percentage: ammo_group |> Ammo.get_percentage_remaining())
-
-  defp get_value_for_key(:actions, ammo_group, %{actions: actions}) do
-    assigns = %{actions: actions, ammo_group: ammo_group}
-
-    ~H"""
-    <%= render_slot(@actions, @ammo_group) %>
-    """
-  end
-
-  defp get_value_for_key(:container, %{container: nil}, _additional_data), do: {nil, nil}
-
-  defp get_value_for_key(
-         :container,
-         %{container: %{name: container_name}} = ammo_group,
-         %{container: container}
-       ) do
-    assigns = %{container: container, ammo_group: ammo_group}
-
-    {container_name,
-     ~H"""
-     <%= render_slot(@container, @ammo_group) %>
-     """}
-  end
-
-  defp get_value_for_key(:original_count, ammo_group, _additional_data),
-    do: ammo_group |> Ammo.get_original_count()
-
-  defp get_value_for_key(:cpr, %{price_paid: nil}, _additional_data),
-    do: gettext("No cost information")
-
-  defp get_value_for_key(:cpr, ammo_group, _additional_data) do
-    gettext("$%{amount}",
-      amount: ammo_group |> Ammo.get_cpr() |> :erlang.float_to_binary(decimals: 2)
-    )
-  end
-
-  defp get_value_for_key(:count, %{count: count}, _additional_data),
-    do: if(count == 0, do: gettext("Empty"), else: count)
-
-  defp get_value_for_key(key, ammo_group, _additional_data), do: ammo_group |> Map.get(key)
-end

lib/cannery_web/components/container_card.ex

@@ -5,20 +5,11 @@ defmodule CanneryWeb.Components.ContainerCard do
 
   use CanneryWeb, :component
   import CanneryWeb.Components.TagCard
-  alias Cannery.{Containers, Containers.Container, Repo}
+  alias Cannery.{Containers, Repo}
   alias CanneryWeb.Endpoint
-  alias Phoenix.LiveView.Rendered
 
-  attr :container, Container, required: true
-  slot(:tag_actions)
-  slot(:inner_block)
-
-  @spec container_card(assigns :: map()) :: Rendered.t()
   def container_card(%{container: container} = assigns) do
-    assigns =
-      assigns
-      |> assign(container: container |> Repo.preload([:tags, :ammo_groups]))
-      |> assign_new(:tag_actions, fn -> [] end)
+    assigns = assigns |> Map.put(:container, container |> Repo.preload([:tags, :ammo_groups]))
 
     ~H"""
     <div
@@ -28,11 +19,12 @@ defmodule CanneryWeb.Components.ContainerCard do
         transition-all duration-300 ease-in-out"
     >
       <div class="max-w-full mb-4 flex flex-col justify-center items-center space-y-2">
-        <.link navigate={Routes.container_show_path(Endpoint, :show, @container)} class="link">
+        <%= live_redirect to: Routes.container_show_path(Endpoint, :show, @container),
+                      class: "link" do %>
           <h1 class="px-4 py-2 rounded-lg title text-xl">
             <%= @container.name %>
           </h1>
-        </.link>
+        <% end %>
 
         <%= if @container.desc do %>
           <span class="rounded-lg title text-lg">
@@ -53,12 +45,7 @@ defmodule CanneryWeb.Components.ContainerCard do
           </span>
         <% end %>
 
-        <%= unless @container.ammo_groups |> Enum.empty?() do %>
-          <span class="rounded-lg title text-lg">
-            <%= gettext("Packs:") %>
-            <%= @container |> Containers.get_container_ammo_group_count!() %>
-          </span>
-
+        <%= if @container.ammo_groups do %>
           <span class="rounded-lg title text-lg">
             <%= gettext("Rounds:") %>
             <%= @container |> Containers.get_container_rounds!() %>
@@ -72,7 +59,9 @@ defmodule CanneryWeb.Components.ContainerCard do
             <% end %>
           <% end %>
 
+          <%= if assigns |> Map.has_key?(:tag_actions) do %>
             <%= render_slot(@tag_actions) %>
+          <% end %>
         </div>
       </div>
 

lib/cannery_web/components/invite_card.ex

@@ -4,23 +4,13 @@ defmodule CanneryWeb.Components.InviteCard do
   """
 
   use CanneryWeb, :component
-  alias Cannery.Invites.Invite
   alias CanneryWeb.Endpoint
 
-  attr :invite, Invite, required: true
-  slot(:inner_block)
-  slot(:code_actions)
-
   def invite_card(assigns) do
-    assigns = assigns |> assign_new(:code_actions, fn -> [] end)
-
     ~H"""
-    <div
-      id={"invite-#{@invite.id}"}
-      class="mx-4 my-2 px-8 py-4 flex flex-col justify-center items-center space-y-4
+    <div class="mx-4 my-2 px-8 py-4 flex flex-col justify-center items-center space-y-4
       border border-gray-400 rounded-lg shadow-lg hover:shadow-md
-      transition-all duration-300 ease-in-out"
-    >
+      transition-all duration-300 ease-in-out">
       <h1 class="title text-xl">
         <%= @invite.name %>
       </h1>
@@ -40,9 +30,13 @@ defmodule CanneryWeb.Components.InviteCard do
         <code
           id={"code-#{@invite.id}"}
           class="mx-2 my-1 text-xs px-4 py-2 rounded-lg text-center break-all text-gray-100 bg-primary-800"
-          phx-no-format
-        ><%= Routes.user_registration_url(Endpoint, :new, invite: @invite.token) %></code>
+        >
+          <%= Routes.user_registration_url(Endpoint, :new, invite: @invite.token) %>
+        </code>
+
+        <%= if @code_actions do %>
           <%= render_slot(@code_actions) %>
+        <% end %>
       </div>
 
       <%= if @inner_block do %>

lib/cannery_web/components/move_ammo_group_component.ex

@@ -22,7 +22,7 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
           assigns,
         socket
       ) do
-    changeset = ammo_group |> AmmoGroup.update_changeset(%{}, current_user)
+    changeset = Ammo.change_ammo_group(ammo_group)
 
     containers =
       Containers.list_containers(current_user)
@@ -52,7 +52,7 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
         {:ok, _ammo_group} ->
           prompt = dgettext("prompts", "Ammo moved to %{name} successfully", name: container_name)
 
-          socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
+          socket |> put_flash(:info, prompt) |> push_redirect(to: return_to)
 
         {:error, %Ecto.Changeset{} = changeset} ->
           socket |> assign(changeset: changeset)
@@ -77,7 +77,7 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
     ~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">
-        <%= dgettext("actions", "Move ammo") %>
+        <%= gettext("Move ammo") %>
       </h2>
 
       <%= if @containers |> Enum.empty?() do %>
@@ -86,9 +86,10 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
           <%= display_emoji("😔") %>
         </h2>
 
-        <.link navigate={Routes.container_index_path(Endpoint, :new)} class="btn btn-primary">
-          <%= dgettext("actions", "Add another container!") %>
-        </.link>
+        <%= 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}
@@ -106,7 +107,7 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
     containers
     |> Enum.map(fn container ->
       columns
-      |> Map.new(fn %{key: key} -> {key, get_row_value_by_key(key, container, assigns)} end)
+      |> Enum.into(%{}, fn %{key: key} -> {key, get_row_value_by_key(key, container, assigns)} end)
     end)
   end
 
@@ -121,7 +122,7 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
         class="btn btn-primary"
         phx-click="move"
         phx-target={@myself}
-        phx-value-container_id={@container.id}
+        phx-value-container_id={container.id}
       >
         <%= dgettext("actions", "Select") %>
       </button>

lib/cannery_web/components/table_component.ex

@@ -6,7 +6,7 @@ defmodule CanneryWeb.Components.TableComponent do
     - `:columns`: An array of maps containing the following keys
       - `:label`: A gettext'd or otherwise user-facing string label for the
         column. Can be nil
-      - `:key`: An atom key used for sorting
+      - `: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.
@@ -21,7 +21,6 @@ defmodule CanneryWeb.Components.TableComponent do
 
   use CanneryWeb, :live_component
   alias Phoenix.LiveView.Socket
-  require Integer
 
   @impl true
   @spec update(
@@ -29,50 +28,26 @@ defmodule CanneryWeb.Components.TableComponent do
             required(:columns) =>
               list(%{
                 required(:label) => String.t() | nil,
-                required(:key) => atom() | nil,
+                required(:key) => String.t() | nil,
                 optional(:class) => String.t(),
-                optional(:row_class) => String.t(),
-                optional(:alternate_row_class) => String.t(),
                 optional(:sortable) => false
               }),
             required(:rows) =>
               list(%{
-                (key :: atom()) => any() | {custom_sort_value :: String.t(), value :: any()}
+                (key :: String.t()) => any() | {custom_sort_value :: String.t(), value :: any()}
               }),
-            optional(:inital_key) => atom(),
-            optional(:initial_sort_mode) => atom(),
             optional(any()) => any()
           },
           Socket.t()
         ) :: {:ok, Socket.t()}
   def update(%{columns: columns, rows: rows} = assigns, socket) do
-    initial_key =
-      if assigns |> Map.has_key?(:initial_key) do
-        assigns.initial_key
-      else
-        columns |> List.first(%{}) |> Map.get(:key)
-      end
-
-    initial_sort_mode =
-      if assigns |> Map.has_key?(:initial_sort_mode) do
-        assigns.initial_sort_mode
-      else
-        :asc
-      end
-
-    rows = rows |> sort_by_custom_sort_value_or_value(initial_key, initial_sort_mode)
+    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: initial_sort_mode
-      )
-      |> assign_new(:row_class, fn -> "bg-white" end)
-      |> assign_new(:alternate_row_class, fn -> "bg-gray-200" end)
+      |> assign(columns: columns, rows: rows, last_sort_key: initial_key, sort_mode: :asc)
 
     {:ok, socket}
   end
@@ -81,19 +56,20 @@ defmodule CanneryWeb.Components.TableComponent do
   def handle_event(
         "sort_by",
         %{"sort-key" => key},
-        %{assigns: %{rows: rows, last_sort_key: last_sort_key, sort_mode: sort_mode}} = socket
+        %{assigns: %{rows: rows, last_sort_key: key, sort_mode: sort_mode}} = socket
       ) do
-    key = key |> String.to_existing_atom()
-
-    sort_mode =
-      case {key, sort_mode} do
-        {^last_sort_key, :asc} -> :desc
-        {^last_sort_key, :desc} -> :asc
-        {_new_sort_key, _last_sort_mode} -> :asc
+    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
 
-    rows = rows |> sort_by_custom_sort_value_or_value(key, sort_mode)
-    {:noreply, socket |> assign(last_sort_key: key, sort_mode: sort_mode, rows: rows)}
+  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

lib/cannery_web/components/table_component.html.heex

@@ -1,4 +1,4 @@
-<div id={@id} class="w-full overflow-x-auto border border-gray-600 rounded-lg shadow-lg bg-white">
+<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>
@@ -6,27 +6,26 @@
           <%= if column |> Map.get(:sortable, true) do %>
             <th class={"p-2 #{column[:class]}"}>
               <span
-                class="cursor-pointer flex justify-center items-center space-x-2"
+                class="cursor-pointer"
                 phx-click="sort_by"
                 phx-value-sort-key={key}
                 phx-target={@myself}
               >
-                <i class="w-0 float-right fas fa-sm fa-chevron-up opacity-0"></i>
-                <span class={if @last_sort_key == key, do: "underline"}><%= label %></span>
+                <span class="underline"><%= label %></span>
                 <%= if @last_sort_key == key do %>
                   <%= case @sort_mode do %>
                     <% :asc -> %>
-                      <i class="w-0 float-right fas fa-sm fa-chevron-down"></i>
+                      <i class="fas fa-sm fa-chevron-down"></i>
                     <% :desc -> %>
-                      <i class="w-0 float-right fas fa-sm fa-chevron-up"></i>
+                      <i class="fas fa-sm fa-chevron-up"></i>
                   <% end %>
                 <% else %>
-                  <i class="w-0 float-right fas fa-sm fa-chevron-up opacity-0"></i>
+                  <i class="fas fa-sm fa-chevron-up opacity-0"></i>
                 <% end %>
               </span>
             </th>
           <% else %>
-            <th class={"p-2 cursor-not-allowed #{column[:class]}"}>
+            <th class={"p-2 #{column[:class]}"}>
               <%= label %>
             </th>
           <% end %>
@@ -34,8 +33,8 @@
       </tr>
     </thead>
     <tbody>
-      <%= for {values, i} <- @rows |> Enum.with_index() do %>
-        <tr class={if i |> Integer.is_even(), do: @row_class, else: @alternate_row_class}>
+      <%= for values <- @rows do %>
+        <tr>
           <%= for %{key: key} = value <- @columns do %>
             <td class={"p-2 #{value[:class]}"}>
               <%= case values |> Map.get(key) do %>

lib/cannery_web/components/tag_card.ex

@@ -4,10 +4,6 @@ defmodule CanneryWeb.Components.TagCard do
   """
 
   use CanneryWeb, :component
-  alias Cannery.Tags.Tag
-
-  attr :tag, Tag, required: true
-  slot(:inner_block, required: true)
 
   def tag_card(assigns) do
     ~H"""
@@ -23,8 +19,6 @@ defmodule CanneryWeb.Components.TagCard do
     """
   end
 
-  attr :tag, Tag, required: true
-
   def simple_tag_card(assigns) do
     ~H"""
     <h1

lib/cannery_web/components/topbar.ex

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

lib/cannery_web/components/user_card.ex

@@ -4,10 +4,6 @@ defmodule CanneryWeb.Components.UserCard do
   """
 
   use CanneryWeb, :component
-  alias Cannery.Accounts.User
-
-  attr :user, User, required: true
-  slot(:inner_block, required: true)
 
   def user_card(assigns) do
     ~H"""

lib/cannery_web/controllers/export_controller.ex

@@ -1,69 +0,0 @@
-defmodule CanneryWeb.ExportController do
-  use CanneryWeb, :controller
-  alias Cannery.{ActivityLog, Ammo, Containers}
-
-  def export(%{assigns: %{current_user: current_user}} = conn, %{"mode" => "json"}) do
-    ammo_types =
-      Ammo.list_ammo_types(current_user)
-      |> Enum.map(fn ammo_type ->
-        average_cost = ammo_type |> Ammo.get_average_cost_for_ammo_type!(current_user)
-        round_count = ammo_type |> Ammo.get_round_count_for_ammo_type(current_user)
-        used_count = ammo_type |> Ammo.get_used_count_for_ammo_type(current_user)
-        ammo_group_count = ammo_type |> Ammo.get_ammo_groups_count_for_type(current_user, true)
-
-        ammo_type
-        |> Jason.encode!()
-        |> Jason.decode!()
-        |> Map.merge(%{
-          "average_cost" => average_cost,
-          "round_count" => round_count,
-          "used_count" => used_count,
-          "ammo_group_count" => ammo_group_count
-        })
-      end)
-
-    ammo_groups =
-      Ammo.list_ammo_groups(current_user, true)
-      |> Enum.map(fn ammo_group ->
-        cpr = ammo_group |> Ammo.get_cpr()
-        used_count = ammo_group |> Ammo.get_used_count()
-        original_count = ammo_group |> Ammo.get_original_count()
-        percentage_remaining = ammo_group |> Ammo.get_percentage_remaining()
-
-        ammo_group
-        |> Jason.encode!()
-        |> Jason.decode!()
-        |> Map.merge(%{
-          "used_count" => used_count,
-          "percentage_remaining" => percentage_remaining,
-          "original_count" => original_count,
-          "cpr" => cpr
-        })
-      end)
-
-    shot_groups = ActivityLog.list_shot_groups(current_user)
-
-    containers =
-      Containers.list_containers(current_user)
-      |> Enum.map(fn container ->
-        ammo_group_count = container |> Containers.get_container_ammo_group_count!()
-        round_count = container |> Containers.get_container_rounds!()
-
-        container
-        |> Jason.encode!()
-        |> Jason.decode!()
-        |> Map.merge(%{
-          "ammo_group_count" => ammo_group_count,
-          "round_count" => round_count
-        })
-      end)
-
-    json(conn, %{
-      user: current_user,
-      ammo_types: ammo_types,
-      ammo_groups: ammo_groups,
-      shot_groups: shot_groups,
-      containers: containers
-    })
-  end
-end

lib/cannery_web/live/ammo_group_live/form_component.ex

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

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

@@ -4,7 +4,7 @@
   </h2>
 
   <.form
-    :let={f}
+    let={f}
     for={@changeset}
     id="ammo_group-form"
     phx-target={@myself}
@@ -38,14 +38,6 @@
     ) %>
     <%= error_tag(f, :price_paid, "col-span-3 text-center") %>
 
-    <%= label(f, :purchased_on, gettext("Purchased on"), class: "title text-lg text-primary-600") %>
-    <%= date_input(f, :purchased_on,
-      class: "input input-primary col-span-2",
-      phx_update: "ignore",
-      value: @changeset |> Changeset.get_field(:purchased_on) || Date.utc_today()
-    ) %>
-    <%= error_tag(f, :purchased_on, "col-span-3 text-center") %>
-
     <%= label(f, :notes, gettext("Notes"), class: "title text-lg text-primary-600") %>
     <%= textarea(f, :notes,
       class: "text-center col-span-2 input input-primary",
@@ -59,8 +51,8 @@
     ) %>
     <%= error_tag(f, :container_id, "col-span-3 text-center") %>
 
-    <%= cond do %>
-      <% @action in [:new, :clone] -> %>
+    <%= case @action do %>
+      <% :new -> %>
         <hr class="hr col-span-3" />
 
         <%= label(f, :multiplier, gettext("Copies"), class: "title text-lg text-primary-600") %>
@@ -77,7 +69,7 @@
         ) %>
 
         <%= error_tag(f, :multiplier, "col-span-3 text-center") %>
-      <% @action == :edit -> %>
+      <% :edit -> %>
         <%= submit(dgettext("actions", "Save"),
           phx_disable_with: dgettext("prompts", "Saving..."),
           class: "mx-auto col-span-3 btn btn-primary"

lib/cannery_web/live/ammo_group_live/index.ex

@@ -9,12 +9,12 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
 
   @impl true
   def mount(_params, _session, socket) do
-    {:ok, socket |> assign(show_used: false)}
+    {:ok, socket |> display_ammo_groups()}
   end
 
   @impl true
   def handle_params(params, _url, %{assigns: %{live_action: live_action}} = socket) do
-    {:noreply, apply_action(socket, live_action, params) |> display_ammo_groups()}
+    {:noreply, apply_action(socket, live_action, params)}
   end
 
   defp apply_action(
@@ -29,22 +29,16 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
 
   defp apply_action(%{assigns: %{current_user: current_user}} = socket, :move, %{"id" => id}) do
     socket
-    |> assign(:page_title, gettext("Move ammo"))
+    |> assign(:page_title, gettext("Move Ammo group"))
     |> assign(:ammo_group, Ammo.get_ammo_group!(id, current_user))
   end
 
   defp apply_action(%{assigns: %{current_user: current_user}} = socket, :edit, %{"id" => id}) do
     socket
-    |> assign(:page_title, gettext("Edit ammo"))
+    |> assign(:page_title, gettext("Edit Ammo group"))
     |> assign(:ammo_group, Ammo.get_ammo_group!(id, current_user))
   end
 
-  defp apply_action(%{assigns: %{current_user: current_user}} = socket, :clone, %{"id" => id}) do
-    socket
-    |> assign(:page_title, dgettext("actions", "Add Ammo"))
-    |> assign(:ammo_group, %{Ammo.get_ammo_group!(id, current_user) | id: nil})
-  end
-
   defp apply_action(socket, :new, _params) do
     socket
     |> assign(:page_title, dgettext("actions", "Add Ammo"))
@@ -52,16 +46,14 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
   end
 
   defp apply_action(socket, :index, _params) do
-    socket
-    |> assign(:page_title, gettext("Ammo"))
-    |> assign(:ammo_group, nil)
+    socket |> assign(:page_title, gettext("Ammo groups")) |> assign(:ammo_group, nil)
   end
 
   @impl true
   def handle_event("delete", %{"id" => id}, %{assigns: %{current_user: current_user}} = socket) do
     Ammo.get_ammo_group!(id, current_user) |> Ammo.delete_ammo_group!(current_user)
 
-    prompt = dgettext("prompts", "Ammo deleted succesfully")
+    prompt = dgettext("prompts", "Ammo group deleted succesfully")
 
     {:noreply, socket |> put_flash(:info, prompt) |> display_ammo_groups()}
   end
@@ -80,26 +72,133 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
     {:noreply, socket |> display_ammo_groups()}
   end
 
-  @impl true
-  def handle_event("toggle_show_used", _params, %{assigns: %{show_used: show_used}} = socket) do
-    {:noreply, socket |> assign(:show_used, !show_used) |> display_ammo_groups()}
-  end
+  defp display_ammo_groups(%{assigns: %{current_user: current_user}} = socket) do
+    ammo_groups = Ammo.list_ammo_groups(current_user) |> Repo.preload([:ammo_type, :container])
+    containers = Containers.list_containers(current_user)
 
-  defp display_ammo_groups(
-         %{assigns: %{current_user: current_user, show_used: show_used}} = socket
-       ) do
-    ammo_groups =
-      Ammo.list_ammo_groups(current_user, show_used)
-      |> Repo.preload([:ammo_type, :container], force: true)
+    columns = [
+      %{label: gettext("Ammo type"), key: "ammo_type"},
+      %{label: gettext("Count"), key: "count"},
+      %{label: gettext("Price paid"), key: "price_paid"},
+      %{label: gettext("% left"), key: "remaining"},
+      %{label: gettext("Range"), key: "range"},
+      %{label: gettext("Container"), key: "container"},
+      %{label: gettext("Added on"), key: "added_on"},
+      %{label: nil, key: "actions", sortable: false}
+    ]
 
-    ammo_types_count = Ammo.get_ammo_types_count!(current_user)
-    containers_count = Containers.get_containers_count!(current_user)
+    rows =
+      ammo_groups
+      |> Enum.map(fn ammo_group -> ammo_group |> get_row_data_for_ammo_group(columns) end)
 
     socket
-    |> assign(
-      ammo_groups: ammo_groups,
-      ammo_types_count: ammo_types_count,
-      containers_count: containers_count
-    )
+    |> 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("added_on", %{inserted_at: inserted_at}) do
+    assigns = %{inserted_at: inserted_at}
+
+    {inserted_at,
+     ~H"""
+     <%= @inserted_at |> display_datetime() %>
+     """}
+  end
+
+  defp get_value_for_key("range", %{staged: staged} = ammo_group) do
+    assigns = %{ammo_group: ammo_group}
+
+    {staged,
+     ~H"""
+     <div class="min-w-20 py-2 px-4 h-full flex flex-col justify-center items-center">
+       <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

@@ -8,139 +8,55 @@
       <%= gettext("No Ammo") %>
       <%= display_emoji("😔") %>
     </h2>
-  <% end %>
 
-  <%= cond do %>
-    <% @containers_count == 0 -> %>
+    <%= if @containers |> Enum.empty?() do %>
       <div class="flex justify-center items-center">
         <h2 class="m-2 title text-md text-primary-600">
           <%= dgettext("prompts", "You'll need to") %>
         </h2>
 
-        <.link navigate={Routes.container_index_path(Endpoint, :new)} class="btn btn-primary">
-          <%= dgettext("actions", "add a container first") %>
-        </.link>
+        <%= live_patch(dgettext("actions", "add a container first"),
+          to: Routes.container_index_path(Endpoint, :new),
+          class: "btn btn-primary"
+        ) %>
       </div>
-    <% @ammo_types_count == 0 -> %>
+    <% else %>
+      <%= live_patch(dgettext("actions", "Add your first box!"),
+        to: Routes.ammo_group_index_path(Endpoint, :new),
+        class: "btn btn-primary"
+      ) %>
+    <% end %>
+  <% else %>
+    <%= if @containers |> Enum.empty?() do %>
       <div class="flex justify-center items-center">
         <h2 class="m-2 title text-md text-primary-600">
           <%= dgettext("prompts", "You'll need to") %>
         </h2>
 
-        <.link navigate={Routes.ammo_type_index_path(Endpoint, :new)} class="btn btn-primary">
-          <%= dgettext("actions", "add an ammo type first") %>
-        </.link>
+        <%= live_patch(dgettext("actions", "add a container first"),
+          to: Routes.container_index_path(Endpoint, :new),
+          class: "btn btn-primary"
+        ) %>
       </div>
-    <% @ammo_groups |> Enum.empty?() -> %>
-      <.link patch={Routes.ammo_group_index_path(Endpoint, :new)} class="btn btn-primary">
-        <%= dgettext("actions", "Add your first box!") %>
-      </.link>
-    <% true -> %>
-      <.link patch={Routes.ammo_group_index_path(Endpoint, :new)} class="btn btn-primary">
-        <%= dgettext("actions", "Add Ammo") %>
-      </.link>
+    <% else %>
+      <%= live_patch(dgettext("actions", "New Ammo group"),
+        to: Routes.ammo_group_index_path(Endpoint, :new),
+        class: "btn btn-primary"
+      ) %>
     <% end %>
 
-  <%= unless @ammo_groups |> Enum.empty?() do %>
-    <div class="flex flex-col space-y-4 justify-center items-center">
-      <.toggle_button action="toggle_show_used" value={@show_used}>
-        <span class="title text-lg text-primary-600">
-          <%= gettext("Show used") %>
-        </span>
-      </.toggle_button>
-    </div>
-
     <.live_component
-      module={CanneryWeb.Components.AmmoGroupTableComponent}
-      id="ammo-group-index-table"
-      ammo_groups={@ammo_groups}
-      current_user={@current_user}
-    >
-      <:ammo_type :let={%{name: ammo_type_name} = ammo_type}>
-        <.link navigate={Routes.ammo_type_show_path(Endpoint, :show, ammo_type)} class="link">
-          <%= ammo_type_name %>
-        </.link>
-      </:ammo_type>
-      <:range :let={ammo_group}>
-        <div class="min-w-20 py-2 px-4 h-full flex flew-wrap justify-center items-center">
-          <button
-            type="button"
-            class="mx-2 my-1 text-sm 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>
-
-          <.link
-            patch={Routes.ammo_group_index_path(Endpoint, :add_shot_group, ammo_group)}
-            class="mx-2 my-1 text-sm btn btn-primary"
-          >
-            <%= dgettext("actions", "Record shots") %>
-          </.link>
-        </div>
-      </:range>
-      <:container :let={%{container: %{name: container_name} = container} = ammo_group}>
-        <div class="min-w-20 py-2 px-4 h-full flex flew-wrap justify-center items-center">
-          <.link
-            navigate={Routes.container_show_path(Endpoint, :show, container)}
-            class="mx-2 my-1 link"
-          >
-            <%= container_name %>
-          </.link>
-
-          <.link
-            patch={Routes.ammo_group_index_path(Endpoint, :move, ammo_group)}
-            class="mx-2 my-1 text-sm btn btn-primary"
-          >
-            <%= gettext("Move ammo") %>
-          </.link>
-        </div>
-      </:container>
-      <:actions :let={ammo_group}>
-        <div class="py-2 px-4 h-full space-x-4 flex justify-center items-center">
-          <.link
-            navigate={Routes.ammo_group_show_path(Endpoint, :show, ammo_group)}
-            class="text-primary-600 link"
-            data-qa={"view-#{ammo_group.id}"}
-          >
-            <i class="fa-fw fa-lg fas fa-eye"></i>
-          </.link>
-
-          <.link
-            patch={Routes.ammo_group_index_path(Endpoint, :edit, ammo_group)}
-            class="text-primary-600 link"
-            data-qa={"edit-#{ammo_group.id}"}
-          >
-            <i class="fa-fw fa-lg fas fa-edit"></i>
-          </.link>
-
-          <.link
-            patch={Routes.ammo_group_index_path(Endpoint, :clone, ammo_group)}
-            class="text-primary-600 link"
-            data-qa={"clone-#{ammo_group.id}"}
-          >
-            <i class="fa-fw fa-lg fas fa-copy"></i>
-          </.link>
-
-          <.link
-            href="#"
-            class="text-primary-600 link"
-            phx-click="delete"
-            phx-value-id={ammo_group.id}
-            data-confirm={dgettext("prompts", "Are you sure you want to delete this ammo?")}
-            data-qa={"delete-#{ammo_group.id}"}
-          >
-            <i class="fa-fw fa-lg fas fa-trash"></i>
-          </.link>
-        </div>
-      </:actions>
-    </.live_component>
+      module={CanneryWeb.Components.TableComponent}
+      id="ammo_groups_index_table"
+      action={@live_action}
+      columns={@columns}
+      rows={@rows}
+    />
   <% end %>
 </div>
 
 <%= cond do %>
-  <% @live_action in [:new, :edit, :clone] -> %>
+  <% @live_action in [:new, :edit] -> %>
     <.modal return_to={Routes.ammo_group_index_path(Endpoint, :index)}>
       <.live_component
         module={CanneryWeb.AmmoGroupLive.FormComponent}
@@ -150,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 -> %>

lib/cannery_web/live/ammo_group_live/show.ex

@@ -30,19 +30,14 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
 
   @impl true
   def handle_params(%{"id" => id}, _url, %{assigns: %{live_action: live_action}} = socket) do
-    socket =
-      socket
-      |> assign(page_title: page_title(live_action))
-      |> display_ammo_group(id)
-
-    {:noreply, socket}
+    {: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")
-  defp page_title(:show), do: gettext("Show Ammo")
-  defp page_title(:edit), do: gettext("Edit Ammo")
+  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(
@@ -52,10 +47,10 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
       ) do
     ammo_group |> Ammo.delete_ammo_group!(current_user)
 
-    prompt = dgettext("prompts", "Ammo deleted succesfully")
+    prompt = dgettext("prompts", "Ammo group deleted succesfully")
     redirect_to = Routes.ammo_group_index_path(socket, :index)
 
-    {:noreply, socket |> put_flash(:info, prompt) |> push_navigate(to: redirect_to)}
+    {:noreply, socket |> put_flash(:info, prompt) |> push_redirect(to: redirect_to)}
   end
 
   @impl true
@@ -74,14 +69,14 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
   def handle_event(
         "delete_shot_group",
         %{"id" => id},
-        %{assigns: %{ammo_group: %{id: ammo_group_id}, current_user: current_user}} = socket
+        %{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_id)}
+    {:noreply, socket |> put_flash(:info, prompt) |> display_ammo_group(ammo_group)}
   end
 
   @spec display_ammo_group(Socket.t(), AmmoGroup.t() | AmmoGroup.id()) :: Socket.t()
@@ -89,10 +84,10 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
     ammo_group = ammo_group |> Repo.preload([:container, :ammo_type, :shot_groups], force: true)
 
     columns = [
-      %{label: gettext("Rounds shot"), key: :count},
-      %{label: gettext("Notes"), key: :notes},
-      %{label: gettext("Date"), key: :date},
-      %{label: nil, key: :actions, sortable: false}
+      %{label: gettext("Rounds shot"), key: "count"},
+      %{label: gettext("Notes"), key: "notes"},
+      %{label: gettext("Date"), key: "date"},
+      %{label: nil, key: "actions", sortable: false}
     ]
 
     rows =
@@ -107,43 +102,41 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
   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()
+  @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
-    |> Map.new(fn %{key: key} ->
+    |> Enum.into(%{}, fn %{key: key} ->
       value =
         case key do
-          :date ->
+          "date" ->
             {date, date |> display_date()}
 
-          :actions ->
+          "actions" ->
             ~H"""
             <div class="px-4 py-2 space-x-4 flex justify-center items-center">
-              <.link
-                patch={Routes.ammo_group_show_path(Endpoint, :edit_shot_group, @ammo_group, @shot_group)}
-                class="text-primary-600 link"
-                data-qa={"edit-#{@shot_group.id}"}
-              >
+              <%= 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>
-              </.link>
+              <% end %>
 
-              <.link
-                href="#"
-                class="text-primary-600 link"
-                phx-click="delete_shot_group"
-                phx-value-id={@shot_group.id}
-                data-confirm={dgettext("prompts", "Are you sure you want to delete this shot record?")}
-                data-qa={"delete-#{@shot_group.id}"}
-              >
+              <%= 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>
-              </.link>
+              <% end %>
             </div>
             """
 
           key ->
-            shot_group |> Map.get(key)
+            shot_group |> Map.get(key |> String.to_existing_atom())
         end
 
       {key, value}

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

@@ -11,12 +11,12 @@
 
     <span class="rounded-lg title text-lg">
       <%= gettext("Original count:") %>
-      <%= Ammo.get_original_count(@ammo_group) %>
+      <%= @ammo_group.count + Ammo.get_used_count(@ammo_group) %>
     </span>
 
     <span class="rounded-lg title text-lg">
       <%= gettext("Percentage left:") %>
-      <%= gettext("%{percentage}%", percentage: @ammo_group |> Ammo.get_percentage_remaining()) %>
+      <%= "#{@ammo_group |> Ammo.get_percentage_remaining()}%" %>
     </span>
 
     <%= if @ammo_group.notes do %>
@@ -27,8 +27,8 @@
     <% end %>
 
     <span class="rounded-lg title text-lg">
-      <%= gettext("Purchased on:") %>
-      <%= @ammo_group.purchased_on |> display_date() %>
+      <%= gettext("Added on:") %>
+      <%= @ammo_group.inserted_at |> display_datetime() %>
     </span>
 
     <%= if @ammo_group.price_paid do %>
@@ -52,54 +52,46 @@
 
   <div class="flex flex-col justify-center items-center">
     <div class="flex flex-wrap justify-center items-center text-primary-600">
-      <.link
-        navigate={Routes.ammo_type_show_path(Endpoint, :show, @ammo_group.ammo_type)}
-        class="mx-4 my-2 btn btn-primary"
-        data-qa="details"
-      >
-        <%= dgettext("actions", "View in Catalog") %>
-      </.link>
+      <%= live_patch(dgettext("actions", "Ammo Details"),
+        to: Routes.ammo_type_show_path(Endpoint, :show, @ammo_group.ammo_type),
+        class: "mx-4 my-2 btn btn-primary",
+        data: [qa: "details"]
+      ) %>
 
-      <.link
-        patch={Routes.ammo_group_show_path(Endpoint, :edit, @ammo_group)}
-        class="mx-4 my-2 text-primary-600 link"
-        data-qa="edit"
-      >
+      <%= live_patch to: Routes.ammo_group_show_path(Endpoint, :edit, @ammo_group),
+                 class: "mx-4 my-2 text-primary-600 link",
+                 data: [qa: "edit"] do %>
         <i class="fa-fw fa-lg fas fa-edit"></i>
-      </.link>
+      <% end %>
 
-      <.link
-        href="#"
-        class="mx-4 my-2 text-primary-600 link"
-        phx-click="delete"
-        data-confirm={dgettext("prompts", "Are you sure you want to delete this ammo?")}
-        data-qa="delete"
-      >
+      <%= link to: "#",
+           class: "mx-4 my-2 text-primary-600 link",
+           phx_click: "delete",
+           data: [
+             confirm: dgettext("prompts", "Are you sure you want to delete this ammo?"),
+             qa: "delete"
+           ] do %>
         <i class="fa-fw fa-lg fas fa-trash"></i>
-      </.link>
+      <% end %>
     </div>
 
     <div class="flex flex-wrap justify-center items-center text-primary-600">
       <button type="button" class="mx-4 my-2 btn btn-primary" phx-click="toggle_staged">
         <%= if @ammo_group.staged,
-          do: dgettext("actions", "Unstage from range"),
-          else: dgettext("actions", "Stage for range") %>
+          do: gettext("Unstage from range"),
+          else: gettext("Stage for range") %>
       </button>
 
-      <.link
-        patch={Routes.ammo_group_show_path(Endpoint, :move, @ammo_group)}
-        class="btn btn-primary"
-        data-qa="move"
-      >
-        <%= dgettext("actions", "Move containers") %>
-      </.link>
+      <%= live_patch(dgettext("actions", "Move containers"),
+        to: Routes.ammo_group_show_path(Endpoint, :move, @ammo_group),
+        class: "btn btn-primary",
+        data: [qa: "move"]
+      ) %>
 
-      <.link
-        patch={Routes.ammo_group_show_path(Endpoint, :add_shot_group, @ammo_group)}
-        class="mx-4 my-2 btn btn-primary"
-      >
-        <%= dgettext("actions", "Record shots") %>
-      </.link>
+      <%= live_patch(dgettext("actions", "Record shots"),
+        to: Routes.ammo_group_show_path(Endpoint, :add_shot_group, @ammo_group),
+        class: "mx-4 my-2 btn btn-primary"
+      ) %>
     </div>
   </div>
 
@@ -113,7 +105,7 @@
 
       <.container_card container={@ammo_group.container} />
     <% else %>
-      <%= gettext("This ammo is not in a container") %>
+      <%= gettext("This ammo group is not in a container") %>
     <% end %>
   </div>
 

lib/cannery_web/live/ammo_type_live/form_component.ex

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

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

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

lib/cannery_web/live/ammo_type_live/index.ex

@@ -10,7 +10,7 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
 
   @impl true
   def mount(_params, _session, socket) do
-    {:ok, socket |> assign(:show_used, false) |> list_ammo_types()}
+    {:ok, socket |> list_ammo_types()}
   end
 
   @impl true
@@ -24,12 +24,6 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
     |> assign(:ammo_type, Ammo.get_ammo_type!(id, current_user))
   end
 
-  defp apply_action(%{assigns: %{current_user: current_user}} = socket, :clone, %{"id" => id}) do
-    socket
-    |> assign(:page_title, gettext("New Ammo type"))
-    |> assign(:ammo_type, %{Ammo.get_ammo_type!(id, current_user) | id: nil})
-  end
-
   defp apply_action(socket, :new, _params) do
     socket
     |> assign(:page_title, gettext("New Ammo type"))
@@ -49,39 +43,34 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
     {:noreply, socket |> put_flash(:info, prompt) |> list_ammo_types()}
   end
 
-  @impl true
-  def handle_event("toggle_show_used", _params, %{assigns: %{show_used: show_used}} = socket) do
-    {:noreply, socket |> assign(:show_used, !show_used) |> list_ammo_types()}
-  end
-
-  defp list_ammo_types(%{assigns: %{current_user: current_user, show_used: show_used}} = socket) do
+  defp list_ammo_types(%{assigns: %{current_user: current_user}} = socket) do
     ammo_types = Ammo.list_ammo_types(current_user)
 
     columns =
       [
-        %{label: gettext("Name"), key: :name, type: :name},
-        %{label: gettext("Bullet type"), key: :bullet_type, type: :string},
-        %{label: gettext("Bullet core"), key: :bullet_core, type: :string},
-        %{label: gettext("Cartridge"), key: :cartridge, type: :string},
-        %{label: gettext("Caliber"), key: :caliber, type: :string},
-        %{label: gettext("Case material"), key: :case_material, type: :string},
-        %{label: gettext("Jacket type"), key: :jacket_type, type: :string},
-        %{label: gettext("Muzzle velocity"), key: :muzzle_velocity, type: :string},
-        %{label: gettext("Powder type"), key: :powder_type, type: :string},
+        %{label: gettext("Name"), key: "name", type: :string},
+        %{label: gettext("Bullet type"), key: "bullet_type", type: :string},
+        %{label: gettext("Bullet core"), key: "bullet_core", type: :string},
+        %{label: gettext("Cartridge"), key: "cartridge", type: :string},
+        %{label: gettext("Caliber"), key: "caliber", type: :string},
+        %{label: gettext("Case material"), key: "case_material", type: :string},
+        %{label: gettext("Jacket type"), key: "jacket_type", type: :string},
+        %{label: gettext("Muzzle velocity"), key: "muzzle_velocity", type: :string},
+        %{label: gettext("Powder type"), key: "powder_type", type: :string},
         %{
           label: gettext("Powder grains per charge"),
-          key: :powder_grains_per_charge,
+          key: "powder_grains_per_charge",
           type: :string
         },
-        %{label: gettext("Grains"), key: :grains, type: :string},
-        %{label: gettext("Pressure"), key: :pressure, type: :string},
-        %{label: gettext("Primer type"), key: :primer_type, type: :string},
-        %{label: gettext("Firing type"), key: :firing_type, type: :string},
-        %{label: gettext("Tracer"), key: :tracer, type: :boolean},
-        %{label: gettext("Incendiary"), key: :incendiary, type: :boolean},
-        %{label: gettext("Blank"), key: :blank, type: :boolean},
-        %{label: gettext("Corrosive"), key: :corrosive, type: :boolean},
-        %{label: gettext("Manufacturer"), key: :manufacturer, type: :string},
+        %{label: gettext("Grains"), key: "grains", type: :string},
+        %{label: gettext("Pressure"), key: "pressure", type: :string},
+        %{label: gettext("Primer type"), key: "primer_type", type: :string},
+        %{label: gettext("Firing type"), key: "firing_type", type: :string},
+        %{label: gettext("Tracer"), key: "tracer", type: :boolean},
+        %{label: gettext("Incendiary"), key: "incendiary", type: :boolean},
+        %{label: gettext("Blank"), key: "blank", type: :boolean},
+        %{label: gettext("Corrosive"), key: "corrosive", type: :boolean},
+        %{label: gettext("Manufacturer"), key: "manufacturer", type: :string},
         %{label: gettext("UPC"), key: "upc", type: :string}
       ]
       |> Enum.filter(fn %{key: key, type: type} ->
@@ -90,51 +79,12 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
 
         ammo_types
         |> Enum.any?(fn ammo_type ->
-          not (ammo_type |> Map.get(key) == default_value)
+          not (ammo_type |> Map.get(key |> String.to_existing_atom()) == default_value)
         end)
       end)
       |> Kernel.++([
-        %{label: gettext("Rounds"), key: :round_count, type: :round_count}
-      ])
-      |> Kernel.++(
-        if show_used do
-          [
-            %{
-              label: gettext("Used rounds"),
-              key: :used_round_count,
-              type: :used_round_count
-            },
-            %{
-              label: gettext("Total ever rounds"),
-              key: :historical_round_count,
-              type: :historical_round_count
-            }
-          ]
-        else
-          []
-        end
-      )
-      |> Kernel.++([%{label: gettext("Packs"), key: :ammo_count, type: :ammo_count}])
-      |> Kernel.++(
-        if show_used do
-          [
-            %{
-              label: gettext("Used packs"),
-              key: :used_ammo_count,
-              type: :used_ammo_count
-            },
-            %{
-              label: gettext("Total ever packs"),
-              key: :historical_ammo_count,
-              type: :historical_ammo_count
-            }
-          ]
-        else
-          []
-        end
-      )
-      |> Kernel.++([
-        %{label: gettext("Average CPR"), key: :avg_price_paid, type: :avg_price_paid},
+        %{label: gettext("Total # of rounds"), key: "round_count", type: :round_count},
+        %{label: gettext("Average Price paid"), key: "avg_price_paid", type: :avg_price_paid},
         %{label: nil, key: "actions", type: :actions, sortable: false}
       ])
 
@@ -147,32 +97,17 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
 
   defp get_ammo_type_values(ammo_type, columns, current_user) do
     columns
-    |> Map.new(fn %{key: key, type: type} ->
+    |> Enum.into(%{}, fn %{key: key, type: type} ->
       {key, get_ammo_type_value(type, key, ammo_type, current_user)}
     end)
   end
 
   defp get_ammo_type_value(:boolean, key, ammo_type, _current_user),
-    do: ammo_type |> Map.get(key) |> humanize()
+    do: ammo_type |> Map.get(key |> String.to_existing_atom()) |> humanize()
 
   defp get_ammo_type_value(:round_count, _key, ammo_type, current_user),
     do: ammo_type |> Ammo.get_round_count_for_ammo_type(current_user)
 
-  defp get_ammo_type_value(:historical_round_count, _key, ammo_type, current_user),
-    do: ammo_type |> Ammo.get_historical_count_for_ammo_type(current_user)
-
-  defp get_ammo_type_value(:used_round_count, _key, ammo_type, current_user),
-    do: ammo_type |> Ammo.get_used_count_for_ammo_type(current_user)
-
-  defp get_ammo_type_value(:historical_ammo_count, _key, ammo_type, current_user),
-    do: ammo_type |> Ammo.get_ammo_groups_count_for_type(current_user, true)
-
-  defp get_ammo_type_value(:used_ammo_count, _key, ammo_type, current_user),
-    do: ammo_type |> Ammo.get_used_ammo_groups_count_for_type(current_user)
-
-  defp get_ammo_type_value(:ammo_count, _key, ammo_type, current_user),
-    do: ammo_type |> Ammo.get_ammo_groups_count_for_type(current_user)
-
   defp get_ammo_type_value(:avg_price_paid, _key, ammo_type, current_user) do
     case ammo_type |> Ammo.get_average_cost_for_ammo_type!(current_user) do
       nil -> gettext("No cost information")
@@ -180,70 +115,39 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
     end
   end
 
-  defp get_ammo_type_value(:name, _key, ammo_type, _current_user) do
-    assigns = %{ammo_type: ammo_type}
-
-    ~H"""
-    <.link
-      navigate={Routes.ammo_type_show_path(Endpoint, :show, @ammo_type)}
-      class="link"
-      data-qa={"view-name-#{@ammo_type.id}"}
-    >
-      <%= @ammo_type.name %>
-    </.link>
-    """
-  end
-
   defp get_ammo_type_value(:actions, _key, ammo_type, _current_user) do
     assigns = %{ammo_type: ammo_type}
 
     ~H"""
     <div class="px-4 py-2 space-x-4 flex justify-center items-center">
-      <.link
-        navigate={Routes.ammo_type_show_path(Endpoint, :show, @ammo_type)}
-        class="text-primary-600 link"
-        data-qa={"view-#{@ammo_type.id}"}
-      >
+      <%= 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>
-      </.link>
+      <% end %>
 
-      <.link
-        patch={Routes.ammo_type_index_path(Endpoint, :edit, @ammo_type)}
-        class="text-primary-600 link"
-        data-qa={"edit-#{@ammo_type.id}"}
-      >
+      <%= 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>
-      </.link>
+      <% end %>
 
-      <.link
-        patch={Routes.ammo_type_index_path(Endpoint, :clone, @ammo_type)}
-        class="text-primary-600 link"
-        data-qa={"clone-#{@ammo_type.id}"}
-      >
-        <i class="fa-fw fa-lg fas fa-copy"></i>
-      </.link>
-
-      <.link
-        href="#"
-        class="text-primary-600 link"
-        phx-click="delete"
-        phx-value-id={@ammo_type.id}
-        data-confirm={
-          dgettext(
-            "prompts",
-            "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!",
-            name: @ammo_type.name
-          )
-        }
-        data-qa={"delete-#{@ammo_type.id}"}
-      >
+      <%= 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>
-      </.link>
+      <% end %>
     </div>
     """
   end
 
   defp get_ammo_type_value(nil, _key, _ammo_type, _current_user), do: nil
 
-  defp get_ammo_type_value(_other, key, ammo_type, _current_user), do: ammo_type |> Map.get(key)
+  defp get_ammo_type_value(_other, key, ammo_type, _current_user),
+    do: ammo_type |> Map.get(key |> String.to_existing_atom())
 end

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

@@ -1,29 +1,23 @@
 <div class="flex flex-col space-y-8 justify-center items-center">
   <h1 class="title text-2xl title-primary-500">
-    <%= gettext("Catalog") %>
+    <%= gettext("Ammo Types") %>
   </h1>
 
   <%= if @rows |> Enum.empty?() do %>
     <h2 class="title text-xl text-primary-600">
-      <%= gettext("No Ammo types") %>
+      <%= gettext("No Ammo Types") %>
       <%= display_emoji("😔") %>
     </h2>
 
-    <.link patch={Routes.ammo_type_index_path(Endpoint, :new)} class="btn btn-primary">
-      <%= dgettext("actions", "Add your first type!") %>
-    </.link>
+    <%= live_patch(dgettext("actions", "Add your first type!"),
+      to: Routes.ammo_type_index_path(Endpoint, :new),
+      class: "btn btn-primary"
+    ) %>
   <% else %>
-    <.link patch={Routes.ammo_type_index_path(Endpoint, :new)} class="btn btn-primary">
-      <%= dgettext("actions", "New Ammo type") %>
-    </.link>
-
-    <div class="flex flex-col justify-center items-center">
-      <.toggle_button action="toggle_show_used" value={@show_used}>
-        <span class="title text-lg text-primary-600">
-          <%= gettext("Show used") %>
-        </span>
-      </.toggle_button>
-    </div>
+    <%= live_patch(dgettext("actions", "New Ammo type"),
+      to: Routes.ammo_type_index_path(Endpoint, :new),
+      class: "btn btn-primary"
+    ) %>
 
     <.live_component
       module={CanneryWeb.Components.TableComponent}
@@ -35,7 +29,7 @@
   <% end %>
 </div>
 
-<%= if @live_action in [:new, :edit, :clone] do %>
+<%= if @live_action in [:new, :edit] do %>
   <.modal return_to={Routes.ammo_type_index_path(Endpoint, :index)}>
     <.live_component
       module={CanneryWeb.AmmoTypeLive.FormComponent}

lib/cannery_web/live/ammo_type_live/show.ex

@@ -5,41 +5,24 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
 
   use CanneryWeb, :live_view
   import CanneryWeb.Components.AmmoGroupCard
-  alias Cannery.{Ammo, Ammo.AmmoType}
+  alias Cannery.Ammo
   alias CanneryWeb.Endpoint
 
-  @fields_list [
-    %{label: gettext("Bullet type:"), key: :bullet_type, type: :string},
-    %{label: gettext("Bullet core:"), key: :bullet_core, type: :string},
-    %{label: gettext("Cartridge:"), key: :cartridge, type: :string},
-    %{label: gettext("Caliber:"), key: :caliber, type: :string},
-    %{label: gettext("Case material:"), key: :case_material, type: :string},
-    %{label: gettext("Jacket type:"), key: :jacket_type, type: :string},
-    %{label: gettext("Muzzle velocity:"), key: :muzzle_velocity, type: :string},
-    %{label: gettext("Powder type:"), key: :powder_type, type: :string},
-    %{label: gettext("Powder grains per charge:"), key: :powder_grains_per_charge, type: :string},
-    %{label: gettext("Grains:"), key: :grains, type: :string},
-    %{label: gettext("Pressure:"), key: :pressure, type: :string},
-    %{label: gettext("Primer type:"), key: :primer_type, type: :string},
-    %{label: gettext("Firing type:"), key: :firing_type, type: :string},
-    %{label: gettext("Tracer:"), key: :tracer, type: :boolean},
-    %{label: gettext("Incendiary:"), key: :incendiary, type: :boolean},
-    %{label: gettext("Blank:"), key: :blank, type: :boolean},
-    %{label: gettext("Corrosive:"), key: :corrosive, type: :boolean},
-    %{label: gettext("Manufacturer:"), key: :manufacturer, type: :string},
-    %{label: gettext("UPC:"), key: :upc, type: :string}
-  ]
+  @impl true
+  def mount(_params, _session, socket), do: {:ok, socket}
 
   @impl true
-  def mount(_params, _session, %{assigns: %{live_action: live_action}} = socket),
-    do: {:ok, socket |> assign(show_used: false, view_table: live_action == :table)}
+  def handle_params(%{"id" => id}, _params, %{assigns: %{current_user: current_user}} = socket) do
+    ammo_type = Ammo.get_ammo_type!(id, current_user)
 
-  @impl true
-  def handle_params(%{"id" => id}, _params, %{assigns: %{live_action: live_action}} = socket) do
     socket =
       socket
-      |> assign(view_table: live_action == :table)
-      |> display_ammo_type(id)
+      |> assign(
+        page_title: page_title(socket.assigns.live_action),
+        ammo_type: ammo_type,
+        ammo_groups: ammo_type |> Ammo.list_ammo_groups_for_type(current_user),
+        avg_cost_per_round: ammo_type |> Ammo.get_average_cost_for_ammo_type!(current_user)
+      )
 
     {:noreply, socket}
   end
@@ -55,67 +38,9 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
     prompt = dgettext("prompts", "%{name} deleted succesfully", name: ammo_type_name)
     redirect_to = Routes.ammo_type_index_path(socket, :index)
 
-    {:noreply, socket |> put_flash(:info, prompt) |> push_navigate(to: redirect_to)}
+    {:noreply, socket |> put_flash(:info, prompt) |> push_redirect(to: redirect_to)}
   end
 
-  @impl true
-  def handle_event("toggle_show_used", _params, %{assigns: %{show_used: show_used}} = socket) do
-    {:noreply, socket |> assign(:show_used, !show_used) |> display_ammo_type()}
-  end
-
-  @impl true
-  def handle_event(
-        "toggle_table",
-        _params,
-        %{assigns: %{view_table: view_table, ammo_type: ammo_type}} = socket
-      ) do
-    new_path =
-      if view_table,
-        do: Routes.ammo_type_show_path(Endpoint, :show, ammo_type),
-        else: Routes.ammo_type_show_path(Endpoint, :table, ammo_type)
-
-    {:noreply, socket |> push_patch(to: new_path)}
-  end
-
-  defp display_ammo_type(
-         %{assigns: %{live_action: live_action, current_user: current_user, show_used: show_used}} =
-           socket,
-         %AmmoType{} = ammo_type
-       ) do
-    fields_to_display =
-      @fields_list
-      |> Enum.any?(fn %{key: field, type: type} ->
-        default_value =
-          case type do
-            :boolean -> false
-            _other_type -> nil
-          end
-
-        ammo_type |> Map.get(field) != default_value
-      end)
-
-    socket
-    |> assign(
-      page_title: page_title(live_action, ammo_type),
-      ammo_type: ammo_type,
-      ammo_groups: ammo_type |> Ammo.list_ammo_groups_for_type(current_user, show_used),
-      avg_cost_per_round: ammo_type |> Ammo.get_average_cost_for_ammo_type!(current_user),
-      fields_list: @fields_list,
-      fields_to_display: fields_to_display
-    )
-  end
-
-  defp display_ammo_type(%{assigns: %{current_user: current_user}} = socket, ammo_type_id) do
-    socket |> display_ammo_type(Ammo.get_ammo_type!(ammo_type_id, current_user))
-  end
-
-  defp display_ammo_type(%{assigns: %{ammo_type: ammo_type}} = socket) do
-    socket |> display_ammo_type(ammo_type)
-  end
-
-  defp page_title(action, %{name: ammo_type_name}) when action in [:show, :table],
-    do: ammo_type_name
-
-  defp page_title(:edit, %{name: ammo_type_name}),
-    do: gettext("Edit %{ammo_type_name}", ammo_type_name: ammo_type_name)
+  defp page_title(:show), do: gettext("Show Ammo type")
+  defp page_title(:edit), do: gettext("Edit Ammo type")
 end

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

@@ -1,4 +1,5 @@
-<div class="space-y-4 flex flex-col justify-center items-center">
+<div class="mx-auto px-4 sm:px-8 space-y-4 max-w-3xl
+  flex flex-col justify-center items-center">
   <h1 class="title text-2xl title-primary-500">
     <%= @ammo_type.name %>
   </h1>
@@ -12,59 +13,66 @@
   <% end %>
 
   <div class="flex space-x-4 justify-center items-center text-primary-600">
-    <.link
-      patch={Routes.ammo_type_show_path(Endpoint, :edit, @ammo_type)}
-      class="text-primary-600 link"
-      data-qa="edit"
-    >
+    <%= live_patch to: Routes.ammo_type_show_path(Endpoint, :edit, @ammo_type),
+               class: "text-primary-600 link",
+               data: [qa: "edit"] do %>
       <i class="fa-fw fa-lg fas fa-edit"></i>
-    </.link>
+    <% end %>
 
-    <.link
-      href="#"
-      class="text-primary-600 link"
-      phx-click="delete"
-      data-confirm={
-        dgettext(
-          "prompts",
-          "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!",
-          name: @ammo_type.name
-        )
-      }
-      data-qa="delete"
-    >
+    <%= link to: "#",
+         class: "text-primary-600 link",
+         phx_click: "delete",
+         data: [
+           confirm:
+             dgettext("prompts", "Are you sure you want to delete %{name}?", name: @ammo_type.name),
+           qa: "delete"
+         ] do %>
       <i class="fa-fw fa-lg fas fa-trash"></i>
-    </.link>
+    <% end %>
   </div>
 
   <hr class="hr" />
 
-  <%= if @fields_to_display do %>
   <div class="grid sm:grid-cols-2 gap-4 text-center justify-center items-center">
-      <%= for %{label: label, key: key, type: type} <- @fields_list do %>
-        <%= if @ammo_type |> Map.get(key) do %>
+    <%= for {field_name, field, type} <- [
+          {gettext("Bullet type"), :bullet_type, :string},
+          {gettext("Bullet core"), :bullet_core, :string},
+          {gettext("Cartridge"), :cartridge, :string},
+          {gettext("Caliber"), :caliber, :string},
+          {gettext("Case material"), :case_material, :string},
+          {gettext("Jacket type"), :jacket_type, :string},
+          {gettext("Muzzle velocity"), :muzzle_velocity, :string},
+          {gettext("Powder type"), :powder_type, :string},
+          {gettext("Powder grains per charge"), :powder_grains_per_charge, :string},
+          {gettext("Grains"), :grains, :string},
+          {gettext("Pressure"), :pressure, :string},
+          {gettext("Primer type"), :primer_type, :string},
+          {gettext("Firing type"), :firing_type, :string},
+          {gettext("Tracer"), :tracer, :boolean},
+          {gettext("Incendiary"), :incendiary, :boolean},
+          {gettext("Blank"), :blank, :boolean},
+          {gettext("Corrosive"), :corrosive, :boolean},
+          {gettext("Manufacturer"), :manufacturer, :string},
+          {gettext("UPC"), :upc, :string}
+        ] do %>
+      <%= if @ammo_type |> Map.get(field) do %>
         <h3 class="title text-lg">
-            <%= label %>
+          <%= field_name %>:
         </h3>
 
         <span class="text-primary-600">
           <%= case type do %>
             <% :boolean -> %>
-                <%= @ammo_type |> Map.get(key) |> humanize() %>
+              <%= @ammo_type |> Map.get(field) |> humanize() %>
             <% _ -> %>
-                <%= @ammo_type |> Map.get(key) %>
+              <%= @ammo_type |> Map.get(field) %>
           <% end %>
         </span>
       <% end %>
     <% end %>
-    </div>
 
-    <hr class="hr" />
-  <% end %>
-
-  <div class="grid sm:grid-cols-2 gap-4 text-center justify-center items-center">
     <h3 class="title text-lg">
-      <%= gettext("Rounds:") %>
+      <%= gettext("Current # of rounds:") %>
     </h3>
 
     <span class="text-primary-600">
@@ -72,53 +80,13 @@
     </span>
 
     <h3 class="title text-lg">
-      <%= gettext("Used rounds:") %>
+      <%= gettext("Total rounds shot:") %>
     </h3>
 
     <span class="text-primary-600">
       <%= @ammo_type |> Ammo.get_used_count_for_ammo_type(@current_user) %>
     </span>
 
-    <h3 class="title text-lg">
-      <%= gettext("Total ever rounds:") %>
-    </h3>
-
-    <span class="text-primary-600">
-      <%= @ammo_type |> Ammo.get_historical_count_for_ammo_type(@current_user) %>
-    </span>
-  </div>
-
-  <hr class="hr" />
-
-  <div class="grid sm:grid-cols-2 gap-4 text-center justify-center items-center">
-    <h3 class="title text-lg">
-      <%= gettext("Packs:") %>
-    </h3>
-
-    <span class="text-primary-600">
-      <%= @ammo_type |> Ammo.get_ammo_groups_count_for_type(@current_user) %>
-    </span>
-
-    <h3 class="title text-lg">
-      <%= gettext("Used packs:") %>
-    </h3>
-
-    <span class="text-primary-600">
-      <%= @ammo_type |> Ammo.get_used_ammo_groups_count_for_type(@current_user) %>
-    </span>
-
-    <h3 class="title text-lg">
-      <%= gettext("Total ever packs:") %>
-    </h3>
-
-    <span class="text-primary-600">
-      <%= @ammo_type |> Ammo.get_ammo_groups_count_for_type(@current_user, true) %>
-    </span>
-  </div>
-
-  <hr class="hr" />
-
-  <div class="grid sm:grid-cols-2 gap-4 text-center justify-center items-center">
     <h3 class="title text-lg">
       <%= gettext("Added on:") %>
     </h3>
@@ -129,7 +97,7 @@
 
     <%= if @avg_cost_per_round do %>
       <h3 class="title text-lg">
-        <%= gettext("Average CPR") %>:
+        <%= gettext("Average Price paid") %>:
       </h3>
 
       <span class="text-primary-600">
@@ -146,51 +114,19 @@
 
   <hr class="hr" />
 
-  <div class="flex justify-center items-center space-x-4">
-    <.toggle_button action="toggle_show_used" value={@show_used}>
-      <span class="title text-lg text-primary-600">
-        <%= gettext("Show used") %>
-      </span>
-    </.toggle_button>
-
-    <.toggle_button action="toggle_table" value={@view_table}>
-      <span class="title text-lg text-primary-600">
-        <%= gettext("View as table") %>
-      </span>
-    </.toggle_button>
-  </div>
-
-  <div class="w-full p-4">
+  <div>
     <%= if @ammo_groups |> Enum.empty?() do %>
-      <h2 class="px-4 title text-lg text-primary-600">
+      <h2 class="mx-8 my-4 title text-lg text-primary-600">
         <%= gettext("No ammo for this type") %>
         <%= display_emoji("😔") %>
       </h2>
-    <% else %>
-      <%= if @view_table do %>
-        <.live_component
-          module={CanneryWeb.Components.AmmoGroupTableComponent}
-          id="ammo-type-show-table"
-          ammo_groups={@ammo_groups}
-          current_user={@current_user}
-        >
-          <:container :let={%{container: %{name: container_name} = container}}>
-            <.link
-              navigate={Routes.container_show_path(Endpoint, :show, container)}
-              class="mx-2 my-1 link"
-            >
-              <%= container_name %>
-            </.link>
-          </:container>
-        </.live_component>
     <% else %>
       <div class="flex flex-wrap justify-center items-center">
         <%= for ammo_group <- @ammo_groups do %>
-            <.ammo_group_card ammo_group={ammo_group} show_container={true} />
+          <.ammo_group_card ammo_group={ammo_group} />
         <% end %>
       </div>
     <% end %>
-    <% end %>
   </div>
 </div>
 

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

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

lib/cannery_web/live/container_live/form_component.ex

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

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

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

lib/cannery_web/live/container_live/index.ex

@@ -6,11 +6,11 @@ defmodule CanneryWeb.ContainerLive.Index do
   use CanneryWeb, :live_view
   import CanneryWeb.Components.ContainerCard
   alias Cannery.{Containers, Containers.Container, Repo}
-  alias CanneryWeb.{Components.TagCard, Endpoint}
+  alias CanneryWeb.Endpoint
   alias Ecto.Changeset
 
   @impl true
-  def mount(_params, _session, socket), do: {:ok, socket |> assign(view_table: false)}
+  def mount(_params, _session, socket), do: {:ok, socket}
 
   @impl true
   def handle_params(params, _url, %{assigns: %{live_action: live_action}} = socket) do
@@ -31,29 +31,10 @@ defmodule CanneryWeb.ContainerLive.Index do
     socket |> assign(:page_title, gettext("New Container")) |> assign(:container, %Container{})
   end
 
-  defp apply_action(%{assigns: %{current_user: current_user}} = socket, :clone, %{"id" => id}) do
-    container = Containers.get_container!(id, current_user)
-
-    socket
-    |> assign(page_title: gettext("New Container"), container: %{container | id: nil})
-  end
-
   defp apply_action(socket, :index, _params) do
     socket
-    |> assign(
-      page_title: gettext("Containers"),
-      container: nil
-    )
-    |> display_containers()
-  end
-
-  defp apply_action(socket, :table, _params) do
-    socket
-    |> assign(
-      page_title: gettext("Containers"),
-      container: nil,
-      view_table: true
-    )
+    |> assign(:page_title, gettext("Containers"))
+    |> assign(:container, nil)
     |> display_containers()
   end
 
@@ -102,148 +83,10 @@ defmodule CanneryWeb.ContainerLive.Index do
     {:noreply, socket}
   end
 
-  @impl true
-  def handle_event("toggle_table", _params, %{assigns: %{view_table: view_table}} = socket) do
-    new_path =
-      if view_table,
-        do: Routes.container_index_path(Endpoint, :index),
-        else: Routes.container_index_path(Endpoint, :table)
-
-    {:noreply, socket |> assign(view_table: !view_table) |> push_patch(to: new_path)}
-  end
-
   defp display_containers(%{assigns: %{current_user: current_user}} = socket) do
     containers =
       Containers.list_containers(current_user) |> Repo.preload([:tags, :ammo_groups], force: true)
 
-    columns =
-      [
-        %{label: gettext("Name"), key: :name, type: :string},
-        %{label: gettext("Description"), key: :desc, type: :string},
-        %{label: gettext("Location"), key: :location, type: :string},
-        %{label: gettext("Type"), key: :type, type: :string},
-        %{label: gettext("Packs"), key: :packs, type: :integer},
-        %{label: gettext("Rounds"), key: :rounds, type: :string},
-        %{label: gettext("Tags"), key: :tags, type: :tags},
-        %{label: nil, key: :actions, sortable: false, type: :actions}
-      ]
-      |> Enum.filter(fn %{key: key, type: type} ->
-        # remove columns if all values match defaults
-        default_value =
-          case type do
-            :boolean -> false
-            _other_type -> nil
+    socket |> assign(containers: containers)
   end
-
-        containers
-        |> Enum.any?(fn container ->
-          type in [:tags, :actions] or not (container |> Map.get(key) == default_value)
-        end)
-      end)
-
-    rows =
-      containers
-      |> Enum.map(fn container -> container |> get_row_data_for_container(columns) end)
-
-    socket
-    |> assign(
-      containers: containers,
-      columns: columns,
-      rows: rows
-    )
-  end
-
-  @spec get_row_data_for_container(Container.t(), [map()]) :: map()
-  defp get_row_data_for_container(container, columns) do
-    container = container |> Repo.preload([:ammo_groups, :tags])
-
-    columns
-    |> Map.new(fn %{key: key} -> {key, get_value_for_key(key, container)} end)
-  end
-
-  @spec get_value_for_key(atom(), Container.t()) :: any()
-  defp get_value_for_key(:name, %{id: id, name: container_name}) do
-    assigns = %{id: id, container_name: container_name}
-
-    {container_name,
-     ~H"""
-     <div class="flex flex-wrap justify-center items-center">
-       <.link navigate={Routes.container_show_path(Endpoint, :show, @id)} class="link">
-         <%= @container_name %>
-       </.link>
-     </div>
-     """}
-  end
-
-  defp get_value_for_key(:packs, container) do
-    container |> Containers.get_container_ammo_group_count!()
-  end
-
-  defp get_value_for_key(:rounds, container) do
-    container |> Containers.get_container_rounds!()
-  end
-
-  defp get_value_for_key(:tags, container) do
-    assigns = %{container: container}
-
-    {container.tags |> Enum.map(fn %{name: name} -> name end),
-     ~H"""
-     <div class="flex flex-wrap justify-center items-center">
-       <%= unless @container.tags |> Enum.empty?() do %>
-         <%= for tag <- @container.tags do %>
-           <TagCard.simple_tag_card tag={tag} />
-         <% end %>
-       <% end %>
-
-       <div class="mx-4 my-2">
-         <.link
-           patch={Routes.container_index_path(Endpoint, :edit_tags, @container)}
-           class="text-primary-600 link"
-         >
-           <i class="fa-fw fa-lg fas fa-tags"></i>
-         </.link>
-       </div>
-     </div>
-     """}
-  end
-
-  defp get_value_for_key(:actions, container) do
-    assigns = %{container: container}
-
-    ~H"""
-    <.link
-      patch={Routes.container_index_path(Endpoint, :edit, @container)}
-      class="text-primary-600 link"
-      data-qa={"edit-#{@container.id}"}
-    >
-      <i class="fa-fw fa-lg fas fa-edit"></i>
-    </.link>
-
-    <.link
-      patch={Routes.container_index_path(Endpoint, :clone, @container)}
-      class="text-primary-600 link"
-      data-qa={"clone-#{@container.id}"}
-    >
-      <i class="fa-fw fa-lg fas fa-copy"></i>
-    </.link>
-
-    <.link
-      href="#"
-      class="text-primary-600 link"
-      phx-click="delete"
-      phx-value-id={@container.id}
-      data-confirm={
-        dgettext("prompts", "Are you sure you want to delete %{name}?", name: @container.name)
-      }
-      data-qa={"delete-#{@container.id}"}
-    >
-      <i class="fa-fw fa-lg fas fa-trash"></i>
-    </.link>
-    """
-  end
-
-  defp get_value_for_key(key, container), do: container |> Map.get(key)
-
-  def return_to(true = _view_table), do: Routes.container_index_path(Endpoint, :table)
-  def return_to(false = _view_table), do: Routes.container_index_path(Endpoint, :index)
 end

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

@@ -9,95 +9,66 @@
       <%= display_emoji("😔") %>
     </h2>
 
-    <.link patch={Routes.container_index_path(Endpoint, :new)} class="btn btn-primary">
-      <%= dgettext("actions", "Add your first container!") %>
-    </.link>
+    <%= live_patch(dgettext("actions", "Add your first container!"),
+      to: Routes.container_index_path(Endpoint, :new),
+      class: "btn btn-primary"
+    ) %>
   <% else %>
-    <.link patch={Routes.container_index_path(Endpoint, :new)} class="btn btn-primary">
-      <%= dgettext("actions", "New Container") %>
-    </.link>
-
-    <div class="flex flex-col justify-center items-center">
-      <.toggle_button action="toggle_table" value={@view_table}>
-        <span class="title text-lg text-primary-600">
-          <%= gettext("View as table") %>
-        </span>
-      </.toggle_button>
-    </div>
+    <%= live_patch(dgettext("actions", "New Container"),
+      to: Routes.container_index_path(Endpoint, :new),
+      class: "btn btn-primary"
+    ) %>
   <% end %>
 
-  <div class="w-full flex flex-row flex-wrap justify-center items-center">
-    <%= if @view_table do %>
-      <.live_component
-        module={CanneryWeb.Components.TableComponent}
-        id="containers_index_table"
-        action={@live_action}
-        columns={@columns}
-        rows={@rows}
-      />
-    <% else %>
+  <div class="max-w-full flex flex-row flex-wrap justify-center items-center">
     <%= for container <- @containers do %>
       <.container_card container={container}>
         <:tag_actions>
           <div class="mx-4 my-2">
-              <.link
-                patch={Routes.container_index_path(Endpoint, :edit_tags, container)}
-                class="text-primary-600 link"
-              >
+            <%= live_patch to: Routes.container_index_path(Endpoint, :edit_tags, container),
+              class: "text-primary-600 link" do %>
               <i class="fa-fw fa-lg fas fa-tags"></i>
-              </.link>
+            <% end %>
           </div>
         </:tag_actions>
-          <.link
-            patch={Routes.container_index_path(Endpoint, :edit, container)}
-            class="text-primary-600 link"
-            data-qa={"edit-#{container.id}"}
-          >
+        <%= live_patch to: Routes.container_index_path(Endpoint, :edit, container),
+                   class: "text-primary-600 link",
+                   data: [qa: "edit-#{container.id}"] do %>
           <i class="fa-fw fa-lg fas fa-edit"></i>
-          </.link>
+        <% end %>
 
-          <.link
-            patch={Routes.container_index_path(Endpoint, :clone, container)}
-            class="text-primary-600 link"
-            data-qa={"clone-#{container.id}"}
-          >
-            <i class="fa-fw fa-lg fas fa-copy"></i>
-          </.link>
-
-          <.link
-            href="#"
-            class="text-primary-600 link"
-            phx-click="delete"
-            phx-value-id={container.id}
-            data-confirm={
-              dgettext("prompts", "Are you sure you want to delete %{name}?", name: container.name)
-            }
-            data-qa={"delete-#{container.id}"}
-          >
+        <%= link to: "#",
+             class: "text-primary-600 link",
+             phx_click: "delete",
+             phx_value_id: container.id,
+             data: [
+               confirm:
+                 dgettext("prompts", "Are you sure you want to delete %{name}?", name: container.name),
+               qa: "delete-#{container.id}"
+             ] do %>
           <i class="fa-fw fa-lg fas fa-trash"></i>
-          </.link>
+        <% end %>
       </.container_card>
     <% end %>
-    <% end %>
   </div>
 </div>
 
-<%= if @live_action in [:new, :edit, :clone] do %>
-  <.modal return_to={return_to(@view_table)}>
+<%= if @live_action in [:new, :edit] do %>
+  <.modal return_to={Routes.container_index_path(Endpoint, :index)}>
     <.live_component
       module={CanneryWeb.ContainerLive.FormComponent}
       id={@container.id || :new}
       title={@page_title}
       action={@live_action}
       container={@container}
-      return_to={return_to(@view_table)}
+      return_to={Routes.container_index_path(Endpoint, :index)}
       current_user={@current_user}
     />
   </.modal>
 <% end %>
 
 <%= if @live_action == :edit_tags do %>
-  <.modal return_to={return_to(@view_table)}>
+  <.modal return_to={Routes.container_index_path(Endpoint, :index)}>
     <.live_component
       module={CanneryWeb.ContainerLive.EditTagsComponent}
       id={@container.id}

lib/cannery_web/live/container_live/show.ex

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

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

@@ -1,4 +1,4 @@
-<div class="space-y-4 flex flex-col justify-center items-center">
+<div class="mx-auto space-y-4 max-w-3xl flex flex-col justify-center items-center">
   <h1 class="title text-2xl title-primary-500">
     <%= @container.name %>
   </h1>
@@ -22,46 +22,23 @@
     </span>
   <% end %>
 
-  <%= unless @ammo_groups |> Enum.empty?() do %>
-    <span class="rounded-lg title text-lg">
-      <%= if @show_used do %>
-        <%= gettext("Total packs:") %>
-      <% else %>
-        <%= gettext("Packs:") %>
-      <% end %>
-      <%= Enum.count(@ammo_groups) %>
-    </span>
-
-    <span class="rounded-lg title text-lg">
-      <%= if @show_used do %>
-        <%= gettext("Total rounds:") %>
-      <% else %>
-        <%= gettext("Rounds:") %>
-      <% end %>
-      <%= @container |> Containers.get_container_rounds!() %>
-    </span>
-  <% end %>
-
   <div class="flex space-x-4 justify-center items-center text-primary-600">
-    <.link
-      patch={Routes.container_show_path(Endpoint, :edit, @container)}
-      class="text-primary-600 link"
-      data-qa="edit"
-    >
+    <%= live_patch to: Routes.container_show_path(Endpoint, :edit, @container),
+               class: "text-primary-600 link",
+               data: [qa: "edit"] do %>
       <i class="fa-fw fa-lg fas fa-edit"></i>
-    </.link>
+    <% end %>
 
-    <.link
-      href="#"
-      class="text-primary-600 link"
-      phx-click="delete_container"
-      data-confirm={
-        dgettext("prompts", "Are you sure you want to delete %{name}?", name: @container.name)
-      }
-      data-qa="delete"
-    >
+    <%= link to: "#",
+         class: "text-primary-600 link",
+         phx_click: "delete_container",
+         data: [
+           confirm:
+             dgettext("prompts", "Are you sure you want to delete %{name}?", name: @container.name),
+           qa: "delete"
+         ] do %>
       <i class="fa-fw fa-lg fas fa-trash"></i>
-    </.link>
+    <% end %>
   </div>
 
   <hr class="mb-4 hr" />
@@ -73,12 +50,10 @@
         <%= display_emoji("😔") %>
       </h2>
 
-      <.link
-        patch={Routes.container_show_path(Endpoint, :edit_tags, @container)}
-        class="btn btn-primary"
-      >
-        <%= dgettext("actions", "Why not add one?") %>
-      </.link>
+      <%= live_patch(dgettext("actions", "Why not add one?"),
+        to: Routes.container_show_path(Endpoint, :edit_tags, @container),
+        class: "btn btn-primary"
+      ) %>
     </div>
   <% else %>
     <div class="flex flex-wrap justify-center items-center">
@@ -87,59 +62,28 @@
       <% end %>
 
       <div class="mx-4 my-2">
-        <.link
-          patch={Routes.container_show_path(Endpoint, :edit_tags, @container)}
-          class="text-primary-600 link"
-        >
+        <%= live_patch to: Routes.container_show_path(Endpoint, :edit_tags, @container),
+          class: "text-primary-600 link" do %>
           <i class="fa-fw fa-lg fas fa-tags"></i>
-        </.link>
+        <% end %>
       </div>
     </div>
   <% end %>
 
   <hr class="mb-4 hr" />
 
-  <div class="flex justify-center items-center space-x-4">
-    <.toggle_button action="toggle_show_used" value={@show_used}>
-      <span class="title text-lg text-primary-600">
-        <%= gettext("Show used") %>
-      </span>
-    </.toggle_button>
-
-    <.toggle_button action="toggle_table" value={@view_table}>
-      <span class="title text-lg text-primary-600">
-        <%= gettext("View as table") %>
-      </span>
-    </.toggle_button>
-  </div>
-
-  <div class="w-full p-4">
-    <%= if @ammo_groups |> Enum.empty?() do %>
-      <h2 class="mx-4 title text-lg text-primary-600 text-center">
-        <%= gettext("No ammo in this container") %>
+  <div>
+    <%= if @container.ammo_groups |> Enum.empty?() do %>
+      <h2 class="mx-8 my-4 title text-lg text-primary-600">
+        <%= gettext("No ammo groups in this container") %>
       </h2>
-    <% else %>
-      <%= if @view_table do %>
-        <.live_component
-          module={CanneryWeb.Components.AmmoGroupTableComponent}
-          id="ammo-type-show-table"
-          ammo_groups={@ammo_groups}
-          current_user={@current_user}
-        >
-          <:ammo_type :let={%{name: ammo_type_name} = ammo_type}>
-            <.link navigate={Routes.ammo_type_show_path(Endpoint, :show, ammo_type)} class="link">
-              <%= ammo_type_name %>
-            </.link>
-          </:ammo_type>
-        </.live_component>
     <% else %>
       <div class="flex flex-wrap justify-center items-center">
-          <%= for ammo_group <- @ammo_groups do %>
+        <%= for ammo_group <- @container.ammo_groups do %>
           <.ammo_group_card ammo_group={ammo_group} />
         <% end %>
       </div>
     <% end %>
-    <% end %>
   </div>
 </div>
 

lib/cannery_web/live/home_live.ex

@@ -5,28 +5,37 @@ defmodule CanneryWeb.HomeLive do
 
   use CanneryWeb, :live_view
   alias Cannery.Accounts
-  alias CanneryWeb.Endpoint
-
-  @version Mix.Project.config()[:version]
 
   @impl true
   def mount(_params, _session, socket) do
     admins = Accounts.list_users_by_role(:admin)
-    socket = socket |> assign(page_title: gettext("Home"), admins: admins, version: @version)
+    socket = socket |> assign(page_title: "Home", query: "", results: %{}, admins: admins)
     {:ok, socket}
   end
 
+  @impl true
+  def handle_event("suggest", %{"q" => query}, socket) do
+    {:noreply, socket |> assign(results: search(query), query: query)}
+  end
+
+  @impl true
+  def handle_event("search", %{"q" => query}, socket) do
+    case search(query) do
+      %{^query => vsn} ->
+        {:noreply, redirect(socket, external: "https://hexdocs.pm/#{query}/#{vsn}")}
+
+      _no_query ->
+        {:noreply,
+         socket
+         |> put_flash(:error, "No dependencies found matching \"#{query}\"")
+         |> assign(results: %{}, query: query)}
+    end
+  end
+
   @impl true
   def render(assigns) do
     ~H"""
     <div class="mx-auto px-8 sm:px-16 flex flex-col justify-center items-center text-center space-y-4 max-w-3xl">
-      <img
-        src={Routes.static_path(Endpoint, "/images/cannery.svg")}
-        alt={gettext("Cannery logo")}
-        class="inline-block w-32 hover:-mt-2 hover:mb-2 transition-all duration-500 ease-in-out"
-        title={gettext("isn't he cute >:3")}
-      />
-
       <h1 class="title text-primary-600 text-2xl">
         <%= gettext("Welcome to %{name}", name: "Cannery") %>
       </h1>
@@ -84,12 +93,10 @@ defmodule CanneryWeb.HomeLive do
           </b>
           <p>
             <%= if @admins |> Enum.empty?() do %>
-              <.link
-                href={Routes.user_registration_path(CanneryWeb.Endpoint, :new)}
-                class="hover:underline"
-              >
-                <%= dgettext("prompts", "Register to setup %{name}", name: "Cannery") %>
-              </.link>
+              <%= link(dgettext("prompts", "Register to setup %{name}", name: "Cannery"),
+                class: "hover:underline",
+                to: Routes.user_registration_path(CanneryWeb.Endpoint, :new)
+              ) %>
             <% else %>
               <div class="flex flex-wrap justify-center space-x-2">
                 <%= for admin <- @admins do %>
@@ -115,17 +122,13 @@ defmodule CanneryWeb.HomeLive do
 
         <li class="flex flex-row justify-center items-center space-x-2">
           <b>Version:</b>
-          <.link
-            href="https://gitea.bubbletea.dev/shibao/cannery/src/branch/stable/CHANGELOG.md"
-            class="flex flex-row justify-center items-center space-x-2 hover:underline"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            <p>
-              <%= @version %>
-            </p>
+          <%= link class: "flex flex-row justify-center items-center space-x-2 hover:underline",
+                to: "https://gitea.bubbletea.dev/shibao/cannery/src/branch/stable/CHANGELOG.md",
+                target: "_blank",
+                rel: "noopener noreferrer" do %>
+            <p>0.5.3</p>
             <i class="fas fa-md fa-info-circle"></i>
-          </.link>
+          <% end %>
         </li>
       </ul>
 
@@ -137,40 +140,46 @@ defmodule CanneryWeb.HomeLive do
         </h2>
 
         <li class="flex flex-col justify-center space-x-2">
-          <.link
-            class="flex flex-row justify-center items-center space-x-2 hover:underline"
-            href="https://gitea.bubbletea.dev/shibao/cannery"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
+          <%= link class: "flex flex-row justify-center items-center space-x-2 hover:underline",
+                to: "https://gitea.bubbletea.dev/shibao/cannery",
+                target: "_blank",
+                rel: "noopener noreferrer" do %>
             <p><%= gettext("View the source code") %></p>
             <i class="fas fa-md fa-code"></i>
-          </.link>
+          <% end %>
         </li>
         <li class="flex flex-col justify-center space-x-2">
-          <.link
-            class="flex flex-row justify-center items-center space-x-2 hover:underline"
-            href="https://weblate.bubbletea.dev/engage/cannery"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
+          <%= link class: "flex flex-row justify-center items-center space-x-2 hover:underline",
+              to: "https://weblate.bubbletea.dev/engage/cannery",
+              target: "_blank",
+              rel: "noopener noreferrer" do %>
             <p><%= gettext("Help translate") %></p>
             <i class="fas fa-md fa-language"></i>
-          </.link>
+          <% end %>
         </li>
         <li class="flex flex-col justify-center space-x-2">
-          <.link
-            class="flex flex-row justify-center items-center space-x-2 hover:underline"
-            href="https://gitea.bubbletea.dev/shibao/cannery/issues/new"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
+          <%= link class: "flex flex-row justify-center items-center space-x-2 hover:underline",
+              to: "https://gitea.bubbletea.dev/shibao/cannery/issues/new",
+              target: "_blank",
+              rel: "noopener noreferrer" do %>
             <p><%= gettext("Report bugs or request features") %></p>
             <i class="fas fa-md fa-spider"></i>
-          </.link>
+          <% end %>
         </li>
       </ul>
     </div>
     """
   end
+
+  defp search(query) do
+    if not CanneryWeb.Endpoint.config(:code_reloader) do
+      raise "action disabled when not in development"
+    end
+
+    for {app, desc, vsn} <- Application.started_applications(),
+        app = to_string(app),
+        String.starts_with?(app, query) and not List.starts_with?(desc, ~c"ERTS"),
+        into: %{},
+        do: {app, vsn}
+  end
 end

lib/cannery_web/live/init_assigns.ex

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

lib/cannery_web/live/invite_live/form_component.ex

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

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

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

lib/cannery_web/live/invite_live/index.ex

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

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

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

lib/cannery_web/live/live_helpers.ex

@@ -3,7 +3,7 @@ defmodule CanneryWeb.LiveHelpers do
   Contains common helper functions for liveviews
   """
 
-  import Phoenix.Component
+  import Phoenix.LiveView.Helpers
   alias Phoenix.LiveView.JS
 
   @doc """
@@ -27,17 +27,17 @@ defmodule CanneryWeb.LiveHelpers do
   """
   def modal(assigns) do
     ~H"""
-    <.link
-      patch={@return_to}
-      id="modal-bg"
-      class="fade-in fixed z-10 left-0 top-0
+    <%= live_patch to: @return_to,
+      id: "modal-bg",
+      class:
+        "fade-in fixed z-10 left-0 top-0
          w-full h-full overflow-hidden
-         p-8 flex flex-col justify-center items-center cursor-auto"
-      style="background-color: rgba(0,0,0,0.4);"
-      phx_remove={hide_modal()}
-    >
+         p-8 flex flex-col justify-center items-center cursor-auto",
+      style: "background-color: rgba(0,0,0,0.4);",
+      phx_remove: hide_modal()
+    do %>
       <span class="hidden"></span>
-    </.link>
+    <% end %>
 
     <div
       id="modal"
@@ -53,16 +53,15 @@ defmodule CanneryWeb.LiveHelpers do
         flex flex-col justify-start items-center
         bg-white border-2 rounded-lg"
       >
-        <.link
-          patch={@return_to}
-          id="close"
-          class="absolute top-8 right-10
+        <%= live_patch to: @return_to,
+                   id: "close",
+                   class:
+                     "absolute top-8 right-10
                       text-gray-500 hover:text-gray-800
-                      transition-all duration-500 ease-in-out"
-          phx_remove={hide_modal()}
-        >
+                      transition-all duration-500 ease-in-out",
+                   phx_remove: hide_modal() do %>
           <i class="fa-fw fa-lg fas fa-times"></i>
-        </.link>
+        <% end %>
 
         <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) %>
@@ -72,57 +71,10 @@ defmodule CanneryWeb.LiveHelpers do
     """
   end
 
-  defp hide_modal(js \\ %JS{}) do
+  def hide_modal(js \\ %JS{}) do
     js
     |> JS.hide(to: "#modal", transition: "fade-out")
     |> JS.hide(to: "#modal-bg", transition: "fade-out")
     |> JS.hide(to: "#modal-content", transition: "fade-out-scale")
   end
-
-  @doc """
-  A toggle button element that can be directed to a liveview or a
-  live_component's `handle_event/3`.
-
-  ## Examples
-
-  <.toggle_button action="my_liveview_action" value={@some_value}>
-    <span>Toggle me!</span>
-  </.toggle_button>
-  <.toggle_button action="my_live_component_action" target={@myself} value={@some_value}>
-    <span>Whatever you want</span>
-  </.toggle_button>
-  """
-  def toggle_button(assigns) do
-    assigns = assigns |> assign_new(:id, fn -> assigns.action end)
-
-    ~H"""
-    <label for={@id} class="inline-flex relative items-center cursor-pointer">
-      <input
-        id={@id}
-        type="checkbox"
-        value={@value}
-        checked={@value}
-        class="sr-only peer"
-        data-qa={@id}
-        {
-          if assigns |> Map.has_key?(:target),
-            do: %{"phx-click" => @action, "phx-value-value" => @value, "phx-target" => @target},
-            else: %{"phx-click" => @action, "phx-value-value" => @value}
-        }
-      />
-      <div class="w-11 h-6 bg-gray-300 rounded-full peer
-        peer-focus:ring-4 peer-focus:ring-teal-300 dark:peer-focus:ring-teal-800
-        peer-checked:bg-gray-600
-        peer-checked:after:translate-x-full peer-checked:after:border-white
-        after:content-[''] after:absolute after:top-1 after:left-[2px] after:bg-white after:border-gray-300
-        after:border after:rounded-full after:h-5 after:w-5
-        after:transition-all after:duration-250 after:ease-in-out
-        transition-colors duration-250 ease-in-out">
-      </div>
-      <span class="ml-3 text-sm font-medium text-gray-900 dark:text-gray-300">
-        <%= render_slot(@inner_block) %>
-      </span>
-    </label>
-    """
-  end
 end

lib/cannery_web/live/range_live/form_component.ex

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

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

@@ -4,7 +4,7 @@
   </h2>
 
   <.form
-    :let={f}
+    let={f}
     for={@changeset}
     id="shot-group-form"
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
@@ -33,7 +33,7 @@
     ) %>
     <%= error_tag(f, :notes, "col-span-3") %>
 
-    <%= label(f, :date, gettext("Date"), class: "title text-lg text-primary-600") %>
+    <%= label(f, :date, gettext("Date (UTC)"), class: "title text-lg text-primary-600") %>
     <%= date_input(f, :date, class: "input input-primary col-span-2") %>
     <%= error_tag(f, :notes, "col-span-3") %>
 

lib/cannery_web/live/range_live/index.ex

@@ -65,7 +65,7 @@ defmodule CanneryWeb.RangeLive.Index do
     {:ok, _ammo_group} =
       ammo_group |> Ammo.update_ammo_group(%{"staged" => !ammo_group.staged}, current_user)
 
-    prompt = dgettext("prompts", "Ammo unstaged succesfully")
+    prompt = dgettext("prompts", "Ammo group unstaged succesfully")
     {:noreply, socket |> put_flash(:info, prompt) |> display_shot_groups()}
   end
 
@@ -77,95 +77,64 @@ defmodule CanneryWeb.RangeLive.Index do
     ammo_groups = Ammo.list_staged_ammo_groups(current_user)
 
     columns = [
-      %{label: gettext("Ammo"), key: :name},
-      %{label: gettext("Rounds shot"), key: :count},
-      %{label: gettext("Notes"), key: :notes},
-      %{label: gettext("Date"), key: :date},
-      %{label: nil, key: :actions, sortable: false}
+      %{label: gettext("Ammo"), key: "name"},
+      %{label: gettext("Rounds shot"), key: "count"},
+      %{label: gettext("Notes"), key: "notes"},
+      %{label: gettext("Date"), key: "date"},
+      %{label: nil, key: "actions", sortable: false}
     ]
 
     rows =
       shot_groups
       |> Enum.map(fn shot_group -> shot_group |> get_row_data_for_shot_group(columns) end)
 
-    chart_data = shot_groups |> get_chart_data_for_shot_group()
-
     socket
-    |> assign(
-      ammo_groups: ammo_groups,
-      columns: columns,
-      rows: rows,
-      chart_data: chart_data,
-      shot_groups: shot_groups
-    )
+    |> assign(ammo_groups: ammo_groups, columns: columns, rows: rows, shot_groups: shot_groups)
   end
 
-  @spec get_chart_data_for_shot_group([ShotGroup.t()]) :: [map()]
-  defp get_chart_data_for_shot_group(shot_groups) do
-    shot_groups
-    |> Repo.preload(ammo_group: :ammo_type)
-    |> Enum.group_by(fn %{date: date} -> date end, fn %{count: count} -> count end)
-    |> Enum.map(fn {date, rounds} ->
-      sum = Enum.sum(rounds)
-
-      %{
-        date: date,
-        count: sum,
-        label: gettext("Rounds shot: %{count}", count: sum)
-      }
-    end)
-    |> Enum.sort_by(fn %{date: date} -> date end)
-  end
-
-  @spec get_row_data_for_shot_group(ShotGroup.t(), [map()]) :: map()
+  @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
-    |> Map.new(fn %{key: key} ->
+    |> Enum.into(%{}, fn %{key: key} ->
       value =
         case key do
-          :name ->
+          "name" ->
             {shot_group.ammo_group.ammo_type.name,
-             ~H"""
-             <.link
-               navigate={Routes.ammo_group_show_path(Endpoint, :show, @shot_group.ammo_group)}
-               class="link"
-             >
-               <%= @shot_group.ammo_group.ammo_type.name %>
-             </.link>
-             """}
+             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" ->
             date |> display_date()
 
-          :actions ->
+          "actions" ->
             ~H"""
             <div class="px-4 py-2 space-x-4 flex justify-center items-center">
-              <.link
-                patch={Routes.range_index_path(Endpoint, :edit, @shot_group)}
-                class="text-primary-600 link"
-                data-qa={"edit-#{@shot_group.id}"}
-              >
+              <%= 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>
-              </.link>
+              <% end %>
 
-              <.link
-                href="#"
-                class="text-primary-600 link"
-                phx-click="delete"
-                phx-value-id={@shot_group.id}
-                data-confirm={dgettext("prompts", "Are you sure you want to delete this shot record?")}
-                data-qa={"delete-#{@shot_group.id}"}
-              >
+              <%= 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>
-              </.link>
+              <% end %>
             </div>
             """
 
           key ->
-            shot_group |> Map.get(key)
+            shot_group |> Map.get(key |> String.to_existing_atom())
         end
 
       {key, value}

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

@@ -9,13 +9,15 @@
       <%= display_emoji("😔") %>
     </h1>
 
-    <.link navigate={Routes.ammo_group_index_path(Endpoint, :index)} class="btn btn-primary">
-      <%= dgettext("actions", "Why not get some ready to shoot?") %>
-    </.link>
+    <%= live_patch(dgettext("actions", "Why not get some ready to shoot?"),
+      to: Routes.ammo_group_index_path(Endpoint, :index),
+      class: "btn btn-primary"
+    ) %>
   <% else %>
-    <.link navigate={Routes.ammo_group_index_path(Endpoint, :index)} class="btn btn-primary">
-      <%= dgettext("actions", "Stage ammo") %>
-    </.link>
+    <%= live_patch(dgettext("actions", "Stage ammo"),
+      to: Routes.ammo_group_index_path(Endpoint, :index),
+      class: "btn btn-primary"
+    ) %>
 
     <%= for ammo_group <- @ammo_groups do %>
       <.ammo_group_card ammo_group={ammo_group}>
@@ -27,16 +29,14 @@
           data-confirm={"#{dgettext("prompts", "Are you sure you want to unstage this ammo?")}"}
         >
           <%= if ammo_group.staged,
-            do: dgettext("actions", "Unstage from range"),
-            else: dgettext("actions", "Stage for range") %>
+            do: gettext("Unstage from range"),
+            else: gettext("Stage for range") %>
         </button>
 
-        <.link
-          patch={Routes.range_index_path(Endpoint, :add_shot_group, ammo_group)}
-          class="btn btn-primary"
-        >
-          <%= dgettext("actions", "Record shots") %>
-        </.link>
+        <%= live_patch(dgettext("actions", "Record shots"),
+          to: Routes.range_index_path(Endpoint, :add_shot_group, ammo_group),
+          class: "btn btn-primary"
+        ) %>
       </.ammo_group_card>
     <% end %>
   <% end %>
@@ -53,27 +53,11 @@
       <%= gettext("Shot log") %>
     </h1>
 
-    <canvas
-      id="shot-log-chart"
-      phx-hook="ShotLogChart"
-      phx-update="ignore"
-      class="max-h-72"
-      data-chart-data={Jason.encode!(@chart_data)}
-      data-label={gettext("Rounds shot")}
-      data-color={random_color()}
-      aria-label={gettext("Rounds shot chart")}
-      role="img"
-    >
-      <%= dgettext("errors", "Your browser does not support the canvas element.") %>
-    </canvas>
-
     <.live_component
       module={CanneryWeb.Components.TableComponent}
       id="shot_groups_index_table"
       columns={@columns}
       rows={@rows}
-      initial_key={:date}
-      initial_sort_mode={:desc}
     />
   <% end %>
 </div>

lib/cannery_web/live/tag_live/form_component.ex

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

lib/cannery_web/live/tag_live/index.ex

@@ -6,7 +6,7 @@ defmodule CanneryWeb.TagLive.Index do
   use CanneryWeb, :live_view
   import CanneryWeb.Components.TagCard
   alias Cannery.{Tags, Tags.Tag}
-  alias CanneryWeb.{Endpoint, ViewHelpers}
+  alias CanneryWeb.Endpoint
 
   @impl true
   def mount(_params, _session, socket), do: {:ok, socket |> display_tags()}
@@ -25,7 +25,7 @@ defmodule CanneryWeb.TagLive.Index do
   defp apply_action(socket, :new, _params) do
     socket
     |> assign(:page_title, gettext("New Tag"))
-    |> assign(:tag, %Tag{bg_color: ViewHelpers.random_color(), text_color: "#ffffff"})
+    |> assign(:tag, %Tag{bg_color: Tags.random_bg_color(), text_color: "#ffffff"})
   end
 
   defp apply_action(socket, :index, _params) do

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

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

lib/cannery_web/router.ex

@@ -11,7 +11,7 @@ defmodule CanneryWeb.Router do
     plug :protect_from_forgery
     plug :put_secure_browser_headers
     plug :fetch_current_user
-    plug :put_user_locale, default: Application.compile_env(:gettext, :default_locale, "en_US")
+    plug :put_user_locale, default: Application.get_env(:gettext, :default_locale, "en_US")
   end
 
   defp put_user_locale(%{assigns: %{current_user: %{locale: locale}}} = conn, default: default) do
@@ -60,45 +60,38 @@ defmodule CanneryWeb.Router do
     put "/users/settings", UserSettingsController, :update
     delete "/users/settings/:id", UserSettingsController, :delete
     get "/users/settings/confirm_email/:token", UserSettingsController, :confirm_email
-    get "/export/:mode", ExportController, :export
 
     live "/tags", TagLive.Index, :index
     live "/tags/new", TagLive.Index, :new
     live "/tags/:id/edit", TagLive.Index, :edit
 
-    live "/catalog", AmmoTypeLive.Index, :index
-    live "/catalog/new", AmmoTypeLive.Index, :new
-    live "/catalog/:id/clone", AmmoTypeLive.Index, :clone
-    live "/catalog/:id/edit", AmmoTypeLive.Index, :edit
+    live "/ammo_types", AmmoTypeLive.Index, :index
+    live "/ammo_types/new", AmmoTypeLive.Index, :new
+    live "/ammo_types/:id/edit", AmmoTypeLive.Index, :edit
 
-    live "/catalog/:id/show", AmmoTypeLive.Show, :show
-    live "/catalog/:id/show/edit", AmmoTypeLive.Show, :edit
-    live "/catalog/:id/show/table", AmmoTypeLive.Show, :table
+    live "/ammo_types/:id", AmmoTypeLive.Show, :show
+    live "/ammo_types/:id/show/edit", AmmoTypeLive.Show, :edit
 
     live "/containers", ContainerLive.Index, :index
-    live "/containers/table", ContainerLive.Index, :table
     live "/containers/new", ContainerLive.Index, :new
     live "/containers/:id/edit", ContainerLive.Index, :edit
-    live "/containers/:id/clone", ContainerLive.Index, :clone
     live "/containers/:id/edit_tags", ContainerLive.Index, :edit_tags
 
-    live "/containers/:id/show", ContainerLive.Show, :show
-    live "/containers/:id/show/table", ContainerLive.Show, :table
+    live "/containers/:id", ContainerLive.Show, :show
     live "/containers/:id/show/edit", ContainerLive.Show, :edit
     live "/containers/:id/show/edit_tags", ContainerLive.Show, :edit_tags
 
-    live "/ammo", AmmoGroupLive.Index, :index
-    live "/ammo/new", AmmoGroupLive.Index, :new
-    live "/ammo/:id/edit", AmmoGroupLive.Index, :edit
-    live "/ammo/:id/clone", AmmoGroupLive.Index, :clone
-    live "/ammo/:id/add_shot_group", AmmoGroupLive.Index, :add_shot_group
-    live "/ammo/:id/move", AmmoGroupLive.Index, :move
+    live "/ammo_groups", AmmoGroupLive.Index, :index
+    live "/ammo_groups/new", AmmoGroupLive.Index, :new
+    live "/ammo_groups/:id/edit", AmmoGroupLive.Index, :edit
+    live "/ammo_groups/:id/add_shot_group", AmmoGroupLive.Index, :add_shot_group
+    live "/ammo_groups/:id/move", AmmoGroupLive.Index, :move
 
-    live "/ammo/:id/show", AmmoGroupLive.Show, :show
-    live "/ammo/:id/show/edit", AmmoGroupLive.Show, :edit
-    live "/ammo/:id/show/add_shot_group", AmmoGroupLive.Show, :add_shot_group
-    live "/ammo/:id/show/move", AmmoGroupLive.Show, :move
-    live "/ammo/:id/show/:shot_group_id/edit", AmmoGroupLive.Show, :edit_shot_group
+    live "/ammo_groups/:id", AmmoGroupLive.Show, :show
+    live "/ammo_groups/:id/show/edit", AmmoGroupLive.Show, :edit
+    live "/ammo_groups/:id/show/add_shot_group", AmmoGroupLive.Show, :add_shot_group
+    live "/ammo_groups/:id/show/move", AmmoGroupLive.Show, :move
+    live "/ammo_groups/:id/show/:shot_group_id/edit", AmmoGroupLive.Show, :edit_shot_group
 
     live "/range", RangeLive.Index, :index
     live "/range/:id/edit", RangeLive.Index, :edit

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

lib/cannery_web/views/error_helpers.ex

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

lib/cannery_web/views/view_helpers.ex

@@ -5,7 +5,7 @@ defmodule CanneryWeb.ViewHelpers do
   :view`
   """
 
-  import Phoenix.Component
+  import Phoenix.LiveView.Helpers
 
   @id_length 16
 
@@ -23,16 +23,11 @@ defmodule CanneryWeb.ViewHelpers do
     }
 
     ~H"""
-    <time
-      id={@id}
-      datetime={@datetime}
-      x-data={"{
+    <time id={@id} datetime={@datetime} x-data={"{
         date:
           Intl.DateTimeFormat([], {dateStyle: 'short', timeStyle: 'long'})
             .format(new Date(\"#{@datetime}\"))
-      }"}
-      x-text="date"
-    >
+      }"} x-text="date">
       <%= @datetime %>
     </time>
     """
@@ -52,15 +47,10 @@ defmodule CanneryWeb.ViewHelpers do
     }
 
     ~H"""
-    <time
-      id={@id}
-      datetime={@date}
-      x-data={"{
+    <time id={@id} datetime={@date} x-data={"{
         date:
           Intl.DateTimeFormat([], {timeZone: 'Etc/UTC', dateStyle: 'short'}).format(new Date(\"#{@date}\"))
-      }"}
-      x-text="date"
-    >
+      }"} x-text="date">
       <%= @date %>
     </time>
     """
@@ -75,18 +65,4 @@ defmodule CanneryWeb.ViewHelpers do
       if(Application.get_env(:cannery, CanneryWeb.ViewHelpers)[:shibao_mode], do: "q_q", else: "😔")
 
   def display_emoji(other_emoji), do: other_emoji
-
-  @doc """
-  Get a random color in `#ffffff` hex format
-
-  ## Examples
-
-      iex> random_color()
-      "#cc0066"
-  """
-  @spec random_color() :: <<_::7>>
-  def random_color do
-    ["#cc0066", "#ff6699", "#6666ff", "#0066cc", "#00cc66", "#669900", "#ff9900", "#996633"]
-    |> Enum.random()
-  end
 end

mix.exs

@@ -4,16 +4,16 @@ defmodule Cannery.MixProject do
   def project do
     [
       app: :cannery,
-      version: "0.7.1",
-      elixir: "1.14.1",
+      version: "0.5.3",
+      elixir: "1.13.4",
       elixirc_paths: elixirc_paths(Mix.env()),
-      compilers: Mix.compilers(),
+      compilers: [:gettext] ++ Mix.compilers(),
       start_permanent: Mix.env() == :prod,
       aliases: aliases(),
       deps: deps(),
       dialyzer: [plt_add_apps: [:ex_unit]],
       consolidate_protocols: Mix.env() not in [:dev, :test],
-      preferred_cli_env: [test: :test, "test.all": :test],
+      preferred_cli_env: [test: :test],
       # ExDoc
       name: "Cannery",
       source_url: "https://gitea.bubbletea.dev/shibao/cannery",
@@ -48,11 +48,11 @@ defmodule Cannery.MixProject do
   defp deps do
     [
       {:bcrypt_elixir, "~> 2.0"},
-      {:phoenix, "~> 1.6.0"},
+      {:phoenix, "~> 1.6"},
       {:phoenix_ecto, "~> 4.4"},
       {:phoenix_html, "~> 3.0"},
       {:phoenix_live_reload, "~> 1.2", only: :dev},
-      {:phoenix_live_view, "~> 0.18.0"},
+      {:phoenix_live_view, "~> 0.17"},
       {:phoenix_view, "~> 1.1"},
       {:phoenix_live_dashboard, "~> 0.6"},
       {:ecto_sql, "~> 3.6"},
@@ -86,13 +86,13 @@ defmodule Cannery.MixProject do
       setup: ["deps.get", "compile", "ecto.setup", "cmd npm install --prefix assets"],
       "ecto.setup": ["ecto.create", "ecto.migrate", "run priv/repo/seeds.exs"],
       "ecto.reset": ["ecto.drop", "ecto.setup"],
-      "format.all": [
+      format: [
         "cmd npm run format --prefix assets",
         "format",
         "gettext.extract --merge",
         "gettext.merge --no-fuzzy priv/gettext"
       ],
-      "test.all": [
+      test: [
         "cmd npm run test --prefix assets",
         "dialyzer",
         "credo --strict",

mix.lock

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

priv/gettext/actions.pot

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

priv/gettext/de/LC_MESSAGES/actions.po

@@ -23,242 +23,204 @@ msgstr ""
 ## Run "mix gettext.extract" to bring this file up to
 ## date. Leave "msgstr"s empty as changing them here has no
 ## effect: edit them in PO (.po) files instead.
-#: lib/cannery_web/live/ammo_group_live/index.ex:44
-#: lib/cannery_web/live/ammo_group_live/index.ex:50
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:40
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.ex:44
 msgid "Add Ammo"
 msgstr "Munition hinzufügen"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:36
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:24
 msgid "Add your first box!"
 msgstr "Fügen Sie ihre erste Box hinzu!"
 
-#: lib/cannery_web/live/container_live/index.html.heex:13
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/index.html.heex:12
 msgid "Add your first container!"
 msgstr "Fügen Sie ihren ersten Behälter hinzu!"
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:13
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:12
 msgid "Add your first type!"
 msgstr "Fügen Sie ihre erste Munitionsart hinzu!"
 
+#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:15
 #: lib/cannery_web/templates/user_settings/edit.html.heex:44
-#, elixir-autogen, elixir-format
 msgid "Change email"
 msgstr "Mailadresse ändern"
 
+#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:58
 #: lib/cannery_web/templates/user_settings/edit.html.heex:99
-#, elixir-autogen, elixir-format
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: lib/cannery_web/live/invite_live/index.html.heex:17
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/index.html.heex:17
 msgid "Create Invite"
 msgstr "Einladung erstellen"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:157
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/templates/user_settings/edit.html.heex:142
 msgid "Delete User"
 msgstr "Benutzer löschen"
 
+#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_registration/new.html.heex:52
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:3
 #: lib/cannery_web/templates/user_session/new.html.heex:45
-#, elixir-autogen, elixir-format
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: lib/cannery_web/live/invite_live/index.html.heex:13
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/index.html.heex:12
 msgid "Invite someone new!"
 msgstr "Laden Sie jemanden ein!"
 
-#: lib/cannery_web/components/topbar.ex:137
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/topbar.ex:106
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:30
-#: lib/cannery_web/templates/user_registration/new.html.heex:49
+#: lib/cannery_web/templates/user_registration/new.html.heex:48
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:48
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:30
 #: lib/cannery_web/templates/user_session/new.html.heex:3
 #: lib/cannery_web/templates/user_session/new.html.heex:33
-#, elixir-autogen, elixir-format
 msgid "Log in"
 msgstr "Einloggen"
 
-#: lib/cannery_web/live/tag_live/index.html.heex:15
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/tag_live/index.html.heex:14
 msgid "Make your first tag!"
 msgstr "Erstellen Sie ihren ersten Tag!"
 
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:17
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:42
+msgid "New Ammo group"
+msgstr "Neue Munitionsgruppe"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:17
 msgid "New Ammo type"
 msgstr "Neue Munitionsart"
 
-#: lib/cannery_web/live/container_live/index.html.heex:17
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/index.html.heex:17
 msgid "New Container"
 msgstr "Neuer Behälter"
 
-#: lib/cannery_web/live/tag_live/index.html.heex:19
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/tag_live/index.html.heex:19
 msgid "New Tag"
 msgstr "Neuer Tag"
 
-#: lib/cannery_web/components/topbar.ex:128
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:26
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/topbar.ex:99
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:25
 #: lib/cannery_web/templates/user_registration/new.html.heex:3
 #: lib/cannery_web/templates/user_registration/new.html.heex:42
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:44
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:26
-#: lib/cannery_web/templates/user_session/new.html.heex:41
-#, elixir-autogen, elixir-format
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:43
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:25
+#: lib/cannery_web/templates/user_session/new.html.heex:40
 msgid "Register"
 msgstr "Registrieren"
 
+#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:3
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:16
-#, elixir-autogen, elixir-format
 msgid "Resend confirmation instructions"
 msgstr "Bestätigungsmail erneut senden"
 
+#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:3
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:34
-#, elixir-autogen, elixir-format
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:53
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:81
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/add_shot_group_component.html.heex:46
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:73
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:156
 #: lib/cannery_web/live/container_live/form_component.html.heex:50
-#: lib/cannery_web/live/invite_live/form_component.html.heex:31
+#: lib/cannery_web/live/invite_live/form_component.html.heex:28
 #: lib/cannery_web/live/range_live/form_component.html.heex:40
-#: lib/cannery_web/live/tag_live/form_component.ex:91
-#, elixir-autogen, elixir-format
+#: lib/cannery_web/live/tag_live/form_component.ex:66
 msgid "Save"
 msgstr "Speichern"
 
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:16
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:16
 msgid "Send instructions to reset password"
 msgstr "Anleitung zum Passwort zurücksetzen zusenden"
 
-#: lib/cannery_web/live/container_live/show.html.heex:80
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/show.html.heex:53
 msgid "Why not add one?"
 msgstr "Warum fügen Sie keine hinzu?"
 
-#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:53
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:52
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: lib/cannery_web/live/range_live/index.html.heex:17
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/range_live/index.html.heex:17
 msgid "Stage ammo"
 msgstr "Munition markieren"
 
-#: lib/cannery_web/live/range_live/index.html.heex:13
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/range_live/index.html.heex:12
 msgid "Why not get some ready to shoot?"
 msgstr "Warum nicht einige für den Schießstand auswählen?"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:79
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:101
-#: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.ex:144
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:91
+#: lib/cannery_web/live/range_live/index.html.heex:36
 msgid "Record shots"
 msgstr "Schüsse dokumentieren"
 
-#: lib/cannery_web/components/move_ammo_group_component.ex:90
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:55
+msgid "Ammo Details"
+msgstr "Munitionsdetails"
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/components/move_ammo_group_component.ex:89
 msgid "Add another container!"
 msgstr "Einen weiteren Behälter hinzufügen!"
 
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:94
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:85
 msgid "Move containers"
 msgstr "Behälter verschieben"
 
-#: lib/cannery_web/components/move_ammo_group_component.ex:126
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/components/move_ammo_group_component.ex:127
 msgid "Select"
 msgstr "Markieren"
 
-#: lib/cannery_web/live/invite_live/index.html.heex:31
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/index.html.heex:33
 msgid "Copy to clipboard"
 msgstr "In die Zwischenablage kopieren"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:21
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:18
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:36
 msgid "add a container first"
 msgstr "Zuerst einen Behälter hinzufügen"
 
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:74
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:66
 msgid "Create"
 msgstr "Erstellen"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:113
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/templates/user_settings/edit.html.heex:113
 msgid "Change Language"
 msgstr "Sprache wechseln"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:134
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/templates/user_settings/edit.html.heex:134
 msgid "Change language"
 msgstr "Sprache wechseln"
-
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:60
-#, elixir-autogen, elixir-format
-msgid "View in Catalog"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:31
-#, elixir-autogen, elixir-format
-msgid "add an ammo type first"
-msgstr ""
-
-#: lib/cannery_web/live/invite_live/index.html.heex:60
-#, elixir-autogen, elixir-format
-msgid "Disable"
-msgstr ""
-
-#: lib/cannery_web/live/invite_live/index.html.heex:64
-#, elixir-autogen, elixir-format
-msgid "Enable"
-msgstr ""
-
-#: lib/cannery_web/components/move_ammo_group_component.ex:80
-#, elixir-autogen, elixir-format
-msgid "Move ammo"
-msgstr ""
-
-#: lib/cannery_web/live/invite_live/index.html.heex:80
-#, elixir-autogen, elixir-format
-msgid "Set Unlimited"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:86
-#: lib/cannery_web/live/range_live/index.html.heex:31
-#, elixir-autogen, elixir-format
-msgid "Stage for range"
-msgstr ""
-
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:85
-#: lib/cannery_web/live/range_live/index.html.heex:30
-#, elixir-autogen, elixir-format
-msgid "Unstage from range"
-msgstr ""
-
-#: lib/cannery_web/templates/user_settings/edit.html.heex:148
-#, elixir-autogen, elixir-format
-msgid "Export Data as JSON"
-msgstr ""

priv/gettext/de/LC_MESSAGES/emails.po

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

priv/gettext/de/LC_MESSAGES/errors.po

@@ -23,186 +23,166 @@ msgstr ""
 ## Run "mix gettext.extract" to bring this file up to
 ## date. Leave "msgstr"s empty as changing them here has no
 ## effect: edit them in PO (.po) files instead.
-#: lib/cannery/containers.ex:140
 #, elixir-autogen, elixir-format
+#: lib/cannery/containers.ex:122
 msgid "Container must be empty before deleting"
 msgstr "Behälter muss vor dem Löschen leer sein"
 
-#: lib/cannery_web/live/container_live/index.ex:88
-#: lib/cannery_web/live/container_live/show.ex:77
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/index.ex:69
+#: lib/cannery_web/live/container_live/show.ex:71
 msgid "Could not delete %{name}: %{error}"
 msgstr "Konnte %{name} nicht löschen: %{error}"
 
-#: lib/cannery_web/live/container_live/index.ex:76
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/index.ex:57
 msgid "Could not find that container"
 msgstr "Konnte Behälter nicht finden"
 
-#: lib/cannery_web/controllers/user_settings_controller.ex:84
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_settings_controller.ex:84
 msgid "Email change link is invalid or it has expired."
 msgstr "Mailadressenänderungs-Link ist ungültig oder abgelaufen."
 
-#: lib/cannery_web/templates/error/error.html.heex:8
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/templates/error/error.html.heex:8
 msgid "Error"
 msgstr "Fehler"
 
-#: lib/cannery_web/templates/error/error.html.heex:28
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/templates/error/error.html.heex:28
 msgid "Go back home"
 msgstr "Zur Hauptseite zurückkehren"
 
-#: lib/cannery_web/views/error_view.ex:11
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/views/error_view.ex:11
 msgid "Internal Server Error"
 msgstr "Interner Serverfehler"
 
-#: lib/cannery_web/controllers/user_session_controller.ex:17
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_session_controller.ex:17
 msgid "Invalid email or password"
 msgstr "Ungültige Mailadresse oder Passwort"
 
-#: lib/cannery_web/views/error_view.ex:9
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/views/error_view.ex:9
 msgid "Not found"
 msgstr "Nicht gefunden"
 
+#, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_registration/new.html.heex:16
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:16
 #: lib/cannery_web/templates/user_settings/edit.html.heex:21
 #: lib/cannery_web/templates/user_settings/edit.html.heex:64
 #: lib/cannery_web/templates/user_settings/edit.html.heex:119
-#, elixir-autogen, elixir-format
 msgid "Oops, something went wrong! Please check the errors below."
 msgstr "Oops, etwas ist schiefgegangen. Bitte beachten Sie den Fehler unten."
 
-#: lib/cannery_web/controllers/user_reset_password_controller.ex:63
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:63
 msgid "Reset password link is invalid or it has expired."
 msgstr "Link zum Passwort zurücksetzen ist ungültig oder abgelaufen."
 
+#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:25
 #: lib/cannery_web/controllers/user_registration_controller.ex:56
-#, elixir-autogen, elixir-format
 msgid "Sorry, public registration is disabled"
 msgstr "Entschuldigung, aber öffentliche Registrierung ist deaktiviert"
 
+#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:15
 #: lib/cannery_web/controllers/user_registration_controller.ex:46
-#, elixir-autogen, elixir-format
 msgid "Sorry, this invite was not found or expired"
 msgstr ""
 "Entschuldigung, aber diese Einladung wurde nicht gefunden oder ist abgelaufen"
 
-#: lib/cannery_web/controllers/user_settings_controller.ex:99
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_settings_controller.ex:99
 msgid "Unable to delete user"
 msgstr "Dieser Nutzer konnte nicht gelöscht werden"
 
-#: lib/cannery_web/views/error_view.ex:10
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/views/error_view.ex:10
 msgid "Unauthorized"
 msgstr "Unbefugt"
 
-#: lib/cannery_web/controllers/user_confirmation_controller.ex:54
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:54
 msgid "User confirmation link is invalid or it has expired."
 msgstr "Nutzerkonto Bestätigungslink ist ungültig oder abgelaufen."
 
-#: lib/cannery_web/live/invite_live/index.ex:18
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/invite_live/index.ex:18
 msgid "You are not authorized to view this page"
 msgstr "Sie sind nicht berechtigt, diese Seite aufzurufen"
 
-#: lib/cannery_web/controllers/user_auth.ex:177
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_auth.ex:177
 msgid "You are not authorized to view this page."
 msgstr "Sie sind nicht berechtigt, diese Seite aufzurufen."
 
-#: lib/cannery/accounts/user.ex:138
 #, elixir-autogen, elixir-format
+#: lib/cannery/accounts/user.ex:130
 msgid "did not change"
 msgstr "hat sich nicht geändert"
 
-#: lib/cannery/accounts/user.ex:159
 #, elixir-autogen, elixir-format
+#: lib/cannery/accounts/user.ex:151
 msgid "does not match password"
 msgstr "Passwort stimmt nicht überein"
 
-#: lib/cannery/accounts/user.ex:196
 #, elixir-autogen, elixir-format
+#: lib/cannery/accounts/user.ex:188
 msgid "is not valid"
 msgstr "ist nicht gültig"
 
-#: lib/cannery/accounts/user.ex:92
 #, elixir-autogen, elixir-format
+#: lib/cannery/accounts/user.ex:84
 msgid "must have the @ sign and no spaces"
 msgstr "Muss ein @ Zeichen und keine Leerzeichen haben"
 
-#: lib/cannery/tags.ex:40
 #, elixir-autogen, elixir-format
+#: lib/cannery/tags.ex:40
 msgid "Tag not found"
 msgstr "Tag nicht gefunden"
 
-#: lib/cannery_web/live/container_live/edit_tags_component.ex:30
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/edit_tags_component.ex:30
 msgid "Tag could not be added"
 msgstr "Tag konnte nicht hinzugefügt werden"
 
-#: lib/cannery/activity_log/shot_group.ex:123
 #, elixir-autogen, elixir-format
+#: lib/cannery/activity_log.ex:125
 msgid "Count must be at least 1"
 msgstr "Anzahl muss mindestens 1 sein"
 
-#: lib/cannery/activity_log/shot_group.ex:82
-#: lib/cannery/activity_log/shot_group.ex:119
 #, elixir-autogen, elixir-format
+#: lib/cannery/activity_log.ex:73
+#: lib/cannery/activity_log.ex:120
 msgid "Count must be less than %{count}"
 msgstr "Anzahl muss weniger als %{count} betragen"
 
+#, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_auth.ex:39
 #: lib/cannery_web/controllers/user_auth.ex:161
-#, elixir-autogen, elixir-format
 msgid "You must confirm your account and log in to access this page."
 msgstr ""
 "Sie müssen ihr Nutzerkonto bestätigen und einloggen, um diese Seite "
 "anzuzeigen."
 
-#: lib/cannery_web/live/container_live/edit_tags_component.ex:52
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/container_live/edit_tags_component.ex:52
 msgid "Tag could not be removed"
 msgstr "Tag konnte nicht gelöscht werden"
 
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:157
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:126
 msgid "Could not parse number of copies"
 msgstr "Konnte die Anzahl der Kopien nicht verstehen"
 
-#: lib/cannery_web/live/ammo_group_live/form_component.ex:142
 #, elixir-autogen, elixir-format
+#: lib/cannery_web/live/ammo_group_live/form_component.ex:111
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""
 "Ungültige Nummer an Kopien. Muss zwischen 1 and %{max} liegen. War "
 "%{multiplier}"
-
-#: lib/cannery/ammo.ex:609
-#, elixir-autogen, elixir-format
-msgid "Invalid multiplier"
-msgstr ""
-
-#: lib/cannery/ammo/ammo_group.ex:96
-#, elixir-autogen, elixir-format
-msgid "Please select an ammo type and container"
-msgstr ""
-
-#: lib/cannery_web/live/range_live/index.html.heex:67
-#, elixir-autogen, elixir-format
-msgid "Your browser does not support the canvas element."
-msgstr ""
-
-#: lib/cannery/activity_log/shot_group.ex:77
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Please select a valid user and ammo pack"
-msgstr ""

priv/gettext/de/LC_MESSAGES/prompts.po

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

priv/gettext/emails.pot

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

priv/gettext/en/LC_MESSAGES/actions.po

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

priv/gettext/en/LC_MESSAGES/emails.po

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

priv/gettext/en/LC_MESSAGES/errors.po

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

priv/gettext/en/LC_MESSAGES/prompts.po

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