run mix format

lib/cannery/ammo.ex

@@ -256,6 +256,12 @@ defmodule Cannery.Ammo do
     |> Repo.insert()
   end
 
+  def create_ammo_group(invalid_attrs, _user) do
+    %AmmoGroup{}
+    |> AmmoGroup.create_changeset(invalid_attrs |> Map.put("user_id", "-1"))
+    |> Repo.insert()
+  end
+
   @doc """
   Updates a ammo_group.
 

lib/cannery_web/components/add_shot_group_component.html.heex

@@ -1,5 +1,5 @@
 <div>
-  <h2 class="text-center title text-xl text-primary-600">
+  <h2 class="mb-8 text-center title text-xl text-primary-600">
     <%= gettext("Record shots") %>
   </h2>
 
@@ -7,7 +7,7 @@
     let={f}
     for={@changeset}
     id="shot-group-form"
-    class="flex flex-col sm:grid sm:grid-cols-3 justify-center items-center space-y-4"
+    class="flex flex-col sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
     phx-target={@myself}
     phx-change="validate"
     phx-submit="save"

lib/cannery_web/components/move_ammo_group_component.html.heex

@@ -1,5 +1,5 @@
 <div class="w-full flex flex-col space-y-8 justify-center items-center">
-  <h2 class="text-center title text-xl text-primary-600">
+  <h2 class="mb-8 text-center title text-xl text-primary-600">
     <%= gettext("Move ammo") %>
   </h2>
 

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

@@ -1,5 +1,5 @@
 <div>
-  <h2 class="text-center title text-xl text-primary-600">
+  <h2 class="mb-8 text-center title text-xl text-primary-600">
     <%= @title %>
   </h2>
 
@@ -10,7 +10,7 @@
     phx-target={@myself}
     phx-change="validate"
     phx-submit="save"
-    class="flex flex-col sm:grid sm:grid-cols-3 justify-center items-center space-y-4"
+    class="flex flex-col 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">

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

@@ -1,5 +1,5 @@
 <div>
-  <h2 class="text-center title text-xl text-primary-600">
+  <h2 class="mb-8 text-center title text-xl text-primary-600">
     <%= @title %>
   </h2>
   <.form
@@ -9,7 +9,7 @@
     phx-target={@myself}
     phx-change="validate"
     phx-submit="save"
-    class="flex flex-col sm:grid sm:grid-cols-3 justify-center items-center space-y-4"
+    class="flex flex-col 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">
@@ -97,10 +97,7 @@
     <%= label(f, :powder_type, gettext("Powder type"),
       class: "mr-4 title text-lg text-primary-600"
     ) %>
-    <%= text_input(f, :powder_type,
+    <%= text_input(f, :powder_type, class: "text-center col-span-2 input input-primary") %>
-      class: "text-center col-span-2 input input-primary",
-      placeholder: gettext("Brass")
-    ) %>
     <%= error_tag(f, :powder_type, "col-span-3 text-center") %>
 
     <%= label(f, :powder_grains_per_charge, gettext("Powder grains per charge"),

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

@@ -1,5 +1,5 @@
 <div>
-  <h2 class="mb-4 text-center title text-xl text-primary-600">
+  <h2 class="mb-8 text-center title text-xl text-primary-600">
     <%= @title %>
   </h2>
 
@@ -7,7 +7,7 @@
     let={f}
     for={:tag}
     id="add-tag-to-container-form"
-    class="flex flex-col sm:grid sm:grid-cols-3 justify-center items-center space-x-2"
+    class="flex flex-col sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
     phx-target={@myself}
     phx-submit="save"
   >

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

@@ -1,12 +1,12 @@
 <div>
-  <h2 class="text-center title text-xl text-primary-600">
+  <h2 class="mb-8 text-center title text-xl text-primary-600">
     <%= @title %>
   </h2>
   <.form
     let={f}
     for={@changeset}
     id="container-form"
-    class="flex flex-col sm:grid sm:grid-cols-3 justify-center items-center space-y-4"
+    class="flex flex-col sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
     phx-target={@myself}
     phx-change="validate"
     phx-submit="save"

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

@@ -1,12 +1,12 @@
 <div>
-  <h2 class="text-center title text-xl text-primary-600">
+  <h2 class="mb-8 text-center title text-xl text-primary-600">
     <%= @title %>
   </h2>
   <.form
     let={f}
     for={@changeset}
     id="invite-form"
-    class="flex flex-col sm:grid sm:grid-cols-3 justify-center items-center space-y-4"
+    class="flex flex-col sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
     phx-target={@myself}
     phx-change="validate"
     phx-submit="save"

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

@@ -1,5 +1,5 @@
 <div>
-  <h2 class="text-center title text-xl text-primary-600">
+  <h2 class="mb-8 text-center title text-xl text-primary-600">
     <%= @title %>
   </h2>
 
@@ -7,7 +7,7 @@
     let={f}
     for={@changeset}
     id="shot-group-form"
-    class="flex flex-col sm:grid sm:grid-cols-3 justify-center items-center space-y-4"
+    class="flex flex-col sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
     phx-target={@myself}
     phx-change="validate"
     phx-submit="save"

lib/cannery_web/live/tag_live/form_component.ex

@@ -29,14 +29,14 @@ defmodule CanneryWeb.TagLive.FormComponent do
   def render(assigns) do
     ~H"""
     <div>
