Open platform to collect and prioritize feedback
Better billing page.
Matt Robertsfa47df2bcbee
diff --git a/public/pages/Administration/components/SideMenu.tsx b/public/pages/Administration/components/SideMenu.tsxindex acde6b97c..088973fd9 100644--- a/public/pages/Administration/components/SideMenu.tsx+++ b/public/pages/Administration/components/SideMenu.tsx@@ -49,7 +49,7 @@ export const SideMenu = (props: SiteMenuProps) => {<SideMenuItem name="advanced" title="Advanced" href="/admin/advanced" isActive={activeItem === "advanced"} />{fider.session.user.isAdministrator && (<>- {fider.settings.isBillingEnabled && <SideMenuItem name="billing" title="Billing" href="/admin/billing" isActive={activeItem === "billing"} />}+ {fider.settings.isBillingEnabled && <SideMenuItem name="billing" title="Billing" href="/admin/billing2" isActive={activeItem === "billing"} />}<SideMenuItem name="webhooks" title="Webhooks" href="/admin/webhooks" isActive={activeItem === "webhooks"} /><SideMenuItem name="export" title="Export" href="/admin/export" isActive={activeItem === "export"} /></>diff --git a/public/pages/Administration/pages/ManageBilling2.page.scss b/public/pages/Administration/pages/ManageBilling2.page.scssnew file mode 100644index 000000000..59e5a1ea3--- /dev/null+++ b/public/pages/Administration/pages/ManageBilling2.page.scss@@ -0,0 +1,28 @@+.c-billing-plans {+ display: grid;+ grid-template-columns: repeat(auto-fit, minmax(280px, 1fr));+ gap: 1.5rem;+ max-width: 700px;+}++.c-plan-card {+ border: 2px solid var(--colors-gray-200);+ border-radius: 12px;++ &--highlighted {+ background: var(--colors-gray-900);+ border-color: var(--colors-gray-700);+ }++ &--current {+ border-color: var(--colors-green-500);+ }+}++.c-plan-card--highlighted .c-plan-card__light {+ color: var(--colors-gray-300);+}++.c-plan-card--highlighted .c-plan-card__muted {+ color: var(--colors-gray-400);+}diff --git a/public/pages/Administration/pages/ManageBilling2.page.tsx b/public/pages/Administration/pages/ManageBilling2.page.tsxindex ce6e7010e..2a60ead10 100644--- a/public/pages/Administration/pages/ManageBilling2.page.tsx+++ b/public/pages/Administration/pages/ManageBilling2.page.tsx@@ -1,14 +1,76 @@import React, { useState } from "react"-import { Button } from "@fider/components"-import { VStack } from "@fider/components/layout"+import { Button, Icon } from "@fider/components"+import { HStack, VStack } from "@fider/components/layout"import { AdminPageContainer } from "../components/AdminBasePage"import { http } from "@fider/services"+import IconCheck from "@fider/assets/images/heroicons-check.svg"++import "./ManageBilling2.page.scss"interface ManageBilling2PageProps {stripeCustomerID: stringstripeSubscriptionID: string}+interface PlanCardProps {+ name: string+ price: string+ period: string+ description: string+ features: string[]+ isCurrent: boolean+ isHighlighted?: boolean+ buttonText: string+ buttonVariant: "primary" | "secondary"+ onButtonClick?: () => void+ isLoading: boolean+}++const PlanCard = (props: PlanCardProps) => {+ const showButton = !!props.onButtonClick+ const showCurrentLabel = props.isCurrent && !props.onButtonClick++ const cardClasses = ["c-plan-card p-6", props.isHighlighted ? "c-plan-card--highlighted" : "bg-gray-100", props.isCurrent ? "c-plan-card--current" : ""].join(+ " "+ )++ const textColor = props.isHighlighted ? "text-white" : "text-gray-900"++ return (+ <div className={cardClasses}>+ <VStack spacing={4}>+ <HStack justify="between" align="center">+ <span className={`text-title ${textColor}`}>{props.name}</span>+ {props.isCurrent && <span className="text-xs text-semibold px-2 py-1 rounded-full bg-green-100 text-green-700">CURRENT</span>}+ </HStack>++ <div className="flex flex-items-baseline">+ <span className={`text-2xl text-bold ${textColor}`}>{props.price}</span>+ {props.period && <span className={`text-sm c-plan-card__muted ${props.isHighlighted ? "" : "text-gray-500"}`}>/{props.period}</span>}+ </div>++ <p className={`text-sm c-plan-card__muted ${props.isHighlighted ? "" : "text-gray-600"}`}>{props.description}</p>++ {showButton && (+ <Button variant={props.buttonVariant} onClick={props.onButtonClick} disabled={props.isLoading}>+ {props.isLoading ? "Loading..." : props.buttonText}+ </Button>+ )}+ {showCurrentLabel && <div className="text-center py-2 px-4 text-sm text-medium text-gray-500 bg-gray-200 rounded-md">Current Plan</div>}++ <VStack spacing={2} className={`pt-4 border-t c-plan-card__light ${props.isHighlighted ? "border-gray-700" : "border-gray-200 text-gray-700"}`}>+ {props.features.map((feature, index) => (+ <HStack key={index} spacing={2} align="start">+ <Icon sprite={IconCheck} className="text-green-500" height="16" />+ <span className="text-sm">{feature}</span>+ </HStack>+ ))}+ </VStack>+ </VStack>+ </div>+ )+}+const ManageBilling2Page = (props: ManageBilling2PageProps) => {const [isLoading, setIsLoading] = useState(false)const hasSubscription = !!props.stripeSubscriptionID@@ -33,27 +95,41 @@ const ManageBilling2Page = (props: ManageBilling2PageProps) => {}}+ const freeFeatures = ["Unlimited feedback posts", "Unlimited voters", "Your own subdomain or custom domain", "All core functionality", "Email notifications"]++ const proFeatures = ["Everything in Free", "Content Moderation", "Responsive email support", "Priority support"]+return (- <AdminPageContainer id="p-admin-billing2" name="billing" title="Billing" subtitle="Manage your billing settings">- {hasSubscription ? (- <VStack spacing={4}>- <h3 className="text-display">Pro Plan</h3>- <p>You are currently on the Pro plan.</p>- <p>Click the button below to manage your subscription, update payment methods, or view billing history.</p>- <Button variant="primary" onClick={openPortal} disabled={isLoading}>- {isLoading ? "Loading..." : "Manage Billing"}- </Button>- </VStack>- ) : (- <VStack spacing={4}>- <h3 className="text-display">Free Plan</h3>- <p>You are currently on the Free plan.</p>- <p>Upgrade to Pro to unlock additional features and support the development of Fider.</p>- <Button variant="primary" onClick={startCheckout} disabled={isLoading}>- {isLoading ? "Loading..." : "Upgrade to Pro"}- </Button>- </VStack>- )}+ <AdminPageContainer id="p-admin-billing2" name="billing" title="Billing" subtitle="Manage your subscription and billing">+ <p>Fider is free forever. But if you need advanced features and support, consider upgrading to Pro.</p>+ <div className="c-billing-plans">+ <PlanCard+ name="Free"+ price="$0"+ period="month"+ description="Perfect for getting started with feedback collection."+ features={freeFeatures}+ isCurrent={!hasSubscription}+ buttonText="Downgrade"+ buttonVariant="secondary"+ onButtonClick={hasSubscription ? openPortal : undefined}+ isLoading={isLoading && hasSubscription}+ />++ <PlanCard+ name="Pro"+ price="$25"+ period="month"+ description="For teams that need advanced features and support."+ features={proFeatures}+ isCurrent={hasSubscription}+ isHighlighted={true}+ buttonText={hasSubscription ? "Manage Billing" : "Upgrade to Pro"}+ buttonVariant="primary"+ onButtonClick={hasSubscription ? openPortal : startCheckout}+ isLoading={isLoading}+ />+ </div></AdminPageContainer>)}