finish updating deps

.drone.yml

@@ -17,7 +17,7 @@ steps:
       - .mix
 
 - name: test
-  image: elixir:1.14.4-alpine
+  image: elixir:1.17.3-otp-27-alpine
   environment:
     TEST_DATABASE_URL: ecto://postgres:postgres@database/cannery_test
     HOST: testing.example.tld
@@ -26,8 +26,8 @@ steps:
     MIX_ENV: test
   commands:
   - apk add --no-cache build-base npm git
-  - mix local.rebar --force --if-missing
+  - mix local.rebar --force
-  - mix local.hex --force --if-missing
+  - mix local.hex --force
   - mix deps.get
   - npm set cache .npm
   - npm --prefix ./assets ci --no-audit --prefer-offline
@@ -36,7 +36,7 @@ steps:
   - mix test.all
 
 - name: build and publish stable
-  image: thegeeklab/drone-docker-buildx
+  image: plugins/docker
   privileged: true
   settings:
     repo: shibaobun/cannery
@@ -44,6 +44,8 @@ steps:
     compress: true
     platforms:
       - linux/amd64
+      - linux/arm64
+      - linux/arm/v7
     username:
       from_secret: docker_username
     password:
@@ -54,7 +56,7 @@ steps:
     - stable
 
 - name: build and publish tagged version
-  image: thegeeklab/drone-docker-buildx
+  image: plugins/docker
   privileged: true
   settings:
     repo: shibaobun/cannery
@@ -62,6 +64,8 @@ steps:
     compress: true
     platforms:
       - linux/amd64
+      - linux/arm64
+      - linux/arm/v7
     username:
       from_secret: docker_username
     password:

.tool-versions

@@ -1,3 +1,3 @@
-elixir 1.14.4-otp-25
+elixir 1.17.3-otp-27
-erlang 25.3
+erlang 27.1.2
-nodejs 18.15.0
+nodejs 23.0.0

CHANGELOG.md

@@ -1,3 +1,45 @@
+# v0.9.12
+- Allow filtering ammo types when creating new packs
+- Add SlimSelect to select elements with user content
+- Fix registration page not offering all translations
+- Update deps
+
+# v0.9.11
+- Fix an issue with emails not being able to be sent for real this time
+- Fix some dropdowns not filling in the correct data
+- Add debounces to more fields
+- Update deps
+
+# v0.9.10
+- Fix issue with logger failing on oban exceptions
+- Fix an issue with emails not being able to be sent
+- Update deps
+
+# v0.9.9
+- Actually fix bar graph
+
+# v0.9.8
+- Make bar graph ignore empty days
+- Update dependencies
+
+# v0.9.7
+- Fix margin on bottom of page
+- Use bar graph instead of line graph
+- Improve login page autocomplete behavior
+
+# v0.9.6
+- Make ammo packs in containers directly navigable in table view
+- Update dependencies
+
+# v0.9.5
+- Update dependencies
+
+# v0.9.4
+- Code quality fixes
+- Fix error/404 pages not rendering properly
+- Update dependencies
+- Fix Range page title
+
 # v0.9.3
 - Update dependencies
 - Add pack lot number to search

Dockerfile

@@ -1,4 +1,4 @@
-FROM elixir:1.14.4-alpine AS build
+FROM elixir:1.17.3-otp-27-alpine AS build
 
 # install build dependencies
 RUN apk add --no-cache build-base npm git python3
@@ -7,8 +7,8 @@ RUN apk add --no-cache build-base npm git python3
 WORKDIR /app
 
 # install hex + rebar
-RUN mix local.hex --force && \
+RUN mix local.rebar --force && \
-    mix local.rebar --force
+    mix local.hex --force
 
 # set build ENV
 ENV MIX_ENV=prod
@@ -37,7 +37,7 @@ RUN mix do compile, release
 FROM alpine:latest AS app
 
 RUN apk upgrade --no-cache && \
-    apk add --no-cache bash openssl libssl1.1 libcrypto1.1 libgcc libstdc++ ncurses-libs
+    apk add --no-cache bash openssl libssl3 libcrypto3 libgcc libstdc++ ncurses-libs
 
 WORKDIR /app
 

README.md

@@ -94,6 +94,7 @@ license can be found at
 
 # Links
 
+- [Website](https://cannery.app): Project website
 - [Gitea](https://gitea.bubbletea.dev/shibao/cannery): Main repo, feature
   requests and bug reports
 - [Github](https://github.com/shibaobun/cannery): Source code mirror, please

assets/css/app.scss

@@ -8,6 +8,8 @@ $fa-font-path: "@fortawesome/fontawesome-free/webfonts";
 @import "@fortawesome/fontawesome-free/scss/solid";
 @import "@fortawesome/fontawesome-free/scss/brands";
 
+@import "slim-select/styles";
+
 @import "components";
 
 /* fix firefox scrollbars */
@@ -152,3 +154,57 @@ $fa-font-path: "@fortawesome/fontawesome-free/webfonts";
   0% { opacity: 1; }
   100% { opacity: 0; }
 }
+
+.ss-main {
+  @apply input;
+}
+
+.ss-main.input-primary {
+  @apply border-primary-500 hover:border-primary-600 active:border-primary-600;
+}
+
+.ss-content {
+  @apply input;
+}
+
+.ss-content.input-primary {
+  @apply border-primary-500 hover:border-primary-600 active:border-primary-600;
+}
+
+.ss-content.ss-open-above {
+  border-bottom-left-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
+
+.ss-content.ss-open-below {
+  border-top-left-radius: 0px;
+  border-top-right-radius: 0px;
+}
+
+.ss-search input[type="search"] {
+  @apply input;
+}
+
+.ss-content.input-primary .ss-search input[type="search"] {
+  @apply border-primary-500 hover:border-primary-600 active:border-primary-600;
+}
+
+.ss-content.ss-open-above .ss-search {
+  padding: var(--ss-spacing-l) 0 0 0;
+}
+
+.ss-content.ss-open-below .ss-search {
+  padding: 0 0 var(--ss-spacing-l) 0;
+}
+
+.ss-content.ss-open-above .ss-list > *:not(:first-child) {
+  margin: var(--ss-spacing-l) 0 0 0;
+}
+
+.ss-content.ss-open-below .ss-list > *:not(:last-child) {
+  margin: 0 0 var(--ss-spacing-l) 0;
+}
+
+.ss-content .ss-list .ss-option {
+  border-radius: var(--ss-border-radius);
+}

assets/js/app.js

@@ -24,15 +24,16 @@ import 'phoenix_html'
 // Establish Phoenix Socket and LiveView configuration.
 import { Socket } from 'phoenix'
 import { LiveSocket } from 'phoenix_live_view'
-import topbar from 'topbar'
-import ShotLogChart from './shot_log_chart'
 import Date from './date'
 import DateTime from './datetime'
+import ShotLogChart from './shot_log_chart'
+import SlimSelect from './slim_select'
+import topbar from 'topbar'
 
 const csrfToken = document.querySelector("meta[name='csrf-token']").getAttribute('content')
 const liveSocket = new LiveSocket('/live', Socket, {
   params: { _csrf_token: csrfToken },
-  hooks: { Date, DateTime, ShotLogChart }
+  hooks: { Date, DateTime, ShotLogChart, SlimSelect }
 })
 
 // Show progress bar on live navigation and form submits

assets/js/shot_log_chart.js

@@ -1,13 +1,12 @@
-import { Chart, Title, Tooltip, Legend, LineController, LineElement, PointElement, TimeScale, LinearScale } from 'chart.js'
+import Chart from 'chart.js/auto'
 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',
+      type: 'bar',
       data: {
         datasets: [{
           label: el.dataset.label,
@@ -51,13 +50,17 @@ export default {
             stacked: true,
             grace: '15%',
             ticks: {
-              padding: 15
+              padding: 15,
+              precision: 0
             }
           },
           x: {
-            type: 'time',
+            type: 'timeseries',
             time: {
               unit: 'day'
+            },
+            ticks: {
+              source: 'data'
             }
           }
         },

assets/js/slim_select.js

@@ -0,0 +1,23 @@
+import SlimSelect from 'slim-select'
+
+export default {
+  initalizeSlimSelect (el) {
+    // eslint-disable-next-line no-new
+    el.slimselect = new SlimSelect({ select: el })
+
+    const main = document.querySelector(`.ss-main[data-id="${el.dataset.id}"]`)
+    main.setAttribute('id', `${el.dataset.id}-main`)
+    main.setAttribute('phx-update', 'ignore')
+
+    const content = document.querySelector(`.ss-content[data-id="${el.dataset.id}"]`)
+    content.setAttribute('id', `${el.dataset.id}-content`)
+    content.setAttribute('phx-update', 'ignore')
+  },
+  updated () {
+    this.el.slimselect?.destroy()
+    this.initalizeSlimSelect(this.el)
+  },
+  mounted () {
+    this.initalizeSlimSelect(this.el)
+  }
+}

assets/package.json

@@ -3,8 +3,8 @@
   "description": " ",
   "license": "MIT",
   "engines": {
-    "node": "v18.15.0",
+    "node": "v23.0.0",
-    "npm": "9.5.0"
+    "npm": "10.9.0"
   },
   "scripts": {
     "deploy": "NODE_ENV=production webpack --mode production",
@@ -13,37 +13,39 @@
     "test": "standard"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-free": "^6.4.0",
+    "@fortawesome/fontawesome-free": "^6.6.0",
-    "chart.js": "^4.2.1",
+    "chart.js": "^4.4.5",
     "chartjs-adapter-date-fns": "^3.0.0",
-    "date-fns": "^2.29.3",
+    "date-fns": "^4.1.0",
     "phoenix": "file:../deps/phoenix",
     "phoenix_html": "file:../deps/phoenix_html",
     "phoenix_live_view": "file:../deps/phoenix_live_view",
-    "topbar": "^2.0.1"
+    "slim-select": "^2.9.2",
+    "topbar": "^3.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.21.4",
+    "@babel/core": "^7.26.0",
-    "@babel/preset-env": "^7.21.4",
+    "@babel/preset-env": "^7.26.0",
-    "autoprefixer": "^10.4.14",
+    "autoprefixer": "^10.4.20",
-    "babel-loader": "^9.1.2",
+    "babel-loader": "^9.2.1",
-    "copy-webpack-plugin": "^11.0.0",
+    "copy-webpack-plugin": "^12.0.2",
-    "css-loader": "^6.7.3",
+    "css-loader": "^7.1.2",
-    "css-minimizer-webpack-plugin": "^5.0.0",
+    "css-minimizer-webpack-plugin": "^7.0.0",
     "file-loader": "^6.2.0",
-    "mini-css-extract-plugin": "^2.7.5",
+    "glob": "^11.0.0",
-    "npm-check-updates": "^16.10.8",
+    "mini-css-extract-plugin": "^2.9.1",
-    "postcss": "^8.4.21",
+    "npm-check-updates": "^17.1.6",
-    "postcss-import": "^15.1.0",
+    "postcss": "^8.4.47",
-    "postcss-loader": "^7.2.4",
+    "postcss-import": "^16.1.0",
-    "postcss-preset-env": "^8.3.1",
+    "postcss-loader": "^8.1.1",
-    "sass": "^1.62.0",
+    "postcss-preset-env": "^10.0.8",
-    "sass-loader": "^13.2.2",
+    "sass": "^1.80.4",
-    "standard": "^17.0.0",
+    "sass-loader": "^16.0.2",
-    "tailwindcss": "^3.3.1",
+    "standard": "^17.1.2",
-    "terser-webpack-plugin": "^5.3.7",
+    "tailwindcss": "^3.4.14",
-    "webpack": "^5.79.0",
+    "terser-webpack-plugin": "^5.3.10",
-    "webpack-cli": "^5.0.1",
+    "webpack": "^5.95.0",
-    "webpack-dev-server": "^4.13.2"
+    "webpack-cli": "^5.1.4",
+    "webpack-dev-server": "^5.1.0"
   }
 }

config/config.exs

@@ -18,7 +18,10 @@ config :cannery, CanneryWeb.Endpoint,
   url: [scheme: "https", host: System.get_env("HOST") || "localhost", port: "443"],
   http: [port: String.to_integer(System.get_env("PORT") || "4000")],
   secret_key_base: "KH59P0iZixX5gP/u+zkxxG8vAAj6vgt0YqnwEB5JP5K+E567SsqkCz69uWShjE7I",
-  render_errors: [view: CanneryWeb.ErrorView, accepts: ~w(html json), layout: false],
+  render_errors: [
+    formats: [html: CanneryWeb.ErrorHTML, json: CanneryWeb.ErrorJSON],
+    layout: false
+  ],
   pubsub_server: Cannery.PubSub,
   live_view: [signing_salt: "zOLgd3lr"]
 

config/test.exs

@@ -9,8 +9,9 @@ config :bcrypt_elixir, :log_rounds, 1
 # to provide built-in test partitioning in CI environment.
 # Run `mix help test` for more information.
 config :cannery, Cannery.Repo,
+  pool_size: 10,
   pool: Ecto.Adapters.SQL.Sandbox,
-  pool_size: 10
+  timeout: 60000
 
 # We don't run a server during test. If one is required,
 # you can enable the server option below.
@@ -26,10 +27,10 @@ config :cannery, Cannery.Mailer, adapter: Swoosh.Adapters.Test
 config :cannery, Cannery.Accounts, registration: "public"
 
 # Print only warnings and errors during test
-config :logger, level: :warn
+config :logger, level: :warning
 
 # Initialize plugs at runtime for faster test compilation
 config :phoenix, :plug_init_mode, :runtime
 
 # Disable Oban
-config :cannery, Oban, queues: false, plugins: false
+config :cannery, Oban, queues: false, plugins: false, testing: :manual

lib/cannery.ex

@@ -6,4 +6,34 @@ defmodule Cannery do
   Contexts are also responsible for managing your data, regardless
   if it comes from the database, an external API or others.
   """
+
+  def context do
+    quote do
+      use Gettext, backend: CanneryWeb.Gettext
+      import Ecto.Query
+      alias Cannery.Accounts.User
+      alias Cannery.Repo
+      alias Ecto.{Changeset, Multi, Queryable, UUID}
+    end
+  end
+
+  def schema do
+    quote do
+      use Ecto.Schema
+      use Gettext, backend: CanneryWeb.Gettext
+      import Ecto.{Changeset, Query}
+      alias Cannery.Accounts.User
+      alias Ecto.{Association, Changeset, Queryable, UUID}
+
+      @primary_key {:id, :binary_id, autogenerate: true}
+      @foreign_key_type :binary_id
+    end
+  end
+
+  @doc """
+  When used, dispatch to the appropriate context/schema/etc.
+  """
+  defmacro __using__(which) when is_atom(which) do
+    apply(__MODULE__, which, [])
+  end
 end

lib/cannery/accounts.ex

@@ -3,10 +3,9 @@ defmodule Cannery.Accounts do
   The Accounts context.
   """
 
-  import Ecto.Query, warn: false
+  use Cannery, :context
-  alias Cannery.{Mailer, Repo}
+  alias Cannery.Mailer
-  alias Cannery.Accounts.{Invite, Invites, User, UserToken}
+  alias Cannery.Accounts.{Invite, Invites, UserToken}
-  alias Ecto.{Changeset, Multi}
   alias Oban.Job
 
   ## Database getters
@@ -404,15 +403,15 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> is_admin?(%User{role: :admin})
+      iex> admin?(%User{role: :admin})
       true
 
-      iex> is_admin?(%User{})
+      iex> admin?(%User{})
       false
 
   """
-  @spec is_admin?(User.t()) :: boolean()
+  @spec admin?(User.t()) :: boolean()
-  def is_admin?(%User{id: user_id}) do
+  def admin?(%User{id: user_id}) do
     Repo.exists?(from u in User, where: u.id == ^user_id, where: u.role == :admin)
   end
 
@@ -421,16 +420,16 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> is_already_admin?(%User{role: :admin})
+      iex> already_admin?(%User{role: :admin})
       true
 
-      iex> is_already_admin?(%User{})
+      iex> already_admin?(%User{})
       false
 
   """
-  @spec is_already_admin?(User.t() | nil) :: boolean()
+  @spec already_admin?(User.t() | nil) :: boolean()
-  def is_already_admin?(%User{role: :admin}), do: true
+  def already_admin?(%User{role: :admin}), do: true
-  def is_already_admin?(_invalid_user), do: false
+  def already_admin?(_invalid_user), do: false
 
   ## Confirmation
 

lib/cannery/accounts/invite.ex

@@ -5,13 +5,8 @@ defmodule Cannery.Accounts.Invite do
   `:uses_left` is defined.
   """
 
-  use Ecto.Schema
+  use Cannery, :schema
-  import Ecto.Changeset
-  alias Cannery.Accounts.User
-  alias Ecto.{Association, Changeset, UUID}
 
-  @primary_key {:id, :binary_id, autogenerate: true}
-  @foreign_key_type :binary_id
   schema "invites" do
     field :name, :string
     field :token, :string

lib/cannery/accounts/invites.ex

@@ -3,10 +3,8 @@ defmodule Cannery.Accounts.Invites do
   The Invites context.
   """
 
-  import Ecto.Query, warn: false
+  use Cannery, :context
-  alias Ecto.Multi
+  alias Cannery.Accounts.Invite
-  alias Cannery.Accounts.{Invite, User}
-  alias Cannery.Repo
 
   @invite_token_length 20
 

lib/cannery/accounts/user.ex

@@ -3,11 +3,8 @@ defmodule Cannery.Accounts.User do
   A Cannery user
   """
 
-  use Ecto.Schema
+  use Cannery, :schema
-  import Ecto.Changeset
+  alias Cannery.Accounts.Invite
-  import CanneryWeb.Gettext
-  alias Ecto.{Association, Changeset, UUID}
-  alias Cannery.Accounts.{Invite, User}
 
   @derive {Jason.Encoder,
            only: [
@@ -20,8 +17,6 @@ defmodule Cannery.Accounts.User do
              :updated_at
            ]}
   @derive {Inspect, except: [:password]}
-  @primary_key {:id, :binary_id, autogenerate: true}
-  @foreign_key_type :binary_id
   schema "users" do
     field :email, :string
     field :password, :string, virtual: true

lib/cannery/accounts/user_token.ex

@@ -3,10 +3,7 @@ defmodule Cannery.Accounts.UserToken do
   Schema for a user's session token
   """
 
-  use Ecto.Schema
+  use Cannery, :schema
-  import Ecto.Query
-  alias Cannery.Accounts.User
-  alias Ecto.{Association, UUID}
 
   @hash_algorithm :sha256
   @rand_size 32
@@ -18,8 +15,6 @@ defmodule Cannery.Accounts.UserToken do
   @change_email_validity_in_days 7
   @session_validity_in_days 60
 
-  @primary_key {:id, :binary_id, autogenerate: true}
-  @foreign_key_type :binary_id
   schema "users_tokens" do
     field :token, :binary
     field :context, :string

lib/cannery/activity_log.ex

@@ -3,43 +3,52 @@ defmodule Cannery.ActivityLog do
   The ActivityLog context.
   """
 
-  import Ecto.Query, warn: false
+  use Cannery, :context
-  alias Cannery.Ammo.{Pack, Type}
+  alias Cannery.{ActivityLog.ShotRecord, Ammo.Pack, Ammo.Type}
-  alias Cannery.{Accounts.User, ActivityLog.ShotRecord, Repo}
+
-  alias Ecto.{Multi, Queryable}
+  @type list_shot_records_option ::
+          {:search, String.t() | nil}
+          | {:class, Type.class() | :all | nil}
+          | {:pack_id, Pack.id() | nil}
+  @type list_shot_records_options :: [list_shot_records_option()]
 
   @doc """
   Returns the list of shot_records.
 
   ## Examples
 
-      iex> list_shot_records(:all, %User{id: 123})
+      iex> list_shot_records(%User{id: 123})
       [%ShotRecord{}, ...]
 
-      iex> list_shot_records("cool", :all, %User{id: 123})
+      iex> list_shot_records(%User{id: 123}, search: "cool")
       [%ShotRecord{notes: "My cool shot record"}, ...]
 
-      iex> list_shot_records("cool", :rifle, %User{id: 123})
+      iex> list_shot_records(%User{id: 123}, search: "cool", class: :rifle)
       [%ShotRecord{notes: "Shot some rifle rounds"}, ...]
 
+      iex> list_shot_records(%User{id: 123}, pack_id: 456)
+      [%ShotRecord{pack_id: 456}, ...]
+
   """
-  @spec list_shot_records(Type.class() | :all, User.t()) :: [ShotRecord.t()]
+  @spec list_shot_records(User.t()) :: [ShotRecord.t()]
-  @spec list_shot_records(search :: nil | String.t(), Type.class() | :all, User.t()) ::
+  @spec list_shot_records(User.t(), list_shot_records_options()) :: [ShotRecord.t()]
-          [ShotRecord.t()]
+  def list_shot_records(%User{id: user_id}, opts \\ []) do
-  def list_shot_records(search \\ nil, type, %{id: user_id}) do
+    from(sr in ShotRecord,
-    from(sg in ShotRecord,
+      as: :sr,
-      as: :sg,
+      left_join: p in Pack,
-      left_join: ag in Pack,
+      as: :p,
-      as: :ag,
+      on: sr.pack_id == p.id,
-      on: sg.pack_id == ag.id,
+      on: p.user_id == ^user_id,
-      left_join: at in Type,
+      left_join: t in Type,
-      as: :at,
+      as: :t,
-      on: ag.type_id == at.id,
+      on: p.type_id == t.id,
-      where: sg.user_id == ^user_id,
+      on: t.user_id == ^user_id,
-      distinct: sg.id
+      where: sr.user_id == ^user_id,
+      distinct: sr.id
     )
-    |> list_shot_records_search(search)
+    |> list_shot_records_search(Keyword.get(opts, :search))
-    |> list_shot_records_filter_type(type)
+    |> list_shot_records_class(Keyword.get(opts, :class))
+    |> list_shot_records_pack_id(Keyword.get(opts, :pack_id))
     |> Repo.all()
   end
 
@@ -52,45 +61,44 @@ defmodule Cannery.ActivityLog do
 
     query
     |> where(
-      [sg: sg, ag: ag, at: at],
+      [sr: sr, p: p, t: t],
       fragment(
         "? @@ websearch_to_tsquery('english', ?)",
-        sg.search,
+        sr.search,
         ^trimmed_search
       ) or
         fragment(
           "? @@ websearch_to_tsquery('english', ?)",
-          ag.search,
+          p.search,
           ^trimmed_search
         ) or
         fragment(
           "? @@ websearch_to_tsquery('english', ?)",
-          at.search,
+          t.search,
           ^trimmed_search
         )
     )
-    |> order_by([sg: sg], {
+    |> order_by([sr: sr], {
       :desc,
       fragment(
         "ts_rank_cd(?, websearch_to_tsquery('english', ?), 4)",
-        sg.search,
+        sr.search,
         ^trimmed_search
       )
     })
   end
 
-  @spec list_shot_records_filter_type(Queryable.t(), Type.class() | :all) ::
+  @spec list_shot_records_class(Queryable.t(), Type.class() | :all | nil) :: Queryable.t()
-          Queryable.t()
+  defp list_shot_records_class(query, class) when class in [:rifle, :pistol, :shotgun],
-  defp list_shot_records_filter_type(query, :rifle),
+    do: query |> where([t: t], t.class == ^class)
-    do: query |> where([at: at], at.class == :rifle)
 
-  defp list_shot_records_filter_type(query, :pistol),
+  defp list_shot_records_class(query, _all), do: query
-    do: query |> where([at: at], at.class == :pistol)
 
-  defp list_shot_records_filter_type(query, :shotgun),
+  @spec list_shot_records_pack_id(Queryable.t(), Pack.id() | nil) :: Queryable.t()
-    do: query |> where([at: at], at.class == :shotgun)
+  defp list_shot_records_pack_id(query, pack_id) when pack_id |> is_binary(),
+    do: query |> where([sr: sr], sr.pack_id == ^pack_id)
 
-  defp list_shot_records_filter_type(query, _all), do: query
+  defp list_shot_records_pack_id(query, _all), do: query
 
   @doc """
   Returns a count of shot records.
@@ -104,25 +112,13 @@ defmodule Cannery.ActivityLog do
   @spec get_shot_record_count!(User.t()) :: integer()
   def get_shot_record_count!(%User{id: user_id}) do
     Repo.one(
-      from sg in ShotRecord,
+      from sr in ShotRecord,
-        where: sg.user_id == ^user_id,
+        where: sr.user_id == ^user_id,
-        select: count(sg.id),
+        select: count(sr.id),
         distinct: true
     ) || 0
   end
 
-  @spec list_shot_records_for_pack(Pack.t(), User.t()) :: [ShotRecord.t()]
-  def list_shot_records_for_pack(
-        %Pack{id: pack_id, user_id: user_id},
-        %User{id: user_id}
-      ) do
-    Repo.all(
-      from sg in ShotRecord,
-        where: sg.pack_id == ^pack_id,
-        where: sg.user_id == ^user_id
-    )
-  end
-
   @doc """
   Gets a single shot_record.
 
@@ -140,10 +136,10 @@ defmodule Cannery.ActivityLog do
   @spec get_shot_record!(ShotRecord.id(), User.t()) :: ShotRecord.t()
   def get_shot_record!(id, %User{id: user_id}) do
     Repo.one!(
-      from sg in ShotRecord,
+      from sr in ShotRecord,
-        where: sg.id == ^id,
+        where: sr.id == ^id,
-        where: sg.user_id == ^user_id,
+        where: sr.user_id == ^user_id,
-        order_by: sg.date
+        order_by: sr.date
     )
   end
 
@@ -172,9 +168,9 @@ defmodule Cannery.ActivityLog do
       fn _repo, %{create_shot_record: %{pack_id: pack_id, user_id: user_id}} ->
         pack =
           Repo.one(
-            from ag in Pack,
+            from p in Pack,
-              where: ag.id == ^pack_id,
+              where: p.id == ^pack_id,
-              where: ag.user_id == ^user_id
+              where: p.user_id == ^user_id
           )
 
         {:ok, pack}
@@ -221,7 +217,7 @@ defmodule Cannery.ActivityLog do
     |> Multi.run(
       :pack,
       fn repo, %{update_shot_record: %{pack_id: pack_id, user_id: user_id}} ->
-        {:ok, repo.one(from ag in Pack, where: ag.id == ^pack_id and ag.user_id == ^user_id)}
+        {:ok, repo.one(from p in Pack, where: p.id == ^pack_id and p.user_id == ^user_id)}
       end
     )
     |> Multi.update(
@@ -266,7 +262,7 @@ defmodule Cannery.ActivityLog do
     |> Multi.run(
       :pack,
       fn repo, %{delete_shot_record: %{pack_id: pack_id, user_id: user_id}} ->
-        {:ok, repo.one(from ag in Pack, where: ag.id == ^pack_id and ag.user_id == ^user_id)}
+        {:ok, repo.one(from p in Pack, where: p.id == ^pack_id and p.user_id == ^user_id)}
       end
     )
     |> Multi.update(
@@ -287,36 +283,6 @@ defmodule Cannery.ActivityLog do
     end
   end
 
-  @doc """
-  Returns the number of shot rounds for a pack
-  """
-  @spec get_used_count(Pack.t(), User.t()) :: non_neg_integer()
-  def get_used_count(%Pack{id: pack_id} = pack, user) do
-    [pack]
-    |> get_used_counts(user)
-    |> Map.get(pack_id, 0)
-  end
-
-  @doc """
-  Returns the number of shot rounds for multiple packs
-  """
-  @spec get_used_counts([Pack.t()], User.t()) ::
-          %{optional(Pack.id()) => non_neg_integer()}
-  def get_used_counts(packs, %User{id: user_id}) do
-    pack_ids =
-      packs
-      |> Enum.map(fn %{id: pack_id} -> pack_id end)
-
-    Repo.all(
-      from sg in ShotRecord,
-        where: sg.pack_id in ^pack_ids,
-        where: sg.user_id == ^user_id,
-        group_by: sg.pack_id,
-        select: {sg.pack_id, sum(sg.count)}
-    )
-    |> Map.new()
-  end
-
   @doc """
   Returns the last entered shot record date for a pack
   """
@@ -337,15 +303,18 @@ defmodule Cannery.ActivityLog do
       |> Enum.map(fn %Pack{id: pack_id, user_id: ^user_id} -> pack_id end)
 
     Repo.all(
-      from sg in ShotRecord,
+      from sr in ShotRecord,
-        where: sg.pack_id in ^pack_ids,
+        where: sr.pack_id in ^pack_ids,
-        where: sg.user_id == ^user_id,
+        where: sr.user_id == ^user_id,
-        group_by: sg.pack_id,
+        group_by: sr.pack_id,
-        select: {sg.pack_id, max(sg.date)}
+        select: {sr.pack_id, max(sr.date)}
     )
     |> Map.new()
   end
 
+  @type get_used_count_option :: {:pack_id, Pack.id() | nil} | {:type_id, Type.id() | nil}
+  @type get_used_count_options :: [get_used_count_option()]
+
   @doc """
   Gets the total number of rounds shot for a type
 
@@ -353,45 +322,116 @@ defmodule Cannery.ActivityLog do
 
   ## Examples
 
-      iex> get_used_count_for_type(123, %User{id: 123})
+      iex> get_used_count(%User{id: 123}, type_id: 123)
       35
 
-      iex> get_used_count_for_type(456, %User{id: 123})
+      iex> get_used_count(%User{id: 123}, pack_id: 456)
-      ** (Ecto.NoResultsError)
+      50
 
   """
-  @spec get_used_count_for_type(Type.t(), User.t()) :: non_neg_integer()
+  @spec get_used_count(User.t(), get_used_count_options()) :: non_neg_integer()
-  def get_used_count_for_type(%Type{id: type_id} = type, user) do
+  def get_used_count(%User{id: user_id}, opts) do
-    [type]
+    from(sr in ShotRecord,
-    |> get_used_count_for_types(user)
+      as: :sr,
-    |> Map.get(type_id, 0)
+      left_join: p in Pack,
+      on: sr.pack_id == p.id,
+      on: p.user_id == ^user_id,
+      as: :p,
+      where: sr.user_id == ^user_id,
+      where: not (sr.count |> is_nil()),
+      select: sum(sr.count),
+      distinct: true
+    )
+    |> get_used_count_type_id(Keyword.get(opts, :type_id))
+    |> get_used_count_pack_id(Keyword.get(opts, :pack_id))
+    |> Repo.one() || 0
   end
 
+  @spec get_used_count_pack_id(Queryable.t(), Pack.id() | nil) :: Queryable.t()
+  defp get_used_count_pack_id(query, pack_id) when pack_id |> is_binary() do
+    query |> where([sr: sr], sr.pack_id == ^pack_id)
+  end
+
+  defp get_used_count_pack_id(query, _nil), do: query
+
+  @spec get_used_count_type_id(Queryable.t(), Type.id() | nil) :: Queryable.t()
+  defp get_used_count_type_id(query, type_id) when type_id |> is_binary() do
+    query |> where([p: p], p.type_id == ^type_id)
+  end
+
+  defp get_used_count_type_id(query, _nil), do: query
+
+  @type get_grouped_used_counts_option ::
+          {:packs, [Pack.t()] | nil}
+          | {:types, [Type.t()] | nil}
+          | {:group_by, :type_id | :pack_id}
+  @type get_grouped_used_counts_options :: [get_grouped_used_counts_option()]
+
   @doc """
-  Gets the total number of rounds shot for multiple types
+  Gets the total number of rounds shot for multiple types or packs
 
   ## Examples
 
-      iex> get_used_count_for_types(123, %User{id: 123})
+      iex> get_grouped_used_counts(
+      ...>   %User{id: 123},
+      ...>   group_by: :type_id,
+      ...>   types: [%Type{id: 456, user_id: 123}]
+      ...> )
       35
 
-  """
+      iex> get_grouped_used_counts(
-  @spec get_used_count_for_types([Type.t()], User.t()) ::
+      ...>   %User{id: 123},
-          %{optional(Type.id()) => non_neg_integer()}
+      ...>   group_by: :pack_id,
-  def get_used_count_for_types(types, %User{id: user_id}) do
+      ...>   packs: [%Pack{id: 456, user_id: 123}]
-    type_ids =
+      ...> )
-      types
+      22
-      |> Enum.map(fn %Type{id: type_id, user_id: ^user_id} -> type_id end)
 
-    Repo.all(
+  """
-      from ag in Pack,
+  @spec get_grouped_used_counts(User.t(), get_grouped_used_counts_options()) ::
-        left_join: sg in ShotRecord,
+          %{optional(Type.id() | Pack.id()) => non_neg_integer()}
-        on: ag.id == sg.pack_id,
+  def get_grouped_used_counts(%User{id: user_id}, opts) do
-        where: ag.type_id in ^type_ids,
+    from(p in Pack,
-        where: not (sg.count |> is_nil()),
+      as: :p,
-        group_by: ag.type_id,
+      left_join: sr in ShotRecord,
-        select: {ag.type_id, sum(sg.count)}
+      on: p.id == sr.pack_id,
+      on: p.user_id == ^user_id,
+      as: :sr,
+      where: sr.user_id == ^user_id,
+      where: not (sr.count |> is_nil())
     )
+    |> get_grouped_used_counts_group_by(Keyword.fetch!(opts, :group_by))
+    |> get_grouped_used_counts_types(Keyword.get(opts, :types))
+    |> get_grouped_used_counts_packs(Keyword.get(opts, :packs))
+    |> Repo.all()
     |> Map.new()
   end
+
+  @spec get_grouped_used_counts_group_by(Queryable.t(), :type_id | :pack_id) :: Queryable.t()
+  defp get_grouped_used_counts_group_by(query, :type_id) do
+    query
+    |> group_by([p: p], p.type_id)
+    |> select([sr: sr, p: p], {p.type_id, sum(sr.count)})
+  end
+
+  defp get_grouped_used_counts_group_by(query, :pack_id) do
+    query
+    |> group_by([sr: sr], sr.pack_id)
+    |> select([sr: sr], {sr.pack_id, sum(sr.count)})
+  end
+
+  @spec get_grouped_used_counts_types(Queryable.t(), [Type.t()] | nil) :: Queryable.t()
+  defp get_grouped_used_counts_types(query, types) when types |> is_list() do
+    type_ids = types |> Enum.map(fn %Type{id: type_id} -> type_id end)
+    query |> where([p: p], p.type_id in ^type_ids)
+  end
+
+  defp get_grouped_used_counts_types(query, _nil), do: query
+
+  @spec get_grouped_used_counts_packs(Queryable.t(), [Pack.t()] | nil) :: Queryable.t()
+  defp get_grouped_used_counts_packs(query, packs) when packs |> is_list() do
+    pack_ids = packs |> Enum.map(fn %Pack{id: pack_id} -> pack_id end)
+    query |> where([p: p], p.id in ^pack_ids)
+  end
+
+  defp get_grouped_used_counts_packs(query, _nil), do: query
 end

lib/cannery/activity_log/shot_record.ex

@@ -3,11 +3,8 @@ defmodule Cannery.ActivityLog.ShotRecord do
   A shot record records a group of ammo shot during a range trip
   """
 
-  use Ecto.Schema
+  use Cannery, :schema
-  import CanneryWeb.Gettext
+  alias Cannery.{Ammo, Ammo.Pack}
-  import Ecto.Changeset
-  alias Cannery.{Accounts.User, Ammo, Ammo.Pack}
-  alias Ecto.{Changeset, UUID}
 
   @derive {Jason.Encoder,
            only: [

lib/cannery/ammo/pack.ex

@@ -6,12 +6,8 @@ defmodule Cannery.Ammo.Pack do
   amount paid for that ammunition, or what condition it is in
   """
 
-  use Ecto.Schema
+  use Cannery, :schema
-  import CanneryWeb.Gettext
+  alias Cannery.{Ammo.Type, Containers, Containers.Container}
-  import Ecto.Changeset
-  alias Cannery.Ammo.Type
-  alias Cannery.{Accounts.User, Containers, Containers.Container}
-  alias Ecto.{Changeset, UUID}
 
   @derive {Jason.Encoder,
            only: [
@@ -24,8 +20,6 @@ defmodule Cannery.Ammo.Pack do
              :type_id,
              :container_id
            ]}
-  @primary_key {:id, :binary_id, autogenerate: true}
-  @foreign_key_type :binary_id
   schema "packs" do
     field :count, :integer
     field :notes, :string
@@ -70,36 +64,45 @@ defmodule Cannery.Ammo.Pack do
         ) :: changeset()
   def create_changeset(
         pack,
-        %Type{id: type_id},
+        type,
-        %Container{id: container_id, user_id: user_id},
+        container,
         %User{id: user_id},
         attrs
       )
-      when is_binary(type_id) and is_binary(container_id) and is_binary(user_id) do
+      when is_binary(user_id) do
+    type_id =
+      case type do
+        %Type{id: type_id} when is_binary(type_id) ->
+          type_id
+
+        _invalid_type ->
+          nil
+      end
+
+    container_id =
+      case container do
+        %Container{id: container_id, user_id: ^user_id} when is_binary(container_id) ->
+          container_id
+
+        _invalid_container ->
+          nil
+      end
+
     pack
     |> change(type_id: type_id)
-    |> change(user_id: user_id)
     |> change(container_id: container_id)
-    |> cast(attrs, [:count, :price_paid, :notes, :staged, :purchased_on, :lot_number])
+    |> change(user_id: user_id)
+    |> cast(attrs, [:count, :lot_number, :notes, :price_paid, :purchased_on, :staged])
+    |> validate_required(:type_id, message: dgettext("errors", "Please select a valid type"))
+    |> validate_required(:container_id,
+      message: dgettext("errors", "Please select a valid container")
+    )
     |> validate_number(:count, greater_than: 0)
     |> validate_number(:price_paid, greater_than_or_equal_to: 0)
     |> validate_length(:lot_number, max: 255)
     |> validate_required([:count, :staged, :purchased_on, :type_id, :container_id, :user_id])
   end
 
-  @doc """
-  Invalid changeset, used to prompt user to select type and container
-  """
-  def create_changeset(pack, _invalid_type, _invalid_container, _invalid_user, attrs) do
-    pack
-    |> cast(attrs, [:type_id, :container_id])
-    |> validate_required([:type_id, :container_id])
-    |> validate_number(:count, greater_than: 0)
-    |> validate_number(:price_paid, greater_than_or_equal_to: 0)
-    |> validate_length(:lot_number, max: 255)
-    |> add_error(:invalid, dgettext("errors", "Please select a type and container"))
-  end
-
   @doc false
   @spec update_changeset(t() | new_pack(), attrs :: map(), User.t()) :: changeset()
   def update_changeset(pack, attrs, user) do

lib/cannery/ammo/type.ex

@@ -5,11 +5,8 @@ defmodule Cannery.Ammo.Type do
   Contains statistical information about the ammunition.
   """
 
-  use Ecto.Schema
+  use Cannery, :schema
-  import Ecto.Changeset
-  alias Cannery.Accounts.User
   alias Cannery.Ammo.Pack
-  alias Ecto.{Changeset, UUID}
 
   @derive {Jason.Encoder,
            only: [
@@ -46,8 +43,6 @@ defmodule Cannery.Ammo.Type do
              :shot_charge_weight,
              :dram_equivalent
            ]}
-  @primary_key {:id, :binary_id, autogenerate: true}
-  @foreign_key_type :binary_id
   schema "types" do
     field :name, :string
     field :desc, :string

lib/cannery/containers.ex

@@ -3,14 +3,15 @@ defmodule Cannery.Containers do
   The Containers context.
   """
 
-  import CanneryWeb.Gettext
+  use Cannery, :context
-  import Ecto.Query, warn: false
+  alias Cannery.Ammo.Pack
-  alias Cannery.{Accounts.User, Ammo.Pack, Repo}
   alias Cannery.Containers.{Container, ContainerTag, Tag}
-  alias Ecto.Changeset
 
   @container_preloads [:tags]
 
+  @type list_containers_option :: {:search, String.t() | nil}
+  @type list_containers_options :: [list_containers_option()]
+
   @doc """
   Returns the list of containers.
 
@@ -19,30 +20,31 @@ defmodule Cannery.Containers do
       iex> list_containers(%User{id: 123})
       [%Container{}, ...]
 
-      iex> list_containers("cool", %User{id: 123})
+      iex> list_containers(%User{id: 123}, search: "cool")
       [%Container{name: "my cool container"}, ...]
 
   """
   @spec list_containers(User.t()) :: [Container.t()]
-  @spec list_containers(search :: nil | String.t(), User.t()) :: [Container.t()]
+  @spec list_containers(User.t(), list_containers_options()) :: [Container.t()]
-  def list_containers(search \\ nil, %User{id: user_id}) do
+  def list_containers(%User{id: user_id}, opts \\ []) do
     from(c in Container,
       as: :c,
       left_join: t in assoc(c, :tags),
+      on: c.user_id == t.user_id,
       as: :t,
       where: c.user_id == ^user_id,
-      order_by: c.name,
       distinct: c.id,
       preload: ^@container_preloads
     )
-    |> list_containers_search(search)
+    |> list_containers_search(Keyword.get(opts, :search))
     |> Repo.all()
   end
 
-  defp list_containers_search(query, nil), do: query
+  @spec list_containers_search(Queryable.t(), search :: String.t() | nil) :: Queryable.t()
-  defp list_containers_search(query, ""), do: query
+  defp list_containers_search(query, search) when search in ["", nil],
+    do: query |> order_by([c: c], c.name)
 
-  defp list_containers_search(query, search) do
+  defp list_containers_search(query, search) when search |> is_binary() do
     trimmed_search = String.trim(search)
 
     query
@@ -203,9 +205,9 @@ defmodule Cannery.Containers do
           {:ok, Container.t()} | {:error, Container.changeset()}
   def delete_container(%Container{user_id: user_id} = container, %User{id: user_id}) do
     Repo.one(
-      from ag in Pack,
+      from p in Pack,
-        where: ag.container_id == ^container.id,
+        where: p.container_id == ^container.id,
-        select: count(ag.id)
+        select: count(p.id)
     )
     |> case do
       0 ->
@@ -289,6 +291,9 @@ defmodule Cannery.Containers do
 
   # Container Tags
 
+  @type list_tags_option :: {:search, String.t() | nil}
+  @type list_tags_options :: [list_tags_option()]
+
   @doc """
   Returns the list of tags.
 
@@ -297,38 +302,42 @@ defmodule Cannery.Containers do
       iex> list_tags(%User{id: 123})
       [%Tag{}, ...]
 
-      iex> list_tags("cool", %User{id: 123})
+      iex> list_tags(%User{id: 123}, search: "cool")
       [%Tag{name: "my cool tag"}, ...]
 
   """
   @spec list_tags(User.t()) :: [Tag.t()]
-  @spec list_tags(search :: nil | String.t(), User.t()) :: [Tag.t()]
+  @spec list_tags(User.t(), list_tags_options()) :: [Tag.t()]
-  def list_tags(search \\ nil, user)
+  def list_tags(%User{id: user_id}, opts \\ []) do
+    from(t in Tag, as: :t, where: t.user_id == ^user_id)
+    |> list_tags_search(Keyword.get(opts, :search))
+    |> Repo.all()
+  end
 
-  def list_tags(search, %{id: user_id}) when search |> is_nil() or search == "",
+  @spec list_tags_search(Queryable.t(), search :: String.t() | nil) :: Queryable.t()
-    do: Repo.all(from t in Tag, where: t.user_id == ^user_id, order_by: t.name)
+  defp list_tags_search(query, search) when search in ["", nil],
+    do: query |> order_by([t: t], t.name)
 
-  def list_tags(search, %{id: user_id}) when search |> is_binary() do
+  defp list_tags_search(query, search) when search |> is_binary() do
     trimmed_search = String.trim(search)
 
-    Repo.all(
+    query
-      from t in Tag,
+    |> where(
-        where: t.user_id == ^user_id,
+      [t: t],
-        where:
+      fragment(
-          fragment(
+        "? @@ websearch_to_tsquery('english', ?)",
-            "? @@ websearch_to_tsquery('english', ?)",
+        t.search,
-            t.search,
+        ^trimmed_search
-            ^trimmed_search
+      )
-          ),
-        order_by: {
-          :desc,
-          fragment(
-            "ts_rank_cd(?, websearch_to_tsquery('english', ?), 4)",
-            t.search,
-            ^trimmed_search
-          )
-        }
     )
+    |> order_by([t: t], {
+      :desc,
+      fragment(
+        "ts_rank_cd(?, websearch_to_tsquery('english', ?), 4)",
+        t.search,
+        ^trimmed_search
+      )
+    })
   end
 
   @doc """

lib/cannery/containers/container.ex

@@ -3,10 +3,8 @@ defmodule Cannery.Containers.Container do
   A container that holds ammunition and belongs to a user.
   """
 
-  use Ecto.Schema
+  use Cannery, :schema
-  import Ecto.Changeset
+  alias Cannery.{Containers.ContainerTag, Containers.Tag}
-  alias Ecto.{Changeset, UUID}
-  alias Cannery.{Accounts.User, Containers.ContainerTag, Containers.Tag}
 
   @derive {Jason.Encoder,
            only: [
@@ -17,8 +15,6 @@ defmodule Cannery.Containers.Container do
              :type,
              :tags
            ]}
-  @primary_key {:id, :binary_id, autogenerate: true}
-  @foreign_key_type :binary_id
   schema "containers" do
     field :name, :string
     field :desc, :string

lib/cannery/containers/container_tag.ex

@@ -4,13 +4,9 @@ defmodule Cannery.Containers.ContainerTag do
   Cannery.Containers.Tag.
   """
 
-  use Ecto.Schema
+  use Cannery, :schema
-  import Ecto.Changeset
   alias Cannery.Containers.{Container, Tag}
-  alias Ecto.{Changeset, UUID}
 
-  @primary_key {:id, :binary_id, autogenerate: true}
-  @foreign_key_type :binary_id
   schema "container_tags" do
     belongs_to :container, Container
     belongs_to :tag, Tag

lib/cannery/containers/tag.ex

@@ -4,10 +4,7 @@ defmodule Cannery.Containers.Tag do
   text and bg colors.
   """
 
-  use Ecto.Schema
+  use Cannery, :schema
-  import Ecto.Changeset
-  alias Cannery.Accounts.User
-  alias Ecto.{Changeset, UUID}
 
   @derive {Jason.Encoder,
            only: [
@@ -16,8 +13,6 @@ defmodule Cannery.Containers.Tag do
              :bg_color,
              :text_color
            ]}
-  @primary_key {:id, :binary_id, autogenerate: true}
-  @foreign_key_type :binary_id
   schema "tags" do
     field :name, :string
     field :bg_color, :string

lib/cannery/email.ex

@@ -7,8 +7,8 @@ defmodule Cannery.Email do
   `lib/cannery_web/components/layouts/email_text.txt.eex` for text emails.
   """
 
+  use Gettext, backend: CanneryWeb.Gettext
   import Swoosh.Email
-  import CanneryWeb.Gettext
   import Phoenix.Template
   alias Cannery.Accounts.User
   alias CanneryWeb.{EmailHTML, Layouts}

lib/cannery/logger.ex

@@ -14,7 +14,7 @@ defmodule Cannery.Logger do
       |> Map.put(:stacktrace, Exception.format_stacktrace(stacktrace))
       |> pretty_encode()
 
-    Logger.error("#{meta.reason}: #{data}")
+    Logger.error("Oban exception: #{data}")
   end
 
   def handle_event([:oban, :job, :start], measure, meta, _config) do

lib/cannery_web.ex

@@ -42,9 +42,10 @@ defmodule CanneryWeb do
         formats: [:html, :json],
         layouts: [html: CanneryWeb.Layouts]
 
+      use Gettext, backend: CanneryWeb.Gettext
+
       # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
       import Plug.Conn
-      import CanneryWeb.Gettext
 
       unquote(verified_routes())
     end
@@ -69,6 +70,7 @@ defmodule CanneryWeb do
 
   def html do
     quote do
+      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
       use Phoenix.Component
 
       # Import convenience functions from controllers
@@ -82,12 +84,10 @@ defmodule CanneryWeb do
 
   defp html_helpers do
     quote do
-      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
+      use PhoenixHTMLHelpers
-      use Phoenix.HTML
+      use Gettext, backend: CanneryWeb.Gettext
-
+      import Phoenix.{Component, HTML, HTML.Form}
-      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
+      import CanneryWeb.{ErrorHelpers, CoreComponents, HTMLHelpers}
-      import Phoenix.Component
-      import CanneryWeb.{ErrorHelpers, Gettext, CoreComponents, HTMLHelpers}
 
       # Shortcut for generating JS commands
       alias Phoenix.LiveView.JS

lib/cannery_web/components/add_shot_record_component.ex

@@ -33,7 +33,9 @@ defmodule CanneryWeb.Components.AddShotRecordComponent do
       ) do
     params = shot_record_params |> process_params(pack)
 
-    changeset = %ShotRecord{} |> ShotRecord.create_changeset(current_user, pack, params)
+    changeset =
+      %ShotRecord{}
+      |> ShotRecord.create_changeset(current_user, pack, params)
 
     changeset =
       case changeset |> Changeset.apply_action(:validate) do

lib/cannery_web/components/add_shot_record_component.html.heex

@@ -13,7 +13,7 @@
     phx-submit="save"
   >
     <div
-      :if={@changeset.action && not @changeset.valid?()}
+      :if={@changeset.action && not @changeset.valid?}
       class="invalid-feedback col-span-3 text-center"
     >
       <%= changeset_errors(@changeset) %>
@@ -37,11 +37,12 @@
 
     <%= label(f, :notes, gettext("Notes"), class: "title text-lg text-primary-600") %>
     <%= textarea(f, :notes,
-      id: "add-shot-record-form-notes",
       class: "input input-primary col-span-2",
+      id: "add-shot-record-form-notes",
       maxlength: 255,
-      placeholder: gettext("Really great weather"),
+      phx_debounce: 300,
-      phx_update: "ignore"
+      phx_update: "ignore",
+      placeholder: gettext("Really great weather")
     ) %>
     <%= error_tag(f, :notes, "col-span-3") %>
 

lib/cannery_web/components/container_table_component.ex

@@ -71,8 +71,16 @@ defmodule CanneryWeb.Components.ContainerTableComponent do
       current_user: current_user,
       tag_actions: tag_actions,
       actions: actions,
-      pack_count: Ammo.get_packs_count_for_containers(containers, current_user),
+      pack_count:
-      round_count: Ammo.get_round_count_for_containers(containers, current_user)
+        Ammo.get_grouped_packs_count(current_user,
+          containers: containers,
+          group_by: :container_id
+        ),
+      round_count:
+        Ammo.get_grouped_round_count(current_user,
+          containers: containers,
+          group_by: :container_id
+        )
     }
 
     rows =

lib/cannery_web/components/core_components.ex

@@ -4,7 +4,8 @@ defmodule CanneryWeb.CoreComponents do
   """
   use Phoenix.Component
   use CanneryWeb, :verified_routes
-  import CanneryWeb.{Gettext, HTMLHelpers}
+  use Gettext, backend: CanneryWeb.Gettext
+  import CanneryWeb.HTMLHelpers
   alias Cannery.{Accounts, Accounts.Invite, Accounts.User}
   alias Cannery.{Ammo, Ammo.Pack}
   alias Cannery.{Containers.Container, Containers.Tag}

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

@@ -27,15 +27,15 @@
       <%= @container.location %>
     </span>
 
-    <%= if @container |> Ammo.get_packs_count_for_container!(@current_user) != 0 do %>
+    <%= if Ammo.get_packs_count(@current_user, container_id: @container.id) != 0 do %>
       <span class="rounded-lg title text-lg">
         <%= gettext("Packs:") %>
-        <%= @container |> Ammo.get_packs_count_for_container!(@current_user) %>
+        <%= Ammo.get_packs_count(@current_user, container_id: @container.id) %>
       </span>
 
       <span class="rounded-lg title text-lg">
         <%= gettext("Rounds:") %>
-        <%= @container |> Ammo.get_round_count_for_container!(@current_user) %>
+        <%= Ammo.get_round_count(@current_user, container_id: @container.id) %>
       </span>
     <% end %>
 

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

@@ -48,7 +48,7 @@
             <%= gettext("Range") %>
           </.link>
         </li>
-        <li :if={@current_user |> Accounts.is_already_admin?()} class="mx-2 my-1">
+        <li :if={@current_user |> Accounts.already_admin?()} class="mx-2 my-1">
           <.link navigate={~p"/invites"} class="text-white hover:underline">
             <%= gettext("Invites") %>
           </.link>
@@ -70,7 +70,7 @@
         </li>
         <li
           :if={
-            @current_user |> Accounts.is_already_admin?() and
+            @current_user |> Accounts.already_admin?() and
               function_exported?(Routes, :live_dashboard_path, 2)
           }
           class="mx-2 my-1"

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

@@ -1,18 +1,45 @@
-<main role="main" class="min-h-full min-w-full">
+<main class="pb-8 min-w-full">
   <header>
     <.topbar current_user={assigns[:current_user]} />
 
     <div class="mx-8 my-2 flex flex-col space-y-4 text-center">
-      <p :if={@flash["info"]} class="alert alert-info" role="alert">
+      <p
-        <%= @flash["info"] %>
+        :if={@flash && @flash |> Map.has_key?("info")}
+        class="alert alert-info"
+        role="alert"
+        phx-click="lv:clear-flash"
+        phx-value-key="info"
+      >
+        <%= Phoenix.Flash.get(@flash, :info) %>
       </p>
-      <p :if={@flash["error"]} class="alert alert-danger" role="alert">
+
-        <%= @flash["error"] %>
+      <p
+        :if={@flash && @flash |> Map.has_key?("error")}
+        class="alert alert-danger"
+        role="alert"
+        phx-click="lv:clear-flash"
+        phx-value-key="error"
+      >
+        <%= Phoenix.Flash.get(@flash, :error) %>
       </p>
     </div>
   </header>
 
-  <div class="mx-4 sm:mx-8 md:mx-16">
+  <div class="mx-4 sm:mx-8 md:mx-16 flex flex-col justify-center items-stretch">
     <%= @inner_content %>
   </div>
 </main>
+
+<div
+  id="disconnect"
+  class="z-50 fixed opacity-0 bottom-12 right-12 px-8 py-4 w-max h-max
+  border border-primary-200 shadow-lg rounded-lg bg-white
+  flex justify-center items-center space-x-4
+  transition-opacity ease-in-out duration-500 delay-[2000ms]"
+>
+  <i class="fas fa-fade text-md fa-satellite-dish"></i>
+
+  <h1 class="title text-md title-primary-500">
+    <%= gettext("Reconnecting...") %>
+  </h1>
+</div>

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

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

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

@@ -1,45 +0,0 @@
-<main class="pb-8 min-w-full">
-  <header>
-    <.topbar current_user={assigns[:current_user]} />
-
-    <div class="mx-8 my-2 flex flex-col space-y-4 text-center">
-      <p
-        :if={@flash && @flash |> Map.has_key?("info")}
-        class="alert alert-info"
-        role="alert"
-        phx-click="lv:clear-flash"
-        phx-value-key="info"
-      >
-        <%= live_flash(@flash, "info") %>
-      </p>
-
-      <p
-        :if={@flash && @flash |> Map.has_key?("error")}
-        class="alert alert-danger"
-        role="alert"
-        phx-click="lv:clear-flash"
-        phx-value-key="error"
-      >
-        <%= live_flash(@flash, "error") %>
-      </p>
-    </div>
-  </header>
-
-  <div class="mx-4 sm:mx-8 md:mx-16 flex flex-col justify-center items-stretch">
-    <%= @inner_content %>
-  </div>
-</main>
-
-<div
-  id="disconnect"
-  class="z-50 fixed opacity-0 bottom-12 right-12 px-8 py-4 w-max h-max
-  border border-primary-200 shadow-lg rounded-lg bg-white
-  flex justify-center items-center space-x-4
-  transition-opacity ease-in-out duration-500 delay-[2000ms]"
->
-  <i class="fas fa-fade text-md fa-satellite-dish"></i>
-
-  <h1 class="title text-md title-primary-500">
-    <%= gettext("Reconnecting...") %>
-  </h1>
-</div>

lib/cannery_web/components/move_pack_component.ex

@@ -89,7 +89,7 @@ defmodule CanneryWeb.Components.MovePackComponent do
       <% else %>
         <.live_component
           module={CanneryWeb.Components.TableComponent}
-          id="move_pack_table"
+          id="move-pack-table"
           columns={@columns}
           rows={@rows}
         />

lib/cannery_web/components/pack_table_component.ex

@@ -141,7 +141,12 @@ defmodule CanneryWeb.Components.PackTableComponent do
   def render(assigns) do
     ~H"""
     <div id={@id} class="w-full">
-      <.live_component module={TableComponent} id={"table-#{@id}"} columns={@columns} rows={@rows} />
+      <.live_component
+        module={TableComponent}
+        id={"pack-table-#{@id}"}
+        columns={@columns}
+        rows={@rows}
+      />
     </div>
     """
   end

lib/cannery_web/components/shot_record_table_component.ex

@@ -74,7 +74,7 @@ defmodule CanneryWeb.Components.ShotRecordTableComponent do
     <div id={@id} class="w-full">
       <.live_component
         module={CanneryWeb.Components.TableComponent}
-        id={"table-#{@id}"}
+        id={"shot-record-table-#{@id}"}
         columns={@columns}
         rows={@rows}
         initial_key={:date}

lib/cannery_web/components/type_table_component.ex

@@ -151,17 +151,25 @@ defmodule CanneryWeb.Components.TypeTableComponent do
       )
       |> TableComponent.maybe_compose_columns(%{label: gettext("Name"), key: :name, type: :name})
 
-    round_counts = types |> Ammo.get_round_count_for_types(current_user)
+    round_counts = Ammo.get_grouped_round_count(current_user, types: types, group_by: :type_id)
-    packs_count = types |> Ammo.get_packs_count_for_types(current_user)
+    packs_count = Ammo.get_grouped_packs_count(current_user, types: types, group_by: :type_id)
-    average_costs = types |> Ammo.get_average_cost_for_types(current_user)
+    average_costs = Ammo.get_average_costs(types, current_user)
 
     [used_counts, historical_round_counts, historical_pack_counts, used_pack_counts] =
       if show_used do
         [
-          types |> ActivityLog.get_used_count_for_types(current_user),
+          ActivityLog.get_grouped_used_counts(current_user, types: types, group_by: :type_id),
-          types |> Ammo.get_historical_count_for_types(current_user),
+          Ammo.get_historical_counts(types, current_user),
-          types |> Ammo.get_packs_count_for_types(current_user, true),
+          Ammo.get_grouped_packs_count(current_user,
-          types |> Ammo.get_used_packs_count_for_types(current_user)
+            types: types,
+            group_by: :type_id,
+            show_used: true
+          ),
+          Ammo.get_grouped_packs_count(current_user,
+            types: types,
+            group_by: :type_id,
+            show_used: :only_used
+          )
         ]
       else
         [nil, nil, nil, nil]
@@ -192,7 +200,12 @@ defmodule CanneryWeb.Components.TypeTableComponent do
   def render(assigns) do
     ~H"""
     <div id={@id} class="w-full">
-      <.live_component module={TableComponent} id={"table-#{@id}"} columns={@columns} rows={@rows} />
+      <.live_component
+        module={TableComponent}
+        id={"type-table-#{@id}"}
+        columns={@columns}
+        rows={@rows}
+      />
     </div>
     """
   end

lib/cannery_web/controllers/error_json.ex

@@ -1,5 +1,5 @@
 defmodule CanneryWeb.ErrorJSON do
-  import CanneryWeb.Gettext
+  use Gettext, backend: CanneryWeb.Gettext
 
   def render(template, _assigns) do
     error_string =

lib/cannery_web/controllers/export_controller.ex

@@ -3,14 +3,22 @@ defmodule CanneryWeb.ExportController do
   alias Cannery.{ActivityLog, Ammo, Containers}
 
   def export(%{assigns: %{current_user: current_user}} = conn, %{"mode" => "json"}) do
-    types = Ammo.list_types(current_user, :all)
+    types = Ammo.list_types(current_user)
-    used_counts = types |> ActivityLog.get_used_count_for_types(current_user)
-    round_counts = types |> Ammo.get_round_count_for_types(current_user)
-    pack_counts = types |> Ammo.get_packs_count_for_types(current_user)
 
-    total_pack_counts = types |> Ammo.get_packs_count_for_types(current_user, true)
+    used_counts =
+      ActivityLog.get_grouped_used_counts(current_user, types: types, group_by: :type_id)
 
-    average_costs = types |> Ammo.get_average_cost_for_types(current_user)
+    round_counts = Ammo.get_grouped_round_count(current_user, types: types, group_by: :type_id)
+    pack_counts = Ammo.get_grouped_packs_count(current_user, types: types, group_by: :type_id)
+
+    total_pack_counts =
+      Ammo.get_grouped_packs_count(current_user,
+        types: types,
+        group_by: :type_id,
+        show_used: true
+      )
+
+    average_costs = Ammo.get_average_costs(types, current_user)
 
     types =
       types
@@ -27,8 +35,11 @@ defmodule CanneryWeb.ExportController do
         })
       end)
 
