upgrade to phoenix 1.7

2023-04-14 23:34:11 -04:00
parent 1796fb822f
commit 1037f37be2
138 changed files with 2304 additions and 2252 deletions
--- a/priv/gettext/en/LC_MESSAGES/actions.po
+++ b/priv/gettext/en/LC_MESSAGES/actions.po
@@ -32,14 +32,14 @@ msgstr ""
 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:43
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:15
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Change email"
 msgstr ""

-#: lib/cannery_web/templates/user_settings/edit.html.heex:57
-#: lib/cannery_web/templates/user_settings/edit.html.heex:97
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:57
+#: lib/cannery_web/controllers/user_settings_html/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:159
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:155
 #, elixir-autogen, elixir-format
 msgid "Delete User"
 msgstr ""

-#: 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:42
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:47
+#: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:3
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Forgot your password?"
 msgstr ""
@@ -66,13 +66,13 @@ msgstr ""
 msgid "Invite someone new!"
 msgstr ""

-#: lib/cannery_web/components/core_components/topbar.html.heex:124
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:32
-#: 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:32
-#: lib/cannery_web/templates/user_session/new.html.heex:3
-#: lib/cannery_web/templates/user_session/new.html.heex:28
+#: lib/cannery_web/components/core_components/topbar.html.heex:94
+#: lib/cannery_web/controllers/user_confirmation_html/new.html.heex:28
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:44
+#: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:41
+#: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:28
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:3
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Log in"
 msgstr ""
@@ -92,25 +92,25 @@ msgstr ""
 msgid "New Tag"
 msgstr ""

-#: lib/cannery_web/components/core_components/topbar.html.heex:116
-#: lib/cannery_web/templates/user_confirmation/new.html.heex:29
-#: lib/cannery_web/templates/user_registration/new.html.heex:3
-#: 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:29
-#: lib/cannery_web/templates/user_session/new.html.heex:39
+#: lib/cannery_web/components/core_components/topbar.html.heex:89
+#: lib/cannery_web/controllers/user_confirmation_html/new.html.heex:25
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:3
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:37
+#: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:38
+#: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:25
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:35
 #, 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/controllers/user_confirmation_html/new.html.heex:3
+#: lib/cannery_web/controllers/user_confirmation_html/new.html.heex:16
 #, 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:29
+#: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:3
+#: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "Reset password"
 msgstr ""
@@ -126,12 +126,12 @@ msgstr ""
 msgid "Save"
 msgstr ""

-#: lib/cannery_web/templates/user_reset_password/new.html.heex:16
+#: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:16
 #, elixir-autogen, elixir-format
 msgid "Send instructions to reset password"
 msgstr ""

-#: lib/cannery_web/live/container_live/show.html.heex:68
+#: lib/cannery_web/live/container_live/show.html.heex:65
 #, elixir-autogen, elixir-format
 msgid "Why not add one?"
 msgstr ""
@@ -152,18 +152,18 @@ msgid "Why not get some ready to shoot?"
 msgstr ""

 #: lib/cannery_web/live/pack_live/index.html.heex:127
-#: lib/cannery_web/live/pack_live/show.html.heex:96
-#: lib/cannery_web/live/range_live/index.html.heex:45
+#: lib/cannery_web/live/pack_live/show.html.heex:90
+#: lib/cannery_web/live/range_live/index.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Record shots"
 msgstr ""

-#: lib/cannery_web/components/move_pack_component.ex:88
+#: lib/cannery_web/components/move_pack_component.ex:87
 #, elixir-autogen, elixir-format
 msgid "Add another container!"
 msgstr ""

-#: lib/cannery_web/components/move_pack_component.ex:124
+#: lib/cannery_web/components/move_pack_component.ex:123
 #, elixir-autogen, elixir-format
 msgid "Select"
 msgstr ""
@@ -183,24 +183,24 @@ msgstr ""
 msgid "Create"
 msgstr ""

-#: lib/cannery_web/templates/user_settings/edit.html.heex:110
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:110
 #, elixir-autogen, elixir-format
 msgid "Change Language"
 msgstr ""

-#: lib/cannery_web/templates/user_settings/edit.html.heex:136
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:136
 #, elixir-autogen, elixir-format
 msgid "Change language"
 msgstr ""

-#: lib/cannery_web/live/pack_live/show.html.heex:55
+#: lib/cannery_web/live/pack_live/show.html.heex:52
 #, elixir-autogen, elixir-format
 msgid "View in Catalog"
 msgstr ""

-#: lib/cannery_web/components/move_pack_component.ex:78
-#: lib/cannery_web/live/pack_live/index.html.heex:144
-#: lib/cannery_web/live/pack_live/show.html.heex:89
+#: lib/cannery_web/components/move_pack_component.ex:77
+#: lib/cannery_web/live/pack_live/index.html.heex:138
+#: lib/cannery_web/live/pack_live/show.html.heex:86
 #, elixir-autogen, elixir-format
 msgid "Move ammo"
 msgstr ""
@@ -210,19 +210,19 @@ msgstr ""
 msgid "Set Unlimited"
 msgstr ""

-#: lib/cannery_web/live/pack_live/show.html.heex:85
+#: lib/cannery_web/live/pack_live/show.html.heex:82
 #: lib/cannery_web/live/range_live/index.html.heex:38
 #, elixir-autogen, elixir-format
 msgid "Stage for range"
 msgstr ""

-#: lib/cannery_web/live/pack_live/show.html.heex:84
+#: lib/cannery_web/live/pack_live/show.html.heex:81
 #: lib/cannery_web/live/range_live/index.html.heex:37
 #, elixir-autogen, elixir-format
 msgid "Unstage from range"
 msgstr ""

-#: lib/cannery_web/templates/user_settings/edit.html.heex:150
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:146
 #, elixir-autogen, elixir-format
 msgid "Export Data as JSON"
 msgstr ""
