feat: mau

apps/web/src/app/(dashboard)/admin/stats/mau.tsx

@@ -0,0 +1,64 @@
+'use client';
+
+import { DateTime } from 'luxon';
+import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recharts';
+
+import type { GetMonthlyActiveUsersResult } from '@documenso/lib/server-only/admin/get-users-stats';
+
+export type MonthlyActiveUsersChartProps = {
+  className?: string;
+  title: string;
+  cummulative?: boolean;
+  data: GetMonthlyActiveUsersResult;
+};
+
+export const MonthlyActiveUsersChart = ({
+  className,
+  data,
+  title,
+  cummulative = false,
+}: MonthlyActiveUsersChartProps) => {
+  const formattedData = [...data].reverse().map(({ month, count, cume_count }) => {
+    return {
+      month: DateTime.fromFormat(month, 'yyyy-MM').toFormat('MMM yyyy'),
+      count: Number(count),
+      cume_count: Number(cume_count),
+    };
+  });
+
+  return (
+    <div className={className}>
+      <div className="border-border flex flex-1 flex-col justify-center rounded-2xl border p-6 pl-2">
+        <div className="mb-6 flex px-4">
+          <h3 className="text-lg font-semibold">{title}</h3>
+        </div>
+
+        <ResponsiveContainer width="100%" height={400}>
+          <BarChart data={formattedData}>
+            <XAxis dataKey="month" />
+            <YAxis />
+
+            <Tooltip
+              labelStyle={{
+                color: 'hsl(var(--primary-foreground))',
+              }}
+              formatter={(value) => [
+                Number(value).toLocaleString('en-US'),
+                cummulative ? 'Cumulative MAU' : 'Monthly Active Users',
+              ]}
+              cursor={{ fill: 'hsl(var(--primary) / 10%)' }}
+            />
+
+            <Bar
+              dataKey={cummulative ? 'cume_count' : 'count'}
+              fill="hsl(var(--primary))"
+              radius={[4, 4, 0, 0]}
+              maxBarSize={60}
+              label={cummulative ? 'Cumulative MAU' : 'Monthly Active Users'}
+            />
+          </BarChart>
+        </ResponsiveContainer>
+      </div>
+    </div>
+  );
+};

apps/web/src/app/(dashboard)/admin/stats/monthly-active-users-chart.tsx

@@ -1,84 +0,0 @@
-'use client';
-
-import { DateTime } from 'luxon';
-import type { TooltipProps } from 'recharts';
-import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recharts';
-import type { NameType, ValueType } from 'recharts/types/component/DefaultTooltipContent';
-
-import type { GetMonthlyActiveUsersResult } from '@documenso/lib/server-only/admin/get-users-stats';
-import { cn } from '@documenso/ui/lib/utils';
-
-export type MonthlyActiveUsersChartProps = {
-  className?: string;
-  title: string;
-  data: GetMonthlyActiveUsersResult;
-  tooltip?: string;
-};
-
-const CustomTooltip = ({
-  active,
-  payload,
-  label,
-  tooltip,
-}: TooltipProps<ValueType, NameType> & { tooltip?: string }) => {
-  if (active && payload && payload.length) {
-    return (
-      <div className="z-100 w-60 space-y-1 rounded-md border border-solid bg-white p-2 px-3">
-        <p className="">{label}</p>
-        <p className="text-documenso">
-          {`${tooltip} : `}
-          <span className="text-black">{payload[0].value}</span>
-        </p>
-      </div>
-    );
-  }
-
-  return null;
-};
-
-export const MonthlyActiveUsersChart = ({
-  className,
-  title,
-  data,
-  tooltip,
-}: MonthlyActiveUsersChartProps) => {
-  const formattedData = (data: GetMonthlyActiveUsersResult) => {
-    return [...data].reverse().map(({ month, count }) => ({
-      month: DateTime.fromFormat(month, 'yyyy-MM').toFormat('LLL'),
-      count: Number(count),
-    }));
-  };
-
-  return (
-    <div className={cn('flex w-full flex-col gap-y-4', className)}>
-      <div className="flex flex-col gap-y-1">
-        <h3 className="text-foreground text-lg font-medium">{title}</h3>
-      </div>
-
-      <div className="w-full">
-        <ResponsiveContainer width="100%" height={400}>
-          <BarChart data={formattedData(data)}>
-            <XAxis dataKey="month" />
-            <YAxis />
-
-            <Tooltip
-              content={<CustomTooltip tooltip={tooltip} />}
-              labelStyle={{
-                color: 'hsl(var(--primary-foreground))',
-              }}
-              cursor={{ fill: 'hsl(var(--primary) / 10%)' }}
-            />
-
-            <Bar
-              dataKey="count"
-              fill="hsl(var(--primary))"
-              radius={[4, 4, 0, 0]}
-              maxBarSize={60}
-              label={tooltip}
-            />
-          </BarChart>
-        </ResponsiveContainer>
-      </div>
-    </div>
-  );
-};

apps/web/src/app/(dashboard)/admin/stats/page.tsx

@@ -29,7 +29,7 @@ import { getSignerConversionMonthly } from '@documenso/lib/server-only/user/get-
 
 import { CardMetric } from '~/components/(dashboard)/metric-card/metric-card';
 
-import { MonthlyActiveUsersChart } from './monthly-active-users-chart';
+import { MonthlyActiveUsersChart } from './mau';
 import { SignerConversionChart } from './signer-conversion-chart';
 import { UserWithDocumentChart } from './user-with-document';
 
@@ -147,8 +147,14 @@ export default async function AdminStatsPage() {
           <MonthlyActiveUsersChart
             title={_(msg`Monthly Active Users (signed in)`)}
             data={monthlyActiveUsers}
-            tooltip={_(msg`Number of users who signed in each month`)}
           />
+
+          <MonthlyActiveUsersChart
+            title={_(msg`Cumulative MAU (signed in)`)}
+            data={monthlyActiveUsers}
+            cummulative
+          />
+
           <UserWithDocumentChart
             data={MONTHLY_USERS_SIGNED}
             title={_(msg`MAU (created document)`)}