📈 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
Use Text component instead of raw text elements
Blue Mouse90128abd46d5
diff --git a/web/app/components/ExitIntentPopup.tsx b/web/app/components/ExitIntentPopup.tsxindex b05fc700a..bd4bd2829 100644--- a/web/app/components/ExitIntentPopup.tsx+++ b/web/app/components/ExitIntentPopup.tsx@@ -5,6 +5,7 @@ import { Link } from '~/ui/Link'import { useAuth } from '~/providers/AuthProvider'import { Badge } from '~/ui/Badge'+import { Text } from '~/ui/Text'import { trackCustom } from '~/utils/analytics'import { getCookie, setCookie } from '~/utils/cookie'@@ -119,13 +120,23 @@ export default function ExitIntentPopup({/></div>- <h2 className='mb-4 max-w-3xl text-[2.5rem]/10 font-semibold tracking-tight text-pretty text-gray-950 lg:text-5xl dark:text-gray-200'>+ <Text+ as='h2'+ weight='semibold'+ tracking='tight'+ className='mb-4 max-w-3xl text-[2.5rem]/10 text-pretty lg:text-5xl'+ >{t('exitIntentPopup.title')}- </h2>+ </Text>- <p className='mb-8 text-xl leading-relaxed text-gray-950 dark:text-gray-200'>+ <Text+ as='p'+ size='xl'+ colour='secondary'+ className='mb-8 leading-relaxed'+ >{t('exitIntentPopup.desc')}- </p>+ </Text><Linkto='/'diff --git a/web/app/components/Footer/index.tsx b/web/app/components/Footer/index.tsxindex ae9c27eb5..0516c71b4 100644--- a/web/app/components/Footer/index.tsx+++ b/web/app/components/Footer/index.tsx@@ -35,6 +35,7 @@ import _map from 'lodash/map'import React, { memo, type FC } from 'react'import { Trans, useTranslation } from 'react-i18next'import { Link } from '~/ui/Link'+import { Text } from '~/ui/Text'import { changeLanguage } from '~/i18n'import {@@ -673,9 +674,14 @@ const Footer = ({ showDBIPMessage }: FooterProps) => {{/* Column 1: Products + Free Tools */}<div className='space-y-8'><div>- <h3 className='mb-4 text-sm font-semibold text-gray-200'>+ <Text+ as='h3'+ size='sm'+ weight='semibold'+ className='mb-4 text-gray-200'+ >{t('footer.products')}- </h3>+ </Text><ul className='space-y-2.5'>{_map(navigation.products,@@ -696,9 +702,14 @@ const Footer = ({ showDBIPMessage }: FooterProps) => {</div><div>- <h3 className='mb-4 text-sm font-semibold text-gray-200'>+ <Text+ as='h3'+ size='sm'+ weight='semibold'+ className='mb-4 text-gray-200'+ >{t('footer.freeTools')}- </h3>+ </Text><ul className='space-y-2.5'>{_map(navigation.freeTools,@@ -722,9 +733,14 @@ const Footer = ({ showDBIPMessage }: FooterProps) => {{/* Column 2: Resources + Comparisons */}<div className='space-y-8'><div>- <h3 className='mb-4 text-sm font-semibold text-gray-200'>+ <Text+ as='h3'+ size='sm'+ weight='semibold'+ className='mb-4 text-gray-200'+ >{t('footer.resources')}- </h3>+ </Text><ul className='space-y-2.5'>{_map(navigation.resources,@@ -745,9 +761,14 @@ const Footer = ({ showDBIPMessage }: FooterProps) => {</div><div>- <h3 className='mb-4 text-sm font-semibold text-gray-200'>+ <Text+ as='h3'+ size='sm'+ weight='semibold'+ className='mb-4 text-gray-200'+ >{t('footer.comparisons')}- </h3>+ </Text><ul className='space-y-2.5'>{_map(navigation.comparisons,@@ -771,9 +792,14 @@ const Footer = ({ showDBIPMessage }: FooterProps) => {{/* Column 3: Company + Community */}<div className='space-y-8'><div>- <h3 className='mb-4 text-sm font-semibold text-gray-200'>+ <Text+ as='h3'+ size='sm'+ weight='semibold'+ className='mb-4 text-gray-200'+ >{t('footer.company')}- </h3>+ </Text><ul className='space-y-2.5'>{_map(navigation.company,@@ -794,9 +820,14 @@ const Footer = ({ showDBIPMessage }: FooterProps) => {</div><div>- <h3 className='mb-4 text-sm font-semibold text-gray-200'>+ <Text+ as='h3'+ size='sm'+ weight='semibold'+ className='mb-4 text-gray-200'+ >{t('footer.community')}- </h3>+ </Text><ul className='space-y-2.5'>{_map(navigation.community,@@ -821,7 +852,7 @@ const Footer = ({ showDBIPMessage }: FooterProps) => {<div><SwetrixLogo theme='dark' />- <p className='mt-4 max-w-72 text-sm text-gray-200'>+ <Text as='p' size='sm' className='mt-4 max-w-72 text-gray-200'>{isSelfhosted ? (<Transt={t}@@ -840,7 +871,7 @@ const Footer = ({ showDBIPMessage }: FooterProps) => {) : (t('footer.description'))}- </p>+ </Text>{isSelfhosted ? null : (<div className='mt-2 flex text-sm text-gray-200'>diff --git a/web/app/components/Header/index.tsx b/web/app/components/Header/index.tsxindex fd31d77d3..7835dc906 100644--- a/web/app/components/Header/index.tsx+++ b/web/app/components/Header/index.tsx@@ -60,6 +60,7 @@ import { useAuth } from '~/providers/AuthProvider'import { useTheme } from '~/providers/ThemeProvider'import Flag from '~/ui/Flag'import SwetrixLogo from '~/ui/icons/SwetrixLogo'+import { Text } from '~/ui/Text'import routes from '~/utils/routes'import { cn } from '~/utils/generic'import { BannerManager } from './banners'@@ -203,9 +204,13 @@ const SolutionsMenu = () => {</a>)}- <p className='mt-1 text-xs text-gray-600 dark:text-neutral-100'>+ <Text+ as='p'+ size='xs'+ className='mt-1 text-gray-600 dark:text-neutral-100'+ >{item.description}- </p>+ </Text></div></div>))}@@ -812,9 +817,13 @@ const Header = ({ refPage, transparent }: HeaderProps) => {</a>)}- <p className='mt-1 text-xs text-gray-600 dark:text-neutral-100'>+ <Text+ as='p'+ size='xs'+ className='mt-1 text-gray-600 dark:text-neutral-100'+ >{item.description}- </p>+ </Text></div></DisclosureButton>))}diff --git a/web/app/components/marketing/DitchGoogle.tsx b/web/app/components/marketing/DitchGoogle.tsxindex 33426fd5d..3dced280d 100644--- a/web/app/components/marketing/DitchGoogle.tsx+++ b/web/app/components/marketing/DitchGoogle.tsx@@ -1,6 +1,7 @@import { ArrowRightIcon, CheckIcon } from '@phosphor-icons/react'import { Trans, useTranslation } from 'react-i18next'import { Link } from '~/ui/Link'+import { Text } from '~/ui/Text'import routes from '~/utils/routes'@@ -15,20 +16,29 @@ export const DitchGoogle = () => {</div><div className='rounded-xl p-8 backdrop-blur-xl sm:p-12 lg:p-16'><div className='mx-auto max-w-4xl'>- <h2 className='mb-6 text-4xl font-bold tracking-tight text-slate-900 sm:text-5xl lg:text-6xl dark:text-white'>+ <Text+ as='h2'+ size='4xl'+ weight='bold'+ tracking='tight'+ className='mb-6 sm:text-5xl lg:text-6xl'+ ><Transt={t}i18nKey='main.timeToDitchGoogleAnalytics'components={{- colour: (- <span className='bg-gradient-to-r from-red-600 to-orange-600 bg-clip-text text-transparent' />- ),+ colour: <span className='text-red-600 dark:text-red-400' />,}}/>- </h2>- <p className='mx-auto mb-10 max-w-2xl text-xl leading-relaxed text-slate-900 dark:text-slate-200'>+ </Text>+ <Text+ as='p'+ size='xl'+ colour='secondary'+ className='mx-auto mb-10 max-w-2xl leading-relaxed'+ >{t('main.whyDitch')}- </p>+ </Text><div className='mb-8 flex flex-col items-center justify-center gap-4 sm:flex-row'><Linkto={routes.signup}diff --git a/web/app/components/marketing/FAQ.tsx b/web/app/components/marketing/FAQ.tsxindex f7244f9c5..4cb8ca561 100644--- a/web/app/components/marketing/FAQ.tsx+++ b/web/app/components/marketing/FAQ.tsx@@ -6,6 +6,7 @@ import sanitizeHtml from 'sanitize-html'import { DOCS_URL, PLAN_LIMITS, TRIAL_DAYS, DISCORD_URL } from '~/lib/constants'import { FAQ as FAQAccordion } from '~/ui/FAQ'+import { Text } from '~/ui/Text'import routesPath from '~/utils/routes'interface FAQProps {@@ -133,9 +134,15 @@ const FAQ = ({ includeGAQuestions = false }: FAQProps) => {return (<section className='relative mx-auto max-w-5xl px-2 py-14 lg:px-8'>- <h2 className='text-center text-3xl font-extrabold text-slate-900 sm:text-4xl dark:text-white'>+ <Text+ as='h2'+ size='3xl'+ weight='bold'+ tracking='tight'+ className='text-center sm:text-4xl'+ >{t('main.faq.title')}- </h2>+ </Text><div className='mt-8 flex flex-col'><FAQAccordion items={formattedItems} withPadding /></div>diff --git a/web/app/components/pricing/BillingPricing.tsx b/web/app/components/pricing/BillingPricing.tsxindex fa19da3fb..55c97913d 100644--- a/web/app/components/pricing/BillingPricing.tsx+++ b/web/app/components/pricing/BillingPricing.tsx@@ -27,6 +27,7 @@ import Button from '~/ui/Button'import Loader from '~/ui/Loader'import Modal from '~/ui/Modal'import { Switch } from '~/ui/Switch'+import { Text } from '~/ui/Text'import Tooltip from '~/ui/Tooltip'import { cn } from '~/utils/generic'import routes from '~/utils/routes'@@ -369,9 +370,9 @@ const BillingPricing = ({<><div className='rounded-xl border border-gray-200 p-4 sm:p-6 dark:border-white/10'><div className='mb-3 flex items-center justify-between'>- <h2 className='text-2xl font-bold text-black dark:text-gray-50'>+ <Text as='h2' size='2xl' weight='bold' tracking='tight'>{t('common.billing')}- </h2>+ </Text><buttontype='button'onClick={toggleBillingFrequency}@@ -483,9 +484,9 @@ const BillingPricing = ({<span className='text-base font-medium'>{t('pricing.overXEvents', { amount: formatEventsLong(20000000) })}</span>- <p className='text-sm group-hover:underline'>+ <Text as='p' size='sm' className='group-hover:underline'>{t('pricing.contactUs')}- </p>+ </Text></a></div></div>@@ -528,7 +529,7 @@ const BillingPricing = ({<>{subUpdatePreview === null ? <Loader /> : null}{subUpdatePreview === false ? (- <p className='whitespace-pre-line'>+ <Text as='p' className='whitespace-pre-line'><Transt={t}i18nKey='billing.previewLoadingError'@@ -543,12 +544,16 @@ const BillingPricing = ({),}}/>- </p>+ </Text>) : null}{subUpdatePreview && typeof subUpdatePreview === 'object' ? (<div>- <h2 className='text-base font-bold'>{t('billing.dueNow')}</h2>- <p className='text-sm'>{t('billing.dueNowDescription')}</p>+ <Text as='h2' size='base' weight='bold'>+ {t('billing.dueNow')}+ </Text>+ <Text as='p' size='sm'>+ {t('billing.dueNowDescription')}+ </Text><div className='mt-2 overflow-hidden ring-1 ring-black/5 md:rounded-lg'><table className='200 min-w-full divide-y divide-gray-300 dark:divide-slate-700'><thead className='bg-gray-50 dark:bg-slate-900'>@@ -590,7 +595,7 @@ const BillingPricing = ({</table></div>{(subUpdatePreview as any).immediatePayment.amount < 0 ? (- <p className='mt-2 italic'>+ <Text as='p' className='mt-2 italic'>{t('billing.negativePayment', {currency: (subUpdatePreview as any).immediatePayment.symbol,@@ -611,11 +616,11 @@ const BillingPricing = ({nextPaymentAmount: (subUpdatePreview as any).nextPayment.amount,})}- </p>+ </Text>) : null}- <h2 className='mt-5 text-base font-bold'>+ <Text as='h2' size='base' weight='bold' className='mt-5'>{t('billing.nextPayment')}- </h2>+ </Text><div className='mt-2 overflow-hidden ring-1 ring-black/5 md:rounded-lg'><table className='200 min-w-full divide-y divide-gray-300 dark:divide-slate-700'><thead className='bg-gray-50 dark:bg-slate-900'>diff --git a/web/app/components/pricing/MarketingPricing.tsx b/web/app/components/pricing/MarketingPricing.tsxindex f9727597d..a21595c98 100644--- a/web/app/components/pricing/MarketingPricing.tsx+++ b/web/app/components/pricing/MarketingPricing.tsx@@ -15,6 +15,7 @@ import {import { DEFAULT_METAINFO, Metainfo } from '~/lib/models/Metainfo'import { useAuth } from '~/providers/AuthProvider'import { Switch } from '~/ui/Switch'+import { Text } from '~/ui/Text'import Tooltip from '~/ui/Tooltip'import routes from '~/utils/routes'@@ -69,14 +70,26 @@ const MarketingPricing = ({<div className='rounded-xl bg-slate-900 py-16 sm:py-20 dark:bg-slate-900/50'><div className='mx-auto grid max-w-7xl grid-cols-1 gap-6 px-4 sm:px-6 lg:grid-cols-12 lg:gap-10 lg:px-8'><div className='col-span-12 lg:col-span-5'>- <h2 className='text-3xl font-extrabold tracking-tight text-white sm:text-4xl'>+ <Text+ as='h2'+ size='3xl'+ weight='bold'+ tracking='tight'+ colour='inherit'+ className='text-white sm:text-4xl'+ >{t('pricing.title')}- </h2>- <p className='mt-2 max-w-md text-sm text-gray-100'>+ </Text>+ <Text+ as='p'+ size='sm'+ colour='inherit'+ className='mt-2 max-w-md text-gray-100'+ >{t('pricing.adv', {amount: TRIAL_DAYS,})}- </p>+ </Text><div className='mt-8 space-y-3'>{[@@ -233,9 +246,9 @@ const MarketingPricing = ({amount: formatEventsLong(20000000),})}</span>- <p className='text-sm group-hover:underline'>+ <Text as='p' size='sm' className='group-hover:underline'>{t('pricing.contactUs')}- </p>+ </Text></a></div></div>diff --git a/web/app/modals/AnnotationModal.tsx b/web/app/modals/AnnotationModal.tsxindex 2a44da8bd..06b11c31d 100644--- a/web/app/modals/AnnotationModal.tsx+++ b/web/app/modals/AnnotationModal.tsx@@ -6,6 +6,7 @@ import Alert from '~/ui/Alert'import Button from '~/ui/Button'import Datepicker from '~/ui/Datepicker'import Modal from '~/ui/Modal'+import { Text } from '~/ui/Text'import Textarea from '~/ui/Textarea'import { cn } from '~/utils/generic'@@ -121,10 +122,16 @@ const AnnotationModal = ({message={<div className='space-y-4'><div>- <label className='mb-1 block text-sm font-medium text-gray-700 dark:text-gray-200'>+ <Text+ as='label'+ size='sm'+ weight='medium'+ colour='secondary'+ className='mb-1 block'+ >{t('modals.annotation.date')}<span className='text-red-600'>*</span>- </label>+ </Text><Datepickermode='single'value={date ? [new Date(date + 'T00:00:00')] : []}@@ -160,9 +167,9 @@ const AnnotationModal = ({disabled={!allowedToManage}rows={3}/>- <p className='mt-1 text-right text-xs text-gray-500 dark:text-gray-400'>+ <Text as='p' size='xs' colour='muted' className='mt-1 text-right'>{text.length}/{MAX_ANNOTATION_LENGTH}- </p>+ </Text></div><Alert variant='info'>{t('modals.annotation.warning')}</Alert></div>diff --git a/web/app/modals/ViewProjectHotkeys.tsx b/web/app/modals/ViewProjectHotkeys.tsxindex 8bac9874a..b6f089d2c 100644--- a/web/app/modals/ViewProjectHotkeys.tsx+++ b/web/app/modals/ViewProjectHotkeys.tsx@@ -6,6 +6,7 @@ import { useTranslation } from 'react-i18next'import { Period } from '~/lib/constants'import { Badge } from '~/ui/Badge'import Modal from '~/ui/Modal'+import { Text } from '~/ui/Text'interface ViewProjectHotkeysProps {onClose: () => void@@ -67,21 +68,25 @@ const getHotkeys = (t: TFunction) => ({const HotkeysList = ({ title, hotkeys }: HotkeysListProps) => (<div className='mt-2 first:mt-0'><table className='min-w-full divide-y divide-gray-300 dark:divide-gray-700'>+ <caption className='sr-only'>{title}</caption><thead><tr>- <th className='pb-2 text-left text-base font-semibold text-gray-900 dark:text-gray-50'>- {title}+ <th scope='colgroup' colSpan={2} className='pb-2 text-left'>+ <Text as='span' size='base' weight='semibold'>+ {title}+ </Text></th>- <th /></tr></thead><tbody className='divide-y divide-gray-200 dark:divide-gray-800'>{_map(hotkeys, (action, label) => (<tr key={label}>- <td className='py-2 pr-3 pl-4 text-left text-sm whitespace-nowrap text-gray-900 sm:pl-0 dark:text-gray-50'>- {label}+ <td className='py-2 pr-3 pl-4 text-left whitespace-nowrap sm:pl-0'>+ <Text as='span' size='sm'>+ {label}+ </Text></td>- <td className='py-2 pr-3 pl-4 text-left text-sm whitespace-nowrap text-gray-900 sm:pl-0 dark:text-gray-50'>+ <td className='py-2 pr-3 pl-4 text-left whitespace-nowrap sm:pl-0'><Badge colour='slate' label={action} /></td></tr>diff --git a/web/app/pages/Auth/CreateNewPassword/CreateNewPassword.tsx b/web/app/pages/Auth/CreateNewPassword/CreateNewPassword.tsxindex 664350b3c..16321a69a 100644--- a/web/app/pages/Auth/CreateNewPassword/CreateNewPassword.tsx+++ b/web/app/pages/Auth/CreateNewPassword/CreateNewPassword.tsx@@ -28,9 +28,14 @@ const CreateNewPassword = () => {<div><div className='flex min-h-min-footer flex-col bg-gray-50 px-4 py-10 sm:px-6 lg:px-8 dark:bg-slate-950'><div className='sm:mx-auto sm:w-full sm:max-w-md'>- <h2 className='text-center text-2xl leading-9 font-bold text-gray-900 dark:text-gray-50'>+ <Text+ as='h2'+ size='2xl'+ weight='bold'+ className='text-center leading-9'+ >{t('auth.recovery.title')}- </h2>+ </Text></div><div className='mt-10 sm:mx-auto sm:w-full sm:max-w-[480px]'><div className='bg-white px-6 py-12 shadow-xs ring-1 ring-gray-200 sm:rounded-lg sm:px-12 dark:bg-slate-950 dark:ring-slate-800'>diff --git a/web/app/pages/Auth/ForgotPassword/ForgotPassword.tsx b/web/app/pages/Auth/ForgotPassword/ForgotPassword.tsxindex bed809d4c..46c5f7c6d 100644--- a/web/app/pages/Auth/ForgotPassword/ForgotPassword.tsx+++ b/web/app/pages/Auth/ForgotPassword/ForgotPassword.tsx@@ -40,9 +40,14 @@ const ForgotPassword = () => {<div><div className='flex min-h-min-footer flex-col bg-gray-50 px-4 py-10 sm:px-6 lg:px-8 dark:bg-slate-950'><div className='sm:mx-auto sm:w-full sm:max-w-md'>- <h2 className='text-center text-2xl leading-9 font-bold text-gray-900 dark:text-gray-50'>+ <Text+ as='h2'+ size='2xl'+ weight='bold'+ className='text-center leading-9'+ >{t('titles.recovery')}- </h2>+ </Text></div><div className='mt-10 sm:mx-auto sm:w-full sm:max-w-[480px]'><div className='bg-white px-6 py-12 shadow-xs ring-1 ring-gray-200 sm:rounded-lg sm:px-12 dark:bg-slate-950 dark:ring-slate-800'>diff --git a/web/app/pages/Auth/Signup/InvitationSignup.tsx b/web/app/pages/Auth/Signup/InvitationSignup.tsxindex e37948975..a4d13147d 100644--- a/web/app/pages/Auth/Signup/InvitationSignup.tsx+++ b/web/app/pages/Auth/Signup/InvitationSignup.tsx@@ -100,7 +100,7 @@ const InvitationSignup = () => {</div><Alert variant='info' className='mb-6'>- <p className='font-semibold'>+ <Text as='p' weight='semibold'><Transt={t}i18nKey='auth.invitation.invitedToJoin'@@ -109,7 +109,7 @@ const InvitationSignup = () => {target: <span className='font-bold' />,}}/>- </p>+ </Text><Transt={t}i18nKey='auth.invitation.invitedByAs'diff --git a/web/app/pages/Blog/Post.tsx b/web/app/pages/Blog/Post.tsxindex 60e7ccdda..072d3f69b 100644--- a/web/app/pages/Blog/Post.tsx+++ b/web/app/pages/Blog/Post.tsx@@ -7,6 +7,7 @@ import { useLoaderData, useLocation } from 'react-router'import ExitIntentPopup from '~/components/ExitIntentPopup'import NotFound from '~/pages/NotFound'import ArticleNav from '~/pages/Blog/ArticleNav'+import { Text } from '~/ui/Text'import { trackPageview } from '~/utils/analytics'interface Post {@@ -73,9 +74,14 @@ export default function PostSlug() {</dd></dl></div>- <h1 className='inline-block max-w-3xl text-[2.5rem]/10 tracking-tight text-pretty text-gray-950 max-lg:font-medium lg:text-6xl dark:text-gray-200'>+ <Text+ as='h1'+ weight='bold'+ tracking='tight'+ className='inline-block max-w-3xl text-[2.5rem]/10 text-pretty max-lg:font-medium lg:text-6xl'+ >{post.title}- </h1>+ </Text><div className='mt-6'><ul className='-mx-5 -mt-6 flex flex-wrap text-sm leading-6'><li className='mt-6 flex items-center gap-4 px-5 font-medium whitespace-nowrap'>diff --git a/web/app/pages/Contact/index.tsx b/web/app/pages/Contact/index.tsxindex 356e76d55..67acc4da5 100644--- a/web/app/pages/Contact/index.tsx+++ b/web/app/pages/Contact/index.tsx@@ -9,6 +9,7 @@ import {DOCS_URL,BOOK_A_CALL_URL,} from '~/lib/constants'+import { Text } from '~/ui/Text'interface PanelProps {href: string@@ -23,13 +24,16 @@ const Panel = ({ href, title, description }: PanelProps) => (rel='noopener noreferrer'className='relative block rounded-2xl border border-gray-300/80 bg-gray-100 p-10 transition-colors hover:bg-gray-200 dark:border-slate-900/80 dark:bg-slate-800/80 dark:hover:bg-slate-900'>- <ArrowSquareOutIcon className='absolute top-5 right-5 h-5 w-5 text-gray-900 dark:text-gray-100' />- <h3 className='text-lg leading-7 font-semibold text-gray-900 dark:text-gray-100'>+ <ArrowSquareOutIcon+ aria-hidden='true'+ className='absolute top-5 right-5 size-5 text-gray-900 dark:text-gray-100'+ />+ <Text as='h3' size='lg' weight='semibold' className='leading-7'>{title}- </h3>- <p className='mt-3 text-sm leading-6 text-gray-600 dark:text-gray-200'>+ </Text>+ <Text as='p' size='sm' colour='secondary' className='mt-3 leading-6'>{description}- </p>+ </Text></a>)@@ -39,10 +43,10 @@ const Contact = () => {return (<div className='min-h-min-footer bg-gray-50 dark:bg-slate-950'><div className='mx-auto px-4 pt-12 pb-16 whitespace-pre-line sm:px-6 md:w-4/5 lg:px-8'>- <h1 className='text-4xl font-bold text-gray-900 dark:text-gray-50'>+ <Text as='h1' size='4xl' weight='bold' className='tracking-tight'>{t('titles.contact')}- </h1>- <div className='mt-2 text-lg text-gray-900 dark:text-gray-50'>+ </Text>+ <Text as='div' size='lg' className='mt-2'><Transt={t}i18nKey='contact.description'@@ -68,7 +72,7 @@ const Contact = () => {),}}/>- </div>+ </Text><div className='mt-8 grid grid-cols-1 gap-6 md:grid-cols-2 lg:col-span-2 lg:gap-8'><Panelhref={DOCS_URL}diff --git a/web/app/pages/ErrorTracking/index.tsx b/web/app/pages/ErrorTracking/index.tsxindex 641c607c7..1b3dc56a1 100644--- a/web/app/pages/ErrorTracking/index.tsx+++ b/web/app/pages/ErrorTracking/index.tsx@@ -8,6 +8,7 @@ import { DitchGoogle } from '~/components/marketing/DitchGoogle'import MarketingPricing from '~/components/pricing/MarketingPricing'import { ERROR_TRACKING_LIVE_DEMO_URL } from '~/lib/constants'import { useTheme } from '~/providers/ThemeProvider'+import { Text } from '~/ui/Text'import routesPath from '~/utils/routes'import { LogoCloud } from '~/components/marketing/LogoCloud'import { FeedbackDual } from '~/routes/_index'@@ -30,20 +31,24 @@ const ErrorTracking = () => {<Header transparent /><section className='mx-auto max-w-7xl px-4 pt-10 pb-5 sm:px-3 lg:grid lg:grid-cols-12 lg:gap-8 lg:px-6 lg:pt-20 xl:px-8'><div className='z-20 col-span-6 flex flex-col items-start'>- <h1 className='max-w-5xl text-left text-5xl font-semibold tracking-tight text-pretty text-slate-900 sm:leading-none lg:mt-6 lg:text-6xl xl:text-7xl dark:text-white'>+ <Text+ as='h1'+ size='4xl'+ weight='semibold'+ tracking='tight'+ className='max-w-5xl text-left text-pretty sm:text-5xl sm:leading-none lg:mt-6 lg:text-6xl xl:text-7xl'+ ><Transt={t}i18nKey='errors.slogan'components={{- span: (- <span className='bg-gradient-to-r from-red-700 to-red-700 bg-clip-text text-transparent dark:from-red-600 dark:to-red-400' />- ),+ span: <span className='text-red-700 dark:text-red-400' />,}}/>- </h1>- <p className='mt-4 max-w-2xl text-left text-lg text-slate-900 dark:text-gray-50'>+ </Text>+ <Text as='p' size='lg' className='mt-4 max-w-2xl text-left'>{t('errors.description')}- </p>+ </Text><div className='mt-8 flex flex-col items-stretch sm:flex-row sm:items-center'><Linkto={routesPath.signup}@@ -116,10 +121,10 @@ const ErrorTracking = () => {<LogoCloud /><div className='mx-auto mt-12 max-w-7xl bg-white px-4 pb-16 whitespace-pre-line dark:bg-slate-950'>- <h2 className='text-4xl font-extrabold text-slate-900 dark:text-white'>+ <Text as='h2' size='4xl' weight='bold' tracking='tight'>{t('errors.fast.title')}- </h2>- <p className='mt-6 text-lg text-gray-900 dark:text-gray-50'>+ </Text>+ <Text as='p' size='lg' className='mt-6'><Transt={t}i18nKey='errors.fast.desc'@@ -147,28 +152,40 @@ const ErrorTracking = () => {),}}/>- </p>- <ul className='mt-2 list-inside list-disc text-lg text-gray-900 dark:text-gray-50'>+ </Text>+ <ul className='mt-2 list-inside list-disc'>{_map(t('errors.fast.list', { returnObjects: true }), (item) => (- <li key={item} className='mb-2'>+ <Text as='li' size='lg' key={item} className='mb-2'>{item}- </li>+ </Text>))}</ul>- <h2 className='mt-10 text-4xl font-extrabold text-slate-900 dark:text-white'>+ <Text+ as='h2'+ size='4xl'+ weight='bold'+ tracking='tight'+ className='mt-10'+ >{t('errors.track.title')}- </h2>- <p className='mt-6 text-lg text-gray-900 dark:text-gray-50'>+ </Text>+ <Text as='p' size='lg' className='mt-6'>{t('errors.track.desc')}- </p>+ </Text>- <h2 className='mt-10 text-4xl font-extrabold text-slate-900 dark:text-white'>+ <Text+ as='h2'+ size='4xl'+ weight='bold'+ tracking='tight'+ className='mt-10'+ >{t('performance.privacy.title')}- </h2>- <p className='mt-6 text-lg text-gray-900 dark:text-gray-50'>+ </Text>+ <Text as='p' size='lg' className='mt-6'>{t('performance.privacy.desc')}- </p>+ </Text></div><MarketingPricing />diff --git a/web/app/pages/Landings/Marketers.tsx b/web/app/pages/Landings/Marketers.tsxindex 270ce2bd9..b982d69a8 100644--- a/web/app/pages/Landings/Marketers.tsx+++ b/web/app/pages/Landings/Marketers.tsx@@ -13,6 +13,7 @@ import {LIVE_DEMO_URL,} from '~/lib/constants'import { useTheme } from '~/providers/ThemeProvider'+import { Text } from '~/ui/Text'import routesPath from '~/utils/routes'const Marketers = () => {@@ -71,20 +72,29 @@ const Marketers = () => {<div className='relative mx-auto min-h-[740px] pt-10 pb-5 sm:px-3 lg:px-6 lg:pt-24 xl:px-8'><div className='relative z-20 flex flex-col content-between justify-center'><div className='relative mx-auto flex flex-col px-4 text-left'>- <h1 className='mx-auto max-w-4xl text-center text-4xl font-extrabold text-slate-900 sm:text-5xl sm:leading-none md:text-5xl lg:text-5xl xl:text-6xl xl:leading-[110%] dark:text-white'>+ <Text+ as='h1'+ size='4xl'+ weight='bold'+ tracking='tight'+ className='mx-auto max-w-4xl text-center text-balance sm:text-5xl sm:leading-none xl:text-6xl xl:leading-[110%]'+ ><Transt={t}i18nKey='marketers.slogan'components={{- span: (- <span className='bg-gradient-to-r from-indigo-700 to-pink-700 bg-clip-text text-transparent dark:from-indigo-600 dark:to-indigo-400' />- ),+ span: <span className='text-indigo-600 dark:text-white' />,}}/>- </h1>- <p className='mx-auto mt-4 max-w-6xl text-center text-base leading-8 text-slate-900 sm:text-xl lg:text-lg xl:text-lg dark:text-slate-300'>+ </Text>+ <Text+ as='p'+ size='base'+ colour='secondary'+ className='mx-auto mt-4 max-w-6xl text-center leading-8 text-pretty sm:text-xl lg:text-lg xl:text-lg'+ >{t('marketers.description')}- </p>+ </Text><div className='mt-10 flex flex-col items-center justify-center sm:flex-row'><Linkto={routesPath.signup}@@ -142,13 +152,18 @@ const Marketers = () => {{_map(t('marketers.whyUs', { returnObjects: true }),(item: { name: string; desc: string[] }) => (- <div- key={item.name}- className='mb-10 text-slate-900 last:mb-0 dark:text-white'- >- <h2 className='mb-5 text-4xl font-extrabold'>{item.name}</h2>+ <div key={item.name} className='mb-10 last:mb-0'>+ <Text+ as='h2'+ size='4xl'+ weight='bold'+ tracking='tight'+ className='mb-5'+ >+ {item.name}+ </Text>{_map(item.desc, (descText) => (- <p key={descText} className='mb-5 text-lg'>+ <Text key={descText} as='p' size='lg' className='mb-5'><Transt={t}components={{@@ -173,7 +188,7 @@ const Marketers = () => {>{descText}</Trans>- </p>+ </Text>))}</div>),diff --git a/web/app/pages/Landings/SmallBusinesses.tsx b/web/app/pages/Landings/SmallBusinesses.tsxindex 57832f082..09b7f2e63 100644--- a/web/app/pages/Landings/SmallBusinesses.tsx+++ b/web/app/pages/Landings/SmallBusinesses.tsx@@ -14,6 +14,7 @@ import {INTEGRATIONS_URL,} from '~/lib/constants'import { useTheme } from '~/providers/ThemeProvider'+import { Text } from '~/ui/Text'import routesPath from '~/utils/routes'const SmallBusinesses = () => {@@ -72,20 +73,29 @@ const SmallBusinesses = () => {<div className='relative mx-auto min-h-[740px] pt-10 pb-5 sm:px-3 lg:px-6 lg:pt-24 xl:px-8'><div className='relative z-20 flex flex-col content-between justify-center'><div className='relative mx-auto flex flex-col px-4 text-left'>- <h1 className='mx-auto max-w-4xl text-center text-4xl font-extrabold text-slate-900 sm:text-5xl sm:leading-none md:text-5xl lg:text-5xl xl:text-6xl xl:leading-[110%] dark:text-white'>+ <Text+ as='h1'+ size='4xl'+ weight='bold'+ tracking='tight'+ className='mx-auto max-w-4xl text-center text-balance sm:text-5xl sm:leading-none xl:text-6xl xl:leading-[110%]'+ ><Transt={t}i18nKey='smbs.slogan'components={{- span: (- <span className='bg-gradient-to-r from-indigo-700 to-pink-700 bg-clip-text text-transparent dark:from-indigo-600 dark:to-indigo-400' />- ),+ span: <span className='text-indigo-600 dark:text-white' />,}}/>- </h1>- <p className='mx-auto mt-4 max-w-6xl text-center text-base leading-8 text-slate-900 sm:text-xl lg:text-lg xl:text-lg dark:text-slate-300'>+ </Text>+ <Text+ as='p'+ size='base'+ colour='secondary'+ className='mx-auto mt-4 max-w-6xl text-center leading-8 text-pretty sm:text-xl lg:text-lg xl:text-lg'+ >{t('smbs.description')}- </p>+ </Text><div className='mt-10 flex flex-col items-center justify-center sm:flex-row'><Linkto={routesPath.signup}@@ -143,13 +153,18 @@ const SmallBusinesses = () => {{_map(t('smbs.whyUs', { returnObjects: true }),(item: { name: string; desc: string[] }) => (- <div- key={item.name}- className='mb-10 text-slate-900 last:mb-0 dark:text-white'- >- <h2 className='mb-5 text-4xl font-extrabold'>{item.name}</h2>+ <div key={item.name} className='mb-10 last:mb-0'>+ <Text+ as='h2'+ size='4xl'+ weight='bold'+ tracking='tight'+ className='mb-5'+ >+ {item.name}+ </Text>{_map(item.desc, (descText) => (- <p key={descText} className='mb-5 text-lg'>+ <Text key={descText} as='p' size='lg' className='mb-5'><Transt={t}components={{@@ -182,7 +197,7 @@ const SmallBusinesses = () => {>{descText}</Trans>- </p>+ </Text>))}</div>),diff --git a/web/app/pages/Landings/Startups.tsx b/web/app/pages/Landings/Startups.tsxindex 979c100e1..2f44af6d2 100644--- a/web/app/pages/Landings/Startups.tsx+++ b/web/app/pages/Landings/Startups.tsx@@ -13,6 +13,7 @@ import {INTEGRATIONS_URL,} from '~/lib/constants'import { useTheme } from '~/providers/ThemeProvider'+import { Text } from '~/ui/Text'import routesPath from '~/utils/routes'const Startups = () => {@@ -71,20 +72,29 @@ const Startups = () => {<div className='relative mx-auto min-h-[740px] pt-10 pb-5 sm:px-3 lg:px-6 lg:pt-24 xl:px-8'><div className='relative z-20 flex flex-col content-between justify-center'><div className='relative mx-auto flex flex-col px-4 text-left'>- <h1 className='mx-auto max-w-4xl text-center text-4xl font-extrabold text-slate-900 sm:text-5xl sm:leading-none md:text-5xl lg:text-5xl xl:text-6xl xl:leading-[110%] dark:text-white'>+ <Text+ as='h1'+ size='4xl'+ weight='bold'+ tracking='tight'+ className='mx-auto max-w-4xl text-center text-balance sm:text-5xl sm:leading-none xl:text-6xl xl:leading-[110%]'+ ><Transt={t}i18nKey='startups.slogan'components={{- span: (- <span className='bg-gradient-to-r from-indigo-700 to-pink-700 bg-clip-text text-transparent dark:from-indigo-600 dark:to-indigo-400' />- ),+ span: <span className='text-indigo-600 dark:text-white' />,}}/>- </h1>- <p className='mx-auto mt-4 max-w-6xl text-center text-base leading-8 text-slate-900 sm:text-xl lg:text-lg xl:text-lg dark:text-slate-300'>+ </Text>+ <Text+ as='p'+ size='base'+ colour='secondary'+ className='mx-auto mt-4 max-w-6xl text-center leading-8 text-pretty sm:text-xl lg:text-lg xl:text-lg'+ >{t('startups.description')}- </p>+ </Text><div className='mt-10 flex flex-col items-center justify-center sm:flex-row'><Linkto={routesPath.signup}@@ -142,13 +152,18 @@ const Startups = () => {{_map(t('startups.whyUs', { returnObjects: true }),(item: { name: string; desc: string[] }) => (- <div- key={item.name}- className='mb-10 text-slate-900 last:mb-0 dark:text-white'- >- <h2 className='mb-5 text-4xl font-extrabold'>{item.name}</h2>+ <div key={item.name} className='mb-10 last:mb-0'>+ <Text+ as='h2'+ size='4xl'+ weight='bold'+ tracking='tight'+ className='mb-5'+ >+ {item.name}+ </Text>{_map(item.desc, (descText) => (- <p key={descText} className='mb-5 text-lg'>+ <Text key={descText} as='p' size='lg' className='mb-5'><Transt={t}components={{@@ -173,7 +188,7 @@ const Startups = () => {>{descText}</Trans>- </p>+ </Text>))}</div>),diff --git a/web/app/pages/NotFound/index.tsx b/web/app/pages/NotFound/index.tsxindex 223baf307..d2a4a0a4a 100644--- a/web/app/pages/NotFound/index.tsx+++ b/web/app/pages/NotFound/index.tsx@@ -1,7 +1,8 @@import { useTranslation } from 'react-i18next'-import { Link } from '~/ui/Link'import { isSelfhosted } from '~/lib/constants'+import { buttonClasses } from '~/ui/Button'+import { Link } from '~/ui/Link'import { Text } from '~/ui/Text'import routes from '~/utils/routes'@@ -11,58 +12,56 @@ const NotFound = () => {const { t } = useTranslation('common')return (- <div className='min-h-min-footer bg-gray-50 px-4 py-16 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8 dark:bg-slate-950'>- <div className='mx-auto max-w-max'>- <main className='sm:flex'>- <Text- as='p'- size='4xl'- weight='bold'- className='text-indigo-600 sm:text-5xl dark:text-indigo-500'- >- 404- </Text>- <div className='sm:ml-6'>- <div className='sm:border-l sm:border-gray-200 sm:pl-6'>- <Text as='h1' size='4xl' weight='bold' className='sm:text-5xl'>- {t('notFoundPage.title')}- </Text>- <Text- as='p'- size='base'- colour='muted'- className='mt-1 whitespace-pre-line'- >- {t('notFoundPage.description')}- </Text>- </div>- <div className='mt-8 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6'>- <Link- to={routes.main}- className='inline-flex items-center rounded-md border border-transparent bg-indigo-600 px-4 py-2 text-sm font-medium text-white hover:bg-indigo-700 focus:ring-2 focus:ring-slate-900 focus:ring-offset-2 focus:outline-hidden dark:focus:ring-slate-300 dark:focus:ring-offset-slate-900'- >- {t('notFoundPage.goHome')}- </Link>- {isSelfhosted ? (- <a- href={CONTACT_US_URL}- target='_blank'- rel='noopener noreferrer'- className='inline-flex items-center rounded-md border border-transparent bg-indigo-100 px-4 py-2 text-sm font-medium text-indigo-700 hover:bg-indigo-200 focus:ring-2 focus:ring-slate-900 focus:ring-offset-2 focus:outline-hidden dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-800 dark:focus:ring-slate-300 dark:focus:ring-offset-slate-900'- >- {t('notFoundPage.support')}- </a>- ) : (- <Link- to={routes.contact}- className='inline-flex items-center rounded-md border border-transparent bg-indigo-100 px-4 py-2 text-sm font-medium text-indigo-700 hover:bg-indigo-200 focus:ring-2 focus:ring-slate-900 focus:ring-offset-2 focus:outline-hidden dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-800 dark:focus:ring-slate-300 dark:focus:ring-offset-slate-900'- >- {t('notFoundPage.support')}- </Link>- )}- </div>- </div>- </main>+ <div className='flex min-h-min-footer items-center justify-center bg-gray-50 px-4 py-16 sm:py-24 dark:bg-slate-950'>+ <div className='mx-auto w-full max-w-2xl text-center'>+ <Text+ as='p'+ size='sm'+ weight='semibold'+ colour='muted'+ tracking='wide'+ className='uppercase'+ >+ 404+ </Text>+ <Text+ as='h1'+ size='4xl'+ weight='bold'+ className='mt-2 tracking-tight text-balance sm:text-5xl'+ >+ {t('notFoundPage.title')}+ </Text>+ <Text+ as='p'+ size='base'+ colour='secondary'+ className='mx-auto mt-3 max-w-md text-pretty whitespace-pre-line'+ >+ {t('notFoundPage.description')}+ </Text>+ <div className='mt-8 flex flex-wrap items-center justify-center gap-3'>+ <Link to={routes.main} className={buttonClasses({ size: 'lg' })}>+ {t('notFoundPage.goHome')}+ </Link>+ {isSelfhosted ? (+ <a+ href={CONTACT_US_URL}+ target='_blank'+ rel='noopener noreferrer'+ className={buttonClasses({ variant: 'secondary', size: 'lg' })}+ >+ {t('notFoundPage.support')}+ </a>+ ) : (+ <Link+ to={routes.contact}+ className={buttonClasses({ variant: 'secondary', size: 'lg' })}+ >+ {t('notFoundPage.support')}+ </Link>+ )}+ </div></div></div>)diff --git a/web/app/pages/OpenStartup/index.tsx b/web/app/pages/OpenStartup/index.tsxindex 10e588acb..7d76e8fe7 100644--- a/web/app/pages/OpenStartup/index.tsx+++ b/web/app/pages/OpenStartup/index.tsx@@ -5,6 +5,7 @@ import { useTranslation, Trans } from 'react-i18next'import { LIVE_DEMO_URL } from '~/lib/constants'import { Stats } from '~/lib/models/Stats'+import { Text } from '~/ui/Text'import { nFormatterSeparated } from '~/utils/generic'// This should be generated on the API side, will be done later.@@ -412,70 +413,58 @@ const OpenStartup = ({ stats }: OpenStartupProps) => {return (<div className='min-h-page bg-gray-50 dark:bg-slate-950'><div className='mx-auto px-4 pt-12 pb-16 whitespace-pre-line sm:px-6 md:w-4/5 lg:px-8'>- <h1 className='text-4xl font-bold text-gray-900 dark:text-gray-50'>+ <Text as='h1' size='4xl' weight='bold' tracking='tight'>{t('titles.open')}- </h1>+ </Text>- <p className='mt-2 text-lg text-gray-900 dark:text-gray-50'>+ <Text as='p' size='lg' className='mt-2'>{t('open.desc')}- </p>+ </Text>- <p className='mt-2 text-lg text-gray-900 dark:text-gray-50'>+ <Text as='p' size='lg' className='mt-2'>{t('open.updated')}- </p>+ </Text>- <h2 className='mt-8 text-2xl font-bold text-gray-900 dark:text-gray-50'>+ <Text as='h2' size='2xl' weight='bold' className='mt-8 tracking-tight'>{t('open.finance.title')}- </h2>+ </Text>- <p className='mt-2 text-lg text-gray-900 dark:text-gray-50'>+ <Text as='p' size='lg' className='mt-2'>{t('open.finance.desc')}- </p>+ </Text><div className='mt-4 h-80' id='open-startup' />- <h2 className='mt-8 text-2xl font-bold text-gray-900 dark:text-gray-50'>+ <Text as='h2' size='2xl' weight='bold' className='mt-8 tracking-tight'>{t('open.usage.title')}- </h2>+ </Text>- <p className='mt-2 text-lg text-gray-900 dark:text-gray-50'>+ <Text as='p' size='lg' className='mt-2'>{t('open.usage.desc')}- </p>+ </Text>- <p className='text-md mt-2 text-gray-900 dark:text-gray-50'>+ <Text as='p' size='base' className='mt-2'>{t('main.users')}{': '}{users[0]}- {users[1] ? (- <span className='text-gray-900 dark:text-indigo-200'>- {users[1]}+- </span>- ) : null}- </p>+ {users[1] ? <span>{users[1]}+</span> : null}+ </Text>- <p className='text-md mt-2 text-gray-900 dark:text-gray-50'>+ <Text as='p' size='base' className='mt-2'>{t('main.websites')}{': '}{websites[0]}- {websites[1] ? (- <span className='text-gray-900 dark:text-indigo-200'>- {websites[1]}+- </span>- ) : null}- </p>+ {websites[1] ? <span>{websites[1]}+</span> : null}+ </Text>- <p className='text-md mt-2 text-gray-900 dark:text-gray-50'>+ <Text as='p' size='base' className='mt-2'>{t('main.pageviews')}{': '}{events[0]}- {events[1] ? (- <span className='text-gray-900 dark:text-indigo-200'>- {events[1]}+- </span>- ) : null}- </p>+ {events[1] ? <span>{events[1]}+</span> : null}+ </Text>- <p className='text-md mt-2 text-gray-900 dark:text-gray-50'>+ <Text as='p' size='base' className='mt-2'><Transt={t}i18nKey='open.usage.live'@@ -490,7 +479,7 @@ const OpenStartup = ({ stats }: OpenStartupProps) => {),}}/>- </p>+ </Text></div></div>)diff --git a/web/app/pages/Organisations/Settings/People.tsx b/web/app/pages/Organisations/Settings/People.tsxindex 50fdda497..540d31c5b 100644--- a/web/app/pages/Organisations/Settings/People.tsx+++ b/web/app/pages/Organisations/Settings/People.tsx@@ -30,6 +30,7 @@ import Button from '~/ui/Button'import Input from '~/ui/Input'import Modal from '~/ui/Modal'import { RadioCardGroup } from '~/ui/RadioCardGroup'+import { Text } from '~/ui/Text'import { isValidEmail } from '~/utils/validator'const NoPeople = () => {@@ -37,10 +38,10 @@ const NoPeople = () => {return (<div className='flex flex-col py-6 sm:px-6 lg:px-8'>- <div className='mx-auto w-full max-w-7xl text-gray-900 dark:text-gray-50'>- <h2 className='mb-8 px-4 text-center text-xl leading-snug'>+ <div className='mx-auto w-full max-w-7xl'>+ <Text as='h2' size='xl' className='mb-8 px-4 text-center leading-snug'>{t('project.settings.noPeople')}- </h2>+ </Text></div></div>)@@ -124,12 +125,22 @@ const UsersList = ({ members, onRemove, fetcher }: UsersListProps) => {className='flex w-full items-center justify-between rounded-md px-3 py-2.5 text-left transition-colors hover:bg-gray-100 dark:hover:bg-slate-800'><div>- <p className='text-sm font-semibold text-gray-900 dark:text-gray-100'>+ <Text+ as='p'+ size='sm'+ weight='semibold'+ className='text-gray-900 dark:text-gray-100'+ >{t(`organisations.role.${itRole}.name`)}- </p>- <p className='mt-0.5 text-sm text-gray-500 dark:text-gray-400'>+ </Text>+ <Text+ as='p'+ size='sm'+ colour='muted'+ className='mt-0.5'+ >{t(`organisations.role.${itRole}.desc`)}- </p>+ </Text></div>{member.role === itRole ? (<CheckIcon className='ml-2 h-5 w-5 shrink-0 text-indigo-600 dark:text-indigo-500' />@@ -307,12 +318,12 @@ const People = ({ organisation }: PeopleProps) => {<div className='mt-6 mb-6'><div className='mb-3 flex items-center justify-between'><div>- <h3 className='mt-2 flex items-center text-lg font-bold text-gray-900 dark:text-gray-50'>+ <Text as='h3' size='lg' weight='bold' className='mt-2'>{t('project.settings.people')}- </h3>- <p className='text-sm text-gray-500 dark:text-gray-400'>+ </Text>+ <Text as='p' size='sm' colour='muted'>{t('project.settings.inviteCoworkers')}- </p>+ </Text></div><ButtonclassName='h-8 pl-2'@@ -392,16 +403,16 @@ const People = ({ organisation }: PeopleProps) => {closeText={t('common.cancel')}message={<div>- <h2 className='text-xl font-bold text-gray-700 dark:text-gray-200'>+ <Text as='h2' size='xl' weight='bold' colour='secondary'>{t('organisations.invite.title', {organisation: name,})}- </h2>- <p className='mt-2 text-base text-gray-700 dark:text-gray-200'>+ </Text>+ <Text as='p' colour='secondary' className='mt-2'>{t('organisations.invite.desc', {expiresIn: INVITATION_EXPIRES_IN,})}- </p>+ </Text><Inputname='email'type='email'diff --git a/web/app/pages/Organisations/Settings/Projects.tsx b/web/app/pages/Organisations/Settings/Projects.tsxindex 290c87e5e..fb4bd7dac 100644--- a/web/app/pages/Organisations/Settings/Projects.tsx+++ b/web/app/pages/Organisations/Settings/Projects.tsx@@ -23,6 +23,7 @@ import Button from '~/ui/Button'import Loader from '~/ui/Loader'import Modal from '~/ui/Modal'import Pagination from '~/ui/Pagination'+import { Text } from '~/ui/Text'import Tooltip from '~/ui/Tooltip'import routes from '~/utils/routes'@@ -106,9 +107,14 @@ const SelectAProject = ({ onSelect }: SelectAProjectProps) => {><div className='flex items-center px-4 py-4 sm:px-6'><div className='min-w-0 flex-1'>- <p className='truncate text-sm font-medium text-gray-900 dark:text-white'>+ <Text+ as='p'+ size='sm'+ weight='medium'+ className='truncate'+ >{project.name}- </p>+ </Text></div></div></li>@@ -137,10 +143,10 @@ const NoProjects = () => {return (<div className='flex flex-col py-6 sm:px-6 lg:px-8'>- <div className='mx-auto w-full max-w-7xl text-gray-900 dark:text-gray-50'>- <h2 className='mb-8 px-4 text-center text-xl leading-snug'>+ <div className='mx-auto w-full max-w-7xl'>+ <Text as='h2' size='xl' className='mb-8 px-4 text-center leading-snug'>{t('organisations.noProjectsFound')}- </h2>+ </Text></div></div>)@@ -265,11 +271,16 @@ export const Projects = ({ organisation }: ProjectsProps) => {return (<div className='mt-6 mb-6'><div className='mb-3 flex items-center justify-between'>- <h3 className='mt-2 flex items-center text-lg font-bold text-gray-900 dark:text-gray-50'>+ <Text+ as='h3'+ size='lg'+ weight='bold'+ className='mt-2 flex items-center'+ >{t('organisations.projects')}{isSearchActive ? (<XIcon- className='ml-2 h-5 w-5 cursor-pointer text-gray-900 hover:opacity-80 dark:text-gray-50'+ className='ml-2 size-5 cursor-pointer text-gray-900 hover:opacity-80 dark:text-gray-50'onClick={() => {setSearch('')setIsSearchActive(false)@@ -277,13 +288,13 @@ export const Projects = ({ organisation }: ProjectsProps) => {/>) : (<MagnifyingGlassIcon- className='ml-2 h-5 w-5 cursor-pointer text-gray-900 hover:opacity-80 dark:text-gray-50'+ className='ml-2 size-5 cursor-pointer text-gray-900 hover:opacity-80 dark:text-gray-50'onClick={() => {setIsSearchActive(true)}}/>)}- </h3>+ </Text><ButtonclassName='h-8 pl-2'type='button'@@ -379,9 +390,9 @@ export const Projects = ({ organisation }: ProjectsProps) => {})}message={<div>- <p className='mt-2 text-base text-gray-700 dark:text-gray-200'>+ <Text as='p' size='base' colour='secondary' className='mt-2'>{t('organisations.modals.addProject.message')}- </p>+ </Text>{selectedProject ? (<div className='mt-4 flex items-center justify-between rounded-lg border border-gray-200 p-4 dark:border-slate-600'>diff --git a/web/app/pages/Organisations/Settings/index.tsx b/web/app/pages/Organisations/Settings/index.tsxindex d9a27a909..bae231610 100644--- a/web/app/pages/Organisations/Settings/index.tsx+++ b/web/app/pages/Organisations/Settings/index.tsx@@ -33,9 +33,10 @@ import Button from '~/ui/Button'import Input from '~/ui/Input'import Loader from '~/ui/Loader'import Modal from '~/ui/Modal'+import Select from '~/ui/Select'import StatusPage from '~/ui/StatusPage'import { TabHeader } from '~/ui/TabHeader'-import Select from '~/ui/Select'+import { Text } from '~/ui/Text'import routes from '~/utils/routes'import NotificationChannels from '~/components/NotificationChannels/NotificationChannels'@@ -298,9 +299,15 @@ const OrganisationSettings = () => {<CaretLeftIcon className='mr-1 size-3' />{t('organisations.backToList')}</Link>- <h2 className='mt-1 text-3xl font-bold text-gray-900 dark:text-gray-50'>+ <Text+ as='h2'+ size='3xl'+ weight='bold'+ tracking='tight'+ className='mt-1'+ >{title}- </h2>+ </Text><hr className='mt-5 border-gray-200 dark:border-slate-700/80' /><div className='mt-6 flex flex-col gap-6 md:flex-row'><div className='md:hidden'>@@ -441,12 +448,12 @@ const OrganisationSettings = () => {iconColorClass={activeTabConfig.iconColor}/><div className='rounded-lg border border-gray-200 p-5 dark:border-slate-800'>- <h3 className='text-lg font-semibold text-gray-900 dark:text-gray-50'>+ <Text as='h3' size='lg' weight='semibold'>{t('organisations.delete')}- </h3>- <p className='mt-2 text-sm text-gray-600 dark:text-gray-300'>+ </Text>+ <Text as='p' size='sm' colour='muted' className='mt-2'>{t('organisations.modals.delete.message')}- </p>+ </Text><Buttonvariant='danger'className='mt-4'diff --git a/web/app/pages/Performance/index.tsx b/web/app/pages/Performance/index.tsxindex 0bd9ae0f2..bc9c63d28 100644--- a/web/app/pages/Performance/index.tsx+++ b/web/app/pages/Performance/index.tsx@@ -8,6 +8,7 @@ import { DitchGoogle } from '~/components/marketing/DitchGoogle'import MarketingPricing from '~/components/pricing/MarketingPricing'import { PERFORMANCE_LIVE_DEMO_URL } from '~/lib/constants'import { useTheme } from '~/providers/ThemeProvider'+import { Text } from '~/ui/Text'import routesPath from '~/utils/routes'import { LogoCloud } from '~/components/marketing/LogoCloud'import { FeedbackDual } from '~/routes/_index'@@ -30,20 +31,26 @@ const Performance = () => {<Header transparent /><section className='mx-auto max-w-7xl px-4 pt-10 pb-5 sm:px-3 lg:grid lg:grid-cols-12 lg:gap-8 lg:px-6 lg:pt-20 xl:px-8'><div className='z-20 col-span-6 flex flex-col items-start'>- <h1 className='max-w-5xl text-left text-5xl font-semibold tracking-tight text-pretty text-slate-900 sm:leading-none lg:mt-6 lg:text-6xl xl:text-7xl dark:text-white'>+ <Text+ as='h1'+ size='4xl'+ weight='semibold'+ tracking='tight'+ className='max-w-5xl text-left text-pretty sm:text-5xl sm:leading-none lg:mt-6 lg:text-6xl xl:text-7xl'+ ><Transt={t}i18nKey='performance.slogan'components={{span: (- <span className='bg-gradient-to-r from-orange-700 to-orange-700 bg-clip-text text-transparent dark:from-orange-600 dark:to-red-400' />+ <span className='text-orange-700 dark:text-orange-400' />),}}/>- </h1>- <p className='mt-4 max-w-2xl text-left text-lg text-slate-900 dark:text-gray-50'>+ </Text>+ <Text as='p' size='lg' className='mt-4 max-w-2xl text-left'>{t('performance.description')}- </p>+ </Text><div className='mt-8 flex flex-col items-stretch sm:flex-row sm:items-center'><Linkto={routesPath.signup}@@ -116,10 +123,10 @@ const Performance = () => {<LogoCloud /><div className='mx-auto mt-12 max-w-7xl bg-white px-4 pb-16 whitespace-pre-line dark:bg-slate-950'>- <h2 className='text-4xl font-extrabold text-slate-900 dark:text-white'>+ <Text as='h2' size='4xl' weight='bold' tracking='tight'>{t('performance.fast.title')}- </h2>- <p className='mt-6 text-lg text-gray-900 dark:text-gray-50'>+ </Text>+ <Text as='p' size='lg' className='mt-6'><Transt={t}i18nKey='performance.fast.desc'@@ -141,31 +148,43 @@ const Performance = () => {),}}/>- </p>- <ul className='mt-2 list-inside list-disc text-lg text-gray-900 dark:text-gray-50'>+ </Text>+ <ul className='mt-2 list-inside list-disc'>{_map(t('performance.fast.list', { returnObjects: true }),(item) => (- <li key={item} className='mb-2'>+ <Text as='li' size='lg' key={item} className='mb-2'>{item}- </li>+ </Text>),)}</ul>- <h2 className='mt-10 text-4xl font-extrabold text-slate-900 dark:text-white'>+ <Text+ as='h2'+ size='4xl'+ weight='bold'+ tracking='tight'+ className='mt-10'+ >{t('performance.metrics.title')}- </h2>- <p className='mt-6 text-lg text-gray-900 dark:text-gray-50'>+ </Text>+ <Text as='p' size='lg' className='mt-6'>{t('performance.metrics.desc')}- </p>+ </Text>- <h2 className='mt-10 text-4xl font-extrabold text-slate-900 dark:text-white'>+ <Text+ as='h2'+ size='4xl'+ weight='bold'+ tracking='tight'+ className='mt-10'+ >{t('performance.privacy.title')}- </h2>- <p className='mt-6 text-lg text-gray-900 dark:text-gray-50'>+ </Text>+ <Text as='p' size='lg' className='mt-6'>{t('performance.privacy.desc')}- </p>+ </Text></div><MarketingPricing />diff --git a/web/app/pages/Project/Settings/Alerts/ProjectAlertsSettings.tsx b/web/app/pages/Project/Settings/Alerts/ProjectAlertsSettings.tsxindex 0693dd80d..b3daec728 100644--- a/web/app/pages/Project/Settings/Alerts/ProjectAlertsSettings.tsx+++ b/web/app/pages/Project/Settings/Alerts/ProjectAlertsSettings.tsx@@ -28,8 +28,10 @@ import Button from '~/ui/Button'import Checkbox from '~/ui/Checkbox'import Input from '~/ui/Input'import Loader from '~/ui/Loader'+import Alert from '~/ui/Alert'import Modal from '~/ui/Modal'import Select from '~/ui/Select'+import StatusPage from '~/ui/StatusPage'import { Text } from '~/ui/Text'import routes from '~/utils/routes'@@ -388,41 +390,19 @@ const ProjectAlertsSettings = ({if (error && !isLoading) {return (- <div className='px-4 py-16 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8'>- <div className='mx-auto max-w-max'>- <main className='sm:flex'>- <XCircleIcon- className='h-12 w-12 text-red-400'- aria-hidden='true'- />- <div className='sm:ml-6'>- <div className='max-w-prose sm:border-l sm:border-gray-200 sm:pl-6'>- <h1 className='text-4xl font-extrabold text-gray-900 sm:text-5xl dark:text-gray-50'>- {t('apiNotifications.somethingWentWrong')}- </h1>- <p className='mt-4 text-2xl font-medium text-gray-700 dark:text-gray-200'>- {t('apiNotifications.errorCode', { error })}- </p>- </div>- <div className='mt-8 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6'>- <button- type='button'- onClick={() => window.location.reload()}- className='inline-flex items-center rounded-md border border-transparent bg-indigo-600 px-4 py-2 text-sm font-medium text-white hover:bg-indigo-700 focus:ring-2 focus:ring-slate-900 focus:ring-offset-2 focus:outline-hidden dark:focus:ring-slate-300 dark:focus:ring-offset-slate-900'- >- {t('dashboard.reloadPage')}- </button>- <Link- to={routes.contact}- className='inline-flex items-center rounded-md border border-transparent bg-indigo-100 px-4 py-2 text-sm font-medium text-indigo-700 hover:bg-indigo-200 focus:ring-2 focus:ring-slate-900 focus:ring-offset-2 focus:outline-hidden dark:bg-slate-900 dark:text-gray-50 dark:hover:bg-slate-800 dark:focus:ring-slate-300 dark:focus:ring-offset-slate-900'- >- {t('notFoundPage.support')}- </Link>- </div>- </div>- </main>- </div>- </div>+ <StatusPage+ type='error'+ title={t('apiNotifications.somethingWentWrong')}+ description={t('apiNotifications.errorCode', { error })}+ actions={[+ {+ label: t('dashboard.reloadPage'),+ onClick: () => window.location.reload(),+ primary: true,+ },+ { label: t('notFoundPage.support'), to: routes.contact },+ ]}+ />)}@@ -483,23 +463,20 @@ const ProjectAlertsSettings = ({) : null}{!authLoading && availableChannels.length === 0 ? (- <div className='mt-4 flex items-start gap-3 rounded-lg border border-amber-200 bg-amber-50 px-4 py-3 dark:border-amber-500/20 dark:bg-amber-500/10'>- <WarningOctagonIcon className='mt-0.5 size-5 shrink-0 text-amber-600 dark:text-amber-400' />- <p className='text-sm text-amber-800 dark:text-amber-200'>- <Trans- t={t}- i18nKey='alert.noChannels'- components={{- url: (- <Link- to={PROJECT_CHANNELS_LINK(projectId)}- className='font-medium underline hover:text-amber-900 dark:hover:text-amber-100'- />- ),- }}- />- </p>- </div>+ <Alert variant='warning' className='mt-4'>+ <Trans+ t={t}+ i18nKey='alert.noChannels'+ components={{+ url: (+ <Link+ to={PROJECT_CHANNELS_LINK(projectId)}+ className='font-medium underline hover:text-amber-900 dark:hover:text-amber-100'+ />+ ),+ }}+ />+ </Alert>) : null}{(form.channelIds || []).map((id) => (<input key={id} type='hidden' name='channelIds' value={id} />diff --git a/web/app/pages/Project/Settings/Alerts/ProjectAlertsView.tsx b/web/app/pages/Project/Settings/Alerts/ProjectAlertsView.tsxindex 35190197f..dfdde881e 100644--- a/web/app/pages/Project/Settings/Alerts/ProjectAlertsView.tsx+++ b/web/app/pages/Project/Settings/Alerts/ProjectAlertsView.tsx@@ -47,9 +47,13 @@ const NoNotificationChannelSet = ({return (<div className='mb-4 flex flex-col gap-3 rounded-lg border border-amber-200 bg-amber-50 px-4 py-3 sm:flex-row sm:items-center dark:border-amber-500/20 dark:bg-amber-500/10'><WarningOctagonIcon className='size-5 shrink-0 text-amber-600 dark:text-amber-400' />- <p className='flex-1 text-sm text-amber-800 dark:text-amber-200'>+ <Text+ as='p'+ size='sm'+ className='flex-1 text-amber-800 dark:text-amber-200'+ >{t('alert.noNotificationChannel')}- </p>+ </Text><Linkto={channelsLink}className='shrink-0 self-start rounded-md bg-amber-600 px-3 py-1.5 text-sm font-medium text-white transition-colors hover:bg-amber-700 sm:self-auto dark:bg-amber-600 dark:hover:bg-amber-500'diff --git a/web/app/pages/Project/Settings/Annotations.tsx b/web/app/pages/Project/Settings/Annotations.tsxindex c41dab1da..0c4fa8020 100644--- a/web/app/pages/Project/Settings/Annotations.tsx+++ b/web/app/pages/Project/Settings/Annotations.tsx@@ -187,9 +187,9 @@ const Annotations = ({ projectId, allowedToManage }: AnnotationsProps) => {{_isEmpty(annotations) ? (<div className='rounded-lg border border-dashed border-gray-300 p-8 text-center dark:border-slate-700'>- <p className='text-gray-500 dark:text-gray-400'>+ <Text as='p' colour='muted'>{t('project.settings.annotations.empty')}- </p>+ </Text>{allowedToManage ? (<Button type='button' onClick={openCreateModal} className='mt-4'><PlusIcon className='mr-1 h-4 w-4' />diff --git a/web/app/pages/Project/Settings/Emails/Emails.tsx b/web/app/pages/Project/Settings/Emails/Emails.tsxindex 3e77eea86..9cb63a979 100644--- a/web/app/pages/Project/Settings/Emails/Emails.tsx+++ b/web/app/pages/Project/Settings/Emails/Emails.tsx@@ -56,12 +56,12 @@ const ModalMessage = ({return (<div>- <h2 className='text-xl font-bold text-gray-700 dark:text-gray-200'>+ <Text as='h2' size='xl' weight='bold' colour='secondary'>{t('project.settings.addARecipient')}- </h2>- <p className='mt-2 text-base text-gray-700 dark:text-gray-200'>+ </Text>+ <Text as='p' colour='secondary' className='mt-2'>{t('project.settings.addARecipientDesc')}- </p>+ </Text><Inputname='email'type='email'@@ -186,9 +186,14 @@ const EmailList = ({ data, onRemove, setEmails }: EmailListProps) => {key={item.value}><div>- <p className='font-bold text-gray-700 group-hover:text-gray-200 dark:text-gray-200'>+ <Text+ as='p'+ weight='bold'+ colour='secondary'+ className='group-hover:text-gray-200'+ >{t(`profileSettings.${_toLower(item.label)}`)}- </p>+ </Text></div>{reportFrequency === item.value ? (<span className='text-indigo-600 group-hover:text-gray-200'>@@ -201,9 +206,13 @@ const EmailList = ({ data, onRemove, setEmails }: EmailListProps) => {onClick={onRemove}className='group flex cursor-pointer items-center justify-between rounded-b-md p-4 hover:bg-gray-200 dark:hover:bg-gray-700'>- <p className='font-bold text-red-600 dark:text-red-500'>+ <Text+ as='p'+ weight='bold'+ className='text-red-600 dark:text-red-500'+ >{t('project.settings.removeMember')}- </p>+ </Text></li></ul>) : null}@@ -235,10 +244,10 @@ const NoSubscribers = () => {return (<div className='flex flex-col py-6 sm:px-6 lg:px-8'>- <div className='mx-auto w-full max-w-7xl text-gray-900 dark:text-gray-50'>- <h2 className='mb-8 px-4 text-center text-xl leading-snug'>+ <div className='mx-auto w-full max-w-7xl'>+ <Text as='h2' size='xl' className='mb-8 px-4 text-center leading-snug'>{t('project.settings.noPeople')}- </h2>+ </Text></div></div>)diff --git a/web/app/pages/Project/Settings/People/People.tsx b/web/app/pages/Project/Settings/People/People.tsxindex 431df8879..523b135fc 100644--- a/web/app/pages/Project/Settings/People/People.tsx+++ b/web/app/pages/Project/Settings/People/People.tsx@@ -39,10 +39,10 @@ const NoPeople = () => {return (<div className='flex flex-col py-6 sm:px-6 lg:px-8'>- <div className='mx-auto w-full max-w-7xl text-gray-900 dark:text-gray-50'>- <h2 className='mb-8 px-4 text-center text-xl leading-snug'>+ <div className='mx-auto w-full max-w-7xl'>+ <Text as='h2' size='xl' className='mb-8 px-4 text-center leading-snug'>{t('project.settings.noPeople')}- </h2>+ </Text></div></div>)@@ -140,12 +140,22 @@ const TableUserRow = ({className='flex w-full items-center justify-between rounded-md px-3 py-2.5 text-left transition-colors hover:bg-gray-100 dark:hover:bg-slate-800'><div>- <p className='text-sm font-semibold text-gray-900 dark:text-gray-100'>+ <Text+ as='p'+ size='sm'+ weight='semibold'+ className='text-gray-900 dark:text-gray-100'+ >{t(`project.settings.roles.${itRole}.name`)}- </p>- <p className='mt-0.5 text-sm text-gray-500 dark:text-gray-400'>+ </Text>+ <Text+ as='p'+ size='sm'+ colour='muted'+ className='mt-0.5'+ >{t(`project.settings.roles.${itRole}.shortDesc`)}- </p>+ </Text></div>{role === itRole ? (<CheckIcon className='ml-2 h-5 w-5 shrink-0 text-indigo-600 dark:text-indigo-500' />@@ -418,21 +428,21 @@ const People = ({ project }: PeopleProps) => {closeText={t('common.cancel')}message={<div>- <h2 className='text-xl font-bold text-gray-700 dark:text-gray-200'>+ <Text as='h2' size='xl' weight='bold' colour='secondary'>{t('project.settings.inviteTo', { project: name })}- </h2>- <p className='mt-2 text-base text-gray-700 dark:text-gray-200'>+ </Text>+ <Text as='p' colour='secondary' className='mt-2'>{t(isSelfhosted? 'project.settings.inviteDescSelfhosted': 'project.settings.inviteDesc',)}- </p>- <p className='mt-2 text-base text-gray-700 dark:text-gray-200'>+ </Text>+ <Text as='p' colour='secondary' className='mt-2'>{t('project.settings.inviteExpity', {amount: INVITATION_EXPIRES_IN,})}- </p>+ </Text><Inputname='email'type='email'diff --git a/web/app/pages/Project/Settings/ProjectSettings.tsx b/web/app/pages/Project/Settings/ProjectSettings.tsxindex dcebf8bc0..a40eb7925 100644--- a/web/app/pages/Project/Settings/ProjectSettings.tsx+++ b/web/app/pages/Project/Settings/ProjectSettings.tsx@@ -49,10 +49,11 @@ import GoogleGSVG from '~/ui/icons/GoogleG'import GoogleSearchConsoleSVG from '~/ui/icons/GoogleSearchConsole'import Input from '~/ui/Input'import Loader from '~/ui/Loader'-import { TabHeader } from '~/ui/TabHeader'import Modal from '~/ui/Modal'import MultiSelect from '~/ui/MultiSelect'import Select from '~/ui/Select'+import { TabHeader } from '~/ui/TabHeader'+import { Text } from '~/ui/Text'// Select is used inside tab componentsimport countries from '~/utils/isoCountries'import routes from '~/utils/routes'@@ -146,9 +147,13 @@ const ModalMessage = ({return (<>- <p className='mt-1 mb-4 text-sm text-gray-500 italic dark:text-gray-300'>+ <Text+ as='p'+ size='sm'+ className='mt-1 mb-4 text-gray-500 italic dark:text-gray-300'+ >{t('project.settings.resetHint')}- </p>+ </Text><div className='mt-6'><nav className='-mb-px flex space-x-6'>{_map(DELETE_DATA_MODAL_TABS, (tabDelete) => (@@ -173,12 +178,20 @@ const ModalMessage = ({</div>{tab === DELETE_DATA_MODAL_TABS[1].name ? (<>- <p className='mt-4 mb-2 text-sm text-gray-500 dark:text-gray-300'>+ <Text+ as='p'+ size='sm'+ className='mt-4 mb-2 text-gray-500 dark:text-gray-300'+ >{t('project.settings.reseted.partiallyDesc')}- </p>- <p className='mt-1 mb-2 text-sm text-gray-500 italic dark:text-gray-300'>+ </Text>+ <Text+ as='p'+ size='sm'+ className='mt-1 mb-2 text-gray-500 italic dark:text-gray-300'+ >{t('project.settings.reseted.partiallyHint')}- </p>+ </Text><inputtype='text'className='m-0 h-0 w-0 border-0 p-0 focus:border-transparent focus:text-transparent focus:shadow-none focus:ring-transparent'@@ -195,15 +208,23 @@ const ModalMessage = ({</>) : null}{tab === DELETE_DATA_MODAL_TABS[0].name ? (- <p className='mt-4 mb-4 text-sm text-gray-500 italic dark:text-gray-300'>+ <Text+ as='p'+ size='sm'+ className='mt-4 mb-4 text-gray-500 italic dark:text-gray-300'+ >{t('project.settings.reseted.allHint')}- </p>+ </Text>) : null}{tab === DELETE_DATA_MODAL_TABS[2].name ? (<div className='min-h-[410px]'>- <p className='mt-4 mb-4 text-sm text-gray-500 italic dark:text-gray-300'>+ <Text+ as='p'+ size='sm'+ className='mt-4 mb-4 text-gray-500 italic dark:text-gray-300'+ >{t('project.settings.reseted.viaFiltersHint')}- </p>+ </Text><div><DropdownclassName='min-w-[160px]'@@ -277,9 +298,13 @@ const ModalMessage = ({}/>) : (- <p className='mt-4 mb-4 text-sm text-gray-500 italic dark:text-gray-300'>+ <Text+ as='p'+ size='sm'+ className='mt-4 mb-4 text-gray-500 italic dark:text-gray-300'+ >{t('project.settings.reseted.noFilters')}- </p>+ </Text>)}</div></div>@@ -958,9 +983,15 @@ const ProjectSettings = () => {<CaretLeftIcon className='mr-1 size-3' />{t('project.backToStats')}</Link>- <h2 className='mt-1 text-3xl font-bold text-gray-900 dark:text-gray-50'>+ <Text+ as='h2'+ size='3xl'+ weight='bold'+ tracking='tight'+ className='mt-1'+ >{title}- </h2>+ </Text><hr className='mt-5 border-gray-200 dark:border-slate-700/80' />@@ -1055,12 +1086,12 @@ const ProjectSettings = () => {{activeTab === 'shields' ? (<div className='mt-8'>- <h3 className='text-lg font-bold text-gray-900 dark:text-gray-50'>+ <Text as='h3' size='lg' weight='bold'>{t('project.settings.blockedTraffic')}- </h3>- <p className='mt-1 text-sm text-gray-500 dark:text-gray-400'>+ </Text>+ <Text as='p' size='sm' colour='muted' className='mt-1'>{t('project.settings.blockedTrafficHint')}- </p>+ </Text><div className='mt-2'><BotProtectionReport pid={id} /></div>@@ -1137,10 +1168,15 @@ const ProjectSettings = () => {iconColorClass={activeTabConfig.iconColor}/><div className='rounded-lg border border-gray-200 p-4 dark:border-slate-800'>- <h3 className='mb-2 flex items-center gap-2 text-lg font-medium text-gray-900 dark:text-gray-50'>+ <Text+ as='h3'+ size='lg'+ weight='medium'+ className='mb-2 flex items-center gap-2'+ ><GoogleSearchConsoleSVG className='size-6' />Google Search Console- </h3>+ </Text>{gscConnected === null ? (<Loader />) : !gscAvailable ? (@@ -1166,9 +1202,13 @@ const ProjectSettings = () => {</div>) : !gscConnected ? (<div className='flex flex-col items-center justify-between gap-4 md:flex-row'>- <p className='text-sm text-gray-800 dark:text-gray-200'>+ <Text+ as='p'+ size='sm'+ className='text-gray-800 dark:text-gray-200'+ >{t('project.settings.gsc.connect')}- </p>+ </Text><ButtonclassName='flex items-center gap-2'type='button'@@ -1279,7 +1319,11 @@ const ProjectSettings = () => {<><hr className='-mx-4 mt-4 mb-4 border-gray-200 dark:border-slate-800' />- <p className='text-sm text-gray-800 dark:text-gray-200'>+ <Text+ as='p'+ size='sm'+ className='text-gray-800 dark:text-gray-200'+ ><Transt={t}i18nKey='project.settings.gsc.connectDisclamer'@@ -1294,7 +1338,7 @@ const ProjectSettings = () => {),}}/>- </p>+ </Text></>)}</div>@@ -1349,12 +1393,12 @@ const ProjectSettings = () => {iconColorClass={activeTabConfig.iconColor}/><div className='rounded-lg border border-gray-200 p-4 dark:border-slate-800'>- <h3 className='mb-2 text-lg font-medium text-gray-900 dark:text-gray-50'>+ <Text as='h3' size='lg' weight='medium' className='mb-2'>{t('project.settings.captcha.title')}- </h3>- <p className='mb-4 text-sm text-gray-600 dark:text-gray-300'>+ </Text>+ <Text as='p' size='sm' colour='muted' className='mb-4'>{t('project.settings.captcha.description')}- </p>+ </Text>{captchaSecretKey ? (<>@@ -1465,9 +1509,9 @@ const ProjectSettings = () => {</>) : (<>- <p className='mb-4 text-sm text-gray-600 dark:text-gray-300'>+ <Text as='p' size='sm' colour='muted' className='mb-4'>{t('project.settings.captcha.noKeyGenerated')}- </p>+ </Text><Button type='button' onClick={onRegenerateCaptchaKey}>{t('project.settings.captcha.generateKey')}</Button>@@ -1564,9 +1608,13 @@ const ProjectSettings = () => {title={t('project.settings.protected')}message={<div>- <p className='mt-1 mb-4 text-sm text-gray-500 dark:text-gray-300'>+ <Text+ as='p'+ size='sm'+ className='mt-1 mb-4 text-gray-500 dark:text-gray-300'+ >{t('project.settings.protectedHint')}- </p>+ </Text><Inputname='password'type='password'@@ -1588,14 +1636,14 @@ const ProjectSettings = () => {closeText={t('common.cancel')}message={<div>- <h2 className='text-xl font-bold text-gray-700 dark:text-gray-200'>+ <Text as='h2' size='xl' weight='bold' colour='secondary'>{t('project.settings.transferTo')}- </h2>- <p className='mt-2 text-base text-gray-700 dark:text-gray-200'>+ </Text>+ <Text as='p' colour='secondary' className='mt-2'>{t('project.settings.transferHint', {name: form.name || DEFAULT_PROJECT_NAME,})}- </p>+ </Text><Inputname='email'type='email'diff --git a/web/app/pages/Project/Settings/tabs/AccessSettings.tsx b/web/app/pages/Project/Settings/tabs/AccessSettings.tsxindex 883c34bf7..3f35678f3 100644--- a/web/app/pages/Project/Settings/tabs/AccessSettings.tsx+++ b/web/app/pages/Project/Settings/tabs/AccessSettings.tsx@@ -4,6 +4,7 @@ import { useTranslation } from 'react-i18next'import { isSelfhosted } from '~/lib/constants'import Checkbox from '~/ui/Checkbox'import Select from '~/ui/Select'+import { Text } from '~/ui/Text'interface AccessSettingsProps {form: {@@ -28,9 +29,9 @@ const AccessSettings = ({return (<>- <h3 className='text-lg font-bold text-gray-900 dark:text-gray-50'>+ <Text as='h3' size='lg' weight='bold'>{t('project.settings.access')}- </h3>+ </Text><Checkboxchecked={Boolean(form.public)}onChange={(checked) => {diff --git a/web/app/pages/Project/Settings/tabs/DangerZone.tsx b/web/app/pages/Project/Settings/tabs/DangerZone.tsxindex 4c39151bb..218af5b78 100644--- a/web/app/pages/Project/Settings/tabs/DangerZone.tsx+++ b/web/app/pages/Project/Settings/tabs/DangerZone.tsx@@ -2,6 +2,7 @@ import { useTranslation } from 'react-i18next'import Button from '~/ui/Button'import Checkbox from '~/ui/Checkbox'+import { Text } from '~/ui/Text'interface DangerZoneProps {isActive: boolean@@ -28,9 +29,9 @@ const DangerZone = ({return (<div>- <h3 className='text-lg font-bold text-gray-900 dark:text-gray-50'>+ <Text as='h3' size='lg' weight='bold'>{t('project.settings.tabs.danger')}- </h3>+ </Text><div className='mt-6 mb-8'><Checkbox@@ -52,12 +53,12 @@ const DangerZone = ({<div className='flex flex-col gap-6'><div className='flex flex-col items-start gap-4 sm:flex-row sm:items-center sm:justify-between'><div>- <div className='text-sm font-medium text-gray-900 dark:text-gray-50'>+ <Text as='div' size='sm' weight='medium'>{t('project.settings.transfer')}- </div>- <p className='mt-1 text-sm text-gray-500 dark:text-gray-400'>+ </Text>+ <Text as='p' size='sm' colour='muted' className='mt-1'>{t('project.settings.transferShort')}- </p>+ </Text></div><Buttonvariant='danger-outline'@@ -73,12 +74,12 @@ const DangerZone = ({<div className='flex flex-col items-start gap-4 sm:flex-row sm:items-center sm:justify-between'><div>- <div className='text-sm font-medium text-gray-900 dark:text-gray-50'>+ <Text as='div' size='sm' weight='medium'>{t('project.settings.reset')}- </div>- <p className='mt-1 text-sm text-gray-500 dark:text-gray-400'>+ </Text>+ <Text as='p' size='sm' colour='muted' className='mt-1'>{t('project.settings.resetShort')}- </p>+ </Text></div><Buttonvariant='danger-outline'@@ -95,12 +96,12 @@ const DangerZone = ({<div className='flex flex-col items-start gap-4 sm:flex-row sm:items-center sm:justify-between'><div>- <div className='text-sm font-medium text-gray-900 dark:text-gray-50'>+ <Text as='div' size='sm' weight='medium'>{t('project.settings.delete')}- </div>- <p className='mt-1 text-sm text-gray-500 dark:text-gray-400'>+ </Text>+ <Text as='p' size='sm' colour='muted' className='mt-1'>{t('project.settings.deleteShort')}- </p>+ </Text></div><Buttonvariant='danger'diff --git a/web/app/pages/Project/Settings/tabs/General.tsx b/web/app/pages/Project/Settings/tabs/General.tsxindex eb3c3b22f..801947230 100644--- a/web/app/pages/Project/Settings/tabs/General.tsx+++ b/web/app/pages/Project/Settings/tabs/General.tsx@@ -2,6 +2,7 @@ import React from 'react'import { useTranslation } from 'react-i18next'import Input from '~/ui/Input'+import { Text } from '~/ui/Text'interface GeneralProps {form: {@@ -30,9 +31,9 @@ const General = ({return (<>- <h3 className='text-lg font-bold text-gray-900 dark:text-gray-50'>+ <Text as='h3' size='lg' weight='bold'>{t('profileSettings.general')}- </h3>+ </Text><Inputname='name'label={t('project.settings.name')}diff --git a/web/app/pages/Project/Settings/tabs/Shields.tsx b/web/app/pages/Project/Settings/tabs/Shields.tsxindex 04edc3866..7aa4c6c26 100644--- a/web/app/pages/Project/Settings/tabs/Shields.tsx+++ b/web/app/pages/Project/Settings/tabs/Shields.tsx@@ -8,6 +8,7 @@ import Flag from '~/ui/Flag'import Input from '~/ui/Input'import MultiSelect from '~/ui/MultiSelect'import Select from '~/ui/Select'+import { Text } from '~/ui/Text'import countries from '~/utils/isoCountries'interface BotsProtectionLevelOption {@@ -107,9 +108,9 @@ const Shields = ({return (<>- <h3 className='text-lg font-bold text-gray-900 dark:text-gray-50'>+ <Text as='h3' size='lg' weight='bold'>{t('project.settings.shields')}- </h3>+ </Text><Inputname='origins'label={t('project.settings.origins')}@@ -129,9 +130,15 @@ const Shields = ({error={beenSubmitted ? errors.ipBlacklist : null}/><div className='mt-4'>- <label className='block text-sm font-medium text-gray-700 dark:text-gray-200'>+ <Text+ as='label'+ size='sm'+ weight='medium'+ colour='secondary'+ className='block'+ >{t('project.settings.countryBlacklist')}- </label>+ </Text><MultiSelectclassName='mt-1'items={searchedCountries}diff --git a/web/app/pages/Project/View/components/AddAViewModal.tsx b/web/app/pages/Project/View/components/AddAViewModal.tsxindex 52b655b05..f8c14f5d0 100644--- a/web/app/pages/Project/View/components/AddAViewModal.tsx+++ b/web/app/pages/Project/View/components/AddAViewModal.tsx@@ -17,6 +17,7 @@ import Combobox from '~/ui/Combobox'import Input from '~/ui/Input'import Modal from '~/ui/Modal'import Select from '~/ui/Select'+import { Text } from '~/ui/Text'import countries from '~/utils/isoCountries'import {@@ -97,7 +98,7 @@ const EditMetric = ({<div className='py-4'><Inputlabel={- <p className='flex w-full items-center justify-between'>+ <Text as='p' className='flex w-full items-center justify-between'><span>{t('project.customEvent')}</span><buttontype='button'@@ -107,7 +108,7 @@ const EditMetric = ({><XIcon className='size-5' /></button>- </p>+ </Text>}maxLength={100}value={metric.customEventName}@@ -437,9 +438,15 @@ const AddAViewModal = ({/>{filterType && !_isEmpty(searchList) ? (<>- <p className='mt-5 text-sm font-medium text-gray-700 dark:text-gray-200'>+ <Text+ as='p'+ size='sm'+ weight='medium'+ colour='secondary'+ className='mt-5'+ >{t('project.filters')}- </p>+ </Text><Comboboxitems={searchList}labelExtractor={(item) => {@@ -517,9 +524,14 @@ const AddAViewModal = ({)}</div><hr className='my-4' />- <p className='text-sm font-medium text-gray-700 dark:text-gray-100'>+ <Text+ as='p'+ size='sm'+ weight='medium'+ className='text-gray-700 dark:text-gray-100'+ >{t('project.customEventsAndMetrics')}- </p>+ </Text><div className='divide-y divide-gray-300/80 dark:divide-slate-900/60'>{_map(customEvents, (ev) => (<EditMetricdiff --git a/web/app/pages/Project/View/components/LiveVisitorsDropdown.tsx b/web/app/pages/Project/View/components/LiveVisitorsDropdown.tsxindex f5328d63d..d9f917f40 100644--- a/web/app/pages/Project/View/components/LiveVisitorsDropdown.tsx+++ b/web/app/pages/Project/View/components/LiveVisitorsDropdown.tsx@@ -12,6 +12,7 @@ import Flag from '~/ui/Flag'import PulsatingCircle from '~/ui/icons/PulsatingCircle'import Spin from '~/ui/icons/Spin'import OutsideClickHandler from '~/ui/OutsideClickHandler'+import { Text } from '~/ui/Text'import { cn } from '~/utils/generic'import { useCurrentProject } from '../../../../providers/CurrentProjectProvider'@@ -93,9 +94,9 @@ const LiveVisitorsDropdown = () => {><div className='flex w-full flex-col'><div className='flex items-center justify-between border-b border-black/10 bg-white p-2 dark:border-slate-700/50 dark:bg-slate-950'>- <p className='text-sm font-semibold text-gray-900 dark:text-gray-50'>+ <Text as='p' size='sm' weight='semibold'>{t('dashboard.liveVisitors')}- </p>+ </Text><buttonclassName='-m-1 rounded-md p-1 transition-colors hover:bg-gray-200 dark:hover:bg-slate-800'@@ -107,15 +108,15 @@ const LiveVisitorsDropdown = () => {</div><div className='scrollbar-thin max-h-[200px] overflow-y-auto px-2'>{isLoading ? (- <p className='flex items-center py-2 text-sm text-gray-900 dark:text-gray-50'>+ <Text as='p' size='sm' className='flex items-center py-2'><Spin className='ml-0' />{t('common.loading')}- </p>+ </Text>) : liveInfo.length === 0 ? (- <p className='py-2 text-sm text-gray-900 dark:text-gray-50'>+ <Text as='p' size='sm' className='py-2'>{t('project.noData')}- </p>+ </Text>) : (<div className='table w-full border-separate border-spacing-y-2'><div className='table-row-group'>@@ -146,7 +147,9 @@ const LiveVisitorsDropdown = () => {{br}</div><div className='table-cell rounded-r-lg bg-gray-100 pr-2 align-middle transition-colors group-hover:bg-gray-200 dark:bg-slate-900 dark:group-hover:bg-slate-700'>- <p className='capitalize'>{dv}</p>+ <Text as='p' className='capitalize'>+ {dv}+ </Text></div></Link>)diff --git a/web/app/pages/Project/View/components/PasswordRequiredModal.tsx b/web/app/pages/Project/View/components/PasswordRequiredModal.tsxindex 47aecacfc..28af03179 100644--- a/web/app/pages/Project/View/components/PasswordRequiredModal.tsx+++ b/web/app/pages/Project/View/components/PasswordRequiredModal.tsx@@ -8,6 +8,7 @@ import { Link } from '~/ui/Link'import Button from '~/ui/Button'import Input from '~/ui/Input'import Modal from '~/ui/Modal'+import { Text } from '~/ui/Text'import routes from '~/utils/routes'const MAX_PASSWORD_LENGTH = 80@@ -80,15 +81,20 @@ const PasswordRequiredModal = ({message={<form onSubmit={handleSubmit} className='space-y-4'><div className='flex flex-col items-center text-center'>- <div className='mx-auto flex h-12 w-12 items-center justify-center rounded-full bg-amber-100 dark:bg-amber-900/30'>- <LockIcon className='h-6 w-6 text-amber-600 dark:text-amber-400' />+ <div className='mx-auto flex size-12 items-center justify-center rounded-full bg-amber-100 dark:bg-amber-500/15'>+ <LockIcon className='size-6 text-amber-600 dark:text-amber-400' /></div>- <h3 className='mt-4 text-lg font-semibold text-gray-900 dark:text-gray-50'>+ <Text+ as='h3'+ size='lg'+ weight='semibold'+ className='mt-4 tracking-tight'+ >{t('titles.passwordProtected')}- </h3>- <p className='mt-2 text-sm text-gray-600 dark:text-gray-400'>+ </Text>+ <Text as='p' size='sm' colour='muted' className='mt-2'>{t('project.passwordProtectedHint')}- </p>+ </Text></div><Inputdiff --git a/web/app/pages/Project/View/components/SearchFilters.tsx b/web/app/pages/Project/View/components/SearchFilters.tsxindex 55898c341..cea36d383 100644--- a/web/app/pages/Project/View/components/SearchFilters.tsx+++ b/web/app/pages/Project/View/components/SearchFilters.tsx@@ -31,6 +31,7 @@ import FilterValueInput, {parseVersionValue,} from '~/ui/FilterValueInput'import Modal from '~/ui/Modal'+import { Text } from '~/ui/Text'import countries from '~/utils/isoCountries'import { Filter as FilterType } from '../interfaces/traffic'@@ -605,9 +606,15 @@ const SearchFilters = ({{/* Currently Applied Filters */}{!_isEmpty(filters) ? (<div className='border-t border-gray-200 pt-4 dark:border-gray-700'>- <p className='mb-2 text-xs font-medium text-gray-500 uppercase dark:text-gray-400'>+ <Text+ as='p'+ size='xs'+ weight='medium'+ colour='muted'+ className='mb-2 uppercase'+ >{t('project.currentFilters')}- </p>+ </Text><div className='flex flex-wrap gap-2'>{filters.map(({ column, filter, isExclusive, isContains }) => {let displayFilter = filterdiff --git a/web/app/pages/Project/tabs/AskAI/AIChart.tsx b/web/app/pages/Project/tabs/AskAI/AIChart.tsxindex 741df3df8..fac50d3ea 100644--- a/web/app/pages/Project/tabs/AskAI/AIChart.tsx+++ b/web/app/pages/Project/tabs/AskAI/AIChart.tsx@@ -35,6 +35,7 @@ import { useTranslation } from 'react-i18next'import { toast } from 'sonner'import BillboardChart from '~/ui/BillboardChart'+import { Text } from '~/ui/Text'import { cn } from '~/utils/generic'const VALID_LINK_TABS = new Set([@@ -1020,9 +1021,15 @@ const AIChart: React.FC<AIChartProps> = ({ chart, projectId }) => {)const titleNode = chart.title ? (- <h4 className='mb-2 pr-36 text-sm font-medium text-gray-700 dark:text-gray-300'>+ <Text+ as='h4'+ size='sm'+ weight='medium'+ colour='secondary'+ className='mb-2 pr-36'+ >{chart.title}- </h4>+ </Text>) : nullreturn (diff --git a/web/app/pages/Project/tabs/AskAI/AskAIView.tsx b/web/app/pages/Project/tabs/AskAI/AskAIView.tsxindex f29264fb0..3d2e308cf 100644--- a/web/app/pages/Project/tabs/AskAI/AskAIView.tsx+++ b/web/app/pages/Project/tabs/AskAI/AskAIView.tsx@@ -194,9 +194,9 @@ const AICapabilitiesTooltip = () => {return (<div className='max-w-sm space-y-3 py-1 text-left'><div>- <p className='mb-1.5 font-semibold text-white'>+ <Text as='p' weight='semibold' className='mb-1.5 text-white'>{t('project.askAi.capabilities.title')}- </p>+ </Text><ul className='space-y-1 text-gray-300'><li className='flex items-start gap-1.5'><ChartBarIcon className='mt-0.5 h-3.5 w-3.5 shrink-0 text-green-400' />@@ -289,9 +289,9 @@ const AICapabilitiesTooltip = () => {</ul></div><div>- <p className='mb-1.5 font-semibold text-white'>+ <Text as='p' weight='semibold' className='mb-1.5 text-white'>{t('project.askAi.capabilities.cannotTitle')}- </p>+ </Text><ul className='space-y-1 text-gray-300'><li className='flex items-start gap-1.5'><XIcon className='mt-0.5 h-3.5 w-3.5 shrink-0 text-red-400' />@@ -554,9 +554,13 @@ const ToolCallSummaryDrawer = ({) : null}</div>{summary.params.length === 0 ? (- <p className='mt-1 text-xs text-gray-400 italic dark:text-gray-500'>+ <Text+ as='p'+ size='xs'+ className='mt-1 text-gray-400 italic dark:text-gray-500'+ >{t('project.askAi.noParameters')}- </p>+ </Text>) : (<dl className='mt-1.5 grid grid-cols-[max-content_minmax(0,1fr)] gap-x-3 gap-y-1 text-xs'>{_map(summary.params, (param, pIdx) => (@@ -925,7 +929,9 @@ const UserMessage = ({return (<div className='group flex flex-col items-end'><div className='max-w-[85%] rounded-2xl bg-gray-100 px-4 py-2.5 text-gray-900 dark:bg-slate-800 dark:text-gray-50'>- <p className='text-sm whitespace-pre-wrap'>{content}</p>+ <Text as='p' size='sm' className='whitespace-pre-wrap'>+ {content}+ </Text></div><div className='mt-1 flex items-center gap-0.5 opacity-0 transition-opacity group-hover:opacity-100 focus-within:opacity-100'><button@@ -2919,9 +2925,13 @@ const AskAIView = ({ projectId }: AskAIViewProps) => {<div className='mx-auto w-full max-w-3xl px-4 pt-4'><div className='flex items-center gap-2 rounded-lg border border-red-200 bg-red-50 px-4 py-3 dark:border-red-800 dark:bg-red-900/20'><WarningCircleIcon className='h-5 w-5 shrink-0 text-red-500' />- <p className='flex-1 text-sm text-red-700 dark:text-red-400'>+ <Text+ as='p'+ size='sm'+ className='flex-1 text-red-700 dark:text-red-400'+ >{error}- </p>+ </Text><buttontype='button'onClick={() => setError(null)}diff --git a/web/app/pages/Project/tabs/Errors/ErrorDetails.tsx b/web/app/pages/Project/tabs/Errors/ErrorDetails.tsxindex 23f52f0ce..c0b32c2d6 100644--- a/web/app/pages/Project/tabs/Errors/ErrorDetails.tsx+++ b/web/app/pages/Project/tabs/Errors/ErrorDetails.tsx@@ -406,7 +406,11 @@ export const ErrorDetails = ({)}- return <p className='block text-gray-800 dark:text-slate-200'>{line}</p>+ return (+ <Text as='p' className='block text-gray-800 dark:text-slate-200'>+ {line}+ </Text>+ )}const stackPreviewLines = stackTraceLines.slice(0, STACK_PREVIEW_LINES_COUNT)@@ -436,13 +440,24 @@ export const ErrorDetails = ({</div><div className='space-y-1'>- <h2 className='text-2xl leading-tight font-bold tracking-tight wrap-break-word text-gray-900 dark:text-white'>+ <Text+ as='h2'+ size='2xl'+ weight='bold'+ tracking='tight'+ className='leading-tight wrap-break-word'+ >{details.name}- </h2>+ </Text>{details.message ? (- <p className='font-mono text-sm wrap-break-word text-gray-600 dark:text-gray-400'>+ <Text+ as='p'+ size='sm'+ colour='muted'+ className='font-mono wrap-break-word'+ >{details.message}- </p>+ </Text>) : null}</div>diff --git a/web/app/pages/Project/tabs/Errors/NoErrorDetails.tsx b/web/app/pages/Project/tabs/Errors/NoErrorDetails.tsxindex d8aaf569e..c218fd680 100644--- a/web/app/pages/Project/tabs/Errors/NoErrorDetails.tsx+++ b/web/app/pages/Project/tabs/Errors/NoErrorDetails.tsx@@ -1,20 +1,27 @@import { WarningIcon } from '@phosphor-icons/react'import { useTranslation } from 'react-i18next'+import { Text } from '~/ui/Text'+const NoErrorDetails = () => {const { t } = useTranslation('common')return (- <div className='mx-auto w-full max-w-2xl py-16 text-center text-gray-900 dark:text-gray-50'>+ <div className='mx-auto w-full max-w-2xl py-16 text-center'><div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-900'><WarningIcon className='size-7 text-gray-700 dark:text-gray-200' /></div>- <h3 className='text-xl font-medium tracking-tight'>+ <Text as='h3' size='xl' weight='medium' className='tracking-tight'>{t('project.noErrorDetails')}- </h3>- <p className='mx-auto mt-2 max-w-md text-sm whitespace-pre-line text-gray-800 dark:text-gray-200'>+ </Text>+ <Text+ as='p'+ size='sm'+ colour='secondary'+ className='mx-auto mt-2 max-w-md whitespace-pre-line'+ >{t('project.noErrorDesc')}- </p>+ </Text></div>)}diff --git a/web/app/pages/Project/tabs/Experiments/ExperimentSettingsModal.tsx b/web/app/pages/Project/tabs/Experiments/ExperimentSettingsModal.tsxindex f878073ce..d57e8ae2e 100644--- a/web/app/pages/Project/tabs/Experiments/ExperimentSettingsModal.tsx+++ b/web/app/pages/Project/tabs/Experiments/ExperimentSettingsModal.tsx@@ -942,18 +942,18 @@ const ExperimentSettingsModal = ({<Tooltiptext={<div>- <p className='font-medium'>+ <Text as='p' weight='medium'>What happens if a user sees multiplevariants?- </p>- <p className='mt-1'>+ </Text>+ <Text as='p' className='mt-1'><strong>Exclude:</strong> Remove them fromanalysis (recommended)- </p>- <p className='mt-0.5'>+ </Text>+ <Text as='p' className='mt-0.5'><strong>First exposure:</strong> Onlycount their first variant- </p>+ </Text></div>}className='flex items-center'diff --git a/web/app/pages/Project/tabs/Experiments/ExperimentsView.tsx b/web/app/pages/Project/tabs/Experiments/ExperimentsView.tsxindex 137711f6f..d1228dede 100644--- a/web/app/pages/Project/tabs/Experiments/ExperimentsView.tsx+++ b/web/app/pages/Project/tabs/Experiments/ExperimentsView.tsx@@ -871,9 +871,14 @@ const ExperimentsView = ({</ul>{_isEmpty(experiments) && filterQuery ? (- <p className='py-8 text-center text-sm text-gray-500 dark:text-gray-400'>+ <Text+ as='p'+ size='sm'+ colour='muted'+ className='py-8 text-center'+ >{t('experiments.noExperimentsMatchFilter')}- </p>+ </Text>) : null}</>)}diff --git a/web/app/pages/Project/tabs/FeatureFlags/FeatureFlagsView.tsx b/web/app/pages/Project/tabs/FeatureFlags/FeatureFlagsView.tsxindex d43944ef4..860a18eb0 100644--- a/web/app/pages/Project/tabs/FeatureFlags/FeatureFlagsView.tsx+++ b/web/app/pages/Project/tabs/FeatureFlags/FeatureFlagsView.tsx@@ -1038,9 +1038,14 @@ const FeatureFlagsViewInner = ({</ul>{_isEmpty(flags) && filterQuery ? (- <p className='py-8 text-center text-sm text-gray-500 dark:text-gray-400'>+ <Text+ as='p'+ size='sm'+ colour='muted'+ className='py-8 text-center'+ >{t('featureFlags.noFlagsMatchFilter')}- </p>+ </Text>) : null}</>)}diff --git a/web/app/pages/Project/tabs/Funnels/FunnelsView.tsx b/web/app/pages/Project/tabs/Funnels/FunnelsView.tsxindex 2bcd1bd8b..5a77c93f0 100644--- a/web/app/pages/Project/tabs/Funnels/FunnelsView.tsx+++ b/web/app/pages/Project/tabs/Funnels/FunnelsView.tsx@@ -359,7 +359,7 @@ const FunnelsViewInner = ({ deferredData }: FunnelsViewInnerProps) => {<div className='relative overflow-hidden rounded-lg border border-gray-200 bg-white p-4 dark:border-slate-800/60 dark:bg-slate-900/25'>{funnelSummary ? (<>- <p className='font-medium text-gray-900 lg:text-left dark:text-gray-50'>+ <Text as='p' weight='medium' className='lg:text-left'>{t('project.funnelSummary.xStepFunnel', {x: funnelSummary.stepsCount,})}@@ -367,14 +367,14 @@ const FunnelsViewInner = ({ deferredData }: FunnelsViewInnerProps) => {{t('project.funnelSummary.conversionRateShort', {x: funnelSummary.conversionRate,})}- </p>- <p className='text-center text-gray-900 lg:text-left dark:text-gray-50'>+ </Text>+ <Text as='p' className='text-center lg:text-left'>{t('project.funnelSummary.startShort')}:{' '}{nLocaleFormatter(funnelSummary.startVisitors)}<span className='mx-1'>→</span>{t('project.funnelSummary.endShort')}:{' '}{nLocaleFormatter(funnelSummary.endVisitors)}- </p>+ </Text></>) : null}{funnelAnalytics?.funnel ? (diff --git a/web/app/pages/Project/tabs/Goals/GoalSettingsModal.tsx b/web/app/pages/Project/tabs/Goals/GoalSettingsModal.tsxindex da7b6a2b4..37112fe94 100644--- a/web/app/pages/Project/tabs/Goals/GoalSettingsModal.tsx+++ b/web/app/pages/Project/tabs/Goals/GoalSettingsModal.tsx@@ -17,6 +17,7 @@ import Button from '~/ui/Button'import Input from '~/ui/Input'import Loader from '~/ui/Loader'import Select from '~/ui/Select'+import { Text } from '~/ui/Text'const GOAL_TYPES = [{ value: 'pageview', label: 'Pageview' },@@ -227,11 +228,11 @@ const GoalSettingsModal = ({selectedItem={GOAL_TYPES.find((t) => t.value === type)}capitalise/>- <p className='mt-1 text-xs text-gray-500 dark:text-gray-400'>+ <Text as='p' size='xs' colour='muted' className='mt-1'>{type === 'pageview'? t('goals.typePageviewDesc'): t('goals.typeCustomEventDesc')}- </p>+ </Text></div><div>@@ -333,9 +334,9 @@ const GoalSettingsModal = ({))}</div>) : (- <p className='text-sm text-gray-500 dark:text-gray-400'>+ <Text as='p' size='sm' colour='muted'>{t('goals.noMetadataFilters')}- </p>+ </Text>)}</div></div>diff --git a/web/app/pages/Project/tabs/Goals/GoalsView.tsx b/web/app/pages/Project/tabs/Goals/GoalsView.tsxindex 99deb3e9e..d6c213c6b 100644--- a/web/app/pages/Project/tabs/Goals/GoalsView.tsx+++ b/web/app/pages/Project/tabs/Goals/GoalsView.tsx@@ -393,14 +393,14 @@ const GoalRow = ({</div>) : stats ? (<>- <p className='text-sm leading-6'>+ <Text as='p' size='sm' className='leading-6'><Text as='span' size='sm' weight='semibold'>{stats.conversions.toLocaleString()}</Text>{' '}<Text as='span' size='sm' colour='secondary'>{t('goals.conversions').toLowerCase()}</Text>- </p>+ </Text><ProgressRingvalue={stats.conversionRate}size={44}@@ -913,9 +913,14 @@ const GoalsViewInner = ({</ul>{_isEmpty(goals) && filterQuery ? (- <p className='py-8 text-center text-sm text-gray-500 dark:text-gray-400'>+ <Text+ as='p'+ size='sm'+ colour='muted'+ className='py-8 text-center'+ >{t('goals.noGoalsMatchFilter')}- </p>+ </Text>) : null}</>)}diff --git a/web/app/pages/Project/tabs/Sessions/NoSessionDetails.tsx b/web/app/pages/Project/tabs/Sessions/NoSessionDetails.tsxindex f801bbac2..dfae8cc1c 100644--- a/web/app/pages/Project/tabs/Sessions/NoSessionDetails.tsx+++ b/web/app/pages/Project/tabs/Sessions/NoSessionDetails.tsx@@ -1,20 +1,27 @@import { SmileySadIcon } from '@phosphor-icons/react'import { useTranslation } from 'react-i18next'+import { Text } from '~/ui/Text'+const NoSessionDetails = () => {const { t } = useTranslation('common')return (- <div className='mx-auto w-full max-w-2xl py-16 text-center text-gray-900 dark:text-gray-50'>+ <div className='mx-auto w-full max-w-2xl py-16 text-center'><div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-900'><SmileySadIcon className='size-7 text-gray-700 dark:text-gray-200' /></div>- <h3 className='text-xl font-medium tracking-tight'>+ <Text as='h3' size='xl' weight='medium' className='tracking-tight'>{t('project.noSessionDetails')}- </h3>- <p className='mx-auto mt-2 max-w-md text-sm whitespace-pre-line text-gray-800 dark:text-gray-200'>+ </Text>+ <Text+ as='p'+ size='sm'+ colour='secondary'+ className='mx-auto mt-2 max-w-md whitespace-pre-line'+ >{t('project.noSessionDesc')}- </p>+ </Text></div>)}diff --git a/web/app/pages/Project/tabs/Sessions/SessionDetailView.tsx b/web/app/pages/Project/tabs/Sessions/SessionDetailView.tsxindex 5af94fb18..0dd99425a 100644--- a/web/app/pages/Project/tabs/Sessions/SessionDetailView.tsx+++ b/web/app/pages/Project/tabs/Sessions/SessionDetailView.tsx@@ -449,9 +449,15 @@ export const SessionDetailView = ({</div><div className='rounded-lg border border-gray-200 bg-white px-4 py-5 dark:border-slate-800/60 dark:bg-slate-900/25'>- <h3 className='mb-4 text-xs font-semibold tracking-wide text-gray-900 uppercase dark:text-gray-50'>+ <Text+ as='h3'+ size='xs'+ weight='semibold'+ tracking='wide'+ className='mb-4 uppercase'+ >{t('project.pageflow')}- </h3>+ </Text><Pageflowpages={activeSession?.pages || []}timeFormat={timeFormat}diff --git a/web/app/pages/Project/tabs/Traffic/TrafficView.tsx b/web/app/pages/Project/tabs/Traffic/TrafficView.tsxindex 19cc0af57..863434212 100644--- a/web/app/pages/Project/tabs/Traffic/TrafficView.tsx+++ b/web/app/pages/Project/tabs/Traffic/TrafficView.tsx@@ -98,6 +98,7 @@ import type { ProjectLoaderData } from '~/routes/projects.$id'import Checkbox from '~/ui/Checkbox'import Dropdown from '~/ui/Dropdown'import LoadingBar from '~/ui/LoadingBar'+import { Text } from '~/ui/Text'import Tooltip from '~/ui/Tooltip'import { getLocaleDisplayName, nLocaleFormatter } from '~/utils/generic'import { groupRefEntries } from '~/utils/referrers'@@ -163,13 +164,22 @@ class TrafficErrorBoundary extends Component<if (this.state.hasError) {return (<div className='flex min-h-[300px] flex-col items-center justify-center rounded-lg border border-red-200 bg-red-50 p-8 dark:border-red-800/50 dark:bg-red-900/20'>- <p className='text-center text-lg font-semibold text-red-600 dark:text-red-400'>+ <Text+ as='p'+ size='lg'+ weight='semibold'+ className='text-center text-red-600 dark:text-red-400'+ >Failed to load traffic data- </p>- <p className='mt-2 text-center text-sm text-red-500 dark:text-red-300'>+ </Text>+ <Text+ as='p'+ size='sm'+ className='mt-2 text-center text-red-500 dark:text-red-300'+ >{this.state.error?.message ||'An unexpected error occurred. Please try again.'}- </p>+ </Text><buttontype='button'onClick={() => window.location.reload()}diff --git a/web/app/pages/Project/tabs/Traffic/UserFlow.tsx b/web/app/pages/Project/tabs/Traffic/UserFlow.tsxindex e0bc87420..c0c9ab975 100644--- a/web/app/pages/Project/tabs/Traffic/UserFlow.tsx+++ b/web/app/pages/Project/tabs/Traffic/UserFlow.tsx@@ -7,6 +7,7 @@ import { toast } from 'sonner'import { useUserFlowProxy } from '~/hooks/useAnalyticsProxy'import type { UserFlowResponse } from '~/api/api.server'import Loader from '~/ui/Loader'+import { Text } from '~/ui/Text'import { useCurrentProject } from '../../../../providers/CurrentProjectProvider'import { useViewProjectContext } from '../../View/ViewProject'@@ -84,9 +85,9 @@ const UserFlow = ({ setReversed, isReversed }: UserFlowProps) => {) {return (<>- <p className='text-md mt-4 flex items-center justify-center text-gray-900 dark:text-gray-50'>+ <Text as='p' className='text-md mt-4 flex items-center justify-center'>{t('project.userFlow.noData')}- </p>+ </Text><buttontype='button'onClick={() => {diff --git a/web/app/pages/UserSettings/UserSettings.tsx b/web/app/pages/UserSettings/UserSettings.tsxindex ec124d315..96a946dee 100644--- a/web/app/pages/UserSettings/UserSettings.tsx+++ b/web/app/pages/UserSettings/UserSettings.tsx@@ -1772,7 +1772,7 @@ const UserSettings = () => {submitDisabled={isCancellingSubscription}message={<div className='space-y-4'>- <p>+ <Text as='p'><Transt={t}i18nKey='pricing.cancelDesc'@@ -1780,24 +1780,16 @@ const UserSettings = () => {email: CONTACT_EMAIL,}}/>- </p>- <div>- <label- htmlFor='cancellation-feedback'- className='block text-sm font-medium text-gray-700 dark:text-gray-300'- >- {t('billing.cancellationFeedbackLabel')}- </label>- <textarea- id='cancellation-feedback'- className='mt-1 block w-full rounded-md border border-gray-300 bg-white px-3 py-2 text-sm shadow-sm focus:border-indigo-500 focus:ring-indigo-500 focus:outline-none dark:border-slate-600 dark:bg-slate-800 dark:text-white'- rows={3}- placeholder={t('billing.cancellationFeedbackPlaceholder')}- value={cancellationFeedback}- onChange={(e) => setCancellationFeedback(e.target.value)}- disabled={isCancellingSubscription}- />- </div>+ </Text>+ <Textarea+ id='cancellation-feedback'+ label={t('billing.cancellationFeedbackLabel')}+ rows={3}+ placeholder={t('billing.cancellationFeedbackPlaceholder')}+ value={cancellationFeedback}+ onChange={(e) => setCancellationFeedback(e.target.value)}+ disabled={isCancellingSubscription}+ /></div>}isOpened={isCancelSubModalOpened}diff --git a/web/app/pages/UserSettings/components/TwoFA.tsx b/web/app/pages/UserSettings/components/TwoFA.tsxindex 7eba9a9ce..1631d5654 100644--- a/web/app/pages/UserSettings/components/TwoFA.tsx+++ b/web/app/pages/UserSettings/components/TwoFA.tsx@@ -10,6 +10,7 @@ import type { UserSettingsActionData } from '~/routes/user-settings'import Alert from '~/ui/Alert'import Button from '~/ui/Button'import Input from '~/ui/Input'+import { Text } from '~/ui/Text'const TwoFA = () => {const { user, mergeUser } = useAuth()@@ -123,9 +124,9 @@ const TwoFA = () => {<Alert variant='warning' className='mb-4'>{t('profileSettings.2faRecoveryWarning')}</Alert>- <p className='mb-4 text-base text-gray-900 dark:text-gray-50'>+ <Text as='p' className='mb-4'>{t('profileSettings.2faRecoveryNote')}- </p>+ </Text><Input className='mt-4' value={twoFARecovery} disabled /><Button size='lg' className='mt-4' onClick={recoverySaved}>{t('profileSettings.2faRecoverySaved')}@@ -138,9 +139,9 @@ const TwoFA = () => {if (twoFADisabling) {return (<>- <p className='max-w-prose text-base text-gray-900 dark:text-gray-50'>+ <Text as='p' className='max-w-prose'>{t('profileSettings.2faDisableHint')}- </p>+ </Text><div className='mt-4 flex items-end gap-2'><Inputlabel={t('profileSettings.enter2faToDisable')}@@ -171,9 +172,9 @@ const TwoFA = () => {<Alert variant='success' className='mb-4'>{t('profileSettings.2faEnabledSuccess')}</Alert>- <p className='max-w-prose text-base text-gray-900 dark:text-gray-50'>+ <Text as='p' className='max-w-prose'>{t('profileSettings.2faEnabled')}- </p>+ </Text><Buttonvariant='danger'size='lg'@@ -189,16 +190,20 @@ const TwoFA = () => {if (twoFAConfigurating) {return (<>- <p className='max-w-prose text-base text-gray-900 dark:text-gray-50'>+ <Text as='p' className='max-w-prose'>{t('profileSettings.2faDesc')}- </p>+ </Text><div className='mt-4 w-max bg-white p-4'><QRCode value={twoFAConfigData?.otpauthUrl || ''} /></div><Alert variant='info' className='mt-4 max-w-prose'>- <p className='font-medium'>{t('profileSettings.2faQRTitle')}</p>- <p className='mt-1'>{t('profileSettings.2faQRHint')}</p>+ <Text as='p' weight='medium' colour='inherit'>+ {t('profileSettings.2faQRTitle')}+ </Text>+ <Text as='p' colour='inherit' className='mt-1'>+ {t('profileSettings.2faQRHint')}+ </Text><code className='mt-2 block rounded bg-sky-100 p-2 font-mono text-sm dark:bg-sky-900/50'>{twoFAConfigData?.secret || ''}</code>diff --git a/web/app/root.tsx b/web/app/root.tsxindex 654ccc105..10e4b2f9b 100644--- a/web/app/root.tsx+++ b/web/app/root.tsx@@ -47,6 +47,7 @@ import {} from '~/lib/constants'import mainCss from '~/styles/index.css?url'import tailwindCss from '~/styles/tailwind.css?url'+import { Text } from '~/ui/Text'import { trackViews, trackErrors, trackError } from '~/utils/analytics'import { getCookie } from '~/utils/cookie'import { detectTheme, isWWW } from '~/utils/server'@@ -171,14 +172,19 @@ export function ErrorBoundary() {</div><div className='py-8'><div className='text-center'>- <h1 className='text-3xl font-bold text-gray-900 sm:text-4xl dark:text-gray-50'>+ <Text+ as='h1'+ size='3xl'+ weight='bold'+ className='sm:text-4xl'+ >{t('errorBoundary.connectionLost')}- </h1>- <p className='mt-3 text-base text-gray-600 dark:text-gray-400'>+ </Text>+ <Text as='p' size='base' colour='muted' className='mt-3'>{t('errorBoundary.connectionLostDesc')}<br />{t('errorBoundary.connectionLostHint')}- </p>+ </Text><buttontype='button'onClick={() => window.location.reload()}@@ -216,15 +222,25 @@ export function ErrorBoundary() {</div><div className='py-8'><div className='text-center'>- <h1 className='text-4xl font-extrabold text-gray-900 sm:text-5xl dark:text-gray-50'>+ <Text as='h1' size='4xl' weight='bold' className='sm:text-5xl'>{t('errorBoundary.crashTitle')}- </h1>- <p className='mt-2 text-base font-medium text-gray-800 dark:text-gray-300'>+ </Text>+ <Text+ as='p'+ size='base'+ weight='medium'+ className='mt-2 text-gray-800 dark:text-gray-300'+ >{t('errorBoundary.crashDesc')}<br />{t('errorBoundary.crashContact', { email: CONTACT_EMAIL })}- </p>- <p className='mt-6 flex flex-col justify-center text-base font-medium text-gray-800 dark:text-gray-300'>+ </Text>+ <Text+ as='p'+ size='base'+ weight='medium'+ className='mt-6 flex flex-col justify-center text-gray-800 dark:text-gray-300'+ >{isRouteErrorResponse(error) ? (<><span>@@ -262,7 +278,7 @@ export function ErrorBoundary() {) : (<>{t('errorBoundary.unknownError')}</>)}- </p>+ </Text></div></div></div>diff --git a/web/app/routes/_index.tsx b/web/app/routes/_index.tsxindex d448e0bb4..7007423a9 100644--- a/web/app/routes/_index.tsx+++ b/web/app/routes/_index.tsx@@ -353,12 +353,17 @@ const Hero = () => {<Header transparent /><section className='mx-auto max-w-7xl px-4 pt-10 pb-5 sm:px-3 lg:grid lg:grid-cols-12 lg:gap-8 lg:px-6 lg:pt-20 xl:px-8'><div className='z-20 col-span-6 flex flex-col items-start'>- <h1 className='max-w-5xl text-left text-5xl font-semibold tracking-tight text-pretty text-slate-900 sm:leading-none lg:mt-6 lg:text-6xl xl:text-7xl dark:text-white'>+ <Text+ as='h1'+ weight='semibold'+ tracking='tight'+ className='max-w-5xl text-left text-5xl text-pretty sm:leading-none lg:mt-6 lg:text-6xl xl:text-7xl'+ >{t('main.slogan')}- </h1>- <p className='mt-4 max-w-2xl text-left text-lg text-slate-900 dark:text-gray-50'>+ </Text>+ <Text as='p' size='lg' className='mt-4 max-w-2xl text-left'>{t('main.description')}- </p>+ </Text><div className='mt-8 flex flex-col items-stretch sm:flex-row sm:items-center'><Linkto={routesPath.signup}diff --git a/web/app/routes/blog._index.tsx b/web/app/routes/blog._index.tsxindex 952c612cc..0baabec26 100644--- a/web/app/routes/blog._index.tsx+++ b/web/app/routes/blog._index.tsx@@ -47,9 +47,9 @@ export default function Posts() {if (_filter(posts, (post) => !post.hidden).length === 0) {return (<div className='flex min-h-min-footer items-center justify-center'>- <h1 className='text-3xl font-bold text-slate-900 dark:text-slate-200'>+ <Text as='h1' size='3xl' weight='bold'>No posts found- </h1>+ </Text></div>)}@@ -83,9 +83,14 @@ export default function Posts() {</svg><div className='relative'><Link to={post.standalone ? `/${post.slug}` : post.slug}>- <h3 className='pt-8 text-base font-semibold text-slate-900 lg:pt-0 dark:text-slate-200'>+ <Text+ as='h3'+ size='base'+ weight='semibold'+ className='pt-8 lg:pt-0'+ >{post.title}- </h3>+ </Text></Link>{post.intro ? (<div className='prose mt-2 mb-4 line-clamp-3 text-sm leading-7 prose-slate dark:text-slate-400'>diff --git a/web/app/routes/google-analytics-alternative.tsx b/web/app/routes/google-analytics-alternative.tsxindex 3a3b28235..3580a8d09 100644--- a/web/app/routes/google-analytics-alternative.tsx+++ b/web/app/routes/google-analytics-alternative.tsx@@ -28,6 +28,7 @@ import {localisePath,} from '~/lib/constants'import { useTheme } from '~/providers/ThemeProvider'+import { Text } from '~/ui/Text'import { cn } from '~/utils/generic'import routes from '~/utils/routes'import { getGeneralStats } from '~/api/api.server'@@ -230,12 +231,17 @@ const Hero = () => {<Header transparent /><section className='mx-auto max-w-7xl px-4 pt-10 pb-5 sm:px-3 lg:grid lg:grid-cols-12 lg:gap-8 lg:px-6 lg:pt-20 xl:px-8'><div className='z-20 col-span-6 flex flex-col items-start'>- <h1 className='max-w-5xl text-left text-5xl font-semibold tracking-tight text-pretty text-slate-900 sm:leading-none lg:mt-6 lg:text-6xl xl:text-7xl dark:text-white'>+ <Text+ as='h1'+ weight='semibold'+ tracking='tight'+ className='max-w-5xl text-left text-5xl text-pretty sm:leading-none lg:mt-6 lg:text-6xl xl:text-7xl'+ >{t('gaAlternative.hero.title')}- </h1>- <p className='mt-4 max-w-2xl text-left text-lg text-slate-900 dark:text-gray-50'>+ </Text>+ <Text as='p' size='lg' className='mt-4 max-w-2xl text-left'>{t('gaAlternative.hero.subtitle')}- </p>+ </Text><div className='mt-8 flex flex-col items-stretch gap-3 sm:flex-row sm:items-center'><Link@@ -314,12 +320,16 @@ const ComparisonTable = () => {return (<section className='relative mx-auto max-w-7xl px-2 py-14 lg:px-8'><div className='mx-auto max-w-3xl text-center'>- <h2 className='text-4xl font-bold text-slate-900 sm:text-5xl dark:text-white'>+ <Text as='h2' size='4xl' weight='bold' className='sm:text-5xl'>{t('gaAlternative.comparison.title')}- </h2>- <p className='mt-4 text-lg text-slate-700 dark:text-gray-200'>+ </Text>+ <Text+ as='p'+ size='lg'+ className='mt-4 text-slate-700 dark:text-gray-200'+ >{t('gaAlternative.comparison.subtitle')}- </p>+ </Text></div><div className='mt-10 overflow-hidden rounded-2xl bg-white ring-1 ring-black/5 dark:bg-slate-950 dark:ring-white/10'>@@ -388,10 +398,22 @@ const WhySwitch = () => {<div className='grid grid-cols-1 gap-12 lg:grid-cols-12 lg:gap-16'>{/* Left column - headline and primary benefit */}<div className='lg:col-span-5'>- <p className='text-sm font-medium tracking-wide text-indigo-600 uppercase dark:text-indigo-400'>+ <Text+ as='p'+ size='sm'+ weight='medium'+ tracking='wide'+ className='text-indigo-600 uppercase dark:text-indigo-400'+ >{t('gaAlternative.whySwitch.label')}- </p>- <h2 className='mt-3 text-3xl leading-snug font-bold tracking-tight text-slate-900 sm:text-4xl sm:leading-snug dark:text-white'>+ </Text>+ <Text+ as='h2'+ size='3xl'+ weight='bold'+ tracking='tight'+ className='mt-3 leading-snug sm:text-4xl sm:leading-snug'+ ><Transi18nKey='gaAlternative.whySwitch.title'components={{@@ -400,10 +422,14 @@ const WhySwitch = () => {),}}/>- </h2>- <p className='mt-5 text-base leading-relaxed text-slate-600 dark:text-slate-300'>+ </Text>+ <Text+ as='p'+ size='base'+ className='mt-5 leading-relaxed text-slate-600 dark:text-slate-300'+ >{t('gaAlternative.whySwitch.subtitle')}- </p>+ </Text>{/* Primary benefit - visually distinct */}<div className='mt-10 border-l-2 border-indigo-500 pl-6'>@@ -412,13 +438,17 @@ const WhySwitch = () => {className='size-5 text-indigo-600 dark:text-indigo-400'weight='duotone'/>- <h3 className='text-lg font-semibold text-slate-900 dark:text-white'>+ <Text as='h3' size='lg' weight='semibold'>{t('gaAlternative.whySwitch.privacy.title')}- </h3>+ </Text></div>- <p className='mt-2 text-sm leading-relaxed text-slate-600 dark:text-slate-400'>+ <Text+ as='p'+ size='sm'+ className='mt-2 leading-relaxed text-slate-600 dark:text-slate-400'+ >{t('gaAlternative.whySwitch.privacy.description')}- </p>+ </Text></div></div>@@ -426,29 +456,47 @@ const WhySwitch = () => {<div className='lg:col-span-7 lg:pt-16'><div className='space-y-10'><div>- <h3 className='flex items-center gap-2.5 text-lg font-semibold text-slate-900 dark:text-white'>+ <Text+ as='h3'+ size='lg'+ weight='semibold'+ className='flex items-center gap-2.5'+ ><GlobeIconclassName='size-5 text-indigo-600 dark:text-indigo-400'weight='duotone'/>{t('gaAlternative.whySwitch.understandable.title')}- </h3>- <p className='mt-2 text-sm leading-relaxed text-slate-600 lg:pl-7 dark:text-slate-400'>+ </Text>+ <Text+ as='p'+ size='sm'+ className='mt-2 leading-relaxed text-slate-600 lg:pl-7 dark:text-slate-400'+ >{t('gaAlternative.whySwitch.understandable.description')}- </p>+ </Text></div><div className='lg:pl-8'>- <h3 className='flex items-center gap-2.5 text-lg font-semibold text-slate-900 dark:text-white'>+ <Text+ as='h3'+ size='lg'+ weight='semibold'+ className='flex items-center gap-2.5'+ ><LightningIconclassName='size-5 text-amber-500 dark:text-amber-400'weight='duotone'/>{t('gaAlternative.whySwitch.actionable.title')}- </h3>- <p className='mt-2 text-sm leading-relaxed text-slate-600 lg:pl-7 dark:text-slate-400'>+ </Text>+ <Text+ as='p'+ size='sm'+ className='mt-2 leading-relaxed text-slate-600 lg:pl-7 dark:text-slate-400'+ >{t('gaAlternative.whySwitch.actionable.description')}- </p>+ </Text></div></div>@@ -491,51 +539,79 @@ const Migration = () => {<section className='relative mx-auto max-w-7xl px-4 py-20 lg:px-8 lg:py-28'><div className='grid grid-cols-1 gap-16 lg:grid-cols-2'><div>- <p className='text-sm font-medium tracking-wide text-indigo-600 uppercase dark:text-indigo-400'>+ <Text+ as='p'+ size='sm'+ weight='medium'+ tracking='wide'+ className='text-indigo-600 uppercase dark:text-indigo-400'+ >{t('gaAlternative.migration.label')}- </p>- <h2 className='mt-3 text-3xl font-bold tracking-tight text-slate-900 sm:text-4xl dark:text-white'>+ </Text>+ <Text+ as='h2'+ size='3xl'+ weight='bold'+ tracking='tight'+ className='mt-3 sm:text-4xl'+ >{t('gaAlternative.migration.title')}- </h2>- <p className='mt-5 text-base leading-relaxed text-slate-600 dark:text-slate-300'>+ </Text>+ <Text+ as='p'+ size='base'+ className='mt-5 leading-relaxed text-slate-600 dark:text-slate-300'+ >{t('gaAlternative.migration.subtitle')}- </p>+ </Text><div className='mt-10 space-y-8'><div className='border-l-2 border-slate-200 pl-6 dark:border-slate-700'><span className='inline-block rounded-full bg-slate-100 px-2.5 py-0.5 text-xs font-semibold text-slate-700 dark:bg-slate-800 dark:text-slate-300'>1</span>- <h3 className='mt-2 text-base font-semibold text-slate-900 dark:text-white'>+ <Text as='h3' size='base' weight='semibold' className='mt-2'>{t('gaAlternative.migration.steps.1.title')}- </h3>- <p className='mt-1 text-sm text-slate-600 dark:text-slate-400'>+ </Text>+ <Text+ as='p'+ size='sm'+ className='mt-1 text-slate-600 dark:text-slate-400'+ >{t('gaAlternative.migration.steps.1.description')}- </p>+ </Text></div><div className='border-l-2 border-slate-200 pl-6 dark:border-slate-700'><span className='inline-block rounded-full bg-slate-100 px-2.5 py-0.5 text-xs font-semibold text-slate-700 dark:bg-slate-800 dark:text-slate-300'>2</span>- <h3 className='mt-2 text-base font-semibold text-slate-900 dark:text-white'>+ <Text as='h3' size='base' weight='semibold' className='mt-2'>{t('gaAlternative.migration.steps.2.title')}- </h3>- <p className='mt-1 text-sm text-slate-600 dark:text-slate-400'>+ </Text>+ <Text+ as='p'+ size='sm'+ className='mt-1 text-slate-600 dark:text-slate-400'+ >{t('gaAlternative.migration.steps.2.description')}- </p>+ </Text></div><div className='border-l-2 border-indigo-500 pl-6'><span className='inline-block rounded-full bg-indigo-100 px-2.5 py-0.5 text-xs font-semibold text-indigo-700 dark:bg-indigo-900/50 dark:text-indigo-300'>3</span>- <h3 className='mt-2 text-base font-semibold text-slate-900 dark:text-white'>+ <Text as='h3' size='base' weight='semibold' className='mt-2'>{t('gaAlternative.migration.steps.3.title')}- </h3>- <p className='mt-1 text-sm text-slate-600 dark:text-slate-400'>+ </Text>+ <Text+ as='p'+ size='sm'+ className='mt-1 text-slate-600 dark:text-slate-400'+ >{t('gaAlternative.migration.steps.3.description')}- </p>+ </Text></div></div></div>diff --git a/web/app/routes/pay.tsx b/web/app/routes/pay.tsxindex 4c580deaf..f6b42e7b2 100644--- a/web/app/routes/pay.tsx+++ b/web/app/routes/pay.tsx@@ -5,6 +5,7 @@ import type { SitemapFunction } from 'remix-sitemap'import { ExternalScriptsHandle } from 'remix-utils/external-scripts'import { isSelfhosted } from '~/lib/constants'+import { Text } from '~/ui/Text'import { getTitle } from '~/utils/seo'export const sitemap: SitemapFunction = () => ({@@ -61,9 +62,9 @@ export default function Index() {return (<div className='min-h-page bg-gray-50 dark:bg-slate-950'><div className='mx-auto px-4 pt-12 pb-16 sm:px-6 md:w-4/5 lg:px-8'>- <h1 className='text-4xl font-bold text-gray-900 dark:text-gray-50'>+ <Text as='h1' size='4xl' weight='bold'>Swetrix Payment- </h1>+ </Text></div></div>)diff --git a/web/app/routes/tools.ab-test-calculator.tsx b/web/app/routes/tools.ab-test-calculator.tsxindex d01f7ba8b..17a88277e 100644--- a/web/app/routes/tools.ab-test-calculator.tsx+++ b/web/app/routes/tools.ab-test-calculator.tsx@@ -200,9 +200,9 @@ export default function ABTestCalculator() {<div className='grid gap-6 md:grid-cols-2'>{/* Control Group */}<div className='rounded-lg bg-white p-6 ring-1 ring-gray-200 dark:bg-slate-950 dark:ring-slate-800'>- <h2 className='mb-4 text-xl font-semibold text-gray-900 dark:text-white'>+ <Text as='h2' size='xl' weight='semibold' className='mb-4'>Control (Variant A)- </h2>+ </Text><div className='space-y-4'><Inputtype='number'@@ -243,9 +243,9 @@ export default function ABTestCalculator() {{/* Variant Group */}<div className='rounded-lg bg-white p-6 ring-1 ring-gray-200 dark:bg-slate-950 dark:ring-slate-800'>- <h2 className='mb-4 text-xl font-semibold text-gray-900 dark:text-white'>+ <Text as='h2' size='xl' weight='semibold' className='mb-4'>Variant (Variant B)- </h2>+ </Text><div className='space-y-4'><Inputtype='number'@@ -313,14 +313,14 @@ export default function ABTestCalculator() {<div className='lg:col-span-1'><div className='sticky top-8 space-y-6'><div className='rounded-lg bg-white p-6 ring-1 ring-gray-200 dark:bg-slate-950 dark:ring-slate-800'>- <h3 className='mb-4 text-lg font-semibold text-gray-900 dark:text-white'>+ <Text as='h3' size='lg' weight='semibold' className='mb-4'>Test Results- </h3>+ </Text>{!results ? (- <p className='text-sm text-gray-500 dark:text-gray-400'>+ <Text as='p' size='sm' colour='muted'>Enter valid data to see results.- </p>+ </Text>) : (<div className='space-y-6'><div@@ -336,18 +336,18 @@ export default function ABTestCalculator() {<WarningCircleIcon className='h-6 w-6 shrink-0 text-gray-500 dark:text-gray-400' />)}<div>- <p className='font-semibold'>+ <Text as='p' weight='semibold'>{results.isSignificant? 'Statistically Significant!': 'Not Significant'}- </p>- <p className='mt-1 text-sm opacity-90'>+ </Text>+ <Text as='p' size='sm' className='mt-1 opacity-90'>{results.isSignificant? `The variant's performance is significantly different from the control at a ${confidenceLevel * 100}% confidence level.`: `The results are not statistically significant. You may need more data or the variation has no real impact.`}- </p>+ </Text></div></div>@@ -480,9 +480,14 @@ export default function ABTestCalculator() {</section><div className='mt-16'>- <h2 className='mb-8 text-center text-3xl font-bold text-gray-900 dark:text-white'>+ <Text+ as='h2'+ size='3xl'+ weight='bold'+ className='mb-8 text-center'+ >Frequently Asked Questions- </h2>+ </Text><FAQ items={FAQ_ITEMS} withStructuredData /></div>diff --git a/web/app/routes/tools.ad-cost-calculator.tsx b/web/app/routes/tools.ad-cost-calculator.tsxindex 1ba503696..a11ad4adb 100644--- a/web/app/routes/tools.ad-cost-calculator.tsx+++ b/web/app/routes/tools.ad-cost-calculator.tsx@@ -135,9 +135,9 @@ export default function AdCostCalculator() {{/* Input Section */}<div className='lg:col-span-2'><div className='rounded-lg bg-white p-8 ring-1 ring-gray-200 dark:bg-slate-950 dark:ring-slate-800'>- <h2 className='mb-6 text-2xl font-semibold text-gray-900 dark:text-white'>+ <Text as='h2' size='2xl' weight='semibold' className='mb-6'>Campaign Data- </h2>+ </Text><div className='grid gap-6 md:grid-cols-2'><Input@@ -219,9 +219,9 @@ export default function AdCostCalculator() {<div className='lg:col-span-1'><div className='sticky top-8 space-y-6'><div className='rounded-lg bg-white p-6 ring-1 ring-gray-200 dark:bg-slate-950 dark:ring-slate-800'>- <h3 className='mb-4 text-lg font-semibold text-gray-900 dark:text-white'>+ <Text as='h3' size='lg' weight='semibold' className='mb-4'>Cost Analysis- </h3>+ </Text><div className='space-y-4'><div className='flex items-center justify-between rounded-lg bg-gray-50 p-4 dark:bg-slate-700/50'>@@ -262,9 +262,15 @@ export default function AdCostCalculator() {</div><div className='mt-6 border-t border-gray-100 pt-6 dark:border-gray-700'>- <h4 className='mb-4 text-sm font-medium text-gray-500 dark:text-gray-400'>+ <Text+ as='h4'+ size='sm'+ weight='medium'+ colour='muted'+ className='mb-4'+ >Performance Rates- </h4>+ </Text><div className='space-y-3'><div className='flex items-center justify-between'><span className='text-sm text-gray-600 dark:text-gray-300'>@@ -359,9 +365,14 @@ export default function AdCostCalculator() {</section><div className='mt-16'>- <h2 className='mb-8 text-center text-3xl font-bold text-gray-900 dark:text-white'>+ <Text+ as='h2'+ size='3xl'+ weight='bold'+ className='mb-8 text-center'+ >Frequently Asked Questions- </h2>+ </Text><FAQ items={FAQ_ITEMS} withStructuredData /></div>diff --git a/web/app/routes/tools.conversion-rate-calculator.tsx b/web/app/routes/tools.conversion-rate-calculator.tsxindex 2e404b176..595204c46 100644--- a/web/app/routes/tools.conversion-rate-calculator.tsx+++ b/web/app/routes/tools.conversion-rate-calculator.tsx@@ -258,9 +258,9 @@ export default function ConversionRateCalculator() {{mode === 'rate' && (<div>- <h2 className='mb-6 text-2xl font-semibold text-gray-900 dark:text-white'>+ <Text as='h2' size='2xl' weight='semibold' className='mb-6'>Calculate Your Conversion Rate- </h2>+ </Text><div className='grid gap-6 md:grid-cols-2'><div>@@ -275,9 +275,9 @@ export default function ConversionRateCalculator() {className='w-full'min='1'/>- <p className='mt-1 text-sm text-gray-500 dark:text-gray-400'>+ <Text as='p' size='sm' colour='muted' className='mt-1'>Total number of visitors or sessions- </p>+ </Text></div><div>@@ -292,9 +292,9 @@ export default function ConversionRateCalculator() {className='w-full'min='0'/>- <p className='mt-1 text-sm text-gray-500 dark:text-gray-400'>+ <Text as='p' size='sm' colour='muted' className='mt-1'>Purchases, signups, or other goals completed- </p>+ </Text></div></div>@@ -306,9 +306,14 @@ export default function ConversionRateCalculator() {{rateResult ? (<div className='mt-6 border-t border-gray-200 pt-6 dark:border-gray-700'>- <h3 className='mb-4 text-lg font-medium text-gray-900 dark:text-white'>+ <Text+ as='h3'+ size='lg'+ weight='medium'+ className='mb-4'+ >Results- </h3>+ </Text><div className='rounded-lg bg-gray-50 p-6 dark:bg-slate-900'><div className='text-center'>@@ -347,11 +352,20 @@ export default function ConversionRateCalculator() {</div><div className='mt-6 rounded-lg bg-indigo-50 p-4 dark:bg-indigo-900/20'>- <h4 className='flex items-center text-lg font-medium text-indigo-900 dark:text-indigo-300'>+ <Text+ as='h4'+ size='lg'+ weight='medium'+ className='flex items-center text-indigo-900 dark:text-indigo-300'+ ><TrendUpIcon className='mr-2 h-5 w-5' />Performance Insights- </h4>- <p className='mt-2 text-sm text-indigo-800 dark:text-indigo-200'>+ </Text>+ <Text+ as='p'+ size='sm'+ className='mt-2 text-indigo-800 dark:text-indigo-200'+ >{rateResult.performance === 'Excellent' &&'Outstanding conversion rate! Your page is performing exceptionally well. Focus on scaling traffic while maintaining quality.'}{rateResult.performance === 'Good' &&@@ -362,7 +376,7 @@ export default function ConversionRateCalculator() {'Below average. Review your landing page copy, user experience, and traffic quality for quick wins.'}{rateResult.performance === 'Poor' &&'Low conversion rate suggests significant friction. Audit your funnel for issues like slow load times, unclear messaging, or poor mobile experience.'}- </p>+ </Text></div></div>) : null}@@ -371,9 +385,9 @@ export default function ConversionRateCalculator() {{mode === 'traffic' && (<div>- <h2 className='mb-6 text-2xl font-semibold text-gray-900 dark:text-white'>+ <Text as='h2' size='2xl' weight='semibold' className='mb-6'>How Much Traffic Do You Need?- </h2>+ </Text><div className='grid gap-6 md:grid-cols-2'><div>@@ -391,9 +405,9 @@ export default function ConversionRateCalculator() {className='w-full'min='1'/>- <p className='mt-1 text-sm text-gray-500 dark:text-gray-400'>+ <Text as='p' size='sm' colour='muted' className='mt-1'>How many conversions you want to achieve- </p>+ </Text></div><div>@@ -409,9 +423,9 @@ export default function ConversionRateCalculator() {min='0.01'step='0.1'/>- <p className='mt-1 text-sm text-gray-500 dark:text-gray-400'>+ <Text as='p' size='sm' colour='muted' className='mt-1'>Your current or expected conversion rate- </p>+ </Text></div></div>@@ -451,9 +465,9 @@ export default function ConversionRateCalculator() {{mode === 'revenue' && (<div>- <h2 className='mb-6 text-2xl font-semibold text-gray-900 dark:text-white'>+ <Text as='h2' size='2xl' weight='semibold' className='mb-6'>Revenue Impact Calculator- </h2>+ </Text><div className='grid gap-6 md:grid-cols-3'><div>@@ -661,9 +675,14 @@ export default function ConversionRateCalculator() {</section><div className='mt-16'>- <h2 className='mb-8 text-center text-3xl font-bold text-gray-900 dark:text-white'>+ <Text+ as='h2'+ size='3xl'+ weight='bold'+ className='mb-8 text-center'+ >Frequently Asked Questions- </h2>+ </Text><FAQ items={FAQ_ITEMS} withStructuredData /></div>diff --git a/web/app/routes/tools.ctr-calculator.tsx b/web/app/routes/tools.ctr-calculator.tsxindex ecfd27c4a..db3179ccb 100644--- a/web/app/routes/tools.ctr-calculator.tsx+++ b/web/app/routes/tools.ctr-calculator.tsx@@ -163,9 +163,9 @@ export default function CTRCalculator() {<div className='mt-12 rounded-lg bg-white p-8 ring-1 ring-gray-200 dark:bg-slate-950 dark:ring-slate-800'><div className='space-y-6'><div>- <h2 className='mb-6 text-2xl font-semibold text-gray-900 dark:text-white'>+ <Text as='h2' size='2xl' weight='semibold' className='mb-6'>Calculate Your CTR- </h2>+ </Text><div className='grid gap-6 md:grid-cols-2'><div>@@ -180,9 +180,9 @@ export default function CTRCalculator() {className='w-full'min='0'/>- <p className='mt-1 text-sm text-gray-500 dark:text-gray-400'>+ <Text as='p' size='sm' colour='muted' className='mt-1'>How many times your ad was clicked- </p>+ </Text></div><div>@@ -197,9 +197,9 @@ export default function CTRCalculator() {className='w-full'min='1'/>- <p className='mt-1 text-sm text-gray-500 dark:text-gray-400'>+ <Text as='p' size='sm' colour='muted' className='mt-1'>How many times your ad was shown- </p>+ </Text></div></div>@@ -210,9 +210,9 @@ export default function CTRCalculator() {{result ? (<div className='border-t border-gray-200 pt-6 dark:border-gray-700'>- <h3 className='mb-4 text-lg font-medium text-gray-900 dark:text-white'>+ <Text as='h3' size='lg' weight='medium' className='mb-4'>Results- </h3>+ </Text><div className='rounded-lg bg-gray-50 p-6 dark:bg-slate-700/50'><div className='text-center'>@@ -250,11 +250,20 @@ export default function CTRCalculator() {</div><div className='mt-6 rounded-lg bg-indigo-50 p-4 dark:bg-indigo-900/20'>- <h4 className='flex items-center text-lg font-medium text-indigo-900 dark:text-indigo-300'>+ <Text+ as='h4'+ size='lg'+ weight='medium'+ className='flex items-center text-indigo-900 dark:text-indigo-300'+ ><TrendUpIcon className='mr-2 h-5 w-5' />Performance Insights- </h4>- <p className='mt-2 text-sm text-indigo-800 dark:text-indigo-200'>+ </Text>+ <Text+ as='p'+ size='sm'+ className='mt-2 text-indigo-800 dark:text-indigo-200'+ >{result.performance === 'Excellent'? 'Outstanding CTR! Your ads are highly engaging and relevant to your audience. Keep up the great work!': null}@@ -270,7 +279,7 @@ export default function CTRCalculator() {{result.performance === 'Poor'? 'Low CTR indicates your ads may not be resonating with your audience. Consider a comprehensive review of your campaign strategy.': null}- </p>+ </Text></div></div>) : null}@@ -368,9 +377,14 @@ export default function CTRCalculator() {</section><div className='mt-16'>- <h2 className='mb-8 text-center text-3xl font-bold text-gray-900 dark:text-white'>+ <Text+ as='h2'+ size='3xl'+ weight='bold'+ className='mb-8 text-center'+ >Frequently Asked Questions- </h2>+ </Text><FAQ items={FAQ_ITEMS} withStructuredData /></div>diff --git a/web/app/routes/tools.ltv-calculator.tsx b/web/app/routes/tools.ltv-calculator.tsxindex 7ebac8256..9398a6f02 100644--- a/web/app/routes/tools.ltv-calculator.tsx+++ b/web/app/routes/tools.ltv-calculator.tsx@@ -144,9 +144,9 @@ export default function LTVCalculator() {{/* Input Section */}<div className='lg:col-span-2'><div className='rounded-lg bg-white p-8 ring-1 ring-gray-200 dark:bg-slate-950 dark:ring-slate-800'>- <h2 className='mb-6 text-2xl font-semibold text-gray-900 dark:text-white'>+ <Text as='h2' size='2xl' weight='semibold' className='mb-6'>Business Metrics- </h2>+ </Text><div className='grid gap-6 md:grid-cols-2'><Input@@ -248,28 +248,33 @@ export default function LTVCalculator() {<div className='lg:col-span-1'><div className='sticky top-8 space-y-6'><div className='rounded-lg bg-white p-6 ring-1 ring-gray-200 dark:bg-slate-950 dark:ring-slate-800'>- <h3 className='mb-4 text-lg font-semibold text-gray-900 dark:text-white'>+ <Text as='h3' size='lg' weight='semibold' className='mb-4'>LTV Results- </h3>+ </Text><div className='space-y-6'><div>- <p className='mb-1 text-sm text-gray-600 dark:text-gray-400'>+ <Text as='p' size='sm' colour='muted' className='mb-1'>Profit LTV- </p>- <p className='flex items-center gap-2 text-3xl font-bold text-gray-900 dark:text-white'>+ </Text>+ <Text+ as='p'+ size='3xl'+ weight='bold'+ className='flex items-center gap-2'+ ><ChartLineUpIcon className='h-6 w-6 text-indigo-500' />{formatCurrency(profitLtv)}- </p>- <p className='mt-1 text-xs text-gray-500'>+ </Text>+ <Text as='p' size='xs' colour='muted' className='mt-1'>Revenue LTV: {formatCurrency(ltv)}- </p>+ </Text></div><div className='border-t border-gray-100 pt-4 dark:border-gray-700'>- <p className='mb-1 text-sm text-gray-600 dark:text-gray-400'>+ <Text as='p' size='sm' colour='muted' className='mb-1'>LTV:CAC Ratio- </p>+ </Text><pclassName={`text-2xl font-bold ${getRatioColor(ltvCacRatio,@@ -277,13 +282,13 @@ export default function LTVCalculator() {>{ltvCacRatio.toFixed(2)}:1</p>- <p className='mt-1 text-xs text-gray-500'>+ <Text as='p' size='xs' colour='muted' className='mt-1'>{ltvCacRatio >= 3? 'Excellent ratio! Healthy growth potential.': ltvCacRatio >= 1? 'Needs improvement. Low profitability.': 'Unsustainable. You lose money on each customer.'}- </p>+ </Text></div></div></div>@@ -362,9 +367,14 @@ export default function LTVCalculator() {</section><div className='mt-16'>- <h2 className='mb-8 text-center text-3xl font-bold text-gray-900 dark:text-white'>+ <Text+ as='h2'+ size='3xl'+ weight='bold'+ className='mb-8 text-center'+ >Frequently Asked Questions- </h2>+ </Text><FAQ items={FAQ_ITEMS} withStructuredData /></div>diff --git a/web/app/routes/tools.meta-tags-generator.tsx b/web/app/routes/tools.meta-tags-generator.tsxindex cee99c316..6cc513f1a 100644--- a/web/app/routes/tools.meta-tags-generator.tsx+++ b/web/app/routes/tools.meta-tags-generator.tsx@@ -124,9 +124,9 @@ ${imageUrl ? `<meta property="twitter:image" content="${imageUrl}" />\n` : ''}${<div className='mt-12 grid gap-8 lg:grid-cols-2'>{/* Input Section */}<div className='rounded-lg bg-white p-6 ring-1 ring-gray-200 dark:bg-slate-950 dark:ring-slate-800'>- <h2 className='mb-6 text-xl font-semibold text-gray-900 dark:text-white'>+ <Text as='h2' size='xl' weight='semibold' className='mb-6'>Page Information- </h2>+ </Text><div className='space-y-4'><Inputtype='text'@@ -222,9 +222,14 @@ ${imageUrl ? `<meta property="twitter:image" content="${imageUrl}" />\n` : ''}${<div className='mb-4 flex items-center justify-between'><div className='flex items-center gap-2'><CodeIcon className='h-5 w-5 text-gray-400' />- <h3 className='text-lg font-medium text-white'>+ <Text+ as='h3'+ size='lg'+ weight='medium'+ className='text-white'+ >Generated HTML- </h3>+ </Text></div></div>@@ -236,9 +241,9 @@ ${imageUrl ? `<meta property="twitter:image" content="${imageUrl}" />\n` : ''}${{/* Social Preview section (Simplified) */}<div className='mt-8 rounded-lg bg-white p-6 ring-1 ring-gray-200 dark:bg-slate-950 dark:ring-slate-800'>- <h2 className='mb-6 text-xl font-semibold text-gray-900 dark:text-white'>+ <Text as='h2' size='xl' weight='semibold' className='mb-6'>Social Preview Example (Twitter/X)- </h2>+ </Text><div className='mx-auto max-w-md overflow-hidden rounded-xl border border-gray-200 bg-white dark:border-slate-800 dark:bg-slate-900'>{data.imageUrl ? (<div className='aspect-[1.91/1] w-full overflow-hidden bg-gray-100 dark:bg-slate-800'>@@ -268,7 +273,7 @@ ${imageUrl ? `<meta property="twitter:image" content="${imageUrl}" />\n` : ''}${</div>)}<div className='border-t border-gray-200 p-3 dark:border-slate-800'>- <p className='truncate text-sm text-gray-500 dark:text-gray-400'>+ <Text as='p' size='sm' colour='muted' className='truncate'>{data.url? new URL(data.url.startsWith('http')@@ -276,13 +281,18 @@ ${imageUrl ? `<meta property="twitter:image" content="${imageUrl}" />\n` : ''}${: `https://${data.url}`,).hostname: 'example.com'}- </p>- <p className='mt-0.5 truncate font-semibold text-gray-900 dark:text-white'>+ </Text>+ <Text as='p' weight='semibold' className='mt-0.5 truncate'>{data.title || 'Page Title'}- </p>- <p className='mt-1 line-clamp-2 text-sm text-gray-500 dark:text-gray-400'>+ </Text>+ <Text+ as='p'+ size='sm'+ colour='muted'+ className='mt-1 line-clamp-2'+ >{data.description || 'Page description goes here...'}- </p>+ </Text></div></div></div>@@ -379,9 +389,14 @@ ${imageUrl ? `<meta property="twitter:image" content="${imageUrl}" />\n` : ''}${</section><div className='mt-16'>- <h2 className='mb-8 text-center text-3xl font-bold text-gray-900 dark:text-white'>+ <Text+ as='h2'+ size='3xl'+ weight='bold'+ className='mb-8 text-center'+ >Frequently Asked Questions- </h2>+ </Text><FAQ items={FAQ_ITEMS} withStructuredData /></div>diff --git a/web/app/routes/tools.og-preview.tsx b/web/app/routes/tools.og-preview.tsxindex 11560c111..8506c295f 100644--- a/web/app/routes/tools.og-preview.tsx+++ b/web/app/routes/tools.og-preview.tsx@@ -285,9 +285,9 @@ export default function OGPreview() {<div className='mt-12 rounded-lg bg-white p-8 ring-1 ring-gray-200 dark:bg-slate-950 dark:ring-slate-800'><div className='space-y-6'>- <h2 className='text-2xl font-semibold text-gray-900 dark:text-white'>+ <Text as='h2' size='2xl' weight='semibold'>Enter your Open Graph data- </h2>+ </Text><div className='space-y-4'><Input@@ -335,9 +335,9 @@ export default function OGPreview() {</div><div className='border-t border-gray-200 pt-6 dark:border-gray-700'>- <h3 className='mb-4 text-lg font-medium text-gray-900 dark:text-white'>+ <Text as='h3' size='lg' weight='medium' className='mb-4'>Preview- </h3>+ </Text><div className='mb-4 flex gap-1 rounded-lg bg-gray-100 p-1 dark:bg-slate-900'>{PLATFORMS.map((p) => (@@ -465,9 +465,14 @@ export default function OGPreview() {</section><div className='mt-16'>- <h2 className='mb-8 text-center text-3xl font-bold text-gray-900 dark:text-white'>+ <Text+ as='h2'+ size='3xl'+ weight='bold'+ className='mb-8 text-center'+ >Frequently Asked Questions- </h2>+ </Text><FAQ items={FAQ_ITEMS} withStructuredData /></div>diff --git a/web/app/routes/tools.percentage-calculator.tsx b/web/app/routes/tools.percentage-calculator.tsxindex afc10a0fd..188971840 100644--- a/web/app/routes/tools.percentage-calculator.tsx+++ b/web/app/routes/tools.percentage-calculator.tsx@@ -223,9 +223,9 @@ export default function PercentageCalculator() {{mode === 'of' && (<div>- <h2 className='mb-6 text-2xl font-semibold text-gray-900 dark:text-white'>+ <Text as='h2' size='2xl' weight='semibold' className='mb-6'>What is X% of Y?- </h2>+ </Text><div className='flex items-end gap-3'><div className='flex-1'>@@ -292,9 +292,9 @@ export default function PercentageCalculator() {{mode === 'is' && (<div>- <h2 className='mb-6 text-2xl font-semibold text-gray-900 dark:text-white'>+ <Text as='h2' size='2xl' weight='semibold' className='mb-6'>X is what percent of Y?- </h2>+ </Text><div className='flex items-end gap-3'><div className='flex-1'>@@ -362,9 +362,9 @@ export default function PercentageCalculator() {{mode === 'change' && (<div>- <h2 className='mb-6 text-2xl font-semibold text-gray-900 dark:text-white'>+ <Text as='h2' size='2xl' weight='semibold' className='mb-6'>Percentage Change- </h2>+ </Text><div className='flex items-end gap-3'><div className='flex-1'>@@ -548,9 +548,14 @@ export default function PercentageCalculator() {</section><div className='mt-16'>- <h2 className='mb-8 text-center text-3xl font-bold text-gray-900 dark:text-white'>+ <Text+ as='h2'+ size='3xl'+ weight='bold'+ className='mb-8 text-center'+ >Frequently Asked Questions- </h2>+ </Text><FAQ items={FAQ_ITEMS} withStructuredData /></div>diff --git a/web/app/routes/tools.qr-code-generator.tsx b/web/app/routes/tools.qr-code-generator.tsxindex 2dd63394a..2aefea21c 100644--- a/web/app/routes/tools.qr-code-generator.tsx+++ b/web/app/routes/tools.qr-code-generator.tsx@@ -104,9 +104,9 @@ export default function QRCodeGenerator() {<div className='mt-12 grid gap-8 lg:grid-cols-2'>{/* Input Section */}<div className='rounded-lg bg-white p-8 ring-1 ring-gray-200 dark:bg-slate-950 dark:ring-slate-800'>- <h2 className='mb-6 text-xl font-semibold text-gray-900 dark:text-white'>+ <Text as='h2' size='xl' weight='semibold' className='mb-6'>Configuration- </h2>+ </Text><div className='space-y-6'><div>@@ -157,20 +157,24 @@ export default function QRCodeGenerator() {</div><div className='rounded-md bg-blue-50 p-4 dark:bg-blue-900/20'>- <p className='text-sm text-blue-800 dark:text-blue-300'>+ <Text+ as='p'+ size='sm'+ className='text-blue-800 dark:text-blue-300'+ ><strong>Pro tip:</strong> Pair this with our UTM Generatortool to track how many people scan your QR codes in youranalytics dashboard!- </p>+ </Text></div></div></div>{/* Preview & Download Section */}<div className='flex flex-col items-center rounded-lg bg-white p-8 ring-1 ring-gray-200 dark:bg-slate-950 dark:ring-slate-800'>- <h3 className='mb-6 text-xl font-semibold text-gray-900 dark:text-white'>+ <Text as='h3' size='xl' weight='semibold' className='mb-6'>Preview- </h3>+ </Text><div className='flex flex-col items-center justify-center space-y-8'><div className='rounded-xl bg-gray-50 p-6 ring-1 ring-gray-200 dark:bg-slate-900 dark:ring-slate-700'>@@ -301,9 +305,14 @@ export default function QRCodeGenerator() {</section><div className='mt-16'>- <h2 className='mb-8 text-center text-3xl font-bold text-gray-900 dark:text-white'>+ <Text+ as='h2'+ size='3xl'+ weight='bold'+ className='mb-8 text-center'+ >Frequently Asked Questions- </h2>+ </Text><FAQ items={FAQ_ITEMS} withStructuredData /></div>diff --git a/web/app/routes/tools.robots-txt-generator.tsx b/web/app/routes/tools.robots-txt-generator.tsxindex 320a5d74a..c41a11e35 100644--- a/web/app/routes/tools.robots-txt-generator.tsx+++ b/web/app/routes/tools.robots-txt-generator.tsx@@ -228,9 +228,9 @@ export default function RobotsTxtGenerator() {{/* Input Section */}<div className='space-y-6'><div className='rounded-lg bg-white p-6 ring-1 ring-gray-200 dark:bg-slate-950 dark:ring-slate-800'>- <h2 className='mb-4 text-xl font-semibold text-gray-900 dark:text-white'>+ <Text as='h2' size='xl' weight='semibold' className='mb-4'>Global Settings- </h2>+ </Text><Inputtype='url'label='Sitemap URL'@@ -247,9 +247,9 @@ export default function RobotsTxtGenerator() {className='rounded-lg bg-white p-6 ring-1 ring-gray-200 dark:bg-slate-950 dark:ring-slate-900'><div className='mb-4 flex items-center justify-between'>- <h2 className='text-xl font-semibold text-gray-900 dark:text-white'>+ <Text as='h2' size='xl' weight='semibold'>Crawler Rules {groupIndex + 1}- </h2>+ </Text>{agentGroups.length > 1 && (<buttontype='button'@@ -400,9 +400,14 @@ export default function RobotsTxtGenerator() {<div className='mb-4 flex flex-wrap items-center justify-between gap-3'><div className='flex items-center gap-2'><CodeIcon className='h-5 w-5 text-gray-400' />- <h3 className='text-lg font-medium text-white'>+ <Text+ as='h3'+ size='lg'+ weight='medium'+ className='text-white'+ >robots.txt- </h3>+ </Text></div><div className='flex items-center gap-2'><Button@@ -450,9 +455,9 @@ export default function RobotsTxtGenerator() {</Text><div className='mt-12'>- <h3 className='mb-8 text-2xl font-bold text-gray-900 dark:text-white'>+ <Text as='h3' size='2xl' weight='bold' className='mb-8'>Frequently Asked Questions- </h3>+ </Text><FAQ items={FAQ_ITEMS} withStructuredData /></div>diff --git a/web/app/routes/tools.roi-calculator.tsx b/web/app/routes/tools.roi-calculator.tsxindex ba7c612f5..da3f82b03 100644--- a/web/app/routes/tools.roi-calculator.tsx+++ b/web/app/routes/tools.roi-calculator.tsx@@ -233,9 +233,9 @@ export default function ROICalculator() {{/* Input Section */}<div className='lg:col-span-2'><div className='rounded-lg bg-white p-8 ring-1 ring-gray-200 dark:bg-slate-950 dark:ring-slate-800'>- <h2 className='mb-6 text-2xl font-semibold text-gray-900 dark:text-white'>+ <Text as='h2' size='2xl' weight='semibold' className='mb-6'>Campaign Metrics- </h2>+ </Text><div className='space-y-6'><Input@@ -385,9 +385,9 @@ export default function ROICalculator() {<div className='sticky top-8 space-y-6'>{/* Primary Metrics */}<div className='rounded-lg bg-white p-6 ring-1 ring-gray-200 dark:bg-slate-950 dark:ring-slate-800'>- <h3 className='mb-4 text-lg font-semibold text-gray-900 dark:text-white'>+ <Text as='h3' size='lg' weight='semibold' className='mb-4'>Key Performance Metrics- </h3>+ </Text><div className='space-y-4'><div className='flex items-center justify-between rounded-lg bg-gray-50 p-4 dark:bg-slate-700/50'>@@ -436,9 +436,9 @@ export default function ROICalculator() {{/* Secondary Metrics */}<div className='rounded-lg bg-white p-6 ring-1 ring-gray-200 dark:bg-slate-950 dark:ring-slate-800'>- <h3 className='mb-4 text-lg font-semibold text-gray-900 dark:text-white'>+ <Text as='h3' size='lg' weight='semibold' className='mb-4'>Detailed Metrics- </h3>+ </Text><div className='space-y-3'><div className='flex justify-between'>@@ -513,10 +513,15 @@ export default function ROICalculator() {{/* Performance Indicator */}{metrics.adSpend > 0 ? (<div className='rounded-xl bg-gradient-to-r from-indigo-500 to-purple-600 p-6 text-white'>- <h3 className='mb-2 text-lg font-semibold'>+ <Text+ as='h3'+ size='lg'+ weight='semibold'+ className='mb-2'+ >Campaign Performance- </h3>- <p className='text-sm opacity-90'>+ </Text>+ <Text as='p' size='sm' className='opacity-90'>{calculated.roas >= 4? 'Excellent! Your campaign is highly profitable.': calculated.roas >= 2@@ -524,7 +529,7 @@ export default function ROICalculator() {: calculated.roas >= 1? 'Breaking even. Optimization needed to improve profitability.': 'Campaign is not profitable. Major adjustments required.'}- </p>+ </Text></div>) : null}</div>@@ -601,9 +606,14 @@ export default function ROICalculator() {</section><div className='mt-16'>- <h2 className='mb-8 text-center text-3xl font-bold text-gray-900 dark:text-white'>+ <Text+ as='h2'+ size='3xl'+ weight='bold'+ className='mb-8 text-center'+ >Frequently Asked Questions- </h2>+ </Text><FAQ items={FAQ_ITEMS} withStructuredData /></div>diff --git a/web/app/routes/tools.schema-markup-generator.tsx b/web/app/routes/tools.schema-markup-generator.tsxindex d6f8779e4..e1a18958c 100644--- a/web/app/routes/tools.schema-markup-generator.tsx+++ b/web/app/routes/tools.schema-markup-generator.tsx@@ -457,9 +457,14 @@ export default function SchemaMarkupGenerator() {<div className='mb-4 flex items-center justify-between'><div className='flex items-center gap-2'><CodeIcon className='h-5 w-5 text-gray-400' />- <h3 className='text-lg font-medium text-white'>+ <Text+ as='h3'+ size='lg'+ weight='medium'+ className='text-white'+ >Generated JSON-LD- </h3>+ </Text></div><Buttonvariant='secondary'@@ -497,9 +502,9 @@ export default function SchemaMarkupGenerator() {</Text><div className='mt-12'>- <h3 className='mb-8 text-2xl font-bold text-gray-900 dark:text-white'>+ <Text as='h3' size='2xl' weight='bold' className='mb-8'>Frequently Asked Questions- </h3>+ </Text><FAQ items={FAQ_ITEMS} withStructuredData /></div>diff --git a/web/app/routes/tools.utm-generator.tsx b/web/app/routes/tools.utm-generator.tsxindex 523da7c4a..a6f6ac986 100644--- a/web/app/routes/tools.utm-generator.tsx+++ b/web/app/routes/tools.utm-generator.tsx@@ -222,9 +222,9 @@ export default function UTMGenerator() {<div className='mt-12 rounded-lg bg-white p-8 ring-1 ring-gray-200 dark:bg-slate-950 dark:ring-slate-800'><div className='space-y-6'><div>- <h2 className='mb-6 text-2xl font-semibold text-gray-900 dark:text-white'>+ <Text as='h2' size='2xl' weight='semibold' className='mb-6'>Build your UTM link- </h2>+ </Text><div className='space-y-6'><Input@@ -238,9 +238,14 @@ export default function UTMGenerator() {<div className='grid gap-6 md:grid-cols-2'><div>- <h3 className='mb-4 text-lg font-medium text-gray-900 dark:text-white'>+ <Text+ as='h3'+ size='lg'+ weight='medium'+ className='mb-4'+ >Campaign parameters- </h3>+ </Text><div className='space-y-4'><div>@@ -312,9 +317,14 @@ export default function UTMGenerator() {</div><div>- <h3 className='mb-4 text-lg font-medium text-gray-900 dark:text-white'>+ <Text+ as='h3'+ size='lg'+ weight='medium'+ className='mb-4'+ >Optional parameters- </h3>+ </Text><div className='space-y-4'><div>@@ -365,9 +375,9 @@ export default function UTMGenerator() {</div><div className='border-t border-gray-200 pt-6 dark:border-gray-700'>- <h3 className='mb-4 text-lg font-medium text-gray-900 dark:text-white'>+ <Text as='h3' size='lg' weight='medium' className='mb-4'>Result- </h3>+ </Text><div className='flex flex-col items-center gap-2 md:flex-row'><Inputtype='text'@@ -477,9 +487,14 @@ export default function UTMGenerator() {</section><div className='mt-16'>- <h2 className='mb-8 text-center text-3xl font-bold text-gray-900 dark:text-white'>+ <Text+ as='h2'+ size='3xl'+ weight='bold'+ className='mb-8 text-center'+ >Frequently Asked Questions- </h2>+ </Text><div className='space-y-4'><FAQ items={FAQ_ITEMS} withStructuredData />diff --git a/web/app/ui/Text.tsx b/web/app/ui/Text.tsxindex 20820d42b..f92497455 100644--- a/web/app/ui/Text.tsx+++ b/web/app/ui/Text.tsx@@ -13,6 +13,9 @@ type TextElement =| 'h6'| 'label'| 'div'+ | 'li'+ | 'dt'+ | 'dd'type TextSize =| 'xxs'| 'xs'