@@ -288,37 +288,37 @@ msgstr ""
 msgid "Unstage"
 msgstr ""

-#: lib/cannery_web/live/pack_live/index.html.heex:174
+#: lib/cannery_web/live/pack_live/index.html.heex:168
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Clone pack of %{pack_count} bullets"
 msgstr ""

-#: lib/cannery_web/live/pack_live/index.html.heex:189
-#: lib/cannery_web/live/pack_live/show.html.heex:74
+#: lib/cannery_web/live/pack_live/index.html.heex:183
+#: lib/cannery_web/live/pack_live/show.html.heex:71
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Delete pack of %{pack_count} bullets"
 msgstr ""

-#: lib/cannery_web/live/pack_live/index.html.heex:164
-#: lib/cannery_web/live/pack_live/show.html.heex:62
+#: lib/cannery_web/live/pack_live/index.html.heex:158
+#: lib/cannery_web/live/pack_live/show.html.heex:59
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit pack of %{pack_count} bullets"
 msgstr ""

-#: lib/cannery_web/live/pack_live/index.html.heex:154
-#: lib/cannery_web/live/type_live/show.html.heex:204
+#: lib/cannery_web/live/pack_live/index.html.heex:148
+#: lib/cannery_web/live/type_live/show.html.heex:201
 #, elixir-autogen, elixir-format, fuzzy
 msgid "View pack of %{pack_count} bullets"
 msgstr ""

-#: lib/cannery_web/live/pack_live/show.ex:160
-#: lib/cannery_web/live/range_live/index.html.heex:155
+#: lib/cannery_web/live/pack_live/show.ex:159
+#: lib/cannery_web/live/range_live/index.html.heex:152
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Delete shot record of %{shot_record_count} shots"
 msgstr ""

-#: lib/cannery_web/live/pack_live/show.ex:145
-#: lib/cannery_web/live/range_live/index.html.heex:138
+#: lib/cannery_web/live/pack_live/show.ex:144
+#: lib/cannery_web/live/range_live/index.html.heex:135
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit shot record of %{shot_record_count} shots"
 msgstr ""
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -25,7 +25,7 @@ msgstr ""
 msgid "Admins:"
 msgstr ""

-#: lib/cannery_web/components/core_components/topbar.html.heex:58
+#: lib/cannery_web/components/core_components/topbar.html.heex:43
 #: lib/cannery_web/components/shot_record_table_component.ex:44
 #: lib/cannery_web/live/pack_live/index.ex:75
 #: lib/cannery_web/live/pack_live/index.ex:84
@@ -80,14 +80,14 @@ msgstr ""
 msgid "Case material"
 msgstr ""

-#: lib/cannery_web/components/move_pack_component.ex:65
+#: lib/cannery_web/components/move_pack_component.ex:64
 #: lib/cannery_web/components/pack_table_component.ex:76
 #: lib/cannery_web/live/pack_live/form_component.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Container"
 msgstr ""

-#: lib/cannery_web/components/core_components/topbar.html.heex:42
+#: lib/cannery_web/components/core_components/topbar.html.heex:33
 #: lib/cannery_web/live/container_live/index.ex:45
 #: lib/cannery_web/live/container_live/index.ex:54
 #: lib/cannery_web/live/container_live/index.html.heex:3
@@ -173,20 +173,20 @@ msgstr ""
 msgid "Invite Only"
 msgstr ""

-#: lib/cannery_web/components/core_components/topbar.html.heex:74
+#: lib/cannery_web/components/core_components/topbar.html.heex:53
 #: lib/cannery_web/live/invite_live/index.ex:31
 #: lib/cannery_web/live/invite_live/index.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Invites"
 msgstr ""

-#: lib/cannery_web/templates/user_session/new.html.heex:23
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:23
 #, elixir-autogen, elixir-format
 msgid "Keep me logged in for 60 days"
 msgstr ""

 #: lib/cannery_web/components/container_table_component.ex:47
-#: lib/cannery_web/components/move_pack_component.ex:67
+#: lib/cannery_web/components/move_pack_component.ex:66
 #: lib/cannery_web/live/container_live/form_component.html.heex:47
 #, elixir-autogen, elixir-format
 msgid "Location"
@@ -277,7 +277,7 @@ msgstr ""
 #: lib/cannery_web/components/add_shot_record_component.html.heex:38
 #: lib/cannery_web/components/shot_record_table_component.ex:46
 #: lib/cannery_web/live/pack_live/form_component.html.heex:57
-#: lib/cannery_web/live/pack_live/show.ex:91
+#: lib/cannery_web/live/pack_live/show.ex:90
 #: lib/cannery_web/live/range_live/form_component.html.heex:30
 #, elixir-autogen, elixir-format
 msgid "Notes"
@@ -333,7 +333,7 @@ msgid "Self-host your own instance, or use an instance from someone you trust."
 msgstr ""

 #: lib/cannery_web/controllers/user_settings_controller.ex:10
-#: lib/cannery_web/templates/user_settings/edit.html.heex:3
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:3
 #, elixir-autogen, elixir-format
 msgid "Settings"
 msgstr ""
@@ -348,13 +348,13 @@ msgstr ""
 msgid "Steel"
 msgstr ""

-#: lib/cannery_web/live/pack_live/show.html.heex:106
+#: lib/cannery_web/live/pack_live/show.html.heex:100
 #, elixir-autogen, elixir-format
 msgid "Stored in"
 msgstr ""

 #: lib/cannery_web/components/container_table_component.ex:66
-#: lib/cannery_web/components/core_components/topbar.html.heex:34
+#: lib/cannery_web/components/core_components/topbar.html.heex:28
 #: lib/cannery_web/live/tag_live/index.ex:43
 #: lib/cannery_web/live/tag_live/index.ex:53
 #: lib/cannery_web/live/tag_live/index.html.heex:3
