Skip to content

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

Refactor subscription components to replace UsageProgressBar with UsageCards

Bill Yangf47fae808cee
diff --git a/client/messages/cs.json b/client/messages/cs.json
index f31ee7345..b12fd6868 100644
--- a/client/messages/cs.json
+++ b/client/messages/cs.json
@@ -1167,14 +1167,10 @@
"x6GhQj": "Limit událostí překročen",
"96ejG8": "Blížíš se k limitu",
"S7U3Nx": "Blížíš se k měsíčnímu limitu událostí. Zvaž upgrade na placený plán pro vyšší limity.",
- "wbsq7O": "Využití",
"rd5F5r": "",
"kdqPM0": "Máš vlastní plán s až {limit} zobrazeními stránek měsíčně.",
"kTH3Q2": "Překročil jsi měsíční limit událostí. Pro pomoc prosím kontaktuj podporu.",
"ni0MP6": "Blížíš se k měsíčnímu limitu událostí. Pokud potřebuješ více kapacity, kontaktuj prosím podporu.",
- "5/hIKX": "",
- "BdV5Om": "",
- "HCYBYT": "",
"yBFhF6": "Tvá 14denní zkušební verze skončila. Pro pokračování sledování návštěv se musíš přihlásit k odběru.",
"UEl0Sh": "Zkušební verze vypršela",
"LB/Amg": "Tvá zkušební verze vypršela. Pro pokračování sledování návštěv se přihlas k plánu.",
diff --git a/client/messages/de.json b/client/messages/de.json
index 5d391731c..fdb7413cf 100644
--- a/client/messages/de.json
+++ b/client/messages/de.json
@@ -845,8 +845,8 @@
"EjE0iv": "Team erfolgreich erstellt",
"hfiE8k": "Team konnte nicht aktualisiert werden",
"DswPK3": "Team konnte nicht erstellt werden",
- "97DGta": "Team erstellen",
"U01dmA": "Team bearbeiten",
+ "97DGta": "Team erstellen",
"03IKqU": "Teamname, Mitglieder und Website-Zuweisungen aktualisieren.",
"Ps71bZ": "Erstellen Sie ein neues Team, um Websites zu gruppieren und den Mitgliederzugriff zu steuern.",
"k+kHlN": "Teamname",
@@ -1167,14 +1167,10 @@
"x6GhQj": "Event-Limit überschritten",
"96ejG8": "Limit fast erreicht",
"S7U3Nx": "Sie nähern sich Ihrem monatlichen Event-Limit. Erwägen Sie ein Upgrade auf einen kostenpflichtigen Plan für höhere Limits.",
- "wbsq7O": "Nutzung",
"rd5F5r": "Benutzerdefinierter Plan",
"kdqPM0": "Sie haben einen individuellen Plan mit bis zu {limit} Seitenaufrufen pro Monat.",
"kTH3Q2": "Sie haben Ihr monatliches Event-Limit überschritten. Bitte kontaktieren Sie den Support.",
"ni0MP6": "Sie nähern sich Ihrem monatlichen Event-Limit. Bitte kontaktieren Sie den Support, falls Sie mehr Kapazität benötigen.",
- "5/hIKX": "Plan-Limits",
- "BdV5Om": "Websites",
- "HCYBYT": "Teammitglieder",
"yBFhF6": "Ihre 14-tägige kostenlose Testphase ist beendet. Sie müssen abonnieren, um erneut Besuche zu verfolgen.",
"UEl0Sh": "Testphase abgelaufen",
"LB/Amg": "Ihre kostenlose Testphase ist abgelaufen. Abonnieren Sie einen Plan, um erneut Besuche zu verfolgen.",
diff --git a/client/messages/en.json b/client/messages/en.json
index 79e4fb274..7c931dfc3 100644
--- a/client/messages/en.json
+++ b/client/messages/en.json
@@ -1167,14 +1167,10 @@
"x6GhQj": "Event Limit Exceeded",
"96ejG8": "Approaching Limit",
"S7U3Nx": "You are approaching your monthly event limit. Consider upgrading to a paid plan for higher limits.",
- "wbsq7O": "Usage",
"rd5F5r": "Custom Plan",
"kdqPM0": "You have a custom plan with up to {limit} pageviews per month.",
"kTH3Q2": "You have exceeded your monthly event limit. Please contact support for assistance.",
"ni0MP6": "You are approaching your monthly event limit. Please contact support if you need more capacity.",
- "5/hIKX": "Plan Limits",
- "BdV5Om": "Websites",
- "HCYBYT": "Team Members",
"yBFhF6": "Your 14-day free trial has ended. You need to subscribe to continue tracking visits again.",
"UEl0Sh": "Trial Expired",
"LB/Amg": "Your free trial has expired. Subscribe to a plan to continue tracking visits again.",
diff --git a/client/messages/es.json b/client/messages/es.json
index 32fc9ef56..fd0a3d1b3 100644
--- a/client/messages/es.json
+++ b/client/messages/es.json
@@ -845,8 +845,8 @@
"EjE0iv": "Equipo creado correctamente",
"hfiE8k": "Error al actualizar el equipo",
"DswPK3": "Error al crear el equipo",
- "97DGta": "Crear equipo",
"U01dmA": "Editar equipo",
+ "97DGta": "Crear equipo",
"03IKqU": "Actualiza el nombre del equipo, los miembros y las asignaciones de sitios.",
"Ps71bZ": "Crea un nuevo equipo para agrupar sitios y controlar el acceso de los miembros.",
"k+kHlN": "Nombre del equipo",
@@ -1167,14 +1167,10 @@
"x6GhQj": "Límite de eventos excedido",
"96ejG8": "Acercándose al límite",
"S7U3Nx": "Te estás acercando a tu límite de eventos mensuales. Considera actualizar a un plan de pago para obtener límites más altos.",
- "wbsq7O": "Uso",
"rd5F5r": "Plan personalizado",
"kdqPM0": "Tienes un plan personalizado con hasta {limit} visitas por mes.",
"kTH3Q2": "Has excedido tu límite mensual de eventos. Por favor, contacta con soporte para obtener ayuda.",
"ni0MP6": "Te estás acercando a tu límite mensual de eventos. Por favor, contacta con soporte si necesitas más capacidad.",
- "5/hIKX": "Límites del plan",
- "BdV5Om": "Sitios web",
- "HCYBYT": "Miembros del equipo",
"yBFhF6": "Tu prueba gratuita de 14 días ha finalizado. Necesitas suscribirte para continuar rastreando visitas nuevamente.",
"UEl0Sh": "Prueba expirada",
"LB/Amg": "Tu prueba gratuita ha expirado. Suscríbete a un plan para continuar rastreando visitas nuevamente.",
diff --git a/client/messages/fr.json b/client/messages/fr.json
index 47d4ee87d..d37989ed9 100644
--- a/client/messages/fr.json
+++ b/client/messages/fr.json
@@ -845,8 +845,8 @@
"EjE0iv": "Équipe créée avec succès",
"hfiE8k": "Échec de la mise à jour de l'équipe",
"DswPK3": "Échec de la création de l'équipe",
- "97DGta": "Créer une équipe",
"U01dmA": "Modifier l'équipe",
+ "97DGta": "Créer une équipe",
"03IKqU": "Mettre à jour le nom de l'équipe, les membres et les affectations de sites.",
"Ps71bZ": "Créez une nouvelle équipe pour regrouper les sites et contrôler l'accès des membres.",
"k+kHlN": "Nom de l'équipe",
@@ -1167,14 +1167,10 @@
"x6GhQj": "Limite d'événements dépassée",
"96ejG8": "Approche de la limite",
"S7U3Nx": "Vous approchez de votre limite mensuelle d'événements. Envisagez de passer à un plan payant pour des limites plus élevées.",
- "wbsq7O": "Utilisation",
"rd5F5r": "Plan personnalisé",
"kdqPM0": "Vous avez un plan personnalisé avec jusqu'à {limit} pages vues par mois.",
"kTH3Q2": "Vous avez dépassé votre limite mensuelle d'événements. Veuillez contacter le support.",
"ni0MP6": "Vous approchez de votre limite mensuelle d'événements. Veuillez contacter le support si vous avez besoin de plus de capacité.",
- "5/hIKX": "Limites du plan",
- "BdV5Om": "Sites web",
- "HCYBYT": "Membres de l'équipe",
"yBFhF6": "Votre essai gratuit de 14 jours est terminé. Vous devez vous abonner pour recommencer à suivre les visites.",
"UEl0Sh": "Essai expiré",
"LB/Amg": "Votre essai gratuit a expiré. Abonnez-vous à un plan pour recommencer à suivre les visites.",
diff --git a/client/messages/it.json b/client/messages/it.json
index cd57319da..b66e07861 100644
--- a/client/messages/it.json
+++ b/client/messages/it.json
@@ -845,8 +845,8 @@
"EjE0iv": "Team creato con successo",
"hfiE8k": "Impossibile aggiornare il team",
"DswPK3": "Impossibile creare il team",
- "97DGta": "Crea team",
"U01dmA": "Modifica team",
+ "97DGta": "Crea team",
"03IKqU": "Aggiorna il nome del team, i membri e le assegnazioni dei siti.",
"Ps71bZ": "Crea un nuovo team per raggruppare i siti e controllare l'accesso dei membri.",
"k+kHlN": "Nome del team",
@@ -1167,14 +1167,10 @@
"x6GhQj": "Limite Eventi Superato",
"96ejG8": "In Avvicinamento al Limite",
"S7U3Nx": "Ti stai avvicinando al tuo limite di eventi mensili. Considera di passare a un piano a pagamento per limiti superiori.",
- "wbsq7O": "Utilizzo",
"rd5F5r": "Piano personalizzato",
"kdqPM0": "Hai un piano personalizzato con fino a {limit} visualizzazioni di pagina al mese.",
"kTH3Q2": "Hai superato il tuo limite di eventi mensili. Contatta il supporto per assistenza.",
"ni0MP6": "Ti stai avvicinando al tuo limite di eventi mensili. Contatta il supporto se hai bisogno di maggiore capacità.",
- "5/hIKX": "Limiti del piano",
- "BdV5Om": "Siti web",
- "HCYBYT": "Membri del team",
"yBFhF6": "La tua prova gratuita di 14 giorni è terminata. Devi abbonarti per continuare a tracciare di nuovo le visite.",
"UEl0Sh": "Prova Scaduta",
"LB/Amg": "La tua prova gratuita è scaduta. Abbonati a un piano per continuare a tracciare di nuovo le visite.",
diff --git a/client/messages/ja.json b/client/messages/ja.json
index aba36511f..18473d2cc 100644
--- a/client/messages/ja.json
+++ b/client/messages/ja.json
@@ -845,8 +845,8 @@
"EjE0iv": "チームが正常に作成されました",
"hfiE8k": "チームの更新に失敗しました",
"DswPK3": "チームの作成に失敗しました",
- "97DGta": "チームを作成",
"U01dmA": "チームを編集",
+ "97DGta": "チームを作成",
"03IKqU": "チーム名、メンバー、サイト割り当てを更新します。",
"Ps71bZ": "サイトをグループ化してメンバーアクセスを制御する新しいチームを作成します。",
"k+kHlN": "チーム名",
@@ -1167,14 +1167,10 @@
"x6GhQj": "イベント上限超過",
"96ejG8": "上限に近づいています",
"S7U3Nx": "月間イベント上限に近づいています。より高い上限にするには有料プランへのアップグレードをご検討ください。",
- "wbsq7O": "使用量",
"rd5F5r": "カスタムプラン",
"kdqPM0": "カスタムプランで月{limit}ページビューまでご利用いただけます。",
"kTH3Q2": "月間イベント上限を超えました。サポートにお問い合わせください。",
"ni0MP6": "月間イベント上限に近づいています。容量を増やす必要がある場合はサポートにお問い合わせください。",
- "5/hIKX": "プランの制限",
- "BdV5Om": "ウェブサイト",
- "HCYBYT": "チームメンバー",
"yBFhF6": "14日間の無料トライアルが終了しました。訪問の追跡を再開するにはサブスクリプションが必要です。",
"UEl0Sh": "トライアル期限切れ",
"LB/Amg": "無料トライアルが期限切れになりました。訪問の追跡を再開するにはプランをサブスクリプションしてください。",
diff --git a/client/messages/ko.json b/client/messages/ko.json
index 676253bbd..bd733cf3d 100644
--- a/client/messages/ko.json
+++ b/client/messages/ko.json
@@ -845,8 +845,8 @@
"EjE0iv": "팀이 성공적으로 생성되었습니다",
"hfiE8k": "팀 업데이트에 실패했습니다",
"DswPK3": "팀 생성에 실패했습니다",
- "97DGta": "팀 생성",
"U01dmA": "팀 편집",
+ "97DGta": "팀 생성",
"03IKqU": "팀 이름, 멤버 및 사이트 할당을 업데이트합니다.",
"Ps71bZ": "사이트를 그룹화하고 멤버 액세스를 제어하는 새 팀을 만듭니다.",
"k+kHlN": "팀 이름",
@@ -1167,14 +1167,10 @@
"x6GhQj": "이벤트 한도 초과",
"96ejG8": "한도에 근접 중",
"S7U3Nx": "월별 이벤트 한도에 근접하고 있습니다. 더 높은 한도를 위해 유료 플랜으로 업그레이드를 고려하세요.",
- "wbsq7O": "사용량",
"rd5F5r": "맞춤 플랜",
"kdqPM0": "월 최대 {limit}개 페이지뷰의 사용자 정의 플랜입니다.",
"kTH3Q2": "월별 이벤트 한도를 초과했습니다. 지원팀에 문의해 주세요.",
"ni0MP6": "월별 이벤트 한도에 근접하고 있습니다. 더 많은 용량이 필요하시면 지원팀에 문의해 주세요.",
- "5/hIKX": "플랜 한도",
- "BdV5Om": "웹사이트",
- "HCYBYT": "팀 멤버",
"yBFhF6": "14일 무료 체험이 종료되었습니다. 방문 추적을 계속하려면 구독이 필요합니다.",
"UEl0Sh": "체험 만료",
"LB/Amg": "무료 체험이 만료되었습니다. 방문 추적을 계속하려면 플랜을 구독하세요.",
diff --git a/client/messages/pl.json b/client/messages/pl.json
index 483c944bb..299bae27b 100644
--- a/client/messages/pl.json
+++ b/client/messages/pl.json
@@ -845,8 +845,8 @@
"EjE0iv": "Zespół został pomyślnie utworzony",
"hfiE8k": "Nie udało się zaktualizować zespołu",
"DswPK3": "Nie udało się utworzyć zespołu",
- "97DGta": "Utwórz zespół",
"U01dmA": "Edytuj zespół",
+ "97DGta": "Utwórz zespół",
"03IKqU": "Zaktualizuj nazwę zespołu, członków i przypisania witryn.",
"Ps71bZ": "Utwórz nowy zespół, aby grupować witryny i kontrolować dostęp członków.",
"k+kHlN": "Nazwa zespołu",
@@ -1167,14 +1167,10 @@
"x6GhQj": "Przekroczono limit zdarzeń",
"96ejG8": "Zbliżanie się do limitu",
"S7U3Nx": "Zbliżasz się do miesięcznego limitu zdarzeń. Rozważ ulepszenie do płatnego planu dla wyższych limitów.",
- "wbsq7O": "Wykorzystanie",
"rd5F5r": "Plan niestandardowy",
"kdqPM0": "Masz niestandardowy plan z limitem do {limit} odsłon miesięcznie.",
"kTH3Q2": "Przekroczyłeś swój miesięczny limit zdarzeń. Skontaktuj się z pomocą techniczną.",
"ni0MP6": "Zbliżasz się do miesięcznego limitu zdarzeń. Skontaktuj się z pomocą techniczną, jeśli potrzebujesz większej pojemności.",
- "5/hIKX": "Limity planu",
- "BdV5Om": "Strony internetowe",
- "HCYBYT": "Członkowie zespołu",
"yBFhF6": "Twoja 14-dniowa darmowa wersja próbna się zakończyła. Musisz subskrybować, aby ponownie śledzić odwiedziny.",
"UEl0Sh": "Wersja próbna wygasła",
"LB/Amg": "Twoja darmowa wersja próbna wygasła. Subskrybuj plan, aby ponownie śledzić odwiedziny.",
diff --git a/client/messages/pt.json b/client/messages/pt.json
index a4e86ccc3..0d7715029 100644
--- a/client/messages/pt.json
+++ b/client/messages/pt.json
@@ -845,8 +845,8 @@
"EjE0iv": "Time criado com sucesso",
"hfiE8k": "Falha ao atualizar time",
"DswPK3": "Falha ao criar time",
- "97DGta": "Criar time",
"U01dmA": "Editar time",
+ "97DGta": "Criar time",
"03IKqU": "Atualize o nome do time, membros e atribuições de sites.",
"Ps71bZ": "Crie um novo time para agrupar sites e controlar o acesso dos membros.",
"k+kHlN": "Nome do time",
@@ -1167,14 +1167,10 @@
"x6GhQj": "Limite de Eventos Excedido",
"96ejG8": "Aproximando-se do Limite",
"S7U3Nx": "Você está se aproximando do seu limite mensal de eventos. Considere atualizar para um plano pago para limites maiores.",
- "wbsq7O": "Uso",
"rd5F5r": "Plano personalizado",
"kdqPM0": "Você tem um plano personalizado com até {limit} visualizações de página por mês.",
"kTH3Q2": "Você excedeu seu limite mensal de eventos. Por favor, entre em contato com o suporte para assistência.",
"ni0MP6": "Você está se aproximando do seu limite mensal de eventos. Por favor, entre em contato com o suporte se precisar de mais capacidade.",
- "5/hIKX": "Limites do plano",
- "BdV5Om": "Sites",
- "HCYBYT": "Membros da equipe",
"yBFhF6": "Seu teste gratuito de 14 dias acabou. Você precisa assinar para continuar rastreando visitas novamente.",
"UEl0Sh": "Teste Expirado",
"LB/Amg": "Seu teste gratuito expirou. Assine um plano para continuar rastreando visitas novamente.",
diff --git a/client/messages/zh.json b/client/messages/zh.json
index 9168da236..bb88f5917 100644
--- a/client/messages/zh.json
+++ b/client/messages/zh.json
@@ -845,8 +845,8 @@
"EjE0iv": "团队创建成功",
"hfiE8k": "更新团队失败",
"DswPK3": "创建团队失败",
- "97DGta": "创建团队",
"U01dmA": "编辑团队",
+ "97DGta": "创建团队",
"03IKqU": "更新团队名称、成员和站点分配。",
"Ps71bZ": "创建新团队以对站点进行分组并控制成员访问权限。",
"k+kHlN": "团队名称",
@@ -1167,14 +1167,10 @@
"x6GhQj": "超出事件限制",
"96ejG8": "接近限制",
"S7U3Nx": "您正在接近每月的事件限制。考虑升级到付费计划以获得更高的额度。",
- "wbsq7O": "使用情况",
"rd5F5r": "自定义计划",
"kdqPM0": "您拥有一个定制计划,每月最高可达 {limit} 次页面浏览量。",
"kTH3Q2": "您已超出每月的事件限制。请联系支持以获得帮助。",
"ni0MP6": "您正在接近每月的事件限制。如果您需要更多容量,请联系支持。",
- "5/hIKX": "计划限制",
- "BdV5Om": "网站",
- "HCYBYT": "团队成员",
"yBFhF6": "您的 14 天免费试用已结束。您需要订阅以继续追踪访问情况。",
"UEl0Sh": "试用期满",
"LB/Amg": "您的免费试用已过期。订阅计划以继续追踪访问情况。",
diff --git a/client/src/components/subscription/AppSumoPlan.tsx b/client/src/components/subscription/AppSumoPlan.tsx
index 622ba287e..6c1b00f69 100644
--- a/client/src/components/subscription/AppSumoPlan.tsx
+++ b/client/src/components/subscription/AppSumoPlan.tsx
@@ -8,7 +8,7 @@ import { UsageChart } from "../UsageChart";
import { PlanCard } from "./components/PlanCard";
import { PlanDialog } from "./components/PlanDialog";
import { UsageLimitAlerts } from "./components/UsageLimitAlerts";
-import { UsageProgressBar } from "./components/UsageProgressBar";
+import { UsageCards } from "./components/UsageCards";
import { useUsageStats } from "./components/useUsageStats";
export function AppSumoPlan() {
@@ -18,7 +18,7 @@ export function AppSumoPlan() {
const [showPlanDialog, setShowPlanDialog] = useState(false);
const organizationId = activeOrg?.id;
- const { currentUsage, limit, percentageUsed, isNearLimit, isLimitExceeded } = useUsageStats(subscription);
+ const { isNearLimit, isLimitExceeded } = useUsageStats(subscription);
if (!subscription) return null;
@@ -37,12 +37,7 @@ export function AppSumoPlan() {
isNearLimit={isNearLimit}
exceededMessage={t("You have exceeded your monthly event limit. Please upgrade to a Pro plan to continue collecting analytics.")}
/>
- <UsageProgressBar
- currentUsage={currentUsage}
- limit={limit}
- percentageUsed={percentageUsed}
- isNearLimit={isNearLimit}
- />
+ <UsageCards />
{organizationId && <UsageChart organizationId={organizationId} />}
<PlanDialog
open={showPlanDialog}
diff --git a/client/src/components/subscription/CustomPlan.tsx b/client/src/components/subscription/CustomPlan.tsx
index db63d0730..f14bb1ce0 100644
--- a/client/src/components/subscription/CustomPlan.tsx
+++ b/client/src/components/subscription/CustomPlan.tsx
@@ -5,7 +5,7 @@ import { useStripeSubscription } from "../../lib/subscription/useStripeSubscript
import { UsageChart } from "../UsageChart";
import { PlanCard } from "./components/PlanCard";
import { UsageLimitAlerts } from "./components/UsageLimitAlerts";
-import { UsageProgressBar } from "./components/UsageProgressBar";
+import { UsageCards } from "./components/UsageCards";
import { useUsageStats } from "./components/useUsageStats";
export function CustomPlan() {
@@ -14,12 +14,10 @@ export function CustomPlan() {
const { data: activeOrg } = authClient.useActiveOrganization();
const organizationId = activeOrg?.id;
- const { currentUsage, limit, percentageUsed, isNearLimit, isLimitExceeded } = useUsageStats(subscription);
+ const { limit, isNearLimit, isLimitExceeded } = useUsageStats(subscription);
if (!subscription) return null;
- const formatLimit = (value: number | null) => (value === null ? t("Unlimited") : value.toLocaleString());
-
return (
<PlanCard
title={
@@ -38,26 +36,7 @@ export function CustomPlan() {
exceededMessage={t("You have exceeded your monthly event limit. Please contact support for assistance.")}
nearLimitMessage={t("You are approaching your monthly event limit. Please contact support if you need more capacity.")}
/>
- <UsageProgressBar
- currentUsage={currentUsage}
- limit={limit}
- percentageUsed={percentageUsed}
- isNearLimit={isNearLimit}
- />
-
- <div className="space-y-2">
- <h3 className="font-medium mb-2">{t("Plan Limits")}</h3>
- <div className="grid grid-cols-2 gap-4">
- <div className="rounded-lg border p-3">
- <div className="text-sm text-muted-foreground">{t("Websites")}</div>
- <div className="text-lg font-semibold">{formatLimit(subscription.siteLimit)}</div>
- </div>
- <div className="rounded-lg border p-3">
- <div className="text-sm text-muted-foreground">{t("Team Members")}</div>
- <div className="text-lg font-semibold">{formatLimit(subscription.memberLimit)}</div>
- </div>
- </div>
- </div>
+ <UsageCards />
{organizationId && <UsageChart organizationId={organizationId} />}
</PlanCard>
diff --git a/client/src/components/subscription/FreePlan.tsx b/client/src/components/subscription/FreePlan.tsx
index 237ba9768..a87286c02 100644
--- a/client/src/components/subscription/FreePlan.tsx
+++ b/client/src/components/subscription/FreePlan.tsx
@@ -9,7 +9,7 @@ import { UsageChart } from "../UsageChart";
import { PlanCard } from "./components/PlanCard";
import { PlanDialog } from "./components/PlanDialog";
import { UsageLimitAlerts } from "./components/UsageLimitAlerts";
-import { UsageProgressBar } from "./components/UsageProgressBar";
+import { UsageCards } from "./components/UsageCards";
import { useUsageStats } from "./components/useUsageStats";
export function FreePlan() {
@@ -19,7 +19,7 @@ export function FreePlan() {
const [showPlanDialog, setShowPlanDialog] = useState(false);
const organizationId = activeOrg?.id;
- const { currentUsage, limit, percentageUsed, isNearLimit, isLimitExceeded } = useUsageStats(subscription);
+ const { isNearLimit, isLimitExceeded } = useUsageStats(subscription);
if (!subscription) return null;
@@ -38,12 +38,7 @@ export function FreePlan() {
isNearLimit={isNearLimit}
exceededMessage={t("You have exceeded your monthly event limit. Please upgrade to a Pro plan to continue collecting analytics.")}
/>
- <UsageProgressBar
- currentUsage={currentUsage}
- limit={limit}
- percentageUsed={percentageUsed}
- isNearLimit={isNearLimit}
- />
+ <UsageCards />
{organizationId && <UsageChart organizationId={organizationId} />}
<PlanDialog
open={showPlanDialog}
diff --git a/client/src/components/subscription/OverridePlan.tsx b/client/src/components/subscription/OverridePlan.tsx
index de24f582c..5107669ad 100644
--- a/client/src/components/subscription/OverridePlan.tsx
+++ b/client/src/components/subscription/OverridePlan.tsx
@@ -6,7 +6,7 @@ import { UsageChart } from "../UsageChart";
import { getPlanType } from "../../lib/stripe";
import { PlanCard } from "./components/PlanCard";
import { UsageLimitAlerts } from "./components/UsageLimitAlerts";
-import { UsageProgressBar } from "./components/UsageProgressBar";
+import { UsageCards } from "./components/UsageCards";
import { useUsageStats } from "./components/useUsageStats";
export function OverridePlan() {
@@ -15,7 +15,7 @@ export function OverridePlan() {
const { data: activeOrg } = authClient.useActiveOrganization();
const organizationId = activeOrg?.id;
- const { currentUsage, limit, percentageUsed, isNearLimit, isLimitExceeded } = useUsageStats(subscription);
+ const { isNearLimit, isLimitExceeded } = useUsageStats(subscription);
if (!subscription) return null;
@@ -46,12 +46,7 @@ export function OverridePlan() {
exceededMessage={t("You have exceeded your monthly event limit. Please contact support for assistance.")}
nearLimitMessage={t("You are approaching your monthly event limit. Please contact support if you need more capacity.")}
/>
- <UsageProgressBar
- currentUsage={currentUsage}
- limit={limit}
- percentageUsed={percentageUsed}
- isNearLimit={isNearLimit}
- />
+ <UsageCards />
{organizationId && <UsageChart organizationId={organizationId} />}
</PlanCard>
);
diff --git a/client/src/components/subscription/PaidPlain/PaidPlan.tsx b/client/src/components/subscription/PaidPlain/PaidPlan.tsx
index bcbcf167f..5c93b7f38 100644
--- a/client/src/components/subscription/PaidPlain/PaidPlan.tsx
+++ b/client/src/components/subscription/PaidPlain/PaidPlan.tsx
@@ -4,16 +4,14 @@ import { toast } from "@/components/ui/sonner";
import { Alert, AlertDescription, AlertTitle } from "../../ui/alert";
import { Button } from "../../ui/button";
import { Card, CardContent } from "../../ui/card";
-import { Progress } from "../../ui/progress";
import { BACKEND_URL } from "../../../lib/const";
import { getPlanType, getStripePrices } from "../../../lib/stripe";
import { formatDate } from "../../../lib/subscription/planUtils";
import { useStripeSubscription } from "../../../lib/subscription/useStripeSubscription";
import { UsageChart } from "../../UsageChart";
import { authClient } from "@/lib/auth";
-import { useGetSitesFromOrg } from "@/api/admin/hooks/useSites";
-import { useOrganizationMembers } from "@/api/admin/hooks/useOrganizationMembers";
import { InvoicesCard } from "../components/InvoicesCard";
+import { UsageCards } from "../components/UsageCards";
import { CancellationDialog } from "./CancellationDialog";
import { PlanDialog } from "../components/PlanDialog";
@@ -23,9 +21,6 @@ export function PaidPlan() {
const { data: activeOrg } = authClient.useActiveOrganization();
const organizationId = activeOrg?.id;
- const { data: sitesData } = useGetSitesFromOrg(organizationId);
- const { data: membersData } = useOrganizationMembers(organizationId ?? "");
-
const [isProcessing, setIsProcessing] = useState(false);
const [actionError, setActionError] = useState<string | null>(null);
const [showPlanDialog, setShowPlanDialog] = useState(false);
@@ -36,7 +31,6 @@ export function PaidPlan() {
const eventLimit = activeSubscription?.eventLimit || 0;
const currentUsage = activeSubscription?.monthlyEventCount || 0;
- const usagePercentage = eventLimit > 0 ? Math.min((currentUsage / eventLimit) * 100, 100) : 0;
const isAnnualPlan = activeSubscription?.interval === "year";
const stripePlan = getStripePrices().find(p => p.name === activeSubscription?.planName);
@@ -170,9 +164,6 @@ export function PaidPlan() {
</Button>
</div>
</div>
-
-
-
{currentUsage >= eventLimit && (
<div className="mt-4 p-3 bg-amber-50 dark:bg-amber-900/20 rounded-md border border-amber-200 dark:border-amber-800">
<div className="flex items-center justify-between">
@@ -185,48 +176,7 @@ export function PaidPlan() {
</div>
</div>
)}
-
- <div className="grid grid-cols-3 gap-4">
- <div className="rounded-lg border p-3 pb-0 overflow-hidden relative">
- <div className="text-sm text-muted-foreground">Events used this month</div>
- <div className="text-lg font-semibold mb-3">
- {currentUsage.toLocaleString()} / {eventLimit.toLocaleString()}
- </div>
- <div className="relative h-1.5 -mx-3">
- <div className="bg-neutral-100 dark:bg-neutral-700 h-1.5 w-full absolute bottom-0 left-0"></div>
- <div
- style={{ width: `${usagePercentage}%` }}
- className={`h-1.5 absolute bottom-0 left-0 ${usagePercentage >= 100 ? "bg-red-500" : "bg-accent-400/75"}`}
- ></div>
- </div>
- </div>
- <div className="rounded-lg border p-3 pb-0 overflow-hidden relative">
- <div className="text-sm text-muted-foreground">Websites</div>
- <div className="text-lg font-semibold mb-3">
- {sitesData?.sites.length ?? 0} / {activeSubscription.siteLimit === null ? "Unlimited" : activeSubscription.siteLimit.toLocaleString()}
- </div>
- <div className="relative h-1.5 -mx-3">
- <div className="bg-neutral-100 dark:bg-neutral-700 h-1.5 w-full absolute bottom-0 left-0"></div>
- <div
- style={{ width: activeSubscription.siteLimit === null ? "0%" : `${Math.min(((sitesData?.sites.length ?? 0) / activeSubscription.siteLimit) * 100, 100)}%` }}
- className="bg-accent-400/75 h-1.5 absolute bottom-0 left-0"
- ></div>
- </div>
- </div>
- <div className="rounded-lg border p-3 pb-0 overflow-hidden relative">
- <div className="text-sm text-muted-foreground">Team Members</div>
- <div className="text-lg font-semibold mb-3">
- {membersData?.data?.length ?? 0} / {activeSubscription.memberLimit === null ? "Unlimited" : activeSubscription.memberLimit.toLocaleString()}
- </div>
- <div className="relative h-1.5 -mx-3">
- <div className="bg-neutral-100 dark:bg-neutral-700 h-1.5 w-full absolute bottom-0 left-0"></div>
- <div
- style={{ width: activeSubscription.memberLimit === null ? "0%" : `${Math.min(((membersData?.data?.length ?? 0) / activeSubscription.memberLimit) * 100, 100)}%` }}
- className="bg-accent-400/75 h-1.5 absolute bottom-0 left-0"
- ></div>
- </div>
- </div>
- </div>
+ <UsageCards />
{organizationId && <UsageChart organizationId={organizationId} />}
diff --git a/client/src/components/subscription/components/UsageCards.tsx b/client/src/components/subscription/components/UsageCards.tsx
new file mode 100644
index 000000000..f7e2c514a
--- /dev/null
+++ b/client/src/components/subscription/components/UsageCards.tsx
@@ -0,0 +1,75 @@
+import { authClient } from "@/lib/auth";
+import { useGetSitesFromOrg } from "@/api/admin/hooks/useSites";
+import { useOrganizationMembers } from "@/api/admin/hooks/useOrganizationMembers";
+import { useStripeSubscription } from "../../../lib/subscription/useStripeSubscription";
+
+interface UsageCardItem {
+ label: string;
+ current: number;
+ limit: number | null;
+}
+
+function UsageCard({ label, current, limit }: UsageCardItem) {
+ const percentage =
+ limit === null ? 0 : Math.min((current / limit) * 100, 100);
+ const isExceeded = limit !== null && current >= limit;
+
+ return (
+ <div className="rounded-lg border p-3 pb-0 overflow-hidden relative">
+ <div className="text-sm text-muted-foreground">{label}</div>
+ <div className="text-lg font-semibold mb-3">
+ {current.toLocaleString()} /{" "}
+ {limit === null ? "Unlimited" : limit.toLocaleString()}
+ </div>
+ <div className="relative h-1.5 -mx-3">
+ <div className="bg-neutral-100 dark:bg-neutral-700 h-1.5 w-full absolute bottom-0 left-0"></div>
+ <div
+ style={{ width: `${percentage}%` }}
+ className={`h-1.5 absolute bottom-0 left-0 ${
+ isExceeded ? "bg-red-500" : "bg-accent-400/75"
+ }`}
+ ></div>
+ </div>
+ </div>
+ );
+}
+
+export function UsageCards() {
+ const { data: subscription } = useStripeSubscription();
+ const { data: activeOrg } = authClient.useActiveOrganization();
+ const organizationId = activeOrg?.id;
+
+ const { data: sitesData } = useGetSitesFromOrg(organizationId);
+ const { data: membersData } = useOrganizationMembers(organizationId ?? "");
+
+ if (!subscription) return null;
+
+ const items: UsageCardItem[] = [
+ {
+ label: "Events used this month",
+ current: subscription.monthlyEventCount || 0,
+ limit: subscription.eventLimit || 0,
+ },
+ {
+ label: "Websites",
+ current: sitesData?.sites.length ?? 0,
+ limit: subscription.siteLimit,
+ },
+ {
+ label: "Team Members",
+ current: membersData?.data?.length ?? 0,
+ limit: subscription.memberLimit,
+ },
+ ];
+
+ return (
+ <div
+ className="grid gap-4"
+ style={{ gridTemplateColumns: `repeat(${items.length}, minmax(0, 1fr))` }}
+ >
+ {items.map((item) => (
+ <UsageCard key={item.label} {...item} />
+ ))}
+ </div>
+ );
+}
diff --git a/client/src/components/subscription/components/UsageProgressBar.tsx b/client/src/components/subscription/components/UsageProgressBar.tsx
deleted file mode 100644
index 785d9e43e..000000000
--- a/client/src/components/subscription/components/UsageProgressBar.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { useExtracted } from "next-intl";
-import { Progress } from "../../ui/progress";
-
-interface UsageProgressBarProps {
- currentUsage: number;
- limit: number;
- percentageUsed: number;
- isNearLimit: boolean;
-}
-
-export function UsageProgressBar({ currentUsage, limit, percentageUsed, isNearLimit }: UsageProgressBarProps) {
- const t = useExtracted();
-
- return (
- <div className="space-y-2">
- <h3 className="font-medium mb-2">{t("Usage")}</h3>
- <div className="space-y-4">
- <div>
- <div className="flex justify-between mb-1">
- <span className="text-sm">{t("Events")}</span>
- <span className="text-sm">
- {currentUsage.toLocaleString()} / {limit.toLocaleString()}
- </span>
- </div>
- <Progress value={percentageUsed} className={isNearLimit ? "bg-amber-100 dark:bg-amber-900" : ""} />
- </div>
- </div>
- </div>
- );
-}