working to get bones73k up to par with work done on shift73k

lib/bones73k_web/live/user_management/index.ex

@@ -3,7 +3,6 @@ defmodule Bones73kWeb.UserManagementLive.Index do
 
   import Ecto.Query
   import Bones73kWeb.Pagination
-  import Bones73k.Util.Dt
 
   alias Bones73k.Repo
   alias Bones73k.Accounts
@@ -27,9 +26,8 @@ defmodule Bones73kWeb.UserManagementLive.Index do
     if Roles.can?(current_user, user, live_action) do
       socket
       |> assign(:query, query_map(params))
-      |> assign_modal_return_to()
+      |> assign_modal_close_handlers()
       |> assign(:delete_user, nil)
-      |> assign(:page, nil)
       |> request_page_query()
       |> apply_action(socket.assigns.live_action, params)
       |> live_noreply()
@@ -64,9 +62,9 @@ defmodule Bones73kWeb.UserManagementLive.Index do
     |> assign(:user, Accounts.get_user!(id))
   end
 
-  def assign_modal_return_to(%{assigns: %{query: query}} = socket) do
+  defp assign_modal_close_handlers(%{assigns: %{query: query}} = socket) do
     to = Routes.user_management_index_path(socket, :index, Enum.into(query, []))
-    assign(socket, :modal_return_to, to)
+    assign(socket, modal_return_to: to, modal_close_action: :return)
   end
 
   defp user_from_params(params)
@@ -97,7 +95,10 @@ defmodule Bones73kWeb.UserManagementLive.Index do
 
   @impl true
   def handle_event("delete-modal", %{"id" => id}, socket) do
-    {:noreply, assign(socket, :delete_user, Accounts.get_user(id))}
+    socket
+    |> assign(:modal_close_action, :delete_user)
+    |> assign(:delete_user, Accounts.get_user!(id))
+    |> live_noreply()
   end
 
   @impl true
@@ -113,17 +114,13 @@ defmodule Bones73kWeb.UserManagementLive.Index do
   end
 
   @impl true
-  def handle_event(
-        "sort-change",
-        %{"sort_by" => column} = params,
-        %{assigns: %{query: query}} = socket
-      ) do
-    (column == query.sort_by &&
-       send(
-         self(),
-         {:query_update, %{"sort_order" => (query.sort_order == "asc" && "desc") || "asc"}}
-       )) ||
+  def handle_event("sort-change", %{"sort_by" => column} = params, socket) do
+    if column == socket.assigns.query.sort_by do
+      order = (socket.assigns.query.sort_order == "asc" && "desc") || "asc"
+      send(self(), {:query_update, %{"sort_order" => order}})
+    else
       send(self(), {:query_update, Map.put(params, "sort_order", "asc")})
+    end
 
     {:noreply, socket}
   end
@@ -168,8 +165,20 @@ defmodule Bones73kWeb.UserManagementLive.Index do
   end
 
   @impl true
-  def handle_info({:close_modal, _}, %{assigns: %{modal_return_to: to}} = socket) do
-    socket |> copy_flash() |> push_patch(to: to) |> live_noreply()
+  def handle_info({:close_modal, _}, %{assigns: %{modal_close_action: :return}} = socket) do
+    socket
+    |> copy_flash()
+    |> push_patch(to: socket.assigns.modal_return_to)
+    |> live_noreply()
+  end
+
+  @impl true
+  def handle_info({:close_modal, _}, %{assigns: %{modal_close_action: assign_key}} = socket) do
+    socket
+    |> assign(assign_key, nil)
+    |> assign_modal_close_handlers()
+    |> request_page_query()
+    |> live_noreply()
   end
 
   @impl true
@@ -187,5 +196,9 @@ defmodule Bones73kWeb.UserManagementLive.Index do
     ]
   end
 
-  def dt_out(ndt), do: format_ndt(ndt, "{YYYY} {Mshort} {0D}, {h12}:{0m} {am}")
+  def dt_out(ndt) do
+    ndt
+    |> DateTime.from_naive!(Bones73k.app_time_zone())
+    |> Calendar.strftime("%Y %b %-d, %-I:%M %p")
+  end
 end

lib/bones73k_web/live/user_management/index.html.leex

@@ -11,8 +11,8 @@
   <%= live_modal @socket, Bones73kWeb.UserManagement.DeleteComponent,
       id: @delete_user.id,
       title: "Delete User",