@@ -384,7 +384,7 @@ msgid "Tracer"
 msgstr ""

 #: lib/cannery_web/components/container_table_component.ex:48
-#: lib/cannery_web/components/move_pack_component.ex:66
+#: lib/cannery_web/components/move_pack_component.ex:65
 #: lib/cannery_web/components/pack_table_component.ex:108
 #: lib/cannery_web/live/container_live/form_component.html.heex:39
 #: lib/cannery_web/live/pack_live/form_component.html.heex:22
@@ -418,7 +418,7 @@ msgstr ""
 msgid "No tags for this container"
 msgstr ""

-#: lib/cannery_web/components/core_components/topbar.html.heex:66
+#: lib/cannery_web/components/core_components/topbar.html.heex:48
 #: lib/cannery_web/components/pack_table_component.ex:80
 #, elixir-autogen, elixir-format
 msgid "Range"
@@ -431,7 +431,7 @@ msgstr ""

 #: lib/cannery_web/components/add_shot_record_component.html.heex:49
 #: lib/cannery_web/components/shot_record_table_component.ex:47
-#: lib/cannery_web/live/pack_live/show.ex:92
+#: lib/cannery_web/live/pack_live/show.ex:91
 #: lib/cannery_web/live/range_live/form_component.html.heex:41
 #, elixir-autogen, elixir-format
 msgid "Date"
@@ -453,26 +453,26 @@ msgstr ""
 msgid "Record shots"
 msgstr ""

-#: lib/cannery_web/live/range_live/index.ex:48
+#: lib/cannery_web/live/range_live/index.ex:47
 #, elixir-autogen, elixir-format
 msgid "New Shot Records"
 msgstr ""

-#: lib/cannery_web/live/range_live/index.html.heex:55
-#: lib/cannery_web/live/range_live/index.html.heex:122
+#: lib/cannery_web/live/range_live/index.html.heex:52
+#: lib/cannery_web/live/range_live/index.html.heex:119
 #, elixir-autogen, elixir-format
 msgid "No shots recorded"
 msgstr ""

 #: lib/cannery_web/components/shot_record_table_component.ex:45
-#: lib/cannery_web/live/pack_live/show.ex:90
-#: lib/cannery_web/live/range_live/index.html.heex:69
+#: lib/cannery_web/live/pack_live/show.ex:89
+#: lib/cannery_web/live/range_live/index.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Rounds shot"
 msgstr ""

-#: lib/cannery_web/live/range_live/index.ex:56
-#: lib/cannery_web/live/range_live/index.ex:66
+#: lib/cannery_web/live/range_live/index.ex:55
+#: lib/cannery_web/live/range_live/index.ex:65
 #, elixir-autogen, elixir-format
 msgid "Shot Records"
 msgstr ""
@@ -482,12 +482,12 @@ msgstr ""
 msgid "Move ammo"
 msgstr ""

-#: lib/cannery_web/components/move_pack_component.ex:83
+#: lib/cannery_web/components/move_pack_component.ex:82
 #, elixir-autogen, elixir-format
 msgid "No other containers"
 msgstr ""

-#: lib/cannery_web/live/range_live/index.html.heex:60
+#: lib/cannery_web/live/range_live/index.html.heex:57
 #, elixir-autogen, elixir-format
 msgid "Shot log"
 msgstr ""
@@ -538,20 +538,20 @@ msgstr ""
 msgid "UPC"
 msgstr ""

-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:20
-#: lib/cannery_web/templates/user_settings/edit.html.heex:76
+#: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:20
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:76
 #, elixir-autogen, elixir-format
 msgid "Confirm new password"
 msgstr ""

-#: lib/cannery_web/templates/user_settings/edit.html.heex:31
-#: lib/cannery_web/templates/user_settings/edit.html.heex:85
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:31
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:85
 #, elixir-autogen, elixir-format
 msgid "Current password"
 msgstr ""

-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:16
-#: lib/cannery_web/templates/user_settings/edit.html.heex:69
+#: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:16
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "New password"
 msgstr ""
@@ -562,19 +562,19 @@ msgstr ""
 msgid "Firing type"
 msgstr ""

-#: lib/cannery_web/templates/layout/live.html.heex:43
+#: lib/cannery_web/components/layouts/live.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Reconnecting..."
 msgstr ""

 #: lib/cannery_web/live/container_live/index.ex:28
-#: lib/cannery_web/live/container_live/show.ex:120
+#: lib/cannery_web/live/container_live/show.ex:116
 #, elixir-autogen, elixir-format
 msgid "Edit %{name}"
 msgstr ""

 #: lib/cannery_web/live/container_live/index.ex:63
-#: lib/cannery_web/live/container_live/show.ex:121
+#: lib/cannery_web/live/container_live/show.ex:117
 #, elixir-autogen, elixir-format
 msgid "Edit %{name} tags"
 msgstr ""
@@ -619,7 +619,7 @@ msgstr ""
 msgid "Percentage left:"
 msgstr ""

-#: lib/cannery_web/live/pack_live/show.html.heex:119
+#: lib/cannery_web/live/pack_live/show.html.heex:113
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Rounds used"
 msgstr ""
@@ -639,18 +639,18 @@ msgstr ""
 msgid "Log in"
 msgstr ""

-#: lib/cannery_web/controllers/user_registration_controller.ex:33
+#: lib/cannery_web/controllers/user_registration_controller.ex:32
 #, elixir-autogen, elixir-format
 msgid "Register"
 msgstr ""

-#: lib/cannery_web/controllers/user_reset_password_controller.ex:36
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:35
 #, elixir-autogen, elixir-format
 msgid "Reset your password"
 msgstr ""

-#: lib/cannery_web/live/pack_live/show.ex:41
-#: lib/cannery_web/live/range_live/index.ex:32
+#: lib/cannery_web/live/pack_live/show.ex:40
+#: lib/cannery_web/live/range_live/index.ex:31
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Record Shots"
 msgstr ""
