bump version

.drone.yml

@@ -13,20 +13,24 @@ steps:
     mount:
       - _build
       - deps
-      - assets/node_modules/
+      - .npm
+      - .mix
 
 - name: test
   image: elixir:1.14.1-alpine
   environment:
     TEST_DATABASE_URL: ecto://postgres:postgres@database/cannery_test
     HOST: testing.example.tld
+    MIX_HOME: /drone/src/.mix
+    MIX_ARCHIVES: /drone/src/.mix/archives
+    MIX_ENV: test
   commands:
-  - apk add --no-cache build-base npm git python3
-  - mix local.rebar --force
-  - mix local.hex --force
+  - apk add --no-cache build-base npm git
+  - mix local.rebar --force --if-missing
+  - mix local.hex --force --if-missing
   - mix deps.get
-  - mix deps.compile
-  - npm --prefix ./assets ci --progress=false --no-audit --loglevel=error
+  - npm set cache .npm
+  - npm --prefix ./assets ci --no-audit --prefer-offline
   - npm run --prefix ./assets deploy
   - mix do phx.digest, gettext.extract
   - mix test.all
@@ -76,7 +80,8 @@ steps:
     mount:
       - _build
       - deps
-      - assets/node_modules/
+      - .npm
+      - .mix
 
 services:
 - name: database

.gitignore

@@ -25,7 +25,7 @@ cannery-*.tar
 # If NPM crashes, it generates a log, let's ignore it too.
 npm-debug.log
 
-# Ignore assets that are produced by build tools.
+# The directory NPM downloads your dependencies sources to.
 /assets/node_modules/
 
 # Since we are building assets from assets/,

.tool-versions

@@ -1,3 +1,3 @@
 elixir 1.14.1-otp-25
 erlang 25.1.2
-nodejs 18.12.1
+nodejs 18.9.1

CHANGELOG.md

@@ -1,3 +1,21 @@
+# v0.8.3
+- Improve some styles
+- Improve server log
+- Various minor improvements
+
+# v0.8.2
+- Fix bug with public registration
+- Improve templates
+- Improve invites, record usage
+- Fix padding on more pages when using chrome
+- Add oban metrics to server log and live dashboard
+
+# v0.8.1
+- Update dependencies
+- Show topbar on form submit/page refresh
+- Make loading/reconnection less intrusive
+- Add QR code for invite link
+
 # v0.8.0
 - Add search to catalog, ammo, container, tag and range index pages
 - Tweak urls for catalog, ammo, containers, tags and shot records

CONTRIBUTING.md

