📈 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 addedDateRange
Andrii Rda9cf6d6b9f2
diff --cc src/pages/Project/View/ViewProject.jsxindex 2c273236d,80fa2dfce..ecdd1b65a--- a/src/pages/Project/View/ViewProject.jsx+++ b/src/pages/Project/View/ViewProject.jsx@@@ -565,35 -525,42 +566,38 @@@ const ViewProject = (<Dropdownitems={periodPairs}title={activePeriod.label}- labelExtractor={(pair) => pair.label}+ labelExtractor={(pair) => pair.dropdownLabel || pair.label}keyExtractor={(pair) => pair.label}- onSelect={(pair) => updatePeriod(pair.period)}+ onSelect={(pair) => {+ if (pair.isCustomDate) {+ setTimeout(() => {+ refCalendar.current.openCalendar()+ }, 100)+ } else {+ setPeriodPairs(tbPeriodPairs(t))+ setRangeDate(null)+ updatePeriod(pair)+ }+ }}/>- {!isProjectPublic && (- <div className='h-full ml-3'>- <Button- onClick={openSettingsHandler}- className='py-2.5 px-3 md:px-4 text-sm dark:text-gray-50 dark:border-gray-800 dark:bg-gray-700 dark:hover:bg-gray-600'- secondary- >- {t('common.settings')}- </Button>- </div>- )}+ <FlatPicker ref={refCalendar} onChange={(date) => setRangeDate(date)} value={rangeDate} /></div></div>- {isPanelsDataEmpty &&- (analyticsLoading ? <Loader /> : <NoEvents t={t} />)- }+ {analyticsLoading && (+ <Loader />+ )}+ {isPanelsDataEmpty && (+ <NoEvents t={t} />+ )}- <div- className={cx(- 'flex flex-row items-center justify-center md:justify-end h-10 mt-16 md:mt-5 mb-4',- { hidden: isPanelsDataEmpty || analyticsLoading }- )}- >+ <div className='flex flex-row flex-wrap items-center justify-center md:justify-end h-10 mt-16 md:mt-5 mb-4'><Checkbox- className={cx({ hidden: isPanelsDataEmpty })}++ className={cx({ hidden: isPanelsDataEmpty || analyticsLoading })}label={t('project.showAll')}id='views'checked={showTotal}onChange={(e) => setShowTotal(e.target.checked)}/>- <div className={cx('h-full ml-3', { hidden: isPanelsDataEmpty })}>- <div className='h-full ml-3'>++ <div className={cx('h-full ml-3', { hidden: isPanelsDataEmpty || analyticsLoading })}><ButtononClick={exportAsImageHandler}className='py-2.5 px-3 md:px-4 text-sm dark:text-gray-50 dark:border-gray-800 dark:bg-gray-700 dark:hover:bg-gray-600'@@@ -602,19 -569,8 +606,19 @@@{t('project.exportImg')}</Button></div>+ {!isProjectPublic && (+ <div className='h-full ml-3'>+ <Button+ onClick={openSettingsHandler}+ className='py-2.5 px-3 md:px-4 text-sm dark:text-gray-50 dark:border-gray-800 dark:bg-gray-700 dark:hover:bg-gray-600'+ secondary+ >+ {t('common.settings')}+ </Button>+ </div>+ )}</div>- <div className={cx('pt-4 md:pt-0', { hidden: isPanelsDataEmpty })}>+ <div className={cx('pt-4 md:pt-0', { hidden: isPanelsDataEmpty || analyticsLoading })}><div className='h-80' id='dataChart' /><Filtersfilters={filters}