📈 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
better revenue UI
Blue Mouse261f2c5c6488
diff --git a/web/app/pages/Project/Settings/tabs/DangerZone.tsx b/web/app/pages/Project/Settings/tabs/DangerZone.tsxindex 7b204b24c..5892e7ab1 100644--- a/web/app/pages/Project/Settings/tabs/DangerZone.tsx+++ b/web/app/pages/Project/Settings/tabs/DangerZone.tsx@@ -27,9 +27,7 @@ const DangerZone = ({ setShowTransfer, setShowReset, setShowDelete, isDeleting,<div className='text-sm font-medium text-gray-900 dark:text-gray-50'>{t('project.settings.transfer')}</div>- <p className='mt-0.5 text-sm text-gray-500 dark:text-gray-400'>- {t('project.settings.transferShort', { defaultValue: 'Transfer ownership to another user.' })}- </p>+ <p className='mt-0.5 text-sm text-gray-500 dark:text-gray-400'>{t('project.settings.transferShort')}</p><div className='mt-3'><Button onClick={() => setShowTransfer(true)} semiDanger semiSmall>{t('project.settings.transfer')}@@ -44,9 +42,7 @@ const DangerZone = ({ setShowTransfer, setShowReset, setShowDelete, isDeleting,<RotateCcw className='mt-0.5 h-5 w-5 text-orange-600 dark:text-orange-400' /><div className='ml-3 flex-1'><div className='text-sm font-medium text-gray-900 dark:text-gray-50'>{t('project.settings.reset')}</div>- <p className='mt-0.5 text-sm text-gray-500 dark:text-gray-400'>- {t('project.settings.resetShort', { defaultValue: 'Clear analytics data. Keep project settings.' })}- </p>+ <p className='mt-0.5 text-sm text-gray-500 dark:text-gray-400'>{t('project.settings.resetShort')}</p><div className='mt-3'><Button onClick={() => !setResetting && setShowReset(true)} loading={isDeleting} semiDanger semiSmall>{t('project.settings.reset')}@@ -61,9 +57,7 @@ const DangerZone = ({ setShowTransfer, setShowReset, setShowDelete, isDeleting,<Trash2Icon className='mt-0.5 h-5 w-5 text-red-700 dark:text-red-500' strokeWidth={1.5} /><div className='ml-3 flex-1'><div className='text-sm font-medium text-gray-900 dark:text-gray-50'>{t('project.settings.delete')}</div>- <p className='mt-0.5 text-sm text-gray-500 dark:text-gray-400'>- {t('project.settings.deleteShort', { defaultValue: 'Permanently delete the project and all data.' })}- </p>+ <p className='mt-0.5 text-sm text-gray-500 dark:text-gray-400'>{t('project.settings.deleteShort')}</p><div className='mt-3'><Button onClick={() => !isDeleting && setShowDelete(true)} loading={isDeleting} danger semiSmall>{t('project.settings.delete')}diff --git a/web/app/pages/Project/Settings/tabs/Revenue.tsx b/web/app/pages/Project/Settings/tabs/Revenue.tsxindex d2fe9066a..4a1463339 100644--- a/web/app/pages/Project/Settings/tabs/Revenue.tsx+++ b/web/app/pages/Project/Settings/tabs/Revenue.tsx@@ -1,4 +1,5 @@-import { ArrowUpRightIcon, CheckCircle2Icon, LinkIcon } from 'lucide-react'+import { CheckCircleIcon } from '@heroicons/react/24/solid'+import { ArrowUpRightIcon, ExternalLinkIcon } from 'lucide-react'import React, { useCallback, useEffect, useState } from 'react'import { useTranslation } from 'react-i18next'import { toast } from 'sonner'@@ -7,6 +8,9 @@ import { connectRevenue, disconnectRevenue, getRevenueStatus, updateRevenueCurreimport type { RevenueProvider } from '~/api'import { DOCS_URL } from '~/lib/constants'import Button from '~/ui/Button'+import PaddleSVG from '~/ui/icons/Paddle'+import StripeSVG from '~/ui/icons/Stripe'+import Input from '~/ui/Input'import Loader from '~/ui/Loader'import Select from '~/ui/Select'import { Text } from '~/ui/Text'@@ -42,27 +46,22 @@ interface ProviderConfig {icon: React.ReactNodeapiKeyPrefix: stringapiKeyCreateUrl?: string+ docsUrl?: string}const PROVIDER_CONFIG: Record<RevenueProvider, ProviderConfig> = {stripe: {label: 'Stripe',- icon: (- <div className='flex h-5 w-5 items-center justify-center rounded bg-[#635BFF] text-xs font-bold text-white'>- S- </div>- ),+ icon: <StripeSVG className='h-5 w-5' />,apiKeyPrefix: 'rk_live_',apiKeyCreateUrl: STRIPE_API_KEY_CREATE_URL,+ docsUrl: `${DOCS_URL}/revenue/stripe`,},paddle: {label: 'Paddle',- icon: (- <div className='flex h-5 w-5 items-center justify-center rounded bg-[#FFCE00] text-xs font-bold text-[#0E1B2B]'>- P- </div>- ),+ icon: <PaddleSVG className='h-5 w-5' />,apiKeyPrefix: 'pdl_live_',+ docsUrl: `${DOCS_URL}/revenue/paddle`,},}@@ -173,191 +172,163 @@ const Revenue = ({ projectId }: Props) => {const providerConfig = PROVIDER_CONFIG[selectedProvider]const isConnected = Boolean(status?.connected)- const isSelectedProviderConnected = isConnected && status?.provider === selectedProvider- const apiKeyCreateUrl = providerConfig.apiKeyCreateUrl- const apiKeyPlaceholder = `${providerConfig.apiKeyPrefix}********************`-+ const connectedProvider = status?.provider as RevenueProvider | undefined+ const connectedProviderConfig = connectedProvider ? PROVIDER_CONFIG[connectedProvider] : nullconst selectedProviderItem = PROVIDER_ITEMS.find((p) => p.id === selectedProvider)return (<div><Text as='h3' size='lg' weight='bold' colour='primary'>- {t('project.settings.revenue.title', { defaultValue: 'Revenue tracking' })}+ {t('project.settings.revenue.title')}</Text>- <Text as='p' size='sm' colour='muted' className='mt-1'>- {t('project.settings.revenue.description', {- defaultValue: 'Connect your payment provider to track revenue alongside your analytics.',- })}+ <Text as='p' size='sm' colour='secondary' className='mt-1'>+ {t('project.settings.revenue.description')}</Text>- <div className='mt-6 space-y-3'>- {/* Step 1: Pick provider */}- <div className='rounded-md border border-gray-200 p-3 dark:border-gray-800'>- <div className='flex items-start'>- <div className='flex h-5 w-5 shrink-0 items-center justify-center rounded-full bg-indigo-100 text-xs font-semibold text-indigo-600 dark:bg-indigo-900/50 dark:text-indigo-400'>- 1- </div>- <div className='ml-3 flex-1'>- <Text as='div' size='sm' weight='medium' colour='primary'>- {t('project.settings.revenue.pickProvider', { defaultValue: 'Pick your payment provider' })}- </Text>- <div className='mt-2'>- <Select- className='max-w-xs'- title={providerConfig.label}- items={PROVIDER_ITEMS}- labelExtractor={(item) => (- <div className='flex items-center gap-2'>- {item.icon}- <span>{item.label}</span>- </div>- )}- keyExtractor={(item) => item.id}- iconExtractor={(item) => item.icon}- selectedItem={selectedProviderItem}- onSelect={(item: ProviderItem) => {- setSelectedProvider(item.id)- }}- />- </div>- </div>- </div>+ {/* Provider Connection Card */}+ <div className='mt-4 rounded-lg border border-gray-200 p-4 dark:border-slate-800'>+ <div className='flex items-center gap-2'>+ <div>{connectedProviderConfig?.icon || providerConfig.icon}</div>+ <Text as='h4' size='base' weight='medium' colour='primary'>+ {t('project.settings.revenue.paymentProvider')}+ </Text>+ {isConnected ? (+ <Text size='sm' colour='success' className='ml-auto flex items-center gap-1'>+ <CheckCircleIcon className='h-4 w-4' />+ {t('common.connected')}+ </Text>+ ) : null}</div>- {/* Step 2: Connect */}- <div className='rounded-md border border-gray-200 p-3 dark:border-gray-800'>- <div className='flex items-start'>- <div className='flex h-5 w-5 shrink-0 items-center justify-center rounded-full bg-indigo-100 text-xs font-semibold text-indigo-600 dark:bg-indigo-900/50 dark:text-indigo-400'>- 2- </div>- <div className='ml-3 flex-1'>- <Text as='div' size='sm' weight='medium' colour='primary'>- {t('project.settings.revenue.connectProvider', {- defaultValue: `Connect ${providerConfig.label}`,- provider: providerConfig.label,- })}- </Text>- <Text as='p' size='sm' colour='muted' className='mt-0.5'>- {t('project.settings.revenue.createApiKey', { defaultValue: 'Create a' })}{' '}- {apiKeyCreateUrl ? (- <a- href={apiKeyCreateUrl}- target='_blank'- rel='noreferrer noopener'- className='inline-flex items-center text-indigo-600 underline decoration-dashed hover:decoration-solid dark:text-indigo-400'- >- {t('project.settings.revenue.restrictedApiKey', { defaultValue: 'restricted API key' })}- <ArrowUpRightIcon className='ml-0.5 h-3 w-3' />- </a>- ) : (- <span className='font-medium'>- {t('project.settings.revenue.restrictedApiKey', { defaultValue: 'restricted API key' })}- </span>- )}{' '}- {t('project.settings.revenue.pasteBelow', {- defaultValue: '(do not change any permissions) and paste it below.',- })}+ {isConnected && connectedProviderConfig ? (+ <div className='mt-4 flex flex-col gap-4'>+ <Input+ label={t('project.settings.revenue.connectedTo')}+ value={connectedProviderConfig.label}+ className='lg:w-1/2'+ disabled+ />++ {status?.lastSyncAt ? (+ <Text as='p' size='sm' colour='muted'>+ {t('project.settings.revenue.lastSync', { date: new Date(status.lastSyncAt).toLocaleString() })}{' '}</Text>-- {isConnected && !isSelectedProviderConnected && status?.provider ? (- <Text as='p' size='sm' colour='warning' className='mt-2'>- {t('project.settings.revenue.replaceWarning', {- defaultValue: `This project is connected to ${PROVIDER_CONFIG[status.provider as RevenueProvider]?.label || status.provider}. Connecting ${providerConfig.label} will replace the existing connection.`,- })}- </Text>- ) : null}-- <div className='mt-3'>- <input- type='text'- value={apiKey}- onChange={(e) => setApiKey(e.target.value)}- placeholder={apiKeyPlaceholder}- className='block w-full max-w-md rounded-md border border-gray-300 bg-white px-3 py-2 text-sm text-gray-900 shadow-sm placeholder:text-gray-400 focus:border-indigo-500 focus:ring-indigo-500 dark:border-gray-700 dark:bg-slate-800 dark:text-gray-50 dark:placeholder:text-gray-500'- disabled={isConnecting}- />- </div>-- {!isSelectedProviderConnected ? (- <Button className='mt-3' onClick={handleConnect} loading={isConnecting} primary regular>- {t('common.connect')}- </Button>- ) : (- <div className='mt-3 flex flex-wrap items-center gap-3'>- <div className='flex items-center gap-1.5'>- <CheckCircle2Icon className='h-4 w-4 text-green-600 dark:text-green-400' />- <Text as='span' size='sm' colour='success' weight='medium'>- {t('common.connected')}- {status?.lastSyncAt ? ` · ${new Date(status.lastSyncAt).toLocaleString()}` : ''}- </Text>- </div>- <Button onClick={handleDisconnect} loading={isDisconnecting} semiDanger semiSmall>- {t('common.disconnect')}- </Button>+ ) : null}++ <Button+ type='button'+ className='max-w-max'+ onClick={handleDisconnect}+ loading={isDisconnecting}+ semiDanger+ regular+ >+ {t('common.disconnect')}+ </Button>+ </div>+ ) : (+ <div className='mt-4 flex flex-col gap-4'>+ <Select+ label={t('project.settings.revenue.provider')}+ className='lg:w-1/2'+ title={providerConfig.label}+ items={PROVIDER_ITEMS}+ labelExtractor={(item) => (+ <div className='flex items-center gap-2'>+ {item.icon}+ <Text>{item.label}</Text></div>)}+ keyExtractor={(item) => item.id}+ selectedItem={selectedProviderItem}+ onSelect={(item: ProviderItem) => {+ setSelectedProvider(item.id)+ }}+ />++ <div>+ <Input+ name='apiKey'+ type='password'+ label={t('project.settings.revenue.apiKey')}+ hint={+ providerConfig.apiKeyCreateUrl ? (+ <Text as='span' size='sm' colour='muted'>+ {t('project.settings.revenue.createApiKeyHint')}{' '}+ <a+ href={providerConfig.apiKeyCreateUrl}+ target='_blank'+ rel='noreferrer noopener'+ className='inline-flex items-center font-medium text-indigo-600 hover:underline dark:text-indigo-400'+ >+ {providerConfig.label} {t('project.settings.revenue.dashboard')}+ <ArrowUpRightIcon className='ml-0.5 h-3 w-3' />+ </a>+ </Text>+ ) : undefined+ }+ value={apiKey}+ className='lg:w-1/2'+ placeholder={`${providerConfig.apiKeyPrefix}********************`}+ onChange={(e) => setApiKey(e.target.value)}+ disabled={isConnecting}+ /></div>- </div>- </div>- {/* Step 3: Link with traffic */}- <div className='rounded-md border border-gray-200 p-3 dark:border-gray-800'>- <div className='flex items-start'>- <div className='flex h-5 w-5 shrink-0 items-center justify-center rounded-full bg-indigo-100 text-xs font-semibold text-indigo-600 dark:bg-indigo-900/50 dark:text-indigo-400'>- 3- </div>- <div className='ml-3 flex-1'>- <Text as='div' size='sm' weight='medium' colour='primary'>- {t('project.settings.revenue.linkWithTraffic', { defaultValue: 'Link with traffic' })}- </Text>- <Text as='p' size='sm' colour='muted' className='mt-0.5'>- {t('project.settings.revenue.linkDescription', {- defaultValue: 'Make revenue-driven decisions by linking your revenue data with your traffic data.',- })}{' '}- <a- href={DOCS_URL}- target='_blank'- rel='noreferrer noopener'- className='inline-flex items-center text-indigo-600 underline decoration-dashed hover:decoration-solid dark:text-indigo-400'- >- {t('project.settings.revenue.getStarted', { defaultValue: 'Get started here' })}- <LinkIcon className='ml-0.5 h-3 w-3' />- </a>{' '}- <span className='text-gray-400 dark:text-gray-500'>- {t('project.settings.revenue.timeEstimate', { defaultValue: '(takes ~2 minutes)' })}- </span>- </Text>- </div>+ <Button type='button' className='max-w-max' onClick={handleConnect} loading={isConnecting} primary regular>+ {t('common.connect')}+ </Button></div>- </div>+ )}</div>- {/* Currency settings */}- <div className='mt-6'>- <Text as='h4' size='sm' weight='medium' colour='primary'>- {t('project.settings.revenue.currency', { defaultValue: 'Currency' })}+ {/* Currency Settings */}+ <div className='mt-6 rounded-lg border border-gray-200 p-4 dark:border-slate-800'>+ <Text as='h4' size='base' weight='medium' colour='primary'>+ {t('project.settings.revenue.currency')}</Text>- <Text as='p' size='sm' colour='muted' className='mt-0.5'>- {t('project.settings.revenue.currencyDescription', {- defaultValue: 'Used for all revenue reporting and payment conversion.',- })}+ <Text as='p' size='sm' colour='secondary' className='mt-1'>+ {t('project.settings.revenue.currencyDescription')}</Text>- <div className='mt-2 flex flex-wrap items-center gap-3'>++ <div className='mt-4 flex flex-col gap-4'><Select- className='max-w-xs'+ className='lg:w-1/2'title={`${selectedCurrency} – ${SUPPORTED_CURRENCIES.find((c) => c.code === selectedCurrency)?.name} (${SUPPORTED_CURRENCIES.find((c) => c.code === selectedCurrency)?.symbol})`}items={SUPPORTED_CURRENCIES}keyExtractor={(item) => item.code}labelExtractor={(item) => `${item.code} – ${item.name} (${item.symbol})`}+ selectedItem={SUPPORTED_CURRENCIES.find((c) => c.code === selectedCurrency)}onSelect={(item: { code: string; name: string; symbol: string }) =>setSelectedCurrency(item.code as 'USD' | 'EUR' | 'GBP')}/>- <Button onClick={handleCurrencyChange} loading={isSavingCurrency} primary regular disabled={!isConnected}>+ <Button+ type='button'+ className='max-w-max'+ onClick={handleCurrencyChange}+ loading={isSavingCurrency}+ primary+ regular+ disabled={!isConnected}+ >{t('common.save')}</Button></div></div>++ {/* Documentation Link */}+ <div className='mt-6'>+ <a+ href={DOCS_URL}+ target='_blank'+ rel='noreferrer noopener'+ className='inline-flex items-center text-sm font-medium text-indigo-600 hover:underline dark:text-indigo-400'+ >+ <ExternalLinkIcon className='mr-1.5 h-4 w-4' />+ {t('project.settings.revenue.learnMore')}+ </a>+ </div></div>)}diff --git a/web/app/ui/icons/Paddle.tsx b/web/app/ui/icons/Paddle.tsxnew file mode 100644index 000000000..dc6650f89--- /dev/null+++ b/web/app/ui/icons/Paddle.tsx@@ -0,0 +1,29 @@+import { useId } from 'react'++const PaddleSVG = ({ className }: { className?: string }) => {+ const id = useId()++ return (+ <svg className={className} viewBox='0 0 100 100' fill='none'>+ <g clipPath={`url(#${id})`}>+ <rect width='100' height='100' fill='white' />+ <path d='M100 0H0V100H100V0Z' fill='#FFDD35' />+ <path+ d='M18.9297 41.5476V38.7972C22.3173 38.7972 25.5679 37.4582 27.9715 35.0788C30.367 32.7075 31.714 29.4731 31.7221 26.1016H34.2789C34.2789 29.4811 35.6179 32.7155 38.0215 35.095C40.4251 37.4905 43.6837 38.8294 47.0713 38.8214V41.5718C43.6837 41.5718 40.4332 42.9107 38.0295 45.2901C35.634 47.6615 34.287 50.8959 34.2789 54.2674H31.7221C31.7221 50.8878 30.3831 47.6534 27.9795 45.274C25.5679 42.8865 22.3173 41.5476 18.9297 41.5476Z'+ fill='#040F11'+ />+ <path+ d='M31.7229 21.3354H53.7184C64.4621 21.3354 72.1407 28.9576 72.1407 40.1288C72.1407 51.2999 64.4701 58.9221 53.7184 58.9221H31.7148V90.9273H40.9179V67.0525H53.7103C69.1644 67.0525 81.3438 54.9618 81.3438 40.1288C81.3438 25.2957 69.1644 13.2051 53.7103 13.2051H31.7148V21.3354H31.7229Z'+ fill='#040F11'+ />+ </g>+ <defs>+ <clipPath id={id}>+ <rect width='100' height='100' fill='white' />+ </clipPath>+ </defs>+ </svg>+ )+}++export default PaddleSVGdiff --git a/web/app/ui/icons/Stripe.tsx b/web/app/ui/icons/Stripe.tsxnew file mode 100644index 000000000..65f47c881--- /dev/null+++ b/web/app/ui/icons/Stripe.tsx@@ -0,0 +1,15 @@+const StripeSVG = ({ className }: { className?: string }) => (+ <svg className={className} viewBox='0 0 32 32' fill='#5f6bea'>+ <path+ d='M111.328 15.602c0-4.97-2.415-8.9-7.013-8.9s-7.423 3.924-7.423 8.863c0 5.85 3.32 8.8 8.036 8.8 2.318 0 4.06-.528 5.377-1.26V19.22a10.246 10.246 0 0 1-4.764 1.075c-1.9 0-3.556-.67-3.774-2.943h9.497a39.64 39.64 0 0 0 .063-1.748zm-9.606-1.835c0-2.186 1.35-3.1 2.56-3.1s2.454.906 2.454 3.1zM89.4 6.712a5.434 5.434 0 0 0-3.801 1.509l-.254-1.208h-4.27v22.64l4.85-1.032v-5.488a5.434 5.434 0 0 0 3.444 1.265c3.472 0 6.64-2.792 6.64-8.957.003-5.66-3.206-8.73-6.614-8.73zM88.23 20.1a2.898 2.898 0 0 1-2.288-.906l-.03-7.2a2.928 2.928 0 0 1 2.315-.96c1.775 0 2.998 2 2.998 4.528.003 2.593-1.198 4.546-2.995 4.546zM79.25.57l-4.87 1.035v3.95l4.87-1.032z'+ fillRule='evenodd'+ />+ <path d='M74.38 7.035h4.87V24.04h-4.87z' />+ <path+ d='M69.164 8.47l-.302-1.434h-4.196V24.04h4.848V12.5c1.147-1.5 3.082-1.208 3.698-1.017V7.038c-.646-.232-2.913-.658-4.048 1.43zm-9.73-5.646L54.698 3.83l-.02 15.562c0 2.87 2.158 4.993 5.038 4.993 1.585 0 2.756-.302 3.405-.643v-3.95c-.622.248-3.683 1.138-3.683-1.72v-6.9h3.683V7.035h-3.683zM46.3 11.97c0-.758.63-1.05 1.648-1.05a10.868 10.868 0 0 1 4.83 1.25V7.6a12.815 12.815 0 0 0-4.83-.888c-3.924 0-6.557 2.056-6.557 5.488 0 5.37 7.375 4.498 7.375 6.813 0 .906-.78 1.186-1.863 1.186-1.606 0-3.68-.664-5.307-1.55v4.63a13.461 13.461 0 0 0 5.307 1.117c4.033 0 6.813-1.992 6.813-5.485 0-5.796-7.417-4.76-7.417-6.943zM13.88 9.515c0-1.37 1.14-1.9 2.982-1.9A19.661 19.661 0 0 1 25.6 9.876v-8.27A23.184 23.184 0 0 0 16.862.001C9.762.001 5 3.72 5 9.93c0 9.716 13.342 8.138 13.342 12.326 0 1.638-1.4 2.146-3.37 2.146-2.905 0-6.657-1.202-9.6-2.802v8.378A24.353 24.353 0 0 0 14.973 32C22.27 32 27.3 28.395 27.3 22.077c0-10.486-13.42-8.613-13.42-12.56z'+ fillRule='evenodd'+ />+ </svg>+)++export default StripeSVGdiff --git a/web/public/locales/en.json b/web/public/locales/en.jsonindex a9c5efe79..6cb5d499f 100644--- a/web/public/locales/en.json+++ b/web/public/locales/en.json@@ -1494,6 +1494,9 @@"barChart": "Bar chart","lineChart": "Line chart","settings": {+ "transferShort": "Transfer ownership to another user.",+ "resetShort": "Clear analytics data. Keep project settings.",+ "deleteShort": "Permanently delete the project and all data.","organisation": "Organisation","shields": "Shields","access": "Access settings",@@ -1525,14 +1528,20 @@"connectPaddle": "Connect Paddle","connectPaddleDesc": "Enter your Paddle API key to start tracking revenue. We will automatically sync transactions from your Paddle account.","paddleDocsLink": "Learn how to get your Paddle API key",+ "paymentProvider": "Payment provider",+ "provider": "Provider","apiKey": "API Key","apiKeyHint": "Your Paddle API key for read-only access to transactions.",+ "createApiKeyHint": "Create a restricted API key from your",+ "dashboard": "dashboard","apiKeyRequired": "API key is required","currency": "Reporting Currency",+ "currencyDescription": "Used for all revenue reporting and payment conversion.","currencyHint": "All revenue will be converted and displayed in this currency.","currencyUpdated": "Reporting currency updated",+ "learnMore": "Learn how to link revenue with traffic sources","connected": "Revenue tracking connected",- "connectedTo": "Connected to {{provider}}",+ "connectedTo": "Connected to","disconnected": "Revenue tracking disconnected","synced": "Synced {{count}} transactions","syncNow": "Sync now",