🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor subscription components to use PlanDialog for upgrade actions
Bill Yang02b5766149c2
diff --git a/client/src/components/subscription/AppSumoPlan.tsx b/client/src/components/subscription/AppSumoPlan.tsxindex df42fefcb..622ba287e 100644--- a/client/src/components/subscription/AppSumoPlan.tsx+++ b/client/src/components/subscription/AppSumoPlan.tsx@@ -1,11 +1,12 @@import { authClient } from "@/lib/auth";import { ArrowRight } from "lucide-react";import { useExtracted } from "next-intl";-import { useRouter } from "next/navigation";+import { useState } from "react";import { useStripeSubscription } from "../../lib/subscription/useStripeSubscription";import { Button } from "../ui/button";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 { useUsageStats } from "./components/useUsageStats";@@ -14,7 +15,7 @@ export function AppSumoPlan() {const t = useExtracted();const { data: subscription } = useStripeSubscription();const { data: activeOrg } = authClient.useActiveOrganization();- const router = useRouter();+ const [showPlanDialog, setShowPlanDialog] = useState(false);const organizationId = activeOrg?.id;const { currentUsage, limit, percentageUsed, isNearLimit, isLimitExceeded } = useUsageStats(subscription);@@ -26,7 +27,7 @@ export function AppSumoPlan() {title={t("AppSumo Plan Tier {tier}", { tier: subscription.planName.split("-")[1] })}description={t("You are on the AppSumo lifetime plan with up to {limit} events per month.", { limit: subscription?.eventLimit.toLocaleString() })}footer={- <Button onClick={() => router.push("/subscribe")} variant={"success"}>+ <Button onClick={() => setShowPlanDialog(true)} variant={"success"}>{t("Upgrade To Pro")} <ArrowRight className="ml-2 h-4 w-4" /></Button>}@@ -43,6 +44,11 @@ export function AppSumoPlan() {isNearLimit={isNearLimit}/>{organizationId && <UsageChart organizationId={organizationId} />}+ <PlanDialog+ open={showPlanDialog}+ onOpenChange={setShowPlanDialog}+ hasActiveSubscription={false}+ /></PlanCard>);}diff --git a/client/src/components/subscription/FreePlan.tsx b/client/src/components/subscription/FreePlan.tsxindex efb5a6bb4..237ba9768 100644--- a/client/src/components/subscription/FreePlan.tsx+++ b/client/src/components/subscription/FreePlan.tsx@@ -1,12 +1,13 @@import { authClient } from "@/lib/auth";import { ArrowRight } from "lucide-react";import { useExtracted } from "next-intl";-import { useRouter } from "next/navigation";+import { useState } from "react";import { DEFAULT_EVENT_LIMIT } from "../../lib/subscription/constants";import { useStripeSubscription } from "../../lib/subscription/useStripeSubscription";import { Button } from "../ui/button";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 { useUsageStats } from "./components/useUsageStats";@@ -15,7 +16,7 @@ export function FreePlan() {const t = useExtracted();const { data: subscription } = useStripeSubscription();const { data: activeOrg } = authClient.useActiveOrganization();- const router = useRouter();+ const [showPlanDialog, setShowPlanDialog] = useState(false);const organizationId = activeOrg?.id;const { currentUsage, limit, percentageUsed, isNearLimit, isLimitExceeded } = useUsageStats(subscription);@@ -27,7 +28,7 @@ export function FreePlan() {title={t("Free Plan")}description={t("You are on the Free plan with up to {limit} pageviews per month.", { limit: DEFAULT_EVENT_LIMIT.toLocaleString() })}footer={- <Button onClick={() => router.push("/subscribe")} variant={"success"}>+ <Button onClick={() => setShowPlanDialog(true)} variant={"success"}>{t("Upgrade To Pro")} <ArrowRight className="ml-2 h-4 w-4" /></Button>}@@ -44,6 +45,11 @@ export function FreePlan() {isNearLimit={isNearLimit}/>{organizationId && <UsageChart organizationId={organizationId} />}+ <PlanDialog+ open={showPlanDialog}+ onOpenChange={setShowPlanDialog}+ hasActiveSubscription={false}+ /></PlanCard>);}diff --git a/client/src/components/subscription/PaidPlain/PaidPlan.tsx b/client/src/components/subscription/PaidPlain/PaidPlan.tsxindex 3b02b5f53..2f02d2d10 100644--- a/client/src/components/subscription/PaidPlain/PaidPlan.tsx+++ b/client/src/components/subscription/PaidPlain/PaidPlan.tsx@@ -13,7 +13,7 @@ import { UsageChart } from "../../UsageChart";import { authClient } from "@/lib/auth";import { InvoicesCard } from "../components/InvoicesCard";import { CancellationDialog } from "./CancellationDialog";-import { PlanDialog } from "./PlanDialog";+import { PlanDialog } from "../components/PlanDialog";export function PaidPlan() {const { data: activeSubscription, isLoading, error: subscriptionError, refetch } = useStripeSubscription();diff --git a/client/src/components/subscription/PaidPlain/PlanChangePreviewDialog.tsx b/client/src/components/subscription/components/PlanChangePreviewDialog.tsxsimilarity index 100%rename from client/src/components/subscription/PaidPlain/PlanChangePreviewDialog.tsxrename to client/src/components/subscription/components/PlanChangePreviewDialog.tsxdiff --git a/client/src/components/subscription/PaidPlain/PlanDialog.tsx b/client/src/components/subscription/components/PlanDialog.tsxsimilarity index 99%rename from client/src/components/subscription/PaidPlain/PlanDialog.tsxrename to client/src/components/subscription/components/PlanDialog.tsxindex a72f89eba..68ca1033d 100644--- a/client/src/components/subscription/PaidPlain/PlanDialog.tsx+++ b/client/src/components/subscription/components/PlanDialog.tsx@@ -6,7 +6,7 @@ import { getStripePrices, STRIPE_TIERS } from "@/lib/stripe";import { usePreviewSubscriptionUpdate, useUpdateSubscription } from "@/lib/subscription/useSubscriptionMutations";import { cn } from "@/lib/utils";import { useState } from "react";-import { CheckoutModal } from "../components/CheckoutModal";+import { CheckoutModal } from "./CheckoutModal";import { PlanChangePreviewDialog } from "./PlanChangePreviewDialog";interface PlanDialogProps {