-      <h2 class="text-center title text-xl text-primary-600">
+      <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 sm:grid sm:grid-cols-3 justify-center items-center space-y-4"
+        class="flex flex-col sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
         phx-target={@myself}
         phx-change="validate"
         phx-submit="save"

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

@@ -15,7 +15,7 @@
 
   <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/>
 

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

@@ -9,7 +9,7 @@
 
   <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/>
 

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

@@ -9,7 +9,7 @@
 
   <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/>
 

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

@@ -1,4 +1,4 @@
-<div class="mb-8 flex flex-col justify-center items-center space-y-4">
+<div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
   <h1 class="title text-primary-600 text-xl">
     <%= dgettext("actions", "Resend confirmation instructions") %>
   </h1>
@@ -7,15 +7,14 @@
            Routes.user_confirmation_path(@conn, :create),
            [
              class:
-               "flex flex-col sm:grid sm:grid-cols-3" <>
+               "flex flex-col sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
-                 "justify-center items-center text-center space-y-4"
            ],
            fn f -> %>
     <%= label(f, :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 my-4 btn btn-primary col-span-3"
+      class: "mx-auto btn btn-primary col-span-3"
     ) %>
   <% end %>
 

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

@@ -1,4 +1,4 @@
-<div class="mb-8 flex flex-col justify-center items-center space-y-4">
+<div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
   <h1 class="title text-primary-600 text-xl">
     <%= dgettext("actions", "Register") %>
   </h1>
@@ -7,8 +7,7 @@
            Routes.user_registration_path(@conn, :create),
            [
              class:
-               "flex flex-col sm:grid sm:grid-cols-3" <>
+               "flex flex-col sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
-                 "justify-center items-center text-center space-y-4"
            ],
            fn f -> %>
     <%= if @changeset.action && not @changeset.valid? do %>
@@ -31,7 +30,7 @@
     <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %>
     <%= error_tag(f, :password, "col-span-3") %>
 
-    <%= submit(dgettext("actions", "Register"), class: "mx-auto my-4 btn btn-primary col-span-3") %>
+    <%= submit(dgettext("actions", "Register"), class: "mx-auto btn btn-primary col-span-3") %>
   <% end %>
 
   <hr class="hr" />

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

@@ -1,4 +1,4 @@
-<div class="mb-8 flex flex-col justify-center items-center space-y-4">
+<div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
   <h1 class="title text-primary-600 text-xl">
     <%= dgettext("actions", "Reset password") %>
   </h1>
