From cb6727ef69bbed9e1a34e222f1e0e30f42ca833d Mon Sep 17 00:00:00 2001 From: Adam Rutkowski Date: Tue, 24 Oct 2023 19:41:20 +0200 Subject: [PATCH] Fix clipping gradient, define once --- .../live/components/visitors24.ex | 30 +++++++++++++------ lib/plausible_web/live/sites.ex | 14 +++++---- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/lib/plausible_web/live/components/visitors24.ex b/lib/plausible_web/live/components/visitors24.ex index 5d08bc463..11ada3444 100644 --- a/lib/plausible_web/live/components/visitors24.ex +++ b/lib/plausible_web/live/components/visitors24.ex @@ -8,6 +8,7 @@ defmodule PlausibleWeb.Live.Components.Visitors do attr :site, Plausible.Site, required: true attr :height, :integer, default: 50 + attr :tick, :integer, default: 20 def chart(assigns) do site = assigns.site @@ -17,14 +18,16 @@ defmodule PlausibleWeb.Live.Components.Visitors do site |> Plausible.Stats.timeseries(q, [:visitors]) |> scale(assigns.height) - |> Enum.with_index(fn scaled_value, index -> "#{(index - 1) * 20},#{scaled_value}" end) + |> Enum.with_index(fn scaled_value, index -> + "#{(index - 1) * assigns.tick},#{scaled_value}" + end) clip_points = List.flatten([ - "-20,#{assigns.height + 1}", + "-#{assigns.tick},#{assigns.height + 1}", points, - "#{(length(points) - 2) * 20},#{assigns.height + 1}", - "-20,#{assigns.height + 1}" + "#{(length(points) - 2) * assigns.tick},#{assigns.height + 1}", + "-#{assigns.tick},#{assigns.height + 1}" ]) assigns = @@ -36,10 +39,6 @@ defmodule PlausibleWeb.Live.Components.Visitors do ~H""" - - - - @@ -49,7 +48,7 @@ defmodule PlausibleWeb.Live.Components.Visitors do y="0" width={24 * 20} height={@height + 1} - fill={"url(#chart-gradient-#{@id})"} + fill="url(#chart-gradient-cut-off)" clip-path={"url(#gradient-cut-off-#{@id})"} /> @@ -57,6 +56,19 @@ defmodule PlausibleWeb.Live.Components.Visitors do """ end + def gradient_defs(assigns) do + ~H""" + + + + + + + + + """ + end + defp scale(data, target_range) do max_value = Enum.max_by(data, fn %{visitors: visitors} -> visitors end) diff --git a/lib/plausible_web/live/sites.ex b/lib/plausible_web/live/sites.ex index 578218c00..4e9ae8b0b 100644 --- a/lib/plausible_web/live/sites.ex +++ b/lib/plausible_web/live/sites.ex @@ -36,6 +36,8 @@ defmodule PlausibleWeb.Live.Sites do @keydown.escape.window="invitationOpen = false" class="container pt-6" > + + <%= if @needs_to_upgrade == {:needs_to_upgrade, :no_active_subscription} do %>
@@ -126,12 +128,12 @@ defmodule PlausibleWeb.Live.Sites do
<% end %> - <%= for site <- @sites.entries do %> -
- <%= link(to: "/" <> URI.encode_www_form(site.domain)) do %> -
  • -
    - <.favicon domain={site.domain} /> + <%= for site <- @sites.entries do %> +
    + <%= link(to: "/" <> URI.encode_www_form(site.domain)) do %> +
  • +
    + <.favicon domain={site.domain} />