@@ -665,23 +665,23 @@ msgstr ""
 msgid "Added on:"
 msgstr ""

-#: lib/cannery_web/templates/user_registration/new.html.heex:32
-#: lib/cannery_web/templates/user_settings/edit.html.heex:127
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:32
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:127
 #, elixir-autogen, elixir-format
 msgid "English"
 msgstr ""

-#: lib/cannery_web/templates/user_settings/edit.html.heex:129
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:129
 #, elixir-autogen, elixir-format
 msgid "French"
 msgstr ""

-#: lib/cannery_web/templates/user_settings/edit.html.heex:128
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:128
 #, elixir-autogen, elixir-format
 msgid "German"
 msgstr ""

-#: lib/cannery_web/templates/user_registration/new.html.heex:28
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Language"
 msgstr ""
@@ -706,7 +706,7 @@ msgstr ""
 msgid "View the source code"
 msgstr ""

-#: lib/cannery_web/components/core_components/topbar.html.heex:50
+#: lib/cannery_web/components/core_components/topbar.html.heex:38
 #: lib/cannery_web/live/type_live/index.ex:52
 #: lib/cannery_web/live/type_live/index.ex:62
 #: lib/cannery_web/live/type_live/index.html.heex:3
@@ -714,27 +714,27 @@ msgstr ""
 msgid "Catalog"
 msgstr ""

-#: lib/cannery_web/live/pack_live/show.ex:45
+#: lib/cannery_web/live/pack_live/show.ex:44
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit Ammo"
 msgstr ""

-#: lib/cannery_web/live/pack_live/show.ex:43
+#: lib/cannery_web/live/pack_live/show.ex:42
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Move Ammo"
 msgstr ""

-#: lib/cannery_web/live/container_live/show.html.heex:123
+#: lib/cannery_web/live/container_live/show.html.heex:117
 #, elixir-autogen, elixir-format, fuzzy
 msgid "No ammo in this container"
 msgstr ""

-#: lib/cannery_web/live/pack_live/show.ex:44
+#: lib/cannery_web/live/pack_live/show.ex:43
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show Ammo"
 msgstr ""

-#: lib/cannery_web/live/pack_live/show.html.heex:111
+#: lib/cannery_web/live/pack_live/show.html.heex:105
 #, elixir-autogen, elixir-format, fuzzy
 msgid "This ammo is not in a container"
 msgstr ""
@@ -746,7 +746,7 @@ msgstr ""
 msgid "Packs:"
 msgstr ""

-#: lib/cannery_web/components/core_components/topbar.html.heex:10
+#: lib/cannery_web/components/core_components/topbar.html.heex:7
 #: lib/cannery_web/live/home_live.html.heex:4
 #, elixir-autogen, elixir-format
 msgid "Cannery logo"
@@ -780,7 +780,7 @@ msgstr ""
 msgid "%{percentage}%"
 msgstr ""

-#: lib/cannery_web/live/range_live/index.ex:154
+#: lib/cannery_web/live/range_live/index.ex:153
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Rounds shot: %{count}"
 msgstr ""
@@ -798,7 +798,7 @@ msgid "Rounds"
 msgstr ""

 #: lib/cannery_web/live/container_live/index.html.heex:40
-#: lib/cannery_web/live/container_live/show.html.heex:115
+#: lib/cannery_web/live/container_live/show.html.heex:109
 #: lib/cannery_web/live/type_live/show.html.heex:170
 #, elixir-autogen, elixir-format
 msgid "View as table"
@@ -844,102 +844,102 @@ msgstr ""
 msgid "Used rounds:"
 msgstr ""

-#: lib/cannery_web/live/range_live/index.html.heex:71
+#: lib/cannery_web/live/range_live/index.html.heex:68
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Rounds shot chart"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:154
+#: lib/cannery_web/live/type_live/show.ex:153
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Blank:"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:132
+#: lib/cannery_web/live/type_live/show.ex:131
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Bullet core:"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:131
+#: lib/cannery_web/live/type_live/show.ex:130
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Bullet type:"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:123
+#: lib/cannery_web/live/type_live/show.ex:122
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Caliber:"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:121
+#: lib/cannery_web/live/type_live/show.ex:120
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Cartridge:"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:134
+#: lib/cannery_web/live/type_live/show.ex:133
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Case material:"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:155
+#: lib/cannery_web/live/type_live/show.ex:154
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Corrosive:"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:151
+#: lib/cannery_web/live/type_live/show.ex:150
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Firing type:"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:130
+#: lib/cannery_web/live/type_live/show.ex:129
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Grains:"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:153
+#: lib/cannery_web/live/type_live/show.ex:152
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Incendiary:"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:133
+#: lib/cannery_web/live/type_live/show.ex:132
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Jacket type:"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:156
+#: lib/cannery_web/live/type_live/show.ex:155
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Manufacturer:"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:149
+#: lib/cannery_web/live/type_live/show.ex:148
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Muzzle velocity:"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:143
+#: lib/cannery_web/live/type_live/show.ex:142
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Powder grains per charge:"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:141
+#: lib/cannery_web/live/type_live/show.ex:140
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Powder type:"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:147
+#: lib/cannery_web/live/type_live/show.ex:146
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Pressure:"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:150
+#: lib/cannery_web/live/type_live/show.ex:149
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Primer type:"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:152
+#: lib/cannery_web/live/type_live/show.ex:151
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Tracer:"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:157
+#: lib/cannery_web/live/type_live/show.ex:156
 #, elixir-autogen, elixir-format, fuzzy
 msgid "UPC:"
 msgstr ""
@@ -976,7 +976,7 @@ msgstr ""
 msgid "Original Count:"
 msgstr ""

-#: lib/cannery_web/live/home_live.ex:15
+#: lib/cannery_web/live/home_live.ex:14
 #, elixir-autogen, elixir-format
 msgid "Home"
 msgstr ""