@@ -7,8 +7,7 @@
            Routes.user_reset_password_path(@conn, :update, @token),
            [
              class:
-               "flex flex-col sm:grid sm:grid-cols-3" <>
+               "flex flex-col sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
-                 "justify-center items-center text-center space-y-4"
            ],
            fn f -> %>
     <%= if @changeset.action && not @changeset.valid? do %>
@@ -33,7 +32,7 @@
     <%= error_tag(f, :password_confirmation, "col-span-3") %>
 
     <%= submit(dgettext("actions", "Reset password"),
-      class: "mx-auto my-4 btn btn-primary col-span-3"
+      class: "mx-auto btn btn-primary col-span-3"
     ) %>
   <% end %>
 

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

@@ -1,4 +1,4 @@
-<div class="mb-8 flex flex-col justify-center items-center space-y-4">
+<div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
   <h1 class="title text-primary-600 text-xl">
     <%= dgettext("actions", "Forgot your password?") %>
   </h1>
@@ -7,15 +7,14 @@
            Routes.user_reset_password_path(@conn, :create),
            [
              class:
-               "flex flex-col sm:grid sm:grid-cols-3" <>
+               "flex flex-col sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
-                 "justify-center items-center text-center space-y-4"
            ],
            fn f -> %>
     <%= label(f, :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 my-4 btn btn-primary col-span-3"
+      class: "mx-auto btn btn-primary col-span-3"
     ) %>
   <% end %>
 

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

@@ -1,4 +1,4 @@
-<div class="mb-8 flex flex-col justify-center items-center space-y-4">
+<div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
   <h1 class="title text-primary-600 text-xl">
     <%= dgettext("actions", "Log in") %>
   </h1>
@@ -8,8 +8,7 @@
            [
              as: :user,
              class:
-               "flex flex-col sm:grid sm:grid-cols-3" <>
+               "flex flex-col sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
-                 "justify-center items-center text-center space-y-4"
            ],
            fn f -> %>
     <%= if @error_message do %>
@@ -31,7 +30,7 @@
     ) %>
     <%= checkbox(f, :remember_me, class: "checkbox col-span-2") %>
 
-    <%= submit(dgettext("actions", "Log in"), class: "mx-auto my-4 btn btn-primary col-span-3") %>
+    <%= submit(dgettext("actions", "Log in"), class: "mx-auto btn btn-primary col-span-3") %>
   <% end %>
 
   <hr class="hr" />

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

@@ -1,4 +1,4 @@
-<div class="mb-8 flex flex-col justify-center items-center space-y-4">
+<div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
   <h1 class="pb-4 title text-primary-600 text-xl">
     <%= gettext("Settings") %>
   </h1>
@@ -9,8 +9,7 @@
            Routes.user_settings_path(@conn, :update),
            [
              class:
-               "pb-4 flex flex-col sm:grid sm:grid-cols-3" <>
+               "pb-4 text-center flex flex-col sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
-                 "justify-center items-center text-center space-y-4"
            ],
            fn f -> %>
     <h3 class="title text-primary-600 text-lg col-span-3">
@@ -44,7 +43,7 @@
     <%= error_tag(f, :current_password, "col-span-3") %>
 
     <%= submit(dgettext("actions", "Change email"),
-      class: "mx-auto my-4 btn btn-primary col-span-3"
+      class: "mx-auto btn btn-primary col-span-3"
     ) %>
   <% end %>
 
@@ -54,7 +53,7 @@
            Routes.user_settings_path(@conn, :update),
            [
              class:
-               "pb-4 flex flex-col sm:grid sm:grid-cols-3 justify-center items-center text-center space-y-4"
+               "pb-4 text-center flex flex-col sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
            ],
            fn f -> %>
     <h3 class="title text-primary-600 text-lg col-span-3">
