bump to 0.7.0

Currently translated at 100.0% (157 of 157 strings)

Translation: cannery/default
Translate-URL: https://weblate.bubbletea.dev/projects/cannery/default/fr/

.credo.exs

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

.drone.yml

@@ -16,36 +16,46 @@ steps:
       - assets/node_modules/
 
 - name: test
-  image: bitwalker/alpine-elixir-phoenix:1.13
+  image: elixir:1.14.1-alpine
   environment:
     TEST_DATABASE_URL: ecto://postgres:postgres@database/cannery_test
     HOST: testing.example.tld
   commands:
+  - apk add --no-cache build-base npm git python3
   - mix local.rebar --force
   - mix local.hex --force
   - mix deps.get
-  - npm install --prefix assets
+  - mix deps.compile
-  - mix test
+  - npm --prefix ./assets ci --progress=false --no-audit --loglevel=error
+  - npm run --prefix ./assets deploy
+  - mix do phx.digest, gettext.extract
+  - mix test.all
 
 - name: build and publish stable
-  image: plugins/docker
+  image: thegeeklab/drone-docker-buildx
+  privileged: true
   settings:
     repo: shibaobun/cannery
+    purge: true
+    compress: true
+    platforms: linux/amd64,linux/arm/v7
     username:
       from_secret: docker_username
     password:
       from_secret: docker_password
-    tags:
+    tags: latest
-      - latest
-      - ${DRONE_TAG}
   when:
     branch:
     - stable
 
 - name: build and publish tagged version
-  image: plugins/docker
+  image: thegeeklab/drone-docker-buildx
+  privileged: true
   settings:
     repo: shibaobun/cannery
+    purge: true
+    compress: true
+    platforms: linux/amd64,linux/arm/v7
     username:
       from_secret: docker_username
     password:
@@ -79,7 +89,7 @@ services:
 volumes:
   - name: cache
     host:
-      path: /tmp/drone-cache
+      path: /run/media/default/ssdsrv/gitea/drone-cache
   - name: docker_sock
     host:
       path: /var/run/docker.sock

.formatter.exs

@@ -2,5 +2,5 @@
   import_deps: [:ecto, :phoenix],
   inputs: ["*.{heex,ex,exs}", "priv/*/seeds.exs", "{config,lib,test}/**/*.{heex,ex,exs}"],
   subdirectories: ["priv/*/migrations"],
-  plugins: [HeexFormatter]
+  plugins: [Phoenix.LiveView.HTMLFormatter]
 ]

.tool-versions

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

CHANGELOG.md

