Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
App layout refactor: Phase 1 (#6598)
RobertJoonas54d8af8ecfab
diff --git a/lib/plausible_web/components/layouts.ex b/lib/plausible_web/components/layouts.exnew file mode 100644index 0000000000..a429347f8a--- /dev/null+++ b/lib/plausible_web/components/layouts.ex@@ -0,0 +1,44 @@+defmodule PlausibleWeb.Layouts do+ @moduledoc false++ use Phoenix.Component++ alias PlausibleWeb.Router.Helpers, as: Routes++ def legacy(assigns) do+ ~H"""+ <div class={["flex flex-col", if(!assigns[:embedded], do: "h-full")]}>+ <%= if !assigns[:embedded] && assigns[:flash] do %>+ {PlausibleWeb.LayoutView.render("_flash.html", assigns)}+ <% end %>++ <%= if !assigns[:embedded] && !assigns[:hide_header?] do %>+ {PlausibleWeb.LayoutView.render("_header.html", assigns)}++ <%= if !assigns[:disable_global_notices?] do %>+ {PlausibleWeb.LayoutView.render("_notice.html", assigns)}+ <% end %>+ <% end %>++ <main class="flex-1 flex flex-col">+ {Map.get(assigns, :inner_layout) || @inner_content}+ </main>++ <%= if assigns[:embedded] do %>+ <div data-iframe-height></div>+ <script type="text/javascript" src={Routes.static_path(@conn, "/js/embed.content.js")}>+ </script>+ <% end %>+ <%= if !assigns[:hide_footer?] do %>+ {PlausibleWeb.LayoutView.render("_footer.html", assigns)}+ <% end %>+ <script type="text/javascript" src={Routes.static_path(@conn, "/js/app.js")}>+ </script>+ <%= if assigns[:load_dashboard_js] do %>+ <script type="text/javascript" src={Routes.static_path(@conn, "/js/dashboard.js")}>+ </script>+ <% end %>+ </div>+ """+ end+enddiff --git a/lib/plausible_web/templates/layout/app.html.heex b/lib/plausible_web/templates/layout/app.html.heexindex e2ec647677..83e7658469 100644--- a/lib/plausible_web/templates/layout/app.html.heex+++ b/lib/plausible_web/templates/layout/app.html.heex@@ -29,44 +29,9 @@{render("_tracking.html", assigns)}</head><body- class={[- "flex flex-col",- assigns[:bg_class] || "bg-gray-50 dark:bg-gray-950",- if !assigns[:embedded] do- "h-full"- end- ]}+ class={assigns[:bg_class] || "bg-gray-50 dark:bg-gray-950"}style={if assigns[:background], do: "background-color: #{assigns[:background]}"}>- <%= if !assigns[:embedded] && assigns[:flash] do %>- {render("_flash.html", assigns)}- <% end %>-- <%= if !assigns[:embedded] && !assigns[:hide_header?] do %>- {render("_header.html", assigns)}-- <%= if !assigns[:disable_global_notices?] do %>- {render("_notice.html", assigns)}- <% end %>- <% end %>-- <main class="flex-1 flex flex-col">- {Map.get(assigns, :inner_layout) || @inner_content}- </main>-- <%= if assigns[:embedded] do %>- <div data-iframe-height></div>- <script type="text/javascript" src={Routes.static_path(@conn, "/js/embed.content.js")}>- </script>- <% end %>- <%= if !assigns[:hide_footer?] do %>- {render("_footer.html", assigns)}- <% end %>- <script type="text/javascript" src={Routes.static_path(@conn, "/js/app.js")}>- </script>- <%= if assigns[:load_dashboard_js] do %>- <script type="text/javascript" src={Routes.static_path(@conn, "/js/dashboard.js")}>- </script>- <% end %>+ <Layouts.legacy {assigns} /></body></html>diff --git a/lib/plausible_web/views/layout_view.ex b/lib/plausible_web/views/layout_view.exindex b67ab79ccc..f82555a175 100644--- a/lib/plausible_web/views/layout_view.ex+++ b/lib/plausible_web/views/layout_view.ex@@ -5,6 +5,7 @@ defmodule PlausibleWeb.LayoutView doalias Plausible.Teamsalias PlausibleWeb.Components.Billing.Noticealias PlausibleWeb.Components.Layout+ alias PlausibleWeb.Layoutsrequire Plausible.Billing@@ -170,7 +171,7 @@ defmodule PlausibleWeb.LayoutView dodef team_switcher(assigns) doteams = assigns[:teams]- if teams && length(teams) > 0 do+ if teams && teams != [] docurrent_team = assigns[:current_team]my_team = assigns[:my_team]current_included? = current_team && Enum.any?(teams, &(&1.id == current_team.id))