From 53355cad0427399c8d66c5a3d93bf578d46d069a Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 2 Dec 2025 20:52:27 +0000 Subject: [PATCH] price cards --- client/src/components/common/HeaderCreate.tsx | 2 + .../components/design-elements/PlanCard.tsx | 128 +++++++++++++++--- client/src/pages/billing/Billing.tsx | 26 +++- client/src/types/entitlements.ts | 1 + server/src/controllers/BillingController.ts | 4 +- server/src/services/system/BillingService.ts | 12 +- server/src/types/entitlements.ts | 15 +- 7 files changed, 155 insertions(+), 33 deletions(-) diff --git a/client/src/components/common/HeaderCreate.tsx b/client/src/components/common/HeaderCreate.tsx index f4c8bcc4d..8beeca2d8 100644 --- a/client/src/components/common/HeaderCreate.tsx +++ b/client/src/components/common/HeaderCreate.tsx @@ -30,11 +30,13 @@ export const HeaderCreate = ({ const { t } = useTranslation(); const navigate = useNavigate(); const ent = useSelector((s: RootState) => s.auth.user?.entitlements); + const limitReached = useMemo(() => { if (!entitlement) return false; if (!ent || typeof ent[entitlement] !== "number") return false; return entitlementCount < ent[entitlement] ? false : true; }, [ent, entitlement, entitlementCount]); + return ( { const selected = plan.plan === currentPlan; const theme = useTheme(); + const checkColor = + plan.plan === "enterprise" + ? theme.palette.success.main + : plan.plan === "free" + ? theme.palette.text.secondary + : theme.palette.accent.main; + const Icon = (() => { + switch (plan.plan) { + case "free": + return PersonStanding; + case "pro": + return BicepsFlexed; + case "business": + return Briefcase; + case "enterprise": + return Building2; + default: + return PersonStanding; + } + })(); + const priceLabel = (() => { + if (typeof plan.price === "number") { + const cents = plan.price; + if (cents === 0) return "Free"; + const dollars = cents / 100; + const formatted = dollars.toFixed(2); + return `$${formatted}/mo`; + } + })(); + const featureItems = [ + { + label: "Monitors", + value: plan.monitorsMax, + tooltip: "Maximum number of monitors allowed.", + }, + { + label: "Status pages", + value: plan.statusPagesMax, + tooltip: "Maximum public status pages you can create.", + }, + { + label: "Notification channels", + value: plan.notificationChannelsMax, + tooltip: "Maximum alerting channels (email, Slack, etc.).", + }, + { + label: "Teams", + value: plan.teamsMax, + tooltip: "Maximum number of teams in your org.", + }, + { + label: "Retention", + value: `${plan.retentionDays} days`, + tooltip: "Oldest checks are automatically removed after retention.", + }, + { + label: "Min interval", + value: `${Math.round(plan.checksIntervalMsMin / 1000)}s`, + tooltip: "Minimum check frequency allowed for this plan.", + }, + ]; return ( onClick?.(plan.plan)} > - - - {plan.plan} - - - Monitors: {plan.monitorsMax} - - - Status pages: {plan.statusPagesMax} - - - Notification channels: {plan.notificationChannelsMax} - - - Teams: {plan.teamsMax} - - - Min interval: {Math.round(plan.checksIntervalMsMin / 1000)}s - - - Retention: {plan.retentionDays} days + + + + {plan.plan} + + + + + + {priceLabel} + + {featureItems.map((item) => ( + + + {item.tooltip ? ( + + + {item.label}: {item.value} + + + ) : ( + + {item.label}: {item.value} + + )} + + ))} + ); diff --git a/client/src/pages/billing/Billing.tsx b/client/src/pages/billing/Billing.tsx index 48b8e9717..4048788c9 100644 --- a/client/src/pages/billing/Billing.tsx +++ b/client/src/pages/billing/Billing.tsx @@ -4,10 +4,13 @@ import Box from "@mui/material/Box"; import { useTheme } from "@mui/material/styles"; import { Button } from "@/components/inputs"; -import { useAppSelector } from "@/hooks/AppHooks"; +import { useAppDispatch, useAppSelector } from "@/hooks/AppHooks"; import { useGet, usePost } from "@/hooks/UseApi"; import type { ApiResponse } from "@/hooks/UseApi"; import type { Entitlements, PlanKey } from "@/types/entitlements"; +import { useEffect } from "react"; +import type { IUser } from "@/types/user"; +import { setSelectedTeamId, setUser } from "@/features/authSlice"; const BillingPage = () => { const { user } = useAppSelector((state) => state.auth); @@ -16,10 +19,31 @@ const BillingPage = () => { {}, {} ); + const { response: meResponse } = useGet>( + "/auth/me", + {}, + { refreshInterval: 10000 } + ); const { post, loading: isPosting } = usePost(); const plans = response?.data ?? []; + const theme = useTheme(); const selectedPlan = user?.entitlements?.plan || null; + const dispatch = useAppDispatch(); + const selectedTeamId = useAppSelector((s) => s.auth.selectedTeamId); + + useEffect(() => { + const freshUser = meResponse?.data; + if (!freshUser) return; + dispatch(setUser(freshUser)); + + if ( + !selectedTeamId || + !freshUser.teams.find((t) => t.id === selectedTeamId) + ) { + dispatch(setSelectedTeamId(freshUser.teams[0].id)); + } + }, [meResponse, dispatch, selectedTeamId]); const handlePlanClick = async (planKey: PlanKey) => { const result = await post("/billing/subscribe", { planKey }); diff --git a/client/src/types/entitlements.ts b/client/src/types/entitlements.ts index e90ee4b9c..458f946d9 100644 --- a/client/src/types/entitlements.ts +++ b/client/src/types/entitlements.ts @@ -2,6 +2,7 @@ export type PlanKey = "free" | "pro" | "business" | "enterprise" | "unlimited"; export interface Entitlements { plan: PlanKey; + price?: number; monitorsMax: number; notificationChannelsMax: number; statusPagesMax: number; diff --git a/server/src/controllers/BillingController.ts b/server/src/controllers/BillingController.ts index 46b8d698e..611236bf5 100644 --- a/server/src/controllers/BillingController.ts +++ b/server/src/controllers/BillingController.ts @@ -1,9 +1,7 @@ import type { Request, Response, NextFunction } from "express"; import { type IBillingService } from "@/services/system/BillingService.js"; -import { Plans, type PlanKey } from "@/types/entitlements.js"; +import { type PlanKey } from "@/types/entitlements.js"; import ApiError from "@/utils/ApiError.js"; -import { config } from "@/config/index.js"; -import { Org } from "@/db/models/index.js"; export interface IBillingController { listPlans: (req: Request, res: Response, next: NextFunction) => Promise; diff --git a/server/src/services/system/BillingService.ts b/server/src/services/system/BillingService.ts index 50ac0c347..c43641015 100644 --- a/server/src/services/system/BillingService.ts +++ b/server/src/services/system/BillingService.ts @@ -31,7 +31,17 @@ class BillingService implements IBillingService { } listPlans = async () => { const order: PlanKey[] = ["free", "pro", "business", "enterprise"]; - return order.map((key) => Plans[key]); + const prices = await this.stripeClient.prices.list({}); + + const plans = order.map((key) => { + const plan = Plans[key]; + plan.price = + prices.data.find((p) => p.lookup_key === key)?.unit_amount || 0; + return plan; + }); + + console.log("Available plans:", plans); + return plans; }; private buildSuccessUrl = (planKey: PlanKey) => diff --git a/server/src/types/entitlements.ts b/server/src/types/entitlements.ts index e8547fdbb..8dcae5cbb 100644 --- a/server/src/types/entitlements.ts +++ b/server/src/types/entitlements.ts @@ -17,6 +17,7 @@ export interface Entitlements { teamsMax: number; notificationsEnabled: boolean; retentionDays: number; + price?: number; } export const Plans: Record = { @@ -24,15 +25,15 @@ export const Plans: Record = { plan: "free", monitorsMax: 3, notificationChannelsMax: 2, - statusPagesMax: 2, + statusPagesMax: 1, checksIntervalMsMin: 60_000, - teamsMax: 2, + teamsMax: 1, notificationsEnabled: true, retentionDays: 30, }, pro: { plan: "pro", - monitorsMax: 50, + monitorsMax: 25, notificationChannelsMax: 5, statusPagesMax: 5, checksIntervalMsMin: 30_000, @@ -42,8 +43,8 @@ export const Plans: Record = { }, business: { plan: "business", - monitorsMax: 200, - notificationChannelsMax: 20, + monitorsMax: 50, + notificationChannelsMax: 10, statusPagesMax: 20, checksIntervalMsMin: 15_000, teamsMax: 10, @@ -52,8 +53,8 @@ export const Plans: Record = { }, enterprise: { plan: "enterprise", - monitorsMax: 5000, - notificationChannelsMax: 100, + monitorsMax: 100, + notificationChannelsMax: 20, statusPagesMax: 100, checksIntervalMsMin: 10_000, teamsMax: 20,