mix format

add page titles to registration and setting pages
fix grids having uneven margins in phone mode
2022-02-20 20:40:24 -05:00 · 2022-02-20 20:39:27 -05:00 · 2022-02-20 20:28:42 -05:00 · 2022-02-20 20:28:34 -05:00
18 changed files with 171 additions and 125 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,7 @@
+# v0.2.3
+- Fix modals with overflowing forms
+- Add page titles to registration and setting pages
+
 # v0.2.2
 - Fix loading and reconnecting pages not being fixed
 - Fix closing modal in some cases not triggering a page reload
--- a/lib/cannery_web/controllers/user_confirmation_controller.ex
+++ b/lib/cannery_web/controllers/user_confirmation_controller.ex
@ -1,10 +1,11 @@
 defmodule CanneryWeb.UserConfirmationController do
  use CanneryWeb, :controller

+  import CanneryWeb.Gettext
  alias Cannery.Accounts

  def new(conn, _params) do
-    render(conn, "new.html")
+    render(conn, "new.html", page_title: gettext("Confirm your account"))
  end

  def create(conn, %{"user" => %{"email" => email}}) do
--- a/lib/cannery_web/controllers/user_registration_controller.ex
+++ b/lib/cannery_web/controllers/user_registration_controller.ex
@ -29,8 +29,11 @@ defmodule CanneryWeb.UserRegistrationController do

  # renders new user registration page
  defp render_new(conn, invite \\ nil) do
-    changeset = Accounts.change_user_registration(%User{})
-    conn |> render("new.html", changeset: changeset, invite: invite)
+    render(conn, "new.html",
+      changeset: Accounts.change_user_registration(%User{}),
+      invite: invite,
+      page_title: gettext("Register")
+    )
  end

  def create(conn, %{"user" => %{"invite_token" => invite_token}} = attrs) do
--- a/lib/cannery_web/controllers/user_reset_password_controller.ex
+++ b/lib/cannery_web/controllers/user_reset_password_controller.ex
@ -6,7 +6,7 @@ defmodule CanneryWeb.UserResetPasswordController do
  plug :get_user_by_reset_password_token when action in [:edit, :update]

  def new(conn, _params) do
-    render(conn, "new.html")
+    render(conn, "new.html", page_title: gettext("Forgot your password?"))
  end

  def create(conn, %{"user" => %{"email" => email}}) do
@ -31,7 +31,10 @@ defmodule CanneryWeb.UserResetPasswordController do
  end

  def edit(conn, _params) do
-    render(conn, "edit.html", changeset: Accounts.change_user_password(conn.assigns.user))
+    render(conn, "edit.html",
+      changeset: Accounts.change_user_password(conn.assigns.user),
+      page_title: gettext("Reset your password")
+    )
  end

  # Do not log in the user after reset password to avoid a
--- a/lib/cannery_web/controllers/user_session_controller.ex
+++ b/lib/cannery_web/controllers/user_session_controller.ex
@ -5,7 +5,7 @@ defmodule CanneryWeb.UserSessionController do
  alias CanneryWeb.UserAuth

  def new(conn, _params) do
-    render(conn, "new.html", error_message: nil)
+    render(conn, "new.html", error_message: nil, page_title: gettext("Log in"))
  end

  def create(conn, %{"user" => user_params}) do
--- a/lib/cannery_web/controllers/user_settings_controller.ex
+++ b/lib/cannery_web/controllers/user_settings_controller.ex
@ -1,13 +1,13 @@
 defmodule CanneryWeb.UserSettingsController do
  use CanneryWeb, :controller
-
+  import CanneryWeb.Gettext
  alias Cannery.Accounts
  alias CanneryWeb.{HomeLive, UserAuth}

  plug :assign_email_and_password_changesets

  def edit(conn, _params) do
-    render(conn, "edit.html")
+    render(conn, "edit.html", page_title: gettext("Settings"))
  end

  def update(conn, %{"action" => "update_email"} = params) do
--- a/lib/cannery_web/live/ammo_group_live/form_component.html.heex
+++ b/lib/cannery_web/live/ammo_group_live/form_component.html.heex
@ -18,34 +18,34 @@
      </div>
    <% end %>

