Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Update component styles and functionality in MainSection and Sidebar

Bill Yang0e1efb742b1a
diff --git a/client/src/app/[site]/components/Sidebar/LiveUserCount.tsx b/client/src/app/[site]/components/Sidebar/LiveUserCount.tsx
index 0793e732e..4169cc4f8 100644
--- a/client/src/app/[site]/components/Sidebar/LiveUserCount.tsx
+++ b/client/src/app/[site]/components/Sidebar/LiveUserCount.tsx
@@ -21,7 +21,7 @@ export default function LiveUserCount() {
<Tooltip>
<TooltipTrigger>
- <span className="text-sm text-neutral-400 ml-1">
+ <span className="text-sm text-neutral-300 ml-1">
{
<NumberFlow
respectMotionPreference={false}
diff --git a/client/src/app/[site]/main/components/MainSection/Chart.tsx b/client/src/app/[site]/main/components/MainSection/Chart.tsx
index 566195612..9da742463 100644
--- a/client/src/app/[site]/main/components/MainSection/Chart.tsx
+++ b/client/src/app/[site]/main/components/MainSection/Chart.tsx
@@ -133,7 +133,7 @@ export function Chart({
},
]}
theme={nivoTheme}
- margin={{ top: 0, right: 15, bottom: 20, left: 40 }}
+ margin={{ top: 10, right: 15, bottom: 20, left: 40 }}
xScale={{
type: "time",
format: "%Y-%m-%d %H:%M:%S",
@@ -150,7 +150,7 @@ export function Chart({
max: Math.max(max, 1),
}}
enableGridX={false}
- enableGridY={true}
+ enableGridY={false}
yFormat=" >-.2f"
axisTop={null}
axisRight={null}
diff --git a/client/src/app/[site]/main/components/MainSection/MainSection.tsx b/client/src/app/[site]/main/components/MainSection/MainSection.tsx
index c5fe2232f..9f99cfd30 100644
--- a/client/src/app/[site]/main/components/MainSection/MainSection.tsx
+++ b/client/src/app/[site]/main/components/MainSection/MainSection.tsx
@@ -39,7 +39,7 @@ export function MainSection() {
<Card>
{(isFetching || isPreviousFetching) && <CardLoader />}
<CardContent className="pt-4 w-full">
- <div className="h-[310px] relative">
+ <div className="h-[290px] relative">
<div className="absolute top-0 left-0 w-full h-full">
<PreviousChart
data={previousData}
diff --git a/client/src/app/[site]/main/components/MainSection/Overview.tsx b/client/src/app/[site]/main/components/MainSection/Overview.tsx
index 8478022fe..af97c0262 100644
--- a/client/src/app/[site]/main/components/MainSection/Overview.tsx
+++ b/client/src/app/[site]/main/components/MainSection/Overview.tsx
@@ -5,6 +5,8 @@ import { Skeleton } from "@/components/ui/skeleton";
import { cn, formatSecondsAsMinutesAndSeconds, formatter } from "@/lib/utils";
import { StatType, useStore } from "../../../../../lib/store";
import { useGetOverview } from "../../../../../api/analytics/useGetOverview";
+import NumberFlow from "@number-flow/react";
+import { round } from "lodash";
const ChangePercentage = ({
current,
@@ -43,6 +45,8 @@ const Stat = ({
previous,
valueFormatter,
isLoading,
+ decimals,
+ postfix,
}: {
title: string;
id: StatType;
@@ -50,6 +54,8 @@ const Stat = ({
previous: number;
valueFormatter?: (value: number) => string;
isLoading: boolean;
+ decimals?: number;
+ postfix?: string;
}) => {
const { selectedStat, setSelectedStat } = useStore();
return (
@@ -69,7 +75,20 @@ const Stat = ({
</>
) : (
<>
- {valueFormatter ? valueFormatter(value) : value}
+ {valueFormatter ? (
+ valueFormatter(value)
+ ) : (
+ <span>
+ {
+ <NumberFlow
+ respectMotionPreference={false}
+ value={decimals ? Number(value.toFixed(decimals)) : value}
+ // format={{ notation: "compact" }}
+ />
+ }
+ {postfix && <span>{postfix}</span>}
+ </span>
+ )}
<ChangePercentage current={value} previous={previous} />
</>
)}
@@ -119,7 +138,6 @@ export function Overview() {
value={currentUsers}
previous={previousUsers}
isLoading={isLoading}
- valueFormatter={formatter}
/>
<Stat
title="Sessions"
@@ -127,7 +145,6 @@ export function Overview() {
value={currentSessions}
previous={previousSessions}
isLoading={isLoading}
- valueFormatter={formatter}
/>
<Stat
title="Pageviews"
@@ -135,15 +152,14 @@ export function Overview() {
value={currentPageviews}
previous={previousPageviews}
isLoading={isLoading}
- valueFormatter={formatter}
/>
<Stat
title="Pages per Session"
id="pages_per_session"
value={currentPagesPerSession}
previous={previousPagesPerSession}
+ decimals={1}
isLoading={isLoading}
- valueFormatter={(value) => value.toFixed(1)}
/>
<Stat
title="Bounce Rate"
@@ -151,7 +167,8 @@ export function Overview() {
value={currentBounceRate}
previous={previousBounceRate}
isLoading={isLoading}
- valueFormatter={(value) => `${value.toFixed(1)}%`}
+ postfix="%"
+ decimals={1}
/>
<Stat
title="Session Duration"
diff --git a/client/src/app/[site]/main/components/MainSection/PreviousChart.tsx b/client/src/app/[site]/main/components/MainSection/PreviousChart.tsx
index f7f3d6e3f..756290289 100644
--- a/client/src/app/[site]/main/components/MainSection/PreviousChart.tsx
+++ b/client/src/app/[site]/main/components/MainSection/PreviousChart.tsx
@@ -54,7 +54,7 @@ export function PreviousChart({
},
]}
theme={nivoTheme}
- margin={{ top: 0, right: 15, bottom: 20, left: 40 }}
+ margin={{ top: 10, right: 15, bottom: 20, left: 40 }}
xScale={{
type: "time",
format: "%Y-%m-%d %H:%M:%S",