📈 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
Merge branch 'main' into improvement/tailwind-v4
Blue Mousee9dd61555cc3
diff --cc web/app/pages/Captcha/View/ViewCaptcha.tsxindex ba1e7ea32,085012fa6..bd0d4fce7--- a/web/app/pages/Captcha/View/ViewCaptcha.tsx+++ b/web/app/pages/Captcha/View/ViewCaptcha.tsx@@@ -603,223 -633,243 +633,243 @@@ const ViewCaptcha = ({ ssrTheme }: Viewreturn (<ClientOnly fallback={<PageLoader />}>{() => (- <>- <EventsRunningOutBanner />- <div ref={ref} className='bg-gray-50 dark:bg-slate-900'>- <div- className='mx-auto min-h-min-footer w-full max-w-[1584px] px-2 py-6 sm:px-4 lg:px-8'- ref={dashboardRef}- >- <div className='mt-2 flex flex-col items-center justify-between lg:flex-row lg:items-start'>- <h2 className='break-words break-all text-xl font-bold text-gray-900 dark:text-gray-50'>{name}</h2>- <div className='mx-auto mt-3 flex w-full max-w-[420px] flex-wrap items-center justify-between sm:mx-0 sm:w-auto sm:max-w-none lg:mt-0'>- <button- type='button'- title={t('project.refreshStats')}- onClick={refreshStats}- className={cx(- 'hover:shadow-xs focus:outline-hidden relative mr-3 rounded-md bg-gray-50 p-2 text-sm font-medium hover:bg-white focus:z-10 focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 dark:bg-slate-900 dark:hover:bg-slate-800 focus:dark:border-gray-200 focus:dark:ring-gray-200',- {- 'cursor-not-allowed opacity-50': authLoading || dataLoading,- },- )}- >- <RotateCw className='h-5 w-5 text-gray-700 dark:text-gray-50' />- </button>- <Dropdown- header={t('project.exportData')}- items={exportTypes}- title={[<DownloadIcon key='download-icon' className='h-5 w-5' strokeWidth={1.5} />]}- labelExtractor={(item) => item.label}- keyExtractor={(item) => item.label}- onSelect={(item) => item.onClick()}- className={cx('mr-3', { hidden: isPanelsDataEmpty || analyticsLoading })}- chevron='mini'- buttonClassName='!p-2 rounded-md hover:bg-white hover:shadow-xs dark:hover:bg-slate-800 focus:z-10 focus:outline-hidden focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 focus:dark:ring-gray-200 focus:dark:border-gray-200'- headless- />- <div- className={cx('space-x-2 border-gray-200 dark:border-gray-600 sm:mr-3 lg:border-x lg:px-3', {- // TODO: Fix a crash when user selects 'bar' chart and refreshes the page:- // Uncaught TypeError: can't access property "create", point5 is undefined- hidden: isPanelsDataEmpty || analyticsLoading || checkIfAllMetricsAreDisabled || true,- })}- >+ <ViewProjectContext.Provider+ value={{+ // States+ projectId: project?.id,+ projectPassword: '',+ timezone,+ dateRange,+ isLoading: authLoading,+ timeBucket,+ period,+ activePeriod,+ periodPairs,+ timeFormat,+ size,+ allowedToManage: project.role === 'admin' || project.role === 'owner',+ dataLoading,+ activeTab: 'traffic',+ filters,++ // Functions+ setDateRange,+ updatePeriod,+ updateTimebucket,+ setPeriodPairs,++ // Refs+ refCalendar,+ }}+ >+ <>+ <EventsRunningOutBanner />+ <div ref={ref} className='bg-gray-50 dark:bg-slate-900'>+ <div+ className='mx-auto min-h-min-footer w-full max-w-[1584px] px-2 py-6 sm:px-4 lg:px-8'+ ref={dashboardRef}+ >+ <div className='mt-2 flex flex-col items-center justify-between lg:flex-row lg:items-start'>+ <h2 className='break-words break-all text-xl font-bold text-gray-900 dark:text-gray-50'>+ {project.name}+ </h2>+ <div className='mx-auto mt-3 flex w-full max-w-[420px] flex-wrap items-center justify-between sm:mx-0 sm:w-auto sm:max-w-none lg:mt-0'><buttontype='button'- title={t('project.barChart')}- onClick={() => setChartTypeOnClick(chartTypes.bar)}+ title={t('project.refreshStats')}+ onClick={refreshStats}className={cx(- 'focus:outline-hidden relative rounded-md fill-gray-700 p-2 text-sm font-medium focus:z-10 focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 dark:fill-gray-50 focus:dark:border-gray-200 focus:dark:ring-gray-200',- 'relative mr-3 rounded-md bg-gray-50 p-2 text-sm font-medium hover:bg-white hover:shadow-sm focus:z-10 focus:border-indigo-500 focus:outline-none focus:ring-1 focus:ring-indigo-500 dark:bg-slate-900 dark:hover:bg-slate-800 focus:dark:border-gray-200 focus:dark:ring-gray-200',++ 'hover:shadow-xs focus:outline-hidden relative mr-3 rounded-md bg-gray-50 p-2 text-sm font-medium hover:bg-white focus:z-10 focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 dark:bg-slate-900 dark:hover:bg-slate-800 focus:dark:border-gray-200 focus:dark:ring-gray-200',{- 'shadow-xs bg-white stroke-white dark:bg-slate-800 dark:stroke-slate-800':- chartType === chartTypes.bar,- 'bg-gray-50 stroke-gray-50 dark:bg-slate-900 dark:stroke-slate-900 [&_svg]:hover:fill-gray-500 [&_svg]:hover:dark:fill-gray-200':- chartType !== chartTypes.bar,+ 'cursor-not-allowed opacity-50': authLoading || dataLoading,},)}>- <BarChart className='h-5 w-5 [&_path]:stroke-[3.5%]' />+ <RotateCw className='h-5 w-5 text-gray-700 dark:text-gray-50' /></button>- <button- type='button'- title={t('project.lineChart')}- onClick={() => setChartTypeOnClick(chartTypes.line)}- className={cx(- 'focus:outline-hidden relative rounded-md fill-gray-700 p-2 text-sm font-medium focus:z-10 focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 dark:fill-gray-50 focus:dark:border-gray-200 focus:dark:ring-gray-200',- {- 'shadow-xs bg-white stroke-white dark:bg-slate-800 dark:stroke-slate-800':- chartType === chartTypes.line,- 'bg-gray-50 stroke-gray-50 dark:bg-slate-900 dark:stroke-slate-900 [&_svg]:hover:fill-gray-500 [&_svg]:hover:dark:fill-gray-200':- chartType !== chartTypes.line,- },- )}- >- <LineChart className='h-5 w-5 [&_path]:stroke-[3.5%]' />- </button>- </div>- {!isPanelsDataEmpty && (<Dropdown- items={chartMetrics}- title={t('project.metricVis')}- className={cx({ hidden: isPanelsDataEmpty || analyticsLoading })}- labelExtractor={(pair) => {- const { label, active } = pair-- return (- <Checkbox- className={cx('px-4 py-2', { hidden: isPanelsDataEmpty || analyticsLoading })}- label={label}- checked={active}- onChange={() => {}}- />- )- }}- keyExtractor={(pair) => pair.id}- onSelect={({ id: pairID }) => {- switchActiveChartMetric(pairID)- }}- buttonClassName='!px-3'- selectItemClassName='group text-gray-700 dark:text-gray-50 dark:border-gray-800 dark:bg-slate-800 block text-sm cursor-pointer hover:bg-gray-200 dark:hover:bg-slate-700'+ header={t('project.exportData')}+ items={exportTypes}+ title={[<DownloadIcon key='download-icon' className='h-5 w-5' strokeWidth={1.5} />]}+ labelExtractor={(item) => item.label}+ keyExtractor={(item) => item.label}+ onSelect={(item) => item.onClick()}+ className={cx('mr-3', { hidden: isPanelsDataEmpty || analyticsLoading })}chevron='mini'- buttonClassName='!p-2 rounded-md hover:bg-white hover:shadow-sm dark:hover:bg-slate-800 focus:z-10 focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 focus:dark:ring-gray-200 focus:dark:border-gray-200'++ buttonClassName='!p-2 rounded-md hover:bg-white hover:shadow-xs dark:hover:bg-slate-800 focus:z-10 focus:outline-hidden focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500 focus:dark:ring-gray-200 focus:dark:border-gray-200'headless/>- )}- <TBPeriodSelector- activePeriod={activePeriod}- updateTimebucket={updateTimebucket}- timeBucket={timeBucket}- items={_filter(periodPairs, (item) => !_includes(['all', '1h'], item.period))}- title={activePeriod?.label}- onSelect={(pair) => {- if (pair.isCustomDate) {- setTimeout(() => {- // @ts-ignore- refCalendar.current.openCalendar()- }, 100)- } else {- setPeriodPairs(captchaTbPeriodPairs(t, undefined, undefined, language))- setDateRange(null)- updatePeriod(pair)- }- }}- />- {(project.role === 'admin' || project.role === 'owner') && (- <button- type='button'- onClick={openSettingsHandler}- className='flex px-3 text-sm font-medium text-gray-700 hover:text-gray-600 dark:text-gray-50 dark:hover:text-gray-200'+ <div+ className={cx('space-x-2 border-gray-200 dark:border-gray-600 sm:mr-3 lg:border-x lg:px-3', {+ // TODO: Fix a crash when user selects 'bar' chart and refreshes the page:+ // Uncaught TypeError: can't access property "create", point5 is undefined+ hidden: isPanelsDataEmpty || analyticsLoading || true,+ })}>- <>- <SettingsIcon className='mr-1 h-5 w-5' strokeWidth={1.5} />- {t('common.settings')}- </>- </button>- )}- <FlatPicker- ref={refCalendar}- onChange={(date) => setDateRange(date)}- value={dateRange || []}- maxDateMonths={MAX_MONTHS_IN_PAST}- />- </div>- </div>- {analyticsLoading && <Loader />}- {isPanelsDataEmpty && <NoEvents filters={filters} resetFilters={resetFilters} />}- <div className={cx('pt-4', { hidden: isPanelsDataEmpty || analyticsLoading })}>- <div- className={cx('h-80', {- hidden: checkIfAllMetricsAreDisabled,- })}- >- <div className='h-80 [&_svg]:!overflow-visible' id='captchaChart' />- </div>- <Filters- filters={filters}- onRemoveFilter={filterHandler}- onChangeExclusive={onChangeExclusive}- tnMapping={tnMapping}- resetFilters={resetFilters}- />- {dataLoading && (- <div className='static mt-4 !bg-transparent' id='loader'>- <div className='loader-head dark:!bg-slate-800'>- <div className='first dark:!bg-slate-600' />- <div className='second dark:!bg-slate-600' />+ <button+ type='button'+ title={t('project.barChart')}+ onClick={() => setChartTypeOnClick(chartTypes.bar)}+ className={cx(- 'relative rounded-md fill-gray-700 p-2 text-sm font-medium focus:z-10 focus:border-indigo-500 focus:outline-none focus:ring-1 focus:ring-indigo-500 dark:fill-gray-50 focus:dark:border-gray-200 focus:dark:ring-gray-200',++ 'focus:outline-hidden relative rounded-md fill-gray-700 p-2 text-sm font-medium focus:z-10 focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 dark:fill-gray-50 focus:dark:border-gray-200 focus:dark:ring-gray-200',+ {- 'bg-white stroke-white shadow-sm dark:bg-slate-800 dark:stroke-slate-800':++ 'shadow-xs bg-white stroke-white dark:bg-slate-800 dark:stroke-slate-800':+ chartType === chartTypes.bar,+ 'bg-gray-50 stroke-gray-50 dark:bg-slate-900 dark:stroke-slate-900 [&_svg]:hover:fill-gray-500 [&_svg]:hover:dark:fill-gray-200':+ chartType !== chartTypes.bar,+ },+ )}+ >+ <BarChart className='h-5 w-5 [&_path]:stroke-[3.5%]' />+ </button>+ <button+ type='button'+ title={t('project.lineChart')}+ onClick={() => setChartTypeOnClick(chartTypes.line)}+ className={cx(- 'relative rounded-md fill-gray-700 p-2 text-sm font-medium focus:z-10 focus:border-indigo-500 focus:outline-none focus:ring-1 focus:ring-indigo-500 dark:fill-gray-50 focus:dark:border-gray-200 focus:dark:ring-gray-200',++ 'focus:outline-hidden relative rounded-md fill-gray-700 p-2 text-sm font-medium focus:z-10 focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 dark:fill-gray-50 focus:dark:border-gray-200 focus:dark:ring-gray-200',+ {- 'bg-white stroke-white shadow-sm dark:bg-slate-800 dark:stroke-slate-800':++ 'shadow-xs bg-white stroke-white dark:bg-slate-800 dark:stroke-slate-800':+ chartType === chartTypes.line,+ 'bg-gray-50 stroke-gray-50 dark:bg-slate-900 dark:stroke-slate-900 [&_svg]:hover:fill-gray-500 [&_svg]:hover:dark:fill-gray-200':+ chartType !== chartTypes.line,+ },+ )}+ >+ <LineChart className='h-5 w-5 [&_path]:stroke-[3.5%]' />+ </button></div>+ <TBPeriodSelector+ activePeriod={activePeriod}+ updateTimebucket={updateTimebucket}+ timeBucket={timeBucket}+ items={_filter(periodPairs, (item) => !_includes(['all', '1h'], item.period))}+ title={activePeriod?.label}+ onSelect={(pair) => {+ if (pair.isCustomDate) {+ setTimeout(() => {+ // @ts-ignore+ refCalendar.current.openCalendar()+ }, 100)+ } else {+ setPeriodPairs(captchaTbPeriodPairs(t, undefined, undefined, language))+ setDateRange(null)+ updatePeriod(pair)+ }+ }}+ />+ {(project.role === 'admin' || project.role === 'owner') && (+ <button+ type='button'+ onClick={openSettingsHandler}+ className='flex px-3 text-sm font-medium text-gray-700 hover:text-gray-600 dark:text-gray-50 dark:hover:text-gray-200'+ >+ <>+ <SettingsIcon className='mr-1 h-5 w-5' strokeWidth={1.5} />+ {t('common.settings')}+ </>+ </button>+ )}+ <FlatPicker+ ref={refCalendar}+ onChange={(date) => setDateRange(date)}+ value={dateRange || []}+ maxDateMonths={MAX_MONTHS_IN_PAST}+ /></div>- )}- <div className='mt-5 grid grid-cols-1 gap-5 sm:grid-cols-2 lg:grid-cols-3'>- {!_isEmpty(panelsData.types) &&- _map(PANELS_ORDER, (type: keyof typeof tnMapping) => {- const panelName = tnMapping[type]- const panelIcon = panelIconMapping[type]-- if (type === 'cc') {- const rowMapper = (entry: any) => {- const { name: entryName, cc } = entry-- if (cc) {- return <CCRow cc={cc} name={entryName} language={language} />- }+ </div>+ {analyticsLoading && <Loader />}+ {isPanelsDataEmpty && <NoEvents filters={filters} resetFilters={resetFilters} />}+ <div className={cx('pt-4', { hidden: isPanelsDataEmpty || analyticsLoading })}>+ <div className='h-80'>+ <div className='h-80 [&_svg]:!overflow-visible' id='captchaChart' />+ </div>+ <Filters+ filters={filters}+ onRemoveFilter={filterHandler}+ onChangeExclusive={onChangeExclusive}+ tnMapping={tnMapping}+ resetFilters={resetFilters}+ />+ {dataLoading && (+ <div className='static mt-4 !bg-transparent' id='loader'>+ <div className='loader-head dark:!bg-slate-800'>+ <div className='first dark:!bg-slate-600' />+ <div className='second dark:!bg-slate-600' />+ </div>+ </div>+ )}+ <div className='mt-5 grid grid-cols-1 gap-5 sm:grid-cols-2 lg:grid-cols-3'>+ {!_isEmpty(panelsData.types) &&+ _map(PANELS_ORDER, (type: keyof typeof tnMapping) => {+ const panelName = tnMapping[type]+ const panelIcon = panelIconMapping[type]- return <CCRow cc={entryName} language={language} />- }+ if (type === 'cc') {+ const rowMapper = (entry: any) => {+ const { name: entryName, cc } = entry- return (- <Panel- key={type}- icon={panelIcon}- id={type}- onFilter={filterHandler}- name={panelName}- data={panelsData.data[type]}- rowMapper={rowMapper}- />- )- }+ if (cc) {+ return <CCRow cc={cc} name={entryName} language={language} />+ }- if (type === 'dv') {- return (- <Panel- key={type}- icon={panelIcon}- id={type}- onFilter={filterHandler}- name={panelName}- data={panelsData.data[type]}- rowMapper={(entry: { name: keyof typeof deviceIconMapping }) => {- const { name: entryName } = entry+ return <CCRow cc={entryName} language={language} />+ }- const icon = deviceIconMapping[entryName]+ return (+ <Panel+ key={type}+ icon={panelIcon}+ id={type}+ onFilter={filterHandler}+ name={panelName}+ data={panelsData.data[type]}+ rowMapper={rowMapper}+ />+ )+ }- if (!icon) {- return entryName- }+ if (type === 'dv') {+ return (+ <Panel+ key={type}+ icon={panelIcon}+ id={type}+ onFilter={filterHandler}+ name={panelName}+ data={panelsData.data[type]}+ rowMapper={(entry: { name: keyof typeof deviceIconMapping }) => {+ const { name: entryName } = entry++ const icon = deviceIconMapping[entryName]++ if (!icon) {+ return entryName+ }++ return (+ <>+ {icon}+ + {entryName}+ </>+ )+ }}+ capitalize+ />+ )+ }++ if (type === 'br') {+ const rowMapper = (entry: any) => {+ const { name: entryName } = entry+ // @ts-ignore+ const logoUrl = BROWSER_LOGO_MAP[entryName]+ if (!logoUrl) {return (<>- {icon}+ <GlobeAltIcon className='h-5 w-5' /> {entryName}</>