@@ -1033,20 +1033,20 @@ msgstr ""
 msgid "Search tags"
 msgstr ""

-#: lib/cannery_web/live/range_live/index.html.heex:115
+#: lib/cannery_web/live/range_live/index.html.heex:112
 #, elixir-autogen, elixir-format
 msgid "Search shot records"
 msgstr ""

-#: lib/cannery_web/templates/user_settings/edit.html.heex:130
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:130
 #, elixir-autogen, elixir-format
 msgid "Spanish"
 msgstr ""

-#: lib/cannery_web/templates/error/error.html.heex:8
-#: lib/cannery_web/templates/layout/root.html.heex:13
-#: lib/cannery_web/templates/layout/root.html.heex:14
-#: lib/cannery_web/views/layout_view.ex:14
+#: lib/cannery_web/components/layouts.ex:15
+#: lib/cannery_web/components/layouts/root.html.heex:9
+#: lib/cannery_web/components/layouts/root.html.heex:10
+#: lib/cannery_web/controllers/error_html/error.html.heex:8
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Cannery"
 msgstr ""
@@ -1076,7 +1076,7 @@ msgstr ""
 msgid "Cannery lets you easily keep an eye on your ammo levels before and after range day"
 msgstr ""

-#: lib/cannery_web/views/layout_view.ex:10
+#: lib/cannery_web/components/layouts.ex:11
 #, elixir-autogen, elixir-format
 msgid "Cannery | %{title}"
 msgstr ""
@@ -1116,17 +1116,17 @@ msgstr ""
 msgid "Uses: %{uses_count}"
 msgstr ""

-#: lib/cannery_web/templates/user_confirmation/new.html.heex:13
-#: lib/cannery_web/templates/user_registration/new.html.heex:20
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:13
-#: lib/cannery_web/templates/user_session/new.html.heex:17
-#: lib/cannery_web/templates/user_settings/edit.html.heex:27
+#: lib/cannery_web/controllers/user_confirmation_html/new.html.heex:13
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:20
+#: lib/cannery_web/controllers/user_reset_password_html/new.html.heex:13
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:17
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:27
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr ""

-#: lib/cannery_web/templates/user_registration/new.html.heex:24
-#: lib/cannery_web/templates/user_session/new.html.heex:20
+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:24
+#: lib/cannery_web/controllers/user_session_html/new.html.heex:20
 #, elixir-autogen, elixir-format
 msgid "Password"
 msgstr ""
@@ -1163,21 +1163,21 @@ msgid "Really great weather"
 msgstr ""

 #: lib/cannery_web/components/container_table_component.ex:67
-#: lib/cannery_web/components/move_pack_component.ex:68
+#: lib/cannery_web/components/move_pack_component.ex:67
 #: lib/cannery_web/components/pack_table_component.ex:62
 #: lib/cannery_web/components/shot_record_table_component.ex:48
 #: lib/cannery_web/components/type_table_component.ex:99
-#: lib/cannery_web/live/pack_live/show.ex:93
+#: lib/cannery_web/live/pack_live/show.ex:92
 #, elixir-autogen, elixir-format
 msgid "Actions"
 msgstr ""

-#: lib/cannery_web/components/core_components/topbar.html.heex:105
+#: lib/cannery_web/components/core_components/topbar.html.heex:81
 #, elixir-autogen, elixir-format
 msgid "Live Dashboard"
 msgstr ""

-#: lib/cannery_web/components/core_components/topbar.html.heex:90
+#: lib/cannery_web/components/core_components/topbar.html.heex:66
 #, elixir-autogen, elixir-format
 msgid "Log out"
 msgstr ""
@@ -1193,9 +1193,9 @@ msgstr ""
 msgid "Close modal"
 msgstr ""

-#: lib/cannery_web/live/container_live/show.html.heex:103
+#: lib/cannery_web/live/container_live/show.html.heex:97
 #: lib/cannery_web/live/pack_live/index.html.heex:58
-#: lib/cannery_web/live/range_live/index.html.heex:92
+#: lib/cannery_web/live/range_live/index.html.heex:89
 #: lib/cannery_web/live/type_live/index.html.heex:35
 #, elixir-autogen, elixir-format
 msgid "All"
@@ -1212,7 +1212,7 @@ msgstr ""
 msgid "Brass height"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:128
+#: lib/cannery_web/live/type_live/show.ex:127
 #, elixir-autogen, elixir-format
 msgid "Brass height:"
 msgstr ""
@@ -1223,7 +1223,7 @@ msgstr ""
 msgid "Chamber size"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:129
+#: lib/cannery_web/live/type_live/show.ex:128
 #, elixir-autogen, elixir-format
 msgid "Chamber size:"
 msgstr ""
@@ -1239,7 +1239,7 @@ msgstr ""
 msgid "Dram equivalent"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:148
+#: lib/cannery_web/live/type_live/show.ex:147
 #, elixir-autogen, elixir-format
 msgid "Dram equivalent:"
 msgstr ""
@@ -1250,7 +1250,7 @@ msgstr ""
 msgid "Gauge"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:123
+#: lib/cannery_web/live/type_live/show.ex:122
 #, elixir-autogen, elixir-format
 msgid "Gauge:"
 msgstr ""
@@ -1261,7 +1261,7 @@ msgstr ""
 msgid "Load grains"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:139
+#: lib/cannery_web/live/type_live/show.ex:138
 #, elixir-autogen, elixir-format
 msgid "Load grains:"
 msgstr ""
@@ -1276,9 +1276,9 @@ msgstr ""
 msgid "None specified"
 msgstr ""

-#: lib/cannery_web/live/container_live/show.html.heex:106
+#: lib/cannery_web/live/container_live/show.html.heex:100
 #: lib/cannery_web/live/pack_live/index.html.heex:61
