From c69d7843abaf9d38c612e13bbb59926e1d7e87c7 Mon Sep 17 00:00:00 2001
From: shibao <shibao@bubbletea.dev>
Date: Fri, 23 Feb 2024 23:34:04 -0500
Subject: [PATCH] fix layout issues

---
 CHANGELOG.md                                  |  3 ++
 .../components/layouts/app.html.heex          | 39 +++++++++++++---
 .../components/layouts/empty.html.heex        |  1 +
 .../components/layouts/live.html.heex         | 45 -------------------
 mix.exs                                       |  2 +-
 priv/gettext/de/LC_MESSAGES/default.po        |  2 +-
 priv/gettext/default.pot                      |  2 +-
 priv/gettext/en/LC_MESSAGES/default.po        |  2 +-
 priv/gettext/es/LC_MESSAGES/default.po        |  2 +-
 priv/gettext/fr/LC_MESSAGES/default.po        |  2 +-
 priv/gettext/ga/LC_MESSAGES/default.po        |  2 +-
 priv/gettext/it/LC_MESSAGES/default.po        |  2 +-
 12 files changed, 45 insertions(+), 59 deletions(-)
 create mode 100644 lib/cannery_web/components/layouts/empty.html.heex
 delete mode 100644 lib/cannery_web/components/layouts/live.html.heex

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b0164e..cd55b32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# v0.9.7
+- Fix margin on bottom of page
+
 # v0.9.6
 - Make ammo packs in containers directly navigable in table view
 - Update dependencies
diff --git a/lib/cannery_web/components/layouts/app.html.heex b/lib/cannery_web/components/layouts/app.html.heex
index 22934f2..eb0ac37 100644
--- a/lib/cannery_web/components/layouts/app.html.heex
+++ b/lib/cannery_web/components/layouts/app.html.heex
@@ -1,18 +1,45 @@
-<main role="main" class="min-h-full min-w-full">
+<main class="pb-8 min-w-full">
   <header>
     <.topbar current_user={assigns[:current_user]} />
 
     <div class="mx-8 my-2 flex flex-col space-y-4 text-center">
-      <p :if={@flash["info"]} class="alert alert-info" role="alert">
-        <%= @flash["info"] %>
+      <p
+        :if={@flash && @flash |> Map.has_key?("info")}
+        class="alert alert-info"
+        role="alert"
+        phx-click="lv:clear-flash"
+        phx-value-key="info"
+      >
+        <%= live_flash(@flash, "info") %>
       </p>
-      <p :if={@flash["error"]} class="alert alert-danger" role="alert">
-        <%= @flash["error"] %>
+
+      <p
+        :if={@flash && @flash |> Map.has_key?("error")}
+        class="alert alert-danger"
+        role="alert"
+        phx-click="lv:clear-flash"
+        phx-value-key="error"
+      >
+        <%= live_flash(@flash, "error") %>
       </p>
     </div>
   </header>
 
-  <div class="mx-4 sm:mx-8 md:mx-16">
+  <div class="mx-4 sm:mx-8 md:mx-16 flex flex-col justify-center items-stretch">
     <%= @inner_content %>
   </div>
 </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]"
