Skip to content

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

fix: enhance subscription messaging and improve admin page behavior

Bill Yangb09bc16f942a
diff --git a/client/src/app/admin/page.tsx b/client/src/app/admin/page.tsx
index e39f2dfac..f541f34e7 100644
--- a/client/src/app/admin/page.tsx
+++ b/client/src/app/admin/page.tsx
@@ -90,6 +90,7 @@ export default function AdminPage() {
const success = await handleImpersonate(userId);
if (success) {
router.push("/");
+ window.location.reload();
}
};
diff --git a/client/src/app/settings/subscription/components/ExpiredTrialPlan.tsx b/client/src/app/settings/subscription/components/ExpiredTrialPlan.tsx
index 0ca594080..88ed76ac0 100644
--- a/client/src/app/settings/subscription/components/ExpiredTrialPlan.tsx
+++ b/client/src/app/settings/subscription/components/ExpiredTrialPlan.tsx
@@ -23,7 +23,7 @@ export function ExpiredTrialPlan({ message }: ExpiredTrialPlanProps) {
const router = useRouter();
const defaultMessage =
- "Your 14-day free trial has ended. You need to subscribe to continue using the analytics service.";
+ "Your 14-day free trial has ended. You need to subscribe to continue tracking visits again.";
return (
<div className="space-y-6">
@@ -31,8 +31,8 @@ export function ExpiredTrialPlan({ message }: ExpiredTrialPlanProps) {
<CardHeader>
<CardTitle>Trial Expired</CardTitle>
<CardDescription>
- Your free trial has expired. Subscribe to a plan to continue using
- the service.
+ Your free trial has expired. Subscribe to a plan to continue
+ tracking visits again.
</CardDescription>
</CardHeader>
<CardContent>
diff --git a/client/src/app/settings/subscription/components/TrialPlan.tsx b/client/src/app/settings/subscription/components/TrialPlan.tsx
index 484c6b0a3..e325528d6 100644
--- a/client/src/app/settings/subscription/components/TrialPlan.tsx
+++ b/client/src/app/settings/subscription/components/TrialPlan.tsx
@@ -61,8 +61,8 @@ export function TrialPlan() {
</>
) : (
<>
- Your trial ends today. Subscribe to continue using the
- service.
+ Your trial ends today. Subscribe to continue tracking visits
+ again.
</>
)}
</AlertDescription>
diff --git a/client/src/app/settings/subscription/utils/useStripeSubscription.ts b/client/src/app/settings/subscription/utils/useStripeSubscription.ts
index d9f28c33f..feee56b11 100644
--- a/client/src/app/settings/subscription/utils/useStripeSubscription.ts
+++ b/client/src/app/settings/subscription/utils/useStripeSubscription.ts
@@ -35,17 +35,7 @@ export function useStripeSubscription() {
}
}
- const data = await response.json();
-
- // If status is expired, the trial has ended and no subscription exists
- if (data.status === "expired") {
- return {
- status: "expired",
- message: data.message,
- };
- }
-
- return data;
+ return await response.json();
};
const { data, isLoading, error, refetch } = useQuery<SubscriptionData>({
diff --git a/client/src/app/subscribe/components/TrialUsageStats.tsx b/client/src/app/subscribe/components/TrialUsageStats.tsx
index 09e36e3f6..981695e4d 100644
--- a/client/src/app/subscribe/components/TrialUsageStats.tsx
+++ b/client/src/app/subscribe/components/TrialUsageStats.tsx
@@ -5,7 +5,6 @@ interface TrialUsageStatsProps {
currentUsage: number;
daysInTrial: number;
projectedMonthlyUsage: number;
- isTrial: boolean;
}
// Calculate days elapsed since a date
@@ -30,10 +29,7 @@ export function TrialUsageStats({
currentUsage,
daysInTrial,
projectedMonthlyUsage,
- isTrial,
}: TrialUsageStatsProps) {
- if (!isTrial) return null;
-
return (
<div className="max-w-lg mx-auto mt-6">
<div className="bg-blue-900/20 rounded-xl border border-blue-800 p-5">
diff --git a/client/src/app/subscribe/page.tsx b/client/src/app/subscribe/page.tsx
index 09c2af965..c0d4dce64 100644
--- a/client/src/app/subscribe/page.tsx
+++ b/client/src/app/subscribe/page.tsx
@@ -27,10 +27,11 @@ export default function Subscribe() {
// Calculate trial usage metrics
const currentUsage = subscription?.monthlyEventCount || 0;
const trialStartDate = subscription?.currentPeriodStart;
- const daysInTrial = trialStartDate ? daysElapsed(trialStartDate) : 0;
- const projectedMonthlyUsage = trialStartDate
- ? extrapolateMonthlyUsage(currentUsage, daysInTrial)
- : 0;
+ const daysInTrial = trialStartDate ? daysElapsed(trialStartDate) : 14;
+ const projectedMonthlyUsage = extrapolateMonthlyUsage(
+ currentUsage,
+ daysInTrial
+ );
return (
<StandardPage>
@@ -48,7 +49,6 @@ export default function Subscribe() {
currentUsage={currentUsage}
daysInTrial={daysInTrial}
projectedMonthlyUsage={projectedMonthlyUsage}
- isTrial={!!subscription?.isTrial}
/>
{/* FAQ Section */}
diff --git a/client/src/components/FreeTrialBanner.tsx b/client/src/components/FreeTrialBanner.tsx
index 9c44a6336..e183a4820 100644
--- a/client/src/components/FreeTrialBanner.tsx
+++ b/client/src/components/FreeTrialBanner.tsx
@@ -58,8 +58,8 @@ export function FreeTrialBanner() {
Your Free Trial Has Ended
</AlertTitle>
<div className="mb-2 text-sm text-amber-700 dark:text-amber-400">
- Your 14-day free trial has expired. Subscribe to continue using
- our analytics services.
+ Your 14-day free trial has expired. Subscribe to continue tracking
+ visits again.
</div>
<div className="flex flex-col space-y-2 sm:flex-row sm:space-y-0 sm:space-x-2 items-start sm:items-center">
diff --git a/server/src/api/stripe/getSubscription.ts b/server/src/api/stripe/getSubscription.ts
index d7ad9cff8..af120e996 100644
--- a/server/src/api/stripe/getSubscription.ts
+++ b/server/src/api/stripe/getSubscription.ts
@@ -128,7 +128,17 @@ export async function getSubscriptionInner(userId: string) {
}
// User has no subscription and trial has ended - return null
- return null;
+ return {
+ id: null,
+ planName: "free",
+ status: "expired",
+ currentPeriodEnd: null,
+ currentPeriodStart: null,
+ eventLimit: 0,
+ monthlyEventCount: user.monthlyEventCount,
+ isTrial: false,
+ trialDaysRemaining: 0,
+ };
}
export async function getSubscription(
@@ -143,15 +153,6 @@ export async function getSubscription(
try {
const responseData = await getSubscriptionInner(userId);
-
- // If trial has expired and no subscription, inform the user
- if (!responseData) {
- return reply.send({
- status: "expired",
- message: "Your trial has expired. Please subscribe to continue.",
- });
- }
-
return reply.send(responseData);
} catch (error: any) {
console.error("Get Subscription Error:", error);