-      delete_user: @delete_user,
-      current_user: @current_user %>
+      delete_user: @delete_user
+    %>
 <% end %>
 
 
@@ -92,20 +92,20 @@
             </dt>
             <dd class="d-inline d-sm-block col-auto">
               <span class="visually-hidden"><%= user.confirmed_at && "Yes" || "No" %></span>
-              <input type="checkbox" class="form-check-input" aria-hidden="true" <%= user.confirmed_at && "checked" || "" %>>
+              <input type="checkbox" class="form-check-input" aria-hidden="true" <%= user.confirmed_at && "checked" || "" %> disabled>
             </dd>
           </dl>
 
           <%= if Roles.can?(@current_user, user, :edit) do %>
             <%= live_patch to: Routes.user_management_index_path(@socket, :edit, user.id, Enum.into(@query, [])), class: "btn btn-primary btn-sm text-nowrap" do %>
-              <%= icon_div @socket, "bi-pencil", [class: "icon baseline", style: "margin-right:0.125rem;"] %>
+              <%= icon_div @socket, "bi-pencil", [class: "icon baseline"] %>
               Edit
             <% end %>
           <% end %>
 
           <%= if Roles.can?(@current_user, user, :delete) do %>
             <button class="btn btn-outline-danger btn-sm text-nowrap" phx-click="delete-modal" phx-value-id="<%= user.id %>">
-              <%= icon_div @socket, "bi-trash", [class: "icon baseline", style: "margin-right:0.125rem;"] %>
+              <%= icon_div @socket, "bi-trash", [class: "icon baseline"] %>
               Delete
             </button>
           <% end %>
@@ -174,20 +174,20 @@
             <td class="align-middle" style="white-space: nowrap;"><%= dt_out(user.inserted_at) %></td>
             <td class="align-middle">
               <span class="visually-hidden"><%= user.confirmed_at && "Confirmed" || "Not confirmed" %></span>
-              <input type="checkbox" class="form-check-input" aria-hidden="true" <%= user.confirmed_at && "checked" || "" %>>
+              <input type="checkbox" class="form-check-input" aria-hidden="true" <%= user.confirmed_at && "checked" || "" %> disabled>
             </td>
             <td class="align-middle text-end text-nowrap">
 
               <%= if Roles.can?(@current_user, user, :edit) do %>
                 <%= live_patch to: Routes.user_management_index_path(@socket, :edit, user.id, Enum.into(@query, [])), class: "btn btn-outline-primary btn-sm text-nowrap" do %>
-                  <%= icon_div @socket, "bi-pencil", [class: "icon baseline", style: "margin-right:0.125rem;"] %>
+                  <%= icon_div @socket, "bi-pencil", [class: "icon baseline"] %>
                   Edit
                 <% end %>
               <% end %>
 
               <%= if Roles.can?(@current_user, user, :delete) do %>
                 <button class="btn btn-outline-danger btn-sm text-nowrap" phx-click="delete-modal" phx-value-id="<%= user.id %>">
-                  <%= icon_div @socket, "bi-trash", [class: "icon baseline", style: "margin-right:0.125rem;"] %>
+                  <%= icon_div @socket, "bi-trash", [class: "icon baseline"] %>
                   Delete
                 </button>
               <% end %>

lib/bones73k_web/templates/layout/navbar/_user_menu.html.eex

@@ -1,7 +1,7 @@
 <%= if !@current_user do %>
 
   <%= link nav_link_opts(@conn, to: Routes.user_session_path(@conn, :new), class: "btn btn-outline-light") do %>
-    <%= icon_div @conn, "bi-door-open", [class: "icon baseline", style: "margin-right:0.125rem;"] %>
+    <%= icon_div @conn, "bi-door-open", [class: "icon baseline"] %>
     Log in
   <% end %>
 

lib/bones73k_web/templates/layout/root.html.leex

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <%= csrf_meta_tag() %>
-    <%= live_title_tag assigns[:page_title] || "Bones73k", suffix: " · Phoenix Framework" %>
+    <%= live_title_tag assigns[:page_title] || "", suffix: assigns[:page_title] && " · Bones73k" || "Bones73k" %>
     <link phx-track-static rel="stylesheet" href="<%= Routes.static_path(@conn, "/css/app.css") %>"/>
     <script defer phx-track-static type="text/javascript" src="<%= Routes.static_path(@conn, "/js/app.js") %>"></script>
   </head>