📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
added legacy tiers logic
Blue Mouse471c6f736394
diff --git a/src/pages/MainPage/Pricing.jsx b/src/pages/MainPage/Pricing.jsxindex 163c5bfc1..5e11f1285 100644--- a/src/pages/MainPage/Pricing.jsx+++ b/src/pages/MainPage/Pricing.jsx@@ -6,6 +6,7 @@ import { CheckIcon } from '@heroicons/react/24/solid'import _map from 'lodash/map'import _isNil from 'lodash/isNil'import _findIndex from 'lodash/findIndex'+import _isEmpty from 'lodash/isEmpty'import { Trans } from 'react-i18next'import cx from 'clsx'@@ -18,6 +19,27 @@ import { authActions } from 'redux/actions/auth'import { authMe } from 'api'import routes from 'routes'+const getNonStandardTiers = (t) => ({+ free: {+ name: t('pricing.free'),+ planCode: 'free',+ priceMonthly: PLAN_LIMITS.free.priceMonthly,+ priceYearly: PLAN_LIMITS.free.priceYearly,+ legacy: PLAN_LIMITS.free.legacy,+ includedFeatures: [+ t('pricing.tiers.upToXVMo', { amount: PLAN_LIMITS.free.monthlyUsageLimit.toLocaleString() }),+ t('pricing.tiers.upToXWebsites', { amount: PLAN_LIMITS.free.maxProjects }),+ // t('pricing.tiers.xMoDataRetention', { amount: 3 }),+ t('pricing.tiers.xAlertsSingular', { amount: PLAN_LIMITS.free.maxAlerts }),+ t('pricing.tiers.dataExports'),+ t('pricing.tiers.dataOwnership'),+ t('pricing.tiers.noBanners'),+ t('pricing.tiers.dashboards'),+ t('pricing.tiers.reports'),+ ],+ },+})+const getTiers = (t) => [{name: t('pricing.tiers.hobby'),@@ -89,6 +111,102 @@ const BillingFrequency = {yearly: 'yearly',}+const PricingItem = ({+ tier, user, t, authenticated, billingFrequency, onPlanChange, downgradeHandler, downgrade,+ planCodeLoading, planCodeID, userPlancodeID,+}) => (+ <div+ key={tier.name}+ className={cx('relative border rounded-2xl shadow-sm divide-y bg-[#F5F5F5] dark:bg-[#212936] divide-gray-200 dark:divide-gray-500', {+ 'border-indigo-400': user.planCode === tier.planCode,+ 'border-gray-200 dark:border-gray-500': user.planCode !== tier.planCode,+ })}+ >+ {user.planCode === tier.planCode && (+ <div className='absolute inset-x-0 top-0 transform translate-y-px'>+ <div className='flex justify-center transform -translate-y-1/2'>+ <span className='inline-flex rounded-full bg-indigo-600 px-4 py-1 text-sm font-semibold tracking-wider uppercase text-white'>+ {t('pricing.currentPlan')}+ </span>+ </div>+ </div>+ )}+ <div className='p-6 border-none'>+ <h2 className='text-lg leading-6 font-semibold text-[#4D4D4D] dark:text-gray-50 text-center'>{tier.name}</h2>+ {tier.mostPopular && !authenticated && (+ <p className='absolute top-0 py-1.5 px-4 bg-indigo-600 rounded-full text-xs font-semibold uppercase tracking-wide text-white transform -translate-y-1/2'>+ {t('pricing.mostPopular')}+ </p>+ )}+ <p className='mt-4 text-center'>+ {tier.planCode === 'free' ? (+ <span className='text-4xl font-bold text-[#4D4D4D] dark:text-gray-50'>+ {t('pricing.free')}+ </span>+ ) : (+ <>+ <span className='text-4xl font-bold text-[#4D4D4D] dark:text-gray-50'>+ $+ {billingFrequency === BillingFrequency.monthly ? tier.priceMonthly : tier.priceYearly}+ </span>+ + <span className='text-base font-medium text-gray-500 dark:text-gray-400'>+ /+ {t(billingFrequency === BillingFrequency.monthly ? 'pricing.perMonth' : 'pricing.perYear')}+ </span>+ </>+ )}+ </p>+ {authenticated ? (+ <span+ onClick={() => downgrade ? downgradeHandler(tier) : onPlanChange(tier)}+ className={cx('inline-flex items-center justify-center mt-8 w-full rounded-md py-2 text-sm font-semibold text-white text-center select-none', {+ 'bg-indigo-600 hover:bg-indigo-700 cursor-pointer': planCodeLoading === null && (tier.planCode !== user.planCode || (user.billingFrequency !== billingFrequency && user.planCode !== 'free')),+ 'bg-indigo-400 cursor-default': planCodeLoading !== null || (tier.planCode === user.planCode && (user.billingFrequency === billingFrequency || user.planCode === 'free')),+ })}+ >+ {planCodeLoading === tier.planCode && (+ <Spin />+ )}+ {planCodeID > userPlancodeID+ ? t('pricing.upgrade')+ : downgrade+ ? t('pricing.downgrade')+ : (user.billingFrequency === billingFrequency || user.planCode === 'free')+ ? t('pricing.yourPlan')+ : billingFrequency === BillingFrequency.monthly+ ? t('pricing.switchToMonthly')+ : t('pricing.switchToYearly')}+ </span>+ ) : (+ <Link+ className='mt-8 block w-full bg-indigo-600 rounded-md py-2 text-sm font-semibold text-white text-center hover:bg-indigo-700'+ to={routes.signup}+ aria-label={t('titles.signup')}+ >+ {tier.planCode === 'free' ? t('common.getStarted') : t('pricing.upgrade')}+ </Link>+ )}+ </div>+ <div className='px-6 border-none'>+ <hr className='w-full mx-auto border border-gray-300 dark:border-gray-600' />+ </div>+ <div className='pt-6 pb-8 px-6 border-none'>+ <h3 className='text-xs font-medium text-gray-900 dark:text-gray-50 tracking-wide uppercase'>+ {t('pricing.whatIncl')}+ </h3>+ <ul className='mt-6 space-y-4'>+ {_map(tier.includedFeatures, (feature) => (+ <li key={feature} className='flex space-x-3'>+ <CheckIcon className='flex-shrink-0 h-5 w-5 text-green-500' aria-hidden='true' />+ <span className='text-sm text-gray-500 dark:text-gray-200'>{feature}</span>+ </li>+ ))}+ </ul>+ </div>+ </div>+)+const Pricing = ({ t, language }) => {const dispatch = useDispatch()const { authenticated, user } = useSelector(state => state.auth)@@ -99,6 +217,10 @@ const Pricing = ({ t, language }) => {const [showDowngradeModal, setShowDowngradeModal] = useState(false)const [billingFrequency, setBillingFrequency] = useState(user?.billingFrequency || BillingFrequency.monthly)const tiers = getTiers(t)+ const nonStandardTiers = getNonStandardTiers(t)+ const isNonStandardTier = authenticated && !_isEmpty(nonStandardTiers[user.planCode])++ console.log(isNonStandardTier, user.planCode)useEffect(() => {const lastEventHandler = async (data) => {@@ -218,101 +340,41 @@ const Pricing = ({ t, language }) => {</div></div><div className='mt-6 space-y-4 sm:mt-10 sm:space-y-0 sm:grid sm:grid-cols-2 sm:gap-6 lg:max-w-4xl lg:mx-auto xl:max-w-none xl:mx-0 xl:grid-cols-4'>+ {isNonStandardTier && (+ <PricingItem+ key={user.planCode}+ tier={nonStandardTiers[user.planCode]}+ user={user}+ t={t}+ billingFrequency={billingFrequency}+ onPlanChange={onPlanChange}+ downgrade={false}+ downgradeHandler={downgradeHandler}+ planCodeLoading={planCodeLoading}+ authenticated={authenticated}+ planCodeID={user.planCode}+ userPlancodeID={user.planCode}+ />+ )}{_map(tiers, (tier) => {const planCodeID = _findIndex(tiers, (el) => el.planCode === tier.planCode)const downgrade = planCodeID < userPlancodeIDreturn (- <div- key={tier.name}- className={cx('relative border rounded-2xl shadow-sm divide-y bg-[#F5F5F5] dark:bg-[#212936] divide-gray-200 dark:divide-gray-500', {- 'border-indigo-400': user.planCode === tier.planCode,- 'border-gray-200 dark:border-gray-500': user.planCode !== tier.planCode,- })}- >- {user.planCode === tier.planCode && (- <div className='absolute inset-x-0 top-0 transform translate-y-px'>- <div className='flex justify-center transform -translate-y-1/2'>- <span className='inline-flex rounded-full bg-indigo-600 px-4 py-1 text-sm font-semibold tracking-wider uppercase text-white'>- {t('pricing.currentPlan')}- </span>- </div>- </div>- )}- <div className='p-6 border-none'>- <h2 className='text-lg leading-6 font-semibold text-[#4D4D4D] dark:text-gray-50 text-center'>{tier.name}</h2>- {tier.mostPopular && !authenticated && (- <p className='absolute top-0 py-1.5 px-4 bg-indigo-600 rounded-full text-xs font-semibold uppercase tracking-wide text-white transform -translate-y-1/2'>- {t('pricing.mostPopular')}- </p>- )}- <p className='mt-4 text-center'>- {tier.planCode === 'free' ? (- <span className='text-4xl font-bold text-[#4D4D4D] dark:text-gray-50'>- {t('pricing.free')}- </span>- ) : (- <>- <span className='text-4xl font-bold text-[#4D4D4D] dark:text-gray-50'>- $- {billingFrequency === BillingFrequency.monthly ? tier.priceMonthly : tier.priceYearly}- </span>- - <span className='text-base font-medium text-gray-500 dark:text-gray-400'>- /- {t(billingFrequency === BillingFrequency.monthly ? 'pricing.perMonth' : 'pricing.perYear')}- </span>- </>- )}- </p>- {authenticated ? (- <span- onClick={() => downgrade ? downgradeHandler(tier) : onPlanChange(tier)}- className={cx('inline-flex items-center justify-center mt-8 w-full rounded-md py-2 text-sm font-semibold text-white text-center select-none', {- 'bg-indigo-600 hover:bg-indigo-700 cursor-pointer': planCodeLoading === null && (tier.planCode !== user.planCode || (user.billingFrequency !== billingFrequency && user.planCode !== 'free')),- 'bg-indigo-400 cursor-default': planCodeLoading !== null || (tier.planCode === user.planCode && (user.billingFrequency === billingFrequency || user.planCode === 'free')),- })}- >- {planCodeLoading === tier.planCode && (- <Spin />- )}- {planCodeID > userPlancodeID- ? t('pricing.upgrade')- : downgrade- ? t('pricing.downgrade')- : (user.billingFrequency === billingFrequency || user.planCode === 'free')- ? t('pricing.yourPlan')- : billingFrequency === BillingFrequency.monthly- ? t('pricing.switchToMonthly')- : t('pricing.switchToYearly')}- </span>- ) : (- <Link- className='mt-8 block w-full bg-indigo-600 rounded-md py-2 text-sm font-semibold text-white text-center hover:bg-indigo-700'- to={routes.signup}- aria-label={t('titles.signup')}- >- {tier.planCode === 'free' ? t('common.getStarted') : t('pricing.upgrade')}- </Link>- )}- </div>- <div className='px-6 border-none'>- <hr className='w-full mx-auto border border-gray-300 dark:border-gray-600' />- </div>- <div className='pt-6 pb-8 px-6 border-none'>- <h3 className='text-xs font-medium text-gray-900 dark:text-gray-50 tracking-wide uppercase'>- {t('pricing.whatIncl')}- </h3>- <ul className='mt-6 space-y-4'>- {_map(tier.includedFeatures, (feature) => (- <li key={feature} className='flex space-x-3'>- <CheckIcon className='flex-shrink-0 h-5 w-5 text-green-500' aria-hidden='true' />- <span className='text-sm text-gray-500 dark:text-gray-200'>{feature}</span>- </li>- ))}- </ul>- </div>- </div>+ <PricingItem+ key={tier.planCode}+ tier={tier}+ user={user}+ t={t}+ billingFrequency={billingFrequency}+ onPlanChange={onPlanChange}+ downgrade={downgrade}+ downgradeHandler={downgradeHandler}+ planCodeLoading={planCodeLoading}+ authenticated={authenticated}+ planCodeID={planCodeID}+ userPlancodeID={userPlancodeID}+ />)})}</div>