-#: lib/cannery_web/live/range_live/index.html.heex:95
+#: lib/cannery_web/live/range_live/index.html.heex:92
 #: lib/cannery_web/live/type_live/form_component.html.heex:25
 #: lib/cannery_web/live/type_live/index.html.heex:38
 #: lib/cannery_web/live/type_live/show.html.heex:56
@@ -1301,9 +1301,9 @@ msgstr ""
 msgid "Projectile"
 msgstr ""

-#: lib/cannery_web/live/container_live/show.html.heex:104
+#: lib/cannery_web/live/container_live/show.html.heex:98
 #: lib/cannery_web/live/pack_live/index.html.heex:59
-#: lib/cannery_web/live/range_live/index.html.heex:93
+#: lib/cannery_web/live/range_live/index.html.heex:90
 #: lib/cannery_web/live/type_live/form_component.html.heex:25
 #: lib/cannery_web/live/type_live/index.html.heex:36
 #: lib/cannery_web/live/type_live/show.html.heex:54
@@ -1317,7 +1317,7 @@ msgstr ""
 msgid "Shot charge weight"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:140
+#: lib/cannery_web/live/type_live/show.ex:139
 #, elixir-autogen, elixir-format
 msgid "Shot charge weight:"
 msgstr ""
@@ -1328,7 +1328,7 @@ msgstr ""
 msgid "Shot material"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:137
+#: lib/cannery_web/live/type_live/show.ex:136
 #, elixir-autogen, elixir-format
 msgid "Shot material:"
 msgstr ""
@@ -1339,7 +1339,7 @@ msgstr ""
 msgid "Shot size"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:138
+#: lib/cannery_web/live/type_live/show.ex:137
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Shot size:"
 msgstr ""
@@ -1350,14 +1350,14 @@ msgstr ""
 msgid "Shot type"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:136
+#: lib/cannery_web/live/type_live/show.ex:135
 #, elixir-autogen, elixir-format
 msgid "Shot type:"
 msgstr ""

-#: lib/cannery_web/live/container_live/show.html.heex:105
+#: lib/cannery_web/live/container_live/show.html.heex:99
 #: lib/cannery_web/live/pack_live/index.html.heex:60
-#: lib/cannery_web/live/range_live/index.html.heex:94
+#: lib/cannery_web/live/range_live/index.html.heex:91
 #: lib/cannery_web/live/type_live/form_component.html.heex:25
 #: lib/cannery_web/live/type_live/index.html.heex:37
 #: lib/cannery_web/live/type_live/show.html.heex:52
@@ -1376,7 +1376,7 @@ msgstr ""
 msgid "Target, bird, buck, etc"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:127
+#: lib/cannery_web/live/type_live/show.ex:126
 #, elixir-autogen, elixir-format
 msgid "Unfired length:"
 msgstr ""
@@ -1393,15 +1393,15 @@ msgstr ""
 msgid "Wadding"
 msgstr ""

-#: lib/cannery_web/live/type_live/show.ex:135
+#: lib/cannery_web/live/type_live/show.ex:134
 #, elixir-autogen, elixir-format
 msgid "Wadding:"
 msgstr ""

 #: lib/cannery_web/components/type_table_component.ex:149
-#: lib/cannery_web/live/container_live/show.html.heex:97
+#: lib/cannery_web/live/container_live/show.html.heex:91
 #: lib/cannery_web/live/pack_live/index.html.heex:50
-#: lib/cannery_web/live/range_live/index.html.heex:86
+#: lib/cannery_web/live/range_live/index.html.heex:83
 #: lib/cannery_web/live/type_live/form_component.html.heex:21
 #: lib/cannery_web/live/type_live/index.html.heex:29
 #: lib/cannery_web/live/type_live/show.html.heex:46
@@ -1420,14 +1420,14 @@ msgstr ""
 msgid "Used up!"
 msgstr ""

-#: lib/cannery_web/live/pack_live/show.ex:42
-#: lib/cannery_web/live/range_live/index.ex:40
+#: lib/cannery_web/live/pack_live/show.ex:41
+#: lib/cannery_web/live/range_live/index.ex:39
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit Shot Record"
 msgstr ""

 #: lib/cannery_web/live/type_live/index.ex:28
-#: lib/cannery_web/live/type_live/show.ex:82
+#: lib/cannery_web/live/type_live/show.ex:81
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit %{type_name}"
 msgstr ""
--- a/priv/gettext/en/LC_MESSAGES/emails.po
+++ b/priv/gettext/en/LC_MESSAGES/emails.po
@@ -10,83 +10,83 @@ msgid ""
 msgstr ""
 "Language: en\n"

-#: 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.heex:3
-#: lib/cannery_web/templates/email/reset_password.txt.eex:2
-#: lib/cannery_web/templates/email/update_email.html.heex:3
-#: lib/cannery_web/templates/email/update_email.txt.eex:2
+#: lib/cannery_web/components/email_html/confirm_email.html.heex:3
+#: lib/cannery_web/components/email_html/confirm_email.txt.eex:2
+#: lib/cannery_web/components/email_html/reset_password.html.heex:3
+#: lib/cannery_web/components/email_html/reset_password.txt.eex:2
+#: lib/cannery_web/components/email_html/update_email.html.heex:3
+#: lib/cannery_web/components/email_html/update_email.txt.eex:2
 #, elixir-autogen, elixir-format
 msgid "Hi %{email},"
 msgstr ""

-#: lib/cannery_web/templates/email/confirm_email.txt.eex:10
+#: lib/cannery_web/components/email_html/confirm_email.txt.eex:10
 #, elixir-autogen, elixir-format
 msgid "If you didn't create an account at %{url}, please ignore this."
 msgstr ""