@@ -1,3 +1,98 @@
+# v0.7.0
+- Add shading to table component
+- Fix chart to sum by day
+- Fix whitespace when copying invite url
+- Make ammo type show page also display ammo groups as table
+- Make container show page also display ammo groups as table
+- Display CPR for ammo packs
+- Add original count for ammo packs
+- Add ammo pack CPR and original count to json export
+
+# v0.6.0
+- Update translations
+- Display used-up date on used-up ammo
+- Make ammo index page a bit more compact
+- Make ammo index page filter used-up ammo
+- Make ammo catalog page include ammo count
+- Make ammo type show page a bit more compact
+- Make ammo type show page include container names for each ammo
+- Make ammo type show page filter used-up ammo
+- Make container index page optionally display a table
+- Make container show page a bit more compact
+- Make container show page filter used-up ammo
+- Forgot to add the logo as the favicon whoops
+- Add graph to range page
+- Add JSON export of data
+- Add ammo cloning
+- Add ammo type cloning
+- Add container cloning
+- Fix bug with moving ammo packs between containers
+- Add button to set rounds left to 0 when creating a shot group
+- Update project dependencies
+
+# v0.5.4
+- Rename "Ammo" tab to "Catalog", and "Manage" tab is now "Ammo"
+- Ammo groups are now just referred to as Ammo or "Packs"
+- URL paths now reflect new names
+- Add pack and round count to container information
+- Add cute logo >:3 Thank you [kalli](https://twitter.com/t0kkuro)!
+- Add note about deleting an ammo type deleting all ammo of that type as well
+- Prompt to create first ammo type before trying to create first ammo
+- Add note about creating unlimited invites
+- Update screenshot lol
+
+# v0.5.3
+- Update French translation: Thank you [duponin](https://udongein.xyz/users/duponin)!
+- Update German translation: Thank you [Kaia](https://shitposter.club/users/kaia)!
+
+# v0.5.2
+- Add "Added on" date to ammo groups
+- Add "Added on" date to ammo types
+- Add "Registered on" date to user information
+- Add language in user settings. The `LOCALE` environment variable will continue
+  to set the default locale for the application.
+- Add involvement links to home page
+- Fix button text-wrapping
+- Update dependencies
+
+# v0.5.1
+- Add French translation: Thank you [duponin](https://udongein.xyz/users/duponin)!
+
+# v0.5.0
+- Add German translation: Thank you [Kaia](https://shitposter.club/users/kaia)!
+- Fix not being able to edit ammo group when fully used up
+- Fix bug with average price per round calculation
+- Show average price per round on ammo type table
+- Use Elixir v1.13.4
+
+# v0.4.1
+- Fix button and tag text wrapping
+- Code quality fixes
+
+# v0.4.0
+- Make tables sortable
+- Add link to changelog from version number
+- Fix some elements flashing with black background
+- Fix bug with moving ammo group to new container
+- Fix bug with no error showing up for create ammo group form
+
+# v0.3.0
+- Fix ammo type counts not showing when count is 0
+- Add prompt to create first container before first ammo group
+- Edit and delete shot groups from ammo group show page
+- Use today's date when adding new shot groups
+- Create multiple ammo groups at one time
+
+# v0.2.3
+- Fix modals with overflowing forms
+- Fix grids having uneven margins in phone mode
+- Add page titles to registration and setting pages
+
+# v0.2.2
+- Fix loading and reconnecting pages not being fixed
+- Fix closing modal in some cases not triggering a page reload
+- Fix error when display container and tag edit routes from a fresh reload
+
 # v0.2.1
 - Fix checkbox spacing for mobile view
 - Fix spacing with form elements in mobile view

CONTRIBUTING.md

@@ -63,8 +63,7 @@ And as always, thank you!
   [`phx_gen_auth`](https://hexdocs.pm/phx_gen_auth/).
 - `Dockerfile` and example `docker-compose.yml`
 - Automatic migrations in `MIX_ENV=prod` or Docker image
-- JS linting with [standard.js](https://standardjs.com), HEEx linting with
+- JS linting with [standard.js](https://standardjs.com)
-  [heex_formatter](https://github.com/feliperenan/heex_formatter)
 
 ## Docs
 
@@ -109,7 +108,8 @@ In `dev` mode, Cannery will listen for these environment variables at runtime.
   Defaults to `false`.
 - `POOL_SIZE`: Controls the pool size to use with PostgreSQL. Defaults to `10`.
 - `REGISTRATION`: Controls if user sign-up should be invite only or set to public. Set to `public` to enable public registration. Defaults to `invite`.
-- `LOCALE`: Sets a custom locale. Defaults to `en_US`.
+- `LOCALE`: Sets a custom default locale. Defaults to `en_US`.
+  - Available options: `en_US`, `de`, and `fr`
 
 ## `MIX_ENV=test`
 
@@ -141,3 +141,6 @@ In `prod` mode (or in the Docker container), Cannery will listen for the same en
 Thank you so much for your contributions!
 
 - shibao (https://misskey.bubbletea.dev/@shibao)
+- kaia (https://shitposter.club/users/kaia)
+- duponin (https://udongein.xyz/users/duponin)
+- kalli (https://twitter.com/t0kkuro)

Dockerfile

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

README.md

@@ -1,6 +1,6 @@
 # Cannery
 
-![screenshot](https://gitea.bubbletea.dev/shibao/cannery/raw/branch/stable/home.png)
+![old screenshot](https://gitea.bubbletea.dev/shibao/cannery/raw/branch/stable/home.png)
 
 The self-hosted firearm tracker website.
 
@@ -63,7 +63,8 @@ You can use the following environment variables to configure Cannery in
   with `docker run -it shibaobun/cannery mix phx.gen.secret` and set for server to start.
 - `REGISTRATION`: Controls if user sign-up should be invite only or set to
   public. Set to `public` to enable public registration. Defaults to `invite`.
-- `LOCALE`: Sets a custom locale. Defaults to `en_US`.
+- `LOCALE`: Sets a custom default locale. Defaults to `en_US`
+  - Available options: `en_US`, `de`, and `fr`
 - `SMTP_HOST`: The url for your SMTP email provider. Must be set
 - `SMTP_PORT`: The port for your SMTP relay. Defaults to `587`.
 - `SMTP_USERNAME`: The username for your SMTP relay. Must be set!

assets/css/components.scss

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

assets/js/app.js

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

assets/js/maintain_attrs.js

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

assets/js/shot_log_chart.js

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

assets/package.json

@@ -2,6 +2,10 @@
   "repository": {},
   "description": " ",
   "license": "MIT",
+  "engines": {
+    "node": "18.12.1",
+    "npm": "8.19.2"
+  },
   "scripts": {
     "deploy": "NODE_ENV=production webpack --mode production",
     "watch": "webpack --mode development --watch --watch-options-stdin",
@@ -9,36 +13,37 @@
     "test": "standard"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-free": "^5.15.4",
+    "@fortawesome/fontawesome-free": "^6.1.1",
-    "alpinejs": "^3.9.0",
+    "alpinejs": "^3.10.2",
+    "chart.js": "^3.9.1",
+    "chartjs-adapter-date-fns": "^2.0.0",
+    "date-fns": "^2.29.3",
     "phoenix": "file:../deps/phoenix",
     "phoenix_html": "file:../deps/phoenix_html",
     "phoenix_live_view": "file:../deps/phoenix_live_view",
-    "topbar": "^0.1.4"
+    "topbar": "^1.0.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.15.0",
+    "@babel/core": "^7.17.10",
-    "@babel/preset-env": "^7.15.0",
+    "@babel/preset-env": "^7.17.10",
-    "autoprefixer": "^10.2.6",
+    "autoprefixer": "^10.4.7",
-    "babel-loader": "^8.2.2",
+    "babel-loader": "^8.2.5",
-    "copy-webpack-plugin": "^9.0.0",
+    "copy-webpack-plugin": "^10.2.4",
-    "css-loader": "^5.2.7",
+    "css-loader": "^6.7.1",
-    "css-minimizer-webpack-plugin": "^3.0.1",
+    "css-minimizer-webpack-plugin": "^3.4.1",
     "file-loader": "^6.2.0",
-    "hard-source-webpack-plugin": "^0.13.1",
+    "mini-css-extract-plugin": "^2.6.0",
-    "mini-css-extract-plugin": "^1.6.0",
+    "postcss": "^8.4.13",
-    "node-sass": "^7.0.1",
+    "postcss-import": "^14.1.0",
-    "postcss": "^8.3.6",
+    "postcss-loader": "^6.2.1",
-    "postcss-import": "^14.0.2",
+    "postcss-preset-env": "^7.5.0",
-    "postcss-loader": "^6.1.1",
+    "sass": "^1.56.0",
-    "postcss-preset-env": "^7.3.1",
+    "sass-loader": "^12.6.0",
-    "sass-loader": "^12.1.0",
+    "standard": "^17.0.0",
-    "standard": "^16.0.4",
+    "tailwindcss": "^3.0.24",
-    "style-loader": "^3.2.1",
+    "terser-webpack-plugin": "^5.3.1",
-    "tailwindcss": "^2.2.7",
+    "webpack": "^5.72.0",
-    "terser-webpack-plugin": "^5.1.3",
+    "webpack-cli": "^4.9.2",
-    "webpack": "^5.67.0",
+    "webpack-dev-server": "^4.9.0"
-    "webpack-cli": "^4.8.0",
-    "webpack-dev-server": "^4.7.4"
   }
 }

assets/tailwind.config.js

@@ -1,24 +1,18 @@
 const colors = require('tailwindcss/colors')
 
 module.exports = {
-  purge: [
+  content: [
-    '../lib/**/*.ex',
+    '../lib/**/*.{ex,heex,leex,eex}',
-    '../lib/**/*.heex',
-    '../lib/**/*.leex',
-    '../lib/**/*.eex',
     './js/**/*.js'
   ],
-  darkMode: 'media',
   theme: {
     colors: {
       transparent: 'transparent',
       current: 'currentColor',
-
       primary: colors.gray,
-
       black: colors.black,
       white: colors.white,
-      gray: colors.trueGray,
+      gray: colors.neutral,
       indigo: colors.indigo,
       red: colors.rose,
       yellow: colors.amber
@@ -28,14 +22,22 @@ module.exports = {
         128: '32rem',
         192: '48rem',
         256: '64rem'
+      },
+      minWidth: {
+        4: '1rem',
+        8: '2rem',
+        12: '3rem',
+        16: '4rem',
+        20: '8rem'
+      },
+      maxWidth: {
+        4: '1rem',
+        8: '2rem',
+        12: '3rem',
+        16: '4rem',
+        20: '8rem'
       }
     }
   },
-  variants: {
-    extend: {
-      backgroundColor: ['active'],
-      borderColor: ['active']
-    }
-  },
   plugins: []
 }

assets/webpack.config.js

@@ -44,19 +44,14 @@ module.exports = (env, options) => {
         },
         {
           test: /\.(woff(2)?|ttf|eot|svg|otf)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-          loader: 'file-loader',
+          type: 'asset/resource',
-          options: {
+          generator: { filename: 'fonts/[name][ext]' }
-            name: '[name].[ext]?[hash]',
-            outputPath: '../fonts'
-          }
         }
       ]
     },
     plugins: [
       new MiniCssExtractPlugin({ filename: '../css/app.css' }),
-      new CopyWebpackPlugin({
+      new CopyWebpackPlugin({ patterns: [{ from: 'static/', to: '../' }] })
-        patterns: [{ from: 'static/', to: '../' }]
-      })
     ]
   }
 }

config/runtime.exs

@@ -14,8 +14,8 @@ end
 
 config :cannery, CanneryWeb.ViewHelpers, shibao_mode: System.get_env("SHIBAO_MODE") == "true"
 
-# Set locale
+# Set default locale
-Gettext.put_locale(System.get_env("LOCALE") || "en_US")
+config :gettext, :default_locale, System.get_env("LOCALE") || "en_US"
 
 maybe_ipv6 = if System.get_env("ECTO_IPV6") == "true", do: [:inet6], else: []
 

lib/cannery/accounts.ex

@@ -196,7 +196,7 @@ defmodule Cannery.Accounts do
          {:ok, _} <- Repo.transaction(user_email_multi(user, email, context)) do
       :ok
     else
-      _ -> :error
+      _error_tuple -> :error
     end
   end
 
@@ -265,10 +265,39 @@ defmodule Cannery.Accounts do
     |> Repo.transaction()
     |> case do
       {:ok, %{user: user}} -> {:ok, user}
-      {:error, :user, changeset, _} -> {:error, changeset}
+      {:error, :user, changeset, _changes_so_far} -> {:error, changeset}
     end
   end
 
+  @doc """
+  Returns an `%Changeset{}` for changing the user locale.
+
+  ## Examples
+
+      iex> change_user_locale(user)
+      %Changeset{data: %User{}}
+
+  """
+  @spec change_user_locale(User.t()) :: Changeset.t(User.t())
+  def change_user_locale(%{locale: locale} = user), do: User.locale_changeset(user, locale)
+
+  @doc """
+  Updates the user locale.
+
+  ## Examples
+
+      iex> update_user_locale(user, "valid locale")
+      {:ok, %User{}}
+
+      iex> update_user_password(user, "invalid locale")
+      {:error, %Changeset{}}
+
+  """
+  @spec update_user_locale(User.t(), locale :: String.t()) ::
+          {:ok, User.t()} | {:error, Changeset.t(User.t())}
+  def update_user_locale(user, locale),
+    do: user |> User.locale_changeset(locale) |> Repo.update()
+
   @doc """
   Deletes a user. must be performed by an admin or the same user!
 
@@ -372,7 +401,7 @@ defmodule Cannery.Accounts do
          {:ok, %{user: user}} <- Repo.transaction(confirm_user_multi(user)) do
       {:ok, user}
     else
-      _ -> :error
+      _error_tuple -> :error
     end
   end
 
@@ -420,7 +449,7 @@ defmodule Cannery.Accounts do
          %User{} = user <- Repo.one(query) do
       user
     else
-      _ -> nil
+      _error_tuple -> nil
     end
   end
 
@@ -444,7 +473,7 @@ defmodule Cannery.Accounts do
     |> Repo.transaction()
     |> case do
       {:ok, %{user: user}} -> {:ok, user}
-      {:error, :user, changeset, _} -> {:error, changeset}
+      {:error, :user, changeset, _changes_so_far} -> {:error, changeset}
     end
   end
 end

lib/cannery/accounts/user.ex

@@ -9,6 +9,14 @@ defmodule Cannery.Accounts.User do
   alias Ecto.{Changeset, UUID}
   alias Cannery.{Accounts.User, Invites.Invite}
 
+  @derive {Jason.Encoder,
+           only: [
+             :id,
+             :email,
+             :confirmed_at,
+             :role,
+             :locale
+           ]}
   @derive {Inspect, except: [:password]}
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
@@ -18,6 +26,7 @@ defmodule Cannery.Accounts.User do
     field :hashed_password, :string
     field :confirmed_at, :naive_datetime
     field :role, Ecto.Enum, values: [:admin, :user], default: :user
+    field :locale, :string
 
     has_many :invites, Invite, on_delete: :delete_all
 
@@ -31,6 +40,7 @@ defmodule Cannery.Accounts.User do
           hashed_password: String.t(),
           confirmed_at: NaiveDateTime.t(),
           role: atom(),
+          locale: String.t() | nil,
           invites: [Invite.t()],
           inserted_at: NaiveDateTime.t(),
           updated_at: NaiveDateTime.t()
@@ -60,7 +70,7 @@ defmodule Cannery.Accounts.User do
           Changeset.t(t() | new_user())
   def registration_changeset(user, attrs, opts \\ []) do
     user
-    |> cast(attrs, [:email, :password, :role])
+    |> cast(attrs, [:email, :password, :role, :locale])
     |> validate_email()
     |> validate_password(opts)
   end
@@ -171,7 +181,7 @@ defmodule Cannery.Accounts.User do
     Bcrypt.verify_pass(password, hashed_password)
   end
 
-  def valid_password?(_, _) do
+  def valid_password?(_invalid_user, _invalid_password) do
     Bcrypt.no_user_verify()
     false
   end
@@ -185,4 +195,14 @@ defmodule Cannery.Accounts.User do
       do: changeset,
       else: changeset |> add_error(:current_password, dgettext("errors", "is not valid"))
   end
+
+  @doc """
+  A changeset for changing the user's locale
+  """
+  @spec locale_changeset(t() | Changeset.t(t()), locale :: String.t() | nil) :: Changeset.t(t())
+  def locale_changeset(user_or_changeset, locale) do
+    user_or_changeset
+    |> cast(%{"locale" => locale}, [:locale])
+    |> validate_required(:locale)
+  end
 end

lib/cannery/activity_log.ex

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

lib/cannery/activity_log/shot_group.ex

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

lib/cannery/ammo.ex

@@ -3,11 +3,15 @@ defmodule Cannery.Ammo do
   The Ammo context.
   """
 
+  import CanneryWeb.Gettext
   import Ecto.Query, warn: false
-  alias Cannery.{Accounts.User, Containers, Repo}
+  alias Cannery.{Accounts.User, Containers, Containers.Container, Repo}
+  alias Cannery.ActivityLog.ShotGroup
   alias Cannery.Ammo.{AmmoGroup, AmmoType}
   alias Ecto.Changeset
 
+  @ammo_group_create_limit 10_000
+
   @doc """
   Returns the list of ammo_types.
 
@@ -21,6 +25,25 @@ defmodule Cannery.Ammo do
   def list_ammo_types(%User{id: user_id}),
     do: Repo.all(from at in AmmoType, where: at.user_id == ^user_id, order_by: at.name)
 
+  @doc """
+  Returns a count of ammo_types.
+
+  ## Examples
+
+      iex> get_ammo_types_count!(%User{id: 123})
+      3
+
+  """
+  @spec get_ammo_types_count!(User.t()) :: integer()
+  def get_ammo_types_count!(%User{id: user_id}) do
+    Repo.one(
+      from at in AmmoType,
+        where: at.user_id == ^user_id,
+        select: count(at.id),
+        distinct: true
+    )
+  end
+
   @doc """
   Gets a single ammo_type.
 
@@ -42,28 +65,31 @@ defmodule Cannery.Ammo do
   @doc """
   Gets the average cost of a single ammo type
 
-  Raises `Ecto.NoResultsError` if the Ammo type does not exist.
-
   ## Examples
 
-      iex> get_ammo_type!(123, %User{id: 123})
+      iex> get_average_cost_for_ammo_type!(%AmmoType{id: 123}, %User{id: 123})
-      %AmmoType{}
+      1.50
-
-      iex> get_ammo_type!(456, %User{id: 123})
-      ** (Ecto.NoResultsError)
 
   """
-  @spec get_average_cost_for_ammo_type!(AmmoType.t(), User.t()) :: float()
+  @spec get_average_cost_for_ammo_type!(AmmoType.t(), User.t()) :: float() | nil
   def get_average_cost_for_ammo_type!(
         %AmmoType{id: ammo_type_id, user_id: user_id},
         %User{id: user_id}
       ) do
+    sg_total_query =
+      from sg in ShotGroup,
+        where: not (sg.count |> is_nil()),
+        group_by: sg.ammo_group_id,
+        select: %{ammo_group_id: sg.ammo_group_id, total: sum(sg.count)}
+
     Repo.one!(
       from ag in AmmoGroup,
-        left_join: sg in assoc(ag, :shot_groups),
+        as: :ammo_group,
+        left_join: sg_query in subquery(sg_total_query),
+        on: ag.id == sg_query.ammo_group_id,
         where: ag.ammo_type_id == ^ammo_type_id,
         where: not (ag.price_paid |> is_nil()),
-        select: sum(ag.price_paid) / (sum(ag.count) + sum(sg.count))
+        select: sum(ag.price_paid) / sum(ag.count + coalesce(sg_query.total, 0))
     )
   end
 
@@ -75,7 +101,7 @@ defmodule Cannery.Ammo do
   ## Examples
 
       iex> get_round_count_for_ammo_type(123, %User{id: 123})
-      %AmmoType{}
+      35
 
       iex> get_round_count_for_ammo_type(456, %User{id: 123})
       ** (Ecto.NoResultsError)
@@ -90,7 +116,7 @@ defmodule Cannery.Ammo do
       from ag in AmmoGroup,
         where: ag.ammo_type_id == ^ammo_type_id,
         select: sum(ag.count)
-    )
+    ) || 0
   end
 
   @doc """
@@ -101,7 +127,7 @@ defmodule Cannery.Ammo do
   ## Examples
 
       iex> get_used_count_for_ammo_type(123, %User{id: 123})
-      %AmmoType{}
+      35
 
       iex> get_used_count_for_ammo_type(456, %User{id: 123})
       ** (Ecto.NoResultsError)
@@ -117,7 +143,30 @@ defmodule Cannery.Ammo do
         left_join: sg in assoc(ag, :shot_groups),
         where: ag.ammo_type_id == ^ammo_type_id,
         select: sum(sg.count)
-    )
+    ) || 0
+  end
+
+  @doc """
+  Gets the total number of ammo ever bought for an ammo type
+
+  Raises `Ecto.NoResultsError` if the Ammo type does not exist.
+
+  ## Examples
+
+      iex> get_historical_count_for_ammo_type(123, %User{id: 123})
+      %AmmoType{}
+
+      iex> get_historical_count_for_ammo_type(456, %User{id: 123})
+      ** (Ecto.NoResultsError)
+
+  """
+  @spec get_historical_count_for_ammo_type(AmmoType.t(), User.t()) :: non_neg_integer()
+  def get_historical_count_for_ammo_type(
+        %AmmoType{user_id: user_id} = ammo_type,
+        %User{id: user_id} = user
+      ) do
+    get_round_count_for_ammo_type(ammo_type, user) +
+      get_used_count_for_ammo_type(ammo_type, user)
   end
 
   @doc """
@@ -134,11 +183,8 @@ defmodule Cannery.Ammo do
   """
   @spec create_ammo_type(attrs :: map(), User.t()) ::
           {:ok, AmmoType.t()} | {:error, Changeset.t(AmmoType.new_ammo_type())}
-  def create_ammo_type(attrs \\ %{}, %User{id: user_id}) do
+  def create_ammo_type(attrs \\ %{}, %User{} = user),
-    %AmmoType{}
+    do: %AmmoType{} |> AmmoType.create_changeset(user, attrs) |> Repo.insert()
-    |> AmmoType.create_changeset(attrs |> Map.put("user_id", user_id))
-    |> Repo.insert()
-  end
 
   @doc """
   Updates a ammo_type.
@@ -187,22 +233,6 @@ defmodule Cannery.Ammo do
   def delete_ammo_type!(%AmmoType{user_id: user_id} = ammo_type, %User{id: user_id}),
     do: ammo_type |> Repo.delete!()
 
-  @doc """
-  Returns an `%Changeset{}` for tracking ammo_type changes.
-
-  ## Examples
-
-      iex> change_ammo_type(ammo_type)
-      %Changeset{data: %AmmoType{}}
-
-  """
-  @spec change_ammo_type(AmmoType.t() | AmmoType.new_ammo_type()) ::
-          Changeset.t(AmmoType.t() | AmmoType.new_ammo_type())
-  @spec change_ammo_type(AmmoType.t() | AmmoType.new_ammo_type(), attrs :: map()) ::
-          Changeset.t(AmmoType.t() | AmmoType.new_ammo_type())
-  def change_ammo_type(%AmmoType{} = ammo_type, attrs \\ %{}),
-    do: AmmoType.update_changeset(ammo_type, attrs)
-
   @doc """
   Returns the list of ammo_groups for a user and type.
 
@@ -213,7 +243,15 @@ defmodule Cannery.Ammo do
 
   """
   @spec list_ammo_groups_for_type(AmmoType.t(), User.t()) :: [AmmoGroup.t()]
-  def list_ammo_groups_for_type(%AmmoType{id: ammo_type_id, user_id: user_id}, %User{id: user_id}) do
+  @spec list_ammo_groups_for_type(AmmoType.t(), User.t(), include_empty :: boolean()) ::
+          [AmmoGroup.t()]
+  def list_ammo_groups_for_type(ammo_type, user, include_empty \\ false)
+
+  def list_ammo_groups_for_type(
+        %AmmoType{id: ammo_type_id, user_id: user_id},
+        %User{id: user_id},
+        true = _include_empty
+      ) do
     Repo.all(
       from ag in AmmoGroup,
         left_join: sg in assoc(ag, :shot_groups),
@@ -224,6 +262,137 @@ defmodule Cannery.Ammo do
     )
   end
 
+  def list_ammo_groups_for_type(
+        %AmmoType{id: ammo_type_id, user_id: user_id},
+        %User{id: user_id},
+        false = _include_empty
+      ) do
+    Repo.all(
+      from ag in AmmoGroup,
+        left_join: sg in assoc(ag, :shot_groups),
+        where: ag.ammo_type_id == ^ammo_type_id,
+        where: ag.user_id == ^user_id,
+        where: not (ag.count == 0),
+        preload: [shot_groups: sg],
+        order_by: ag.id
+    )
+  end
+
+  @doc """
+  Returns the list of ammo_groups for a user and container.
+
+  ## Examples
+
+      iex> list_ammo_groups_for_container(%AmmoType{id: 123}, %User{id: 123})
+      [%AmmoGroup{}, ...]
+
+  """
+  @spec list_ammo_groups_for_container(Container.t(), User.t()) :: [AmmoGroup.t()]
+  @spec list_ammo_groups_for_container(Container.t(), User.t(), include_empty :: boolean()) ::
+          [AmmoGroup.t()]
+  def list_ammo_groups_for_container(container, user, include_empty \\ false)
+
+  def list_ammo_groups_for_container(
+        %Container{id: container_id, user_id: user_id},
+        %User{id: user_id},
+        true = _include_empty
+      ) do
+    Repo.all(
+      from ag in AmmoGroup,
+        left_join: sg in assoc(ag, :shot_groups),
+        where: ag.container_id == ^container_id,
+        where: ag.user_id == ^user_id,
+        preload: [shot_groups: sg],
+        order_by: ag.id
+    )
+  end
+
+  def list_ammo_groups_for_container(
+        %Container{id: container_id, user_id: user_id},
+        %User{id: user_id},
+        false = _include_empty
+      ) do
+    Repo.all(
+      from ag in AmmoGroup,
+        left_join: sg in assoc(ag, :shot_groups),
+        where: ag.container_id == ^container_id,
+        where: ag.user_id == ^user_id,
+        where: not (ag.count == 0),
+        preload: [shot_groups: sg],
+        order_by: ag.id
+    )
+  end
+
+  @doc """
+  Returns the count of ammo_groups for an ammo type.
+
+  ## Examples
+
+      iex> get_ammo_groups_count_for_type(%AmmoType{id: 123}, %User{id: 123})
+      3
+
+      iex> get_ammo_groups_count_for_type(%AmmoType{id: 123}, %User{id: 123}, true)
+      5
+
+  """
+  @spec get_ammo_groups_count_for_type(AmmoType.t(), User.t()) :: [AmmoGroup.t()]
+  @spec get_ammo_groups_count_for_type(AmmoType.t(), User.t(), include_empty :: boolean()) ::
+          [AmmoGroup.t()]
+  def get_ammo_groups_count_for_type(ammo_type, user, include_empty \\ false)
+
+  def get_ammo_groups_count_for_type(
+        %AmmoType{id: ammo_type_id, user_id: user_id},
+        %User{id: user_id},
+        true = _include_empty
+      ) do
+    Repo.one!(
+      from ag in AmmoGroup,
+        where: ag.user_id == ^user_id,
+        where: ag.ammo_type_id == ^ammo_type_id,
+        distinct: true,
+        select: count(ag.id)
+    ) || 0
+  end
+
+  def get_ammo_groups_count_for_type(
+        %AmmoType{id: ammo_type_id, user_id: user_id},
+        %User{id: user_id},
+        false = _include_empty
+      ) do
+    Repo.one!(
+      from ag in AmmoGroup,
+        where: ag.user_id == ^user_id,
+        where: ag.ammo_type_id == ^ammo_type_id,
+        where: not (ag.count == 0),
+        distinct: true,
+        select: count(ag.id)
+    ) || 0
+  end
+
+  @doc """
+  Returns the count of used ammo_groups for an ammo type.
+
+  ## Examples
+
+      iex> get_used_ammo_groups_count_for_type(%AmmoType{id: 123}, %User{id: 123})
+      3
+
+  """
+  @spec get_used_ammo_groups_count_for_type(AmmoType.t(), User.t()) :: [AmmoGroup.t()]
+  def get_used_ammo_groups_count_for_type(
+        %AmmoType{id: ammo_type_id, user_id: user_id},
+        %User{id: user_id}
+      ) do
+    Repo.one!(
+      from ag in AmmoGroup,
+        where: ag.user_id == ^user_id,
+        where: ag.ammo_type_id == ^ammo_type_id,
+        where: ag.count == 0,
+        distinct: true,
+        select: count(ag.id)
+    ) || 0
+  end
+
   @doc """
   Returns the list of ammo_groups for a user.
 
@@ -235,22 +404,27 @@ defmodule Cannery.Ammo do
   """
   @spec list_ammo_groups(User.t()) :: [AmmoGroup.t()]
   @spec list_ammo_groups(User.t(), include_empty :: boolean()) :: [AmmoGroup.t()]
-  def list_ammo_groups(%User{id: user_id}, include_empty \\ false) do
+  def list_ammo_groups(user, include_empty \\ false)
-    if include_empty do
+
+  def list_ammo_groups(%User{id: user_id}, true = _include_empty) do
+    Repo.all(
       from ag in AmmoGroup,
         left_join: sg in assoc(ag, :shot_groups),
         where: ag.user_id == ^user_id,
         preload: [shot_groups: sg],
         order_by: ag.id
-    else
+    )
+  end
+
+  def list_ammo_groups(%User{id: user_id}, false = _include_empty) do
+    Repo.all(
       from ag in AmmoGroup,
         left_join: sg in assoc(ag, :shot_groups),
         where: ag.user_id == ^user_id,
         where: not (ag.count == 0),
         preload: [shot_groups: sg],
         order_by: ag.id
-    end
+    )
-    |> Repo.all()
   end
 
   @doc """
@@ -306,11 +480,22 @@ defmodule Cannery.Ammo do
   def get_used_count(%AmmoGroup{} = ammo_group) do
     ammo_group
     |> Repo.preload(:shot_groups)
-    |> Map.get(:shot_groups)
+    |> Map.fetch!(:shot_groups)
     |> Enum.map(fn %{count: count} -> count end)
     |> Enum.sum()
   end
 
+  @doc """
+  Returns the last entered shot group for an ammo group
+  """
+  @spec get_last_used_shot_group(AmmoGroup.t()) :: ShotGroup.t() | nil
+  def get_last_used_shot_group(%AmmoGroup{} = ammo_group) do
+    ammo_group
+    |> Repo.preload(:shot_groups)
+    |> Map.fetch!(:shot_groups)
+    |> Enum.max_by(fn %{date: date} -> date end, Date, fn -> nil end)
+  end
+
   @doc """
   Calculates the percentage remaining of an ammo group out of 100
   """
@@ -321,42 +506,113 @@ defmodule Cannery.Ammo do
     ammo_group = ammo_group |> Repo.preload(:shot_groups)
 
     shot_group_sum =
-      ammo_group.shot_groups |> Enum.map(fn %{count: count} -> count end) |> Enum.sum()
+      ammo_group.shot_groups
+      |> Enum.map(fn %{count: count} -> count end)
+      |> Enum.sum()
 
     round(count / (count + shot_group_sum) * 100)
   end
 
   @doc """
-  Creates a ammo_group.
+  Gets the original count for an ammo group
+  """
+  @spec get_original_count(AmmoGroup.t()) :: non_neg_integer()
+  def get_original_count(%AmmoGroup{count: count} = ammo_group) do
+    count + get_used_count(ammo_group)
+  end
+
+  @doc """
+  Calculates the CPR for a single ammo group
+  """
+  @spec get_cpr(AmmoGroup.t()) :: nil | float()
+  def get_cpr(%AmmoGroup{price_paid: nil}), do: nil
+
+  def get_cpr(%AmmoGroup{price_paid: price_paid} = ammo_group),
+    do: calculate_cpr(price_paid, get_original_count(ammo_group))
+
+  @spec calculate_cpr(price_paid :: float() | nil, count :: integer()) :: float() | nil
+  defp calculate_cpr(nil, _count), do: nil
+  defp calculate_cpr(_price_paid, 0), do: nil
+  defp calculate_cpr(price_paid, total_count), do: price_paid / total_count
+
+  @doc """
+  Creates multiple ammo_groups at once.
 
   ## Examples
 
-      iex> create_ammo_group(%{field: value}, %User{id: 123})
+      iex> create_ammo_groups(%{field: value}, 3, %User{id: 123})
-      {:ok, %AmmoGroup{}}
+      {:ok, {3, [%AmmoGroup{}]}}
 
-      iex> create_ammo_group(%{field: bad_value}, %User{id: 123})
+      iex> create_ammo_groups(%{field: bad_value}, 3, %User{id: 123})
       {:error, %Changeset{}}
 
   """
-  @spec create_ammo_group(attrs :: map(), User.t()) ::
+  @spec create_ammo_groups(attrs :: map(), multiplier :: non_neg_integer(), User.t()) ::
-          {:ok, AmmoGroup.t()} | {:error, Changeset.t(AmmoGroup.new_ammo_group())}
+          {:ok, {count :: non_neg_integer(), [AmmoGroup.t()] | nil}}
-  def create_ammo_group(
+          | {:error, Changeset.t(AmmoGroup.new_ammo_group())}
+  def create_ammo_groups(
         %{"ammo_type_id" => ammo_type_id, "container_id" => container_id} = attrs,
-        %User{id: user_id} = user
+        multiplier,
-      ) do
+        %User{} = user
-    # validate ammo type and container ids belong to user
+      )
-    _valid_ammo_type = get_ammo_type!(ammo_type_id, user)
+      when multiplier >= 1 and multiplier <= @ammo_group_create_limit and
-    _valid_container = Containers.get_container!(container_id, user)
+             not (ammo_type_id |> is_nil()) and not (container_id |> is_nil()) do
+    now = NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second)
 
-    %AmmoGroup{}
+    changesets =
-    |> AmmoGroup.create_changeset(attrs |> Map.put("user_id", user_id))
+      Enum.map(1..multiplier, fn _count ->
-    |> Repo.insert()
+        %AmmoGroup{}
+        |> AmmoGroup.create_changeset(
+          get_ammo_type!(ammo_type_id, user),
+          Containers.get_container!(container_id, user),
+          user,
+          attrs
+        )
+      end)
+
+    if changesets |> Enum.all?(fn %{valid?: valid} -> valid end) do
+      {count, inserted_ammo_groups} =
+        Repo.insert_all(
+          AmmoGroup,
+          changesets
+          |> Enum.map(fn changeset ->
+            changeset
+            |> Map.get(:changes)
+            |> Map.merge(%{inserted_at: now, updated_at: now})
+          end),
+          returning: true
+        )
+
+      {:ok, {count, inserted_ammo_groups}}
+    else
+      changesets
+      |> Enum.reject(fn %{valid?: valid} -> valid end)
+      |> List.first()
+      |> Changeset.apply_action(:insert)
+    end
   end
 
-  def create_ammo_group(invalid_attrs, _user) do
+  def create_ammo_groups(
-    %AmmoGroup{}
+        %{"ammo_type_id" => ammo_type_id, "container_id" => container_id} = attrs,
-    |> AmmoGroup.create_changeset(invalid_attrs |> Map.put("user_id", "-1"))
+        _multiplier,
-    |> Repo.insert()
+        user
+      )
+      when not (ammo_type_id |> is_nil()) and not (container_id |> is_nil()) do
+    changeset =
+      %AmmoGroup{}
+      |> AmmoGroup.create_changeset(
+        get_ammo_type!(ammo_type_id, user),
+        Containers.get_container!(container_id, user),
+        user,
+        attrs
+      )
+      |> Changeset.add_error(:multiplier, dgettext("errors", "Invalid multiplier"))
+
+    {:error, changeset}
+  end
+
+  def create_ammo_groups(invalid_attrs, _multiplier, user) do
+    {:error, %AmmoGroup{} |> AmmoGroup.create_changeset(nil, nil, user, invalid_attrs)}
   end
 
   @doc """
@@ -373,8 +629,12 @@ defmodule Cannery.Ammo do
   """
   @spec update_ammo_group(AmmoGroup.t(), attrs :: map(), User.t()) ::
           {:ok, AmmoGroup.t()} | {:error, Changeset.t(AmmoGroup.t())}
-  def update_ammo_group(%AmmoGroup{user_id: user_id} = ammo_group, attrs, %User{id: user_id}),
+  def update_ammo_group(
-    do: ammo_group |> AmmoGroup.update_changeset(attrs) |> Repo.update()
+        %AmmoGroup{user_id: user_id} = ammo_group,
+        attrs,
+        %User{id: user_id} = user
+      ),
+      do: ammo_group |> AmmoGroup.update_changeset(attrs, user) |> Repo.update()
 
   @doc """
   Deletes a ammo_group.
@@ -405,18 +665,4 @@ defmodule Cannery.Ammo do
   @spec delete_ammo_group!(AmmoGroup.t(), User.t()) :: AmmoGroup.t()
   def delete_ammo_group!(%AmmoGroup{user_id: user_id} = ammo_group, %User{id: user_id}),
     do: ammo_group |> Repo.delete!()
-
-  @doc """
-  Returns an `%Changeset{}` for tracking ammo_group changes.
-
-  ## Examples
-
-      iex> change_ammo_group(ammo_group)
-      %Changeset{data: %AmmoGroup{}}
-
-  """
-  @spec change_ammo_group(AmmoGroup.t()) :: Changeset.t(AmmoGroup.t())
-  @spec change_ammo_group(AmmoGroup.t(), attrs :: map()) :: Changeset.t(AmmoGroup.t())
-  def change_ammo_group(%AmmoGroup{} = ammo_group, attrs \\ %{}),
-    do: AmmoGroup.update_changeset(ammo_group, attrs)
 end

lib/cannery/ammo/ammo_group.ex

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

lib/cannery/ammo/ammo_type.ex

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

lib/cannery/containers.ex

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

lib/cannery/containers/container.ex

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

lib/cannery/containers/container_tag.ex

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

lib/cannery/invites.ex

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

lib/cannery/invites/invite.ex

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

lib/cannery/release.ex

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

lib/cannery/repo/migrator.ex

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

lib/cannery/tags.ex

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

lib/cannery/tags/tag.ex

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

lib/cannery_web.ex

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

lib/cannery_web/components/add_shot_group_component.ex

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

lib/cannery_web/components/add_shot_group_component.html.heex

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

lib/cannery_web/components/ammo_group_card.ex

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

lib/cannery_web/components/ammo_group_table_component.ex

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

lib/cannery_web/components/container_card.ex

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

lib/cannery_web/components/invite_card.ex

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

lib/cannery_web/components/move_ammo_group_component.ex

@@ -4,7 +4,8 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
   """
 
   use CanneryWeb, :live_component
-  alias Cannery.{Accounts.User, Ammo, Ammo.AmmoGroup, Containers}
+  alias Cannery.{Accounts.User, Ammo, Ammo.AmmoGroup, Containers, Containers.Container}
+  alias CanneryWeb.Endpoint
   alias Phoenix.LiveView.Socket
 
   @impl true
@@ -21,13 +22,18 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
           assigns,
         socket
       ) do
-    changeset = Ammo.change_ammo_group(ammo_group)
+    changeset = ammo_group |> AmmoGroup.update_changeset(%{}, current_user)
 
     containers =
       Containers.list_containers(current_user)
       |> Enum.reject(fn %{id: id} -> id == container_id end)
 
-    {:ok, socket |> assign(assigns) |> assign(changeset: changeset, containers: containers)}
+    socket =
+      socket
+      |> assign(assigns)
+      |> assign(changeset: changeset, containers: containers)
+
+    {:ok, socket}
   end
 
   @impl true
@@ -46,7 +52,7 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
         {:ok, _ammo_group} ->
           prompt = dgettext("prompts", "Ammo moved to %{name} successfully", name: container_name)
 
-          socket |> put_flash(:info, prompt) |> push_redirect(to: return_to)
+          socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
 
         {:error, %Ecto.Changeset{} = changeset} ->
           socket |> assign(changeset: changeset)
@@ -54,4 +60,75 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
 
     {:noreply, socket}
   end
+
+  @impl true
+  def render(%{containers: containers} = assigns) do
+    columns = [
+      %{label: gettext("Container"), key: "name"},
+      %{label: gettext("Type"), key: "type"},
+      %{label: gettext("Location"), key: "location"},
+      %{label: nil, key: "actions", sortable: false}
+    ]
+
+    rows = containers |> get_rows_for_containers(assigns, columns)
+
+    assigns = assigns |> Map.merge(%{columns: columns, rows: rows})
+
+    ~H"""
+    <div class="w-full flex flex-col space-y-8 justify-center items-center">
+      <h2 class="mb-8 text-center title text-xl text-primary-600">
+        <%= dgettext("actions", "Move ammo") %>
+      </h2>
+
+      <%= if @containers |> Enum.empty?() do %>
+        <h2 class="title text-xl text-primary-600">
+          <%= gettext("No other containers") %>
+          <%= display_emoji("😔") %>
+        </h2>
+
+        <.link navigate={Routes.container_index_path(Endpoint, :new)} class="btn btn-primary">
+          <%= dgettext("actions", "Add another container!") %>
+        </.link>
+      <% else %>
+        <.live_component
+          module={CanneryWeb.Components.TableComponent}
+          id="move_ammo_group_table"
+          columns={@columns}
+          rows={@rows}
+        />
+      <% end %>
+    </div>
+    """
+  end
+
+  @spec get_rows_for_containers([Container.t()], map(), [map()]) :: [map()]
+  defp get_rows_for_containers(containers, assigns, columns) do
+    containers
+    |> Enum.map(fn container ->
+      columns
+      |> Map.new(fn %{key: key} -> {key, get_row_value_by_key(key, container, assigns)} end)
+    end)
+  end
+
+  @spec get_row_value_by_key(String.t(), Container.t(), map()) :: any()
+  defp get_row_value_by_key("actions", container, assigns) do
+    assigns = assigns |> Map.put(:container, container)
+
+    ~H"""
+    <div class="px-4 py-2 space-x-4 flex justify-center items-center">
+      <button
+        type="button"
+        class="btn btn-primary"
+        phx-click="move"
+        phx-target={@myself}
+        phx-value-container_id={@container.id}
+      >
+        <%= dgettext("actions", "Select") %>
+      </button>
+    </div>
+    """
+  end
+
+  defp get_row_value_by_key(key, container, _assigns),
+    do: container |> Map.get(key |> String.to_existing_atom())
 end

lib/cannery_web/components/move_ammo_group_component.html.heex

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

lib/cannery_web/components/table_component.ex

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

lib/cannery_web/components/table_component.html.heex

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

lib/cannery_web/components/tag_card.ex

@@ -4,6 +4,10 @@ defmodule CanneryWeb.Components.TagCard do
   """
 
   use CanneryWeb, :component
+  alias Cannery.Tags.Tag
+
+  attr :tag, Tag, required: true
+  slot(:inner_block, required: true)
 
   def tag_card(assigns) do
     ~H"""
@@ -19,10 +23,12 @@ defmodule CanneryWeb.Components.TagCard do
     """
   end
 
+  attr :tag, Tag, required: true
+
   def simple_tag_card(assigns) do
     ~H"""
     <h1
-      class="mx-2 my-1 px-4 py-2 rounded-lg title text-xl"
+      class="inline-block break-all mx-2 my-1 px-4 py-2 rounded-lg title text-xl"
       style={"color: #{@tag.text_color}; background-color: #{@tag.bg_color}"}
     >
       <%= @tag.name %>

lib/cannery_web/components/topbar.ex

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

lib/cannery_web/components/user_card.ex

@@ -4,6 +4,10 @@ defmodule CanneryWeb.Components.UserCard do
   """
 
   use CanneryWeb, :component
+  alias Cannery.Accounts.User
+
+  attr :user, User, required: true
+  slot(:inner_block, required: true)
 
   def user_card(assigns) do
     ~H"""
@@ -18,12 +22,18 @@ defmodule CanneryWeb.Components.UserCard do
       </h1>
 
       <h3 class="px-4 py-2 rounded-lg title text-lg">
-        <%= if @user.confirmed_at |> is_nil() do %>
+        <p>
-          Email unconfirmed
+          <%= if @user.confirmed_at |> is_nil() do %>
-        <% else %>
+            Email unconfirmed
-          <p>User was confirmed at</p>
+          <% else %>
-          <%= @user.confirmed_at |> display_datetime() %>
+            User was confirmed at <%= @user.confirmed_at |> display_datetime() %>
-        <% end %>
+          <% end %>
+        </p>
+
+        <p>
+          <%= gettext("User registered on") %>
+          <%= @user.inserted_at |> display_datetime() %>
+        </p>
       </h3>
 
       <%= if @inner_block do %>

lib/cannery_web/controllers/export_controller.ex

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

lib/cannery_web/controllers/user_confirmation_controller.ex

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

lib/cannery_web/controllers/user_registration_controller.ex

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

lib/cannery_web/controllers/user_reset_password_controller.ex

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

lib/cannery_web/controllers/user_session_controller.ex

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

lib/cannery_web/controllers/user_settings_controller.ex

@@ -1,19 +1,20 @@
 defmodule CanneryWeb.UserSettingsController do
   use CanneryWeb, :controller
-
+  import CanneryWeb.Gettext
   alias Cannery.Accounts
   alias CanneryWeb.{HomeLive, UserAuth}
 
   plug :assign_email_and_password_changesets
 
   def edit(conn, _params) do
-    render(conn, "edit.html")
+    render(conn, "edit.html", page_title: gettext("Settings"))
   end
 
-  def update(conn, %{"action" => "update_email"} = params) do
+  def update(%{assigns: %{current_user: user}} = conn, %{
-    %{"current_password" => password, "user" => user_params} = params
+        "action" => "update_email",
-    user = conn.assigns.current_user
+        "current_password" => password,
-
+        "user" => user_params
+      }) do
     case Accounts.apply_user_email(user, password, user_params) do
       {:ok, applied_user} ->
         Accounts.deliver_update_email_instructions(
@@ -33,14 +34,15 @@ defmodule CanneryWeb.UserSettingsController do
         |> redirect(to: Routes.user_settings_path(conn, :edit))
 
       {:error, changeset} ->
-        render(conn, "edit.html", email_changeset: changeset)
+        conn |> render("edit.html", email_changeset: changeset)
     end
   end
 
-  def update(conn, %{"action" => "update_password"} = params) do
+  def update(%{assigns: %{current_user: user}} = conn, %{
-    %{"current_password" => password, "user" => user_params} = params
+        "action" => "update_password",
-    user = conn.assigns.current_user
+        "current_password" => password,
-
+        "user" => user_params
+      }) do
     case Accounts.update_user_password(user, password, user_params) do
       {:ok, user} ->
         conn
@@ -49,12 +51,27 @@ defmodule CanneryWeb.UserSettingsController do
         |> UserAuth.log_in_user(user)
 
       {:error, changeset} ->
-        render(conn, "edit.html", password_changeset: changeset)
+        conn |> render("edit.html", password_changeset: changeset)
     end
   end
 
-  def confirm_email(conn, %{"token" => token}) do
+  def update(
-    case Accounts.update_user_email(conn.assigns.current_user, token) do
+        %{assigns: %{current_user: user}} = conn,
+        %{"action" => "update_locale", "user" => %{"locale" => locale}}
+      ) do
+    case Accounts.update_user_locale(user, locale) do
+      {:ok, _user} ->
+        conn
+        |> put_flash(:info, dgettext("prompts", "Language updated successfully."))
+        |> redirect(to: Routes.user_settings_path(conn, :edit))
+
+      {:error, changeset} ->
+        conn |> render("edit.html", locale_changeset: changeset)
+    end
+  end
+
+  def confirm_email(%{assigns: %{current_user: user}} = conn, %{"token" => token}) do
+    case Accounts.update_user_email(user, token) do
       :ok ->
         conn
         |> put_flash(:info, dgettext("prompts", "Email changed successfully."))
@@ -84,11 +101,10 @@ defmodule CanneryWeb.UserSettingsController do
     end
   end
 
-  defp assign_email_and_password_changesets(conn, _opts) do
+  defp assign_email_and_password_changesets(%{assigns: %{current_user: user}} = conn, _opts) do
-    user = conn.assigns.current_user
-
     conn
     |> assign(:email_changeset, Accounts.change_user_email(user))
     |> assign(:password_changeset, Accounts.change_user_password(user))
+    |> assign(:locale_changeset, Accounts.change_user_locale(user))
   end
 end

lib/cannery_web/live/ammo_group_live/form_component.ex

@@ -9,6 +9,8 @@ defmodule CanneryWeb.AmmoGroupLive.FormComponent do
   alias Ecto.Changeset
   alias Phoenix.LiveView.Socket
 
+  @ammo_group_create_limit 10_000
+
   @impl true
   @spec update(
           %{:ammo_group => AmmoGroup.t(), :current_user => User.t(), optional(any) => any},
@@ -19,21 +21,30 @@ defmodule CanneryWeb.AmmoGroupLive.FormComponent do
   end
 
   @spec update(Socket.t()) :: {:ok, Socket.t()}
-  def update(%{assigns: %{ammo_group: ammo_group, current_user: current_user}} = socket) do
+  def update(%{assigns: %{current_user: current_user}} = socket) do
-    changeset = Ammo.change_ammo_group(ammo_group)
+    %{assigns: %{ammo_types: ammo_types, containers: containers}} =
-    containers = Containers.list_containers(current_user)
+      socket =
-    ammo_types = Ammo.list_ammo_types(current_user)
+      socket
-    {:ok, socket |> assign(changeset: changeset, containers: containers, ammo_types: ammo_types)}
+      |> assign(:ammo_group_create_limit, @ammo_group_create_limit)
+      |> assign(:ammo_types, Ammo.list_ammo_types(current_user))
+      |> assign_new(:containers, fn -> Containers.list_containers(current_user) end)
+
+    params =
+      if ammo_types |> List.first() |> is_nil(),
+        do: %{},
+        else: %{} |> Map.put("ammo_type_id", ammo_types |> List.first() |> Map.get(:id))
+
+    params =
+      if containers |> List.first() |> is_nil(),
+        do: params,
+        else: params |> Map.put("container_id", containers |> List.first() |> Map.get(:id))
+
+    {:ok, socket |> assign_changeset(params)}
   end
 
   @impl true
-  def handle_event(
+  def handle_event("validate", %{"ammo_group" => ammo_group_params}, socket) do
-        "validate",
+    {:noreply, socket |> assign_changeset(ammo_group_params)}
-        %{"ammo_group" => ammo_group_params},
-        %{assigns: %{ammo_group: ammo_group}} = socket
-      ) do
-    socket = socket |> assign(:changeset, ammo_group |> Ammo.change_ammo_group(ammo_group_params))
-    {:noreply, socket}
   end
 
   def handle_event(
@@ -57,6 +68,44 @@ defmodule CanneryWeb.AmmoGroupLive.FormComponent do
 
   # Save Helpers
 
+  defp assign_changeset(
+         %{assigns: %{action: action, ammo_group: ammo_group, current_user: user}} = socket,
+         ammo_group_params
+       ) do
+    changeset_action =
+      cond do
+        action in [:new, :clone] -> :insert
+        action == :edit -> :update
+      end
+
+    changeset =
+      cond do
+        action in [:new, :clone] ->
+          ammo_type =
+            if ammo_group_params |> Map.has_key?("ammo_type_id"),
+              do: ammo_group_params |> Map.get("ammo_type_id") |> Ammo.get_ammo_type!(user),
+              else: nil
+
+          container =
+            if ammo_group_params |> Map.has_key?("container_id"),
+              do: ammo_group_params |> Map.get("container_id") |> Containers.get_container!(user),
+              else: nil
+
+          ammo_group |> AmmoGroup.create_changeset(ammo_type, container, user, ammo_group_params)
+
+        action == :edit ->
+          ammo_group |> AmmoGroup.update_changeset(ammo_group_params, user)
+      end
+
+    changeset =
+      case changeset |> Changeset.apply_action(changeset_action) do
+        {:ok, _data} -> changeset
+        {:error, changeset} -> changeset
+      end
+
+    socket |> assign(:changeset, changeset)
+  end
+
   defp save_ammo_group(
          %{assigns: %{ammo_group: ammo_group, current_user: current_user, return_to: return_to}} =
            socket,
@@ -66,8 +115,8 @@ defmodule CanneryWeb.AmmoGroupLive.FormComponent do
     socket =
       case Ammo.update_ammo_group(ammo_group, ammo_group_params, current_user) do
         {:ok, _ammo_group} ->
-          prompt = dgettext("prompts", "Ammo group updated successfully")
+          prompt = dgettext("prompts", "Ammo updated successfully")
-          socket |> put_flash(:info, prompt) |> push_redirect(to: return_to)
+          socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
 
         {:error, %Changeset{} = changeset} ->
           socket |> assign(:changeset, changeset)
@@ -77,20 +126,66 @@ defmodule CanneryWeb.AmmoGroupLive.FormComponent do
   end
 
   defp save_ammo_group(
-         %{assigns: %{current_user: current_user, return_to: return_to}} = socket,
+         %{assigns: %{changeset: changeset}} = socket,
-         :new,
+         action,
-         ammo_group_params
+         %{"multiplier" => multiplier_str} = ammo_group_params
-       ) do
+       )
+       when action in [:new, :clone] do
     socket =
-      case Ammo.create_ammo_group(ammo_group_params, current_user) do
+      case multiplier_str |> Integer.parse() do
-        {:ok, _ammo_group} ->
+        {multiplier, _remainder}
-          prompt = dgettext("prompts", "Ammo group created successfully")
+        when multiplier >= 1 and multiplier <= @ammo_group_create_limit ->
-          socket |> put_flash(:info, prompt) |> push_redirect(to: return_to)
+          socket |> create_multiple(ammo_group_params, multiplier)
 
-        {:error, %Changeset{} = changeset} ->
+        {multiplier, _remainder} ->
-          socket |> assign(changeset: changeset)
+          error_msg =
+            dgettext(
+              "errors",
+              "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}",
+              max: @ammo_group_create_limit,
+              multiplier: multiplier
+            )
+
+          {:error, changeset} =
+            changeset
+            |> Changeset.add_error(:multiplier, error_msg)
+            |> Changeset.apply_action(:insert)
+
+          socket |> assign(:changeset, changeset)
+
+        :error ->
+          error_msg = dgettext("errors", "Could not parse number of copies")
+
+          {:error, changeset} =
+            changeset
+            |> Changeset.add_error(:multiplier, error_msg)
+            |> Changeset.apply_action(:insert)
+
+          socket |> assign(:changeset, changeset)
       end
 
     {:noreply, socket}
   end
+
+  defp create_multiple(
+         %{assigns: %{current_user: current_user, return_to: return_to}} = socket,
+         ammo_group_params,
+         multiplier
+       ) do
+    case Ammo.create_ammo_groups(ammo_group_params, multiplier, current_user) do
+      {:ok, {count, _ammo_groups}} ->
+        prompt =
+          dngettext(
+            "prompts",
+            "Ammo added successfully",
+            "Ammo added successfully",
+            count
+          )
+
+        socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
+
+      {:error, %Changeset{} = changeset} ->
+        socket |> assign(changeset: changeset)
+    end
+  end
 end

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

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

lib/cannery_web/live/ammo_group_live/index.ex

@@ -4,22 +4,24 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
   """
 
   use CanneryWeb, :live_view
-  alias Cannery.{Ammo, Ammo.AmmoGroup, Repo}
+  alias Cannery.{Ammo, Ammo.AmmoGroup, Containers, Repo}
   alias CanneryWeb.Endpoint
 
   @impl true
-  def mount(_params, session, socket) do
+  def mount(_params, _session, socket) do
-    {:ok, socket |> assign_defaults(session) |> display_ammo_groups()}
+    {:ok, socket |> assign(show_used: false)}
   end
 
   @impl true
   def handle_params(params, _url, %{assigns: %{live_action: live_action}} = socket) do
-    {:noreply, apply_action(socket, live_action, params)}
+    {:noreply, apply_action(socket, live_action, params) |> display_ammo_groups()}
   end
 
-  defp apply_action(%{assigns: %{current_user: current_user}} = socket, :add_shot_group, %{
+  defp apply_action(
-         "id" => id
+         %{assigns: %{current_user: current_user}} = socket,
-       }) do
+         :add_shot_group,
+         %{"id" => id}
+       ) do
     socket
     |> assign(:page_title, gettext("Record shots"))
     |> assign(:ammo_group, Ammo.get_ammo_group!(id, current_user))
@@ -37,6 +39,12 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
     |> assign(:ammo_group, Ammo.get_ammo_group!(id, current_user))
   end
 
+  defp apply_action(%{assigns: %{current_user: current_user}} = socket, :clone, %{"id" => id}) do
+    socket
+    |> assign(:page_title, dgettext("actions", "Add Ammo"))
+    |> assign(:ammo_group, %{Ammo.get_ammo_group!(id, current_user) | id: nil})
+  end
+
   defp apply_action(socket, :new, _params) do
     socket
     |> assign(:page_title, dgettext("actions", "Add Ammo"))
@@ -44,7 +52,9 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
   end
 
   defp apply_action(socket, :index, _params) do
-    socket |> assign(:page_title, gettext("Ammo groups")) |> assign(:ammo_group, nil)
+    socket
+    |> assign(:page_title, gettext("Ammo groups"))
+    |> assign(:ammo_group, nil)
   end
 
   @impl true
@@ -70,8 +80,26 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
     {:noreply, socket |> display_ammo_groups()}
   end
 
-  defp display_ammo_groups(%{assigns: %{current_user: current_user}} = socket) do
+  @impl true
-    ammo_groups = Ammo.list_ammo_groups(current_user) |> Repo.preload([:ammo_type, :container])
+  def handle_event("toggle_show_used", _params, %{assigns: %{show_used: show_used}} = socket) do
-    socket |> assign(:ammo_groups, ammo_groups)
+    {:noreply, socket |> assign(:show_used, !show_used) |> display_ammo_groups()}
+  end
+
+  defp display_ammo_groups(
+         %{assigns: %{current_user: current_user, show_used: show_used}} = socket
+       ) do
+    ammo_groups =
+      Ammo.list_ammo_groups(current_user, show_used)
+      |> Repo.preload([:ammo_type, :container], force: true)
+
+    ammo_types_count = Ammo.get_ammo_types_count!(current_user)
+    containers_count = Containers.get_containers_count!(current_user)
+
+    socket
+    |> assign(
+      ammo_groups: ammo_groups,
+      ammo_types_count: ammo_types_count,
+      containers_count: containers_count
+    )
   end
 end

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

@@ -8,132 +8,140 @@
       <%= gettext("No Ammo") %>
       <%= display_emoji("😔") %>
     </h2>
+  <% end %>
 
-    <%= live_patch(dgettext("actions", "Add your first box!"),
+  <%= cond do %>
-      to: Routes.ammo_group_index_path(Endpoint, :new),
+    <% @containers_count == 0 -> %>
-      class: "btn btn-primary"
+      <div class="flex justify-center items-center">
-    ) %>
+        <h2 class="m-2 title text-md text-primary-600">
-  <% else %>
+          <%= dgettext("prompts", "You'll need to") %>
-    <%= live_patch(dgettext("actions", "New Ammo group"),
+        </h2>
-      to: Routes.ammo_group_index_path(Endpoint, :new),
-      class: "btn btn-primary"
-    ) %>
 
-    <div class="w-full overflow-x-auto border border-gray-600 rounded-lg shadow-lg bg-black">
+        <.link navigate={Routes.container_index_path(Endpoint, :new)} class="btn btn-primary">
-      <table class="min-w-full table-auto text-center bg-white">
+          <%= dgettext("actions", "add a container first") %>
-        <thead class="border-b border-primary-600">
+        </.link>
-          <tr>
+      </div>
-            <th class="p-2">
+    <% @ammo_types_count == 0 -> %>
-              <%= gettext("Ammo type") %>
+      <div class="flex justify-center items-center">
-            </th>
+        <h2 class="m-2 title text-md text-primary-600">
-            <th class="p-2">
+          <%= dgettext("prompts", "You'll need to") %>
-              <%= gettext("Count") %>
+        </h2>
-            </th>
-            <th class="p-2">
-              <%= gettext("Price paid") %>
-            </th>
-            <th class="p-2">
-              <%= gettext("% left") %>
-            </th>
-            <th class="p-2">
-              <%= gettext("Range") %>
-            </th>
-            <th class="p-2">
-              <%= gettext("Container") %>
-            </th>
 
-            <th class="p-2"></th>
+        <.link navigate={Routes.ammo_type_index_path(Endpoint, :new)} class="btn btn-primary">
-          </tr>
+          <%= dgettext("actions", "add an ammo type first") %>
-        </thead>
+        </.link>
-        <tbody id="ammo_groups">
+      </div>
-          <%= for ammo_group <- @ammo_groups do %>
+    <% @ammo_groups |> Enum.empty?() -> %>
-            <tr id={"ammo_group-#{ammo_group.id}"}>
+      <.link patch={Routes.ammo_group_index_path(Endpoint, :new)} class="btn btn-primary">
-              <td class="p-2">
+        <%= dgettext("actions", "Add your first box!") %>
-                <%= live_patch(ammo_group.ammo_type.name,
+      </.link>
-                  to: Routes.ammo_type_show_path(Endpoint, :show, ammo_group.ammo_type),
+    <% true -> %>
-                  class: "link"
+      <.link patch={Routes.ammo_group_index_path(Endpoint, :new)} class="btn btn-primary">
-                ) %>
+        <%= dgettext("actions", "Add Ammo") %>
-              </td>
+      </.link>
+  <% end %>
 
-              <td class="p-2">
+  <%= unless @ammo_groups |> Enum.empty?() do %>
-                <%= ammo_group.count %>
+    <div class="flex flex-col space-y-4 justify-center items-center">
-              </td>
+      <.toggle_button action="toggle_show_used" value={@show_used}>
-
+        <span class="title text-lg text-primary-600">
-              <td class="p-2">
+          <%= gettext("Show used") %>
-                <%= if ammo_group.price_paid do %>
+        </span>
-                  <%= gettext("$%{amount}",
+      </.toggle_button>
-                    amount: ammo_group.price_paid |> :erlang.float_to_binary(decimals: 2)
-                  ) %>
-                <% end %>
-              </td>
-
-              <td class="p-2">
-                <%= "#{ammo_group |> Ammo.get_percentage_remaining()}%" %>
-              </td>
-
-              <td class="p-2">
-                <div class="px-4 py-2 space-x-4 flex justify-center items-center">
-                  <button
-                    type="button"
-                    class="btn btn-primary"
-                    phx-click="toggle_staged"
-                    phx-value-ammo_group_id={ammo_group.id}
-                  >
-                    <%= if ammo_group.staged, do: gettext("Unstage"), else: gettext("Stage") %>
-                  </button>
-
-                  <%= live_patch(dgettext("actions", "Record shots"),
-                    to: Routes.ammo_group_index_path(Endpoint, :add_shot_group, ammo_group),
-                    class: "btn btn-primary"
-                  ) %>
-                </div>
-              </td>
-
-              <td class="p-2">
-                <%= if ammo_group.container do %>
-                  <%= live_patch(ammo_group.container.name,
-                    to: Routes.ammo_group_index_path(Endpoint, :move, ammo_group),
-                    class: "btn btn-primary"
-                  ) %>
-                <% end %>
-              </td>
-
-              <td class="p-2">
-                <div class="px-4 py-2 space-x-4 flex justify-center items-center">
-                  <%= live_redirect to: Routes.ammo_group_show_path(Endpoint, :show, ammo_group),
-                                class: "text-primary-600 link",
-                                data: [qa: "view-#{ammo_group.id}"] do %>
-                    <i class="fa-fw fa-lg fas fa-eye"></i>
-                  <% end %>
-
-                  <%= live_patch to: Routes.ammo_group_index_path(Endpoint, :edit, ammo_group),
-                             class: "text-primary-600 link",
-                             data: [qa: "edit-#{ammo_group.id}"] do %>
-                    <i class="fa-fw fa-lg fas fa-edit"></i>
-                  <% end %>
-
-                  <%= link to: "#",
-                       class: "text-primary-600 link",
-                       phx_click: "delete",
-                       phx_value_id: ammo_group.id,
-                       data: [
-                         confirm: dgettext("prompts", "Are you sure you want to delete this ammo?"),
-                         qa: "delete-#{ammo_group.id}"
-                       ] do %>
-                    <i class="fa-fw fa-lg fas fa-trash"></i>
-                  <% end %>
-                </div>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
     </div>
+
+    <.live_component
+      module={CanneryWeb.Components.AmmoGroupTableComponent}
+      id="ammo-group-index-table"
+      ammo_groups={@ammo_groups}
+      current_user={@current_user}
+      show_used={@show_used}
+    >
+      <:ammo_type :let={%{name: ammo_type_name} = ammo_type}>
+        <.link navigate={Routes.ammo_type_show_path(Endpoint, :show, ammo_type)} class="link">
+          <%= ammo_type_name %>
+        </.link>
+      </:ammo_type>
+      <:range :let={ammo_group}>
+        <div class="min-w-20 py-2 px-4 h-full flex flew-wrap justify-center items-center">
+          <button
+            type="button"
+            class="mx-2 my-1 text-sm btn btn-primary"
+            phx-click="toggle_staged"
+            phx-value-ammo_group_id={ammo_group.id}
+          >
+            <%= if ammo_group.staged, do: gettext("Unstage"), else: gettext("Stage") %>
+          </button>
+
+          <.link
+            patch={Routes.ammo_group_index_path(Endpoint, :add_shot_group, ammo_group)}
+            class="mx-2 my-1 text-sm btn btn-primary"
+          >
+            <%= dgettext("actions", "Record shots") %>
+          </.link>
+        </div>
+      </:range>
+      <:container :let={%{container: %{name: container_name} = container} = ammo_group}>
+        <div class="min-w-20 py-2 px-4 h-full flex flew-wrap justify-center items-center">
+          <.link
+            navigate={Routes.container_show_path(Endpoint, :show, container)}
+            class="mx-2 my-1 link"
+          >
+            <%= container_name %>
+          </.link>
+
+          <.link
+            patch={Routes.ammo_group_index_path(Endpoint, :move, ammo_group)}
+            class="mx-2 my-1 text-sm btn btn-primary"
+          >
+            <%= gettext("Move ammo") %>
+          </.link>
+        </div>
+      </:container>
+      <:actions :let={ammo_group}>
+        <div class="py-2 px-4 h-full space-x-4 flex justify-center items-center">
+          <.link
+            navigate={Routes.ammo_group_show_path(Endpoint, :show, ammo_group)}
+            class="text-primary-600 link"
+            data-qa={"view-#{ammo_group.id}"}
+          >
+            <i class="fa-fw fa-lg fas fa-eye"></i>
+          </.link>
+
+          <.link
+            patch={Routes.ammo_group_index_path(Endpoint, :edit, ammo_group)}
+            class="text-primary-600 link"
+            data-qa={"edit-#{ammo_group.id}"}
+          >
+            <i class="fa-fw fa-lg fas fa-edit"></i>
+          </.link>
+
+          <.link
+            patch={Routes.ammo_group_index_path(Endpoint, :clone, ammo_group)}
+            class="text-primary-600 link"
+            data-qa={"clone-#{ammo_group.id}"}
+          >
+            <i class="fa-fw fa-lg fas fa-copy"></i>
+          </.link>
+
+          <.link
+            href="#"
+            class="text-primary-600 link"
+            phx-click="delete"
+            phx-value-id={ammo_group.id}
+            data-confirm={dgettext("prompts", "Are you sure you want to delete this ammo?")}
+            data-qa={"delete-#{ammo_group.id}"}
+          >
+            <i class="fa-fw fa-lg fas fa-trash"></i>
+          </.link>
+        </div>
+      </:actions>
+    </.live_component>
   <% end %>
 </div>
 
 <%= cond do %>
-  <% @live_action in [:new, :edit] -> %>
+  <% @live_action in [:new, :edit, :clone] -> %>
     <.modal return_to={Routes.ammo_group_index_path(Endpoint, :index)}>
       <.live_component
         module={CanneryWeb.AmmoGroupLive.FormComponent}
@@ -170,4 +178,5 @@
       />
     </.modal>
   <% true -> %>
-  <% end %>
+    <%= nil %>
+<% end %>

lib/cannery_web/live/ammo_group_live/show.ex

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

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

@@ -11,12 +11,12 @@
 
     <span class="rounded-lg title text-lg">
       <%= gettext("Original count:") %>
-      <%= @ammo_group.count + Ammo.get_used_count(@ammo_group) %>
+      <%= Ammo.get_original_count(@ammo_group) %>
     </span>
 
     <span class="rounded-lg title text-lg">
       <%= gettext("Percentage left:") %>
-      <%= "#{@ammo_group |> Ammo.get_percentage_remaining()}%" %>
+      <%= gettext("%{percentage}%", percentage: @ammo_group |> Ammo.get_percentage_remaining()) %>
     </span>
 
     <%= if @ammo_group.notes do %>
@@ -26,6 +26,11 @@
       </span>
     <% end %>
 
+    <span class="rounded-lg title text-lg">
+      <%= gettext("Added on:") %>
+      <%= @ammo_group.inserted_at |> display_datetime() %>
+    </span>
+
     <%= if @ammo_group.price_paid do %>
       <span class="rounded-lg title text-lg">
         <%= gettext("Original cost:") %>
@@ -47,46 +52,54 @@
 
   <div class="flex flex-col justify-center items-center">
     <div class="flex flex-wrap justify-center items-center text-primary-600">
-      <%= live_patch(dgettext("actions", "Ammo Details"),
+      <.link
-        to: Routes.ammo_type_show_path(Endpoint, :show, @ammo_group.ammo_type),
+        navigate={Routes.ammo_type_show_path(Endpoint, :show, @ammo_group.ammo_type)}
-        class: "mx-4 my-2 btn btn-primary",
+        class="mx-4 my-2 btn btn-primary"
-        data: [qa: "details"]
+        data-qa="details"
-      ) %>
+      >
+        <%= dgettext("actions", "View in Catalog") %>
+      </.link>
 
-      <%= live_patch to: Routes.ammo_group_show_path(Endpoint, :edit, @ammo_group),
+      <.link
-                 class: "mx-4 my-2 text-primary-600 link",
+        patch={Routes.ammo_group_show_path(Endpoint, :edit, @ammo_group)}
-                 data: [qa: "edit"] do %>
+        class="mx-4 my-2 text-primary-600 link"
+        data-qa="edit"
+      >
         <i class="fa-fw fa-lg fas fa-edit"></i>
-      <% end %>
+      </.link>
 
-      <%= link to: "#",
+      <.link
-           class: "mx-4 my-2 text-primary-600 link",
+        href="#"
-           phx_click: "delete",
+        class="mx-4 my-2 text-primary-600 link"
-           data: [
+        phx-click="delete"
-             confirm: dgettext("prompts", "Are you sure you want to delete this ammo?"),
+        data-confirm={dgettext("prompts", "Are you sure you want to delete this ammo?")}
-             qa: "delete"
+        data-qa="delete"
-           ] do %>
+      >
         <i class="fa-fw fa-lg fas fa-trash"></i>
-      <% end %>
+      </.link>
     </div>
 
     <div class="flex flex-wrap justify-center items-center text-primary-600">
       <button type="button" class="mx-4 my-2 btn btn-primary" phx-click="toggle_staged">
         <%= if @ammo_group.staged,
-          do: gettext("Unstage from range"),
+          do: dgettext("actions", "Unstage from range"),
-          else: gettext("Stage for range") %>
+          else: dgettext("actions", "Stage for range") %>
       </button>
 
-      <%= live_patch(dgettext("actions", "Move containers"),
+      <.link
-        to: Routes.ammo_group_show_path(Endpoint, :move, @ammo_group),
+        patch={Routes.ammo_group_show_path(Endpoint, :move, @ammo_group)}
-        class: "btn btn-primary",
+        class="btn btn-primary"
-        data: [qa: "move"]
+        data-qa="move"
-      ) %>
+      >
+        <%= dgettext("actions", "Move containers") %>
+      </.link>
 
-      <%= live_patch(dgettext("actions", "Record shots"),
+      <.link
-        to: Routes.ammo_group_show_path(Endpoint, :add_shot_group, @ammo_group),
+        patch={Routes.ammo_group_show_path(Endpoint, :add_shot_group, @ammo_group)}
-        class: "mx-4 my-2 btn btn-primary"
+        class="mx-4 my-2 btn btn-primary"
-      ) %>
+      >
+        <%= dgettext("actions", "Record shots") %>
+      </.link>
     </div>
   </div>
 
@@ -100,7 +113,7 @@
 
       <.container_card container={@ammo_group.container} />
     <% else %>
-      <%= gettext("This ammo group is not in a container") %>
+      <%= gettext("This ammo is not in a container") %>
     <% end %>
   </div>
 
@@ -111,38 +124,12 @@
       <%= gettext("Rounds used") %>
     </h1>
 
-    <div class="w-full overflow-x-auto border border-gray-600 rounded-lg shadow-lg bg-black">
+    <.live_component
-      <table class="min-w-full table-auto text-center bg-white">
+      module={CanneryWeb.Components.TableComponent}
-        <thead class="border-b border-primary-600">
+      id="ammo_group_shot_groups_table"
-          <tr>
+      columns={@columns}
-            <th class="p-2">
+      rows={@rows}
-              <%= gettext("Rounds shot") %>
+    />
-            </th>
-            <th class="p-2">
-              <%= gettext("Notes") %>
-            </th>
-            <th class="p-2">
-              <%= gettext("Date") %>
-            </th>
-          </tr>
-        </thead>
-        <tbody id="shot_groups">
-          <%= for shot_group <- @ammo_group.shot_groups do %>
-            <tr id={"shot_group-#{shot_group.id}"}>
-              <td class="p-2">
-                <%= shot_group.count %>
-              </td>
-              <td class="p-2">
-                <%= shot_group.notes %>
-              </td>
-              <td class="p-2">
-                <%= shot_group.date |> display_date() %>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-    </div>
   <% end %>
 </div>
 
@@ -159,6 +146,18 @@
         current_user={@current_user}
       />
     </.modal>
+  <% :edit_shot_group -> %>
+    <.modal return_to={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)}>
+      <.live_component
+        module={CanneryWeb.RangeLive.FormComponent}
+        id={@shot_group.id}
+        title={@page_title}
+        action={@live_action}
+        shot_group={@shot_group}
+        return_to={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)}
+        current_user={@current_user}
+      />
+    </.modal>
   <% :add_shot_group -> %>
     <.modal return_to={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)}>
       <.live_component
@@ -184,4 +183,4 @@
       />
     </.modal>
   <% _show -> %>
-  <% end %>
+<% end %>

lib/cannery_web/live/ammo_type_live/form_component.ex

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

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

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

lib/cannery_web/live/ammo_type_live/index.ex

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

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

@@ -1,93 +1,41 @@
 <div class="flex flex-col space-y-8 justify-center items-center">
   <h1 class="title text-2xl title-primary-500">
-    <%= gettext("Ammo Types") %>
+    <%= gettext("Catalog") %>
   </h1>
 
-  <%= if @ammo_types |> Enum.empty?() do %>
+  <%= if @rows |> Enum.empty?() do %>
     <h2 class="title text-xl text-primary-600">
       <%= gettext("No Ammo Types") %>
       <%= display_emoji("😔") %>
     </h2>
 
-    <%= live_patch(dgettext("actions", "Add your first type!"),
+    <.link patch={Routes.ammo_type_index_path(Endpoint, :new)} class="btn btn-primary">
-      to: Routes.ammo_type_index_path(Endpoint, :new),
+      <%= dgettext("actions", "Add your first type!") %>
-      class: "btn btn-primary"
+    </.link>
-    ) %>
   <% else %>
-    <%= live_patch(dgettext("actions", "New Ammo type"),
+    <.link patch={Routes.ammo_type_index_path(Endpoint, :new)} class="btn btn-primary">
-      to: Routes.ammo_type_index_path(Endpoint, :new),
+      <%= dgettext("actions", "New Ammo type") %>
-      class: "btn btn-primary"
+    </.link>
-    ) %>
 
-    <div class="w-full overflow-x-auto border border-gray-600 rounded-lg shadow-lg bg-black">
+    <div class="flex flex-col justify-center items-center">
-      <table class="min-w-full table-auto text-center bg-white">
+      <.toggle_button action="toggle_show_used" value={@show_used}>
-        <thead class="border-b border-primary-600">
+        <span class="title text-lg text-primary-600">
-          <tr>
+          <%= gettext("Show used") %>
-            <%= for {field_name, _field, _type} <- @columns_to_display do %>
+        </span>
-              <th class="p-2">
+      </.toggle_button>
-                <%= field_name %>
-              </th>
-            <% end %>
-            <th class="p-2">
-              <%= gettext("Total # of rounds") %>
-            </th>
-
-            <th class="p-2"></th>
-          </tr>
-        </thead>
-        <tbody>
-          <%= for ammo_type <- @ammo_types do %>
-            <tr id={"ammo_type-#{ammo_type.id}"}>
-              <%= for {_label, field, type} <- @columns_to_display do %>
-                <td class="p-2">
-                  <%= case type do %>
-                    <% :boolean -> %>
-                      <%= ammo_type |> Map.get(field) |> humanize() %>
-                    <% _other -> %>
-                      <%= ammo_type |> Map.get(field) %>
-                  <% end %>
-                </td>
-              <% end %>
-
-              <td class="p-2">
-                <%= ammo_type |> Ammo.get_round_count_for_ammo_type(@current_user) %>
-              </td>
-
-              <td class="p-2">
-                <div class="px-4 py-2 space-x-4 flex justify-center items-center">
-                  <%= live_redirect to: Routes.ammo_type_show_path(Endpoint, :show, ammo_type),
-                                class: "text-primary-600 link",
-                                data: [qa: "view-#{ammo_type.id}"] do %>
-                    <i class="fa-fw fa-lg fas fa-eye"></i>
-                  <% end %>
-
-                  <%= live_patch to: Routes.ammo_type_index_path(Endpoint, :edit, ammo_type),
-                             class: "text-primary-600 link",
-                             data: [qa: "edit-#{ammo_type.id}"] do %>
-                    <i class="fa-fw fa-lg fas fa-edit"></i>
-                  <% end %>
-
-                  <%= link to: "#",
-                       class: "text-primary-600 link",
-                       phx_click: "delete",
-                       phx_value_id: ammo_type.id,
-                       data: [
-                         confirm: dgettext("prompts", "Are you sure you want to delete this ammo?"),
-                         qa: "delete-#{ammo_type.id}"
-                       ] do %>
-                    <i class="fa-lg fas fa-trash"></i>
-                  <% end %>
-                </div>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
     </div>
+
+    <.live_component
+      module={CanneryWeb.Components.TableComponent}
+      id="ammo_types_index_table"
+      action={@live_action}
+      columns={@columns}
+      rows={@rows}
+    />
   <% end %>
 </div>
 
-<%= if @live_action in [:new, :edit] do %>
+<%= if @live_action in [:new, :edit, :clone] do %>
   <.modal return_to={Routes.ammo_type_index_path(Endpoint, :index)}>
     <.live_component
       module={CanneryWeb.AmmoTypeLive.FormComponent}

lib/cannery_web/live/ammo_type_live/show.ex

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

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

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

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

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

lib/cannery_web/live/container_live/form_component.ex

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

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

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

lib/cannery_web/live/container_live/index.ex

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

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

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

lib/cannery_web/live/container_live/show.ex

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

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

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

lib/cannery_web/live/home_live.ex

@@ -5,16 +5,12 @@ defmodule CanneryWeb.HomeLive do
 
   use CanneryWeb, :live_view
   alias Cannery.Accounts
+  alias CanneryWeb.Endpoint
 
   @impl true
-  def mount(_params, session, socket) do
+  def mount(_params, _session, socket) do
     admins = Accounts.list_users_by_role(:admin)
-
+    socket = socket |> assign(page_title: "Home", query: "", results: %{}, admins: admins)
-    socket =
-      socket
-      |> assign_defaults(session)
-      |> assign(page_title: "Home", query: "", results: %{}, admins: admins)
-
     {:ok, socket}
   end
 
@@ -29,7 +25,7 @@ defmodule CanneryWeb.HomeLive do
       %{^query => vsn} ->
         {:noreply, redirect(socket, external: "https://hexdocs.pm/#{query}/#{vsn}")}
 
-      _ ->
+      _no_query ->
         {:noreply,
          socket
          |> put_flash(:error, "No dependencies found matching \"#{query}\"")
@@ -40,9 +36,14 @@ defmodule CanneryWeb.HomeLive do
   @impl true
   def render(assigns) do
     ~H"""
-    <div
+    <div class="mx-auto px-8 sm:px-16 flex flex-col justify-center items-center text-center space-y-4 max-w-3xl">
-      class="mx-auto px-8 sm:px-16 flex flex-col justify-center items-center text-center space-y-4 max-w-3xl"
+      <img
-    >
+        src={Routes.static_path(Endpoint, "/images/cannery.svg")}
+        alt={gettext("Cannery logo")}
+        class="inline-block w-32 hover:-mt-2 hover:mb-2 transition-all duration-500 ease-in-out"
+        title={gettext("isn't he cute >:3")}
+      />
+
       <h1 class="title text-primary-600 text-2xl">
         <%= gettext("Welcome to %{name}", name: "Cannery") %>
       </h1>
@@ -100,10 +101,12 @@ defmodule CanneryWeb.HomeLive do
           </b>
           <p>
             <%= if @admins |> Enum.empty?() do %>
-              <%= link(dgettext("prompts", "Register to setup %{name}", name: "Cannery"),
+              <.link
-                class: "hover:underline",
+                href={Routes.user_registration_path(CanneryWeb.Endpoint, :new)}
-                to: Routes.user_registration_path(CanneryWeb.Endpoint, :new)
+                class="hover:underline"
-              ) %>
+              >
+                <%= dgettext("prompts", "Register to setup %{name}", name: "Cannery") %>
+              </.link>
             <% else %>
               <div class="flex flex-wrap justify-center space-x-2">
                 <%= for admin <- @admins do %>
@@ -127,11 +130,59 @@ defmodule CanneryWeb.HomeLive do
           </p>
         </li>
 
-        <li class="flex flex-row justify-center space-x-2">
+        <li class="flex flex-row justify-center items-center space-x-2">
           <b>Version:</b>
-          <p>
+          <.link
-            0.2.1
+            href="https://gitea.bubbletea.dev/shibao/cannery/src/branch/stable/CHANGELOG.md"
-          </p>
+            class="flex flex-row justify-center items-center space-x-2 hover:underline"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            <p>0.7.0</p>
+            <i class="fas fa-md fa-info-circle"></i>
+          </.link>
+        </li>
+      </ul>
+
+      <hr class="hr" />
+
+      <ul class="flex flex-col space-y-2 text-center justify-center">
+        <h2 class="title text-primary-600 text-lg">
+          <%= gettext("Get involved!") %>
+        </h2>
+
+        <li class="flex flex-col justify-center space-x-2">
+          <.link
+            class="flex flex-row justify-center items-center space-x-2 hover:underline"
+            href="https://gitea.bubbletea.dev/shibao/cannery"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            <p><%= gettext("View the source code") %></p>
+            <i class="fas fa-md fa-code"></i>
+          </.link>
+        </li>
+        <li class="flex flex-col justify-center space-x-2">
+          <.link
+            class="flex flex-row justify-center items-center space-x-2 hover:underline"
+            href="https://weblate.bubbletea.dev/engage/cannery"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            <p><%= gettext("Help translate") %></p>
+            <i class="fas fa-md fa-language"></i>
+          </.link>
+        </li>
+        <li class="flex flex-col justify-center space-x-2">
+          <.link
+            class="flex flex-row justify-center items-center space-x-2 hover:underline"
+            href="https://gitea.bubbletea.dev/shibao/cannery/issues/new"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            <p><%= gettext("Report bugs or request features") %></p>
+            <i class="fas fa-md fa-spider"></i>
+          </.link>
         </li>
       </ul>
     </div>

lib/cannery_web/live/init_assigns.ex

@@ -0,0 +1,19 @@
+defmodule CanneryWeb.InitAssigns do
+  @moduledoc """
+  Ensures common `assigns` are applied to all LiveViews attaching this hook.
+  """
+  import Phoenix.Component
+  alias Cannery.Accounts
+
+  def on_mount(:default, _params, %{"locale" => locale, "user_token" => user_token}, socket) do
+    Gettext.put_locale(locale)
+
+    socket =
+      socket
+      |> assign_new(:current_user, fn -> Accounts.get_user_by_session_token(user_token) end)
+
+    {:cont, socket}
+  end
+
+  def on_mount(:default, _params, _session, socket), do: {:cont, socket}
+end

lib/cannery_web/live/invite_live/form_component.ex

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

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

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

lib/cannery_web/live/invite_live/index.ex

@@ -10,16 +10,14 @@ defmodule CanneryWeb.InviteLive.Index do
   alias Phoenix.LiveView.JS
 
   @impl true
-  def mount(_params, session, socket) do
+  def mount(_params, _session, %{assigns: %{current_user: current_user}} = socket) do
-    %{assigns: %{current_user: current_user}} = socket = socket |> assign_defaults(session)
-
     socket =
       if current_user |> Map.get(:role) == :admin do
         socket |> display_invites()
       else
         prompt = dgettext("errors", "You are not authorized to view this page")
         return_to = Routes.live_path(Endpoint, HomeLive)
-        socket |> put_flash(:error, prompt) |> push_redirect(to: return_to)
+        socket |> put_flash(:error, prompt) |> push_navigate(to: return_to)
       end
 
     {:ok, socket}
@@ -40,7 +38,7 @@ defmodule CanneryWeb.InviteLive.Index do
   end
 
   defp apply_action(socket, :index, _params) do
-    socket |> assign(page_title: gettext("Listing Invites"), invite: nil)
+    socket |> assign(page_title: gettext("Invites"), invite: nil)
   end
 
   @impl true
@@ -119,7 +117,7 @@ defmodule CanneryWeb.InviteLive.Index do
   end
 
   @impl true
-  def handle_event("copy_to_clipboard", _, socket) do
+  def handle_event("copy_to_clipboard", _params, socket) do
     prompt = dgettext("prompts", "Copied to clipboard")
     {:noreply, socket |> put_flash(:info, prompt)}
   end

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

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

lib/cannery_web/live/live_helpers.ex

@@ -3,20 +3,9 @@ defmodule CanneryWeb.LiveHelpers do
   Contains common helper functions for liveviews
   """
 
-  import Phoenix.LiveView
+  import Phoenix.Component
-  import Phoenix.LiveView.Helpers
-  alias Cannery.Accounts
   alias Phoenix.LiveView.JS
 
-  def assign_defaults(socket, %{"user_token" => user_token} = _session) do
-    socket
-    |> assign_new(:current_user, fn -> Accounts.get_user_by_session_token(user_token) end)
-  end
-
-  def assign_defaults(socket, _session) do
-    socket
-  end
-
   @doc """
   Renders a live component inside a modal.
 
@@ -38,32 +27,44 @@ defmodule CanneryWeb.LiveHelpers do
   """
   def modal(assigns) do
     ~H"""
+    <.link
+      patch={@return_to}
+      id="modal-bg"
+      class="fade-in fixed z-10 left-0 top-0
+         w-full h-full overflow-hidden
+         p-8 flex flex-col justify-center items-center cursor-auto"
+      style="background-color: rgba(0,0,0,0.4);"
+      phx_remove={hide_modal()}
+    >
+      <span class="hidden"></span>
+    </.link>
+
     <div
       id="modal"
-      class="fade-in fixed z-10 left-0 top-0
+      class="fixed z-10 left-0 top-0 pointer-events-none
-      w-full h-full overflow-hidden
+        w-full h-full overflow-hidden
-      p-8 flex flex-col justify-center items-center"
+        p-4 sm:p-8 flex flex-col justify-center items-center"
-      style="opacity: 1 !important; background-color: rgba(0,0,0,0.4);"
-      phx-remove={hide_modal()}
     >
       <div
         id="modal-content"
-        class="fade-in-scale w-full max-w-3xl max-h-128 relative overflow-y-auto
+        class="fade-in-scale w-full max-w-3xl relative
+        pointer-events-auto overflow-hidden
+        px-8 py-4 sm:py-8 flex flex-col justify-center items-center
         flex flex-col justify-start items-center
         bg-white border-2 rounded-lg"
-        phx-click-away={hide_modal()}
-        phx-window-keydown={hide_modal()}
-        phx-key="escape"
       >
-        <%= live_patch to: @return_to,
+        <.link
-                   id: "close",
+          patch={@return_to}
-                   class:
+          id="close"
-                     "absolute top-8 right-10 text-gray-500 hover:text-gray-800 transition-all duration-500 ease-in-out",
+          class="absolute top-8 right-10
-                   phx_click: hide_modal() do %>
+                      text-gray-500 hover:text-gray-800
+                      transition-all duration-500 ease-in-out"
+          phx_remove={hide_modal()}
+        >
           <i class="fa-fw fa-lg fas fa-times"></i>
-        <% end %>
+        </.link>
 
-        <div class="w-full p-8 flex flex-col space-y-4 justify-start items-center">
+        <div class="overflow-x-hidden overflow-y-auto w-full p-8 flex flex-col space-y-4 justify-start items-center">
           <%= render_slot(@inner_block) %>
         </div>
       </div>
@@ -74,6 +75,7 @@ defmodule CanneryWeb.LiveHelpers do
   def hide_modal(js \\ %JS{}) do
     js
     |> JS.hide(to: "#modal", transition: "fade-out")
+    |> JS.hide(to: "#modal-bg", transition: "fade-out")
     |> JS.hide(to: "#modal-content", transition: "fade-out-scale")
   end
 end

lib/cannery_web/live/range_live/form_component.ex

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

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

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

lib/cannery_web/live/range_live/index.ex

@@ -10,9 +10,7 @@ defmodule CanneryWeb.RangeLive.Index do
   alias Phoenix.LiveView.Socket
 
   @impl true
-  def mount(_params, session, socket) do
+  def mount(_params, _session, socket), do: {:ok, socket |> display_shot_groups()}
-    {:ok, socket |> assign_defaults(session) |> display_shot_groups()}
-  end
 
   @impl true
   def handle_params(params, _url, %{assigns: %{live_action: live_action}} = socket) do
@@ -25,7 +23,7 @@ defmodule CanneryWeb.RangeLive.Index do
          %{"id" => id}
        ) do
     socket
-    |> assign(:page_title, gettext("Record shots"))
+    |> assign(:page_title, gettext("Record Shots"))
     |> assign(:ammo_group, Ammo.get_ammo_group!(id, current_user))
   end
 
@@ -67,7 +65,7 @@ defmodule CanneryWeb.RangeLive.Index do
     {:ok, _ammo_group} =
       ammo_group |> Ammo.update_ammo_group(%{"staged" => !ammo_group.staged}, current_user)
 
-    prompt = dgettext("prompts", "Ammo group unstaged succesfully")
+    prompt = dgettext("prompts", "Ammo unstaged succesfully")
     {:noreply, socket |> put_flash(:info, prompt) |> display_shot_groups()}
   end
 
@@ -77,6 +75,100 @@ defmodule CanneryWeb.RangeLive.Index do
       ActivityLog.list_shot_groups(current_user) |> Repo.preload(ammo_group: :ammo_type)
 
     ammo_groups = Ammo.list_staged_ammo_groups(current_user)
-    socket |> assign(shot_groups: shot_groups, ammo_groups: ammo_groups)
+
+    columns = [
+      %{label: gettext("Ammo"), key: :name},
+      %{label: gettext("Rounds shot"), key: :count},
+      %{label: gettext("Notes"), key: :notes},
+      %{label: gettext("Date"), key: :date},
+      %{label: nil, key: :actions, sortable: false}
+    ]
+
+    rows =
+      shot_groups
+      |> Enum.map(fn shot_group -> shot_group |> get_row_data_for_shot_group(columns) end)
+
+    chart_data = shot_groups |> get_chart_data_for_shot_group()
+
+    socket
+    |> assign(
+      ammo_groups: ammo_groups,
+      columns: columns,
+      rows: rows,
+      chart_data: chart_data,
+      shot_groups: shot_groups
+    )
+  end
+
+  @spec get_chart_data_for_shot_group([ShotGroup.t()]) :: [map()]
+  defp get_chart_data_for_shot_group(shot_groups) do
+    shot_groups
+    |> Repo.preload(ammo_group: :ammo_type)
+    |> Enum.group_by(fn %{date: date} -> date end, fn %{count: count} -> count end)
+    |> Enum.map(fn {date, rounds} ->
+      sum = Enum.sum(rounds)
+
+      %{
+        date: date,
+        count: sum,
+        label: gettext("Rounds shot: %{count}", count: sum)
+      }
+    end)
+    |> Enum.sort_by(fn %{date: date} -> date end)
+  end
+
+  @spec get_row_data_for_shot_group(ShotGroup.t(), [map()]) :: map()
+  defp get_row_data_for_shot_group(%{date: date} = shot_group, columns) do
+    shot_group = shot_group |> Repo.preload(ammo_group: :ammo_type)
+    assigns = %{shot_group: shot_group}
+
+    columns
+    |> Map.new(fn %{key: key} ->
+      value =
+        case key do
+          :name ->
+            {shot_group.ammo_group.ammo_type.name,
+             ~H"""
+             <.link
+               navigate={Routes.ammo_group_show_path(Endpoint, :show, @shot_group.ammo_group)}
+               class="link"
+             >
+               <%= @shot_group.ammo_group.ammo_type.name %>
+             </.link>
+             """}
+
+          :date ->
+            date |> display_date()
+
+          :actions ->
+            ~H"""
+            <div class="px-4 py-2 space-x-4 flex justify-center items-center">
+              <.link
+                patch={Routes.range_index_path(Endpoint, :edit, @shot_group)}
+                class="text-primary-600 link"
+                data-qa={"edit-#{@shot_group.id}"}
+              >
+                <i class="fa-fw fa-lg fas fa-edit"></i>
+              </.link>
+
+              <.link
+                href="#"
+                class="text-primary-600 link"
+                phx-click="delete"
+                phx-value-id={@shot_group.id}
+                data-confirm={dgettext("prompts", "Are you sure you want to delete this shot record?")}
+                data-qa={"delete-#{@shot_group.id}"}
+              >
+                <i class="fa-fw fa-lg fas fa-trash"></i>
+              </.link>
+            </div>
+            """
+
+          key ->
+            shot_group |> Map.get(key)
+        end
+
+      {key, value}
+    end)
   end
 end

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

@@ -9,15 +9,13 @@
       <%= display_emoji("😔") %>
     </h1>
 
-    <%= live_patch(dgettext("actions", "Why not get some ready to shoot?"),
+    <.link navigate={Routes.ammo_group_index_path(Endpoint, :index)} class="btn btn-primary">
-      to: Routes.ammo_group_index_path(Endpoint, :index),
+      <%= dgettext("actions", "Why not get some ready to shoot?") %>
-      class: "btn btn-primary"
+    </.link>
-    ) %>
   <% else %>
-    <%= live_patch(dgettext("actions", "Stage ammo"),
+    <.link navigate={Routes.ammo_group_index_path(Endpoint, :index)} class="btn btn-primary">
-      to: Routes.ammo_group_index_path(Endpoint, :index),
+      <%= dgettext("actions", "Stage ammo") %>
-      class: "btn btn-primary"
+    </.link>
-    ) %>
 
     <%= for ammo_group <- @ammo_groups do %>
       <.ammo_group_card ammo_group={ammo_group}>
@@ -29,14 +27,16 @@
           data-confirm={"#{dgettext("prompts", "Are you sure you want to unstage this ammo?")}"}
         >
           <%= if ammo_group.staged,
-            do: gettext("Unstage from range"),
+            do: dgettext("actions", "Unstage from range"),
-            else: gettext("Stage for range") %>
+            else: dgettext("actions", "Stage for range") %>
         </button>
 
-        <%= live_patch(dgettext("actions", "Record shots"),
+        <.link
-          to: Routes.range_index_path(Endpoint, :add_shot_group, ammo_group),
+          patch={Routes.range_index_path(Endpoint, :add_shot_group, ammo_group)}
-          class: "btn btn-primary"
+          class="btn btn-primary"
-        ) %>
+        >
+          <%= dgettext("actions", "Record shots") %>
+        </.link>
       </.ammo_group_card>
     <% end %>
   <% end %>
@@ -53,70 +53,28 @@
       <%= gettext("Shot log") %>
     </h1>
 
-    <div class="w-full overflow-x-auto border border-gray-600 rounded-lg shadow-lg bg-black">
+    <canvas
-      <table class="min-w-full table-auto text-center bg-white">
+      id="shot-log-chart"
-        <thead class="border-b border-primary-600">
+      phx-hook="ShotLogChart"
-          <tr>
+      phx-update="ignore"
-            <th class="p-2">
+      class="max-h-72"
-              <%= gettext("Ammo") %>
+      data-chart-data={Jason.encode!(@chart_data)}
-            </th>
+      data-label={gettext("Rounds shot")}
-            <th class="p-2">
+      data-color={random_color()}
-              <%= gettext("Rounds shot") %>
+      aria-label={gettext("Rounds shot chart")}
-            </th>
+      role="img"
-            <th class="p-2">
+    >
-              <%= gettext("Notes") %>
+      <%= dgettext("errors", "Your browser does not support the canvas element.") %>
-            </th>
+    </canvas>
-            <th class="p-2">
-              <%= gettext("Date") %>
-            </th>
 
-            <th class="p-2"></th>
+    <.live_component
-          </tr>
+      module={CanneryWeb.Components.TableComponent}
-        </thead>
+      id="shot_groups_index_table"
-        <tbody id="shot_groups">
+      columns={@columns}
-          <%= for shot_group <- @shot_groups do %>
+      rows={@rows}
-            <tr id={"shot_group-#{shot_group.id}"}>
+      initial_key={:date}
-              <td class="p-2">
+      initial_sort_mode={:desc}
-                <%= live_patch(shot_group.ammo_group.ammo_type.name,
+    />
-                  to: Routes.ammo_group_show_path(Endpoint, :show, shot_group.ammo_group),
-                  class: "link"
-                ) %>
-              </td>
-              <td class="p-2">
-                <%= shot_group.count %>
-              </td>
-              <td class="p-2">
-                <%= shot_group.notes %>
-              </td>
-              <td class="p-2">
-                <%= shot_group.date |> display_date() %>
-              </td>
-
-              <td class="p-2 w-full h-full space-x-2 flex justify-center items-center">
-                <div class="px-4 py-2 space-x-4 flex justify-center items-center">
-                  <%= live_patch to: Routes.range_index_path(Endpoint, :edit, shot_group),
-                             class: "text-primary-600 link",
-                             data: [qa: "edit-#{shot_group.id}"] do %>
-                    <i class="fa-fw fa-lg fas fa-edit"></i>
-                  <% end %>
-
-                  <%= link to: "#",
-                       class: "text-primary-600 link",
-                       phx_click: "delete",
-                       phx_value_id: shot_group.id,
-                       data: [
-                         confirm: dgettext("prompts", "Are you sure you want to delete this shot record?"),
-                         qa: "delete-#{shot_group.id}"
-                       ] do %>
-                    <i class="fa-fw fa-lg fas fa-trash"></i>
-                  <% end %>
-                </div>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-    </div>
   <% end %>
 </div>
 

lib/cannery_web/live/tag_live/form_component.ex

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

lib/cannery_web/live/tag_live/index.ex

@@ -6,16 +6,14 @@ defmodule CanneryWeb.TagLive.Index do
   use CanneryWeb, :live_view
   import CanneryWeb.Components.TagCard
   alias Cannery.{Tags, Tags.Tag}
-  alias CanneryWeb.Endpoint
+  alias CanneryWeb.{Endpoint, ViewHelpers}
 
   @impl true
-  def mount(_params, session, socket) do
+  def mount(_params, _session, socket), do: {:ok, socket |> display_tags()}
-    {:ok, socket |> assign_defaults(session) |> display_tags()}
-  end
 
   @impl true
   def handle_params(params, _url, %{assigns: %{live_action: live_action}} = socket) do
-    {:noreply, apply_action(socket, live_action, params)}
+    {:noreply, apply_action(socket, live_action, params) |> display_tags}
   end
 
   defp apply_action(%{assigns: %{current_user: current_user}} = socket, :edit, %{"id" => id}) do
@@ -27,11 +25,11 @@ defmodule CanneryWeb.TagLive.Index do
   defp apply_action(socket, :new, _params) do
     socket
     |> assign(:page_title, gettext("New Tag"))
-    |> assign(:tag, %Tag{bg_color: Tags.random_bg_color(), text_color: "#ffffff"})
+    |> assign(:tag, %Tag{bg_color: ViewHelpers.random_color(), text_color: "#ffffff"})
   end
 
   defp apply_action(socket, :index, _params) do
-    socket |> assign(:page_title, gettext("Listing Tags")) |> assign(:tag, nil)
+    socket |> assign(:page_title, gettext("Tags")) |> assign(:tag, nil)
   end
 
   @impl true

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

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

lib/cannery_web/router.ex

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

lib/cannery_web/templates/error/error.html.heex

@@ -8,7 +8,8 @@
       <%= dgettext("errors", "Error") %>| Cannery
     </title>
     <link rel="stylesheet" href="/css/app.css" />
-    <script defer type="text/javascript" src="/js/app.js"></script>
+    <script defer type="text/javascript" src="/js/app.js">
+    </script>
   </head>
   <body class="pb-8 m-0 p-0 w-full h-full">
     <header>
@@ -16,9 +17,7 @@
     </header>
 
     <div class="pb-8 w-full flex flex-col justify-center items-center text-center">
-      <div
+      <div class="p-8 sm:p-16 w-full flex flex-col justify-center items-center space-y-4 max-w-3xl">
-        class="p-8 sm:p-16 w-full flex flex-col justify-center items-center space-y-4 max-w-3xl"
-      >
         <h1 class="title text-primary-600 text-3xl">
           <%= @error_string %>
         </h1>

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

@@ -4,14 +4,10 @@
       <%= @email.subject %>
     </title>
   </head>
-  <body
+  <body style="padding: 2em; color: rgb(31, 31, 31); background-color: rgb(220, 220, 228); font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif; text-align: center;">
-    style="padding: 2em; color: rgb(31, 31, 31); background-color: rgb(220, 220, 228); font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif; text-align: center;"
-  >
     <%= @inner_content %>
 
-    <hr
+    <hr style="margin: 2em auto; border-width: 1px; border-color: rgb(212, 212, 216); width: 100%; max-width: 42rem;" />
-      style="margin: 2em auto; border-width: 1px; border-color: rgb(212, 212, 216); width: 100%; max-width: 42rem;"
-    />
 
     <a style="color: rgb(31, 31, 31);" href={Routes.live_url(Endpoint, HomeLive)}>
       <%= dgettext(

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

@@ -22,14 +22,14 @@
     </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="loading"
-  class="absolute opacity-0 top-0 left-0 w-screen h-screen bg-white z-50
+  class="fixed opacity-0 top-0 left-0 w-screen h-screen bg-white z-50
   flex flex-col justify-center items-center space-y-4
   transition-opacity ease-in-out duration-500"
 >
@@ -37,12 +37,12 @@
     <%= gettext("Loading...") %>
   </h1>
 
-  <i class="fas fa-3x fa-spin fa-cog"></i>
+  <i class="fas fa-3x fa-spin fa-gear"></i>
 </div>
 
 <div
   id="disconnect"
-  class="absolute opacity-0 top-0 left-0 w-screen h-screen bg-white z-50
+  class="fixed opacity-0 top-0 left-0 w-screen h-screen bg-white z-50
   flex flex-col justify-center items-center space-y-4
   transition-opacity ease-in-out duration-500"
 >

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

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

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

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

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

@@ -30,19 +30,26 @@
     <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %>
     <%= error_tag(f, :password, "col-span-3") %>
 
+    <%= label(f, :locale, gettext("Language"), class: "title text-lg text-primary-600") %>
+    <%= select(
+      f,
+      :locale,
+      [{gettext("English"), "en_US"}, {gettext("German"), "de"}, {gettext("French"), "fr"}],
+      class: "input input-primary col-span-2"
+    ) %>
+    <%= error_tag(f, :locale) %>
+
     <%= submit(dgettext("actions", "Register"), class: "mx-auto btn btn-primary col-span-3") %>
   <% end %>
 
   <hr class="hr" />
 
   <div class="flex flex-row justify-center items-center space-x-4">
-    <%= link(dgettext("actions", "Log in"),
+    <.link href={Routes.user_session_path(@conn, :new)} class="btn btn-primary">
-      to: Routes.user_session_path(@conn, :new),
+      <%= dgettext("actions", "Log in") %>
-      class: "btn btn-primary"
+    </.link>
-    ) %>
+    <.link href={Routes.user_reset_password_path(@conn, :new)} class="btn btn-primary">
-    <%= link(dgettext("actions", "Forgot your password?"),
+      <%= dgettext("actions", "Forgot your password?") %>
-      to: Routes.user_reset_password_path(@conn, :new),
+    </.link>
-      class: "btn btn-primary"
-    ) %>
   </div>
 </div>

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

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

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

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

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

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

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

@@ -1,17 +1,16 @@
-<div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
+<div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center text-center space-y-4">
   <h1 class="pb-4 title text-primary-600 text-xl">
     <%= gettext("Settings") %>
   </h1>
 
   <hr class="hr" />
 
-  <%= form_for @email_changeset,
+  <.form
-           Routes.user_settings_path(@conn, :update),
+    :let={f}
-           [
+    for={@email_changeset}
-             class:
+    action={Routes.user_settings_path(@conn, :update)}
-               "flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
+    class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
-           ],
+  >
-           fn f -> %>
     <h3 class="title text-primary-600 text-lg col-span-3">
       <%= dgettext("actions", "Change email") %>
     </h3>
@@ -45,17 +44,16 @@
     <%= submit(dgettext("actions", "Change email"),
       class: "mx-auto btn btn-primary col-span-3"
     ) %>
-  <% end %>
+  </.form>
 
   <hr class="hr" />
 
-  <%= form_for @password_changeset,
+  <.form
-           Routes.user_settings_path(@conn, :update),
+    :let={f}
-           [
+    for={@password_changeset}
-             class:
+    action={Routes.user_settings_path(@conn, :update)}
-               "flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
+    class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
-           ],
+  >
-           fn f -> %>
     <h3 class="title text-primary-600 text-lg col-span-3">
       <%= dgettext("actions", "Change password") %>
     </h3>
@@ -101,14 +99,62 @@
     <%= submit(dgettext("actions", "Change password"),
       class: "mx-auto btn btn-primary col-span-3"
     ) %>
-  <% end %>
+  </.form>
 
   <hr class="hr" />
 
-  <%= link(dgettext("actions", "Delete User"),
+  <.form
-    to: Routes.user_settings_path(@conn, :delete, @current_user),
+    :let={f}
-    method: :delete,
+    for={@locale_changeset}
-    class: "btn btn-alert",
+    action={Routes.user_settings_path(@conn, :update)}
-    data: [confirm: dgettext("prompts", "Are you sure you want to delete your account?")]
+    class="flex flex-col space-y-4 justify-center items-center"
-  ) %>
+  >
+    <h3 class="title text-primary-600 text-lg">
+      <%= dgettext("actions", "Change Language") %>
+    </h3>
+
+    <%= if @locale_changeset.action && not @locale_changeset.valid? do %>
+      <div class="alert alert-danger">
+        <p>
+          <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
+        </p>
+      </div>
+    <% end %>
+
+    <%= hidden_input(f, :action, name: "action", value: "update_locale") %>
+
+    <%= select(
+      f,
+      :locale,
+      [{gettext("English"), "en_US"}, {gettext("German"), "de"}, {gettext("French"), "fr"}],
+      class: "mx-2 my-1 min-w-md input input-primary"
+    ) %>
+    <%= error_tag(f, :locale) %>
+
+    <%= submit(dgettext("actions", "Change language"),
+      class: "whitespace-nowrap mx-auto btn btn-primary",
+      data: [qa: dgettext("prompts", "Are you sure you want to change your language?")]
+    ) %>
+  </.form>
+
+  <hr class="hr" />
+
+  <div class="flex justify-center items-center">
+    <.link
+      href={Routes.export_path(@conn, :export, :json)}
+      class="mx-4 my-2 btn btn-primary"
+      target="_blank"
+    >
+      <%= dgettext("actions", "Export Data as JSON") %>
+    </.link>
+
+    <.link
+      href={Routes.user_settings_path(@conn, :delete, @current_user)}
+      method={:delete}
+      class="mx-4 my-2 btn btn-alert"
+      data-confirm={dgettext("prompts", "Are you sure you want to delete your account?")}
+    >
+      <%= dgettext("actions", "Delete User") %>
+    </.link>
+  </div>
 </div>