From c251e1dba3550544d3e1d15681e0edb3425c664f Mon Sep 17 00:00:00 2001
From: Moritz <moritz.m@local-it.org>
Date: Thu, 3 Jul 2025 21:29:01 +0200
Subject: [PATCH] fix: adapt layout to phoenix 1.8

---
 lib/mv_web/components/layouts.ex            | 87 +++++++++------------
 lib/mv_web/components/layouts/app.html.heex | 34 --------
 2 files changed, 38 insertions(+), 83 deletions(-)
 delete mode 100644 lib/mv_web/components/layouts/app.html.heex

diff --git a/lib/mv_web/components/layouts.ex b/lib/mv_web/components/layouts.ex
index 1ced765..dd70936 100644
--- a/lib/mv_web/components/layouts.ex
+++ b/lib/mv_web/components/layouts.ex
@@ -11,60 +11,49 @@ defmodule MvWeb.Layouts do
 
   embed_templates "layouts/*"
 
-  @doc """
-  Renders the app layout
-
-  ## Examples
-
-      <Layouts.app flash={@flash}>
-        <h1>Content</h1>
-      </Layout.app>
-      
-  """
-  attr :flash, :map, required: true, doc: "the map of flash messages"
-
-  attr :current_scope, :map,
-    default: nil,
-    doc: "the current [scope](https://hexdocs.pm/phoenix/scopes.html)"
-
-  slot :inner_block, required: true
+  @doc "The main app layout (Backpex shell, topbar, sidebar, flash, content)"
+  attr :flash, :map, required: true
+  attr :socket, :any, default: nil
+  attr :current_url, :string, default: nil
+  attr :fluid?, :boolean, default: false
+  attr :inner_content, :any, required: true
 
   def app(assigns) do
     ~H"""
-    <header class="navbar px-4 sm:px-6 lg:px-8">
-      <div class="flex-1">
-        <a href="/" class="flex-1 flex w-fit items-center gap-2">
-          <img src={~p"/images/logo.svg"} width="36" />
-          <span class="text-sm font-semibold">v{Application.spec(:phoenix, :vsn)}</span>
-        </a>
-      </div>
-      <div class="flex-none">
-        <ul class="flex flex-column px-1 space-x-4 items-center">
-          <li>
-            <a href="https://phoenixframework.org/" class="btn btn-ghost">Website</a>
-          </li>
-          <li>
-            <a href="https://github.com/phoenixframework/phoenix" class="btn btn-ghost">GitHub</a>
-          </li>
-          <li>
-            <.theme_toggle />
-          </li>
-          <li>
-            <a href="https://hexdocs.pm/phoenix/overview.html" class="btn btn-primary">
-              Get Started <span aria-hidden="true">&rarr;</span>
-            </a>
-          </li>
-        </ul>
-      </div>
-    </header>
+    <Backpex.HTML.Layout.app_shell fluid={@fluid?}>
+      <:topbar>
+        <Backpex.HTML.Layout.topbar_branding />
 
-    <main class="px-4 py-20 sm:px-6 lg:px-8">
-      <div class="mx-auto max-w-2xl space-y-4">
-        {render_slot(@inner_block)}
-      </div>
-    </main>
+        <Backpex.HTML.Layout.theme_selector
+          socket={@socket}
+          themes={[
+            {"Light", "light"},
+            {"Dark", "dark"}
+          ]}
+        />
 
-    <.flash_group flash={@flash} />
+        <Backpex.HTML.Layout.topbar_dropdown class="mr-2 md:mr-0">
+          <:label>
+            <label tabindex="0" class="btn btn-square btn-ghost">
+              <.icon name="hero-user" class="size-6" />
+            </label>
+          </:label>
+          <li>
+            <.link navigate={~p"/"} class="text-error flex justify-between hover:bg-base-200">
+              <p>Logout</p>
+              <.icon name="hero-arrow-right-on-rectangle" class="size-5" />
+            </.link>
+          </li>
+        </Backpex.HTML.Layout.topbar_dropdown>
+      </:topbar>
+      <:sidebar>
+        <Backpex.HTML.Layout.sidebar_item current_url={@current_url} navigate={~p"/members"}>
+          <.icon name="hero-users" class="size-5" /> Members
+        </Backpex.HTML.Layout.sidebar_item>
+      </:sidebar>
+      <Backpex.HTML.Layout.flash_messages flash={@flash} />
+      <%= @inner_content %>
+    </Backpex.HTML.Layout.app_shell>
     """
   end
 
diff --git a/lib/mv_web/components/layouts/app.html.heex b/lib/mv_web/components/layouts/app.html.heex
deleted file mode 100644
index 892d4a5..0000000
--- a/lib/mv_web/components/layouts/app.html.heex
+++ /dev/null
@@ -1,34 +0,0 @@
-<Backpex.HTML.Layout.app_shell fluid={@fluid?}>
-  <:topbar>
-    <Backpex.HTML.Layout.topbar_branding />
-
-    <Backpex.HTML.Layout.theme_selector
-      socket={@socket}
-      themes={[
-        {"Light", "light"},
-        {"Dark", "dark"}
-      ]}
-    />
-
-    <Backpex.HTML.Layout.topbar_dropdown class="mr-2 md:mr-0">
-      <:label>
-        <label tabindex="0" class="btn btn-square btn-ghost">
-          <.icon name="hero-user" class="size-6" />
-        </label>
-      </:label>
-      <li>
-        <.link navigate={~p"/"} class="text-error flex justify-between hover:bg-base-200">
-          <p>Logout</p>
-          <.icon name="hero-arrow-right-on-rectangle" class="size-5" />
-        </.link>
-      </li>
-    </Backpex.HTML.Layout.topbar_dropdown>
-  </:topbar>
-  <:sidebar>
-    <Backpex.HTML.Layout.sidebar_item current_url={@current_url} navigate={~p"/members"}>
-      <.icon name="hero-users" class="size-5" /> Members
-    </Backpex.HTML.Layout.sidebar_item>
-  </:sidebar>
-  <Backpex.HTML.Layout.flash_messages flash={@flash} />
-  <%= @inner_content %>
-</Backpex.HTML.Layout.app_shell> 
\ No newline at end of file