-#: lib/cannery_web/templates/email/reset_password.txt.eex:8
-#: lib/cannery_web/templates/email/update_email.txt.eex:8
+#: lib/cannery_web/components/email_html/reset_password.txt.eex:8
+#: lib/cannery_web/components/email_html/update_email.txt.eex:8
 #, elixir-autogen, elixir-format
 msgid "If you didn't request this change from %{url}, please ignore this."
 msgstr ""

-#: lib/cannery_web/templates/email/update_email.html.heex:8
-#: lib/cannery_web/templates/email/update_email.txt.eex:4
+#: lib/cannery_web/components/email_html/update_email.html.heex:8
+#: lib/cannery_web/components/email_html/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.heex:14
-#: lib/cannery_web/templates/email/confirm_email.txt.eex:6
+#: lib/cannery_web/components/email_html/confirm_email.html.heex:14
+#: lib/cannery_web/components/email_html/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.heex:8
-#: lib/cannery_web/templates/email/reset_password.txt.eex:4
+#: lib/cannery_web/components/email_html/reset_password.html.heex:8
+#: lib/cannery_web/components/email_html/reset_password.txt.eex:4
 #, elixir-autogen, elixir-format
 msgid "You can reset your password by visiting the URL below:"
 msgstr ""

-#: lib/cannery/accounts/email.ex:30
+#: lib/cannery/accounts/email.ex:31
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Confirm your Cannery account"
 msgstr ""

-#: lib/cannery_web/templates/email/confirm_email.html.heex:22
+#: lib/cannery_web/components/email_html/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
+#: lib/cannery_web/components/email_html/reset_password.html.heex:16
+#: lib/cannery_web/components/email_html/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
+#: lib/cannery/accounts/email.ex:38
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Reset your Cannery password"
 msgstr ""

-#: lib/cannery_web/templates/layout/email.txt.eex:9
+#: lib/cannery_web/components/layouts/email_text.txt.eex:9
 #, 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
+#: lib/cannery_web/components/layouts/email_html.html.heex:13
 #, 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
+#: lib/cannery/accounts/email.ex:45
 #, 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
+#: lib/cannery_web/components/email_html/confirm_email.html.heex:9
+#: lib/cannery_web/components/email_html/confirm_email.txt.eex:4
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Welcome to Cannery"
 msgstr ""
--- a/priv/gettext/en/LC_MESSAGES/errors.po
+++ b/priv/gettext/en/LC_MESSAGES/errors.po
@@ -16,7 +16,7 @@ msgid "Container must be empty before deleting"
 msgstr ""

 #: lib/cannery_web/live/container_live/index.ex:86
-#: lib/cannery_web/live/container_live/show.ex:71
+#: lib/cannery_web/live/container_live/show.ex:67
 #, elixir-autogen, elixir-format
 msgid "Could not delete %{name}: %{error}"
 msgstr ""
@@ -31,55 +31,51 @@ msgstr ""
 msgid "Email change link is invalid or it has expired."
 msgstr ""

-#: lib/cannery_web/templates/error/error.html.heex:8
+#: lib/cannery_web/controllers/error_html/error.html.heex:8
 #, elixir-autogen, elixir-format
 msgid "Error"
 msgstr ""

-#: lib/cannery_web/templates/error/error.html.heex:31
+#: lib/cannery_web/controllers/error_html/error.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Go back home"
 msgstr ""

-#: lib/cannery_web/views/error_view.ex:10
-#, elixir-autogen, elixir-format
-msgid "Internal Server Error"
-msgstr ""
-
 #: lib/cannery_web/controllers/user_session_controller.ex:17
 #, elixir-autogen, elixir-format
 msgid "Invalid email or password"
 msgstr ""

-#: lib/cannery_web/views/error_view.ex:8
+#: lib/cannery_web/controllers/error_html.ex:9
+#: lib/cannery_web/controllers/error_json.ex:7
 #, elixir-autogen, elixir-format
 msgid "Not found"
 msgstr ""

+#: lib/cannery_web/controllers/user_registration_html/new.html.heex:13
+#: lib/cannery_web/controllers/user_reset_password_html/edit.html.heex:13
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:22
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:64
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:118
 #: lib/cannery_web/live/type_live/form_component.html.heex:18
-#: 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:118
 #, elixir-autogen, elixir-format
 msgid "Oops, something went wrong! Please check the errors below."
 msgstr ""

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

-#: lib/cannery_web/controllers/user_registration_controller.ex:23
-#: lib/cannery_web/controllers/user_registration_controller.ex:52
+#: 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 ""

-#: lib/cannery_web/controllers/user_registration_controller.ex:13
-#: lib/cannery_web/controllers/user_registration_controller.ex:42
-#: lib/cannery_web/controllers/user_registration_controller.ex:71
+#: 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 ""
@@ -89,17 +85,18 @@ msgstr ""
 msgid "Unable to delete user"
 msgstr ""

-#: lib/cannery_web/views/error_view.ex:9
+#: lib/cannery_web/controllers/error_html.ex:10
+#: lib/cannery_web/controllers/error_json.ex:8
 #, elixir-autogen, elixir-format
 msgid "Unauthorized"
 msgstr ""

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

-#: lib/cannery_web/controllers/user_auth.ex:177
+#: lib/cannery_web/controllers/user_auth.ex:266
 #, elixir-autogen, elixir-format
 msgid "You are not authorized to view this page."
 msgstr ""
@@ -125,7 +122,7 @@ msgstr ""
 msgid "must have the @ sign and no spaces"
 msgstr ""

-#: lib/cannery_web/live/container_live/show.ex:46
+#: lib/cannery_web/live/container_live/show.ex:45
 #, elixir-autogen, elixir-format
 msgid "Tag not found"
 msgstr ""
@@ -135,8 +132,8 @@ msgstr ""
 msgid "Tag could not be added"
 msgstr ""

