diff --git a/CHANGELOG.md b/CHANGELOG.md index a7742e03d..ba2a7cd1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,6 +57,7 @@ All notable changes to this project will be documented in this file. - Validate metric isn't queried multiple times ### Fixed +- Creating many sites no longer leads to cookie overflow - Ignore sessions without pageviews for `entry_page` and `exit_page` breakdowns - Using `VersionedCollapsingMergeTree` to store visit data to avoid rare race conditions that led to wrong visit data being shown - Fix `conversion_rate` metric in a `browser_versions` breakdown diff --git a/lib/plausible_web/components/first_dashboard_launch_banner.ex b/lib/plausible_web/components/first_dashboard_launch_banner.ex new file mode 100644 index 000000000..f4ed01c43 --- /dev/null +++ b/lib/plausible_web/components/first_dashboard_launch_banner.ex @@ -0,0 +1,50 @@ +defmodule PlausibleWeb.Components.FirstDashboardLaunchBanner do + @moduledoc """ + A banner that appears on the first dashboard launch + """ + use Phoenix.Component + use Phoenix.HTML + + attr(:site, Plausible.Site, required: true) + + def set(assigns) do + ~H""" + + """ + end + + attr(:site, Plausible.Site, required: true) + + def render(assigns) do + ~H""" + + """ + end + + defp x_data(site) do + "{show: !!sessionStorage.getItem('#{storage_key(site)}')}" + end + + defp x_init(site) do + "setTimeout(() => sessionStorage.removeItem('#{storage_key(site)}'), 3000)" + end + + defp storage_key(site) do + "dashboard_seen_#{site.domain}" + end +end diff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.ex index 77c9a9343..64cc4332d 100644 --- a/lib/plausible_web/controllers/site_controller.ex +++ b/lib/plausible_web/controllers/site_controller.ex @@ -34,9 +34,9 @@ defmodule PlausibleWeb.SiteController do |> Plausible.Mailer.send() end - conn - |> put_session(site.domain <> "_offer_email_report", true) - |> redirect(external: Routes.site_path(conn, :add_snippet, site.domain)) + redirect(conn, + external: Routes.site_path(conn, :add_snippet, site.domain, site_created: true) + ) {:error, {:over_limit, limit}} -> render(conn, "new.html", diff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.ex index 8e331f8a7..1e8d7f321 100644 --- a/lib/plausible_web/controllers/stats_controller.ex +++ b/lib/plausible_web/controllers/stats_controller.ex @@ -59,10 +59,7 @@ defmodule PlausibleWeb.StatsController do cond do stats_start_date && can_see_stats? -> - offer_email_report = get_session(conn, site.domain <> "_offer_email_report") - conn - |> remove_email_report_banner(site) |> put_resp_header("x-robots-tag", "noindex, nofollow") |> render("stats.html", site: site, @@ -72,7 +69,6 @@ defmodule PlausibleWeb.StatsController do stats_start_date: stats_start_date, native_stats_start_date: NaiveDateTime.to_date(site.native_stats_start_at), title: title(conn, site), - offer_email_report: offer_email_report, demo: demo, flags: get_flags(conn.assigns[:current_user]), is_dbip: is_dbip(), @@ -328,7 +324,6 @@ defmodule PlausibleWeb.StatsController do stats_start_date: stats_start_date, native_stats_start_date: NaiveDateTime.to_date(shared_link.site.native_stats_start_at), title: title(conn, shared_link.site), - offer_email_report: false, demo: false, dogfood_page_path: "/share/:dashboard", shared_link_auth: shared_link.slug, @@ -351,14 +346,6 @@ defmodule PlausibleWeb.StatsController do end end - defp remove_email_report_banner(conn, site) do - if conn.assigns[:current_user] do - delete_session(conn, site.domain <> "_offer_email_report") - else - conn - end - end - defp shared_link_cookie_name(slug), do: "shared-link-" <> slug defp get_flags(_user) do @@ -367,11 +354,12 @@ defmodule PlausibleWeb.StatsController do defp is_dbip() do on_full_build do - false + "false" else Plausible.Geo.database_type() |> to_string() |> String.starts_with?("DBIP") + |> to_string() end end diff --git a/lib/plausible_web/templates/site/snippet.html.heex b/lib/plausible_web/templates/site/snippet.html.heex index 0035dfdc0..de462c0bf 100644 --- a/lib/plausible_web/templates/site/snippet.html.heex +++ b/lib/plausible_web/templates/site/snippet.html.heex @@ -1,3 +1,8 @@ + +
<%= form_for @conn, "/", [class: "max-w-lg w-full mx-auto bg-white dark:bg-gray-800 shadow-md rounded px-8 pt-6 pb-8 mb-4 mt-8"], fn f -> %>