-    <%= label(f, :ammo_type_id, gettext("Ammo type"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :ammo_type_id, gettext("Ammo type"), class: "title text-lg text-primary-600") %>
    <%= select(f, :ammo_type_id, ammo_type_options(@ammo_types),
      class: "text-center col-span-2 input input-primary"
    ) %>
    <%= error_tag(f, :ammo_type_id, "col-span-3 text-center") %>

-    <%= label(f, :count, gettext("Count"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :count, gettext("Count"), class: "title text-lg text-primary-600") %>
    <%= number_input(f, :count,
      class: "text-center col-span-2 input input-primary",
      min: 1
    ) %>
    <%= error_tag(f, :count, "col-span-3 text-center") %>

-    <%= label(f, :price_paid, gettext("Price paid"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :price_paid, gettext("Price paid"), class: "title text-lg text-primary-600") %>
    <%= number_input(f, :price_paid,
      step: "0.01",
      class: "text-center col-span-2 input input-primary"
    ) %>
    <%= error_tag(f, :price_paid, "col-span-3 text-center") %>

-    <%= label(f, :notes, gettext("Notes"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :notes, gettext("Notes"), class: "title text-lg text-primary-600") %>
    <%= textarea(f, :notes,
      class: "text-center col-span-2 input input-primary",
      phx_hook: "MaintainAttrs"
    ) %>
    <%= error_tag(f, :notes, "col-span-3 text-center") %>

-    <%= label(f, :container, gettext("Container"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :container, gettext("Container"), class: "title text-lg text-primary-600") %>
    <%= select(f, :container_id, container_options(@containers),
      class: "text-center col-span-2 input input-primary"
    ) %>
--- a/lib/cannery_web/live/ammo_type_live/form_component.html.heex
+++ b/lib/cannery_web/live/ammo_type_live/form_component.html.heex
@ -17,11 +17,11 @@
      </div>
    <% end %>

-    <%= label(f, :name, gettext("Name"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :name, gettext("Name"), class: "title text-lg text-primary-600") %>
    <%= text_input(f, :name, class: "text-center col-span-2 input input-primary") %>
    <%= error_tag(f, :name, "col-span-3 text-center") %>

-    <%= label(f, :desc, gettext("Description"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :desc, gettext("Description"), class: "title text-lg text-primary-600") %>
    <%= textarea(f, :desc,
      class: "text-center col-span-2 input input-primary",
      phx_hook: "MaintainAttrs"
@ -34,50 +34,42 @@
    >
      <%= gettext("Example bullet type abbreviations") %>
    </a>
-    <%= label(f, :bullet_type, gettext("Bullet type"),
-      class: "mr-4 title text-lg text-primary-600"
-    ) %>
+    <%= label(f, :bullet_type, gettext("Bullet type"), class: "title text-lg text-primary-600") %>
    <%= text_input(f, :bullet_type,
      class: "text-center col-span-2 input input-primary",
      placeholder: gettext("FMJ")
    ) %>
    <%= error_tag(f, :bullet_type, "col-span-3 text-center") %>

-    <%= label(f, :bullet_core, gettext("Bullet core"),
-      class: "mr-4 title text-lg text-primary-600"
-    ) %>
+    <%= label(f, :bullet_core, gettext("Bullet core"), class: "title text-lg text-primary-600") %>
    <%= text_input(f, :bullet_core,
      class: "text-center col-span-2 input input-primary",
      placeholder: gettext("Steel")
    ) %>
    <%= error_tag(f, :bullet_core, "col-span-3 text-center") %>

-    <%= label(f, :cartridge, gettext("Cartridge"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :cartridge, gettext("Cartridge"), class: "title text-lg text-primary-600") %>
    <%= text_input(f, :cartridge,
      class: "text-center col-span-2 input input-primary",
      placeholder: "5.56x46mm NATO"
    ) %>
    <%= error_tag(f, :cartridge, "col-span-3 text-center") %>

-    <%= label(f, :caliber, gettext("Caliber"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :caliber, gettext("Caliber"), class: "title text-lg text-primary-600") %>
    <%= text_input(f, :caliber,
      class: "text-center col-span-2 input input-primary",
      placeholder: ".223"
    ) %>
    <%= error_tag(f, :caliber, "col-span-3 text-center") %>

-    <%= label(f, :case_material, gettext("Case material"),
-      class: "mr-4 title text-lg text-primary-600"
-    ) %>
+    <%= label(f, :case_material, gettext("Case material"), class: "title text-lg text-primary-600") %>
    <%= text_input(f, :case_material,
      class: "text-center col-span-2 input input-primary",
      placeholder: gettext("Brass")
    ) %>
    <%= error_tag(f, :case_material, "col-span-3 text-center") %>

-    <%= label(f, :jacket_type, gettext("Jacket type"),
-      class: "mr-4 title text-lg text-primary-600"
-    ) %>
+    <%= label(f, :jacket_type, gettext("Jacket type"), class: "title text-lg text-primary-600") %>
    <%= text_input(f, :jacket_type,
      class: "text-center col-span-2 input input-primary",
      placeholder: gettext("Bimetal")
@ -85,7 +77,7 @@
    <%= error_tag(f, :case_material, "col-span-3 text-center") %>

    <%= label(f, :muzzle_velocity, gettext("Muzzle velocity"),
-      class: "mr-4 title text-lg text-primary-600"
+      class: "title text-lg text-primary-600"
    ) %>
    <%= number_input(f, :muzzle_velocity,
      step: "1",
@ -94,14 +86,12 @@
    ) %>
    <%= error_tag(f, :muzzle_velocity, "col-span-3 text-center") %>

-    <%= label(f, :powder_type, gettext("Powder type"),
-      class: "mr-4 title text-lg text-primary-600"
-    ) %>
+    <%= label(f, :powder_type, gettext("Powder type"), class: "title text-lg text-primary-600") %>
    <%= text_input(f, :powder_type, class: "text-center col-span-2 input input-primary") %>
    <%= error_tag(f, :powder_type, "col-span-3 text-center") %>

    <%= label(f, :powder_grains_per_charge, gettext("Powder grains per charge"),
-      class: "mr-4 title text-lg text-primary-600"
+      class: "title text-lg text-primary-600"
    ) %>
    <%= number_input(f, :powder_grains_per_charge,
      step: "1",
@ -110,7 +100,7 @@
    ) %>
    <%= error_tag(f, :powder_grains_per_charge, "col-span-3 text-center") %>

-    <%= label(f, :grains, gettext("Grains"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :grains, gettext("Grains"), class: "title text-lg text-primary-600") %>
    <%= number_input(f, :grains,
      step: "1",
      class: "text-center col-span-2 input input-primary",
@ -118,54 +108,48 @@
    ) %>
    <%= error_tag(f, :grains, "col-span-3 text-center") %>

-    <%= label(f, :pressure, gettext("Pressure"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :pressure, gettext("Pressure"), class: "title text-lg text-primary-600") %>
    <%= text_input(f, :pressure,
      class: "text-center col-span-2 input input-primary",
      placeholder: "+P"
    ) %>
    <%= error_tag(f, :pressure, "col-span-3 text-center") %>

-    <%= label(f, :primer_type, gettext("Primer type"),
-      class: "mr-4 title text-lg text-primary-600"
-    ) %>
+    <%= label(f, :primer_type, gettext("Primer type"), class: "title text-lg text-primary-600") %>
    <%= text_input(f, :primer_type,
      class: "text-center col-span-2 input input-primary",
      placeholder: "Boxer"
    ) %>
    <%= error_tag(f, :primer_type, "col-span-3 text-center") %>

-    <%= label(f, :firing_type, gettext("Firing type"),
-      class: "mr-4 title text-lg text-primary-600"
-    ) %>
+    <%= label(f, :firing_type, gettext("Firing type"), class: "title text-lg text-primary-600") %>
    <%= text_input(f, :firing_type,
      class: "text-center col-span-2 input input-primary",
      placeholder: "Centerfire"
    ) %>
    <%= error_tag(f, :firing_type, "col-span-3 text-center") %>

-    <%= label(f, :tracer, gettext("Tracer"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :tracer, gettext("Tracer"), class: "title text-lg text-primary-600") %>
    <%= checkbox(f, :tracer, class: "text-center col-span-2 checkbox") %>
    <%= error_tag(f, :tracer, "col-span-3 text-center") %>

-    <%= label(f, :incendiary, gettext("Incendiary"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :incendiary, gettext("Incendiary"), class: "title text-lg text-primary-600") %>
    <%= checkbox(f, :incendiary, class: "text-center col-span-2 checkbox") %>
    <%= error_tag(f, :incendiary, "col-span-3 text-center") %>

-    <%= label(f, :blank, gettext("Blank"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :blank, gettext("Blank"), class: "title text-lg text-primary-600") %>
    <%= checkbox(f, :blank, class: "text-center col-span-2 checkbox") %>
    <%= error_tag(f, :blank, "col-span-3 text-center") %>

-    <%= label(f, :corrosive, gettext("Corrosive"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :corrosive, gettext("Corrosive"), class: "title text-lg text-primary-600") %>
    <%= checkbox(f, :corrosive, class: "text-center col-span-2 checkbox") %>
    <%= error_tag(f, :corrosive, "col-span-3 text-center") %>

-    <%= label(f, :manufacturer, gettext("Manufacturer"),
-      class: "mr-4 title text-lg text-primary-600"
-    ) %>
+    <%= label(f, :manufacturer, gettext("Manufacturer"), class: "title text-lg text-primary-600") %>
    <%= text_input(f, :manufacturer, class: "text-center col-span-2 input input-primary") %>
    <%= error_tag(f, :manufacturer, "col-span-3 text-center") %>

-    <%= label(f, :upc, gettext("UPC"), class: "mr-4 title text-lg text-primary-600") %>
+    <%= label(f, :upc, gettext("UPC"), class: "title text-lg text-primary-600") %>
    <%= text_input(f, :upc, class: "text-center col-span-2 input input-primary") %>
    <%= error_tag(f, :upc, "col-span-3 text-center") %>

--- a/lib/cannery_web/live/live_helpers.ex
+++ b/lib/cannery_web/live/live_helpers.ex
@ -54,12 +54,13 @@ defmodule CanneryWeb.LiveHelpers do
      id="modal"
      class="fixed z-10 left-0 top-0 pointer-events-none
        w-full h-full overflow-hidden
-        p-8 flex flex-col justify-center items-center"
+        p-4 sm:p-8 flex flex-col justify-center items-center"
    >
      <div
        id="modal-content"
-        class="fade-in-scale w-full max-w-3xl max-h-128 relative pointer-events-auto overflow-y-auto
-        p-8 flex flex-col justify-center items-center
+        class="fade-in-scale w-full max-w-3xl relative
+        pointer-events-auto overflow-hidden
+        px-8 py-4 sm:py-8 flex flex-col justify-center items-center
        flex flex-col justify-start items-center
        bg-white border-2 rounded-lg"
      >
@ -69,12 +70,13 @@ defmodule CanneryWeb.LiveHelpers do
                     "absolute top-8 right-10
                      text-gray-500 hover:text-gray-800
                      transition-all duration-500 ease-in-out",
-      phx_remove: hide_modal()
-      do %>
+                   phx_remove: hide_modal() do %>
          <i class="fa-fw fa-lg fas fa-times"></i>
        <% end %>

-        <div class="w-full p-8 flex flex-col space-y-4 justify-start items-center">
+        <div
+          class="overflow-x-hidden overflow-y-auto w-full p-8 flex flex-col space-y-4 justify-start items-center"
+        >
          <%= render_slot(@inner_block) %>
        </div>
      </div>
--- a/lib/cannery_web/templates/layout/root.html.heex
+++ b/lib/cannery_web/templates/layout/root.html.heex
@ -5,11 +5,8 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <%= csrf_meta_tag() %>
-    <%= if(assigns |> Map.has_key?(:page_title),
-      do: "#{assigns.page_title} | Cannery",
-      else: "Cannery"
-    )
-    |> live_title_tag(suffix: "") %>
+    <%= if(assigns |> Map.has_key?(:page_title), do: @page_title, else: "Cannery")
+    |> live_title_tag(suffix: " | Cannery") %>
    <link phx-track-static rel="stylesheet" href={Routes.static_path(@conn, "/css/app.css")} />
    <script
      defer
--- a/priv/gettext/actions.pot
+++ b/priv/gettext/actions.pot
@ -126,7 +126,7 @@ 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:172
+#: 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:28
 #: lib/cannery_web/live/range_live/form_component.html.heex:40
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@ -54,19 +54,19 @@ msgid "Background color"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:154
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:140
 #: lib/cannery_web/live/ammo_type_live/index.ex:67
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:55
 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:68
 msgid "Brass"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:46
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:44
 #: lib/cannery_web/live/ammo_type_live/index.ex:53
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:41
 msgid "Bullet core"
@ -80,21 +80,21 @@ msgid "Bullet type"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:62
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:58
 #: lib/cannery_web/live/ammo_type_live/index.ex:55
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:43
 msgid "Caliber"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:55
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:51
 #: lib/cannery_web/live/ammo_type_live/index.ex:54
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:42
 msgid "Cartridge"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:69
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:65
 #: lib/cannery_web/live/ammo_type_live/index.ex:56
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:44
 msgid "Case material"
@ -114,7 +114,7 @@ msgid "Containers"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:158
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:144
 #: lib/cannery_web/live/ammo_type_live/index.ex:68
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:56
 msgid "Corrosive"
@ -187,19 +187,19 @@ msgid "Example bullet type abbreviations"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:42
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:40
 msgid "FMJ"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:113
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:103
 #: 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:150
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:136
 #: lib/cannery_web/live/ammo_type_live/index.ex:66
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:54
 msgid "Incendiary"
@ -274,7 +274,7 @@ msgid "Manage"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:162
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:148
 #: lib/cannery_web/live/ammo_type_live/index.ex:69
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:57
 msgid "Manufacturer"
@ -376,7 +376,7 @@ msgid "On the bookshelf"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:121
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:111
 #: lib/cannery_web/live/ammo_type_live/index.ex:62
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:50
 msgid "Pressure"
@ -394,7 +394,7 @@ msgid "Price paid:"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:128
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:118
 #: lib/cannery_web/live/ammo_type_live/index.ex:63
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:51
 msgid "Primer type"
@ -421,6 +421,7 @@ msgid "Set Unlimited"
 msgstr ""

 #, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_settings_controller.ex:10
 #: lib/cannery_web/templates/user_settings/edit.html.heex:3
 msgid "Settings"
 msgstr ""
@ -441,7 +442,7 @@ msgid "Simple:"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:51
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:47
 msgid "Steel"
 msgstr ""

@ -477,7 +478,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:146
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:132
 #: lib/cannery_web/live/ammo_type_live/index.ex:65
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:53
 msgid "Tracer"
@ -654,40 +655,40 @@ msgid "$%{amount}"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:83
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:75
 msgid "Bimetal"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:78
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:72
 #: lib/cannery_web/live/ammo_type_live/index.ex:57
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:45
 msgid "Jacket type"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:87
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:79
 #: lib/cannery_web/live/ammo_type_live/index.ex:58
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:46
 msgid "Muzzle velocity"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:103
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:93
 #: 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"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:97
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:89
 #: lib/cannery_web/live/ammo_type_live/index.ex:59
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:47
 msgid "Powder type"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:168
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:152
 #: lib/cannery_web/live/ammo_type_live/index.ex:70
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:58
 msgid "UPC"
@ -720,7 +721,7 @@ msgid "Unstage"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:137
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:125
 #: lib/cannery_web/live/ammo_type_live/index.ex:64
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:52
 msgid "Firing type"
@ -807,3 +808,28 @@ msgstr ""
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:85
 msgid "Total rounds shot:"
 msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:8
+msgid "Confirm your account"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:9
+msgid "Forgot your password?"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_session_controller.ex:8
+msgid "Log in"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_registration_controller.ex:35
+msgid "Register"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:36
+msgid "Reset your password"
+msgstr ""
--- a/priv/gettext/en/LC_MESSAGES/actions.po
+++ b/priv/gettext/en/LC_MESSAGES/actions.po
@ -127,7 +127,7 @@ 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:172
+#: 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:28
 #: lib/cannery_web/live/range_live/form_component.html.heex:40
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@ -55,19 +55,19 @@ msgid "Background color"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:154
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:140
 #: lib/cannery_web/live/ammo_type_live/index.ex:67
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:55
 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:68
 msgid "Brass"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:46
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:44
 #: lib/cannery_web/live/ammo_type_live/index.ex:53
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:41
 msgid "Bullet core"
@ -81,21 +81,21 @@ msgid "Bullet type"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:62
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:58
 #: lib/cannery_web/live/ammo_type_live/index.ex:55
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:43
 msgid "Caliber"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:55
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:51
 #: lib/cannery_web/live/ammo_type_live/index.ex:54
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:42
 msgid "Cartridge"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:69
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:65
 #: lib/cannery_web/live/ammo_type_live/index.ex:56
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:44
 msgid "Case material"
@ -115,7 +115,7 @@ msgid "Containers"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:158
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:144
 #: lib/cannery_web/live/ammo_type_live/index.ex:68
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:56
 msgid "Corrosive"
@ -188,19 +188,19 @@ msgid "Example bullet type abbreviations"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:42
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:40
 msgid "FMJ"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:113
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:103
 #: 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:150
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:136
 #: lib/cannery_web/live/ammo_type_live/index.ex:66
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:54
 msgid "Incendiary"
@ -275,7 +275,7 @@ msgid "Manage"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:162
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:148
 #: lib/cannery_web/live/ammo_type_live/index.ex:69
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:57
 msgid "Manufacturer"
@ -377,7 +377,7 @@ msgid "On the bookshelf"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:121
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:111
 #: lib/cannery_web/live/ammo_type_live/index.ex:62
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:50
 msgid "Pressure"
@ -395,7 +395,7 @@ msgid "Price paid:"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:128
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:118
 #: lib/cannery_web/live/ammo_type_live/index.ex:63
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:51
 msgid "Primer type"
@ -422,6 +422,7 @@ msgid "Set Unlimited"
 msgstr ""

 #, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_settings_controller.ex:10
 #: lib/cannery_web/templates/user_settings/edit.html.heex:3
 msgid "Settings"
 msgstr ""
@ -442,7 +443,7 @@ msgid "Simple:"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:51
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:47
 msgid "Steel"
 msgstr ""

@ -478,7 +479,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:146
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:132
 #: lib/cannery_web/live/ammo_type_live/index.ex:65
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:53
 msgid "Tracer"
@ -655,40 +656,40 @@ msgid "$%{amount}"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:83
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:75
 msgid "Bimetal"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:78
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:72
 #: lib/cannery_web/live/ammo_type_live/index.ex:57
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:45
 msgid "Jacket type"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:87
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:79
 #: lib/cannery_web/live/ammo_type_live/index.ex:58
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:46
 msgid "Muzzle velocity"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:103
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:93
 #: 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"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:97
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:89
 #: lib/cannery_web/live/ammo_type_live/index.ex:59
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:47
 msgid "Powder type"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:168
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:152
 #: lib/cannery_web/live/ammo_type_live/index.ex:70
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:58
 msgid "UPC"
@ -721,7 +722,7 @@ msgid "Unstage"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:137
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:125
 #: lib/cannery_web/live/ammo_type_live/index.ex:64
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:52
 msgid "Firing type"
@ -808,3 +809,28 @@ msgstr ""
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:85
 msgid "Total rounds shot:"
 msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:8
+msgid "Confirm your account"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:9
+msgid "Forgot your password?"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_session_controller.ex:8
+msgid "Log in"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_registration_controller.ex:35
+msgid "Register"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:36
+msgid "Reset your password"
+msgstr ""
--- a/priv/gettext/en/LC_MESSAGES/errors.po
+++ b/priv/gettext/en/LC_MESSAGES/errors.po
@ -65,19 +65,19 @@ msgid "Oops, something went wrong! Please check the errors below."
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_reset_password_controller.ex:60
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:63
 msgid "Reset password link is invalid or it has expired."
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:25
-#: lib/cannery_web/controllers/user_registration_controller.ex:53
+#: lib/cannery_web/controllers/user_registration_controller.ex:56
 msgid "Sorry, public registration is disabled"
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:15
-#: lib/cannery_web/controllers/user_registration_controller.ex:43
+#: lib/cannery_web/controllers/user_registration_controller.ex:46
 msgid "Sorry, this invite was not found or expired"
 msgstr ""

@ -92,7 +92,7 @@ msgid "Unauthorized"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_confirmation_controller.ex:53
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:54
 msgid "User confirmation link is invalid or it has expired."
 msgstr ""

--- a/priv/gettext/en/LC_MESSAGES/prompts.po
+++ b/priv/gettext/en/LC_MESSAGES/prompts.po
@ -125,7 +125,7 @@ msgid "Email changed successfully."
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_confirmation_controller.ex:22
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:23
 msgid "If your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly."
 msgstr ""

@ -140,7 +140,7 @@ msgid "Logged out successfully."
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_reset_password_controller.ex:43
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:46
 msgid "Password reset successfully."
 msgstr ""

@ -150,7 +150,7 @@ msgid "Password updated successfully."
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_registration_controller.ex:71
+#: lib/cannery_web/controllers/user_registration_controller.ex:74
 msgid "Please check your email to verify your account"
 msgstr ""

@ -162,7 +162,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:173
+#: 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:30
 #: lib/cannery_web/live/range_live/form_component.html.heex:42
@ -226,7 +226,7 @@ msgid "Shot records updated successfully"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_confirmation_controller.ex:37
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:38
 msgid "%{email} confirmed successfully."
 msgstr ""

--- a/priv/gettext/errors.pot
+++ b/priv/gettext/errors.pot
@ -65,19 +65,19 @@ msgid "Oops, something went wrong! Please check the errors below."
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_reset_password_controller.ex:60
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:63
 msgid "Reset password link is invalid or it has expired."
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:25
-#: lib/cannery_web/controllers/user_registration_controller.ex:53
+#: lib/cannery_web/controllers/user_registration_controller.ex:56
 msgid "Sorry, public registration is disabled"
 msgstr ""

 #, elixir-autogen, elixir-format
 #: lib/cannery_web/controllers/user_registration_controller.ex:15
-#: lib/cannery_web/controllers/user_registration_controller.ex:43
+#: lib/cannery_web/controllers/user_registration_controller.ex:46
 msgid "Sorry, this invite was not found or expired"
 msgstr ""

@ -92,7 +92,7 @@ msgid "Unauthorized"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_confirmation_controller.ex:53
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:54
 msgid "User confirmation link is invalid or it has expired."
 msgstr ""

--- a/priv/gettext/prompts.pot
+++ b/priv/gettext/prompts.pot
@ -124,7 +124,7 @@ msgid "Email changed successfully."
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_confirmation_controller.ex:22
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:23
 msgid "If your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly."
 msgstr ""

@ -139,7 +139,7 @@ msgid "Logged out successfully."
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_reset_password_controller.ex:43
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:46
 msgid "Password reset successfully."
 msgstr ""

@ -149,7 +149,7 @@ msgid "Password updated successfully."
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_registration_controller.ex:71
+#: lib/cannery_web/controllers/user_registration_controller.ex:74
 msgid "Please check your email to verify 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:173
+#: 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:30
 #: lib/cannery_web/live/range_live/form_component.html.heex:42
@ -225,7 +225,7 @@ msgid "Shot records updated successfully"
 msgstr ""

 #, elixir-autogen, elixir-format
-#: lib/cannery_web/controllers/user_confirmation_controller.ex:37
+#: lib/cannery_web/controllers/user_confirmation_controller.ex:38
 msgid "%{email} confirmed successfully."
 msgstr ""
Author	SHA1	Message	Date
shibao	3ce8eda712	mix format All checks were successful continuous-integration/drone/push Build is passing Details	2022-02-20 20:40:24 -05:00
shibao	1a78e88b34	add page titles to registration and setting pages	2022-02-20 20:39:27 -05:00
shibao	968abd04ee	fix grids having uneven margins in phone mode	2022-02-20 20:28:42 -05:00
shibao	dc209fa192	fix modals with overflowing content	2022-02-20 20:28:34 -05:00