-#: lib/cannery_web/controllers/user_auth.ex:39
-#: lib/cannery_web/controllers/user_auth.ex:161
+#: lib/cannery_web/controllers/user_auth.ex:38
+#: lib/cannery_web/controllers/user_auth.ex:250
 #, elixir-autogen, elixir-format
 msgid "You must confirm your account and log in to access this page."
 msgstr ""
@@ -161,7 +158,7 @@ msgstr ""
 msgid "Invalid multiplier"
 msgstr ""

-#: lib/cannery_web/live/range_live/index.html.heex:74
+#: lib/cannery_web/live/range_live/index.html.heex:71
 #, elixir-autogen, elixir-format
 msgid "Your browser does not support the canvas element."
 msgstr ""
@@ -195,3 +192,19 @@ msgstr ""
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Please select a type and container"
 msgstr ""
+
+#: lib/cannery_web/controllers/error_html.ex:11
+#: lib/cannery_web/controllers/error_json.ex:9
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Internal server error"
+msgstr ""
+
+#: lib/cannery_web/controllers/user_auth.ex:195
+#, elixir-autogen, elixir-format
+msgid "You must log in as an administrator to access this page."
+msgstr ""
+
+#: lib/cannery_web/controllers/user_auth.ex:178
+#, elixir-autogen, elixir-format
+msgid "You must log in to access this page."
+msgstr ""
--- a/priv/gettext/en/LC_MESSAGES/prompts.po
+++ b/priv/gettext/en/LC_MESSAGES/prompts.po
@@ -20,13 +20,13 @@ msgstr ""

 #: lib/cannery_web/live/tag_live/index.ex:65
 #: lib/cannery_web/live/type_live/index.ex:72
-#: lib/cannery_web/live/type_live/show.ex:27
+#: lib/cannery_web/live/type_live/show.ex:26
 #, elixir-autogen, elixir-format
 msgid "%{name} deleted succesfully"
 msgstr ""

 #: lib/cannery_web/live/container_live/index.ex:79
-#: lib/cannery_web/live/container_live/show.ex:61
+#: lib/cannery_web/live/container_live/show.ex:60
 #, elixir-autogen, elixir-format
 msgid "%{name} has been deleted"
 msgstr ""
@@ -58,18 +58,18 @@ msgstr ""
 msgid "Are you sure you want to delete %{name}?"
 msgstr ""

-#: lib/cannery_web/live/pack_live/index.html.heex:187
-#: lib/cannery_web/live/pack_live/show.html.heex:72
+#: lib/cannery_web/live/pack_live/index.html.heex:181
+#: lib/cannery_web/live/pack_live/show.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this ammo?"
 msgstr ""

-#: lib/cannery_web/templates/user_settings/edit.html.heex:157
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:153
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete your account?"
 msgstr ""

-#: lib/cannery_web/components/core_components/topbar.html.heex:89
+#: lib/cannery_web/components/core_components/topbar.html.heex:65
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to log out?"
 msgstr ""
@@ -94,7 +94,7 @@ msgstr ""
 msgid "Logged out successfully."
 msgstr ""

-#: lib/cannery_web/controllers/user_reset_password_controller.ex:46
+#: lib/cannery_web/controllers/user_reset_password_controller.ex:45
 #, elixir-autogen, elixir-format
 msgid "Password reset successfully."
 msgstr ""
@@ -104,7 +104,7 @@ msgstr ""
 msgid "Password updated successfully."
 msgstr ""

-#: lib/cannery_web/controllers/user_registration_controller.ex:66
+#: lib/cannery_web/controllers/user_registration_controller.ex:65
 #, elixir-autogen, elixir-format
 msgid "Please check your email to verify your account"
 msgstr ""
@@ -135,7 +135,7 @@ msgstr ""
 msgid "%{name} added successfully"
 msgstr ""

-#: lib/cannery_web/live/container_live/show.ex:38
+#: lib/cannery_web/live/container_live/show.ex:37
 #, elixir-autogen, elixir-format
 msgid "%{tag_name} has been removed from %{container_name}"
 msgstr ""
@@ -155,14 +155,14 @@ msgstr ""
 msgid "Are you sure you want to unstage this ammo?"
 msgstr ""

-#: lib/cannery_web/live/pack_live/show.ex:158
-#: lib/cannery_web/live/range_live/index.html.heex:152
+#: lib/cannery_web/live/pack_live/show.ex:157
+#: lib/cannery_web/live/range_live/index.html.heex:149
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete this shot record?"
 msgstr ""

-#: lib/cannery_web/live/pack_live/show.ex:80
-#: lib/cannery_web/live/range_live/index.ex:79
+#: lib/cannery_web/live/pack_live/show.ex:79
+#: lib/cannery_web/live/range_live/index.ex:78
 #, elixir-autogen, elixir-format
 msgid "Shot records deleted succesfully"
 msgstr ""
@@ -172,12 +172,12 @@ msgstr ""
 msgid "Shot records updated successfully"
 msgstr ""

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

-#: lib/cannery_web/components/move_pack_component.ex:52
+#: lib/cannery_web/components/move_pack_component.ex:51
 #, elixir-autogen, elixir-format
 msgid "Ammo moved to %{name} successfully"
 msgstr ""
@@ -203,7 +203,7 @@ msgstr ""
 msgid "Creating..."
 msgstr ""

-#: lib/cannery_web/templates/user_settings/edit.html.heex:138
+#: lib/cannery_web/controllers/user_settings_html/edit.html.heex:138
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to change your language?"
 msgstr ""
@@ -214,12 +214,12 @@ msgid "Language updated successfully."
 msgstr ""

 #: lib/cannery_web/live/pack_live/index.ex:94
-#: lib/cannery_web/live/pack_live/show.ex:55
+#: lib/cannery_web/live/pack_live/show.ex:54
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo deleted succesfully"
 msgstr ""

-#: lib/cannery_web/live/range_live/index.ex:92
+#: lib/cannery_web/live/range_live/index.ex:91
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Ammo unstaged succesfully"
 msgstr ""