CHANGELOG.md

@@ -1,8 +1,3 @@
-# v0.8.1
-- Update dependencies
-- Show topbar on form submit/page refresh
-- Make loading/reconnection less intrusive
-
 # v0.8.0
 - Add search to catalog, ammo, container, tag and range index pages
 - Tweak urls for catalog, ammo, containers, tags and shot records

assets/css/app.scss

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

assets/js/app.js

@@ -48,8 +48,6 @@ Alpine.start()
 topbar.config({ barColors: { 0: '#29d' }, shadowColor: 'rgba(0, 0, 0, .3)' })
 window.addEventListener('phx:page-loading-start', info => topbar.show())
 window.addEventListener('phx:page-loading-stop', info => topbar.hide())
-window.addEventListener('submit', info => topbar.show())
-window.addEventListener('beforeunload', info => topbar.show())
 
 // connect if there are any LiveViews on the page
 liveSocket.connect()

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

@@ -28,15 +28,27 @@
 </main>
 
 <div
-  id="disconnect"
-  class="z-50 fixed opacity-0 bottom-12 right-12 px-8 py-4 w-max h-max
-  border border-primary-200 shadow-lg rounded-lg bg-white
-  flex justify-center items-center space-x-4
-  transition-opacity ease-in-out duration-500 delay-[2000ms]"
+  id="loading"
+  class="fixed opacity-0 top-0 left-0 w-screen h-screen bg-white z-50
+  flex flex-col justify-center items-center space-y-4
+  transition-opacity ease-in-out duration-500"
 >
-  <i class="fas fa-fade text-md fa-satellite-dish"></i>
+  <h1 class="title text-2xl title-primary-500">
+    <%= gettext("Loading...") %>
+  </h1>
 
-  <h1 class="title text-md title-primary-500">
+  <i class="fas fa-3x fa-spin fa-gear"></i>
+</div>
+
+<div
+  id="disconnect"
+  class="fixed opacity-0 top-0 left-0 w-screen h-screen bg-white z-50
+  flex flex-col justify-center items-center space-y-4
+  transition-opacity ease-in-out duration-500"
+>
+  <h1 class="title text-2xl title-primary-500">
     <%= gettext("Reconnecting...") %>
   </h1>
+
+  <i class="fas fa-3x fa-fade fa-satellite-dish"></i>
 </div>

mix.exs

@@ -4,7 +4,7 @@ defmodule Cannery.MixProject do
   def project do
     [
       app: :cannery,
-      version: "0.8.1",
+      version: "0.8.0",
       elixir: "1.14.1",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: Mix.compilers(),

priv/gettext/de/LC_MESSAGES/default.po

@@ -632,11 +632,16 @@ msgstr "Demarkiert"
 msgid "Firing type"
 msgstr "Patronenhülsenform"
 
-#: lib/cannery_web/templates/layout/live.html.heex:40
+#: lib/cannery_web/templates/layout/live.html.heex:50
 #, elixir-autogen, elixir-format
 msgid "Reconnecting..."
 msgstr "Neu verbinden..."
 
+#: lib/cannery_web/templates/layout/live.html.heex:37
+#, elixir-autogen, elixir-format
+msgid "Loading..."
+msgstr "Lädt..."
+
 #: lib/cannery_web/live/container_live/index.ex:32
 #: lib/cannery_web/live/container_live/show.ex:113
 #, elixir-autogen, elixir-format

priv/gettext/default.pot

@@ -615,11 +615,16 @@ msgstr ""
 msgid "Firing type"
 msgstr ""
 
-#: lib/cannery_web/templates/layout/live.html.heex:40
+#: lib/cannery_web/templates/layout/live.html.heex:50
 #, elixir-autogen, elixir-format
 msgid "Reconnecting..."
 msgstr ""
 
+#: lib/cannery_web/templates/layout/live.html.heex:37
+#, elixir-autogen, elixir-format
+msgid "Loading..."
+msgstr ""
+
 #: lib/cannery_web/live/container_live/index.ex:32
 #: lib/cannery_web/live/container_live/show.ex:113
 #, elixir-autogen, elixir-format

priv/gettext/en/LC_MESSAGES/default.po

@@ -615,11 +615,16 @@ msgstr ""
 msgid "Firing type"
 msgstr ""
 
-#: lib/cannery_web/templates/layout/live.html.heex:40
+#: lib/cannery_web/templates/layout/live.html.heex:50
 #, elixir-autogen, elixir-format
 msgid "Reconnecting..."
 msgstr ""
 
+#: lib/cannery_web/templates/layout/live.html.heex:37
+#, elixir-autogen, elixir-format
+msgid "Loading..."
+msgstr ""
+
 #: lib/cannery_web/live/container_live/index.ex:32
 #: lib/cannery_web/live/container_live/show.ex:113
 #, elixir-autogen, elixir-format

priv/gettext/es/LC_MESSAGES/default.po

@@ -633,11 +633,16 @@ msgstr "Retirar"
 msgid "Firing type"
 msgstr "Tipo de fuego"
 
-#: lib/cannery_web/templates/layout/live.html.heex:40
+#: lib/cannery_web/templates/layout/live.html.heex:50
 #, elixir-autogen, elixir-format
 msgid "Reconnecting..."
 msgstr "Reconectando..."
 
+#: lib/cannery_web/templates/layout/live.html.heex:37
+#, elixir-autogen, elixir-format
+msgid "Loading..."
+msgstr "Cargando..."
+
 #: lib/cannery_web/live/container_live/index.ex:32
 #: lib/cannery_web/live/container_live/show.ex:113
 #, elixir-autogen, elixir-format

priv/gettext/fr/LC_MESSAGES/default.po

@@ -634,11 +634,16 @@ msgstr "Désélectionner"
 msgid "Firing type"
 msgstr "Type d’allumage"
 
-#: lib/cannery_web/templates/layout/live.html.heex:40
+#: lib/cannery_web/templates/layout/live.html.heex:50
 #, elixir-autogen, elixir-format
 msgid "Reconnecting..."
 msgstr "Reconnexion en cours…"
 
+#: lib/cannery_web/templates/layout/live.html.heex:37
+#, elixir-autogen, elixir-format
+msgid "Loading..."
+msgstr "Chargement en cours…"
+
 #: lib/cannery_web/live/container_live/index.ex:32
 #: lib/cannery_web/live/container_live/show.ex:113
 #, elixir-autogen, elixir-format

priv/gettext/ga/LC_MESSAGES/default.po

@@ -626,11 +626,16 @@ msgstr ""
 msgid "Firing type"
 msgstr ""
 
-#: lib/cannery_web/templates/layout/live.html.heex:40
+#: lib/cannery_web/templates/layout/live.html.heex:50
 #, elixir-autogen, elixir-format
 msgid "Reconnecting..."
 msgstr ""
 
+#: lib/cannery_web/templates/layout/live.html.heex:37
+#, elixir-autogen, elixir-format
+msgid "Loading..."
+msgstr ""
+
 #: lib/cannery_web/live/container_live/index.ex:32
 #: lib/cannery_web/live/container_live/show.ex:113
 #, elixir-autogen, elixir-format