Add JavaScript snippet

diff --git a/lib/plausible_web/templates/stats/stats.html.eex b/lib/plausible_web/templates/stats/stats.html.eex deleted file mode 100644 index 382ca9162..000000000 --- a/lib/plausible_web/templates/stats/stats.html.eex +++ /dev/null @@ -1,63 +0,0 @@ -
- <%= if @offer_email_report do %> - - <% end %> - - <%= if @site.locked do %> - - <% end %> - -
-
-
- - <%= if !@conn.assigns[:current_user] && @conn.assigns[:demo] do %> -
-
-

- Want these stats for your website? -
- Start your free trial today. -

- -
-
- <% end %> -
diff --git a/lib/plausible_web/templates/stats/stats.html.heex b/lib/plausible_web/templates/stats/stats.html.heex new file mode 100644 index 000000000..a4b55810c --- /dev/null +++ b/lib/plausible_web/templates/stats/stats.html.heex @@ -0,0 +1,73 @@ +
+ + + <%= if @site.locked do %> + + <% end %> + +
+
Jason.encode!() + } + > +
+ + <%= if !@conn.assigns[:current_user] && @conn.assigns[:demo] do %> +
+
+

+ Want these stats for your website?
+ Start your free trial today. +

+ +
+
+ <% end %> +
diff --git a/test/plausible_web/controllers/site_controller_test.exs b/test/plausible_web/controllers/site_controller_test.exs index 12fe79abf..6b6d0cb22 100644 --- a/test/plausible_web/controllers/site_controller_test.exs +++ b/test/plausible_web/controllers/site_controller_test.exs @@ -244,7 +244,9 @@ defmodule PlausibleWeb.SiteControllerTest do } }) - assert redirected_to(conn) == "/#{URI.encode_www_form("éxample.com")}/snippet" + assert redirected_to(conn) == + "/#{URI.encode_www_form("éxample.com")}/snippet?site_created=true" + assert site = Repo.get_by(Plausible.Site, domain: "éxample.com") assert site.timezone == "Europe/London" assert site.ingest_rate_limit_scale_seconds == 60 @@ -341,7 +343,7 @@ defmodule PlausibleWeb.SiteControllerTest do } }) - assert redirected_to(conn) == "/example.com/snippet" + assert redirected_to(conn) == "/example.com/snippet?site_created=true" assert Repo.get_by(Plausible.Site, domain: "example.com") end @@ -361,7 +363,7 @@ defmodule PlausibleWeb.SiteControllerTest do } }) - assert redirected_to(conn) == "/example.com/snippet" + assert redirected_to(conn) == "/example.com/snippet?site_created=true" assert Plausible.Billing.Quota.site_usage(user) == 3 end @@ -375,7 +377,7 @@ defmodule PlausibleWeb.SiteControllerTest do } }) - assert redirected_to(conn) == "/example.com/snippet" + assert redirected_to(conn) == "/example.com/snippet?site_created=true" assert Repo.get_by(Plausible.Site, domain: "example.com") end end