@@ -100,7 +99,7 @@
     <%= error_tag(f, :current_password, "col-span-3") %>
 
     <%= submit(dgettext("actions", "Change password"),
-      class: "mx-auto my-4 btn btn-primary col-span-3"
+      class: "mx-auto btn btn-primary col-span-3"
     ) %>
   <% end %>
 

priv/gettext/actions.pot

@@ -31,14 +31,14 @@ msgid "Add your first type!"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:17
+#: lib/cannery_web/templates/user_settings/edit.html.heex:16
-#: lib/cannery_web/templates/user_settings/edit.html.heex:46
+#: lib/cannery_web/templates/user_settings/edit.html.heex:45
 msgid "Change email"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:61
+#: lib/cannery_web/templates/user_settings/edit.html.heex:60
-#: lib/cannery_web/templates/user_settings/edit.html.heex:102
+#: lib/cannery_web/templates/user_settings/edit.html.heex:101
 msgid "Change password"
 msgstr ""
 
@@ -48,14 +48,14 @@ msgid "Create Invite"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:109
+#: lib/cannery_web/templates/user_settings/edit.html.heex:108
 msgid "Delete User"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_registration/new.html.heex:44
+#: lib/cannery_web/templates/user_registration/new.html.heex:43
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:3
-#: lib/cannery_web/templates/user_session/new.html.heex:46
+#: lib/cannery_web/templates/user_session/new.html.heex:45
 msgid "Forgot your password?"
 msgstr ""
 
@@ -66,12 +66,12 @@ msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/topbar.ex:108
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:31
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:30
-#: lib/cannery_web/templates/user_registration/new.html.heex:40
+#: lib/cannery_web/templates/user_registration/new.html.heex:39
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:49
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:48
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:31
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:30
 #: lib/cannery_web/templates/user_session/new.html.heex:3
-#: lib/cannery_web/templates/user_session/new.html.heex:34
+#: lib/cannery_web/templates/user_session/new.html.heex:33
 msgid "Log in"
 msgstr ""
 
@@ -102,31 +102,31 @@ msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/topbar.ex:101
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:26
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:25
 #: lib/cannery_web/templates/user_registration/new.html.heex:3
-#: lib/cannery_web/templates/user_registration/new.html.heex:34
+#: lib/cannery_web/templates/user_registration/new.html.heex:33
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:44
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:43
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:26
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:25
-#: lib/cannery_web/templates/user_session/new.html.heex:41
+#: lib/cannery_web/templates/user_session/new.html.heex:40
 msgid "Register"
 msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:3
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:17
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:16
 msgid "Resend confirmation instructions"
 msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:3
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:35
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:34
 msgid "Reset password"
 msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/add_shot_group_component.html.heex:42
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:54
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:175
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:172
 #: lib/cannery_web/live/container_live/form_component.html.heex:50
 #: lib/cannery_web/live/invite_live/form_component.html.heex:28
 #: lib/cannery_web/live/range_live/form_component.html.heex:40
@@ -135,7 +135,7 @@ msgid "Save"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:17
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:16
 msgid "Send instructions to reset password"
 msgstr ""
 

priv/gettext/default.pot

@@ -54,14 +54,13 @@ msgid "Background color"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:157
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:154
 #: lib/cannery_web/live/ammo_type_live/index.ex:67
 msgid "Blank"
 msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:74
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:102
 msgid "Brass"
 msgstr ""
 
@@ -114,7 +113,7 @@ msgid "Containers"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:161
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:158
 #: lib/cannery_web/live/ammo_type_live/index.ex:68
 msgid "Corrosive"
 msgstr ""
@@ -197,14 +196,14 @@ msgid "FMJ"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:116
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:113
 #: lib/cannery_web/live/ammo_type_live/index.ex:61
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:49
 msgid "Grains"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:153
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:150
 #: lib/cannery_web/live/ammo_type_live/index.ex:66
 msgid "Incendiary"
 msgstr ""
