.drone.yml

@@ -35,7 +35,9 @@ steps:
       from_secret: docker_username
     password:
       from_secret: docker_password
-    tags: latest
+    tags:
+      - latest
+      - ${DRONE_TAG}
   when:
     branch:
     - stable

CHANGELOG.md

@@ -1,8 +1,3 @@
-# v0.2.2
-- Fix loading and reconnecting pages not being fixed
-- Fix closing modal in some cases not triggering a page reload
-- Fix error when display container and tag edit routes from a fresh reload
-
 # v0.2.1
 - Fix checkbox spacing for mobile view
 - Fix spacing with form elements in mobile view

lib/cannery_web/live/container_live/index.ex

@@ -16,7 +16,7 @@ defmodule CanneryWeb.ContainerLive.Index do
 
   @impl true
   def handle_params(params, _url, %{assigns: %{live_action: live_action}} = socket) do
-    {:noreply, apply_action(socket, live_action, params) |> display_containers()}
+    {:noreply, apply_action(socket, live_action, params)}
   end
 
   defp apply_action(%{assigns: %{current_user: current_user}} = socket, :edit, %{"id" => id}) do

lib/cannery_web/live/live_helpers.ex

@@ -38,39 +38,28 @@ defmodule CanneryWeb.LiveHelpers do
   """
   def modal(assigns) do
     ~H"""
-    <%= live_patch to: @return_to,
-      id: "modal-bg",
-      class:
-        "fade-in fixed z-10 left-0 top-0
-         w-full h-full overflow-hidden
-         p-8 flex flex-col justify-center items-center cursor-auto",
-      style: "background-color: rgba(0,0,0,0.4);",
-      phx_remove: hide_modal()
-    do %>
-      <span class="hidden"></span>
-    <% end %>
-
     <div
       id="modal"
-      class="fixed z-10 left-0 top-0 pointer-events-none
+      class="fade-in fixed z-10 left-0 top-0
       w-full h-full overflow-hidden
       p-8 flex flex-col justify-center items-center"
+      style="opacity: 1 !important; background-color: rgba(0,0,0,0.4);"
+      phx-remove={hide_modal()}
     >
       <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 max-h-128 relative overflow-y-auto
         flex flex-col justify-start items-center
         bg-white border-2 rounded-lg"
+        phx-click-away={hide_modal()}
+        phx-window-keydown={hide_modal()}
+        phx-key="escape"
       >
         <%= live_patch to: @return_to,
                    id: "close",
                    class:
-                     "absolute top-8 right-10
-                      text-gray-500 hover:text-gray-800
-                      transition-all duration-500 ease-in-out",
-      phx_remove: hide_modal()
-      do %>
+                     "absolute top-8 right-10 text-gray-500 hover:text-gray-800 transition-all duration-500 ease-in-out",
+                   phx_click: hide_modal() do %>
           <i class="fa-fw fa-lg fas fa-times"></i>
         <% end %>
 
@@ -85,7 +74,6 @@ defmodule CanneryWeb.LiveHelpers do
   def hide_modal(js \\ %JS{}) do
     js
     |> JS.hide(to: "#modal", transition: "fade-out")
-    |> JS.hide(to: "#modal-bg", transition: "fade-out")
     |> JS.hide(to: "#modal-content", transition: "fade-out-scale")
   end
 end

lib/cannery_web/live/tag_live/index.ex

@@ -15,7 +15,7 @@ defmodule CanneryWeb.TagLive.Index do
 
   @impl true
   def handle_params(params, _url, %{assigns: %{live_action: live_action}} = socket) do
-    {:noreply, apply_action(socket, live_action, params) |> display_tags}
+    {:noreply, apply_action(socket, live_action, params)}
   end
 
   defp apply_action(%{assigns: %{current_user: current_user}} = socket, :edit, %{"id" => id}) do

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

@@ -29,7 +29,7 @@
 
 <div
   id="loading"
-  class="fixed opacity-0 top-0 left-0 w-screen h-screen bg-white z-50
+  class="absolute 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"
 >
@@ -42,7 +42,7 @@
 
 <div
   id="disconnect"
-  class="fixed opacity-0 top-0 left-0 w-screen h-screen bg-white z-50
+  class="absolute 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"
 >