📈 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
improve sidebar UI
Blue Mouse2e93a42dbebc
diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsxindex ac63b28b8..12364dce7 100644--- a/web/app/pages/Project/View/ViewProject.tsx+++ b/web/app/pages/Project/View/ViewProject.tsx@@ -1050,44 +1050,46 @@ const ViewProjectContent = () => {<>{!isEmbedded ? <Header /> : null}<div className='flex min-h-screen flex-col bg-gray-50 dark:bg-slate-900'>- <div className='relative flex flex-1'>- <ProjectSidebar- tabs={tabs}- activeTab={activeTab}- onTabChange={() => {}}- projectId={id}- projectName=''- dataLoading={false}- searchParams={searchParams}- allowedToManage={false}- className='hidden md:flex'- />+ <div className='mx-auto w-full max-w-7xl flex-1 px-4 py-2 sm:px-6 lg:px-8'>+ <div className='relative flex gap-4'>+ <ProjectSidebar+ tabs={tabs}+ activeTab={activeTab}+ onTabChange={() => {}}+ projectId={id}+ projectName=''+ dataLoading={false}+ searchParams={searchParams}+ allowedToManage={false}+ className='hidden md:flex'+ />- <div className='flex flex-1 flex-col px-4 py-2 sm:px-6 lg:px-8'>- {/* Skeleton header */}- <div className='mb-6 flex items-center justify-between'>- <div className='h-8 w-48 animate-pulse rounded bg-gray-200 dark:bg-slate-700' />- <div className='flex gap-2'>- <div className='h-10 w-24 animate-pulse rounded bg-gray-200 dark:bg-slate-700' />- <div className='h-10 w-32 animate-pulse rounded bg-gray-200 dark:bg-slate-700' />+ <div className='flex min-w-0 flex-1 flex-col'>+ {/* Skeleton header */}+ <div className='mb-6 flex items-center justify-between'>+ <div className='h-8 w-48 animate-pulse rounded bg-gray-200 dark:bg-slate-700' />+ <div className='flex gap-2'>+ <div className='h-10 w-24 animate-pulse rounded bg-gray-200 dark:bg-slate-700' />+ <div className='h-10 w-32 animate-pulse rounded bg-gray-200 dark:bg-slate-700' />+ </div></div>- </div>- {/* Skeleton metric cards */}- <div className='mb-6 grid grid-cols-2 gap-4 md:grid-cols-4'>- {[...Array(4)].map((_, i) => (- <div key={i} className='h-24 animate-pulse rounded-lg bg-gray-200 dark:bg-slate-700' />- ))}- </div>+ {/* Skeleton metric cards */}+ <div className='mb-6 grid grid-cols-2 gap-4 md:grid-cols-4'>+ {[...Array(4)].map((_, i) => (+ <div key={i} className='h-24 animate-pulse rounded-lg bg-gray-200 dark:bg-slate-700' />+ ))}+ </div>- {/* Skeleton chart */}- <div className='mb-6 h-80 animate-pulse rounded-lg bg-gray-200 dark:bg-slate-700' />+ {/* Skeleton chart */}+ <div className='mb-6 h-80 animate-pulse rounded-lg bg-gray-200 dark:bg-slate-700' />- {/* Skeleton panels */}- <div className='grid grid-cols-1 gap-4 md:grid-cols-2'>- {[...Array(4)].map((_, i) => (- <div key={i} className='h-48 animate-pulse rounded-lg bg-gray-200 dark:bg-slate-700' />- ))}+ {/* Skeleton panels */}+ <div className='grid grid-cols-1 gap-4 md:grid-cols-2'>+ {[...Array(4)].map((_, i) => (+ <div key={i} className='h-48 animate-pulse rounded-lg bg-gray-200 dark:bg-slate-700' />+ ))}+ </div></div></div></div>@@ -1128,21 +1130,9 @@ const ViewProjectContent = () => {'min-h-screen': isEmbedded,})}>- <div className='relative flex flex-1'>- {/* Desktop Sidebar */}- <ProjectSidebar- tabs={tabs}- activeTab={activeTab}- onTabChange={setDashboardTab}- projectId={id}- projectName={project.name}- dataLoading={dataLoading}- searchParams={searchParams}- allowedToManage={allowedToManage}- className='hidden md:flex'- />- {/* Mobile Sidebar */}- {isMobileSidebarOpen ? (+ <div className='mx-auto w-full max-w-7xl flex-1 px-4 py-2 sm:px-6 lg:px-8'>+ <div className='relative flex gap-4'>+ {/* Desktop Sidebar */}<ProjectSidebartabs={tabs}activeTab={activeTab}@@ -1152,15 +1142,29 @@ const ViewProjectContent = () => {dataLoading={dataLoading}searchParams={searchParams}allowedToManage={allowedToManage}- isMobileOpen={isMobileSidebarOpen}- onMobileClose={closeMobileSidebar}+ className='hidden md:flex'/>- ) : null}+ {/* Mobile Sidebar */}+ {isMobileSidebarOpen ? (+ <ProjectSidebar+ tabs={tabs}+ activeTab={activeTab}+ onTabChange={setDashboardTab}+ projectId={id}+ projectName={project.name}+ dataLoading={dataLoading}+ searchParams={searchParams}+ allowedToManage={allowedToManage}+ isMobileOpen={isMobileSidebarOpen}+ onMobileClose={closeMobileSidebar}+ />+ ) : null}- {/* Main Content */}- <div className='flex flex-1 flex-col px-4 py-2 sm:px-6 lg:px-8'>- <MobileSidebarTrigger onClick={openMobileSidebar} activeTabLabel={activeTabLabel} />- <LockedDashboard />+ {/* Main Content */}+ <div className='flex min-w-0 flex-1 flex-col'>+ <MobileSidebarTrigger onClick={openMobileSidebar} activeTabLabel={activeTabLabel} />+ <LockedDashboard />+ </div></div></div>@@ -1183,19 +1187,8 @@ const ViewProjectContent = () => {>{!isEmbedded ? <Header /> : null}- <div ref={ref} className='relative flex flex-1'>- <ProjectSidebar- tabs={tabs}- activeTab={activeTab}- onTabChange={setDashboardTab}- projectId={id}- projectName={project.name}- dataLoading={dataLoading}- searchParams={searchParams}- allowedToManage={allowedToManage}- className='hidden md:flex'- />- {isMobileSidebarOpen ? (+ <div className='mx-auto w-full max-w-7xl flex-1 px-4 py-2 sm:px-6 lg:px-8'>+ <div ref={ref} className='relative flex gap-4'><ProjectSidebartabs={tabs}activeTab={activeTab}@@ -1205,164 +1198,177 @@ const ViewProjectContent = () => {dataLoading={dataLoading}searchParams={searchParams}allowedToManage={allowedToManage}- isMobileOpen={isMobileSidebarOpen}- onMobileClose={closeMobileSidebar}+ className='hidden md:flex'/>- ) : null}- {/* Main Content */}- <div className='flex flex-1 flex-col px-4 py-2 sm:px-6 lg:px-8' ref={dashboardRef}>- <EventsRunningOutBanner />- <MobileSidebarTrigger onClick={openMobileSidebar} activeTabLabel={activeTabLabel} />- <AnimatePresence mode='wait'>- <motion.div- key={activeTab}- initial={{ opacity: 0 }}- animate={{ opacity: 1 }}- exit={{ opacity: 0 }}- transition={{ duration: 0.15 }}- >- {activeTab === PROJECT_TABS.ai ? <AskAIView projectId={id} /> : null}- {activeTab === PROJECT_TABS.traffic ? (- <TrafficView- tnMapping={tnMapping}- customMetrics={customMetrics}- onRemoveCustomMetric={onRemoveCustomMetric}- resetCustomMetrics={resetCustomMetrics}- mode={mode}- projectViews={projectViews}- projectViewsLoading={projectViewsLoading}- projectViewDeleting={projectViewDeleting}- loadProjectViews={loadProjectViews}- onProjectViewDelete={onProjectViewDelete}- setProjectViewToUpdate={setProjectViewToUpdate}- setIsAddAViewOpened={setIsAddAViewOpened}- onCustomMetric={onCustomMetric}- />- ) : null}- {activeTab === PROJECT_TABS.performance ? <PerformanceView tnMapping={tnMapping} /> : null}- {activeTab === PROJECT_TABS.funnels ? <FunnelsView /> : null}- {activeTab === PROJECT_TABS.alerts ? <ProjectAlertsView /> : null}- {activeTab === PROJECT_TABS.profiles ? <ProfilesView chartType={chartType} /> : null}- {activeTab === PROJECT_TABS.sessions ? (- <SessionsView tnMapping={tnMapping} chartType={chartType} rotateXAxis={rotateXAxis} />- ) : null}- {activeTab === PROJECT_TABS.errors ? <ErrorsView /> : null}- {activeTab === PROJECT_TABS.goals ? (- <GoalsView- period={period}- from={dateRange ? getFormatDate(dateRange[0]) : ''}- to={dateRange ? getFormatDate(dateRange[1]) : ''}- timezone={timezone}- />- ) : null}- {activeTab === PROJECT_TABS.experiments ? (- <ExperimentsView- period={period}- from={dateRange ? getFormatDate(dateRange[0]) : ''}- to={dateRange ? getFormatDate(dateRange[1]) : ''}- timezone={timezone}- />- ) : null}- {activeTab === PROJECT_TABS.featureFlags ? (- <FeatureFlagsView- period={period}- from={dateRange ? getFormatDate(dateRange[0]) : ''}- to={dateRange ? getFormatDate(dateRange[1]) : ''}- timezone={timezone}- />- ) : null}- {activeTab === PROJECT_TABS.captcha ? <CaptchaView projectId={id} /> : null}- </motion.div>- </AnimatePresence>-- {isEmbedded ? null : (- <>- <div className='flex-1' />- <div className='mt-4 flex w-full items-center justify-between gap-2'>- <Dropdown- items={whitelist}- buttonClassName='relative rounded-md border border-transparent bg-gray-50 p-2 hover:border-gray-300 hover:bg-white focus:z-10 focus:ring-1 focus:ring-indigo-500 focus:outline-hidden ring-inset dark:bg-slate-900 hover:dark:border-slate-700/80 dark:hover:bg-slate-800 focus:dark:ring-gray-200 inline-flex items-center [&>svg]:w-4 [&>svg]:h-4 [&>svg]:mr-0 [&>svg]:ml-1 font-medium !text-sm text-slate-900 dark:text-gray-50'- title={- <span className='inline-flex items-center'>- <Flag- className='mr-2 rounded-xs'- country={languageFlag[language]}- size={16}- alt={languages[language]}- />- {languages[language]}- </span>- }- labelExtractor={(lng: string) => (- <div className='flex items-center'>- <Flag- className='mr-2 rounded-xs'- country={languageFlag[lng]}- size={16}- alt={languageFlag[lng]}- />- {languages[lng]}- </div>- )}- onSelect={(lng: string) => {- changeLanguage(lng)- }}- headless- />- <div className='flex items-center gap-2'>- <button- type='button'- onClick={() => setIsHotkeysHelpOpened(true)}- aria-label={t('modals.shortcuts.title')}- className='relative rounded-md border border-transparent bg-gray-50 p-2 transition-colors ring-inset hover:border-gray-300 hover:bg-white focus:z-10 focus:ring-1 focus:ring-indigo-500 focus:outline-hidden dark:bg-slate-900 hover:dark:border-slate-700/80 dark:hover:bg-slate-800 focus:dark:ring-gray-200'- >- <KeyboardIcon className='h-6 w-6 text-slate-700 dark:text-gray-200' />- </button>+ {isMobileSidebarOpen ? (+ <ProjectSidebar+ tabs={tabs}+ activeTab={activeTab}+ onTabChange={setDashboardTab}+ projectId={id}+ projectName={project.name}+ dataLoading={dataLoading}+ searchParams={searchParams}+ allowedToManage={allowedToManage}+ isMobileOpen={isMobileSidebarOpen}+ onMobileClose={closeMobileSidebar}+ />+ ) : null}+ {/* Main Content */}+ <div className='flex min-w-0 flex-1 flex-col' ref={dashboardRef}>+ <EventsRunningOutBanner />+ <MobileSidebarTrigger onClick={openMobileSidebar} activeTabLabel={activeTabLabel} />+ <AnimatePresence mode='wait'>+ <motion.div+ key={activeTab}+ initial={{ opacity: 0 }}+ animate={{ opacity: 1 }}+ exit={{ opacity: 0 }}+ transition={{ duration: 0.15 }}+ >+ {activeTab === PROJECT_TABS.ai ? <AskAIView projectId={id} /> : null}+ {activeTab === PROJECT_TABS.traffic ? (+ <TrafficView+ tnMapping={tnMapping}+ customMetrics={customMetrics}+ onRemoveCustomMetric={onRemoveCustomMetric}+ resetCustomMetrics={resetCustomMetrics}+ mode={mode}+ projectViews={projectViews}+ projectViewsLoading={projectViewsLoading}+ projectViewDeleting={projectViewDeleting}+ loadProjectViews={loadProjectViews}+ onProjectViewDelete={onProjectViewDelete}+ setProjectViewToUpdate={setProjectViewToUpdate}+ setIsAddAViewOpened={setIsAddAViewOpened}+ onCustomMetric={onCustomMetric}+ />+ ) : null}+ {activeTab === PROJECT_TABS.performance ? <PerformanceView tnMapping={tnMapping} /> : null}+ {activeTab === PROJECT_TABS.funnels ? <FunnelsView /> : null}+ {activeTab === PROJECT_TABS.alerts ? <ProjectAlertsView /> : null}+ {activeTab === PROJECT_TABS.profiles ? <ProfilesView chartType={chartType} /> : null}+ {activeTab === PROJECT_TABS.sessions ? (+ <SessionsView tnMapping={tnMapping} chartType={chartType} rotateXAxis={rotateXAxis} />+ ) : null}+ {activeTab === PROJECT_TABS.errors ? <ErrorsView /> : null}+ {activeTab === PROJECT_TABS.goals ? (+ <GoalsView+ period={period}+ from={dateRange ? getFormatDate(dateRange[0]) : ''}+ to={dateRange ? getFormatDate(dateRange[1]) : ''}+ timezone={timezone}+ />+ ) : null}+ {activeTab === PROJECT_TABS.experiments ? (+ <ExperimentsView+ period={period}+ from={dateRange ? getFormatDate(dateRange[0]) : ''}+ to={dateRange ? getFormatDate(dateRange[1]) : ''}+ timezone={timezone}+ />+ ) : null}+ {activeTab === PROJECT_TABS.featureFlags ? (+ <FeatureFlagsView+ period={period}+ from={dateRange ? getFormatDate(dateRange[0]) : ''}+ to={dateRange ? getFormatDate(dateRange[1]) : ''}+ timezone={timezone}+ />+ ) : null}+ {activeTab === PROJECT_TABS.captcha ? <CaptchaView projectId={id} /> : null}+ </motion.div>+ </AnimatePresence>++ {isEmbedded ? null : (+ <>+ <div className='flex-1' />+ <div className='mt-4 flex w-full items-center justify-between gap-2'><Dropdown+ items={whitelist}+ buttonClassName='relative rounded-md border border-transparent bg-gray-50 p-2 hover:border-gray-300 hover:bg-white focus:z-10 focus:ring-1 focus:ring-indigo-500 focus:outline-hidden ring-inset dark:bg-slate-900 hover:dark:border-slate-700/80 dark:hover:bg-slate-800 focus:dark:ring-gray-200 inline-flex items-center [&>svg]:w-4 [&>svg]:h-4 [&>svg]:mr-0 [&>svg]:ml-1 font-medium !text-sm text-slate-900 dark:text-gray-50'title={- <span className='flex items-center justify-center'>- <span className='sr-only'>{t('header.switchTheme')}</span>- {theme === 'dark' ? (- <SunIcon className='h-6 w-6 text-gray-200' aria-hidden='true' />- ) : (- <MoonIcon className='h-6 w-6 text-slate-700' aria-hidden='true' />- )}+ <span className='inline-flex items-center'>+ <Flag+ className='mr-2 rounded-xs'+ country={languageFlag[language]}+ size={16}+ alt={languages[language]}+ />+ {languages[language]}</span>}- items={[- { key: 'light', label: t('header.light'), icon: SunIcon },- { key: 'dark', label: t('header.dark'), icon: MoonIcon },- ]}- keyExtractor={(item) => item.key}- labelExtractor={(item) => (- <div- className={cx('flex w-full items-center', {- 'light:text-indigo-600': item.key === 'light',- 'dark:text-indigo-400': item.key === 'dark',- })}- >- <item.icon- className={cx('mr-2 h-5 w-5', {- 'dark:text-gray-300': item.key === 'light',- 'light:text-gray-400': item.key === 'dark',- })}- aria-hidden='true'+ labelExtractor={(lng: string) => (+ <div className='flex items-center'>+ <Flag+ className='mr-2 rounded-xs'+ country={languageFlag[lng]}+ size={16}+ alt={languageFlag[lng]}/>- {item.label}+ {languages[lng]}</div>)}- onSelect={(item) => setTheme(item.key as 'light' | 'dark')}- className='flex'- chevron={null}+ onSelect={(lng: string) => {+ changeLanguage(lng)+ }}headless- buttonClassName='relative rounded-md border border-transparent bg-gray-50 p-2 md:px-2 hover:border-gray-300 hover:bg-white focus:z-10 focus:ring-1 focus:ring-indigo-500 focus:outline-hidden ring-inset dark:bg-slate-900 hover:dark:border-slate-700/80 dark:hover:bg-slate-800 focus:dark:ring-gray-200'- menuItemsClassName='top-5'- selectItemClassName='font-semibold'/>+ <div className='flex items-center gap-2'>+ <button+ type='button'+ onClick={() => setIsHotkeysHelpOpened(true)}+ aria-label={t('modals.shortcuts.title')}+ className='relative rounded-md border border-transparent bg-gray-50 p-2 transition-colors ring-inset hover:border-gray-300 hover:bg-white focus:z-10 focus:ring-1 focus:ring-indigo-500 focus:outline-hidden dark:bg-slate-900 hover:dark:border-slate-700/80 dark:hover:bg-slate-800 focus:dark:ring-gray-200'+ >+ <KeyboardIcon className='h-6 w-6 text-slate-700 dark:text-gray-200' />+ </button>+ <Dropdown+ title={+ <span className='flex items-center justify-center'>+ <span className='sr-only'>{t('header.switchTheme')}</span>+ {theme === 'dark' ? (+ <SunIcon className='h-6 w-6 text-gray-200' aria-hidden='true' />+ ) : (+ <MoonIcon className='h-6 w-6 text-slate-700' aria-hidden='true' />+ )}+ </span>+ }+ items={[+ { key: 'light', label: t('header.light'), icon: SunIcon },+ { key: 'dark', label: t('header.dark'), icon: MoonIcon },+ ]}+ keyExtractor={(item) => item.key}+ labelExtractor={(item) => (+ <div+ className={cx('flex w-full items-center', {+ 'light:text-indigo-600': item.key === 'light',+ 'dark:text-indigo-400': item.key === 'dark',+ })}+ >+ <item.icon+ className={cx('mr-2 h-5 w-5', {+ 'dark:text-gray-300': item.key === 'light',+ 'light:text-gray-400': item.key === 'dark',+ })}+ aria-hidden='true'+ />+ {item.label}+ </div>+ )}+ onSelect={(item) => setTheme(item.key as 'light' | 'dark')}+ className='flex'+ chevron={null}+ headless+ buttonClassName='relative rounded-md border border-transparent bg-gray-50 p-2 md:px-2 hover:border-gray-300 hover:bg-white focus:z-10 focus:ring-1 focus:ring-indigo-500 focus:outline-hidden ring-inset dark:bg-slate-900 hover:dark:border-slate-700/80 dark:hover:bg-slate-800 focus:dark:ring-gray-200'+ menuItemsClassName='top-5'+ selectItemClassName='font-semibold'+ />+ </div></div>- </div>- </>- )}+ </>+ )}+ </div></div></div>diff --git a/web/app/pages/Project/View/components/ProjectSidebar.tsx b/web/app/pages/Project/View/components/ProjectSidebar.tsxindex b15550e5f..b9470eeac 100644--- a/web/app/pages/Project/View/components/ProjectSidebar.tsx+++ b/web/app/pages/Project/View/components/ProjectSidebar.tsx@@ -270,6 +270,17 @@ const ProjectSidebar: React.FC<ProjectSidebarProps> = ({return false})+ const [isScrolled, setIsScrolled] = useState(false)++ useEffect(() => {+ const handleScroll = () => {+ setIsScrolled(window.scrollY > 40)+ }++ window.addEventListener('scroll', handleScroll, { passive: true })+ return () => window.removeEventListener('scroll', handleScroll)+ }, [])+const toggleCollapsed = useCallback(() => {setIsCollapsed((prev) => {const newValue = !prev@@ -358,13 +369,14 @@ const ProjectSidebar: React.FC<ProjectSidebarProps> = ({const sidebarContent = (<asideclassName={cn(- 'sticky top-0 flex h-screen shrink-0 flex-col self-start border-r border-gray-200 bg-white transition-all duration-200 dark:border-slate-800 dark:bg-slate-900',- isMobileOpen ? 'w-64' : isCollapsed ? 'w-14' : 'w-56',+ 'sticky top-2 flex shrink-0 flex-col self-start overflow-hidden rounded-lg border border-gray-200 bg-white transition-all duration-300 ease-in-out dark:border-slate-800/60 dark:bg-slate-800/25',+ isMobileOpen ? 'h-screen w-64' : isScrolled ? 'h-[calc(100vh-1.5rem)]' : 'h-[calc(100vh-60px-1rem)]',+ isCollapsed && !isMobileOpen ? 'w-14' : 'w-56',className,)}>{/* Project name at the top */}- <div className='sticky top-0 z-10 flex items-center justify-between border-b border-gray-200 bg-white px-4 py-2 dark:border-slate-800 dark:bg-slate-900'>+ <div className='sticky top-0 z-10 flex items-center justify-between border-b border-gray-200 bg-white px-4 py-2 dark:border-slate-800/60 dark:bg-slate-800/25'>{isCollapsed && !isMobileOpen ? (<Tooltiptext={projectName}@@ -491,7 +503,7 @@ const ProjectSidebar: React.FC<ProjectSidebarProps> = ({</div>{/* Bottom section: Collapse button + Settings */}- <div className='sticky bottom-0 flex flex-col gap-0.5 border-t border-gray-200 bg-white px-2 py-2 dark:border-slate-800 dark:bg-slate-900'>+ <div className='sticky bottom-0 flex flex-col gap-0.5 border-t border-gray-200 bg-white px-2 py-2 dark:border-slate-800/60 dark:bg-slate-800/25'>{/* Collapse/Expand button - hide on mobile */}{!isMobileOpen ? (<button