@@ -63,7 +63,8 @@ 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)
+- JS linting with [standard.js](https://standardjs.com), HEEx linting with
+  [heex_formatter](https://github.com/feliperenan/heex_formatter)
 
 ## Docs
 
@@ -109,7 +110,7 @@ In `dev` mode, Cannery will listen for these environment variables at runtime.
 - `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 default locale. Defaults to `en_US`.
-  - Available options: `en_US`, `de`, and `fr`
+  - Available options: `en_US`, `de`, `fr`, and `es`
 
 ## `MIX_ENV=test`
 
@@ -144,3 +145,4 @@ Thank you so much for your contributions!
 - kaia (https://shitposter.club/users/kaia)
 - duponin (https://udongein.xyz/users/duponin)
 - kalli (https://twitter.com/t0kkuro)
+- brea (https://refusal.biz/users/tarperfume)

README.md

@@ -64,7 +64,7 @@ You can use the following environment variables to configure Cannery in
 - `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 default locale. Defaults to `en_US`
-  - Available options: `en_US`, `de`, and `fr`
+  - Available options: `en_US`, `de`, `fr` and `es`
 - `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/app.scss

@@ -25,12 +25,13 @@ $fa-font-path: "@fortawesome/fontawesome-free/webfonts";
   100% { scale: 1.0; opacity: 1; }
 }
 
-.phx-connected > #disconnect, #loading {
+// disconnect toast
+.phx-connected > #disconnect {
   opacity: 0 !important;
   pointer-events: none;
 }
 
-.phx-loading:not(.phx-error) > #loading, .phx-error > #disconnect {
+.phx-error > #disconnect {
   opacity: 0.95 !important;
 }
 

assets/css/components.scss

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

assets/js/app.js

@@ -24,7 +24,7 @@ import 'phoenix_html'
 // Establish Phoenix Socket and LiveView configuration.
 import { Socket } from 'phoenix'
 import { LiveSocket } from 'phoenix_live_view'
-import topbar from '../vendor/topbar'
+import topbar from 'topbar'
 import MaintainAttrs from './maintain_attrs'
 import ShotLogChart from './shot_log_chart'
 import Alpine from 'alpinejs'
@@ -48,6 +48,8 @@ Alpine.start()
 topbar.config({ barColors: { 0: '#29d' }, shadowColor: 'rgba(0, 0, 0, .3)' })
 window.addEventListener('phx:page-loading-start', info => topbar.show())
 window.addEventListener('phx:page-loading-stop', info => topbar.hide())
+window.addEventListener('submit', info => topbar.show())
+window.addEventListener('beforeunload', info => topbar.show())
 
 // connect if there are any LiveViews on the page
 liveSocket.connect()

assets/package-lock.json

@@ -6215,9 +6215,9 @@
       "dev": true
     },
     "node_modules/json5": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true,
       "bin": {
         "json5": "lib/cli.js"
@@ -6333,9 +6333,9 @@
       }
     },
     "node_modules/loader-utils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
-      "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
       "dev": true,
       "dependencies": {
         "big.js": "^5.2.2",
@@ -9639,9 +9639,9 @@
       }
     },
     "node_modules/tsconfig-paths/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
       "dev": true,
       "dependencies": {
         "minimist": "^1.2.0"
@@ -14763,9 +14763,9 @@
       "dev": true
     },
     "json5": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true
     },
     "jsx-ast-utils": {
@@ -14850,9 +14850,9 @@
       "dev": true
     },
     "loader-utils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
-      "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
       "dev": true,
       "requires": {
         "big.js": "^5.2.2",
@@ -17080,9 +17080,9 @@
       },
       "dependencies": {
         "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
           "dev": true,
           "requires": {
             "minimist": "^1.2.0"

assets/package.json

@@ -3,8 +3,8 @@
   "description": " ",
   "license": "MIT",
   "engines": {
-    "node": "18.12.1",
-    "npm": "8.19.2"
+    "node": "v18.9.1",
+    "npm": "8.10.0"
   },
   "scripts": {
     "deploy": "NODE_ENV=production webpack --mode production",

assets/vendor/topbar.js

@@ -1,157 +0,0 @@
-/**
- * @license MIT
- * topbar 1.0.0, 2021-01-06
- * https://buunguyen.github.io/topbar
- * Copyright (c) 2021 Buu Nguyen
- */
-(function (window, document) {
-  "use strict";
-
-  // https://gist.github.com/paulirish/1579671
-  (function () {
-    var lastTime = 0;
-    var vendors = ["ms", "moz", "webkit", "o"];
-    for (var x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) {
-      window.requestAnimationFrame =
-        window[vendors[x] + "RequestAnimationFrame"];
-      window.cancelAnimationFrame =
-        window[vendors[x] + "CancelAnimationFrame"] ||
-        window[vendors[x] + "CancelRequestAnimationFrame"];
-    }
-    if (!window.requestAnimationFrame)
-      window.requestAnimationFrame = function (callback, element) {
-        var currTime = new Date().getTime();
-        var timeToCall = Math.max(0, 16 - (currTime - lastTime));
-        var id = window.setTimeout(function () {
-          callback(currTime + timeToCall);
-        }, timeToCall);
-        lastTime = currTime + timeToCall;
-        return id;
-      };
-    if (!window.cancelAnimationFrame)
-      window.cancelAnimationFrame = function (id) {
-        clearTimeout(id);
-      };
-  })();
-
-  var canvas,
-    progressTimerId,
-    fadeTimerId,
-    currentProgress,
-    showing,
-    addEvent = function (elem, type, handler) {
-      if (elem.addEventListener) elem.addEventListener(type, handler, false);
-      else if (elem.attachEvent) elem.attachEvent("on" + type, handler);
-      else elem["on" + type] = handler;
-    },
-    options = {
-      autoRun: true,
-      barThickness: 3,
-      barColors: {
-        0: "rgba(26,  188, 156, .9)",
-        ".25": "rgba(52,  152, 219, .9)",
-        ".50": "rgba(241, 196, 15,  .9)",
-        ".75": "rgba(230, 126, 34,  .9)",
-        "1.0": "rgba(211, 84,  0,   .9)",
-      },
-      shadowBlur: 10,
-      shadowColor: "rgba(0,   0,   0,   .6)",
-      className: null,
-    },
-    repaint = function () {
-      canvas.width = window.innerWidth;
-      canvas.height = options.barThickness * 5; // need space for shadow
-
-      var ctx = canvas.getContext("2d");
-      ctx.shadowBlur = options.shadowBlur;
-      ctx.shadowColor = options.shadowColor;
-
-      var lineGradient = ctx.createLinearGradient(0, 0, canvas.width, 0);
-      for (var stop in options.barColors)
-        lineGradient.addColorStop(stop, options.barColors[stop]);
-      ctx.lineWidth = options.barThickness;
-      ctx.beginPath();
-      ctx.moveTo(0, options.barThickness / 2);
-      ctx.lineTo(
-        Math.ceil(currentProgress * canvas.width),
-        options.barThickness / 2
-      );
-      ctx.strokeStyle = lineGradient;
-      ctx.stroke();
-    },
-    createCanvas = function () {
-      canvas = document.createElement("canvas");
-      var style = canvas.style;
-      style.position = "fixed";
-      style.top = style.left = style.right = style.margin = style.padding = 0;
-      style.zIndex = 100001;
-      style.display = "none";
-      if (options.className) canvas.classList.add(options.className);
-      document.body.appendChild(canvas);
-      addEvent(window, "resize", repaint);
-    },
-    topbar = {
-      config: function (opts) {
-        for (var key in opts)
-          if (options.hasOwnProperty(key)) options[key] = opts[key];
-      },
-      show: function () {
-        if (showing) return;
-        showing = true;
-        if (fadeTimerId !== null) window.cancelAnimationFrame(fadeTimerId);
-        if (!canvas) createCanvas();
-        canvas.style.opacity = 1;
-        canvas.style.display = "block";
-        topbar.progress(0);
-        if (options.autoRun) {
-          (function loop() {
-            progressTimerId = window.requestAnimationFrame(loop);
-            topbar.progress(
-              "+" + 0.05 * Math.pow(1 - Math.sqrt(currentProgress), 2)
-            );
-          })();
-        }
-      },
-      progress: function (to) {
-        if (typeof to === "undefined") return currentProgress;
-        if (typeof to === "string") {
-          to =
-            (to.indexOf("+") >= 0 || to.indexOf("-") >= 0
-              ? currentProgress
-              : 0) + parseFloat(to);
-        }
-        currentProgress = to > 1 ? 1 : to;
-        repaint();
-        return currentProgress;
-      },
-      hide: function () {
-        if (!showing) return;
-        showing = false;
-        if (progressTimerId != null) {
-          window.cancelAnimationFrame(progressTimerId);
-          progressTimerId = null;
-        }
-        (function loop() {
-          if (topbar.progress("+.1") >= 1) {
-            canvas.style.opacity -= 0.05;
-            if (canvas.style.opacity <= 0.05) {
-              canvas.style.display = "none";
-              fadeTimerId = null;
-              return;
-            }
-          }
-          fadeTimerId = window.requestAnimationFrame(loop);
-        })();
-      },
-    };
-
-  if (typeof module === "object" && typeof module.exports === "object") {
-    module.exports = topbar;
-  } else if (typeof define === "function" && define.amd) {
-    define(function () {
-      return topbar;
-    });
-  } else {
-    this.topbar = topbar;
-  }
-}.call(this, window, document));

config/config.exs

@@ -11,6 +11,8 @@ config :cannery,
   ecto_repos: [Cannery.Repo],
   generators: [binary_id: true]
 
+config :cannery, Cannery.Accounts, registration: System.get_env("REGISTRATION", "invite")
+
 # Configures the endpoint
 config :cannery, CanneryWeb.Endpoint,
   url: [scheme: "https", host: System.get_env("HOST") || "localhost", port: "443"],
@@ -18,8 +20,7 @@ config :cannery, CanneryWeb.Endpoint,
   secret_key_base: "KH59P0iZixX5gP/u+zkxxG8vAAj6vgt0YqnwEB5JP5K+E567SsqkCz69uWShjE7I",
   render_errors: [view: CanneryWeb.ErrorView, accepts: ~w(html json), layout: false],
   pubsub_server: Cannery.PubSub,
-  live_view: [signing_salt: "zOLgd3lr"],
-  registration: System.get_env("REGISTRATION") || "invite"
+  live_view: [signing_salt: "zOLgd3lr"]
 
 config :cannery, Cannery.Application, automigrate: false
 

config/dev.exs

@@ -64,8 +64,9 @@ config :cannery, CanneryWeb.Endpoint,
     ]
   ]
 
-# Do not include metadata nor timestamps in development logs
-config :logger, :console, format: "[$level] $message\n"
+config :logger, :console,
+  format: "[$level] $message $metadata\n\n",
+  metadata: [:data]
 
 # Set a higher stacktrace during development. Avoid configuring such
 # in production as building large stacktraces may be expensive.

config/runtime.exs

@@ -15,17 +15,18 @@ end
 config :cannery, CanneryWeb.ViewHelpers, shibao_mode: System.get_env("SHIBAO_MODE") == "true"
 
 # Set default locale
-config :gettext, :default_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: []
 
 database_url =
   if config_env() == :test do
-    System.get_env("TEST_DATABASE_URL") ||
+    System.get_env(
+      "TEST_DATABASE_URL",
       "ecto://postgres:postgres@localhost/cannery_test#{System.get_env("MIX_TEST_PARTITION")}"
+    )
   else
-    System.get_env("DATABASE_URL") ||
-      "ecto://postgres:postgres@cannery-db/cannery"
+    System.get_env("DATABASE_URL", "ecto://postgres:postgres@cannery-db/cannery")
   end
 
 host =
@@ -40,7 +41,7 @@ interface =
 config :cannery, Cannery.Repo,
   # ssl: true,
   url: database_url,
-  pool_size: String.to_integer(System.get_env("POOL_SIZE") || "10"),
+  pool_size: String.to_integer(System.get_env("POOL_SIZE", "10")),
   socket_options: maybe_ipv6
 
 config :cannery, CanneryWeb.Endpoint,
@@ -49,10 +50,13 @@ config :cannery, CanneryWeb.Endpoint,
     # See the documentation on https://hexdocs.pm/plug_cowboy/Plug.Cowboy.html
     # for details about using IPv6 vs IPv4 and loopback vs public addresses.
     ip: interface,
-    port: String.to_integer(System.get_env("PORT") || "4000")
+    port: String.to_integer(System.get_env("PORT", "4000"))
   ],
-  server: true,
-  registration: System.get_env("REGISTRATION") || "invite"
+  server: true
+
+if config_env() in [:dev, :prod] do
+  config :cannery, Cannery.Accounts, registration: System.get_env("REGISTRATION", "invite")
+end
 
 if config_env() == :prod do
   # The secret key base is used to sign/encrypt cookies and other secrets.
@@ -76,12 +80,12 @@ if config_env() == :prod do
   config :cannery, Cannery.Mailer,
     adapter: Swoosh.Adapters.SMTP,
     relay: System.get_env("SMTP_HOST") || raise("No SMTP_HOST set!"),
-    port: System.get_env("SMTP_PORT") || 587,
+    port: System.get_env("SMTP_PORT", "587"),
     username: System.get_env("SMTP_USERNAME") || raise("No SMTP_USERNAME set!"),
     password: System.get_env("SMTP_PASSWORD") || raise("No SMTP_PASSWORD set!"),
     ssl: System.get_env("SMTP_SSL") == "true",
-    email_from: System.get_env("EMAIL_FROM") || "no-reply@#{System.get_env("HOST")}",
-    email_name: System.get_env("EMAIL_NAME") || "Cannery"
+    email_from: System.get_env("EMAIL_FROM", "no-reply@#{System.get_env("HOST")}"),
+    email_name: System.get_env("EMAIL_NAME", "Cannery")
 
   # ## Using releases
   #

config/test.exs

@@ -22,6 +22,9 @@ config :cannery, CanneryWeb.Endpoint,
 # In test we don't send emails.
 config :cannery, Cannery.Mailer, adapter: Swoosh.Adapters.Test
 
+# Don't require invites for signups
+config :cannery, Cannery.Accounts, registration: "public"
+
 # Print only warnings and errors during test
 config :logger, level: :warn
 

lib/cannery/accounts.ex

@@ -5,7 +5,7 @@ defmodule Cannery.Accounts do
 
   import Ecto.Query, warn: false
   alias Cannery.{Mailer, Repo}
-  alias Cannery.Accounts.{User, UserToken}
+  alias Cannery.Accounts.{Invite, Invites, User, UserToken}
   alias Ecto.{Changeset, Multi}
   alias Oban.Job
 
@@ -24,14 +24,16 @@ defmodule Cannery.Accounts do
 
   """
   @spec get_user_by_email(email :: String.t()) :: User.t() | nil
-  def get_user_by_email(email) when is_binary(email), do: Repo.get_by(User, email: email)
+  def get_user_by_email(email) when is_binary(email) do
+    Repo.get_by(User, email: email)
+  end
 
   @doc """
   Gets a user by email and password.
 
   ## Examples
 
-      iex> get_user_by_email_and_password("foo@example.com", "correct_password")
+      iex> get_user_by_email_and_password("foo@example.com", "valid_password")
       %User{}
 
       iex> get_user_by_email_and_password("foo@example.com", "invalid_password")
@@ -53,28 +55,30 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> get_user!(123)
-      %User{}
+      iex> get_user!(user_id)
+      user
 
-      iex> get_user!(456)
+      iex> get_user!()
       ** (Ecto.NoResultsError)
 
   """
-  @spec get_user!(User.t()) :: User.t()
-  def get_user!(id), do: Repo.get!(User, id)
+  @spec get_user!(User.id()) :: User.t()
+  def get_user!(id) do
+    Repo.get!(User, id)
+  end
 
   @doc """
   Returns all users grouped by role.
 
   ## Examples
 
-      iex> list_users_by_role(%User{id: 123, role: :admin})
-      [admin: [%User{}], user: [%User{}, %User{}]]
+      iex> list_all_users_by_role(user1)
+      %{admin: [%User{role: :admin}], user: [%User{role: :user}]}
 
   """
-  @spec list_all_users_by_role(User.t()) :: %{String.t() => [User.t()]}
+  @spec list_all_users_by_role(User.t()) :: %{User.role() => [User.t()]}
   def list_all_users_by_role(%User{role: :admin}) do
-    Repo.all(from u in User, order_by: u.email) |> Enum.group_by(fn user -> user.role end)
+    Repo.all(from u in User, order_by: u.email) |> Enum.group_by(fn %{role: role} -> role end)
   end
 
   @doc """
@@ -82,13 +86,12 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> list_users_by_role(%User{id: 123, role: :admin})
-      [%User{}]
+      iex> list_users_by_role(:admin)
+      [%User{role: :admin}]
 
   """
-  @spec list_users_by_role(User.role()) :: [User.t()]
-  def list_users_by_role(role) do
-    role = role |> to_string()
+  @spec list_users_by_role(:admin) :: [User.t()]
+  def list_users_by_role(:admin = role) do
     Repo.all(from u in User, where: u.role == ^role, order_by: u.email)
   end
 
@@ -99,26 +102,36 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> register_user(%{field: value})
-      {:ok, %User{}}
+      iex> register_user(%{email: "foo@example.com", password: "valid_password"})
+      {:ok, %User{email: "foo@example.com"}}
 
-      iex> register_user(%{field: bad_value})
+      iex> register_user(%{email: "foo@example"})
       {:error, %Changeset{}}
 
   """
-  @spec register_user(attrs :: map()) :: {:ok, User.t()} | {:error, User.changeset()}
-  def register_user(attrs) do
+  @spec register_user(attrs :: map()) ::
+          {:ok, User.t()} | {:error, :invalid_token | User.changeset()}
+  @spec register_user(attrs :: map(), Invite.token() | nil) ::
+          {:ok, User.t()} | {:error, :invalid_token | User.changeset()}
+  def register_user(attrs, invite_token \\ nil) do
     Multi.new()
     |> Multi.one(:users_count, from(u in User, select: count(u.id), distinct: true))
-    |> Multi.insert(:add_user, fn %{users_count: count} ->
+    |> Multi.run(:use_invite, fn _changes_so_far, _repo ->
+      if allow_registration?() and invite_token |> is_nil() do
+        {:ok, nil}
+      else
+        Invites.use_invite(invite_token)
+      end
+    end)
+    |> Multi.insert(:add_user, fn %{users_count: count, use_invite: invite} ->
       # if no registered users, make first user an admin
-      role = if count == 0, do: "admin", else: "user"
-
-      User.registration_changeset(attrs) |> User.role_changeset(role)
+      role = if count == 0, do: :admin, else: :user
+      User.registration_changeset(attrs, invite) |> User.role_changeset(role)
     end)
     |> Repo.transaction()
     |> case do
       {:ok, %{add_user: user}} -> {:ok, user}
+      {:error, :use_invite, :invalid_token, _changes_so_far} -> {:error, :invalid_token}
       {:error, :add_user, changeset, _changes_so_far} -> {:error, changeset}
     end
   end
@@ -128,14 +141,18 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> change_user_registration(user)
-      %Changeset{data: %User{}}
+      iex> change_user_registration()
+      %Changeset{}
+
+      iex> change_user_registration(%{password: "hi"}
+      %Changeset{}
 
   """
   @spec change_user_registration() :: User.changeset()
   @spec change_user_registration(attrs :: map()) :: User.changeset()
-  def change_user_registration(attrs \\ %{}),
-    do: User.registration_changeset(attrs, hash_password: false)
+  def change_user_registration(attrs \\ %{}) do
+    User.registration_changeset(attrs, nil, hash_password: false)
+  end
 
   ## Settings
 
@@ -144,25 +161,29 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> change_user_email(user)
-      %Changeset{data: %User{}}
+      iex> change_user_email(%User{email: "foo@example.com"})
+      %Changeset{}
 
   """
   @spec change_user_email(User.t()) :: User.changeset()
   @spec change_user_email(User.t(), attrs :: map()) :: User.changeset()
-  def change_user_email(user, attrs \\ %{}), do: User.email_changeset(user, attrs)
+  def change_user_email(user, attrs \\ %{}) do
+    User.email_changeset(user, attrs)
+  end
 
   @doc """
   Returns an `%Changeset{}` for changing the user role.
 
   ## Examples
 
-      iex> change_user_role(user)
-      %Changeset{data: %User{}}
+      iex> change_user_role(%User{}, :user)
+      %Changeset{}
 
   """
   @spec change_user_role(User.t(), User.role()) :: User.changeset()
-  def change_user_role(user, role), do: User.role_changeset(user, role)
+  def change_user_role(user, role) do
+    User.role_changeset(user, role)
+  end
 
   @doc """
   Emulates that the email will change without actually changing
@@ -170,10 +191,10 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> apply_user_email(user, "valid password", %{email: ...})
+      iex> apply_user_email(user, "valid_password", %{email: "new_email@account.com"})
       {:ok, %User{}}
 
-      iex> apply_user_email(user, "invalid password", %{email: ...})
+      iex> apply_user_email(user, "invalid password", %{email: "new_email@account"})
       {:error, %Changeset{}}
 
   """
@@ -219,8 +240,8 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> deliver_update_email_instructions(user, current_email, &Routes.user_update_email_url(conn, :edit, &1))
-      {:ok, %{to: ..., body: ...}}
+      iex> deliver_update_email_instructions(user, "new_foo@example.com", fn _token -> "example url" end)
+      %Oban.Job{args: %{email: :update_email, user_id: ^user_id, attrs: %{url: "example url"}}}
 
   """
   @spec deliver_update_email_instructions(User.t(), current_email :: String.t(), function) ::
@@ -237,23 +258,27 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> change_user_password(user)
-      %Changeset{data: %User{}}
+      iex> change_user_password(%User{})
+      %Changeset{}
 
   """
   @spec change_user_password(User.t(), attrs :: map()) :: User.changeset()
-  def change_user_password(user, attrs \\ %{}),
-    do: User.password_changeset(user, attrs, hash_password: false)
+  def change_user_password(user, attrs \\ %{}) do
+    User.password_changeset(user, attrs, hash_password: false)
+  end
 
   @doc """
   Updates the user password.
 
   ## Examples
 
-      iex> update_user_password(user, "valid password", %{password: ...})
+      iex> reset_user_password(user, %{
+      ...>   password: "new password",
+      ...>   password_confirmation: "new password"
+      ...> })
       {:ok, %User{}}
 
-      iex> update_user_password(user, "invalid password", %{password: ...})
+      iex> update_user_password(user, "invalid password", %{password: "123"})
       {:error, %Changeset{}}
 
   """
@@ -276,49 +301,54 @@ defmodule Cannery.Accounts do
   end
 
   @doc """
-  Returns an `%Changeset{}` for changing the user locale.
+  Returns an `Ecto.Changeset.t()` for changing the user locale.
 
   ## Examples
 
-      iex> change_user_locale(user)
-      %Changeset{data: %User{}}
+      iex> change_user_locale(%User{})
+      %Changeset{}
 
   """
   @spec change_user_locale(User.t()) :: User.changeset()
-  def change_user_locale(%{locale: locale} = user), do: User.locale_changeset(user, locale)
+  def change_user_locale(%{locale: locale} = user) do
+    User.locale_changeset(user, locale)
+  end
 
   @doc """
   Updates the user locale.
 
   ## Examples
 
-      iex> update_user_locale(user, "valid locale")
+      iex> update_user_locale(user, "en_US")
       {:ok, %User{}}
 
-      iex> update_user_password(user, "invalid locale")
-      {:error, %Changeset{}}
-
   """
   @spec update_user_locale(User.t(), locale :: String.t()) ::
           {:ok, User.t()} | {:error, User.changeset()}
-  def update_user_locale(user, locale),
-    do: user |> User.locale_changeset(locale) |> Repo.update()
+  def update_user_locale(user, locale) do
+    user |> User.locale_changeset(locale) |> Repo.update()
+  end
 
   @doc """
   Deletes a user. must be performed by an admin or the same user!
 
   ## Examples
 
-      iex> delete_user!(user_to_delete, %User{id: 123, role: :admin})
+      iex> delete_user!(user, %User{id: 123, role: :admin})
       %User{}
 
-      iex> delete_user!(%User{id: 123}, %User{id: 123})
+      iex> delete_user!(user, user)
       %User{}
 
   """
   @spec delete_user!(user_to_delete :: User.t(), User.t()) :: User.t()
-  def delete_user!(user, %User{role: :admin}), do: user |> Repo.delete!()
-  def delete_user!(%User{id: user_id} = user, %User{id: user_id}), do: user |> Repo.delete!()
+  def delete_user!(user, %User{role: :admin}) do
+    user |> Repo.delete!()
+  end
+
+  def delete_user!(%User{id: user_id} = user, %User{id: user_id}) do
+    user |> Repo.delete!()
+  end
 
   ## Session
 
@@ -346,7 +376,7 @@ defmodule Cannery.Accounts do
   """
   @spec delete_session_token(token :: String.t()) :: :ok
   def delete_session_token(token) do
-    Repo.delete_all(UserToken.token_and_context_query(token, "session"))
+    UserToken.token_and_context_query(token, "session") |> Repo.delete_all()
     :ok
   end
 
@@ -355,19 +385,43 @@ defmodule Cannery.Accounts do
   """
   @spec allow_registration?() :: boolean()
   def allow_registration? do
-    Application.get_env(:cannery, CanneryWeb.Endpoint)[:registration] == "public" or
+    Application.get_env(:cannery, Cannery.Accounts)[:registration] == "public" or
       list_users_by_role(:admin) |> Enum.empty?()
   end
 
   @doc """
   Checks if user is an admin
+
+  ## Examples
+
+      iex> is_admin?(%User{role: :admin})
+      true
+
+      iex> is_admin?(%User{})
+      false
+
   """
   @spec is_admin?(User.t()) :: boolean()
   def is_admin?(%User{id: user_id}) do
-    Repo.one(from u in User, where: u.id == ^user_id and u.role == :admin)
-    |> is_nil()
+    Repo.exists?(from u in User, where: u.id == ^user_id, where: u.role == :admin)
   end
 
+  @doc """
+  Checks to see if user has the admin role
+
+  ## Examples
+
+      iex> is_already_admin?(%User{role: :admin})
+      true
+
+      iex> is_already_admin?(%User{})
+      false
+
+  """
+  @spec is_already_admin?(User.t() | nil) :: boolean()
+  def is_already_admin?(%User{role: :admin}), do: true
+  def is_already_admin?(_invalid_user), do: false
+
   ## Confirmation
 
   @doc """
@@ -375,10 +429,10 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> deliver_user_confirmation_instructions(user, &Routes.user_confirmation_url(conn, :confirm, &1))
-      {:ok, %{to: ..., body: ...}}
+      iex> deliver_user_confirmation_instructions(user, fn _token -> "example url" end)
+      %Oban.Job{args: %{email: :welcome, user_id: ^user_id, attrs: %{url: "example url"}}}
 
-      iex> deliver_user_confirmation_instructions(confirmed_user, &Routes.user_confirmation_url(conn, :confirm, &1))
+      iex> deliver_user_confirmation_instructions(user, fn _token -> "example url" end)
       {:error, :already_confirmed}
 
   """
@@ -425,8 +479,8 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> deliver_user_reset_password_instructions(user, &Routes.user_reset_password_url(conn, :edit, &1))
-      {:ok, %{to: ..., body: ...}}
+      iex> deliver_user_reset_password_instructions(user, fn _token -> "example url" end)
+      %Oban.Job{args: %{email: :reset_password, user_id: ^user_id, attrs: %{url: "example url"}}}
 
   """
   @spec deliver_user_reset_password_instructions(User.t(), function()) :: Job.t()
@@ -442,7 +496,7 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> get_user_by_reset_password_token("validtoken")
+      iex> get_user_by_reset_password_token(encoded_token)
       %User{}
 
       iex> get_user_by_reset_password_token("invalidtoken")
@@ -464,7 +518,10 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> reset_user_password(user, %{password: "new long password", password_confirmation: "new long password"})
+      iex> reset_user_password(user, %{
+      ...>   password: "new password",
+      ...>   password_confirmation: "new password"
+      ...> })
       {:ok, %User{}}
 
       iex> reset_user_password(user, %{password: "valid", password_confirmation: "not the same"})

lib/cannery/accounts/email.ex

@@ -27,21 +27,21 @@ defmodule Cannery.Email do
   @spec generate_email(key :: String.t(), User.t(), attrs :: map()) :: t()
   def generate_email("welcome", user, %{"url" => url}) do
     user
-    |> base_email(dgettext("emails", "Confirm your %{name} account", name: "Cannery"))
+    |> base_email(dgettext("emails", "Confirm your Cannery account"))
     |> render_body("confirm_email.html", %{user: user, url: url})
     |> text_body(EmailView.render("confirm_email.txt", %{user: user, url: url}))
   end
 
   def generate_email("reset_password", user, %{"url" => url}) do
     user
-    |> base_email(dgettext("emails", "Reset your %{name} password", name: "Cannery"))
+    |> base_email(dgettext("emails", "Reset your Cannery password"))
     |> render_body("reset_password.html", %{user: user, url: url})
     |> text_body(EmailView.render("reset_password.txt", %{user: user, url: url}))
   end
 
   def generate_email("update_email", user, %{"url" => url}) do
     user
-    |> base_email(dgettext("emails", "Update your %{name} email", name: "Cannery"))
+    |> base_email(dgettext("emails", "Update your Cannery email"))
     |> render_body("update_email.html", %{user: user, url: url})
     |> text_body(EmailView.render("update_email.txt", %{user: user, url: url}))
   end

lib/cannery/accounts/invite.ex

@@ -1,4 +1,4 @@
-defmodule Cannery.Invites.Invite do
+defmodule Cannery.Accounts.Invite do
   @moduledoc """
   An invite, created by an admin to allow someone to join their instance. An
   invite can be enabled or disabled, and can have an optional number of uses if
@@ -7,8 +7,8 @@ defmodule Cannery.Invites.Invite do
 
   use Ecto.Schema
   import Ecto.Changeset
-  alias Ecto.{Changeset, UUID}
-  alias Cannery.{Accounts.User, Invites.Invite}
+  alias Cannery.Accounts.User
+  alias Ecto.{Association, Changeset, UUID}
 
   @primary_key {:id, :binary_id, autogenerate: true}
   @foreign_key_type :binary_id
@@ -18,33 +18,37 @@ defmodule Cannery.Invites.Invite do
     field :uses_left, :integer, default: nil
     field :disabled_at, :naive_datetime
 
-    belongs_to :user, User
+    belongs_to :created_by, User
+
+    has_many :users, User
 
     timestamps()
   end
 
-  @type t :: %Invite{
+  @type t :: %__MODULE__{
           id: id(),
           name: String.t(),
-          token: String.t(),
+          token: token(),
           uses_left: integer() | nil,
           disabled_at: NaiveDateTime.t(),
-          user: User.t(),
-          user_id: User.id(),
+          created_by: User.t() | nil | Association.NotLoaded.t(),
+          created_by_id: User.id() | nil,
+          users: [User.t()] | Association.NotLoaded.t(),
           inserted_at: NaiveDateTime.t(),
           updated_at: NaiveDateTime.t()
         }
-  @type new_invite :: %Invite{}
+  @type new_invite :: %__MODULE__{}
   @type id :: UUID.t()
   @type changeset :: Changeset.t(t() | new_invite())
+  @type token :: String.t()
 
   @doc false
-  @spec create_changeset(User.t(), token :: binary(), attrs :: map()) :: changeset()
+  @spec create_changeset(User.t(), token(), attrs :: map()) :: changeset()
   def create_changeset(%User{id: user_id}, token, attrs) do
-    %Invite{}
-    |> change(token: token, user_id: user_id)
+    %__MODULE__{}
+    |> change(token: token, created_by_id: user_id)
     |> cast(attrs, [:name, :uses_left, :disabled_at])
-    |> validate_required([:name, :token, :user_id])
+    |> validate_required([:name, :token, :created_by_id])
     |> validate_number(:uses_left, greater_than_or_equal_to: 0)
   end
 

lib/cannery/accounts/invites.ex

@@ -0,0 +1,198 @@
+defmodule Cannery.Accounts.Invites do
+  @moduledoc """
+  The Invites context.
+  """
+
+  import Ecto.Query, warn: false
+  alias Ecto.Multi
+  alias Cannery.Accounts.{Invite, User}
+  alias Cannery.Repo
+
+  @invite_token_length 20
+
+  @doc """
+  Returns the list of invites.
+
+  ## Examples
+
+      iex> list_invites(%User{id: 123, role: :admin})
+      [%Invite{}, ...]
+
+  """
+  @spec list_invites(User.t()) :: [Invite.t()]
+  def list_invites(%User{role: :admin}) do
+    Repo.all(from i in Invite, order_by: i.name)
+  end
+
+  @doc """
+  Gets a single invite for a user
+
+  Raises `Ecto.NoResultsError` if the Invite does not exist.
+
+  ## Examples
+
+      iex> get_invite!(123, %User{id: 123, role: :admin})
+      %Invite{}
+
+      > get_invite!(456, %User{id: 123, role: :admin})
+      ** (Ecto.NoResultsError)
+
+  """
+  @spec get_invite!(Invite.id(), User.t()) :: Invite.t()
+  def get_invite!(id, %User{role: :admin}) do
+    Repo.get!(Invite, id)
+  end
+
+  @doc """
+  Returns if an invite token is still valid
+
+  ## Examples
+
+      iex> valid_invite_token?("valid_token")
+      %Invite{}
+
+      iex> valid_invite_token?("invalid_token")
+      nil
+  """
+  @spec valid_invite_token?(Invite.token() | nil) :: boolean()
+  def valid_invite_token?(token) when token in [nil, ""], do: false
+
+  def valid_invite_token?(token) do
+    Repo.exists?(
+      from i in Invite,
+        where: i.token == ^token,
+        where: i.disabled_at |> is_nil()
+    )
+  end
+
+  @doc """
+  Uses invite by decrementing uses_left, or marks invite invalid if it's been
+  completely used.
+  """
+  @spec use_invite(Invite.token()) :: {:ok, Invite.t()} | {:error, :invalid_token}
+  def use_invite(invite_token) do
+    Multi.new()
+    |> Multi.run(:invite, fn _changes_so_far, _repo ->
+      invite_token |> get_invite_by_token()
+    end)
+    |> Multi.update(:decrement_invite, fn %{invite: invite} ->
+      decrement_invite_changeset(invite)
+    end)
+    |> Repo.transaction()
+    |> case do
+      {:ok, %{decrement_invite: invite}} -> {:ok, invite}
+      {:error, :invite, :invalid_token, _changes_so_far} -> {:error, :invalid_token}
+    end
+  end
+
+  @spec get_invite_by_token(Invite.token() | nil) :: {:ok, Invite.t()} | {:error, :invalid_token}
+  defp get_invite_by_token(token) when token in [nil, ""], do: {:error, :invalid_token}
+
+  defp get_invite_by_token(token) do
+    Repo.one(
+      from i in Invite,
+        where: i.token == ^token,
+        where: i.disabled_at |> is_nil()
+    )
+    |> case do
+      nil -> {:error, :invalid_token}
+      invite -> {:ok, invite}
+    end
+  end
+
+  @spec get_use_count(Invite.t(), User.t()) :: non_neg_integer()
+  def get_use_count(%Invite{id: invite_id}, %User{role: :admin}) do
+    Repo.one(
+      from u in User,
+        where: u.invite_id == ^invite_id,
+        select: count(u.id)
+    )
+  end
+
+  @spec decrement_invite_changeset(Invite.t()) :: Invite.changeset()
+  defp decrement_invite_changeset(%Invite{uses_left: nil} = invite) do
+    invite |> Invite.update_changeset(%{})
+  end
+
+  defp decrement_invite_changeset(%Invite{uses_left: 1} = invite) do
+    now = NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second)
+    invite |> Invite.update_changeset(%{uses_left: 0, disabled_at: now})
+  end
+
+  defp decrement_invite_changeset(%Invite{uses_left: uses_left} = invite) do
+    invite |> Invite.update_changeset(%{uses_left: uses_left - 1})
+  end
+
+  @doc """
+  Creates a invite.
+
+  ## Examples
+
+      iex> create_invite(%User{id: 123, role: :admin}, %{field: value})
+      {:ok, %Invite{}}
+
+      iex> create_invite(%User{id: 123, role: :admin}, %{field: bad_value})
+      {:error, %Changeset{}}
+
+  """
+  @spec create_invite(User.t(), attrs :: map()) ::
+          {:ok, Invite.t()} | {:error, Invite.changeset()}
+  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)
+
+    Invite.create_changeset(user, token, attrs) |> Repo.insert()
+  end
+
+  @doc """
+  Updates a invite.
+
+  ## Examples
+
+      iex> update_invite(invite, %{field: new_value}, %User{id: 123, role: :admin})
+      {:ok, %Invite{}}
+
+      iex> update_invite(invite, %{field: bad_value}, %User{id: 123, role: :admin})
+      {:error, %Changeset{}}
+
+  """
+  @spec update_invite(Invite.t(), attrs :: map(), User.t()) ::
+          {:ok, Invite.t()} | {:error, Invite.changeset()}
+  def update_invite(invite, attrs, %User{role: :admin}) do
+    invite |> Invite.update_changeset(attrs) |> Repo.update()
+  end
+
+  @doc """
+  Deletes a invite.
+
+  ## Examples
+
+      iex> delete_invite(invite, %User{id: 123, role: :admin})
+      {:ok, %Invite{}}
+
+      iex> delete_invite(invite, %User{id: 123, role: :admin})
+      {:error, %Changeset{}}
+
+  """
+  @spec delete_invite(Invite.t(), User.t()) ::
+          {:ok, Invite.t()} | {:error, Invite.changeset()}
+  def delete_invite(invite, %User{role: :admin}) do
+    invite |> Repo.delete()
+  end
+
+  @doc """
+  Deletes a invite.
+
+  ## Examples
+
+      iex> delete_invite(invite, %User{id: 123, role: :admin})
+      %Invite{}
+
+  """
+  @spec delete_invite!(Invite.t(), User.t()) :: Invite.t()
+  def delete_invite!(invite, %User{role: :admin}) do
+    invite |> Repo.delete!()
+  end
+end

lib/cannery/accounts/user.ex

@@ -1,13 +1,13 @@
 defmodule Cannery.Accounts.User do
   @moduledoc """
-  A cannery user
+  A Cannery user
   """
 
   use Ecto.Schema
   import Ecto.Changeset
   import CanneryWeb.Gettext
-  alias Ecto.{Changeset, UUID}
-  alias Cannery.{Accounts.User, Invites.Invite}
+  alias Ecto.{Association, Changeset, UUID}
+  alias Cannery.Accounts.{Invite, User}
 
   @derive {Jason.Encoder,
            only: [
@@ -15,7 +15,9 @@ defmodule Cannery.Accounts.User do
              :email,
              :confirmed_at,
              :role,
-             :locale
+             :locale,
+             :inserted_at,
+             :updated_at
            ]}
   @derive {Inspect, except: [:password]}
   @primary_key {:id, :binary_id, autogenerate: true}
@@ -28,7 +30,9 @@ defmodule Cannery.Accounts.User do
     field :role, Ecto.Enum, values: [:admin, :user], default: :user
     field :locale, :string
 
-    has_many :invites, Invite, on_delete: :delete_all
+    has_many :created_invites, Invite, foreign_key: :created_by_id
+
+    belongs_to :invite, Invite
 
     timestamps()
   end
@@ -41,14 +45,16 @@ defmodule Cannery.Accounts.User do
           confirmed_at: NaiveDateTime.t(),
           role: role(),
           locale: String.t() | nil,
-          invites: [Invite.t()],
+          created_invites: [Invite.t()] | Association.NotLoaded.t(),
+          invite: Invite.t() | nil | Association.NotLoaded.t(),
+          invite_id: Invite.id() | nil,
           inserted_at: NaiveDateTime.t(),
           updated_at: NaiveDateTime.t()
         }
   @type new_user :: %User{}
   @type id :: UUID.t()
   @type changeset :: Changeset.t(t() | new_user())
-  @type role :: :admin | :user | String.t()
+  @type role :: :admin | :user
 
   @doc """
   A user changeset for registration.
@@ -67,11 +73,12 @@ defmodule Cannery.Accounts.User do
       validations on a LiveView form), this option can be set to `false`.
       Defaults to `true`.
   """
-  @spec registration_changeset(attrs :: map()) :: changeset()
-  @spec registration_changeset(attrs :: map(), opts :: keyword()) :: changeset()
-  def registration_changeset(attrs, opts \\ []) do
+  @spec registration_changeset(attrs :: map(), Invite.t() | nil) :: changeset()
+  @spec registration_changeset(attrs :: map(), Invite.t() | nil, opts :: keyword()) :: changeset()
+  def registration_changeset(attrs, invite, opts \\ []) do
     %User{}
     |> cast(attrs, [:email, :password, :locale])
+    |> put_change(:invite_id, if(invite, do: invite.id))
     |> validate_email()
     |> validate_password(opts)
   end
@@ -81,7 +88,7 @@ defmodule Cannery.Accounts.User do
   """
   @spec role_changeset(t() | new_user() | changeset(), role()) :: changeset()
   def role_changeset(user, role) do
-    user |> cast(%{"role" => role}, [:role])
+    user |> change(role: role)
   end
 
   @spec validate_email(changeset()) :: changeset()

lib/cannery/accounts/user_token.ex

@@ -1,12 +1,12 @@
 defmodule Cannery.Accounts.UserToken do
   @moduledoc """
-  Schema for serialized user session and authentication tokens
+  Schema for a user's session token
   """
 
   use Ecto.Schema
   import Ecto.Query
-  alias Ecto.{Query, UUID}
-  alias Cannery.{Accounts.User, Accounts.UserToken}
+  alias Cannery.Accounts.User
+  alias Ecto.{Association, UUID}
 
   @hash_algorithm :sha256
   @rand_size 32
@@ -30,27 +30,27 @@ defmodule Cannery.Accounts.UserToken do
     timestamps(updated_at: false)
   end
 
-  @type t :: %UserToken{
+  @type t :: %__MODULE__{
           id: id(),
-          token: String.t(),
+          token: token(),
           context: String.t(),
           sent_to: String.t(),
-          user: User.t(),
-          user_id: User.id(),
+          user: User.t() | Association.NotLoaded.t(),
+          user_id: User.id() | nil,
           inserted_at: NaiveDateTime.t()
         }
-  @type new_token :: %UserToken{}
+  @type new_user_token :: %__MODULE__{}
   @type id :: UUID.t()
+  @type token :: binary()
 
   @doc """
   Generates a token that will be stored in a signed place,
   such as session or cookie. As they are signed, those
   tokens do not need to be hashed.
   """
-  @spec build_session_token(User.t()) :: {token :: String.t(), new_token()}
-  def build_session_token(%{id: user_id}) do
+  def build_session_token(user) do
     token = :crypto.strong_rand_bytes(@rand_size)
-    {token, %UserToken{token: token, context: "session", user_id: user_id}}
+    {token, %__MODULE__{token: token, context: "session", user_id: user.id}}
   end
 
   @doc """
@@ -58,7 +58,6 @@ defmodule Cannery.Accounts.UserToken do
 
   The query returns the user found by the token.
   """
-  @spec verify_session_token_query(token :: String.t()) :: {:ok, Query.t()}
   def verify_session_token_query(token) do
     query =
       from token in token_and_context_query(token, "session"),
@@ -77,19 +76,16 @@ defmodule Cannery.Accounts.UserToken do
   The token is valid for a week as long as users don't change
   their email.
   """
-  @spec build_email_token(User.t(), context :: String.t()) :: {token :: String.t(), new_token()}
   def build_email_token(user, context) do
     build_hashed_token(user, context, user.email)
   end
 
-  @spec build_hashed_token(User.t(), String.t(), String.t()) ::
-          {String.t(), new_token()}
   defp build_hashed_token(user, context, sent_to) do
     token = :crypto.strong_rand_bytes(@rand_size)
     hashed_token = :crypto.hash(@hash_algorithm, token)
 
     {Base.url_encode64(token, padding: false),
-     %UserToken{
+     %__MODULE__{
        token: hashed_token,
        context: context,
        sent_to: sent_to,
@@ -102,8 +98,6 @@ defmodule Cannery.Accounts.UserToken do
 
   The query returns the user found by the token.
   """
-  @spec verify_email_token_query(token :: String.t(), context :: String.t()) ::
-          {:ok, Query.t()} | :error
   def verify_email_token_query(token, context) do
     case Base.url_decode64(token, padding: false) do
       {:ok, decoded_token} ->
@@ -123,7 +117,6 @@ defmodule Cannery.Accounts.UserToken do
     end
   end
 
-  @spec days_for_context(context :: <<_::56>>) :: non_neg_integer()
   defp days_for_context("confirm"), do: @confirm_validity_in_days
   defp days_for_context("reset_password"), do: @reset_password_validity_in_days
 
@@ -132,8 +125,6 @@ defmodule Cannery.Accounts.UserToken do
 
   The query returns the user token record.
   """
-  @spec verify_change_email_token_query(token :: String.t(), context :: String.t()) ::
-          {:ok, Query.t()} | :error
   def verify_change_email_token_query(token, context) do
     case Base.url_decode64(token, padding: false) do
       {:ok, decoded_token} ->
@@ -153,21 +144,18 @@ defmodule Cannery.Accounts.UserToken do
   @doc """
   Returns the given token with the given context.
   """
-  @spec token_and_context_query(token :: String.t(), context :: String.t()) :: Query.t()
   def token_and_context_query(token, context) do
-    from UserToken, where: [token: ^token, context: ^context]
+    from __MODULE__, where: [token: ^token, context: ^context]
   end
 
   @doc """
   Gets all tokens for the given user for the given contexts.
   """
-  @spec user_and_contexts_query(User.t(), contexts :: :all | nonempty_maybe_improper_list()) ::
-          Query.t()
-  def user_and_contexts_query(%{id: user_id}, :all) do
-    from t in UserToken, where: t.user_id == ^user_id
+  def user_and_contexts_query(user, :all) do
+    from t in __MODULE__, where: t.user_id == ^user.id
   end
 
-  def user_and_contexts_query(%{id: user_id}, [_ | _] = contexts) do
-    from t in UserToken, where: t.user_id == ^user_id and t.context in ^contexts
+  def user_and_contexts_query(user, [_ | _] = contexts) do
+    from t in __MODULE__, where: t.user_id == ^user.id and t.context in ^contexts
   end
 end

lib/cannery/application.ex

@@ -4,6 +4,7 @@ defmodule Cannery.Application do
   @moduledoc false
 
   use Application
+  alias Cannery.Logger
 
   @impl true
   def start(_type, _args) do
@@ -17,16 +18,24 @@ defmodule Cannery.Application do
       # Start the Endpoint (http/https)
       CanneryWeb.Endpoint,
       # Add Oban
-      {Oban, oban_config()}
+      {Oban, oban_config()},
+      Cannery.Repo.Migrator
       # Start a worker by calling: Cannery.Worker.start_link(arg)
       # {Cannery.Worker, arg}
     ]
 
-    # Automatically migrate on start in prod
-    children =
-      if Application.get_env(:cannery, Cannery.Application, automigrate: false)[:automigrate],
-        do: children ++ [Cannery.Repo.Migrator],
-        else: children
+    # Oban events logging https://hexdocs.pm/oban/Oban.html#module-reporting-errors
+    :ok =
+      :telemetry.attach_many(
+        "oban-logger",
+        [
+          [:oban, :job, :exception],
+          [:oban, :job, :start],
+          [:oban, :job, :stop]
+        ],
+        &Logger.handle_event/4,
+        []
+      )
 
     # See https://hexdocs.pm/elixir/Supervisor.html
     # for other strategies and supported options

lib/cannery/invites.ex

@@ -1,155 +0,0 @@
-defmodule Cannery.Invites do
-  @moduledoc """
-  The Invites context.
-  """
-
-  import Ecto.Query, warn: false
-  alias Cannery.{Accounts.User, Invites.Invite, Repo}
-
-  @invite_token_length 20
-
-  @doc """
-  Returns the list of invites.
-
-  ## Examples
-
-      iex> list_invites(%User{id: 123, role: :admin})
-      [%Invite{}, ...]
-
-  """
-  @spec list_invites(User.t()) :: [Invite.t()]
-  def list_invites(%User{role: :admin}) do
-    Repo.all(from i in Invite, order_by: i.name)
-  end
-
-  @doc """
-  Gets a single invite.
-
-  Raises `Ecto.NoResultsError` if the Invite does not exist.
-
-  ## Examples
-
-      iex> get_invite!(123, %User{id: 123, role: :admin})
-      %Invite{}
-
-      iex> get_invite!(456, %User{id: 123, role: :admin})
-      ** (Ecto.NoResultsError)
-
-  """
-  @spec get_invite!(Invite.id(), User.t()) :: Invite.t()
-  def get_invite!(id, %User{role: :admin}) do
-    Repo.get!(Invite, id)
-  end
-
-  @doc """
-  Returns a valid invite or nil based on the attempted token
-
-  ## Examples
-
-      iex> get_invite_by_token("valid_token")
-      %Invite{}
-
-      iex> get_invite_by_token("invalid_token")
-      nil
-  """
-  @spec get_invite_by_token(token :: String.t() | nil) :: Invite.t() | nil
-  def get_invite_by_token(nil), do: nil
-  def get_invite_by_token(""), do: nil
-
-  def get_invite_by_token(token) do
-    Repo.one(
-      from(i in Invite,
-        where: i.token == ^token and i.disabled_at |> is_nil()
-      )
-    )
-  end
-
-  @doc """
-  Uses invite by decrementing uses_left, or marks invite invalid if it's been
-  completely used.
-  """
-  @spec use_invite!(Invite.t()) :: Invite.t()
-  def use_invite!(%Invite{uses_left: nil} = invite), do: invite
-
-  def use_invite!(%Invite{uses_left: uses_left} = invite) do
-    new_uses_left = uses_left - 1
-
-    attrs =
-      if new_uses_left <= 0 do
-        now = NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second)
-        %{"uses_left" => 0, "disabled_at" => now}
-      else
-        %{"uses_left" => new_uses_left}
-      end
-
-    invite |> Invite.update_changeset(attrs) |> Repo.update!()
-  end
-
-  @doc """
-  Creates a invite.
-
-  ## Examples
-
-      iex> create_invite(%User{id: 123, role: :admin}, %{field: value})
-      {:ok, %Invite{}}
-
-      iex> create_invite(%User{id: 123, role: :admin}, %{field: bad_value})
-      {:error, %Changeset{}}
-
-  """
-  @spec create_invite(User.t(), attrs :: map()) ::
-          {:ok, Invite.t()} | {:error, Invite.changeset()}
-  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)
-
-    Invite.create_changeset(user, token, attrs) |> Repo.insert()
-  end
-
-  @doc """
-  Updates a invite.
-
-  ## Examples
-
-      iex> update_invite(invite, %{field: new_value}, %User{id: 123, role: :admin})
-      {:ok, %Invite{}}
-
-      iex> update_invite(invite, %{field: bad_value}, %User{id: 123, role: :admin})
-      {:error, %Changeset{}}
-
-  """
-  @spec update_invite(Invite.t(), attrs :: map(), User.t()) ::
-          {:ok, Invite.t()} | {:error, Invite.changeset()}
-  def update_invite(invite, attrs, %User{role: :admin}),
-    do: invite |> Invite.update_changeset(attrs) |> Repo.update()
-
-  @doc """
-  Deletes a invite.
-
-  ## Examples
-
-      iex> delete_invite(invite, %User{id: 123, role: :admin})
-      {:ok, %Invite{}}
-
-      iex> delete_invite(invite, %User{id: 123, role: :admin})
-      {:error, %Changeset{}}
-
-  """
-  @spec delete_invite(Invite.t(), User.t()) ::
-          {:ok, Invite.t()} | {:error, Invite.changeset()}
-  def delete_invite(invite, %User{role: :admin}), do: invite |> Repo.delete()
-
-  @doc """
-  Deletes a invite.
-
-  ## Examples
-
-      iex> delete_invite(invite, %User{id: 123, role: :admin})
-      %Invite{}
-
-  """
-  @spec delete_invite!(Invite.t(), User.t()) :: Invite.t()
-  def delete_invite!(invite, %User{role: :admin}), do: invite |> Repo.delete!()
-end

lib/cannery/logger.ex

@@ -0,0 +1,63 @@
+defmodule Cannery.Logger do
+  @moduledoc """
+  Custom logger for telemetry events
+
+  Oban implementation taken from
+  https://hexdocs.pm/oban/Oban.html#module-reporting-errors
+  """
+
+  require Logger
+
+  def handle_event([:oban, :job, :exception], measure, %{stacktrace: stacktrace} = meta, _config) do
+    data =
+      get_oban_job_data(meta, measure)
+      |> Map.put(:stacktrace, Exception.format_stacktrace(stacktrace))
+      |> pretty_encode()
+
+    Logger.error(meta.reason, data: data)
+  end
+
+  def handle_event([:oban, :job, :start], measure, meta, _config) do
+    data = get_oban_job_data(meta, measure) |> pretty_encode()
+    Logger.info("Started oban job", data: data)
+  end
+
+  def handle_event([:oban, :job, :stop], measure, meta, _config) do
+    data = get_oban_job_data(meta, measure) |> pretty_encode()
+    Logger.info("Finished oban job", data: data)
+  end
+
+  def handle_event([:oban, :job, unhandled_event], measure, meta, _config) do
+    data =
+      get_oban_job_data(meta, measure)
+      |> Map.put(:event, unhandled_event)
+      |> pretty_encode()
+
+    Logger.warning("Unhandled oban job event", data: data)
+  end
+
+  def handle_event(unhandled_event, measure, meta, config) do
+    data =
+      pretty_encode(%{
+        event: unhandled_event,
+        meta: meta,
+        measurements: measure,
+        config: config
+      })
+
+    Logger.warning("Unhandled telemetry event", data: data)
+  end
+
+  defp get_oban_job_data(%{job: job}, measure) do
+    %{
+      job: job |> Map.take([:id, :args, :meta, :queue, :worker]),
+      measurements: measure
+    }
+  end
+
+  defp pretty_encode(data) do
+    data
+    |> Jason.encode!()
+    |> Jason.Formatter.pretty_print()
+  end
+end

lib/cannery/release.ex

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

lib/cannery/repo/migrator.ex

@@ -1,6 +1,6 @@
 defmodule Cannery.Repo.Migrator do
   @moduledoc """
-  Genserver to automatically run migrations in prod env
+  Genserver to automatically perform all migration on app start
   """
 
   use GenServer
@@ -11,12 +11,15 @@ defmodule Cannery.Repo.Migrator do
   end
 
   def init(_opts) do
-    migrate!()
-    {:ok, nil}
+    {:ok, if(automigrate_enabled?(), do: migrate!())}
   end
 
   def migrate! do
     path = Application.app_dir(:cannery, "priv/repo/migrations")
     Ecto.Migrator.run(Cannery.Repo, path, :up, all: true)
   end
+
+  defp automigrate_enabled? do
+    Application.get_env(:cannery, Cannery.Application, automigrate: false)[:automigrate]
+  end
 end

lib/cannery_web.ex

@@ -72,16 +72,14 @@ defmodule CanneryWeb do
     quote do
       use Phoenix.Router
 
+      import Phoenix.{Controller, LiveView.Router}
       # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
       import Plug.Conn
-      import Phoenix.Controller
-      import Phoenix.LiveView.Router
     end
   end
 
   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
@@ -95,15 +93,10 @@ defmodule CanneryWeb do
       use Phoenix.HTML
 
       # Import LiveView and .heex helpers (live_render, live_patch, <.form>, etc)
-      # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
-      import Phoenix.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}
+      import Phoenix.{Component, View}
+
       alias CanneryWeb.Endpoint
       alias CanneryWeb.Router.Helpers, as: Routes
     end

lib/cannery_web/components/add_shot_group_component.html.heex

@@ -12,11 +12,12 @@
     phx-change="validate"
     phx-submit="save"
   >
-    <%= if @changeset.action && not @changeset.valid? do %>
-      <div class="invalid-feedback col-span-3 text-center">
+    <div
+      :if={@changeset.action && not @changeset.valid?()}
+      class="invalid-feedback col-span-3 text-center"
+    >
       <%= changeset_errors(@changeset) %>
     </div>
-    <% end %>
 
     <%= label(f, :ammo_left, gettext("Rounds left"), class: "title text-lg text-primary-600") %>
     <%= number_input(f, :ammo_left,

lib/cannery_web/components/ammo_group_card.ex

@@ -23,7 +23,8 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
     ~H"""
     <div
       id={"ammo_group-#{@ammo_group.id}"}
-      class="mx-4 my-2 px-8 py-4 flex flex-col justify-center items-center
+      class="mx-4 my-2 px-8 py-4
+        flex flex-col justify-center items-center
         border border-gray-400 rounded-lg shadow-lg hover:shadow-md
         transition-all duration-300 ease-in-out"
     >
@@ -39,31 +40,28 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
           <%= 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">
+        <span
+          :if={@ammo_group |> Ammo.get_original_count() != @ammo_group.count}
+          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">
+        <span :if={@ammo_group.notes} class="rounded-lg title text-lg">
           <%= gettext("Notes:") %>
           <%= @ammo_group.notes %>
         </span>
-        <% end %>
 
         <span class="rounded-lg title text-lg">
           <%= gettext("Purchased on:") %>
-          <%= @ammo_group.purchased_on |> display_date() %>
+          <.date date={@ammo_group.purchased_on} />
         </span>
 
-        <%= if @ammo_group |> Ammo.get_last_used_shot_group() do %>
-          <span class="rounded-lg title text-lg">
+        <span :if={@ammo_group |> Ammo.get_last_used_shot_group()} class="rounded-lg title text-lg">
           <%= gettext("Last used on:") %>
-            <%= @ammo_group |> Ammo.get_last_used_shot_group() |> Map.get(:date) |> display_date() %>
+          <.date date={@ammo_group |> Ammo.get_last_used_shot_group() |> Map.get(:date)} />
         </span>
-        <% end %>
 
         <%= if @ammo_group.price_paid do %>
           <span class="rounded-lg title text-lg">
@@ -81,8 +79,7 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
           </span>
         <% end %>
 
-        <%= if @show_container and @ammo_group.container do %>
-          <span class="rounded-lg title text-lg">
+        <span :if={@show_container and @ammo_group.container} class="rounded-lg title text-lg">
           <%= gettext("Container:") %>
 
           <.link
@@ -92,14 +89,14 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
             <%= @ammo_group.container.name %>
           </.link>
         </span>
-        <% end %>
       </div>
 
-      <%= if assigns |> Map.has_key?(:inner_block) do %>
-        <div class="mt-4 flex space-x-4 justify-center items-center">
+      <div
+        :if={assigns |> Map.has_key?(:inner_block)}
+        class="mt-4 flex space-x-4 justify-center items-center"
+      >
         <%= render_slot(@inner_block) %>
       </div>
-      <% end %>
     </div>
     """
   end

lib/cannery_web/components/ammo_group_table_component.ex

@@ -157,7 +157,7 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do
 
     {purchased_on,
      ~H"""
-     <%= @purchased_on |> display_date() %>
+     <.date date={@purchased_on} />
      """}
   end
 
@@ -173,7 +173,7 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do
     {last_shot_group_date,
      ~H"""
      <%= if @last_shot_group_date do %>
-       <%= @last_shot_group_date |> display_date() %>
+       <.date date={@last_shot_group_date} />
      <% else %>
        <%= gettext("Never used") %>
      <% end %>

lib/cannery_web/components/container_card.ex

@@ -23,7 +23,8 @@ defmodule CanneryWeb.Components.ContainerCard do
     ~H"""
     <div
       id={"container-#{@container.id}"}
-      class="overflow-hidden max-w-full mx-4 mb-4 px-8 py-4 flex flex-col justify-center items-center space-y-4
+      class="overflow-hidden max-w-full mx-4 mb-4 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"
     >
@@ -34,24 +35,20 @@ defmodule CanneryWeb.Components.ContainerCard do
           </h1>
         </.link>
 
-        <%= if @container.desc do %>
-          <span class="rounded-lg title text-lg">
+        <span :if={@container.desc} class="rounded-lg title text-lg">
           <%= gettext("Description:") %>
           <%= @container.desc %>
         </span>
-        <% end %>
 
         <span class="rounded-lg title text-lg">
           <%= gettext("Type:") %>
           <%= @container.type %>
         </span>
 
-        <%= if @container.location do %>
-          <span class="rounded-lg title text-lg">
+        <span :if={@container.location} class="rounded-lg title text-lg">
           <%= gettext("Location:") %>
           <%= @container.location %>
         </span>
-        <% end %>
 
         <%= unless @container.ammo_groups |> Enum.empty?() do %>
           <span class="rounded-lg title text-lg">
@@ -66,21 +63,18 @@ defmodule CanneryWeb.Components.ContainerCard do
         <% end %>
 
         <div class="flex flex-wrap justify-center items-center">
-          <%= unless @container.tags |> Enum.empty?() do %>
-            <%= for tag <- @container.tags do %>
-              <.simple_tag_card tag={tag} />
-            <% end %>
-          <% end %>
+          <.simple_tag_card :for={tag <- @container.tags} :if={@container.tags} tag={tag} />
 
           <%= render_slot(@tag_actions) %>
         </div>
       </div>
 
-      <%= if assigns |> Map.has_key?(:inner_block) do %>
-        <div class="flex space-x-4 justify-center items-center">
+      <div
+        :if={assigns |> Map.has_key?(:inner_block)}
+        class="flex space-x-4 justify-center items-center"
+      >
         <%= render_slot(@inner_block) %>
       </div>
-      <% end %>
     </div>
     """
   end

lib/cannery_web/components/container_table_component.ex

@@ -135,11 +135,7 @@ defmodule CanneryWeb.Components.ContainerTableComponent do
     {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 %>
+       <TagCard.simple_tag_card :for={tag <- @container.tags} :if={@container.tags} tag={tag} />
 
        <%= render_slot(@tag_actions, @container) %>
      </div>

lib/cannery_web/components/invite_card.ex

@@ -4,31 +4,38 @@ defmodule CanneryWeb.Components.InviteCard do
   """
 
   use CanneryWeb, :component
-  alias Cannery.Invites.Invite
+  alias Cannery.Accounts.{Invite, Invites, User}
   alias CanneryWeb.Endpoint
 
   attr :invite, Invite, required: true
+  attr :current_user, User, required: true
   slot(:inner_block)
   slot(:code_actions)
 
-  def invite_card(assigns) do
-    assigns = assigns |> assign_new(:code_actions, fn -> [] end)
+  def invite_card(%{invite: invite, current_user: current_user} = assigns) do
+    assigns =
+      assigns
+      |> assign(:use_count, Invites.get_use_count(invite, current_user))
+      |> assign_new(:code_actions, fn -> [] end)
 
     ~H"""
-    <div
-      id={"invite-#{@invite.id}"}
-      class="mx-4 my-2 px-8 py-4 flex flex-col justify-center items-center space-y-4
+    <div class="mx-4 my-2 px-8 py-4 flex flex-col justify-center items-center space-y-4
       border border-gray-400 rounded-lg shadow-lg hover:shadow-md
-      transition-all duration-300 ease-in-out"
-    >
+      transition-all duration-300 ease-in-out">
       <h1 class="title text-xl">
         <%= @invite.name %>
       </h1>
 
       <%= if @invite.disabled_at |> is_nil() do %>
         <h2 class="title text-md">
-          <%= gettext("Uses Left:") %>
-          <%= @invite.uses_left || "Unlimited" %>
+          <%= if @invite.uses_left do %>
+            <%= gettext(
+              "Uses Left: %{uses_left_count}",
+              uses_left_count: @invite.uses_left
+            ) %>
+          <% else %>
+            <%= gettext("Uses Left: Unlimited") %>
+          <% end %>
         </h2>
       <% else %>
         <h2 class="title text-md">
@@ -36,6 +43,15 @@ defmodule CanneryWeb.Components.InviteCard do
         </h2>
       <% end %>
 
+      <.qr_code
+        content={Routes.user_registration_url(Endpoint, :new, invite: @invite.token)}
+        filename={@invite.name}
+      />
+
+      <h2 :if={@use_count != 0} class="title text-md">
+        <%= gettext("Uses: %{uses_count}", uses_count: @use_count) %>
+      </h2>
+
       <div class="flex flex-row flex-wrap justify-center items-center">
         <code
           id={"code-#{@invite.id}"}
@@ -45,11 +61,9 @@ defmodule CanneryWeb.Components.InviteCard do
         <%= render_slot(@code_actions) %>
       </div>
 
-      <%= if @inner_block do %>
-        <div class="flex space-x-4 justify-center items-center">
+      <div :if={@inner_block} class="flex space-x-4 justify-center items-center">
         <%= render_slot(@inner_block) %>
       </div>
-      <% end %>
     </div>
     """
   end

lib/cannery_web/components/shot_group_table_component.ex

@@ -103,7 +103,11 @@ defmodule CanneryWeb.Components.ShotGroupTableComponent do
     {ammo_type_name, name_block}
   end
 
-  defp get_row_value(:date, %{date: date}, _extra_data), do: date |> display_date()
+  defp get_row_value(:date, %{date: _date} = assigns, _extra_data) do
+    ~H"""
+    <.date date={@date} />
+    """
+  end
 
   defp get_row_value(:actions, shot_group, %{actions: actions}) do
     assigns = %{actions: actions, shot_group: shot_group}

lib/cannery_web/components/table_component.html.heex

@@ -4,7 +4,7 @@
       <tr>
         <%= for %{key: key, label: label} = column <- @columns do %>
           <%= if column |> Map.get(:sortable, true) do %>
-            <th class={"p-2 #{column[:class]}"}>
+            <th class={["p-2", column[:class]]}>
               <span
                 class="cursor-pointer flex justify-center items-center space-x-2"
                 phx-click="sort_by"
@@ -26,7 +26,7 @@
               </span>
             </th>
           <% else %>
-            <th class={"p-2 cursor-not-allowed #{column[:class]}"}>
+            <th class={["p-2 cursor-not-allowed", column[:class]]}>
               <%= label %>
             </th>
           <% end %>
@@ -34,10 +34,11 @@
       </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]}"}>
+      <tr
+        :for={{values, i} <- @rows |> Enum.with_index()}
+        class={if i |> Integer.is_even(), do: @row_class, else: @alternate_row_class}
+      >
+        <td :for={%{key: key} = value <- @columns} class={["p-2", value[:class]]}>
           <%= case values |> Map.get(key) do %>
             <% {_custom_sort_value, value} -> %>
               <%= value %>
@@ -45,9 +46,7 @@
               <%= value %>
           <% end %>
         </td>
-          <% end %>
       </tr>
-      <% end %>
     </tbody>
   </table>
 </div>

lib/cannery_web/components/topbar.ex

@@ -6,7 +6,7 @@ defmodule CanneryWeb.Components.Topbar do
   use CanneryWeb, :component
 
   alias Cannery.Accounts
-  alias CanneryWeb.{Endpoint, HomeLive}
+  alias CanneryWeb.HomeLive
 
   def topbar(assigns) do
     assigns =
@@ -81,8 +81,7 @@ defmodule CanneryWeb.Components.Topbar do
                 <%= gettext("Range") %>
               </.link>
             </li>
-            <%= if @current_user.role == :admin do %>
-              <li class="mx-2 my-1">
+            <li :if={@current_user |> Accounts.is_already_admin?()} class="mx-2 my-1">
               <.link
                 navigate={Routes.invite_index_path(Endpoint, :index)}
                 class="text-primary-600 text-white hover:underline"
@@ -90,10 +89,9 @@ defmodule CanneryWeb.Components.Topbar do
                 <%= gettext("Invites") %>
               </.link>
             </li>
-            <% end %>
             <li class="mx-2 my-1">
               <.link
-                navigate={Routes.user_settings_path(Endpoint, :edit)}
+                href={Routes.user_settings_path(Endpoint, :edit)}
                 class="text-primary-600 text-white hover:underline truncate"
               >
                 <%= @current_user.email %>
@@ -108,31 +106,33 @@ defmodule CanneryWeb.Components.Topbar do
                 <i class="fas fa-sign-out-alt"></i>
               </.link>
             </li>
-            <%= if @current_user.role == :admin and function_exported?(Routes, :live_dashboard_path, 2) do %>
-              <li class="mx-2 my-1">
+            <li
+              :if={
+                @current_user |> Accounts.is_already_admin?() and
+                  function_exported?(Routes, :live_dashboard_path, 2)
+              }
+              class="mx-2 my-1"
+            >
               <.link
                 navigate={Routes.live_dashboard_path(Endpoint, :home)}
-                  class="text-primary-600 text-white hover:underline"
+                class="text-white text-white hover:underline"
               >
                 <i class="fas fa-gauge"></i>
               </.link>
             </li>
-            <% end %>
           <% else %>
-            <%= if Accounts.allow_registration?() do %>
-              <li class="mx-2 my-1">
+            <li :if={Accounts.allow_registration?()} class="mx-2 my-1">
               <.link
-                  navigate={Routes.user_registration_path(Endpoint, :new)}
-                  class="text-primary-600 text-white hover:underline truncate"
+                href={Routes.user_registration_path(Endpoint, :new)}
+                class="text-white hover:underline truncate"
               >
                 <%= dgettext("actions", "Register") %>
               </.link>
             </li>
-            <% end %>
             <li class="mx-2 my-1">
               <.link
-                navigate={Routes.user_session_path(Endpoint, :new)}
-                class="text-primary-600 text-white hover:underline truncate"
+                href={Routes.user_session_path(Endpoint, :new)}
+                class="text-white hover:underline truncate"
               >
                 <%= dgettext("actions", "Log in") %>
               </.link>

lib/cannery_web/components/user_card.ex

@@ -23,24 +23,29 @@ defmodule CanneryWeb.Components.UserCard do
 
       <h3 class="px-4 py-2 rounded-lg title text-lg">
         <p>
-          <%= if @user.confirmed_at |> is_nil() do %>
-            Email unconfirmed
+          <%= if @user.confirmed_at do %>
+            <%= gettext(
+              "User was confirmed at%{confirmed_datetime}",
+              confirmed_datetime: ""
+            ) %>
+            <.datetime datetime={@user.confirmed_at} />
           <% else %>
-            User was confirmed at <%= @user.confirmed_at |> display_datetime() %>
+            <%= gettext("Email unconfirmed") %>
           <% end %>
         </p>
 
         <p>
-          <%= gettext("User registered on") %>
-          <%= @user.inserted_at |> display_datetime() %>
+          <%= gettext(
+            "User registered on%{registered_datetime}",
+            registered_datetime: ""
+          ) %>
+          <.datetime datetime={@user.inserted_at} />
         </p>
       </h3>
 
-      <%= if @inner_block do %>
-        <div class="px-4 py-2 flex space-x-4 justify-center items-center">
+      <div :if={@inner_block} class="px-4 py-2 flex space-x-4 justify-center items-center">
         <%= render_slot(@inner_block) %>
       </div>
-      <% end %>
     </div>
     """
   end

lib/cannery_web/controllers/home_controller.ex

@@ -1,4 +1,8 @@
 defmodule CanneryWeb.HomeController do
+  @moduledoc """
+  Controller for home page
+  """
+
   use CanneryWeb, :controller
 
   def index(conn, _params) do

lib/cannery_web/controllers/user_registration_controller.ex

@@ -1,14 +1,12 @@
 defmodule CanneryWeb.UserRegistrationController do
   use CanneryWeb, :controller
   import CanneryWeb.Gettext
-  alias Cannery.{Accounts, Invites}
+  alias Cannery.{Accounts, Accounts.Invites}
   alias CanneryWeb.{Endpoint, HomeLive}
 
   def new(conn, %{"invite" => invite_token}) do
-    invite = Invites.get_invite_by_token(invite_token)
-
-    if invite do
-      conn |> render_new(invite)
+    if Invites.valid_invite_token?(invite_token) do
+      conn |> render_new(invite_token)
     else
       conn
       |> put_flash(:error, dgettext("errors", "Sorry, this invite was not found or expired"))
@@ -27,19 +25,17 @@ defmodule CanneryWeb.UserRegistrationController do
   end
 
   # renders new user registration page
-  defp render_new(conn, invite \\ nil) do
+  defp render_new(conn, invite_token \\ nil) do
     render(conn, "new.html",
       changeset: Accounts.change_user_registration(),
-      invite: invite,
+      invite_token: invite_token,
       page_title: gettext("Register")
     )
   end
 
   def create(conn, %{"user" => %{"invite_token" => invite_token}} = attrs) do
-    invite = Invites.get_invite_by_token(invite_token)
-
-    if invite do
-      conn |> create_user(attrs, invite)
+    if Invites.valid_invite_token?(invite_token) do
+      conn |> create_user(attrs, invite_token)
     else
       conn
       |> put_flash(:error, dgettext("errors", "Sorry, this invite was not found or expired"))
@@ -57,13 +53,9 @@ defmodule CanneryWeb.UserRegistrationController do
     end
   end
 
-  defp create_user(conn, %{"user" => user_params}, invite \\ nil) do
-    case Accounts.register_user(user_params) do
+  defp create_user(conn, %{"user" => user_params}, invite_token \\ nil) do
+    case Accounts.register_user(user_params, invite_token) do
       {:ok, user} ->
-        unless invite |> is_nil() do
-          invite |> Invites.use_invite!()
-        end
-
         Accounts.deliver_user_confirmation_instructions(
           user,
           &Routes.user_confirmation_url(conn, :confirm, &1)
@@ -73,8 +65,13 @@ defmodule CanneryWeb.UserRegistrationController do
         |> put_flash(:info, dgettext("prompts", "Please check your email to verify your account"))
         |> redirect(to: Routes.user_session_path(Endpoint, :new))
 
+      {:error, :invalid_token} ->
+        conn
+        |> put_flash(:error, dgettext("errors", "Sorry, this invite was not found or expired"))
+        |> redirect(to: Routes.live_path(Endpoint, HomeLive))
+
       {:error, %Ecto.Changeset{} = changeset} ->
-        conn |> render("new.html", changeset: changeset, invite: invite)
+        conn |> render("new.html", changeset: changeset, invite_token: invite_token)
     end
   end
 end

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

@@ -12,11 +12,12 @@
     phx-submit="save"
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
-    <%= if @changeset.action && not @changeset.valid? do %>
-      <div class="invalid-feedback col-span-3 text-center">
+    <div
+      :if={@changeset.action && not @changeset.valid?()}
+      class="invalid-feedback col-span-3 text-center"
+    >
       <%= changeset_errors(@changeset) %>
     </div>
-    <% end %>
 
     <%= 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),
@@ -59,8 +60,8 @@
     ) %>
     <%= error_tag(f, :container_id, "col-span-3 text-center") %>
 
-    <%= cond do %>
-      <% @action in [:new, :clone] -> %>
+    <%= case @action do %>
+      <% action when action in [:new, :clone] -> %>
         <hr class="hr col-span-3" />
 
         <%= label(f, :multiplier, gettext("Copies"), class: "title text-lg text-primary-600") %>
@@ -77,7 +78,7 @@
         ) %>
 
         <%= error_tag(f, :multiplier, "col-span-3 text-center") %>
-      <% @action == :edit -> %>
+      <% :edit -> %>
         <%= submit(dgettext("actions", "Save"),
           phx_disable_with: dgettext("prompts", "Saving..."),
           class: "mx-auto col-span-3 btn btn-primary"

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

@@ -3,12 +3,13 @@
     <%= gettext("Ammo") %>
   </h1>
 
-  <%= if @ammo_groups |> Enum.empty?() and @search |> is_nil() do %>
-    <h2 class="title text-xl text-primary-600">
+  <h2
+    :if={@ammo_groups |> Enum.empty?() and @search |> is_nil()}
+    class="title text-xl text-primary-600"
+  >
     <%= gettext("No Ammo") %>
     <%= display_emoji("😔") %>
   </h2>
-  <% end %>
 
   <%= cond do %>
     <% @containers_count == 0 -> %>

lib/cannery_web/live/ammo_group_live/show.ex

@@ -116,7 +116,12 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
       value =
         case key do
           :date ->
-            {date, date |> display_date()}
+            assigns = %{date: date}
+
+            {date,
+             ~H"""
+             <.date date={@date} />
+             """}
 
           :actions ->
             ~H"""

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

@@ -28,7 +28,7 @@
 
     <span class="rounded-lg title text-lg">
       <%= gettext("Purchased on:") %>
-      <%= @ammo_group.purchased_on |> display_date() %>
+      <.date date={@ammo_group.purchased_on} />
     </span>
 
     <%= if @ammo_group.price_paid do %>

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

@@ -11,11 +11,12 @@
     phx-submit="save"
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
-    <%= if @changeset.action && not @changeset.valid? do %>
-      <div class="invalid-feedback col-span-3 text-center">
+    <div
+      :if={@changeset.action && not @changeset.valid?()}
+      class="invalid-feedback col-span-3 text-center"
+    >
       <%= changeset_errors(@changeset) %>
     </div>
-    <% end %>
 
     <%= 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") %>

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

@@ -104,8 +104,10 @@
   <% end %>
 </div>
 
-<%= if @live_action in [:new, :edit, :clone] do %>
-  <.modal return_to={Routes.ammo_type_index_path(Endpoint, :index)}>
+<.modal
+  :if={@live_action in [:new, :edit, :clone]}
+  return_to={Routes.ammo_type_index_path(Endpoint, :index)}
+>
   <.live_component
     module={CanneryWeb.AmmoTypeLive.FormComponent}
     id={@ammo_type.id || :new}
@@ -116,5 +118,4 @@
     current_user={@current_user}
     }
   />
-  </.modal>
-<% end %>
+</.modal>

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

@@ -3,13 +3,14 @@
     <%= @ammo_type.name %>
   </h1>
 
-  <%= if @ammo_type.desc do %>
-    <span class="max-w-2xl w-full px-8 py-4 rounded-lg
+  <span
+    :if={@ammo_type.desc}
+    class="max-w-2xl w-full px-8 py-4 rounded-lg
     text-center title text-lg
-      border border-primary-600">
+    border border-primary-600"
+  >
     <%= @ammo_type.desc %>
   </span>
-  <% end %>
 
   <div class="flex space-x-4 justify-center items-center text-primary-600">
     <.link
@@ -124,7 +125,7 @@
     </h3>
 
     <span class="text-primary-600">
-      <%= @ammo_type.inserted_at |> display_datetime() %>
+      <.datetime datetime={@ammo_type.inserted_at} />
     </span>
 
     <%= if @avg_cost_per_round do %>
@@ -185,17 +186,21 @@
         </.live_component>
       <% else %>
         <div class="flex flex-wrap justify-center items-stretch">
-          <%= for ammo_group <- @ammo_groups do %>
-            <.ammo_group_card ammo_group={ammo_group} show_container={true} />
-          <% end %>
+          <.ammo_group_card
+            :for={ammo_group <- @ammo_groups}
+            ammo_group={ammo_group}
+            show_container={true}
+          />
         </div>
       <% end %>
     <% end %>
   </div>
 </div>
 
-<%= if @live_action in [:edit] do %>
-  <.modal return_to={Routes.ammo_type_show_path(Endpoint, :show, @ammo_type)}>
+<.modal
+  :if={@live_action == :edit}
+  return_to={Routes.ammo_type_show_path(Endpoint, :show, @ammo_type)}
+>
   <.live_component
     module={CanneryWeb.AmmoTypeLive.FormComponent}
     id={@ammo_type.id}
@@ -205,5 +210,4 @@
     return_to={Routes.ammo_type_show_path(Endpoint, :show, @ammo_type)}
     current_user={@current_user}
   />
-  </.modal>
-<% end %>
+</.modal>

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

@@ -4,8 +4,8 @@
   </h2>
 
   <div class="flex flex-wrap justify-center items-center">
-    <%= for tag <- @container.tags do %>
     <.link
+      :for={tag <- @container.tags}
       href="#"
       class="mx-2 my-1 px-4 py-2 rounded-lg title text-xl"
       style={"color: #{tag.text_color}; background-color: #{tag.bg_color}"}
@@ -24,14 +24,11 @@
       <%= tag.name %>
       <i class="fa-fw fa-sm fas fa-trash"></i>
     </.link>
-    <% end %>
 
-    <%= if @container.tags |> Enum.empty?() do %>
-      <h2 class="title text-xl text-primary-600">
+    <h2 :if={@container.tags |> Enum.empty?()} class="title text-xl text-primary-600">
       <%= gettext("No tags") %>
       <%= display_emoji("😔") %>
     </h2>
-    <% end %>
   </div>
 
   <%= unless tag_options(@tags, @container) |> Enum.empty?() do %>

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

@@ -11,11 +11,12 @@
     phx-change="validate"
     phx-submit="save"
   >
-    <%= if @changeset.action && not @changeset.valid? do %>
-      <div class="invalid-feedback col-span-3 text-center">
+    <div
+      :if={@changeset.action && not @changeset.valid?()}
+      class="invalid-feedback col-span-3 text-center"
+    >
       <%= changeset_errors(@changeset) %>
     </div>
-    <% end %>
 
     <%= label(f, :name, gettext("Name"), class: "title text-lg text-primary-600") %>
     <%= text_input(f, :name,

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

@@ -99,8 +99,7 @@
       </.live_component>
     <% else %>
       <div class="w-full flex flex-row flex-wrap justify-center items-stretch">
-        <%= for container <- @containers do %>
-          <.container_card container={container}>
+        <.container_card :for={container <- @containers} container={container}>
           <:tag_actions>
             <div class="mx-4 my-2">
               <.link
@@ -133,23 +132,22 @@
             phx-click="delete"
             phx-value-id={container.id}
             data-confirm={
-                dgettext("prompts", "Are you sure you want to delete %{name}?",
-                  name: container.name
-                )
+              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 %>
       </div>
     <% end %>
   <% end %>
 </div>
 
-<%= if @live_action in [:new, :edit, :clone] do %>
-  <.modal return_to={Routes.container_index_path(Endpoint, :index)}>
+<.modal
+  :if={@live_action in [:new, :edit, :clone]}
+  return_to={Routes.container_index_path(Endpoint, :index)}
+>
   <.live_component
     module={CanneryWeb.ContainerLive.FormComponent}
     id={@container.id || :new}
@@ -159,11 +157,9 @@
     return_to={Routes.container_index_path(Endpoint, :index)}
     current_user={@current_user}
   />
-  </.modal>
-<% end %>
+</.modal>
 
-<%= if @live_action == :edit_tags do %>
-  <.modal return_to={Routes.container_index_path(Endpoint, :index)}>
+<.modal :if={@live_action == :edit_tags} return_to={Routes.container_index_path(Endpoint, :index)}>
   <.live_component
     module={CanneryWeb.ContainerLive.EditTagsComponent}
     id={@container.id}
@@ -172,5 +168,4 @@
     container={@container}
     current_user={@current_user}
   />
-  </.modal>
-<% end %>
+</.modal>

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

@@ -3,24 +3,20 @@
     <%= @container.name %>
   </h1>
 
-  <%= if @container.desc do %>
-    <span class="rounded-lg title text-lg">
+  <span :if={@container.desc} class="rounded-lg title text-lg">
     <%= gettext("Description:") %>
     <%= @container.desc %>
   </span>
-  <% end %>
 
   <span class="rounded-lg title text-lg">
     <%= gettext("Type:") %>
     <%= @container.type %>
   </span>
 
-  <%= if @container.location do %>
-    <span class="rounded-lg title text-lg">
+  <span :if={@container.location} class="rounded-lg title text-lg">
     <%= gettext("Location:") %>
     <%= @container.location %>
   </span>
-  <% end %>
 
   <%= unless @ammo_groups |> Enum.empty?() do %>
     <span class="rounded-lg title text-lg">
@@ -82,9 +78,7 @@
     </div>
   <% else %>
     <div class="flex flex-wrap justify-center items-center">
-      <%= for tag <- @container.tags do %>
-        <.simple_tag_card tag={tag} />
-      <% end %>
+      <.simple_tag_card :for={tag <- @container.tags} tag={tag} />
 
       <div class="mx-4 my-2">
         <.link
@@ -134,17 +128,17 @@
         </.live_component>
       <% else %>
         <div class="flex flex-wrap justify-center items-stretch">
-          <%= for ammo_group <- @ammo_groups do %>
-            <.ammo_group_card ammo_group={ammo_group} />
-          <% end %>
+          <.ammo_group_card :for={ammo_group <- @ammo_groups} ammo_group={ammo_group} />
         </div>
       <% end %>
     <% end %>
   </div>
 </div>
 
-<%= if @live_action in [:edit] do %>
-  <.modal return_to={Routes.container_show_path(Endpoint, :show, @container)}>
+<.modal
+  :if={@live_action == :edit}
+  return_to={Routes.container_show_path(Endpoint, :show, @container)}
+>
   <.live_component
     module={CanneryWeb.ContainerLive.FormComponent}
     id={@container.id}
@@ -154,11 +148,12 @@
     return_to={Routes.container_show_path(Endpoint, :show, @container)}
     current_user={@current_user}
   />
-  </.modal>
-<% end %>
+</.modal>
 
-<%= if @live_action == :edit_tags do %>
-  <.modal return_to={Routes.container_show_path(Endpoint, :show, @container)}>
+<.modal
+  :if={@live_action == :edit_tags}
+  return_to={Routes.container_show_path(Endpoint, :show, @container)}
+>
   <.live_component
     module={CanneryWeb.ContainerLive.EditTagsComponent}
     id={@container.id}
@@ -168,5 +163,4 @@
     return_to={Routes.container_show_path(Endpoint, :show, @container)}
     current_user={@current_user}
   />
-  </.modal>
-<% end %>
+</.modal>

lib/cannery_web/live/home_live.ex

@@ -15,162 +15,4 @@ defmodule CanneryWeb.HomeLive do
     socket = socket |> assign(page_title: gettext("Home"), admins: admins, version: @version)
     {:ok, socket}
   end
-
-  @impl true
-  def render(assigns) do
-    ~H"""
-    <div class="mx-auto px-8 sm:px-16 flex flex-col justify-center items-center text-center space-y-4 max-w-3xl">
-      <img
-        src={Routes.static_path(Endpoint, "/images/cannery.svg")}
-        alt={gettext("Cannery logo")}
-        class="inline-block w-32 hover:-mt-2 hover:mb-2 transition-all duration-500 ease-in-out"
-        title={gettext("isn't he cute >:3")}
-      />
-
-      <h1 class="title text-primary-600 text-2xl">
-        <%= gettext("Welcome to %{name}", name: "Cannery") %>
-      </h1>
-
-      <h2 class="title text-primary-600 text-lg">
-        <%= gettext("The self-hosted firearm tracker website") %>
-      </h2>
-
-      <hr class="hr" />
-
-      <ul class="flex flex-col space-y-4 text-center">
-        <li class="flex flex-col justify-center items-center
-          space-y-2">
-          <b class="whitespace-nowrap">
-            <%= gettext("Easy to Use:") %>
-          </b>
-          <p>
-            <%= gettext(
-              "%{name} lets you easily keep an eye on your ammo levels before and after range day",
-              name: "Cannery"
-            ) %>
-          </p>
-        </li>
-        <li class="flex flex-col justify-center items-center
-          space-y-2">
-          <b class="whitespace-nowrap">
-            <%= gettext("Secure:") %>
-          </b>
-          <p>
-            <%= gettext("Self-host your own instance, or use an instance from someone you trust.") %>
-            <%= gettext("Your data stays with you, period") %>
-          </p>
-        </li>
-        <li class="flex flex-col justify-center items-center
-          space-y-2">
-          <b class="whitespace-nowrap">
-            <%= gettext("Simple:") %>
-          </b>
-          <p>
-            <%= gettext("Access from any internet-capable device") %>
-          </p>
-        </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("Instance Information") %>
-        </h2>
-
-        <li class="flex flex-col justify-center space-x-2">
-          <b>
-            <%= gettext("Admins:") %>
-          </b>
-          <p>
-            <%= if @admins |> Enum.empty?() do %>
-              <.link
-                href={Routes.user_registration_path(CanneryWeb.Endpoint, :new)}
-                class="hover:underline"
-              >
-                <%= dgettext("prompts", "Register to setup %{name}", name: "Cannery") %>
-              </.link>
-            <% else %>
-              <div class="flex flex-wrap justify-center space-x-2">
-                <%= for admin <- @admins do %>
-                  <a class="hover:underline" href={"mailto:#{admin.email}"}>
-                    <%= admin.email %>
-                  </a>
-                <% end %>
-              </div>
-            <% end %>
-          </p>
-        </li>
-
-        <li class="flex flex-row justify-center space-x-2">
-          <b>Registration:</b>
-          <p>
-            <%= Application.get_env(:cannery, CanneryWeb.Endpoint)[:registration]
-            |> case do
-              "public" -> gettext("Public Signups")
-              _ -> gettext("Invite Only")
-            end %>
-          </p>
-        </li>
-
-        <li class="flex flex-row justify-center items-center space-x-2">
-          <b>Version:</b>
-          <.link
-            href="https://gitea.bubbletea.dev/shibao/cannery/src/branch/stable/CHANGELOG.md"
-            class="flex flex-row justify-center items-center space-x-2 hover:underline"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            <p>
-              <%= @version %>
-            </p>
-            <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>
-    """
-  end
 end

lib/cannery_web/live/home_live.html.heex

@@ -0,0 +1,144 @@
+<div class="mx-auto px-8 sm:px-16 flex flex-col justify-center items-center text-center space-y-4 max-w-3xl">
+  <img
+    src={Routes.static_path(Endpoint, "/images/cannery.svg")}
+    alt={gettext("Cannery logo")}
+    class="inline-block w-32 hover:-mt-2 hover:mb-2 transition-all duration-500 ease-in-out"
+    title={gettext("isn't he cute >:3")}
+  />
+
+  <h1 class="title text-primary-600 text-2xl">
+    <%= gettext("Welcome to Cannery") %>
+  </h1>
+
+  <h2 class="title text-primary-600 text-lg">
+    <%= gettext("The self-hosted firearm tracker website") %>
+  </h2>
+
+  <hr class="hr" />
+
+  <ul class="flex flex-col space-y-4 text-center">
+    <li class="flex flex-col justify-center items-center
+      space-y-2">
+      <b class="whitespace-nowrap">
+        <%= gettext("Easy to Use:") %>
+      </b>
+      <p>
+        <%= gettext(
+          "Cannery lets you easily keep an eye on your ammo levels before and after range day"
+        ) %>
+      </p>
+    </li>
+    <li class="flex flex-col justify-center items-center space-y-2">
+      <b class="whitespace-nowrap">
+        <%= gettext("Secure:") %>
+      </b>
+      <p>
+        <%= gettext("Self-host your own instance, or use an instance from someone you trust.") %>
+        <%= gettext("Your data stays with you, period") %>
+      </p>
+    </li>
+    <li class="flex flex-col justify-center items-center
+      space-y-2">
+      <b class="whitespace-nowrap">
+        <%= gettext("Simple:") %>
+      </b>
+      <p>
+        <%= gettext("Access from any internet-capable device") %>
+      </p>
+    </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("Instance Information") %>
+    </h2>
+
+    <li class="flex flex-col justify-center space-x-2">
+      <b>
+        <%= gettext("Admins:") %>
+      </b>
+      <p>
+        <%= if @admins |> Enum.empty?() do %>
+          <.link href={Routes.user_registration_path(Endpoint, :new)} class="hover:underline">
+            <%= dgettext("prompts", "Register to setup Cannery") %>
+          </.link>
+        <% else %>
+          <div class="flex flex-wrap justify-center space-x-2">
+            <a :for={%{email: email} <- @admins} class="hover:underline" href={"mailto:#{email}"}>
+              <%= email %>
+            </a>
+          </div>
+        <% end %>
+      </p>
+    </li>
+
+    <li class="flex flex-row justify-center space-x-2">
+      <b><%= gettext("Registration:") %></b>
+      <p>
+        <%= case Application.get_env(:cannery, Cannery.Accounts)[:registration] do
+          "public" -> gettext("Public Signups")
+          _ -> gettext("Invite Only")
+        end %>
+      </p>
+    </li>
+
+    <li class="flex flex-row justify-center items-center space-x-2">
+      <b><%= gettext("Version:") %></b>
+      <.link
+        href="https://gitea.bubbletea.dev/shibao/cannery/src/branch/stable/CHANGELOG.md"
+        class="flex flex-row justify-center items-center space-x-2 hover:underline"
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        <p>
+          <%= @version %>
+        </p>
+        <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/invite_live/form_component.ex

@@ -1,11 +1,11 @@
 defmodule CanneryWeb.InviteLive.FormComponent do
   @moduledoc """
-  Livecomponent that can update or create an Cannery.Invites.Invite
+  Livecomponent that can update or create an Cannery.Accounts.Invite
   """
 
   use CanneryWeb, :live_component
-  alias Cannery.{Accounts.User, Invites, Invites.Invite}
   alias Ecto.Changeset
+  alias Cannery.Accounts.{Invite, Invites, User}
   alias Phoenix.LiveView.Socket
 
   @impl true

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

@@ -11,11 +11,12 @@
     phx-change="validate"
     phx-submit="save"
   >
-    <%= if @changeset.action && not @changeset.valid? do %>
-      <div class="invalid-feedback col-span-3 text-center">
+    <div
+      :if={@changeset.action && not @changeset.valid?()}
+      class="invalid-feedback col-span-3 text-center"
+    >
       <%= changeset_errors(@changeset) %>
     </div>
-    <% end %>
 
     <%= label(f, :name, gettext("Name"), class: "title text-lg text-primary-600") %>
     <%= text_input(f, :name, class: "input input-primary col-span-2") %>
@@ -25,7 +26,7 @@
     <%= 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") %>
+      <%= gettext(~s/Leave "Uses left" blank to make invite unlimited/) %>
     </span>
 
     <%= submit(dgettext("actions", "Save"),

lib/cannery_web/live/invite_live/index.ex

@@ -1,12 +1,13 @@
 defmodule CanneryWeb.InviteLive.Index do
   @moduledoc """
-  Liveview to show a Cannery.Invites.Invite index
+  Liveview to show a Cannery.Accounts.Invite index
   """
 
   use CanneryWeb, :live_view
   import CanneryWeb.Components.{InviteCard, UserCard}
-  alias Cannery.{Accounts, Invites, Invites.Invite}
-  alias CanneryWeb.{Endpoint, HomeLive}
+  alias Cannery.Accounts
+  alias Cannery.Accounts.{Invite, Invites}
+  alias CanneryWeb.HomeLive
   alias Phoenix.LiveView.JS
 
   @impl true
@@ -17,7 +18,7 @@ defmodule CanneryWeb.InviteLive.Index do
       else
         prompt = dgettext("errors", "You are not authorized to view this page")
         return_to = Routes.live_path(Endpoint, HomeLive)
-        socket |> put_flash(:error, prompt) |> push_navigate(to: return_to)
+        socket |> put_flash(:error, prompt) |> push_redirect(to: return_to)
       end
 
     {:ok, socket}
@@ -50,7 +51,7 @@ defmodule CanneryWeb.InviteLive.Index do
     %{name: invite_name} =
       id |> Invites.get_invite!(current_user) |> Invites.delete_invite!(current_user)
 
-    prompt = dgettext("prompts", "%{name} deleted succesfully", name: invite_name)
+    prompt = dgettext("prompts", "%{invite_name} deleted succesfully", invite_name: invite_name)
     {:noreply, socket |> put_flash(:info, prompt) |> display_invites()}
   end
 
@@ -61,10 +62,12 @@ defmodule CanneryWeb.InviteLive.Index do
       ) do
     socket =
       Invites.get_invite!(id, current_user)
-      |> Invites.update_invite(%{"uses_left" => nil}, current_user)
+      |> Invites.update_invite(%{uses_left: nil}, current_user)
       |> case do
         {:ok, %{name: invite_name}} ->
-          prompt = dgettext("prompts", "%{name} updated succesfully", name: invite_name)
+          prompt =
+            dgettext("prompts", "%{invite_name} updated succesfully", invite_name: invite_name)
+
           socket |> put_flash(:info, prompt) |> display_invites()
 
         {:error, changeset} ->
@@ -81,10 +84,12 @@ defmodule CanneryWeb.InviteLive.Index do
       ) do
     socket =
       Invites.get_invite!(id, current_user)
-      |> Invites.update_invite(%{"uses_left" => nil, "disabled_at" => nil}, current_user)
+      |> Invites.update_invite(%{uses_left: nil, disabled_at: nil}, current_user)
       |> case do
         {:ok, %{name: invite_name}} ->
-          prompt = dgettext("prompts", "%{name} enabled succesfully", name: invite_name)
+          prompt =
+            dgettext("prompts", "%{invite_name} enabled succesfully", invite_name: invite_name)
+
           socket |> put_flash(:info, prompt) |> display_invites()
 
         {:error, changeset} ->
@@ -103,10 +108,12 @@ defmodule CanneryWeb.InviteLive.Index do
 
     socket =
       Invites.get_invite!(id, current_user)
-      |> Invites.update_invite(%{"uses_left" => 0, "disabled_at" => now}, current_user)
+      |> Invites.update_invite(%{uses_left: 0, disabled_at: now}, current_user)
       |> case do
         {:ok, %{name: invite_name}} ->
-          prompt = dgettext("prompts", "%{name} disabled succesfully", name: invite_name)
+          prompt =
+            dgettext("prompts", "%{invite_name} disabled succesfully", invite_name: invite_name)
+
           socket |> put_flash(:info, prompt) |> display_invites()
 
         {:error, changeset} ->
@@ -130,7 +137,7 @@ defmodule CanneryWeb.InviteLive.Index do
       ) do
     %{email: user_email} = Accounts.get_user!(id) |> Accounts.delete_user!(current_user)
 
-    prompt = dgettext("prompts", "%{name} deleted succesfully", name: user_email)
+    prompt = dgettext("prompts", "%{user_email} deleted succesfully", user_email: user_email)
 
     {:noreply, socket |> put_flash(:info, prompt) |> display_invites()}
   end

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

@@ -1,4 +1,4 @@
-<div class="w-full flex flex-col space-y-8 justify-center items-center">
+<div class="mx-auto flex flex-col justify-center items-center space-y-4 max-w-3xl">
   <h1 class="title text-2xl title-primary-500">
     <%= gettext("Invites") %>
   </h1>
@@ -18,9 +18,8 @@
     </.link>
   <% end %>
 
-  <div class="w-full flex flex-row flex-wrap justify-center items-stretch">
-    <%= for invite <- @invites do %>
-      <.invite_card invite={invite}>
+  <div class="flex flex-col justify-center items-stretch space-y-4">
+    <.invite_card :for={invite <- @invites} invite={invite} current_user={@current_user}>
       <:code_actions>
         <form phx-submit="copy_to_clipboard">
           <button
@@ -46,8 +45,8 @@
         phx-click="delete_invite"
         phx-value-id={invite.id}
         data-confirm={
-            dgettext("prompts", "Are you sure you want to delete the invite for %{name}?",
-              name: invite.name
+          dgettext("prompts", "Are you sure you want to delete the invite for %{invite_name}?",
+            invite_name: invite.name
           )
         }
         data-qa={"delete-#{invite.id}"}
@@ -55,33 +54,30 @@
         <i class="fa-fw fa-lg fas fa-trash"></i>
       </.link>
 
-        <%= if invite.disabled_at |> is_nil() do %>
-          <a href="#" class="btn btn-primary" phx-click="disable_invite" phx-value-id={invite.id}>
-            <%= dgettext("actions", "Disable") %>
-          </a>
-        <% else %>
-          <a href="#" class="btn btn-primary" phx-click="enable_invite" phx-value-id={invite.id}>
-            <%= dgettext("actions", "Enable") %>
-          </a>
-        <% end %>
-
-        <%= if invite.disabled_at |> is_nil() and not (invite.uses_left |> is_nil()) do %>
       <a
+        href="#"
+        class="btn btn-primary"
+        phx-click={if invite.disabled_at, do: "enable_invite", else: "disable_invite"}
+        phx-value-id={invite.id}
+      >
+        <%= if invite.disabled_at, do: gettext("Enable"), else: gettext("Disable") %>
+      </a>
+
+      <a
+        :if={invite.disabled_at |> is_nil() and not (invite.uses_left |> is_nil())}
         href="#"
         class="btn btn-primary"
         phx-click="set_unlimited"
         phx-value-id={invite.id}
         data-confirm={
-              dgettext("prompts", "Are you sure you want to make %{name} unlimited?",
-                name: invite.name
+          dgettext("prompts", "Are you sure you want to make %{invite_name} unlimited?",
+            invite_name: invite.name
           )
         }
       >
         <%= dgettext("actions", "Set Unlimited") %>
       </a>
-        <% end %>
     </.invite_card>
-    <% end %>
   </div>
 
   <%= unless @admins |> Enum.empty?() do %>
@@ -91,9 +87,8 @@
       <%= gettext("Admins") %>
     </h1>
 
-    <div class="w-full flex flex-row flex-wrap justify-center items-stretch">
-      <%= for admin <- @admins do %>
-        <.user_card user={admin}>
+    <div class="flex flex-col justify-center items-stretch space-y-4">
+      <.user_card :for={admin <- @admins} user={admin}>
         <.link
           href="#"
           class="text-primary-600 link"
@@ -110,7 +105,6 @@
           <i class="fa-fw fa-lg fas fa-trash"></i>
         </.link>
       </.user_card>
-      <% end %>
     </div>
   <% end %>
 
@@ -121,9 +115,8 @@
       <%= gettext("Users") %>
     </h1>
 
-    <div class="w-full flex flex-row flex-wrap justify-center items-stretch">
-      <%= for user <- @users do %>
-        <.user_card user={user}>
+    <div class="flex flex-col justify-center items-stretch space-y-4">
+      <.user_card :for={user <- @users} user={user}>
         <.link
           href="#"
           class="text-primary-600 link"
@@ -140,13 +133,11 @@
           <i class="fa-fw fa-lg fas fa-trash"></i>
         </.link>
       </.user_card>
-      <% end %>
     </div>
   <% end %>
 </div>
 
-<%= if @live_action in [:new, :edit] do %>
-  <.modal return_to={Routes.invite_index_path(Endpoint, :index)}>
+<.modal :if={@live_action in [:new, :edit]} return_to={Routes.invite_index_path(Endpoint, :index)}>
   <.live_component
     module={CanneryWeb.InviteLive.FormComponent}
     id={@invite.id || :new}
@@ -156,5 +147,4 @@
     return_to={Routes.invite_index_path(Endpoint, :index)}
     current_user={@current_user}
   />
-  </.modal>
-<% end %>
+</.modal>

lib/cannery_web/live/live_helpers.ex

@@ -34,7 +34,7 @@ defmodule CanneryWeb.LiveHelpers do
         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()}
+      phx-remove={hide_modal()}
     >
       <span class="hidden"></span>
     </.link>
@@ -49,7 +49,7 @@ defmodule CanneryWeb.LiveHelpers do
         id="modal-content"
         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
+          px-8 py-4 sm:py-8
           flex flex-col justify-start items-center
           bg-white border-2 rounded-lg"
       >
@@ -59,7 +59,7 @@ defmodule CanneryWeb.LiveHelpers do
           class="absolute top-8 right-10
             text-gray-500 hover:text-gray-800
             transition-all duration-500 ease-in-out"
-          phx_remove={hide_modal()}
+          phx-remove={hide_modal()}
         >
           <i class="fa-fw fa-lg fas fa-times"></i>
         </.link>
@@ -106,8 +106,8 @@ defmodule CanneryWeb.LiveHelpers do
         data-qa={@id}
         {
           if assigns |> Map.has_key?(:target),
-            do: %{"phx-click" => @action, "phx-value-value" => @value, "phx-target" => @target},
-            else: %{"phx-click" => @action, "phx-value-value" => @value}
+            do: %{"phx-click": @action, "phx-value-value": @value, "phx-target": @target},
+            else: %{"phx-click": @action, "phx-value-value": @value}
         }
       />
       <div class="w-11 h-6 bg-gray-300 rounded-full peer

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

@@ -12,11 +12,12 @@
     phx-change="validate"
     phx-submit="save"
   >
-    <%= if @changeset.action && not @changeset.valid? do %>
-      <div class="invalid-feedback col-span-3 text-center">
+    <div
+      :if={@changeset.action && not @changeset.valid?()}
+      class="invalid-feedback col-span-3 text-center"
+    >
       <%= changeset_errors(@changeset) %>
     </div>
-    <% end %>
 
     <%= label(f, :count, gettext("Shots fired"), class: "title text-lg text-primary-600") %>
     <%= number_input(f, :count,

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

@@ -18,8 +18,7 @@
     </.link>
 
     <div class="w-full flex flex-row flex-wrap justify-center items-stretch">
-      <%= for ammo_group <- @ammo_groups do %>
-        <.ammo_group_card ammo_group={ammo_group}>
+      <.ammo_group_card :for={ammo_group <- @ammo_groups} ammo_group={ammo_group}>
         <button
           type="button"
           class="btn btn-primary"
@@ -39,7 +38,6 @@
           <%= dgettext("actions", "Record shots") %>
         </.link>
       </.ammo_group_card>
-      <% end %>
     </div>
   <% end %>
 
@@ -128,8 +126,7 @@
   <% end %>
 </div>
 
-<%= if @live_action in [:edit] do %>
-  <.modal return_to={Routes.range_index_path(Endpoint, :index)}>
+<.modal :if={@live_action == :edit} return_to={Routes.range_index_path(Endpoint, :index)}>
   <.live_component
     module={CanneryWeb.RangeLive.FormComponent}
     id={@shot_group.id}
@@ -139,11 +136,12 @@
     return_to={Routes.range_index_path(Endpoint, :index)}
     current_user={@current_user}
   />
-  </.modal>
-<% end %>
+</.modal>
 
-<%= if @live_action in [:add_shot_group] do %>
-  <.modal return_to={Routes.range_index_path(Endpoint, :index)}>
+<.modal
+  :if={@live_action == :add_shot_group}
+  return_to={Routes.range_index_path(Endpoint, :index)}
+>
   <.live_component
     module={CanneryWeb.Components.AddShotGroupComponent}
     id={:new}
@@ -153,5 +151,4 @@
     return_to={Routes.range_index_path(Endpoint, :index)}
     current_user={@current_user}
   />
-  </.modal>
-<% end %>
+</.modal>

lib/cannery_web/live/tag_live/form_component.ex

@@ -50,53 +50,6 @@ defmodule CanneryWeb.TagLive.FormComponent do
     socket |> assign(:changeset, changeset)
   end
 
-  @impl true
-  def render(assigns) do
-    ~H"""
-    <div>
-      <h2 class="mb-8 text-center title text-xl text-primary-600">
-        <%= @title %>
-      </h2>
-      <.form
-        :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"
-        phx-target={@myself}
-        phx-change="validate"
-        phx-submit="save"
-      >
-        <%= if @changeset.action && not @changeset.valid? do %>
-          <div class="invalid-feedback col-span-3 text-center">
-            <%= changeset_errors(@changeset) %>
-          </div>
-        <% end %>
-
-        <%= label(f, :name, gettext("Name"), class: "title text-lg text-primary-600") %>
-        <%= text_input(f, :name, class: "input input-primary col-span-2") %>
-        <%= error_tag(f, :name, "col-span-3") %>
-
-        <%= label(f, :bg_color, gettext("Background color"), class: "title text-lg text-primary-600") %>
-        <span id="tag-bg-color-input" class="mx-auto col-span-2" phx-update="ignore">
-          <%= color_input(f, :bg_color) %>
-        </span>
-        <%= error_tag(f, :bg_color, "col-span-3") %>
-
-        <%= label(f, :text_color, gettext("Text color"), class: "title text-lg text-primary-600") %>
-        <span id="tag-text-color-input" class="mx-auto col-span-2" phx-update="ignore">
-          <%= color_input(f, :text_color) %>
-        </span>
-        <%= error_tag(f, :text_color, "col-span-3") %>
-
-        <%= submit(dgettext("actions", "Save"),
-          class: "mx-auto btn btn-primary col-span-3",
-          phx_disable_with: dgettext("prompts", "Saving...")
-        ) %>
-      </.form>
-    </div>
-    """
-  end
-
   defp save_tag(
          %{assigns: %{tag: tag, current_user: current_user, return_to: return_to}} = socket,
          :edit,

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

@@ -0,0 +1,42 @@
+<div>
+  <h2 class="mb-8 text-center title text-xl text-primary-600">
+    <%= @title %>
+  </h2>
+  <.form
+    :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"
+    phx-target={@myself}
+    phx-change="validate"
+    phx-submit="save"
+  >
+    <div
+      :if={@changeset.action && not @changeset.valid?()}
+      class="invalid-feedback col-span-3 text-center"
+    >
+      <%= changeset_errors(@changeset) %>
+    </div>
+
+    <%= label(f, :name, gettext("Name"), class: "title text-lg text-primary-600") %>
+    <%= text_input(f, :name, class: "input input-primary col-span-2") %>
+    <%= error_tag(f, :name, "col-span-3") %>
+
+    <%= label(f, :bg_color, gettext("Background color"), class: "title text-lg text-primary-600") %>
+    <span id="tag-bg-color-input" class="mx-auto col-span-2" phx-update="ignore">
+      <%= color_input(f, :bg_color) %>
+    </span>
+    <%= error_tag(f, :bg_color, "col-span-3") %>
+
+    <%= label(f, :text_color, gettext("Text color"), class: "title text-lg text-primary-600") %>
+    <span id="tag-text-color-input" class="mx-auto col-span-2" phx-update="ignore">
+      <%= color_input(f, :text_color) %>
+    </span>
+    <%= error_tag(f, :text_color, "col-span-3") %>
+
+    <%= submit(dgettext("actions", "Save"),
+      class: "mx-auto btn btn-primary col-span-3",
+      phx_disable_with: dgettext("prompts", "Saving...")
+    ) %>
+  </.form>
+</div>

lib/cannery_web/live/tag_live/index.ex

@@ -6,7 +6,7 @@ defmodule CanneryWeb.TagLive.Index do
   use CanneryWeb, :live_view
   import CanneryWeb.Components.TagCard
   alias Cannery.{Tags, Tags.Tag}
-  alias CanneryWeb.{Endpoint, ViewHelpers}
+  alias CanneryWeb.ViewHelpers
 
   @impl true
   def mount(%{"search" => search}, _session, socket) do

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

@@ -45,8 +45,7 @@
     </h2>
   <% else %>
     <div class="flex flex-row flex-wrap justify-center items-stretch">
-      <%= for tag <- @tags do %>
-        <.tag_card tag={tag}>
+      <.tag_card :for={tag <- @tags} tag={tag}>
         <.link
           patch={Routes.tag_index_path(Endpoint, :edit, tag)}
           class="text-primary-600 link"
@@ -68,13 +67,11 @@
           <i class="fa-fw fa-lg fas fa-trash"></i>
         </.link>
       </.tag_card>
-      <% end %>
     </div>
   <% end %>
 </div>
 
-<%= if @live_action in [:new, :edit] do %>
-  <.modal return_to={Routes.tag_index_path(Endpoint, :index)}>
+<.modal :if={@live_action in [:new, :edit]} return_to={Routes.tag_index_path(Endpoint, :index)}>
   <.live_component
     module={CanneryWeb.TagLive.FormComponent}
     id={@tag.id || :new}
@@ -84,5 +81,4 @@
     return_to={Routes.tag_index_path(Endpoint, :index)}
     current_user={@current_user}
   />
-  </.modal>
-<% end %>
+</.modal>

lib/cannery_web/router.ex

@@ -11,15 +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")
+    plug :put_user_locale
   end
 
-  defp put_user_locale(%{assigns: %{current_user: %{locale: locale}}} = conn, default: default) do
+  defp put_user_locale(%{assigns: %{current_user: %{locale: locale}}} = conn, _opts) do
+    default = Application.fetch_env!(:gettext, :default_locale)
     Gettext.put_locale(locale || default)
     conn |> put_session(:locale, locale || default)
   end
 
-  defp put_user_locale(conn, default: default) do
+  defp put_user_locale(conn, _opts) do
+    default = Application.fetch_env!(:gettext, :default_locale)
     Gettext.put_locale(default)
     conn |> put_session(:locale, default)
   end

lib/cannery_web/telemetry.ex

@@ -57,6 +57,30 @@ defmodule CanneryWeb.Telemetry do
           "The time the connection spent waiting before being checked out for the query"
       ),
 
+      # Oban Metrics
+      counter("oban.job.exception",
+        tags: [:queue, :worker],
+        event_name: [:oban, :job, :exception],
+        measurement: :duration,
+        description: "Number of oban jobs that raised an exception"
+      ),
+      counter("oban.job.start",
+        tags: [:queue, :worker],
+        event_name: [:oban, :job, :start],
+        measurement: :system_time,
+        description: "Number of oban jobs started"
+      ),
+      summary("oban.job.stop.duration",
+        tags: [:queue, :worker],
+        unit: {:native, :millisecond},
+        description: "Length of time spent processing the oban job"
+      ),
+      summary("oban.job.stop.queue_time",
+        tags: [:queue, :worker],
+        unit: {:native, :millisecond},
+        description: "Time the oban job spent waiting in milliseconds"
+      ),
+
       # VM Metrics
       summary("vm.memory.total", unit: {:byte, :kilobyte}),
       summary("vm.total_run_queue_lengths.total"),

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

@@ -3,23 +3,21 @@
     <%= dgettext("emails", "Hi %{email},", email: @user.email) %>
   </span>
 
-  <br/>
+  <br />
 
   <span style="margin-bottom: 1em; font-size: 1.25em;">
-    <%= dgettext("emails", "Welcome to %{name}!", name: "Cannery") %>
+    <%= dgettext("emails", "Welcome to Cannery") %>
   </span>
 
-  <br/>
+  <br />
 
   <%= dgettext("emails", "You can confirm your account by visiting the URL below:") %>
 
-  <br/>
+  <br />
 
-  <a style="margin: 1em; color: rgb(31, 31, 31);" href="<%= @url %>"><%= @url %></a>
+  <a style="margin: 1em; color: rgb(31, 31, 31);" href={@url}><%= @url %></a>
 
-  <br/>
+  <br />
 
-  <%= dgettext("emails",
-    "If you didn't create an account at %{name}, please ignore this.",
-    name: "Cannery") %>
+  <%= dgettext("emails", "If you didn't create an account at Cannery, please ignore this.") %>
 </div>

lib/cannery_web/templates/email/confirm_email.txt.eex

@@ -1,7 +1,7 @@
 
 <%= dgettext("emails", "Hi %{email},", email: @user.email) %>
 
-<%= dgettext("emails", "Welcome to %{name}%!", name: "Cannery") %>
+<%= dgettext("emails", "Welcome to Cannery") %>
 
 <%= dgettext("emails", "You can confirm your account by visiting the URL below:") %>
 

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

@@ -3,17 +3,15 @@
     <%= dgettext("emails", "Hi %{email},", email: @user.email) %>
   </span>
 
-  <br/>
+  <br />
 
   <%= dgettext("emails", "You can reset your password by visiting the URL below:") %>
 
-  <br/>
+  <br />
 
-  <a style="margin: 1em; color: rgb(31, 31, 31);" href="<%= @url %>"><%= @url %></a>
+  <a style="margin: 1em; color: rgb(31, 31, 31);" href={@url}><%= @url %></a>
 
-  <br/>
+  <br />
 
-  <%= dgettext("emails",
-    "If you didn't request this change from %{name}, please ignore this.",
-    name: "Cannery") %>
+  <%= dgettext("emails", "If you didn't request this change from Cannery, please ignore this.") %>
 </div>

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

@@ -3,17 +3,18 @@
     <%= dgettext("emails", "Hi %{email},", email: @user.email) %>
   </span>
 
-  <br/>
+  <br />
 
   <%= dgettext("emails", "You can change your email by visiting the URL below:") %>
 
-  <br/>
+  <br />
 
-  <a style="margin: 1em; color: rgb(31, 31, 31);" href="<%= @url %>"><%= @url %></a>
+  <a style="margin: 1em; color: rgb(31, 31, 31);" href={@url}><%= @url %></a>
 
-  <br/>
+  <br />
 
-  <%= dgettext("emails",
-    "If you didn't request this change from %{name}, please ignore this.",
-    name: "Cannery") %>
+  <%= dgettext(
+    "emails",
+    "If you didn't request this change from Cannery, please ignore this."
+  ) %>
 </div>

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

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>
-      <%= dgettext("errors", "Error") %>| Cannery
+      <%= dgettext("errors", "Error") %> | <%= gettext("Cannery") %>
     </title>
     <link rel="stylesheet" href="/css/app.css" />
     <script defer type="text/javascript" src="/js/app.js">
@@ -13,7 +13,7 @@
   </head>
   <body class="pb-8 m-0 p-0 w-full h-full">
     <header>
-      <.topbar current_user={assigns[:current_user]}></.topbar>
+      <.topbar current_user={assigns[:current_user]} />
     </header>
 
     <div class="pb-8 w-full flex flex-col justify-center items-center text-center">

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

@@ -1,18 +1,14 @@
 <main role="main" class="min-h-full min-w-full">
   <header>
-    <.topbar current_user={assigns[:current_user]}></.topbar>
+    <.topbar current_user={assigns[:current_user]} />
 
     <div class="mx-8 my-2 flex flex-col space-y-4 text-center">
-      <%= if get_flash(@conn, :info) do %>
-        <p class="alert alert-info" role="alert">
+      <p :if={get_flash(@conn, :info)} class="alert alert-info" role="alert">
         <%= get_flash(@conn, :info) %>
       </p>
-      <% end %>
-      <%= if get_flash(@conn, :error) do %>
-        <p class="alert alert-danger" role="alert">
+      <p :if={get_flash(@conn, :error)} class="alert alert-danger" role="alert">
         <%= get_flash(@conn, :error) %>
       </p>
-      <% end %>
     </div>
   </header>
 

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

@@ -12,8 +12,7 @@
     <a style="color: rgb(31, 31, 31);" href={Routes.live_url(Endpoint, HomeLive)}>
       <%= dgettext(
         "emails",
-        "This email was sent from %{name}, the self-hosted firearm tracker website.",
-        name: "Cannery"
+        "This email was sent from Cannery, the self-hosted firearm tracker website."
       ) %>
     </a>
   </body>

lib/cannery_web/templates/layout/email.txt.eex

@@ -7,6 +7,5 @@
 =====================
 
 <%= dgettext("emails",
-  "This email was sent from %{name} at %{url}, the self-hosted firearm tracker website.",
-  name: "Cannery",
+  "This email was sent from Cannery at %{url}, the self-hosted firearm tracker website.",
   url: Routes.live_url(Endpoint, HomeLive)) %>

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

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

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

@@ -10,8 +10,8 @@
       type="image/jpg"
       href={Routes.static_path(@conn, "/images/cannery.svg")}
     />
-    <.live_title suffix=" | Cannery">
-      <%= assigns[:page_title] || "Cannery" %>
+    <.live_title suffix={" | #{gettext("Cannery")}"}>
+      <%= assigns[:page_title] || gettext("Cannery") %>
     </.live_title>
     <link phx-track-static rel="stylesheet" href={Routes.static_path(@conn, "/css/app.css")} />
     <script
@@ -23,7 +23,7 @@
     </script>
   </head>
 
-  <body class="m-0 p-0 w-full h-full bg-white">
+  <body class="m-0 p-0 w-full h-full subpixel-antialiased">
     <%= @inner_content %>
   </body>
 </html>

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

@@ -1,31 +1,32 @@
-<div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
+<div class="mx-auto pb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
   <h1 class="title text-primary-600 text-xl">
     <%= dgettext("actions", "Resend confirmation instructions") %>
   </h1>
 
-  <%= form_for :user,
-           Routes.user_confirmation_path(@conn, :create),
-           [
-             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 -> %>
-    <%= label(f, :email, class: "title text-lg text-primary-600") %>
+  <.form
+    :let={f}
+    for={:user}
+    action={Routes.user_confirmation_path(@conn, :create)}
+    class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
+  >
+    <%= label(f, :email, gettext("Email"), class: "title text-lg text-primary-600") %>
     <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
 
     <%= submit(dgettext("actions", "Resend confirmation instructions"),
       class: "mx-auto btn btn-primary col-span-3"
     ) %>
-  <% end %>
+  </.form>
 
   <hr class="hr" />
 
   <div class="flex flex-row justify-center items-center space-x-4">
-    <%= if Accounts.allow_registration?() do %>
-      <.link href={Routes.user_registration_path(@conn, :new)} class="btn btn-primary">
+    <.link
+      :if={Accounts.allow_registration?()}
+      href={Routes.user_registration_path(@conn, :new)}
+      class="btn btn-primary"
+    >
       <%= dgettext("actions", "Register") %>
     </.link>
-    <% end %>
     <.link href={Routes.user_session_path(@conn, :new)} class="btn btn-primary">
       <%= dgettext("actions", "Log in") %>
     </.link>

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

@@ -1,32 +1,27 @@
-<div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
+<div class="mx-auto pb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
   <h1 class="title text-primary-600 text-xl">
     <%= dgettext("actions", "Register") %>
   </h1>
 
-  <%= form_for @changeset,
-           Routes.user_registration_path(@conn, :create),
-           [
-             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 -> %>
-    <%= if @changeset.action && not @changeset.valid? do %>
-      <div class="alert alert-danger col-span-3">
-        <p>
+  <.form
+    :let={f}
+    for={@changeset}
+    action={Routes.user_registration_path(@conn, :create)}
+    class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
+  >
+    <p :if={@changeset.action && not @changeset.valid?()} class="alert alert-danger col-span-3">
       <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
     </p>
-      </div>
+
+    <%= if @invite_token do %>
+      <%= hidden_input(f, :invite_token, value: @invite_token) %>
     <% end %>
 
-    <%= if @invite do %>
-      <%= hidden_input(f, :invite_token, value: @invite.token) %>
-    <% end %>
-
-    <%= label(f, :email, class: "title text-lg text-primary-600") %>
+    <%= label(f, :email, gettext("Email"), class: "title text-lg text-primary-600") %>
     <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
     <%= error_tag(f, :email, "col-span-3") %>
 
-    <%= label(f, :password, class: "title text-lg text-primary-600") %>
+    <%= label(f, :password, gettext("Password"), class: "title text-lg text-primary-600") %>
     <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %>
     <%= error_tag(f, :password, "col-span-3") %>
 
@@ -34,13 +29,13 @@
     <%= select(
       f,
       :locale,
-      [{gettext("English"), "en_US"}, {gettext("German"), "de"}, {gettext("French"), "fr"}],
+      [{gettext("English"), "en_US"}],
       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 %>
+  </.form>
 
   <hr class="hr" />
 

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

@@ -1,28 +1,23 @@
-<div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
+<div class="mx-auto pb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
   <h1 class="title text-primary-600 text-xl">
     <%= dgettext("actions", "Reset password") %>
   </h1>
 
-  <%= form_for @changeset,
-           Routes.user_reset_password_path(@conn, :update, @token),
-           [
-             class:
-               "flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
-           ],
-           fn f -> %>
-    <%= if @changeset.action && not @changeset.valid? do %>
-      <div class="alert alert-danger col-span-3">
-        <p>
+  <.form
+    :let={f}
+    for={@changeset}
+    action={Routes.user_reset_password_path(@conn, :update, @token)}
+    class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
+  >
+    <p :if={@changeset.action && not @changeset.valid?()} class="alert alert-danger col-span-3">
       <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
     </p>
-      </div>
-    <% end %>
 
-    <%= label(f, :password, "New password", class: "title text-lg text-primary-600") %>
+    <%= label(f, :password, gettext("New password"), class: "title text-lg text-primary-600") %>
     <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %>
     <%= error_tag(f, :password, "col-span-3") %>
 
-    <%= label(f, :password_confirmation, "Confirm new password",
+    <%= label(f, :password_confirmation, gettext("Confirm new password"),
       class: "title text-lg text-primary-600"
     ) %>
     <%= password_input(f, :password_confirmation,
@@ -34,16 +29,18 @@
     <%= submit(dgettext("actions", "Reset password"),
       class: "mx-auto btn btn-primary col-span-3"
     ) %>
-  <% end %>
+  </.form>
 
   <hr class="hr" />
 
   <div class="flex flex-row justify-center items-center space-x-4">
-    <%= if Accounts.allow_registration?() do %>
-      <.link href={Routes.user_registration_path(@conn, :new)} class="btn btn-primary">
+    <.link
+      :if={Accounts.allow_registration?()}
+      href={Routes.user_registration_path(@conn, :new)}
+      class="btn btn-primary"
+    >
       <%= dgettext("actions", "Register") %>
     </.link>
-    <% end %>
     <.link href={Routes.user_session_path(@conn, :new)} class="btn btn-primary">
       <%= dgettext("actions", "Log in") %>
     </.link>

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

@@ -1,31 +1,32 @@
-<div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
+<div class="mx-auto pb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
   <h1 class="title text-primary-600 text-xl">
     <%= dgettext("actions", "Forgot your password?") %>
   </h1>
 
-  <%= form_for :user,
-           Routes.user_reset_password_path(@conn, :create),
-           [
-             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 -> %>
-    <%= label(f, :email, class: "title text-lg text-primary-600") %>
+  <.form
+    :let={f}
+    for={:user}
+    action={Routes.user_reset_password_path(@conn, :create)}
+    class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
+  >
+    <%= label(f, :email, gettext("Email"), class: "title text-lg text-primary-600") %>
     <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
 
     <%= submit(dgettext("actions", "Send instructions to reset password"),
       class: "mx-auto btn btn-primary col-span-3"
     ) %>
-  <% end %>
+  </.form>
 
   <hr class="hr" />
 
   <div class="flex flex-row justify-center items-center space-x-4">
-    <%= if Accounts.allow_registration?() do %>
-      <.link href={Routes.user_registration_path(@conn, :new)} class="btn btn-primary">
+    <.link
+      :if={Accounts.allow_registration?()}
+      href={Routes.user_registration_path(@conn, :new)}
+      class="btn btn-primary"
+    >
       <%= dgettext("actions", "Register") %>
     </.link>
-    <% end %>
     <.link href={Routes.user_session_path(@conn, :new)} class="btn btn-primary">
       <%= dgettext("actions", "Log in") %>
     </.link>

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

@@ -1,28 +1,23 @@
-<div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
+<div class="mx-auto pb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
   <h1 class="title text-primary-600 text-xl">
     <%= dgettext("actions", "Log in") %>
   </h1>
 
-  <%= form_for @conn,
-           Routes.user_session_path(@conn, :create),
-           [
-             as: :user,
-             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 -> %>
-    <%= if @error_message do %>
-      <div class="alert alert-danger col-span-3">
-        <p>
+  <.form
+    :let={f}
+    for={@conn}
+    action={Routes.user_session_path(@conn, :create)}
+    as="user"
+    class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
+  >
+    <p :if={@error_message} class="alert alert-danger col-span-3">
       <%= @error_message %>
     </p>
-      </div>
-    <% end %>
 
-    <%= label(f, :email, class: "title text-lg text-primary-600") %>
+    <%= label(f, :email, gettext("Email"), class: "title text-lg text-primary-600") %>
     <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
 
-    <%= label(f, :password, class: "title text-lg text-primary-600") %>
+    <%= label(f, :password, gettext("Password"), class: "title text-lg text-primary-600") %>
     <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %>
 
     <%= label(f, :remember_me, gettext("Keep me logged in for 60 days"),
@@ -31,16 +26,18 @@
     <%= checkbox(f, :remember_me, class: "checkbox col-span-2") %>
 
     <%= submit(dgettext("actions", "Log in"), class: "mx-auto btn btn-primary col-span-3") %>
-  <% end %>
+  </.form>
 
   <hr class="hr" />
 
   <div class="flex flex-row justify-center items-center space-x-4">
-    <%= if Accounts.allow_registration?() do %>
-      <.link href={Routes.user_registration_path(@conn, :new)} class="btn btn-primary">
+    <.link
+      :if={Accounts.allow_registration?()}
+      href={Routes.user_registration_path(@conn, :new)}
+      class="btn btn-primary"
+    >
       <%= dgettext("actions", "Register") %>
     </.link>
-    <% end %>
     <.link href={Routes.user_reset_password_path(@conn, :new)} class="btn btn-primary">
       <%= dgettext("actions", "Forgot your password?") %>
     </.link>

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

@@ -1,5 +1,5 @@
-<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">
+<div class="mx-auto pb-8 max-w-3xl flex flex-col justify-center items-center text-right space-y-4">
+  <h1 class="pb-4 title text-primary-600 text-2xl text-center">
     <%= gettext("Settings") %>
   </h1>
 
@@ -11,21 +11,20 @@
     action={Routes.user_settings_path(@conn, :update)}
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
-    <h3 class="title text-primary-600 text-lg col-span-3">
+    <h3 class="title text-primary-600 text-lg text-center col-span-3">
       <%= dgettext("actions", "Change email") %>
     </h3>
 
-    <%= if @email_changeset.action && not @email_changeset.valid? do %>
-      <div class="alert alert-danger col-span-3">
-        <p>
+    <div
+      :if={@email_changeset.action && not @email_changeset.valid?()}
+      class="alert alert-danger col-span-3"
+    >
       <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
-        </p>
     </div>
-    <% end %>
 
     <%= hidden_input(f, :action, name: "action", value: "update_email") %>
 
-    <%= label(f, :email, class: "title text-lg text-primary-600") %>
+    <%= label(f, :email, gettext("Email"), class: "title text-lg text-primary-600") %>
     <%= email_input(f, :email, required: true, class: "mx-2 my-1 input input-primary col-span-2") %>
     <%= error_tag(f, :email, "col-span-3") %>
 
@@ -54,17 +53,16 @@
     action={Routes.user_settings_path(@conn, :update)}
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
-    <h3 class="title text-primary-600 text-lg col-span-3">
+    <h3 class="title text-primary-600 text-lg text-center col-span-3">
       <%= dgettext("actions", "Change password") %>
     </h3>
 
-    <%= if @password_changeset.action && not @password_changeset.valid? do %>
-      <div class="alert alert-danger col-span-3">
-        <p>
+    <div
+      :if={@password_changeset.action && not @password_changeset.valid?()}
+      class="alert alert-danger col-span-3"
+    >
       <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
-        </p>
     </div>
-    <% end %>
 
     <%= hidden_input(f, :action, name: "action", value: "update_password") %>
 
@@ -107,19 +105,18 @@
     :let={f}
     for={@locale_changeset}
     action={Routes.user_settings_path(@conn, :update)}
-    class="flex flex-col space-y-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"
   >
-    <h3 class="title text-primary-600 text-lg">
+    <h3 class="title text-primary-600 text-lg text-center col-span-3">
       <%= dgettext("actions", "Change Language") %>
     </h3>
 
-    <%= if @locale_changeset.action && not @locale_changeset.valid? do %>
-      <div class="alert alert-danger">
-        <p>
+    <div
+      :if={@locale_changeset.action && not @locale_changeset.valid?()}
+      class="alert alert-danger col-span-3"
+    >
       <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
-        </p>
     </div>
-    <% end %>
 
     <%= hidden_input(f, :action, name: "action", value: "update_locale") %>
 
@@ -132,12 +129,12 @@
         {gettext("French"), "fr"},
         {gettext("Spanish"), "es"}
       ],
-      class: "mx-2 my-1 min-w-md input input-primary"
+      class: "mx-2 my-1 min-w-md input input-primary col-span-3"
     ) %>
-    <%= error_tag(f, :locale) %>
+    <%= error_tag(f, :locale, "col-span-3") %>
 
     <%= submit(dgettext("actions", "Change language"),
-      class: "whitespace-nowrap mx-auto btn btn-primary",
+      class: "whitespace-nowrap mx-auto btn btn-primary col-span-3",
       data: [qa: dgettext("prompts", "Are you sure you want to change your language?")]
     ) %>
   </.form>

lib/cannery_web/views/email_view.ex

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

lib/cannery_web/views/error_helpers.ex

@@ -17,11 +17,13 @@ defmodule CanneryWeb.ErrorHelpers do
     assigns = %{extra_class: extra_class, form: form, field: field}
 
     ~H"""
-    <%= for error <- Keyword.get_values(@form.errors, @field) do %>
-      <span class={"invalid-feedback #{@extra_class}"} phx-feedback-for={input_name(@form, @field)}>
+    <span
+      :for={error <- Keyword.get_values(@form.errors, @field)}
+      class={["invalid-feedback", @extra_class]}
+      phx-feedback-for={input_name(@form, @field)}
+    >
       <%= translate_error(error) %>
     </span>
-    <% end %>
     """
   end
 

lib/cannery_web/views/error_view.ex

@@ -1,14 +1,14 @@
 defmodule CanneryWeb.ErrorView do
   use CanneryWeb, :view
   import CanneryWeb.Components.Topbar
-  alias CanneryWeb.{Endpoint, HomeLive}
+  alias CanneryWeb.HomeLive
 
   def template_not_found(error_path, _assigns) do
     error_string =
       case error_path do
         "404.html" -> dgettext("errors", "Not found")
         "401.html" -> dgettext("errors", "Unauthorized")
-        _other_template -> dgettext("errors", "Internal Server Error")
+        _other_path -> dgettext("errors", "Internal Server Error")
       end
 
     render("error.html", %{error_string: error_string})

lib/cannery_web/views/layout_view.ex

@@ -1,17 +1,17 @@
 defmodule CanneryWeb.LayoutView do
   use CanneryWeb, :view
   import CanneryWeb.Components.Topbar
-  alias CanneryWeb.{Endpoint, HomeLive}
+  alias CanneryWeb.HomeLive
 
   # Phoenix LiveDashboard is available only in development by default,
   # so we instruct Elixir to not warn if the dashboard route is missing.
   @compile {:no_warn_undefined, {Routes, :live_dashboard_path, 2}}
 
-  def get_title(conn) do
-    if conn.assigns |> Map.has_key?(:title) do
-      "Cannery | #{conn.assigns.title}"
-    else
-      "Cannery"
+  def get_title(%{assigns: %{title: title}}) when title not in [nil, ""] do
+    gettext("Cannery | %{title}", title: title)
   end
+
+  def get_title(_conn) do
+    gettext("Cannery")
   end
 end

lib/cannery_web/views/view_helpers.ex

@@ -5,63 +5,59 @@ defmodule CanneryWeb.ViewHelpers do
   :view`
   """
 
-  import Phoenix.Component
-
-  @id_length 16
+  use Phoenix.Component
 
   @doc """
-  Returns a <time> element that renders the naivedatetime in the user's local
-  timezone with Alpine.js
+  Phoenix.Component for a <time> element that renders the naivedatetime in the
+  user's local timezone with Alpine.js
   """
-  @spec display_datetime(NaiveDateTime.t() | nil) :: Phoenix.LiveView.Rendered.t()
-  def display_datetime(nil), do: ""
 
-  def display_datetime(datetime) do
-    assigns = %{
-      id: :crypto.strong_rand_bytes(@id_length) |> Base.url_encode64(),
-      datetime: datetime |> DateTime.from_naive!("Etc/UTC") |> DateTime.to_iso8601(:extended)
-    }
+  attr :datetime, :any, required: true, doc: "A `DateTime` struct or nil"
 
+  def datetime(assigns) do
     ~H"""
     <time
-      id={@id}
-      datetime={@datetime}
+      :if={@datetime}
+      datetime={cast_datetime(@datetime)}
       x-data={"{
-        date:
+        datetime:
           Intl.DateTimeFormat([], {dateStyle: 'short', timeStyle: 'long'})
-            .format(new Date(\"#{@datetime}\"))
+            .format(new Date(\"#{cast_datetime(@datetime)}\"))
       }"}
-      x-text="date"
+      x-text="datetime"
     >
-      <%= @datetime %>
+      <%= cast_datetime(@datetime) %>
     </time>
     """
   end
 
+  @spec cast_datetime(NaiveDateTime.t() | nil) :: String.t()
+  defp cast_datetime(%NaiveDateTime{} = datetime) do
+    datetime |> DateTime.from_naive!("Etc/UTC") |> DateTime.to_iso8601(:extended)
+  end
+
+  defp cast_datetime(_datetime), do: ""
+
   @doc """
-  Returns a <date> element that renders the Date in the user's local
-  timezone with Alpine.js
+  Phoenix.Component for a <date> element that renders the Date in the user's
+  local timezone with Alpine.js
   """
-  @spec display_date(Date.t() | nil) :: Phoenix.LiveView.Rendered.t()
-  def display_date(nil), do: ""
 
-  def display_date(date) do
-    assigns = %{
-      id: :crypto.strong_rand_bytes(@id_length) |> Base.url_encode64(),
-      date: date |> Date.to_iso8601(:extended)
-    }
+  attr :date, :any, required: true, doc: "A `Date` struct or nil"
 
+  def date(assigns) do
     ~H"""
     <time
-      id={@id}
-      datetime={@date}
+      :if={@date}
+      datetime={@date |> Date.to_iso8601(:extended)}
       x-data={"{
         date:
-          Intl.DateTimeFormat([], {timeZone: 'Etc/UTC', dateStyle: 'short'}).format(new Date(\"#{@date}\"))
+          Intl.DateTimeFormat([], {timeZone: 'Etc/UTC', dateStyle: 'short'})
+            .format(new Date(\"#{@date |> Date.to_iso8601(:extended)}\"))
       }"}
       x-text="date"
     >
-      <%= @date %>
+      <%= @date |> Date.to_iso8601(:extended) %>
     </time>
     """
   end
@@ -70,12 +66,44 @@ defmodule CanneryWeb.ViewHelpers do
   Displays emoji as text emoji if SHIBAO_MODE is set to true :)
   """
   @spec display_emoji(String.t()) :: String.t()
-  def display_emoji("😔"),
-    do:
-      if(Application.get_env(:cannery, CanneryWeb.ViewHelpers)[:shibao_mode], do: "q_q", else: "😔")
+  def display_emoji("😔") do
+    if Application.get_env(:cannery, CanneryWeb.ViewHelpers)[:shibao_mode], do: "q_q", else: "😔"
+  end
 
   def display_emoji(other_emoji), do: other_emoji
 
+  @doc """
+  Displays content in a QR code as a base64 encoded PNG
+  """
+  @spec qr_code_image(String.t()) :: String.t()
+  @spec qr_code_image(String.t(), width :: non_neg_integer()) :: String.t()
+  def qr_code_image(content, width \\ 384) do
+    img_data =
+      content
+      |> EQRCode.encode()
+      |> EQRCode.png(width: width)
+      |> Base.encode64()
+
+    "data:image/png;base64," <> img_data
+  end
+
+  @doc """
+  Creates a downloadable QR Code element
+  """
+
+  attr :content, :string, required: true
+  attr :filename, :string, default: "qrcode", doc: "filename without .png extension"
+  attr :image_class, :string, default: "w-64 h-max"
+  attr :width, :integer, default: 384, doc: "width of png to generate"
+
+  def qr_code(assigns) do
+    ~H"""
+    <a href={qr_code_image(@content)} download={@filename <> ".png"}>
+      <img class={@image_class} alt={@filename} src={qr_code_image(@content)} />
+    </a>
+    """
+  end
+
   @doc """
   Get a random color in `#ffffff` hex format
 

mix.exs

@@ -4,7 +4,7 @@ defmodule Cannery.MixProject do
   def project do
     [
       app: :cannery,
-      version: "0.8.0",
+      version: "0.8.3",
       elixir: "1.14.1",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: Mix.compilers(),
@@ -13,7 +13,7 @@ defmodule Cannery.MixProject do
       deps: deps(),
       dialyzer: [plt_add_apps: [:ex_unit]],
       consolidate_protocols: Mix.env() not in [:dev, :test],
-      preferred_cli_env: [test: :test, "test.all": :test],
+      preferred_cli_env: ["test.all": :test],
       # ExDoc
       name: "Cannery",
       source_url: "https://gitea.bubbletea.dev/shibao/cannery",
@@ -34,7 +34,7 @@ defmodule Cannery.MixProject do
   def application do
     [
       mod: {Cannery.Application, []},
-      extra_applications: [:logger, :runtime_tools, :os_mon]
+      extra_applications: [:logger, :runtime_tools, :os_mon, :crypto]
     ]
   end
 
@@ -70,6 +70,7 @@ defmodule Cannery.MixProject do
       {:jason, "~> 1.2"},
       {:plug_cowboy, "~> 2.5"},
       {:ecto_psql_extras, "~> 0.6"},
+      {:eqrcode, "~> 0.1.10"},
       {:credo, "~> 1.5", only: [:dev, :test], runtime: false},
       {:dialyxir, "~> 1.0", only: [:dev, :test], runtime: false}
     ]

mix.lock

@@ -1,44 +1,42 @@
 %{
   "bcrypt_elixir": {:hex, :bcrypt_elixir, "2.3.1", "5114d780459a04f2b4aeef52307de23de961b69e13a5cd98a911e39fda13f420", [:make, :mix], [{:comeonin, "~> 5.3", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "42182d5f46764def15bf9af83739e3bf4ad22661b1c34fc3e88558efced07279"},
   "bunt": {:hex, :bunt, "0.2.1", "e2d4792f7bc0ced7583ab54922808919518d0e57ee162901a16a1b6664ef3b14", [:mix], [], "hexpm", "a330bfb4245239787b15005e66ae6845c9cd524a288f0d141c148b02603777a5"},
-  "castore": {:hex, :castore, "0.1.18", "deb5b9ab02400561b6f5708f3e7660fc35ca2d51bfc6a940d2f513f89c2975fc", [:mix], [], "hexpm", "61bbaf6452b782ef80b33cdb45701afbcf0a918a45ebe7e73f1130d661e66a06"},
+  "castore": {:hex, :castore, "0.1.22", "4127549e411bedd012ca3a308dede574f43819fe9394254ca55ab4895abfa1a2", [:mix], [], "hexpm", "c17576df47eb5aa1ee40cc4134316a99f5cad3e215d5c77b8dd3cfef12a22cac"},
   "comeonin": {:hex, :comeonin, "5.3.3", "2c564dac95a35650e9b6acfe6d2952083d8a08e4a89b93a481acb552b325892e", [:mix], [], "hexpm", "3e38c9c2cb080828116597ca8807bb482618a315bfafd98c90bc22a821cc84df"},
   "connection": {:hex, :connection, "1.1.0", "ff2a49c4b75b6fb3e674bfc5536451607270aac754ffd1bdfe175abe4a6d7a68", [:mix], [], "hexpm", "722c1eb0a418fbe91ba7bd59a47e28008a189d47e37e0e7bb85585a016b2869c"},
   "cowboy": {:hex, :cowboy, "2.9.0", "865dd8b6607e14cf03282e10e934023a1bd8be6f6bacf921a7e2a96d800cd452", [:make, :rebar3], [{:cowlib, "2.11.0", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "2c729f934b4e1aa149aff882f57c6372c15399a20d54f65c8d67bef583021bde"},
   "cowboy_telemetry": {:hex, :cowboy_telemetry, "0.4.0", "f239f68b588efa7707abce16a84d0d2acf3a0f50571f8bb7f56a15865aae820c", [:rebar3], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7d98bac1ee4565d31b62d59f8823dfd8356a169e7fcbb83831b8a5397404c9de"},
   "cowlib": {:hex, :cowlib, "2.11.0", "0b9ff9c346629256c42ebe1eeb769a83c6cb771a6ee5960bd110ab0b9b872063", [:make, :rebar3], [], "hexpm", "2b3e9da0b21c4565751a6d4901c20d1b4cc25cbb7fd50d91d2ab6dd287bc86a9"},
   "credo": {:hex, :credo, "1.6.7", "323f5734350fd23a456f2688b9430e7d517afb313fbd38671b8a4449798a7854", [:mix], [{:bunt, "~> 0.2.1", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2.8", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "41e110bfb007f7eda7f897c10bf019ceab9a0b269ce79f015d54b0dcf4fc7dd3"},
-  "db_connection": {:hex, :db_connection, "2.4.2", "f92e79aff2375299a16bcb069a14ee8615c3414863a6fef93156aee8e86c2ff3", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "4fe53ca91b99f55ea249693a0229356a08f4d1a7931d8ffa79289b145fe83668"},
+  "db_connection": {:hex, :db_connection, "2.4.3", "3b9aac9f27347ec65b271847e6baeb4443d8474289bd18c1d6f4de655b70c94d", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c127c15b0fa6cfb32eed07465e05da6c815b032508d4ed7c116122871df73c12"},
   "decimal": {:hex, :decimal, "2.0.0", "a78296e617b0f5dd4c6caf57c714431347912ffb1d0842e998e9792b5642d697", [:mix], [], "hexpm", "34666e9c55dea81013e77d9d87370fe6cb6291d1ef32f46a1600230b1d44f577"},
   "dialyxir": {:hex, :dialyxir, "1.2.0", "58344b3e87c2e7095304c81a9ae65cb68b613e28340690dfe1a5597fd08dec37", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "61072136427a851674cab81762be4dbeae7679f85b1272b6d25c3a839aff8463"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.29", "149d50dcb3a93d9f3d6f3ecf18c918fb5a2d3c001b5d3305c926cddfbd33355b", [:mix], [], "hexpm", "4902af1b3eb139016aed210888748db8070b8125c2342ce3dcae4f38dcc63503"},
-  "ecto": {:hex, :ecto, "3.9.1", "67173b1687afeb68ce805ee7420b4261649d5e2deed8fe5550df23bab0bc4396", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c80bb3d736648df790f7f92f81b36c922d9dd3203ca65be4ff01d067f54eb304"},
-  "ecto_psql_extras": {:hex, :ecto_psql_extras, "0.7.4", "5d43fd088d39a158c860b17e8d210669587f63ec89ea122a4654861c8c6e2db4", [:mix], [{:ecto_sql, "~> 3.4", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:postgrex, ">= 0.15.7", [hex: :postgrex, repo: "hexpm", optional: false]}, {:table_rex, "~> 3.1.1", [hex: :table_rex, repo: "hexpm", optional: false]}], "hexpm", "311db02f1b772e3d0dc7f56a05044b5e1499d78ed6abf38885e1ca70059449e5"},
-  "ecto_sql": {:hex, :ecto_sql, "3.9.0", "2bb21210a2a13317e098a420a8c1cc58b0c3421ab8e3acfa96417dab7817918c", [:mix], [{:db_connection, "~> 2.5 or ~> 2.4.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.9.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a8f3f720073b8b1ac4c978be25fa7960ed7fd44997420c304a4a2e200b596453"},
-  "elixir_make": {:hex, :elixir_make, "0.6.3", "bc07d53221216838d79e03a8019d0839786703129599e9619f4ab74c8c096eac", [:mix], [], "hexpm", "f5cbd651c5678bcaabdbb7857658ee106b12509cd976c2c2fca99688e1daf716"},
+  "ecto": {:hex, :ecto, "3.9.4", "3ee68e25dbe0c36f980f1ba5dd41ee0d3eb0873bccae8aeaf1a2647242bffa35", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "de5f988c142a3aa4ec18b85a4ec34a2390b65b24f02385c1144252ff6ff8ee75"},
+  "ecto_psql_extras": {:hex, :ecto_psql_extras, "0.7.10", "e14d400930f401ca9f541b3349212634e44027d7f919bbb71224d7ac0d0e8acd", [:mix], [{:ecto_sql, "~> 3.4", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.15.7 or ~> 0.16.0", [hex: :postgrex, repo: "hexpm", optional: false]}, {:table_rex, "~> 3.1.1", [hex: :table_rex, repo: "hexpm", optional: false]}], "hexpm", "505e8cd81e4f17c090be0f99e92b1b3f0fd915f98e76965130b8ccfb891e7088"},
+  "ecto_sql": {:hex, :ecto_sql, "3.9.2", "34227501abe92dba10d9c3495ab6770e75e79b836d114c41108a4bf2ce200ad5", [:mix], [{:db_connection, "~> 2.4.1 or ~> 2.5", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.9.2", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "1eb5eeb4358fdbcd42eac11c1fbd87e3affd7904e639d77903c1358b2abd3f70"},
+  "elixir_make": {:hex, :elixir_make, "0.7.3", "c37fdae1b52d2cc51069713a58c2314877c1ad40800a57efb213f77b078a460d", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "24ada3e3996adbed1fa024ca14995ef2ba3d0d17b678b0f3f2b1f66e6ce2b274"},
+  "eqrcode": {:hex, :eqrcode, "0.1.10", "6294fece9d68ad64eef1c3c92cf111cfd6469f4fbf230a2d4cc905a682178f3f", [:mix], [], "hexpm", "da30e373c36a0fd37ab6f58664b16029919896d6c45a68a95cc4d713e81076f1"},
   "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
-  "esbuild": {:hex, :esbuild, "0.4.0", "9f17db148aead4cf1e6e6a584214357287a93407b5fb51a031f122b61385d4c2", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}], "hexpm", "b61e4e6b92ffe45e4ee4755a22de6211a67c67987dc02afb35a425a0add1d447"},
-  "ex_doc": {:hex, :ex_doc, "0.29.0", "4a1cb903ce746aceef9c1f9ae8a6c12b742a5461e6959b9d3b24d813ffbea146", [:mix], [{:earmark_parser, "~> 1.4.19", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "f096adb8bbca677d35d278223361c7792d496b3fc0d0224c9d4bc2f651af5db1"},
+  "ex_doc": {:hex, :ex_doc, "0.29.1", "b1c652fa5f92ee9cf15c75271168027f92039b3877094290a75abcaac82a9f77", [:mix], [{:earmark_parser, "~> 1.4.19", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "b7745fa6374a36daf484e2a2012274950e084815b936b1319aeebcf7809574f6"},
+  "expo": {:hex, :expo, "0.3.0", "13127c1d5f653b2927f2616a4c9ace5ae372efd67c7c2693b87fd0fdc30c6feb", [:mix], [], "hexpm", "fb3cd4bf012a77bc1608915497dae2ff684a06f0fa633c7afa90c4d72b881823"},
   "file_system": {:hex, :file_system, "0.2.10", "fb082005a9cd1711c05b5248710f8826b02d7d1784e7c3451f9c1231d4fc162d", [:mix], [], "hexpm", "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"},
   "floki": {:hex, :floki, "0.34.0", "002d0cc194b48794d74711731db004fafeb328fe676976f160685262d43706a8", [:mix], [], "hexpm", "9c3a9f43f40dde00332a589bd9d389b90c1f518aef500364d00636acc5ebc99c"},
   "gen_smtp": {:hex, :gen_smtp, "1.2.0", "9cfc75c72a8821588b9b9fe947ae5ab2aed95a052b81237e0928633a13276fd3", [:rebar3], [{:ranch, ">= 1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "5ee0375680bca8f20c4d85f58c2894441443a743355430ff33a783fe03296779"},
-  "gettext": {:hex, :gettext, "0.20.0", "75ad71de05f2ef56991dbae224d35c68b098dd0e26918def5bb45591d5c8d429", [:mix], [], "hexpm", "1c03b177435e93a47441d7f681a7040bd2a816ece9e2666d1c9001035121eb3d"},
-  "heex_formatter": {:git, "https://github.com/feliperenan/heex_formatter.git", "dfefc9ae267fb0874c287ceb6c47dda106c59552", []},
-  "html_entities": {:hex, :html_entities, "0.5.2", "9e47e70598da7de2a9ff6af8758399251db6dbb7eebe2b013f2bbd2515895c3c", [:mix], [], "hexpm", "c53ba390403485615623b9531e97696f076ed415e8d8058b1dbaa28181f4fdcc"},
-  "hut": {:hex, :hut, "1.3.0", "71f2f054e657c03f959cf1acc43f436ea87580696528ca2a55c8afb1b06c85e7", [:"erlang.mk", :rebar, :rebar3], [], "hexpm", "7e15d28555d8a1f2b5a3a931ec120af0753e4853a4c66053db354f35bf9ab563"},
+  "gettext": {:hex, :gettext, "0.22.0", "a25d71ec21b1848957d9207b81fd61cb25161688d282d58bdafef74c2270bdc4", [:mix], [{:expo, "~> 0.3.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "cb0675141576f73720c8e49b4f0fd3f2c69f0cd8c218202724d4aebab8c70ace"},
   "jason": {:hex, :jason, "1.4.0", "e855647bc964a44e2f67df589ccf49105ae039d4179db7f6271dfd3843dc27e6", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "79a3791085b2a0f743ca04cec0f7be26443738779d09302e01318f97bdb82121"},
   "makeup": {:hex, :makeup, "1.1.0", "6b67c8bc2882a6b6a445859952a602afc1a41c2e08379ca057c0f525366fc3ca", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "0a45ed501f4a8897f580eabf99a2e5234ea3e75a4373c8a52824f6e873be57a6"},
   "makeup_elixir": {:hex, :makeup_elixir, "0.16.0", "f8c570a0d33f8039513fbccaf7108c5d750f47d8defd44088371191b76492b0b", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "28b2cbdc13960a46ae9a8858c4bebdec3c9a6d7b4b9e7f4ed1502f8159f338e7"},
   "makeup_erlang": {:hex, :makeup_erlang, "0.1.1", "3fcb7f09eb9d98dc4d208f49cc955a34218fc41ff6b84df7c75b3e6e533cc65f", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "174d0809e98a4ef0b3309256cbf97101c6ec01c4ab0b23e926a9e17df2077cbb"},
   "mime": {:hex, :mime, "2.0.3", "3676436d3d1f7b81b5a2d2bd8405f412c677558c81b1c92be58c00562bb59095", [:mix], [], "hexpm", "27a30bf0db44d25eecba73755acf4068cbfe26a4372f9eb3e4ea3a45956bff6b"},
   "nimble_parsec": {:hex, :nimble_parsec, "1.2.3", "244836e6e3f1200c7f30cb56733fd808744eca61fd182f731eac4af635cc6d0b", [:mix], [], "hexpm", "c8d789e39b9131acf7b99291e93dae60ab48ef14a7ee9d58c6964f59efb570b0"},
-  "oban": {:hex, :oban, "2.13.4", "b4c4f48f4c89cc01036670eefa28aa9c03d09aadd402655475b936983d597006", [:mix], [{:ecto_sql, "~> 3.6", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.16", [hex: :postgrex, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a7d26f82b409e2d7928fbb75a17716e06ad3f783ebe9af260e3dd23abed7f124"},
+  "oban": {:hex, :oban, "2.13.6", "a0cb1bce3bd393770512231fb5a3695fa19fd3af10d7575bf73f837aee7abf43", [:mix], [{:ecto_sql, "~> 3.6", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.16", [hex: :postgrex, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "3c1c5eb16f377b3cbbf2ea14be24d20e3d91285af9d1ac86260b7c2af5464887"},
   "phoenix": {:hex, :phoenix, "1.6.15", "0a1d96bbc10747fd83525370d691953cdb6f3ccbac61aa01b4acb012474b047d", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 1.0 or ~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "d70ab9fbf6b394755ea88b644d34d79d8b146e490973151f248cacd122d20672"},
   "phoenix_ecto": {:hex, :phoenix_ecto, "4.4.0", "0672ed4e4808b3fbed494dded89958e22fb882de47a97634c0b13e7b0b5f7720", [:mix], [{:ecto, "~> 3.3", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "09864e558ed31ee00bd48fcc1d4fc58ae9678c9e81649075431e69dbabb43cc1"},
   "phoenix_html": {:hex, :phoenix_html, "3.2.0", "1c1219d4b6cb22ac72f12f73dc5fad6c7563104d083f711c3fcd8551a1f4ae11", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "36ec97ba56d25c0136ef1992c37957e4246b649d620958a1f9fa86165f8bc54f"},
   "phoenix_live_dashboard": {:hex, :phoenix_live_dashboard, "0.7.1", "b0bf8f3348dec4910907a2ad1453e642f6fe4d444376c1c9b26222d63c73cf97", [:mix], [{:ecto, "~> 3.6.2 or ~> 3.7", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_mysql_extras, "~> 0.5", [hex: :ecto_mysql_extras, repo: "hexpm", optional: true]}, {:ecto_psql_extras, "~> 0.7", [hex: :ecto_psql_extras, repo: "hexpm", optional: true]}, {:mime, "~> 1.6 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.18.0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:telemetry_metrics, "~> 0.6 or ~> 1.0", [hex: :telemetry_metrics, repo: "hexpm", optional: false]}], "hexpm", "b6c5d744bf4b40692b1b361d3608bdfd05aeab83e17c7bc217d730f007f31abf"},
-  "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.4.0", "4fe222c0be55fdc3f9c711e24955fc42a7cd9b7a2f5f406f2580a567c335a573", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "bebf0fc2d2113b61cb5968f585367234b7b4c21d963d691de7b4b2dc6cdaae6f"},
-  "phoenix_live_view": {:hex, :phoenix_live_view, "0.18.2", "635cf07de947235deb030cd6b776c71a3b790ab04cebf526aa8c879fe17c7784", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6 or ~> 1.7", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.1", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "da287a77327e996cc166e4c440c3ad5ab33ccdb151b91c793209b39ebbce5b75"},
+  "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.4.1", "2aff698f5e47369decde4357ba91fc9c37c6487a512b41732818f2204a8ef1d3", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "9bffb834e7ddf08467fe54ae58b5785507aaba6255568ae22b4d46e2bb3615ab"},
+  "phoenix_live_view": {:hex, :phoenix_live_view, "0.18.2", "635cf07de947235deb030cd6b776c71a3b790ab04cebf526aa8c879fe17c7784", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.1", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "da287a77327e996cc166e4c440c3ad5ab33ccdb151b91c793209b39ebbce5b75"},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.1", "ba04e489ef03763bf28a17eb2eaddc2c20c6d217e2150a61e3298b0f4c2012b5", [:mix], [], "hexpm", "81367c6d1eea5878ad726be80808eb5a787a23dee699f96e72b1109c57cdd8d9"},
   "phoenix_swoosh": {:hex, :phoenix_swoosh, "1.1.0", "f8e4780705c9f254cc853f7a40e25f7198ba4d91102bcfad2226669b69766b35", [:mix], [{:finch, "~> 0.8", [hex: :finch, repo: "hexpm", optional: true]}, {:hackney, "~> 1.10", [hex: :hackney, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6", [hex: :phoenix, repo: "hexpm", optional: true]}, {:phoenix_html, "~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_view, "~> 1.0 or ~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:swoosh, "~> 1.5", [hex: :swoosh, repo: "hexpm", optional: false]}], "hexpm", "aa82f10afd9a4b6080fdf3274dbb9432b25b210d42b4b6b55308f6e59cd87c3d"},
   "phoenix_view": {:hex, :phoenix_view, "1.1.2", "1b82764a065fb41051637872c7bd07ed2fdb6f5c3bd89684d4dca6e10115c95a", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "7ae90ad27b09091266f6adbb61e1d2516a7c3d7062c6789d46a7554ec40f3a56"},
@@ -47,10 +45,9 @@
   "plug_crypto": {:hex, :plug_crypto, "1.2.3", "8f77d13aeb32bfd9e654cb68f0af517b371fb34c56c9f2b58fe3df1235c1251a", [:mix], [], "hexpm", "b5672099c6ad5c202c45f5a403f21a3411247f164e4a8fab056e5cd8a290f4a2"},
   "postgrex": {:hex, :postgrex, "0.16.5", "fcc4035cc90e23933c5d69a9cd686e329469446ef7abba2cf70f08e2c4b69810", [:mix], [{:connection, "~> 1.1", [hex: :connection, repo: "hexpm", optional: false]}, {:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "edead639dc6e882618c01d8fc891214c481ab9a3788dfe38dd5e37fd1d5fb2e8"},
   "ranch": {:hex, :ranch, "1.8.0", "8c7a100a139fd57f17327b6413e4167ac559fbc04ca7448e9be9057311597a1d", [:make, :rebar3], [], "hexpm", "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"},
-  "set_locale": {:hex, :set_locale, "0.2.9", "33350ba3c66f1c560dffc43019eea4b573f91c5cbe3e461fe0e5395d2d6ba2c3", [:mix], [{:gettext, "~>0.14", [hex: :gettext, repo: "hexpm", optional: false]}, {:phoenix, ">1.3.0", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "e46348b64b7c5d725d0c90a6524942a19b65e6ce27372ddf9a727dfb64ba236c"},
-  "swoosh": {:hex, :swoosh, "1.8.2", "af9a22ab2c0d20b266f61acca737fa11a121902de9466a39e91bacdce012101c", [:mix], [{:cowboy, "~> 1.1 or ~> 2.4", [hex: :cowboy, repo: "hexpm", optional: true]}, {:ex_aws, "~> 2.1", [hex: :ex_aws, repo: "hexpm", optional: true]}, {:finch, "~> 0.6", [hex: :finch, repo: "hexpm", optional: true]}, {:gen_smtp, "~> 0.13 or ~> 1.0", [hex: :gen_smtp, repo: "hexpm", optional: true]}, {:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mail, "~> 0.2", [hex: :mail, repo: "hexpm", optional: true]}, {:mime, "~> 1.1 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_cowboy, ">= 1.0.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "d058ba750eafadb6c09a84a352c14c5d1eeeda6e84945fcc95785b7f3067b7db"},
+  "swoosh": {:hex, :swoosh, "1.9.1", "0a5d7bf9954eb41d7e55525bc0940379982b090abbaef67cd8e1fd2ed7f8ca1a", [:mix], [{:cowboy, "~> 1.1 or ~> 2.4", [hex: :cowboy, repo: "hexpm", optional: true]}, {:ex_aws, "~> 2.1", [hex: :ex_aws, repo: "hexpm", optional: true]}, {:finch, "~> 0.6", [hex: :finch, repo: "hexpm", optional: true]}, {:gen_smtp, "~> 0.13 or ~> 1.0", [hex: :gen_smtp, repo: "hexpm", optional: true]}, {:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mail, "~> 0.2", [hex: :mail, repo: "hexpm", optional: true]}, {:mime, "~> 1.1 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_cowboy, ">= 1.0.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "76dffff3ffcab80f249d5937a592eaef7cc49ac6f4cdd27e622868326ed6371e"},
   "table_rex": {:hex, :table_rex, "3.1.1", "0c67164d1714b5e806d5067c1e96ff098ba7ae79413cc075973e17c38a587caa", [:mix], [], "hexpm", "678a23aba4d670419c23c17790f9dcd635a4a89022040df7d5d772cb21012490"},
-  "telemetry": {:hex, :telemetry, "1.1.0", "a589817034a27eab11144ad24d5c0f9fab1f58173274b1e9bae7074af9cbee51", [:rebar3], [], "hexpm", "b727b2a1f75614774cff2d7565b64d0dfa5bd52ba517f16543e6fc7efcc0df48"},
+  "telemetry": {:hex, :telemetry, "1.2.1", "68fdfe8d8f05a8428483a97d7aab2f268aaff24b49e0f599faa091f1d4e7f61c", [:rebar3], [], "hexpm", "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"},
   "telemetry_metrics": {:hex, :telemetry_metrics, "0.6.1", "315d9163a1d4660aedc3fee73f33f1d355dcc76c5c3ab3d59e76e3edf80eef1f", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7be9e0871c41732c233be71e4be11b96e56177bf15dde64a8ac9ce72ac9834c6"},
   "telemetry_poller": {:hex, :telemetry_poller, "1.0.0", "db91bb424e07f2bb6e73926fcafbfcbcb295f0193e0a00e825e589a0a47e8453", [:rebar3], [{:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "b3a24eafd66c3f42da30fc3ca7dda1e9d546c12250a2d60d7b81d264fbec4f6e"},
 }

priv/gettext/actions.pot

@@ -12,12 +12,12 @@ msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/index.ex:54
 #: lib/cannery_web/live/ammo_group_live/index.ex:62
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:40
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Add Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:36
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Add your first box!"
 msgstr ""
@@ -33,13 +33,13 @@ msgid "Add your first type!"
 msgstr ""
 
 #: lib/cannery_web/templates/user_settings/edit.html.heex:15
-#: lib/cannery_web/templates/user_settings/edit.html.heex:44
+#: lib/cannery_web/templates/user_settings/edit.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Change email"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:58
-#: lib/cannery_web/templates/user_settings/edit.html.heex:99
+#: lib/cannery_web/templates/user_settings/edit.html.heex:57
+#: lib/cannery_web/templates/user_settings/edit.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Change password"
 msgstr ""
@@ -49,14 +49,14 @@ msgstr ""
 msgid "Create Invite"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:162
+#: lib/cannery_web/templates/user_settings/edit.html.heex:159
 #, elixir-autogen, elixir-format
 msgid "Delete User"
 msgstr ""
 
-#: lib/cannery_web/templates/user_registration/new.html.heex:52
+#: lib/cannery_web/templates/user_registration/new.html.heex:47
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:3
-#: lib/cannery_web/templates/user_session/new.html.heex:45
+#: lib/cannery_web/templates/user_session/new.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Forgot your password?"
 msgstr ""
@@ -67,12 +67,12 @@ msgid "Invite someone new!"
 msgstr ""
 
 #: lib/cannery_web/components/topbar.ex:137
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:30
-#: lib/cannery_web/templates/user_registration/new.html.heex:49
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:48
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:30
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:31
+#: lib/cannery_web/templates/user_registration/new.html.heex:44
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:45
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:31
 #: lib/cannery_web/templates/user_session/new.html.heex:3
-#: lib/cannery_web/templates/user_session/new.html.heex:33
+#: lib/cannery_web/templates/user_session/new.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Log in"
 msgstr ""
@@ -97,51 +97,51 @@ msgstr ""
 msgid "New Tag"
 msgstr ""
 
-#: lib/cannery_web/components/topbar.ex:128
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:26
+#: lib/cannery_web/components/topbar.ex:129
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:28
 #: lib/cannery_web/templates/user_registration/new.html.heex:3
-#: lib/cannery_web/templates/user_registration/new.html.heex:42
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:44
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:26
-#: lib/cannery_web/templates/user_session/new.html.heex:41
+#: lib/cannery_web/templates/user_registration/new.html.heex:37
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:42
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:28
+#: lib/cannery_web/templates/user_session/new.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Register"
 msgstr ""
 
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:3
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:16
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:15
 #, elixir-autogen, elixir-format
 msgid "Resend confirmation instructions"
 msgstr ""
 
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:3
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:34
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "Reset password"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:53
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:81
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:156
-#: lib/cannery_web/live/container_live/form_component.html.heex:50
-#: lib/cannery_web/live/invite_live/form_component.html.heex:31
-#: lib/cannery_web/live/range_live/form_component.html.heex:40
-#: lib/cannery_web/live/tag_live/form_component.ex:91
+#: lib/cannery_web/components/add_shot_group_component.html.heex:54
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:82
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:157
+#: lib/cannery_web/live/container_live/form_component.html.heex:51
+#: lib/cannery_web/live/invite_live/form_component.html.heex:32
+#: lib/cannery_web/live/range_live/form_component.html.heex:41
+#: lib/cannery_web/live/tag_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Save"
 msgstr ""
 
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:16
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:15
 #, elixir-autogen, elixir-format
 msgid "Send instructions to reset password"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:80
+#: lib/cannery_web/live/container_live/show.html.heex:76
 #, elixir-autogen, elixir-format
 msgid "Why not add one?"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:53
+#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:50
 #, elixir-autogen, elixir-format
 msgid "Add"
 msgstr ""
@@ -156,9 +156,9 @@ msgstr ""
 msgid "Why not get some ready to shoot?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:100
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:101
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:101
-#: lib/cannery_web/live/range_live/index.html.heex:39
+#: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Record shots"
 msgstr ""
@@ -178,27 +178,27 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:31
+#: lib/cannery_web/live/invite_live/index.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Copy to clipboard"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:21
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:22
 #, elixir-autogen, elixir-format
 msgid "add a container first"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:74
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Create"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:113
+#: lib/cannery_web/templates/user_settings/edit.html.heex:111
 #, elixir-autogen, elixir-format
 msgid "Change Language"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:139
+#: lib/cannery_web/templates/user_settings/edit.html.heex:136
 #, elixir-autogen, elixir-format
 msgid "Change language"
 msgstr ""
@@ -208,44 +208,34 @@ msgstr ""
 msgid "View in Catalog"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:31
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:32
 #, elixir-autogen, elixir-format
 msgid "add an ammo type first"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:60
-#, elixir-autogen, elixir-format
-msgid "Disable"
-msgstr ""
-
-#: lib/cannery_web/live/invite_live/index.html.heex:64
-#, elixir-autogen, elixir-format
-msgid "Enable"
-msgstr ""
-
 #: lib/cannery_web/components/move_ammo_group_component.ex:80
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:80
+#: lib/cannery_web/live/invite_live/index.html.heex:78
 #, elixir-autogen, elixir-format
 msgid "Set Unlimited"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:86
-#: lib/cannery_web/live/range_live/index.html.heex:32
+#: lib/cannery_web/live/range_live/index.html.heex:31
 #, elixir-autogen, elixir-format
 msgid "Stage for range"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:85
-#: lib/cannery_web/live/range_live/index.html.heex:31
+#: lib/cannery_web/live/range_live/index.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Unstage from range"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:153
+#: lib/cannery_web/templates/user_settings/edit.html.heex:150
 #, elixir-autogen, elixir-format
 msgid "Export Data as JSON"
 msgstr ""

priv/gettext/de/LC_MESSAGES/actions.po

@@ -25,12 +25,12 @@ msgstr ""
 ## effect: edit them in PO (.po) files instead.
 #: lib/cannery_web/live/ammo_group_live/index.ex:54
 #: lib/cannery_web/live/ammo_group_live/index.ex:62
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:40
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Add Ammo"
 msgstr "Munition hinzufügen"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:36
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Add your first box!"
 msgstr "Fügen Sie ihre erste Box hinzu!"
@@ -46,13 +46,13 @@ msgid "Add your first type!"
 msgstr "Fügen Sie ihre erste Munitionsart hinzu!"
 
 #: lib/cannery_web/templates/user_settings/edit.html.heex:15
-#: lib/cannery_web/templates/user_settings/edit.html.heex:44
+#: lib/cannery_web/templates/user_settings/edit.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Change email"
 msgstr "Mailadresse ändern"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:58
-#: lib/cannery_web/templates/user_settings/edit.html.heex:99
+#: lib/cannery_web/templates/user_settings/edit.html.heex:57
+#: lib/cannery_web/templates/user_settings/edit.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Change password"
 msgstr "Passwort ändern"
@@ -62,14 +62,14 @@ msgstr "Passwort ändern"
 msgid "Create Invite"
 msgstr "Einladung erstellen"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:162
+#: lib/cannery_web/templates/user_settings/edit.html.heex:159
 #, elixir-autogen, elixir-format
 msgid "Delete User"
 msgstr "Benutzer löschen"
 
-#: lib/cannery_web/templates/user_registration/new.html.heex:52
+#: lib/cannery_web/templates/user_registration/new.html.heex:47
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:3
-#: lib/cannery_web/templates/user_session/new.html.heex:45
+#: lib/cannery_web/templates/user_session/new.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
@@ -80,12 +80,12 @@ msgid "Invite someone new!"
 msgstr "Laden Sie jemanden ein!"
 
 #: lib/cannery_web/components/topbar.ex:137
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:30
-#: lib/cannery_web/templates/user_registration/new.html.heex:49
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:48
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:30
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:31
+#: lib/cannery_web/templates/user_registration/new.html.heex:44
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:45
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:31
 #: lib/cannery_web/templates/user_session/new.html.heex:3
-#: lib/cannery_web/templates/user_session/new.html.heex:33
+#: lib/cannery_web/templates/user_session/new.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Log in"
 msgstr "Einloggen"
@@ -110,51 +110,51 @@ msgstr "Neuer Behälter"
 msgid "New Tag"
 msgstr "Neuer Tag"
 
-#: lib/cannery_web/components/topbar.ex:128
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:26
+#: lib/cannery_web/components/topbar.ex:129
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:28
 #: lib/cannery_web/templates/user_registration/new.html.heex:3
-#: lib/cannery_web/templates/user_registration/new.html.heex:42
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:44
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:26
-#: lib/cannery_web/templates/user_session/new.html.heex:41
+#: lib/cannery_web/templates/user_registration/new.html.heex:37
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:42
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:28
+#: lib/cannery_web/templates/user_session/new.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Register"
 msgstr "Registrieren"
 
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:3
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:16
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:15
 #, elixir-autogen, elixir-format
 msgid "Resend confirmation instructions"
 msgstr "Bestätigungsmail erneut senden"
 
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:3
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:34
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:53
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:81
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:156
-#: lib/cannery_web/live/container_live/form_component.html.heex:50
-#: lib/cannery_web/live/invite_live/form_component.html.heex:31
-#: lib/cannery_web/live/range_live/form_component.html.heex:40
-#: lib/cannery_web/live/tag_live/form_component.ex:91
+#: lib/cannery_web/components/add_shot_group_component.html.heex:54
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:82
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:157
+#: lib/cannery_web/live/container_live/form_component.html.heex:51
+#: lib/cannery_web/live/invite_live/form_component.html.heex:32
+#: lib/cannery_web/live/range_live/form_component.html.heex:41
+#: lib/cannery_web/live/tag_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Save"
 msgstr "Speichern"
 
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:16
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:15
 #, elixir-autogen, elixir-format
 msgid "Send instructions to reset password"
 msgstr "Anleitung zum Passwort zurücksetzen zusenden"
 
-#: lib/cannery_web/live/container_live/show.html.heex:80
+#: lib/cannery_web/live/container_live/show.html.heex:76
 #, elixir-autogen, elixir-format
 msgid "Why not add one?"
 msgstr "Warum fügen Sie keine hinzu?"
 
-#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:53
+#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:50
 #, elixir-autogen, elixir-format
 msgid "Add"
 msgstr "Hinzufügen"
@@ -169,9 +169,9 @@ msgstr "Munition markieren"
 msgid "Why not get some ready to shoot?"
 msgstr "Warum nicht einige für den Schießstand auswählen?"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:100
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:101
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:101
-#: lib/cannery_web/live/range_live/index.html.heex:39
+#: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Record shots"
 msgstr "Schüsse dokumentieren"
@@ -191,27 +191,27 @@ msgstr "Behälter verschieben"
 msgid "Select"
 msgstr "Markieren"
 
-#: lib/cannery_web/live/invite_live/index.html.heex:31
+#: lib/cannery_web/live/invite_live/index.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Copy to clipboard"
 msgstr "In die Zwischenablage kopieren"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:21
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:22
 #, elixir-autogen, elixir-format
 msgid "add a container first"
 msgstr "Zuerst einen Behälter hinzufügen"
 
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:74
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Create"
 msgstr "Erstellen"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:113
+#: lib/cannery_web/templates/user_settings/edit.html.heex:111
 #, elixir-autogen, elixir-format
 msgid "Change Language"
 msgstr "Sprache wechseln"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:139
+#: lib/cannery_web/templates/user_settings/edit.html.heex:136
 #, elixir-autogen, elixir-format
 msgid "Change language"
 msgstr "Sprache wechseln"
@@ -221,44 +221,34 @@ msgstr "Sprache wechseln"
 msgid "View in Catalog"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:31
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:32
 #, elixir-autogen, elixir-format
 msgid "add an ammo type first"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:60
-#, elixir-autogen, elixir-format
-msgid "Disable"
-msgstr ""
-
-#: lib/cannery_web/live/invite_live/index.html.heex:64
-#, elixir-autogen, elixir-format
-msgid "Enable"
-msgstr ""
-
 #: lib/cannery_web/components/move_ammo_group_component.ex:80
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:80
+#: lib/cannery_web/live/invite_live/index.html.heex:78
 #, elixir-autogen, elixir-format
 msgid "Set Unlimited"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:86
-#: lib/cannery_web/live/range_live/index.html.heex:32
+#: lib/cannery_web/live/range_live/index.html.heex:31
 #, elixir-autogen, elixir-format
 msgid "Stage for range"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:85
-#: lib/cannery_web/live/range_live/index.html.heex:31
+#: lib/cannery_web/live/range_live/index.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Unstage from range"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:153
+#: lib/cannery_web/templates/user_settings/edit.html.heex:150
 #, elixir-autogen, elixir-format
 msgid "Export Data as JSON"
 msgstr ""

priv/gettext/de/LC_MESSAGES/emails.po

@@ -14,25 +14,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.11.2\n"
 
-## This file is a PO Template file.
-##
-## "msgid"s here are often extracted from source code.
-## Add new translations manually only if they're dynamic
-## translations that can't be statically extracted.
-##
-## Run "mix gettext.extract" to bring this file up to
-## date. Leave "msgstr"s empty as changing them here has no
-## effect: edit them in PO (.po) files instead.
-#: lib/cannery/accounts/email.ex:30
-#, elixir-autogen, elixir-format
-msgid "Confirm your %{name} account"
-msgstr "Bestätigen Sie ihr %{name} Nutzerkonto"
-
-#: lib/cannery_web/templates/email/confirm_email.html.eex:3
+#: lib/cannery_web/templates/email/confirm_email.html.heex:3
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:2
-#: lib/cannery_web/templates/email/reset_password.html.eex:3
+#: lib/cannery_web/templates/email/reset_password.html.heex:3
 #: lib/cannery_web/templates/email/reset_password.txt.eex:2
-#: lib/cannery_web/templates/email/update_email.html.eex:3
+#: lib/cannery_web/templates/email/update_email.html.heex:3
 #: lib/cannery_web/templates/email/update_email.txt.eex:2
 #, elixir-autogen, elixir-format
 msgid "Hi %{email},"
@@ -53,69 +39,79 @@ msgstr ""
 "Falls Sie diese Änderung von %{url} nicht angefordert haben, ignorieren Sie "
 "bitte diese Nachricht."
 
-#: lib/cannery/accounts/email.ex:37
-#, elixir-autogen, elixir-format
-msgid "Reset your %{name} password"
-msgstr "Passwort für %{name} zurücksetzen"
-
-#: lib/cannery/accounts/email.ex:44
-#, elixir-autogen, elixir-format
-msgid "Update your %{name} email"
-msgstr "Aktualisieren Sie %{name} Mailadresse"
-
-#: lib/cannery_web/templates/email/confirm_email.html.eex:9
-#, elixir-autogen, elixir-format
-msgid "Welcome to %{name}!"
-msgstr "Willkommen %{name}!"
-
-#: lib/cannery_web/templates/email/confirm_email.txt.eex:4
-#, elixir-autogen, elixir-format
-msgid "Welcome to %{name}%!"
-msgstr "Willkommen %{name}%!"
-
-#: lib/cannery_web/templates/email/update_email.html.eex:8
+#: lib/cannery_web/templates/email/update_email.html.heex:8
 #: lib/cannery_web/templates/email/update_email.txt.eex:4
 #, elixir-autogen, elixir-format
 msgid "You can change your email by visiting the URL below:"
 msgstr "Sie können Ihre Mailadresse unter folgender URL ändern:"
 
-#: lib/cannery_web/templates/email/confirm_email.html.eex:14
+#: lib/cannery_web/templates/email/confirm_email.html.heex:14
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:6
 #, elixir-autogen, elixir-format
 msgid "You can confirm your account by visiting the URL below:"
 msgstr "Sie können Ihr Nutzerkonto unter folgender URL bestätigen:"
 
-#: lib/cannery_web/templates/email/reset_password.html.eex:8
+#: lib/cannery_web/templates/email/reset_password.html.heex:8
 #: lib/cannery_web/templates/email/reset_password.txt.eex:4
 #, elixir-autogen, elixir-format
 msgid "You can reset your password by visiting the URL below:"
 msgstr "Sie können ihr Passwort unter folgender URL zurücksetzen:"
 
-#: lib/cannery_web/templates/email/confirm_email.html.eex:22
-#, elixir-autogen, elixir-format
-msgid "If you didn't create an account at %{name}, please ignore this."
+## This file is a PO Template file.
+##
+## "msgid"s here are often extracted from source code.
+## Add new translations manually only if they're dynamic
+## translations that can't be statically extracted.
+##
+## Run "mix gettext.extract" to bring this file up to
+## date. Leave "msgstr"s empty as changing them here has no
+## effect: edit them in PO (.po) files instead.
+#: lib/cannery/accounts/email.ex:30
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Confirm your Cannery account"
+msgstr "Bestätigen Sie ihr %{name} Nutzerkonto"
+
+#: lib/cannery_web/templates/email/confirm_email.html.heex:22
+#, elixir-autogen, elixir-format, fuzzy
+msgid "If you didn't create an account at Cannery, please ignore this."
 msgstr ""
 "Falls SIe dieses Nutzerkonto unter %{name}, nicht erstellt haben, ignorieren "
 "Sie diese Nachricht bitte."
 
-#: lib/cannery_web/templates/email/reset_password.html.eex:16
-#: lib/cannery_web/templates/email/update_email.html.eex:16
-#, elixir-autogen, elixir-format
-msgid "If you didn't request this change from %{name}, please ignore this."
+#: lib/cannery_web/templates/email/reset_password.html.heex:16
+#: lib/cannery_web/templates/email/update_email.html.heex:16
+#, elixir-autogen, elixir-format, fuzzy
+msgid "If you didn't request this change from Cannery, please ignore this."
 msgstr ""
 "Falls Sie die Änderung von %{name} nicht angefragt haben, ignorieren Sie "
 "diese Nachricht bitte."
 
+#: lib/cannery/accounts/email.ex:37
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Reset your Cannery password"
+msgstr "Passwort für %{name} zurücksetzen"
+
 #: lib/cannery_web/templates/layout/email.txt.eex:9
-#, elixir-autogen, elixir-format
-msgid "This email was sent from %{name} at %{url}, the self-hosted firearm tracker website."
+#, elixir-autogen, elixir-format, fuzzy
+msgid "This email was sent from Cannery at %{url}, the self-hosted firearm tracker website."
 msgstr ""
 "Diese Nachricht wurde von %{name} unter %{url} gesandt, einem selbst-"
 "gehosteten Schusswaffenmanager."
 
 #: lib/cannery_web/templates/layout/email.html.heex:13
-#, elixir-autogen, elixir-format
-msgid "This email was sent from %{name}, the self-hosted firearm tracker website."
+#, elixir-autogen, elixir-format, fuzzy
+msgid "This email was sent from Cannery, the self-hosted firearm tracker website."
 msgstr ""
 "Diese Nachricht wurde von %{name} gesandt, einem selbst-gehosteten "
 "Schusswaffenmanager."
+
+#: lib/cannery/accounts/email.ex:44
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Update your Cannery email"
+msgstr "Aktualisieren Sie %{name} Mailadresse"
+
+#: lib/cannery_web/templates/email/confirm_email.html.heex:9
+#: lib/cannery_web/templates/email/confirm_email.txt.eex:4
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Welcome to Cannery"
+msgstr "Willkommen %{name}!"

priv/gettext/de/LC_MESSAGES/errors.po

@@ -69,11 +69,11 @@ msgstr "Ungültige Mailadresse oder Passwort"
 msgid "Not found"
 msgstr "Nicht gefunden"
 
-#: lib/cannery_web/templates/user_registration/new.html.heex:16
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:16
-#: lib/cannery_web/templates/user_settings/edit.html.heex:21
+#: lib/cannery_web/templates/user_registration/new.html.heex:13
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:13
+#: lib/cannery_web/templates/user_settings/edit.html.heex:22
 #: lib/cannery_web/templates/user_settings/edit.html.heex:64
-#: lib/cannery_web/templates/user_settings/edit.html.heex:119
+#: lib/cannery_web/templates/user_settings/edit.html.heex:118
 #, elixir-autogen, elixir-format
 msgid "Oops, something went wrong! Please check the errors below."
 msgstr "Oops, etwas ist schiefgegangen. Bitte beachten Sie den Fehler unten."
@@ -83,14 +83,15 @@ msgstr "Oops, etwas ist schiefgegangen. Bitte beachten Sie den Fehler unten."
 msgid "Reset password link is invalid or it has expired."
 msgstr "Link zum Passwort zurücksetzen ist ungültig oder abgelaufen."
 
-#: lib/cannery_web/controllers/user_registration_controller.ex:24
-#: lib/cannery_web/controllers/user_registration_controller.ex:55
+#: lib/cannery_web/controllers/user_registration_controller.ex:22
+#: lib/cannery_web/controllers/user_registration_controller.ex:51
 #, elixir-autogen, elixir-format
 msgid "Sorry, public registration is disabled"
 msgstr "Entschuldigung, aber öffentliche Registrierung ist deaktiviert"
 
-#: lib/cannery_web/controllers/user_registration_controller.ex:14
-#: lib/cannery_web/controllers/user_registration_controller.ex:45
+#: lib/cannery_web/controllers/user_registration_controller.ex:12
+#: lib/cannery_web/controllers/user_registration_controller.ex:41
+#: lib/cannery_web/controllers/user_registration_controller.ex:70
 #, elixir-autogen, elixir-format
 msgid "Sorry, this invite was not found or expired"
 msgstr ""
@@ -111,7 +112,7 @@ msgstr "Unbefugt"
 msgid "User confirmation link is invalid or it has expired."
 msgstr "Nutzerkonto Bestätigungslink ist ungültig oder abgelaufen."
 
-#: lib/cannery_web/live/invite_live/index.ex:18
+#: lib/cannery_web/live/invite_live/index.ex:19
 #, elixir-autogen, elixir-format
 msgid "You are not authorized to view this page"
 msgstr "Sie sind nicht berechtigt, diese Seite aufzurufen"
@@ -121,22 +122,22 @@ msgstr "Sie sind nicht berechtigt, diese Seite aufzurufen"
 msgid "You are not authorized to view this page."
 msgstr "Sie sind nicht berechtigt, diese Seite aufzurufen."
 
-#: lib/cannery/accounts/user.ex:137
+#: lib/cannery/accounts/user.ex:144
 #, elixir-autogen, elixir-format
 msgid "did not change"
 msgstr "hat sich nicht geändert"
 
-#: lib/cannery/accounts/user.ex:158
+#: lib/cannery/accounts/user.ex:165
 #, elixir-autogen, elixir-format
 msgid "does not match password"
 msgstr "Passwort stimmt nicht überein"
 
-#: lib/cannery/accounts/user.ex:195
+#: lib/cannery/accounts/user.ex:202
 #, elixir-autogen, elixir-format
 msgid "is not valid"
 msgstr "ist nicht gültig"
 
-#: lib/cannery/accounts/user.ex:92
+#: lib/cannery/accounts/user.ex:99
 #, elixir-autogen, elixir-format
 msgid "must have the @ sign and no spaces"
 msgstr "Muss ein @ Zeichen und keine Leerzeichen haben"
@@ -197,7 +198,7 @@ msgstr ""
 msgid "Please select an ammo type and container"
 msgstr ""
 
-#: lib/cannery_web/live/range_live/index.html.heex:69
+#: lib/cannery_web/live/range_live/index.html.heex:67
 #, elixir-autogen, elixir-format
 msgid "Your browser does not support the canvas element."
 msgstr ""

priv/gettext/de/LC_MESSAGES/prompts.po

@@ -26,45 +26,28 @@ msgstr ""
 #: lib/cannery_web/live/ammo_type_live/form_component.ex:86
 #: lib/cannery_web/live/container_live/form_component.ex:89
 #: lib/cannery_web/live/invite_live/form_component.ex:80
-#: lib/cannery_web/live/tag_live/form_component.ex:126
+#: lib/cannery_web/live/tag_live/form_component.ex:79
 #, elixir-autogen, elixir-format
 msgid "%{name} created successfully"
 msgstr "%{name} erfolgreich erstellt"
 
 #: lib/cannery_web/live/ammo_type_live/index.ex:73
 #: lib/cannery_web/live/ammo_type_live/show.ex:55
-#: lib/cannery_web/live/invite_live/index.ex:53
-#: lib/cannery_web/live/invite_live/index.ex:133
 #: lib/cannery_web/live/tag_live/index.ex:64
 #, elixir-autogen, elixir-format
 msgid "%{name} deleted succesfully"
 msgstr "%{name} erfolgreich gelöscht"
 
-#: lib/cannery_web/live/invite_live/index.ex:109
-#, elixir-autogen, elixir-format
-msgid "%{name} disabled succesfully"
-msgstr "%{name} erfolgreich deaktiviert"
-
-#: lib/cannery_web/live/invite_live/index.ex:87
-#, elixir-autogen, elixir-format
-msgid "%{name} enabled succesfully"
-msgstr "%{name} erfolgreich aktiviert"
-
 #: lib/cannery_web/live/container_live/index.ex:85
 #: lib/cannery_web/live/container_live/show.ex:63
 #, elixir-autogen, elixir-format
 msgid "%{name} has been deleted"
 msgstr "%{name} wurde gelöscht"
 
-#: lib/cannery_web/live/invite_live/index.ex:67
-#, elixir-autogen, elixir-format
-msgid "%{name} updated succesfully"
-msgstr "%{name} erfolgreich aktualisiert"
-
 #: lib/cannery_web/live/ammo_type_live/form_component.ex:67
 #: lib/cannery_web/live/container_live/form_component.ex:70
 #: lib/cannery_web/live/invite_live/form_component.ex:62
-#: lib/cannery_web/live/tag_live/form_component.ex:108
+#: lib/cannery_web/live/tag_live/form_component.ex:61
 #, elixir-autogen, elixir-format
 msgid "%{name} updated successfully"
 msgstr "%{name} erfolgreich aktualisiert"
@@ -74,8 +57,8 @@ msgstr "%{name} erfolgreich aktualisiert"
 msgid "A link to confirm your email change has been sent to the new address."
 msgstr "Eine Mail zum Bestätigen ihre Mailadresse wurde Ihnen zugesandt."
 
-#: lib/cannery_web/live/invite_live/index.html.heex:103
-#: lib/cannery_web/live/invite_live/index.html.heex:133
+#: lib/cannery_web/live/invite_live/index.html.heex:98
+#: lib/cannery_web/live/invite_live/index.html.heex:126
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete %{email}? This action is permanent!"
 msgstr ""
@@ -83,39 +66,29 @@ msgstr ""
 "zurückgenommen werden!"
 
 #: lib/cannery_web/live/container_live/index.html.heex:92
-#: lib/cannery_web/live/container_live/index.html.heex:136
-#: lib/cannery_web/live/container_live/show.html.heex:59
-#: lib/cannery_web/live/tag_live/index.html.heex:64
+#: lib/cannery_web/live/container_live/index.html.heex:135
+#: lib/cannery_web/live/container_live/show.html.heex:55
+#: lib/cannery_web/live/tag_live/index.html.heex:63
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete %{name}?"
 msgstr "Sind Sie sicher, dass sie %{name} löschen möchten?"
 
-#: lib/cannery_web/live/invite_live/index.html.heex:49
-#, elixir-autogen, elixir-format
-msgid "Are you sure you want to delete the invite for %{name}?"
-msgstr "Sind Sie sicher, dass sie die Einladung für %{name} löschen möchten?"
-
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:152
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:153
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:75
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this ammo?"
 msgstr "Sind Sie sicher, dass sie diese Munition löschen möchten?"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:160
+#: lib/cannery_web/templates/user_settings/edit.html.heex:157
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete your account?"
 msgstr "Sind Sie sicher, dass sie Ihren Account löschen möchten?"
 
-#: lib/cannery_web/components/topbar.ex:106
+#: lib/cannery_web/components/topbar.ex:104
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to log out?"
 msgstr "Wirklich ausloggen?"
 
-#: lib/cannery_web/live/invite_live/index.html.heex:75
-#, elixir-autogen, elixir-format
-msgid "Are you sure you want to make %{name} unlimited?"
-msgstr "Sind Sie sicher, dass sie %{name} auf unbegrenzt setzen möchten?"
-
 #: lib/cannery_web/controllers/user_settings_controller.ex:77
 #, elixir-autogen, elixir-format
 msgid "Email changed successfully."
@@ -150,23 +123,18 @@ msgstr "Passwort erfolgreich zurückgesetzt."
 msgid "Password updated successfully."
 msgstr "Passwort erfolgreich geändert."
 
-#: lib/cannery_web/controllers/user_registration_controller.ex:73
+#: lib/cannery_web/controllers/user_registration_controller.ex:65
 #, elixir-autogen, elixir-format
 msgid "Please check your email to verify your account"
 msgstr "Bitte überprüfen Sie ihre Mailbox und bestätigen Sie das Nutzerkonto"
 
-#: lib/cannery_web/live/home_live.ex:91
-#, elixir-autogen, elixir-format
-msgid "Register to setup %{name}"
-msgstr "Registrieren Sie sich, um %{name} zu bearbeiten"
-
-#: lib/cannery_web/components/add_shot_group_component.html.heex:55
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:82
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:157
-#: lib/cannery_web/live/container_live/form_component.html.heex:52
-#: lib/cannery_web/live/invite_live/form_component.html.heex:33
-#: lib/cannery_web/live/range_live/form_component.html.heex:42
-#: lib/cannery_web/live/tag_live/form_component.ex:93
+#: lib/cannery_web/components/add_shot_group_component.html.heex:56
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:83
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:158
+#: lib/cannery_web/live/container_live/form_component.html.heex:53
+#: lib/cannery_web/live/invite_live/form_component.html.heex:34
+#: lib/cannery_web/live/range_live/form_component.html.heex:43
+#: lib/cannery_web/live/tag_live/form_component.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Saving..."
 msgstr "Speichere..."
@@ -193,7 +161,7 @@ msgstr "%{name} erfolgreich hinzugefügt"
 msgid "%{tag_name} has been removed from %{container_name}"
 msgstr "%{tag_name} wurde von %{container_name} entfernt"
 
-#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:55
+#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:52
 #, elixir-autogen, elixir-format
 msgid "Adding..."
 msgstr "Füge hinzu..."
@@ -203,13 +171,13 @@ msgstr "Füge hinzu..."
 msgid "Shots recorded successfully"
 msgstr "Schüsse erfolgreich dokumentiert"
 
-#: lib/cannery_web/live/range_live/index.html.heex:28
+#: lib/cannery_web/live/range_live/index.html.heex:27
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to unstage this ammo?"
 msgstr "Sind sie sicher, dass Sie diese Munition demarkieren möchten?"
 
-#: lib/cannery_web/live/ammo_group_live/show.ex:137
-#: lib/cannery_web/live/range_live/index.html.heex:118
+#: lib/cannery_web/live/ammo_group_live/show.ex:142
+#: lib/cannery_web/live/range_live/index.html.heex:116
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this shot record?"
 msgstr "Sind sie sicher, dass sie die Schießkladde löschen möchten?"
@@ -235,7 +203,7 @@ msgstr "%{email} erfolgreich bestätigt."
 msgid "Ammo moved to %{name} successfully"
 msgstr "Munition erfolgreich zu %{name} verschoben"
 
-#: lib/cannery_web/live/invite_live/index.ex:121
+#: lib/cannery_web/live/invite_live/index.ex:128
 #, elixir-autogen, elixir-format
 msgid "Copied to clipboard"
 msgstr "Der Zwischenablage hinzugefügt"
@@ -245,18 +213,18 @@ msgstr "Der Zwischenablage hinzugefügt"
 msgid "%{name} removed successfully"
 msgstr "%{name} erfolgreich entfernt"
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:17
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:27
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:18
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "You'll need to"
 msgstr "Sie müssen"
 
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:75
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:76
 #, elixir-autogen, elixir-format
 msgid "Creating..."
 msgstr "Erstellen..."
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:141
+#: lib/cannery_web/templates/user_settings/edit.html.heex:138
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to change your language?"
 msgstr "Möchten Sie die Sprache wechseln?"
@@ -290,7 +258,47 @@ msgstr[0] "Munitionsgruppe erfolgreich aktualisiert"
 msgstr[1] "Munitionsgruppe erfolgreich aktualisiert"
 
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:90
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:28
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:29
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!"
 msgstr "Sind Sie sicher, dass sie %{name} löschen möchten?"
+
+#: lib/cannery_web/live/home_live.html.heex:65
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Register to setup Cannery"
+msgstr "Registrieren Sie sich, um %{name} zu bearbeiten"
+
+#: lib/cannery_web/live/invite_live/index.ex:54
+#, elixir-autogen, elixir-format, fuzzy
+msgid "%{invite_name} deleted succesfully"
+msgstr "%{name} erfolgreich gelöscht"
+
+#: lib/cannery_web/live/invite_live/index.ex:115
+#, elixir-autogen, elixir-format, fuzzy
+msgid "%{invite_name} disabled succesfully"
+msgstr "%{name} erfolgreich deaktiviert"
+
+#: lib/cannery_web/live/invite_live/index.ex:91
+#, elixir-autogen, elixir-format, fuzzy
+msgid "%{invite_name} enabled succesfully"
+msgstr "%{name} erfolgreich aktiviert"
+
+#: lib/cannery_web/live/invite_live/index.ex:69
+#, elixir-autogen, elixir-format, fuzzy
+msgid "%{invite_name} updated succesfully"
+msgstr "%{name} erfolgreich aktualisiert"
+
+#: lib/cannery_web/live/invite_live/index.ex:140
+#, elixir-autogen, elixir-format, fuzzy
+msgid "%{user_email} deleted succesfully"
+msgstr "%{name} erfolgreich gelöscht"
+
+#: lib/cannery_web/live/invite_live/index.html.heex:48
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Are you sure you want to delete the invite for %{invite_name}?"
+msgstr "Sind Sie sicher, dass sie die Einladung für %{name} löschen möchten?"
+
+#: lib/cannery_web/live/invite_live/index.html.heex:73
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Are you sure you want to make %{invite_name} unlimited?"
+msgstr "Sind Sie sicher, dass sie %{name} auf unbegrenzt setzen möchten?"

priv/gettext/emails.pot

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

priv/gettext/en/LC_MESSAGES/actions.po

@@ -9,16 +9,15 @@
 msgid ""
 msgstr ""
 "Language: en\n"
-"Plural-Forms: nplurals=2\n"
 
 #: lib/cannery_web/live/ammo_group_live/index.ex:54
 #: lib/cannery_web/live/ammo_group_live/index.ex:62
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:40
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Add Ammo"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:36
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Add your first box!"
 msgstr ""
@@ -34,13 +33,13 @@ msgid "Add your first type!"
 msgstr ""
 
 #: lib/cannery_web/templates/user_settings/edit.html.heex:15
-#: lib/cannery_web/templates/user_settings/edit.html.heex:44
+#: lib/cannery_web/templates/user_settings/edit.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Change email"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:58
-#: lib/cannery_web/templates/user_settings/edit.html.heex:99
+#: lib/cannery_web/templates/user_settings/edit.html.heex:57
+#: lib/cannery_web/templates/user_settings/edit.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Change password"
 msgstr ""
@@ -50,14 +49,14 @@ msgstr ""
 msgid "Create Invite"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:162
+#: lib/cannery_web/templates/user_settings/edit.html.heex:159
 #, elixir-autogen, elixir-format
 msgid "Delete User"
 msgstr ""
 
-#: lib/cannery_web/templates/user_registration/new.html.heex:52
+#: lib/cannery_web/templates/user_registration/new.html.heex:47
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:3
-#: lib/cannery_web/templates/user_session/new.html.heex:45
+#: lib/cannery_web/templates/user_session/new.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Forgot your password?"
 msgstr ""
@@ -68,12 +67,12 @@ msgid "Invite someone new!"
 msgstr ""
 
 #: lib/cannery_web/components/topbar.ex:137
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:30
-#: lib/cannery_web/templates/user_registration/new.html.heex:49
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:48
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:30
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:31
+#: lib/cannery_web/templates/user_registration/new.html.heex:44
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:45
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:31
 #: lib/cannery_web/templates/user_session/new.html.heex:3
-#: lib/cannery_web/templates/user_session/new.html.heex:33
+#: lib/cannery_web/templates/user_session/new.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Log in"
 msgstr ""
@@ -98,51 +97,51 @@ msgstr ""
 msgid "New Tag"
 msgstr ""
 
-#: lib/cannery_web/components/topbar.ex:128
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:26
+#: lib/cannery_web/components/topbar.ex:129
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:28
 #: lib/cannery_web/templates/user_registration/new.html.heex:3
-#: lib/cannery_web/templates/user_registration/new.html.heex:42
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:44
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:26
-#: lib/cannery_web/templates/user_session/new.html.heex:41
+#: lib/cannery_web/templates/user_registration/new.html.heex:37
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:42
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:28
+#: lib/cannery_web/templates/user_session/new.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Register"
 msgstr ""
 
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:3
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:16
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:15
 #, elixir-autogen, elixir-format
 msgid "Resend confirmation instructions"
 msgstr ""
 
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:3
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:34
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "Reset password"
 msgstr ""
 
-#: lib/cannery_web/components/add_shot_group_component.html.heex:53
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:81
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:156
-#: lib/cannery_web/live/container_live/form_component.html.heex:50
-#: lib/cannery_web/live/invite_live/form_component.html.heex:31
-#: lib/cannery_web/live/range_live/form_component.html.heex:40
-#: lib/cannery_web/live/tag_live/form_component.ex:91
+#: lib/cannery_web/components/add_shot_group_component.html.heex:54
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:82
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:157
+#: lib/cannery_web/live/container_live/form_component.html.heex:51
+#: lib/cannery_web/live/invite_live/form_component.html.heex:32
+#: lib/cannery_web/live/range_live/form_component.html.heex:41
+#: lib/cannery_web/live/tag_live/form_component.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Save"
 msgstr ""
 
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:16
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:15
 #, elixir-autogen, elixir-format
 msgid "Send instructions to reset password"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/show.html.heex:80
+#: lib/cannery_web/live/container_live/show.html.heex:76
 #, elixir-autogen, elixir-format
 msgid "Why not add one?"
 msgstr ""
 
-#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:53
+#: lib/cannery_web/live/container_live/edit_tags_component.html.heex:50
 #, elixir-autogen, elixir-format
 msgid "Add"
 msgstr ""
@@ -157,9 +156,9 @@ msgstr ""
 msgid "Why not get some ready to shoot?"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:100
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:101
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:101
-#: lib/cannery_web/live/range_live/index.html.heex:39
+#: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Record shots"
 msgstr ""
@@ -179,27 +178,27 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:31
+#: lib/cannery_web/live/invite_live/index.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Copy to clipboard"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:21
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:22
 #, elixir-autogen, elixir-format
 msgid "add a container first"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:74
+#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:75
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Create"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:113
+#: lib/cannery_web/templates/user_settings/edit.html.heex:111
 #, elixir-autogen, elixir-format
 msgid "Change Language"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:139
+#: lib/cannery_web/templates/user_settings/edit.html.heex:136
 #, elixir-autogen, elixir-format
 msgid "Change language"
 msgstr ""
@@ -209,44 +208,34 @@ msgstr ""
 msgid "View in Catalog"
 msgstr ""
 
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:31
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:32
 #, elixir-autogen, elixir-format
 msgid "add an ammo type first"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:60
-#, elixir-autogen, elixir-format
-msgid "Disable"
-msgstr ""
-
-#: lib/cannery_web/live/invite_live/index.html.heex:64
-#, elixir-autogen, elixir-format
-msgid "Enable"
-msgstr ""
-
 #: lib/cannery_web/components/move_ammo_group_component.ex:80
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr ""
 
-#: lib/cannery_web/live/invite_live/index.html.heex:80
+#: lib/cannery_web/live/invite_live/index.html.heex:78
 #, elixir-autogen, elixir-format
 msgid "Set Unlimited"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:86
-#: lib/cannery_web/live/range_live/index.html.heex:32
+#: lib/cannery_web/live/range_live/index.html.heex:31
 #, elixir-autogen, elixir-format
 msgid "Stage for range"
 msgstr ""
 
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:85
-#: lib/cannery_web/live/range_live/index.html.heex:31
+#: lib/cannery_web/live/range_live/index.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Unstage from range"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:153
+#: lib/cannery_web/templates/user_settings/edit.html.heex:150
 #, elixir-autogen, elixir-format
 msgid "Export Data as JSON"
 msgstr ""

priv/gettext/en/LC_MESSAGES/emails.po

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