📈 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
Consolidate icons & improve UI (#469)
Andrii Romasiunf112ce38cfcf
diff --git a/docs/package-lock.json b/docs/package-lock.jsonindex 86f9abff5..9e0846d43 100644--- a/docs/package-lock.json+++ b/docs/package-lock.json@@ -12,9 +12,9 @@"@docusaurus/preset-classic": "3.9.2","@mdx-js/react": "^3.0.0","@node-rs/jieba": "^1.7.0",+ "@phosphor-icons/react": "^2.1.10","autoprefixer": "^10.4.14","clsx": "^2.1.0",- "lucide-react": "^0.544.0","postcss": "^8.4.23","prism-react-renderer": "^2.3.0","prismjs": "^1.29.0",@@ -4810,6 +4810,19 @@"win32"]},+ "node_modules/@phosphor-icons/react": {+ "version": "2.1.10",+ "resolved": "https://registry.npmjs.org/@phosphor-icons/react/-/react-2.1.10.tgz",+ "integrity": "sha512-vt8Tvq8GLjheAZZYa+YG/pW7HDbov8El/MANW8pOAz4eGxrwhnbfrQZq0Cp4q8zBEu8NIhHdnr+r8thnfRSNYA==",+ "license": "MIT",+ "engines": {+ "node": ">=10"+ },+ "peerDependencies": {+ "react": ">= 16.8",+ "react-dom": ">= 16.8"+ }+ },"node_modules/@pnpm/config.env-replace": {"version": "1.1.0","resolved": "https://registry.npmjs.org/@pnpm/config.env-replace/-/config.env-replace-1.1.0.tgz",@@ -10611,15 +10624,6 @@"yallist": "^3.0.2"}},- "node_modules/lucide-react": {- "version": "0.544.0",- "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.544.0.tgz",- "integrity": "sha512-t5tS44bqd825zAW45UQxpG2CvcC4urOwn2TrwSH8u+MjeE+1NnWl6QqeQ/6NdjMqdOygyiT9p3Ev0p1NJykxjw==",- "license": "ISC",- "peerDependencies": {- "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0"- }- },"node_modules/markdown-extensions": {"version": "2.0.0","resolved": "https://registry.npmjs.org/markdown-extensions/-/markdown-extensions-2.0.0.tgz",diff --git a/docs/package.json b/docs/package.jsonindex 4190e6653..a6539f9b9 100644--- a/docs/package.json+++ b/docs/package.json@@ -22,7 +22,7 @@"@node-rs/jieba": "^1.7.0","autoprefixer": "^10.4.14","clsx": "^2.1.0",- "lucide-react": "^0.544.0",+ "@phosphor-icons/react": "^2.1.10","postcss": "^8.4.23","prism-react-renderer": "^2.3.0","prismjs": "^1.29.0",diff --git a/docs/src/components/FeedbackWidget.jsx b/docs/src/components/FeedbackWidget.jsxindex 4710beda6..05eb28df1 100644--- a/docs/src/components/FeedbackWidget.jsx+++ b/docs/src/components/FeedbackWidget.jsx@@ -1,6 +1,6 @@import React, { useEffect, useMemo, useState } from 'react'import { useLocation } from '@docusaurus/router'-import { ThumbsUpIcon, ThumbsDownIcon } from 'lucide-react'+import { ThumbsUpIcon, ThumbsDownIcon } from '@phosphor-icons/react'import Link from '@docusaurus/Link'const FEEDBACK_TTL_DAYS = 7diff --git a/web/app/components/EventsRunningOutBanner.tsx b/web/app/components/EventsRunningOutBanner.tsxindex 9c6705445..3d6d9e945 100644--- a/web/app/components/EventsRunningOutBanner.tsx+++ b/web/app/components/EventsRunningOutBanner.tsx@@ -1,4 +1,4 @@-import { ExclamationTriangleIcon, XMarkIcon } from '@heroicons/react/24/outline'+import { WarningOctagonIcon, XIcon } from '@phosphor-icons/react'import { memo, useMemo, useState } from 'react'import { useTranslation } from 'react-i18next'@@ -48,7 +48,7 @@ const EventsRunningOutBanner = () => {<div className='flex flex-wrap items-center justify-between'><div className='flex flex-1 items-center'><span className='flex rounded-lg bg-yellow-600 p-2'>- <ExclamationTriangleIcon+ <WarningOctagonIconclassName='h-6 w-6 text-white'aria-hidden='true'/>@@ -79,7 +79,7 @@ const EventsRunningOutBanner = () => {className='-mr-1 flex rounded-md p-2 hover:bg-yellow-500 focus:ring-2 focus:ring-white focus:outline-hidden sm:-mr-2'><span className='sr-only'>{t('common.close')}</span>- <XMarkIcon className='h-6 w-6 text-black' aria-hidden='true' />+ <XIcon className='h-6 w-6 text-black' aria-hidden='true' /></button></div></div>diff --git a/web/app/components/ExitIntentPopup.tsx b/web/app/components/ExitIntentPopup.tsxindex 5176f1282..c4f3c1cf9 100644--- a/web/app/components/ExitIntentPopup.tsx+++ b/web/app/components/ExitIntentPopup.tsx@@ -1,4 +1,4 @@-import { XIcon } from 'lucide-react'+import { XIcon } from '@phosphor-icons/react'import { useEffect, useRef, useState } from 'react'import { useTranslation } from 'react-i18next'import { Link } from 'react-router'diff --git a/web/app/components/Footer/index.tsx b/web/app/components/Footer/index.tsxindex 531e67c7b..3a6f64a16 100644--- a/web/app/components/Footer/index.tsx+++ b/web/app/components/Footer/index.tsx@@ -1,7 +1,32 @@-import { MoonIcon, SunIcon } from '@heroicons/react/24/solid'-import { SiGithub } from '@icons-pack/react-simple-icons'+import {+ MoonIcon,+ SunIcon,+ GithubLogoIcon,+ GaugeIcon,+ ShieldCheckIcon,+ BookOpenIcon,+ CurrencyDollarIcon,+ LinkIcon,+ CursorClickIcon,+ ChartPieIcon,+ GlobeIcon,+ TreeStructureIcon,+ LockKeyIcon,+ PulseIcon,+ ArticleIcon,+ EnvelopeIcon,+ CloudIcon,+ HeartIcon,+ DiscordLogoIcon,+ XLogoIcon,+ LinkedinLogoIcon,+ type IconProps,+ ChartBarIcon,+ WarningIcon,+ ArrowsHorizontalIcon,+} from '@phosphor-icons/react'import _map from 'lodash/map'-import React, { memo } from 'react'+import React, { memo, type FC } from 'react'import { Trans, useTranslation } from 'react-i18next'import { Link } from 'react-router'@@ -28,160 +53,334 @@ import routesPath from '~/utils/routes'export const CONTACT_US_URL = `https://swetrix.com${routesPath.contact}`-const products = [+interface NavItem {+ key?: string+ name?: string+ href: string+ internal?: boolean+ icon: FC<IconProps>+ iconColor: string+}++interface LegalItem {+ key: string+ href: string+ internal: boolean+}++const products: NavItem[] = [{key: 'header.solutions.analytics.title',href: routesPath.main,internal: true,+ icon: ChartBarIcon,+ iconColor: 'text-indigo-400',},{key: 'header.solutions.performance.title',href: routesPath.performance,internal: true,+ icon: GaugeIcon,+ iconColor: 'text-amber-400',},{key: 'header.solutions.errors.title',href: routesPath.errorTracking,internal: true,+ icon: WarningIcon,+ iconColor: 'text-rose-400',},{key: 'header.solutions.captcha.title',href: routesPath.captchaLanding,internal: true,+ icon: ShieldCheckIcon,+ iconColor: 'text-emerald-400',+ },+]++const freeTools: NavItem[] = [+ {+ key: 'utm',+ href: isSelfhosted+ ? `https://swetrix.com${routesPath.utm_generator}`+ : routesPath.utm_generator,+ internal: !isSelfhosted,+ icon: LinkIcon,+ iconColor: 'text-violet-400',+ },+ {+ key: 'ctr',+ href: isSelfhosted+ ? `https://swetrix.com${routesPath.ctr_calculator}`+ : routesPath.ctr_calculator,+ internal: !isSelfhosted,+ icon: CursorClickIcon,+ iconColor: 'text-pink-400',+ },+ {+ key: 'roi',+ href: isSelfhosted+ ? `https://swetrix.com${routesPath.roi_calculator}`+ : routesPath.roi_calculator,+ internal: !isSelfhosted,+ icon: ChartPieIcon,+ iconColor: 'text-teal-400',+ },+ {+ key: 'ip-lookup',+ name: 'IP Lookup',+ href: isSelfhosted+ ? `https://swetrix.com${routesPath.ip_lookup}`+ : routesPath.ip_lookup,+ internal: !isSelfhosted,+ icon: GlobeIcon,+ iconColor: 'text-blue-400',+ },+ {+ key: 'sitemap-validator',+ name: 'Sitemap Validator',+ href: isSelfhosted+ ? `https://swetrix.com${routesPath.sitemap_validator}`+ : routesPath.sitemap_validator,+ internal: !isSelfhosted,+ icon: TreeStructureIcon,+ iconColor: 'text-lime-400',+ },+]++const comparisons: NavItem[] = [+ {+ name: 'Google Analytics',+ href: isSelfhosted+ ? `https://swetrix.com/comparison/google-analytics`+ : '/comparison/google-analytics',+ icon: ArrowsHorizontalIcon,+ iconColor: 'text-amber-400',+ internal: !isSelfhosted,+ },+ {+ name: 'Plausible',+ href: isSelfhosted+ ? `https://swetrix.com/comparison/plausible`+ : '/comparison/plausible',+ icon: ArrowsHorizontalIcon,+ iconColor: 'text-violet-400',+ internal: !isSelfhosted,+ },+ {+ name: 'Cloudflare Analytics',+ href: isSelfhosted+ ? `https://swetrix.com/comparison/cloudflare-analytics`+ : '/comparison/cloudflare-analytics',+ icon: ArrowsHorizontalIcon,+ iconColor: 'text-orange-400',+ internal: !isSelfhosted,+ },+ {+ name: 'Fathom Analytics',+ href: isSelfhosted+ ? `https://swetrix.com/comparison/fathom-analytics`+ : '/comparison/fathom-analytics',+ icon: ArrowsHorizontalIcon,+ iconColor: 'text-purple-400',+ internal: !isSelfhosted,+ },+ {+ name: 'Simple Analytics',+ href: isSelfhosted+ ? `https://swetrix.com/comparison/simple-analytics`+ : '/comparison/simple-analytics',+ icon: ArrowsHorizontalIcon,+ iconColor: 'text-red-400',+ internal: !isSelfhosted,+ },+ {+ name: 'Vercel Web Analytics',+ href: isSelfhosted+ ? `https://swetrix.com/comparison/vercel-web-analytics`+ : '/comparison/vercel-web-analytics',+ icon: ArrowsHorizontalIcon,+ iconColor: 'text-slate-400',+ internal: !isSelfhosted,+ },+ {+ name: 'Rybbit',+ href: isSelfhosted+ ? `https://swetrix.com/comparison/rybbit`+ : '/comparison/rybbit',+ icon: ArrowsHorizontalIcon,+ iconColor: 'text-emerald-400',+ internal: !isSelfhosted,+ },+ {+ name: 'Umami',+ href: isSelfhosted+ ? `https://swetrix.com/comparison/umami`+ : '/comparison/umami',+ icon: ArrowsHorizontalIcon,+ iconColor: 'text-blue-400',+ internal: !isSelfhosted,+ },+ {+ name: 'Pirsch',+ href: isSelfhosted+ ? `https://swetrix.com/comparison/pirsch`+ : '/comparison/pirsch',+ icon: ArrowsHorizontalIcon,+ iconColor: 'text-emerald-400',+ internal: !isSelfhosted,+ },+ {+ name: 'Matomo',+ href: isSelfhosted+ ? `https://swetrix.com/comparison/matomo`+ : '/comparison/matomo',+ icon: ArrowsHorizontalIcon,+ iconColor: 'text-lime-400',+ internal: !isSelfhosted,+ },+ {+ name: 'PostHog',+ href: isSelfhosted+ ? `https://swetrix.com/comparison/posthog`+ : '/comparison/posthog',+ icon: ArrowsHorizontalIcon,+ iconColor: 'text-blue-400',+ internal: !isSelfhosted,+ },+]++const community: NavItem[] = [+ {+ name: 'GitHub',+ href: GITHUB_URL,+ icon: GithubLogoIcon,+ iconColor: 'text-gray-300',+ },+ {+ name: 'Discord',+ href: DISCORD_URL,+ icon: DiscordLogoIcon,+ iconColor: 'text-indigo-400',+ },+ {+ name: 'Twitter / X',+ href: TWITTER_URL,+ icon: XLogoIcon,+ iconColor: 'text-gray-300',+ },+ {+ name: 'LinkedIn',+ href: LINKEDIN_URL,+ icon: LinkedinLogoIcon,+ iconColor: 'text-blue-400',},]const productionNavigation = {products,+ freeTools,resources: [- { key: 'docs', href: DOCS_URL, internal: false },- { key: 'pricing', href: `${routesPath.main}#pricing`, internal: true },- { key: 'tools', href: routesPath.tools, internal: true },- { key: 'utm', href: routesPath.utm_generator, internal: true },- { key: 'ctr', href: routesPath.ctr_calculator, internal: true },- { key: 'roi', href: routesPath.roi_calculator, internal: true },{- key: 'ip-lookup',- name: 'IP Lookup',- href: routesPath.ip_lookup,- internal: true,+ key: 'docs',+ href: DOCS_URL,+ internal: false,+ icon: BookOpenIcon,+ iconColor: 'text-sky-400',},{- key: 'sitemap-validator',- name: 'Sitemap Validator',- href: routesPath.sitemap_validator,+ key: 'pricing',+ href: `${routesPath.main}#pricing`,internal: true,+ icon: CurrencyDollarIcon,+ iconColor: 'text-emerald-400',},- ],+ ] as NavItem[],+ comparisons,company: [- { key: 'open', href: routesPath.open, internal: true },- { key: 'status', href: STATUSPAGE_URL, internal: false },- { key: 'blog', href: routesPath.blog, internal: true },- { key: 'contact', href: routesPath.contact, internal: true },- ],- community: [- { name: 'GitHub', href: GITHUB_URL },- { name: 'Discord', href: DISCORD_URL },- { name: 'X (Twitter)', href: TWITTER_URL },- { name: 'LinkedIn', href: LINKEDIN_URL },- ],- comparisons: [- { name: 'Google Analytics', href: '/comparison/google-analytics' },- { name: 'Plausible', href: '/comparison/plausible' },- { name: 'Cloudflare Analytics', href: '/comparison/cloudflare-analytics' },- { name: 'Fathom Analytics', href: '/comparison/fathom-analytics' },- { name: 'Simple Analytics', href: '/comparison/simple-analytics' },- { name: 'Vercel Web Analytics', href: '/comparison/vercel-web-analytics' },- { name: 'Rybbit', href: '/comparison/rybbit' },- { name: 'Pirsch', href: '/comparison/pirsch' },- { name: 'Umami', href: '/comparison/umami' },- { name: 'Matomo', href: '/comparison/matomo' },- { name: 'PostHog', href: '/comparison/posthog' },- ],+ {+ key: 'open',+ href: routesPath.open,+ internal: true,+ icon: LockKeyIcon,+ iconColor: 'text-teal-400',+ },+ {+ key: 'blog',+ href: routesPath.blog,+ internal: true,+ icon: ArticleIcon,+ iconColor: 'text-fuchsia-400',+ },+ {+ key: 'contact',+ href: routesPath.contact,+ internal: true,+ icon: EnvelopeIcon,+ iconColor: 'text-blue-400',+ },+ {+ key: 'status',+ href: STATUSPAGE_URL,+ internal: false,+ icon: PulseIcon,+ iconColor: 'text-emerald-400',+ },+ ] as NavItem[],+ community,legal: [{ key: 'privacy', href: routesPath.privacy, internal: true },{ key: 'terms', href: routesPath.terms, internal: true },{ key: 'cookie', href: routesPath.cookiePolicy, internal: true },- { key: 'data-policy', href: routesPath.dataPolicy, internal: true },{ key: 'imprint', href: routesPath.imprint, internal: true },- ],+ ] as LegalItem[],}const communityEditionNavigation = {products,+ freeTools,resources: [- { key: 'docs', href: DOCS_URL, internal: false },- { key: 'pricing', href: `https://swetrix.com/#pricing`, internal: false },{- key: 'tools',- href: `https://swetrix.com${routesPath.tools}`,+ key: 'docs',+ href: DOCS_URL,internal: false,+ icon: BookOpenIcon,+ iconColor: 'text-sky-400',},{- key: 'utm',- href: `https://swetrix.com${routesPath.utm_generator}`,- internal: false,- },- {- key: 'ctr',- href: `https://swetrix.com${routesPath.ctr_calculator}`,- internal: false,- },- {- key: 'roi',- href: `https://swetrix.com${routesPath.roi_calculator}`,+ key: 'pricing',+ href: `https://swetrix.com/#pricing`,internal: false,+ icon: CurrencyDollarIcon,+ iconColor: 'text-emerald-400',},+ ] as NavItem[],+ comparisons,+ company: [{- key: 'ip-lookup',- name: 'IP Lookup',- href: `https://swetrix.com${routesPath.ip_lookup}`,+ key: 'cloudEdition',+ href: 'https://swetrix.com',internal: false,+ icon: CloudIcon,+ iconColor: 'text-sky-400',},- ],- company: [- { key: 'cloudEdition', href: 'https://swetrix.com', internal: false },{key: 'blog',href: `https://swetrix.com${routesPath.blog}`,internal: false,- },- { key: 'supportUs', href: DONATE_URL, internal: false },- ],- community: [- { name: 'GitHub', href: GITHUB_URL },- { name: 'Discord', href: DISCORD_URL },- { name: 'X', href: TWITTER_URL },- { name: 'LinkedIn', href: LINKEDIN_URL },- ],- comparisons: [- {- name: 'Google Analytics',- href: 'https://swetrix.com/comparison/google-analytics',- },- { name: 'Plausible', href: 'https://swetrix.com/comparison/plausible' },- {- name: 'Cloudflare Analytics',- href: 'https://swetrix.com/comparison/cloudflare-analytics',- },- {- name: 'Fathom Analytics',- href: 'https://swetrix.com/comparison/fathom-analytics',+ icon: ArticleIcon,+ iconColor: 'text-amber-400',},{- name: 'Simple Analytics',- href: 'https://swetrix.com/comparison/simple-analytics',- },- {- name: 'Vercel Web Analytics',- href: 'https://swetrix.com/comparison/vercel-web-analytics',+ key: 'supportUs',+ href: DONATE_URL,+ internal: false,+ icon: HeartIcon,+ iconColor: 'text-rose-400',},- { name: 'Rybbit', href: 'https://swetrix.com/comparison/rybbit' },- { name: 'Pirsch', href: 'https://swetrix.com/comparison/pirsch' },- { name: 'Umami', href: 'https://swetrix.com/comparison/umami' },- { name: 'Matomo', href: 'https://swetrix.com/comparison/matomo' },- { name: 'PostHog', href: 'https://swetrix.com/comparison/posthog' },- ],+ ] as NavItem[],+ community,legal: [{key: 'contact',@@ -193,7 +392,7 @@ const communityEditionNavigation = {href: `https://swetrix.com${routesPath.imprint}`,internal: false,},- ],+ ] as LegalItem[],}const navigation = isSelfhosted@@ -301,19 +500,36 @@ interface FooterProps {const FooterLink = ({href,internal,+ icon: Icon,+ iconColor,children,}: {href: stringinternal: boolean+ icon?: FC<IconProps>+ iconColor?: stringchildren: React.ReactNode}) => {+ const content = (+ <span className='inline-flex items-center gap-2'>+ {Icon && (+ <Icon+ weight='duotone'+ className={cn('h-4 w-4 shrink-0', iconColor)}+ aria-hidden='true'+ />+ )}+ <span>{children}</span>+ </span>+ )+if (internal) {return (<Linkto={href}className='underline-animate text-sm text-white transition-colors'>- {children}+ {content}</Link>)}@@ -324,6 +540,38 @@ const FooterLink = ({className='underline-animate text-sm text-white transition-colors'target='_blank'rel='noopener noreferrer'+ >+ {content}+ </a>+ )+}++const SimpleLegalLink = ({+ href,+ internal,+ children,+}: {+ href: string+ internal: boolean+ children: React.ReactNode+}) => {+ if (internal) {+ return (+ <Link+ to={href}+ className='underline-animate text-sm text-gray-200 transition-colors hover:text-white'+ >+ {children}+ </Link>+ )+ }++ return (+ <a+ href={href}+ className='underline-animate text-sm text-gray-200 transition-colors hover:text-white'+ target='_blank'+ rel='noopener noreferrer'>{children}</a>@@ -347,93 +595,159 @@ const Footer = ({ showDBIPMessage }: FooterProps) => {<div className='mx-auto max-w-7xl px-4 sm:px-6 lg:px-8'><div className='space-y-11'>- <div className='md:flex md:justify-between md:gap-8 lg:gap-10'>- <nav className='w-full'>- <ul className='-mx-3 flex flex-row flex-wrap gap-y-8 lg:flex-nowrap'>- <li className='flex w-1/2 flex-col px-3 lg:w-1/5'>- <ul>- <li className='mb-4 text-sm font-bold text-white uppercase'>- {t('footer.products')}- </li>- {_map(navigation.products, ({ key, href, internal }) => (- <li key={key} className='mb-2'>- <FooterLink href={href} internal={internal}>- {t(key)}+ <div className='grid grid-cols-1 gap-8 sm:grid-cols-2 lg:grid-cols-4'>+ {/* Column 1: Products + Free Tools */}+ <div className='space-y-8'>+ <div>+ <h3 className='mb-4 text-sm font-semibold text-gray-200'>+ {t('footer.products')}+ </h3>+ <ul className='space-y-2.5'>+ {_map(+ navigation.products,+ ({ key, href, internal, icon, iconColor }) => (+ <li key={key}>+ <FooterLink+ href={href}+ internal={internal ?? false}+ icon={icon}+ iconColor={iconColor}+ >+ {t(key as string)}</FooterLink></li>- ))}- </ul>- </li>-- <li className='flex w-1/2 flex-col px-3 lg:w-1/5'>- <ul>- <li className='mb-4 text-sm font-bold text-white uppercase'>- {t('footer.resources')}- </li>- {_map(- navigation.resources,- ({ key, name, href, internal }) => (- <li key={key} className='mb-2'>- <FooterLink href={href} internal={internal}>- {name || t(`footer.${key}`)}- </FooterLink>- </li>- ),- )}- </ul>- </li>-- <li className='flex w-1/2 flex-col px-3 lg:w-1/5'>- <ul>- <li className='mb-4 text-sm font-bold text-white uppercase'>- {t('footer.company')}- </li>- {_map(navigation.company, ({ key, href, internal }) => (- <li key={key} className='mb-2'>- <FooterLink href={href} internal={internal}>- {t(`footer.${key}`)}+ ),+ )}+ </ul>+ </div>++ <div>+ <h3 className='mb-4 text-sm font-semibold text-gray-200'>+ {t('footer.freeTools')}+ </h3>+ <ul className='space-y-2.5'>+ {_map(+ navigation.freeTools,+ ({ key, name, href, internal, icon, iconColor }) => (+ <li key={key}>+ <FooterLink+ href={href}+ internal={internal ?? false}+ icon={icon}+ iconColor={iconColor}+ >+ {name || t(`footer.${key}`)}+ </FooterLink>+ </li>+ ),+ )}+ </ul>+ </div>+ </div>++ {/* Column 2: Resources + Comparisons */}+ <div className='space-y-8'>+ <div>+ <h3 className='mb-4 text-sm font-semibold text-gray-200'>+ {t('footer.resources')}+ </h3>+ <ul className='space-y-2.5'>+ {_map(+ navigation.resources,+ ({ key, name, href, internal, icon, iconColor }) => (+ <li key={key}>+ <FooterLink+ href={href}+ internal={internal ?? false}+ icon={icon}+ iconColor={iconColor}+ >+ {name || t(`footer.${key}`)}</FooterLink></li>- ))}- </ul>- </li>-- <li className='flex w-1/2 flex-col px-3 lg:w-1/5'>- <ul>- <li className='mb-4 text-sm font-bold text-white uppercase'>- {t('footer.community')}- </li>- {_map(navigation.community, ({ name, href }) => (- <li key={name} className='mb-2'>- <FooterLink href={href} internal={false}>+ ),+ )}+ </ul>+ </div>++ <div>+ <h3 className='mb-4 text-sm font-semibold text-gray-200'>+ {t('footer.comparisons')}+ </h3>+ <ul className='space-y-2.5'>+ {_map(+ navigation.comparisons,+ ({ name, href, icon, iconColor }) => (+ <li key={name}>+ <FooterLink+ href={href}+ internal={!isSelfhosted}+ icon={icon}+ iconColor={iconColor}+ >{name}</FooterLink></li>- ))}- </ul>- </li>-- <li className='flex w-1/2 flex-col px-3 lg:w-1/5'>- <ul>- <li className='mb-4 text-sm font-bold text-white uppercase'>- {t('footer.comparisons')}- </li>- {_map(navigation.comparisons, ({ name, href }) => (- <li key={name} className='mb-2'>- <FooterLink href={href} internal={!isSelfhosted}>+ ),+ )}+ </ul>+ </div>+ </div>++ {/* Column 3: Company + Community */}+ <div className='space-y-8'>+ <div>+ <h3 className='mb-4 text-sm font-semibold text-gray-200'>+ {t('footer.company')}+ </h3>+ <ul className='space-y-2.5'>+ {_map(+ navigation.company,+ ({ key, href, internal, icon, iconColor }) => (+ <li key={key}>+ <FooterLink+ href={href}+ internal={internal ?? false}+ icon={icon}+ iconColor={iconColor}+ >+ {t(`footer.${key}`)}+ </FooterLink>+ </li>+ ),+ )}+ </ul>+ </div>++ <div>+ <h3 className='mb-4 text-sm font-semibold text-gray-200'>+ {t('footer.community')}+ </h3>+ <ul className='space-y-2.5'>+ {_map(+ navigation.community,+ ({ name, href, icon, iconColor }) => (+ <li key={name}>+ <FooterLink+ href={href}+ internal={false}+ icon={icon}+ iconColor={iconColor}+ >{name}</FooterLink></li>- ))}- </ul>- </li>- </ul>- </nav>+ ),+ )}+ </ul>+ </div>+ </div>- <div className='mt-12 md:mt-0 md:w-fit md:min-w-[280px]'>+ {/* Column 4: About / Logo */}+ <div><SwetrixLogo theme='dark' lazy />- <p className='mt-4 max-w-72 text-sm text-white'>+ <p className='mt-4 max-w-72 text-sm text-gray-200'>{isSelfhosted ? (<Transt={t}@@ -455,7 +769,7 @@ const Footer = ({ showDBIPMessage }: FooterProps) => {</p>{isSelfhosted ? null : (- <div className='mt-2 flex text-sm text-white'>+ <div className='mt-2 flex text-sm text-gray-200'><Trans t={t} i18nKey='footer.madeInHostedIn'><FlagclassName='mx-[1ch]'@@ -482,19 +796,19 @@ const Footer = ({ showDBIPMessage }: FooterProps) => {</div>)}- <div className='mt-8 flex w-full justify-end md:w-auto'>+ <div className='mt-6'><ahref={GITHUB_URL}target='_blank'rel='noopener noreferrer'- className='inline-flex items-center justify-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 transition-colors hover:bg-gray-50'+ className='inline-flex items-center justify-center rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium text-gray-700 transition-colors hover:bg-gray-50'>- <SiGithub className='mr-2 h-4 w-4' />+ <GithubLogoIcon className='mr-1.5 h-4 w-4' weight='duotone' /><span>{t('footer.starOnGithub')}</span></a></div>- <div className='mt-4 flex flex-col justify-end space-y-3 sm:flex-row sm:space-y-0 sm:space-x-4'>+ <div className='mt-4 flex flex-col space-y-3 sm:flex-row sm:space-y-0 sm:space-x-3'><LanguageSelector /><ThemeSelector /></div>@@ -502,8 +816,8 @@ const Footer = ({ showDBIPMessage }: FooterProps) => {</div><div className='flex flex-col items-start border-t border-white/10 pt-6 lg:pt-8'>- <div className='flex w-full flex-col items-center gap-4 text-center text-sm text-white md:flex-row md:justify-between md:text-left'>- <div>+ <div className='flex w-full flex-col items-center gap-4 text-center text-sm md:flex-row md:justify-between md:text-left'>+ <div className='text-gray-200'>© {year} {t('footer.copy')}{showDBIPMessage && isSelfhosted ? (<>@@ -512,7 +826,7 @@ const Footer = ({ showDBIPMessage }: FooterProps) => {href='https://db-ip.com'target='_blank'rel='noopener noreferrer'- className='underline-animate'+ className='text-gray-200 transition-colors hover:text-white'>IP Geolocation by DB-IP</a>@@ -520,11 +834,11 @@ const Footer = ({ showDBIPMessage }: FooterProps) => {) : null}</div>- <div className='flex flex-wrap items-center justify-center gap-4'>+ <div className='flex flex-wrap items-center justify-center gap-x-6 gap-y-2'>{_map(navigation.legal, ({ key, href, internal }) => (- <FooterLink key={key} href={href} internal={internal}>+ <SimpleLegalLink key={key} href={href} internal={internal}>{t(`footer.${key}`)}- </FooterLink>+ </SimpleLegalLink>))}</div></div>diff --git a/web/app/components/Header/index.tsx b/web/app/components/Header/index.tsxindex ef65fb443..2383bbcd8 100644--- a/web/app/components/Header/index.tsx+++ b/web/app/components/Header/index.tsx@@ -14,14 +14,6 @@ import {DisclosurePanel,PopoverBackdrop,} from '@headlessui/react'-import { ArrowRightIcon } from '@heroicons/react/20/solid'-import {- Bars3Icon,- XMarkIcon,- ChevronDownIcon,-} from '@heroicons/react/24/outline'-import { MoonIcon, SunIcon } from '@heroicons/react/24/solid'-import { SiDiscord, SiGithub, SiYoutube } from '@icons-pack/react-simple-icons'import cx from 'clsx'import dayjs from 'dayjs'import duration from 'dayjs/plugin/duration'@@ -31,11 +23,30 @@ import _map from 'lodash/map'import _startsWith from 'lodash/startsWith'import {GaugeIcon,- ChartPieIcon,- BugIcon,- PuzzleIcon,- PhoneIcon,-} from 'lucide-react'+ WarningIcon,+ ShieldCheckIcon,+ ArrowRightIcon,+ ListIcon,+ XIcon,+ CaretDownIcon,+ MoonIcon,+ SunIcon,+ GithubLogoIcon,+ YoutubeLogoIcon,+ DiscordLogoIcon,+ EnvelopeIcon,+ ChartBarIcon,+ LifebuoyIcon,+ CreditCardIcon,+ GearIcon,+ BuildingsIcon,+ SignOutIcon,+ SignInIcon,+ UserPlusIcon,+ SquaresFourIcon,+ TagIcon,+ BookOpenIcon,+} from '@phosphor-icons/react'import { memo, Fragment, useMemo, useState, useEffect } from 'react'import { useTranslation } from 'react-i18next'import { Link } from 'react-router'@@ -59,6 +70,7 @@ import Flag from '~/ui/Flag'import SwetrixLogo from '~/ui/icons/SwetrixLogo'import Modal from '~/ui/Modal'import routes from '~/utils/routes'+import { cn } from '~/utils/generic'dayjs.extend(utc)dayjs.extend(duration)@@ -77,25 +89,29 @@ const getSolutions = (t: typeof i18nextT) => [name: t('header.solutions.analytics.title'),description: t('header.solutions.analytics.desc'),link: routes.main,- icon: ChartPieIcon,+ icon: ChartBarIcon,+ className: 'text-indigo-500 dark:text-indigo-400',},{name: t('header.solutions.performance.title'),description: t('header.solutions.performance.desc'),link: routes.performance,icon: GaugeIcon,+ className: 'text-amber-500 dark:text-amber-400',},{name: t('header.solutions.errors.title'),description: t('header.solutions.errors.desc'),link: routes.errorTracking,- icon: BugIcon,+ icon: WarningIcon,+ className: 'text-red-500 dark:text-red-400',},{name: t('header.solutions.captcha.title'),description: t('header.solutions.captcha.desc'),link: routes.captchaLanding,- icon: PuzzleIcon,+ icon: ShieldCheckIcon,+ className: 'text-emerald-500 dark:text-emerald-400',},]@@ -103,9 +119,15 @@ const getCallsToAction = (t: typeof i18nextT) => [{name: t('header.watchDemo'),link: 'https://www.youtube.com/watch?v=XBp38fZREIE',- icon: SiYoutube,+ icon: YoutubeLogoIcon,+ className: 'text-red-500 dark:text-red-400',+ },+ {+ name: t('header.contactSales'),+ link: routes.contact,+ icon: EnvelopeIcon,+ className: 'text-blue-500 dark:text-blue-400',},- { name: t('header.contactSales'), link: routes.contact, icon: PhoneIcon },]const SolutionsMenu = () => {@@ -119,8 +141,8 @@ const SolutionsMenu = () => {<><PopoverButton className='underline-animate inline-flex items-center gap-x-1 text-base leading-6 font-semibold text-slate-800 focus:outline-hidden dark:text-white'><span>{t('header.solutions.title')}</span>- <ChevronDownIcon- className={cx('h-3 w-3 stroke-2 transition-transform', {+ <CaretDownIcon+ className={cx('size-3 transition-transform', {'rotate-180': open,})}aria-hidden='true'@@ -146,9 +168,12 @@ const SolutionsMenu = () => {className='group relative flex gap-x-2 rounded-lg p-2 transition-colors hover:bg-gray-400/20 dark:hover:bg-slate-700/50'><item.icon- className='mt-1 h-5 w-5 text-gray-600 dark:text-gray-300'+ className={cn(+ 'mt-1 h-5 w-5 text-gray-600 dark:text-gray-300',+ item.className,+ )}aria-hidden='true'- strokeWidth={1.5}+ weight='duotone'/><div>{_startsWith(item.link, '/') ? (@@ -188,9 +213,12 @@ const SolutionsMenu = () => {className='flex items-center justify-center gap-x-2 rounded-lg p-3 text-gray-900 transition-colors hover:bg-gray-400/20 dark:text-gray-50 dark:hover:bg-slate-700/50'><item.icon- className='h-5 w-5 flex-none text-gray-600 dark:text-gray-300'+ className={cn(+ 'h-5 w-5 flex-none text-gray-600 dark:text-gray-300',+ item.className,+ )}aria-hidden='true'- strokeWidth={1.5}+ weight='duotone'/>{item.name}</Link>@@ -206,9 +234,12 @@ const SolutionsMenu = () => {className='flex items-center justify-center gap-x-2 rounded-lg p-3 text-gray-900 transition-colors hover:bg-gray-400/20 dark:text-gray-50 dark:hover:bg-slate-700/50'><item.icon- className='h-5 w-5 flex-none text-gray-600 dark:text-gray-300'+ className={cn(+ 'h-5 w-5 flex-none text-gray-600 dark:text-gray-300',+ item.className,+ )}aria-hidden='true'- strokeWidth={1.5}+ weight='duotone'/>{item.name}</a>@@ -238,9 +269,9 @@ const ProfileMenu = ({ logoutHandler }: { logoutHandler: () => void }) => {<div><MenuButton className='underline-animate flex items-center justify-center text-base leading-6 font-semibold text-slate-800 focus:outline-hidden dark:text-white'><span>{t('common.account')}</span>- <ChevronDownIcon+ <CaretDownIconclassName={cx(- 'ml-1 h-4 w-4 transform-gpu stroke-2 transition-transform',+ 'ml-1 size-4 transform-gpu transition-transform',{'rotate-180': open,},@@ -285,10 +316,10 @@ const ProfileMenu = ({ logoutHandler }: { logoutHandler: () => void }) => {/>{languages[language]}</div>- <ChevronDownIcon+ <CaretDownIconclassName={cx(open ? 'rotate-180' : '',- '-mr-1 ml-2 h-5 w-5 transform-gpu stroke-2 transition-transform',+ '-mr-1 ml-2 size-5 transform-gpu transition-transform',)}aria-hidden='true'/>@@ -340,8 +371,9 @@ const ProfileMenu = ({ logoutHandler }: { logoutHandler: () => void }) => {href={CONTACT_US_URL}target='_blank'rel='noopener noreferrer'- className='block rounded-md p-2 text-sm text-gray-700 transition-colors hover:bg-gray-200 dark:text-gray-50 dark:hover:bg-slate-800/60'+ className='flex items-center gap-2 rounded-md p-2 text-sm text-gray-700 transition-colors hover:bg-gray-200 dark:text-gray-50 dark:hover:bg-slate-800/60'>+ <LifebuoyIcon className='h-4 w-4' />{t('footer.support')}</a></MenuItem>@@ -349,8 +381,9 @@ const ProfileMenu = ({ logoutHandler }: { logoutHandler: () => void }) => {<MenuItem><Linkto={routes.contact}- className='block rounded-md p-2 text-sm text-gray-700 transition-colors hover:bg-gray-200 dark:text-gray-50 dark:hover:bg-slate-800/60'+ className='flex items-center gap-2 rounded-md p-2 text-sm text-gray-700 transition-colors hover:bg-gray-200 dark:text-gray-50 dark:hover:bg-slate-800/60'>+ <LifebuoyIcon className='h-4 w-4' />{t('footer.support')}</Link></MenuItem>@@ -359,8 +392,9 @@ const ProfileMenu = ({ logoutHandler }: { logoutHandler: () => void }) => {<MenuItem><Linkto={routes.billing}- className='block rounded-md p-2 text-sm text-gray-700 transition-colors hover:bg-gray-200 dark:text-gray-50 dark:hover:bg-slate-800/60'+ className='flex items-center gap-2 rounded-md p-2 text-sm text-gray-700 transition-colors hover:bg-gray-200 dark:text-gray-50 dark:hover:bg-slate-800/60'>+ <CreditCardIcon className='h-4 w-4' />{t('common.billing')}</Link></MenuItem>@@ -371,8 +405,9 @@ const ProfileMenu = ({ logoutHandler }: { logoutHandler: () => void }) => {<MenuItem><Linkto={routes.user_settings}- className='block rounded-md p-2 text-sm text-gray-700 transition-colors hover:bg-gray-200 dark:text-gray-50 dark:hover:bg-slate-800/60'+ className='flex items-center gap-2 rounded-md p-2 text-sm text-gray-700 transition-colors hover:bg-gray-200 dark:text-gray-50 dark:hover:bg-slate-800/60'>+ <GearIcon className='h-4 w-4' />{t('common.accountSettings')}</Link></MenuItem>@@ -380,8 +415,9 @@ const ProfileMenu = ({ logoutHandler }: { logoutHandler: () => void }) => {<MenuItem><Linkto={routes.organisations}- className='block rounded-md p-2 text-sm text-gray-700 transition-colors hover:bg-gray-200 dark:text-gray-50 dark:hover:bg-slate-800/60'+ className='flex items-center gap-2 rounded-md p-2 text-sm text-gray-700 transition-colors hover:bg-gray-200 dark:text-gray-50 dark:hover:bg-slate-800/60'>+ <BuildingsIcon className='h-4 w-4' />{t('organisations.organisations')}</Link></MenuItem>@@ -389,9 +425,10 @@ const ProfileMenu = ({ logoutHandler }: { logoutHandler: () => void }) => {<MenuItem><buttontype='button'- className='w-full rounded-md p-2 text-left text-sm text-gray-700 transition-colors hover:bg-gray-200 dark:text-gray-50 dark:hover:bg-slate-800/60'+ className='flex w-full items-center gap-2 rounded-md p-2 text-left text-sm text-gray-700 transition-colors hover:bg-gray-200 dark:text-gray-50 dark:hover:bg-slate-800/60'onClick={logoutHandler}>+ <SignOutIcon className='h-4 w-4' />{t('common.logout')}</button></MenuItem>@@ -408,28 +445,38 @@ const Separator = () => (</svg>)-const SelfhostedCommunityLinks = () => (- <span className='flex items-center gap-2'>- <a- href={DISCORD_URL}- className='inline-flex items-center rounded-md p-1 text-slate-700 transition-colors hover:text-slate-900 focus:outline-hidden focus-visible:ring-2 focus-visible:ring-indigo-500/60 dark:text-gray-200 dark:hover:text-white'- target='_blank'- rel='noreferrer noopener'- >- <span className='sr-only'>Discord</span>- <SiDiscord className='h-5 w-5' aria-hidden='true' />- </a>- <a- href={GITHUB_URL}- className='inline-flex items-center rounded-md p-1 text-slate-700 transition-colors hover:text-slate-900 focus:outline-hidden focus-visible:ring-2 focus-visible:ring-indigo-500/60 dark:text-gray-200 dark:hover:text-white'- target='_blank'- rel='noreferrer noopener'- >- <span className='sr-only'>GitHub</span>- <SiGithub className='h-5 w-5' aria-hidden='true' />- </a>- </span>-)+const CommunityLinks = () => {+ return (+ <span className='flex items-center gap-2'>+ <a+ href={DISCORD_URL}+ className='inline-flex items-center rounded-md p-1 text-indigo-600 transition-colors hover:text-indigo-500 focus:outline-hidden focus-visible:ring-2 focus-visible:ring-indigo-500/60 dark:text-indigo-400 dark:hover:text-indigo-100'+ target='_blank'+ rel='noreferrer noopener'+ >+ <span className='sr-only'>Discord</span>+ <DiscordLogoIcon+ className='h-5 w-5'+ aria-hidden='true'+ weight='duotone'+ />+ </a>+ <a+ href={GITHUB_URL}+ className='inline-flex items-center rounded-md p-1 text-slate-700 transition-colors hover:text-slate-500 focus:outline-hidden focus-visible:ring-2 focus-visible:ring-indigo-500/60 dark:text-gray-200 dark:hover:text-white'+ target='_blank'+ rel='noreferrer noopener'+ >+ <span className='sr-only'>GitHub</span>+ <GithubLogoIcon+ className='h-5 w-5'+ aria-hidden='true'+ weight='duotone'+ />+ </a>+ </span>+ )+}interface TrialBannerProps {status: string | null@@ -649,7 +696,6 @@ const AuthedHeader = ({{!isSelfhosted && !isDisableMarketingPages ? (<SolutionsMenu />) : null}- {isSelfhosted ? <SelfhostedCommunityLinks /> : null}<ahref={DOCS_URL}className='underline-animate text-base leading-6 font-semibold text-slate-800 focus:outline-hidden dark:text-white'@@ -666,7 +712,8 @@ const AuthedHeader = ({</Link></div></div>- <div className='ml-1 hidden flex-wrap items-center justify-center space-y-1 space-x-2 sm:space-y-0 lg:ml-10 lg:flex lg:space-x-4'>+ <div className='ml-1 hidden flex-wrap items-center justify-center space-y-1 space-x-2 sm:space-y-0 lg:ml-10 lg:flex lg:space-x-2'>+ <CommunityLinks /><ProfileMenu logoutHandler={logoutHandler} /></div><div className='flex items-center justify-center space-x-3 lg:hidden'>@@ -676,7 +723,7 @@ const AuthedHeader = ({className='rounded-md p-1 text-slate-700 transition-colors hover:bg-gray-400/20 hover:text-slate-600 dark:text-gray-200 dark:hover:bg-slate-700/50 dark:hover:text-gray-300'><span className='sr-only'>{t('common.openMenu')}</span>- <Bars3Icon className='h-8 w-8 flex-none' aria-hidden='true' />+ <ListIcon className='h-8 w-8 flex-none' aria-hidden='true' /></button></div></div>@@ -729,7 +776,7 @@ const NotAuthedHeader = ({{t('common.pricing')}</Link>) : null}- {isSelfhosted ? <SelfhostedCommunityLinks /> : null}+ <CommunityLinks /><ahref={DOCS_URL}className='underline-animate text-base leading-6 font-semibold text-slate-800 focus:outline-hidden dark:text-white'@@ -756,7 +803,7 @@ const NotAuthedHeader = ({className='underline-animate flex items-center text-base leading-6 font-semibold text-slate-800 dark:text-white'>{isSelfhosted ? t('header.signUp') : t('header.startForFree')}- <ArrowRightIcon className='mt-[1px] ml-1 h-4 w-4 stroke-2' />+ <ArrowRightIcon className='mt-[1px] ml-1 size-4' /></Link></>) : null}@@ -768,7 +815,7 @@ const NotAuthedHeader = ({className='rounded-md p-1 text-slate-700 transition-colors hover:bg-gray-400/20 hover:text-slate-600 dark:text-gray-200 dark:hover:bg-slate-700/50 dark:hover:text-gray-300'><span className='sr-only'>{t('common.openMenu')}</span>- <Bars3Icon className='h-8 w-8 flex-none' aria-hidden='true' />+ <ListIcon className='h-8 w-8 flex-none' aria-hidden='true' /></button></div></div>@@ -855,20 +902,48 @@ const Header = ({ refPage, transparent }: HeaderProps) => {className='rounded-md p-1 text-slate-700 transition-colors hover:bg-gray-400/20 hover:text-slate-600 dark:text-gray-200 dark:hover:bg-slate-700/50 dark:hover:text-gray-300'><span className='sr-only'>{t('common.close')}</span>- <XMarkIcon className='h-8 w-8 flex-none' aria-hidden='true' />+ <XIcon className='h-8 w-8 flex-none' aria-hidden='true' /></button></div></div><div className='mt-6 flow-root'><div className='-my-6 divide-y divide-gray-500/10'>- <div className='space-y-2 py-6'>+ <div className='space-y-2 py-3'>+ <a+ href={DISCORD_URL}+ className='-mx-3 flex items-center gap-2 rounded-lg px-3 py-2 text-base leading-7 font-semibold text-gray-900 transition-colors hover:bg-gray-400/20 dark:text-gray-50 dark:hover:bg-slate-700/50'+ target='_blank'+ rel='noreferrer noopener'+ >+ <DiscordLogoIcon+ className='h-5 w-5 text-indigo-600 dark:text-indigo-400'+ aria-hidden='true'+ weight='duotone'+ />+ <span>Discord</span>+ </a>+ <a+ href={GITHUB_URL}+ className='-mx-3 flex items-center gap-2 rounded-lg px-3 py-2 text-base leading-7 font-semibold text-gray-900 transition-colors hover:bg-gray-400/20 dark:text-gray-50 dark:hover:bg-slate-700/50'+ target='_blank'+ rel='noreferrer noopener'+ >+ <GithubLogoIcon+ className='h-5 w-5 text-slate-700 dark:text-gray-200'+ aria-hidden='true'+ weight='duotone'+ />+ <span>GitHub</span>+ </a>+ </div>+ <div className='space-y-2 py-3'>{!isSelfhosted ? (<Disclosure as='div' className='-mx-3'>{({ open }) => (<><DisclosureButton className='flex w-full items-center justify-between rounded-lg py-2 pr-3.5 pl-3 text-base leading-7 font-semibold text-gray-900 transition-colors hover:bg-gray-400/20 dark:text-gray-50 dark:hover:bg-slate-700/50'>{t('header.solutions.title')}- <ChevronDownIcon+ <CaretDownIconclassName={cx(open ? 'rotate-180' : '','h-5 w-5 flex-none',@@ -939,9 +1014,10 @@ const Header = ({ refPage, transparent }: HeaderProps) => {<Linkto={routes.billing}onClick={() => setMobileMenuOpen(false)}- className='-mx-3 block rounded-lg px-3 py-2 text-base leading-7 font-semibold text-gray-900 transition-colors hover:bg-gray-400/20 dark:text-gray-50 dark:hover:bg-slate-700/50'+ className='-mx-3 flex items-center gap-2 rounded-lg px-3 py-2 text-base leading-7 font-semibold text-gray-900 transition-colors hover:bg-gray-400/20 dark:text-gray-50 dark:hover:bg-slate-700/50'key='Billing'>+ <CreditCardIcon className='h-5 w-5' />{t('common.billing')}</Link>) : null}@@ -951,59 +1027,60 @@ const Header = ({ refPage, transparent }: HeaderProps) => {<Linkto={`${routes.main}#pricing`}onClick={() => setMobileMenuOpen(false)}- className='-mx-3 block rounded-lg px-3 py-2 text-base leading-7 font-semibold text-gray-900 transition-colors hover:bg-gray-400/20 dark:text-gray-50 dark:hover:bg-slate-700/50'+ className='-mx-3 flex items-center gap-2 rounded-lg px-3 py-2 text-base leading-7 font-semibold text-gray-900 transition-colors hover:bg-gray-400/20 dark:text-gray-50 dark:hover:bg-slate-700/50'key='Pricing'>+ <TagIcon className='h-5 w-5' />{t('common.pricing')}</Link>) : null}- {isSelfhosted ? (- <div className='-mx-3 flex items-center gap-3 px-3 py-2'>- <SelfhostedCommunityLinks />- </div>- ) : null}<ahref={DOCS_URL}onClick={() => setMobileMenuOpen(false)}- className='-mx-3 block rounded-lg px-3 py-2 text-base leading-7 font-semibold text-gray-900 transition-colors hover:bg-gray-400/20 dark:text-gray-50 dark:hover:bg-slate-700/50'+ className='-mx-3 flex items-center gap-2 rounded-lg px-3 py-2 text-base leading-7 font-semibold text-gray-900 transition-colors hover:bg-gray-400/20 dark:text-gray-50 dark:hover:bg-slate-700/50'target='_blank'rel='noreferrer noopener'>+ <BookOpenIcon className='h-5 w-5' />{t('common.docs')}</a>{isAuthenticated ? (<Linkto={routes.dashboard}onClick={() => setMobileMenuOpen(false)}- className='-mx-3 block rounded-lg px-3 py-2 text-base leading-7 font-semibold text-gray-900 transition-colors hover:bg-gray-400/20 dark:text-gray-50 dark:hover:bg-slate-700/50'+ className='-mx-3 flex items-center gap-2 rounded-lg px-3 py-2 text-base leading-7 font-semibold text-gray-900 transition-colors hover:bg-gray-400/20 dark:text-gray-50 dark:hover:bg-slate-700/50'>+ <SquaresFourIcon className='h-5 w-5' />{t('common.dashboard')}</Link>) : null}</div>- <div className='space-y-2 py-6'>+ <div className='space-y-2 py-3'>{isAuthenticated ? (<><Linkto={routes.user_settings}onClick={() => setMobileMenuOpen(false)}- className='-mx-3 block rounded-lg px-3 py-2 text-base leading-7 font-semibold text-gray-900 transition-colors hover:bg-gray-400/20 dark:text-gray-50 dark:hover:bg-slate-700/50'+ className='-mx-3 flex items-center gap-2 rounded-lg px-3 py-2 text-base leading-7 font-semibold text-gray-900 transition-colors hover:bg-gray-400/20 dark:text-gray-50 dark:hover:bg-slate-700/50'>+ <GearIcon className='h-5 w-5' />{t('common.accountSettings')}</Link>{!isSelfhosted ? (<Linkto={routes.organisations}onClick={() => setMobileMenuOpen(false)}- className='-mx-3 block rounded-lg px-3 py-2 text-base leading-7 font-semibold text-gray-900 transition-colors hover:bg-gray-400/20 dark:text-gray-50 dark:hover:bg-slate-700/50'+ className='-mx-3 flex items-center gap-2 rounded-lg px-3 py-2 text-base leading-7 font-semibold text-gray-900 transition-colors hover:bg-gray-400/20 dark:text-gray-50 dark:hover:bg-slate-700/50'>+ <BuildingsIcon className='h-5 w-5' />{t('organisations.organisations')}</Link>) : null}<span- className='-mx-3 block rounded-lg px-3 py-2 text-base leading-7 font-semibold text-gray-900 transition-colors hover:bg-gray-400/20 dark:text-gray-50 dark:hover:bg-slate-700/50'+ className='-mx-3 flex cursor-pointer items-center gap-2 rounded-lg px-3 py-2 text-base leading-7 font-semibold text-gray-900 transition-colors hover:bg-gray-400/20 dark:text-gray-50 dark:hover:bg-slate-700/50'onClick={logoutHandler}>+ <SignOutIcon className='h-5 w-5' />{t('common.logout')}</span></>@@ -1012,16 +1089,18 @@ const Header = ({ refPage, transparent }: HeaderProps) => {<Linkto={routes.signin}onClick={() => setMobileMenuOpen(false)}- className='-mx-3 block rounded-lg px-3 py-2 text-base leading-7 font-semibold text-gray-900 transition-colors hover:bg-gray-400/20 dark:text-gray-50 dark:hover:bg-slate-700/50'+ className='-mx-3 flex items-center gap-2 rounded-lg px-3 py-2 text-base leading-7 font-semibold text-gray-900 transition-colors hover:bg-gray-400/20 dark:text-gray-50 dark:hover:bg-slate-700/50'>+ <SignInIcon className='h-5 w-5' />{t('auth.common.signin')}</Link><Linkto={routes.signup}onClick={() => setMobileMenuOpen(false)}- className='-mx-3 block rounded-lg px-3 py-2 text-base leading-7 font-semibold text-gray-900 transition-colors hover:bg-gray-400/20 dark:text-gray-50 dark:hover:bg-slate-700/50'+ className='-mx-3 flex items-center gap-2 rounded-lg px-3 py-2 text-base leading-7 font-semibold text-gray-900 transition-colors hover:bg-gray-400/20 dark:text-gray-50 dark:hover:bg-slate-700/50'aria-label={t('titles.signup')}>+ <UserPlusIcon className='h-5 w-5' />{isSelfhosted? t('header.signUp'): t('header.startForFree')}diff --git a/web/app/components/OIDCAuth.tsx b/web/app/components/OIDCAuth.tsxindex 5f962d551..b71827dc5 100644--- a/web/app/components/OIDCAuth.tsx+++ b/web/app/components/OIDCAuth.tsx@@ -1,5 +1,5 @@import cx from 'clsx'-import { KeyRoundIcon } from 'lucide-react'+import { KeyIcon } from '@phosphor-icons/react'import { useTranslation } from 'react-i18next'import Button from '~/ui/Button'@@ -24,7 +24,7 @@ const OIDCAuth = ({ onClick, className, disabled }: OIDCAuthProps) => {regulardisabled={disabled}>- <KeyRoundIcon className='mr-2 size-5' />+ <KeyIcon className='mr-2 size-5' />{t('auth.common.oidc')}</Button>)diff --git a/web/app/components/ToolsNav.tsx b/web/app/components/ToolsNav.tsxindex 712338c55..018f3cd78 100644--- a/web/app/components/ToolsNav.tsx+++ b/web/app/components/ToolsNav.tsx@@ -1,11 +1,11 @@import {- GlobeAltIcon,+ GlobeIcon,CalculatorIcon,- CursorArrowRaysIcon,+ CursorClickIcon,LinkIcon,- DocumentMagnifyingGlassIcon,- ChevronDownIcon,-} from '@heroicons/react/24/outline'+ FileMagnifyingGlassIcon,+ CaretDownIcon,+} from '@phosphor-icons/react'import { useState } from 'react'import { Link, useLocation } from 'react-router'@@ -17,7 +17,7 @@ export const TOOLS = [title: 'IP Lookup',description: 'Find your IP address and geolocation data',href: '/tools/ip-lookup',- icon: GlobeAltIcon,+ icon: GlobeIcon,},{id: 'roi-calculator',@@ -31,7 +31,7 @@ export const TOOLS = [title: 'CTR Calculator',description: 'Calculate your Click-Through Rate',href: '/tools/ctr-calculator',- icon: CursorArrowRaysIcon,+ icon: CursorClickIcon,},{id: 'utm-generator',@@ -45,7 +45,7 @@ export const TOOLS = [title: 'Sitemap Validator',description: 'Validate your sitemap.xml for errors',href: '/tools/sitemap-validator',- icon: DocumentMagnifyingGlassIcon,+ icon: FileMagnifyingGlassIcon,},] as const@@ -141,7 +141,7 @@ export function ToolsNavMobile({ className }: ToolsNavProps) {</p></div></div>- <ChevronDownIcon+ <CaretDownIconclassName={cn('h-5 w-5 shrink-0 text-gray-400 transition-transform',isOpen && 'rotate-180',diff --git a/web/app/components/marketing/ComparisonTable.tsx b/web/app/components/marketing/ComparisonTable.tsxindex bc1454e94..c9f490102 100644--- a/web/app/components/marketing/ComparisonTable.tsx+++ b/web/app/components/marketing/ComparisonTable.tsx@@ -1,4 +1,4 @@-import { CheckIcon, XMarkIcon } from '@heroicons/react/24/solid'+import { CheckIcon, XIcon } from '@phosphor-icons/react'import cx from 'clsx'import _map from 'lodash/map'import { useTranslation } from 'react-i18next'@@ -131,7 +131,7 @@ export const ComparisonTable = ({ className }: ComparisonTableProps) => {/>) : null}{!COMPETITOR_FEATURE_TABLE[service][key] ? (- <XMarkIcon+ <XIconclassName='h-5 w-5 shrink-0 text-red-600 dark:text-red-500'aria-label={t('common.no')}/>diff --git a/web/app/components/marketing/DitchGoogle.tsx b/web/app/components/marketing/DitchGoogle.tsxindex 6e9c4068f..0d76e599f 100644--- a/web/app/components/marketing/DitchGoogle.tsx+++ b/web/app/components/marketing/DitchGoogle.tsx@@ -1,5 +1,4 @@-import { ArrowRightIcon } from '@heroicons/react/20/solid'-import { CheckIcon } from 'lucide-react'+import { ArrowRightIcon, CheckIcon } from '@phosphor-icons/react'import { Trans, useTranslation } from 'react-i18next'import { Link } from 'react-router'diff --git a/web/app/components/marketing/FAQ.tsx b/web/app/components/marketing/FAQ.tsxindex a355544bd..9613c486b 100644--- a/web/app/components/marketing/FAQ.tsx+++ b/web/app/components/marketing/FAQ.tsx@@ -1,5 +1,5 @@import _map from 'lodash/map'-import { ChevronDownIcon } from 'lucide-react'+import { CaretDownIcon } from '@phosphor-icons/react'import { useMemo } from 'react'import { Trans, useTranslation } from 'react-i18next'import { Link } from 'react-router'@@ -102,7 +102,7 @@ const FAQ = ({ includeGAQuestions = false }: FAQProps) => {<span className='text-base font-medium text-slate-900 group-hover:underline dark:text-white'><Trans t={t} i18nKey={`${item.i18nKey}.q`} /></span>- <ChevronDownIcon className='size-4 text-slate-900 transition-transform group-open:rotate-180 dark:text-gray-200' />+ <CaretDownIcon className='size-4 text-slate-900 transition-transform group-open:rotate-180 dark:text-gray-200' /></summary><div className='px-4'><p className='pb-4 text-sm whitespace-pre-line text-slate-900 dark:text-gray-100'>diff --git a/web/app/components/pricing/BillingPricing.tsx b/web/app/components/pricing/BillingPricing.tsxindex 86073915c..020ccdbbb 100644--- a/web/app/components/pricing/BillingPricing.tsx+++ b/web/app/components/pricing/BillingPricing.tsx@@ -4,7 +4,7 @@ import dayjs from 'dayjs'import _includes from 'lodash/includes'import _isNil from 'lodash/isNil'import _map from 'lodash/map'-import { CircleHelpIcon } from 'lucide-react'+import { QuestionIcon } from '@phosphor-icons/react'import React, { memo, useEffect, useMemo, useState } from 'react'import { Trans, useTranslation } from 'react-i18next'import { useFetcher } from 'react-router'@@ -370,10 +370,7 @@ const BillingPricing = ({tooltipNode={<span className='flex items-center gap-1'>{t('pricing.legacy')}- <CircleHelpIcon- className='size-4 stroke-yellow-800 dark:stroke-yellow-500'- strokeWidth={1.5}- />+ <QuestionIcon className='size-4 stroke-yellow-800 dark:stroke-yellow-500' /></span>}/>diff --git a/web/app/components/pricing/MarketingPricing.tsx b/web/app/components/pricing/MarketingPricing.tsxindex 98a10a95e..11aeaf3ff 100644--- a/web/app/components/pricing/MarketingPricing.tsx+++ b/web/app/components/pricing/MarketingPricing.tsx@@ -1,8 +1,7 @@import { Label, Radio, RadioGroup } from '@headlessui/react'-import { CheckIcon } from '@heroicons/react/24/solid'import cx from 'clsx'import _map from 'lodash/map'-import { ArrowRightIcon, CircleHelpIcon } from 'lucide-react'+import { ArrowRightIcon, QuestionIcon, CheckIcon } from '@phosphor-icons/react'import { useState } from 'react'import { useTranslation } from 'react-i18next'import { Link } from 'react-router'@@ -68,10 +67,7 @@ const MarketingPricing = ({amount: 50,})}tooltipNode={- <CircleHelpIcon- className='size-4 stroke-gray-50'- strokeWidth={1.5}- />+ <QuestionIcon className='size-4 stroke-gray-50' />}/></div>diff --git a/web/app/modals/AnnotationModal.tsx b/web/app/modals/AnnotationModal.tsxindex 198d736eb..d4afa483c 100644--- a/web/app/modals/AnnotationModal.tsx+++ b/web/app/modals/AnnotationModal.tsx@@ -1,4 +1,4 @@-import { InfoIcon } from 'lucide-react'+import { InfoIcon } from '@phosphor-icons/react'import { useState, useEffect, useMemo } from 'react'import { useTranslation } from 'react-i18next'diff --git a/web/app/modals/NewFunnel.tsx b/web/app/modals/NewFunnel.tsxindex 164cfe4cb..694676b94 100644--- a/web/app/modals/NewFunnel.tsx+++ b/web/app/modals/NewFunnel.tsx@@ -1,6 +1,6 @@import _every from 'lodash/every'import _map from 'lodash/map'-import { Trash2Icon } from 'lucide-react'+import { TrashIcon } from '@phosphor-icons/react'import { useState, useEffect, useMemo } from 'react'import { useTranslation } from 'react-i18next'@@ -173,7 +173,7 @@ const NewFunnel = ({}}aria-label='Remove step'>- <Trash2Icon className='size-5' strokeWidth={1.5} />+ <TrashIcon className='size-5' /></button>) : null}</div>diff --git a/web/app/pages/Auth/Signup/Signup.tsx b/web/app/pages/Auth/Signup/Signup.tsxindex 8c8e7ba5e..5468de8e3 100644--- a/web/app/pages/Auth/Signup/Signup.tsx+++ b/web/app/pages/Auth/Signup/Signup.tsx@@ -1,9 +1,9 @@import {- BarChart3Icon,- MousePointerClickIcon,+ ChartBarIcon,+ CursorClickIcon,ShieldCheckIcon,- SparklesIcon,-} from 'lucide-react'+ SparkleIcon,+} from '@phosphor-icons/react'import React, { useState, useEffect, memo } from 'react'import { useTranslation, Trans } from 'react-i18next'import {@@ -40,10 +40,10 @@ import { MIN_PASSWORD_CHARS } from '~/utils/validator'const HASH_CHECK_FREQUENCY = 1000const featureIcons = [- BarChart3Icon,- MousePointerClickIcon,+ ChartBarIcon,+ CursorClickIcon,ShieldCheckIcon,- SparklesIcon,+ SparkleIcon,]const featureKeys = [diff --git a/web/app/pages/Billing/index.tsx b/web/app/pages/Billing/index.tsxindex 708126033..f564c88ce 100644--- a/web/app/pages/Billing/index.tsx+++ b/web/app/pages/Billing/index.tsx@@ -1,7 +1,4 @@-import {- ExclamationTriangleIcon,- InformationCircleIcon,-} from '@heroicons/react/24/outline'+import { WarningOctagonIcon, InfoIcon } from '@phosphor-icons/react'import dayjs from 'dayjs'import duration from 'dayjs/plugin/duration'import utc from 'dayjs/plugin/utc'@@ -230,7 +227,7 @@ const Billing = () => {<div className='mt-5 max-w-prose rounded-md bg-blue-50 p-4 dark:bg-blue-600/30'><div className='flex'><div className='shrink-0'>- <InformationCircleIcon+ <InfoIconaria-hidden='true'className='h-5 w-5 text-blue-400 dark:text-blue-100'/>@@ -254,7 +251,7 @@ const Billing = () => {<div className='mt-5 max-w-prose rounded-md bg-blue-50 p-4 dark:bg-blue-600/30'><div className='flex'><div className='shrink-0'>- <InformationCircleIcon+ <InfoIconaria-hidden='true'className='h-5 w-5 text-blue-400 dark:text-blue-100'/>@@ -283,7 +280,7 @@ const Billing = () => {<div className='mt-5 max-w-prose rounded-md bg-amber-400/10 p-4 dark:bg-amber-600/20'><div className='flex'><div className='shrink-0'>- <InformationCircleIcon+ <InfoIconaria-hidden='true'className='h-5 w-5 text-amber-400 dark:text-amber-50'/>@@ -303,7 +300,7 @@ const Billing = () => {<div className='mt-5 max-w-prose rounded-md bg-red-50 p-4 dark:bg-red-600/20'><div className='flex'><div className='shrink-0'>- <ExclamationTriangleIcon+ <WarningOctagonIconaria-hidden='true'className='h-5 w-5 text-red-400 dark:text-red-100'/>@@ -371,7 +368,7 @@ const Billing = () => {<div className='mb-4 rounded-md bg-amber-50 p-4 dark:bg-amber-600/30'><div className='flex'><div className='shrink-0'>- <ExclamationTriangleIcon+ <WarningOctagonIconaria-hidden='true'className='h-5 w-5 text-amber-400 dark:text-amber-100'/>diff --git a/web/app/pages/Blog/Post.tsx b/web/app/pages/Blog/Post.tsxindex ce6b756d7..2f4451fb1 100644--- a/web/app/pages/Blog/Post.tsx+++ b/web/app/pages/Blog/Post.tsx@@ -1,4 +1,4 @@-import { ChevronLeftIcon } from 'lucide-react'+import { CaretLeftIcon } from '@phosphor-icons/react'import { useEffect } from 'react'import { useTranslation } from 'react-i18next'import { Link, useLoaderData, useLocation } from 'react-router'@@ -57,7 +57,7 @@ export default function PostSlug() {to='/blog'className='underline-animate group mt-10 mb-6 flex max-w-max items-center text-sm leading-6 font-semibold text-slate-700 uppercase hover:text-slate-900 dark:text-slate-200 dark:hover:text-white'>- <ChevronLeftIcon className='mr-2 size-4 text-slate-500 dark:text-slate-400' />+ <CaretLeftIcon className='mr-2 size-4 text-slate-500 dark:text-slate-400' />{t('common.allPosts')}</Link>)}diff --git a/web/app/pages/Captcha/CaptchaDemo.tsx b/web/app/pages/Captcha/CaptchaDemo.tsxindex f328c9f00..bc62ebe80 100644--- a/web/app/pages/Captcha/CaptchaDemo.tsx+++ b/web/app/pages/Captcha/CaptchaDemo.tsx@@ -1,4 +1,4 @@-import { ArrowRightIcon } from '@heroicons/react/20/solid'+import { ArrowRightIcon } from '@phosphor-icons/react'import { useCallback, useEffect, useState } from 'react'import { useTranslation } from 'react-i18next'diff --git a/web/app/pages/Captcha/index.tsx b/web/app/pages/Captcha/index.tsxindex 590cfb667..0fc4793d9 100644--- a/web/app/pages/Captcha/index.tsx+++ b/web/app/pages/Captcha/index.tsx@@ -1,10 +1,10 @@-import { ArrowRightIcon } from '@heroicons/react/20/solid'import {- CodeBracketIcon,+ ArrowRightIcon,+ BracketsCurlyIcon,PuzzlePieceIcon,- CursorArrowRaysIcon,+ CursorClickIcon,EyeSlashIcon,-} from '@heroicons/react/24/outline'+} from '@phosphor-icons/react'import _map from 'lodash/map'import { useEffect, useState } from 'react'import { useTranslation, Trans } from 'react-i18next'@@ -38,7 +38,7 @@ const features = [{titleKey: 'captchaPage.features.opensource.title',descKey: 'captchaPage.features.opensource.desc',- icon: CodeBracketIcon,+ icon: BracketsCurlyIcon,},{titleKey: 'captchaPage.features.customisable.title',@@ -48,7 +48,7 @@ const features = [{titleKey: 'captchaPage.features.easy.title',descKey: 'captchaPage.features.easy.desc',- icon: CursorArrowRaysIcon,+ icon: CursorClickIcon,},]diff --git a/web/app/pages/Contact/index.tsx b/web/app/pages/Contact/index.tsxindex 65ebe4ff9..aedc1a94e 100644--- a/web/app/pages/Contact/index.tsx+++ b/web/app/pages/Contact/index.tsx@@ -1,4 +1,4 @@-import { SquareArrowOutUpRightIcon } from 'lucide-react'+import { ArrowSquareOutIcon } from '@phosphor-icons/react'import { useTranslation, Trans } from 'react-i18next'import {@@ -23,10 +23,7 @@ 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-800'>- <SquareArrowOutUpRightIcon- className='absolute top-5 right-5 h-5 w-5 text-gray-900 dark:text-gray-100'- strokeWidth={1.5}- />+ <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'>{title}</h3>diff --git a/web/app/pages/Dashboard/AddProject.tsx b/web/app/pages/Dashboard/AddProject.tsxindex 12fb67014..3ec36424f 100644--- a/web/app/pages/Dashboard/AddProject.tsx+++ b/web/app/pages/Dashboard/AddProject.tsx@@ -1,4 +1,4 @@-import { FolderPlusIcon } from '@heroicons/react/24/outline'+import { FolderPlusIcon } from '@phosphor-icons/react'import cx from 'clsx'import React from 'react'import { useTranslation } from 'react-i18next'diff --git a/web/app/pages/Dashboard/Dashboard.tsx b/web/app/pages/Dashboard/Dashboard.tsxindex 092cedb96..f5261bccb 100644--- a/web/app/pages/Dashboard/Dashboard.tsx+++ b/web/app/pages/Dashboard/Dashboard.tsx@@ -4,12 +4,12 @@ import _keys from 'lodash/keys'import _map from 'lodash/map'import _size from 'lodash/size'import {- StretchHorizontalIcon,- LayoutGridIcon,- SearchIcon,+ RowsIcon,+ SquaresFourIcon,+ MagnifyingGlassIcon,XIcon,FolderPlusIcon,-} from 'lucide-react'+} from '@phosphor-icons/react'import React, { useState, useEffect, useRef, useMemo, memo } from 'react'import { useTranslation } from 'react-i18next'import {@@ -367,10 +367,7 @@ const Dashboard = () => {}}aria-label={t('common.close')}>- <XIcon- className='h-5 w-5 cursor-pointer rounded-md text-gray-900 dark:text-gray-50'- strokeWidth={1.5}- />+ <XIcon className='h-5 w-5 cursor-pointer rounded-md text-gray-900 dark:text-gray-50' /></button>) : (<button@@ -384,10 +381,7 @@ const Dashboard = () => {}}aria-label={t('project.search')}>- <SearchIcon- className='h-5 w-5 cursor-pointer rounded-md text-gray-900 dark:text-gray-50'- strokeWidth={1.5}- />+ <MagnifyingGlassIcon className='h-5 w-5 cursor-pointer rounded-md text-gray-900 dark:text-gray-50' /></button>)}</Text>@@ -398,10 +392,7 @@ const Dashboard = () => {</label><div className='relative w-full'><div className='pointer-events-none absolute inset-y-0 left-0 hidden items-center sm:flex'>- <SearchIcon- className='ml-2 h-5 w-5 cursor-pointer text-gray-900 hover:opacity-80 dark:text-gray-50'- strokeWidth={1.5}- />+ <MagnifyingGlassIcon className='ml-2 h-5 w-5 cursor-pointer text-gray-900 hover:opacity-80 dark:text-gray-50' /></div><inputref={searchInputRef}@@ -435,7 +426,7 @@ const Dashboard = () => {onClick={() => handleViewModeChange(DASHBOARD_VIEW.LIST)}className='rounded-md border border-transparent bg-gray-50 p-2 transition-colors hover:border-gray-300 hover:bg-white dark:bg-slate-900 hover:dark:border-slate-700/80 dark:hover:bg-slate-800'>- <StretchHorizontalIcon className='h-5 w-5 text-gray-700 dark:text-gray-50' />+ <RowsIcon className='h-5 w-5 text-gray-700 dark:text-gray-50' /></button>) : null}{viewMode === DASHBOARD_VIEW.LIST ? (@@ -447,12 +438,12 @@ const Dashboard = () => {}}className='rounded-md border border-transparent bg-gray-50 p-2 transition-colors hover:border-gray-300 hover:bg-white dark:bg-slate-900 hover:dark:border-slate-700/80 dark:hover:bg-slate-800'>- <LayoutGridIcon className='h-5 w-5 text-gray-700 dark:text-gray-50' />+ <SquaresFourIcon className='h-5 w-5 text-gray-700 dark:text-gray-50' /></button>) : null}</div><Button onClick={onNewProject} primary large>- <FolderPlusIcon className='mr-1 h-5 w-5' strokeWidth={1.5} />+ <FolderPlusIcon className='mr-1 h-5 w-5' />{t('dashboard.newProject')}</Button></div>@@ -464,10 +455,7 @@ const Dashboard = () => {</label><div className='relative w-full'><div className='pointer-events-none absolute inset-y-0 left-0 flex items-center'>- <SearchIcon- className='ml-2 h-5 w-5 cursor-pointer text-gray-900 hover:opacity-80 dark:text-gray-50'- strokeWidth={1.5}- />+ <MagnifyingGlassIcon className='ml-2 h-5 w-5 cursor-pointer text-gray-900 hover:opacity-80 dark:text-gray-50' /></div><inputid='project-search'diff --git a/web/app/pages/Dashboard/NoProjects.tsx b/web/app/pages/Dashboard/NoProjects.tsxindex 264197900..a146ac152 100644--- a/web/app/pages/Dashboard/NoProjects.tsx+++ b/web/app/pages/Dashboard/NoProjects.tsx@@ -1,5 +1,4 @@-import { FolderPlusIcon } from '@heroicons/react/24/outline'-import { FolderInputIcon } from 'lucide-react'+import { FolderSimpleIcon, FolderPlusIcon } from '@phosphor-icons/react'import { useTranslation } from 'react-i18next'import { Text } from '~/ui/Text'@@ -27,10 +26,7 @@ export const NoProjects = ({ onClick, search }: NoProjectsProps) => {return (<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-800'>- <FolderInputIcon- className='size-7 text-gray-700 dark:text-gray-200'- strokeWidth={1.5}- />+ <FolderSimpleIcon className='size-7 text-gray-700 dark:text-gray-200' /></div><Text as='h3' size='xl' weight='medium' className='tracking-tight'>{t('dashboard.noProjects')}diff --git a/web/app/pages/Dashboard/PeriodSelector.tsx b/web/app/pages/Dashboard/PeriodSelector.tsxindex 2bf7901bb..ecc08c51d 100644--- a/web/app/pages/Dashboard/PeriodSelector.tsx+++ b/web/app/pages/Dashboard/PeriodSelector.tsx@@ -4,10 +4,9 @@ import {PopoverPanel,Transition,} from '@headlessui/react'-import { ChevronDownIcon } from '@heroicons/react/20/solid'import cx from 'clsx'import _map from 'lodash/map'-import { CalendarIcon } from 'lucide-react'+import { CalendarDotsIcon, CaretDownIcon } from '@phosphor-icons/react'import { Fragment, useMemo } from 'react'import { useTranslation } from 'react-i18next'@@ -68,9 +67,9 @@ export const PeriodSelector = ({{({ open }) => (<><PopoverButton className='group inline-flex w-full rounded-md border border-transparent bg-gray-50 p-2 text-sm font-medium text-gray-700 outline-hidden transition-colors hover:border-gray-300 hover:bg-white dark:bg-slate-900 dark:text-gray-50 hover:dark:border-slate-700/80 dark:hover:bg-slate-800'>- <CalendarIcon className='mr-1 h-5 w-5' strokeWidth={1.5} />+ <CalendarDotsIcon className='mr-1 h-5 w-5' /><span>{period}</span>- <ChevronDownIcon+ <CaretDownIconclassName={cx('ml-2 h-5 w-5 transform-gpu text-gray-700 transition ease-in-out group-hover:text-gray-500 dark:text-gray-50',{diff --git a/web/app/pages/Dashboard/ProjectCard.tsx b/web/app/pages/Dashboard/ProjectCard.tsxindex f92c0c795..dfe7f4107 100644--- a/web/app/pages/Dashboard/ProjectCard.tsx+++ b/web/app/pages/Dashboard/ProjectCard.tsx@@ -4,11 +4,11 @@ import _isNumber from 'lodash/isNumber'import _replace from 'lodash/replace'import _size from 'lodash/size'import {- Settings2Icon,- PinIcon,- ChevronUpIcon,- ChevronDownIcon,-} from 'lucide-react'+ SlidersHorizontalIcon,+ PushPinIcon,+ CaretUpIcon,+ CaretDownIcon,+} from '@phosphor-icons/react'import React, { useState, useMemo, useCallback, useEffect } from 'react'import { useTranslation } from 'react-i18next'import { Link, useFetcher, useNavigate } from 'react-router'@@ -102,12 +102,12 @@ const MiniCard = ({ labelTKey, total, percChange, hasData }: MiniCardProps) => {>{statsDidGrowUp ? (<>- <ChevronUpIcon className='size-3.5 shrink-0 text-green-500' />+ <CaretUpIcon className='size-3.5 shrink-0 text-green-500' /><span className='sr-only'>{t('dashboard.inc')}</span></>) : (<>- <ChevronDownIcon className='size-3.5 shrink-0 text-slate-500 dark:text-slate-400' />+ <CaretDownIcon className='size-3.5 shrink-0 text-slate-500 dark:text-slate-400' /><span className='sr-only'>{t('dashboard.dec')}</span></>)}@@ -398,12 +398,9 @@ export const ProjectCard = ({localIsPinned ? t('dashboard.unpin') : t('dashboard.pin')}>- <PinIcon- className={cx(- 'size-5 transition-transform',- localIsPinned && 'rotate-30',- )}- strokeWidth={1.5}+ <PushPinIcon+ className='size-5 transition-transform'+ weight={localIsPinned ? 'duotone' : 'regular'}/></button>{project.isAccessConfirmed && role !== 'viewer' ? (@@ -417,7 +414,7 @@ export const ProjectCard = ({}}aria-label={`${t('project.settings.settings')} ${name}`}>- <Settings2Icon className='size-5' strokeWidth={1.5} />+ <SlidersHorizontalIcon className='size-5' /></button>) : null}</div>diff --git a/web/app/pages/Dashboard/SortSelector.tsx b/web/app/pages/Dashboard/SortSelector.tsxindex 7ded298a6..11da6ed1e 100644--- a/web/app/pages/Dashboard/SortSelector.tsx+++ b/web/app/pages/Dashboard/SortSelector.tsx@@ -4,10 +4,9 @@ import {PopoverPanel,Transition,} from '@headlessui/react'-import { ChevronDownIcon } from '@heroicons/react/20/solid'import cx from 'clsx'import _map from 'lodash/map'-import { ArrowUpDown } from 'lucide-react'+import { ArrowsDownUpIcon, CaretDownIcon } from '@phosphor-icons/react'import { Fragment, useEffect, useMemo } from 'react'import { useTranslation } from 'react-i18next'@@ -73,9 +72,9 @@ export const SortSelector = ({{({ open }) => (<><PopoverButton className='group inline-flex w-full rounded-md border border-transparent bg-gray-50 p-2 text-sm font-medium text-gray-700 outline-hidden transition-colors hover:border-gray-300 hover:bg-white dark:bg-slate-900 dark:text-gray-50 hover:dark:border-slate-700/80 dark:hover:bg-slate-800'>- <ArrowUpDown className='mr-1 h-5 w-5' strokeWidth={1.5} />+ <ArrowsDownUpIcon className='mr-1 h-5 w-5' /><span>{sortLabel}</span>- <ChevronDownIcon+ <CaretDownIconclassName={cx('ml-2 h-5 w-5 transform-gpu text-gray-700 transition ease-in-out group-hover:text-gray-500 dark:text-gray-50',{diff --git a/web/app/pages/ErrorTracking/index.tsx b/web/app/pages/ErrorTracking/index.tsxindex a78ae964f..1c77579f2 100644--- a/web/app/pages/ErrorTracking/index.tsx+++ b/web/app/pages/ErrorTracking/index.tsx@@ -1,4 +1,4 @@-import { ArrowRightIcon } from '@heroicons/react/20/solid'+import { ArrowRightIcon } from '@phosphor-icons/react'import _map from 'lodash/map'import { useTranslation, Trans } from 'react-i18next'import { Link } from 'react-router'diff --git a/web/app/pages/Landings/Marketers.tsx b/web/app/pages/Landings/Marketers.tsxindex 97b7bb1d6..e450323c2 100644--- a/web/app/pages/Landings/Marketers.tsx+++ b/web/app/pages/Landings/Marketers.tsx@@ -1,4 +1,4 @@-import { ArrowRightIcon } from '@heroicons/react/20/solid'+import { ArrowRightIcon } from '@phosphor-icons/react'import _map from 'lodash/map'import { useTranslation, Trans } from 'react-i18next'import { Link } from 'react-router'diff --git a/web/app/pages/Landings/SmallBusinesses.tsx b/web/app/pages/Landings/SmallBusinesses.tsxindex 81359014e..78beb9617 100644--- a/web/app/pages/Landings/SmallBusinesses.tsx+++ b/web/app/pages/Landings/SmallBusinesses.tsx@@ -1,4 +1,4 @@-import { ArrowRightIcon } from '@heroicons/react/20/solid'+import { ArrowRightIcon } from '@phosphor-icons/react'import _map from 'lodash/map'import { useTranslation, Trans } from 'react-i18next'import { Link } from 'react-router'diff --git a/web/app/pages/Landings/Startups.tsx b/web/app/pages/Landings/Startups.tsxindex c2fb7b55f..9f8df5bbd 100644--- a/web/app/pages/Landings/Startups.tsx+++ b/web/app/pages/Landings/Startups.tsx@@ -1,4 +1,4 @@-import { ArrowRightIcon } from '@heroicons/react/20/solid'+import { ArrowRightIcon } from '@phosphor-icons/react'import _map from 'lodash/map'import { useTranslation, Trans } from 'react-i18next'import { Link } from 'react-router'diff --git a/web/app/pages/Onboarding/Onboarding.tsx b/web/app/pages/Onboarding/Onboarding.tsxindex 9de7519b8..a6f33e58d 100644--- a/web/app/pages/Onboarding/Onboarding.tsx+++ b/web/app/pages/Onboarding/Onboarding.tsx@@ -1,14 +1,14 @@-import { EnvelopeIcon } from '@heroicons/react/24/outline'-import { CheckCircleIcon as CheckCircleIconSolid } from '@heroicons/react/24/solid'import type { TFunction } from 'i18next'import {- ChevronRightIcon,- LaptopMinimalIcon,+ CaretRightIcon,+ LaptopIcon,RocketIcon,CodeIcon,- MailCheckIcon,- SparklesIcon,-} from 'lucide-react'+ EnvelopeOpenIcon,+ SparkleIcon,+ EnvelopeIcon,+ CheckCircleIcon,+} from '@phosphor-icons/react'import { useState, useEffect, useMemo, useRef } from 'react'import { Trans, useTranslation } from 'react-i18next'import { Link, useNavigate, useFetcher, useLoaderData } from 'react-router'@@ -37,10 +37,10 @@ import routes from '~/utils/routes'const MAX_PROJECT_NAME_LENGTH = 50const STEP_ICONS = {- confirm_email: MailCheckIcon,+ confirm_email: EnvelopeOpenIcon,create_project: RocketIcon,setup_tracking: CodeIcon,- waiting_for_events: SparklesIcon,+ waiting_for_events: SparkleIcon,}const getOnboardingSteps = (t: TFunction) => [@@ -328,7 +328,7 @@ const Onboarding = () => {)}>{status === 'complete' ? (- <CheckCircleIconSolid className='size-5 text-green-600 dark:text-green-400' />+ <CheckCircleIcon className='size-5 text-green-600 dark:text-green-400' />) : StepIcon ? (<StepIconclassName={cn(@@ -338,7 +338,6 @@ const Onboarding = () => {status === 'upcoming' &&'text-gray-400 dark:text-gray-500',)}- strokeWidth={1.5}/>) : null}</div>@@ -382,7 +381,7 @@ const Onboarding = () => {className='flex w-full items-center justify-center gap-1 rounded-lg px-3 py-2 text-sm text-gray-600 transition-colors hover:bg-gray-100 hover:text-gray-900 dark:text-gray-400 dark:hover:bg-slate-800 dark:hover:text-gray-200'>{t('onboarding.skipOnboarding')}- <ChevronRightIcon className='size-3.5' strokeWidth={2} />+ <CaretRightIcon className='size-3.5' /></button></div>) : null}@@ -416,7 +415,7 @@ const Onboarding = () => {className='mt-3 flex w-full items-center justify-center gap-1 text-sm text-gray-500 dark:text-gray-400'>{t('onboarding.skipOnboarding')}- <ChevronRightIcon className='size-3.5' strokeWidth={2} />+ <CaretRightIcon className='size-3.5' /></button>) : null}</div>@@ -481,10 +480,7 @@ const Onboarding = () => {{currentStep === 1 ? (<form onSubmit={handleCreateProject} className='p-6 md:p-8'><div className='mx-auto mb-6 flex size-16 items-center justify-center rounded-2xl bg-gradient-to-br from-indigo-100 to-purple-100 dark:from-indigo-500/20 dark:to-purple-500/20'>- <RocketIcon- className='size-8 text-indigo-600 dark:text-indigo-400'- strokeWidth={1.5}- />+ <RocketIcon className='size-8 text-indigo-600 dark:text-indigo-400' /></div><Textas='h1'@@ -529,10 +525,7 @@ const Onboarding = () => {{currentStep === 2 && project ? (<div className='p-6 md:p-8'><div className='mx-auto mb-6 flex size-16 items-center justify-center rounded-2xl bg-gradient-to-br from-indigo-100 to-purple-100 dark:from-indigo-500/20 dark:to-purple-500/20'>- <CodeIcon- className='size-8 text-indigo-600 dark:text-indigo-400'- strokeWidth={1.5}- />+ <CodeIcon className='size-8 text-indigo-600 dark:text-indigo-400' /></div><Textas='h1'@@ -567,10 +560,7 @@ const Onboarding = () => {<div className='mt-8 rounded-lg border border-gray-200 bg-gray-50 p-5 dark:border-slate-700/60 dark:bg-slate-800/50'><div className='flex items-center gap-3'><div className='flex size-11 items-center justify-center rounded-lg bg-white dark:bg-slate-700'>- <LaptopMinimalIcon- className='size-5 text-gray-700 dark:text-gray-200'- strokeWidth={1.5}- />+ <LaptopIcon className='size-5 text-gray-700 dark:text-gray-200' /></div><div><Text as='h3' size='sm' weight='semibold'>@@ -649,7 +639,7 @@ const Onboarding = () => {)}>{hasEvents ? (- <CheckCircleIconSolid className='size-8 text-green-600 dark:text-green-400' />+ <CheckCircleIcon className='size-8 text-green-600 dark:text-green-400' />) : (<PulsatingCircle type='giant' />)}diff --git a/web/app/pages/Organisations/AddOrganisation.tsx b/web/app/pages/Organisations/AddOrganisation.tsxindex e204048ff..997aba900 100644--- a/web/app/pages/Organisations/AddOrganisation.tsx+++ b/web/app/pages/Organisations/AddOrganisation.tsx@@ -1,4 +1,4 @@-import { BuildingOffice2Icon } from '@heroicons/react/24/outline'+import { BuildingOfficeIcon } from '@phosphor-icons/react'import cx from 'clsx'import { useTranslation } from 'react-i18next'@@ -25,7 +25,7 @@ export const AddOrganisation = ({)}><div>- <BuildingOffice2Icon+ <BuildingOfficeIconclassName='mx-auto h-12 w-12 text-gray-400 transition-colors group-hover:text-gray-500 dark:text-gray-200 group-hover:dark:text-gray-400'strokeWidth={1}/>diff --git a/web/app/pages/Organisations/NoOrganisations.tsx b/web/app/pages/Organisations/NoOrganisations.tsxindex b0db977d3..5baae2f70 100644--- a/web/app/pages/Organisations/NoOrganisations.tsx+++ b/web/app/pages/Organisations/NoOrganisations.tsx@@ -1,4 +1,4 @@-import { BuildingOffice2Icon } from '@heroicons/react/24/outline'+import { BuildingOfficeIcon } from '@phosphor-icons/react'import { useTranslation } from 'react-i18next'import { Text } from '~/ui/Text'@@ -13,10 +13,7 @@ export const NoOrganisations = ({ onClick }: NoOrganisationsProps) => {return (<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-800'>- <BuildingOffice2Icon- className='size-7 text-gray-700 dark:text-gray-200'- strokeWidth={1.5}- />+ <BuildingOfficeIcon className='size-7 text-gray-700 dark:text-gray-200' /></div><Text as='h3' size='xl' weight='medium' className='tracking-tight'>{t('organisations.noOrganisations')}diff --git a/web/app/pages/Organisations/OrganisationCard.tsx b/web/app/pages/Organisations/OrganisationCard.tsxindex ef91cb8c7..ed5cfef8a 100644--- a/web/app/pages/Organisations/OrganisationCard.tsx+++ b/web/app/pages/Organisations/OrganisationCard.tsx@@ -3,7 +3,7 @@ import _find from 'lodash/find'import _map from 'lodash/map'import _replace from 'lodash/replace'import _size from 'lodash/size'-import { Settings2Icon } from 'lucide-react'+import { SlidersHorizontalIcon } from '@phosphor-icons/react'import React, { useState, useMemo, useEffect } from 'react'import { useTranslation } from 'react-i18next'import { Link, useFetcher } from 'react-router'@@ -121,7 +121,7 @@ export const OrganisationCard = ({ organisation }: OrganisationCardProps) => {aria-label={`${t('project.settings.settings')} ${name}`}className='rounded-md border border-transparent p-1.5 text-gray-800 transition-colors hover:border-gray-300 hover:bg-gray-50 hover:text-gray-900 dark:text-slate-400 hover:dark:border-slate-700/80 dark:hover:bg-slate-800 dark:hover:text-slate-300'>- <Settings2Icon className='size-5' strokeWidth={1.5} />+ <SlidersHorizontalIcon className='size-5' /></div>)}</div>diff --git a/web/app/pages/Organisations/Organisations.tsx b/web/app/pages/Organisations/Organisations.tsxindex 785172f2f..b283218b9 100644--- a/web/app/pages/Organisations/Organisations.tsx+++ b/web/app/pages/Organisations/Organisations.tsx@@ -1,8 +1,11 @@-import { BuildingOffice2Icon } from '@heroicons/react/24/outline'import _isEmpty from 'lodash/isEmpty'import _map from 'lodash/map'import _size from 'lodash/size'-import { SearchIcon, XIcon } from 'lucide-react'+import {+ MagnifyingGlassIcon,+ XIcon,+ BuildingOfficeIcon,+} from '@phosphor-icons/react'import React, { useState, useEffect, useRef, useCallback } from 'react'import { useTranslation } from 'react-i18next'import {@@ -194,10 +197,7 @@ const Organisations = () => {}}aria-label={t('common.close')}>- <XIcon- className='h-5 w-5 cursor-pointer rounded-md text-gray-900 dark:text-gray-50'- strokeWidth={1.5}- />+ <XIcon className='h-5 w-5 cursor-pointer rounded-md text-gray-900 dark:text-gray-50' /></button>) : (<button@@ -211,10 +211,7 @@ const Organisations = () => {}}aria-label={t('project.search')}>- <SearchIcon- className='h-5 w-5 cursor-pointer rounded-md text-gray-900 dark:text-gray-50'- strokeWidth={1.5}- />+ <MagnifyingGlassIcon className='h-5 w-5 cursor-pointer rounded-md text-gray-900 dark:text-gray-50' /></button>)}</Text>@@ -225,10 +222,7 @@ const Organisations = () => {</label><div className='relative w-full'><div className='pointer-events-none absolute inset-y-0 left-0 hidden items-center sm:flex'>- <SearchIcon- className='ml-2 h-5 w-5 cursor-pointer text-gray-900 hover:opacity-80 dark:text-gray-50'- strokeWidth={1.5}- />+ <MagnifyingGlassIcon className='ml-2 h-5 w-5 cursor-pointer text-gray-900 hover:opacity-80 dark:text-gray-50' /></div><inputref={searchInputRef}@@ -244,10 +238,7 @@ const Organisations = () => {) : null}</div><Button onClick={onNewOrganisation} primary large>- <BuildingOffice2Icon- className='mr-1 h-5 w-5'- strokeWidth={1.5}- />+ <BuildingOfficeIcon className='mr-1 h-5 w-5' />{t('organisations.new')}</Button></div>@@ -258,10 +249,7 @@ const Organisations = () => {</label><div className='relative w-full'><div className='pointer-events-none absolute inset-y-0 left-0 flex items-center'>- <SearchIcon- className='ml-2 h-5 w-5 cursor-pointer text-gray-900 hover:opacity-80 dark:text-gray-50'- strokeWidth={1.5}- />+ <MagnifyingGlassIcon className='ml-2 h-5 w-5 cursor-pointer text-gray-900 hover:opacity-80 dark:text-gray-50' /></div><inputid='organisation-search-mobile'diff --git a/web/app/pages/Organisations/Settings/People.tsx b/web/app/pages/Organisations/Settings/People.tsxindex b647192d1..c04848f33 100644--- a/web/app/pages/Organisations/Settings/People.tsx+++ b/web/app/pages/Organisations/Settings/People.tsx@@ -1,10 +1,14 @@-import { ChevronDownIcon, CheckIcon } from '@heroicons/react/24/solid'import cx from 'clsx'import dayjs from 'dayjs'import _isEmpty from 'lodash/isEmpty'import _keys from 'lodash/keys'import _map from 'lodash/map'-import { Trash2Icon, UserRoundPlusIcon } from 'lucide-react'+import {+ TrashIcon,+ UserCirclePlusIcon,+ CaretDownIcon,+ CheckIcon,+} from '@phosphor-icons/react'import React, { useState, useEffect, useRef } from 'react'import { useTranslation } from 'react-i18next'import { useFetcher } from 'react-router'@@ -89,7 +93,7 @@ const UsersList = ({ members, onRemove, fetcher }: UsersListProps) => {className='inline-flex items-center rounded-full border border-gray-200 bg-white py-0.5 pr-1 pl-2 text-sm leading-5 font-medium text-gray-700 hover:bg-gray-50 disabled:cursor-not-allowed disabled:opacity-80 dark:border-gray-600 dark:bg-slate-800 dark:text-gray-200 dark:hover:bg-gray-600'>{t(`organisations.role.${member.role}.name`)}- <ChevronDownIcon+ <CaretDownIconstyle={{transform:roleEditDropdownId === member.id ? 'rotate(180deg)' : '',@@ -153,7 +157,7 @@ const UsersList = ({ members, onRemove, fetcher }: UsersListProps) => {smallonClick={() => onRemove(member)}>- <Trash2Icon className='h-4 w-4' strokeWidth={1.5} />+ <TrashIcon className='h-4 w-4' /></Button></div>)}@@ -310,7 +314,7 @@ const People = ({ organisation }: PeopleProps) => {onClick={() => setShowModal(true)}><>- <UserRoundPlusIcon className='mr-1 h-5 w-5' strokeWidth={1.5} />+ <UserCirclePlusIcon className='mr-1 h-5 w-5' />{t('project.settings.invite')}</></Button>diff --git a/web/app/pages/Organisations/Settings/Projects.tsx b/web/app/pages/Organisations/Settings/Projects.tsxindex 1eba44a22..c807ceff4 100644--- a/web/app/pages/Organisations/Settings/Projects.tsx+++ b/web/app/pages/Organisations/Settings/Projects.tsx@@ -1,9 +1,9 @@import {- InformationCircleIcon,+ InfoIcon,MagnifyingGlassIcon,FolderPlusIcon,- XMarkIcon,-} from '@heroicons/react/24/outline'+ XIcon,+} from '@phosphor-icons/react'import _filter from 'lodash/filter'import _isEmpty from 'lodash/isEmpty'import _map from 'lodash/map'@@ -172,9 +172,7 @@ const ProjectList = ({ projects, onRemove }: ProjectListProps) => {text={t('organisations.projectOwnedBy', {email: project.admin.email,})}- tooltipNode={- <InformationCircleIcon className='size-5 text-gray-400' />- }+ tooltipNode={<InfoIcon className='size-5 text-gray-400' />}/>) : null}@@ -266,7 +264,7 @@ export const Projects = ({ organisation }: ProjectsProps) => {<h3 className='mt-2 flex items-center text-lg font-bold text-gray-900 dark:text-gray-50'>{t('organisations.projects')}{isSearchActive ? (- <XMarkIcon+ <XIconclassName='ml-2 h-5 w-5 cursor-pointer text-gray-900 hover:opacity-80 dark:text-gray-50'onClick={() => {setSearch('')diff --git a/web/app/pages/Organisations/Settings/index.tsx b/web/app/pages/Organisations/Settings/index.tsxindex 826ad2583..80c5d5baf 100644--- a/web/app/pages/Organisations/Settings/index.tsx+++ b/web/app/pages/Organisations/Settings/index.tsx@@ -1,7 +1,7 @@import _isEmpty from 'lodash/isEmpty'import _keys from 'lodash/keys'import _size from 'lodash/size'-import { Trash2Icon } from 'lucide-react'+import { TrashIcon } from '@phosphor-icons/react'import React, { useState, useEffect, useMemo } from 'react'import { useTranslation } from 'react-i18next'import {@@ -251,7 +251,7 @@ const OrganisationSettings = () => {dangersemiSmall>- <Trash2Icon className='mr-1 h-5 w-5' strokeWidth={1.5} />+ <TrashIcon className='mr-1 h-5 w-5' />{t('organisations.delete')}</Button></div>diff --git a/web/app/pages/Performance/index.tsx b/web/app/pages/Performance/index.tsxindex 22e588c4f..24c1f0cc5 100644--- a/web/app/pages/Performance/index.tsx+++ b/web/app/pages/Performance/index.tsx@@ -1,4 +1,4 @@-import { ArrowRightIcon } from '@heroicons/react/20/solid'+import { ArrowRightIcon } from '@phosphor-icons/react'import _map from 'lodash/map'import { useTranslation, Trans } from 'react-i18next'import { Link } from 'react-router'diff --git a/web/app/pages/Project/Settings/Annotations.tsx b/web/app/pages/Project/Settings/Annotations.tsxindex e82142b84..59914e4d3 100644--- a/web/app/pages/Project/Settings/Annotations.tsx+++ b/web/app/pages/Project/Settings/Annotations.tsx@@ -1,7 +1,7 @@import _isEmpty from 'lodash/isEmpty'import _map from 'lodash/map'import _size from 'lodash/size'-import { PencilIcon, Trash2Icon, PlusIcon } from 'lucide-react'+import { PencilIcon, TrashIcon, PlusIcon } from '@phosphor-icons/react'import { useCallback, useEffect, useRef, useState } from 'react'import { useTranslation } from 'react-i18next'import { useFetcher } from 'react-router'@@ -252,7 +252,7 @@ const Annotations = ({ projectId, allowedToManage }: AnnotationsProps) => {className='rounded p-1.5 text-red-500 transition-colors hover:bg-red-50 hover:text-red-700 dark:text-red-400 dark:hover:bg-red-900/20 dark:hover:text-red-300'title={t('common.delete')}>- <Trash2Icon className='h-4 w-4' />+ <TrashIcon className='h-4 w-4' /></button></div></td>diff --git a/web/app/pages/Project/Settings/Emails/Emails.tsx b/web/app/pages/Project/Settings/Emails/Emails.tsxindex d9c1629d7..e5fa4d177 100644--- a/web/app/pages/Project/Settings/Emails/Emails.tsx+++ b/web/app/pages/Project/Settings/Emails/Emails.tsx@@ -1,4 +1,3 @@-import { ChevronDownIcon, CheckIcon } from '@heroicons/react/24/outline'import cx from 'clsx'import dayjs from 'dayjs'import _filter from 'lodash/filter'@@ -6,7 +5,12 @@ import _isEmpty from 'lodash/isEmpty'import _keys from 'lodash/keys'import _map from 'lodash/map'import _toLower from 'lodash/toLower'-import { MailPlusIcon, Trash2Icon } from 'lucide-react'+import {+ EnvelopeSimpleIcon,+ TrashIcon,+ CaretDownIcon,+ CheckIcon,+} from '@phosphor-icons/react'import React, { useState, useEffect, useRef } from 'react'import { useTranslation } from 'react-i18next'import { useFetcher, useParams } from 'react-router'@@ -226,7 +230,7 @@ const EmailList = ({ data, onRemove, setEmails }: EmailListProps) => {className='inline-flex items-center rounded-full border border-gray-200 bg-white py-0.5 pr-1 pl-2 text-sm leading-5 font-medium text-gray-700 hover:bg-gray-50 dark:border-gray-600 dark:bg-slate-800 dark:text-gray-200 dark:hover:bg-gray-600'>{t(`profileSettings.${_toLower(reportFrequency)}`)}- <ChevronDownIcon+ <CaretDownIconstyle={{ transform: open ? 'rotate(180deg)' : '' }}className='ml-0.5 h-4 w-4 pt-px'/>@@ -281,7 +285,7 @@ const EmailList = ({ data, onRemove, setEmails }: EmailListProps) => {smallonClick={onRemove}>- <Trash2Icon className='h-4 w-4' strokeWidth={1.5} />+ <TrashIcon className='h-4 w-4' /></Button></div>)}@@ -518,7 +522,7 @@ const Emails = ({ projectId }: { projectId: string }) => {onClick={() => setShowModal(true)}><>- <MailPlusIcon className='mr-1 h-5 w-5' strokeWidth={1.5} />+ <EnvelopeSimpleIcon className='mr-1 h-5 w-5' />{t('project.emails.add')}</></Button>diff --git a/web/app/pages/Project/Settings/People/People.tsx b/web/app/pages/Project/Settings/People/People.tsxindex aa0c89404..289b8ce58 100644--- a/web/app/pages/Project/Settings/People/People.tsx+++ b/web/app/pages/Project/Settings/People/People.tsx@@ -1,10 +1,14 @@-import { ChevronDownIcon, CheckIcon } from '@heroicons/react/24/solid'import cx from 'clsx'import dayjs from 'dayjs'import _isEmpty from 'lodash/isEmpty'import _keys from 'lodash/keys'import _map from 'lodash/map'-import { Trash2Icon, UserRoundPlusIcon } from 'lucide-react'+import {+ TrashIcon,+ UserCirclePlusIcon,+ CaretDownIcon,+ CheckIcon,+} from '@phosphor-icons/react'import React, { useState, useEffect, useRef } from 'react'import { useTranslation } from 'react-i18next'import { useFetcher, useRevalidator } from 'react-router'@@ -101,7 +105,7 @@ const TableUserRow = ({className='inline-flex items-center rounded-full border border-gray-200 bg-white py-0.5 pr-1 pl-2 text-sm leading-5 font-medium text-gray-700 hover:bg-gray-50 disabled:cursor-not-allowed disabled:opacity-80 dark:border-gray-600 dark:bg-slate-800 dark:text-gray-200 dark:hover:bg-gray-600'>{t(`project.settings.roles.${role}.name`)}- <ChevronDownIcon+ <CaretDownIconstyle={{ transform: open ? 'rotate(180deg)' : '' }}className='ml-0.5 h-4 w-4 pt-px'/>@@ -159,7 +163,7 @@ const TableUserRow = ({smallonClick={onRemove}>- <Trash2Icon className='h-4 w-4' strokeWidth={1.5} />+ <TrashIcon className='h-4 w-4' /></Button></div>)}@@ -321,7 +325,7 @@ const People = ({ project }: PeopleProps) => {onClick={() => setShowModal(true)}><>- <UserRoundPlusIcon className='mr-1 h-5 w-5' strokeWidth={1.5} />+ <UserCirclePlusIcon className='mr-1 h-5 w-5' />{t('project.settings.invite')}</></Button>diff --git a/web/app/pages/Project/Settings/ProjectSettings.tsx b/web/app/pages/Project/Settings/ProjectSettings.tsxindex 79d22ba7a..92ae01dde 100644--- a/web/app/pages/Project/Settings/ProjectSettings.tsx+++ b/web/app/pages/Project/Settings/ProjectSettings.tsx@@ -10,18 +10,18 @@ import _replace from 'lodash/replace'import _size from 'lodash/size'import _toUpper from 'lodash/toUpper'import {- Settings2Icon,+ SlidersHorizontalIcon,ShieldIcon,LockIcon,- UserRoundIcon,- MailIcon,- TriangleAlertIcon,- ChevronLeftIcon,- PuzzleIcon,- StickyNoteIcon,+ UserCircleIcon,+ EnvelopeIcon,+ WarningOctagonIcon,+ CaretLeftIcon,+ PuzzlePieceIcon,+ NoteIcon,ShieldCheckIcon,- DollarSignIcon,-} from 'lucide-react'+ CurrencyDollarIcon,+} from '@phosphor-icons/react'import React, { useState, useEffect, useMemo, useRef } from 'react'import { Trans, useTranslation } from 'react-i18next'import {@@ -46,6 +46,7 @@ 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'@@ -361,61 +362,81 @@ const ProjectSettings = () => {{id: 'general',label: t('project.settings.tabs.general'),- icon: Settings2Icon,+ description: t('project.settings.tabs.generalDesc'),+ icon: SlidersHorizontalIcon,+ iconColor: 'text-blue-500',visible: true,},{id: 'access',label: t('project.settings.tabs.access'),+ description: t('project.settings.tabs.accessDesc'),icon: LockIcon,+ iconColor: 'text-amber-500',visible: true,},{id: 'shields',label: t('project.settings.tabs.shields'),+ description: t('project.settings.tabs.shieldsDesc'),icon: ShieldIcon,+ iconColor: 'text-emerald-500',visible: true,},{id: 'captcha',label: t('project.settings.tabs.captcha'),+ description: t('project.settings.tabs.captchaDesc'),icon: ShieldCheckIcon,+ iconColor: 'text-teal-500',visible: true,},{id: 'integrations',label: t('project.settings.tabs.integrations'),- icon: PuzzleIcon,+ description: t('project.settings.tabs.integrationsDesc'),+ icon: PuzzlePieceIcon,+ iconColor: 'text-purple-500',visible: !isSelfhosted,},{id: 'revenue',label: t('project.settings.tabs.revenue'),- icon: DollarSignIcon,+ description: t('project.settings.tabs.revenueDesc'),+ icon: CurrencyDollarIcon,+ iconColor: 'text-green-500',visible: !isSelfhosted,},{id: 'emails',label: t('project.settings.tabs.emails'),- icon: MailIcon,+ description: t('project.settings.tabs.emailsDesc'),+ icon: EnvelopeIcon,+ iconColor: 'text-sky-500',visible: !isSelfhosted,},{id: 'people',label: t('project.settings.tabs.people'),- icon: UserRoundIcon,+ description: t('project.settings.tabs.peopleDesc'),+ icon: UserCircleIcon,+ iconColor: 'text-indigo-500',visible: true,},{id: 'annotations',label: t('project.settings.tabs.annotations'),- icon: StickyNoteIcon,+ description: t('project.settings.tabs.annotationsDesc'),+ icon: NoteIcon,+ iconColor: 'text-orange-500',visible: true,},{id: 'danger',label: t('project.settings.tabs.danger'),- icon: TriangleAlertIcon,+ description: t('project.settings.tabs.dangerDesc'),+ icon: WarningOctagonIcon,+ iconColor: 'text-red-500',visible: project?.role === 'owner',},].filter((tab) => tab.visible),@@ -434,6 +455,11 @@ const ProjectSettings = () => {setSearchParams(newSearchParams)}+ const activeTabConfig = useMemo(+ () => tabs.find((tab) => tab.id === activeTab),+ [tabs, activeTab],+ )+// Google Search Console integration stateconst [gscConnected, setGscConnected] = useState<boolean | null>(null)const [gscProperties, setGscProperties] = useState<@@ -854,7 +880,7 @@ const ProjectSettings = () => {to={_replace(routes.project, ':id', id)}className='flex max-w-max items-center text-sm text-gray-900 underline decoration-dashed hover:decoration-solid dark:text-gray-100'>- <ChevronLeftIcon className='mr-1 size-3' strokeWidth={1.5} />+ <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'>@@ -873,7 +899,7 @@ const ProjectSettings = () => {labelExtractor={(item) => item.label}iconExtractor={(item) => {const Icon = item.icon- return <Icon className='h-4 w-4' strokeWidth={1.5} />+ return <Icon className='h-4 w-4' />}}onSelect={(item: any) =>setActiveTab(item.id as typeof activeTab)@@ -883,7 +909,7 @@ const ProjectSettings = () => {</div><aside className='hidden w-56 shrink-0 md:block'>- <nav className='flex flex-col space-y-1' aria-label='Sidebar'>+ <nav className='flex flex-col space-y-0.5' aria-label='Sidebar'>{_map(tabs, (tab) => {const isCurrent = tab.id === activeTabconst Icon = tab.icon@@ -905,14 +931,12 @@ const ProjectSettings = () => {aria-current={isCurrent ? 'page' : undefined}><Icon- className={cx('mr-2 h-5 w-5 shrink-0 transition-colors', {+ className={cx('mr-2 size-4 shrink-0 transition-colors', {'text-gray-900 dark:text-gray-50': isCurrent,- 'text-gray-500 group-hover:text-gray-600 dark:text-gray-400 dark:group-hover:text-gray-300':- !isCurrent,+ 'text-gray-600 dark:text-gray-300': !isCurrent,})}- strokeWidth={1.5}/>- <span>{tab.label}</span>+ <span className='truncate'>{tab.label}</span></button>)})}@@ -920,8 +944,15 @@ const ProjectSettings = () => {</aside><section className='flex-1'>- {['general', 'shields', 'access'].includes(activeTab) ? (+ {['general', 'shields', 'access'].includes(activeTab) &&+ activeTabConfig ? (<form onSubmit={handleSubmit}>+ <TabHeader+ icon={activeTabConfig.icon}+ label={activeTabConfig.label}+ description={activeTabConfig.description}+ iconColorClass={activeTabConfig.iconColor}+ />{activeTab === 'general' ? (<Generalform={form}@@ -974,21 +1005,53 @@ const ProjectSettings = () => {</form>) : null}- {activeTab === 'emails' && !isSelfhosted ? (- <Emails projectId={id} />+ {activeTab === 'emails' && !isSelfhosted && activeTabConfig ? (+ <>+ <TabHeader+ icon={activeTabConfig.icon}+ label={activeTabConfig.label}+ description={activeTabConfig.description}+ iconColorClass={activeTabConfig.iconColor}+ />+ <Emails projectId={id} />+ </>) : null}- {activeTab === 'people' ? <People project={project} /> : null}- {activeTab === 'annotations' ? (- <Annotations- projectId={id}- allowedToManage={- project?.role === 'owner' || project?.role === 'admin'- }- />+ {activeTab === 'people' && activeTabConfig ? (+ <>+ <TabHeader+ icon={activeTabConfig.icon}+ label={activeTabConfig.label}+ description={activeTabConfig.description}+ iconColorClass={activeTabConfig.iconColor}+ />+ <People project={project} />+ </>+ ) : null}+ {activeTab === 'annotations' && activeTabConfig ? (+ <>+ <TabHeader+ icon={activeTabConfig.icon}+ label={activeTabConfig.label}+ description={activeTabConfig.description}+ iconColorClass={activeTabConfig.iconColor}+ />+ <Annotations+ projectId={id}+ allowedToManage={+ project?.role === 'owner' || project?.role === 'admin'+ }+ />+ </>) : null}- {activeTab === 'integrations' ? (+ {activeTab === 'integrations' && activeTabConfig ? (<div>+ <TabHeader+ icon={activeTabConfig.icon}+ label={activeTabConfig.label}+ description={activeTabConfig.description}+ 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'><GoogleSearchConsoleSVG className='size-6' />@@ -1138,8 +1201,14 @@ const ProjectSettings = () => {</div>) : null}- {activeTab === 'captcha' ? (+ {activeTab === 'captcha' && activeTabConfig ? (<div>+ <TabHeader+ icon={activeTabConfig.icon}+ label={activeTabConfig.label}+ description={activeTabConfig.description}+ 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'>{t('project.settings.captcha.title')}@@ -1277,16 +1346,34 @@ const ProjectSettings = () => {</div>) : null}- {activeTab === 'revenue' ? <Revenue projectId={id} /> : null}+ {activeTab === 'revenue' && activeTabConfig ? (+ <>+ <TabHeader+ icon={activeTabConfig.icon}+ label={activeTabConfig.label}+ description={activeTabConfig.description}+ iconColorClass={activeTabConfig.iconColor}+ />+ <Revenue projectId={id} />+ </>+ ) : null}- {activeTab === 'danger' ? (- <DangerZone- setShowTransfer={setShowTransfer}- setShowReset={setShowReset}- setShowDelete={setShowDelete}- isDeleting={isDeleting}- setResetting={isResetting}- />+ {activeTab === 'danger' && activeTabConfig ? (+ <>+ <TabHeader+ icon={activeTabConfig.icon}+ label={activeTabConfig.label}+ description={activeTabConfig.description}+ iconColorClass={activeTabConfig.iconColor}+ />+ <DangerZone+ setShowTransfer={setShowTransfer}+ setShowReset={setShowReset}+ setShowDelete={setShowDelete}+ isDeleting={isDeleting}+ setResetting={isResetting}+ />+ </>) : null}</section></div>diff --git a/web/app/pages/Project/Settings/tabs/DangerZone.tsx b/web/app/pages/Project/Settings/tabs/DangerZone.tsxindex ad7775026..dde2d8d63 100644--- a/web/app/pages/Project/Settings/tabs/DangerZone.tsx+++ b/web/app/pages/Project/Settings/tabs/DangerZone.tsx@@ -1,5 +1,8 @@-import { ArrowLeftRight, RotateCcw, Trash2Icon } from 'lucide-react'-import React from 'react'+import {+ ArrowsLeftRightIcon,+ ArrowCounterClockwiseIcon,+ TrashIcon,+} from '@phosphor-icons/react'import { useTranslation } from 'react-i18next'import Button from '~/ui/Button'@@ -30,7 +33,7 @@ const DangerZone = ({<div className='mt-4 space-y-3'><div className='rounded-md border border-gray-200 p-3 dark:border-gray-800'><div className='flex items-start'>- <ArrowLeftRight className='mt-0.5 h-5 w-5 text-red-700 dark:text-red-500' />+ <ArrowsLeftRightIcon className='mt-0.5 h-5 w-5 text-red-700 dark:text-red-500' /><div className='ml-3 flex-1'><div className='text-sm font-medium text-gray-900 dark:text-gray-50'>{t('project.settings.transfer')}@@ -53,7 +56,7 @@ const DangerZone = ({<div className='rounded-md border border-gray-200 p-3 dark:border-gray-800'><div className='flex items-start'>- <RotateCcw className='mt-0.5 h-5 w-5 text-red-700 dark:text-red-500' />+ <ArrowCounterClockwiseIcon className='mt-0.5 h-5 w-5 text-red-700 dark:text-red-500' /><div className='ml-3 flex-1'><div className='text-sm font-medium text-gray-900 dark:text-gray-50'>{t('project.settings.reset')}@@ -77,10 +80,7 @@ const DangerZone = ({<div className='rounded-md border border-gray-200 p-3 dark:border-gray-800'><div className='flex items-start'>- <Trash2Icon- className='mt-0.5 h-5 w-5 text-red-700 dark:text-red-500'- strokeWidth={1.5}- />+ <TrashIcon className='mt-0.5 h-5 w-5 text-red-700 dark:text-red-500' /><div className='ml-3 flex-1'><div className='text-sm font-medium text-gray-900 dark:text-gray-50'>{t('project.settings.delete')}diff --git a/web/app/pages/Project/Settings/tabs/Revenue.tsx b/web/app/pages/Project/Settings/tabs/Revenue.tsxindex 42354a417..968055232 100644--- a/web/app/pages/Project/Settings/tabs/Revenue.tsx+++ b/web/app/pages/Project/Settings/tabs/Revenue.tsx@@ -1,5 +1,8 @@-import { CheckCircleIcon } from '@heroicons/react/24/solid'-import { ArrowUpRightIcon, ExternalLinkIcon } from 'lucide-react'+import {+ ArrowUpRightIcon,+ ArrowSquareOutIcon,+ CheckCircleIcon,+} from '@phosphor-icons/react'import React, { useEffect, useState } from 'react'import { useTranslation } from 'react-i18next'import { useFetcher } from 'react-router'@@ -385,7 +388,7 @@ const Revenue = ({ projectId }: Props) => {rel='noreferrer noopener'className='inline-flex items-center text-sm font-medium text-indigo-600 hover:underline dark:text-indigo-400'>- <ExternalLinkIcon className='mr-1.5 h-4 w-4' />+ <ArrowSquareOutIcon className='mr-1.5 h-4 w-4' />{t('project.settings.revenue.learnMore')}</a></div>diff --git a/web/app/pages/Project/View/Panels.tsx b/web/app/pages/Project/View/Panels.tsxindex 2724fa430..b900e6a4d 100644--- a/web/app/pages/Project/View/Panels.tsx+++ b/web/app/pages/Project/View/Panels.tsx@@ -1,9 +1,3 @@-import { ChevronUpIcon, ChevronDownIcon } from '@heroicons/react/20/solid'-import { ChevronRightIcon, CircleStackIcon } from '@heroicons/react/24/outline'-import {- ArrowLongRightIcon,- ArrowLongLeftIcon,-} from '@heroicons/react/24/solid'import { useVirtualizer, type VirtualItem } from '@tanstack/react-virtual'import type { ChartOptions } from 'billboard.js'import cx from 'clsx'@@ -22,7 +16,16 @@ import _slice from 'lodash/slice'import _sortBy from 'lodash/sortBy'import _sum from 'lodash/sum'import _toPairs from 'lodash/toPairs'-import { FilterIcon, ScanIcon } from 'lucide-react'+import {+ FunnelIcon,+ ScanIcon,+ CaretUpIcon,+ CaretDownIcon,+ CaretRightIcon,+ StackIcon,+ ArrowLineRightIcon,+ ArrowLineLeftIcon,+} from '@phosphor-icons/react'import React, {memo,useState,@@ -62,7 +65,7 @@ const ENTRIES_PER_CUSTOM_EVENTS_PANEL = 7const PanelEmptyState = ({ message }: { message: string }) => (<div className='flex flex-col items-center justify-center py-8 text-center'><div className='mb-3 flex size-10 items-center justify-center rounded-lg bg-gray-100 dark:bg-slate-800'>- <CircleStackIcon className='size-5 text-gray-400 dark:text-slate-500' />+ <StackIcon className='size-5 text-gray-400 dark:text-slate-500' /></div><Text as='p' size='sm' colour='secondary'>{message}@@ -365,10 +368,7 @@ const KVTable = ({><td className='flex w-2/5 items-center py-1 pl-2 text-left sm:w-4/6'>{event}- <FilterIcon- className='ml-2 hidden h-4 w-4 shrink-0 text-gray-500 group-hover:block dark:text-gray-300'- strokeWidth={1.5}- />+ <FunnelIcon className='ml-2 hidden h-4 w-4 shrink-0 text-gray-500 group-hover:block dark:text-gray-300' /><div className='ml-2 h-4 w-4 group-hover:hidden' /></td><td className='w-[30%] py-1 text-right sm:w-1/6'>@@ -760,16 +760,13 @@ const CustomEvents = ({{loadingEvents[ev] ? (<Spin className='m-0.5!' />) : activeEvents[ev] ? (- <ChevronUpIcon className='size-5 text-gray-500 dark:text-gray-300' />+ <CaretUpIcon className='size-5 text-gray-500 dark:text-gray-300' />) : (- <ChevronDownIcon className='size-5 text-gray-500 dark:text-gray-300' />+ <CaretDownIcon className='size-5 text-gray-500 dark:text-gray-300' />)}</button><span className='pl-2'>{ev}</span>- <FilterIcon- className='ml-2 hidden h-4 w-4 shrink-0 text-gray-500 group-hover:block peer-hover:hidden dark:text-gray-300'- strokeWidth={1.5}- />+ <FunnelIcon className='ml-2 hidden h-4 w-4 shrink-0 text-gray-500 group-hover:block peer-hover:hidden dark:text-gray-300' /><div className='ml-2 h-4 w-4 group-hover:hidden peer-hover:block' /></td><td className='w-[40%] py-1 pr-2 text-right sm:w-2/6'>@@ -870,10 +867,7 @@ const CustomEvents = ({<Text size='sm' truncate>{ev}</Text>- <FilterIcon- className='ml-2 hidden h-4 w-4 shrink-0 text-gray-500 group-hover:block dark:text-gray-300'- strokeWidth={1.5}- />+ <FunnelIcon className='ml-2 hidden h-4 w-4 shrink-0 text-gray-500 group-hover:block dark:text-gray-300' /><div className='ml-2 h-4 w-4 group-hover:hidden' /></div><div className='relative z-10 flex w-2/6 items-center justify-end text-right'>@@ -1159,10 +1153,7 @@ const MetadataKeyPanel = ({</td><td className='flex items-center py-1 text-left'><span className='truncate'>{value}</span>- <FilterIcon- className='ml-2 hidden h-4 w-4 shrink-0 text-gray-500 group-hover:block dark:text-gray-300'- strokeWidth={1.5}- />+ <FunnelIcon className='ml-2 hidden h-4 w-4 shrink-0 text-gray-500 group-hover:block dark:text-gray-300' /></td><td className='py-1 text-right'>{count}</td><td className='py-1 pr-2 text-right'>{perc}%</td>@@ -1209,10 +1200,7 @@ const MetadataKeyPanel = ({><td className='flex items-center py-1 pl-2 text-left'><span className='truncate'>{value}</span>- <FilterIcon- className='ml-2 hidden h-4 w-4 shrink-0 text-gray-500 group-hover:block dark:text-gray-300'- strokeWidth={1.5}- />+ <FunnelIcon className='ml-2 hidden h-4 w-4 shrink-0 text-gray-500 group-hover:block dark:text-gray-300' /></td><td className='py-1 text-right'>{count}</td><td className='py-1 pr-2 text-right'>{perc}%</td>@@ -1320,10 +1308,7 @@ const MetadataKeyPanel = ({<Text size='sm' truncate>{value}</Text>- <FilterIcon- className='ml-2 hidden h-4 w-4 shrink-0 text-gray-500 group-hover:block dark:text-gray-300'- strokeWidth={1.5}- />+ <FunnelIcon className='ml-2 hidden h-4 w-4 shrink-0 text-gray-500 group-hover:block dark:text-gray-300' /><div className='ml-2 h-4 w-4 group-hover:hidden' /></div><div className='relative z-10 w-1/6 pr-2 text-right'>@@ -1407,10 +1392,7 @@ const MetadataKeyPanel = ({<Text size='sm' truncate>{value}</Text>- <FilterIcon- className='ml-2 hidden h-4 w-4 shrink-0 text-gray-500 group-hover:block dark:text-gray-300'- strokeWidth={1.5}- />+ <FunnelIcon className='ml-2 hidden h-4 w-4 shrink-0 text-gray-500 group-hover:block dark:text-gray-300' /><div className='ml-2 h-4 w-4 group-hover:hidden' /></div><div className='relative z-10 w-1/6 pr-2 text-right'>@@ -1839,10 +1821,7 @@ const DetailsTable = ({</span>{!disableRowClick ? (<>- <FilterIcon- className='ml-2 hidden h-4 w-4 shrink-0 text-gray-500 group-hover:block dark:text-gray-300'- strokeWidth={1.5}- />+ <FunnelIcon className='ml-2 hidden h-4 w-4 shrink-0 text-gray-500 group-hover:block dark:text-gray-300' /><div className='ml-2 h-4 w-4 group-hover:hidden' /></>) : null}@@ -2051,7 +2030,7 @@ const Panel = ({isExpanded ? 'Collapse versions' : 'Expand versions'}>- <ChevronRightIcon+ <CaretRightIconclassName={cx('h-4 w-4 text-gray-500 transition-transform dark:text-gray-400',{@@ -2451,7 +2430,7 @@ const MetadataPanel = ({ metadata }: MetadataPanelProps) => {disabled={!canGoPrev()}focus={false}>- <ArrowLongLeftIcon className='h-5 w-5' />+ <ArrowLineLeftIcon className='h-5 w-5' /></Button><ButtonclassName={cx(@@ -2466,7 +2445,7 @@ const MetadataPanel = ({ metadata }: MetadataPanelProps) => {type='button'focus={false}>- <ArrowLongRightIcon className='h-5 w-5' />+ <ArrowLineRightIcon className='h-5 w-5' /></Button></div></div>diff --git a/web/app/pages/Project/View/ViewProject.helpers.tsx b/web/app/pages/Project/View/ViewProject.helpers.tsxindex f95d1d313..24c2c26a9 100644--- a/web/app/pages/Project/View/ViewProject.helpers.tsx+++ b/web/app/pages/Project/View/ViewProject.helpers.tsx@@ -1,4 +1,3 @@-import { LanguageIcon, ArrowRightCircleIcon } from '@heroicons/react/24/outline'import type { ChartOptions, GridLineOptions } from 'billboard.js'import { area, areaSpline, spline, bar, line, zoom } from 'billboard.js'import * as d3 from 'd3'@@ -24,22 +23,24 @@ import _sum from 'lodash/sum'import _toNumber from 'lodash/toNumber'import _toString from 'lodash/toString'import {- CircleQuestionMark,+ QuestionMarkIcon,GlobeIcon,CompassIcon,CpuIcon,FileTextIcon,- Gamepad2Icon,+ GameControllerIcon,MapPinIcon,- MonitorCog,+ MonitorPlayIcon,MonitorIcon,ShareIcon,- SmartphoneIcon,- TabletIcon,- TabletSmartphoneIcon,- TvIcon,+ DeviceMobileIcon,+ DeviceTabletIcon,+ DevicesIcon,+ TelevisionIcon,WatchIcon,-} from 'lucide-react'+ TranslateIcon,+ ArrowCircleRightIcon,+} from '@phosphor-icons/react'import {TimeFormat,@@ -2141,24 +2142,24 @@ const typeNameMapping = (t: typeof i18next.t) => ({const iconClassName = 'w-5 h-5'const panelIconMapping = {- cc: <MapPinIcon className={iconClassName} strokeWidth={1.5} />,- pg: <FileTextIcon className={iconClassName} strokeWidth={1.5} />,- lc: <LanguageIcon className={iconClassName} />,- ref: <ArrowRightCircleIcon className={iconClassName} />,- dv: <TabletSmartphoneIcon className={iconClassName} strokeWidth={1.5} />,- br: <CompassIcon className={iconClassName} strokeWidth={1.5} />,- os: <MonitorCog className={iconClassName} strokeWidth={1.5} />,- so: <ShareIcon className={iconClassName} strokeWidth={1.5} />,+ cc: <MapPinIcon className={iconClassName} />,+ pg: <FileTextIcon className={iconClassName} />,+ lc: <TranslateIcon className={iconClassName} />,+ ref: <ArrowCircleRightIcon className={iconClassName} />,+ dv: <DevicesIcon className={iconClassName} />,+ br: <CompassIcon className={iconClassName} />,+ os: <MonitorPlayIcon className={iconClassName} />,+ so: <ShareIcon className={iconClassName} />,}export const deviceIconMapping = {- desktop: <MonitorIcon className='size-5' strokeWidth={1.5} />,- mobile: <SmartphoneIcon className='size-5' strokeWidth={1.5} />,- tablet: <TabletIcon className='size-5' strokeWidth={1.5} />,- smarttv: <TvIcon className='size-5' strokeWidth={1.5} />,- console: <Gamepad2Icon className='size-5' strokeWidth={1.5} />,- wearable: <WatchIcon className='size-5' strokeWidth={1.5} />,- embedded: <CpuIcon className='size-5' strokeWidth={1.5} />,+ desktop: <MonitorIcon className='size-5' />,+ mobile: <DeviceMobileIcon className='size-5' />,+ tablet: <DeviceTabletIcon className='size-5' />,+ smarttv: <TelevisionIcon className='size-5' />,+ console: <GameControllerIcon className='size-5' />,+ wearable: <WatchIcon className='size-5' />,+ embedded: <CpuIcon className='size-5' />,}// This function return date using the same format as the backend@@ -2211,7 +2212,7 @@ export const getDeviceRowMapper = (if (entryName === null) {return (<>- <GlobeIcon className='h-5 w-5' strokeWidth={1.5} />+ <GlobeIcon className='h-5 w-5' /> <span className='italic'>{t('common.unknown')}</span></>@@ -2221,7 +2222,7 @@ export const getDeviceRowMapper = (if (!logoUrl) {return (<>- <GlobeIcon className='h-5 w-5' strokeWidth={1.5} />+ <GlobeIcon className='h-5 w-5' /> {displayName}</>@@ -2255,7 +2256,7 @@ export const getDeviceRowMapper = (if (entryName === null) {return (<>- <GlobeIcon className='h-5 w-5' strokeWidth={1.5} />+ <GlobeIcon className='h-5 w-5' /> <span className='italic'>{t('common.unknown')}</span></>@@ -2265,7 +2266,7 @@ export const getDeviceRowMapper = (if (!logoUrl) {return (<>- <GlobeIcon className='h-5 w-5' strokeWidth={1.5} />+ <GlobeIcon className='h-5 w-5' /> {displayName}</>@@ -2291,7 +2292,7 @@ export const getDeviceRowMapper = (if (entryName === null) {return (<>- <CircleQuestionMark className='h-5 w-5' strokeWidth={1.5} />+ <QuestionMarkIcon className='h-5 w-5' /> <span className='italic'>{t('common.unknown')}</span></>diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsxindex 234156753..42b074dd9 100644--- a/web/app/pages/Project/View/ViewProject.tsx+++ b/web/app/pages/Project/View/ViewProject.tsx@@ -8,21 +8,21 @@ import _replace from 'lodash/replace'import {MoonIcon,SunIcon,- BugIcon,+ WarningIcon,GaugeIcon,- UserIcon,- BellRingIcon,- ChartNoAxesColumnIcon,- FilterIcon,- SettingsIcon,+ BellRingingIcon,+ ChartBarIcon,+ FunnelIcon,+ GearIcon,KeyboardIcon,TargetIcon,- PuzzleIcon,- SparklesIcon,- FlagIcon,- FlaskConicalIcon,- FileUser,-} from 'lucide-react'+ ShieldCheckIcon,+ SparkleIcon,+ FlaskIcon,+ IdentificationCardIcon,+ UserListIcon,+ ToggleRightIcon,+} from '@phosphor-icons/react'import React, {useState,useEffect,@@ -704,7 +704,7 @@ const ViewProjectContent = () => {{id: PROJECT_TABS.traffic,label: t('dashboard.traffic'),- icon: ChartNoAxesColumnIcon,+ icon: ChartBarIcon,},{id: PROJECT_TABS.performance,@@ -714,22 +714,22 @@ const ViewProjectContent = () => {{id: PROJECT_TABS.profiles,label: t('dashboard.profiles'),- icon: UserIcon,+ icon: IdentificationCardIcon,},{id: PROJECT_TABS.sessions,label: t('dashboard.sessions'),- icon: FileUser,+ icon: UserListIcon,},{id: PROJECT_TABS.errors,label: t('dashboard.errors'),- icon: BugIcon,+ icon: WarningIcon,},{id: PROJECT_TABS.funnels,label: t('dashboard.funnels'),- icon: FilterIcon,+ icon: FunnelIcon,},{id: PROJECT_TABS.goals,@@ -739,12 +739,12 @@ const ViewProjectContent = () => {{id: PROJECT_TABS.featureFlags,label: t('dashboard.featureFlags'),- icon: FlagIcon,+ icon: ToggleRightIcon,},{id: PROJECT_TABS.captcha,label: t('common.captcha'),- icon: PuzzleIcon,+ icon: ShieldCheckIcon,},]@@ -753,7 +753,7 @@ const ViewProjectContent = () => {{id: 'settings',label: t('common.settings'),- icon: SettingsIcon,+ icon: GearIcon,},]: []@@ -767,17 +767,17 @@ const ViewProjectContent = () => {{id: PROJECT_TABS.ai,label: t('dashboard.askAi'),- icon: SparklesIcon,+ icon: SparkleIcon,},{id: PROJECT_TABS.alerts,label: t('dashboard.alerts'),- icon: BellRingIcon,+ icon: BellRingingIcon,},{id: PROJECT_TABS.experiments,label: t('dashboard.experiments'),- icon: FlaskConicalIcon,+ icon: FlaskIcon,},...adminTabs,].filter((x) => !!x)diff --git a/web/app/pages/Project/View/components/AddAViewModal.tsx b/web/app/pages/Project/View/components/AddAViewModal.tsxindex 8d2187b00..9559877e9 100644--- a/web/app/pages/Project/View/components/AddAViewModal.tsx+++ b/web/app/pages/Project/View/components/AddAViewModal.tsx@@ -1,4 +1,4 @@-import { XMarkIcon } from '@heroicons/react/24/outline'+import { XIcon } from '@phosphor-icons/react'import _filter from 'lodash/filter'import _find from 'lodash/find'import _isEmpty from 'lodash/isEmpty'@@ -105,7 +105,7 @@ const EditMetric = ({onClick={onDelete}aria-label='Delete custom event'>- <XMarkIcon className='size-5' />+ <XIcon className='size-5' /></button></p>}diff --git a/web/app/pages/Project/View/components/BackButton.tsx b/web/app/pages/Project/View/components/BackButton.tsxindex ea0e279d8..f99c2a106 100644--- a/web/app/pages/Project/View/components/BackButton.tsx+++ b/web/app/pages/Project/View/components/BackButton.tsx@@ -1,4 +1,4 @@-import { ChevronLeftIcon } from 'lucide-react'+import { CaretLeftIcon } from '@phosphor-icons/react'import { useTranslation } from 'react-i18next'import { Link } from 'react-router'@@ -36,7 +36,7 @@ export const BackButton = ({const content = (<>- <ChevronLeftIcon className='h-5 w-5 text-gray-700 dark:text-gray-50' />+ <CaretLeftIcon className='h-5 w-5 text-gray-700 dark:text-gray-50' /><span className='text-sm font-medium text-gray-700 dark:text-gray-50'>{backLabel}</span>diff --git a/web/app/pages/Project/View/components/ChartContextMenu.tsx b/web/app/pages/Project/View/components/ChartContextMenu.tsxindex e23f218bf..016c2e564 100644--- a/web/app/pages/Project/View/components/ChartContextMenu.tsx+++ b/web/app/pages/Project/View/components/ChartContextMenu.tsx@@ -1,5 +1,5 @@import cx from 'clsx'-import { PencilIcon, PlusIcon, Trash2Icon } from 'lucide-react'+import { PencilIcon, PlusIcon, TrashIcon } from '@phosphor-icons/react'import { useEffect, useRef } from 'react'import { useTranslation } from 'react-i18next'@@ -94,7 +94,7 @@ export const ChartContextMenu = ({},{label: t('project.deleteAnnotation'),- icon: Trash2Icon,+ icon: TrashIcon,onClick: onDeleteAnnotation,danger: true,},diff --git a/web/app/pages/Project/View/components/ChartTypeSwitcher.tsx b/web/app/pages/Project/View/components/ChartTypeSwitcher.tsxindex 5bed671d0..0910de9ab 100644--- a/web/app/pages/Project/View/components/ChartTypeSwitcher.tsx+++ b/web/app/pages/Project/View/components/ChartTypeSwitcher.tsx@@ -1,4 +1,4 @@-import { ChartColumnBigIcon, ChartLineIcon } from 'lucide-react'+import { ChartBarIcon, ChartLineIcon } from '@phosphor-icons/react'import { useTranslation } from 'react-i18next'import { chartTypes } from '~/lib/constants'@@ -33,7 +33,7 @@ export const ChartTypeSwitcher = ({onClick={() => onSwitch(chartTypes.bar)}className='rounded-md border border-transparent p-1.5 text-sm font-medium transition-colors ring-inset hover:border-gray-300 hover:bg-white focus:z-10 focus:ring-1 focus:ring-indigo-500 focus:outline-hidden hover:dark:border-slate-700/80 hover:dark:bg-slate-900 focus:dark:ring-gray-200'>- <ChartColumnBigIcon className='h-5 w-5 text-gray-700 dark:text-gray-50' />+ <ChartBarIcon className='h-5 w-5 text-gray-700 dark:text-gray-50' /></button>)}diff --git a/web/app/pages/Project/View/components/DashboardHeader.tsx b/web/app/pages/Project/View/components/DashboardHeader.tsxindex 8c383fe21..4794fb640 100644--- a/web/app/pages/Project/View/components/DashboardHeader.tsx+++ b/web/app/pages/Project/View/components/DashboardHeader.tsx@@ -1,7 +1,7 @@import cx from 'clsx'import dayjs from 'dayjs'import _find from 'lodash/find'-import { SearchIcon, UsersIcon } from 'lucide-react'+import { MagnifyingGlassIcon, UsersIcon } from '@phosphor-icons/react'import React from 'react'import { useTranslation } from 'react-i18next'import { useSearchParams } from 'react-router'@@ -203,7 +203,7 @@ const DashboardHeader = ({},)}>- <SearchIcon className='h-5 w-5 text-gray-700 dark:text-gray-50' />+ <MagnifyingGlassIcon className='h-5 w-5 text-gray-700 dark:text-gray-50' /></button></div>) : null}diff --git a/web/app/pages/Project/View/components/Filters.tsx b/web/app/pages/Project/View/components/Filters.tsxindex 1a00ef5a8..a981fa22c 100644--- a/web/app/pages/Project/View/components/Filters.tsx+++ b/web/app/pages/Project/View/components/Filters.tsx@@ -1,10 +1,9 @@-import { XMarkIcon } from '@heroicons/react/24/outline'import _isEmpty from 'lodash/isEmpty'import _map from 'lodash/map'import _replace from 'lodash/replace'import _startsWith from 'lodash/startsWith'import _truncate from 'lodash/truncate'-import { FilterIcon } from 'lucide-react'+import { FunnelIcon, XIcon } from '@phosphor-icons/react'import { memo, MouseEvent, useMemo } from 'react'import { useTranslation } from 'react-i18next'import { Link, useSearchParams } from 'react-router'@@ -305,10 +304,7 @@ const Filters = ({ tnMapping, className }: FiltersProps) => {)}><div className='flex min-w-0 flex-1 items-center gap-1'>- <FilterIcon- className='size-5 shrink-0 text-gray-500 dark:text-gray-400'- strokeWidth={1.5}- />+ <FunnelIcon className='size-5 shrink-0 text-gray-500 dark:text-gray-400' /><div className='flex flex-wrap'>{_map(filters, (props) => {const { column, filter } = props@@ -336,7 +332,7 @@ const Filters = ({ tnMapping, className }: FiltersProps) => {'cursor-wait': dataLoading,})}>- <XMarkIcon className='size-5 cursor-pointer rounded-md stroke-2 p-0.5 text-gray-500 transition-colors hover:bg-gray-100 hover:text-gray-700 dark:text-gray-400 dark:hover:bg-slate-700 dark:hover:text-gray-200' />+ <XIcon className='size-5 cursor-pointer rounded-md p-0.5 text-gray-500 transition-colors hover:bg-gray-100 hover:text-gray-700 dark:text-gray-400 dark:hover:bg-slate-700 dark:hover:text-gray-200' /></Link></div>)diff --git a/web/app/pages/Project/View/components/InteractiveMap.tsx b/web/app/pages/Project/View/components/InteractiveMap.tsxindex 903e820ba..b1422b2c2 100644--- a/web/app/pages/Project/View/components/InteractiveMap.tsx+++ b/web/app/pages/Project/View/components/InteractiveMap.tsx@@ -1,4 +1,4 @@-import { ArrowsPointingOutIcon, XMarkIcon } from '@heroicons/react/24/outline'+import { ArrowsOutIcon, XIcon } from '@phosphor-icons/react'import cx from 'clsx'import { scalePow, scaleThreshold } from 'd3-scale'import { Feature, GeoJsonObject } from 'geojson'@@ -453,7 +453,7 @@ const InteractiveMapCore = ({title='Fullscreen'className='rounded-md border border-gray-300 bg-gray-50 p-1.5 text-gray-700 transition-colors ring-inset hover:bg-white focus:z-10 focus:ring-1 focus:ring-indigo-500 focus:outline-hidden dark:border-slate-700/80 dark:bg-slate-900 dark:text-gray-200 dark:hover:bg-slate-800 focus:dark:ring-gray-200'>- <ArrowsPointingOutIcon className='size-4' />+ <ArrowsOutIcon className='size-4' /></button></div>) : null}@@ -467,7 +467,7 @@ const InteractiveMapCore = ({onClick={() => onFullscreenToggle(false)}className='pointer-events-auto flex items-center rounded-md border border-gray-300 bg-gray-50 px-3 py-2 text-sm font-medium text-gray-700 transition-colors ring-inset hover:bg-white focus:z-10 focus:ring-1 focus:ring-indigo-500 focus:outline-hidden dark:border-slate-700/80 dark:bg-slate-900 dark:text-gray-200 dark:hover:bg-slate-800 focus:dark:ring-gray-200'>- <XMarkIcon className='mr-1.5 h-4 w-4' />+ <XIcon className='mr-1.5 h-4 w-4' />{t('common.close')}</button></div>diff --git a/web/app/pages/Project/View/components/LiveVisitorsDropdown.tsx b/web/app/pages/Project/View/components/LiveVisitorsDropdown.tsxindex 218a78e8d..0d0732143 100644--- a/web/app/pages/Project/View/components/LiveVisitorsDropdown.tsx+++ b/web/app/pages/Project/View/components/LiveVisitorsDropdown.tsx@@ -1,4 +1,4 @@-import { ChevronDownIcon, XMarkIcon } from '@heroicons/react/24/outline'+import { CaretDownIcon, XIcon } from '@phosphor-icons/react'import _map from 'lodash/map'import React, { useState } from 'react'import { useTranslation } from 'react-i18next'@@ -68,7 +68,7 @@ const LiveVisitorsDropdown = () => {amount: liveVisitors,})}{' '}</span>- <ChevronDownIcon+ <CaretDownIconclassName={cn('ml-1 inline h-4 w-4 transition-transform duration-150 ease-out',{@@ -100,7 +100,7 @@ const LiveVisitorsDropdown = () => {type='button'onClick={() => setIsDropdownVisible(false)}>- <XMarkIcon className='h-5 w-5 cursor-pointer rounded-md text-gray-900 dark:text-gray-50' />+ <XIcon className='h-5 w-5 cursor-pointer rounded-md text-gray-900 dark:text-gray-50' /></button></div><div className='scrollbar-thin max-h-[200px] overflow-y-auto px-2'>diff --git a/web/app/pages/Project/View/components/LockedDashboard.tsx b/web/app/pages/Project/View/components/LockedDashboard.tsxindex d6ef35688..3b1a0ee26 100644--- a/web/app/pages/Project/View/components/LockedDashboard.tsx+++ b/web/app/pages/Project/View/components/LockedDashboard.tsx@@ -1,4 +1,4 @@-import { LockClosedIcon } from '@heroicons/react/24/outline'+import { LockIcon } from '@phosphor-icons/react'import { useMemo } from 'react'import { useTranslation } from 'react-i18next'import { Link } from 'react-router'@@ -46,7 +46,7 @@ const LockedDashboard = () => {return (<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-800'>- <LockClosedIcon className='size-7 text-yellow-500 dark:text-yellow-400' />+ <LockIcon className='size-7 text-yellow-500 dark:text-yellow-400' /></div><Text as='h3' size='xl' weight='medium' tracking='tight'>{t('project.locked.title')}diff --git a/web/app/pages/Project/View/components/NoEvents.tsx b/web/app/pages/Project/View/components/NoEvents.tsxindex ad121e5f7..741b3cd72 100644--- a/web/app/pages/Project/View/components/NoEvents.tsx+++ b/web/app/pages/Project/View/components/NoEvents.tsx@@ -1,4 +1,4 @@-import { FunnelIcon, CalendarDaysIcon } from '@heroicons/react/24/outline'+import { FunnelIcon, CalendarIcon } from '@phosphor-icons/react'import _isEmpty from 'lodash/isEmpty'import { memo } from 'react'import { useTranslation } from 'react-i18next'@@ -27,7 +27,7 @@ const NoEvents = ({ filters }: NoEventsProps) => {{hasFilters ? (<FunnelIcon className='size-7 text-gray-700 dark:text-gray-200' />) : (- <CalendarDaysIcon className='size-7 text-gray-700 dark:text-gray-200' />+ <CalendarIcon className='size-7 text-gray-700 dark:text-gray-200' />)}</div><Text as='h3' size='xl' weight='medium' className='tracking-tight'>diff --git a/web/app/pages/Project/View/components/PasswordRequiredModal.tsx b/web/app/pages/Project/View/components/PasswordRequiredModal.tsxindex 5e7c94cf7..a67e8b390 100644--- a/web/app/pages/Project/View/components/PasswordRequiredModal.tsx+++ b/web/app/pages/Project/View/components/PasswordRequiredModal.tsx@@ -1,4 +1,4 @@-import { LockClosedIcon } from '@heroicons/react/24/outline'+import { LockIcon } from '@phosphor-icons/react'import _isEmpty from 'lodash/isEmpty'import _size from 'lodash/size'import { useState, useEffect, useCallback, FormEvent } from 'react'@@ -81,7 +81,7 @@ const PasswordRequiredModal = ({<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'>- <LockClosedIcon className='h-6 w-6 text-amber-600 dark:text-amber-400' />+ <LockIcon className='h-6 w-6 text-amber-600 dark:text-amber-400' /></div><h3 className='mt-4 text-lg font-semibold text-gray-900 dark:text-gray-50'>{t('titles.passwordProtected')}diff --git a/web/app/pages/Project/View/components/ProjectSidebar.tsx b/web/app/pages/Project/View/components/ProjectSidebar.tsxindex 64371700f..54ec939db 100644--- a/web/app/pages/Project/View/components/ProjectSidebar.tsx+++ b/web/app/pages/Project/View/components/ProjectSidebar.tsx@@ -1,13 +1,13 @@import _map from 'lodash/map'import {- ChevronDownIcon,- ChevronRightIcon,- PanelLeftCloseIcon,- PanelLeftOpenIcon,- SettingsIcon,+ CaretDownIcon,+ CaretRightIcon,+ SidebarSimpleIcon,+ SidebarIcon,+ GearIcon,XIcon,- MenuIcon,-} from 'lucide-react'+ ListIcon,+} from '@phosphor-icons/react'import React, {useState,useMemo,@@ -67,7 +67,7 @@ const ICON_COLORS: Record<string, string> = {funnels: 'text-teal-500',alerts: 'text-cyan-500',// Product Analytics- profiles: 'text-indigo-500',+ profiles: 'text-fuchsia-500',sessions: 'text-indigo-500',errors: 'text-red-500',goals: 'text-purple-500',@@ -82,7 +82,7 @@ const ICON_COLORS: Record<string, string> = {interface Tab {id: ProjectTabKeylabel: string- icon: React.ComponentType<{ className?: string; strokeWidth?: number }>+ icon: React.ComponentType<{ className?: string; weight?: string }>}interface TabGroup {@@ -198,7 +198,7 @@ const CollapsibleGroup: React.FC<{><TabIconclassName={cn('size-5 shrink-0', iconColorClass)}- strokeWidth={1.5}+ weight='duotone'aria-hidden='true'/></Link>@@ -234,15 +234,9 @@ const CollapsibleGroup: React.FC<{{group.label}</Text>{isExpanded ? (- <ChevronDownIcon- className='size-3.5 text-gray-400'- strokeWidth={2}- />+ <CaretDownIcon className='size-3.5 text-gray-400' />) : (- <ChevronRightIcon- className='size-3.5 text-gray-400'- strokeWidth={2}- />+ <CaretRightIcon className='size-3.5 text-gray-400' />)}</button>@@ -301,7 +295,7 @@ const CollapsibleGroup: React.FC<{><TabIconclassName={cn('size-4 shrink-0', iconColorClass)}- strokeWidth={1.5}+ weight='duotone'aria-hidden='true'/><Text@@ -535,7 +529,7 @@ const ProjectSidebar: React.FC<ProjectSidebarProps> = ({className='ml-2 rounded-md p-1.5 text-gray-500 hover:bg-gray-100 hover:text-gray-700 dark:text-gray-400 dark:hover:bg-slate-800 dark:hover:text-gray-200'aria-label={t('common.close')}>- <XIcon className='h-5 w-5' strokeWidth={1.5} />+ <XIcon className='h-5 w-5' /></button>) : null}</div>@@ -583,7 +577,7 @@ const ProjectSidebar: React.FC<ProjectSidebarProps> = ({><TabIconclassName={cn('size-5 shrink-0', iconColorClass)}- strokeWidth={1.5}+ weight='duotone'aria-hidden='true'/></Link>@@ -611,7 +605,7 @@ const ProjectSidebar: React.FC<ProjectSidebarProps> = ({><TabIconclassName={cn('size-4 shrink-0', iconColorClass)}- strokeWidth={1.5}+ weight='duotone'aria-hidden='true'/><Text@@ -657,16 +651,16 @@ const ProjectSidebar: React.FC<ProjectSidebarProps> = ({aria-label={isCollapsed ? t('common.expand') : t('common.collapse')}>{isCollapsed ? (- <PanelLeftOpenIcon+ <SidebarIconclassName={cn('h-5 w-5 shrink-0', ICON_COLORS.misc)}- strokeWidth={1.5}+ weight='duotone'aria-hidden='true'/>) : (<>- <PanelLeftCloseIcon+ <SidebarSimpleIconclassName={cn('h-5 w-5 shrink-0', ICON_COLORS.misc)}- strokeWidth={1.5}+ weight='duotone'aria-hidden='true'/><span className='truncate'>{t('common.collapse')}</span>@@ -686,9 +680,9 @@ const ProjectSidebar: React.FC<ProjectSidebarProps> = ({)}aria-label={t('common.settings')}>- <SettingsIcon+ <GearIconclassName={cn('h-5 w-5 shrink-0', ICON_COLORS.misc)}- strokeWidth={1.5}+ weight='duotone'aria-hidden='true'/>{!isCollapsed || isMobileOpen ? (@@ -737,7 +731,7 @@ export const MobileSidebarTrigger: React.FC<MobileSidebarTriggerProps> = ({className='flex items-center justify-center rounded-md border border-gray-300 p-2 text-gray-700 transition-all ring-inset hover:bg-white focus:z-10 focus:ring-1 focus:ring-indigo-500 focus:outline-hidden dark:border-slate-700/80 dark:text-gray-200 dark:hover:bg-slate-800 focus:dark:ring-gray-200'aria-label={t('common.openMenu')}>- <MenuIcon className='h-5 w-5' strokeWidth={1.5} />+ <ListIcon className='h-5 w-5' /></button>{activeTabLabel ? (<span className='text-sm font-medium text-gray-700 dark:text-gray-200'>diff --git a/web/app/pages/Project/View/components/RefreshStatsButton.tsx b/web/app/pages/Project/View/components/RefreshStatsButton.tsxindex 2cce31a3e..51829e46f 100644--- a/web/app/pages/Project/View/components/RefreshStatsButton.tsx+++ b/web/app/pages/Project/View/components/RefreshStatsButton.tsx@@ -1,4 +1,4 @@-import { RotateCw } from 'lucide-react'+import { ArrowClockwiseIcon } from '@phosphor-icons/react'import { useState, useEffect, useRef } from 'react'import { useTranslation } from 'react-i18next'@@ -98,7 +98,7 @@ export const RefreshStatsButton = ({ onRefresh }: RefreshStatsButtonProps) => {)}><div className='relative h-5 w-5'>- <RotateCw+ <ArrowClockwiseIconclassName={cn('absolute inset-0 h-5 w-5 text-gray-400/80 dark:text-slate-600',{@@ -110,15 +110,15 @@ export const RefreshStatsButton = ({ onRefresh }: RefreshStatsButtonProps) => {<divclassName='absolute inset-0'style={{- maskImage: `conic-gradient(from 80deg, black ${progress}%, transparent ${progress}%)`,- WebkitMaskImage: `conic-gradient(from 80deg, black ${progress}%, transparent ${progress}%)`,+ maskImage: `conic-gradient(from 100deg, black ${progress}%, transparent ${progress}%)`,+ WebkitMaskImage: `conic-gradient(from 100deg, black ${progress}%, transparent ${progress}%)`,}}>- <RotateCw className='h-5 w-5 text-gray-700 dark:text-gray-50' />+ <ArrowClockwiseIcon className='h-5 w-5 text-gray-700 dark:text-gray-50' /></div>) : null}{showSpinner ? (- <RotateCw className='absolute inset-0 h-5 w-5 animate-spin text-gray-700 dark:text-gray-50' />+ <ArrowClockwiseIcon className='absolute inset-0 h-5 w-5 animate-spin text-gray-700 dark:text-gray-50' />) : null}</div><div className='pointer-events-none absolute bottom-full left-1/2 z-30 mb-2 -translate-x-1/2 rounded bg-gray-900 px-2 py-1 text-xs whitespace-nowrap text-white opacity-0 transition-opacity group-hover:opacity-100 dark:bg-slate-700'>diff --git a/web/app/pages/Project/View/components/SearchFilters.tsx b/web/app/pages/Project/View/components/SearchFilters.tsxindex 73528f115..dbdd349e1 100644--- a/web/app/pages/Project/View/components/SearchFilters.tsx+++ b/web/app/pages/Project/View/components/SearchFilters.tsx@@ -9,11 +9,11 @@ import cx from 'clsx'import _isEmpty from 'lodash/isEmpty'import {CheckIcon,- ChevronsUpDownIcon,+ CaretUpDownIcon,PlusIcon,SlidersHorizontalIcon,- Trash2Icon,-} from 'lucide-react'+ TrashIcon,+} from '@phosphor-icons/react'import { useState, useEffect, useCallback, Fragment } from 'react'import { useTranslation } from 'react-i18next'import { useNavigate, useSearchParams } from 'react-router'@@ -425,7 +425,7 @@ const SearchFilters = ({: t('project.selectColumn')}</span><span className='pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2'>- <ChevronsUpDownIcon className='h-4 w-4 text-gray-400' />+ <CaretUpDownIcon className='h-4 w-4 text-gray-400' /></span></ListboxButton><Transition@@ -499,7 +499,7 @@ const SearchFilters = ({)}</span><span className='pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2'>- <ChevronsUpDownIcon className='h-4 w-4 text-gray-400' />+ <CaretUpDownIcon className='h-4 w-4 text-gray-400' /></span></ListboxButton><Transition@@ -574,7 +574,7 @@ const SearchFilters = ({className='rounded-md p-2 text-gray-400 transition-colors hover:bg-gray-100 hover:text-gray-600 dark:hover:bg-slate-700 dark:hover:text-gray-300'title={t('project.removeFilter')}>- <Trash2Icon className='h-5 w-5' />+ <TrashIcon className='h-5 w-5' /></button></div>))}diff --git a/web/app/pages/Project/View/components/TBPeriodSelector.tsx b/web/app/pages/Project/View/components/TBPeriodSelector.tsxindex 1686600ec..aba4e127c 100644--- a/web/app/pages/Project/View/components/TBPeriodSelector.tsx+++ b/web/app/pages/Project/View/components/TBPeriodSelector.tsx@@ -4,11 +4,10 @@ import {PopoverPanel,Transition,} from '@headlessui/react'-import { ChevronDownIcon } from '@heroicons/react/20/solid'import cx from 'clsx'import _includes from 'lodash/includes'import _map from 'lodash/map'-import { CalendarIcon } from 'lucide-react'+import { CalendarDotsIcon, CaretDownIcon } from '@phosphor-icons/react'import React, { memo, Fragment, useMemo } from 'react'import { useTranslation } from 'react-i18next'@@ -62,9 +61,9 @@ const TBPeriodSelector = ({{({ open }) => (<><PopoverButton className='group inline-flex w-full rounded-md border border-gray-50/0 p-2 text-sm font-medium text-gray-700 outline-hidden transition-colors ring-inset hover:border-gray-300 hover:bg-white focus:z-10 focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 focus:outline-hidden dark:text-gray-50 hover:dark:border-slate-700/80 dark:hover:bg-slate-800 focus:dark:ring-gray-200'>- <CalendarIcon className='mr-1 h-5 w-5' strokeWidth={1.5} />+ <CalendarDotsIcon className='mr-1 h-5 w-5' /><span>{title}</span>- <ChevronDownIcon+ <CaretDownIconclassName={cx('ml-2 h-5 w-5 transform-gpu text-gray-700 transition ease-in-out group-hover:text-gray-500 dark:text-gray-50',{diff --git a/web/app/pages/Project/tabs/Alerts/ProjectAlertsSettings.tsx b/web/app/pages/Project/tabs/Alerts/ProjectAlertsSettings.tsxindex afab2aa16..47905181d 100644--- a/web/app/pages/Project/tabs/Alerts/ProjectAlertsSettings.tsx+++ b/web/app/pages/Project/tabs/Alerts/ProjectAlertsSettings.tsx@@ -1,7 +1,4 @@-import {- ExclamationTriangleIcon,- XCircleIcon,-} from '@heroicons/react/24/outline'+import { WarningOctagonIcon, XCircleIcon } from '@phosphor-icons/react'import _findKey from 'lodash/findKey'import _isEmpty from 'lodash/isEmpty'import _keys from 'lodash/keys'@@ -406,7 +403,7 @@ const ProjectAlertsSettings = ({{!authLoading && !isIntegrationLinked ? (<div className='mt-2 flex items-center rounded-sm bg-blue-50 px-5 py-3 text-base whitespace-pre-wrap dark:bg-slate-800 dark:text-gray-50'>- <ExclamationTriangleIcon className='mr-1 h-5 w-5' />+ <WarningOctagonIcon className='mr-1 h-5 w-5' /><Transt={t}i18nKey='alert.noIntegration'@@ -593,7 +590,7 @@ const ProjectAlertsSettings = ({<div className='mt-5 flex items-center justify-between'><Button onClick={() => setShowModal(true)} danger semiSmall><>- <ExclamationTriangleIcon className='mr-1 h-5 w-5' />+ <WarningOctagonIcon className='mr-1 h-5 w-5' />{t('alert.delete')}</></Button>diff --git a/web/app/pages/Project/tabs/Alerts/ProjectAlertsView.tsx b/web/app/pages/Project/tabs/Alerts/ProjectAlertsView.tsxindex 7f8ef2756..7af9531a5 100644--- a/web/app/pages/Project/tabs/Alerts/ProjectAlertsView.tsx+++ b/web/app/pages/Project/tabs/Alerts/ProjectAlertsView.tsx@@ -6,17 +6,17 @@ import _reduce from 'lodash/reduce'import _values from 'lodash/values'import {PencilIcon,- Trash2Icon,- BellRingIcon,- TriangleAlertIcon,+ TrashIcon,+ BellRingingIcon,+ WarningIcon,+ WarningOctagonIcon,PlusIcon,EyeIcon,- MousePointerClickIcon,+ CursorClickIcon,UsersIcon,- BugIcon,FileTextIcon,- BellOffIcon,-} from 'lucide-react'+ BellSlashIcon,+} from '@phosphor-icons/react'import { useMemo, useState, useEffect, useRef, Suspense, use } from 'react'import { useTranslation } from 'react-i18next'import {@@ -55,10 +55,7 @@ const NoNotificationChannelSet = () => {return (<div className='mb-4 flex items-center gap-3 rounded-lg border border-yellow-200 bg-yellow-50 px-4 py-3 dark:border-yellow-500/20 dark:bg-yellow-500/10'>- <TriangleAlertIcon- className='size-5 shrink-0 text-yellow-600 dark:text-yellow-500'- strokeWidth={1.5}- />+ <WarningOctagonIcon className='size-5 shrink-0 text-yellow-600 dark:text-yellow-500' /><p className='flex-1 text-sm text-yellow-800 dark:text-yellow-200'>{t('alert.noNotificationChannel')}</p>@@ -97,10 +94,10 @@ const METRIC_ICON_MAPPING: Record<},[QUERY_METRIC.ONLINE_USERS]: { icon: UsersIcon, className: 'text-sky-500' },[QUERY_METRIC.CUSTOM_EVENTS]: {- icon: MousePointerClickIcon,+ icon: CursorClickIcon,className: 'text-green-500',},- [QUERY_METRIC.ERRORS]: { icon: BugIcon, className: 'text-red-500' },+ [QUERY_METRIC.ERRORS]: { icon: WarningIcon, className: 'text-red-500' },}interface AlertRowProps {@@ -163,7 +160,6 @@ const AlertRow = ({metricIconClass,!active && 'opacity-50',)}- strokeWidth={1.5}/></div>@@ -179,7 +175,7 @@ const AlertRow = ({</Text>{!active ? (<span className='inline-flex items-center gap-1 rounded-md bg-gray-100 px-1.5 py-0.5 text-xs text-gray-500 dark:bg-slate-700 dark:text-gray-400'>- <BellOffIcon className='size-3' strokeWidth={1.5} />+ <BellSlashIcon className='size-3' />{t('alert.disabled')}</span>) : null}@@ -227,7 +223,7 @@ const AlertRow = ({aria-label={t('common.edit')}className='rounded-md border border-transparent p-1.5 text-gray-500 transition-colors hover:border-gray-300 hover:bg-white hover:text-gray-700 dark:text-slate-400 hover:dark:border-slate-600 dark:hover:bg-slate-700 dark:hover:text-slate-300'>- <PencilIcon className='size-4' strokeWidth={1.5} />+ <PencilIcon className='size-4' /></button><buttontype='button'@@ -238,7 +234,7 @@ const AlertRow = ({aria-label={t('common.delete')}className='rounded-md border border-transparent p-1.5 text-gray-500 transition-colors hover:border-red-200 hover:bg-red-50 hover:text-red-600 dark:text-slate-400 hover:dark:border-red-500/30 dark:hover:bg-red-500/10 dark:hover:text-red-400'>- <Trash2Icon className='size-4' strokeWidth={1.5} />+ <TrashIcon className='size-4' /></button></div></div>@@ -461,7 +457,7 @@ const ProjectAlertsInner = ({ deferredData }: ProjectAlertsInnerProps) => {return (<div className='mt-5 rounded-lg bg-gray-700 p-5'><div className='flex items-center text-gray-50'>- <BellRingIcon className='mr-2 h-8 w-8' strokeWidth={1.5} />+ <BellRingingIcon className='mr-2 h-8 w-8' /><p className='text-3xl font-bold'>{t('dashboard.alerts')}</p></div><p className='mt-2 text-sm whitespace-pre-wrap text-gray-100'>@@ -517,7 +513,7 @@ const ProjectAlertsInner = ({ deferredData }: ProjectAlertsInnerProps) => {{_isEmpty(alerts) ? (<div className='mt-5 rounded-lg bg-gray-700 p-5'><div className='flex items-center text-gray-50'>- <BellRingIcon className='mr-2 h-8 w-8' strokeWidth={1.5} />+ <BellRingingIcon className='mr-2 h-8 w-8' /><p className='text-3xl font-bold'>{t('dashboard.alerts')}</p></div><p className='mt-2 text-sm whitespace-pre-wrap text-gray-100'>@@ -542,7 +538,7 @@ const ProjectAlertsInner = ({ deferredData }: ProjectAlertsInnerProps) => {{t('alert.totalCount', { count: total })}</Text><Button onClick={handleNewAlert} primary regular>- <PlusIcon className='mr-1.5 size-4' strokeWidth={2} />+ <PlusIcon className='mr-1.5 size-4' />{t('alert.add')}</Button></div>diff --git a/web/app/pages/Project/tabs/AskAI/AskAIView.tsx b/web/app/pages/Project/tabs/AskAI/AskAIView.tsxindex 24b2742c6..7fa14c453 100644--- a/web/app/pages/Project/tabs/AskAI/AskAIView.tsx+++ b/web/app/pages/Project/tabs/AskAI/AskAIView.tsx@@ -2,24 +2,24 @@ import _filter from 'lodash/filter'import _isEmpty from 'lodash/isEmpty'import _map from 'lodash/map'import {- SendIcon,- ChevronDownIcon,- ChevronRightIcon,- Loader2Icon,+ PaperPlaneIcon,+ CaretDownIcon,+ CaretRightIcon,+ SpinnerGapIcon,StopCircleIcon,- AlertCircleIcon,+ WarningCircleIcon,ArrowDownIcon,ArrowLeftIcon,- BarChart3Icon,+ ChartBarIcon,TargetIcon,GitBranchIcon,InfoIcon,CheckIcon,- MessageSquareIcon,+ ChatIcon,TrashIcon,XIcon,LinkIcon,-} from 'lucide-react'+} from '@phosphor-icons/react'import { marked } from 'marked'import React, { useState, useRef, useEffect, useCallback, useMemo } from 'react'import { useTranslation } from 'react-i18next'@@ -150,7 +150,7 @@ const getToolInfo = (label: t('project.askAi.tools.getProjectInfo'),icon: InfoIcon,},- getData: { label: t('project.askAi.tools.getData'), icon: BarChart3Icon },+ getData: { label: t('project.askAi.tools.getData'), icon: ChartBarIcon },getGoalStats: {label: t('project.askAi.tools.getGoalStats'),icon: TargetIcon,@@ -167,7 +167,7 @@ const getAvailableTools = (t: any) => [{id: 'getData',label: t('project.askAi.tools.queryData'),- icon: BarChart3Icon,+ icon: ChartBarIcon,},{id: 'getGoalStats',@@ -222,7 +222,7 @@ const AICapabilitiesTooltip = () => {</p><ul className='space-y-1 text-gray-300'><li className='flex items-start gap-1.5'>- <BarChart3Icon className='mt-0.5 h-3.5 w-3.5 shrink-0 text-green-400' />+ <ChartBarIcon className='mt-0.5 h-3.5 w-3.5 shrink-0 text-green-400' /><span><strong className='text-white'>{t('project.askAi.capabilities.queryAnalytics')}@@ -246,7 +246,7 @@ const AICapabilitiesTooltip = () => {</span></li><li className='flex items-start gap-1.5'>- <BarChart3Icon className='mt-0.5 h-3.5 w-3.5 shrink-0 text-green-400' />+ <ChartBarIcon className='mt-0.5 h-3.5 w-3.5 shrink-0 text-green-400' /><span><strong className='text-white'>{t('project.askAi.capabilities.performanceMetrics')}@@ -254,7 +254,7 @@ const AICapabilitiesTooltip = () => {</span></li><li className='flex items-start gap-1.5'>- <AlertCircleIcon className='mt-0.5 h-3.5 w-3.5 shrink-0 text-green-400' />+ <WarningCircleIcon className='mt-0.5 h-3.5 w-3.5 shrink-0 text-green-400' /><span><strong className='text-white'>{t('project.askAi.capabilities.errorTracking')}@@ -298,7 +298,7 @@ const ThinkingIndicator = () => {const { t } = useTranslation('common')return (<div className='flex items-center gap-2 text-sm text-gray-500 dark:text-gray-400'>- <Loader2Icon className='h-4 w-4 animate-spin' />+ <SpinnerGapIcon className='h-4 w-4 animate-spin' /><span>{t('project.askAi.thinking')}</span></div>)@@ -331,7 +331,7 @@ const ThoughtProcess = ({><span className='flex h-5 w-5 items-center justify-center rounded-full border border-gray-200 dark:border-gray-600'>{isActivelyThinking ? (- <Loader2Icon className='h-3 w-3 animate-spin' />+ <SpinnerGapIcon className='h-3 w-3 animate-spin' />) : (<svgclassName='h-3 w-3'@@ -352,9 +352,9 @@ const ThoughtProcess = ({</span>{!isActivelyThinking ? (isExpanded ? (- <ChevronDownIcon className='h-3.5 w-3.5' />+ <CaretDownIcon className='h-3.5 w-3.5' />) : (- <ChevronRightIcon className='h-3.5 w-3.5' />+ <CaretRightIcon className='h-3.5 w-3.5' />)) : null}</button>@@ -383,7 +383,7 @@ const ToolCallBadge = ({<Icon className='h-3.5 w-3.5' /><span>{label}</span>{isLoading ? (- <Loader2Icon className='h-3 w-3 animate-spin text-gray-500' />+ <SpinnerGapIcon className='h-3 w-3 animate-spin text-gray-500' />) : (<CheckIcon className='h-3 w-3 text-green-600 dark:text-green-400' />)}@@ -1139,7 +1139,7 @@ const AskAIView = ({ projectId }: AskAIViewProps) => {{error ? (<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'>- <AlertCircleIcon className='h-5 w-5 shrink-0 text-red-500' />+ <WarningCircleIcon className='h-5 w-5 shrink-0 text-red-500' /><p className='flex-1 text-sm text-red-700 dark:text-red-400'>{error}</p>@@ -1225,7 +1225,7 @@ const AskAIView = ({ projectId }: AskAIViewProps) => {disabled={!input.trim() || isLoading}className='flex h-7 w-7 items-center justify-center rounded-lg border border-gray-200 bg-white text-gray-700 transition-colors hover:bg-gray-50 disabled:cursor-not-allowed disabled:opacity-50 dark:border-slate-800/50 dark:bg-slate-800 dark:text-gray-200 hover:dark:bg-slate-700'>- <SendIcon className='h-3.5 w-3.5' />+ <PaperPlaneIcon className='h-3.5 w-3.5' /></button></div></form>@@ -1304,7 +1304,7 @@ const AskAIView = ({ projectId }: AskAIViewProps) => {disabled={!input.trim()}className='flex h-7 w-7 items-center justify-center rounded-lg border border-gray-200 bg-white text-gray-700 transition-colors hover:bg-gray-50 disabled:cursor-not-allowed disabled:opacity-50 dark:border-slate-800/50 dark:bg-slate-800 dark:text-gray-200 hover:dark:bg-slate-700'>- <SendIcon className='h-3.5 w-3.5' />+ <PaperPlaneIcon className='h-3.5 w-3.5' /></button>)}</div>@@ -1390,7 +1390,7 @@ const AskAIView = ({ projectId }: AskAIViewProps) => {onClick={() => handleOpenChat(chat.id)}className='flex flex-1 items-center gap-3 overflow-hidden text-left'>- <MessageSquareIcon className='h-4 w-4 shrink-0 text-gray-400 dark:text-gray-500' />+ <ChatIcon className='h-4 w-4 shrink-0 text-gray-400 dark:text-gray-500' /><div className='overflow-hidden'><span className='block truncate text-sm text-gray-900 dark:text-white'>{chat.name || t('project.askAi.newChat')}@@ -1421,7 +1421,7 @@ const AskAIView = ({ projectId }: AskAIViewProps) => {className='flex w-full items-center justify-center gap-2 rounded-lg border border-gray-200 bg-white px-4 py-2 text-sm font-medium text-gray-700 transition-colors hover:bg-gray-50 disabled:opacity-50 dark:border-slate-800/50 dark:bg-slate-800 dark:text-gray-200 hover:dark:bg-slate-700'>{isLoadingChats ? (- <Loader2Icon className='h-4 w-4 animate-spin' />+ <SpinnerGapIcon className='h-4 w-4 animate-spin' />) : null}{t('project.askAi.loadMore')}</button>@@ -1430,7 +1430,7 @@ const AskAIView = ({ projectId }: AskAIViewProps) => {)}{isLoadingChats && _isEmpty(allChats) ? (<div className='flex items-center justify-center py-8'>- <Loader2Icon className='h-6 w-6 animate-spin text-gray-400' />+ <SpinnerGapIcon className='h-6 w-6 animate-spin text-gray-400' /></div>) : null}</div>diff --git a/web/app/pages/Project/tabs/Captcha/CaptchaView.tsx b/web/app/pages/Project/tabs/Captcha/CaptchaView.tsxindex 671c6e349..6560404dc 100644--- a/web/app/pages/Project/tabs/Captcha/CaptchaView.tsx+++ b/web/app/pages/Project/tabs/Captcha/CaptchaView.tsx@@ -1,4 +1,3 @@-import { GlobeAltIcon } from '@heroicons/react/24/outline'import cx from 'clsx'import _isEmpty from 'lodash/isEmpty'import _keys from 'lodash/keys'@@ -6,9 +5,10 @@ import _map from 'lodash/map'import {CompassIcon,MapPinIcon,- MonitorCog,- TabletSmartphoneIcon,-} from 'lucide-react'+ MonitorIcon,+ DevicesIcon,+ GlobeIcon,+} from '@phosphor-icons/react'import { useState, useEffect, useMemo, useContext, useRef } from 'react'import { useTranslation } from 'react-i18next'import { useSearchParams } from 'react-router'@@ -46,10 +46,10 @@ const PANELS_ORDER = ['cc', 'br', 'os', 'dv']const iconClassName = 'w-6 h-6'const panelIconMapping: Record<string, React.ReactNode> = {- cc: <MapPinIcon className={iconClassName} strokeWidth={1.5} />,- dv: <TabletSmartphoneIcon className={iconClassName} strokeWidth={1.5} />,- br: <CompassIcon className={iconClassName} strokeWidth={1.5} />,- os: <MonitorCog className={iconClassName} strokeWidth={1.5} />,+ cc: <MapPinIcon className={iconClassName} />,+ dv: <DevicesIcon className={iconClassName} />,+ br: <CompassIcon className={iconClassName} />,+ os: <MonitorIcon className={iconClassName} />,}export const captchaTypeNameMapping = (t: any) => ({@@ -327,7 +327,7 @@ const CaptchaView = ({ projectId }: CaptchaViewProps) => {if (!logoUrl) {return (<>- <GlobeAltIcon className='h-5 w-5' />+ <GlobeIcon className='h-5 w-5' /> {entryName}</>@@ -370,7 +370,7 @@ const CaptchaView = ({ projectId }: CaptchaViewProps) => {if (!logoUrl) {return (<>- <GlobeAltIcon className='h-5 w-5' />+ <GlobeIcon className='h-5 w-5' /> {entryName}</>diff --git a/web/app/pages/Project/tabs/Captcha/NoCaptchaEvents.tsx b/web/app/pages/Project/tabs/Captcha/NoCaptchaEvents.tsxindex bd5406977..1c15999e1 100644--- a/web/app/pages/Project/tabs/Captcha/NoCaptchaEvents.tsx+++ b/web/app/pages/Project/tabs/Captcha/NoCaptchaEvents.tsx@@ -1,4 +1,4 @@-import { FunnelIcon, CalendarDaysIcon } from '@heroicons/react/24/outline'+import { FunnelIcon, CalendarIcon } from '@phosphor-icons/react'import _isEmpty from 'lodash/isEmpty'import { memo } from 'react'import { useTranslation } from 'react-i18next'@@ -27,7 +27,7 @@ const NoCaptchaEvents = ({ filters }: NoCaptchaEventsProps) => {{hasFilters ? (<FunnelIcon className='size-7 text-gray-700 dark:text-gray-200' />) : (- <CalendarDaysIcon className='size-7 text-gray-700 dark:text-gray-200' />+ <CalendarIcon className='size-7 text-gray-700 dark:text-gray-200' />)}</div><Text as='h3' size='xl' weight='medium' className='tracking-tight'>diff --git a/web/app/pages/Project/tabs/Errors/ErrorDetails.tsx b/web/app/pages/Project/tabs/Errors/ErrorDetails.tsxindex ad3a2e076..c2f8dc4e6 100644--- a/web/app/pages/Project/tabs/Errors/ErrorDetails.tsx+++ b/web/app/pages/Project/tabs/Errors/ErrorDetails.tsx@@ -1,18 +1,16 @@-import {- ChevronDownIcon,- ChevronUpIcon,- ClipboardIcon,- CheckIcon,-} from '@heroicons/react/24/outline'import _map from 'lodash/map'import {FileCodeIcon,- CalendarIcon,+ CalendarDotsIcon,HashIcon,- ExternalLinkIcon,+ ArrowSquareOutIcon,UsersIcon,- ActivityIcon,-} from 'lucide-react'+ PulseIcon,+ CaretDownIcon,+ CaretUpIcon,+ ClipboardIcon,+ CheckIcon,+} from '@phosphor-icons/react'import { useMemo, useState, useEffect, useCallback, useRef } from 'react'import { useTranslation } from 'react-i18next'import { Link, useLocation } from 'react-router'@@ -152,10 +150,7 @@ const SessionRow = ({ session }: SessionRowProps) => {</Text></div></div>- <ExternalLinkIcon- className='mt-0.5 size-4 shrink-0 text-gray-400 transition-colors group-hover:text-gray-600 dark:group-hover:text-gray-300'- strokeWidth={1.5}- />+ <ArrowSquareOutIcon className='mt-0.5 size-4 shrink-0 text-gray-400 transition-colors group-hover:text-gray-600 dark:group-hover:text-gray-300' /></Link>)}@@ -415,10 +410,7 @@ export const ErrorDetails = ({{details.filename ? (<div className='flex items-center gap-2'><div className='flex items-center gap-2 rounded-md bg-gray-100 px-3 py-1.5 font-mono text-xs text-gray-600 dark:bg-slate-800 dark:text-gray-300'>- <FileCodeIcon- className='size-3.5 text-gray-500'- strokeWidth={1.5}- />+ <FileCodeIcon className='size-3.5 text-gray-500' /><span className='break-all'>{fileLocation}</span><buttontype='button'@@ -449,12 +441,12 @@ export const ErrorDetails = ({value={details.users || 0}/><StatItem- icon={<CalendarIcon className='size-4' />}+ icon={<CalendarDotsIcon className='size-4' />}label={t('dashboard.firstSeen')}value={firstSeen || '-'}/><StatItem- icon={<ActivityIcon className='size-4' />}+ icon={<PulseIcon className='size-4' />}label={t('dashboard.lastSeen')}value={lastSeen || '-'}/>@@ -501,12 +493,12 @@ export const ErrorDetails = ({>{isStackTraceExpanded ? (<>- <ChevronUpIcon className='mr-1 size-4' />+ <CaretUpIcon className='mr-1 size-4' />{t('project.showLess')}</>) : (<>- <ChevronDownIcon className='mr-1 size-4' />+ <CaretDownIcon className='mr-1 size-4' />{stackHiddenCount > 0? t('project.showMore', { count: stackHiddenCount }): t('project.showMore', { count: 0 })}diff --git a/web/app/pages/Project/tabs/Errors/ErrorsView.tsx b/web/app/pages/Project/tabs/Errors/ErrorsView.tsxindex 6b23a79f3..79baeae7d 100644--- a/web/app/pages/Project/tabs/Errors/ErrorsView.tsx+++ b/web/app/pages/Project/tabs/Errors/ErrorsView.tsx@@ -8,14 +8,13 @@ import _isEmpty from 'lodash/isEmpty'import _map from 'lodash/map'import _size from 'lodash/size'import {- BugIcon,PercentIcon,UsersIcon,MonitorIcon,- ChevronRightIcon,- AlertTriangleIcon,+ CaretRightIcon,+ WarningIcon,UserIcon,-} from 'lucide-react'+} from '@phosphor-icons/react'import {useState,useEffect,@@ -431,15 +430,13 @@ const ErrorItem = ({ error }: ErrorItemProps) => {className='mr-3 flex items-center'title={t('project.affectedUsers')}>- <UserIcon className='mr-1 size-4' strokeWidth={1.5} />{' '}- {error.users}+ <UserIcon className='mr-1 size-4' /> {error.users}</span><spanclassName='flex items-center'title={t('project.affectedSessions')}>- <MonitorIcon className='mr-1 size-4' strokeWidth={1.5} />{' '}- {error.sessions}+ <MonitorIcon className='mr-1 size-4' /> {error.sessions}</span></p></div>@@ -451,27 +448,24 @@ const ErrorItem = ({ error }: ErrorItemProps) => {className='flex items-center'title={t('dashboard.xOccurrences', { x: error.count })}>- <AlertTriangleIcon className='mr-1 size-4' strokeWidth={1.5} />{' '}- {error.count}+ <WarningIcon className='mr-1 size-4' /> {error.count}</span><spanclassName='flex items-center'title={t('project.xAffectedUsers', { x: error.users })}>- <UserIcon className='mr-1 size-4' strokeWidth={1.5} />{' '}- {error.users}+ <UserIcon className='mr-1 size-4' /> {error.users}</span><spanclassName='flex items-center'title={t('project.xAffectedSessions', { x: error.sessions })}>- <MonitorIcon className='mr-1 size-4' strokeWidth={1.5} />{' '}- {error.sessions}+ <MonitorIcon className='mr-1 size-4' /> {error.sessions}</span></div><Badge label={status.label} colour={status.colour} /></div>- <ChevronRightIcon className='h-5 w-5 flex-none text-gray-400' />+ <CaretRightIcon className='h-5 w-5 flex-none text-gray-400' /></div></li></Link>@@ -1282,26 +1276,22 @@ const ErrorsViewInner = ({ deferredData }: ErrorsViewInnerProps) => {<div className='grid w-full grid-cols-2 gap-2 lg:w-[35%]'><StatCard- icon={<BugIcon className='text-red-600' strokeWidth={1.5} />}+ icon={<WarningIcon className='text-red-600' />}value={nFormatter(overview?.stats?.totalErrors || 0, 1)}label={t('project.totalErrors')}/><StatCard- icon={- <PercentIcon className='text-orange-600' strokeWidth={1.5} />- }+ icon={<PercentIcon className='text-orange-600' />}value={`${overview?.stats?.errorRate || 0}%`}label={t('project.errorRate')}/><StatCard- icon={<UsersIcon className='text-blue-600' strokeWidth={1.5} />}+ icon={<UsersIcon className='text-blue-600' />}value={nFormatter(overview?.stats?.affectedUsers || 0, 1)}label={t('project.affectedUsers')}/><StatCard- icon={- <MonitorIcon className='text-purple-600' strokeWidth={1.5} />- }+ icon={<MonitorIcon className='text-purple-600' />}value={nFormatter(overview?.stats?.affectedSessions || 0, 1)}label={t('project.affectedSessions')}/>diff --git a/web/app/pages/Project/tabs/Errors/NoErrorDetails.tsx b/web/app/pages/Project/tabs/Errors/NoErrorDetails.tsxindex 24577b365..bf8fb3e8e 100644--- a/web/app/pages/Project/tabs/Errors/NoErrorDetails.tsx+++ b/web/app/pages/Project/tabs/Errors/NoErrorDetails.tsx@@ -1,4 +1,4 @@-import { BugIcon } from 'lucide-react'+import { WarningIcon } from '@phosphor-icons/react'import { useTranslation } from 'react-i18next'const NoErrorDetails = () => {@@ -7,10 +7,7 @@ const NoErrorDetails = () => {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 mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-800'>- <BugIcon- className='size-7 text-gray-700 dark:text-gray-200'- strokeWidth={1.5}- />+ <WarningIcon className='size-7 text-gray-700 dark:text-gray-200' /></div><h3 className='text-xl font-medium tracking-tight'>{t('project.noErrorDetails')}diff --git a/web/app/pages/Project/tabs/Errors/WaitingForAnError.tsx b/web/app/pages/Project/tabs/Errors/WaitingForAnError.tsxindex 56885d3d5..972a2b667 100644--- a/web/app/pages/Project/tabs/Errors/WaitingForAnError.tsx+++ b/web/app/pages/Project/tabs/Errors/WaitingForAnError.tsx@@ -1,4 +1,4 @@-import { BugIcon } from 'lucide-react'+import { WarningIcon } from '@phosphor-icons/react'import { useTranslation, Trans } from 'react-i18next'import { Link } from 'react-router'@@ -13,10 +13,7 @@ const WaitingForAnError = () => {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 mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-800'>- <BugIcon- className='size-7 text-gray-700 dark:text-gray-200'- strokeWidth={1.5}- />+ <WarningIcon className='size-7 text-gray-700 dark:text-gray-200' /></div><h3 className='text-xl font-medium tracking-tight'>{t('project.waitingError.title')}diff --git a/web/app/pages/Project/tabs/Experiments/ExperimentResults.tsx b/web/app/pages/Project/tabs/Experiments/ExperimentResults.tsxindex dfacae603..68794d531 100644--- a/web/app/pages/Project/tabs/Experiments/ExperimentResults.tsx+++ b/web/app/pages/Project/tabs/Experiments/ExperimentResults.tsx@@ -12,13 +12,13 @@ import {TargetIcon,InfoIcon,PencilIcon,- TrendingUpIcon,- TrendingDownIcon,- FlaskConicalIcon,+ TrendUpIcon,+ TrendDownIcon,+ FlaskIcon,PercentIcon,- ChevronDownIcon,- ChevronUpIcon,-} from 'lucide-react'+ CaretDownIcon,+ CaretUpIcon,+} from '@phosphor-icons/react'import { useState, useEffect, useRef, useMemo, memo } from 'react'import { useTranslation } from 'react-i18next'@@ -624,9 +624,9 @@ const MetricsTable = memo({variant.improvement !== 0 ? (<>{isPositive ? (- <TrendingUpIcon className='size-4' />+ <TrendUpIcon className='size-4' />) : (- <TrendingDownIcon className='size-4' />+ <TrendDownIcon className='size-4' />)}{isPositive ? '+' : ''}{variant.improvement.toFixed(2)}%@@ -702,9 +702,9 @@ const CollapsibleSection = memo({title}</Text>{isOpen ? (- <ChevronUpIcon className='size-4 text-gray-500' />+ <CaretUpIcon className='size-4 text-gray-500' />) : (- <ChevronDownIcon className='size-4 text-gray-500' />+ <CaretDownIcon className='size-4 text-gray-500' />)}</button>{isOpen ? (@@ -867,7 +867,7 @@ const ExperimentResults = ({ghostsmall>- <PencilIcon className='mr-1 size-4' strokeWidth={1.5} />+ <PencilIcon className='mr-1 size-4' />{t('common.edit')}</Button>}@@ -875,10 +875,7 @@ const ExperimentResults = ({}leftContent={<div className='flex items-center gap-2'>- <FlaskConicalIcon- className='size-5 text-purple-500'- strokeWidth={1.5}- />+ <FlaskIcon className='size-5 text-purple-500' /><Text as='h2' size='xl' weight='bold' truncate>{experiment.name}</Text>@@ -901,7 +898,7 @@ const ExperimentResults = ({</div>{goal?.name ? (<div className='inline-flex max-w-[240px] items-center gap-1.5 rounded-full bg-indigo-50 px-2 py-0.5 text-xs font-medium text-indigo-700 dark:bg-indigo-900/20 dark:text-indigo-300'>- <TargetIcon className='size-3.5' strokeWidth={1.5} />+ <TargetIcon className='size-3.5' /><Textas='span'size='xs'@@ -951,10 +948,7 @@ const ExperimentResults = ({{results.totalExposures === 0 ? (<div className='flex items-start gap-4 rounded-lg border border-yellow-300 bg-yellow-50 p-4 dark:border-yellow-700 dark:bg-yellow-900/20'><div className='flex size-12 shrink-0 items-center justify-center rounded-full bg-yellow-100 dark:bg-yellow-900/40'>- <InfoIcon- className='size-6 text-yellow-700 dark:text-yellow-300'- strokeWidth={1.5}- />+ <InfoIcon className='size-6 text-yellow-700 dark:text-yellow-300' /></div><div className='min-w-0 flex-1'><Text@@ -970,7 +964,7 @@ const ExperimentResults = ({</Text>{goal?.name ? (<div className='mt-2 flex items-center gap-2 text-yellow-900/80 dark:text-yellow-100/80'>- <TargetIcon className='size-4' strokeWidth={1.5} />+ <TargetIcon className='size-4' /><Text as='p' size='sm'>{t('experiments.goal')}:{' '}<Text as='span' size='sm' weight='medium'>@@ -994,30 +988,23 @@ const ExperimentResults = ({<div className='grid w-full grid-cols-2 gap-3 lg:w-[35%]'><StatCard- icon={<UsersIcon className='text-blue-600' strokeWidth={1.5} />}+ icon={<UsersIcon className='text-blue-600' />}value={nFormatter(results.totalExposures, 1)}label={t('experiments.totalExposures')}/><StatCard- icon={<TargetIcon className='text-green-600' strokeWidth={1.5} />}+ icon={<TargetIcon className='text-green-600' />}value={nFormatter(results.totalConversions, 1)}subValue={`(${overallConversionRate}%)`}label={t('experiments.totalConversions')}/><StatCard- icon={- <FlaskConicalIcon- className='text-purple-600'- strokeWidth={1.5}- />- }+ icon={<FlaskIcon className='text-purple-600' />}value={results.variants.length}label={t('experiments.variantsCount')}/><StatCard- icon={- <PercentIcon className='text-amber-600' strokeWidth={1.5} />- }+ icon={<PercentIcon className='text-amber-600' />}value={`${results.confidenceLevel}%`}label={t('experiments.confidenceLevel')}/>diff --git a/web/app/pages/Project/tabs/Experiments/ExperimentSettingsModal.tsx b/web/app/pages/Project/tabs/Experiments/ExperimentSettingsModal.tsxindex 2d1eb1197..4653d266c 100644--- a/web/app/pages/Project/tabs/Experiments/ExperimentSettingsModal.tsx+++ b/web/app/pages/Project/tabs/Experiments/ExperimentSettingsModal.tsx@@ -4,17 +4,17 @@ import {DialogPanel,DialogTitle,} from '@headlessui/react'-import { XMarkIcon } from '@heroicons/react/24/outline'import cx from 'clsx'import _map from 'lodash/map'import _sum from 'lodash/sum'import {PlusIcon,- Trash2Icon,- ChevronDownIcon,- TrendingUpIcon,- TrendingDownIcon,-} from 'lucide-react'+ TrashIcon,+ CaretDownIcon,+ TrendUpIcon,+ TrendDownIcon,+ XIcon,+} from '@phosphor-icons/react'import { useState, useEffect, useMemo, useRef } from 'react'import { useTranslation } from 'react-i18next'import { useFetcher } from 'react-router'@@ -455,7 +455,7 @@ const ExperimentSettingsModal = ({onClick={onClose}className='rounded-md p-1.5 text-gray-400 hover:bg-gray-100 hover:text-gray-500 dark:hover:bg-slate-800 dark:hover:text-gray-300'>- <XMarkIcon className='size-5' />+ <XIcon className='size-5' /></button></div>@@ -664,7 +664,7 @@ const ExperimentSettingsModal = ({onClick={() => handleRemoveVariant(index)}className='rounded p-1 text-gray-400 hover:bg-gray-200 hover:text-red-500 dark:hover:bg-slate-600'>- <Trash2Icon className='size-4' />+ <TrashIcon className='size-4' /></button>) : null}</div>@@ -743,7 +743,7 @@ const ExperimentSettingsModal = ({: 'bg-white text-gray-600 hover:bg-gray-50 dark:bg-slate-800 dark:text-gray-400 dark:hover:bg-slate-700',)}>- <TrendingUpIcon className='size-4' />+ <TrendUpIcon className='size-4' /><span className='hidden sm:inline'>Increase</span></button><button@@ -756,7 +756,7 @@ const ExperimentSettingsModal = ({: 'bg-white text-gray-600 hover:bg-gray-50 dark:bg-slate-800 dark:text-gray-400 dark:hover:bg-slate-700',)}>- <TrendingDownIcon className='size-4' />+ <TrendDownIcon className='size-4' /><span className='hidden sm:inline'>Decrease</span></button></div>@@ -784,7 +784,7 @@ const ExperimentSettingsModal = ({<Text size='sm' weight='medium' colour='muted'>Advanced settings</Text>- <ChevronDownIcon+ <CaretDownIconclassName={cx('size-4 text-gray-400 transition-transform',showAdvanced && 'rotate-180',diff --git a/web/app/pages/Project/tabs/Experiments/ExperimentsView.tsx b/web/app/pages/Project/tabs/Experiments/ExperimentsView.tsxindex 56d811443..3abd28174 100644--- a/web/app/pages/Project/tabs/Experiments/ExperimentsView.tsx+++ b/web/app/pages/Project/tabs/Experiments/ExperimentsView.tsx@@ -5,16 +5,16 @@ import _debounce from 'lodash/debounce'import _isEmpty from 'lodash/isEmpty'import _map from 'lodash/map'import {- FlaskConicalIcon,- Trash2Icon,+ FlaskIcon,+ TrashIcon,PencilIcon,PlusIcon,PlayIcon,PauseIcon,CheckCircleIcon,- BarChart3Icon,- SearchIcon,-} from 'lucide-react'+ ChartBarIcon,+ MagnifyingGlassIcon,+} from '@phosphor-icons/react'import { useState, useEffect, useMemo, useRef, useCallback, memo } from 'react'import { useTranslation } from 'react-i18next'import { useFetcher } from 'react-router'@@ -173,10 +173,7 @@ const ExperimentRow = ({truncateclassName='flex items-center gap-x-1.5'>- <FlaskConicalIcon- className='size-4 text-purple-500'- strokeWidth={1.5}- />+ <FlaskIcon className='size-4 text-purple-500' /><span>{experiment.name}</span></Text>{/* Status badge */}@@ -236,7 +233,7 @@ const ExperimentRow = ({{actionLoading ? (<Spin className='size-4' />) : (- <PlayIcon className='mr-1 size-4' strokeWidth={1.5} />+ <PlayIcon className='mr-1 size-4' />)}{t('experiments.start')}</Button>@@ -252,7 +249,7 @@ const ExperimentRow = ({{actionLoading ? (<Spin className='size-4' />) : (- <PauseIcon className='mr-1 size-4' strokeWidth={1.5} />+ <PauseIcon className='mr-1 size-4' />)}{t('experiments.pause')}</Button>@@ -261,7 +258,7 @@ const ExperimentRow = ({ghostsmall>- <BarChart3Icon className='mr-1 size-4' strokeWidth={1.5} />+ <ChartBarIcon className='mr-1 size-4' />{t('experiments.results')}</Button></>@@ -277,7 +274,7 @@ const ExperimentRow = ({{actionLoading ? (<Spin className='size-4' />) : (- <PlayIcon className='mr-1 size-4' strokeWidth={1.5} />+ <PlayIcon className='mr-1 size-4' />)}{t('experiments.resume')}</Button>@@ -287,14 +284,14 @@ const ExperimentRow = ({ghostsmall>- <CheckCircleIcon className='mr-1 size-4' strokeWidth={1.5} />+ <CheckCircleIcon className='mr-1 size-4' />{t('experiments.complete')}</Button></>) : null}{experiment.status === 'completed' ? (<Button onClick={() => onViewResults(experiment.id)} ghost small>- <BarChart3Icon className='mr-1 size-4' strokeWidth={1.5} />+ <ChartBarIcon className='mr-1 size-4' />{t('experiments.viewResults')}</Button>) : null}@@ -321,7 +318,7 @@ const ExperimentRow = ({'cursor-not-allowed opacity-50 hover:border-transparent hover:bg-transparent',)}>- <PencilIcon className='size-4' strokeWidth={1.5} />+ <PencilIcon className='size-4' /></button><buttontype='button'@@ -329,7 +326,7 @@ const ExperimentRow = ({aria-label={t('common.delete')}className='rounded-md border border-transparent p-1.5 text-gray-800 transition-colors hover:border-gray-300 hover:bg-gray-50 hover:text-gray-900 dark:text-slate-400 hover:dark:border-slate-700/80 dark:hover:bg-slate-800 dark:hover:text-slate-300'>- <Trash2Icon className='size-4' strokeWidth={1.5} />+ <TrashIcon className='size-4' /></button></div></div>@@ -710,7 +707,7 @@ const ExperimentsView = ({{_isEmpty(experiments) && !filterQuery ? (<div className='mt-5 rounded-lg bg-gray-700 p-5'><div className='flex items-center text-gray-50'>- <FlaskConicalIcon className='mr-2 h-8 w-8' strokeWidth={1.5} />+ <FlaskIcon className='mr-2 h-8 w-8' /><p className='text-3xl font-bold'>{t('experiments.title')}</p></div><p className='mt-2 text-sm whitespace-pre-wrap text-gray-100'>@@ -729,10 +726,7 @@ const ExperimentsView = ({<><div className='mb-4 flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between'><div className='relative'>- <SearchIcon- className='absolute top-1/2 left-3 size-4 -translate-y-1/2 text-gray-400'- strokeWidth={1.5}- />+ <MagnifyingGlassIcon className='absolute top-1/2 left-3 size-4 -translate-y-1/2 text-gray-400' /><inputtype='text'placeholder={t('experiments.filterExperiments')}@@ -742,7 +736,7 @@ const ExperimentsView = ({/></div><Button onClick={handleNewExperiment} primary regular>- <PlusIcon className='mr-1.5 size-4' strokeWidth={2} />+ <PlusIcon className='mr-1.5 size-4' />{t('experiments.create')}</Button></div>diff --git a/web/app/pages/Project/tabs/FeatureFlags/FeatureFlagSettingsModal.tsx b/web/app/pages/Project/tabs/FeatureFlags/FeatureFlagSettingsModal.tsxindex bd73d859e..8de6c52e7 100644--- a/web/app/pages/Project/tabs/FeatureFlags/FeatureFlagSettingsModal.tsx+++ b/web/app/pages/Project/tabs/FeatureFlags/FeatureFlagSettingsModal.tsx@@ -9,21 +9,18 @@ import {ListboxOptions,Transition,} from '@headlessui/react'-import {- XMarkIcon,- ClipboardIcon,- CheckIcon as HeroCheckIcon,-} from '@heroicons/react/24/outline'import cx from 'clsx'import _map from 'lodash/map'import {- Trash2Icon,+ TrashIcon,PlusIcon,CodeIcon,- ChevronDownIcon,- ChevronsUpDownIcon,+ CaretDownIcon,+ CaretUpDownIcon,CheckIcon,-} from 'lucide-react'+ XIcon,+ ClipboardIcon,+} from '@phosphor-icons/react'import { useState, useEffect, useCallback, Fragment, useRef } from 'react'import { useTranslation } from 'react-i18next'import { useFetcher } from 'react-router'@@ -359,7 +356,7 @@ const flags = await swetrix.getFeatureFlags(undefined, true)`onClick={onClose}className='rounded-md p-1.5 text-gray-400 hover:bg-gray-100 hover:text-gray-500 dark:hover:bg-slate-800 dark:hover:text-gray-300'>- <XMarkIcon className='h-5 w-5' />+ <XIcon className='h-5 w-5' /></button></div>@@ -473,7 +470,7 @@ const flags = await swetrix.getFeatureFlags(undefined, true)`)?.label || t('common.select')}</span><span className='pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2'>- <ChevronsUpDownIcon className='h-4 w-4 text-gray-400' />+ <CaretUpDownIcon className='h-4 w-4 text-gray-400' /></span></ListboxButton><Transition@@ -556,7 +553,7 @@ const flags = await swetrix.getFeatureFlags(undefined, true)`: t('featureFlags.is')}</span><span className='pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2'>- <ChevronsUpDownIcon className='h-4 w-4 text-gray-400' />+ <CaretUpDownIcon className='h-4 w-4 text-gray-400' /></span></ListboxButton><Transition@@ -667,7 +664,7 @@ const flags = await swetrix.getFeatureFlags(undefined, true)`onClick={() => removeTargetingRule(index)}className='rounded-md p-2 text-gray-400 transition-colors hover:bg-gray-100 hover:text-gray-600 dark:hover:bg-slate-700 dark:hover:text-gray-300'>- <Trash2Icon className='h-4 w-4' />+ <TrashIcon className='h-4 w-4' /></button></div>))}@@ -702,7 +699,7 @@ const flags = await swetrix.getFeatureFlags(undefined, true)`{t('featureFlags.howToImplement')}</Text></div>- <ChevronDownIcon+ <CaretDownIconclassName={cx('size-5 text-gray-500 transition-transform',{@@ -732,7 +729,7 @@ const flags = await swetrix.getFeatureFlags(undefined, true)`className='flex items-center gap-1 text-xs text-gray-500 hover:text-gray-700'>{copiedCode === 'js-all' ? (- <HeroCheckIcon className='size-4 text-green-500' />+ <CheckIcon className='size-4 text-green-500' />) : (<ClipboardIcon className='size-4' />)}@@ -758,7 +755,7 @@ const flags = await swetrix.getFeatureFlags(undefined, true)`className='flex items-center gap-1 text-xs text-gray-500 hover:text-gray-700'>{copiedCode === 'js-single' ? (- <HeroCheckIcon className='size-4 text-green-500' />+ <CheckIcon className='size-4 text-green-500' />) : (<ClipboardIcon className='size-4' />)}@@ -786,7 +783,7 @@ const flags = await swetrix.getFeatureFlags(undefined, true)`className='flex items-center gap-1 text-xs text-gray-500 hover:text-gray-700'>{copiedCode === 'js-cache' ? (- <HeroCheckIcon className='size-4 text-green-500' />+ <CheckIcon className='size-4 text-green-500' />) : (<ClipboardIcon className='size-4' />)}diff --git a/web/app/pages/Project/tabs/FeatureFlags/FeatureFlagsView.tsx b/web/app/pages/Project/tabs/FeatureFlags/FeatureFlagsView.tsxindex 683c7a19d..84d90e256 100644--- a/web/app/pages/Project/tabs/FeatureFlags/FeatureFlagsView.tsx+++ b/web/app/pages/Project/tabs/FeatureFlags/FeatureFlagsView.tsx@@ -5,21 +5,19 @@ import _debounce from 'lodash/debounce'import _isEmpty from 'lodash/isEmpty'import _map from 'lodash/map'import {- FlagIcon,- Trash2Icon,+ TrashIcon,PencilIcon,PlusIcon,- SearchIcon,+ MagnifyingGlassIcon,ToggleLeftIcon,ToggleRightIcon,- PercentIcon,UsersIcon,- ActivityIcon,- ChevronDownIcon,- DownloadIcon,+ PulseIcon,+ CaretDownIcon,+ DownloadSimpleIcon,CheckIcon,XIcon,-} from 'lucide-react'+} from '@phosphor-icons/react'import {useState,useEffect,@@ -156,9 +154,9 @@ const FeatureFlagProfileRow = ({)}>{profile.lastResult ? (- <CheckIcon className='mr-1 size-3' strokeWidth={2} />+ <CheckIcon className='mr-1 size-3' />) : (- <XIcon className='mr-1 size-3' strokeWidth={2} />+ <XIcon className='mr-1 size-3' />)}{profile.lastResult ? 'true' : 'false'}</span>@@ -225,10 +223,7 @@ const FeatureFlagRow = ({truncateclassName='flex items-center gap-x-1.5'>- <FlagIcon- className='size-4 text-indigo-500'- strokeWidth={1.5}- />+ <ToggleRightIcon className='size-4 text-indigo-600 dark:text-indigo-500' /><span>{flag.key}</span></Text>{/* Status badge */}@@ -247,10 +242,7 @@ const FeatureFlagRow = ({{/* Flag type badge */}<span className='inline-flex items-center gap-1 rounded-full bg-blue-100 px-2 py-0.5 text-xs font-medium text-blue-800 dark:bg-blue-900/30 dark:text-blue-400'>{flag.flagType === 'rollout' ? (- <>- <PercentIcon className='size-3' />- {flag.rolloutPercentage}%- </>+ <>{flag.rolloutPercentage}%</>) : (<><ToggleRightIcon className='size-3' />@@ -280,7 +272,7 @@ const FeatureFlagRow = ({) : stats ? (<><span className='flex items-center gap-1'>- <ActivityIcon className='size-3' />+ <PulseIcon className='size-3' />{nFormatter(stats.evaluations, 1)}{' '}{t('featureFlags.evaluations').toLowerCase()}</span>@@ -364,9 +356,9 @@ const FeatureFlagRow = ({)}>{flag.enabled ? (- <ToggleRightIcon className='size-5' strokeWidth={1.5} />+ <ToggleRightIcon className='size-5' />) : (- <ToggleLeftIcon className='size-5' strokeWidth={1.5} />+ <ToggleLeftIcon className='size-5' />)}</button><button@@ -379,7 +371,7 @@ const FeatureFlagRow = ({aria-label={t('common.edit')}className='rounded-md border border-transparent p-1.5 text-gray-800 transition-colors hover:border-gray-300 hover:bg-gray-50 hover:text-gray-900 dark:text-slate-400 hover:dark:border-slate-700/80 dark:hover:bg-slate-800 dark:hover:text-slate-300'>- <PencilIcon className='size-4' strokeWidth={1.5} />+ <PencilIcon className='size-4' /></button><buttontype='button'@@ -391,16 +383,15 @@ const FeatureFlagRow = ({aria-label={t('common.delete')}className='rounded-md border border-transparent p-1.5 text-gray-800 transition-colors hover:border-gray-300 hover:bg-gray-50 hover:text-gray-900 dark:text-slate-400 hover:dark:border-slate-700/80 dark:hover:bg-slate-800 dark:hover:text-slate-300'>- <Trash2Icon className='size-4' strokeWidth={1.5} />+ <TrashIcon className='size-4' /></button>- <ChevronDownIcon+ <CaretDownIconclassName={cx('size-5 text-gray-500 transition-transform dark:text-gray-400',{'rotate-180': isExpanded,},)}- strokeWidth={1.5}/></div></div>@@ -460,10 +451,7 @@ const FeatureFlagRow = ({{profilesLoading ? (<Spin className='mr-2 size-5' />) : (- <DownloadIcon- className='mr-2 h-5 w-5'- strokeWidth={1.5}- />+ <DownloadSimpleIcon className='mr-2 h-5 w-5' />)}{t('featureFlags.loadMore')}</button>@@ -968,7 +956,7 @@ const FeatureFlagsViewInner = ({{_isEmpty(flags) && !filterQuery ? (<div className='mt-5 rounded-lg bg-gray-700 p-5'><div className='flex items-center text-gray-50'>- <FlagIcon className='mr-2 h-8 w-8' strokeWidth={1.5} />+ <ToggleRightIcon className='mr-2 h-8 w-8' /><p className='text-3xl font-bold'>{t('featureFlags.title')}</p></div><p className='mt-2 text-sm whitespace-pre-wrap text-gray-100'>@@ -988,10 +976,7 @@ const FeatureFlagsViewInner = ({{/* Header with filter and add button */}<div className='mb-4 flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between'><div className='relative'>- <SearchIcon- className='absolute top-1/2 left-3 size-4 -translate-y-1/2 text-gray-400'- strokeWidth={1.5}- />+ <MagnifyingGlassIcon className='absolute top-1/2 left-3 size-4 -translate-y-1/2 text-gray-400' /><inputtype='text'placeholder={t('featureFlags.filterFlags')}@@ -1001,7 +986,7 @@ const FeatureFlagsViewInner = ({/></div><Button onClick={handleNewFlag} primary regular>- <PlusIcon className='mr-1.5 size-4' strokeWidth={2} />+ <PlusIcon className='mr-1.5 size-4' />{t('featureFlags.addFlag')}</Button></div>diff --git a/web/app/pages/Project/tabs/Funnels/FunnelsList.tsx b/web/app/pages/Project/tabs/Funnels/FunnelsList.tsxindex 65063e6df..b720b6ee3 100644--- a/web/app/pages/Project/tabs/Funnels/FunnelsList.tsx+++ b/web/app/pages/Project/tabs/Funnels/FunnelsList.tsx@@ -1,6 +1,10 @@import cx from 'clsx'import _map from 'lodash/map'-import { Settings2Icon, Trash2Icon, FunnelPlusIcon } from 'lucide-react'+import {+ SlidersHorizontalIcon,+ TrashIcon,+ FunnelIcon,+} from '@phosphor-icons/react'import { useMemo } from 'react'import { useTranslation } from 'react-i18next'import { Link, useSearchParams } from 'react-router'@@ -68,7 +72,7 @@ const FunnelCard = ({aria-label={t('common.settings')}className='rounded-md border border-transparent p-1.5 text-gray-800 transition-colors hover:border-gray-300 hover:bg-gray-50 hover:text-gray-900 dark:text-slate-400 hover:dark:border-slate-700/80 dark:hover:bg-slate-800 dark:hover:text-slate-300'>- <Settings2Icon className='size-5' strokeWidth={1.5} />+ <SlidersHorizontalIcon className='size-5' /></button>{allowedToManage ? (<button@@ -86,7 +90,7 @@ const FunnelCard = ({},)}>- <Trash2Icon className='size-5' strokeWidth={1.5} />+ <TrashIcon className='size-5' /></button>) : null}</div>@@ -109,10 +113,7 @@ const AddFunnel = ({ openFunnelSettings }: AddFunnelProps) => {className='group flex h-auto min-h-[120px] cursor-pointer items-center justify-center rounded-lg border border-dashed border-gray-300 transition-colors hover:border-gray-400 dark:border-gray-500 dark:hover:border-gray-600'><div>- <FunnelPlusIcon- className='mx-auto h-12 w-12 text-gray-400 transition-colors group-hover:text-gray-500 dark:text-gray-200 group-hover:dark:text-gray-400'- strokeWidth={1}- />+ <FunnelIcon className='mx-auto h-12 w-12 text-gray-400 transition-colors group-hover:text-gray-500 dark:text-gray-200 group-hover:dark:text-gray-400' /><Textas='span'size='sm'diff --git a/web/app/pages/Project/tabs/Funnels/FunnelsView.tsx b/web/app/pages/Project/tabs/Funnels/FunnelsView.tsxindex bd8ce240c..cff212434 100644--- a/web/app/pages/Project/tabs/Funnels/FunnelsView.tsx+++ b/web/app/pages/Project/tabs/Funnels/FunnelsView.tsx@@ -3,7 +3,7 @@ import _filter from 'lodash/filter'import _find from 'lodash/find'import _includes from 'lodash/includes'import _isEmpty from 'lodash/isEmpty'-import { FilterIcon } from 'lucide-react'+import { FunnelIcon } from '@phosphor-icons/react'import { useState, useEffect, useMemo, useRef, Suspense, use } from 'react'import { useTranslation } from 'react-i18next'import {@@ -432,7 +432,7 @@ const FunnelsViewInner = ({ deferredData }: FunnelsViewInnerProps) => {<><div className='mt-5 rounded-xl bg-gray-700 p-5'><div className='flex items-center text-gray-50'>- <FilterIcon className='mr-2 h-8 w-8' strokeWidth={1.5} />+ <FunnelIcon className='mr-2 h-8 w-8' /><p className='text-3xl font-bold'>{t('dashboard.funnels')}</p></div><p className='mt-2 text-sm whitespace-pre-wrap text-gray-100'>diff --git a/web/app/pages/Project/tabs/Goals/GoalSettingsModal.tsx b/web/app/pages/Project/tabs/Goals/GoalSettingsModal.tsxindex fd9dbe665..c15347871 100644--- a/web/app/pages/Project/tabs/Goals/GoalSettingsModal.tsx+++ b/web/app/pages/Project/tabs/Goals/GoalSettingsModal.tsx@@ -4,9 +4,8 @@ import {DialogPanel,DialogTitle,} from '@headlessui/react'-import { XMarkIcon } from '@heroicons/react/24/outline'import _map from 'lodash/map'-import { Trash2Icon, PlusIcon } from 'lucide-react'+import { TrashIcon, PlusIcon, XIcon } from '@phosphor-icons/react'import { useState, useEffect, useRef } from 'react'import { useTranslation } from 'react-i18next'import { useFetcher } from 'react-router'@@ -198,7 +197,7 @@ const GoalSettingsModal = ({onClick={onClose}className='rounded-md p-1.5 text-gray-400 hover:bg-gray-100 hover:text-gray-500 dark:hover:bg-slate-800 dark:hover:text-gray-300'>- <XMarkIcon className='h-5 w-5' />+ <XIcon className='h-5 w-5' /></button></div>@@ -328,7 +327,7 @@ const GoalSettingsModal = ({onClick={() => removeMetadataFilter(index)}className='rounded-md border border-transparent p-1.5 text-gray-800 transition-colors hover:border-gray-300 hover:bg-gray-50 hover:text-gray-900 dark:text-slate-400 hover:dark:border-slate-700/80 dark:hover:bg-slate-800 dark:hover:text-slate-300'>- <Trash2Icon className='h-4 w-4' />+ <TrashIcon className='h-4 w-4' /></button></div>))}diff --git a/web/app/pages/Project/tabs/Goals/GoalsView.tsx b/web/app/pages/Project/tabs/Goals/GoalsView.tsxindex cbe0b3573..3c35d6f59 100644--- a/web/app/pages/Project/tabs/Goals/GoalsView.tsx+++ b/web/app/pages/Project/tabs/Goals/GoalsView.tsx@@ -9,14 +9,14 @@ import _map from 'lodash/map'import _size from 'lodash/size'import {TargetIcon,- Trash2Icon,+ TrashIcon,PencilIcon,PlusIcon,- SearchIcon,+ MagnifyingGlassIcon,FileTextIcon,- MousePointerClickIcon,- ChevronDownIcon,-} from 'lucide-react'+ CursorClickIcon,+ CaretDownIcon,+} from '@phosphor-icons/react'import {useState,useEffect,@@ -334,15 +334,9 @@ const GoalRow = ({className='flex items-center gap-x-1.5'>{goal.type === 'pageview' ? (- <FileTextIcon- className='size-4 text-blue-500'- strokeWidth={1.5}- />+ <FileTextIcon className='size-4 text-blue-500' />) : (- <MousePointerClickIcon- className='size-4 text-amber-500'- strokeWidth={1.5}- />+ <CursorClickIcon className='size-4 text-amber-500' />)}<span>{goal.name}</span></Text>@@ -427,7 +421,7 @@ const GoalRow = ({aria-label={t('common.edit')}className='rounded-md border border-transparent p-1.5 text-gray-800 transition-colors hover:border-gray-300 hover:bg-gray-50 hover:text-gray-900 dark:text-slate-400 hover:dark:border-slate-700/80 dark:hover:bg-slate-800 dark:hover:text-slate-300'>- <PencilIcon className='size-4' strokeWidth={1.5} />+ <PencilIcon className='size-4' /></button><buttontype='button'@@ -439,16 +433,15 @@ const GoalRow = ({aria-label={t('common.delete')}className='rounded-md border border-transparent p-1.5 text-gray-800 transition-colors hover:border-gray-300 hover:bg-gray-50 hover:text-gray-900 dark:text-slate-400 hover:dark:border-slate-700/80 dark:hover:bg-slate-800 dark:hover:text-slate-300'>- <Trash2Icon className='size-4' strokeWidth={1.5} />+ <TrashIcon className='size-4' /></button>- <ChevronDownIcon+ <CaretDownIconclassName={cx('size-5 text-gray-500 transition-transform dark:text-gray-400',{'rotate-180': isExpanded,},)}- strokeWidth={1.5}/></div></div>@@ -856,7 +849,7 @@ const GoalsViewInner = ({{_isEmpty(goals) && !filterQuery ? (<div className='mt-5 rounded-lg bg-gray-700 p-5'><div className='flex items-center text-gray-50'>- <TargetIcon className='mr-2 h-8 w-8' strokeWidth={1.5} />+ <TargetIcon className='mr-2 h-8 w-8' /><p className='text-3xl font-bold'>{t('goals.title')}</p></div><p className='mt-2 text-sm whitespace-pre-wrap text-gray-100'>@@ -876,10 +869,7 @@ const GoalsViewInner = ({{/* Header with filter and add button */}<div className='mb-4 flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between'><div className='relative'>- <SearchIcon- className='absolute top-1/2 left-3 size-4 -translate-y-1/2 text-gray-400'- strokeWidth={1.5}- />+ <MagnifyingGlassIcon className='absolute top-1/2 left-3 size-4 -translate-y-1/2 text-gray-400' /><inputtype='text'placeholder={t('goals.filterGoals')}@@ -889,7 +879,7 @@ const GoalsViewInner = ({/></div><Button onClick={handleNewGoal} primary regular>- <PlusIcon className='mr-1.5 size-4' strokeWidth={2} />+ <PlusIcon className='mr-1.5 size-4' />{t('goals.addGoal')}</Button></div>diff --git a/web/app/pages/Project/tabs/Performance/PerformanceView.tsx b/web/app/pages/Project/tabs/Performance/PerformanceView.tsxindex d16ff5f2b..908ac0475 100644--- a/web/app/pages/Project/tabs/Performance/PerformanceView.tsx+++ b/web/app/pages/Project/tabs/Performance/PerformanceView.tsx@@ -2,7 +2,7 @@ import cx from 'clsx'import _isEmpty from 'lodash/isEmpty'import _keys from 'lodash/keys'import _map from 'lodash/map'-import { EyeIcon, PercentIcon } from 'lucide-react'+import { EyeIcon, PercentIcon } from '@phosphor-icons/react'import {useState,useEffect,@@ -26,7 +26,7 @@ import type {PerformanceOverallObject,} from '~/api/api.server'import { useAnnotations } from '~/hooks/useAnnotations'-import { PERFORMANCE_PANELS_ORDER, chartTypes } from '~/lib/constants'+import { PERFORMANCE_PANELS_ORDER } from '~/lib/constants'import { CountryEntry } from '~/lib/models/Entry'import { OverallPerformanceObject } from '~/lib/models/Project'import AnnotationModal from '~/modals/AnnotationModal'diff --git a/web/app/pages/Project/tabs/Profiles/ProfileDetails.tsx b/web/app/pages/Project/tabs/Profiles/ProfileDetails.tsxindex 2cee3602c..592c14c52 100644--- a/web/app/pages/Project/tabs/Profiles/ProfileDetails.tsx+++ b/web/app/pages/Project/tabs/Profiles/ProfileDetails.tsx@@ -5,16 +5,16 @@ import _capitalize from 'lodash/capitalize'import _isEmpty from 'lodash/isEmpty'import {ClockIcon,- CalendarIcon,+ CalendarDotsIcon,FileTextIcon,MonitorIcon,- SmartphoneIcon,- TabletIcon,+ DeviceMobileIcon,+ DeviceTabletIcon,GlobeIcon,- DollarSignIcon,- UsersIcon,- MousePointerClickIcon,-} from 'lucide-react'+ CurrencyDollarIcon,+ UserListIcon,+ CursorClickIcon,+} from '@phosphor-icons/react'import { useMemo } from 'react'import { useTranslation } from 'react-i18next'@@ -274,8 +274,8 @@ const InfoRow = ({const DeviceIcon = ({ device }: { device: string | null }) => {const deviceLower = device?.toLowerCase() || ''- if (deviceLower === 'mobile') return <SmartphoneIcon className='h-4 w-4' />- if (deviceLower === 'tablet') return <TabletIcon className='h-4 w-4' />+ if (deviceLower === 'mobile') return <DeviceMobileIcon className='h-4 w-4' />+ if (deviceLower === 'tablet') return <DeviceTabletIcon className='h-4 w-4' />return <MonitorIcon className='h-4 w-4' />}@@ -387,7 +387,7 @@ export const ProfileDetails = ({</div><div className='mt-5 grid grid-cols-2 gap-x-4 gap-y-5'><StatItem- icon={<UsersIcon className='h-3.5 w-3.5' />}+ icon={<UserListIcon className='h-3.5 w-3.5' />}label={t('project.sessions')}value={details.sessionsCount || 0}/>@@ -397,7 +397,7 @@ export const ProfileDetails = ({value={details.pageviewsCount || 0}/><StatItem- icon={<MousePointerClickIcon className='h-3.5 w-3.5' />}+ icon={<CursorClickIcon className='h-3.5 w-3.5' />}label={t('dashboard.events')}value={details.eventsCount || 0}/>@@ -407,19 +407,19 @@ export const ProfileDetails = ({value={avgDurationStr}/><StatItem- icon={<CalendarIcon className='h-3.5 w-3.5' />}+ icon={<CalendarDotsIcon className='h-3.5 w-3.5' />}label={t('project.firstSeen')}value={formatDate(details.firstSeen)}/><StatItem- icon={<CalendarIcon className='h-3.5 w-3.5' />}+ icon={<CalendarDotsIcon className='h-3.5 w-3.5' />}label={t('project.lastSeen')}value={formatDate(details.lastSeen)}/>{details.totalRevenue !== undefined && details.totalRevenue > 0 ? (<StatItemicon={- <DollarSignIcon className='h-3.5 w-3.5 text-emerald-500' />+ <CurrencyDollarIcon className='h-3.5 w-3.5 text-emerald-500' />}label={t('dashboard.revenue')}value={new Intl.NumberFormat('en-US', {diff --git a/web/app/pages/Project/tabs/Profiles/Profiles.tsx b/web/app/pages/Project/tabs/Profiles/Profiles.tsxindex 5e77fcb20..760d1731b 100644--- a/web/app/pages/Project/tabs/Profiles/Profiles.tsx+++ b/web/app/pages/Project/tabs/Profiles/Profiles.tsx@@ -1,15 +1,15 @@-import { ChevronRightIcon } from '@heroicons/react/24/outline'import cx from 'clsx'import dayjs from 'dayjs'import relativeTime from 'dayjs/plugin/relativeTime'import _map from 'lodash/map'import {- BugIcon,+ WarningIcon,FileTextIcon,- MousePointerClickIcon,- UsersIcon,- CalendarIcon,-} from 'lucide-react'+ CursorClickIcon,+ UserListIcon,+ CalendarDotsIcon,+ CaretRightIcon,+} from '@phosphor-icons/react'import React, { useMemo } from 'react'import { useTranslation } from 'react-i18next'import { Link, useLocation } from 'react-router'@@ -155,14 +155,13 @@ const ProfileRow = ({ profile, timeFormat }: ProfileRowProps) => {className='mr-2 flex items-center'title={t('project.sessions')}>- <UsersIcon className='mr-1 size-4' strokeWidth={1.5} />{' '}- {profile.sessionsCount}+ <UserListIcon className='mr-1 size-4' /> {profile.sessionsCount}</span><spanclassName='mr-2 flex items-center'title={t('dashboard.pageviews')}>- <FileTextIcon className='mr-1 size-4' strokeWidth={1.5} />{' '}+ <FileTextIcon className='mr-1 size-4' />{' '}{profile.pageviewsCount}</span>{profile.eventsCount > 0 ? (@@ -170,10 +169,7 @@ const ProfileRow = ({ profile, timeFormat }: ProfileRowProps) => {className='mr-2 flex items-center'title={t('dashboard.events')}>- <MousePointerClickIcon- className='mr-1 size-4'- strokeWidth={1.5}- />{' '}+ <CursorClickIcon className='mr-1 size-4' />{' '}{profile.eventsCount}</span>) : null}@@ -182,8 +178,7 @@ const ProfileRow = ({ profile, timeFormat }: ProfileRowProps) => {className='flex items-center text-red-400'title={t('dashboard.errors')}>- <BugIcon className='mr-1 size-4' strokeWidth={1.5} />{' '}- {profile.errorsCount}+ <WarningIcon className='mr-1 size-4' /> {profile.errorsCount}</span>) : null}</p>@@ -196,14 +191,13 @@ const ProfileRow = ({ profile, timeFormat }: ProfileRowProps) => {className='flex items-center'title={t('project.xSessions', { x: profile.sessionsCount })}>- <UsersIcon className='mr-1 size-5' strokeWidth={1.5} />{' '}- {profile.sessionsCount}+ <UserListIcon className='mr-1 size-5' /> {profile.sessionsCount}</span><spanclassName='flex items-center'title={t('dashboard.xPageviews', { x: profile.pageviewsCount })}>- <FileTextIcon className='mr-1 size-5' strokeWidth={1.5} />{' '}+ <FileTextIcon className='mr-1 size-5' />{' '}{profile.pageviewsCount}</span>{profile.eventsCount > 0 ? (@@ -213,10 +207,7 @@ const ProfileRow = ({ profile, timeFormat }: ProfileRowProps) => {x: profile.eventsCount,})}>- <MousePointerClickIcon- className='mr-1 size-5'- strokeWidth={1.5}- />{' '}+ <CursorClickIcon className='mr-1 size-5' />{' '}{profile.eventsCount}</span>) : null}@@ -225,17 +216,16 @@ const ProfileRow = ({ profile, timeFormat }: ProfileRowProps) => {className='flex items-center text-red-500'title={t('dashboard.xErrors', { x: profile.errorsCount })}>- <BugIcon className='mr-1 size-5' strokeWidth={1.5} />{' '}- {profile.errorsCount}+ <WarningIcon className='mr-1 size-5' /> {profile.errorsCount}</span>) : null}</div><p className='mt-1 flex items-center text-xs leading-5 text-gray-500 dark:text-gray-400'>- <CalendarIcon className='mr-1 size-3' strokeWidth={1.5} />+ <CalendarDotsIcon className='mr-1 size-3' />{lastSeenText}</p></div>- <ChevronRightIcon+ <CaretRightIconclassName='h-5 w-5 flex-none text-gray-400'aria-hidden='true'/>diff --git a/web/app/pages/Project/tabs/Profiles/ProfilesView.tsx b/web/app/pages/Project/tabs/Profiles/ProfilesView.tsxindex 20c44b2ce..9729d06f2 100644--- a/web/app/pages/Project/tabs/Profiles/ProfilesView.tsx+++ b/web/app/pages/Project/tabs/Profiles/ProfilesView.tsx@@ -1,6 +1,6 @@import cx from 'clsx'import _isEmpty from 'lodash/isEmpty'-import { DownloadIcon } from 'lucide-react'+import { DownloadSimpleIcon } from '@phosphor-icons/react'import { useState, useEffect, useMemo, useRef } from 'react'import { useTranslation } from 'react-i18next'import { useSearchParams } from 'react-router'@@ -440,7 +440,7 @@ const ProfilesView = ({ tnMapping }: ProfilesViewProps) => {},)}>- <DownloadIcon className='mr-2 h-5 w-5' strokeWidth={1.5} />+ <DownloadSimpleIcon className='mr-2 h-5 w-5' />{t('project.loadMore')}</button>) : null}diff --git a/web/app/pages/Project/tabs/Profiles/components/NoProfiles.tsx b/web/app/pages/Project/tabs/Profiles/components/NoProfiles.tsxindex b84352d35..e081c380c 100644--- a/web/app/pages/Project/tabs/Profiles/components/NoProfiles.tsx+++ b/web/app/pages/Project/tabs/Profiles/components/NoProfiles.tsx@@ -1,6 +1,5 @@-import { FunnelIcon } from '@heroicons/react/24/outline'import _isEmpty from 'lodash/isEmpty'-import { UserIcon } from 'lucide-react'+import { UserIcon, FunnelIcon } from '@phosphor-icons/react'import { memo } from 'react'import { useTranslation } from 'react-i18next'diff --git a/web/app/pages/Project/tabs/Sessions/NoSessionDetails.tsx b/web/app/pages/Project/tabs/Sessions/NoSessionDetails.tsxindex b46cf073f..a70caa6a4 100644--- a/web/app/pages/Project/tabs/Sessions/NoSessionDetails.tsx+++ b/web/app/pages/Project/tabs/Sessions/NoSessionDetails.tsx@@ -1,4 +1,4 @@-import { FaceFrownIcon } from '@heroicons/react/24/outline'+import { SmileySadIcon } from '@phosphor-icons/react'import { useTranslation } from 'react-i18next'const NoSessionDetails = () => {@@ -7,10 +7,7 @@ const NoSessionDetails = () => {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 mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-800'>- <FaceFrownIcon- className='size-7 text-gray-700 dark:text-gray-200'- strokeWidth={1.5}- />+ <SmileySadIcon className='size-7 text-gray-700 dark:text-gray-200' /></div><h3 className='text-xl font-medium tracking-tight'>{t('project.noSessionDetails')}diff --git a/web/app/pages/Project/tabs/Sessions/Pageflow.tsx b/web/app/pages/Project/tabs/Sessions/Pageflow.tsxindex 494861f37..6a3877b0c 100644--- a/web/app/pages/Project/tabs/Sessions/Pageflow.tsx+++ b/web/app/pages/Project/tabs/Sessions/Pageflow.tsx@@ -5,15 +5,15 @@ import _size from 'lodash/size'import _toUpper from 'lodash/toUpper'import _truncate from 'lodash/truncate'import {- BugIcon,- ChevronDownIcon,+ WarningIcon,+ CaretDownIcon,CircleIcon,- DollarSignIcon,+ CurrencyDollarIcon,FileTextIcon,- MousePointerClickIcon,- RotateCcwIcon,+ CursorClickIcon,+ ArrowCounterClockwiseIcon,TagIcon,-} from 'lucide-react'+} from '@phosphor-icons/react'import React, { useMemo, useState } from 'react'import { Trans, useTranslation } from 'react-i18next'@@ -194,35 +194,30 @@ const PageflowItem = ({<FileTextIconclassName='h-5 w-5 text-white'aria-hidden='true'- strokeWidth={1.5}/>) : null}{type === 'event' ? (- <MousePointerClickIcon+ <CursorClickIconclassName='h-5 w-5 text-white'aria-hidden='true'- strokeWidth={1.5}/>) : null}{type === 'error' ? (- <BugIcon+ <WarningIconclassName='h-5 w-5 text-white'aria-hidden='true'- strokeWidth={1.5}/>) : null}{type === 'sale' ? (- <DollarSignIcon+ <CurrencyDollarIconclassName='h-5 w-5 text-white'aria-hidden='true'- strokeWidth={1.5}/>) : null}{type === 'refund' ? (- <RotateCcwIcon+ <ArrowCounterClockwiseIconclassName='h-5 w-5 text-white'aria-hidden='true'- strokeWidth={1.5}/>) : null}</span>@@ -309,7 +304,7 @@ const PageflowItem = ({</span>) : null}{hasMetadata ? (- <ChevronDownIcon+ <CaretDownIconclassName={cn('ml-1 h-4 w-4 shrink-0 text-gray-400 transition-transform duration-200 dark:text-gray-500',isExpanded && 'rotate-180',diff --git a/web/app/pages/Project/tabs/Sessions/SessionDetailView.tsx b/web/app/pages/Project/tabs/Sessions/SessionDetailView.tsxindex 6ff40aafc..8df8ca290 100644--- a/web/app/pages/Project/tabs/Sessions/SessionDetailView.tsx+++ b/web/app/pages/Project/tabs/Sessions/SessionDetailView.tsx@@ -6,12 +6,12 @@ import _truncate from 'lodash/truncate'import {GlobeIcon,MonitorIcon,- SmartphoneIcon,- TabletIcon,+ DeviceMobileIcon,+ DeviceTabletIcon,ClockIcon,LinkIcon,UserIcon,-} from 'lucide-react'+} from '@phosphor-icons/react'import { useMemo, useState } from 'react'import { useTranslation } from 'react-i18next'import { Link } from 'react-router'@@ -90,8 +90,8 @@ const InfoRow = ({const DeviceIcon = ({ device }: { device: string | null }) => {const deviceLower = device?.toLowerCase() || ''- if (deviceLower === 'mobile') return <SmartphoneIcon className='h-4 w-4' />- if (deviceLower === 'tablet') return <TabletIcon className='h-4 w-4' />+ if (deviceLower === 'mobile') return <DeviceMobileIcon className='h-4 w-4' />+ if (deviceLower === 'tablet') return <DeviceTabletIcon className='h-4 w-4' />return <MonitorIcon className='h-4 w-4' />}diff --git a/web/app/pages/Project/tabs/Sessions/Sessions.tsx b/web/app/pages/Project/tabs/Sessions/Sessions.tsxindex 4a75f726e..e821902cf 100644--- a/web/app/pages/Project/tabs/Sessions/Sessions.tsx+++ b/web/app/pages/Project/tabs/Sessions/Sessions.tsx@@ -1,4 +1,3 @@-import { ChevronRightIcon } from '@heroicons/react/24/outline'import cx from 'clsx'import dayjs from 'dayjs'import duration from 'dayjs/plugin/duration'@@ -6,10 +5,11 @@ import relativeTime from 'dayjs/plugin/relativeTime'import _map from 'lodash/map'import {FileTextIcon,- BugIcon,- MousePointerClickIcon,- CalendarIcon,-} from 'lucide-react'+ WarningIcon,+ CursorClickIcon,+ CalendarDotsIcon,+ CaretRightIcon,+} from '@phosphor-icons/react'import React, { useMemo } from 'react'import { useTranslation } from 'react-i18next'import { Link, useLocation } from 'react-router'@@ -255,8 +255,7 @@ const Session = ({className='mr-2 flex items-center'title={t('dashboard.pageviews')}>- <FileTextIcon className='mr-1 size-4' strokeWidth={1.5} />{' '}- {session.pageviews}+ <FileTextIcon className='mr-1 size-4' /> {session.pageviews}</span>{session.revenue != null && session.revenue !== 0 ? (<span@@ -276,10 +275,7 @@ const Session = ({className='mr-2 flex items-center'title={t('dashboard.events')}>- <MousePointerClickIcon- className='mr-1 size-4'- strokeWidth={1.5}- />{' '}+ <CursorClickIcon className='mr-1 size-4' />{' '}{session.customEvents}</span>) : null}@@ -288,8 +284,7 @@ const Session = ({className='flex items-center text-red-400'title={t('dashboard.errors')}>- <BugIcon className='mr-1 size-4' strokeWidth={1.5} />{' '}- {session.errors}+ <WarningIcon className='mr-1 size-4' /> {session.errors}</span>) : null}</p>@@ -302,8 +297,7 @@ const Session = ({className='flex items-center'title={t('dashboard.xPageviews', { x: session.pageviews })}>- <FileTextIcon className='mr-1 size-5' strokeWidth={1.5} />{' '}- {session.pageviews}+ <FileTextIcon className='mr-1 size-5' /> {session.pageviews}</span>{session.revenue != null && session.revenue !== 0 ? (<span@@ -325,10 +319,7 @@ const Session = ({x: session.customEvents,})}>- <MousePointerClickIcon- className='mr-1 size-5'- strokeWidth={1.5}- />{' '}+ <CursorClickIcon className='mr-1 size-5' />{' '}{session.customEvents}</span>) : null}@@ -337,17 +328,16 @@ const Session = ({className='flex items-center text-red-500'title={t('dashboard.xErrors', { x: session.errors })}>- <BugIcon className='mr-1 size-5' strokeWidth={1.5} />{' '}- {session.errors}+ <WarningIcon className='mr-1 size-5' /> {session.errors}</span>) : null}</div><p className='mt-1 flex items-center text-xs leading-5 text-gray-500 dark:text-gray-400'>- <CalendarIcon className='mr-1 size-3' strokeWidth={1.5} />+ <CalendarDotsIcon className='mr-1 size-3' />{dateLineString}</p></div>- <ChevronRightIcon+ <CaretRightIconclassName='h-5 w-5 flex-none text-gray-400'aria-hidden='true'/>diff --git a/web/app/pages/Project/tabs/Sessions/SessionsView.tsx b/web/app/pages/Project/tabs/Sessions/SessionsView.tsxindex 71cc33da6..8b40b0569 100644--- a/web/app/pages/Project/tabs/Sessions/SessionsView.tsx+++ b/web/app/pages/Project/tabs/Sessions/SessionsView.tsx@@ -1,6 +1,6 @@import cx from 'clsx'import _isEmpty from 'lodash/isEmpty'-import { DownloadIcon } from 'lucide-react'+import { DownloadSimpleIcon } from '@phosphor-icons/react'import {Component,useState,@@ -413,7 +413,7 @@ const SessionsViewInner = ({{sessionsLoading ? (<Spin className='mr-2 size-5' />) : (- <DownloadIcon className='mr-2 h-5 w-5' strokeWidth={1.5} />+ <DownloadSimpleIcon className='mr-2 h-5 w-5' />)}{t('project.loadMore')}</button>diff --git a/web/app/pages/Project/tabs/Sessions/components/NoSessions.tsx b/web/app/pages/Project/tabs/Sessions/components/NoSessions.tsxindex 1210e2b5e..5f8f9bbc2 100644--- a/web/app/pages/Project/tabs/Sessions/components/NoSessions.tsx+++ b/web/app/pages/Project/tabs/Sessions/components/NoSessions.tsx@@ -1,4 +1,4 @@-import { FunnelIcon, ClockIcon } from '@heroicons/react/24/outline'+import { FunnelIcon, ClockIcon } from '@phosphor-icons/react'import _isEmpty from 'lodash/isEmpty'import { memo } from 'react'import { useTranslation } from 'react-i18next'diff --git a/web/app/pages/Project/tabs/Traffic/CustomEventsSubmenu.tsx b/web/app/pages/Project/tabs/Traffic/CustomEventsSubmenu.tsxindex 6b6a9d44f..7309eac73 100644--- a/web/app/pages/Project/tabs/Traffic/CustomEventsSubmenu.tsx+++ b/web/app/pages/Project/tabs/Traffic/CustomEventsSubmenu.tsx@@ -2,7 +2,7 @@ import { Transition } from '@headlessui/react'import _map from 'lodash/map'import _size from 'lodash/size'import _truncate from 'lodash/truncate'-import { ChevronRightIcon } from 'lucide-react'+import { CaretRightIcon } from '@phosphor-icons/react'import React, { memo, useEffect, useRef, useState } from 'react'import { createPortal } from 'react-dom'@@ -137,7 +137,7 @@ const CustomEventsSubmenu: React.FC<CustomEventsSubmenuProps> = ({><div className='flex items-center justify-between'><span>{label}</span>- <ChevronRightIcon className='size-4 text-gray-500 dark:text-gray-400' />+ <CaretRightIcon className='size-4 text-gray-500 dark:text-gray-400' /></div></div>diff --git a/web/app/pages/Project/tabs/Traffic/CustomMetrics.tsx b/web/app/pages/Project/tabs/Traffic/CustomMetrics.tsxindex 7e636c91e..f24f48685 100644--- a/web/app/pages/Project/tabs/Traffic/CustomMetrics.tsx+++ b/web/app/pages/Project/tabs/Traffic/CustomMetrics.tsx@@ -1,4 +1,4 @@-import { ScaleIcon, XMarkIcon } from '@heroicons/react/24/outline'+import { ScalesIcon, XIcon } from '@phosphor-icons/react'import _isEmpty from 'lodash/isEmpty'import _map from 'lodash/map'import { memo, useMemo } from 'react'@@ -89,7 +89,7 @@ const CustomMetrics = ({return (<div className='mt-2 flex items-center justify-between rounded-md border border-gray-300 bg-slate-200 p-1 dark:border-slate-800/50 dark:bg-slate-800/25'><div className='flex items-center'>- <ScaleIcon className='box-content size-6 shrink-0 px-1 text-gray-700 dark:text-gray-200' />+ <ScalesIcon className='box-content size-6 shrink-0 px-1 text-gray-700 dark:text-gray-200' /><div className='flex flex-wrap'>{_map(metrics, (metric) => (<CustomMetric@@ -102,8 +102,8 @@ const CustomMetrics = ({))}</div></div>- <XMarkIcon- className='box-content size-6 shrink-0 cursor-pointer stroke-2 px-1 text-gray-800 hover:text-gray-600 dark:text-gray-200 dark:hover:text-gray-300'+ <XIcon+ className='box-content size-6 shrink-0 cursor-pointer px-1 text-gray-800 hover:text-gray-600 dark:text-gray-200 dark:hover:text-gray-300'onClick={resetMetrics}/></div>diff --git a/web/app/pages/Project/tabs/Traffic/MetricCards.tsx b/web/app/pages/Project/tabs/Traffic/MetricCards.tsxindex ba10ba6b0..f4105fd3f 100644--- a/web/app/pages/Project/tabs/Traffic/MetricCards.tsx+++ b/web/app/pages/Project/tabs/Traffic/MetricCards.tsx@@ -1,4 +1,4 @@-import { ChevronDownIcon, XMarkIcon } from '@heroicons/react/24/outline'+import { CaretDownIcon, XIcon } from '@phosphor-icons/react'import cx from 'clsx'import _isEmpty from 'lodash/isEmpty'import _isNumber from 'lodash/isNumber'@@ -168,7 +168,7 @@ export const MetricCardSelect = ({><Text size='sm' weight='bold'>{values[selected].label}{' '}- <ChevronDownIcon+ <CaretDownIconclassName={cx('inline h-4 w-4 transform transition-transform duration-200',show ? 'rotate-180' : 'rotate-0',@@ -194,7 +194,7 @@ export const MetricCardSelect = ({type='button'onClick={() => setShow(!show)}>- <XMarkIcon className='h-5 w-5 cursor-pointer rounded-md text-gray-900 dark:text-gray-50' />+ <XIcon className='h-5 w-5 cursor-pointer rounded-md text-gray-900 dark:text-gray-50' /></button></div><div className='scrollbar-thin max-h-[200px] overflow-x-hidden overflow-y-auto p-1'>diff --git a/web/app/pages/Project/tabs/Traffic/PageLinkRow.tsx b/web/app/pages/Project/tabs/Traffic/PageLinkRow.tsxindex 68296d7fc..9030b3386 100644--- a/web/app/pages/Project/tabs/Traffic/PageLinkRow.tsx+++ b/web/app/pages/Project/tabs/Traffic/PageLinkRow.tsx@@ -1,4 +1,4 @@-import { ExternalLinkIcon } from 'lucide-react'+import { ArrowSquareOutIcon } from '@phosphor-icons/react'import { useMemo } from 'react'interface PageLinkRowProps {@@ -42,10 +42,7 @@ const PageLinkRow = ({ pagePath, websiteUrl }: PageLinkRowProps) => {aria-label={`Open ${pagePath} (opens in a new tab)`}className='ml-1 shrink-0 rounded-md p-1 text-gray-800 hover:bg-gray-100 dark:text-gray-200 dark:hover:bg-slate-700'>- <ExternalLinkIcon- className='size-3.5 opacity-0 group-hover:opacity-100 [@media(hover:none)]:opacity-100'- strokeWidth={2}- />+ <ArrowSquareOutIcon className='size-3.5 opacity-0 group-hover:opacity-100 [@media(hover:none)]:opacity-100' /></a>) : null}</div>diff --git a/web/app/pages/Project/tabs/Traffic/RefRow.tsx b/web/app/pages/Project/tabs/Traffic/RefRow.tsxindex a06eafde9..c70ca2407 100644--- a/web/app/pages/Project/tabs/Traffic/RefRow.tsx+++ b/web/app/pages/Project/tabs/Traffic/RefRow.tsx@@ -1,4 +1,4 @@-import { ExternalLinkIcon, LinkIcon } from 'lucide-react'+import { ArrowSquareOutIcon, LinkIcon } from '@phosphor-icons/react'import { useMemo } from 'react'import { useTranslation } from 'react-i18next'@@ -32,7 +32,7 @@ const RefRow = ({ rowName }: { rowName: string | null }) => {if (rowName === null) {return (<div className='scrollbar-thin hover-always-overflow flex items-center'>- <LinkIcon className='float-left mr-1.5 size-5' strokeWidth={1.5} />+ <LinkIcon className='float-left mr-1.5 size-5' /><span className='italic'>{t('project.directNone')}</span></div>)@@ -61,10 +61,7 @@ const RefRow = ({ rowName }: { rowName: string | null }) => {aria-label={`${rowName} (opens in a new tab)`}className='ml-1 shrink-0 rounded-md p-1 text-gray-800 hover:bg-gray-100 dark:text-gray-200 dark:hover:bg-slate-700'>- <ExternalLinkIcon- className='size-3.5 opacity-0 group-hover:opacity-100 [@media(hover:none)]:opacity-100'- strokeWidth={2}- />+ <ArrowSquareOutIcon className='size-3.5 opacity-0 group-hover:opacity-100 [@media(hover:none)]:opacity-100' /></a>) : null}</div>diff --git a/web/app/pages/Project/tabs/Traffic/TrafficHeaderActions.tsx b/web/app/pages/Project/tabs/Traffic/TrafficHeaderActions.tsxindex b00f0bbc1..ef6871d24 100644--- a/web/app/pages/Project/tabs/Traffic/TrafficHeaderActions.tsx+++ b/web/app/pages/Project/tabs/Traffic/TrafficHeaderActions.tsx@@ -2,11 +2,11 @@ import cx from 'clsx'import _filter from 'lodash/filter'import _isEmpty from 'lodash/isEmpty'import {- BookmarkIcon,- DownloadIcon,+ BookmarkSimpleIcon,+ DownloadSimpleIcon,PencilIcon,- Trash2Icon,-} from 'lucide-react'+ TrashIcon,+} from '@phosphor-icons/react'import React, { useEffect, useRef } from 'react'import { useTranslation } from 'react-i18next'import { useSearchParams, useFetcher } from 'react-router'@@ -110,7 +110,7 @@ const TrafficHeaderActions = ({],(x) => !!x,)}- title={[<BookmarkIcon key='bookmark-icon' className='h-5 w-5' />]}+ title={[<BookmarkSimpleIcon key='bookmark-icon' className='h-5 w-5' />]}labelExtractor={(item, close) => {// @ts-expect-errorif (item.createView) {@@ -164,7 +164,7 @@ const TrafficHeaderActions = ({},)}>- <Trash2Icon className='size-3' />+ <TrashIcon className='size-3' /></button></deleteFetcher.Form></div>@@ -205,7 +205,7 @@ const TrafficHeaderActions = ({<Dropdownheader={t('project.exportData')}items={exportTypes}- title={[<DownloadIcon key='download-icon' className='h-5 w-5' />]}+ title={[<DownloadSimpleIcon key='download-icon' className='h-5 w-5' />]}labelExtractor={(item) => item.label}keyExtractor={(item) => item.label}onSelect={(item) => {diff --git a/web/app/pages/Project/tabs/Traffic/TrafficView.tsx b/web/app/pages/Project/tabs/Traffic/TrafficView.tsxindex bf2faf8d4..69e971c3d 100644--- a/web/app/pages/Project/tabs/Traffic/TrafficView.tsx+++ b/web/app/pages/Project/tabs/Traffic/TrafficView.tsx@@ -5,12 +5,7 @@ import _isEmpty from 'lodash/isEmpty'import _keys from 'lodash/keys'import _map from 'lodash/map'import _some from 'lodash/some'-import {- BanIcon,- ChartColumnBigIcon,- ChartLineIcon,- EyeIcon,-} from 'lucide-react'+import { ProhibitIcon, EyeIcon } from '@phosphor-icons/react'import React, {useState,useEffect,@@ -45,7 +40,7 @@ import {useRevenueProxy,} from '~/hooks/useAnalyticsProxy'import { useAnnotations } from '~/hooks/useAnnotations'-import { TRAFFIC_PANELS_ORDER, chartTypes, isSelfhosted } from '~/lib/constants'+import { TRAFFIC_PANELS_ORDER, isSelfhosted } from '~/lib/constants'import { CountryEntry, Entry } from '~/lib/models/Entry'import { OverallObject } from '~/lib/models/Project'import AnnotationModal from '~/modals/AnnotationModal'@@ -988,7 +983,7 @@ const TrafficViewInner = ({if (_isEmpty(panelsData.customs)) {return (<span className='flex cursor-not-allowed items-center p-2'>- <BanIcon className='mr-2 h-4 w-4' strokeWidth={1.5} />+ <ProhibitIcon className='mr-2 h-4 w-4' />{label}</span>)diff --git a/web/app/pages/UserSettings/UserSettings.tsx b/web/app/pages/UserSettings/UserSettings.tsxindex 210f005fd..069b2050b 100644--- a/web/app/pages/UserSettings/UserSettings.tsx+++ b/web/app/pages/UserSettings/UserSettings.tsx@@ -1,8 +1,3 @@-import {- EnvelopeIcon,- ExclamationTriangleIcon,- ChevronDownIcon,-} from '@heroicons/react/24/outline'import cx from 'clsx'import dayjs from 'dayjs'import utc from 'dayjs/plugin/utc'@@ -13,10 +8,19 @@ import _isEmpty from 'lodash/isEmpty'import _keys from 'lodash/keys'import _map from 'lodash/map'import _size from 'lodash/size'-import { MessageSquareTextIcon, MonitorIcon, UserRoundIcon } from 'lucide-react'+import {+ ChatTextIcon,+ MonitorIcon,+ UserIcon,+ EnvelopeIcon,+ WarningOctagonIcon,+ TranslateIcon,+ LockIcon,+ CaretDownIcon,+} from '@phosphor-icons/react'import React, { useState, useEffect, memo, useMemo, useRef } from 'react'import { useTranslation } from 'react-i18next'-import { useNavigate, useFetcher } from 'react-router'+import { useNavigate, useFetcher, useSearchParams } from 'react-router'import { toast } from 'sonner'import {@@ -25,18 +29,26 @@ import {CONFIRMATION_TIMEOUT,TimeFormat,isSelfhosted,+ whitelist,+ languages,+ languageFlag,} from '~/lib/constants'+import { changeLanguage } from '~/i18n'import { User } from '~/lib/models/User'import PaidFeature from '~/modals/PaidFeature'import { useAuth } from '~/providers/AuthProvider'import type { UserSettingsActionData } from '~/routes/user-settings'+import Alert from '~/ui/Alert'import Button from '~/ui/Button'import Checkbox from '~/ui/Checkbox'import Input from '~/ui/Input'import Modal from '~/ui/Modal'+import PasswordStrength from '~/ui/PasswordStrength'import Select from '~/ui/Select'+import { TabHeader } from '~/ui/TabHeader'import { Text } from '~/ui/Text'import Textarea from '~/ui/Textarea'+import Flag from '~/ui/Flag'import TimezonePicker from '~/ui/TimezonePicker'import { getCookie, setCookie } from '~/utils/cookie'import routes from '~/utils/routes'@@ -60,22 +72,47 @@ const timeFormatArray = _map(TimeFormat, (key) => key)const TAB_MAPPING = {ACCOUNT: 'account',+ PASSWORD_AUTH: 'password-auth',INTERFACE: 'interface',COMMUNICATIONS: 'communications',+ LANGUAGE: 'language',}-const getTabs = (t: typeof i18next.t) => {+type SettingsTab = (typeof TAB_MAPPING)[keyof typeof TAB_MAPPING]++interface TabConfig {+ id: string+ label: string+ icon: React.ElementType+ description: string+}++const getTabs = (t: typeof i18next.t): TabConfig[] => {if (isSelfhosted) {return [{id: TAB_MAPPING.ACCOUNT,label: t('profileSettings.account'),- icon: UserRoundIcon,+ icon: UserIcon,+ description: t('profileSettings.accountDesc'),+ },+ {+ id: TAB_MAPPING.PASSWORD_AUTH,+ label: t('profileSettings.passwordAuth'),+ icon: LockIcon,+ description: t('profileSettings.passwordAuthDesc'),},{id: TAB_MAPPING.INTERFACE,label: t('profileSettings.interfaceSettings'),icon: MonitorIcon,+ description: t('profileSettings.interfaceDesc'),+ },+ {+ id: TAB_MAPPING.LANGUAGE,+ label: t('profileSettings.language'),+ icon: TranslateIcon,+ description: t('profileSettings.languageDesc'),},]}@@ -84,21 +121,80 @@ const getTabs = (t: typeof i18next.t) => {{id: TAB_MAPPING.ACCOUNT,label: t('profileSettings.account'),- icon: UserRoundIcon,+ icon: UserIcon,+ description: t('profileSettings.accountDesc'),+ },+ {+ id: TAB_MAPPING.PASSWORD_AUTH,+ label: t('profileSettings.passwordAuth'),+ icon: LockIcon,+ description: t('profileSettings.passwordAuthDesc'),},{id: TAB_MAPPING.COMMUNICATIONS,label: t('profileSettings.communications'),- icon: MessageSquareTextIcon,+ icon: ChatTextIcon,+ description: t('profileSettings.communicationsDesc'),},{id: TAB_MAPPING.INTERFACE,label: t('profileSettings.interfaceSettings'),icon: MonitorIcon,+ description: t('profileSettings.interfaceDesc'),+ },+ {+ id: TAB_MAPPING.LANGUAGE,+ label: t('profileSettings.language'),+ icon: TranslateIcon,+ description: t('profileSettings.languageDesc'),},]}+const getTabIconColor = (tabId: string): string => {+ switch (tabId) {+ case TAB_MAPPING.ACCOUNT:+ return 'text-blue-500'+ case TAB_MAPPING.PASSWORD_AUTH:+ return 'text-indigo-500'+ case TAB_MAPPING.COMMUNICATIONS:+ return 'text-emerald-500'+ case TAB_MAPPING.INTERFACE:+ return 'text-purple-500'+ default:+ return 'text-amber-500'+ }+}++interface SettingsSectionProps {+ title: string+ description?: string+ children: React.ReactNode+ isLast?: boolean+}++const SettingsSection = ({+ title,+ description,+ children,+ isLast,+}: SettingsSectionProps) => (+ <div className={cx({ 'pb-6': !isLast })}>+ <Text as='h3' size='base' weight='semibold'>+ {title}+ </Text>+ {description && (+ <Text as='p' size='sm' colour='muted' className='mt-1'>+ {description}+ </Text>+ )}+ <div className='mt-4'>{children}</div>+ {!isLast && (+ <hr className='mt-6 border-gray-200 dark:border-slate-700/80' />+ )}+ </div>+)+interface Form extends Partial<User> {repeat: stringpassword: string@@ -109,17 +205,36 @@ const UserSettings = () => {const { user, logout, mergeUser } = useAuth()const navigate = useNavigate()- const { t } = useTranslation('common')+ const {+ t,+ i18n: { language },+ } = useTranslation('common')const fetcher = useFetcher<UserSettingsActionData>()- const [activeTab, setActiveTab] = useState(TAB_MAPPING.ACCOUNT)+ const [searchParams, setSearchParams] = useSearchParams()++ const tabs = getTabs(t)++ const activeTab = useMemo<SettingsTab>(() => {+ const tab = searchParams.get('tab') as SettingsTab+ const allowed = new Set(tabs.map((t) => t.id as SettingsTab))+ return allowed.has(tab) ? tab : TAB_MAPPING.ACCOUNT+ }, [searchParams, tabs])++ const setActiveTab = (tab: SettingsTab) => {+ const newSearchParams = new URLSearchParams(searchParams.toString())+ newSearchParams.set('tab', tab)+ setSearchParams(newSearchParams)+ }const [form, setForm] = useState<Form>(() => ({- email: user?.email || '',+ email: '',password: '',repeat: '',timeFormat: user?.timeFormat || TimeFormat['12-hour'],}))- const [showPasswordFields, setShowPasswordFields] = useState(false)+ const [showEmailFields, setShowEmailFields] = useState(false)+ const [emailBeenSubmitted, setEmailBeenSubmitted] = useState(false)+ const [passwordBeenSubmitted, setPasswordBeenSubmitted] = useState(false)const [timezone, setTimezone] = useState(() => user?.timezone || DEFAULT_TIMEZONE,)@@ -129,7 +244,6 @@ const UserSettings = () => {const [reportFrequency, setReportFrequency] = useState(() => user?.reportFrequency,)- const [beenSubmitted, setBeenSubmitted] = useState(false)const [showModal, setShowModal] = useState(false)const [showAPIDeleteModal, setShowAPIDeleteModal] = useState(false)const translatedFrequencies = useMemo(@@ -148,11 +262,11 @@ const UserSettings = () => {const isSubmitting = fetcher.state === 'submitting'- const tabs = getTabs(t)- const activeTabLabel = useMemo(- () => _find(tabs, (tab) => tab.id === activeTab)?.label,+ const activeTabConfig = useMemo(+ () => _find(tabs, (tab) => tab.id === activeTab),[tabs, activeTab],)+ const activeTabLabel = activeTabConfig?.labeluseEffect(() => {if (fetcher.state !== 'idle' || !fetcher.data) return@@ -214,7 +328,7 @@ const UserSettings = () => {const errors = useMemo(() => {const allErrors: Record<string, string> = {}- if (!isValidEmail(form.email)) {+ if (form.email && !isValidEmail(form.email)) {allErrors.email = t('auth.common.badEmailError')}@@ -237,20 +351,29 @@ const UserSettings = () => {const { target } = eventconst value = target.type === 'checkbox' ? target.checked : target.value+ if (target.name === 'email') {+ setEmailBeenSubmitted(false)+ }++ if (target.name === 'password' || target.name === 'repeat') {+ setPasswordBeenSubmitted(false)+ }+setForm((prevForm) => ({...prevForm,[target.name]: value,}))}- const submitProfileUpdate = (additionalData?: Record<string, unknown>) => {- setBeenSubmitted(true)-- if (!validated) return+ const submitProfileUpdate = (+ additionalData?: Record<string, unknown>,+ skipValidation = false,+ ) => {+ if (!skipValidation && !validated) returnconst formData = new FormData()formData.set('intent', 'update-profile')- if (form.email) formData.set('email', form.email)+ formData.set('email', form.email || user?.email || '')if (form.password) formData.set('password', form.password)if (form.repeat) formData.set('repeat', form.repeat)if (additionalData?.timezone)@@ -264,7 +387,6 @@ const UserSettings = () => {if (additionalData?.reportFrequency)formData.set('reportFrequency', additionalData.reportFrequency as string)- passwordChangedRef.current = !!form.passwordfetcher.submit(formData, { method: 'post' })}@@ -276,7 +398,9 @@ const UserSettings = () => {e.preventDefault()e.stopPropagation()}- setBeenSubmitted(true)++ if (form.email) setEmailBeenSubmitted(true)+ if (form.password || form.repeat) setPasswordBeenSubmitted(true)if (validated) {// User is about to change their password, let's warn him if@@ -289,6 +413,22 @@ const UserSettings = () => {}}+ const handleEmailSubmit = () => {+ setEmailBeenSubmitted(true)++ if (!form.email || errors.email) return++ submitProfileUpdate(undefined, true)+ }++ const handlePasswordSubmit = () => {+ setPasswordBeenSubmitted(true)++ if (errors.password || errors.repeat) return++ setIsPasswordChangeModalOpened(true)+ }+const handleTimezoneSave = () => {submitProfileUpdate({ timezone })}@@ -327,8 +467,6 @@ const UserSettings = () => {data: Record<string, unknown>,callback: (isSuccess: boolean) => void = () => {},) => {- setBeenSubmitted(true)-if (validated) {submitProfileUpdate(data)callback(true)@@ -377,62 +515,15 @@ const UserSettings = () => {submitProfileUpdate({ timeFormat: form.timeFormat })}- const toggleShowPasswordFields = () => {+ const toggleShowEmailFields = () => {setForm((prev) => ({...prev,- password: '',- repeat: '',+ email: '',}))- setShowPasswordFields((prev) => !prev)+ setEmailBeenSubmitted(false)+ setShowEmailFields((prev) => !prev)}- const sharedProjectsSection = (- <>- <hr className='mt-5 border-gray-200 dark:border-slate-700/80' />- <Text as='h3' size='lg' weight='bold' className='mt-2 flex items-center'>- {t('profileSettings.shared')}- </Text>- <div>- {!_isEmpty(user?.sharedProjects) ? (- <div className='mt-3 overflow-hidden rounded-lg border border-gray-200 dark:border-slate-700'>- <table className='min-w-full divide-y divide-gray-200 dark:divide-slate-700'>- <thead className='bg-gray-50 dark:bg-slate-800'>- <tr>- <th- scope='col'- className='px-4 py-3 text-left text-xs font-bold tracking-wider text-gray-900 uppercase dark:text-white'- >- {t('profileSettings.sharedTable.project')}- </th>- <th- scope='col'- className='px-4 py-3 text-left text-xs font-bold tracking-wider text-gray-900 uppercase dark:text-white'- >- {t('profileSettings.sharedTable.role')}- </th>- <th- scope='col'- className='px-4 py-3 text-left text-xs font-bold tracking-wider text-gray-900 uppercase dark:text-white'- >- {t('profileSettings.sharedTable.joinedOn')}- </th>- <th scope='col' />- </tr>- </thead>- <tbody className='divide-y divide-gray-200 bg-white dark:divide-slate-700 dark:bg-slate-900'>- {_map(user?.sharedProjects, (item) => (- <ProjectList key={item.id} item={item} />- ))}- </tbody>- </table>- </div>- ) : (- <NoSharedProjects />- )}- </div>- </>- )-return (<div className='flex min-h-min-footer flex-col bg-gray-50 dark:bg-slate-900'><form@@ -442,7 +533,6 @@ const UserSettings = () => {<Text as='h2' size='3xl' weight='bold' className='mt-2'>{t('titles.profileSettings')}</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'><Select@@ -451,7 +541,7 @@ const UserSettings = () => {labelExtractor={(item) => item.label}iconExtractor={(item) => {const Icon = item.icon- return <Icon className='h-4 w-4' strokeWidth={1.5} />+ return <Icon className='h-4 w-4' />}}onSelect={(item) => {setActiveTab(item.id)@@ -463,7 +553,7 @@ const UserSettings = () => {</div><aside className='hidden w-56 shrink-0 md:block'>- <nav className='flex flex-col space-y-1' aria-label='Sidebar'>+ <nav className='flex flex-col space-y-0.5' aria-label='Sidebar'>{_map(tabs, (tab) => {const isCurrent = tab.id === activeTabconst Icon = tab.icon@@ -485,14 +575,12 @@ const UserSettings = () => {aria-current={isCurrent ? 'page' : undefined}><Icon- className={cx('mr-2 h-5 w-5 shrink-0 transition-colors', {+ className={cx('mr-2 size-4 shrink-0 transition-colors', {'text-gray-900 dark:text-gray-50': isCurrent,- 'text-gray-500 group-hover:text-gray-600 dark:text-gray-400 dark:group-hover:text-gray-300':- !isCurrent,+ 'text-gray-600 dark:text-gray-300': !isCurrent,})}- strokeWidth={1.5}/>- <span>{tab.label}</span>+ <span className='truncate'>{tab.label}</span></button>)})}@@ -500,139 +588,210 @@ const UserSettings = () => {</aside><section className='flex-1'>- {activeTab === TAB_MAPPING.ACCOUNT ? (+ {activeTab === TAB_MAPPING.ACCOUNT && activeTabConfig ? (<>- <Input- name='email'- type='email'- label={t('auth.common.email')}- value={form.email}- placeholder='[email protected]'- onChange={handleInput}- error={beenSubmitted ? errors.email : null}+ <TabHeader+ icon={activeTabConfig.icon}+ label={activeTabConfig.label}+ description={activeTabConfig.description}+ iconColorClass={getTabIconColor(activeTabConfig.id)}/>- <span- onClick={toggleShowPasswordFields}- className='mt-2 flex max-w-max cursor-pointer items-center text-sm text-gray-900 hover:underline dark:text-gray-50'++ {/* Change email address */}+ <SettingsSection+ title={t('profileSettings.changeEmail')}+ description={t('profileSettings.changeEmailDesc')}>- {t('auth.common.changePassword')}- <ChevronDownIcon- className={cx('ml-2 size-3', {- 'rotate-180': showPasswordFields,- })}- />- </span>- {showPasswordFields ? (- <div className='mt-4 grid grid-cols-1 gap-x-4 gap-y-6 sm:grid-cols-6'>- <Input- name='password'- type='password'- label={t('auth.common.password')}- hint={t('auth.common.hint', {- amount: MIN_PASSWORD_CHARS,- })}- value={form.password}- placeholder={t('auth.common.password')}- className='sm:col-span-3'- onChange={handleInput}- error={beenSubmitted ? errors.password : null}- />- <Input- name='repeat'- type='password'- label={t('auth.common.repeat')}- value={form.repeat}- placeholder={t('auth.common.repeat')}- className='sm:col-span-3'- onChange={handleInput}- error={beenSubmitted ? errors.repeat : null}- />+ <div className='max-w-md'>+ <div className='mb-4'>+ <Text as='p' size='sm' weight='medium' colour='secondary'>+ {t('profileSettings.currentEmail')}+ </Text>+ <Text as='p' size='sm' weight='semibold' className='mt-1'>+ {user?.email}+ </Text>+ </div>+ <Text+ size='sm'+ weight='medium'+ colour='primary'+ className='mb-2 flex cursor-pointer items-center'+ onClick={toggleShowEmailFields}+ >+ {showEmailFields+ ? t('common.cancel')+ : t('profileSettings.changeEmailBtn')}+ <CaretDownIcon+ className={cx('ml-2 size-3 transition-transform', {+ 'rotate-180': showEmailFields,+ })}+ />+ </Text>+ {showEmailFields ? (+ <div className='mt-4 space-y-4'>+ <Input+ name='email'+ type='email'+ label={t('profileSettings.newEmail')}+ value={form.email}+ placeholder={t('auth.common.email')}+ onChange={handleInput}+ error={emailBeenSubmitted ? errors.email : null}+ />+ <Button onClick={handleEmailSubmit} primary large>+ {t('profileSettings.update')}+ </Button>+ </div>+ ) : null}</div>- ) : null}- <Button className='mt-4' type='submit' primary large>- {t('profileSettings.update')}- </Button>+ </SettingsSection>- <hr className='mt-5 border-gray-200 dark:border-slate-700/80' />-- <h3 className='mt-2 flex items-center text-lg font-bold text-gray-900 dark:text-gray-50'>- {t('profileSettings.apiKey')}- </h3>- {user?.apiKey ? (- <>- <p className='max-w-prose text-base text-gray-900 dark:text-gray-50'>- {t('profileSettings.apiKeyWarning')}- </p>- <div className='grid grid-cols-1 gap-x-4 gap-y-6 lg:grid-cols-2'>- <Input- label={t('profileSettings.apiKey')}- name='apiKey'+ {/* API Key */}+ <SettingsSection+ title={t('profileSettings.apiKey')}+ description={t('profileSettings.apiKeyDesc')}+ >+ {user?.apiKey ? (+ <>+ <Text as='p' size='sm' colour='warning' className='mb-3'>+ {t('profileSettings.apiKeyWarning')}+ </Text>+ <div className='max-w-md'>+ <Input+ label={t('profileSettings.apiKey')}+ name='apiKey'+ value={user.apiKey}+ disabled+ />+ </div>+ <ButtonclassName='mt-4'- value={user.apiKey}- disabled- />- </div>- </>- ) : (- <p className='max-w-prose text-base text-gray-900 dark:text-gray-50'>- {t('profileSettings.noApiKey')}- </p>- )}- {user?.apiKey ? (- <Button- className='mt-4'- onClick={() => setShowAPIDeleteModal(true)}- danger- large- >- {t('profileSettings.deleteApiKeyBtn')}- </Button>- ) : (- <Button- className='mt-4'- onClick={onApiKeyGenerate}- primary- large- >- {t('profileSettings.addApiKeyBtn')}- </Button>- )}+ onClick={() => setShowAPIDeleteModal(true)}+ danger+ large+ >+ {t('profileSettings.deleteApiKeyBtn')}+ </Button>+ </>+ ) : (+ <>+ <Text as='p' size='sm' colour='muted' className='mb-3'>+ {t('profileSettings.noApiKey')}+ </Text>+ <Button onClick={onApiKeyGenerate} primary large>+ {t('profileSettings.addApiKeyBtn')}+ </Button>+ </>+ )}+ </SettingsSection>{isSelfhosted ? (<>{/* Shared projects setting */}- {sharedProjectsSection}+ <SettingsSection+ title={t('profileSettings.shared')}+ description={t('profileSettings.sharedDesc')}+ >+ {!_isEmpty(user?.sharedProjects) ? (+ <div className='overflow-hidden rounded-lg border border-gray-200 dark:border-slate-700'>+ <table className='min-w-full divide-y divide-gray-200 dark:divide-slate-700'>+ <thead className='bg-gray-50 dark:bg-slate-800'>+ <tr>+ <th+ scope='col'+ className='px-4 py-3 text-left text-xs font-bold tracking-wider text-gray-900 uppercase dark:text-white'+ >+ {t('profileSettings.sharedTable.project')}+ </th>+ <th+ scope='col'+ className='px-4 py-3 text-left text-xs font-bold tracking-wider text-gray-900 uppercase dark:text-white'+ >+ {t('profileSettings.sharedTable.role')}+ </th>+ <th+ scope='col'+ className='px-4 py-3 text-left text-xs font-bold tracking-wider text-gray-900 uppercase dark:text-white'+ >+ {t('profileSettings.sharedTable.joinedOn')}+ </th>+ <th scope='col' />+ </tr>+ </thead>+ <tbody className='divide-y divide-gray-200 bg-white dark:divide-slate-700 dark:bg-slate-900'>+ {_map(user?.sharedProjects, (item) => (+ <ProjectList key={item.id} item={item} />+ ))}+ </tbody>+ </table>+ </div>+ ) : (+ <NoSharedProjects />+ )}+ </SettingsSection></>) : (<>- {/* 2FA setting */}- <hr className='mt-5 border-gray-200 dark:border-slate-700/80' />- <h3 className='mt-2 flex items-center text-lg font-bold text-gray-900 dark:text-gray-50'>- {t('profileSettings.2fa')}- </h3>- <TwoFA />-{/* Socialisations setup */}- <hr className='mt-5 border-gray-200 dark:border-slate-700/80' />- <h3- id='socialisations'- className='mt-2 flex items-center text-lg font-bold text-gray-900 dark:text-gray-50'+ <SettingsSection+ title={t('profileSettings.socialisations')}+ description={t('profileSettings.socialisationsDesc')}>- {t('profileSettings.socialisations')}- </h3>- <Socialisations />+ <div id='socialisations'>+ <Socialisations />+ </div>+ </SettingsSection>{/* Shared projects setting */}- {sharedProjectsSection}+ <SettingsSection+ title={t('profileSettings.shared')}+ description={t('profileSettings.sharedDesc')}+ >+ {!_isEmpty(user?.sharedProjects) ? (+ <div className='overflow-hidden rounded-lg border border-gray-200 dark:border-slate-700'>+ <table className='min-w-full divide-y divide-gray-200 dark:divide-slate-700'>+ <thead className='bg-gray-50 dark:bg-slate-800'>+ <tr>+ <th+ scope='col'+ className='px-4 py-3 text-left text-xs font-bold tracking-wider text-gray-900 uppercase dark:text-white'+ >+ {t('profileSettings.sharedTable.project')}+ </th>+ <th+ scope='col'+ className='px-4 py-3 text-left text-xs font-bold tracking-wider text-gray-900 uppercase dark:text-white'+ >+ {t('profileSettings.sharedTable.role')}+ </th>+ <th+ scope='col'+ className='px-4 py-3 text-left text-xs font-bold tracking-wider text-gray-900 uppercase dark:text-white'+ >+ {t('profileSettings.sharedTable.joinedOn')}+ </th>+ <th scope='col' />+ </tr>+ </thead>+ <tbody className='divide-y divide-gray-200 bg-white dark:divide-slate-700 dark:bg-slate-900'>+ {_map(user?.sharedProjects, (item) => (+ <ProjectList key={item.id} item={item} />+ ))}+ </tbody>+ </table>+ </div>+ ) : (+ <NoSharedProjects />+ )}+ </SettingsSection>{/* Organisations setting */}- <hr className='mt-5 border-gray-200 dark:border-slate-700/80' />- <h3 className='mt-2 flex items-center text-lg font-bold text-gray-900 dark:text-gray-50'>- {t('profileSettings.organisations')}- </h3>- <div>+ <SettingsSection+ title={t('profileSettings.organisations')}+ description={t('profileSettings.organisationsDesc')}+ >{!_isEmpty(user?.organisationMemberships) ? (- <div className='mt-3 overflow-hidden rounded-lg border border-gray-200 dark:border-slate-700'>+ <div className='overflow-hidden rounded-lg border border-gray-200 dark:border-slate-700'><table className='min-w-full divide-y divide-gray-200 dark:divide-slate-700'><thead className='bg-gray-50 dark:bg-slate-800'><tr>@@ -677,76 +836,158 @@ const UserSettings = () => {) : (<NoOrganisations />)}- </div>+ </SettingsSection>- <hr className='mt-5 border-gray-200 dark:border-slate-700/80' />{!user?.isActive ? (- <div- className='mt-4 flex max-w-max cursor-pointer pl-0 text-blue-600 underline hover:text-indigo-800 dark:hover:text-indigo-600'- onClick={onEmailConfirm}+ <SettingsSection+ title={t('profileSettings.confirmEmail')}+ description={t('profileSettings.confirmEmailDesc')}>- <EnvelopeIcon className='mt-0.5 mr-2 h-6 w-6 text-blue-500' />- {t('profileSettings.noLink')}- </div>+ <button+ type='button'+ className='flex items-center text-sm font-medium text-indigo-600 hover:text-indigo-500 dark:text-indigo-400 dark:hover:text-indigo-300'+ onClick={onEmailConfirm}+ >+ <EnvelopeIcon className='mr-2 h-5 w-5' />+ {t('profileSettings.noLink')}+ </button>+ </SettingsSection>) : null}</>)}- <div className='mt-4 flex flex-wrap justify-center gap-2 sm:justify-end'>++ {/* Danger zone */}+ <SettingsSection+ title={t('profileSettings.dangerZone')}+ description={t('profileSettings.dangerZoneDesc')}+ isLast+ ><Button- onClick={() => {- logout(true)- }}+ onClick={() => setShowModal(true)}semiSmallsemiDanger><>- {/* We need this div for the button to match the height of the button after it */}- <div className='h-5' />- {t('profileSettings.logoutAll')}+ <WarningOctagonIcon className='mr-1 h-5 w-5' />+ {t('profileSettings.delete')}</></Button>+ </SettingsSection>+ </>+ ) : null}++ {activeTab === TAB_MAPPING.PASSWORD_AUTH && activeTabConfig ? (+ <>+ <TabHeader+ icon={activeTabConfig.icon}+ label={activeTabConfig.label}+ description={activeTabConfig.description}+ iconColorClass={getTabIconColor(activeTabConfig.id)}+ />++ {/* Change password */}+ <SettingsSection+ title={t('profileSettings.changePassword')}+ description={t('profileSettings.changePasswordDesc')}+ >+ <div className='max-w-md space-y-4'>+ <Input+ name='password'+ type='password'+ label={t('profileSettings.newPassword')}+ value={form.password}+ placeholder={t('auth.common.password')}+ onChange={handleInput}+ error={passwordBeenSubmitted ? errors.password : null}+ />+ <PasswordStrength password={form.password} />+ <Input+ name='repeat'+ type='password'+ label={t('profileSettings.repeatPassword')}+ value={form.repeat}+ placeholder={t('auth.common.repeat')}+ onChange={handleInput}+ error={passwordBeenSubmitted ? errors.repeat : null}+ />+ <Button+ onClick={handlePasswordSubmit}+ disabled={!form.password || !form.repeat}+ primary+ large+ >+ {t('profileSettings.updatePassword')}+ </Button>+ </div>+ </SettingsSection>++ {/* 2FA setting */}+ {!isSelfhosted ? (+ <SettingsSection+ title={t('profileSettings.2fa')}+ description={t('profileSettings.2faSectionDesc')}+ >+ <TwoFA />+ </SettingsSection>+ ) : null}++ {/* Logout from all devices */}+ <SettingsSection+ title={t('profileSettings.logoutAllTitle')}+ description={t('profileSettings.logoutAllDesc')}+ isLast+ >+ <Alert variant='warning' className='mb-4'>+ {t('profileSettings.logoutAllWarning')}+ </Alert><Button- onClick={() => setShowModal(true)}- semiSmall+ onClick={() => {+ logout(true)+ }}semiDanger+ large>- <>- <ExclamationTriangleIcon className='mr-1 h-5 w-5' />- {t('profileSettings.delete')}- </>+ {t('profileSettings.logoutAll')}</Button>- </div>+ </SettingsSection></>) : null}- {activeTab === TAB_MAPPING.INTERFACE ? (+ {activeTab === TAB_MAPPING.INTERFACE && activeTabConfig ? (<>- <h3 className='flex items-center text-lg font-bold text-gray-900 dark:text-gray-50'>- {t('profileSettings.timezone')}- </h3>- <div className='mt-4 grid grid-cols-1 gap-x-4 gap-y-6 lg:grid-cols-2'>- <div>+ <TabHeader+ icon={activeTabConfig.icon}+ label={activeTabConfig.label}+ description={activeTabConfig.description}+ iconColorClass={getTabIconColor(activeTabConfig.id)}+ />++ {/* Timezone preference */}+ <SettingsSection+ title={t('profileSettings.timezone')}+ description={t('profileSettings.timezoneDesc')}+ >+ <div className='max-w-md'><TimezonePicker value={timezone} onChange={setTimezone} />+ <Button+ className='mt-4'+ onClick={handleTimezoneSave}+ primary+ large+ >+ {t('common.save')}+ </Button></div>- </div>- <Button- className='mt-4'- onClick={handleTimezoneSave}- primary- large+ </SettingsSection>++ {/* Time format selector */}+ <SettingsSection+ title={t('profileSettings.timeFormat')}+ description={t('profileSettings.selectTimeFormat')}>- {t('common.save')}- </Button>- {/* Timeformat selector (12 / 24 hour format) */}- <hr className='mt-5 border-gray-200 dark:border-slate-700/80' />- <h3 className='mt-2 text-lg font-bold text-gray-900 dark:text-gray-50'>- {t('profileSettings.timeFormat')}- </h3>- <div className='mt-4 grid grid-cols-1 gap-x-4 gap-y-6 lg:grid-cols-2'>- <div>+ <div className='max-w-md'><Selecttitle={t(`profileSettings.${form.timeFormat}`)}- label={t('profileSettings.selectTimeFormat')}className='w-full'items={translatedTimeFormat}onSelect={(f) =>@@ -771,48 +1012,56 @@ const UserSettings = () => {]}/>+ <Button+ className='mt-4'+ onClick={setAsyncTimeFormat}+ primary+ large+ >+ {t('common.save')}+ </Button></div>- </div>- <Button- className='mt-4'- onClick={setAsyncTimeFormat}- primary- large- >- {t('common.save')}- </Button>+ </SettingsSection>{/* UI Settings */}- <hr className='mt-5 border-gray-200 dark:border-slate-700/80' />- <h3 className='mt-2 text-lg font-bold text-gray-900 dark:text-gray-50'>- {t('profileSettings.uiSettings')}- </h3>- <Checkbox- checked={user?.showLiveVisitorsInTitle}- onChange={handleShowLiveVisitorsSave}- disabled={- fetcher.formData?.get('intent') === 'toggle-live-visitors'- }- name='active'- classes={{- label: 'mt-4',- }}- label={t('profileSettings.showVisitorsInTitle')}- />+ <SettingsSection+ title={t('profileSettings.uiSettings')}+ description={t('profileSettings.uiSettingsDesc')}+ isLast+ >+ <Checkbox+ checked={user?.showLiveVisitorsInTitle}+ onChange={handleShowLiveVisitorsSave}+ disabled={+ fetcher.formData?.get('intent') === 'toggle-live-visitors'+ }+ name='active'+ label={t('profileSettings.showVisitorsInTitle')}+ />+ </SettingsSection></>) : null}- {activeTab === TAB_MAPPING.COMMUNICATIONS && !isSelfhosted ? (+ {activeTab === TAB_MAPPING.COMMUNICATIONS &&+ !isSelfhosted &&+ activeTabConfig ? (<>- {/* Email reports frequency selector (e.g. monthly, weekly, etc.) */}- <h3 className='text-lg font-bold text-gray-900 dark:text-gray-50'>- {t('profileSettings.email')}- </h3>- <div className='mt-4 grid grid-cols-1 gap-x-4 gap-y-6 lg:grid-cols-2'>- <div>+ <TabHeader+ icon={activeTabConfig.icon}+ label={activeTabConfig.label}+ description={activeTabConfig.description}+ iconColorClass={getTabIconColor(activeTabConfig.id)}+ />++ {/* Email reports frequency */}+ <SettingsSection+ title={t('profileSettings.email')}+ description={t('profileSettings.frequency')}+ >+ <div className='max-w-md'><Selecttitle={t(`profileSettings.${reportFrequency}`)}- label={t('profileSettings.frequency')}+ label={t('profileSettings.email')}className='w-full'items={translatedFrequencies}onSelect={(f) =>@@ -835,43 +1084,102 @@ const UserSettings = () => {]}/>+ <Button+ className='mt-4'+ onClick={handleReportSave}+ primary+ large+ >+ {t('common.save')}+ </Button></div>- </div>- <Button- className='mt-4'- onClick={handleReportSave}- primary- large- >- {t('common.save')}- </Button>+ </SettingsSection>- <hr className='mt-5 border-gray-200 dark:border-slate-700/80' />{/* Integrations setup */}- <h3- id='integrations'- className='mt-2 flex items-center text-lg font-bold text-gray-900 dark:text-gray-50'+ <SettingsSection+ title={t('profileSettings.integrations')}+ description={t('profileSettings.integrationsDesc')}+ isLast={!user?.isTelegramChatIdConfirmed}>- {t('profileSettings.integrations')}- </h3>- <Integrations handleIntegrationSave={handleIntegrationSave} />+ <div id='integrations'>+ <Integrations+ handleIntegrationSave={handleIntegrationSave}+ />+ </div>+ </SettingsSection>+{user?.isTelegramChatIdConfirmed ? (- <Checkbox- checked={user?.receiveLoginNotifications}- onChange={handleReceiveLoginNotifications}- disabled={- fetcher.formData?.get('intent') ===- 'toggle-login-notifications'- }- name='receiveLoginNotifications'- classes={{- label: 'mt-4',- }}- label={t('profileSettings.receiveLoginNotifications')}- />+ <SettingsSection+ title={t('profileSettings.notifications')}+ description={t('profileSettings.notificationsDesc')}+ isLast+ >+ <Checkbox+ checked={user?.receiveLoginNotifications}+ onChange={handleReceiveLoginNotifications}+ disabled={+ fetcher.formData?.get('intent') ===+ 'toggle-login-notifications'+ }+ name='receiveLoginNotifications'+ label={t('profileSettings.receiveLoginNotifications')}+ />+ </SettingsSection>) : null}</>) : null}++ {activeTab === TAB_MAPPING.LANGUAGE && activeTabConfig ? (+ <>+ <TabHeader+ icon={activeTabConfig.icon}+ label={activeTabConfig.label}+ description={activeTabConfig.description}+ iconColorClass={getTabIconColor(activeTabConfig.id)}+ />++ <SettingsSection+ title={t('profileSettings.changeLanguage')}+ isLast+ >+ <div className='grid grid-cols-2 gap-3 sm:grid-cols-3 lg:grid-cols-4'>+ {_map(whitelist, (lng) => {+ const isSelected = language === lng++ return (+ <button+ key={lng}+ type='button'+ onClick={() => changeLanguage(lng)}+ className={cx(+ 'flex flex-col items-center justify-center rounded-lg px-4 py-6 ring-1 transition-all ring-inset',+ isSelected+ ? 'bg-gray-100 ring-gray-300 dark:bg-slate-800 dark:ring-slate-600'+ : 'ring-gray-200 hover:bg-gray-50 hover:ring-gray-300 dark:ring-slate-700 dark:hover:bg-slate-800/50 dark:hover:ring-slate-600',+ )}+ >+ <Flag+ country={languageFlag[lng]}+ size={32}+ alt={languages[lng]}+ className='mb-3'+ />+ <Text+ as='span'+ size='sm'+ weight={isSelected ? 'semibold' : 'medium'}+ colour='inherit'+ className='text-gray-900 dark:text-gray-100'+ >+ {languages[lng]}+ </Text>+ </button>+ )+ })}+ </div>+ </SettingsSection>+ </>+ ) : null}</section></div></form>@@ -932,7 +1240,8 @@ const UserSettings = () => {}}onSubmit={() => {setIsPasswordChangeModalOpened(false)- handleSubmit(null, true)+ passwordChangedRef.current = true+ submitProfileUpdate(undefined, true)}}closeText={t('common.cancel')}submitText={t('common.continue')}diff --git a/web/app/pages/UserSettings/components/Integrations.tsx b/web/app/pages/UserSettings/components/Integrations.tsxindex 439337f1e..ad0180176 100644--- a/web/app/pages/UserSettings/components/Integrations.tsx+++ b/web/app/pages/UserSettings/components/Integrations.tsx@@ -1,8 +1,4 @@-import {- CheckCircleIcon,- XCircleIcon,- ClockIcon,-} from '@heroicons/react/24/solid'+import { CheckCircleIcon, XCircleIcon, ClockIcon } from '@phosphor-icons/react'import type i18next from 'i18next'import _map from 'lodash/map'import React, { useState, memo, useEffect } from 'react'diff --git a/web/app/pages/UserSettings/components/NoOrganisations.tsx b/web/app/pages/UserSettings/components/NoOrganisations.tsxindex 1c0da69e2..52b98fdee 100644--- a/web/app/pages/UserSettings/components/NoOrganisations.tsx+++ b/web/app/pages/UserSettings/components/NoOrganisations.tsx@@ -1,5 +1,5 @@import { useTranslation } from 'react-i18next'-import { BuildingOfficeIcon } from '@heroicons/react/24/outline'+import { BuildingOfficeIcon } from '@phosphor-icons/react'import { Text } from '~/ui/Text'diff --git a/web/app/pages/UserSettings/components/NoSharedProjects.tsx b/web/app/pages/UserSettings/components/NoSharedProjects.tsxindex 23b42e399..64c117e20 100644--- a/web/app/pages/UserSettings/components/NoSharedProjects.tsx+++ b/web/app/pages/UserSettings/components/NoSharedProjects.tsx@@ -1,5 +1,5 @@import { useTranslation } from 'react-i18next'-import { ShareIcon } from '@heroicons/react/24/outline'+import { ShareIcon } from '@phosphor-icons/react'import { Text } from '~/ui/Text'diff --git a/web/app/pages/UserSettings/components/Organisations.tsx b/web/app/pages/UserSettings/components/Organisations.tsxindex b6b5a8543..9a1f09e6f 100644--- a/web/app/pages/UserSettings/components/Organisations.tsx+++ b/web/app/pages/UserSettings/components/Organisations.tsx@@ -1,4 +1,3 @@-import cx from 'clsx'import dayjs from 'dayjs'import _filter from 'lodash/filter'import _map from 'lodash/map'@@ -92,12 +91,8 @@ const Organisations = ({ membership }: OrganisationsProps) => {? dayjs(created).locale(language).format('MMMM D, YYYY'): dayjs(created).locale(language).format('D MMMM, YYYY')}</td>- <td- className={cx('px-4 py-3 text-right text-sm whitespace-nowrap', {- hidden: role === 'owner',- })}- >- {confirmed ? (+ <td className='px-4 py-3 text-right text-sm whitespace-nowrap'>+ {role === 'owner' ? null : confirmed ? (<Button onClick={() => setShowDeleteModal(true)} danger small>{t('common.quit')}</Button>diff --git a/web/app/pages/UserSettings/components/Socialisations.tsx b/web/app/pages/UserSettings/components/Socialisations.tsxindex 43c0e6a87..08234c3b0 100644--- a/web/app/pages/UserSettings/components/Socialisations.tsx+++ b/web/app/pages/UserSettings/components/Socialisations.tsx@@ -1,4 +1,4 @@-import { CheckCircleIcon, XCircleIcon } from '@heroicons/react/24/solid'+import { CheckCircleIcon, XCircleIcon } from '@phosphor-icons/react'import _map from 'lodash/map'import { useEffect, useState } from 'react'import { useTranslation } from 'react-i18next'@@ -172,115 +172,110 @@ const Socialisations = () => {}return (- <>- <p className='max-w-prose text-base text-gray-900 dark:text-gray-50'>- {t('profileSettings.socialisationsDesc')}- </p>- <div className='mt-2 overflow-hidden rounded-lg border border-gray-200 bg-white dark:border-slate-700 dark:bg-slate-900'>- <table className='min-w-full divide-y divide-gray-200 dark:divide-slate-700'>- <thead className='bg-gray-50 dark:bg-slate-800'>- <tr>- <th- scope='col'- className='px-4 py-3 text-left text-xs font-bold tracking-wider text-gray-900 uppercase dark:text-white'- >- {t('common.name')}- </th>- <th- scope='col'- className='px-4 py-3 text-left text-xs font-bold tracking-wider text-gray-900 uppercase dark:text-white'- >- {t('common.status')}- </th>- <th scope='col' className='px-4 py-3' />- </tr>- </thead>- <tbody className='divide-y divide-gray-200 bg-white dark:divide-slate-700 dark:bg-slate-900'>- {_map(AVAILABLE_SSO_PROVIDERS, ({ name, key, icons }) => {- const [connected, unlinkable] = getStatusByUser(user, key)- const { Light, Dark } = icons- const status = connected ? 'connected' : 'notConnected'+ <div className='mt-2 overflow-hidden rounded-lg border border-gray-200 bg-white dark:border-slate-700 dark:bg-slate-900'>+ <table className='min-w-full divide-y divide-gray-200 dark:divide-slate-700'>+ <thead className='bg-gray-50 dark:bg-slate-800'>+ <tr>+ <th+ scope='col'+ className='px-4 py-3 text-left text-xs font-bold tracking-wider text-gray-900 uppercase dark:text-white'+ >+ {t('common.name')}+ </th>+ <th+ scope='col'+ className='px-4 py-3 text-left text-xs font-bold tracking-wider text-gray-900 uppercase dark:text-white'+ >+ {t('common.status')}+ </th>+ <th scope='col' className='px-4 py-3' />+ </tr>+ </thead>+ <tbody className='divide-y divide-gray-200 bg-white dark:divide-slate-700 dark:bg-slate-900'>+ {_map(AVAILABLE_SSO_PROVIDERS, ({ name, key, icons }) => {+ const [connected, unlinkable] = getStatusByUser(user, key)+ const { Light, Dark } = icons+ const status = connected ? 'connected' : 'notConnected'- return (- <tr- key={key}- className='hover:bg-gray-50 dark:hover:bg-slate-800/50'- >- <td className='px-4 py-3 text-sm text-gray-900 dark:text-gray-100'>- <div className='flex items-center gap-3'>- <div className='hidden shrink-0 sm:block'>- {theme === 'dark' ? (- <Light className='h-9 w-9 rounded-md' />- ) : (- <Dark className='h-9 w-9 rounded-md' />- )}- </div>- <span className='font-medium'>{name}</span>- </div>- </td>- <td className='px-4 py-3 text-sm text-gray-700 dark:text-gray-300'>- <div className='flex items-center'>- {status === 'notConnected' ? (- <XCircleIcon- className='mr-1.5 h-5 w-5 shrink-0 text-red-400'- aria-hidden='true'- />- ) : null}- {status === 'connected' ? (- <CheckCircleIcon- className='mr-1.5 h-5 w-5 shrink-0 text-green-400'- aria-hidden='true'- />- ) : null}- {t(`common.${status}`)}+ return (+ <tr+ key={key}+ className='hover:bg-gray-50 dark:hover:bg-slate-800/50'+ >+ <td className='px-4 py-3 text-sm text-gray-900 dark:text-gray-100'>+ <div className='flex items-center gap-3'>+ <div className='hidden shrink-0 sm:block'>+ {theme === 'dark' ? (+ <Light className='h-9 w-9 rounded-md' />+ ) : (+ <Dark className='h-9 w-9 rounded-md' />+ )}</div>- </td>- <td className='px-4 py-3 text-right text-sm whitespace-nowrap'>- <div className='flex items-center justify-end gap-2'>- {connected && !unlinkable ? (- <Button- onClick={() =>- toast.error(- t('profileSettings.cantUnlinkSocialisation'),- )- }- small- danger- >- {t('common.unlink')}- </Button>- ) : null}+ <span className='font-medium'>{name}</span>+ </div>+ </td>+ <td className='px-4 py-3 text-sm text-gray-700 dark:text-gray-300'>+ <div className='flex items-center'>+ {status === 'notConnected' ? (+ <XCircleIcon+ className='mr-1.5 h-5 w-5 shrink-0 text-red-400'+ aria-hidden='true'+ />+ ) : null}+ {status === 'connected' ? (+ <CheckCircleIcon+ className='mr-1.5 h-5 w-5 shrink-0 text-green-400'+ aria-hidden='true'+ />+ ) : null}+ {t(`common.${status}`)}+ </div>+ </td>+ <td className='px-4 py-3 text-right text-sm whitespace-nowrap'>+ <div className='flex items-center justify-end gap-2'>+ {connected && !unlinkable ? (+ <Button+ onClick={() =>+ toast.error(+ t('profileSettings.cantUnlinkSocialisation'),+ )+ }+ small+ danger+ >+ {t('common.unlink')}+ </Button>+ ) : null}- {connected && unlinkable ? (- <Button- onClick={() => onUnlinkSSO(key)}- loading={isUnlinking}- small- danger- >- {t('common.unlink')}- </Button>- ) : null}+ {connected && unlinkable ? (+ <Button+ onClick={() => onUnlinkSSO(key)}+ loading={isUnlinking}+ small+ danger+ >+ {t('common.unlink')}+ </Button>+ ) : null}- {!connected ? (- <Button- onClick={() => linkSSO(key)}- loading={isLoading}- small- primary- >- {t('common.link')}- </Button>- ) : null}- </div>- </td>- </tr>- )- })}- </tbody>- </table>- </div>- </>+ {!connected ? (+ <Button+ onClick={() => linkSSO(key)}+ loading={isLoading}+ small+ primary+ >+ {t('common.link')}+ </Button>+ ) : null}+ </div>+ </td>+ </tr>+ )+ })}+ </tbody>+ </table>+ </div>)}diff --git a/web/app/pages/UserSettings/components/TwoFA.tsx b/web/app/pages/UserSettings/components/TwoFA.tsxindex e28e308f2..42bcfa79e 100644--- a/web/app/pages/UserSettings/components/TwoFA.tsx+++ b/web/app/pages/UserSettings/components/TwoFA.tsx@@ -1,13 +1,13 @@-import cx from 'clsx'-import _isNull from 'lodash/isNull'import React, { useState, useEffect } from 'react'import { useTranslation } from 'react-i18next'import QRCode from 'react-qr-code'import { useFetcher } from 'react-router'import { toast } from 'sonner'+import { LockIcon } from '@phosphor-icons/react'import { useAuth } from '~/providers/AuthProvider'import type { UserSettingsActionData } from '~/routes/user-settings'+import Alert from '~/ui/Alert'import Button from '~/ui/Button'import Input from '~/ui/Input'@@ -30,7 +30,6 @@ const TwoFA = () => {const isLoading =fetcher.state === 'submitting' || fetcher.state === 'loading'- // Handle fetcher responsesuseEffect(() => {if (fetcher.data?.success) {const { intent, twoFAData } = fetcher.data@@ -121,11 +120,14 @@ const TwoFA = () => {if (twoFARecovery) {return (<div className='max-w-prose'>- <p className='text-base text-gray-900 dark:text-gray-50'>+ <Alert variant='warning' className='mb-4'>+ {t('profileSettings.2faRecoveryWarning')}+ </Alert>+ <p className='mb-4 text-base text-gray-900 dark:text-gray-50'>{t('profileSettings.2faRecoveryNote')}</p>- <Input className='mt-4' value={twoFARecovery} />- <Button onClick={recoverySaved} primary large>+ <Input className='mt-4' value={twoFARecovery} disabled />+ <Button className='mt-4' onClick={recoverySaved} primary large>{t('profileSettings.2faRecoverySaved')}</Button></div>@@ -139,7 +141,7 @@ const TwoFA = () => {<p className='max-w-prose text-base text-gray-900 dark:text-gray-50'>{t('profileSettings.2faDisableHint')}</p>- <div className='mt-4 flex items-center'>+ <div className='mt-4 flex items-end gap-2'><Inputlabel={t('profileSettings.enter2faToDisable')}value={twoFACode}@@ -151,10 +153,7 @@ const TwoFA = () => {disabled={isLoading}/><Button- className={cx('ml-2', {- 'mt-4': _isNull(twoFACodeError),- 'mb-1': !_isNull(twoFACodeError),- })}+ className={twoFACodeError ? 'mb-5' : ''}onClick={_disable2FA}loading={isLoading}danger@@ -169,6 +168,9 @@ const TwoFA = () => {return (<>+ <Alert variant='success' className='mb-4'>+ {t('profileSettings.2faEnabledSuccess')}+ </Alert><p className='max-w-prose text-base text-gray-900 dark:text-gray-50'>{t('profileSettings.2faEnabled')}</p>@@ -193,12 +195,16 @@ const TwoFA = () => {<div className='mt-4 w-max bg-white p-4'><QRCode value={twoFAConfigData?.otpauthUrl || ''} /></div>- <p className='mt-2 text-base whitespace-pre-line text-gray-900 dark:text-gray-50'>- {t('profileSettings.2faQRAlt', {- key: twoFAConfigData?.secret || '',- })}- </p>- <div className='mt-4 flex items-center'>++ <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>+ <code className='mt-2 block rounded bg-sky-100 p-2 font-mono text-sm dark:bg-sky-900/50'>+ {twoFAConfigData?.secret || ''}+ </code>+ </Alert>++ <div className='mt-4 flex items-end gap-2'><Inputlabel={t('profileSettings.enter2faToEnable')}value={twoFACode}@@ -210,10 +216,7 @@ const TwoFA = () => {disabled={isLoading}/><Button- className={cx('ml-2', {- 'xs:mt-4 mt-8': _isNull(twoFACodeError),- 'mb-1': !_isNull(twoFACodeError),- })}+ className={twoFACodeError ? 'mb-5' : ''}onClick={_enable2FA}loading={isLoading}primary@@ -228,16 +231,15 @@ const TwoFA = () => {return (<>- <p className='max-w-prose text-base text-gray-900 dark:text-gray-50'>- {t('profileSettings.2faEnable')}- </p>- <Button- className='mt-4'- onClick={_generate2FA}- loading={isLoading}- primary- large+ <Alert+ variant='tip'+ title={t('profileSettings.securityRecommendation')}+ className='mb-4'>+ {t('profileSettings.2faSecurityRecommendation')}+ </Alert>+ <Button onClick={_generate2FA} loading={isLoading} primary large>+ <LockIcon className='mr-2 size-4' weight='duotone' />{t('profileSettings.2faEnableBtn')}</Button></>diff --git a/web/app/root.tsx b/web/app/root.tsxindex 4405e7a9e..566872657 100644--- a/web/app/root.tsx+++ b/web/app/root.tsx@@ -1,8 +1,8 @@import {- ExclamationTriangleIcon,- ChevronDownIcon,- ChevronUpIcon,-} from '@heroicons/react/24/outline'+ WarningOctagonIcon,+ CaretDownIcon,+ CaretUpIcon,+} from '@phosphor-icons/react'import BillboardCss from 'billboard.js/dist/billboard.min.css?url'import cx from 'clsx'import _replace from 'lodash/replace'@@ -139,7 +139,7 @@ export function ErrorBoundary() {><div className='mx-auto flex w-full max-w-7xl flex-grow flex-col justify-center px-4 sm:px-6 lg:px-8'><div className='flex shrink-0 justify-center'>- <ExclamationTriangleIcon className='h-24 w-auto text-yellow-400 dark:text-yellow-600' />+ <WarningOctagonIcon className='h-24 w-auto text-yellow-400 dark:text-yellow-600' /></div><div className='py-8'><div className='text-center'>@@ -170,12 +170,12 @@ export function ErrorBoundary() {{crashStackShown ? (<>Hide crash stack- <ChevronUpIcon className='ml-2 h-4 w-4' />+ <CaretUpIcon className='ml-2 h-4 w-4' /></>) : (<>Show crash stack- <ChevronDownIcon className='ml-2 h-4 w-4' />+ <CaretDownIcon className='ml-2 h-4 w-4' /></>)}</span>diff --git a/web/app/routes/_index.tsx b/web/app/routes/_index.tsxindex 28eabbcc4..0ab9ddee1 100644--- a/web/app/routes/_index.tsx+++ b/web/app/routes/_index.tsx@@ -1,27 +1,27 @@-import { ArrowRightIcon } from '@heroicons/react/20/solid'-import { StarIcon } from '@heroicons/react/24/solid'-import { SiGithub } from '@icons-pack/react-simple-icons'import { motion, AnimatePresence } from 'framer-motion'import _map from 'lodash/map'import {CheckIcon,CookieIcon,- ServerIcon,+ HardDrivesIcon,DatabaseIcon,FileTextIcon,- MousePointerClickIcon,+ CursorClickIcon,GlobeIcon,GaugeIcon,- BellRingIcon,- BugIcon,- ChevronUpIcon,- ChevronDownIcon,+ GithubLogoIcon,+ BellRingingIcon,+ WarningIcon,+ CaretUpIcon,+ CaretDownIcon,ToggleRightIcon,- FlaskConicalIcon,- TrendingUpIcon,+ FlaskIcon,+ TrendUpIcon,TargetIcon,- DollarSignIcon,-} from 'lucide-react'+ CurrencyDollarIcon,+ ArrowRightIcon,+ StarIcon,+} from '@phosphor-icons/react'import React, { useEffect, useState } from 'react'import { useTranslation, Trans } from 'react-i18next'import type { LoaderFunctionArgs, MetaFunction } from 'react-router'@@ -268,11 +268,11 @@ const Testimonials = ({</div><div className='mt-1 flex flex-col items-center justify-center gap-1 md:items-start'><div className='relative inline-flex'>- <StarIcon className='size-5 text-yellow-500' />- <StarIcon className='size-5 text-yellow-500' />- <StarIcon className='size-5 text-yellow-500' />- <StarIcon className='size-5 text-yellow-500' />- <StarIcon className='size-5 text-yellow-500' />+ <StarIcon className='size-5 text-yellow-500' weight='fill' />+ <StarIcon className='size-5 text-yellow-500' weight='fill' />+ <StarIcon className='size-5 text-yellow-500' weight='fill' />+ <StarIcon className='size-5 text-yellow-500' weight='fill' />+ <StarIcon className='size-5 text-yellow-500' weight='fill' /></div><div className='text-base text-gray-900/70 dark:text-gray-200'><Trans@@ -403,7 +403,7 @@ const Hero = () => {<span>{t('main.heroBenefits.cookieless')}</span></div><div className='flex items-center gap-3 text-sm'>- <SiGithub className='size-5' />+ <GithubLogoIcon className='size-5' /><span>{t('main.heroBenefits.openSource')}</span></div><div className='flex items-center gap-3 text-sm'>@@ -411,7 +411,7 @@ const Hero = () => {<span>{t('main.heroBenefits.dataOwnership')}</span></div><div className='flex items-center gap-3 text-sm'>- <ServerIcon className='size-5' />+ <HardDrivesIcon className='size-5' /><span>{t('main.heroBenefits.selfHostable')}</span></div></div>@@ -446,7 +446,7 @@ const FeatureCard = ({}) => (<divclassName={cn(- 'flex h-full flex-col overflow-hidden bg-white ring-1 ring-gray-200 dark:ring-slate-800/60 dark:bg-slate-800/25 dark:ring-white/10',+ 'flex h-full flex-col overflow-hidden bg-white ring-1 ring-gray-200 dark:bg-slate-800/25 dark:ring-slate-800/60 dark:ring-white/10',size === 'large' ? 'rounded-2xl' : 'rounded-xl',)}>@@ -775,11 +775,11 @@ const CustomEventsPreview = () => {)}>{ev.name === 'pageview' ? (- <FileTextIcon className='size-4 text-indigo-600 dark:text-indigo-400' />+ <FileTextIcon className='size-4 text-indigo-600 dark:text-indigo-500' />) : ev.name === 'goal_reached' ? (- <TargetIcon className='size-4 text-emerald-600 dark:text-emerald-400' />+ <TargetIcon className='size-4 text-emerald-600 dark:text-emerald-500' />) : (- <MousePointerClickIcon className='size-4 text-indigo-600 dark:text-indigo-400' />+ <CursorClickIcon className='size-4 text-indigo-600 dark:text-indigo-500' />)}</span><div>@@ -927,12 +927,12 @@ const PerformancePreview = () => {>{isUp ? (<>- <ChevronUpIcon className='h-4 w-4 shrink-0' />+ <CaretUpIcon className='h-4 w-4 shrink-0' />{`${pct}%`}</>) : (<>- <ChevronDownIcon className='h-4 w-4 shrink-0' />+ <CaretDownIcon className='h-4 w-4 shrink-0' />{`${pct}%`}</>)}@@ -977,7 +977,6 @@ const PerformancePreview = () => {d={toPath(s.values)}fill='none'stroke={s.color}- strokeWidth={1.5}initial={{ pathLength: 0 }}animate={{ pathLength: 1 }}transition={{ duration: 1.1 }}@@ -1216,7 +1215,7 @@ const AlertsPreview = () => {return (<div className='rounded-2xl bg-white p-3 ring-1 ring-black/5 dark:bg-slate-900 dark:ring-white/10'><div className='mb-1 flex items-center gap-2 text-slate-900 dark:text-white'>- <BugIcon className='size-4 text-rose-600 dark:text-rose-400' />+ <WarningIcon className='size-4 text-rose-600 dark:text-rose-400' /><span className='text-sm'>Error alert <span className='font-semibold'>Unique error</span>{' '}triggered!@@ -1243,7 +1242,7 @@ const AlertsPreview = () => {return (<div className='rounded-2xl bg-white p-3 ring-1 ring-black/5 dark:bg-slate-900 dark:ring-white/10'><div className='mb-1 flex items-center gap-2 text-slate-900 dark:text-white'>- <BellRingIcon className='size-4 text-amber-600 dark:text-amber-400' />+ <BellRingingIcon className='size-4 text-amber-600 dark:text-amber-400' /><span className='text-sm'>Alert <span className='font-semibold'>Online >= 10</span> gottriggered!@@ -1263,7 +1262,7 @@ const AlertsPreview = () => {return (<div className='rounded-2xl bg-white p-3 ring-1 ring-black/5 dark:bg-slate-900 dark:ring-white/10'><div className='mb-1 flex items-center gap-2 text-slate-900 dark:text-white'>- <BellRingIcon className='size-4 text-amber-600 dark:text-amber-400' />+ <BellRingingIcon className='size-4 text-amber-600 dark:text-amber-400' /><span className='text-sm'>Alert <span className='font-semibold'>No traffic</span> gottriggered!@@ -1332,7 +1331,7 @@ const RevenuePreview = () => {<div className='mb-4 flex items-center justify-between rounded-xl bg-white p-4 ring-1 ring-black/5 dark:bg-slate-900 dark:ring-white/10'><div><div className='flex items-center gap-1.5 text-[10px] font-semibold tracking-wider text-slate-500 uppercase dark:text-gray-400'>- <DollarSignIcon className='size-3' />+ <CurrencyDollarIcon className='size-3' />Total Revenue</div><motion.div@@ -1345,7 +1344,7 @@ const RevenuePreview = () => {</motion.div></div><div className='flex items-center gap-1 rounded-full bg-emerald-100 px-2.5 py-1 text-xs font-medium text-emerald-700 dark:bg-emerald-900/40 dark:text-emerald-400'>- <TrendingUpIcon className='size-3.5' />+ <TrendUpIcon className='size-3.5' />+14.2%</div></div>@@ -1518,7 +1517,7 @@ const ExperimentsPreview = () => {<div className='h-full w-full bg-gradient-to-b from-white to-slate-50 p-4 dark:from-slate-800 dark:to-slate-900'><div className='mb-3 flex items-center justify-between'><div className='flex items-center gap-2'>- <FlaskConicalIcon className='size-4 text-indigo-600 dark:text-indigo-400' />+ <FlaskIcon className='size-4 text-indigo-600 dark:text-indigo-400' /><span className='text-sm font-medium text-slate-900 dark:text-white'>Checkout Flow Test</span>@@ -1570,7 +1569,7 @@ const ExperimentsPreview = () => {{v.name}</span>{i === winnerIdx ? (- <TrendingUpIcon className='size-3 text-emerald-600 dark:text-emerald-400' />+ <TrendUpIcon className='size-3 text-emerald-600 dark:text-emerald-400' />) : null}</div><div className='mt-1 text-slate-600 dark:text-gray-300'>@@ -1726,13 +1725,11 @@ const FeaturesShowcase = () => {<FileTextIconclassName='h-5 w-5 text-white'aria-hidden='true'- strokeWidth={1.5}/>) : (- <MousePointerClickIcon+ <CursorClickIconclassName='h-5 w-5 text-white'aria-hidden='true'- strokeWidth={1.5}/>)}</span>@@ -1769,7 +1766,7 @@ const FeaturesShowcase = () => {className='flex items-center gap-2 text-sm text-gray-900 dark:text-gray-50'key={feature}>- <CheckIcon className='h-4 w-4' strokeWidth={1.5} />+ <CheckIcon className='h-4 w-4' /><span>{feature}</span></li>),diff --git a/web/app/routes/blog._index.tsx b/web/app/routes/blog._index.tsxindex dd6eddf8c..0617810cc 100644--- a/web/app/routes/blog._index.tsx+++ b/web/app/routes/blog._index.tsx@@ -1,7 +1,7 @@import _filter from 'lodash/filter'import _isEmpty from 'lodash/isEmpty'import _map from 'lodash/map'-import { ChevronRightIcon } from 'lucide-react'+import { CaretRightIcon } from '@phosphor-icons/react'import { useTranslation } from 'react-i18next'import type { LoaderFunctionArgs, MetaFunction } from 'react-router'import { redirect, Link, useLoaderData } from 'react-router'@@ -98,7 +98,7 @@ export default function Posts() {to={post.slug}><span className='relative'>Read more</span>- <ChevronRightIcon className='relative mt-px ml-0.5 size-4 overflow-visible' />+ <CaretRightIcon className='relative mt-px ml-0.5 size-4 overflow-visible' /></Link></article>)diff --git a/web/app/routes/google-analytics-alternative.tsx b/web/app/routes/google-analytics-alternative.tsxindex d0004cf3e..b2ae3cb2f 100644--- a/web/app/routes/google-analytics-alternative.tsx+++ b/web/app/routes/google-analytics-alternative.tsx@@ -1,7 +1,3 @@-import { ArrowRightIcon } from '@heroicons/react/20/solid'-import { StarIcon } from '@heroicons/react/24/solid'-import { XMarkIcon } from '@heroicons/react/24/outline'-import { SiGithub } from '@icons-pack/react-simple-icons'import {CheckIcon,CookieIcon,@@ -9,8 +5,12 @@ import {GaugeIcon,GlobeIcon,ShieldCheckIcon,- ZapIcon,-} from 'lucide-react'+ LightningIcon,+ ArrowRightIcon,+ StarIcon,+ XIcon,+ GithubLogoIcon,+} from '@phosphor-icons/react'import { useTranslation, Trans } from 'react-i18next'import type { LoaderFunctionArgs, MetaFunction } from 'react-router'import { Link, redirect, useLoaderData } from 'react-router'@@ -102,11 +102,31 @@ const Testimonials = ({ className }: { className?: string }) => {role='img'aria-label='5 out of 5 stars'>- <StarIcon className='size-5 text-yellow-500' aria-hidden='true' />- <StarIcon className='size-5 text-yellow-500' aria-hidden='true' />- <StarIcon className='size-5 text-yellow-500' aria-hidden='true' />- <StarIcon className='size-5 text-yellow-500' aria-hidden='true' />- <StarIcon className='size-5 text-yellow-500' aria-hidden='true' />+ <StarIcon+ className='size-5 text-yellow-500'+ aria-hidden='true'+ weight='fill'+ />+ <StarIcon+ className='size-5 text-yellow-500'+ aria-hidden='true'+ weight='fill'+ />+ <StarIcon+ className='size-5 text-yellow-500'+ aria-hidden='true'+ weight='fill'+ />+ <StarIcon+ className='size-5 text-yellow-500'+ aria-hidden='true'+ weight='fill'+ />+ <StarIcon+ className='size-5 text-yellow-500'+ aria-hidden='true'+ weight='fill'+ /></div><div className='text-base text-gray-900/70 dark:text-gray-200'><span className='font-semibold text-gray-900 dark:text-gray-50'>@@ -244,7 +264,7 @@ const Hero = () => {<span>{t('gaAlternative.hero.features.ownData')}</span></div><div className='flex items-center gap-3 text-sm'>- <SiGithub className='size-5' />+ <GithubLogoIcon className='size-5' /><span>{t('gaAlternative.hero.features.openSource')}</span></div></div>@@ -335,7 +355,7 @@ const ComparisonTable = () => {</td><td className='px-6 py-4 text-sm text-slate-700 dark:text-gray-200'><span className='inline-flex items-center gap-2'>- <XMarkIcon className='size-4 text-rose-600 dark:text-rose-400' />+ <XIcon className='size-4 text-rose-600 dark:text-rose-400' />{t(`gaAlternative.comparison.table.rows.${key}.ga`)}</span></td>@@ -380,7 +400,10 @@ const WhySwitch = () => {{/* Primary benefit - visually distinct */}<div className='mt-10 border-l-2 border-indigo-500 pl-6'><div className='flex items-center gap-2'>- <ShieldCheckIcon className='size-5 text-indigo-600 dark:text-indigo-400' />+ <ShieldCheckIcon+ className='size-5 text-indigo-600 dark:text-indigo-400'+ weight='duotone'+ /><h3 className='text-lg font-semibold text-slate-900 dark:text-white'>{t('gaAlternative.whySwitch.privacy.title')}</h3>@@ -396,7 +419,10 @@ const WhySwitch = () => {<div className='space-y-10'><div><h3 className='flex items-center gap-2.5 text-lg font-semibold text-slate-900 dark:text-white'>- <GlobeIcon className='size-5 text-indigo-600 dark:text-indigo-400' />+ <GlobeIcon+ className='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'>@@ -406,7 +432,10 @@ const WhySwitch = () => {<div className='lg:pl-8'><h3 className='flex items-center gap-2.5 text-lg font-semibold text-slate-900 dark:text-white'>- <ZapIcon className='size-5 text-amber-500 dark:text-amber-400' />+ <LightningIcon+ className='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'>diff --git a/web/app/routes/tools._index.tsx b/web/app/routes/tools._index.tsxindex 0de901b05..0c0389a8a 100644--- a/web/app/routes/tools._index.tsx+++ b/web/app/routes/tools._index.tsx@@ -1,4 +1,4 @@-import { ArrowRightIcon } from '@heroicons/react/20/solid'+import { ArrowRightIcon } from '@phosphor-icons/react'import type { MetaFunction } from 'react-router'import { Link, redirect } from 'react-router'import type { SitemapFunction } from 'remix-sitemap'diff --git a/web/app/routes/tools.ctr-calculator.tsx b/web/app/routes/tools.ctr-calculator.tsxindex 76826e8e2..e26fedffd 100644--- a/web/app/routes/tools.ctr-calculator.tsx+++ b/web/app/routes/tools.ctr-calculator.tsx@@ -1,4 +1,4 @@-import { ChevronDownIcon, TrendingUpIcon } from 'lucide-react'+import { CaretDownIcon, TrendUpIcon } from '@phosphor-icons/react'import { useState } from 'react'import type { MetaFunction } from 'react-router'import { redirect } from 'react-router'@@ -251,7 +251,7 @@ export default function CTRCalculator() {<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'>- <TrendingUpIcon className='mr-2 h-5 w-5' />+ <TrendUpIcon className='mr-2 h-5 w-5' />Performance Insights</h4><p className='mt-2 text-sm text-indigo-800 dark:text-indigo-200'>@@ -292,7 +292,7 @@ export default function CTRCalculator() {<h3 className='text-lg font-medium text-gray-900 dark:text-white'>{item.question}</h3>- <ChevronDownIcon className='h-5 w-5 text-gray-500 transition-transform group-open:rotate-180' />+ <CaretDownIcon className='h-5 w-5 text-gray-500 transition-transform group-open:rotate-180' /></summary><div className='border-t border-gray-200 px-6 py-4 dark:border-gray-700'><p className='text-gray-600 dark:text-gray-400'>diff --git a/web/app/routes/tools.ip-lookup.tsx b/web/app/routes/tools.ip-lookup.tsxindex bdc57d1f8..17e59f1f7 100644--- a/web/app/routes/tools.ip-lookup.tsx+++ b/web/app/routes/tools.ip-lookup.tsx@@ -1,7 +1,4 @@-import {- ChevronDownIcon,- MagnifyingGlassIcon,-} from '@heroicons/react/24/outline'+import { CaretDownIcon, MagnifyingGlassIcon } from '@phosphor-icons/react'import { useState, useEffect } from 'react'import type { MetaFunction } from 'react-router'import { redirect, useFetcher, useLoaderData } from 'react-router'@@ -589,7 +586,7 @@ export default function IpLookup() {><summary className='flex cursor-pointer items-center justify-between px-5 py-4 text-left'><Text weight='medium'>{item.question}</Text>- <ChevronDownIcon className='h-5 w-5 shrink-0 text-gray-400 transition-transform group-open:rotate-180' />+ <CaretDownIcon className='h-5 w-5 shrink-0 text-gray-400 transition-transform group-open:rotate-180' /></summary><div className='border-t border-gray-200 px-5 py-4 dark:border-slate-700'><Text as='p' colour='muted'>diff --git a/web/app/routes/tools.roi-calculator.tsx b/web/app/routes/tools.roi-calculator.tsxindex 7de36b953..763824eb2 100644--- a/web/app/routes/tools.roi-calculator.tsx+++ b/web/app/routes/tools.roi-calculator.tsx@@ -1,9 +1,9 @@import {- TrendingUpIcon,- DollarSignIcon,+ TrendUpIcon,+ CurrencyDollarIcon,ShoppingCartIcon,- ChevronDownIcon,-} from 'lucide-react'+ CaretDownIcon,+} from '@phosphor-icons/react'import { useState, useEffect } from 'react'import type { MetaFunction } from 'react-router'import { redirect } from 'react-router'@@ -391,7 +391,7 @@ export default function ROICalculator() {<div className='space-y-4'><div className='flex items-center justify-between rounded-lg bg-gray-50 p-4 dark:bg-slate-700/50'><div className='flex items-center'>- <TrendingUpIcon className='mr-2 h-5 w-5 text-gray-500 dark:text-gray-400' />+ <TrendUpIcon className='mr-2 h-5 w-5 text-gray-500 dark:text-gray-400' /><span className='font-medium text-gray-700 dark:text-gray-300'>ROI</span>@@ -405,7 +405,7 @@ export default function ROICalculator() {<div className='flex items-center justify-between rounded-lg bg-gray-50 p-4 dark:bg-slate-700/50'><div className='flex items-center'>- <DollarSignIcon className='mr-2 h-5 w-5 text-gray-500 dark:text-gray-400' />+ <CurrencyDollarIcon className='mr-2 h-5 w-5 text-gray-500 dark:text-gray-400' /><span className='font-medium text-gray-700 dark:text-gray-300'>ROAS</span>@@ -546,7 +546,7 @@ export default function ROICalculator() {<h3 className='text-lg font-medium text-gray-900 dark:text-white'>{item.question}</h3>- <ChevronDownIcon className='h-5 w-5 text-gray-500 transition-transform group-open:rotate-180' />+ <CaretDownIcon className='h-5 w-5 text-gray-500 transition-transform group-open:rotate-180' /></summary><div className='border-t border-gray-200 px-6 py-4 dark:border-gray-700'><p className='text-gray-600 dark:text-gray-400'>diff --git a/web/app/routes/tools.sitemap-validator.tsx b/web/app/routes/tools.sitemap-validator.tsxindex fccb9faaf..f64b24e84 100644--- a/web/app/routes/tools.sitemap-validator.tsx+++ b/web/app/routes/tools.sitemap-validator.tsx@@ -1,13 +1,11 @@import {- ChevronDownIcon,+ CaretDownIcon,MagnifyingGlassIcon,-} from '@heroicons/react/24/outline'-import {CheckCircleIcon,- ExclamationTriangleIcon,+ WarningOctagonIcon,XCircleIcon,- InformationCircleIcon,-} from '@heroicons/react/24/solid'+ InfoIcon,+} from '@phosphor-icons/react'import { XMLParser, XMLValidator } from 'fast-xml-parser'import { useState } from 'react'import type { MetaFunction } from 'react-router'@@ -566,13 +564,9 @@ function IssueIcon({ type }: { type: 'error' | 'warning' | 'info' }) {case 'error':return <XCircleIcon className='h-5 w-5 shrink-0 text-red-500' />case 'warning':- return (- <ExclamationTriangleIcon className='h-5 w-5 shrink-0 text-amber-500' />- )+ return <WarningOctagonIcon className='h-5 w-5 shrink-0 text-amber-500' />case 'info':- return (- <InformationCircleIcon className='h-5 w-5 shrink-0 text-blue-500' />- )+ return <InfoIcon className='h-5 w-5 shrink-0 text-blue-500' />}}@@ -761,14 +755,14 @@ export default function SitemapValidator() {)}{warningCount > 0 && (<span className='flex items-center gap-1 text-amber-600 dark:text-amber-400'>- <ExclamationTriangleIcon className='h-4 w-4' />+ <WarningOctagonIcon className='h-4 w-4' />{warningCount} warning{warningCount !== 1 ? 's' : ''}</span>)}{infoCount > 0 && (<span className='flex items-center gap-1 text-blue-600 dark:text-blue-400'>- <InformationCircleIcon className='h-4 w-4' />+ <InfoIcon className='h-4 w-4' />{infoCount} info</span>)}@@ -1071,7 +1065,7 @@ export default function SitemapValidator() {><summary className='flex cursor-pointer items-center justify-between px-5 py-4 text-left'><Text weight='medium'>{item.question}</Text>- <ChevronDownIcon className='h-5 w-5 shrink-0 text-gray-400 transition-transform group-open:rotate-180' />+ <CaretDownIcon className='h-5 w-5 shrink-0 text-gray-400 transition-transform group-open:rotate-180' /></summary><div className='border-t border-gray-200 px-5 py-4 dark:border-slate-700'><Text as='p' colour='muted'>diff --git a/web/app/routes/tools.utm-generator.tsx b/web/app/routes/tools.utm-generator.tsxindex 2ee7e02bc..31927eb5e 100644--- a/web/app/routes/tools.utm-generator.tsx+++ b/web/app/routes/tools.utm-generator.tsx@@ -1,4 +1,4 @@-import { CopyIcon, ChevronDownIcon } from 'lucide-react'+import { CopyIcon, CaretDownIcon } from '@phosphor-icons/react'import { useState } from 'react'import type { MetaFunction } from 'react-router'import { redirect } from 'react-router'@@ -405,7 +405,7 @@ export default function UTMGenerator() {<h3 className='text-lg font-medium text-gray-900 dark:text-white'>{item.question}</h3>- <ChevronDownIcon className='h-5 w-5 text-gray-500 transition-transform group-open:rotate-180' />+ <CaretDownIcon className='h-5 w-5 text-gray-500 transition-transform group-open:rotate-180' /></summary><div className='border-t border-gray-200 px-6 py-4 dark:border-gray-700'><p className='text-gray-600 dark:text-gray-400'>diff --git a/web/app/styles/tailwind.css b/web/app/styles/tailwind.cssindex 64196975c..a1d2023ed 100644--- a/web/app/styles/tailwind.css+++ b/web/app/styles/tailwind.css@@ -92,7 +92,7 @@left: 0;right: 0;bottom: -2px;- height: 2px;+ height: 1.5px;transform: scaleX(0);transform-origin: center;transition: transform var(--default-transition-duration, 250ms) ease;diff --git a/web/app/ui/Alert.tsx b/web/app/ui/Alert.tsxnew file mode 100644index 000000000..ef0ec8947--- /dev/null+++ b/web/app/ui/Alert.tsx@@ -0,0 +1,98 @@+import cx from 'clsx'+import {+ InfoIcon,+ WarningIcon,+ WarningCircleIcon,+ CheckCircleIcon,+ LightbulbIcon,+} from '@phosphor-icons/react'++type AlertVariant = 'info' | 'warning' | 'error' | 'success' | 'tip'++interface AlertProps {+ variant: AlertVariant+ title?: string+ children: React.ReactNode+ className?: string+}++const variantConfig: Record<+ AlertVariant,+ {+ icon: React.ElementType+ containerClass: string+ iconClass: string+ titleClass: string+ textClass: string+ }+> = {+ info: {+ icon: InfoIcon,+ containerClass: 'bg-sky-50 dark:bg-sky-900/50',+ iconClass: 'text-sky-600 dark:text-sky-400',+ titleClass: 'text-sky-900 dark:text-sky-50',+ textClass: 'text-sky-800 dark:text-sky-50',+ },+ warning: {+ icon: WarningIcon,+ containerClass: 'bg-amber-50 dark:bg-amber-900/50',+ iconClass: 'text-amber-600 dark:text-amber-400',+ titleClass: 'text-amber-900 dark:text-amber-50',+ textClass: 'text-amber-800 dark:text-amber-50',+ },+ error: {+ icon: WarningCircleIcon,+ containerClass: 'bg-red-50 dark:bg-red-900/50',+ iconClass: 'text-red-600 dark:text-red-400',+ titleClass: 'text-red-900 dark:text-red-50',+ textClass: 'text-red-800 dark:text-red-50',+ },+ success: {+ icon: CheckCircleIcon,+ containerClass: 'bg-green-50 dark:bg-emerald-900/50',+ iconClass: 'text-green-600 dark:text-emerald-400',+ titleClass: 'text-green-900 dark:text-emerald-50',+ textClass: 'text-green-800 dark:text-emerald-50',+ },+ tip: {+ icon: LightbulbIcon,+ containerClass: 'bg-green-50 dark:bg-emerald-900/50',+ iconClass: 'text-green-600 dark:text-emerald-400',+ titleClass: 'text-green-900 dark:text-green-50',+ textClass: 'text-green-800 dark:text-green-50',+ },+}++const Alert = ({ variant, title, children, className }: AlertProps) => {+ const {+ icon: Icon,+ containerClass,+ iconClass,+ titleClass,+ textClass,+ } = variantConfig[variant]++ return (+ <div+ className={cx(+ 'flex w-full rounded-lg px-3 py-2 text-sm',+ containerClass,+ className,+ )}+ >+ <Icon+ className={cx('mt-0.5 mr-2 size-4 shrink-0', iconClass)}+ weight='duotone'+ aria-hidden='true'+ />+ <div className={cx('flex grow flex-col gap-y-1', textClass)}>+ {title && (+ <span className={cx('font-semibold', titleClass)}>{title}</span>+ )}+ <div>{children}</div>+ </div>+ </div>+ )+}++export default Alertdiff --git a/web/app/ui/Button.tsx b/web/app/ui/Button.tsxindex 334b7fafc..4595bf148 100644--- a/web/app/ui/Button.tsx+++ b/web/app/ui/Button.tsx@@ -81,7 +81,7 @@ const Button = ({className,)}>- {loading ? <Spin alwaysLight /> : null}+ {loading ? <Spin inherit /> : null}{text || children}</HeadlessButton>)diff --git a/web/app/ui/Checkbox.tsx b/web/app/ui/Checkbox.tsxindex 13900aeaf..8f94fbd50 100644--- a/web/app/ui/Checkbox.tsx+++ b/web/app/ui/Checkbox.tsx@@ -4,7 +4,7 @@ import {Field,Label,} from '@headlessui/react'-import { CheckIcon } from '@heroicons/react/24/outline'+import { CheckIcon } from '@phosphor-icons/react'import cx from 'clsx'import React, { memo } from 'react'diff --git a/web/app/ui/Combobox.tsx b/web/app/ui/Combobox.tsxindex 7730cce5e..97d7172d8 100644--- a/web/app/ui/Combobox.tsx+++ b/web/app/ui/Combobox.tsx@@ -6,7 +6,7 @@ import {ComboboxOptions,ComboboxOption,} from '@headlessui/react'-import { CheckIcon, ChevronUpDownIcon } from '@heroicons/react/24/solid'+import { CheckIcon, CaretUpDownIcon } from '@phosphor-icons/react'import cx from 'clsx'import _filter from 'lodash/filter'import _includes from 'lodash/includes'@@ -67,7 +67,7 @@ const Combobox = ({placeholder={placeholder}/><ComboboxButton className='absolute inset-y-0 right-0 flex items-center pr-2'>- <ChevronUpDownIcon+ <CaretUpDownIconclassName='h-5 w-5 text-gray-400'aria-hidden='true'/>diff --git a/web/app/ui/Datepicker.tsx b/web/app/ui/Datepicker.tsxindex eaf48ec86..ba40b28ff 100644--- a/web/app/ui/Datepicker.tsx+++ b/web/app/ui/Datepicker.tsx@@ -1,7 +1,7 @@import cx from 'clsx'import _clamp from 'lodash/clamp'import _isEmpty from 'lodash/isEmpty'-import { ChevronLeftIcon, ChevronRightIcon } from 'lucide-react'+import { CaretLeftIcon, CaretRightIcon } from '@phosphor-icons/react'import React, {memo,useEffect,@@ -365,7 +365,7 @@ const DatePicker = forwardRef<DatePickerHandle, DatePickerProps>(onClick={handlePrevMonth}aria-label='Previous month'>- <ChevronLeftIcon className='size-5' />+ <CaretLeftIcon className='size-5' /></button><div className='flex items-center gap-2'><div className='relative'>@@ -427,7 +427,7 @@ const DatePicker = forwardRef<DatePickerHandle, DatePickerProps>(onClick={handleNextMonth}aria-label='Next month'>- <ChevronRightIcon className='size-5' />+ <CaretRightIcon className='size-5' /></button></div><div className='mt-2 grid grid-cols-7 gap-1 text-center text-xs text-gray-500 dark:text-gray-300'>@@ -523,7 +523,7 @@ const DatePicker = forwardRef<DatePickerHandle, DatePickerProps>(onClick={handlePrevMonth}aria-label='Previous month'>- <ChevronLeftIcon className='size-5' />+ <CaretLeftIcon className='size-5' /></button><div className='flex items-center gap-2'><div className='relative'>@@ -585,7 +585,7 @@ const DatePicker = forwardRef<DatePickerHandle, DatePickerProps>(onClick={handleNextMonth}aria-label='Next month'>- <ChevronRightIcon className='size-5' />+ <CaretRightIcon className='size-5' /></button></div><div className='mt-2 grid grid-cols-7 gap-1 text-center text-xs text-gray-500 dark:text-gray-300'>diff --git a/web/app/ui/Dropdown.tsx b/web/app/ui/Dropdown.tsxindex 923ade8f9..f86e01d69 100644--- a/web/app/ui/Dropdown.tsx+++ b/web/app/ui/Dropdown.tsx@@ -5,13 +5,12 @@ import {MenuItem,Transition,} from '@headlessui/react'-import { ChevronDownIcon as ChevronDownIconMini } from '@heroicons/react/20/solid'-import { ChevronDownIcon } from '@heroicons/react/24/solid'import _isEmpty from 'lodash/isEmpty'import _map from 'lodash/map'import React, { memo, Fragment, Key } from 'react'import { cn } from '~/utils/generic'+import { CaretDownIcon } from '@phosphor-icons/react'import Spin from './icons/Spin'@@ -90,7 +89,7 @@ function Dropdown<T>({><span>{title}</span>{chevron === 'regular' ? (- <ChevronDownIcon+ <CaretDownIconclassName={cn('ml-2 h-5 w-5 transform-gpu transition-transform',{@@ -101,7 +100,7 @@ function Dropdown<T>({/>) : null}{chevron === 'mini' ? (- <ChevronDownIconMini+ <CaretDownIconclassName={cn('ml-1 h-5 w-5 transform-gpu transition-transform',{diff --git a/web/app/ui/FilterValueInput.tsx b/web/app/ui/FilterValueInput.tsxindex 90ced1c1e..229a06b86 100644--- a/web/app/ui/FilterValueInput.tsx+++ b/web/app/ui/FilterValueInput.tsx@@ -6,34 +6,34 @@ import _toLower from 'lodash/toLower'import {BuildingIcon,CheckIcon,- ChevronsUpDownIcon,- CircleQuestionMark,+ CaretUpDownIcon,+ QuestionMarkIcon,CompassIcon,CpuIcon,FileIcon,FileTextIcon,- Gamepad2Icon,+ GameControllerIcon,GlobeIcon,- LanguagesIcon,+ TranslateIcon,LinkIcon,- LogInIcon,- LogOutIcon,- MapIcon,+ SignInIcon,+ SignOutIcon,+ MapTrifoldIcon,MapPinIcon,MegaphoneIcon,- MonitorCogIcon,+ MonitorPlayIcon,MonitorIcon,PlusIcon,RadioIcon,- ServerIcon,+ HardDrivesIcon,ShareIcon,- SmartphoneIcon,- TabletIcon,- TabletSmartphoneIcon,+ DeviceMobileIcon,+ DeviceTabletIcon,+ DevicesIcon,TagIcon,- TvIcon,+ TelevisionIcon,WatchIcon,-} from 'lucide-react'+} from '@phosphor-icons/react'import {useState,useEffect,@@ -57,35 +57,35 @@ const ITEM_HEIGHT = 36// Icon mapping for filter categoriesexport const filterCategoryIcons: Record<string, ReactNode> = {- cc: <MapPinIcon className='size-4' strokeWidth={1.5} />,- rg: <MapIcon className='size-4' strokeWidth={1.5} />,- ct: <BuildingIcon className='size-4' strokeWidth={1.5} />,- pg: <FileTextIcon className='size-4' strokeWidth={1.5} />,- entryPage: <LogInIcon className='size-4' strokeWidth={1.5} />,- exitPage: <LogOutIcon className='size-4' strokeWidth={1.5} />,- host: <ServerIcon className='size-4' strokeWidth={1.5} />,- br: <CompassIcon className='size-4' strokeWidth={1.5} />,- brv: <CompassIcon className='size-4' strokeWidth={1.5} />,- os: <MonitorCogIcon className='size-4' strokeWidth={1.5} />,- osv: <MonitorCogIcon className='size-4' strokeWidth={1.5} />,- ref: <LinkIcon className='size-4' strokeWidth={1.5} />,- so: <ShareIcon className='size-4' strokeWidth={1.5} />,- me: <RadioIcon className='size-4' strokeWidth={1.5} />,- ca: <MegaphoneIcon className='size-4' strokeWidth={1.5} />,- te: <TagIcon className='size-4' strokeWidth={1.5} />,- co: <FileIcon className='size-4' strokeWidth={1.5} />,- lc: <LanguagesIcon className='size-4' strokeWidth={1.5} />,- dv: <TabletSmartphoneIcon className='size-4' strokeWidth={1.5} />,+ cc: <MapPinIcon className='size-4' />,+ rg: <MapTrifoldIcon className='size-4' />,+ ct: <BuildingIcon className='size-4' />,+ pg: <FileTextIcon className='size-4' />,+ entryPage: <SignInIcon className='size-4' />,+ exitPage: <SignOutIcon className='size-4' />,+ host: <HardDrivesIcon className='size-4' />,+ br: <CompassIcon className='size-4' />,+ brv: <CompassIcon className='size-4' />,+ os: <MonitorPlayIcon className='size-4' />,+ osv: <MonitorPlayIcon className='size-4' />,+ ref: <LinkIcon className='size-4' />,+ so: <ShareIcon className='size-4' />,+ me: <RadioIcon className='size-4' />,+ ca: <MegaphoneIcon className='size-4' />,+ te: <TagIcon className='size-4' />,+ co: <FileIcon className='size-4' />,+ lc: <TranslateIcon className='size-4' />,+ dv: <DevicesIcon className='size-4' />,}const deviceIconMapping: Record<string, ReactNode> = {- desktop: <MonitorIcon className='size-4' strokeWidth={1.5} />,- mobile: <SmartphoneIcon className='size-4' strokeWidth={1.5} />,- tablet: <TabletIcon className='size-4' strokeWidth={1.5} />,- smarttv: <TvIcon className='size-4' strokeWidth={1.5} />,- console: <Gamepad2Icon className='size-4' strokeWidth={1.5} />,- wearable: <WatchIcon className='size-4' strokeWidth={1.5} />,- embedded: <CpuIcon className='size-4' strokeWidth={1.5} />,+ desktop: <MonitorIcon className='size-4' />,+ mobile: <DeviceMobileIcon className='size-4' />,+ tablet: <DeviceTabletIcon className='size-4' />,+ smarttv: <TelevisionIcon className='size-4' />,+ console: <GameControllerIcon className='size-4' />,+ wearable: <WatchIcon className='size-4' />,+ embedded: <CpuIcon className='size-4' />,}// Special separator for combined version values (e.g., "Chrome|||120.5")@@ -187,7 +187,7 @@ const FilterValueInput = ({if (logoUrl) {return <img src={logoUrl} className='size-4 shrink-0' alt='' />}- return <GlobeIcon className='size-4 shrink-0' strokeWidth={1.5} />+ return <GlobeIcon className='size-4 shrink-0' />}// For browser versions, show browser icon@@ -200,7 +200,7 @@ const FilterValueInput = ({return <img src={logoUrl} className='size-4 shrink-0' alt='' />}}- return <GlobeIcon className='size-4 shrink-0' strokeWidth={1.5} />+ return <GlobeIcon className='size-4 shrink-0' />}if (column === 'os') {@@ -220,7 +220,7 @@ const FilterValueInput = ({/>)}- return <GlobeIcon className='size-4 shrink-0' strokeWidth={1.5} />+ return <GlobeIcon className='size-4 shrink-0' />}// For OS versions, show OS icon@@ -244,7 +244,7 @@ const FilterValueInput = ({)}}- return <GlobeIcon className='size-4 shrink-0' strokeWidth={1.5} />+ return <GlobeIcon className='size-4 shrink-0' />}if (column === 'dv') {@@ -252,9 +252,7 @@ const FilterValueInput = ({if (icon) {return <span className='shrink-0'>{icon}</span>}- return (- <CircleQuestionMark className='size-4 shrink-0' strokeWidth={1.5} />- )+ return <QuestionMarkIcon className='size-4 shrink-0' />}return null@@ -367,7 +365,7 @@ const FilterValueInput = ({{isLoading ? (<Spin className='size-4' />) : (- <ChevronsUpDownIcon className='h-4 w-4 text-gray-400' />+ <CaretUpDownIcon className='h-4 w-4 text-gray-400' />)}</span></div>diff --git a/web/app/ui/Input.tsx b/web/app/ui/Input.tsxindex bcd5c37e9..4fe299ca6 100644--- a/web/app/ui/Input.tsx+++ b/web/app/ui/Input.tsx@@ -6,7 +6,7 @@ import {} from '@headlessui/react'import cx from 'clsx'import _isEmpty from 'lodash/isEmpty'-import { Eye, EyeOff } from 'lucide-react'+import { EyeIcon, EyeSlashIcon } from '@phosphor-icons/react'import React, { memo, useState } from 'react'interface InputProps {@@ -90,9 +90,9 @@ const Input = ({className='absolute inset-y-0 right-0 flex items-center pr-3 text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200'>{showPassword ? (- <EyeOff className='size-5' />+ <EyeSlashIcon className='size-5' />) : (- <Eye className='size-5' />+ <EyeIcon className='size-5' />)}</button></div>diff --git a/web/app/ui/Modal.tsx b/web/app/ui/Modal.tsxindex 98e466bcf..4b93c07cd 100644--- a/web/app/ui/Modal.tsx+++ b/web/app/ui/Modal.tsx@@ -6,11 +6,11 @@ import {} from '@headlessui/react'import {CheckIcon,- ExclamationTriangleIcon,- InformationCircleIcon,- UserGroupIcon,- XMarkIcon,-} from '@heroicons/react/24/outline'+ WarningOctagonIcon,+ InfoIcon,+ UsersIcon,+ XIcon,+} from '@phosphor-icons/react'import React, { memo } from 'react'import { useTranslation } from 'react-i18next'@@ -86,39 +86,39 @@ const Modal = ({{type === 'success' ? (<div className='mx-auto flex h-12 w-12 shrink-0 items-center justify-center rounded-full bg-green-100 sm:mr-3 sm:h-10 sm:w-10'><CheckIcon- className='h-6 w-6 text-green-600'+ className='h-6 w-6 text-green-600 dark:text-green-500'aria-hidden='true'/></div>) : null}{type === 'error' ? (<div className='mx-auto flex h-12 w-12 shrink-0 items-center justify-center rounded-full bg-red-100 sm:mr-3 sm:h-10 sm:w-10'>- <ExclamationTriangleIcon- className='h-6 w-6 text-red-600'+ <WarningOctagonIcon+ className='h-6 w-6 text-red-600 dark:text-red-500'aria-hidden='true'/></div>) : null}{type === 'info' ? (<div className='mx-auto flex h-12 w-12 shrink-0 items-center justify-center rounded-full bg-blue-100 text-center sm:mr-3 sm:h-10 sm:w-10'>- <InformationCircleIcon- className='h-6 w-6 text-blue-600'+ <InfoIcon+ className='h-6 w-6 text-blue-600 dark:text-blue-500'aria-hidden='true'/></div>) : null}{type === 'warning' ? (<div className='mx-auto flex h-12 w-12 shrink-0 items-center justify-center rounded-full bg-orange-100 sm:mr-3 sm:h-10 sm:w-10'>- <ExclamationTriangleIcon- className='h-6 w-6 text-amber-600'+ <WarningOctagonIcon+ className='h-6 w-6 text-amber-600 dark:text-amber-500'aria-hidden='true'/></div>) : null}{type === 'confirmed' ? (<div className='mx-auto flex h-12 w-12 shrink-0 items-center justify-center rounded-full bg-green-100 sm:mr-3 sm:h-10 sm:w-10'>- <UserGroupIcon- className='h-6 w-6 text-green-600'+ <UsersIcon+ className='h-6 w-6 text-green-600 dark:text-green-500'aria-hidden='true'/></div>@@ -147,7 +147,7 @@ const Modal = ({aria-label={t('common.close')}className='rounded-md p-1.5 text-gray-800 transition-colors hover:bg-gray-100 hover:text-gray-900 dark:text-slate-400 dark:hover:bg-slate-700 dark:hover:text-slate-300'>- <XMarkIcon className='size-5' />+ <XIcon className='size-5' /></button>) : null}</DialogTitle>diff --git a/web/app/ui/MultiSelect.tsx b/web/app/ui/MultiSelect.tsxindex f327a9322..d209dfa2f 100644--- a/web/app/ui/MultiSelect.tsx+++ b/web/app/ui/MultiSelect.tsx@@ -1,4 +1,4 @@-import { CheckIcon, ChevronUpDownIcon } from '@heroicons/react/24/solid'+import { CheckIcon, CaretUpDownIcon } from '@phosphor-icons/react'import cx from 'clsx'import _includes from 'lodash/includes'import _isEmpty from 'lodash/isEmpty'@@ -103,7 +103,7 @@ const MultiSelect = ({onKeyDown={handleKeyDown}/><span className='pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2'>- <ChevronUpDownIcon+ <CaretUpDownIconclassName='h-5 w-5 text-gray-400'aria-hidden='true'/>diff --git a/web/app/ui/Pagination.tsx b/web/app/ui/Pagination.tsxindex 5a9ffa0d9..b085b5cc1 100644--- a/web/app/ui/Pagination.tsx+++ b/web/app/ui/Pagination.tsx@@ -1,6 +1,6 @@import cx from 'clsx'import _map from 'lodash/map'-import { ChevronLeftIcon, ChevronRightIcon } from 'lucide-react'+import { CaretLeftIcon, CaretRightIcon } from '@phosphor-icons/react'import { memo } from 'react'import { Trans, useTranslation } from 'react-i18next'@@ -138,7 +138,7 @@ const Pagination = ({)}><span className='sr-only'>{t('project.prev')}</span>- <ChevronLeftIcon className='h-5 w-5' aria-hidden='true' />+ <CaretLeftIcon className='h-5 w-5' aria-hidden='true' /></button>{_map(paginationRange, (item, index) => {if (item === DOTS) {@@ -201,7 +201,7 @@ const Pagination = ({)}><span className='sr-only'>{t('project.next')}</span>- <ChevronRightIcon className='h-5 w-5' aria-hidden='true' />+ <CaretRightIcon className='h-5 w-5' aria-hidden='true' /></button></nav></div>diff --git a/web/app/ui/PasswordStrength.tsx b/web/app/ui/PasswordStrength.tsxnew file mode 100644index 000000000..8ad20494b--- /dev/null+++ b/web/app/ui/PasswordStrength.tsx@@ -0,0 +1,123 @@+import cx from 'clsx'+import { useMemo } from 'react'+import { useTranslation } from 'react-i18next'+import { InfoIcon } from '@phosphor-icons/react'+import Tooltip from './Tooltip'++interface PasswordStrengthProps {+ password: string+ className?: string+}++type StrengthLevel = 'empty' | 'weak' | 'fair' | 'good' | 'strong'++interface StrengthConfig {+ label: string+ color: string+ bgColor: string+ segments: number+}++const calculateStrength = (password: string): StrengthLevel => {+ if (!password) return 'empty'++ let score = 0++ if (password.length >= 8) score += 1+ if (password.length >= 12) score += 1+ if (/[a-z]/.test(password)) score += 1+ if (/[A-Z]/.test(password)) score += 1+ if (/[0-9]/.test(password)) score += 1+ if (/[^a-zA-Z0-9]/.test(password)) score += 1++ if (score <= 2) return 'weak'+ if (score <= 3) return 'fair'+ if (score <= 4) return 'good'+ return 'strong'+}++const PasswordStrength = ({ password, className }: PasswordStrengthProps) => {+ const { t } = useTranslation('common')++ const strength = useMemo(() => calculateStrength(password), [password])++ const config: Record<StrengthLevel, StrengthConfig> = useMemo(+ () => ({+ empty: {+ label: '',+ color: 'bg-gray-300 dark:bg-slate-600',+ bgColor: 'bg-gray-200 dark:bg-slate-700',+ segments: 0,+ },+ weak: {+ label: t('auth.passwordStrength.weak'),+ color: 'bg-red-500',+ bgColor: 'bg-gray-200 dark:bg-slate-700',+ segments: 1,+ },+ fair: {+ label: t('auth.passwordStrength.fair'),+ color: 'bg-amber-500',+ bgColor: 'bg-gray-200 dark:bg-slate-700',+ segments: 2,+ },+ good: {+ label: t('auth.passwordStrength.good'),+ color: 'bg-yellow-500',+ bgColor: 'bg-gray-200 dark:bg-slate-700',+ segments: 3,+ },+ strong: {+ label: t('auth.passwordStrength.strong'),+ color: 'bg-emerald-500',+ bgColor: 'bg-gray-200 dark:bg-slate-700',+ segments: 4,+ },+ }),+ [t],+ )++ const currentConfig = config[strength]+ const totalSegments = 4++ return (+ <div className={cx('space-y-1.5', className)}>+ <div className='flex gap-1'>+ {Array.from({ length: totalSegments }).map((_, index) => (+ <div+ key={index}+ className={cx(+ 'h-1 flex-1 rounded-full transition-colors duration-200',+ index < currentConfig.segments+ ? currentConfig.color+ : currentConfig.bgColor,+ )}+ />+ ))}+ </div>+ {strength !== 'empty' && (+ <div className='flex items-center justify-end gap-1'>+ <span+ className={cx(+ 'text-xs font-medium',+ strength === 'weak' && 'text-red-600 dark:text-red-400',+ strength === 'fair' && 'text-amber-600 dark:text-amber-400',+ strength === 'good' && 'text-yellow-600 dark:text-yellow-400',+ strength === 'strong' && 'text-emerald-600 dark:text-emerald-400',+ )}+ >+ {currentConfig.label}+ </span>+ <Tooltip+ text={t('auth.passwordStrength.hint')}+ tooltipNode={+ <InfoIcon className='size-4 cursor-help text-gray-400 dark:text-gray-500' />+ }+ />+ </div>+ )}+ </div>+ )+}++export default PasswordStrengthdiff --git a/web/app/ui/Select.tsx b/web/app/ui/Select.tsxindex f5acce4c7..ea236d033 100644--- a/web/app/ui/Select.tsx+++ b/web/app/ui/Select.tsx@@ -6,7 +6,7 @@ import {ListboxOptions,ListboxOption,} from '@headlessui/react'-import { CheckIcon, ChevronUpDownIcon } from '@heroicons/react/24/solid'+import { CheckIcon, CaretUpDownIcon } from '@phosphor-icons/react'import cx from 'clsx'import _map from 'lodash/map'import React, { Fragment, Key, memo } from 'react'@@ -89,7 +89,7 @@ function Select<T>({{title}</span><span className='pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2'>- <ChevronUpDownIcon+ <CaretUpDownIconclassName='h-5 w-5 text-gray-400'aria-hidden='true'/>diff --git a/web/app/ui/StatusPage.tsx b/web/app/ui/StatusPage.tsxindex 2985298ba..316ddbf80 100644--- a/web/app/ui/StatusPage.tsx+++ b/web/app/ui/StatusPage.tsx@@ -1,8 +1,4 @@-import {- CheckCircleIcon,- XCircleIcon,- InformationCircleIcon,-} from '@heroicons/react/24/solid'+import { CheckCircleIcon, XCircleIcon, InfoIcon } from '@phosphor-icons/react'import type { ReactNode } from 'react'import { useTranslation } from 'react-i18next'import { Link } from 'react-router'@@ -53,7 +49,7 @@ const iconMap: Record<StatusType, ReactNode> = {/>),info: (- <InformationCircleIcon+ <InfoIconclassName='size-8 text-amber-500 dark:text-amber-400'aria-hidden='true'/>diff --git a/web/app/ui/TabHeader.tsx b/web/app/ui/TabHeader.tsxnew file mode 100644index 000000000..fe492f241--- /dev/null+++ b/web/app/ui/TabHeader.tsx@@ -0,0 +1,39 @@+import cx from 'clsx'++import { Text } from '~/ui/Text'++interface TabHeaderProps {+ icon: React.ElementType+ label: string+ description: string+ iconColorClass?: string+}++export const TabHeader = ({+ icon: Icon,+ label,+ description,+ iconColorClass = 'text-gray-500',+}: TabHeaderProps) => {+ return (+ <div className='mb-6'>+ <div className='flex items-start gap-4'>+ <div className='flex h-14 w-14 shrink-0 items-center justify-center rounded-lg border border-gray-200 p-2 dark:border-slate-700'>+ <Icon+ className={cx('h-full w-full', iconColorClass)}+ weight='duotone'+ />+ </div>+ <div>+ <Text as='h2' size='lg' weight='semibold'>+ {label}+ </Text>+ <Text as='p' size='sm' colour='muted'>+ {description}+ </Text>+ </div>+ </div>+ <hr className='mt-6 border-gray-200 dark:border-slate-700/80' />+ </div>+ )+}diff --git a/web/app/ui/Text.tsx b/web/app/ui/Text.tsxindex d74982eaa..7973ed263 100644--- a/web/app/ui/Text.tsx+++ b/web/app/ui/Text.tsx@@ -36,7 +36,7 @@ type Tracking = 'tight' | 'normal' | 'wide'interface TextProps {children: React.ReactNode- as?: TextElement+ as?: TextElement | 'button'size?: TextSizeweight?: TextWeightcolour?: TextColourdiff --git a/web/app/ui/TimezonePicker.tsx b/web/app/ui/TimezonePicker.tsxindex ec5f63869..f76594ddf 100644--- a/web/app/ui/TimezonePicker.tsx+++ b/web/app/ui/TimezonePicker.tsx@@ -1,7 +1,6 @@import _find from 'lodash/find'import _includes from 'lodash/includes'import _reduce from 'lodash/reduce'-import { useTranslation } from 'react-i18next'import spacetime from 'spacetime'import soft from 'timezone-soft'@@ -53,7 +52,6 @@ interface TimezoneSelectProps {}const TimezoneSelect = ({ value, onChange }: TimezoneSelectProps) => {- const { t } = useTranslation('common')const labelExtractor = (option: { label: string }) => option?.labelconst keyExtractor = (option: { value: string }) => option?.value@@ -88,7 +86,6 @@ const TimezoneSelect = ({ value, onChange }: TimezoneSelectProps) => {return (<Selecttitle={labelExtractor(parseTimezone(value))}- label={t('profileSettings.timezoneDesc')}className='w-full'items={options}labelExtractor={labelExtractor}diff --git a/web/app/ui/Tooltip.tsx b/web/app/ui/Tooltip.tsxindex 358d6c1f4..f9dec9df9 100644--- a/web/app/ui/Tooltip.tsx+++ b/web/app/ui/Tooltip.tsx@@ -1,5 +1,5 @@import * as TooltipPrimitive from '@radix-ui/react-tooltip'-import { CircleHelpIcon } from 'lucide-react'+import { QuestionIcon } from '@phosphor-icons/react'import React, { forwardRef, memo } from 'react'import { cn } from '~/utils/generic'@@ -55,10 +55,7 @@ const Tooltip = ({<TooltipRoot><TooltipTrigger className={className}>{tooltipNode || (- <CircleHelpIcon- className='size-4.5 fill-slate-700 stroke-gray-50 dark:fill-slate-200 dark:stroke-slate-800'- strokeWidth={1.5}- />+ <QuestionIcon className='size-4.5 fill-slate-700 stroke-gray-50 dark:fill-slate-200 dark:stroke-slate-800' />)}</TooltipTrigger><TooltipContentdiff --git a/web/app/ui/icons/Sort.tsx b/web/app/ui/icons/Sort.tsxindex 6c5710bfe..515c17b33 100644--- a/web/app/ui/icons/Sort.tsx+++ b/web/app/ui/icons/Sort.tsx@@ -1,8 +1,8 @@import {- ChevronUpDownIcon,- ChevronUpIcon,- ChevronDownIcon,-} from '@heroicons/react/24/outline'+ CaretUpDownIcon,+ CaretUpIcon,+ CaretDownIcon,+} from '@phosphor-icons/react'import cx from 'clsx'interface SortProps {@@ -13,14 +13,14 @@ interface SortProps {const Sort = ({ sortByAscend, sortByDescend, className }: SortProps) => {if (sortByAscend) {- return <ChevronUpIcon className={cx(className, 'h-4 w-4')} />+ return <CaretUpIcon className={cx(className, 'h-4 w-4')} />}if (sortByDescend) {- return <ChevronDownIcon className={cx(className, 'h-4 w-4')} />+ return <CaretDownIcon className={cx(className, 'h-4 w-4')} />}- return <ChevronUpDownIcon className={cx(className, 'h-4 w-4')} />+ return <CaretUpDownIcon className={cx(className, 'h-4 w-4')} />}export default Sortdiff --git a/web/app/ui/icons/Spin.tsx b/web/app/ui/icons/Spin.tsxindex 569d5c395..3625cf7b3 100644--- a/web/app/ui/icons/Spin.tsx+++ b/web/app/ui/icons/Spin.tsx@@ -1,38 +1,24 @@+import { SpinnerIcon } from '@phosphor-icons/react'import { cn } from '~/utils/generic'interface SpinProps {className?: stringalwaysLight?: boolean+ inherit?: boolean}-const Spin = ({ className, alwaysLight }: SpinProps) => (- <svg+const Spin = ({ className, alwaysLight, inherit }: SpinProps) => (+ <SpinnerIconclassName={cn(- 'mr-2 -ml-1 h-4 w-4 animate-spin text-slate-900 dark:text-white',+ 'mr-2 -ml-1 h-4 w-4 animate-spin',{- 'text-slate-900 dark:text-white': !alwaysLight,- 'text-white': alwaysLight,+ 'text-current': inherit,+ 'text-slate-900 dark:text-white': !alwaysLight && !inherit,+ 'text-white': alwaysLight && !inherit,},className,)}- xmlns='http://www.w3.org/2000/svg'- fill='none'- viewBox='0 0 24 24'- >- <circle- className='opacity-25'- cx='12'- cy='12'- r='10'- stroke='currentColor'- strokeWidth='4'- />- <path- className='opacity-75'- fill='currentColor'- d='M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z'- />- </svg>+ />)export default Spindiff --git a/web/package-lock.json b/web/package-lock.jsonindex 0dd059c17..164757369 100644--- a/web/package-lock.json+++ b/web/package-lock.json@@ -7,9 +7,8 @@"license": "AGPL-3.0","dependencies": {"@headlessui/react": "^2.2.9",- "@heroicons/react": "^2.2.0",- "@icons-pack/react-simple-icons": "^13.8.0","@nivo/sankey": "^0.99.0",+ "@phosphor-icons/react": "^2.1.10","@radix-ui/react-tooltip": "^1.2.8","@react-router/fs-routes": "^7.13.0","@react-router/node": "^7.13.0",@@ -37,7 +36,6 @@"jszip": "^3.10.1","leaflet": "^1.9.4","lodash": "^4.17.23",- "lucide-react": "^0.563.0","marked": "^17.0.1","react": "^19.2.4","react-dom": "^19.2.4",@@ -1064,24 +1062,6 @@"react-dom": "^18 || ^19 || ^19.0.0-rc"}},- "node_modules/@heroicons/react": {- "version": "2.2.0",- "resolved": "https://registry.npmjs.org/@heroicons/react/-/react-2.2.0.tgz",- "integrity": "sha512-LMcepvRaS9LYHJGsF0zzmgKCUim/X3N/DQKc4jepAXJ7l8QxJ1PmxJzqplF2Z3FE4PqBAIGyJAQ/w4B5dsqbtQ==",- "license": "MIT",- "peerDependencies": {- "react": ">= 16 || ^19.0.0-rc"- }- },- "node_modules/@icons-pack/react-simple-icons": {- "version": "13.8.0",- "resolved": "https://registry.npmjs.org/@icons-pack/react-simple-icons/-/react-simple-icons-13.8.0.tgz",- "integrity": "sha512-iZrhL1fSklfCCVn68IYHaAoKfcby3RakUTn2tRPyHBkhr2tkYqeQbjJWf+NizIYBzKBn2IarDJXmTdXd6CuEfw==",- "license": "MIT",- "peerDependencies": {- "react": "^16.13 || ^17 || ^18 || ^19"- }- },"node_modules/@jridgewell/gen-mapping": {"version": "0.3.13","resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",@@ -1819,6 +1799,19 @@"win32"]},+ "node_modules/@phosphor-icons/react": {+ "version": "2.1.10",+ "resolved": "https://registry.npmjs.org/@phosphor-icons/react/-/react-2.1.10.tgz",+ "integrity": "sha512-vt8Tvq8GLjheAZZYa+YG/pW7HDbov8El/MANW8pOAz4eGxrwhnbfrQZq0Cp4q8zBEu8NIhHdnr+r8thnfRSNYA==",+ "license": "MIT",+ "engines": {+ "node": ">=10"+ },+ "peerDependencies": {+ "react": ">= 16.8",+ "react-dom": ">= 16.8"+ }+ },"node_modules/@radix-ui/primitive": {"version": "1.1.3","resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.3.tgz",@@ -6068,15 +6061,6 @@"yallist": "^3.0.2"}},- "node_modules/lucide-react": {- "version": "0.563.0",- "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.563.0.tgz",- "integrity": "sha512-8dXPB2GI4dI8jV4MgUDGBeLdGk8ekfqVZ0BdLcrRzocGgG75ltNEmWS+gE7uokKF/0oSUuczNDT+g9hFJ23FkA==",- "license": "ISC",- "peerDependencies": {- "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0"- }- },"node_modules/magic-string": {"version": "0.30.21","resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",diff --git a/web/package.json b/web/package.jsonindex f1a5ced8e..b6f70afc8 100644--- a/web/package.json+++ b/web/package.json@@ -19,9 +19,8 @@},"dependencies": {"@headlessui/react": "^2.2.9",- "@heroicons/react": "^2.2.0",- "@icons-pack/react-simple-icons": "^13.8.0","@nivo/sankey": "^0.99.0",+ "@phosphor-icons/react": "^2.1.10","@radix-ui/react-tooltip": "^1.2.8","@react-router/fs-routes": "^7.13.0","@react-router/node": "^7.13.0",@@ -49,7 +48,6 @@"jszip": "^3.10.1","leaflet": "^1.9.4","lodash": "^4.17.23",- "lucide-react": "^0.563.0","marked": "^17.0.1","react": "^19.2.4","react-dom": "^19.2.4",diff --git a/web/public/locales/en.json b/web/public/locales/en.jsonindex 1445bcd01..a0cfee2bb 100644--- a/web/public/locales/en.json+++ b/web/public/locales/en.json@@ -786,19 +786,57 @@"github": "Github","oidc": "OpenID Connect","orContinueWith": "Or continue with"+ },+ "passwordStrength": {+ "weak": "Weak",+ "fair": "Fair",+ "good": "Good",+ "strong": "Strong",+ "hint": "Use 12+ characters with uppercase, lowercase, numbers, and symbols for a strong password."}},"profileSettings": {"logoutAll": "Log out from all devices","emailChanged": "To confirm the change of your email address, please click the link in the email we sent you to your new email address.","account": "Account",+ "accountDesc": "Manage your profile and general settings.",+ "passwordAuth": "Password & Authentication",+ "passwordAuthDesc": "Manage access to your account.",+ "newPassword": "New password",+ "repeatPassword": "New password (repeated)",+ "updatePassword": "Update password",+ "logoutAllTitle": "Log out from all devices",+ "logoutAllDesc": "This will log you out from all devices and sessions, including the current one.",+ "logoutAllWarning": "This action will terminate all your active sessions across all devices. You will need to log in again on each device.","general": "General settings",- "update": "Update profile",+ "update": "Save changes","email": "Email reports","timezone": "Timezone preference","frequency": "How often should we send you an email summary about your websites?","noLink": "Didn't receive a link to confirm the email address? Request a new one!","delete": "Delete account",+ "language": "Language",+ "languageDesc": "You can change the language of the application interface.",+ "changeLanguage": "Change your language",+ "interfaceDesc": "Customize how Swetrix displays information to you.",+ "communicationsDesc": "Configure how you receive updates and notifications.",+ "changeEmail": "Change email address",+ "changeEmailDesc": "Change your account email address. You need this email to sign in and verify your identity.",+ "currentEmail": "Current email address",+ "newEmail": "New email address",+ "changeEmailBtn": "Change email address",+ "changePassword": "Change password",+ "changePasswordDesc": "Update your password to keep your account secure.",+ "apiKeyDesc": "Use your API key to access Swetrix programmatically.",+ "sharedDesc": "Projects that have been shared with you by other users.",+ "organisationsDesc": "Organisations you are a member of.",+ "dangerZone": "Danger zone",+ "dangerZoneDesc": "Irreversible and destructive actions.",+ "confirmEmail": "Confirm email",+ "confirmEmailDesc": "Your email address is not yet confirmed.",+ "uiSettingsDesc": "Customize the appearance and behavior of the interface.",+ "notifications": "Notifications",+ "notificationsDesc": "Configure when and how you receive notifications.","deactivateConfirmation": "Are you sure you want to deactivate your account?\nAll of your data will be permanently removed from our servers forever.\nThis action cannot be undone.","deletionFeedbackLabel": "Why are you leaving? (optional)","deletionFeedback": "We're sad to see you go, could you please tell us why you're leaving so we could improve our service?",@@ -835,7 +873,7 @@"noOrganisations": "You are not a member of any organisation yet.","noSharedProjects": "Nobody is sharing a project with you yet.","2fa": "Two-factor authentication (2FA)",- "2faEnable": "Enable 2FA to make your account more secure.",+ "2faSectionDesc": "Add an extra layer of security to your account.","2faEnableBtn": "Enable 2FA","2faDisableBtn": "Disable 2FA","2faDesc": "An authenticator app that supports time-based, one-time passwords (TOTP) such as andOTP or Google Authenticator can scan the QR code below to enable 2FA on your Swetrix account:",@@ -844,10 +882,16 @@"enter2faToDisable": "Enter your one-time code or a recovery code","yourOneTimeCode": "Your one-time code","invalid2fa": "Invalid 2FA code, please try again",- "2faRecoveryNote": "Important: If you cannot use your authenticator app, because you've deleted the app or lost your device, you'll need a way to access your account and disable 2FA.\n\nYou can use this recovery code to disable 2FA. Write it down and store it in a safe, secure place.",+ "2faRecoveryNote": "You can use this recovery code to disable 2FA. Write it down and store it in a safe, secure place.",+ "2faRecoveryWarning": "Store your recovery code in a safe location. If you lose access to your authentication methods, it's the only way to recover your account. If you lose it, you will lose access to your account forever.","2faRecoverySaved": "I have saved this recovery code","2faEnabled": "Two-factor authenticated is enabled on your account.",+ "2faEnabledSuccess": "Two-factor authentication is active and protecting your account.","2faDisableHint": "To disable two-factor authentication, please enter your 6-digit code or one of your recovery codes below.",+ "2faQRTitle": "Can't scan the QR code?",+ "2faQRHint": "Use this secret key instead:",+ "2faSecurityRecommendation": "Two-Factor Authentication adds an additional layer of security to your account by requiring more than just a password to sign in. We recommend you enable it.",+ "securityRecommendation": "Security Recommendation","apiKey": "API Key","noApiKey": "You haven't created any API keys yet.","apiKeyWarning": "Treat your API Key like a password and keep it secret. Never hardcode it into your programs, or share it with anyone.",@@ -1599,15 +1643,25 @@},"tabs": {"general": "General",+ "generalDesc": "Configure your project name and basic settings.","access": "Access",+ "accessDesc": "Control who can view and access your project.","shields": "Shields",+ "shieldsDesc": "Protect your analytics from bots and unwanted traffic.","captcha": "CAPTCHA",+ "captchaDesc": "Add human verification to protect your forms.","emails": "Emails",+ "emailsDesc": "Configure email reports and notification preferences.","people": "People",+ "peopleDesc": "Manage team members and their permissions.","annotations": "Annotations",+ "annotationsDesc": "Add notes to mark important events on your charts.","danger": "Danger zone",+ "dangerDesc": "Destructive actions that cannot be undone.","integrations": "Integrations",- "revenue": "Revenue"+ "integrationsDesc": "Connect external services to enrich your analytics.",+ "revenue": "Revenue",+ "revenueDesc": "Track revenue and attribute sales to campaigns."},"revenue": {"title": "Revenue Tracking",@@ -2145,6 +2199,7 @@"madeInHostedIn": "Made in <0></0> / <1></1>, hosted in <2></2>","products": "Products","resources": "Resources",+ "freeTools": "Free tools","company": "Company","community": "Join our community","comparisons": "Comparisons",diff --git a/web/vite.config.ts b/web/vite.config.tsindex 7466eabb3..338d70319 100644--- a/web/vite.config.ts+++ b/web/vite.config.ts@@ -21,8 +21,7 @@ export default defineConfig({'marked','billboard.js',/^remix-utils.*/,- /^remix-i18next.*/,- 'lucide-react',+ /^remix-i18next.*/],},plugins: [reactRouter(), tsconfigPaths(), tailwindcss()],