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
Simplify Phoenix error template (#2913)
Vini Brasil257fa16cdc3b
diff --git a/config/config.exs b/config/config.exsindex 6e0f0a0077..62c1064ff5 100644--- a/config/config.exs+++ b/config/config.exs@@ -7,7 +7,7 @@ config :plausible, PlausibleWeb.Endpoint,pubsub_server: Plausible.PubSub,render_errors: [view: PlausibleWeb.ErrorView,- layout: {PlausibleWeb.LayoutView, "focus.html"},+ layout: {PlausibleWeb.LayoutView, "base_error.html"},accepts: ~w(html json)]diff --git a/lib/plausible_web/controllers/billing_controller.ex b/lib/plausible_web/controllers/billing_controller.exindex ccd8cd2f93..336cfdf1a8 100644--- a/lib/plausible_web/controllers/billing_controller.ex+++ b/lib/plausible_web/controllers/billing_controller.ex@@ -27,6 +27,7 @@ defmodule PlausibleWeb.BillingController dotrue ->render(conn, "upgrade.html",+ skip_plausible_tracking: true,usage: Plausible.Billing.usage(user),user: user,layout: {PlausibleWeb.LayoutView, "focus.html"}@@ -45,6 +46,7 @@ defmodule PlausibleWeb.BillingController doplan ->render(conn, "upgrade_to_plan.html",+ skip_plausible_tracking: true,user: user,plan: plan,layout: {PlausibleWeb.LayoutView, "focus.html"}@@ -56,7 +58,10 @@ defmodule PlausibleWeb.BillingController doenddef upgrade_success(conn, _params) do- render(conn, "upgrade_success.html", layout: {PlausibleWeb.LayoutView, "focus.html"})+ render(conn, "upgrade_success.html",+ layout: {PlausibleWeb.LayoutView, "focus.html"},+ skip_plausible_tracking: true+ )enddef change_plan_form(conn, _params) do@@ -76,6 +81,7 @@ defmodule PlausibleWeb.BillingController dosubscription && user.enterprise_plan &&subscription.paddle_plan_id == user.enterprise_plan.paddle_plan_id ->render(conn, "change_enterprise_plan_contact_us.html",+ skip_plausible_tracking: true,user: user,plan: user.enterprise_plan,layout: {PlausibleWeb.LayoutView, "focus.html"}@@ -83,6 +89,7 @@ defmodule PlausibleWeb.BillingController dosubscription ->render(conn, "change_plan.html",+ skip_plausible_tracking: true,subscription: subscription,layout: {PlausibleWeb.LayoutView, "focus.html"})@@ -106,6 +113,7 @@ defmodule PlausibleWeb.BillingController dotrue ->render(conn, "change_enterprise_plan.html",+ skip_plausible_tracking: true,user: user,plan: new_plan,layout: {PlausibleWeb.LayoutView, "focus.html"}@@ -117,6 +125,7 @@ defmodule PlausibleWeb.BillingController dowith {:ok, {subscription, preview_info}} <-preview_subscription(conn.assigns.current_user, new_plan_id) dorender(conn, "change_plan_preview.html",+ skip_plausible_tracking: true,subscription: subscription,preview_info: preview_info,layout: {PlausibleWeb.LayoutView, "focus.html"}diff --git a/lib/plausible_web/controllers/error_report_controller.ex b/lib/plausible_web/controllers/error_report_controller.exindex b830047765..601fe9fc3e 100644--- a/lib/plausible_web/controllers/error_report_controller.ex+++ b/lib/plausible_web/controllers/error_report_controller.ex@@ -23,6 +23,8 @@ defmodule PlausibleWeb.ErrorReportController dodefp thanks(conn) doconn|> put_view(PlausibleWeb.ErrorView)- |> render("server_error_report_thanks.html", layout: {PlausibleWeb.LayoutView, "focus.html"})+ |> render("server_error_report_thanks.html",+ layout: {PlausibleWeb.LayoutView, "base_error.html"}+ )endenddiff --git a/lib/plausible_web/controllers/helpers.ex b/lib/plausible_web/controllers/helpers.exindex d8db7f88e8..e8a1d5976a 100644--- a/lib/plausible_web/controllers/helpers.ex+++ b/lib/plausible_web/controllers/helpers.ex@@ -6,13 +6,16 @@ defmodule PlausibleWeb.ControllerHelpers doconn|> put_status(status)|> put_view(PlausibleWeb.ErrorView)- |> render("#{status}.html", layout: false, message: message)+ |> render("#{status}.html", message: message, layout: error_layout())enddef render_error(conn, status) doconn|> put_status(status)|> put_view(PlausibleWeb.ErrorView)- |> render("#{status}.html", layout: false)+ |> render("#{status}.html", layout: error_layout())end++ defp error_layout,+ do: Application.get_env(:plausible, PlausibleWeb.Endpoint)[:render_errors][:layout]enddiff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.exindex 6c89418070..6de9010ec1 100644--- a/lib/plausible_web/controllers/site_controller.ex+++ b/lib/plausible_web/controllers/site_controller.ex@@ -877,6 +877,7 @@ defmodule PlausibleWeb.SiteController dochangeset = Plausible.Site.update_changeset(conn.assigns.site)render(conn, "change_domain.html",+ skip_plausible_tracking: true,changeset: changeset,layout: {PlausibleWeb.LayoutView, "focus.html"})@@ -893,6 +894,7 @@ defmodule PlausibleWeb.SiteController do{:error, changeset} ->render(conn, "change_domain.html",+ skip_plausible_tracking: true,changeset: changeset,layout: {PlausibleWeb.LayoutView, "focus.html"})diff --git a/lib/plausible_web/templates/error/error.html.eex b/lib/plausible_web/templates/error/error.html.eexdeleted file mode 100644index f5a01e7ce5..0000000000--- a/lib/plausible_web/templates/error/error.html.eex+++ /dev/null@@ -1,21 +0,0 @@-<!DOCTYPE html>-<html lang="en" class="h-full">- <head>- <meta charset="utf-8"/>- <meta http-equiv="X-UA-Compatible" content="IE=edge"/>- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>- <meta name="description" content="A lightweight, non-intrusive alternative to Google Analytics."/>- <link rel="icon" type="image/png" sizes="32x32" href="<%= PlausibleWeb.Router.Helpers.static_path(@conn, "/images/icon/plausible_favicon.png") %>">- <title><%= assigns[:title] || "Plausible · Web analytics" %></title>- <link rel="stylesheet" href="<%= Routes.static_path(@conn, "/css/app.css") %>"/>- <script type="text/javascript" data-pref="<%= @conn.assigns[:current_user] && @conn.assigns[:current_user].theme %>" src="<%= Routes.static_path(@conn, "/js/applyTheme.js") %>"></script>-- </head>- <body class="flex flex-col h-full bg-gray-100 dark:bg-gray-900">- <div class="container text-center mt-24">- <h1 class="text-5xl font-black dark:text-gray-100"><%= @status %></h1>- <div class="my-4 text-xl dark:text-gray-100"><%= @message %></div>- <%= link("Go to the homepage", to: PlausibleWeb.LayoutView.home_dest(@conn), class: "button mt-4") %>- </div>- </body>-</html>diff --git a/lib/plausible_web/templates/error/generic_error.html.eex b/lib/plausible_web/templates/error/generic_error.html.eexnew file mode 100644index 0000000000..0011ac166c--- /dev/null+++ b/lib/plausible_web/templates/error/generic_error.html.eex@@ -0,0 +1,5 @@+<div class="container text-center mt-24">+ <h1 class="text-5xl font-black dark:text-gray-100"><%= @status %></h1>+ <div class="my-4 text-xl dark:text-gray-100"><%= @message %></div>+ <%= link("Go to the homepage", to: PlausibleWeb.LayoutView.home_dest(@conn), class: "button mt-4") %>+</div>diff --git a/lib/plausible_web/templates/error/server_error.html.eex b/lib/plausible_web/templates/error/server_error.html.eexindex e8670e13a0..d6d26a1982 100644--- a/lib/plausible_web/templates/error/server_error.html.eex+++ b/lib/plausible_web/templates/error/server_error.html.eex@@ -50,7 +50,5 @@</p></div><% end %>--</div></div>diff --git a/lib/plausible_web/templates/layout/_tracking.html.eex b/lib/plausible_web/templates/layout/_tracking.html.eexindex 309e28354f..813e90dd93 100644--- a/lib/plausible_web/templates/layout/_tracking.html.eex+++ b/lib/plausible_web/templates/layout/_tracking.html.eex@@ -2,9 +2,7 @@<%= if Application.get_env(:plausible, :environment) in ["prod", "staging"] do %><script defer data-domain="<%= base_domain() %>" event-logged_in="<%= [email protected][:current_user] %>" src="<%="#{plausible_url()}/js/script.pageview-props.js"%>"></script><script>window.plausible = window.plausible || function() { (window.plausible.q = window.plausible.q || []).push(arguments) }</script>- <% end %>-- <%= if Application.get_env(:plausible, :environment) == "dev" do %>+ <% else %><script defer data-domain="<%= base_domain() %>" event-logged_in="<%= [email protected][:current_user] %>" src="<%="#{plausible_url()}/js/plausible.local.pageview-props.js"%>"></script><script>window.plausible = window.plausible || function() { (window.plausible.q = window.plausible.q || []).push(arguments) }</script><% end %>diff --git a/lib/plausible_web/templates/layout/base_error.html.eex b/lib/plausible_web/templates/layout/base_error.html.eexnew file mode 100644index 0000000000..3cb6971241--- /dev/null+++ b/lib/plausible_web/templates/layout/base_error.html.eex@@ -0,0 +1,21 @@+<!DOCTYPE html>+<html lang="en" class="h-full">+ <head>+ <meta charset="utf-8"/>+ <meta http-equiv="X-UA-Compatible" content="IE=edge"/>+ <meta name="viewport" content="width=device-width, initial-scale=1.0"/>+ <link rel="icon" type="image/png" sizes="32x32" href="<%= PlausibleWeb.Router.Helpers.static_path(PlausibleWeb.Endpoint, "/images/icon/plausible_favicon.png") %>">+ <title>Plausible · Web analytics</title>+ <link rel="stylesheet" href="<%= Routes.static_path(PlausibleWeb.Endpoint, "/css/app.css") %>"/>+ </head>+ <body class="flex flex-col h-full bg-gray-100 dark:bg-gray-900">+ <div class="w-full my-8 text-center">+ <%= img_tag(PlausibleWeb.Router.Helpers.static_path(PlausibleWeb.Endpoint, "/images/icon/plausible_logo_dark.png"), class: "hidden dark:inline", style: "height: 2.5rem;", alt: "Plausible logo") %>+ <%= img_tag(PlausibleWeb.Router.Helpers.static_path(PlausibleWeb.Endpoint, "/images/icon/plausible_logo.png"), class: "inline dark:hidden", style: "height: 2.5rem;", alt: "Plausible logo")%>+ </div>++ <%= @inner_content %>++ <script type="text/javascript" src="<%= Routes.static_path(PlausibleWeb.Endpoint, "/js/app.js") %>"></script>+ </body>+</html>diff --git a/lib/plausible_web/views/error_view.ex b/lib/plausible_web/views/error_view.exindex c9b422c71b..2a2f8b78bd 100644--- a/lib/plausible_web/views/error_view.ex+++ b/lib/plausible_web/views/error_view.ex@@ -9,17 +9,12 @@ defmodule PlausibleWeb.ErrorView doenddef render("404.html", assigns) do- render(- "error.html",- Map.merge(- %{- layout: false,- status: 404,- message: "Oops! There's nothing here"- },- assigns- )- )+ assigns =+ assigns+ |> Map.put(:status, 404)+ |> Map.put_new(:message, "Oops! There's nothing here")++ render("generic_error.html", assigns)enddef render(<<"5", _error_5xx::binary-size(2), ".html">>, assigns) do@@ -45,18 +40,11 @@ defmodule PlausibleWeb.ErrorView doenddef template_not_found(template, assigns) do- status = String.trim_trailing(template, ".html")-- render(- "error.html",- Map.merge(- %{- layout: false,- status: status,- message: Phoenix.Controller.status_message_from_template(template)- },- assigns- )- )+ assigns =+ assigns+ |> Map.put_new(:message, Phoenix.Controller.status_message_from_template(template))+ |> Map.put(:status, String.trim_trailing(template, ".html"))++ render("generic_error.html", assigns)endenddiff --git a/test/plausible_web/views/error_view_test.exs b/test/plausible_web/views/error_view_test.exsnew file mode 100644index 0000000000..bf8274aaec--- /dev/null+++ b/test/plausible_web/views/error_view_test.exs@@ -0,0 +1,13 @@+defmodule PlausibleWeb.ErrorViewTest do+ use PlausibleWeb.ConnCase, async: false++ test "renders 500.html", %{conn: conn} do+ conn = get(conn, "/test")+ layout = Application.get_env(:plausible, PlausibleWeb.Endpoint)[:render_errors][:layout]++ error_html =+ Phoenix.View.render_to_string(PlausibleWeb.ErrorView, "500.html", conn: conn, layout: layout)++ refute error_html =~ "data-domain="+ end+end