From a8fa05706b88ea26b8eec541bb1d13501c9db092 Mon Sep 17 00:00:00 2001 From: hq1 Date: Mon, 6 Nov 2023 10:17:15 +0100 Subject: [PATCH] Add loading state to site cards (#3483) * Show loading state for mini plots * Dark mode * Don't render no change in green * Fix loading placeholders for mobile/desktop view * Fixup test * Make loading state background color for light theme one step brighter --------- Co-authored-by: Adrian Gruntkowski --- lib/plausible_web/live/sites.ex | 47 ++++++++++++------- .../controllers/site_controller_test.exs | 2 +- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/lib/plausible_web/live/sites.ex b/lib/plausible_web/live/sites.ex index b60b4626b..5237d8f70 100644 --- a/lib/plausible_web/live/sites.ex +++ b/lib/plausible_web/live/sites.ex @@ -236,20 +236,32 @@ defmodule PlausibleWeb.Live.Sites do def site_stats(assigns) do ~H""" -
- - -
-

- - <%= PlausibleWeb.StatsView.large_number_format(@hourly_stats.visitors) %> - visitors in last 24h - -

- - <.percentage_change change={@hourly_stats.change} /> -
-
+
+
+
+
+
+
""" end @@ -259,7 +271,7 @@ defmodule PlausibleWeb.Live.Sites do def percentage_change(assigns) do ~H"""

- 〰 + 〰 0} class="font-semibold text-green-500">↑ ↓ <%= abs(@change) %>% @@ -487,7 +499,10 @@ defmodule PlausibleWeb.Live.Sites do if connected?(socket) do Plausible.Stats.Clickhouse.last_24h_visitors_hourly_intervals(sites.entries) else - Plausible.Stats.Clickhouse.empty_24h_visitors_hourly_intervals(sites.entries) + sites.entries + |> Enum.into(%{}, fn site -> + {site.domain, :loading} + end) end assign( diff --git a/test/plausible_web/controllers/site_controller_test.exs b/test/plausible_web/controllers/site_controller_test.exs index 7522b60d6..c06909e1d 100644 --- a/test/plausible_web/controllers/site_controller_test.exs +++ b/test/plausible_web/controllers/site_controller_test.exs @@ -56,7 +56,7 @@ defmodule PlausibleWeb.SiteControllerTest do site_card = text_of_element(resp, "li[data-domain=\"#{site.domain}\"]") - assert site_card =~ "0 visitors in last 24h" + refute site_card =~ "0 visitors" assert site_card =~ site.domain end