📈 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
fixed dashboard loader
kruzhambusbb68c22ca187
diff --git a/src/pages/Dashboard/Dashboard.jsx b/src/pages/Dashboard/Dashboard.jsxindex bfbb86cd8..c9386a3ef 100644--- a/src/pages/Dashboard/Dashboard.jsx+++ b/src/pages/Dashboard/Dashboard.jsx@@ -231,43 +231,50 @@ const Dashboard = ({)}- if (!isLoading) {- return (- <Title title={t('titles.dashboard')}>- <div className='min-h-min-footer bg-gray-50 dark:bg-gray-800'>- <EventsRunningOutBanner />- <div className='flex flex-col py-6 px-4 sm:px-6 lg:px-8'>- <div className='max-w-7xl w-full mx-auto'>- <div className='flex justify-between'>- <h2 className='mt-2 text-3xl font-bold text-gray-900 dark:text-gray-50'>- {t('titles.dashboard')}- </h2>- <span onClick={onNewProject} className='inline-flex cursor-pointer items-center text-center border border-transparent leading-4 font-medium rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 shadow-sm text-white bg-indigo-600 hover:bg-indigo-700 px-4 py-2 text-sm'>- {t('dashboard.newProject')}- </span>- </div>- <div className='mt-6'>- {sharedTotal > 0 && (- <nav className='-mb-px flex space-x-8'>- {_map(tabsForDashboard, (tab) => (- <button- key={tab.name}- type='button'- onClick={() => setTabProjects(tab.name)}- className={cx('whitespace-nowrap pb-4 px-1 border-b-2 font-medium text-md', {- 'border-indigo-500 text-indigo-600 dark:text-indigo-500': tabProjects === tab.name,- 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300 dark:text-gray-400 dark:hover:text-gray-300 dark:hover:border-gray-300': tabProjects !== tab.name,- })}- aria-current={tab.name === tabProjects ? 'page' : undefined}- >- {t(tab.label)}- </button>- ))}- </nav>- )}- </div>+ return (+ <Title title={t('titles.dashboard')}>+ <div className='min-h-min-footer bg-gray-50 dark:bg-gray-800'>+ <EventsRunningOutBanner />+ <div className='flex flex-col py-6 px-4 sm:px-6 lg:px-8'>+ <div className='max-w-7xl w-full mx-auto'>+ <div className='flex justify-between'>+ <h2 className='mt-2 text-3xl font-bold text-gray-900 dark:text-gray-50'>+ {t('titles.dashboard')}+ </h2>+ <span onClick={onNewProject} className='inline-flex cursor-pointer items-center text-center border border-transparent leading-4 font-medium rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 shadow-sm text-white bg-indigo-600 hover:bg-indigo-700 px-4 py-2 text-sm'>+ {t('dashboard.newProject')}+ </span>+ </div>+ <div className='mt-6'>+ {sharedTotal > 0 && (+ <nav className='-mb-px flex space-x-8'>+ {_map(tabsForDashboard, (tab) => (+ <button+ key={tab.name}+ type='button'+ onClick={() => setTabProjects(tab.name)}+ className={cx('whitespace-nowrap pb-4 px-1 border-b-2 font-medium text-md', {+ 'border-indigo-500 text-indigo-600 dark:text-indigo-500': tabProjects === tab.name,+ 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300 dark:text-gray-400 dark:hover:text-gray-300 dark:hover:border-gray-300': tabProjects !== tab.name,+ })}+ aria-current={tab.name === tabProjects ? 'page' : undefined}+ >+ {t(tab.label)}+ </button>+ ))}+ </nav>+ )}+ </div>+ {isLoading ? (+ <Title title={t('titles.dashboard')}>+ <div className='min-h-min-footer bg-gray-50 dark:bg-gray-800'>+ <Loader />+ </div>+ </Title>+ ) : (+ <>- {tabProjects === tabForOwnedProject && (+ {tabProjects === tabForOwnedProject && (<div>{_isEmpty(_filter(projects, ({ uiHidden }) => !uiHidden)) ? (<NoProjects t={t} />@@ -298,9 +305,9 @@ const Dashboard = ({</div>)}</div>- )}+ )}- {tabProjects === tabForSharedProject && (+ {tabProjects === tabForSharedProject && (<div>{_isEmpty(_filter(sharedProjects, ({ uiHidden }) => !uiHidden)) ? (<NoProjects t={t} />@@ -355,34 +362,27 @@ const Dashboard = ({</div>)}</div>- )}+ )}+ </>+ )}- {+ {pageAmount > 1 && (<Pagination page={tabProjects === tabForSharedProject ? dashboardPaginationPageShared : dashboardPaginationPage} setPage={tabProjects === tabForSharedProject ? (page) => setDashboardPaginationPageShared(page) : (page) => setDashboardPaginationPage(page)} pageAmount={pageAmount || 0} total={tabProjects === tabForSharedProject ? sharedTotal : total} />)}- </div></div></div>- <Modal- onClose={() => setShowActivateEmailModal(false)}- onSubmit={() => setShowActivateEmailModal(false)}- submitText={t('common.gotIt')}- title={t('dashboard.verifyEmailTitle')}- type='info'- message={t('dashboard.verifyEmailDesc')}- isOpened={showActivateEmailModal}- />- </Title>- )- }-- return (- <Title title={t('titles.dashboard')}>- <div className='min-h-min-footer bg-gray-50 dark:bg-gray-800'>- <Loader /></div>+ <Modal+ onClose={() => setShowActivateEmailModal(false)}+ onSubmit={() => setShowActivateEmailModal(false)}+ submitText={t('common.gotIt')}+ title={t('dashboard.verifyEmailTitle')}+ type='info'+ message={t('dashboard.verifyEmailDesc')}+ isOpened={showActivateEmailModal}+ /></Title>)}