@@ -231,7 +230,7 @@ msgid "Invites"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_session/new.html.heex:29
+#: lib/cannery_web/templates/user_session/new.html.heex:28
 msgid "Keep me logged in for 60 days"
 msgstr ""
 
@@ -278,7 +277,7 @@ msgid "Manage"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:165
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:162
 #: lib/cannery_web/live/ammo_type_live/index.ex:69
 msgid "Manufacturer"
 msgstr ""
@@ -378,7 +377,7 @@ msgid "On the bookshelf"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:124
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:121
 #: lib/cannery_web/live/ammo_type_live/index.ex:62
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:50
 msgid "Pressure"
@@ -397,7 +396,7 @@ msgid "Price paid:"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:131
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:128
 #: lib/cannery_web/live/ammo_type_live/index.ex:63
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:51
 msgid "Primer type"
@@ -491,7 +490,7 @@ msgid "This ammo group is not in a container"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:149
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:146
 #: lib/cannery_web/live/ammo_type_live/index.ex:65
 msgid "Tracer"
 msgstr ""
@@ -688,7 +687,7 @@ msgid "Muzzle velocity"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:106
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:103
 #: lib/cannery_web/live/ammo_type_live/index.ex:60
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:48
 msgid "Powder grains per charge"
@@ -702,24 +701,24 @@ msgid "Powder type"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:171
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:168
 #: lib/cannery_web/live/ammo_type_live/index.ex:70
 msgid "UPC"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:81
+#: lib/cannery_web/templates/user_settings/edit.html.heex:80
 msgid "Confirm new password"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:34
+#: lib/cannery_web/templates/user_settings/edit.html.heex:33
-#: lib/cannery_web/templates/user_settings/edit.html.heex:90
+#: lib/cannery_web/templates/user_settings/edit.html.heex:89
 msgid "Current password"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:74
+#: lib/cannery_web/templates/user_settings/edit.html.heex:73
 msgid "New password"
 msgstr ""
 
@@ -734,7 +733,7 @@ msgid "Unstage"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:140
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:137
 msgid "Firing type"
 msgstr ""
 

priv/gettext/errors.pot

@@ -57,10 +57,10 @@ msgid "Not found"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_registration/new.html.heex:17
+#: lib/cannery_web/templates/user_registration/new.html.heex:16
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:17
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:16
-#: lib/cannery_web/templates/user_settings/edit.html.heex:23
+#: lib/cannery_web/templates/user_settings/edit.html.heex:22
-#: lib/cannery_web/templates/user_settings/edit.html.heex:67
+#: lib/cannery_web/templates/user_settings/edit.html.heex:66
 msgid "Oops, something went wrong! Please check the errors below."
 msgstr ""
 

priv/gettext/prompts.pot

@@ -104,7 +104,7 @@ msgid "Are you sure you want to delete this ammo?"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:113
+#: lib/cannery_web/templates/user_settings/edit.html.heex:112
 msgid "Are you sure you want to delete your account?"
 msgstr ""
 
@@ -161,7 +161,7 @@ msgstr ""
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/add_shot_group_component.html.heex:44
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:55
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:176
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:173
 #: lib/cannery_web/live/container_live/form_component.html.heex:52
 #: lib/cannery_web/live/invite_live/form_component.html.heex:30
 #: lib/cannery_web/live/range_live/form_component.html.heex:42

test/support/fixtures.ex

@@ -56,8 +56,8 @@ defmodule Cannery.Fixtures do
       |> Atom.to_string()
       |> Email.generate_email(Accounts.get_user!(user_id), attrs)
 
-    [_, html_token, _] = email.html_body |> String.split("[TOKEN]")
+    [_, html_token | _] = email.html_body |> String.split("[TOKEN]")
-    [_, text_token, _] = email.text_body |> String.split("[TOKEN]")
+    [_, text_token | _] = email.text_body |> String.split("[TOKEN]")
     ^text_token = html_token
   end