-    packs = Ammo.list_packs(nil, :all, current_user, true)
+    packs = Ammo.list_packs(current_user, show_used: true)
-    used_counts = packs |> ActivityLog.get_used_counts(current_user)
+
+    used_counts =
+      ActivityLog.get_grouped_used_counts(current_user, packs: packs, group_by: :pack_id)
+
     original_counts = packs |> Ammo.get_original_counts(current_user)
     cprs = packs |> Ammo.get_cprs(current_user)
     percentages_remaining = packs |> Ammo.get_percentages_remaining(current_user)
@@ -47,20 +58,17 @@ defmodule CanneryWeb.ExportController do
         })
       end)
 
-    shot_records = ActivityLog.list_shot_records(:all, current_user)
+    shot_records = ActivityLog.list_shot_records(current_user)
 
     containers =
       Containers.list_containers(current_user)
       |> Enum.map(fn container ->
-        pack_count = container |> Ammo.get_packs_count_for_container!(current_user)
-        round_count = container |> Ammo.get_round_count_for_container!(current_user)
-
         container
         |> Jason.encode!()
         |> Jason.decode!()
         |> Map.merge(%{
-          "pack_count" => pack_count,
+          "pack_count" => Ammo.get_packs_count(current_user, container_id: container.id),
-          "round_count" => round_count
+          "round_count" => Ammo.get_round_count(current_user, container_id: container.id)
         })
       end)
 

lib/cannery_web/controllers/user_auth.ex

@@ -4,9 +4,9 @@ defmodule CanneryWeb.UserAuth do
   """
 
   use CanneryWeb, :verified_routes
+  use Gettext, backend: CanneryWeb.Gettext
   import Plug.Conn
   import Phoenix.Controller
-  import CanneryWeb.Gettext
   alias Cannery.{Accounts, Accounts.User}
 
   # Make the remember me cookie valid for 60 days.

lib/cannery_web/controllers/user_confirmation_controller.ex

@@ -1,7 +1,5 @@
 defmodule CanneryWeb.UserConfirmationController do
   use CanneryWeb, :controller
-
-  import CanneryWeb.Gettext
   alias Cannery.Accounts
 
   def new(conn, _params) do

lib/cannery_web/controllers/user_registration_controller.ex

@@ -1,6 +1,5 @@
 defmodule CanneryWeb.UserRegistrationController do
   use CanneryWeb, :controller
-  import CanneryWeb.Gettext
   alias Cannery.{Accounts, Accounts.Invites}
   alias Ecto.Changeset
 
@@ -71,7 +70,7 @@ defmodule CanneryWeb.UserRegistrationController do
         |> redirect(to: ~p"/")
 
       {:error, %Changeset{} = changeset} ->
-        conn |> render("new.html", changeset: changeset, invite_token: invite_token)
+        conn |> render(:new, changeset: changeset, invite_token: invite_token)
     end
   end
 end

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

@@ -9,7 +9,7 @@
     action={~p"/users/register"}
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
-    <p :if={@changeset.action && not @changeset.valid?()} class="alert alert-danger col-span-3">
+    <p :if={@changeset.action && not @changeset.valid?} class="alert alert-danger col-span-3">
       <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
     </p>
 
@@ -29,7 +29,12 @@
     <%= select(
       f,
       :locale,
-      [{gettext("English"), "en_US"}],
+      [
+        {"English", "en_US"},
+        {"Deutsch", "de"},
+        {"Français", "fr"},
+        {"Español", "es"}
+      ],
       class: "input input-primary col-span-2"
     ) %>
     <%= error_tag(f, :locale) %>

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

@@ -9,7 +9,7 @@
     action={~p"/users/reset_password/#{@token}"}
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
-    <p :if={@changeset.action && not @changeset.valid?()} class="alert alert-danger col-span-3">
+    <p :if={@changeset.action && not @changeset.valid?} class="alert alert-danger col-span-3">
       <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
     </p>
 

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

@@ -15,10 +15,18 @@
     </p>
 
     <%= label(f, :email, gettext("Email"), class: "title text-lg text-primary-600") %>
-    <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
+    <%= email_input(f, :email,
+      autocomplete: :email,
+      class: "input input-primary col-span-2",
+      required: true
+    ) %>
 
     <%= label(f, :password, gettext("Password"), class: "title text-lg text-primary-600") %>
-    <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %>
+    <%= password_input(f, :password,
+      autocomplete: "current-password",
+      class: "input input-primary col-span-2",
+      required: true
+    ) %>
 
     <%= label(f, :remember_me, gettext("Keep me logged in for 60 days"),
       class: "title text-lg text-primary-600"

lib/cannery_web/controllers/user_settings_controller.ex

@@ -1,6 +1,5 @@
 defmodule CanneryWeb.UserSettingsController do
   use CanneryWeb, :controller
-  import CanneryWeb.Gettext
   alias Cannery.Accounts
   alias CanneryWeb.UserAuth
 

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

@@ -16,7 +16,7 @@
     </h3>
 
     <div
-      :if={@email_changeset.action && not @email_changeset.valid?()}
+      :if={@email_changeset.action && not @email_changeset.valid?}
       class="alert alert-danger col-span-3"
     >
       <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
@@ -58,7 +58,7 @@
     </h3>
 
     <div
-      :if={@password_changeset.action && not @password_changeset.valid?()}
+      :if={@password_changeset.action && not @password_changeset.valid?}
       class="alert alert-danger col-span-3"
     >
       <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
@@ -112,7 +112,7 @@
     ) %>
 
     <div
-      :if={@locale_changeset.action && not @locale_changeset.valid?()}
+      :if={@locale_changeset.action && not @locale_changeset.valid?}
       class="alert alert-danger col-span-3"
     >
       <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
@@ -124,12 +124,12 @@
       f,
       :locale,
       [
-        {gettext("English"), "en_US"},
+        {"English", "en_US"},
-        {gettext("German"), "de"},
+        {"Deutsch", "de"},
-        {gettext("French"), "fr"},
+        {"Français", "fr"},
-        {gettext("Spanish"), "es"}
+        {"Español", "es"}
       ],
-      class: "mx-2 my-1 min-w-md input input-primary col-span-3"
+      class: "my-1 min-w-md input input-primary col-span-3"
     ) %>
     <%= error_tag(f, :locale, "col-span-3") %>
 

lib/cannery_web/error_helpers.ex

@@ -3,8 +3,8 @@ defmodule CanneryWeb.ErrorHelpers do
   Conveniences for translating and building error messages.
   """
 
-  use Phoenix.HTML
+  use PhoenixHTMLHelpers
-  import Phoenix.Component
+  import Phoenix.{Component, HTML.Form}
   alias Ecto.Changeset
   alias Phoenix.{HTML.Form, LiveView.Rendered}
 
@@ -65,7 +65,7 @@ defmodule CanneryWeb.ErrorHelpers do
     changeset
     |> changeset_error_map()
     |> Enum.map_join(". ", fn {key, errors} ->
-      "#{key |> humanize()}: #{errors |> Enum.join(", ")}"
+      "#{key |> Phoenix.Naming.humanize()}: #{errors |> Enum.join(", ")}"
     end)
   end
 

