diff --git a/environments/.env.develop b/environments/.env.develop new file mode 100644 index 0000000..1aaa843 --- /dev/null +++ b/environments/.env.develop @@ -0,0 +1,6 @@ +AURA_API_HOST=https://api-web.aura.wit.life +AURA_DAPI_HOST=https://dev.api.aura.witapps.us +AURA_SITE_HOST=https://aura.wit.life +AURA_PREFIX=api/v1 +AURA_OPEN_AI_HOST=https://api.openai.com +AURA_OPEN_AI_PREFIX=v1 \ No newline at end of file diff --git a/environments/.env.production b/environments/.env.production new file mode 100644 index 0000000..05cd7ea --- /dev/null +++ b/environments/.env.production @@ -0,0 +1,6 @@ +AURA_API_HOST=https://api-web.aura.wit.life +AURA_DAPI_HOST=https://api.aura.witapps.us +AURA_SITE_HOST=https://aura.wit.life +AURA_PREFIX=api/v1 +AURA_OPEN_AI_HOST=https://api.openai.com +AURA_OPEN_AI_PREFIX=v1 \ No newline at end of file diff --git a/index.html b/index.html index 2d0d1da..e1616df 100755 --- a/index.html +++ b/index.html @@ -89,7 +89,6 @@ Aura - Energy of your Horoscope - diff --git a/package-lock.json b/package-lock.json index 7dc1d88..7dc0036 100755 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,6 @@ "name": "aurawebapp", "version": "0.0.0", "dependencies": { - "@chargebee/chargebee-js-react-wrapper": "^0.6.3", "@reduxjs/toolkit": "^1.9.5", "@smakss/react-scroll-direction": "^4.0.4", "@stripe/react-stripe-js": "^2.3.1", @@ -30,7 +29,6 @@ "unique-names-generator": "^4.7.1" }, "devDependencies": { - "@chargebee/chargebee-js-types": "^1.0.1", "@types/node": "^20.5.1", "@types/react": "^18.2.6", "@types/react-dom": "^18.2.4", @@ -417,21 +415,6 @@ "node": ">=6.9.0" } }, - "node_modules/@chargebee/chargebee-js-react-wrapper": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/@chargebee/chargebee-js-react-wrapper/-/chargebee-js-react-wrapper-0.6.3.tgz", - "integrity": "sha512-U3KJLZZiUxxkW4HAkAZr2bs6r4HqL1S59zo3AAp4UYtJZbxmBpfX5e/MlsSENvsRxd2GvOpumcHr8rR4V0D5vw==", - "peerDependencies": { - "react": "^18.0.0 || ^17.0.0", - "react-dom": "^18.0.0 || ^17.0.0" - } - }, - "node_modules/@chargebee/chargebee-js-types": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@chargebee/chargebee-js-types/-/chargebee-js-types-1.0.1.tgz", - "integrity": "sha512-JsHlIAjZDwX2Q/vDGN4xzKRC8n1K4xCwzKl7wZOOwUH9ow030CRspVRkP3OWHrY5gLmpbmICc/iK2aptF3t/Ow==", - "dev": true - }, "node_modules/@emotion/is-prop-valid": { "version": "0.8.8", "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz", @@ -3865,18 +3848,6 @@ "to-fast-properties": "^2.0.0" } }, - "@chargebee/chargebee-js-react-wrapper": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/@chargebee/chargebee-js-react-wrapper/-/chargebee-js-react-wrapper-0.6.3.tgz", - "integrity": "sha512-U3KJLZZiUxxkW4HAkAZr2bs6r4HqL1S59zo3AAp4UYtJZbxmBpfX5e/MlsSENvsRxd2GvOpumcHr8rR4V0D5vw==", - "requires": {} - }, - "@chargebee/chargebee-js-types": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@chargebee/chargebee-js-types/-/chargebee-js-types-1.0.1.tgz", - "integrity": "sha512-JsHlIAjZDwX2Q/vDGN4xzKRC8n1K4xCwzKl7wZOOwUH9ow030CRspVRkP3OWHrY5gLmpbmICc/iK2aptF3t/Ow==", - "dev": true - }, "@emotion/is-prop-valid": { "version": "0.8.8", "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz", diff --git a/package.json b/package.json index 03a0ec7..965f5b4 100755 --- a/package.json +++ b/package.json @@ -7,10 +7,13 @@ "dev": "vite --host", "build": "tsc && vite build", "lint": "eslint src --ext ts,tsx --report-unused-disable-directives --max-warnings 0", - "preview": "vite preview" + "preview": "vite preview", + "start:dev": "vite --host --mode develop", + "start:prod": "vite --host --mode production", + "build:dev": "tsc && vite build --mode develop", + "build:prod": "tsc && vite build --mode production" }, "dependencies": { - "@chargebee/chargebee-js-react-wrapper": "^0.6.3", "@reduxjs/toolkit": "^1.9.5", "@smakss/react-scroll-direction": "^4.0.4", "@stripe/react-stripe-js": "^2.3.1", @@ -32,7 +35,6 @@ "unique-names-generator": "^4.7.1" }, "devDependencies": { - "@chargebee/chargebee-js-types": "^1.0.1", "@types/node": "^20.5.1", "@types/react": "^18.2.6", "@types/react-dom": "^18.2.4", diff --git a/src/api/api.ts b/src/api/api.ts index 3143f8b..ca2c811 100644 --- a/src/api/api.ts +++ b/src/api/api.ts @@ -13,7 +13,6 @@ import { SubscriptionCheckout, SubscriptionReceipts, SubscriptionStatus, - PaymentIntents, AICompatCategories, AICompats, AIRequests, @@ -50,7 +49,6 @@ const api = { getSubscriptionStatus: createMethod(SubscriptionStatus.createRequest), getSubscriptionReceipt: createMethod(SubscriptionReceipts.createGetRequest), createSubscriptionReceipt: createMethod(SubscriptionReceipts.createRequest), - createPaymentIntent: createMethod(PaymentIntents.createRequest), getAiCompatCategories: createMethod(AICompatCategories.createRequest), getAiCompat: createMethod(AICompats.createRequest), getAiRequest: createMethod(AIRequests.createRequest), diff --git a/src/api/errors.ts b/src/api/errors.ts index d5a9427..1da7531 100644 --- a/src/api/errors.ts +++ b/src/api/errors.ts @@ -24,23 +24,26 @@ export interface SingleErrorResponse { export type ErrorResponse = ErrorListResponse | SingleErrorResponse -export type ErrorPayload = { +export type ErrorPayload = { body: ErrorResponse statusCode: number + responseData?: T | null } export type MaybeError = ShortDomainError | FullDomainError | undefined export const buildUnknownError = (statusCode: number) => `Unknown Error occurred from Server with status code ${statusCode}` -export class ApiError extends Error { +export class ApiError extends Error { readonly body: ErrorResponse readonly statusCode: number - constructor(payload: ErrorPayload) { + readonly responseData: T | null + constructor(payload: ErrorPayload) { super('Caught an error while fetching the API Server endpoint...') this.name = 'ApiError' this.body = payload.body this.statusCode = payload.statusCode + this.responseData = payload?.responseData || null } } diff --git a/src/api/resources/Apps.ts b/src/api/resources/Apps.ts index de4c19f..03c5e7c 100644 --- a/src/api/resources/Apps.ts +++ b/src/api/resources/Apps.ts @@ -13,7 +13,6 @@ export interface Response { active_iaps: ActiveIAps[] version: string apple_music_api: AppleMusicApi - chargebee: ChargebeeConfig first_open_subscription_popup: boolean runs_before_subscription_popup: number appirater_alerts: AppiraterAlertAppiraterAlert[] @@ -53,12 +52,6 @@ export interface AppleMusicApi { jwt: string } -export interface ChargebeeConfig { - site: string - publishableKey: string - gatewayAccountId: string -} - export const createRequest = ({ bundleId }: Payload): Request => { const url = new URL(routes.server.apps(bundleId)) return new Request(url, { method: 'GET', headers: getBaseHeaders() }) diff --git a/src/api/resources/UserPaymentIntents.ts b/src/api/resources/UserPaymentIntents.ts deleted file mode 100644 index c20ab27..0000000 --- a/src/api/resources/UserPaymentIntents.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { PaymentIntent } from '@chargebee/chargebee-js-types' -import { AuthPayload } from '../types' -import { getAuthHeaders } from '../utils' -import routes from '@/routes' - -export interface Payload extends AuthPayload { - paymentMethod: PaymentMethod - currencyCode: CurrencyCode -} - -export interface Response { - payment_intent: PaymentIntent - customer: Customer -} - -export type PaymentMethod = 'apple_pay' | 'google_pay' | 'card' -export type CurrencyCode = 'USD' - -export interface Customer { - id: string - email: string - auto_collection: 'on' | 'off' - net_term_days: number - allow_direct_debit: boolean - taxability: 'taxable' | 'exempt' - created_at: number - updated_at: number - pii_cleared: 'active' | 'scheduled_for_clear' | 'cleared' - channel: 'web' | 'app_store' | 'play_store' - resource_version: number - deleted: boolean - card_status: 'no_card' | 'valid' | 'expiring' | 'expired' - promotional_credits: number - refundable_credits: number - excess_payments: number - unbilled_charges: number - preferred_currency_code: CurrencyCode -} - -export const createRequest = ({ token, paymentMethod, currencyCode }: Payload): Request => { - const url = new URL(routes.server.paymentIntents()) - const body = JSON.stringify({ - payment_intent: { - payment_method_type: paymentMethod, - currency_code: currencyCode, - } - }) - return new Request(url, { method: 'POST', headers: getAuthHeaders(token), body }) -} diff --git a/src/api/resources/UserSubscriptionReceipts.ts b/src/api/resources/UserSubscriptionReceipts.ts index 8d5611d..906a9b1 100644 --- a/src/api/resources/UserSubscriptionReceipts.ts +++ b/src/api/resources/UserSubscriptionReceipts.ts @@ -6,12 +6,6 @@ export interface GetPayload extends AuthPayload { id: string; } -export interface ChargebeeReceiptPayload extends AuthPayload { - itemPriceId: string; - gwToken: string; - referenceId?: string; -} - export interface AppleReceiptPayload extends AuthPayload { receiptData: string; autorenewable?: boolean; @@ -33,7 +27,6 @@ export interface PayPalReceiptPayload extends AuthPayload { } export type Payload = - | ChargebeeReceiptPayload | AppleReceiptPayload | StripeReceiptPayload | PayPalReceiptPayload; @@ -78,12 +71,6 @@ interface IPayPalLink { method: "GET" | "PATCH"; } -function createRequest({ - token, - itemPriceId, - gwToken, - referenceId, -}: ChargebeeReceiptPayload): Request; function createRequest({ token, receiptData, @@ -104,16 +91,6 @@ function createRequest(payload: Payload): Request { } function getDataPayload(payload: Payload) { - if ("itemPriceId" in payload && "gwToken" in payload) { - return { - way: "chargebee", - subscription_receipt: { - item_price_id: payload.itemPriceId, - gw_token: payload.gwToken, - reference_id: payload.referenceId, - }, - }; - } if ("receiptData" in payload) { return { way: "apple", diff --git a/src/api/resources/index.ts b/src/api/resources/index.ts index 2f721e5..32faca6 100644 --- a/src/api/resources/index.ts +++ b/src/api/resources/index.ts @@ -11,7 +11,6 @@ export * as SubscriptionItems from "./UserSubscriptionItemPrices"; export * as SubscriptionCheckout from "./UserSubscriptionCheckout"; export * as SubscriptionStatus from "./UserSubscriptionStatus"; export * as SubscriptionReceipts from "./UserSubscriptionReceipts"; -export * as PaymentIntents from "./UserPaymentIntents"; export * as AICompatCategories from "./AICompatCategories"; export * as AICompats from "./AICompats"; export * as AIRequests from "./AIRequests"; diff --git a/src/api/utils.ts b/src/api/utils.ts index 39f80a1..4c38e1a 100644 --- a/src/api/utils.ts +++ b/src/api/utils.ts @@ -17,11 +17,11 @@ export function createMethod(createRequest: (payload: P) => Request) { const body = isErrorResponse(data) ? data : { error: buildUnknownError(statusCode) }; - throw new ApiError({ body, statusCode }); + throw new ApiError({ body, statusCode, responseData: data }); } if (isErrorResponse(data)) { - throw new ApiError({ body: data, statusCode }); + throw new ApiError({ body: data, statusCode, responseData: data }); } return data; diff --git a/src/components/PaymentPage/index.tsx b/src/components/PaymentPage/index.tsx index 6720ba5..214ee76 100644 --- a/src/components/PaymentPage/index.tsx +++ b/src/components/PaymentPage/index.tsx @@ -1,74 +1,15 @@ -import { usePayment } from "@/payment"; import routes from "@/routes"; import { selectors } from "@/store"; -import { useEffect, useState } from "react"; -import { useTranslation } from "react-i18next"; import { useSelector } from "react-redux"; import { useNavigate } from "react-router-dom"; import Header from "../Header"; import Loader from "../Loader"; -import Title from "../Title"; import UserHeader from "../UserHeader"; -import ErrorModal from "./ErrorModal"; -import { ApplePayBanner, GooglePayBanner } from "./methods"; -import { StripeButton } from "./methods/Stripe"; -import secure from "./secure.png"; import "./styles.css"; -// import { PayPalButton } from "./methods/PayPal/Button"; -// import { useAuth } from "@/auth"; -// import { useApi } from "@/api"; -// import { PayPalReceiptPayload } from "@/api/resources/UserSubscriptionReceipts"; -import { ISubscriptionPlan } from "@/api/resources/SubscriptionPlans"; - -const getPrice = (activeSubPlan: ISubscriptionPlan | null) => { - if (!activeSubPlan) return 0; - return String( - activeSubPlan?.trial?.price_cents - ? activeSubPlan.trial.price_cents / 100 - : 0 - ); -}; function PaymentPage(): JSX.Element { - const { t } = useTranslation(); - const { applePay } = usePayment(); - // const api = useApi(); - // const { token } = useAuth(); - const [openErrorModal, setOpenErrorModal] = useState(false); const navigate = useNavigate(); - const isLoading = applePay === null; - const isApplePayAvailable = - import.meta.env.PROD && applePay?.canMakePayments(); const email = useSelector(selectors.selectEmail); - const activeSubPlan = useSelector(selectors.selectActiveSubPlan); - - // Do not allow to go to this page if there is no other payment methods - useEffect(() => { - // Have only Stripe for now - navigate(routes.client.paymentStripe()); - }, []); - - const navigateToStripe = () => { - navigate(routes.client.paymentStripe()); - }; - - // const navigateToPayPal = async () => { - // const { subscription_receipt } = await api.createSubscriptionReceipt({ - // token, - // itemInterval: "year", - // way: "paypal", - // subscription_receipt: { - // sub_plan_id: activeSubPlan?.id || "", - // }, - // } as PayPalReceiptPayload); - // const url = subscription_receipt.data.links?.find( - // (link) => link.rel === "approve" - // )?.href; - // if (!url?.length) { - // return setOpenErrorModal(true); - // } - // window.location.href = url; - // }; return ( <> @@ -78,38 +19,7 @@ function PaymentPage(): JSX.Element { />
- {isLoading ? ( - - ) : ( - <> -
- {isApplePayAvailable ? : } - 100% Secure -
- - {t("choose_payment")} - -
- {/* */} - -
-

- {t("will_be_charged", { - strongText: ( - - {t("trial_price", { - price: getPrice(activeSubPlan || null), - })} - - ), - })} -

- setOpenErrorModal(false)} - /> - - )} +
); diff --git a/src/components/PaymentPage/methods/ApplePay/Apple-Pay.png b/src/components/PaymentPage/methods/ApplePay/Apple-Pay.png deleted file mode 100644 index 2e7c7dd..0000000 Binary files a/src/components/PaymentPage/methods/ApplePay/Apple-Pay.png and /dev/null differ diff --git a/src/components/PaymentPage/methods/ApplePay/Banner.tsx b/src/components/PaymentPage/methods/ApplePay/Banner.tsx deleted file mode 100644 index 20b889d..0000000 --- a/src/components/PaymentPage/methods/ApplePay/Banner.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import applePaySafeCheckout from './Apple-Pay.png' - -export function ApplePayBanner (): JSX.Element { - return Guaranteed safe checkout -} diff --git a/src/components/PaymentPage/methods/ApplePay/Button.tsx b/src/components/PaymentPage/methods/ApplePay/Button.tsx deleted file mode 100644 index e062afa..0000000 --- a/src/components/PaymentPage/methods/ApplePay/Button.tsx +++ /dev/null @@ -1,67 +0,0 @@ -import { useCallback, useEffect, useState } from 'react' -import { useTranslation } from 'react-i18next' -import { PaymentIntent } from '@chargebee/chargebee-js-types' -import { useApi, useApiCall, extractErrorMessage, SubscriptionReceipts } from '@/api' -import { usePayment, ApplePayButtonOptions } from '@/payment' -import { useAuth } from '@/auth' -import Loader, { LoaderColor } from '@/components/Loader' -import ErrorText from '@/components/ErrorText' - -const currencyCode = 'USD' -const paymentMethod = 'apple_pay' -const buttonId = 'apple-pay-btn' - -interface ApplePayButtonProps { - onSuccess: (receipt: SubscriptionReceipts.SubscriptionReceipt) => void - onError: (error: Error) => void -} - -export function ApplePayButton({ onSuccess, onError }: ApplePayButtonProps): JSX.Element { - const api = useApi() - const { i18n } = useTranslation() - const { token } = useAuth() - const { applePay } = usePayment() - const [isMounting, setIsMounting] = useState(true) - const loadData = useCallback(() => { - return api.createPaymentIntent({ token, paymentMethod, currencyCode }) - .then(({ payment_intent }) => payment_intent) - }, [api, token]) - const { data, error, isPending } = useApiCall(loadData) - - if (error) console.error(error) - - useEffect(() => { - if (data === null) return - const buttonOptions: ApplePayButtonOptions = { - buttonColor: 'black', - buttonType: 'plain', - locale: i18n.language - } - applePay?.setPaymentIntent(data) - applePay?.mountPaymentButton(`#${buttonId}`, buttonOptions) - .then(() => setIsMounting(false)) - .then(() => applePay?.handlePayment()) - .then((paymentIntent) => { - return api.createSubscriptionReceipt({ - token, receiptData: paymentIntent.id, autorenewable: true, sandbox: true, - }) - }) - .then(({ subscription_receipt }: SubscriptionReceipts.Response) => onSuccess(subscription_receipt)) - .catch((error: Error) => onError(error)) - }, [data, applePay, i18n.language, api, token, onSuccess, onError]) - - return ( -
- {isPending || isMounting ? : null} - {error ? : null} -
- ) -} - -function FakeApplePayButton() { - return ( -
- -
- ) -} diff --git a/src/components/PaymentPage/methods/ApplePay/index.ts b/src/components/PaymentPage/methods/ApplePay/index.ts deleted file mode 100644 index 3818e10..0000000 --- a/src/components/PaymentPage/methods/ApplePay/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './Banner' -export * from './Button' diff --git a/src/components/PaymentPage/methods/Card/Button.tsx b/src/components/PaymentPage/methods/Card/Button.tsx deleted file mode 100644 index fe4f8be..0000000 --- a/src/components/PaymentPage/methods/Card/Button.tsx +++ /dev/null @@ -1,18 +0,0 @@ - -import { useTranslation } from 'react-i18next' -import MainButton from '@/components/MainButton' -import card from './card.svg' - -interface CardButtonProps { - onClick: () => void -} - -export function CardButton({ onClick }: CardButtonProps): JSX.Element { - const { t } = useTranslation() - return ( - - Credit / Debit Card - {t('card')} - - ) -} diff --git a/src/components/PaymentPage/methods/Card/Modal.tsx b/src/components/PaymentPage/methods/Card/Modal.tsx deleted file mode 100644 index 7bc7a26..0000000 --- a/src/components/PaymentPage/methods/Card/Modal.tsx +++ /dev/null @@ -1,146 +0,0 @@ -import { useCallback, useEffect, useRef, useState, ChangeEvent } from 'react' -import { useTranslation } from 'react-i18next' -import { - CardCVV, CardComponent, CardExpiry, CardNumber, Provider -} from '@chargebee/chargebee-js-react-wrapper' -import ChargebeeComponents from '@chargebee/chargebee-js-react-wrapper/dist/components/ComponentGroup' -import { PaymentIntent } from '@chargebee/chargebee-js-types' -import { usePayment } from '@/payment' -import { useApi, SubscriptionReceipts, useApiCall } from '@/api' -import { useAuth } from '@/auth' -import Modal from '@/components/Modal' -import Title from '@/components/Title' -import MainButton from '@/components/MainButton' -import Loader from '@/components/Loader' -import visa from './visa.svg' -import mastercard from './mastercard.svg' -import amex from './amex.svg' -import diners from './diners.svg' -import discover from './discover.svg' -import { cardStyles } from './styles' - -interface CardModalProps { - open: boolean - onClose: () => void - onSuccess: (receipt: SubscriptionReceipts.SubscriptionReceipt) => void - onError: (error: Error) => void -} - -interface Field { - cardType: string | undefined - complete: boolean - empty: boolean - error: Error | undefined - field: 'number' | 'expiry' | 'cvv' - key: string | undefined - type: string -} - -type Status = 'idle' | 'loading' | 'filling' | 'subscribing' | 'ready' | 'success' | 'error' - -const initCompletedFields = { - number: false, - expiry: false, - cvv: false, -} - -type CompletedFields = typeof initCompletedFields - -const isReady = (fields: CompletedFields) => Object.values(fields).every((complete: boolean) => complete) - -const currencyCode = 'USD' -const paymentMethod = 'card' -const itemPriceId = 'aura-membership-2-week-USD' - -export function CardModal({ open, onClose, onSuccess, onError }: CardModalProps): JSX.Element { - const api = useApi() - const cardRef = useRef(null) - const [status, setStatus] = useState('idle') - const [fields, setFields] = useState(initCompletedFields) - const { token, user } = useAuth() - const { t, i18n } = useTranslation() - const locale = i18n.language - const isInit = status === 'idle' - const isLoading = status === 'loading' - const { chargebee } = usePayment() - const loadData = useCallback(() => { - return api.createPaymentIntent({ token, paymentMethod, currencyCode }) - .then(({ payment_intent }) => payment_intent) - }, [api, token]) - const { data, error } = useApiCall(loadData) - const handleReady = () => setStatus('filling') - const handleClose = () => { - setStatus('loading') - onClose() - } - const handleChange = ({ field, complete, error }: ChangeEvent & Field) => { - setFields((state) => ({ ...state, [field]: complete && !error })) - } - const payWithCard = () => { - if (data === null) return - setStatus('subscribing') - cardRef.current?.authorizeWith3ds(data, { email: user?.email }, {}) - .then((paymentIntent: PaymentIntent) => { - return api.createSubscriptionReceipt({ token, itemPriceId, gwToken: paymentIntent.id }) - }) - .then(({ subscription_receipt }: SubscriptionReceipts.Response) => { - setStatus('success') - onSuccess(subscription_receipt) - }) - .catch((error: Error) => { - setStatus('error') - onError(error) - }) - } - - if (error) console.error(error) - - useEffect(() => { - if (status !== 'filling' && status !== 'ready' && status !== 'error') return - setStatus(isReady(fields) ? 'ready' : 'filling') - }, [fields, status]) - - useEffect(() => { - if (isInit) setStatus('loading') - }, [isInit]) - - return ( - - { isLoading ?
: null} -
-
- {t('card')} -
- Visa Card - Mastercard Card - Amex Card - Diners Card - Discover Card -
-
- - -
-
-
-
-
- - -

{t('charged_only')}

- - { status === 'subscribing' ? : <>{t('start_trial')} } - -
- - ) -} - -function LockIcon(): JSX.Element { - return ( - - - - - ) -} diff --git a/src/components/PaymentPage/methods/Card/amex.svg b/src/components/PaymentPage/methods/Card/amex.svg deleted file mode 100644 index 1fa5c94..0000000 --- a/src/components/PaymentPage/methods/Card/amex.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/components/PaymentPage/methods/Card/card.svg b/src/components/PaymentPage/methods/Card/card.svg deleted file mode 100644 index 0568eee..0000000 --- a/src/components/PaymentPage/methods/Card/card.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/components/PaymentPage/methods/Card/diners.svg b/src/components/PaymentPage/methods/Card/diners.svg deleted file mode 100644 index 6c050b6..0000000 --- a/src/components/PaymentPage/methods/Card/diners.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/components/PaymentPage/methods/Card/discover.svg b/src/components/PaymentPage/methods/Card/discover.svg deleted file mode 100644 index b9884e8..0000000 --- a/src/components/PaymentPage/methods/Card/discover.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/components/PaymentPage/methods/Card/index.ts b/src/components/PaymentPage/methods/Card/index.ts deleted file mode 100644 index 794d8c4..0000000 --- a/src/components/PaymentPage/methods/Card/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './Button' -export * from './Modal' diff --git a/src/components/PaymentPage/methods/Card/mastercard.svg b/src/components/PaymentPage/methods/Card/mastercard.svg deleted file mode 100644 index 0f02395..0000000 --- a/src/components/PaymentPage/methods/Card/mastercard.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/components/PaymentPage/methods/Card/styles.ts b/src/components/PaymentPage/methods/Card/styles.ts deleted file mode 100644 index 6af1925..0000000 --- a/src/components/PaymentPage/methods/Card/styles.ts +++ /dev/null @@ -1,18 +0,0 @@ -export const cardStyles = { - base: { - color: '#121620', - lineHeight: '18px', - fontSize: '16px', - fontWeight: '400', - fontFamily: 'SF Pro Text, system-ui, sans-serif', - '::placeholder': { - color: '#8E8E93', - } - }, - invalid: { - color: '#FF5758', - }, - empty: { - fontWeight: '400', - }, -} diff --git a/src/components/PaymentPage/methods/Card/visa.svg b/src/components/PaymentPage/methods/Card/visa.svg deleted file mode 100644 index 3efb559..0000000 --- a/src/components/PaymentPage/methods/Card/visa.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/components/PaymentPage/methods/GooglePay/Banner.tsx b/src/components/PaymentPage/methods/GooglePay/Banner.tsx deleted file mode 100644 index af82d77..0000000 --- a/src/components/PaymentPage/methods/GooglePay/Banner.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import gPaySafeCheckout from './Google-Pay.png' - -export function GooglePayBanner(): JSX.Element { - return Guaranteed safe checkout -} diff --git a/src/components/PaymentPage/methods/GooglePay/Button.tsx b/src/components/PaymentPage/methods/GooglePay/Button.tsx deleted file mode 100644 index cf9a8a9..0000000 --- a/src/components/PaymentPage/methods/GooglePay/Button.tsx +++ /dev/null @@ -1,67 +0,0 @@ -import { useCallback, useEffect, useState } from 'react' -import { useTranslation } from 'react-i18next' -import { PaymentIntent } from '@chargebee/chargebee-js-types' -import { SubscriptionReceipts, extractErrorMessage, useApi, useApiCall } from '@/api' -import { usePayment, GooglePayButtonOptions } from '@/payment' -import { useAuth } from '@/auth' -import Loader, { LoaderColor } from '@/components/Loader' -import ErrorText from '@/components/ErrorText' - -const currencyCode = 'USD' -const paymentMethod = 'google_pay' -const buttonId = 'google-pay-btn' - -interface GooglePayButtonProps { - onSuccess: (receipt: SubscriptionReceipts.SubscriptionReceipt) => void - onError: (error: Error) => void -} - -export function GooglePayButton({ onSuccess, onError }: GooglePayButtonProps): JSX.Element { - const api = useApi() - const { i18n } = useTranslation() - const { token } = useAuth() - const { googlePay } = usePayment() - const [isMounting, setIsMounting] = useState(true) - const loadData = useCallback(() => { - return api.createPaymentIntent({ token, paymentMethod, currencyCode }) - .then(({ payment_intent }) => payment_intent) - }, [api, token]) - const { data, error, isPending } = useApiCall(loadData) - - if (error) console.error(error) - - useEffect(() => { - if (data === null) return - const buttonOptions: GooglePayButtonOptions = { - buttonColor: 'black', - buttonType: 'plain', - buttonLocale: i18n.language, - buttonSizeMode: 'fill', - } - googlePay?.setPaymentIntent(data) - googlePay?.mountPaymentButton(`#${buttonId}`, buttonOptions) - .then(() => setIsMounting(false)) - .then(() => googlePay?.handlePayment()) - .then((result) => { - console.log('Success payment by GooglePay', result) - // TODO: implement api.createSubscriptionReceipt for GooglePay - }) - .then(() => onSuccess({} as SubscriptionReceipts.SubscriptionReceipt)) - .catch((error: Error) => onError(error)) - }, [data, googlePay, i18n.language, onSuccess, onError]) - - return ( -
- {isPending || isMounting ? : null} - {error ? : null} -
- ) -} - -function FakeGPayButton() { - return ( -
- -
- ) -} diff --git a/src/components/PaymentPage/methods/GooglePay/Google-Pay.png b/src/components/PaymentPage/methods/GooglePay/Google-Pay.png deleted file mode 100644 index 7973303..0000000 Binary files a/src/components/PaymentPage/methods/GooglePay/Google-Pay.png and /dev/null differ diff --git a/src/components/PaymentPage/methods/GooglePay/dark_gpay.svg b/src/components/PaymentPage/methods/GooglePay/dark_gpay.svg deleted file mode 100644 index 8979835..0000000 --- a/src/components/PaymentPage/methods/GooglePay/dark_gpay.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/components/PaymentPage/methods/GooglePay/index.ts b/src/components/PaymentPage/methods/GooglePay/index.ts deleted file mode 100644 index 3818e10..0000000 --- a/src/components/PaymentPage/methods/GooglePay/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './Banner' -export * from './Button' diff --git a/src/components/PaymentPage/methods/index.ts b/src/components/PaymentPage/methods/index.ts deleted file mode 100644 index e343ee4..0000000 --- a/src/components/PaymentPage/methods/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from './ApplePay' -export * from './GooglePay' -export * from './Card' diff --git a/src/components/PaymentPage/styles.css b/src/components/PaymentPage/styles.css index 89be04d..1e943cb 100644 --- a/src/components/PaymentPage/styles.css +++ b/src/components/PaymentPage/styles.css @@ -44,10 +44,6 @@ letter-spacing: 0.0008em; } -.payment-chargebee { - width: 100%; -} - .payment-card-list { display: flex; justify-content: space-between; diff --git a/src/components/PriceList/styles.module.css b/src/components/PriceList/styles.module.css index de269fd..7686405 100755 --- a/src/components/PriceList/styles.module.css +++ b/src/components/PriceList/styles.module.css @@ -3,4 +3,5 @@ display: flex; flex-direction: row; justify-content: space-between; + gap: 4px; } diff --git a/src/components/SubPlanInformation/index.tsx b/src/components/SubPlanInformation/index.tsx index 3e42867..7e1f270 100644 --- a/src/components/SubPlanInformation/index.tsx +++ b/src/components/SubPlanInformation/index.tsx @@ -2,7 +2,6 @@ import { useTranslation } from "react-i18next"; import styles from "./styles.module.css"; import { ISubscriptionPlan } from "@/api/resources/SubscriptionPlans"; import TotalToday from "./TotalToday"; -// import ApplePayButton from "../StripePage/ApplePayButton"; import MainButton from "../MainButton"; import { useApi } from "@/api"; import { useAuth } from "@/auth"; diff --git a/src/components/pages/SinglePaymentPage/index.tsx b/src/components/pages/SinglePaymentPage/index.tsx index 195b814..5081c52 100644 --- a/src/components/pages/SinglePaymentPage/index.tsx +++ b/src/components/pages/SinglePaymentPage/index.tsx @@ -68,7 +68,7 @@ function SinglePaymentPage({ productId, isForce = false }: ISinglePaymentPage) { /> )} - {errorSinglePayment?.error && ( + {errorSinglePayment?.error && !isLoadingSinglePayment && ( Something went wrong:{" "} {errorSinglePayment?.error?.length && errorSinglePayment?.error} @@ -78,4 +78,4 @@ function SinglePaymentPage({ productId, isForce = false }: ISinglePaymentPage) { ); } -export default SinglePaymentPage; \ No newline at end of file +export default SinglePaymentPage; diff --git a/src/components/pages/TrialChoice/index.tsx b/src/components/pages/TrialChoice/index.tsx index 6fa1197..5e0b87c 100755 --- a/src/components/pages/TrialChoice/index.tsx +++ b/src/components/pages/TrialChoice/index.tsx @@ -1,6 +1,6 @@ import PriceList from "@/components/PriceList"; import styles from "./styles.module.css"; -import { useEffect, useState } from "react"; +import { useEffect, useMemo, useState } from "react"; import { ISubscriptionPlan } from "@/api/resources/SubscriptionPlans"; import { useTranslation } from "react-i18next"; import { useApi } from "@/api"; @@ -26,6 +26,7 @@ function TrialChoicePage() { const email = useSelector(selectors.selectEmail); const [subPlans, setSubPlans] = useState<ISubscriptionPlan[]>([]); const [isDisabled, setIsDisabled] = useState(true); + const allowedPlans = useMemo(() => ["stripe.37"], []); useEffect(() => { (async () => { @@ -39,7 +40,10 @@ function TrialChoicePage() { plansKeys[plan.name] = plansKeys[plan.name] ? plansKeys[plan.name] + 1 : 1; - if (plansKeys[plan.name] > 1 && !plan.trial?.is_free && !!plan.trial) { + if ( + (plansKeys[plan.name] > 1 && !plan.trial?.is_free && !!plan.trial) || + allowedPlans.includes(plan.id) + ) { const targetPlan = plansWithoutTest.find( (item) => item.name === plan.name && item.id.includes("stripe") ); @@ -62,6 +66,7 @@ function TrialChoicePage() { setSubPlans(plans); })(); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [api, locale]); const handlePriceItem = () => { diff --git a/src/components/palmistry/steps-manager/steps-manager.tsx b/src/components/palmistry/steps-manager/steps-manager.tsx index 8b1c17f..f5b5124 100644 --- a/src/components/palmistry/steps-manager/steps-manager.tsx +++ b/src/components/palmistry/steps-manager/steps-manager.tsx @@ -1,34 +1,37 @@ -import React from 'react'; -import { AnimatePresence, motion } from 'framer-motion'; -import { useLocation } from 'react-router-dom'; +import React from "react"; +import { AnimatePresence, motion } from "framer-motion"; +import { useLocation, useSearchParams } from "react-router-dom"; -import './steps-manager.css'; +import "./steps-manager.css"; -import Progressbar from '@/components/palmistry/progress-bar/progress-bar'; -import PalmistryContainer from '@/components/palmistry/palmistry-container/palmistry-container'; -import useSteps, { Step } from '@/hooks/palmistry/use-steps'; -import StepWelcome from '@/components/palmistry/step-welcome/step-welcome'; -import StepGender from '@/components/palmistry/step-gender/step-gender'; -import StepBirthdate from '@/components/palmistry/step-birthdate/step-birthdate'; -import StepPalmsHold from '@/components/palmistry/step-palms-hold/step-palms-hold'; -import StepWish from '@/components/palmistry/step-wish/step-wish'; -import StepRelationshipStatus from '@/components/palmistry/step-relationship-status/step-relationship-status'; -import StepResonatedElement from '@/components/palmistry/step-resonated-element/step-resonated-element'; -import StepColorYouLike from '@/components/palmistry/step-color-you-like/step-color-you-like'; -import StepDecisions from '@/components/palmistry/step-decisions/step-decisions'; -import StepGuidancePlan from '@/components/palmistry/step-guidance-plan/step-guidance-plan'; -import StepPersonalStatement from '@/components/palmistry/step-personal-statement/step-personal-statement'; -import StepScanInfo from '@/components/palmistry/step-scan-info/step-scan-info'; -import StepUpload from '@/components/palmistry/step-upload/step-upload'; -import StepScanPhoto from '@/components/palmistry/step-scan-photo/step-scan-photo'; -import StepEmail from '@/components/palmistry/step-email/step-email'; -import StepSubscriptionPlan from '@/components/palmistry/step-subscription-plan/step-subscription-plan'; -import StepPaywall from '@/components/palmistry/step-paywall/step-paywall'; -import PaymentScreen from '@/components/palmistry/payment-screen/payment-screen'; -import DiscountScreen from '@/components/palmistry/discount-screen/discount-screen'; -import PremiumBundleScreen from '@/components/palmistry/premium-bundle-screen/premium-bundle-screen'; +import Progressbar from "@/components/palmistry/progress-bar/progress-bar"; +import PalmistryContainer from "@/components/palmistry/palmistry-container/palmistry-container"; +import useSteps, { Step } from "@/hooks/palmistry/use-steps"; +import StepWelcome from "@/components/palmistry/step-welcome/step-welcome"; +import StepGender from "@/components/palmistry/step-gender/step-gender"; +import StepBirthdate from "@/components/palmistry/step-birthdate/step-birthdate"; +import StepPalmsHold from "@/components/palmistry/step-palms-hold/step-palms-hold"; +import StepWish from "@/components/palmistry/step-wish/step-wish"; +import StepRelationshipStatus from "@/components/palmistry/step-relationship-status/step-relationship-status"; +import StepResonatedElement from "@/components/palmistry/step-resonated-element/step-resonated-element"; +import StepColorYouLike from "@/components/palmistry/step-color-you-like/step-color-you-like"; +import StepDecisions from "@/components/palmistry/step-decisions/step-decisions"; +import StepGuidancePlan from "@/components/palmistry/step-guidance-plan/step-guidance-plan"; +import StepPersonalStatement from "@/components/palmistry/step-personal-statement/step-personal-statement"; +import StepScanInfo from "@/components/palmistry/step-scan-info/step-scan-info"; +import StepUpload from "@/components/palmistry/step-upload/step-upload"; +import StepScanPhoto from "@/components/palmistry/step-scan-photo/step-scan-photo"; +import StepEmail from "@/components/palmistry/step-email/step-email"; +import StepSubscriptionPlan from "@/components/palmistry/step-subscription-plan/step-subscription-plan"; +import StepPaywall from "@/components/palmistry/step-paywall/step-paywall"; +import PaymentScreen from "@/components/palmistry/payment-screen/payment-screen"; +import DiscountScreen from "@/components/palmistry/discount-screen/discount-screen"; +import PremiumBundleScreen from "@/components/palmistry/premium-bundle-screen/premium-bundle-screen"; -const PalmistryContainerWrapper = (props: { children: React.ReactNode, currentStep: Step }) => { +const PalmistryContainerWrapper = (props: { + children: React.ReactNode; + currentStep: Step; +}) => { return ( <PalmistryContainer singleQuestion={[ @@ -39,7 +42,9 @@ const PalmistryContainerWrapper = (props: { children: React.ReactNode, currentSt Step.Decisions, ].includes(props.currentStep)} type={props.currentStep} - >{props.children}</PalmistryContainer> + > + {props.children} + </PalmistryContainer> ); }; @@ -48,106 +53,111 @@ const animationDuration = 0.2; export default function StepsManager() { const steps = useSteps(); const { pathname } = useLocation(); + const [searchParams] = useSearchParams(); const [modalIsOpen, setModalIsOpen] = React.useState(false); React.useLayoutEffect(() => { if (!steps.isInited) return; - - steps.goFirstUnpassedStep(); + steps.goFirstUnpassedStep(searchParams.toString()); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [steps.isInited]); const motionDivClassName = [ - 'steps-manager__motion-div', - modalIsOpen ? 'steps-manager__motion-div_no-transform' : '', + "steps-manager__motion-div", + modalIsOpen ? "steps-manager__motion-div_no-transform" : "", ]; - const nonSliderSteps = [ - Step.Payment, - Step.Discount, - Step.PremiumBundle, - ]; + const nonSliderSteps = [Step.Payment, Step.Discount, Step.PremiumBundle]; return ( <div className="steps-manager"> - {steps.currentNumber >= steps.progressBarRange[0] && steps.currentNumber <= steps.progressBarRange[1] && ( - <Progressbar step={steps.currentNumber}/> - )} + {steps.currentNumber >= steps.progressBarRange[0] && + steps.currentNumber <= steps.progressBarRange[1] && ( + <Progressbar step={steps.currentNumber} /> + )} <main className="steps-manager__main"> {nonSliderSteps.includes(steps.current as Step) && ( <PalmistryContainerWrapper currentStep={steps.current as Step}> - {steps.current === Step.Payment && <PaymentScreen/>} - {steps.current === Step.Discount && <DiscountScreen/>} - {steps.current === Step.PremiumBundle && <PremiumBundleScreen/>} + {steps.current === Step.Payment && <PaymentScreen />} + {steps.current === Step.Discount && <DiscountScreen />} + {steps.current === Step.PremiumBundle && <PremiumBundleScreen />} </PalmistryContainerWrapper> )} {!nonSliderSteps.includes(steps.current as Step) && ( - <AnimatePresence - mode="wait" - initial={false} - > + <AnimatePresence mode="wait" initial={false}> <motion.div - className={motionDivClassName.join(' ')} + className={motionDivClassName.join(" ")} key={pathname} initial="pageInitial" animate="pageAnimate" exit="pageExit" variants={{ pageInitial: { - transform: 'translateX(100vw)', - width: '100%', + transform: "translateX(100vw)", + width: "100%", }, pageAnimate: { - transform: 'translateX(0)', - width: '100%', + transform: "translateX(0)", + width: "100%", }, pageExit: { - transform: 'translateX(-200vw)', + transform: "translateX(-200vw)", opacity: 0, - width: '100%', + width: "100%", }, }} transition={{ duration: animationDuration, - ease: 'linear', + ease: "linear", }} > <PalmistryContainerWrapper currentStep={steps.current as Step}> - {steps.current === Step.Welcome && <StepWelcome/>} + {steps.current === Step.Welcome && <StepWelcome />} - {steps.current === Step.Gender && <StepGender/>} + {steps.current === Step.Gender && <StepGender />} - {steps.current === Step.Birthdate && <StepBirthdate/>} + {steps.current === Step.Birthdate && <StepBirthdate />} - {steps.current === Step.PalmsHold && <StepPalmsHold/>} + {steps.current === Step.PalmsHold && <StepPalmsHold />} - {steps.current === Step.Wish && <StepWish/>} + {steps.current === Step.Wish && <StepWish />} - {steps.current === Step.RelationshipStatus && <StepRelationshipStatus/>} + {steps.current === Step.RelationshipStatus && ( + <StepRelationshipStatus /> + )} - {steps.current === Step.ResonatedElement && <StepResonatedElement/>} + {steps.current === Step.ResonatedElement && ( + <StepResonatedElement /> + )} - {steps.current === Step.ColorYouLike && <StepColorYouLike/>} + {steps.current === Step.ColorYouLike && <StepColorYouLike />} - {steps.current === Step.Decisions && <StepDecisions/>} + {steps.current === Step.Decisions && <StepDecisions />} - {steps.current === Step.GuidancePlan && <StepGuidancePlan/>} + {steps.current === Step.GuidancePlan && <StepGuidancePlan />} - {steps.current === Step.PersonalStatement && <StepPersonalStatement/>} + {steps.current === Step.PersonalStatement && ( + <StepPersonalStatement /> + )} - {steps.current === Step.ScanInfo && <StepScanInfo/>} + {steps.current === Step.ScanInfo && <StepScanInfo />} - {steps.current === Step.Upload && <StepUpload onOpenModal={setModalIsOpen}/>} + {steps.current === Step.Upload && ( + <StepUpload onOpenModal={setModalIsOpen} /> + )} - {steps.current === Step.ScanPhoto && <StepScanPhoto/>} + {steps.current === Step.ScanPhoto && <StepScanPhoto />} - {steps.current === Step.Email && <StepEmail/>} + {steps.current === Step.Email && <StepEmail />} - {steps.current === Step.SubscriptionPlan && <StepSubscriptionPlan/>} + {steps.current === Step.SubscriptionPlan && ( + <StepSubscriptionPlan /> + )} - {steps.current === Step.Paywall && <StepPaywall/>} + {steps.current === Step.Paywall && <StepPaywall />} </PalmistryContainerWrapper> </motion.div> </AnimatePresence> diff --git a/src/env.d.ts b/src/env.d.ts new file mode 100644 index 0000000..d15030a --- /dev/null +++ b/src/env.d.ts @@ -0,0 +1,8 @@ +interface ImportMetaEnv { + AURA_API_HOST: string, + AURA_DAPI_HOST: string, + AURA_SITE_HOST: string, + AURA_PREFIX: string, + AURA_OPEN_AI_HOST: number, + AURA_OPEN_AI_PREFIX: string +} \ No newline at end of file diff --git a/src/hooks/palmistry/use-steps.ts b/src/hooks/palmistry/use-steps.ts index 467e0bb..520f38d 100644 --- a/src/hooks/palmistry/use-steps.ts +++ b/src/hooks/palmistry/use-steps.ts @@ -126,6 +126,7 @@ export default function useSteps() { setIsInited(true); setStoredValues(buildStoredValues(getFromStorage)); setFirstUnpassedStep(getFromStorage('firstUnpassedStep') as Step | null); + // eslint-disable-next-line react-hooks/exhaustive-deps }, []); const getStoredValue = (key: Step) => { @@ -168,13 +169,19 @@ export default function useSteps() { navigate(`/palmistry/${getNextStep(choice)}`); } - function goFirstUnpassedStep() { + function goFirstUnpassedStep(queryParameters = "") { if (!firstUnpassedStep) { - navigate(`/palmistry/${sortedList[0]}`); + navigate(`/palmistry/${sortedList[0]}?${queryParameters}`); return; } - navigate(`/palmistry/${firstUnpassedStep}`); + + + navigate(`/palmistry/${firstUnpassedStep}?${queryParameters}`, { + state: { + from: pathname, + }, + }); } function saveCurrent(value: string) { diff --git a/src/hooks/payment/useSinglePayment.ts b/src/hooks/payment/useSinglePayment.ts index 4cc3b80..df40126 100644 --- a/src/hooks/payment/useSinglePayment.ts +++ b/src/hooks/payment/useSinglePayment.ts @@ -1,4 +1,4 @@ -import { SinglePayment, useApi } from "@/api"; +import { ApiError, SinglePayment, useApi } from "@/api"; import { User } from "@/api/resources/User"; import { AuthToken } from "@/api/types"; import { productUrls } from "@/data/products"; @@ -135,7 +135,18 @@ export const useSinglePayment = () => { }, return_url: returnUrl, }, + }).catch((error: ApiError<SinglePayment.ResponsePost>) => { + if (error.responseData && "message" in error.responseData) { + setError({ error: error.responseData.message }); + } else { + setError({ error: error.message }); + } + setIsLoading(false); + return; }); + if (typeof paymentIntent !== "object") { + return; + } if ("message" in paymentIntent) { setError({ error: paymentIntent.message }); setIsLoading(false); diff --git a/src/init.tsx b/src/init.tsx index c8573fb..33318eb 100755 --- a/src/init.tsx +++ b/src/init.tsx @@ -8,7 +8,6 @@ import { store } from "./store"; import { AuthProvider } from "./auth"; import { ApiContext, createApi } from "./api"; import { LegalContext, buildLegal } from "./legal"; -import { PaymentContext } from "./payment"; import { getClientLocale, buildResources, fallbackLng } from "./locales"; import App from "./components/App"; @@ -35,7 +34,6 @@ const init = async () => { .use(initReactI18next) .use(new ReactPostprocessor()) .init(options); - window.Chargebee.init(config.chargebee); const isProduction = import.meta.env.MODE === "production"; @@ -72,11 +70,7 @@ const init = async () => { <ApiContext.Provider value={api}> <AuthProvider> <LegalContext.Provider value={legal}> - <PaymentContext.Provider - value={window.Chargebee.getInstance()} - > - <App /> - </PaymentContext.Provider> + <App /> </LegalContext.Provider> </AuthProvider> </ApiContext.Provider> diff --git a/src/payment/PaymentContext.ts b/src/payment/PaymentContext.ts deleted file mode 100644 index cb406b2..0000000 --- a/src/payment/PaymentContext.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { createContext } from 'react' -import { ChargebeeInstance } from '@chargebee/chargebee-js-types' - -export const PaymentContext = createContext<ChargebeeInstance>({} as ChargebeeInstance) diff --git a/src/payment/index.ts b/src/payment/index.ts deleted file mode 100644 index 7258f41..0000000 --- a/src/payment/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from './PaymentContext' -export * from './usePayment' -export * from './types' diff --git a/src/payment/types.ts b/src/payment/types.ts deleted file mode 100644 index 36398ef..0000000 --- a/src/payment/types.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { PaymentIntent } from '@chargebee/chargebee-js-types' - -interface Handler { - handlePayment: () => Promise<PaymentIntent> - setPaymentIntent: (paymentIntent: PaymentIntent) => void -} - -export interface GooglePayButtonOptions { - buttonColor: 'default' | 'black' | 'white' - buttonType: 'long' | 'short' | 'book' | 'buy' | 'checkout' | 'donate' | 'order' | 'pay' | 'plain' | 'subscribe' - buttonSizeMode: 'static' | 'fill' - buttonLocale: string -} - -export interface PaymentOptions { - requestPayerEmail: boolean - requestBillingAddress: boolean - requestShippingAddress: boolean -} - -export interface ApplePayButtonOptions { - locale: string - buttonColor: 'black' | 'white' | 'white-outline' - buttonType: 'add-money' | 'book' | 'buy' | 'check-out' | 'continue' | 'contribute' | 'donate' | 'order' | 'pay' | 'plain' | 'reload' | 'rent' | 'set-up' | 'subscribe' | 'support' | 'tip' | 'top-up' -} - -interface ApplePay extends Handler { - canMakePayments: () => boolean - mountPaymentButton: (selector: string, options?: ApplePayButtonOptions) => Promise<void> -} - -interface GooglePay extends Handler { - getPaymentIntent: () => PaymentIntent - updatePaymentIntent: (paymentIntent: PaymentIntent) => void - mountPaymentButton: ( - selector: string, - buttonOptions?: GooglePayButtonOptions, - paymentOptions?: PaymentOptions - ) => Promise<void> -} - -export type ApplePayHandler = ApplePay | null -export type GooglePayHandler = GooglePay | null diff --git a/src/payment/usePayment.ts b/src/payment/usePayment.ts deleted file mode 100644 index c8af806..0000000 --- a/src/payment/usePayment.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { useContext, useEffect, useState } from 'react' -import { PaymentContext } from './PaymentContext' -import { ApplePayHandler, GooglePayHandler } from './types' - -export const usePayment = () => { - const chargebee = useContext(PaymentContext) - const [googlePay, setGooglePay] = useState<GooglePayHandler>(null) - const [applePay, setApplePay] = useState<ApplePayHandler>(null) - - useEffect(() => { - Promise.all([ - chargebee.load('google-pay'), - chargebee.load('apple-pay'), - ]).then(([googlePay, applePay]) => { - setGooglePay(googlePay) - setApplePay(applePay) - }) - }, [chargebee]) - - return { chargebee, googlePay, applePay } -} diff --git a/src/routes.ts b/src/routes.ts index 94f3ad3..574f62b 100755 --- a/src/routes.ts +++ b/src/routes.ts @@ -1,17 +1,14 @@ import type { UserStatus } from "./types"; -const isProduction = import.meta.env.MODE === "production"; +const environments = import.meta.env const host = ""; -export const apiHost = "https://api-web.aura.wit.life"; -const dApiHost = isProduction - ? "https://api.aura.witapps.us" - : "https://dev.api.aura.witapps.us"; -// const dApiHost = "https://d.api.witapps.us"; -const siteHost = "https://aura.wit.life"; -const prefix = "api/v1"; -const openAIHost = " https://api.openai.com"; -const openAiPrefix = "v1"; +export const apiHost = environments.AURA_API_HOST; +const dApiHost = environments.AURA_DAPI_HOST +const siteHost = environments.AURA_SITE_HOST +const prefix = environments.AURA_PREFIX; +const openAIHost = environments.AURA_OPEN_AI_HOST; +const openAiPrefix = environments.AURA_OPEN_AI_PREFIX; const routes = { client: { diff --git a/src/types.ts b/src/types.ts index e124ca4..c664802 100644 --- a/src/types.ts +++ b/src/types.ts @@ -1,11 +1,3 @@ -import { Chargebee } from "@chargebee/chargebee-js-types"; - -declare global { - interface Window { - Chargebee: typeof Chargebee; - } -} - export enum EDirectionOnboarding { LEFT = "left", RIGHT = "right", diff --git a/vite.config.ts b/vite.config.ts index 09f8f7b..89b458a 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -19,4 +19,6 @@ export default defineConfig({ path: '/hmr/', }, }, + envDir: "./environments", + envPrefix: "AURA_" })