Use sessionStorage for "dashboard first launch" banner tracking (#3892)
* Use sessionStorage for offer e-mail report banner tracking Keeping it within the cookie is problematic, as the banners don't expire and overflow the cookie with data when enough new sites are added. Ref https://github.com/plausible/analytics/issues/3762 * Update changelog * Extract a component * Make is_dbip evaluate to quoted booleanpull/3948/head r2024.03.26-415
parent
7523abe93e
commit
edf70d14b6
@ -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"""
|
||||
<script>
|
||||
sessionStorage.setItem('<%= storage_key(@site) %>', false);
|
||||
</script>
|
||||
"""
|
||||
end
|
||||
|
||||
attr(:site, Plausible.Site, required: true)
|
||||
|
||||
def render(assigns) do
|
||||
~H"""
|
||||
<div
|
||||
x-cloak
|
||||
x-data={x_data(@site)}
|
||||
class="w-full px-4 text-sm font-bold text-center text-blue-900 bg-blue-200 rounded transition"
|
||||
style="top: 91px"
|
||||
role="alert"
|
||||
x-bind:class="! show ? 'hidden' : ''"
|
||||
x-init={x_init(@site)}
|
||||
>
|
||||
<%= link("Team members, email reports and GA import. Explore more →",
|
||||
to: "/#{URI.encode_www_form(@site.domain)}/settings/email-reports",
|
||||
class: "py-2 block"
|
||||
) %>
|
||||
</div>
|
||||
"""
|
||||
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
|
||||
@ -1,63 +0,0 @@
|
||||
<div class="<%= stats_container_class(@conn) %>" data-site-domain="<%= @site.domain %>">
|
||||
<%= if @offer_email_report do %>
|
||||
<div class="w-full px-4 text-sm font-bold text-center text-blue-900 bg-blue-200 rounded transition" style="top: 91px" role="alert">
|
||||
<%= link("Team members, email reports and GA import. Explore more →", to: "/#{URI.encode_www_form(@site.domain)}/settings/email-reports", class: "py-2 block") %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<%= if @site.locked do %>
|
||||
<div class="w-full px-4 py-4 text-sm font-bold text-center text-yellow-800 bg-yellow-100 rounded transition" style="top: 91px" role="alert">
|
||||
<p>This dashboard is actually locked. You are viewing it with super-admin access</p>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<div class="pt-6"></div>
|
||||
<div
|
||||
id="stats-react-container"
|
||||
style="overflow-anchor: none;"
|
||||
data-domain="<%= @site.domain %>"
|
||||
data-offset="<%= Plausible.Site.tz_offset(@site) %>"
|
||||
data-has-goals="<%= @has_goals %>"
|
||||
data-conversions-opted-out="<%= Plausible.Billing.Feature.Goals.opted_out?(@site) %>"
|
||||
data-funnels-opted-out="<%= Plausible.Billing.Feature.Funnels.opted_out?(@site) %>"
|
||||
data-props-opted-out="<%= Plausible.Billing.Feature.Props.opted_out?(@site) %>"
|
||||
data-funnels-available="<%= Plausible.Billing.Feature.Funnels.check_availability(@site.owner) == :ok %>"
|
||||
data-props-available="<%= Plausible.Billing.Feature.Props.check_availability(@site.owner) == :ok %>"
|
||||
data-funnels="<%= Jason.encode!(@funnels) %>"
|
||||
data-has-props="<%= @has_props %>"
|
||||
data-logged-in="<%= !!@conn.assigns[:current_user] %>"
|
||||
data-stats-begin="<%= @stats_start_date %>"
|
||||
data-native-stats-begin="<%= @native_stats_start_date %>"
|
||||
data-shared-link-auth="<%= assigns[:shared_link_auth] %>"
|
||||
data-embedded="<%= @conn.assigns[:embedded] %>"
|
||||
data-background="<%= @conn.assigns[:background] %>"
|
||||
data-is-dbip="<%= @is_dbip %>"
|
||||
data-current-user-role="<%= @conn.assigns[:current_user_role] %>"
|
||||
data-flags="<%= Jason.encode!(@flags) %>"
|
||||
data-valid-intervals-by-period="<%= Plausible.Stats.Interval.valid_by_period(site: @site) |> Jason.encode!() %>">
|
||||
</div>
|
||||
<div id="modal_root"></div>
|
||||
<%= if !@conn.assigns[:current_user] && @conn.assigns[:demo] do %>
|
||||
<div class="bg-gray-50 dark:bg-gray-850">
|
||||
<div class="py-12 lg:py-16 lg:flex lg:items-center lg:justify-between">
|
||||
<h2 class="text-3xl font-extrabold tracking-tight text-gray-900 leading-9 sm:text-4xl sm:leading-10 dark:text-gray-100">
|
||||
Want these stats for your website?
|
||||
<br />
|
||||
<span class="text-indigo-600">Start your free trial today.</span>
|
||||
</h2>
|
||||
<div class="flex mt-8 lg:flex-shrink-0 lg:mt-0">
|
||||
<div class="inline-flex shadow rounded-md">
|
||||
<a href="/register" class="inline-flex items-center justify-center px-5 py-3 text-base font-medium text-white bg-indigo-600 border border-transparent leading-6 rounded-md hover:bg-indigo-500 focus:outline-none focus:ring transition duration-150 ease-in-out">
|
||||
Get started
|
||||
</a>
|
||||
</div>
|
||||
<div class="inline-flex ml-3 shadow rounded-md">
|
||||
<a href="/" class="inline-flex items-center justify-center px-5 py-3 text-base font-medium text-indigo-600 bg-white border border-transparent leading-6 rounded-md dark:text-gray-100 dark:bg-gray-800 hover:text-indigo-500 dark:hover:text-indigo-500 focus:outline-none focus:ring transition duration-150 ease-in-out">
|
||||
Learn more
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
@ -0,0 +1,73 @@
|
||||
<div class={stats_container_class(@conn)} data-site-domain={@site.domain}>
|
||||
<PlausibleWeb.Components.FirstDashboardLaunchBanner.render site={@site} />
|
||||
|
||||
<%= if @site.locked do %>
|
||||
<div
|
||||
class="w-full px-4 py-4 text-sm font-bold text-center text-yellow-800 bg-yellow-100 rounded transition"
|
||||
style="top: 91px"
|
||||
role="alert"
|
||||
>
|
||||
<p>This dashboard is actually locked. You are viewing it with super-admin access</p>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<div class="pt-6"></div>
|
||||
<div
|
||||
id="stats-react-container"
|
||||
style="overflow-anchor: none;"
|
||||
data-domain={@site.domain}
|
||||
data-offset={Plausible.Site.tz_offset(@site)}
|
||||
data-has-goals={@has_goals}
|
||||
data-conversions-opted-out={Plausible.Billing.Feature.Goals.opted_out?(@site)}
|
||||
data-funnels-opted-out={Plausible.Billing.Feature.Funnels.opted_out?(@site)}
|
||||
data-props-opted-out={Plausible.Billing.Feature.Props.opted_out?(@site)}
|
||||
data-funnels-available={
|
||||
Plausible.Billing.Feature.Funnels.check_availability(@site.owner) == :ok
|
||||
}
|
||||
data-props-available={Plausible.Billing.Feature.Props.check_availability(@site.owner) == :ok}
|
||||
data-funnels={Jason.encode!(@funnels)}
|
||||
data-has-props={@has_props}
|
||||
data-logged-in={!!@conn.assigns[:current_user]}
|
||||
data-stats-begin={@stats_start_date}
|
||||
data-native-stats-begin={@native_stats_start_date}
|
||||
data-shared-link-auth={assigns[:shared_link_auth]}
|
||||
data-embedded={@conn.assigns[:embedded]}
|
||||
data-background={@conn.assigns[:background]}
|
||||
data-is-dbip={@is_dbip}
|
||||
data-current-user-role={@conn.assigns[:current_user_role]}
|
||||
data-flags={Jason.encode!(@flags)}
|
||||
data-valid-intervals-by-period={
|
||||
Plausible.Stats.Interval.valid_by_period(site: @site) |> Jason.encode!()
|
||||
}
|
||||
>
|
||||
</div>
|
||||
<div id="modal_root"></div>
|
||||
<%= if !@conn.assigns[:current_user] && @conn.assigns[:demo] do %>
|
||||
<div class="bg-gray-50 dark:bg-gray-850">
|
||||
<div class="py-12 lg:py-16 lg:flex lg:items-center lg:justify-between">
|
||||
<h2 class="text-3xl font-extrabold tracking-tight text-gray-900 leading-9 sm:text-4xl sm:leading-10 dark:text-gray-100">
|
||||
Want these stats for your website? <br />
|
||||
<span class="text-indigo-600">Start your free trial today.</span>
|
||||
</h2>
|
||||
<div class="flex mt-8 lg:flex-shrink-0 lg:mt-0">
|
||||
<div class="inline-flex shadow rounded-md">
|
||||
<a
|
||||
href="/register"
|
||||
class="inline-flex items-center justify-center px-5 py-3 text-base font-medium text-white bg-indigo-600 border border-transparent leading-6 rounded-md hover:bg-indigo-500 focus:outline-none focus:ring transition duration-150 ease-in-out"
|
||||
>
|
||||
Get started
|
||||
</a>
|
||||
</div>
|
||||
<div class="inline-flex ml-3 shadow rounded-md">
|
||||
<a
|
||||
href="/"
|
||||
class="inline-flex items-center justify-center px-5 py-3 text-base font-medium text-indigo-600 bg-white border border-transparent leading-6 rounded-md dark:text-gray-100 dark:bg-gray-800 hover:text-indigo-500 dark:hover:text-indigo-500 focus:outline-none focus:ring transition duration-150 ease-in-out"
|
||||
>
|
||||
Learn more
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
Loading…
Reference in New Issue