lib/cannery_web/gettext.ex

@@ -5,7 +5,7 @@ defmodule CanneryWeb.Gettext do
   By using [Gettext](https://hexdocs.pm/gettext),
   your module gains a set of macros for translations, for example:
 
-      import CanneryWeb.Gettext
+      use Gettext, backend: CanneryWeb.Gettext
 
       # Simple translation
       gettext("Here is the string to translate")
@@ -20,5 +20,5 @@ defmodule CanneryWeb.Gettext do
 
   See the [Gettext Docs](https://hexdocs.pm/gettext) for detailed usage.
   """
-  use Gettext, otp_app: :cannery
+  use Gettext.Backend, otp_app: :cannery
 end

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

@@ -44,7 +44,9 @@
       phx-submit="save"
     >
       <%= select(f, :tag_id, tag_options(@tags, @container),
-        class: "text-center col-span-2 input input-primary"
+        class: "text-center col-span-2 input input-primary",
+        id: "#{@id}-tag-select",
+        phx_hook: "SlimSelect"
       ) %>
       <%= error_tag(f, :tag_id, "col-span-3 text-center") %>
 

lib/cannery_web/live/container_live/form_component.ex

@@ -19,7 +19,7 @@ defmodule CanneryWeb.ContainerLive.FormComponent do
 
   @impl true
   def handle_event("validate", %{"container" => container_params}, socket) do
-    {:noreply, socket |> assign_changeset(container_params)}
+    {:noreply, socket |> assign_changeset(container_params, :validate)}
   end
 
   def handle_event(
@@ -32,14 +32,9 @@ defmodule CanneryWeb.ContainerLive.FormComponent do
 
   defp assign_changeset(
          %{assigns: %{action: action, container: container, current_user: user}} = socket,
-         container_params
+         container_params,
+         changeset_action \\ nil
        ) do
-    changeset_action =
-      case action do
-        create when create in [:new, :clone] -> :insert
-        :edit -> :update
-      end
-
     changeset =
       case action do
         create when create in [:new, :clone] ->
@@ -50,9 +45,13 @@ defmodule CanneryWeb.ContainerLive.FormComponent do
       end
 
     changeset =
-      case changeset |> Changeset.apply_action(changeset_action) do
+      if changeset_action do
-        {:ok, _data} -> changeset
+        case changeset |> Changeset.apply_action(changeset_action) do
-        {:error, changeset} -> changeset
+          {:ok, _data} -> changeset
+          {:error, changeset} -> changeset
+        end
+      else
+        changeset
       end
 
     socket |> assign(:changeset, changeset)

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

@@ -12,7 +12,7 @@
     phx-submit="save"
   >
     <div
-      :if={@changeset.action && not @changeset.valid?()}
+      :if={@changeset.action && not @changeset.valid?}
       class="invalid-feedback col-span-3 text-center"
     >
       <%= changeset_errors(@changeset) %>
@@ -21,34 +21,38 @@
     <%= label(f, :name, gettext("Name"), class: "title text-lg text-primary-600") %>
     <%= text_input(f, :name,
       class: "input input-primary col-span-2",
-      placeholder: gettext("My cool ammo can"),
+      maxlength: 255,
-      maxlength: 255
+      phx_debounce: 300,
+      placeholder: gettext("My cool ammo can")
     ) %>
     <%= error_tag(f, :name, "col-span-3 text-center") %>
 
     <%= label(f, :desc, gettext("Description"), class: "title text-lg text-primary-600") %>
     <%= textarea(f, :desc,
-      id: "container-form-desc",
       class: "input input-primary col-span-2",
-      placeholder: gettext("Metal ammo can with the anime girl sticker"),
+      id: "container-form-desc",
-      phx_update: "ignore"
+      phx_debounce: 300,
+      phx_update: "ignore",
+      placeholder: gettext("Metal ammo can with the anime girl sticker")
     ) %>
     <%= error_tag(f, :desc, "col-span-3 text-center") %>
 
     <%= label(f, :type, gettext("Type"), class: "title text-lg text-primary-600") %>
     <%= text_input(f, :type,
       class: "input input-primary col-span-2",
-      placeholder: gettext("Magazine, Clip, Ammo Box, etc"),
+      maxlength: 255,
-      maxlength: 255
+      phx_debounce: 300,
+      placeholder: gettext("Magazine, Clip, Ammo Box, etc")
     ) %>
     <%= error_tag(f, :type, "col-span-3 text-center") %>
 
     <%= label(f, :location, gettext("Location"), class: "title text-lg text-primary-600") %>
     <%= textarea(f, :location,
-      id: "container-form-location",
       class: "input input-primary col-span-2",
-      placeholder: gettext("On the bookshelf"),
+      id: "container-form-location",
-      phx_update: "ignore"
+      phx_debounce: 300,
+      phx_update: "ignore",
+      placeholder: gettext("On the bookshelf")
     ) %>
     <%= error_tag(f, :location, "col-span-3 text-center") %>
 

lib/cannery_web/live/container_live/index.ex

@@ -113,6 +113,6 @@ defmodule CanneryWeb.ContainerLive.Index do
   end
 
   defp display_containers(%{assigns: %{search: search, current_user: current_user}} = socket) do
-    socket |> assign(:containers, Containers.list_containers(search, current_user))
+    socket |> assign(:containers, Containers.list_containers(current_user, search: search))
   end
 end

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

@@ -28,10 +28,10 @@
       >
         <%= text_input(f, :search_term,
           class: "grow input input-primary",
-          value: @search,
-          role: "search",
           phx_debounce: 300,
-          placeholder: gettext("Search containers")
+          placeholder: gettext("Search containers"),
+          role: "search",
+          value: @search
         ) %>
       </.form>
 
@@ -51,7 +51,7 @@
       <%= if @view_table do %>
         <.live_component
           module={CanneryWeb.Components.ContainerTableComponent}
-          id="containers_index_table"
+          id="containers-index-table"
           action={@live_action}
           containers={@containers}
           current_user={@current_user}

lib/cannery_web/live/container_live/show.ex

@@ -104,8 +104,10 @@ defmodule CanneryWeb.ContainerLive.Show do
          id,
          current_user
        ) do
-    %{name: container_name} = container = Containers.get_container!(id, current_user)
+    %{id: container_id, name: container_name} =
-    packs = Ammo.list_packs_for_container(container, class, current_user)
+      container = Containers.get_container!(id, current_user)
+
+    packs = Ammo.list_packs(current_user, container_id: container_id, class: class)
     original_counts = packs |> Ammo.get_original_counts(current_user)
     cprs = packs |> Ammo.get_cprs(current_user)
     last_used_dates = packs |> ActivityLog.get_last_used_dates(current_user)
@@ -120,8 +122,8 @@ defmodule CanneryWeb.ContainerLive.Show do
     socket
     |> assign(
       container: container,
-      round_count: Ammo.get_round_count_for_container!(container, current_user),
+      round_count: Ammo.get_round_count(current_user, container_id: container.id),
-      packs_count: Ammo.get_packs_count_for_container!(container, current_user),
+      packs_count: Ammo.get_packs_count(current_user, container_id: container.id),
       packs: packs,
       original_counts: original_counts,
       cprs: cprs,

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

@@ -120,7 +120,7 @@
       <%= if @view_table do %>
         <.live_component
           module={CanneryWeb.Components.PackTableComponent}
-          id="type-show-table"
+          id="pack-show-table"
           packs={@packs}
           current_user={@current_user}
           show_used={false}
@@ -130,6 +130,21 @@
               <%= type_name %>
             </.link>
           </:type>
+          <:actions :let={%{count: pack_count} = pack}>
+            <div class="py-2 px-4 h-full space-x-4 flex justify-center items-center">
+              <.link
+                navigate={~p"/ammo/show/#{pack}"}
+                class="text-primary-600 link"
+                aria-label={
+                  dgettext("actions", "View pack of %{pack_count} bullets",
+                    pack_count: pack_count
+                  )
+                }
+              >
+                <i class="fa-fw fa-lg fas fa-eye"></i>
+              </.link>
+            </div>
+          </:actions>
         </.live_component>
       <% else %>
         <div class="flex flex-wrap justify-center items-stretch">

lib/cannery_web/live/invite_live/form_component.ex

@@ -19,7 +19,7 @@ defmodule CanneryWeb.InviteLive.FormComponent do
 
   @impl true
   def handle_event("validate", %{"invite" => invite_params}, socket) do
-    {:noreply, socket |> assign_changeset(invite_params)}
+    {:noreply, socket |> assign_changeset(invite_params, :validate)}
   end
 
   def handle_event("save", %{"invite" => invite_params}, %{assigns: %{action: action}} = socket) do
@@ -28,14 +28,9 @@ defmodule CanneryWeb.InviteLive.FormComponent do
 
   defp assign_changeset(
          %{assigns: %{action: action, current_user: user, invite: invite}} = socket,
-         invite_params
+         invite_params,
+         changeset_action \\ nil
        ) do
-    changeset_action =
-      case action do
-        :new -> :insert
-        :edit -> :update
-      end
-
     changeset =
       case action do
         :new -> Invite.create_changeset(user, "example_token", invite_params)
@@ -43,9 +38,13 @@ defmodule CanneryWeb.InviteLive.FormComponent do
       end
 
     changeset =
-      case changeset |> Changeset.apply_action(changeset_action) do
+      if changeset_action do
-        {:ok, _data} -> changeset
+        case changeset |> Changeset.apply_action(changeset_action) do
-        {:error, changeset} -> changeset
+          {:ok, _data} -> changeset
+          {:error, changeset} -> changeset
+        end
+      else
+        changeset
       end
 
     socket |> assign(:changeset, changeset)

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

@@ -12,7 +12,7 @@
     phx-submit="save"
   >
     <div
-      :if={@changeset.action && not @changeset.valid?()}
+      :if={@changeset.action && not @changeset.valid?}
       class="invalid-feedback col-span-3 text-center"
     >
       <%= changeset_errors(@changeset) %>
@@ -22,7 +22,10 @@
       class: "title text-lg text-primary-600",
       maxlength: 255
     ) %>
-    <%= text_input(f, :name, class: "input input-primary col-span-2") %>
+    <%= text_input(f, :name,
+      class: "input input-primary col-span-2",
+      phx_debounce: 300
+    ) %>
     <%= error_tag(f, :name, "col-span-3") %>
 
     <%= label(f, :uses_left, gettext("Uses left"), class: "title text-lg text-primary-600") %>

lib/cannery_web/live/pack_live/form_component.ex

@@ -9,7 +9,11 @@ defmodule CanneryWeb.PackLive.FormComponent do
   alias Ecto.Changeset
   alias Phoenix.LiveView.Socket
 
-  @pack_create_limit 10_000
+  @impl true
+  @spec mount(Socket.t()) :: {:ok, Socket.t()}
+  def mount(socket) do
+    {:ok, socket |> assign(:class, :all)}
+  end
 
   @impl true
   @spec update(
@@ -22,29 +26,30 @@ defmodule CanneryWeb.PackLive.FormComponent do
 
   @spec update(Socket.t()) :: {:ok, Socket.t()}
   def update(%{assigns: %{current_user: current_user}} = socket) do
-    %{assigns: %{types: types, containers: containers}} =
+    socket =
-      socket =
       socket
-      |> assign(:pack_create_limit, @pack_create_limit)
+      |> assign(:types, Ammo.list_types(current_user))
-      |> assign(:types, Ammo.list_types(current_user, :all))
       |> assign_new(:containers, fn -> Containers.list_containers(current_user) end)
 
-    params =
+    {:ok, socket |> assign_changeset(%{})}
-      if types |> List.first() |> is_nil(),
-        do: %{},
-        else: %{} |> Map.put("type_id", types |> List.first() |> Map.get(:id))
-
-    params =
-      if containers |> List.first() |> is_nil(),
-        do: params,
-        else: params |> Map.put("container_id", containers |> List.first() |> Map.get(:id))
-
-    {:ok, socket |> assign_changeset(params)}
   end
 
   @impl true
   def handle_event("validate", %{"pack" => pack_params}, socket) do
-    {:noreply, socket |> assign_changeset(pack_params, :validate)}
+    matched_class =
+      case pack_params["class"] do
+        "rifle" -> :rifle
+        "shotgun" -> :shotgun
+        "pistol" -> :pistol
+        _other -> :all
+      end
+
+    socket =
+      socket
+      |> assign_changeset(pack_params, :validate)
+      |> assign(:class, matched_class)
+
+    {:noreply, socket}
   end
 
   def handle_event(
@@ -62,11 +67,18 @@ defmodule CanneryWeb.PackLive.FormComponent do
     containers |> Enum.map(fn %{id: id, name: name} -> {name, id} end)
   end
 
-  @spec type_options([Type.t()]) :: [{String.t(), Type.id()}]
+  @spec type_options([Type.t()], Type.class() | :all) ::
-  defp type_options(types) do
+          [{String.t(), Type.id()}]
+  defp type_options(types, :all) do
     types |> Enum.map(fn %{id: id, name: name} -> {name, id} end)
   end
 
+  defp type_options(types, selected_class) do
+    types
+    |> Enum.filter(fn %{class: class} -> class == selected_class end)
+    |> Enum.map(fn %{id: id, name: name} -> {name, id} end)
+  end
+
   # Save Helpers
 
   defp assign_changeset(
@@ -92,9 +104,13 @@ defmodule CanneryWeb.PackLive.FormComponent do
       end
 
     changeset =
-      case changeset |> Changeset.apply_action(changeset_action || default_action) do
+      if changeset_action do
-        {:ok, _data} -> changeset
+        case changeset |> Changeset.apply_action(changeset_action) do
-        {:error, changeset} -> changeset
+          {:ok, _data} -> changeset
+          {:error, changeset} -> changeset
+        end
+      else
+        changeset
       end
 
     socket |> assign(:changeset, changeset)
@@ -133,53 +149,15 @@ defmodule CanneryWeb.PackLive.FormComponent do
   end
 
   defp save_pack(
-         %{assigns: %{changeset: changeset}} = socket,
+         %{assigns: %{changeset: changeset, current_user: current_user, return_to: return_to}} =
+           socket,
          action,
          %{"multiplier" => multiplier_str} = pack_params
        )
        when action in [:new, :clone] do
     socket =
-      case multiplier_str |> Integer.parse() do
+      with {multiplier, _remainder} <- multiplier_str |> Integer.parse(),
-        {multiplier, _remainder}
+           {:ok, {count, _packs}} <- Ammo.create_packs(pack_params, multiplier, current_user) do
-        when multiplier >= 1 and multiplier <= @pack_create_limit ->
-          socket |> create_multiple(pack_params, multiplier)
-
-        {multiplier, _remainder} ->
-          error_msg =
-            dgettext(
-              "errors",
-              "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}",
-              max: @pack_create_limit,
-              multiplier: multiplier
-            )
-
-          save_multiplier_error(socket, changeset, error_msg)
-
-        :error ->
-          error_msg = dgettext("errors", "Could not parse number of copies")
-          save_multiplier_error(socket, changeset, error_msg)
-      end
-
-    {:noreply, socket}
-  end
-
-  @spec save_multiplier_error(Socket.t(), Changeset.t(), String.t()) :: Socket.t()
-  defp save_multiplier_error(socket, changeset, error_msg) do
-    {:error, changeset} =
-      changeset
-      |> Changeset.add_error(:multiplier, error_msg)
-      |> Changeset.apply_action(:insert)
-
-    socket |> assign(:changeset, changeset)
-  end
-
-  defp create_multiple(
-         %{assigns: %{current_user: current_user, return_to: return_to}} = socket,
-         pack_params,
-         multiplier
-       ) do
-    case Ammo.create_packs(pack_params, multiplier, current_user) do
-      {:ok, {count, _packs}} ->
         prompt =
           dngettext(
             "prompts",
@@ -189,9 +167,21 @@ defmodule CanneryWeb.PackLive.FormComponent do
           )
 
         socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
+      else
+        {:error, %Changeset{} = changeset} ->
+          socket |> assign(changeset: changeset)
 
-      {:error, %Changeset{} = changeset} ->
+        :error ->
-        socket |> assign(changeset: changeset)
+          error_msg = dgettext("errors", "Could not parse number of copies")
-    end
+
+          {:error, changeset} =
+            changeset
+            |> Changeset.add_error(:multiplier, error_msg)
+            |> Changeset.apply_action(:insert)
+
+          socket |> assign(:changeset, changeset)
+      end
+
+    {:noreply, socket}
   end
 end

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

@@ -13,15 +13,32 @@
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
     <div
-      :if={@changeset.action && not @changeset.valid?()}
+      :if={@changeset.action && not @changeset.valid?}
       class="invalid-feedback col-span-3 text-center"
     >
       <%= changeset_errors(@changeset) %>
     </div>
 
+    <%= label(f, :class, gettext("Class"), class: "title text-lg text-primary-600") %>
+    <%= select(
+      f,
+      :class,
+      [
+        {gettext("Any"), :all},
+        {gettext("Rifle"), :rifle},
+        {gettext("Shotgun"), :shotgun},
+        {gettext("Pistol"), :pistol}
+      ],
+      class: "text-center col-span-2 input input-primary",
+      value: @class
+    ) %>
+    <%= error_tag(f, :class, "col-span-3 text-center") %>
+
     <%= label(f, :type_id, gettext("Type"), class: "title text-lg text-primary-600") %>
-    <%= select(f, :type_id, type_options(@types),
+    <%= select(f, :type_id, type_options(@types, @class),
-      class: "text-center col-span-2 input input-primary"
+      class: "text-center col-span-2 input input-primary",
+      id: "pack-form-type-select",
+      phx_hook: "SlimSelect"
     ) %>
     <%= error_tag(f, :type_id, "col-span-3 text-center") %>
 
@@ -42,7 +59,8 @@
     <%= label(f, :lot_number, gettext("Lot number"), class: "title text-lg text-primary-600") %>
     <%= text_input(f, :lot_number,
       class: "text-center col-span-2 input input-primary",
-      maxlength: 255
+      maxlength: 255,
+      phx_debounce: 300
     ) %>
     <%= error_tag(f, :price_paid, "col-span-3 text-center") %>
 
@@ -56,15 +74,18 @@
 
     <%= label(f, :notes, gettext("Notes"), class: "title text-lg text-primary-600") %>
     <%= textarea(f, :notes,
-      id: "pack-form-notes",
       class: "text-center col-span-2 input input-primary",
+      id: "pack-form-notes",
+      phx_debounce: 300,
       phx_update: "ignore"
     ) %>
     <%= error_tag(f, :notes, "col-span-3 text-center") %>
 
     <%= label(f, :container, gettext("Container"), class: "title text-lg text-primary-600") %>
     <%= select(f, :container_id, container_options(@containers),
-      class: "text-center col-span-2 input input-primary"
+      class: "text-center col-span-2 input input-primary",
+      id: "pack-form-container-select",
+      phx_hook: "SlimSelect"
     ) %>
     <%= error_tag(f, :container_id, "col-span-3 text-center") %>
 
@@ -74,7 +95,6 @@
 
         <%= label(f, :multiplier, gettext("Copies"), class: "title text-lg text-primary-600") %>
         <%= number_input(f, :multiplier,
-          max: @pack_create_limit,
           class: "text-center input input-primary",
           value: 1,
           phx_update: "ignore"

lib/cannery_web/live/pack_live/index.ex

@@ -148,8 +148,8 @@ defmodule CanneryWeb.PackLive.Index do
        ) do
     # get total number of packs to determine whether to display onboarding
     # prompts
-    packs_count = Ammo.get_packs_count!(current_user, true)
+    packs_count = Ammo.get_packs_count(current_user, show_used: true)
-    packs = Ammo.list_packs(search, class, current_user, show_used)
+    packs = Ammo.list_packs(current_user, search: search, class: class, show_used: show_used)
     types_count = Ammo.get_types_count!(current_user)
     containers_count = Containers.get_containers_count!(current_user)
 

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

@@ -75,10 +75,10 @@
         >
           <%= text_input(f, :search_term,
             class: "grow input input-primary",
-            value: @search,
-            role: "search",
             phx_debounce: 300,
-            placeholder: gettext("Search ammo")
+            placeholder: gettext("Search ammo"),
+            role: "search",
+            value: @search
           ) %>
         </.form>
 
@@ -145,7 +145,9 @@
                 navigate={~p"/ammo/show/#{pack}"}
                 class="text-primary-600 link"
                 aria-label={
-                  dgettext("actions", "View pack of %{pack_count} bullets", pack_count: pack_count)
+                  dgettext("actions", "View pack of %{pack_count} bullets",
+                    pack_count: pack_count
+                  )
                 }
               >
                 <i class="fa-fw fa-lg fas fa-eye"></i>
@@ -155,7 +157,9 @@
                 patch={~p"/ammo/edit/#{pack}"}
                 class="text-primary-600 link"
                 aria-label={
-                  dgettext("actions", "Edit pack of %{pack_count} bullets", pack_count: pack_count)
+                  dgettext("actions", "Edit pack of %{pack_count} bullets",
+                    pack_count: pack_count
+                  )
                 }
               >
                 <i class="fa-fw fa-lg fas fa-edit"></i>

lib/cannery_web/live/pack_live/show.ex

@@ -92,7 +92,7 @@ defmodule CanneryWeb.PackLive.Show do
       %{label: gettext("Actions"), key: :actions, sortable: false}
     ]
 
-    shot_records = ActivityLog.list_shot_records_for_pack(pack, current_user)
+    shot_records = ActivityLog.list_shot_records(current_user, pack_id: pack.id)
 
     rows =
       shot_records

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

@@ -115,7 +115,7 @@
 
     <.live_component
       module={CanneryWeb.Components.TableComponent}
-      id="pack_shot_records_table"
+      id="pack-shot-records-table"
       columns={@columns}
       rows={@rows}
     />

lib/cannery_web/live/range_live/form_component.ex

@@ -71,24 +71,25 @@ defmodule CanneryWeb.RangeLive.FormComponent do
            }
          } = socket,
          shot_record_params,
-         action \\ nil
+         changeset_action \\ nil
        ) do
-    default_action =
+    changeset =
       case live_action do
-        :add_shot_record -> :insert
+        :add_shot_record ->
-        editing when editing in [:edit, :edit_shot_record] -> :update
+          shot_record |> ShotRecord.create_changeset(user, pack, shot_record_params)
+
+        editing when editing in [:edit, :edit_shot_record] ->
+          shot_record |> ShotRecord.update_changeset(user, shot_record_params)
       end
 
     changeset =
-      case default_action do
+      if changeset_action do
-        :insert -> shot_record |> ShotRecord.create_changeset(user, pack, shot_record_params)
+        case changeset |> Changeset.apply_action(changeset_action) do
-        :update -> shot_record |> ShotRecord.update_changeset(user, shot_record_params)
+          {:ok, _data} -> changeset
-      end
+          {:error, changeset} -> changeset
-
+        end
-    changeset =
+      else
-      case changeset |> Changeset.apply_action(action || default_action) do
+        changeset
-        {:ok, _data} -> changeset
-        {:error, changeset} -> changeset
       end
 
     socket |> assign(:changeset, changeset)

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

@@ -13,7 +13,7 @@
     phx-submit="save"
   >
     <div
-      :if={@changeset.action && not @changeset.valid?()}
+      :if={@changeset.action && not @changeset.valid?}
       class="invalid-feedback col-span-3 text-center"
     >
       <%= changeset_errors(@changeset) %>
@@ -29,11 +29,12 @@
 
     <%= label(f, :notes, gettext("Notes"), class: "title text-lg text-primary-600") %>
     <%= textarea(f, :notes,
-      id: "shot-record-form-notes",
       class: "input input-primary col-span-2",
+      id: "shot-record-form-notes",
       maxlength: 255,
-      placeholder: gettext("Really great weather"),
+      phx_debounce: 300,
-      phx_update: "ignore"
+      phx_update: "ignore",
+      placeholder: gettext("Really great weather")
     ) %>
     <%= error_tag(f, :notes, "col-span-3") %>
 

lib/cannery_web/live/range_live/index.ex

@@ -44,7 +44,7 @@ defmodule CanneryWeb.RangeLive.Index do
   defp apply_action(socket, :new, _params) do
     socket
     |> assign(
-      page_title: gettext("New Shot Records"),
+      page_title: gettext("Record Shots"),
       shot_record: %ShotRecord{}
     )
   end
@@ -52,7 +52,7 @@ defmodule CanneryWeb.RangeLive.Index do
   defp apply_action(socket, :index, _params) do
     socket
     |> assign(
-      page_title: gettext("Shot Records"),
+      page_title: gettext("Range"),
       search: nil,
       shot_record: nil
     )
@@ -62,7 +62,7 @@ defmodule CanneryWeb.RangeLive.Index do
   defp apply_action(socket, :search, %{"search" => search}) do
     socket
     |> assign(
-      page_title: gettext("Shot Records"),
+      page_title: gettext("Range"),
       search: search,
       shot_record: nil
     )
@@ -120,8 +120,8 @@ defmodule CanneryWeb.RangeLive.Index do
   defp display_shot_records(
          %{assigns: %{class: class, search: search, current_user: current_user}} = socket
        ) do
-    shot_records = ActivityLog.list_shot_records(search, class, current_user)
+    shot_records = ActivityLog.list_shot_records(current_user, search: search, class: class)
-    packs = Ammo.list_staged_packs(current_user)
+    packs = Ammo.list_packs(current_user, staged: true)
     chart_data = shot_records |> get_chart_data_for_shot_record()
     original_counts = packs |> Ammo.get_original_counts(current_user)
     cprs = packs |> Ammo.get_cprs(current_user)

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

@@ -80,7 +80,9 @@
         phx-submit="change_class"
         class="flex items-center"
       >
-        <%= label(f, :class, gettext("Class"), class: "title text-primary-600 text-lg text-center") %>
+        <%= label(f, :class, gettext("Class"),
+          class: "title text-primary-600 text-lg text-center"
+        ) %>
 
         <%= select(
           f,
@@ -106,10 +108,10 @@
       >
         <%= text_input(f, :search_term,
           class: "grow input input-primary",
-          value: @search,
-          role: "search",
           phx_debounce: 300,
-          placeholder: gettext("Search shot records")
+          placeholder: gettext("Search shot records"),
+          role: "search",
+          value: @search
         ) %>
       </.form>
     </div>
@@ -122,7 +124,7 @@
     <% else %>
       <.live_component
         module={CanneryWeb.Components.ShotRecordTableComponent}
-        id="shot_records_index_table"
+        id="shot-records-index-table"
         shot_records={@shot_records}
         current_user={@current_user}
       >

lib/cannery_web/live/tag_live/form_component.ex

@@ -17,7 +17,7 @@ defmodule CanneryWeb.TagLive.FormComponent do
 
   @impl true
   def handle_event("validate", %{"tag" => tag_params}, socket) do
-    {:noreply, socket |> assign_changeset(tag_params)}
+    {:noreply, socket |> assign_changeset(tag_params, :validate)}
   end
 
   def handle_event("save", %{"tag" => tag_params}, %{assigns: %{action: action}} = socket) do
@@ -26,14 +26,9 @@ defmodule CanneryWeb.TagLive.FormComponent do
 
   defp assign_changeset(
          %{assigns: %{action: action, current_user: user, tag: tag}} = socket,
-         tag_params
+         tag_params,
+         changeset_action \\ nil
        ) do
-    changeset_action =
-      case action do
-        :new -> :insert
-        :edit -> :update
-      end
-
     changeset =
       case action do
         :new -> tag |> Tag.create_changeset(user, tag_params)
@@ -41,9 +36,13 @@ defmodule CanneryWeb.TagLive.FormComponent do
       end
 
     changeset =
-      case changeset |> Changeset.apply_action(changeset_action) do
+      if changeset_action do
-        {:ok, _data} -> changeset
+        case changeset |> Changeset.apply_action(changeset_action) do
-        {:error, changeset} -> changeset
+          {:ok, _data} -> changeset
+          {:error, changeset} -> changeset
+        end
+      else
+        changeset
       end
 
     socket |> assign(:changeset, changeset)

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

@@ -12,14 +12,18 @@
     phx-submit="save"
   >
     <div
-      :if={@changeset.action && not @changeset.valid?()}
+      :if={@changeset.action && not @changeset.valid?}
       class="invalid-feedback col-span-3 text-center"
     >
       <%= changeset_errors(@changeset) %>
     </div>
 
     <%= label(f, :name, gettext("Name"), class: "title text-lg text-primary-600") %>
-    <%= text_input(f, :name, class: "input input-primary col-span-2", maxlength: 255) %>
+    <%= text_input(f, :name,
+      class: "input input-primary col-span-2",
+      maxlength: 255,
+      phx_debounce: 300
+    ) %>
     <%= error_tag(f, :name, "col-span-3") %>
 
     <%= label(f, :bg_color, gettext("Background color"), class: "title text-lg text-primary-600") %>

lib/cannery_web/live/tag_live/index.ex

@@ -75,6 +75,6 @@ defmodule CanneryWeb.TagLive.Index do
   end
 
   defp display_tags(%{assigns: %{search: search, current_user: current_user}} = socket) do
-    socket |> assign(tags: Containers.list_tags(search, current_user))
+    socket |> assign(tags: Containers.list_tags(current_user, search: search))
   end
 end

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

@@ -30,10 +30,10 @@
       >
         <%= text_input(f, :search_term,
           class: "grow input input-primary",
-          value: @search,
-          role: "search",
           phx_debounce: 300,
-          placeholder: gettext("Search tags")
+          placeholder: gettext("Search tags"),
+          role: "search",
+          value: @search
         ) %>
       </.form>
     </div>

lib/cannery_web/live/type_live/form_component.ex

@@ -19,7 +19,7 @@ defmodule CanneryWeb.TypeLive.FormComponent do
 
   @impl true
   def handle_event("validate", %{"type" => type_params}, socket) do
-    {:noreply, socket |> assign_changeset(type_params)}
+    {:noreply, socket |> assign_changeset(type_params, :validate)}
   end
 
   def handle_event(
@@ -32,14 +32,9 @@ defmodule CanneryWeb.TypeLive.FormComponent do
 
   defp assign_changeset(
          %{assigns: %{action: action, type: type, current_user: user}} = socket,
-         type_params
+         type_params,
+         changeset_action \\ nil
        ) do
-    changeset_action =
-      case action do
-        create when create in [:new, :clone] -> :insert
-        :edit -> :update
-      end
-
     changeset =
       case action do
         create when create in [:new, :clone] ->
@@ -50,9 +45,13 @@ defmodule CanneryWeb.TypeLive.FormComponent do
       end
 
     changeset =
-      case changeset |> Changeset.apply_action(changeset_action) do
+      if changeset_action do
-        {:ok, _data} -> changeset
+        case changeset |> Changeset.apply_action(changeset_action) do
-        {:error, changeset} -> changeset
+          {:ok, _data} -> changeset
+          {:error, changeset} -> changeset
+        end
+      else
+        changeset
       end
 
     socket |> assign(changeset: changeset)

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

@@ -12,7 +12,7 @@
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
     <div
-      :if={@changeset.action && not @changeset.valid?()}
+      :if={@changeset.action && not @changeset.valid?}
       class="invalid-feedback col-span-3 text-center"
     >
       <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
@@ -22,7 +22,11 @@
     <%= select(
       f,
       :class,
-      [{gettext("Rifle"), :rifle}, {gettext("Shotgun"), :shotgun}, {gettext("Pistol"), :pistol}],
+      [
+        {gettext("Rifle"), :rifle},
+        {gettext("Shotgun"), :shotgun},
+        {gettext("Pistol"), :pistol}
+      ],
       class: "text-center col-span-2 input input-primary",
       maxlength: 255
     ) %>
@@ -31,14 +35,16 @@
     <%= label(f, :name, gettext("Name"), class: "title text-lg text-primary-600") %>
     <%= text_input(f, :name,
       class: "text-center col-span-2 input input-primary",
-      maxlength: 255
+      maxlength: 255,
+      phx_debounce: 300
     ) %>
     <%= error_tag(f, :name, "col-span-3 text-center") %>
 
     <%= label(f, :desc, gettext("Description"), class: "title text-lg text-primary-600") %>
     <%= textarea(f, :desc,
-      id: "type-form-desc",
       class: "text-center col-span-2 input input-primary",
+      id: "type-form-desc",
+      phx_debounce: 300,
       phx_update: "ignore"
     ) %>
     <%= error_tag(f, :desc, "col-span-3 text-center") %>
@@ -52,6 +58,7 @@
       <%= text_input(f, :cartridge,
         class: "text-center col-span-2 input input-primary",
         maxlength: 255,
+        phx_debounce: 300,
         placeholder: gettext("5.56x46mm NATO")
       ) %>
       <%= error_tag(f, :cartridge, "col-span-3 text-center") %>
@@ -71,6 +78,7 @@
     <%= text_input(f, :caliber,
       class: "text-center col-span-2 input input-primary",
       maxlength: 255,
+      phx_debounce: 300,
       placeholder: gettext(".223")
     ) %>
     <%= error_tag(f, :caliber, "col-span-3 text-center") %>
@@ -81,21 +89,28 @@
       ) %>
       <%= text_input(f, :unfired_length,
         class: "text-center col-span-2 input input-primary",
-        maxlength: 255
+        maxlength: 255,
+        phx_debounce: 300
       ) %>
       <%= error_tag(f, :unfired_length, "col-span-3 text-center") %>
 
-      <%= label(f, :brass_height, gettext("Brass height"), class: "title text-lg text-primary-600") %>
+      <%= label(f, :brass_height, gettext("Brass height"),
+        class: "title text-lg text-primary-600"
+      ) %>
       <%= text_input(f, :brass_height,
         class: "text-center col-span-2 input input-primary",
-        maxlength: 255
+        maxlength: 255,
+        phx_debounce: 300
       ) %>
       <%= error_tag(f, :brass_height, "col-span-3 text-center") %>
 
-      <%= label(f, :chamber_size, gettext("Chamber size"), class: "title text-lg text-primary-600") %>
+      <%= label(f, :chamber_size, gettext("Chamber size"),
+        class: "title text-lg text-primary-600"
+      ) %>
       <%= text_input(f, :chamber_size,
         class: "text-center col-span-2 input input-primary",
-        maxlength: 255
+        maxlength: 255,
+        phx_debounce: 300
       ) %>
       <%= error_tag(f, :chamber_size, "col-span-3 text-center") %>
     <% else %>
@@ -132,6 +147,7 @@
       <%= text_input(f, :bullet_type,
         class: "text-center col-span-2 input input-primary",
         maxlength: 255,
+        phx_debounce: 300,
         placeholder: gettext("FMJ")
       ) %>
       <%= error_tag(f, :bullet_type, "col-span-3 text-center") %>
@@ -151,6 +167,7 @@
     <%= text_input(f, :bullet_core,
       class: "text-center col-span-2 input input-primary",
       maxlength: 255,
+      phx_debounce: 300,
       placeholder: gettext("Steel")
     ) %>
     <%= error_tag(f, :bullet_core, "col-span-3 text-center") %>
@@ -160,6 +177,7 @@
       <%= text_input(f, :jacket_type,
         class: "text-center col-span-2 input input-primary",
         maxlength: 255,
+        phx_debounce: 300,
         placeholder: gettext("Bimetal")
       ) %>
       <%= error_tag(f, :jacket_type, "col-span-3 text-center") %>
@@ -167,10 +185,13 @@
       <%= hidden_input(f, :jacket_type, value: nil) %>
     <% end %>
 
-    <%= label(f, :case_material, gettext("Case material"), class: "title text-lg text-primary-600") %>
+    <%= label(f, :case_material, gettext("Case material"),
+      class: "title text-lg text-primary-600"
+    ) %>
     <%= text_input(f, :case_material,
       class: "text-center col-span-2 input input-primary",
       maxlength: 255,
+      phx_debounce: 300,
       placeholder: gettext("Brass")
     ) %>
     <%= error_tag(f, :case_material, "col-span-3 text-center") %>
@@ -179,7 +200,8 @@
       <%= label(f, :wadding, gettext("Wadding"), class: "title text-lg text-primary-600") %>
       <%= text_input(f, :wadding,
         class: "text-center col-span-2 input input-primary",
-        maxlength: 255
+        maxlength: 255,
+        phx_debounce: 300
       ) %>
       <%= error_tag(f, :wadding, "col-span-3 text-center") %>
 
@@ -187,6 +209,7 @@
       <%= text_input(f, :shot_type,
         class: "text-center col-span-2 input input-primary",
         maxlength: 255,
+        phx_debounce: 300,
         placeholder: gettext("Target, bird, buck, etc")
       ) %>
       <%= error_tag(f, :shot_type, "col-span-3 text-center") %>
@@ -196,14 +219,16 @@
       ) %>
       <%= text_input(f, :shot_material,
         class: "text-center col-span-2 input input-primary",
-        maxlength: 255
+        maxlength: 255,
+        phx_debounce: 300
       ) %>
       <%= error_tag(f, :shot_material, "col-span-3 text-center") %>
 
       <%= label(f, :shot_size, gettext("Shot size"), class: "title text-lg text-primary-600") %>
       <%= text_input(f, :shot_size,
         class: "text-center col-span-2 input input-primary",
-        maxlength: 255
+        maxlength: 255,
+        phx_debounce: 300
       ) %>
       <%= error_tag(f, :shot_size, "col-span-3 text-center") %>
 
@@ -220,7 +245,8 @@
       ) %>
       <%= text_input(f, :shot_charge_weight,
         class: "text-center col-span-2 input input-primary",
-        maxlength: 255
+        maxlength: 255,
+        phx_debounce: 300
       ) %>
       <%= error_tag(f, :shot_charge_weight, "col-span-3 text-center") %>
     <% else %>
@@ -239,7 +265,8 @@
     <%= label(f, :powder_type, gettext("Powder type"), class: "title text-lg text-primary-600") %>
     <%= text_input(f, :powder_type,
       class: "text-center col-span-2 input input-primary",
-      maxlength: 255
+      maxlength: 255,
+      phx_debounce: 300
     ) %>
     <%= error_tag(f, :powder_type, "col-span-3 text-center") %>
 
@@ -261,6 +288,7 @@
     <%= text_input(f, :pressure,
       class: "text-center col-span-2 input input-primary",
       maxlength: 255,
+      phx_debounce: 300,
       placeholder: gettext("+P")
     ) %>
     <%= error_tag(f, :pressure, "col-span-3 text-center") %>
@@ -271,7 +299,8 @@
       ) %>
       <%= text_input(f, :dram_equivalent,
         class: "text-center col-span-2 input input-primary",
-        maxlength: 255
+        maxlength: 255,
+        phx_debounce: 300
       ) %>
       <%= error_tag(f, :dram_equivalent, "col-span-3 text-center") %>
     <% else %>
@@ -300,6 +329,7 @@
     <%= text_input(f, :primer_type,
       class: "text-center col-span-2 input input-primary",
       maxlength: 255,
+      phx_debounce: 300,
       placeholder: gettext("Boxer")
     ) %>
     <%= error_tag(f, :primer_type, "col-span-3 text-center") %>
@@ -308,6 +338,7 @@
     <%= text_input(f, :firing_type,
       class: "text-center col-span-2 input input-primary",
       maxlength: 255,
+      phx_debounce: 300,
       placeholder: gettext("Centerfire")
     ) %>
     <%= error_tag(f, :firing_type, "col-span-3 text-center") %>
@@ -339,14 +370,16 @@
     <%= label(f, :manufacturer, gettext("Manufacturer"), class: "title text-lg text-primary-600") %>
     <%= text_input(f, :manufacturer,
       class: "text-center col-span-2 input input-primary",
-      maxlength: 255
+      maxlength: 255,
+      phx_debounce: 300
     ) %>
     <%= error_tag(f, :manufacturer, "col-span-3 text-center") %>
 
     <%= label(f, :upc, gettext("UPC"), class: "title text-lg text-primary-600") %>
     <%= text_input(f, :upc,
       class: "text-center col-span-2 input input-primary",
-      maxlength: 255
+      maxlength: 255,
+      phx_debounce: 300
     ) %>
     <%= error_tag(f, :upc, "col-span-3 text-center") %>
 

lib/cannery_web/live/type_live/index.ex

@@ -106,7 +106,7 @@ defmodule CanneryWeb.TypeLive.Index do
        ) do
     socket
     |> assign(
-      types: Ammo.list_types(search, current_user, class),
+      types: Ammo.list_types(current_user, class: class, search: search),
       types_count: Ammo.get_types_count!(current_user)
     )
   end

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

@@ -26,7 +26,9 @@
         phx-submit="change_class"
         class="flex items-center"
       >
-        <%= label(f, :class, gettext("Class"), class: "title text-primary-600 text-lg text-center") %>
+        <%= label(f, :class, gettext("Class"),
+          class: "title text-primary-600 text-lg text-center"
+        ) %>
 
         <%= select(
           f,
@@ -52,10 +54,10 @@
       >
         <%= text_input(f, :search_term,
           class: "grow input input-primary",
-          value: @search,
-          role: "search",
           phx_debounce: 300,
-          placeholder: gettext("Search catalog")
+          placeholder: gettext("Search catalog"),
+          role: "search",
+          value: @search
         ) %>
       </.form>
 
@@ -74,7 +76,7 @@
     <% else %>
       <.live_component
         module={CanneryWeb.Components.TypeTableComponent}
-        id="types_index_table"
+        id="types-index-table"
         action={@live_action}
         types={@types}
         current_user={@current_user}

lib/cannery_web/live/type_live/show.ex

@@ -40,7 +40,7 @@ defmodule CanneryWeb.TypeLive.Show do
   defp display_type(
          %{assigns: %{live_action: live_action, current_user: current_user, show_used: show_used}} =
            socket,
-         %Type{name: type_name} = type
+         %Type{id: type_id, name: type_name} = type
        ) do
     custom_fields? =
       fields_to_display(type)
@@ -54,7 +54,7 @@ defmodule CanneryWeb.TypeLive.Show do
         type |> Map.get(field) != default_value
       end)
 
-    packs = type |> Ammo.list_packs_for_type(current_user, show_used)
+    packs = Ammo.list_packs(current_user, type_id: type_id, show_used: show_used)
 
     [
       original_counts,
@@ -66,10 +66,10 @@ defmodule CanneryWeb.TypeLive.Show do
       if show_used do
         [
           packs |> Ammo.get_original_counts(current_user),
-          type |> Ammo.get_used_packs_count_for_type(current_user),
+          Ammo.get_packs_count(current_user, type_id: type.id, show_used: :only_used),
-          type |> Ammo.get_packs_count_for_type(current_user, true),
+          Ammo.get_packs_count(current_user, type_id: type.id, show_used: true),
-          type |> ActivityLog.get_used_count_for_type(current_user),
+          ActivityLog.get_used_count(current_user, type_id: type.id),
-          type |> Ammo.get_historical_count_for_type(current_user)
+          Ammo.get_historical_count(type, current_user)
         ]
       else
         [nil, nil, nil, nil, nil]
@@ -94,12 +94,12 @@ defmodule CanneryWeb.TypeLive.Show do
       containers: containers,
       cprs: packs |> Ammo.get_cprs(current_user),
       last_used_dates: packs |> ActivityLog.get_last_used_dates(current_user),
-      avg_cost_per_round: type |> Ammo.get_average_cost_for_type(current_user),
+      avg_cost_per_round: Ammo.get_average_cost(type, current_user),
-      rounds: type |> Ammo.get_round_count_for_type(current_user),
+      rounds: Ammo.get_round_count(current_user, type_id: type.id),
       original_counts: original_counts,
       used_rounds: used_rounds,
       historical_round_count: historical_round_count,
-      packs_count: type |> Ammo.get_packs_count_for_type(current_user),
+      packs_count: Ammo.get_packs_count(current_user, type_id: type.id),
       used_packs_count: used_packs_count,
       historical_packs_count: historical_packs_count,
       fields_to_display: fields_to_display(type),

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

@@ -198,7 +198,9 @@
                 navigate={~p"/ammo/show/#{pack}"}
                 class="text-primary-600 link"
                 aria-label={
-                  dgettext("actions", "View pack of %{pack_count} bullets", pack_count: pack_count)
+                  dgettext("actions", "View pack of %{pack_count} bullets",
+                    pack_count: pack_count
+                  )
                 }
               >
                 <i class="fa-fw fa-lg fas fa-eye"></i>

mix.exs

@@ -4,8 +4,8 @@ defmodule Cannery.MixProject do
   def project do
     [
       app: :cannery,
-      version: "0.9.3",
+      version: "0.9.12",
-      elixir: "1.14.4",
+      elixir: "1.17.3",
       elixirc_paths: elixirc_paths(Mix.env()),
       start_permanent: Mix.env() == :prod,
       aliases: aliases(),
@@ -47,29 +47,30 @@ defmodule Cannery.MixProject do
   defp deps do
     [
       {:bcrypt_elixir, "~> 3.0"},
-      {:phoenix, "~> 1.7.0"},
+      {:credo, "~> 1.5", only: [:dev, :test], runtime: false},
-      {:phoenix_ecto, "~> 4.4"},
+      {:dialyxir, "~> 1.0", only: [:dev, :test], runtime: false},
-      {:phoenix_html, "~> 3.0"},
+      {:ecto_psql_extras, "~> 0.6"},
-      {:phoenix_live_reload, "~> 1.2", only: :dev},
-      {:phoenix_live_view, "~> 0.18.0"},
-      {:phoenix_live_dashboard, "~> 0.6"},
       {:ecto_sql, "~> 3.6"},
-      {:postgrex, ">= 0.0.0"},
+      {:eqrcode, "~> 0.1.10"},
-      {:floki, ">= 0.30.0", only: :test},
       # {:esbuild, "~> 0.3", runtime: Mix.env() == :dev},
       {:ex_doc, "~> 0.27", only: :dev, runtime: false},
-      {:swoosh, "~> 1.6"},
+      {:floki, ">= 0.30.0", only: :test},
       {:gen_smtp, "~> 1.0"},
-      {:oban, "~> 2.10"},
-      {:telemetry_metrics, "~> 0.6"},
-      {:telemetry_poller, "~> 1.0"},
       {:gettext, "~> 0.18"},
       {:jason, "~> 1.2"},
-      {:plug_cowboy, "~> 2.5"},
+      {:oban, "~> 2.10"},
-      {:ecto_psql_extras, "~> 0.6"},
+      {:phoenix_ecto, "~> 4.4"},
-      {:eqrcode, "~> 0.1.10"},
+      {:phoenix_html_helpers, "~> 1.0"},
-      {:credo, "~> 1.5", only: [:dev, :test], runtime: false},
+      {:phoenix_html, "~> 4.0"},
-      {:dialyxir, "~> 1.0", only: [:dev, :test], runtime: false}
+      {:phoenix_live_dashboard, "~> 0.8"},
+      {:phoenix_live_reload, "~> 1.2", only: :dev},
+      {:phoenix_live_view, "~> 0.20.0"},
+      {:phoenix, "~> 1.7.11"},
+      {:plug_cowboy, "~> 2.7"},
+      {:postgrex, ">= 0.0.0"},
+      {:swoosh, "~> 1.6"},
+      {:telemetry_metrics, "~> 0.6"},
+      {:telemetry_poller, "~> 1.0"}
     ]
   end
 

mix.lock

@@ -1,54 +1,54 @@
 %{
-  "bcrypt_elixir": {:hex, :bcrypt_elixir, "3.0.1", "9be815469e6bfefec40fa74658ecbbe6897acfb57614df1416eeccd4903f602c", [:make, :mix], [{:comeonin, "~> 5.3", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "486bb95efb645d1efc6794c1ddd776a186a9a713abf06f45708a6ce324fb96cf"},
+  "bcrypt_elixir": {:hex, :bcrypt_elixir, "3.2.0", "feab711974beba4cb348147170346fe097eea2e840db4e012a145e180ed4ab75", [:make, :mix], [{:comeonin, "~> 5.3", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "563e92a6c77d667b19c5f4ba17ab6d440a085696bdf4c68b9b0f5b30bc5422b8"},
-  "bunt": {:hex, :bunt, "0.2.1", "e2d4792f7bc0ced7583ab54922808919518d0e57ee162901a16a1b6664ef3b14", [:mix], [], "hexpm", "a330bfb4245239787b15005e66ae6845c9cd524a288f0d141c148b02603777a5"},
+  "bunt": {:hex, :bunt, "1.0.0", "081c2c665f086849e6d57900292b3a161727ab40431219529f13c4ddcf3e7a44", [:mix], [], "hexpm", "dc5f86aa08a5f6fa6b8096f0735c4e76d54ae5c9fa2c143e5a1fc7c1cd9bb6b5"},
-  "castore": {:hex, :castore, "1.0.1", "240b9edb4e9e94f8f56ab39d8d2d0a57f49e46c56aced8f873892df8ff64ff5a", [:mix], [], "hexpm", "b4951de93c224d44fac71614beabd88b71932d0b1dea80d2f80fb9044e01bbb3"},
+  "castore": {:hex, :castore, "1.0.9", "5cc77474afadf02c7c017823f460a17daa7908e991b0cc917febc90e466a375c", [:mix], [], "hexpm", "5ea956504f1ba6f2b4eb707061d8e17870de2bee95fb59d512872c2ef06925e7"},
-  "comeonin": {:hex, :comeonin, "5.3.3", "2c564dac95a35650e9b6acfe6d2952083d8a08e4a89b93a481acb552b325892e", [:mix], [], "hexpm", "3e38c9c2cb080828116597ca8807bb482618a315bfafd98c90bc22a821cc84df"},
+  "comeonin": {:hex, :comeonin, "5.5.0", "364d00df52545c44a139bad919d7eacb55abf39e86565878e17cebb787977368", [:mix], [], "hexpm", "6287fc3ba0aad34883cbe3f7949fc1d1e738e5ccdce77165bc99490aa69f47fb"},
-  "connection": {:hex, :connection, "1.1.0", "ff2a49c4b75b6fb3e674bfc5536451607270aac754ffd1bdfe175abe4a6d7a68", [:mix], [], "hexpm", "722c1eb0a418fbe91ba7bd59a47e28008a189d47e37e0e7bb85585a016b2869c"},
+  "cowboy": {:hex, :cowboy, "2.12.0", "f276d521a1ff88b2b9b4c54d0e753da6c66dd7be6c9fca3d9418b561828a3731", [:make, :rebar3], [{:cowlib, "2.13.0", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "8a7abe6d183372ceb21caa2709bec928ab2b72e18a3911aa1771639bef82651e"},
-  "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"},
+  "cowlib": {:hex, :cowlib, "2.13.0", "db8f7505d8332d98ef50a3ef34b34c1afddec7506e4ee4dd4a3a266285d282ca", [:make, :rebar3], [], "hexpm", "e1e1284dc3fc030a64b1ad0d8382ae7e99da46c3246b815318a4b848873800a4"},
-  "credo": {:hex, :credo, "1.7.0", "6119bee47272e85995598ee04f2ebbed3e947678dee048d10b5feca139435f75", [: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", "6839fcf63d1f0d1c0f450abc8564a57c43d644077ab96f2934563e68b8a769d7"},
+  "credo": {:hex, :credo, "1.7.8", "9722ba1681e973025908d542ec3d95db5f9c549251ba5b028e251ad8c24ab8c5", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "cb9e87cc64f152f3ed1c6e325e7b894dea8f5ef2e41123bd864e3cd5ceb44968"},
-  "db_connection": {:hex, :db_connection, "2.5.0", "bb6d4f30d35ded97b29fe80d8bd6f928a1912ca1ff110831edcd238a1973652c", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c92d5ba26cd69ead1ff7582dbb860adeedfff39774105a4f1c92cbb654b55aa2"},
+  "db_connection": {:hex, :db_connection, "2.7.0", "b99faa9291bb09892c7da373bb82cba59aefa9b36300f6145c5f201c7adf48ec", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "dcf08f31b2701f857dfc787fbad78223d61a32204f217f15e881dd93e4bdd3ff"},
-  "decimal": {:hex, :decimal, "2.0.0", "a78296e617b0f5dd4c6caf57c714431347912ffb1d0842e998e9792b5642d697", [:mix], [], "hexpm", "34666e9c55dea81013e77d9d87370fe6cb6291d1ef32f46a1600230b1d44f577"},
+  "decimal": {:hex, :decimal, "2.1.1", "5611dca5d4b2c3dd497dec8f68751f1f1a54755e8ed2a966c2633cf885973ad6", [:mix], [], "hexpm", "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"},
-  "dialyxir": {:hex, :dialyxir, "1.3.0", "fd1672f0922b7648ff9ce7b1b26fcf0ef56dda964a459892ad15f6b4410b5284", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "00b2a4bcd6aa8db9dcb0b38c1225b7277dca9bc370b6438715667071a304696f"},
+  "dialyxir": {:hex, :dialyxir, "1.4.4", "fb3ce8741edeaea59c9ae84d5cec75da00fa89fe401c72d6e047d11a61f65f70", [:mix], [{:erlex, ">= 0.2.7", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "cd6111e8017ccd563e65621a4d9a4a1c5cd333df30cebc7face8029cacb4eff6"},
-  "earmark_parser": {:hex, :earmark_parser, "1.4.31", "a93921cdc6b9b869f519213d5bc79d9e218ba768d7270d46fdcf1c01bacff9e2", [:mix], [], "hexpm", "317d367ee0335ef037a87e46c91a2269fef6306413f731e8ec11fc45a7efd059"},
+  "earmark_parser": {:hex, :earmark_parser, "1.4.41", "ab34711c9dc6212dda44fcd20ecb87ac3f3fce6f0ca2f28d4a00e4154f8cd599", [:mix], [], "hexpm", "a81a04c7e34b6617c2792e291b5a2e57ab316365c2644ddc553bb9ed863ebefa"},
-  "ecto": {:hex, :ecto, "3.10.1", "c6757101880e90acc6125b095853176a02da8f1afe056f91f1f90b80c9389822", [: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", "d2ac4255f1601bdf7ac74c0ed971102c6829dc158719b94bd30041bbad77f87a"},
+  "ecto": {:hex, :ecto, "3.12.4", "267c94d9f2969e6acc4dd5e3e3af5b05cdae89a4d549925f3008b2b7eb0b93c3", [:mix], [{:decimal, "~> 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", "ef04e4101688a67d061e1b10d7bc1fbf00d1d13c17eef08b71d070ff9188f747"},
-  "ecto_psql_extras": {:hex, :ecto_psql_extras, "0.7.10", "e14d400930f401ca9f541b3349212634e44027d7f919bbb71224d7ac0d0e8acd", [:mix], [{:ecto_sql, "~> 3.4", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.15.7 or ~> 0.16.0", [hex: :postgrex, repo: "hexpm", optional: false]}, {:table_rex, "~> 3.1.1", [hex: :table_rex, repo: "hexpm", optional: false]}], "hexpm", "505e8cd81e4f17c090be0f99e92b1b3f0fd915f98e76965130b8ccfb891e7088"},
+  "ecto_psql_extras": {:hex, :ecto_psql_extras, "0.8.2", "79350a53246ac5ec27326d208496aebceb77fa82a91744f66a9154560f0759d3", [:mix], [{:ecto_sql, "~> 3.7", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:postgrex, "> 0.16.0 and < 0.20.0", [hex: :postgrex, repo: "hexpm", optional: false]}, {:table_rex, "~> 3.1.1 or ~> 4.0.0", [hex: :table_rex, repo: "hexpm", optional: false]}], "hexpm", "6149c1c4a5ba6602a76cb09ee7a269eb60dab9694a1dbbb797f032555212de75"},
-  "ecto_sql": {:hex, :ecto_sql, "3.10.1", "6ea6b3036a0b0ca94c2a02613fd9f742614b5cfe494c41af2e6571bb034dd94c", [:mix], [{:db_connection, "~> 2.4.1 or ~> 2.5", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.10.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.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", "f6a25bdbbd695f12c8171eaff0851fa4c8e72eec1e98c7364402dda9ce11c56b"},
+  "ecto_sql": {:hex, :ecto_sql, "3.12.1", "c0d0d60e85d9ff4631f12bafa454bc392ce8b9ec83531a412c12a0d415a3a4d0", [:mix], [{:db_connection, "~> 2.4.1 or ~> 2.5", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.12", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.7", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.19 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", "aff5b958a899762c5f09028c847569f7dfb9cc9d63bdb8133bff8a5546de6bf5"},
-  "elixir_make": {:hex, :elixir_make, "0.7.6", "67716309dc5d43e16b5abbd00c01b8df6a0c2ab54a8f595468035a50189f9169", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "5a0569756b0f7873a77687800c164cca6dfc03a09418e6fcf853d78991f49940"},
+  "elixir_make": {:hex, :elixir_make, "0.8.4", "4960a03ce79081dee8fe119d80ad372c4e7badb84c493cc75983f9d3bc8bde0f", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.0", [hex: :certifi, repo: "hexpm", optional: true]}], "hexpm", "6e7f1d619b5f61dfabd0a20aa268e575572b542ac31723293a4c1a567d5ef040"},
   "eqrcode": {:hex, :eqrcode, "0.1.10", "6294fece9d68ad64eef1c3c92cf111cfd6469f4fbf230a2d4cc905a682178f3f", [:mix], [], "hexpm", "da30e373c36a0fd37ab6f58664b16029919896d6c45a68a95cc4d713e81076f1"},
-  "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
+  "erlex": {:hex, :erlex, "0.2.7", "810e8725f96ab74d17aac676e748627a07bc87eb950d2b83acd29dc047a30595", [:mix], [], "hexpm", "3ed95f79d1a844c3f6bf0cea61e0d5612a42ce56da9c03f01df538685365efb0"},
-  "ex_doc": {:hex, :ex_doc, "0.29.4", "6257ecbb20c7396b1fe5accd55b7b0d23f44b6aa18017b415cb4c2b91d997729", [:mix], [{:earmark_parser, "~> 1.4.31", [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", "2c6699a737ae46cb61e4ed012af931b57b699643b24dabe2400a8168414bc4f5"},
+  "ex_doc": {:hex, :ex_doc, "0.34.2", "13eedf3844ccdce25cfd837b99bea9ad92c4e511233199440488d217c92571e8", [:mix], [{:earmark_parser, "~> 1.4.39", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.0", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14 or ~> 1.0", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1 or ~> 1.0", [hex: :makeup_erlang, repo: "hexpm", optional: false]}, {:makeup_html, ">= 0.1.0", [hex: :makeup_html, repo: "hexpm", optional: true]}], "hexpm", "5ce5f16b41208a50106afed3de6a2ed34f4acfd65715b82a0b84b49d995f95c1"},
-  "expo": {:hex, :expo, "0.4.1", "1c61d18a5df197dfda38861673d392e642649a9cef7694d2f97a587b2cfb319b", [:mix], [], "hexpm", "2ff7ba7a798c8c543c12550fa0e2cbc81b95d4974c65855d8d15ba7b37a1ce47"},
+  "expo": {:hex, :expo, "1.1.0", "f7b9ed7fb5745ebe1eeedf3d6f29226c5dd52897ac67c0f8af62a07e661e5c75", [:mix], [], "hexpm", "fbadf93f4700fb44c331362177bdca9eeb8097e8b0ef525c9cc501cb9917c960"},
-  "file_system": {:hex, :file_system, "0.2.10", "fb082005a9cd1711c05b5248710f8826b02d7d1784e7c3451f9c1231d4fc162d", [:mix], [], "hexpm", "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"},
+  "file_system": {:hex, :file_system, "1.0.1", "79e8ceaddb0416f8b8cd02a0127bdbababe7bf4a23d2a395b983c1f8b3f73edd", [:mix], [], "hexpm", "4414d1f38863ddf9120720cd976fce5bdde8e91d8283353f0e31850fa89feb9e"},
-  "floki": {:hex, :floki, "0.34.2", "5fad07ef153b3b8ec110b6b155ec3780c4b2c4906297d0b4be1a7162d04a7e02", [:mix], [], "hexpm", "26b9d50f0f01796bc6be611ca815c5e0de034d2128e39cc9702eee6b66a4d1c8"},
+  "floki": {:hex, :floki, "0.36.3", "1102f93b16a55bc5383b85ae3ec470f82dee056eaeff9195e8afdf0ef2a43c30", [:mix], [], "hexpm", "fe0158bff509e407735f6d40b3ee0d7deb47f3f3ee7c6c182ad28599f9f6b27a"},
   "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.22.1", "e7942988383c3d9eed4bdc22fc63e712b655ae94a672a27e4900e3d4a2c43581", [:mix], [{:expo, "~> 0.4.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "ad105b8dab668ee3f90c0d3d94ba75e9aead27a62495c101d94f2657a190ac5d"},
+  "gettext": {:hex, :gettext, "0.26.1", "38e14ea5dcf962d1fc9f361b63ea07c0ce715a8ef1f9e82d3dfb8e67e0416715", [:mix], [{:expo, "~> 0.5.1 or ~> 1.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "01ce56f188b9dc28780a52783d6529ad2bc7124f9744e571e1ee4ea88bf08734"},
-  "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.4.4", "b9226785a9aa77b6857ca22832cffa5d5011a667207eb2a0ad56adb5db443b8a", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "c5eb0cab91f094599f94d55bc63409236a8ec69a21a67814529e8d5f6cc90b3b"},
-  "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": {:hex, :makeup, "1.1.2", "9ba8837913bdf757787e71c1581c21f9d2455f4dd04cfca785c70bbfff1a76a3", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "cce1566b81fbcbd21eca8ffe808f33b221f9eee2cbc7a1706fc3da9ff18e6cac"},
-  "makeup_elixir": {:hex, :makeup_elixir, "0.16.1", "cc9e3ca312f1cfeccc572b37a09980287e243648108384b97ff2b76e505c3555", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "e127a341ad1b209bd80f7bd1620a15693a9908ed780c3b763bccf7d200c767c6"},
+  "makeup_elixir": {:hex, :makeup_elixir, "0.16.2", "627e84b8e8bf22e60a2579dad15067c755531fea049ae26ef1020cad58fe9578", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "41193978704763f6bbe6cc2758b84909e62984c7752b3784bd3c218bb341706b"},
-  "makeup_erlang": {:hex, :makeup_erlang, "0.1.1", "3fcb7f09eb9d98dc4d208f49cc955a34218fc41ff6b84df7c75b3e6e533cc65f", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "174d0809e98a4ef0b3309256cbf97101c6ec01c4ab0b23e926a9e17df2077cbb"},
+  "makeup_erlang": {:hex, :makeup_erlang, "1.0.1", "c7f58c120b2b5aa5fd80d540a89fdf866ed42f1f3994e4fe189abebeab610839", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "8a89a1eeccc2d798d6ea15496a6e4870b75e014d1af514b1b71fa33134f57814"},
-  "mime": {:hex, :mime, "2.0.3", "3676436d3d1f7b81b5a2d2bd8405f412c677558c81b1c92be58c00562bb59095", [:mix], [], "hexpm", "27a30bf0db44d25eecba73755acf4068cbfe26a4372f9eb3e4ea3a45956bff6b"},
+  "mime": {:hex, :mime, "2.0.6", "8f18486773d9b15f95f4f4f1e39b710045fa1de891fada4516559967276e4dc2", [:mix], [], "hexpm", "c9945363a6b26d747389aac3643f8e0e09d30499a138ad64fe8fd1d13d9b153e"},
-  "nimble_parsec": {:hex, :nimble_parsec, "1.3.0", "9e18a119d9efc3370a3ef2a937bf0b24c088d9c4bf0ba9d7c3751d49d347d035", [:mix], [], "hexpm", "7977f183127a7cbe9346981e2f480dc04c55ffddaef746bd58debd566070eef8"},
+  "nimble_parsec": {:hex, :nimble_parsec, "1.4.0", "51f9b613ea62cfa97b25ccc2c1b4216e81df970acd8e16e8d1bdc58fef21370d", [:mix], [], "hexpm", "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"},
-  "oban": {:hex, :oban, "2.15.0", "27b9c2845cdff30c98c8060b11a64318e79bbc1bd32b8dc95fa59a1580a8d90c", [:mix], [{:ecto_sql, "~> 3.6", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:ecto_sqlite3, "~> 0.9", [hex: :ecto_sqlite3, repo: "hexpm", optional: true]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.16", [hex: :postgrex, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "22e181c540335d1dd5c995be00435927075519207d62b3de32477d95dbf9dfd3"},
+  "oban": {:hex, :oban, "2.18.3", "1608c04f8856c108555c379f2f56bc0759149d35fa9d3b825cb8a6769f8ae926", [:mix], [{:ecto_sql, "~> 3.10", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:ecto_sqlite3, "~> 0.9", [hex: :ecto_sqlite3, repo: "hexpm", optional: true]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.16", [hex: :postgrex, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "36ca6ca84ef6518f9c2c759ea88efd438a3c81d667ba23b02b062a0aa785475e"},
-  "phoenix": {:hex, :phoenix, "1.7.2", "c375ffb482beb4e3d20894f84dd7920442884f5f5b70b9f4528cbe0cedefec63", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.4", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "1ebca94b32b4d0e097ab2444a9742ed8ff3361acad17365e4e6b2e79b4792159"},
+  "phoenix": {:hex, :phoenix, "1.7.14", "a7d0b3f1bc95987044ddada111e77bd7f75646a08518942c72a8440278ae7825", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.7", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.5.3", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "c7859bc56cc5dfef19ecfc240775dae358cbaa530231118a9e014df392ace61a"},
-  "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_ecto": {:hex, :phoenix_ecto, "4.6.3", "f686701b0499a07f2e3b122d84d52ff8a31f5def386e03706c916f6feddf69ef", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.1", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.16 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}], "hexpm", "909502956916a657a197f94cc1206d9a65247538de8a5e186f7537c895d95764"},
-  "phoenix_html": {:hex, :phoenix_html, "3.3.1", "4788757e804a30baac6b3fc9695bf5562465dd3f1da8eb8460ad5b404d9a2178", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "bed1906edd4906a15fd7b412b85b05e521e1f67c9a85418c55999277e553d0d3"},
+  "phoenix_html": {:hex, :phoenix_html, "4.1.1", "4c064fd3873d12ebb1388425a8f2a19348cef56e7289e1998e2d2fa758aa982e", [:mix], [], "hexpm", "f2f2df5a72bc9a2f510b21497fd7d2b86d932ec0598f0210fed4114adc546c6f"},
-  "phoenix_live_dashboard": {:hex, :phoenix_live_dashboard, "0.7.2", "97cc4ff2dba1ebe504db72cb45098cb8e91f11160528b980bd282cc45c73b29c", [:mix], [{:ecto, "~> 3.6.2 or ~> 3.7", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_mysql_extras, "~> 0.5", [hex: :ecto_mysql_extras, repo: "hexpm", optional: true]}, {:ecto_psql_extras, "~> 0.7", [hex: :ecto_psql_extras, repo: "hexpm", optional: true]}, {:mime, "~> 1.6 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.18.3", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:telemetry_metrics, "~> 0.6 or ~> 1.0", [hex: :telemetry_metrics, repo: "hexpm", optional: false]}], "hexpm", "0e5fdf063c7a3b620c566a30fcf68b7ee02e5e46fe48ee46a6ec3ba382dc05b7"},
+  "phoenix_html_helpers": {:hex, :phoenix_html_helpers, "1.0.1", "7eed85c52eff80a179391036931791ee5d2f713d76a81d0d2c6ebafe1e11e5ec", [:mix], [{:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "cffd2385d1fa4f78b04432df69ab8da63dc5cf63e07b713a4dcf36a3740e3090"},
-  "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.4.1", "2aff698f5e47369decde4357ba91fc9c37c6487a512b41732818f2204a8ef1d3", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "9bffb834e7ddf08467fe54ae58b5785507aaba6255568ae22b4d46e2bb3615ab"},
+  "phoenix_live_dashboard": {:hex, :phoenix_live_dashboard, "0.8.4", "4508e481f791ce62ec6a096e13b061387158cbeefacca68c6c1928e1305e23ed", [: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]}, {:ecto_sqlite3_extras, "~> 1.1.7 or ~> 1.2.0", [hex: :ecto_sqlite3_extras, repo: "hexpm", optional: true]}, {:mime, "~> 1.6 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.19 or ~> 1.0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:telemetry_metrics, "~> 0.6 or ~> 1.0", [hex: :telemetry_metrics, repo: "hexpm", optional: false]}], "hexpm", "2984aae96994fbc5c61795a73b8fb58153b41ff934019cfb522343d2d3817d59"},
-  "phoenix_live_view": {:hex, :phoenix_live_view, "0.18.18", "1f38fbd7c363723f19aad1a04b5490ff3a178e37daaf6999594d5f34796c47fc", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a5810d0472f3189ede6d2a95bda7f31c6113156b91784a3426cb0ab6a6d85214"},
+  "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.5.3", "f2161c207fda0e4fb55165f650f7f8db23f02b29e3bff00ff7ef161d6ac1f09d", [:mix], [{:file_system, "~> 0.3 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "b4ec9cd73cb01ff1bd1cac92e045d13e7030330b74164297d1aee3907b54803c"},
-  "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.1", "ba04e489ef03763bf28a17eb2eaddc2c20c6d217e2150a61e3298b0f4c2012b5", [:mix], [], "hexpm", "81367c6d1eea5878ad726be80808eb5a787a23dee699f96e72b1109c57cdd8d9"},
+  "phoenix_live_view": {:hex, :phoenix_live_view, "0.20.17", "f396bbdaf4ba227b82251eb75ac0afa6b3da5e509bc0d030206374237dfc9450", [:mix], [{:floki, "~> 0.36", [hex: :floki, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.15", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a61d741ffb78c85fdbca0de084da6a48f8ceb5261a79165b5a0b59e5f65ce98b"},
-  "phoenix_template": {:hex, :phoenix_template, "1.0.1", "85f79e3ad1b0180abb43f9725973e3b8c2c3354a87245f91431eec60553ed3ef", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "157dc078f6226334c91cb32c1865bf3911686f8bcd6bcff86736f6253e6993ee"},
+  "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.3", "3168d78ba41835aecad272d5e8cd51aa87a7ac9eb836eabc42f6e57538e3731d", [:mix], [], "hexpm", "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"},
-  "plug": {:hex, :plug, "1.14.2", "cff7d4ec45b4ae176a227acd94a7ab536d9b37b942c8e8fa6dfc0fff98ff4d80", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "842fc50187e13cf4ac3b253d47d9474ed6c296a8732752835ce4a86acdf68d13"},
+  "phoenix_template": {:hex, :phoenix_template, "1.0.4", "e2092c132f3b5e5b2d49c96695342eb36d0ed514c5b252a77048d5969330d639", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "2c0c81f0e5c6753faf5cca2f229c9709919aba34fab866d3bc05060c9c444206"},
-  "plug_cowboy": {:hex, :plug_cowboy, "2.6.1", "9a3bbfceeb65eff5f39dab529e5cd79137ac36e913c02067dba3963a26efe9b2", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "de36e1a21f451a18b790f37765db198075c25875c64834bcc82d90b309eb6613"},
+  "plug": {:hex, :plug, "1.16.1", "40c74619c12f82736d2214557dedec2e9762029b2438d6d175c5074c933edc9d", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a13ff6b9006b03d7e33874945b2755253841b238c34071ed85b0e86057f8cddc"},
-  "plug_crypto": {:hex, :plug_crypto, "1.2.5", "918772575e48e81e455818229bf719d4ab4181fcbf7f85b68a35620f78d89ced", [:mix], [], "hexpm", "26549a1d6345e2172eb1c233866756ae44a9609bd33ee6f99147ab3fd87fd842"},
+  "plug_cowboy": {:hex, :plug_cowboy, "2.7.2", "fdadb973799ae691bf9ecad99125b16625b1c6039999da5fe544d99218e662e4", [: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", "245d8a11ee2306094840c000e8816f0cbed69a23fc0ac2bcf8d7835ae019bb2f"},
-  "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_crypto": {:hex, :plug_crypto, "2.1.0", "f44309c2b06d249c27c8d3f65cfe08158ade08418cf540fd4f72d4d6863abb7b", [:mix], [], "hexpm", "131216a4b030b8f8ce0f26038bc4421ae60e4bb95c5cf5395e1421437824c4fa"},
+  "postgrex": {:hex, :postgrex, "0.19.2", "34d6884a332c7bf1e367fc8b9a849d23b43f7da5c6e263def92784d03f9da468", [:mix], [{: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", "618988886ab7ae8561ebed9a3c7469034bf6a88b8995785a3378746a4b9835ec"},
   "ranch": {:hex, :ranch, "1.8.0", "8c7a100a139fd57f17327b6413e4167ac559fbc04ca7448e9be9057311597a1d", [:make, :rebar3], [], "hexpm", "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"},
-  "swoosh": {:hex, :swoosh, "1.9.1", "0a5d7bf9954eb41d7e55525bc0940379982b090abbaef67cd8e1fd2ed7f8ca1a", [: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", "76dffff3ffcab80f249d5937a592eaef7cc49ac6f4cdd27e622868326ed6371e"},
+  "swoosh": {:hex, :swoosh, "1.17.2", "73611f08fc7cb9fa15f4909db36eeb12b70727d5c8b6a7fa0d4a31c6575db29e", [:mix], [{:bandit, ">= 1.0.0", [hex: :bandit, repo: "hexpm", optional: true]}, {: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]}, {:mua, "~> 0.2.3", [hex: :mua, repo: "hexpm", optional: true]}, {:multipart, "~> 0.4", [hex: :multipart, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: true]}, {:plug_cowboy, ">= 1.0.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:req, "~> 0.5 or ~> 1.0", [hex: :req, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "de914359f0ddc134dc0d7735e28922d49d0503f31e4bd66b44e26039c2226d39"},
-  "table_rex": {:hex, :table_rex, "3.1.1", "0c67164d1714b5e806d5067c1e96ff098ba7ae79413cc075973e17c38a587caa", [:mix], [], "hexpm", "678a23aba4d670419c23c17790f9dcd635a4a89022040df7d5d772cb21012490"},
+  "table_rex": {:hex, :table_rex, "4.0.0", "3c613a68ebdc6d4d1e731bc973c233500974ec3993c99fcdabb210407b90959b", [:mix], [], "hexpm", "c35c4d5612ca49ebb0344ea10387da4d2afe278387d4019e4d8111e815df8f55"},
-  "telemetry": {:hex, :telemetry, "1.2.1", "68fdfe8d8f05a8428483a97d7aab2f268aaff24b49e0f599faa091f1d4e7f61c", [:rebar3], [], "hexpm", "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"},
+  "telemetry": {:hex, :telemetry, "1.3.0", "fedebbae410d715cf8e7062c96a1ef32ec22e764197f70cda73d82778d61e7a2", [:rebar3], [], "hexpm", "7015fc8919dbe63764f4b4b87a95b7c0996bd539e0d499be6ec9d7f3875b79e6"},
-  "telemetry_metrics": {:hex, :telemetry_metrics, "0.6.1", "315d9163a1d4660aedc3fee73f33f1d355dcc76c5c3ab3d59e76e3edf80eef1f", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7be9e0871c41732c233be71e4be11b96e56177bf15dde64a8ac9ce72ac9834c6"},
+  "telemetry_metrics": {:hex, :telemetry_metrics, "0.6.2", "2caabe9344ec17eafe5403304771c3539f3b6e2f7fb6a6f602558c825d0d0bfb", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "9b43db0dc33863930b9ef9d27137e78974756f5f198cae18409970ed6fa5b561"},
-  "telemetry_poller": {:hex, :telemetry_poller, "1.0.0", "db91bb424e07f2bb6e73926fcafbfcbcb295f0193e0a00e825e589a0a47e8453", [:rebar3], [{:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "b3a24eafd66c3f42da30fc3ca7dda1e9d546c12250a2d60d7b81d264fbec4f6e"},
+  "telemetry_poller": {:hex, :telemetry_poller, "1.1.0", "58fa7c216257291caaf8d05678c8d01bd45f4bdbc1286838a28c4bb62ef32999", [:rebar3], [{:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "9eb9d9cbfd81cbd7cdd24682f8711b6e2b691289a0de6826e58452f28c103c8f"},
-  "websock": {:hex, :websock, "0.5.0", "f6bbce90226121d62a0715bca7c986c5e43de0ccc9475d79c55381d1796368cc", [:mix], [], "hexpm", "b51ac706df8a7a48a2c622ee02d09d68be8c40418698ffa909d73ae207eb5fb8"},
+  "websock": {:hex, :websock, "0.5.3", "2f69a6ebe810328555b6fe5c831a851f485e303a7c8ce6c5f675abeb20ebdadc", [:mix], [], "hexpm", "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"},
-  "websock_adapter": {:hex, :websock_adapter, "0.5.0", "cea35d8bbf1a6964e32d4b02ceb561dfb769c04f16d60d743885587e7d2ca55b", [:mix], [{:bandit, "~> 0.6", [hex: :bandit, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "16318b124effab8209b1eb7906c636374f623dc9511a8278ad09c083cea5bb83"},
+  "websock_adapter": {:hex, :websock_adapter, "0.5.7", "65fa74042530064ef0570b75b43f5c49bb8b235d6515671b3d250022cb8a1f9e", [:mix], [{:bandit, ">= 0.6.0", [hex: :bandit, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "d0f478ee64deddfec64b800673fd6e0c8888b079d9f3444dd96d2a98383bdbd1"},
 }

priv/gettext/actions.pot

@@ -54,9 +54,9 @@ msgstr ""
 msgid "Delete User"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_registration_html/new.html.heex:47
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:52
 #: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:3
-#: lib/cannery_web/controllers/user_session_html/new.html.heex:38
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:46
 #, elixir-autogen, elixir-format
 msgid "Forgot your password?"
 msgstr ""
@@ -68,11 +68,11 @@ msgstr ""
 
 #: lib/cannery_web/components/core_components/topbar.html.heex:94
 #: lib/cannery_web/controllers/user_confirmation_html/new.html.heex:28
-#: lib/cannery_web/controllers/user_registration_html/new.html.heex:44
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:49
 #: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:41
 #: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:28
 #: lib/cannery_web/controllers/user_session_html/new.html.heex:3
-#: lib/cannery_web/controllers/user_session_html/new.html.heex:28
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Log in"
 msgstr ""
@@ -95,10 +95,10 @@ msgstr ""
 #: lib/cannery_web/components/core_components/topbar.html.heex:89
 #: lib/cannery_web/controllers/user_confirmation_html/new.html.heex:25
 #: lib/cannery_web/controllers/user_registration_html/new.html.heex:3
-#: lib/cannery_web/controllers/user_registration_html/new.html.heex:37
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:42
 #: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:38
 #: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:25
-#: lib/cannery_web/controllers/user_session_html/new.html.heex:35
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Register"
 msgstr ""
@@ -115,13 +115,13 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_record_component.html.heex:56
+#: lib/cannery_web/components/add_shot_record_component.html.heex:57
-#: lib/cannery_web/live/container_live/form_component.html.heex:55
+#: lib/cannery_web/live/container_live/form_component.html.heex:59
-#: lib/cannery_web/live/invite_live/form_component.html.heex:35
+#: lib/cannery_web/live/invite_live/form_component.html.heex:38
-#: lib/cannery_web/live/pack_live/form_component.html.heex:90
+#: lib/cannery_web/live/pack_live/form_component.html.heex:110
-#: lib/cannery_web/live/range_live/form_component.html.heex:44
+#: lib/cannery_web/live/range_live/form_component.html.heex:45
-#: lib/cannery_web/live/tag_live/form_component.html.heex:37
+#: lib/cannery_web/live/tag_live/form_component.html.heex:41
-#: lib/cannery_web/live/type_live/form_component.html.heex:353
+#: lib/cannery_web/live/type_live/form_component.html.heex:386
 #, elixir-autogen, elixir-format
 msgid "Save"
 msgstr ""
@@ -136,7 +136,7 @@ msgstr ""
 msgid "Why not add one?"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:51
+#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:53
 #, elixir-autogen, elixir-format
 msgid "Add"
 msgstr ""
@@ -178,7 +178,7 @@ msgstr ""
 msgid "add a container first"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/form_component.html.heex:83
+#: lib/cannery_web/live/pack_live/form_component.html.heex:103
 #, elixir-autogen, elixir-format
 msgid "Create"
 msgstr ""
@@ -288,23 +288,24 @@ msgstr ""
 msgid "Unstage"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:168
+#: lib/cannery_web/live/pack_live/index.html.heex:172
 #, elixir-autogen, elixir-format
 msgid "Clone pack of %{pack_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:183
+#: lib/cannery_web/live/pack_live/index.html.heex:187
 #: lib/cannery_web/live/pack_live/show.html.heex:71
 #, elixir-autogen, elixir-format
 msgid "Delete pack of %{pack_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:158
+#: lib/cannery_web/live/pack_live/index.html.heex:160
 #: lib/cannery_web/live/pack_live/show.html.heex:59
 #, elixir-autogen, elixir-format
 msgid "Edit pack of %{pack_count} bullets"
 msgstr ""
 
+#: lib/cannery_web/live/container_live/show.html.heex:139
 #: lib/cannery_web/live/pack_live/index.html.heex:148
 #: lib/cannery_web/live/type_live/show.html.heex:201
 #, elixir-autogen, elixir-format
@@ -312,29 +313,29 @@ msgid "View pack of %{pack_count} bullets"
 msgstr ""
 
 #: lib/cannery_web/live/pack_live/show.ex:159
-#: lib/cannery_web/live/range_live/index.html.heex:152
+#: lib/cannery_web/live/range_live/index.html.heex:154
 #, elixir-autogen, elixir-format
 msgid "Delete shot record of %{shot_record_count} shots"
 msgstr ""
 
 #: lib/cannery_web/live/pack_live/show.ex:144
-#: lib/cannery_web/live/range_live/index.html.heex:135
+#: lib/cannery_web/live/range_live/index.html.heex:137
 #, elixir-autogen, elixir-format
 msgid "Edit shot record of %{shot_record_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/index.html.heex:105
+#: lib/cannery_web/live/type_live/index.html.heex:107
 #, elixir-autogen, elixir-format
 msgid "Clone %{type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/index.html.heex:122
+#: lib/cannery_web/live/type_live/index.html.heex:124
 #: lib/cannery_web/live/type_live/show.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Delete %{type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/index.html.heex:97
+#: lib/cannery_web/live/type_live/index.html.heex:99
 #: lib/cannery_web/live/type_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "Edit %{type_name}"
@@ -345,7 +346,7 @@ msgstr ""
 msgid "New Type"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/index.html.heex:89
+#: lib/cannery_web/live/type_live/index.html.heex:91
 #, elixir-autogen, elixir-format
 msgid "View %{type_name}"
 msgstr ""

priv/gettext/de/LC_MESSAGES/actions.po

@@ -67,9 +67,9 @@ msgstr "Einladung erstellen"
 msgid "Delete User"
 msgstr "Benutzer löschen"
 
-#: lib/cannery_web/controllers/user_registration_html/new.html.heex:47
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:52
 #: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:3
-#: lib/cannery_web/controllers/user_session_html/new.html.heex:38
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:46
 #, elixir-autogen, elixir-format
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
@@ -81,11 +81,11 @@ msgstr "Laden Sie jemanden ein!"
 
 #: lib/cannery_web/components/core_components/topbar.html.heex:94
 #: lib/cannery_web/controllers/user_confirmation_html/new.html.heex:28
-#: lib/cannery_web/controllers/user_registration_html/new.html.heex:44
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:49
 #: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:41
 #: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:28
 #: lib/cannery_web/controllers/user_session_html/new.html.heex:3
-#: lib/cannery_web/controllers/user_session_html/new.html.heex:28
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Log in"
 msgstr "Einloggen"
@@ -108,10 +108,10 @@ msgstr "Neuer Tag"
 #: lib/cannery_web/components/core_components/topbar.html.heex:89
 #: lib/cannery_web/controllers/user_confirmation_html/new.html.heex:25
 #: lib/cannery_web/controllers/user_registration_html/new.html.heex:3
-#: lib/cannery_web/controllers/user_registration_html/new.html.heex:37
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:42
 #: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:38
 #: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:25
-#: lib/cannery_web/controllers/user_session_html/new.html.heex:35
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Register"
 msgstr "Registrieren"
@@ -128,13 +128,13 @@ msgstr "Bestätigungsmail erneut senden"
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
-#: lib/cannery_web/components/add_shot_record_component.html.heex:56
+#: lib/cannery_web/components/add_shot_record_component.html.heex:57
-#: lib/cannery_web/live/container_live/form_component.html.heex:55
+#: lib/cannery_web/live/container_live/form_component.html.heex:59
-#: lib/cannery_web/live/invite_live/form_component.html.heex:35
+#: lib/cannery_web/live/invite_live/form_component.html.heex:38
-#: lib/cannery_web/live/pack_live/form_component.html.heex:90
+#: lib/cannery_web/live/pack_live/form_component.html.heex:110
-#: lib/cannery_web/live/range_live/form_component.html.heex:44
+#: lib/cannery_web/live/range_live/form_component.html.heex:45
-#: lib/cannery_web/live/tag_live/form_component.html.heex:37
+#: lib/cannery_web/live/tag_live/form_component.html.heex:41
-#: lib/cannery_web/live/type_live/form_component.html.heex:353
+#: lib/cannery_web/live/type_live/form_component.html.heex:386
 #, elixir-autogen, elixir-format
 msgid "Save"
 msgstr "Speichern"
@@ -149,7 +149,7 @@ msgstr "Anleitung zum Passwort zurücksetzen zusenden"
 msgid "Why not add one?"
 msgstr "Warum fügen Sie keine hinzu?"
 
-#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:51
+#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:53
 #, elixir-autogen, elixir-format
 msgid "Add"
 msgstr "Hinzufügen"
@@ -191,7 +191,7 @@ msgstr "In die Zwischenablage kopieren"
 msgid "add a container first"
 msgstr "Zuerst einen Behälter hinzufügen"
 
-#: lib/cannery_web/live/pack_live/form_component.html.heex:83
+#: lib/cannery_web/live/pack_live/form_component.html.heex:103
 #, elixir-autogen, elixir-format
 msgid "Create"
 msgstr "Erstellen"
@@ -301,23 +301,24 @@ msgstr ""
 msgid "Unstage"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:168
+#: lib/cannery_web/live/pack_live/index.html.heex:172
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Clone pack of %{pack_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:183
+#: lib/cannery_web/live/pack_live/index.html.heex:187
 #: lib/cannery_web/live/pack_live/show.html.heex:71
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Delete pack of %{pack_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:158
+#: lib/cannery_web/live/pack_live/index.html.heex:160
 #: lib/cannery_web/live/pack_live/show.html.heex:59
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit pack of %{pack_count} bullets"
 msgstr ""
 
+#: lib/cannery_web/live/container_live/show.html.heex:139
 #: lib/cannery_web/live/pack_live/index.html.heex:148
 #: lib/cannery_web/live/type_live/show.html.heex:201
 #, elixir-autogen, elixir-format, fuzzy
@@ -325,29 +326,29 @@ msgid "View pack of %{pack_count} bullets"
 msgstr ""
 
 #: lib/cannery_web/live/pack_live/show.ex:159
-#: lib/cannery_web/live/range_live/index.html.heex:152
+#: lib/cannery_web/live/range_live/index.html.heex:154
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Delete shot record of %{shot_record_count} shots"
 msgstr ""
 
 #: lib/cannery_web/live/pack_live/show.ex:144
-#: lib/cannery_web/live/range_live/index.html.heex:135
+#: lib/cannery_web/live/range_live/index.html.heex:137
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit shot record of %{shot_record_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/index.html.heex:105
+#: lib/cannery_web/live/type_live/index.html.heex:107
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Clone %{type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/index.html.heex:122
+#: lib/cannery_web/live/type_live/index.html.heex:124
 #: lib/cannery_web/live/type_live/show.html.heex:35
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Delete %{type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/index.html.heex:97
+#: lib/cannery_web/live/type_live/index.html.heex:99
 #: lib/cannery_web/live/type_live/show.html.heex:19
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit %{type_name}"
@@ -358,7 +359,7 @@ msgstr ""
 msgid "New Type"
 msgstr "Neue Munitionsart"
 
-#: lib/cannery_web/live/type_live/index.html.heex:89
+#: lib/cannery_web/live/type_live/index.html.heex:91
 #, elixir-autogen, elixir-format, fuzzy
 msgid "View %{type_name}"
 msgstr ""

priv/gettext/de/LC_MESSAGES/default.po

@@ -38,55 +38,55 @@ msgstr "Admins:"
 msgid "Ammo"
 msgstr "Munition"
 
-#: lib/cannery_web/live/tag_live/form_component.html.heex:25
+#: lib/cannery_web/live/tag_live/form_component.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "Background color"
 msgstr "Hintergrundfarbe"
 
 #: lib/cannery_web/components/type_table_component.ex:86
-#: lib/cannery_web/live/type_live/form_component.html.heex:327
+#: lib/cannery_web/live/type_live/form_component.html.heex:358
 #, elixir-autogen, elixir-format
 msgid "Blank"
 msgstr "Knallpatrone"
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:174
+#: lib/cannery_web/live/type_live/form_component.html.heex:195
 #, elixir-autogen, elixir-format
 msgid "Brass"
 msgstr "Messing"
 
 #: lib/cannery_web/components/type_table_component.ex:61
-#: lib/cannery_web/live/type_live/form_component.html.heex:147
+#: lib/cannery_web/live/type_live/form_component.html.heex:163
 #, elixir-autogen, elixir-format
 msgid "Bullet core"
 msgstr "Projektilkern"
 
 #: lib/cannery_web/components/type_table_component.ex:59
-#: lib/cannery_web/live/type_live/form_component.html.heex:121
+#: lib/cannery_web/live/type_live/form_component.html.heex:136
 #, elixir-autogen, elixir-format
 msgid "Bullet type"
 msgstr "Patronenart"
 
 #: lib/cannery_web/components/type_table_component.ex:51
-#: lib/cannery_web/live/type_live/form_component.html.heex:67
+#: lib/cannery_web/live/type_live/form_component.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "Caliber"
 msgstr "Kaliber"
 
 #: lib/cannery_web/components/type_table_component.ex:49
-#: lib/cannery_web/live/type_live/form_component.html.heex:51
+#: lib/cannery_web/live/type_live/form_component.html.heex:57
 #, elixir-autogen, elixir-format
 msgid "Cartridge"
 msgstr "Patrone"
 
 #: lib/cannery_web/components/type_table_component.ex:66
-#: lib/cannery_web/live/type_live/form_component.html.heex:170
+#: lib/cannery_web/live/type_live/form_component.html.heex:188
 #, elixir-autogen, elixir-format
 msgid "Case material"
 msgstr "Gehäusematerial"
 
 #: lib/cannery_web/components/move_pack_component.ex:64
 #: lib/cannery_web/components/pack_table_component.ex:76
-#: lib/cannery_web/live/pack_live/form_component.html.heex:65
+#: lib/cannery_web/live/pack_live/form_component.html.heex:84
 #, elixir-autogen, elixir-format
 msgid "Container"
 msgstr "Behälter"
@@ -100,13 +100,13 @@ msgid "Containers"
 msgstr "Behälter"
 
 #: lib/cannery_web/components/type_table_component.ex:87
-#: lib/cannery_web/live/type_live/form_component.html.heex:331
+#: lib/cannery_web/live/type_live/form_component.html.heex:362
 #, elixir-autogen, elixir-format
 msgid "Corrosive"
 msgstr "Korrosiv"
 
 #: lib/cannery_web/components/pack_table_component.ex:104
-#: lib/cannery_web/live/pack_live/form_component.html.heex:28
+#: lib/cannery_web/live/pack_live/form_component.html.heex:45
 #, elixir-autogen, elixir-format
 msgid "Count"
 msgstr "Anzahl"
@@ -118,8 +118,8 @@ msgid "Count:"
 msgstr "Anzahl:"
 
 #: lib/cannery_web/components/container_table_component.ex:46
-#: lib/cannery_web/live/container_live/form_component.html.heex:29
+#: lib/cannery_web/live/container_live/form_component.html.heex:30
-#: lib/cannery_web/live/type_live/form_component.html.heex:38
+#: lib/cannery_web/live/type_live/form_component.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr "Beschreibung"
@@ -145,19 +145,19 @@ msgstr "Einladung bearbeiten"
 msgid "Edit Tag"
 msgstr "Tag bearbeiten"
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:135
+#: lib/cannery_web/live/type_live/form_component.html.heex:151
 #, elixir-autogen, elixir-format
 msgid "FMJ"
 msgstr "VM"
 
 #: lib/cannery_web/components/type_table_component.ex:58
-#: lib/cannery_web/live/type_live/form_component.html.heex:111
+#: lib/cannery_web/live/type_live/form_component.html.heex:126
 #, elixir-autogen, elixir-format
 msgid "Grains"
 msgstr "Körner"
 
 #: lib/cannery_web/components/type_table_component.ex:85
-#: lib/cannery_web/live/type_live/form_component.html.heex:323
+#: lib/cannery_web/live/type_live/form_component.html.heex:354
 #, elixir-autogen, elixir-format
 msgid "Incendiary"
 msgstr "Brandmunition"
@@ -184,14 +184,14 @@ msgstr "Nur mit Einladung"
 msgid "Invites"
 msgstr "Einladungen"
 
-#: lib/cannery_web/controllers/user_session_html/new.html.heex:23
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:31
 #, elixir-autogen, elixir-format
 msgid "Keep me logged in for 60 days"
 msgstr "Für 60 Tage eingeloggt bleiben"
 
 #: lib/cannery_web/components/container_table_component.ex:47
 #: lib/cannery_web/components/move_pack_component.ex:66
-#: lib/cannery_web/live/container_live/form_component.html.heex:46
+#: lib/cannery_web/live/container_live/form_component.html.heex:49
 #, elixir-autogen, elixir-format
 msgid "Location"
 msgstr "Standort"
@@ -202,24 +202,24 @@ msgstr "Standort"
 msgid "Location:"
 msgstr "Standort:"
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:41
+#: lib/cannery_web/live/container_live/form_component.html.heex:45
 #, elixir-autogen, elixir-format
 msgid "Magazine, Clip, Ammo Box, etc"
 msgstr "Magazin, Ladestreifen, Munitionskiste usw."
 
 #: lib/cannery_web/components/type_table_component.ex:88
-#: lib/cannery_web/live/type_live/form_component.html.heex:336
+#: lib/cannery_web/live/type_live/form_component.html.heex:367
-#: lib/cannery_web/live/type_live/form_component.html.heex:339
+#: lib/cannery_web/live/type_live/form_component.html.heex:370
 #, elixir-autogen, elixir-format
 msgid "Manufacturer"
 msgstr "Hersteller"
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:33
+#: lib/cannery_web/live/container_live/form_component.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Metal ammo can with the anime girl sticker"
 msgstr "Metallene Munitionskiste mit Anime-Girl-Sticker"
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:24
+#: lib/cannery_web/live/container_live/form_component.html.heex:26
 #, elixir-autogen, elixir-format
 msgid "My cool ammo can"
 msgstr "Meine coole Munitionskiste"
@@ -229,7 +229,7 @@ msgstr "Meine coole Munitionskiste"
 #: lib/cannery_web/live/container_live/form_component.html.heex:21
 #: lib/cannery_web/live/invite_live/form_component.html.heex:21
 #: lib/cannery_web/live/tag_live/form_component.html.heex:21
-#: lib/cannery_web/live/type_live/form_component.html.heex:31
+#: lib/cannery_web/live/type_live/form_component.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Name"
 msgstr "Name"
@@ -280,7 +280,7 @@ msgstr "Keine Tags"
 
 #: lib/cannery_web/components/add_shot_record_component.html.heex:38
 #: lib/cannery_web/components/shot_record_table_component.ex:46
-#: lib/cannery_web/live/pack_live/form_component.html.heex:57
+#: lib/cannery_web/live/pack_live/form_component.html.heex:75
 #: lib/cannery_web/live/pack_live/show.ex:90
 #: lib/cannery_web/live/range_live/form_component.html.heex:30
 #, elixir-autogen, elixir-format
@@ -293,19 +293,19 @@ msgstr "Bemerkungen"
 msgid "Notes:"
 msgstr "Bemerkungen:"
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:50
+#: lib/cannery_web/live/container_live/form_component.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "On the bookshelf"
 msgstr "Auf dem Bücherregal"
 
 #: lib/cannery_web/components/type_table_component.ex:79
-#: lib/cannery_web/live/type_live/form_component.html.heex:260
+#: lib/cannery_web/live/type_live/form_component.html.heex:287
 #, elixir-autogen, elixir-format
 msgid "Pressure"
 msgstr "Druck"
 
 #: lib/cannery_web/components/pack_table_component.ex:92
-#: lib/cannery_web/live/pack_live/form_component.html.heex:35
+#: lib/cannery_web/live/pack_live/form_component.html.heex:52
 #, elixir-autogen, elixir-format
 msgid "Price paid"
 msgstr "Kaufpreis"
@@ -316,7 +316,7 @@ msgid "Price paid:"
 msgstr "Kaufpreis:"
 
 #: lib/cannery_web/components/type_table_component.ex:82
-#: lib/cannery_web/live/type_live/form_component.html.heex:299
+#: lib/cannery_web/live/type_live/form_component.html.heex:328
 #, elixir-autogen, elixir-format
 msgid "Primer type"
 msgstr "Zündertyp"
@@ -338,7 +338,7 @@ msgstr ""
 "Hosten Sie Ihre eigene Instanz oder verwenden Sie eine Instanz, der Sie "
 "vertrauen."
 
-#: lib/cannery_web/controllers/user_settings_controller.ex:10
+#: lib/cannery_web/controllers/user_settings_controller.ex:9
 #: lib/cannery_web/controllers/user_settings_html/edit.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Settings"
@@ -349,7 +349,7 @@ msgstr "Einstellungen"
 msgid "Simple:"
 msgstr "Einfach:"
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:154
+#: lib/cannery_web/live/type_live/form_component.html.heex:171
 #, elixir-autogen, elixir-format
 msgid "Steel"
 msgstr "Stahl"
@@ -373,7 +373,7 @@ msgstr "Tags"
 msgid "Tags can be added to your containers to help you organize"
 msgstr "Tags können zur besseren Ordnung einem Behälter hinzugefügt werden"
 
-#: lib/cannery_web/live/tag_live/form_component.html.heex:31
+#: lib/cannery_web/live/tag_live/form_component.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Text color"
 msgstr "Textfarbe"
@@ -384,7 +384,7 @@ msgid "The self-hosted firearm tracker website"
 msgstr "Die selbst-gehostete Website zur Verwaltung von Schusswaffen"
 
 #: lib/cannery_web/components/type_table_component.ex:84
-#: lib/cannery_web/live/type_live/form_component.html.heex:319
+#: lib/cannery_web/live/type_live/form_component.html.heex:350
 #, elixir-autogen, elixir-format
 msgid "Tracer"
 msgstr "Leuchtspur"
@@ -392,8 +392,8 @@ msgstr "Leuchtspur"
 #: lib/cannery_web/components/container_table_component.ex:48
 #: lib/cannery_web/components/move_pack_component.ex:65
 #: lib/cannery_web/components/pack_table_component.ex:108
-#: lib/cannery_web/live/container_live/form_component.html.heex:38
+#: lib/cannery_web/live/container_live/form_component.html.heex:40
-#: lib/cannery_web/live/pack_live/form_component.html.heex:22
+#: lib/cannery_web/live/pack_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Type"
 msgstr "Art"
@@ -409,7 +409,7 @@ msgstr "Art:"
 msgid "Users"
 msgstr "Benutzer"
 
-#: lib/cannery_web/live/invite_live/form_component.html.heex:28
+#: lib/cannery_web/live/invite_live/form_component.html.heex:31
 #, elixir-autogen, elixir-format
 msgid "Uses left"
 msgstr "Verbleibende Nutzung"
@@ -426,6 +426,8 @@ msgstr "Keine Tags für diesen Behälter"
 
 #: lib/cannery_web/components/core_components/topbar.html.heex:48
 #: lib/cannery_web/components/pack_table_component.ex:80
+#: lib/cannery_web/live/range_live/index.ex:55
+#: lib/cannery_web/live/range_live/index.ex:65
 #, elixir-autogen, elixir-format
 msgid "Range"
 msgstr "Schießplatz"
@@ -435,10 +437,10 @@ msgstr "Schießplatz"
 msgid "Range day"
 msgstr "Range Day"
 
-#: lib/cannery_web/components/add_shot_record_component.html.heex:48
+#: lib/cannery_web/components/add_shot_record_component.html.heex:49
 #: lib/cannery_web/components/shot_record_table_component.ex:47
 #: lib/cannery_web/live/pack_live/show.ex:91
-#: lib/cannery_web/live/range_live/form_component.html.heex:40
+#: lib/cannery_web/live/range_live/form_component.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Date"
 msgstr "Datum"
@@ -459,13 +461,8 @@ msgstr "Keine Munition selektiert"
 msgid "Record shots"
 msgstr "Schüsse dokumentieren"
 
-#: lib/cannery_web/live/range_live/index.ex:47
-#, elixir-autogen, elixir-format
-msgid "New Shot Records"
-msgstr "Neue Schießkladde"
-
 #: lib/cannery_web/live/range_live/index.html.heex:52
-#: lib/cannery_web/live/range_live/index.html.heex:119
+#: lib/cannery_web/live/range_live/index.html.heex:121
 #, elixir-autogen, elixir-format
 msgid "No shots recorded"
 msgstr "Keine Schüsse dokumentiert"
@@ -477,12 +474,6 @@ msgstr "Keine Schüsse dokumentiert"
 msgid "Rounds shot"
 msgstr "Patronen abgefeuert"
 
-#: lib/cannery_web/live/range_live/index.ex:55
-#: lib/cannery_web/live/range_live/index.ex:65
-#, elixir-autogen, elixir-format
-msgid "Shot Records"
-msgstr "Schießkladde"
-
 #: lib/cannery_web/live/pack_live/index.ex:43
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
@@ -500,9 +491,9 @@ msgstr "Schießkladde"
 
 #: lib/cannery_web/components/core_components/pack_card.html.heex:42
 #: lib/cannery_web/components/core_components/pack_card.html.heex:47
-#: lib/cannery_web/components/pack_table_component.ex:176
+#: lib/cannery_web/components/pack_table_component.ex:181
-#: lib/cannery_web/components/pack_table_component.ex:259
+#: lib/cannery_web/components/pack_table_component.ex:264
-#: lib/cannery_web/components/type_table_component.ex:260
+#: lib/cannery_web/components/type_table_component.ex:273
 #: lib/cannery_web/live/pack_live/show.html.heex:37
 #: lib/cannery_web/live/pack_live/show.html.heex:42
 #: lib/cannery_web/live/type_live/show.html.heex:150
@@ -510,36 +501,36 @@ msgstr "Schießkladde"
 msgid "$%{amount}"
 msgstr "$%{amount}"
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:163
+#: lib/cannery_web/live/type_live/form_component.html.heex:181
 #, elixir-autogen, elixir-format
 msgid "Bimetal"
 msgstr "Bimetall"
 
 #: lib/cannery_web/components/type_table_component.ex:65
-#: lib/cannery_web/live/type_live/form_component.html.heex:159
+#: lib/cannery_web/live/type_live/form_component.html.heex:176
 #, elixir-autogen, elixir-format
 msgid "Jacket type"
 msgstr "Patronenhülse"
 
 #: lib/cannery_web/components/type_table_component.ex:81
-#: lib/cannery_web/live/type_live/form_component.html.heex:282
+#: lib/cannery_web/live/type_live/form_component.html.heex:311
 #, elixir-autogen, elixir-format
 msgid "Muzzle velocity"
 msgstr "Mündungsgeschwindigkeit"
 
 #: lib/cannery_web/components/type_table_component.ex:75
-#: lib/cannery_web/live/type_live/form_component.html.heex:247
+#: lib/cannery_web/live/type_live/form_component.html.heex:274
 #, elixir-autogen, elixir-format
 msgid "Powder grains per charge"
 msgstr "Pulverkörner pro Ladung"
 
 #: lib/cannery_web/components/type_table_component.ex:73
-#: lib/cannery_web/live/type_live/form_component.html.heex:239
+#: lib/cannery_web/live/type_live/form_component.html.heex:265
 #, elixir-autogen, elixir-format
 msgid "Powder type"
 msgstr "Pulverart"
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:346
+#: lib/cannery_web/live/type_live/form_component.html.heex:378
 #, elixir-autogen, elixir-format
 msgid "UPC"
 msgstr "UPC"
@@ -563,24 +554,24 @@ msgid "New password"
 msgstr "Neues Passwort"
 
 #: lib/cannery_web/components/type_table_component.ex:83
-#: lib/cannery_web/live/type_live/form_component.html.heex:307
+#: lib/cannery_web/live/type_live/form_component.html.heex:337
 #, elixir-autogen, elixir-format
 msgid "Firing type"
 msgstr "Patronenhülsenform"
 
-#: lib/cannery_web/components/layouts/live.html.heex:43
+#: lib/cannery_web/components/layouts/app.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Reconnecting..."
 msgstr "Neu verbinden..."
 
 #: lib/cannery_web/live/container_live/index.ex:28
-#: lib/cannery_web/live/container_live/show.ex:116
+#: lib/cannery_web/live/container_live/show.ex:118
 #, elixir-autogen, elixir-format
 msgid "Edit %{name}"
 msgstr "%{name} bearbeiten"
 
 #: lib/cannery_web/live/container_live/index.ex:63
-#: lib/cannery_web/live/container_live/show.ex:117
+#: lib/cannery_web/live/container_live/show.ex:119
 #, elixir-autogen, elixir-format
 msgid "Edit %{name} tags"
 msgstr "Editiere %{name} Tags"
@@ -592,9 +583,9 @@ msgstr "Editiere %{name} Tags"
 msgid "Rounds:"
 msgstr "Patronen:"
 
-#: lib/cannery_web/components/pack_table_component.ex:173
+#: lib/cannery_web/components/pack_table_component.ex:178
-#: lib/cannery_web/components/pack_table_component.ex:255
+#: lib/cannery_web/components/pack_table_component.ex:260
-#: lib/cannery_web/components/type_table_component.ex:259
+#: lib/cannery_web/components/type_table_component.ex:272
 #: lib/cannery_web/live/type_live/show.html.heex:154
 #, elixir-autogen, elixir-format
 msgid "No cost information"
@@ -630,7 +621,7 @@ msgstr "Prozent verbleibend:"
 msgid "Rounds used"
 msgstr "Patronen verbraucht"
 
-#: lib/cannery_web/controllers/user_confirmation_controller.ex:8
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:6
 #, elixir-autogen, elixir-format
 msgid "Confirm your account"
 msgstr "Bestätigen Sie ihr Nutzerkonto"
@@ -645,7 +636,7 @@ msgstr "Passwort vergessen?"
 msgid "Log in"
 msgstr "Einloggen"
 
-#: lib/cannery_web/controllers/user_registration_controller.ex:32
+#: lib/cannery_web/controllers/user_registration_controller.ex:31
 #, elixir-autogen, elixir-format
 msgid "Register"
 msgstr "Registrieren"
@@ -657,11 +648,12 @@ msgstr "Passwort zurücksetzen"
 
 #: lib/cannery_web/live/pack_live/show.ex:40
 #: lib/cannery_web/live/range_live/index.ex:31
+#: lib/cannery_web/live/range_live/index.ex:47
 #, elixir-autogen, elixir-format
 msgid "Record Shots"
 msgstr "Schüsse dokumentieren"
 
-#: lib/cannery_web/live/pack_live/form_component.html.heex:75
+#: lib/cannery_web/live/pack_live/form_component.html.heex:96
 #, elixir-autogen, elixir-format
 msgid "Copies"
 msgstr "Kopien"
@@ -671,22 +663,6 @@ msgstr "Kopien"
 msgid "Added on:"
 msgstr "Hinzugefügt am:"
 
-#: lib/cannery_web/controllers/user_registration_html/new.html.heex:32
-#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:127
-#, elixir-autogen, elixir-format
-msgid "English"
-msgstr "Englisch"
-
-#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:129
-#, elixir-autogen, elixir-format
-msgid "French"
-msgstr "Französisch"
-
-#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:128
-#, elixir-autogen, elixir-format
-msgid "German"
-msgstr "Deutsch"
-
 #: lib/cannery_web/controllers/user_registration_html/new.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Language"
@@ -763,7 +739,7 @@ msgstr ""
 msgid "isn't he cute >:3"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/form_component.html.heex:32
+#: lib/cannery_web/live/invite_live/form_component.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Leave \"Uses left\" blank to make invite unlimited"
 msgstr ""
@@ -774,13 +750,13 @@ msgid "Container:"
 msgstr "Behälter"
 
 #: lib/cannery_web/live/pack_live/index.html.heex:87
-#: lib/cannery_web/live/type_live/index.html.heex:64
+#: lib/cannery_web/live/type_live/index.html.heex:66
 #: lib/cannery_web/live/type_live/show.html.heex:164
 #, elixir-autogen, elixir-format
 msgid "Show used"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:214
+#: lib/cannery_web/components/pack_table_component.ex:219
 #: lib/cannery_web/live/pack_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "%{percentage}%"
@@ -957,7 +933,7 @@ msgid "Average CPR"
 msgstr ""
 
 #: lib/cannery_web/components/core_components/pack_card.html.heex:17
-#: lib/cannery_web/components/pack_table_component.ex:263
+#: lib/cannery_web/components/pack_table_component.ex:268
 #, elixir-autogen, elixir-format
 msgid "Empty"
 msgstr ""
@@ -997,13 +973,13 @@ msgstr ""
 msgid "Last used on:"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:194
+#: lib/cannery_web/components/pack_table_component.ex:199
 #, elixir-autogen, elixir-format
 msgid "Never used"
 msgstr ""
 
 #: lib/cannery_web/components/pack_table_component.ex:71
-#: lib/cannery_web/live/pack_live/form_component.html.heex:49
+#: lib/cannery_web/live/pack_live/form_component.html.heex:67
 #, elixir-autogen, elixir-format
 msgid "Purchased on"
 msgstr ""
@@ -1024,17 +1000,17 @@ msgstr "Munitionstyp bearbeiten"
 msgid "Search catalog"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:81
+#: lib/cannery_web/live/pack_live/index.html.heex:79
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Search ammo"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:34
+#: lib/cannery_web/live/container_live/index.html.heex:32
 #, elixir-autogen, elixir-format
 msgid "Search containers"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/index.html.heex:36
+#: lib/cannery_web/live/tag_live/index.html.heex:34
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Search tags"
 msgstr ""
@@ -1044,11 +1020,6 @@ msgstr ""
 msgid "Search shot records"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:130
-#, elixir-autogen, elixir-format
-msgid "Spanish"
-msgstr ""
-
 #: lib/cannery_web/components/layouts.ex:15
 #: lib/cannery_web/components/layouts/root.html.heex:9
 #: lib/cannery_web/components/layouts/root.html.heex:10
@@ -1143,38 +1114,38 @@ msgid "Email"
 msgstr ""
 
 #: lib/cannery_web/controllers/user_registration_html/new.html.heex:24
-#: lib/cannery_web/controllers/user_session_html/new.html.heex:20
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:24
 #, elixir-autogen, elixir-format
 msgid "Password"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:264
+#: lib/cannery_web/live/type_live/form_component.html.heex:292
 #, elixir-autogen, elixir-format
 msgid "+P"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:74
+#: lib/cannery_web/live/type_live/form_component.html.heex:82
 #, elixir-autogen, elixir-format
 msgid ".223"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:55
+#: lib/cannery_web/live/type_live/form_component.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "5.56x46mm NATO"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:303
+#: lib/cannery_web/live/type_live/form_component.html.heex:333
 #, elixir-autogen, elixir-format
 msgid "Boxer"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:311
+#: lib/cannery_web/live/type_live/form_component.html.heex:342
 #, elixir-autogen, elixir-format
 msgid "Centerfire"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_record_component.html.heex:43
+#: lib/cannery_web/components/add_shot_record_component.html.heex:45
-#: lib/cannery_web/live/range_live/form_component.html.heex:35
+#: lib/cannery_web/live/range_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Really great weather"
 msgstr ""
@@ -1212,19 +1183,19 @@ msgstr ""
 
 #: lib/cannery_web/live/container_live/show.html.heex:97
 #: lib/cannery_web/live/pack_live/index.html.heex:58
-#: lib/cannery_web/live/range_live/index.html.heex:89
+#: lib/cannery_web/live/range_live/index.html.heex:91
-#: lib/cannery_web/live/type_live/index.html.heex:35
+#: lib/cannery_web/live/type_live/index.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "All"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:316
+#: lib/cannery_web/live/type_live/form_component.html.heex:347
 #, elixir-autogen, elixir-format
 msgid "Attributes"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:56
-#: lib/cannery_web/live/type_live/form_component.html.heex:88
+#: lib/cannery_web/live/type_live/form_component.html.heex:97
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Brass height"
 msgstr "Messing"
@@ -1235,7 +1206,7 @@ msgid "Brass height:"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:57
-#: lib/cannery_web/live/type_live/form_component.html.heex:95
+#: lib/cannery_web/live/type_live/form_component.html.heex:107
 #, elixir-autogen, elixir-format
 msgid "Chamber size"
 msgstr ""
@@ -1245,13 +1216,13 @@ msgstr ""
 msgid "Chamber size:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:47
+#: lib/cannery_web/live/type_live/form_component.html.heex:53
 #, elixir-autogen, elixir-format
 msgid "Dimensions"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:80
-#: lib/cannery_web/live/type_live/form_component.html.heex:269
+#: lib/cannery_web/live/type_live/form_component.html.heex:297
 #, elixir-autogen, elixir-format
 msgid "Dram equivalent"
 msgstr ""
@@ -1262,7 +1233,7 @@ msgid "Dram equivalent:"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:51
-#: lib/cannery_web/live/type_live/form_component.html.heex:66
+#: lib/cannery_web/live/type_live/form_component.html.heex:73
 #, elixir-autogen, elixir-format
 msgid "Gauge"
 msgstr ""
@@ -1273,7 +1244,7 @@ msgid "Gauge:"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:71
-#: lib/cannery_web/live/type_live/form_component.html.heex:210
+#: lib/cannery_web/live/type_live/form_component.html.heex:235
 #, elixir-autogen, elixir-format
 msgid "Load grains"
 msgstr ""
@@ -1294,42 +1265,44 @@ msgid "None specified"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/show.html.heex:100
+#: lib/cannery_web/live/pack_live/form_component.html.heex:30
 #: lib/cannery_web/live/pack_live/index.html.heex:61
-#: lib/cannery_web/live/range_live/index.html.heex:92
+#: lib/cannery_web/live/range_live/index.html.heex:94
-#: lib/cannery_web/live/type_live/form_component.html.heex:25
+#: lib/cannery_web/live/type_live/form_component.html.heex:28
-#: lib/cannery_web/live/type_live/index.html.heex:38
+#: lib/cannery_web/live/type_live/index.html.heex:40
 #: lib/cannery_web/live/type_live/show.html.heex:56
 #, elixir-autogen, elixir-format
 msgid "Pistol"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:236
+#: lib/cannery_web/live/type_live/form_component.html.heex:262
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Powder"
 msgstr "Pulverart"
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:296
+#: lib/cannery_web/live/type_live/form_component.html.heex:325
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Primer"
 msgstr "Zündertyp"
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:108
+#: lib/cannery_web/live/type_live/form_component.html.heex:123
 #, elixir-autogen, elixir-format
 msgid "Projectile"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/show.html.heex:98
+#: lib/cannery_web/live/pack_live/form_component.html.heex:28
 #: lib/cannery_web/live/pack_live/index.html.heex:59
-#: lib/cannery_web/live/range_live/index.html.heex:90
+#: lib/cannery_web/live/range_live/index.html.heex:92
-#: lib/cannery_web/live/type_live/form_component.html.heex:25
+#: lib/cannery_web/live/type_live/form_component.html.heex:26
-#: lib/cannery_web/live/type_live/index.html.heex:36
+#: lib/cannery_web/live/type_live/index.html.heex:38
 #: lib/cannery_web/live/type_live/show.html.heex:54
 #, elixir-autogen, elixir-format
 msgid "Rifle"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:72
-#: lib/cannery_web/live/type_live/form_component.html.heex:218
+#: lib/cannery_web/live/type_live/form_component.html.heex:243
 #, elixir-autogen, elixir-format
 msgid "Shot charge weight"
 msgstr ""
@@ -1340,7 +1313,7 @@ msgid "Shot charge weight:"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:69
-#: lib/cannery_web/live/type_live/form_component.html.heex:194
+#: lib/cannery_web/live/type_live/form_component.html.heex:217
 #, elixir-autogen, elixir-format
 msgid "Shot material"
 msgstr ""
@@ -1351,7 +1324,7 @@ msgid "Shot material:"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:70
-#: lib/cannery_web/live/type_live/form_component.html.heex:203
+#: lib/cannery_web/live/type_live/form_component.html.heex:227
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Shot size"
 msgstr "Schüsse abgegeben"
@@ -1362,7 +1335,7 @@ msgid "Shot size:"
 msgstr "Schüsse abgegeben"
 
 #: lib/cannery_web/components/type_table_component.ex:68
-#: lib/cannery_web/live/type_live/form_component.html.heex:186
+#: lib/cannery_web/live/type_live/form_component.html.heex:208
 #, elixir-autogen, elixir-format
 msgid "Shot type"
 msgstr ""
@@ -1373,22 +1346,23 @@ msgid "Shot type:"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/show.html.heex:99
+#: lib/cannery_web/live/pack_live/form_component.html.heex:29
 #: lib/cannery_web/live/pack_live/index.html.heex:60
-#: lib/cannery_web/live/range_live/index.html.heex:91
+#: lib/cannery_web/live/range_live/index.html.heex:93
-#: lib/cannery_web/live/type_live/form_component.html.heex:25
+#: lib/cannery_web/live/type_live/form_component.html.heex:27
-#: lib/cannery_web/live/type_live/index.html.heex:37
+#: lib/cannery_web/live/type_live/index.html.heex:39
 #: lib/cannery_web/live/type_live/show.html.heex:52
 #, elixir-autogen, elixir-format
 msgid "Shotgun"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:61
-#: lib/cannery_web/live/type_live/form_component.html.heex:146
+#: lib/cannery_web/live/type_live/form_component.html.heex:162
 #, elixir-autogen, elixir-format
 msgid "Slug core"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:190
+#: lib/cannery_web/live/type_live/form_component.html.heex:213
 #, elixir-autogen, elixir-format
 msgid "Target, bird, buck, etc"
 msgstr ""
@@ -1399,13 +1373,13 @@ msgid "Unfired length:"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:55
-#: lib/cannery_web/live/type_live/form_component.html.heex:79
+#: lib/cannery_web/live/type_live/form_component.html.heex:87
 #, elixir-autogen, elixir-format
 msgid "Unfired shell length"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:67
-#: lib/cannery_web/live/type_live/form_component.html.heex:179
+#: lib/cannery_web/live/type_live/form_component.html.heex:200
 #, elixir-autogen, elixir-format
 msgid "Wadding"
 msgstr ""
@@ -1417,6 +1391,7 @@ msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:149
 #: lib/cannery_web/live/container_live/show.html.heex:91
+#: lib/cannery_web/live/pack_live/form_component.html.heex:22
 #: lib/cannery_web/live/pack_live/index.html.heex:50
 #: lib/cannery_web/live/range_live/index.html.heex:83
 #: lib/cannery_web/live/type_live/form_component.html.heex:21
@@ -1456,13 +1431,13 @@ msgid "New Type"
 msgstr "Neuer Munitionstyp"
 
 #: lib/cannery_web/live/type_live/index.html.heex:8
-#: lib/cannery_web/live/type_live/index.html.heex:71
+#: lib/cannery_web/live/type_live/index.html.heex:73
 #, elixir-autogen, elixir-format, fuzzy
 msgid "No Types"
 msgstr "Art"
 
 #: lib/cannery_web/components/pack_table_component.ex:84
-#: lib/cannery_web/live/pack_live/form_component.html.heex:42
+#: lib/cannery_web/live/pack_live/form_component.html.heex:59
 #, elixir-autogen, elixir-format
 msgid "Lot number"
 msgstr ""
@@ -1471,3 +1446,8 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Lot number:"
 msgstr ""
+
+#: lib/cannery_web/live/pack_live/form_component.html.heex:27
+#, elixir-autogen, elixir-format
+msgid "Any"
+msgstr ""

priv/gettext/de/LC_MESSAGES/emails.po

@@ -66,7 +66,7 @@ msgstr "Sie können ihr Passwort unter folgender URL zurücksetzen:"
 ## Run "mix gettext.extract" to bring this file up to
 ## date. Leave "msgstr"s empty as changing them here has no
 ## effect: edit them in PO (.po) files instead.
-#: lib/cannery/accounts/email.ex:31
+#: lib/cannery/email.ex:31
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Confirm your Cannery account"
 msgstr "Bestätigen Sie ihr %{name} Nutzerkonto"
@@ -86,7 +86,7 @@ msgstr ""
 "Falls Sie die Änderung von %{name} nicht angefragt haben, ignorieren Sie "
 "diese Nachricht bitte."
 
-#: lib/cannery/accounts/email.ex:38
+#: lib/cannery/email.ex:38
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Reset your Cannery password"
 msgstr "Passwort für %{name} zurücksetzen"
@@ -105,7 +105,7 @@ msgstr ""
 "Diese Nachricht wurde von %{name} gesandt, einem selbst-gehosteten "
 "Schusswaffenmanager."
 
-#: lib/cannery/accounts/email.ex:45
+#: lib/cannery/email.ex:45
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Update your Cannery email"
 msgstr "Aktualisieren Sie %{name} Mailadresse"

priv/gettext/de/LC_MESSAGES/errors.po

@@ -23,7 +23,7 @@ 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:220
+#: lib/cannery/containers.ex:222
 #, elixir-autogen, elixir-format
 msgid "Container must be empty before deleting"
 msgstr "Behälter muss vor dem Löschen leer sein"
@@ -39,7 +39,7 @@ msgstr "Konnte %{name} nicht löschen: %{error}"
 msgid "Could not find that container"
 msgstr "Konnte Behälter nicht finden"
 
-#: lib/cannery_web/controllers/user_settings_controller.ex:84
+#: lib/cannery_web/controllers/user_settings_controller.ex:83
 #, elixir-autogen, elixir-format
 msgid "Email change link is invalid or it has expired."
 msgstr "Mailadressenänderungs-Link ist ungültig oder abgelaufen."
@@ -80,21 +80,21 @@ msgstr "Oops, etwas ist schiefgegangen. Bitte beachten Sie den Fehler unten."
 msgid "Reset password link is invalid or it has expired."
 msgstr "Link zum Passwort zurücksetzen ist ungültig oder abgelaufen."
 
-#: lib/cannery_web/controllers/user_registration_controller.ex:22
+#: lib/cannery_web/controllers/user_registration_controller.ex:21
-#: lib/cannery_web/controllers/user_registration_controller.ex:51
+#: lib/cannery_web/controllers/user_registration_controller.ex:50
 #, elixir-autogen, elixir-format
 msgid "Sorry, public registration is disabled"
 msgstr "Entschuldigung, aber öffentliche Registrierung ist deaktiviert"
 
-#: lib/cannery_web/controllers/user_registration_controller.ex:12
+#: lib/cannery_web/controllers/user_registration_controller.ex:11
-#: lib/cannery_web/controllers/user_registration_controller.ex:41
+#: lib/cannery_web/controllers/user_registration_controller.ex:40
-#: lib/cannery_web/controllers/user_registration_controller.ex:70
+#: lib/cannery_web/controllers/user_registration_controller.ex:69
 #, 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
+#: lib/cannery_web/controllers/user_settings_controller.ex:98
 #, elixir-autogen, elixir-format
 msgid "Unable to delete user"
 msgstr "Dieser Nutzer konnte nicht gelöscht werden"
@@ -105,7 +105,7 @@ msgstr "Dieser Nutzer konnte nicht gelöscht werden"
 msgid "Unauthorized"
 msgstr "Unbefugt"
 
-#: lib/cannery_web/controllers/user_confirmation_controller.ex:53
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:51
 #, elixir-autogen, elixir-format
 msgid "User confirmation link is invalid or it has expired."
 msgstr "Nutzerkonto Bestätigungslink ist ungültig oder abgelaufen."
@@ -115,22 +115,22 @@ msgstr "Nutzerkonto Bestätigungslink ist ungültig oder abgelaufen."
 msgid "You are not authorized to view this page."
 msgstr "Sie sind nicht berechtigt, diese Seite aufzurufen."
 
-#: lib/cannery/accounts/user.ex:145
+#: lib/cannery/accounts/user.ex:140
 #, elixir-autogen, elixir-format
 msgid "did not change"
 msgstr "hat sich nicht geändert"
 
-#: lib/cannery/accounts/user.ex:166
+#: lib/cannery/accounts/user.ex:161
 #, elixir-autogen, elixir-format
 msgid "does not match password"
 msgstr "Passwort stimmt nicht überein"
 
-#: lib/cannery/accounts/user.ex:203
+#: lib/cannery/accounts/user.ex:198
 #, elixir-autogen, elixir-format
 msgid "is not valid"
 msgstr "ist nicht gültig"
 
-#: lib/cannery/accounts/user.ex:100
+#: lib/cannery/accounts/user.ex:95
 #, elixir-autogen, elixir-format
 msgid "must have the @ sign and no spaces"
 msgstr "Muss ein @ Zeichen und keine Leerzeichen haben"
@@ -158,58 +158,48 @@ msgstr ""
 msgid "Tag could not be removed"
 msgstr "Tag konnte nicht gelöscht werden"
 
-#: lib/cannery_web/live/pack_live/form_component.ex:159
+#: lib/cannery_web/live/pack_live/form_component.ex:175
 #, elixir-autogen, elixir-format
 msgid "Could not parse number of copies"
 msgstr "Konnte die Anzahl der Kopien nicht verstehen"
 
-#: lib/cannery_web/live/pack_live/form_component.ex:149
+#: lib/cannery/ammo.ex:1026
 #, elixir-autogen, elixir-format
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""
 "Ungültige Nummer an Kopien. Muss zwischen 1 and %{max} liegen. War "
 "%{multiplier}"
 
-#: lib/cannery/ammo.ex:1121
-#, elixir-autogen, elixir-format
-msgid "Invalid multiplier"
-msgstr ""
-
 #: lib/cannery_web/live/range_live/index.html.heex:71
 #, elixir-autogen, elixir-format
 msgid "Your browser does not support the canvas element."
 msgstr ""
 
-#: lib/cannery/activity_log/shot_record.ex:74
+#: lib/cannery/activity_log/shot_record.ex:71
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Please select a valid user and ammo pack"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_record.ex:88
+#: lib/cannery/activity_log/shot_record.ex:85
 #, elixir-autogen, elixir-format
 msgid "Ammo left can be at most %{count} rounds"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_record.ex:84
+#: lib/cannery/activity_log/shot_record.ex:81
 #, elixir-autogen, elixir-format
 msgid "Ammo left must be at least 0"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_record.ex:119
+#: lib/cannery/activity_log/shot_record.ex:116
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Count can be at most %{count} shots"
 msgstr "Anzahl muss weniger als %{count} betragen"
 
-#: lib/cannery/activity_log/shot_record.ex:80
+#: lib/cannery/activity_log/shot_record.ex:77
 #, elixir-autogen, elixir-format
 msgid "can't be blank"
 msgstr ""
 
-#: lib/cannery/ammo/pack.ex:100
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Please select a type and container"
-msgstr ""
-
 #: lib/cannery_web/controllers/error_html.ex:11
 #: lib/cannery_web/controllers/error_json.ex:9
 #, elixir-autogen, elixir-format, fuzzy
@@ -225,3 +215,13 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "You must log in to access this page."
 msgstr ""
+
+#: lib/cannery/ammo/pack.ex:98
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Please select a valid container"
+msgstr ""
+
+#: lib/cannery/ammo/pack.ex:96
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Please select a valid type"
+msgstr ""

priv/gettext/de/LC_MESSAGES/prompts.po

@@ -23,10 +23,10 @@ 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/container_live/form_component.ex:89
+#: lib/cannery_web/live/container_live/form_component.ex:88
-#: lib/cannery_web/live/invite_live/form_component.ex:80
+#: lib/cannery_web/live/invite_live/form_component.ex:79
-#: lib/cannery_web/live/tag_live/form_component.ex:78
+#: lib/cannery_web/live/tag_live/form_component.ex:77
-#: lib/cannery_web/live/type_live/form_component.ex:88
+#: lib/cannery_web/live/type_live/form_component.ex:87
 #, elixir-autogen, elixir-format
 msgid "%{name} created successfully"
 msgstr "%{name} erfolgreich erstellt"
@@ -44,15 +44,15 @@ msgstr "%{name} erfolgreich gelöscht"
 msgid "%{name} has been deleted"
 msgstr "%{name} wurde gelöscht"
 
-#: lib/cannery_web/live/container_live/form_component.ex:70
+#: lib/cannery_web/live/container_live/form_component.ex:69
-#: lib/cannery_web/live/invite_live/form_component.ex:62
+#: lib/cannery_web/live/invite_live/form_component.ex:61
-#: lib/cannery_web/live/tag_live/form_component.ex:60
+#: lib/cannery_web/live/tag_live/form_component.ex:59
-#: lib/cannery_web/live/type_live/form_component.ex:69
+#: lib/cannery_web/live/type_live/form_component.ex:68
 #, elixir-autogen, elixir-format
 msgid "%{name} updated successfully"
 msgstr "%{name} erfolgreich aktualisiert"
 
-#: lib/cannery_web/controllers/user_settings_controller.ex:29
+#: lib/cannery_web/controllers/user_settings_controller.ex:28
 #, elixir-autogen, elixir-format
 msgid "A link to confirm your email change has been sent to the new address."
 msgstr "Eine Mail zum Bestätigen ihre Mailadresse wurde Ihnen zugesandt."
@@ -73,7 +73,7 @@ msgstr ""
 msgid "Are you sure you want to delete %{name}?"
 msgstr "Sind Sie sicher, dass sie %{name} löschen möchten?"
 
-#: lib/cannery_web/live/pack_live/index.html.heex:181
+#: lib/cannery_web/live/pack_live/index.html.heex:185
 #: lib/cannery_web/live/pack_live/show.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this ammo?"
@@ -89,12 +89,12 @@ msgstr "Sind Sie sicher, dass sie Ihren Account löschen möchten?"
 msgid "Are you sure you want to log out?"
 msgstr "Wirklich ausloggen?"
 
-#: lib/cannery_web/controllers/user_settings_controller.ex:77
+#: lib/cannery_web/controllers/user_settings_controller.ex:76
 #, elixir-autogen, elixir-format
 msgid "Email changed successfully."
 msgstr "Mailadresse erfolgreich geändert."
 
-#: lib/cannery_web/controllers/user_confirmation_controller.ex:23
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:21
 #, elixir-autogen, elixir-format
 msgid "If your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly."
 msgstr ""
@@ -118,28 +118,28 @@ msgstr "Erfolgreich ausgeloggt."
 msgid "Password reset successfully."
 msgstr "Passwort erfolgreich zurückgesetzt."
 
-#: lib/cannery_web/controllers/user_settings_controller.ex:49
+#: lib/cannery_web/controllers/user_settings_controller.ex:48
 #, elixir-autogen, elixir-format
 msgid "Password updated successfully."
 msgstr "Passwort erfolgreich geändert."
 
-#: lib/cannery_web/controllers/user_registration_controller.ex:65
+#: lib/cannery_web/controllers/user_registration_controller.ex:64
 #, elixir-autogen, elixir-format
 msgid "Please check your email to verify your account"
 msgstr "Bitte überprüfen Sie ihre Mailbox und bestätigen Sie das Nutzerkonto"
 
-#: lib/cannery_web/components/add_shot_record_component.html.heex:58
+#: lib/cannery_web/components/add_shot_record_component.html.heex:59
-#: lib/cannery_web/live/container_live/form_component.html.heex:57
+#: lib/cannery_web/live/container_live/form_component.html.heex:61
-#: lib/cannery_web/live/invite_live/form_component.html.heex:37
+#: lib/cannery_web/live/invite_live/form_component.html.heex:40
-#: lib/cannery_web/live/pack_live/form_component.html.heex:91
+#: lib/cannery_web/live/pack_live/form_component.html.heex:111
-#: lib/cannery_web/live/range_live/form_component.html.heex:46
+#: lib/cannery_web/live/range_live/form_component.html.heex:47
-#: lib/cannery_web/live/tag_live/form_component.html.heex:39
+#: lib/cannery_web/live/tag_live/form_component.html.heex:43
-#: lib/cannery_web/live/type_live/form_component.html.heex:354
+#: lib/cannery_web/live/type_live/form_component.html.heex:387
 #, elixir-autogen, elixir-format
 msgid "Saving..."
 msgstr "Speichere..."
 
-#: lib/cannery_web/controllers/user_settings_controller.ex:95
+#: lib/cannery_web/controllers/user_settings_controller.ex:94
 #, elixir-autogen, elixir-format
 msgid "Your account has been deleted"
 msgstr "Ihr Nutzerkonto wurde gelöscht"
@@ -161,12 +161,12 @@ msgstr "%{name} erfolgreich hinzugefügt"
 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:53
+#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "Adding..."
 msgstr "Füge hinzu..."
 
-#: lib/cannery_web/components/add_shot_record_component.ex:60
+#: lib/cannery_web/components/add_shot_record_component.ex:62
 #, elixir-autogen, elixir-format
 msgid "Shots recorded successfully"
 msgstr "Schüsse erfolgreich dokumentiert"
@@ -177,7 +177,7 @@ msgid "Are you sure you want to unstage this ammo?"
 msgstr "Sind sie sicher, dass Sie diese Munition demarkieren möchten?"
 
 #: lib/cannery_web/live/pack_live/show.ex:157
-#: lib/cannery_web/live/range_live/index.html.heex:149
+#: lib/cannery_web/live/range_live/index.html.heex:151
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this shot record?"
 msgstr "Sind sie sicher, dass sie die Schießkladde löschen möchten?"
@@ -193,7 +193,7 @@ msgstr "Schießkladde erfolgreich gelöscht"
 msgid "Shot records updated successfully"
 msgstr "Schießkladde erfolgreich aktualisiert"
 
-#: lib/cannery_web/controllers/user_confirmation_controller.ex:37
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:35
 #, elixir-autogen, elixir-format
 msgid "%{email} confirmed successfully."
 msgstr "%{email} erfolgreich bestätigt."
@@ -219,7 +219,7 @@ msgstr "%{name} erfolgreich entfernt"
 msgid "You'll need to"
 msgstr "Sie müssen"
 
-#: lib/cannery_web/live/pack_live/form_component.html.heex:84
+#: lib/cannery_web/live/pack_live/form_component.html.heex:104
 #, elixir-autogen, elixir-format
 msgid "Creating..."
 msgstr "Erstellen..."
@@ -229,7 +229,7 @@ msgstr "Erstellen..."
 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
+#: lib/cannery_web/controllers/user_settings_controller.ex:64
 #, elixir-autogen, elixir-format
 msgid "Language updated successfully."
 msgstr "Spracheinstellung gespeichert."
@@ -245,19 +245,19 @@ msgstr "Munitionsgruppe erfolgreich gelöscht"
 msgid "Ammo unstaged succesfully"
 msgstr "Munition erfolgreich demarkiert"
 
-#: lib/cannery_web/live/pack_live/form_component.ex:125
+#: lib/cannery_web/live/pack_live/form_component.ex:141
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo updated successfully"
 msgstr "Munitionsgruppe erfolgreich aktualisiert"
 
-#: lib/cannery_web/live/pack_live/form_component.ex:184
+#: lib/cannery_web/live/pack_live/form_component.ex:162
 #, 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/type_live/index.html.heex:116
+#: lib/cannery_web/live/type_live/index.html.heex:118
 #: lib/cannery_web/live/type_live/show.html.heex:29
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!"

priv/gettext/default.pot

@@ -34,55 +34,55 @@ msgstr ""
 msgid "Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/form_component.html.heex:25
+#: lib/cannery_web/live/tag_live/form_component.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "Background color"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:86
-#: lib/cannery_web/live/type_live/form_component.html.heex:327
+#: lib/cannery_web/live/type_live/form_component.html.heex:358
 #, elixir-autogen, elixir-format
 msgid "Blank"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:174
+#: lib/cannery_web/live/type_live/form_component.html.heex:195
 #, elixir-autogen, elixir-format
 msgid "Brass"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:61
-#: lib/cannery_web/live/type_live/form_component.html.heex:147
+#: lib/cannery_web/live/type_live/form_component.html.heex:163
 #, elixir-autogen, elixir-format
 msgid "Bullet core"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:59
-#: lib/cannery_web/live/type_live/form_component.html.heex:121
+#: lib/cannery_web/live/type_live/form_component.html.heex:136
 #, elixir-autogen, elixir-format
 msgid "Bullet type"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:51
-#: lib/cannery_web/live/type_live/form_component.html.heex:67
+#: lib/cannery_web/live/type_live/form_component.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "Caliber"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:49
-#: lib/cannery_web/live/type_live/form_component.html.heex:51
+#: lib/cannery_web/live/type_live/form_component.html.heex:57
 #, elixir-autogen, elixir-format
 msgid "Cartridge"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:66
-#: lib/cannery_web/live/type_live/form_component.html.heex:170
+#: lib/cannery_web/live/type_live/form_component.html.heex:188
 #, elixir-autogen, elixir-format
 msgid "Case material"
 msgstr ""
 
 #: lib/cannery_web/components/move_pack_component.ex:64
 #: lib/cannery_web/components/pack_table_component.ex:76
-#: lib/cannery_web/live/pack_live/form_component.html.heex:65
+#: lib/cannery_web/live/pack_live/form_component.html.heex:84
 #, elixir-autogen, elixir-format
 msgid "Container"
 msgstr ""
@@ -96,13 +96,13 @@ msgid "Containers"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:87
-#: lib/cannery_web/live/type_live/form_component.html.heex:331
+#: lib/cannery_web/live/type_live/form_component.html.heex:362
 #, elixir-autogen, elixir-format
 msgid "Corrosive"
 msgstr ""
 
 #: lib/cannery_web/components/pack_table_component.ex:104
-#: lib/cannery_web/live/pack_live/form_component.html.heex:28
+#: lib/cannery_web/live/pack_live/form_component.html.heex:45
 #, elixir-autogen, elixir-format
 msgid "Count"
 msgstr ""
@@ -114,8 +114,8 @@ msgid "Count:"
 msgstr ""
 
 #: lib/cannery_web/components/container_table_component.ex:46
-#: lib/cannery_web/live/container_live/form_component.html.heex:29
+#: lib/cannery_web/live/container_live/form_component.html.heex:30
-#: lib/cannery_web/live/type_live/form_component.html.heex:38
+#: lib/cannery_web/live/type_live/form_component.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr ""
@@ -141,19 +141,19 @@ msgstr ""
 msgid "Edit Tag"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:135
+#: lib/cannery_web/live/type_live/form_component.html.heex:151
 #, elixir-autogen, elixir-format
 msgid "FMJ"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:58
-#: lib/cannery_web/live/type_live/form_component.html.heex:111
+#: lib/cannery_web/live/type_live/form_component.html.heex:126
 #, elixir-autogen, elixir-format
 msgid "Grains"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:85
-#: lib/cannery_web/live/type_live/form_component.html.heex:323
+#: lib/cannery_web/live/type_live/form_component.html.heex:354
 #, elixir-autogen, elixir-format
 msgid "Incendiary"
 msgstr ""
@@ -180,14 +180,14 @@ msgstr ""
 msgid "Invites"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_session_html/new.html.heex:23
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:31
 #, elixir-autogen, elixir-format
 msgid "Keep me logged in for 60 days"
 msgstr ""
 
 #: lib/cannery_web/components/container_table_component.ex:47
 #: lib/cannery_web/components/move_pack_component.ex:66
-#: lib/cannery_web/live/container_live/form_component.html.heex:46
+#: lib/cannery_web/live/container_live/form_component.html.heex:49
 #, elixir-autogen, elixir-format
 msgid "Location"
 msgstr ""
@@ -198,24 +198,24 @@ msgstr ""
 msgid "Location:"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:41
+#: lib/cannery_web/live/container_live/form_component.html.heex:45
 #, elixir-autogen, elixir-format
 msgid "Magazine, Clip, Ammo Box, etc"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:88
-#: lib/cannery_web/live/type_live/form_component.html.heex:336
+#: lib/cannery_web/live/type_live/form_component.html.heex:367
-#: lib/cannery_web/live/type_live/form_component.html.heex:339
+#: lib/cannery_web/live/type_live/form_component.html.heex:370
 #, elixir-autogen, elixir-format
 msgid "Manufacturer"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:33
+#: lib/cannery_web/live/container_live/form_component.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Metal ammo can with the anime girl sticker"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:24
+#: lib/cannery_web/live/container_live/form_component.html.heex:26
 #, elixir-autogen, elixir-format
 msgid "My cool ammo can"
 msgstr ""
@@ -225,7 +225,7 @@ msgstr ""
 #: lib/cannery_web/live/container_live/form_component.html.heex:21
 #: lib/cannery_web/live/invite_live/form_component.html.heex:21
 #: lib/cannery_web/live/tag_live/form_component.html.heex:21
-#: lib/cannery_web/live/type_live/form_component.html.heex:31
+#: lib/cannery_web/live/type_live/form_component.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Name"
 msgstr ""
@@ -276,7 +276,7 @@ msgstr ""
 
 #: lib/cannery_web/components/add_shot_record_component.html.heex:38
 #: lib/cannery_web/components/shot_record_table_component.ex:46
-#: lib/cannery_web/live/pack_live/form_component.html.heex:57
+#: lib/cannery_web/live/pack_live/form_component.html.heex:75
 #: lib/cannery_web/live/pack_live/show.ex:90
 #: lib/cannery_web/live/range_live/form_component.html.heex:30
 #, elixir-autogen, elixir-format
@@ -289,19 +289,19 @@ msgstr ""
 msgid "Notes:"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:50
+#: lib/cannery_web/live/container_live/form_component.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "On the bookshelf"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:79
-#: lib/cannery_web/live/type_live/form_component.html.heex:260
+#: lib/cannery_web/live/type_live/form_component.html.heex:287
 #, elixir-autogen, elixir-format
 msgid "Pressure"
 msgstr ""
 
 #: lib/cannery_web/components/pack_table_component.ex:92
-#: lib/cannery_web/live/pack_live/form_component.html.heex:35
+#: lib/cannery_web/live/pack_live/form_component.html.heex:52
 #, elixir-autogen, elixir-format
 msgid "Price paid"
 msgstr ""
@@ -312,7 +312,7 @@ msgid "Price paid:"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:82
-#: lib/cannery_web/live/type_live/form_component.html.heex:299
+#: lib/cannery_web/live/type_live/form_component.html.heex:328
 #, elixir-autogen, elixir-format
 msgid "Primer type"
 msgstr ""
@@ -332,7 +332,7 @@ msgstr ""
 msgid "Self-host your own instance, or use an instance from someone you trust."
 msgstr ""
 
-#: lib/cannery_web/controllers/user_settings_controller.ex:10
+#: lib/cannery_web/controllers/user_settings_controller.ex:9
 #: lib/cannery_web/controllers/user_settings_html/edit.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Settings"
@@ -343,7 +343,7 @@ msgstr ""
 msgid "Simple:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:154
+#: lib/cannery_web/live/type_live/form_component.html.heex:171
 #, elixir-autogen, elixir-format
 msgid "Steel"
 msgstr ""
@@ -367,7 +367,7 @@ msgstr ""
 msgid "Tags can be added to your containers to help you organize"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/form_component.html.heex:31
+#: lib/cannery_web/live/tag_live/form_component.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Text color"
 msgstr ""
@@ -378,7 +378,7 @@ msgid "The self-hosted firearm tracker website"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:84
-#: lib/cannery_web/live/type_live/form_component.html.heex:319
+#: lib/cannery_web/live/type_live/form_component.html.heex:350
 #, elixir-autogen, elixir-format
 msgid "Tracer"
 msgstr ""
@@ -386,8 +386,8 @@ msgstr ""
 #: lib/cannery_web/components/container_table_component.ex:48
 #: lib/cannery_web/components/move_pack_component.ex:65
 #: lib/cannery_web/components/pack_table_component.ex:108
-#: lib/cannery_web/live/container_live/form_component.html.heex:38
+#: lib/cannery_web/live/container_live/form_component.html.heex:40
-#: lib/cannery_web/live/pack_live/form_component.html.heex:22
+#: lib/cannery_web/live/pack_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Type"
 msgstr ""
@@ -403,7 +403,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/form_component.html.heex:28
+#: lib/cannery_web/live/invite_live/form_component.html.heex:31
 #, elixir-autogen, elixir-format
 msgid "Uses left"
 msgstr ""
@@ -420,6 +420,8 @@ msgstr ""
 
 #: lib/cannery_web/components/core_components/topbar.html.heex:48
 #: lib/cannery_web/components/pack_table_component.ex:80
+#: lib/cannery_web/live/range_live/index.ex:55
+#: lib/cannery_web/live/range_live/index.ex:65
 #, elixir-autogen, elixir-format
 msgid "Range"
 msgstr ""
@@ -429,10 +431,10 @@ msgstr ""
 msgid "Range day"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_record_component.html.heex:48
+#: lib/cannery_web/components/add_shot_record_component.html.heex:49
 #: lib/cannery_web/components/shot_record_table_component.ex:47
 #: lib/cannery_web/live/pack_live/show.ex:91
-#: lib/cannery_web/live/range_live/form_component.html.heex:40
+#: lib/cannery_web/live/range_live/form_component.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Date"
 msgstr ""
@@ -453,13 +455,8 @@ msgstr ""
 msgid "Record shots"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:47
-#, elixir-autogen, elixir-format
-msgid "New Shot Records"
-msgstr ""
-
 #: lib/cannery_web/live/range_live/index.html.heex:52
-#: lib/cannery_web/live/range_live/index.html.heex:119
+#: lib/cannery_web/live/range_live/index.html.heex:121
 #, elixir-autogen, elixir-format
 msgid "No shots recorded"
 msgstr ""
@@ -471,12 +468,6 @@ msgstr ""
 msgid "Rounds shot"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:55
-#: lib/cannery_web/live/range_live/index.ex:65
-#, elixir-autogen, elixir-format
-msgid "Shot Records"
-msgstr ""
-
 #: lib/cannery_web/live/pack_live/index.ex:43
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
@@ -494,9 +485,9 @@ msgstr ""
 
 #: lib/cannery_web/components/core_components/pack_card.html.heex:42
 #: lib/cannery_web/components/core_components/pack_card.html.heex:47
-#: lib/cannery_web/components/pack_table_component.ex:176
+#: lib/cannery_web/components/pack_table_component.ex:181
-#: lib/cannery_web/components/pack_table_component.ex:259
+#: lib/cannery_web/components/pack_table_component.ex:264
-#: lib/cannery_web/components/type_table_component.ex:260
+#: lib/cannery_web/components/type_table_component.ex:273
 #: lib/cannery_web/live/pack_live/show.html.heex:37
 #: lib/cannery_web/live/pack_live/show.html.heex:42
 #: lib/cannery_web/live/type_live/show.html.heex:150
@@ -504,36 +495,36 @@ msgstr ""
 msgid "$%{amount}"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:163
+#: lib/cannery_web/live/type_live/form_component.html.heex:181
 #, elixir-autogen, elixir-format
 msgid "Bimetal"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:65
-#: lib/cannery_web/live/type_live/form_component.html.heex:159
+#: lib/cannery_web/live/type_live/form_component.html.heex:176
 #, elixir-autogen, elixir-format
 msgid "Jacket type"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:81
-#: lib/cannery_web/live/type_live/form_component.html.heex:282
+#: lib/cannery_web/live/type_live/form_component.html.heex:311
 #, elixir-autogen, elixir-format
 msgid "Muzzle velocity"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:75
-#: lib/cannery_web/live/type_live/form_component.html.heex:247
+#: lib/cannery_web/live/type_live/form_component.html.heex:274
 #, elixir-autogen, elixir-format
 msgid "Powder grains per charge"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:73
-#: lib/cannery_web/live/type_live/form_component.html.heex:239
+#: lib/cannery_web/live/type_live/form_component.html.heex:265
 #, elixir-autogen, elixir-format
 msgid "Powder type"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:346
+#: lib/cannery_web/live/type_live/form_component.html.heex:378
 #, elixir-autogen, elixir-format
 msgid "UPC"
 msgstr ""
@@ -557,24 +548,24 @@ msgid "New password"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:83
-#: lib/cannery_web/live/type_live/form_component.html.heex:307
+#: lib/cannery_web/live/type_live/form_component.html.heex:337
 #, elixir-autogen, elixir-format
 msgid "Firing type"
 msgstr ""
 
-#: lib/cannery_web/components/layouts/live.html.heex:43
+#: lib/cannery_web/components/layouts/app.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Reconnecting..."
 msgstr ""
 
 #: lib/cannery_web/live/container_live/index.ex:28
-#: lib/cannery_web/live/container_live/show.ex:116
+#: lib/cannery_web/live/container_live/show.ex:118
 #, elixir-autogen, elixir-format
 msgid "Edit %{name}"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/index.ex:63
-#: lib/cannery_web/live/container_live/show.ex:117
+#: lib/cannery_web/live/container_live/show.ex:119
 #, elixir-autogen, elixir-format
 msgid "Edit %{name} tags"
 msgstr ""
@@ -586,9 +577,9 @@ msgstr ""
 msgid "Rounds:"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:173
+#: lib/cannery_web/components/pack_table_component.ex:178
-#: lib/cannery_web/components/pack_table_component.ex:255
+#: lib/cannery_web/components/pack_table_component.ex:260
-#: lib/cannery_web/components/type_table_component.ex:259
+#: lib/cannery_web/components/type_table_component.ex:272
 #: lib/cannery_web/live/type_live/show.html.heex:154
 #, elixir-autogen, elixir-format
 msgid "No cost information"
@@ -624,7 +615,7 @@ msgstr ""
 msgid "Rounds used"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_confirmation_controller.ex:8
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:6
 #, elixir-autogen, elixir-format
 msgid "Confirm your account"
 msgstr ""
@@ -639,7 +630,7 @@ msgstr ""
 msgid "Log in"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_registration_controller.ex:32
+#: lib/cannery_web/controllers/user_registration_controller.ex:31
 #, elixir-autogen, elixir-format
 msgid "Register"
 msgstr ""
@@ -651,11 +642,12 @@ msgstr ""
 
 #: lib/cannery_web/live/pack_live/show.ex:40
 #: lib/cannery_web/live/range_live/index.ex:31
+#: lib/cannery_web/live/range_live/index.ex:47
 #, elixir-autogen, elixir-format
 msgid "Record Shots"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/form_component.html.heex:75
+#: lib/cannery_web/live/pack_live/form_component.html.heex:96
 #, elixir-autogen, elixir-format
 msgid "Copies"
 msgstr ""
@@ -665,22 +657,6 @@ msgstr ""
 msgid "Added on:"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_registration_html/new.html.heex:32
-#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:127
-#, elixir-autogen, elixir-format
-msgid "English"
-msgstr ""
-
-#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:129
-#, elixir-autogen, elixir-format
-msgid "French"
-msgstr ""
-
-#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:128
-#, elixir-autogen, elixir-format
-msgid "German"
-msgstr ""
-
 #: lib/cannery_web/controllers/user_registration_html/new.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Language"
@@ -757,7 +733,7 @@ msgstr ""
 msgid "isn't he cute >:3"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/form_component.html.heex:32
+#: lib/cannery_web/live/invite_live/form_component.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Leave \"Uses left\" blank to make invite unlimited"
 msgstr ""
@@ -768,13 +744,13 @@ msgid "Container:"
 msgstr ""
 
 #: lib/cannery_web/live/pack_live/index.html.heex:87
-#: lib/cannery_web/live/type_live/index.html.heex:64
+#: lib/cannery_web/live/type_live/index.html.heex:66
 #: lib/cannery_web/live/type_live/show.html.heex:164
 #, elixir-autogen, elixir-format
 msgid "Show used"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:214
+#: lib/cannery_web/components/pack_table_component.ex:219
 #: lib/cannery_web/live/pack_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "%{percentage}%"
@@ -951,7 +927,7 @@ msgid "Average CPR"
 msgstr ""
 
 #: lib/cannery_web/components/core_components/pack_card.html.heex:17
-#: lib/cannery_web/components/pack_table_component.ex:263
+#: lib/cannery_web/components/pack_table_component.ex:268
 #, elixir-autogen, elixir-format
 msgid "Empty"
 msgstr ""
@@ -991,13 +967,13 @@ msgstr ""
 msgid "Last used on:"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:194
+#: lib/cannery_web/components/pack_table_component.ex:199
 #, elixir-autogen, elixir-format
 msgid "Never used"
 msgstr ""
 
 #: lib/cannery_web/components/pack_table_component.ex:71
-#: lib/cannery_web/live/pack_live/form_component.html.heex:49
+#: lib/cannery_web/live/pack_live/form_component.html.heex:67
 #, elixir-autogen, elixir-format
 msgid "Purchased on"
 msgstr ""
@@ -1018,17 +994,17 @@ msgstr ""
 msgid "Search catalog"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:81
+#: lib/cannery_web/live/pack_live/index.html.heex:79
 #, elixir-autogen, elixir-format
 msgid "Search ammo"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:34
+#: lib/cannery_web/live/container_live/index.html.heex:32
 #, elixir-autogen, elixir-format
 msgid "Search containers"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/index.html.heex:36
+#: lib/cannery_web/live/tag_live/index.html.heex:34
 #, elixir-autogen, elixir-format
 msgid "Search tags"
 msgstr ""
@@ -1038,11 +1014,6 @@ msgstr ""
 msgid "Search shot records"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:130
-#, elixir-autogen, elixir-format
-msgid "Spanish"
-msgstr ""
-
 #: lib/cannery_web/components/layouts.ex:15
 #: lib/cannery_web/components/layouts/root.html.heex:9
 #: lib/cannery_web/components/layouts/root.html.heex:10
@@ -1126,38 +1097,38 @@ msgid "Email"
 msgstr ""
 
 #: lib/cannery_web/controllers/user_registration_html/new.html.heex:24
-#: lib/cannery_web/controllers/user_session_html/new.html.heex:20
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:24
 #, elixir-autogen, elixir-format
 msgid "Password"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:264
+#: lib/cannery_web/live/type_live/form_component.html.heex:292
 #, elixir-autogen, elixir-format
 msgid "+P"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:74
+#: lib/cannery_web/live/type_live/form_component.html.heex:82
 #, elixir-autogen, elixir-format
 msgid ".223"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:55
+#: lib/cannery_web/live/type_live/form_component.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "5.56x46mm NATO"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:303
+#: lib/cannery_web/live/type_live/form_component.html.heex:333
 #, elixir-autogen, elixir-format
 msgid "Boxer"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:311
+#: lib/cannery_web/live/type_live/form_component.html.heex:342
 #, elixir-autogen, elixir-format
 msgid "Centerfire"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_record_component.html.heex:43
+#: lib/cannery_web/components/add_shot_record_component.html.heex:45
-#: lib/cannery_web/live/range_live/form_component.html.heex:35
+#: lib/cannery_web/live/range_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Really great weather"
 msgstr ""
@@ -1195,19 +1166,19 @@ msgstr ""
 
 #: lib/cannery_web/live/container_live/show.html.heex:97
 #: lib/cannery_web/live/pack_live/index.html.heex:58
-#: lib/cannery_web/live/range_live/index.html.heex:89
+#: lib/cannery_web/live/range_live/index.html.heex:91
-#: lib/cannery_web/live/type_live/index.html.heex:35
+#: lib/cannery_web/live/type_live/index.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "All"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:316
+#: lib/cannery_web/live/type_live/form_component.html.heex:347
 #, elixir-autogen, elixir-format
 msgid "Attributes"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:56
-#: lib/cannery_web/live/type_live/form_component.html.heex:88
+#: lib/cannery_web/live/type_live/form_component.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Brass height"
 msgstr ""
@@ -1218,7 +1189,7 @@ msgid "Brass height:"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:57
-#: lib/cannery_web/live/type_live/form_component.html.heex:95
+#: lib/cannery_web/live/type_live/form_component.html.heex:107
 #, elixir-autogen, elixir-format
 msgid "Chamber size"
 msgstr ""
@@ -1228,13 +1199,13 @@ msgstr ""
 msgid "Chamber size:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:47
+#: lib/cannery_web/live/type_live/form_component.html.heex:53
 #, elixir-autogen, elixir-format
 msgid "Dimensions"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:80
-#: lib/cannery_web/live/type_live/form_component.html.heex:269
+#: lib/cannery_web/live/type_live/form_component.html.heex:297
 #, elixir-autogen, elixir-format
 msgid "Dram equivalent"
 msgstr ""
@@ -1245,7 +1216,7 @@ msgid "Dram equivalent:"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:51
-#: lib/cannery_web/live/type_live/form_component.html.heex:66
+#: lib/cannery_web/live/type_live/form_component.html.heex:73
 #, elixir-autogen, elixir-format
 msgid "Gauge"
 msgstr ""
@@ -1256,7 +1227,7 @@ msgid "Gauge:"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:71
-#: lib/cannery_web/live/type_live/form_component.html.heex:210
+#: lib/cannery_web/live/type_live/form_component.html.heex:235
 #, elixir-autogen, elixir-format
 msgid "Load grains"
 msgstr ""
@@ -1277,42 +1248,44 @@ msgid "None specified"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/show.html.heex:100
+#: lib/cannery_web/live/pack_live/form_component.html.heex:30
 #: lib/cannery_web/live/pack_live/index.html.heex:61
-#: lib/cannery_web/live/range_live/index.html.heex:92
+#: lib/cannery_web/live/range_live/index.html.heex:94
-#: lib/cannery_web/live/type_live/form_component.html.heex:25
+#: lib/cannery_web/live/type_live/form_component.html.heex:28
-#: lib/cannery_web/live/type_live/index.html.heex:38
+#: lib/cannery_web/live/type_live/index.html.heex:40
 #: lib/cannery_web/live/type_live/show.html.heex:56
 #, elixir-autogen, elixir-format
 msgid "Pistol"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:236
+#: lib/cannery_web/live/type_live/form_component.html.heex:262
 #, elixir-autogen, elixir-format
 msgid "Powder"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:296
+#: lib/cannery_web/live/type_live/form_component.html.heex:325
 #, elixir-autogen, elixir-format
 msgid "Primer"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:108
+#: lib/cannery_web/live/type_live/form_component.html.heex:123
 #, elixir-autogen, elixir-format
 msgid "Projectile"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/show.html.heex:98
+#: lib/cannery_web/live/pack_live/form_component.html.heex:28
 #: lib/cannery_web/live/pack_live/index.html.heex:59
-#: lib/cannery_web/live/range_live/index.html.heex:90
+#: lib/cannery_web/live/range_live/index.html.heex:92
-#: lib/cannery_web/live/type_live/form_component.html.heex:25
+#: lib/cannery_web/live/type_live/form_component.html.heex:26
-#: lib/cannery_web/live/type_live/index.html.heex:36
+#: lib/cannery_web/live/type_live/index.html.heex:38
 #: lib/cannery_web/live/type_live/show.html.heex:54
 #, elixir-autogen, elixir-format
 msgid "Rifle"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:72
-#: lib/cannery_web/live/type_live/form_component.html.heex:218
+#: lib/cannery_web/live/type_live/form_component.html.heex:243
 #, elixir-autogen, elixir-format
 msgid "Shot charge weight"
 msgstr ""
@@ -1323,7 +1296,7 @@ msgid "Shot charge weight:"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:69
-#: lib/cannery_web/live/type_live/form_component.html.heex:194
+#: lib/cannery_web/live/type_live/form_component.html.heex:217
 #, elixir-autogen, elixir-format
 msgid "Shot material"
 msgstr ""
@@ -1334,7 +1307,7 @@ msgid "Shot material:"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:70
-#: lib/cannery_web/live/type_live/form_component.html.heex:203
+#: lib/cannery_web/live/type_live/form_component.html.heex:227
 #, elixir-autogen, elixir-format
 msgid "Shot size"
 msgstr ""
@@ -1345,7 +1318,7 @@ msgid "Shot size:"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:68
-#: lib/cannery_web/live/type_live/form_component.html.heex:186
+#: lib/cannery_web/live/type_live/form_component.html.heex:208
 #, elixir-autogen, elixir-format
 msgid "Shot type"
 msgstr ""
@@ -1356,22 +1329,23 @@ msgid "Shot type:"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/show.html.heex:99
+#: lib/cannery_web/live/pack_live/form_component.html.heex:29
 #: lib/cannery_web/live/pack_live/index.html.heex:60
-#: lib/cannery_web/live/range_live/index.html.heex:91
+#: lib/cannery_web/live/range_live/index.html.heex:93
-#: lib/cannery_web/live/type_live/form_component.html.heex:25
+#: lib/cannery_web/live/type_live/form_component.html.heex:27
-#: lib/cannery_web/live/type_live/index.html.heex:37
+#: lib/cannery_web/live/type_live/index.html.heex:39
 #: lib/cannery_web/live/type_live/show.html.heex:52
 #, elixir-autogen, elixir-format
 msgid "Shotgun"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:61
-#: lib/cannery_web/live/type_live/form_component.html.heex:146
+#: lib/cannery_web/live/type_live/form_component.html.heex:162
 #, elixir-autogen, elixir-format
 msgid "Slug core"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:190
+#: lib/cannery_web/live/type_live/form_component.html.heex:213
 #, elixir-autogen, elixir-format
 msgid "Target, bird, buck, etc"
 msgstr ""
@@ -1382,13 +1356,13 @@ msgid "Unfired length:"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:55
-#: lib/cannery_web/live/type_live/form_component.html.heex:79
+#: lib/cannery_web/live/type_live/form_component.html.heex:87
 #, elixir-autogen, elixir-format
 msgid "Unfired shell length"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:67
-#: lib/cannery_web/live/type_live/form_component.html.heex:179
+#: lib/cannery_web/live/type_live/form_component.html.heex:200
 #, elixir-autogen, elixir-format
 msgid "Wadding"
 msgstr ""
@@ -1400,6 +1374,7 @@ msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:149
 #: lib/cannery_web/live/container_live/show.html.heex:91
+#: lib/cannery_web/live/pack_live/form_component.html.heex:22
 #: lib/cannery_web/live/pack_live/index.html.heex:50
 #: lib/cannery_web/live/range_live/index.html.heex:83
 #: lib/cannery_web/live/type_live/form_component.html.heex:21
@@ -1439,13 +1414,13 @@ msgid "New Type"
 msgstr ""
 
 #: lib/cannery_web/live/type_live/index.html.heex:8
-#: lib/cannery_web/live/type_live/index.html.heex:71
+#: lib/cannery_web/live/type_live/index.html.heex:73
 #, elixir-autogen, elixir-format
 msgid "No Types"
 msgstr ""
 
 #: lib/cannery_web/components/pack_table_component.ex:84
-#: lib/cannery_web/live/pack_live/form_component.html.heex:42
+#: lib/cannery_web/live/pack_live/form_component.html.heex:59
 #, elixir-autogen, elixir-format
 msgid "Lot number"
 msgstr ""
@@ -1454,3 +1429,8 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Lot number:"
 msgstr ""
+
+#: lib/cannery_web/live/pack_live/form_component.html.heex:27
+#, elixir-autogen, elixir-format
+msgid "Any"
+msgstr ""

priv/gettext/emails.pot

@@ -49,7 +49,7 @@ msgstr ""
 msgid "You can reset your password by visiting the URL below:"
 msgstr ""
 
-#: lib/cannery/accounts/email.ex:31
+#: lib/cannery/email.ex:31
 #, elixir-autogen, elixir-format
 msgid "Confirm your Cannery account"
 msgstr ""
@@ -65,7 +65,7 @@ msgstr ""
 msgid "If you didn't request this change from Cannery, please ignore this."
 msgstr ""
 
-#: lib/cannery/accounts/email.ex:38
+#: lib/cannery/email.ex:38
 #, elixir-autogen, elixir-format
 msgid "Reset your Cannery password"
 msgstr ""
@@ -80,7 +80,7 @@ msgstr ""
 msgid "This email was sent from Cannery, the self-hosted firearm tracker website."
 msgstr ""
 
-#: lib/cannery/accounts/email.ex:45
+#: lib/cannery/email.ex:45
 #, elixir-autogen, elixir-format
 msgid "Update your Cannery email"
 msgstr ""

priv/gettext/en/LC_MESSAGES/actions.po

@@ -54,9 +54,9 @@ msgstr ""
 msgid "Delete User"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_registration_html/new.html.heex:47
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:52
 #: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:3
-#: lib/cannery_web/controllers/user_session_html/new.html.heex:38
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:46
 #, elixir-autogen, elixir-format
 msgid "Forgot your password?"
 msgstr ""
@@ -68,11 +68,11 @@ msgstr ""
 
 #: lib/cannery_web/components/core_components/topbar.html.heex:94
 #: lib/cannery_web/controllers/user_confirmation_html/new.html.heex:28
-#: lib/cannery_web/controllers/user_registration_html/new.html.heex:44
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:49
 #: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:41
 #: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:28
 #: lib/cannery_web/controllers/user_session_html/new.html.heex:3
-#: lib/cannery_web/controllers/user_session_html/new.html.heex:28
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Log in"
 msgstr ""
@@ -95,10 +95,10 @@ msgstr ""
 #: lib/cannery_web/components/core_components/topbar.html.heex:89
 #: lib/cannery_web/controllers/user_confirmation_html/new.html.heex:25
 #: lib/cannery_web/controllers/user_registration_html/new.html.heex:3
-#: lib/cannery_web/controllers/user_registration_html/new.html.heex:37
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:42
 #: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:38
 #: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:25
-#: lib/cannery_web/controllers/user_session_html/new.html.heex:35
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Register"
 msgstr ""
@@ -115,13 +115,13 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_record_component.html.heex:56
+#: lib/cannery_web/components/add_shot_record_component.html.heex:57
-#: lib/cannery_web/live/container_live/form_component.html.heex:55
+#: lib/cannery_web/live/container_live/form_component.html.heex:59
-#: lib/cannery_web/live/invite_live/form_component.html.heex:35
+#: lib/cannery_web/live/invite_live/form_component.html.heex:38
-#: lib/cannery_web/live/pack_live/form_component.html.heex:90
+#: lib/cannery_web/live/pack_live/form_component.html.heex:110
-#: lib/cannery_web/live/range_live/form_component.html.heex:44
+#: lib/cannery_web/live/range_live/form_component.html.heex:45
-#: lib/cannery_web/live/tag_live/form_component.html.heex:37
+#: lib/cannery_web/live/tag_live/form_component.html.heex:41
-#: lib/cannery_web/live/type_live/form_component.html.heex:353
+#: lib/cannery_web/live/type_live/form_component.html.heex:386
 #, elixir-autogen, elixir-format
 msgid "Save"
 msgstr ""
@@ -136,7 +136,7 @@ msgstr ""
 msgid "Why not add one?"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:51
+#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:53
 #, elixir-autogen, elixir-format
 msgid "Add"
 msgstr ""
@@ -178,7 +178,7 @@ msgstr ""
 msgid "add a container first"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/form_component.html.heex:83
+#: lib/cannery_web/live/pack_live/form_component.html.heex:103
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Create"
 msgstr ""
@@ -288,23 +288,24 @@ msgstr ""
 msgid "Unstage"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:168
+#: lib/cannery_web/live/pack_live/index.html.heex:172
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Clone pack of %{pack_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:183
+#: lib/cannery_web/live/pack_live/index.html.heex:187
 #: lib/cannery_web/live/pack_live/show.html.heex:71
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Delete pack of %{pack_count} bullets"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:158
+#: lib/cannery_web/live/pack_live/index.html.heex:160
 #: lib/cannery_web/live/pack_live/show.html.heex:59
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit pack of %{pack_count} bullets"
 msgstr ""
 
+#: lib/cannery_web/live/container_live/show.html.heex:139
 #: lib/cannery_web/live/pack_live/index.html.heex:148
 #: lib/cannery_web/live/type_live/show.html.heex:201
 #, elixir-autogen, elixir-format, fuzzy
@@ -312,29 +313,29 @@ msgid "View pack of %{pack_count} bullets"
 msgstr ""
 
 #: lib/cannery_web/live/pack_live/show.ex:159
-#: lib/cannery_web/live/range_live/index.html.heex:152
+#: lib/cannery_web/live/range_live/index.html.heex:154
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Delete shot record of %{shot_record_count} shots"
 msgstr ""
 
 #: lib/cannery_web/live/pack_live/show.ex:144
-#: lib/cannery_web/live/range_live/index.html.heex:135
+#: lib/cannery_web/live/range_live/index.html.heex:137
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit shot record of %{shot_record_count} shots"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/index.html.heex:105
+#: lib/cannery_web/live/type_live/index.html.heex:107
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Clone %{type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/index.html.heex:122
+#: lib/cannery_web/live/type_live/index.html.heex:124
 #: lib/cannery_web/live/type_live/show.html.heex:35
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Delete %{type_name}"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/index.html.heex:97
+#: lib/cannery_web/live/type_live/index.html.heex:99
 #: lib/cannery_web/live/type_live/show.html.heex:19
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit %{type_name}"
@@ -345,7 +346,7 @@ msgstr ""
 msgid "New Type"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/index.html.heex:89
+#: lib/cannery_web/live/type_live/index.html.heex:91
 #, elixir-autogen, elixir-format, fuzzy
 msgid "View %{type_name}"
 msgstr ""

priv/gettext/en/LC_MESSAGES/default.po

@@ -34,55 +34,55 @@ msgstr ""
 msgid "Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/form_component.html.heex:25
+#: lib/cannery_web/live/tag_live/form_component.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "Background color"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:86
-#: lib/cannery_web/live/type_live/form_component.html.heex:327
+#: lib/cannery_web/live/type_live/form_component.html.heex:358
 #, elixir-autogen, elixir-format
 msgid "Blank"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:174
+#: lib/cannery_web/live/type_live/form_component.html.heex:195
 #, elixir-autogen, elixir-format
 msgid "Brass"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:61
-#: lib/cannery_web/live/type_live/form_component.html.heex:147
+#: lib/cannery_web/live/type_live/form_component.html.heex:163
 #, elixir-autogen, elixir-format
 msgid "Bullet core"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:59
-#: lib/cannery_web/live/type_live/form_component.html.heex:121
+#: lib/cannery_web/live/type_live/form_component.html.heex:136
 #, elixir-autogen, elixir-format
 msgid "Bullet type"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:51
-#: lib/cannery_web/live/type_live/form_component.html.heex:67
+#: lib/cannery_web/live/type_live/form_component.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "Caliber"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:49
-#: lib/cannery_web/live/type_live/form_component.html.heex:51
+#: lib/cannery_web/live/type_live/form_component.html.heex:57
 #, elixir-autogen, elixir-format
 msgid "Cartridge"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:66
-#: lib/cannery_web/live/type_live/form_component.html.heex:170
+#: lib/cannery_web/live/type_live/form_component.html.heex:188
 #, elixir-autogen, elixir-format
 msgid "Case material"
 msgstr ""
 
 #: lib/cannery_web/components/move_pack_component.ex:64
 #: lib/cannery_web/components/pack_table_component.ex:76
-#: lib/cannery_web/live/pack_live/form_component.html.heex:65
+#: lib/cannery_web/live/pack_live/form_component.html.heex:84
 #, elixir-autogen, elixir-format
 msgid "Container"
 msgstr ""
@@ -96,13 +96,13 @@ msgid "Containers"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:87
-#: lib/cannery_web/live/type_live/form_component.html.heex:331
+#: lib/cannery_web/live/type_live/form_component.html.heex:362
 #, elixir-autogen, elixir-format
 msgid "Corrosive"
 msgstr ""
 
 #: lib/cannery_web/components/pack_table_component.ex:104
-#: lib/cannery_web/live/pack_live/form_component.html.heex:28
+#: lib/cannery_web/live/pack_live/form_component.html.heex:45
 #, elixir-autogen, elixir-format
 msgid "Count"
 msgstr ""
@@ -114,8 +114,8 @@ msgid "Count:"
 msgstr ""
 
 #: lib/cannery_web/components/container_table_component.ex:46
-#: lib/cannery_web/live/container_live/form_component.html.heex:29
+#: lib/cannery_web/live/container_live/form_component.html.heex:30
-#: lib/cannery_web/live/type_live/form_component.html.heex:38
+#: lib/cannery_web/live/type_live/form_component.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Description"
 msgstr ""
@@ -141,19 +141,19 @@ msgstr ""
 msgid "Edit Tag"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:135
+#: lib/cannery_web/live/type_live/form_component.html.heex:151
 #, elixir-autogen, elixir-format
 msgid "FMJ"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:58
-#: lib/cannery_web/live/type_live/form_component.html.heex:111
+#: lib/cannery_web/live/type_live/form_component.html.heex:126
 #, elixir-autogen, elixir-format
 msgid "Grains"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:85
-#: lib/cannery_web/live/type_live/form_component.html.heex:323
+#: lib/cannery_web/live/type_live/form_component.html.heex:354
 #, elixir-autogen, elixir-format
 msgid "Incendiary"
 msgstr ""
@@ -180,14 +180,14 @@ msgstr ""
 msgid "Invites"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_session_html/new.html.heex:23
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:31
 #, elixir-autogen, elixir-format
 msgid "Keep me logged in for 60 days"
 msgstr ""
 
 #: lib/cannery_web/components/container_table_component.ex:47
 #: lib/cannery_web/components/move_pack_component.ex:66
-#: lib/cannery_web/live/container_live/form_component.html.heex:46
+#: lib/cannery_web/live/container_live/form_component.html.heex:49
 #, elixir-autogen, elixir-format
 msgid "Location"
 msgstr ""
@@ -198,24 +198,24 @@ msgstr ""
 msgid "Location:"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:41
+#: lib/cannery_web/live/container_live/form_component.html.heex:45
 #, elixir-autogen, elixir-format
 msgid "Magazine, Clip, Ammo Box, etc"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:88
-#: lib/cannery_web/live/type_live/form_component.html.heex:336
+#: lib/cannery_web/live/type_live/form_component.html.heex:367
-#: lib/cannery_web/live/type_live/form_component.html.heex:339
+#: lib/cannery_web/live/type_live/form_component.html.heex:370
 #, elixir-autogen, elixir-format
 msgid "Manufacturer"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:33
+#: lib/cannery_web/live/container_live/form_component.html.heex:36
 #, elixir-autogen, elixir-format
 msgid "Metal ammo can with the anime girl sticker"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:24
+#: lib/cannery_web/live/container_live/form_component.html.heex:26
 #, elixir-autogen, elixir-format
 msgid "My cool ammo can"
 msgstr ""
@@ -225,7 +225,7 @@ msgstr ""
 #: lib/cannery_web/live/container_live/form_component.html.heex:21
 #: lib/cannery_web/live/invite_live/form_component.html.heex:21
 #: lib/cannery_web/live/tag_live/form_component.html.heex:21
-#: lib/cannery_web/live/type_live/form_component.html.heex:31
+#: lib/cannery_web/live/type_live/form_component.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Name"
 msgstr ""
@@ -276,7 +276,7 @@ msgstr ""
 
 #: lib/cannery_web/components/add_shot_record_component.html.heex:38
 #: lib/cannery_web/components/shot_record_table_component.ex:46
-#: lib/cannery_web/live/pack_live/form_component.html.heex:57
+#: lib/cannery_web/live/pack_live/form_component.html.heex:75
 #: lib/cannery_web/live/pack_live/show.ex:90
 #: lib/cannery_web/live/range_live/form_component.html.heex:30
 #, elixir-autogen, elixir-format
@@ -289,19 +289,19 @@ msgstr ""
 msgid "Notes:"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/form_component.html.heex:50
+#: lib/cannery_web/live/container_live/form_component.html.heex:55
 #, elixir-autogen, elixir-format
 msgid "On the bookshelf"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:79
-#: lib/cannery_web/live/type_live/form_component.html.heex:260
+#: lib/cannery_web/live/type_live/form_component.html.heex:287
 #, elixir-autogen, elixir-format
 msgid "Pressure"
 msgstr ""
 
 #: lib/cannery_web/components/pack_table_component.ex:92
-#: lib/cannery_web/live/pack_live/form_component.html.heex:35
+#: lib/cannery_web/live/pack_live/form_component.html.heex:52
 #, elixir-autogen, elixir-format
 msgid "Price paid"
 msgstr ""
@@ -312,7 +312,7 @@ msgid "Price paid:"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:82
-#: lib/cannery_web/live/type_live/form_component.html.heex:299
+#: lib/cannery_web/live/type_live/form_component.html.heex:328
 #, elixir-autogen, elixir-format
 msgid "Primer type"
 msgstr ""
@@ -332,7 +332,7 @@ msgstr ""
 msgid "Self-host your own instance, or use an instance from someone you trust."
 msgstr ""
 
-#: lib/cannery_web/controllers/user_settings_controller.ex:10
+#: lib/cannery_web/controllers/user_settings_controller.ex:9
 #: lib/cannery_web/controllers/user_settings_html/edit.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Settings"
@@ -343,7 +343,7 @@ msgstr ""
 msgid "Simple:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:154
+#: lib/cannery_web/live/type_live/form_component.html.heex:171
 #, elixir-autogen, elixir-format
 msgid "Steel"
 msgstr ""
@@ -367,7 +367,7 @@ msgstr ""
 msgid "Tags can be added to your containers to help you organize"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/form_component.html.heex:31
+#: lib/cannery_web/live/tag_live/form_component.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Text color"
 msgstr ""
@@ -378,7 +378,7 @@ msgid "The self-hosted firearm tracker website"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:84
-#: lib/cannery_web/live/type_live/form_component.html.heex:319
+#: lib/cannery_web/live/type_live/form_component.html.heex:350
 #, elixir-autogen, elixir-format
 msgid "Tracer"
 msgstr ""
@@ -386,8 +386,8 @@ msgstr ""
 #: lib/cannery_web/components/container_table_component.ex:48
 #: lib/cannery_web/components/move_pack_component.ex:65
 #: lib/cannery_web/components/pack_table_component.ex:108
-#: lib/cannery_web/live/container_live/form_component.html.heex:38
+#: lib/cannery_web/live/container_live/form_component.html.heex:40
-#: lib/cannery_web/live/pack_live/form_component.html.heex:22
+#: lib/cannery_web/live/pack_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Type"
 msgstr ""
@@ -403,7 +403,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/form_component.html.heex:28
+#: lib/cannery_web/live/invite_live/form_component.html.heex:31
 #, elixir-autogen, elixir-format
 msgid "Uses left"
 msgstr ""
@@ -420,6 +420,8 @@ msgstr ""
 
 #: lib/cannery_web/components/core_components/topbar.html.heex:48
 #: lib/cannery_web/components/pack_table_component.ex:80
+#: lib/cannery_web/live/range_live/index.ex:55
+#: lib/cannery_web/live/range_live/index.ex:65
 #, elixir-autogen, elixir-format
 msgid "Range"
 msgstr ""
@@ -429,10 +431,10 @@ msgstr ""
 msgid "Range day"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_record_component.html.heex:48
+#: lib/cannery_web/components/add_shot_record_component.html.heex:49
 #: lib/cannery_web/components/shot_record_table_component.ex:47
 #: lib/cannery_web/live/pack_live/show.ex:91
-#: lib/cannery_web/live/range_live/form_component.html.heex:40
+#: lib/cannery_web/live/range_live/form_component.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Date"
 msgstr ""
@@ -453,13 +455,8 @@ msgstr ""
 msgid "Record shots"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:47
-#, elixir-autogen, elixir-format
-msgid "New Shot Records"
-msgstr ""
-
 #: lib/cannery_web/live/range_live/index.html.heex:52
-#: lib/cannery_web/live/range_live/index.html.heex:119
+#: lib/cannery_web/live/range_live/index.html.heex:121
 #, elixir-autogen, elixir-format
 msgid "No shots recorded"
 msgstr ""
@@ -471,12 +468,6 @@ msgstr ""
 msgid "Rounds shot"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.ex:55
-#: lib/cannery_web/live/range_live/index.ex:65
-#, elixir-autogen, elixir-format
-msgid "Shot Records"
-msgstr ""
-
 #: lib/cannery_web/live/pack_live/index.ex:43
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
@@ -494,9 +485,9 @@ msgstr ""
 
 #: lib/cannery_web/components/core_components/pack_card.html.heex:42
 #: lib/cannery_web/components/core_components/pack_card.html.heex:47
-#: lib/cannery_web/components/pack_table_component.ex:176
+#: lib/cannery_web/components/pack_table_component.ex:181
-#: lib/cannery_web/components/pack_table_component.ex:259
+#: lib/cannery_web/components/pack_table_component.ex:264
-#: lib/cannery_web/components/type_table_component.ex:260
+#: lib/cannery_web/components/type_table_component.ex:273
 #: lib/cannery_web/live/pack_live/show.html.heex:37
 #: lib/cannery_web/live/pack_live/show.html.heex:42
 #: lib/cannery_web/live/type_live/show.html.heex:150
@@ -504,36 +495,36 @@ msgstr ""
 msgid "$%{amount}"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:163
+#: lib/cannery_web/live/type_live/form_component.html.heex:181
 #, elixir-autogen, elixir-format
 msgid "Bimetal"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:65
-#: lib/cannery_web/live/type_live/form_component.html.heex:159
+#: lib/cannery_web/live/type_live/form_component.html.heex:176
 #, elixir-autogen, elixir-format
 msgid "Jacket type"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:81
-#: lib/cannery_web/live/type_live/form_component.html.heex:282
+#: lib/cannery_web/live/type_live/form_component.html.heex:311
 #, elixir-autogen, elixir-format
 msgid "Muzzle velocity"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:75
-#: lib/cannery_web/live/type_live/form_component.html.heex:247
+#: lib/cannery_web/live/type_live/form_component.html.heex:274
 #, elixir-autogen, elixir-format
 msgid "Powder grains per charge"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:73
-#: lib/cannery_web/live/type_live/form_component.html.heex:239
+#: lib/cannery_web/live/type_live/form_component.html.heex:265
 #, elixir-autogen, elixir-format
 msgid "Powder type"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:346
+#: lib/cannery_web/live/type_live/form_component.html.heex:378
 #, elixir-autogen, elixir-format
 msgid "UPC"
 msgstr ""
@@ -557,24 +548,24 @@ msgid "New password"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:83
-#: lib/cannery_web/live/type_live/form_component.html.heex:307
+#: lib/cannery_web/live/type_live/form_component.html.heex:337
 #, elixir-autogen, elixir-format
 msgid "Firing type"
 msgstr ""
 
-#: lib/cannery_web/components/layouts/live.html.heex:43
+#: lib/cannery_web/components/layouts/app.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Reconnecting..."
 msgstr ""
 
 #: lib/cannery_web/live/container_live/index.ex:28
-#: lib/cannery_web/live/container_live/show.ex:116
+#: lib/cannery_web/live/container_live/show.ex:118
 #, elixir-autogen, elixir-format
 msgid "Edit %{name}"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/index.ex:63
-#: lib/cannery_web/live/container_live/show.ex:117
+#: lib/cannery_web/live/container_live/show.ex:119
 #, elixir-autogen, elixir-format
 msgid "Edit %{name} tags"
 msgstr ""
@@ -586,9 +577,9 @@ msgstr ""
 msgid "Rounds:"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:173
+#: lib/cannery_web/components/pack_table_component.ex:178
-#: lib/cannery_web/components/pack_table_component.ex:255
+#: lib/cannery_web/components/pack_table_component.ex:260
-#: lib/cannery_web/components/type_table_component.ex:259
+#: lib/cannery_web/components/type_table_component.ex:272
 #: lib/cannery_web/live/type_live/show.html.heex:154
 #, elixir-autogen, elixir-format
 msgid "No cost information"
@@ -624,7 +615,7 @@ msgstr ""
 msgid "Rounds used"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_confirmation_controller.ex:8
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:6
 #, elixir-autogen, elixir-format
 msgid "Confirm your account"
 msgstr ""
@@ -639,7 +630,7 @@ msgstr ""
 msgid "Log in"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_registration_controller.ex:32
+#: lib/cannery_web/controllers/user_registration_controller.ex:31
 #, elixir-autogen, elixir-format
 msgid "Register"
 msgstr ""
@@ -651,11 +642,12 @@ msgstr ""
 
 #: lib/cannery_web/live/pack_live/show.ex:40
 #: lib/cannery_web/live/range_live/index.ex:31
+#: lib/cannery_web/live/range_live/index.ex:47
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Record Shots"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/form_component.html.heex:75
+#: lib/cannery_web/live/pack_live/form_component.html.heex:96
 #, elixir-autogen, elixir-format
 msgid "Copies"
 msgstr ""
@@ -665,22 +657,6 @@ msgstr ""
 msgid "Added on:"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_registration_html/new.html.heex:32
-#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:127
-#, elixir-autogen, elixir-format
-msgid "English"
-msgstr ""
-
-#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:129
-#, elixir-autogen, elixir-format
-msgid "French"
-msgstr ""
-
-#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:128
-#, elixir-autogen, elixir-format
-msgid "German"
-msgstr ""
-
 #: lib/cannery_web/controllers/user_registration_html/new.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Language"
@@ -757,7 +733,7 @@ msgstr ""
 msgid "isn't he cute >:3"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/form_component.html.heex:32
+#: lib/cannery_web/live/invite_live/form_component.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "Leave \"Uses left\" blank to make invite unlimited"
 msgstr ""
@@ -768,13 +744,13 @@ msgid "Container:"
 msgstr ""
 
 #: lib/cannery_web/live/pack_live/index.html.heex:87
-#: lib/cannery_web/live/type_live/index.html.heex:64
+#: lib/cannery_web/live/type_live/index.html.heex:66
 #: lib/cannery_web/live/type_live/show.html.heex:164
 #, elixir-autogen, elixir-format
 msgid "Show used"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:214
+#: lib/cannery_web/components/pack_table_component.ex:219
 #: lib/cannery_web/live/pack_live/show.html.heex:19
 #, elixir-autogen, elixir-format
 msgid "%{percentage}%"
@@ -951,7 +927,7 @@ msgid "Average CPR"
 msgstr ""
 
 #: lib/cannery_web/components/core_components/pack_card.html.heex:17
-#: lib/cannery_web/components/pack_table_component.ex:263
+#: lib/cannery_web/components/pack_table_component.ex:268
 #, elixir-autogen, elixir-format
 msgid "Empty"
 msgstr ""
@@ -991,13 +967,13 @@ msgstr ""
 msgid "Last used on:"
 msgstr ""
 
-#: lib/cannery_web/components/pack_table_component.ex:194
+#: lib/cannery_web/components/pack_table_component.ex:199
 #, elixir-autogen, elixir-format
 msgid "Never used"
 msgstr ""
 
 #: lib/cannery_web/components/pack_table_component.ex:71
-#: lib/cannery_web/live/pack_live/form_component.html.heex:49
+#: lib/cannery_web/live/pack_live/form_component.html.heex:67
 #, elixir-autogen, elixir-format
 msgid "Purchased on"
 msgstr ""
@@ -1018,17 +994,17 @@ msgstr ""
 msgid "Search catalog"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/index.html.heex:81
+#: lib/cannery_web/live/pack_live/index.html.heex:79
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Search ammo"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/index.html.heex:34
+#: lib/cannery_web/live/container_live/index.html.heex:32
 #, elixir-autogen, elixir-format
 msgid "Search containers"
 msgstr ""
 
-#: lib/cannery_web/live/tag_live/index.html.heex:36
+#: lib/cannery_web/live/tag_live/index.html.heex:34
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Search tags"
 msgstr ""
@@ -1038,11 +1014,6 @@ msgstr ""
 msgid "Search shot records"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:130
-#, elixir-autogen, elixir-format
-msgid "Spanish"
-msgstr ""
-
 #: lib/cannery_web/components/layouts.ex:15
 #: lib/cannery_web/components/layouts/root.html.heex:9
 #: lib/cannery_web/components/layouts/root.html.heex:10
@@ -1126,38 +1097,38 @@ msgid "Email"
 msgstr ""
 
 #: lib/cannery_web/controllers/user_registration_html/new.html.heex:24
-#: lib/cannery_web/controllers/user_session_html/new.html.heex:20
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:24
 #, elixir-autogen, elixir-format
 msgid "Password"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:264
+#: lib/cannery_web/live/type_live/form_component.html.heex:292
 #, elixir-autogen, elixir-format
 msgid "+P"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:74
+#: lib/cannery_web/live/type_live/form_component.html.heex:82
 #, elixir-autogen, elixir-format
 msgid ".223"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:55
+#: lib/cannery_web/live/type_live/form_component.html.heex:62
 #, elixir-autogen, elixir-format
 msgid "5.56x46mm NATO"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:303
+#: lib/cannery_web/live/type_live/form_component.html.heex:333
 #, elixir-autogen, elixir-format
 msgid "Boxer"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:311
+#: lib/cannery_web/live/type_live/form_component.html.heex:342
 #, elixir-autogen, elixir-format
 msgid "Centerfire"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_record_component.html.heex:43
+#: lib/cannery_web/components/add_shot_record_component.html.heex:45
-#: lib/cannery_web/live/range_live/form_component.html.heex:35
+#: lib/cannery_web/live/range_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Really great weather"
 msgstr ""
@@ -1195,19 +1166,19 @@ msgstr ""
 
 #: lib/cannery_web/live/container_live/show.html.heex:97
 #: lib/cannery_web/live/pack_live/index.html.heex:58
-#: lib/cannery_web/live/range_live/index.html.heex:89
+#: lib/cannery_web/live/range_live/index.html.heex:91
-#: lib/cannery_web/live/type_live/index.html.heex:35
+#: lib/cannery_web/live/type_live/index.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "All"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:316
+#: lib/cannery_web/live/type_live/form_component.html.heex:347
 #, elixir-autogen, elixir-format
 msgid "Attributes"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:56
-#: lib/cannery_web/live/type_live/form_component.html.heex:88
+#: lib/cannery_web/live/type_live/form_component.html.heex:97
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Brass height"
 msgstr ""
@@ -1218,7 +1189,7 @@ msgid "Brass height:"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:57
-#: lib/cannery_web/live/type_live/form_component.html.heex:95
+#: lib/cannery_web/live/type_live/form_component.html.heex:107
 #, elixir-autogen, elixir-format
 msgid "Chamber size"
 msgstr ""
@@ -1228,13 +1199,13 @@ msgstr ""
 msgid "Chamber size:"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:47
+#: lib/cannery_web/live/type_live/form_component.html.heex:53
 #, elixir-autogen, elixir-format
 msgid "Dimensions"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:80
-#: lib/cannery_web/live/type_live/form_component.html.heex:269
+#: lib/cannery_web/live/type_live/form_component.html.heex:297
 #, elixir-autogen, elixir-format
 msgid "Dram equivalent"
 msgstr ""
@@ -1245,7 +1216,7 @@ msgid "Dram equivalent:"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:51
-#: lib/cannery_web/live/type_live/form_component.html.heex:66
+#: lib/cannery_web/live/type_live/form_component.html.heex:73
 #, elixir-autogen, elixir-format
 msgid "Gauge"
 msgstr ""
@@ -1256,7 +1227,7 @@ msgid "Gauge:"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:71
-#: lib/cannery_web/live/type_live/form_component.html.heex:210
+#: lib/cannery_web/live/type_live/form_component.html.heex:235
 #, elixir-autogen, elixir-format
 msgid "Load grains"
 msgstr ""
@@ -1277,42 +1248,44 @@ msgid "None specified"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/show.html.heex:100
+#: lib/cannery_web/live/pack_live/form_component.html.heex:30
 #: lib/cannery_web/live/pack_live/index.html.heex:61
-#: lib/cannery_web/live/range_live/index.html.heex:92
+#: lib/cannery_web/live/range_live/index.html.heex:94
-#: lib/cannery_web/live/type_live/form_component.html.heex:25
+#: lib/cannery_web/live/type_live/form_component.html.heex:28
-#: lib/cannery_web/live/type_live/index.html.heex:38
+#: lib/cannery_web/live/type_live/index.html.heex:40
 #: lib/cannery_web/live/type_live/show.html.heex:56
 #, elixir-autogen, elixir-format
 msgid "Pistol"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:236
+#: lib/cannery_web/live/type_live/form_component.html.heex:262
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Powder"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:296
+#: lib/cannery_web/live/type_live/form_component.html.heex:325
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Primer"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:108
+#: lib/cannery_web/live/type_live/form_component.html.heex:123
 #, elixir-autogen, elixir-format
 msgid "Projectile"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/show.html.heex:98
+#: lib/cannery_web/live/pack_live/form_component.html.heex:28
 #: lib/cannery_web/live/pack_live/index.html.heex:59
-#: lib/cannery_web/live/range_live/index.html.heex:90
+#: lib/cannery_web/live/range_live/index.html.heex:92
-#: lib/cannery_web/live/type_live/form_component.html.heex:25
+#: lib/cannery_web/live/type_live/form_component.html.heex:26
-#: lib/cannery_web/live/type_live/index.html.heex:36
+#: lib/cannery_web/live/type_live/index.html.heex:38
 #: lib/cannery_web/live/type_live/show.html.heex:54
 #, elixir-autogen, elixir-format
 msgid "Rifle"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:72
-#: lib/cannery_web/live/type_live/form_component.html.heex:218
+#: lib/cannery_web/live/type_live/form_component.html.heex:243
 #, elixir-autogen, elixir-format
 msgid "Shot charge weight"
 msgstr ""
@@ -1323,7 +1296,7 @@ msgid "Shot charge weight:"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:69
-#: lib/cannery_web/live/type_live/form_component.html.heex:194
+#: lib/cannery_web/live/type_live/form_component.html.heex:217
 #, elixir-autogen, elixir-format
 msgid "Shot material"
 msgstr ""
@@ -1334,7 +1307,7 @@ msgid "Shot material:"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:70
-#: lib/cannery_web/live/type_live/form_component.html.heex:203
+#: lib/cannery_web/live/type_live/form_component.html.heex:227
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Shot size"
 msgstr ""
@@ -1345,7 +1318,7 @@ msgid "Shot size:"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:68
-#: lib/cannery_web/live/type_live/form_component.html.heex:186
+#: lib/cannery_web/live/type_live/form_component.html.heex:208
 #, elixir-autogen, elixir-format
 msgid "Shot type"
 msgstr ""
@@ -1356,22 +1329,23 @@ msgid "Shot type:"
 msgstr ""
 
 #: lib/cannery_web/live/container_live/show.html.heex:99
+#: lib/cannery_web/live/pack_live/form_component.html.heex:29
 #: lib/cannery_web/live/pack_live/index.html.heex:60
-#: lib/cannery_web/live/range_live/index.html.heex:91
+#: lib/cannery_web/live/range_live/index.html.heex:93
-#: lib/cannery_web/live/type_live/form_component.html.heex:25
+#: lib/cannery_web/live/type_live/form_component.html.heex:27
-#: lib/cannery_web/live/type_live/index.html.heex:37
+#: lib/cannery_web/live/type_live/index.html.heex:39
 #: lib/cannery_web/live/type_live/show.html.heex:52
 #, elixir-autogen, elixir-format
 msgid "Shotgun"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:61
-#: lib/cannery_web/live/type_live/form_component.html.heex:146
+#: lib/cannery_web/live/type_live/form_component.html.heex:162
 #, elixir-autogen, elixir-format
 msgid "Slug core"
 msgstr ""
 
-#: lib/cannery_web/live/type_live/form_component.html.heex:190
+#: lib/cannery_web/live/type_live/form_component.html.heex:213
 #, elixir-autogen, elixir-format
 msgid "Target, bird, buck, etc"
 msgstr ""
@@ -1382,13 +1356,13 @@ msgid "Unfired length:"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:55
-#: lib/cannery_web/live/type_live/form_component.html.heex:79
+#: lib/cannery_web/live/type_live/form_component.html.heex:87
 #, elixir-autogen, elixir-format
 msgid "Unfired shell length"
 msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:67
-#: lib/cannery_web/live/type_live/form_component.html.heex:179
+#: lib/cannery_web/live/type_live/form_component.html.heex:200
 #, elixir-autogen, elixir-format
 msgid "Wadding"
 msgstr ""
@@ -1400,6 +1374,7 @@ msgstr ""
 
 #: lib/cannery_web/components/type_table_component.ex:149
 #: lib/cannery_web/live/container_live/show.html.heex:91
+#: lib/cannery_web/live/pack_live/form_component.html.heex:22
 #: lib/cannery_web/live/pack_live/index.html.heex:50
 #: lib/cannery_web/live/range_live/index.html.heex:83
 #: lib/cannery_web/live/type_live/form_component.html.heex:21
@@ -1439,13 +1414,13 @@ msgid "New Type"
 msgstr ""
 
 #: lib/cannery_web/live/type_live/index.html.heex:8
-#: lib/cannery_web/live/type_live/index.html.heex:71
+#: lib/cannery_web/live/type_live/index.html.heex:73
 #, elixir-autogen, elixir-format, fuzzy
 msgid "No Types"
 msgstr ""
 
 #: lib/cannery_web/components/pack_table_component.ex:84
-#: lib/cannery_web/live/pack_live/form_component.html.heex:42
+#: lib/cannery_web/live/pack_live/form_component.html.heex:59
 #, elixir-autogen, elixir-format
 msgid "Lot number"
 msgstr ""
@@ -1454,3 +1429,8 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Lot number:"
 msgstr ""
+
+#: lib/cannery_web/live/pack_live/form_component.html.heex:27
+#, elixir-autogen, elixir-format
+msgid "Any"
+msgstr ""

priv/gettext/en/LC_MESSAGES/emails.po

@@ -49,7 +49,7 @@ msgstr ""
 msgid "You can reset your password by visiting the URL below:"
 msgstr ""
 
-#: lib/cannery/accounts/email.ex:31
+#: lib/cannery/email.ex:31
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Confirm your Cannery account"
 msgstr ""
@@ -65,7 +65,7 @@ msgstr ""
 msgid "If you didn't request this change from Cannery, please ignore this."
 msgstr ""
 
-#: lib/cannery/accounts/email.ex:38
+#: lib/cannery/email.ex:38
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Reset your Cannery password"
 msgstr ""
@@ -80,7 +80,7 @@ msgstr ""
 msgid "This email was sent from Cannery, the self-hosted firearm tracker website."
 msgstr ""
 
-#: lib/cannery/accounts/email.ex:45
+#: lib/cannery/email.ex:45
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Update your Cannery email"
 msgstr ""

priv/gettext/en/LC_MESSAGES/errors.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Language: en\n"
 
-#: lib/cannery/containers.ex:220
+#: lib/cannery/containers.ex:222
 #, elixir-autogen, elixir-format
 msgid "Container must be empty before deleting"
 msgstr ""
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Could not find that container"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_settings_controller.ex:84
+#: lib/cannery_web/controllers/user_settings_controller.ex:83
 #, elixir-autogen, elixir-format
 msgid "Email change link is invalid or it has expired."
 msgstr ""
@@ -67,20 +67,20 @@ msgstr ""
 msgid "Reset password link is invalid or it has expired."
 msgstr ""
 
-#: lib/cannery_web/controllers/user_registration_controller.ex:22
+#: lib/cannery_web/controllers/user_registration_controller.ex:21
-#: lib/cannery_web/controllers/user_registration_controller.ex:51
+#: lib/cannery_web/controllers/user_registration_controller.ex:50
 #, elixir-autogen, elixir-format
 msgid "Sorry, public registration is disabled"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_registration_controller.ex:12
+#: lib/cannery_web/controllers/user_registration_controller.ex:11
-#: lib/cannery_web/controllers/user_registration_controller.ex:41
+#: lib/cannery_web/controllers/user_registration_controller.ex:40
-#: lib/cannery_web/controllers/user_registration_controller.ex:70
+#: lib/cannery_web/controllers/user_registration_controller.ex:69
 #, elixir-autogen, elixir-format
 msgid "Sorry, this invite was not found or expired"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_settings_controller.ex:99
+#: lib/cannery_web/controllers/user_settings_controller.ex:98
 #, elixir-autogen, elixir-format
 msgid "Unable to delete user"
 msgstr ""
@@ -91,7 +91,7 @@ msgstr ""
 msgid "Unauthorized"
 msgstr ""
 
-#: lib/cannery_web/controllers/user_confirmation_controller.ex:53
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:51
 #, elixir-autogen, elixir-format
 msgid "User confirmation link is invalid or it has expired."
 msgstr ""
@@ -101,23 +101,23 @@ msgstr ""
 msgid "You are not authorized to view this page."
 msgstr ""
 
-#: lib/cannery/accounts/user.ex:145
+#: lib/cannery/accounts/user.ex:140
 #, elixir-autogen, elixir-format
 msgid "did not change"
 msgstr ""
 
-#: lib/cannery/accounts/user.ex:166
+#: lib/cannery/accounts/user.ex:161
 #, elixir-autogen, elixir-format
 msgid "does not match password"
 msgstr ""
 
 ## From Ecto.Changeset.put_change/3
-#: lib/cannery/accounts/user.ex:203
+#: lib/cannery/accounts/user.ex:198
 #, elixir-autogen, elixir-format, fuzzy
 msgid "is not valid"
 msgstr ""
 
-#: lib/cannery/accounts/user.ex:100
+#: lib/cannery/accounts/user.ex:95
 #, elixir-autogen, elixir-format
 msgid "must have the @ sign and no spaces"
 msgstr ""
@@ -143,56 +143,46 @@ msgstr ""
 msgid "Tag could not be removed"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/form_component.ex:159
+#: lib/cannery_web/live/pack_live/form_component.ex:175
 #, elixir-autogen, elixir-format
 msgid "Could not parse number of copies"
 msgstr ""
 
-#: lib/cannery_web/live/pack_live/form_component.ex:149
+#: lib/cannery/ammo.ex:1026
 #, elixir-autogen, elixir-format
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""
 
-#: lib/cannery/ammo.ex:1121
-#, elixir-autogen, elixir-format
-msgid "Invalid multiplier"
-msgstr ""
-
 #: lib/cannery_web/live/range_live/index.html.heex:71
 #, elixir-autogen, elixir-format
 msgid "Your browser does not support the canvas element."
 msgstr ""
 
-#: lib/cannery/activity_log/shot_record.ex:74
+#: lib/cannery/activity_log/shot_record.ex:71
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Please select a valid user and ammo pack"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_record.ex:88
+#: lib/cannery/activity_log/shot_record.ex:85
 #, elixir-autogen, elixir-format
 msgid "Ammo left can be at most %{count} rounds"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_record.ex:84
+#: lib/cannery/activity_log/shot_record.ex:81
 #, elixir-autogen, elixir-format
 msgid "Ammo left must be at least 0"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_record.ex:119
+#: lib/cannery/activity_log/shot_record.ex:116
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Count can be at most %{count} shots"
 msgstr ""
 
-#: lib/cannery/activity_log/shot_record.ex:80
+#: lib/cannery/activity_log/shot_record.ex:77
 #, elixir-autogen, elixir-format
 msgid "can't be blank"
 msgstr ""
 
-#: lib/cannery/ammo/pack.ex:100
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Please select a type and container"
-msgstr ""
-
 #: lib/cannery_web/controllers/error_html.ex:11
 #: lib/cannery_web/controllers/error_json.ex:9
 #, elixir-autogen, elixir-format, fuzzy
@@ -208,3 +198,13 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "You must log in to access this page."
 msgstr ""
+
+#: lib/cannery/ammo/pack.ex:98
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Please select a valid container"
+msgstr ""
+
+#: lib/cannery/ammo/pack.ex:96
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Please select a valid type"
+msgstr ""