+>
+  <i class="fas fa-fade text-md fa-satellite-dish"></i>
+
+  <h1 class="title text-md title-primary-500">
+    <%= gettext("Reconnecting...") %>
+  </h1>
+</div>
diff --git a/lib/cannery_web/components/layouts/empty.html.heex b/lib/cannery_web/components/layouts/empty.html.heex
new file mode 100644
index 0000000..430d018
--- /dev/null
+++ b/lib/cannery_web/components/layouts/empty.html.heex
@@ -0,0 +1 @@
+<%= @inner_block %>
diff --git a/lib/cannery_web/components/layouts/live.html.heex b/lib/cannery_web/components/layouts/live.html.heex
deleted file mode 100644
index eb0ac37..0000000
--- a/lib/cannery_web/components/layouts/live.html.heex
+++ /dev/null
@@ -1,45 +0,0 @@
-<main class="pb-8 min-w-full">
-  <header>
-    <.topbar current_user={assigns[:current_user]} />
-
-    <div class="mx-8 my-2 flex flex-col space-y-4 text-center">
-      <p
-        :if={@flash && @flash |> Map.has_key?("info")}
-        class="alert alert-info"
-        role="alert"
-        phx-click="lv:clear-flash"
-        phx-value-key="info"
-      >
-        <%= live_flash(@flash, "info") %>
-      </p>
-
-      <p
-        :if={@flash && @flash |> Map.has_key?("error")}
-        class="alert alert-danger"
-        role="alert"
-        phx-click="lv:clear-flash"
-        phx-value-key="error"
-      >
-        <%= live_flash(@flash, "error") %>
-      </p>
-    </div>
-  </header>
-
-  <div class="mx-4 sm:mx-8 md:mx-16 flex flex-col justify-center items-stretch">
-    <%= @inner_content %>
-  </div>
-</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]"
->
-  <i class="fas fa-fade text-md fa-satellite-dish"></i>
-
-  <h1 class="title text-md title-primary-500">
-    <%= gettext("Reconnecting...") %>
-  </h1>
-</div>
diff --git a/mix.exs b/mix.exs
index db08f1f..b3dcd50 100644
--- a/mix.exs
+++ b/mix.exs
@@ -4,7 +4,7 @@ defmodule Cannery.MixProject do
   def project do
     [
       app: :cannery,
-      version: "0.9.6",
+      version: "0.9.7",
       elixir: "1.16.1",
       elixirc_paths: elixirc_paths(Mix.env()),
       start_permanent: Mix.env() == :prod,
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index 49215e3..e50682e 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -559,7 +559,7 @@ msgstr "Neues Passwort"
 msgid "Firing type"
 msgstr "Patronenhülsenform"
 
-#: lib/cannery_web/components/layouts/live.html.heex:43
+#: lib/cannery_web/components/layouts/app.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Reconnecting..."
 msgstr "Neu verbinden..."
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index b2214f2..5418819 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -553,7 +553,7 @@ msgstr ""
 msgid "Firing type"
 msgstr ""
 
-#: lib/cannery_web/components/layouts/live.html.heex:43
+#: lib/cannery_web/components/layouts/app.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Reconnecting..."
 msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index eb37481..8483717 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -553,7 +553,7 @@ msgstr ""
 msgid "Firing type"
 msgstr ""
 
-#: lib/cannery_web/components/layouts/live.html.heex:43
+#: lib/cannery_web/components/layouts/app.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Reconnecting..."
 msgstr ""
diff --git a/priv/gettext/es/LC_MESSAGES/default.po b/priv/gettext/es/LC_MESSAGES/default.po
index 0e0af3f..70b0bbb 100644
--- a/priv/gettext/es/LC_MESSAGES/default.po
+++ b/priv/gettext/es/LC_MESSAGES/default.po
@@ -560,7 +560,7 @@ msgstr "Nueva contraseña"
 msgid "Firing type"
 msgstr "Tipo de fuego"
 
-#: lib/cannery_web/components/layouts/live.html.heex:43
+#: lib/cannery_web/components/layouts/app.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Reconnecting..."
 msgstr "Reconectando..."
diff --git a/priv/gettext/fr/LC_MESSAGES/default.po b/priv/gettext/fr/LC_MESSAGES/default.po
index 2cb0ae9..893c873 100644
--- a/priv/gettext/fr/LC_MESSAGES/default.po
+++ b/priv/gettext/fr/LC_MESSAGES/default.po
@@ -561,7 +561,7 @@ msgstr "Nouveau mot de passe"
 msgid "Firing type"
 msgstr "Type d’allumage"
 
-#: lib/cannery_web/components/layouts/live.html.heex:43
+#: lib/cannery_web/components/layouts/app.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Reconnecting..."
 msgstr "Reconnexion en cours…"
diff --git a/priv/gettext/ga/LC_MESSAGES/default.po b/priv/gettext/ga/LC_MESSAGES/default.po
index ac43901..539ea7a 100644
--- a/priv/gettext/ga/LC_MESSAGES/default.po
+++ b/priv/gettext/ga/LC_MESSAGES/default.po
@@ -555,7 +555,7 @@ msgstr ""
 msgid "Firing type"
 msgstr ""
 
-#: lib/cannery_web/components/layouts/live.html.heex:43
+#: lib/cannery_web/components/layouts/app.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Reconnecting..."
 msgstr ""
diff --git a/priv/gettext/it/LC_MESSAGES/default.po b/priv/gettext/it/LC_MESSAGES/default.po
index 72c6d27..36e7d59 100644
--- a/priv/gettext/it/LC_MESSAGES/default.po
+++ b/priv/gettext/it/LC_MESSAGES/default.po
@@ -564,7 +564,7 @@ msgstr ""
 msgid "Firing type"
 msgstr ""
 
-#: lib/cannery_web/components/layouts/live.html.heex:43
+#: lib/cannery_web/components/layouts/app.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Reconnecting..."
 msgstr ""