diff --git a/frontend/apps/editor3d/app/src/components/signaled/TopBar/TopBar.tsx b/frontend/apps/editor3d/app/src/components/signaled/TopBar/TopBar.tsx index a1a1abecf8..d4084bf060 100644 --- a/frontend/apps/editor3d/app/src/components/signaled/TopBar/TopBar.tsx +++ b/frontend/apps/editor3d/app/src/components/signaled/TopBar/TopBar.tsx @@ -8,6 +8,7 @@ import { faImage, faPenNib, faGem, + faCoinFront, } from "@fortawesome/pro-solid-svg-icons"; import { faWindowRestore, @@ -16,6 +17,7 @@ import { faDash, } from "@fortawesome/pro-regular-svg-icons"; import { Button } from "@storyteller/ui-button"; +import { PopoverMenu } from "@storyteller/ui-popover"; import { AuthButtons } from "./AuthButtons"; import { SceneTitleInput } from "./SceneTitleInput"; import { Activity } from "~/pages/PageEnigma/comps/GenerateModals/Activity"; @@ -52,8 +54,10 @@ import { useEditStore } from "../../../pages/PageEdit/stores/EditState"; import { BaseSelectorImage } from "../../../pages/PageEdit/BaseImageSelector"; import { ProviderSetupModal } from "@storyteller/provider-setup-modal"; import { ProviderBillingModal } from "@storyteller/provider-billing-modal"; -import { usePricingModalStore } from "@storyteller/ui-pricing-modal"; -// import { ProgressCircle } from "@storyteller/ui-progress"; // Uncomment this for Credits indicator - BFlat +import { + usePricingModalStore, + useCreditsModalStore, +} from "@storyteller/ui-pricing-modal"; interface Props { pageName: string; @@ -119,16 +123,6 @@ export const TopBar = ({ pageName, loginSignUpPressed }: Props) => { const [settingsSection, setSettingsSection] = useState("general"); - // Credit state (replace with real data fetch) - const [credits, setCredits] = useState({ - used: 800, - total: 1000, - }); - - const creditsRemaining = credits.total - credits.used; - const creditsRemainingPercentage = (creditsRemaining / credits.total) * 100; - const isLowCredit = creditsRemainingPercentage < 20; // Less than 20% credits remaining - const { isDesktop, isMaximized, minimize, toggleMaximize, close } = useTauriWindowControls(); const platform = useTauriPlatform(); @@ -225,6 +219,7 @@ export const TopBar = ({ pageName, loginSignUpPressed }: Props) => { const pageTitle = getPageTitle(); const { toggleModal } = usePricingModalStore(); + const { toggleModal: toggleCreditsModal } = useCreditsModalStore(); return ( <> @@ -294,27 +289,72 @@ export const TopBar = ({ pageName, loginSignUpPressed }: Props) => {
- {/* Uncomment this for Credits indicator - BFlat */} - {/* - - */} + } + buttonClassName="h-[30px] px-2 ps-1.5 bg-transparent hover:bg-white/10" + panelClassName="mt-3" + > + {(close) => ( +
+
+ + Your credit balance + + +
+
+ + 180 +
+
+ + +
+
+ )} + diff --git a/frontend/apps/editor3d/app/src/pages/PageEnigma/PageEnigma.tsx b/frontend/apps/editor3d/app/src/pages/PageEnigma/PageEnigma.tsx index 55d36c9649..78c990387e 100644 --- a/frontend/apps/editor3d/app/src/pages/PageEnigma/PageEnigma.tsx +++ b/frontend/apps/editor3d/app/src/pages/PageEnigma/PageEnigma.tsx @@ -23,7 +23,11 @@ import { InstallSounds } from "~/pages/PageEnigma/InstallSounds"; import { PageEditor } from "~/pages/PageEnigma/PageEditor"; import { GalleryDragComponent } from "@storyteller/ui-gallery-modal"; import { LoadingDots } from "@storyteller/ui-loading"; -import { PricingModal } from "@storyteller/ui-pricing-modal"; +import { + PricingModal, + CreditsModal, + useCreditsModalStore, +} from "@storyteller/ui-pricing-modal"; import { isActionReminderOpen, actionReminderProps, @@ -41,6 +45,10 @@ export const PageEnigma = ({ sceneToken }: { sceneToken?: string }) => { useBackgroundLoadingMedia(); useQueueHandler(); + // Credits modal state (must be before any early returns) + const { isOpen: isCreditsOpen, closeModal: closeCreditsModal } = + useCreditsModalStore(); + const [validGpu, setValidGpu] = useState("unknown"); useEffect(() => { @@ -144,6 +152,7 @@ export const PageEnigma = ({ sceneToken }: { sceneToken?: string }) => { )} + ); }; diff --git a/frontend/libs/components/pricing-modal/src/index.ts b/frontend/libs/components/pricing-modal/src/index.ts index 7a07596c53..a02f1fb21c 100644 --- a/frontend/libs/components/pricing-modal/src/index.ts +++ b/frontend/libs/components/pricing-modal/src/index.ts @@ -1,3 +1,5 @@ export * from "./lib/pricing-modal"; export * from "./lib/pricing-config"; export * from "./lib/pricing-modal-store"; +export * from "./lib/credits-modal"; +export * from "./lib/credits-modal-store"; diff --git a/frontend/libs/components/pricing-modal/src/lib/credits-modal-store.ts b/frontend/libs/components/pricing-modal/src/lib/credits-modal-store.ts new file mode 100644 index 0000000000..8d7a22ea91 --- /dev/null +++ b/frontend/libs/components/pricing-modal/src/lib/credits-modal-store.ts @@ -0,0 +1,15 @@ +import { create } from "zustand"; + +interface CreditsModalState { + isOpen: boolean; + openModal: () => void; + closeModal: () => void; + toggleModal: () => void; +} + +export const useCreditsModalStore = create((set) => ({ + isOpen: false, + openModal: () => set({ isOpen: true }), + closeModal: () => set({ isOpen: false }), + toggleModal: () => set((state) => ({ isOpen: !state.isOpen })), +})); diff --git a/frontend/libs/components/pricing-modal/src/lib/credits-modal.tsx b/frontend/libs/components/pricing-modal/src/lib/credits-modal.tsx new file mode 100644 index 0000000000..f01d969449 --- /dev/null +++ b/frontend/libs/components/pricing-modal/src/lib/credits-modal.tsx @@ -0,0 +1,162 @@ +import { Modal } from "@storyteller/ui-modal"; +import { Button } from "@storyteller/ui-button"; +import { faCoinFront as faCoinFrontLine } from "@fortawesome/pro-regular-svg-icons"; +import { faCoinFront } from "@fortawesome/pro-solid-svg-icons"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; + +interface CreditPack { + id: string; + total: number; + base: number; + bonus: number; + priceUsd: number; + badge?: string; + priceId?: string; +} + +const creditPacks: CreditPack[] = [ + { id: "c_005", total: 330, base: 330, bonus: 0, priceUsd: 5 }, + { id: "c_010", total: 660, base: 660, bonus: 0, priceUsd: 10 }, + { id: "c_020", total: 1320, base: 1320, bonus: 0, priceUsd: 20 }, + { + id: "c_050", + total: 3500, + base: 3300, + bonus: 200, + priceUsd: 50, + }, + { + id: "c_100", + total: 7500, + base: 6600, + bonus: 900, + priceUsd: 100, + }, + { + id: "c_200", + total: 16000, + base: 13200, + bonus: 2800, + priceUsd: 200, + }, + { + id: "c_600", + total: 48000, + base: 39600, + bonus: 8400, + priceUsd: 600, + }, + { + id: "c_1200", + total: 96000, + base: 79200, + bonus: 16800, + priceUsd: 1200, + }, +]; + +interface CreditsModalProps { + isOpen?: boolean; + onClose?: () => void; + onPurchase?: (pack: CreditPack) => void; +} + +function CoinIcon() { + return ( + + ); +} + +export function CreditsModal({ + isOpen = false, + onClose, + onPurchase, +}: CreditsModalProps) { + const handlePurchase = async (pack: CreditPack) => { + if (onPurchase) { + onPurchase(pack); + return; + } + + // Hook up Stripe/checkout here + // Example: redirect to checkout with pack.priceId + // await stripe.redirectToCheckout({ lineItems: [{ price: pack.priceId, quantity: 1 }], mode: 'payment', ... }) + // For now, just log + // eslint-disable-next-line no-console + console.log("Purchasing credits pack", pack); + }; + + const cardBase = + "relative rounded-xl border p-6 h-full flex flex-col justify-between bg-[#1F1F1F] border-white/10 hover:border-white/20 transition-all"; + + return ( + {})} + className="rounded-xl bg-[#1A1A1A] max-h-[90vh] max-w-screen-2xl overflow-y-auto flex flex-col" + allowBackgroundInteraction={false} + showClose={true} + closeOnOutsideClick={true} + resizable={false} + backdropClassName="bg-black/80" + > +
+
+

Buy credits

+

+ Choose a one-time credits package. No subscription required. +

+
+ +
+ {creditPacks.map((pack) => ( +
+ {pack.badge && ( +
+ {pack.badge} +
+ )} + + + +
+
+ + {pack.total.toLocaleString()} +
+ {pack.bonus > 0 && ( +
+ Total: {pack.base.toLocaleString()} {" + "} + + {pack.bonus.toLocaleString()} Bonus + +
+ )} +
+ +
+
+ ${pack.priceUsd} +
+ +
+
+ ))} +
+
+
+ ); +} + +export default CreditsModal; diff --git a/frontend/libs/components/pricing-modal/src/lib/pricing-modal.tsx b/frontend/libs/components/pricing-modal/src/lib/pricing-modal.tsx index 5f7a710272..0ee0c4af3f 100644 --- a/frontend/libs/components/pricing-modal/src/lib/pricing-modal.tsx +++ b/frontend/libs/components/pricing-modal/src/lib/pricing-modal.tsx @@ -161,7 +161,7 @@ export function PricingModal({ isOpen={isOpen} onClose={closeModal} className="rounded-xl bg-[#1A1A1A] max-h-[90vh] max-w-screen-2xl overflow-y-auto flex flex-col" - allowBackgroundInteraction={true} + allowBackgroundInteraction={false} showClose={true} closeOnOutsideClick={true} resizable={false} diff --git a/frontend/libs/components/settings-modal/src/lib/panes/BillingSettingsPane.tsx b/frontend/libs/components/settings-modal/src/lib/panes/BillingSettingsPane.tsx index c0def04f35..31ab6148e4 100644 --- a/frontend/libs/components/settings-modal/src/lib/panes/BillingSettingsPane.tsx +++ b/frontend/libs/components/settings-modal/src/lib/panes/BillingSettingsPane.tsx @@ -1,13 +1,14 @@ import { useEffect, useState } from "react"; import { Button } from "@storyteller/ui-button"; import { Label } from "@storyteller/ui-label"; -import { Progress } from "@storyteller/ui-progress"; import { - faCircleDollar, + faCoinFront, faInfoCircle, faStar, } from "@fortawesome/pro-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { usePricingModalStore } from "@storyteller/ui-pricing-modal"; +import { useCreditsModalStore } from "@storyteller/ui-pricing-modal"; interface BillingSettingsPaneProps {} @@ -45,45 +46,34 @@ export const BillingSettingsPane = (args: BillingSettingsPaneProps) => { fetchBillingData(); }, []); - const creditPercentage = - (billingInfo.credits.remaining / billingInfo.credits.total) * 100; - const isLowCredit = creditPercentage < 20; // If used more than 80% of credits, consider it low + const { toggleModal } = usePricingModalStore(); + const { toggleModal: toggleCreditsModal } = useCreditsModalStore(); return ( <>
-
- -
- - - {billingInfo.credits.remaining}/{billingInfo.credits.total} - -
-
- -
- -
+
-
- +
+ {billingInfo.plan}
-
@@ -94,6 +84,34 @@ export const BillingSettingsPane = (args: BillingSettingsPaneProps) => { Next {billingInfo.nextPayment.amount} payment due{" "} {billingInfo.nextPayment.date}
+ +
+ +
+ +
+
+ + + {billingInfo.credits.remaining} + +
+
+ +
+
+
); diff --git a/frontend/libs/components/settings-modal/src/lib/settings-modal.tsx b/frontend/libs/components/settings-modal/src/lib/settings-modal.tsx index 613d508af5..d2d9473c8c 100644 --- a/frontend/libs/components/settings-modal/src/lib/settings-modal.tsx +++ b/frontend/libs/components/settings-modal/src/lib/settings-modal.tsx @@ -52,7 +52,7 @@ export const SettingsModal = ({ const sections = [ { id: "general" as const, label: "General", icon: faCog }, { id: "accounts" as const, label: "Accounts", icon: faUser }, - // { id: "billing" as const, label: "Plan & Credits", icon: faCreditCard }, // Uncomment this for billing - BFlat + { id: "billing" as const, label: "Plan & Credits", icon: faCreditCard }, { id: "provider_priority" as const, label: "Provider Priority",