From c7b72875a99a35fdbe2c4bf91ee5c141bba5828e Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 2 Jan 2025 16:07:58 -0500 Subject: [PATCH] Standardize card layouts and fix more spacing --- .../src/components/dashboard/DateTime.jsx | 32 +++++++++---------- .../dashboard/MiniRealtimeAnalytics.jsx | 14 ++++---- .../components/dashboard/MiniSalesChart.jsx | 16 +++++++--- .../components/dashboard/MiniStatCards.jsx | 10 +++--- 4 files changed, 39 insertions(+), 33 deletions(-) diff --git a/dashboard/src/components/dashboard/DateTime.jsx b/dashboard/src/components/dashboard/DateTime.jsx index 0dae73e..648c154 100644 --- a/dashboard/src/components/dashboard/DateTime.jsx +++ b/dashboard/src/components/dashboard/DateTime.jsx @@ -148,7 +148,7 @@ const DateTimeWeatherDisplay = ({ scaleFactor = 1 }) => { case code >= 800 && code < 803: return ; case code >= 803: - return ; + return ; default: return ; } @@ -347,30 +347,30 @@ const DateTimeWeatherDisplay = ({ scaleFactor = 1 }) => { ); return ( -
+
{/* Time Display */} - - -
+ + +
- {hours} - : - {minutes} - {ampm} + {hours} + : + {minutes} + {ampm}
{/* Date and Weather Display */} -
- +
+
- + {dateInfo.day} - + {dateInfo.weekday}
@@ -385,13 +385,13 @@ return ( weather.weather[0]?.id, datetime.getHours() >= 18 || datetime.getHours() < 6 ), - "flex items-center justify-center aspect-square cursor-pointer hover:brightness-110 transition-all relative" + "flex items-center justify-center cursor-pointer hover:brightness-110 transition-all relative" )}> - +
{getWeatherIcon(weather.weather[0]?.id, datetime)} = 18 || datetime.getHours() < 6 diff --git a/dashboard/src/components/dashboard/MiniRealtimeAnalytics.jsx b/dashboard/src/components/dashboard/MiniRealtimeAnalytics.jsx index b2af127..b862514 100644 --- a/dashboard/src/components/dashboard/MiniRealtimeAnalytics.jsx +++ b/dashboard/src/components/dashboard/MiniRealtimeAnalytics.jsx @@ -110,28 +110,28 @@ const MiniRealtimeAnalytics = () => {
{summaryCard( - "Last 30 minutes", + "Last 30 Minutes", "Active users", basicData.last30MinUsers, { colorClass: "text-sky-200", titleClass: "text-sky-100 font-bold text-md", - descriptionClass: "text-sky-200 text-md font-semibold", - background: "h-[150px] bg-gradient-to-br from-sky-900 to-sky-800", + descriptionClass: "pt-2 text-sky-200 text-md font-semibold", + background: "h-[150px] pt-2 bg-gradient-to-br from-sky-900 to-sky-800", icon: Users, iconColor: "text-sky-900", iconBackground: "bg-sky-300" } )} {summaryCard( - "Last 5 minutes", + "Last 5 Minutes", "Active users", basicData.last5MinUsers, { colorClass: "text-sky-200", titleClass: "text-sky-100 font-bold text-md", - descriptionClass: "text-sky-200 text-md font-semibold", - background: "h-[150px] bg-gradient-to-br from-sky-900 to-sky-800", + descriptionClass: "pt-2 text-sky-200 text-md font-semibold", + background: "h-[150px] pt-2 bg-gradient-to-br from-sky-900 to-sky-800", icon: Activity, iconColor: "text-sky-900", iconBackground: "bg-sky-300" @@ -141,7 +141,7 @@ const MiniRealtimeAnalytics = () => { -
+
( - + {title} {Icon && ( @@ -94,8 +96,8 @@ const MiniStatCard = memo(({
{value}
-
- Prev: {previousValue} +
+ Prev: {previousValue} {trend && ( { trend={summaryStats.growth.revenue >= 0 ? "up" : "down"} trendValue={`${Math.abs(Math.round(summaryStats.growth.revenue))}%`} colorClass="text-emerald-200" + titleClass="text-emerald-100 font-bold text-md" + descriptionClass="text-emerald-200 text-md font-semibold" icon={PiggyBank} iconColor="text-emerald-900" iconBackground="bg-emerald-300" @@ -254,6 +258,8 @@ const MiniSalesChart = ({ className = "" }) => { trend={summaryStats.growth.orders >= 0 ? "up" : "down"} trendValue={`${Math.abs(Math.round(summaryStats.growth.orders))}%`} colorClass="text-blue-200" + titleClass="text-blue-100 font-bold text-md" + descriptionClass="text-blue-200 text-md font-semibold" icon={Truck} iconColor="text-blue-900" iconBackground="bg-blue-300" @@ -280,7 +286,7 @@ const MiniSalesChart = ({ className = "" }) => { ) : ( -
+
+
Proj: {projectionLoading ? ( @@ -428,7 +428,7 @@ const MiniStatCards = ({ onDetailsClick={() => setSelectedMetric("orders")} isLoading={loading || !stats} variant="mini" - background="bg-gradient-to-br from-blue-900 to-blue-800" + background="h-[150px] bg-gradient-to-br from-blue-900 to-blue-800" /> setSelectedMetric("average_order")} isLoading={loading || !stats} variant="mini" - background="bg-gradient-to-br from-violet-900 to-violet-800" + background="h-[150px] bg-gradient-to-br from-violet-900 to-violet-800" /> setSelectedMetric("shipping")} isLoading={loading || !stats} variant="mini" - background="bg-gradient-to-br from-orange-900 to-orange-800" + background="h-[150px] bg-gradient-to-br from-orange-900 to-orange-800" />