📈 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
Dashboard - list / grid views
Blue Mousef6194679dfb0
diff --git a/web/app/pages/Dashboard/AddProject.tsx b/web/app/pages/Dashboard/AddProject.tsxindex c919b9045..522f426fe 100644--- a/web/app/pages/Dashboard/AddProject.tsx+++ b/web/app/pages/Dashboard/AddProject.tsx@@ -9,9 +9,10 @@ import routes from '~/utils/routes'interface AddProjectProps {onClick: (e: React.MouseEvent<HTMLAnchorElement>) => voidsitesCount: number+ viewMode: 'grid' | 'list'}-export const AddProject = ({ onClick, sitesCount }: AddProjectProps) => {+export const AddProject = ({ onClick, sitesCount, viewMode }: AddProjectProps) => {const { t } = useTranslation('common')return (@@ -19,14 +20,16 @@ export const AddProject = ({ onClick, sitesCount }: AddProjectProps) => {to={routes.new_project}onClick={onClick}className={cx(- 'group flex h-auto min-h-[153.1px] cursor-pointer items-center justify-center rounded-lg border-2 border-dashed border-gray-300 hover:border-gray-400',- {- 'lg:min-h-[auto]': sitesCount % 3 !== 0,- },+ 'group cursor-pointer border-2 border-dashed border-gray-300 hover:border-gray-400',+ viewMode === 'list'+ ? 'flex h-[72px] items-center justify-center rounded-lg'+ : cx('flex h-auto min-h-[153.1px] items-center justify-center rounded-lg', {+ 'lg:min-h-[auto]': sitesCount % 3 !== 0,+ }),)}>- <div>- <FolderPlusIcon className='mx-auto h-12 w-12 text-gray-400 group-hover:text-gray-500 dark:text-gray-200 group-hover:dark:text-gray-400' />+ <div className={cx('flex items-center', viewMode === 'list' && 'gap-2')}>+ <FolderPlusIcon className='h-12 w-12 text-gray-400 group-hover:text-gray-500 dark:text-gray-200 group-hover:dark:text-gray-400' /><span className='mt-2 block text-sm font-semibold text-gray-900 dark:text-gray-50 group-hover:dark:text-gray-400'>{t('dashboard.newProject')}</span>diff --git a/web/app/pages/Dashboard/Dashboard.tsx b/web/app/pages/Dashboard/Dashboard.tsxindex ea8f13b8d..92885fd36 100644--- a/web/app/pages/Dashboard/Dashboard.tsx+++ b/web/app/pages/Dashboard/Dashboard.tsx@@ -7,6 +7,7 @@ import _map from 'lodash/map'import { useTranslation } from 'react-i18next'import { FolderPlusIcon, MagnifyingGlassIcon, XMarkIcon } from '@heroicons/react/24/outline'import { XCircleIcon } from '@heroicons/react/24/solid'+import { StretchHorizontal as StretchHorizontalIcon, LayoutGrid as LayoutGridIcon } from 'lucide-react'import cx from 'clsx'import Modal from '~/ui/Modal'@@ -18,6 +19,7 @@ import DashboardLockedBanner from '~/components/DashboardLockedBanner'import useDebounce from '~/hooks/useDebounce'import useFeatureFlag from '~/hooks/useFeatureFlag'import { FeatureFlag } from '~/lib/models/User'+import { getItem, setItem } from '~/utils/localstorage'import Pagination from '~/ui/Pagination'import { useSelector } from 'react-redux'@@ -32,6 +34,12 @@ import { PeriodSelector } from './PeriodSelector'const PAGE_SIZE_OPTIONS = [12, 24, 48, 96]+const DASHBOARD_VIEW_KEY = 'dashboard_view'+const DASHBOARD_VIEW = {+ GRID: 'grid',+ LIST: 'list',+} as const+const Dashboard = () => {const { user, loading: authLoading } = useSelector((state: StateType) => state.auth)const showPeriodSelector = useFeatureFlag(FeatureFlag['dashboard-period-selector'])@@ -41,6 +49,7 @@ const Dashboard = () => {const { t } = useTranslation('common')const [isSearchActive, setIsSearchActive] = useState(false)const [showActivateEmailModal, setShowActivateEmailModal] = useState(false)+ const [viewMode, setViewMode] = useState(getItem(DASHBOARD_VIEW_KEY) || DASHBOARD_VIEW.GRID)const [projects, setProjects] = useState<Project[]>([])const [paginationTotal, setPaginationTotal] = useState(0)@@ -249,6 +258,44 @@ const Dashboard = () => {)}</div><div className='flex items-center gap-2'>+ <ClientOnly fallback={null}>+ {() => (+ <div className='space-x-2 sm:mr-3 lg:px-3'>+ <button+ type='button'+ title={t('dashboard.gridView')}+ onClick={() => {+ setViewMode(DASHBOARD_VIEW.GRID)+ setItem(DASHBOARD_VIEW_KEY, DASHBOARD_VIEW.GRID)+ }}+ className={cx(+ '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',+ viewMode === DASHBOARD_VIEW.GRID+ ? 'bg-gray-100 text-gray-900 dark:bg-slate-700 dark:text-gray-50'+ : 'text-gray-700 hover:bg-gray-50 dark:text-gray-50 dark:hover:bg-slate-700',+ )}+ >+ <LayoutGridIcon className='h-5 w-5 [&_path]:stroke-[3.5%]' />+ </button>+ <button+ type='button'+ title={t('dashboard.listView')}+ onClick={() => {+ setViewMode(DASHBOARD_VIEW.LIST)+ setItem(DASHBOARD_VIEW_KEY, DASHBOARD_VIEW.LIST)+ }}+ className={cx(+ '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',+ viewMode === DASHBOARD_VIEW.LIST+ ? 'bg-gray-100 text-gray-900 dark:bg-slate-700 dark:text-gray-50'+ : 'text-gray-700 hover:bg-gray-50 dark:text-gray-50 dark:hover:bg-slate-700',+ )}+ >+ <StretchHorizontalIcon className='h-5 w-5' />+ </button>+ </div>+ )}+ </ClientOnly>{activeTab === 'lost-traffic' ? null : showPeriodSelector ? (<PeriodSelectoractivePeriod={activePeriod}@@ -296,13 +343,13 @@ const Dashboard = () => {)}{isLoading || isLoading === null ? (<div className='min-h-min-footer bg-gray-50 dark:bg-slate-900'>- <ProjectCardSkeleton />+ <ProjectCardSkeleton viewMode={viewMode} /></div>) : (<ClientOnlyfallback={<div className='min-h-min-footer bg-gray-50 dark:bg-slate-900'>- <ProjectCardSkeleton />+ <ProjectCardSkeleton viewMode={viewMode} /></div>}>@@ -311,7 +358,14 @@ const Dashboard = () => {{_isEmpty(projects) ? (<NoProjects onClick={onNewProject} />) : (- <div className='grid grid-cols-1 gap-x-6 gap-y-3 lg:grid-cols-3 lg:gap-y-6'>+ <div+ className={cx(+ 'grid gap-x-6 gap-y-3',+ viewMode === DASHBOARD_VIEW.GRID+ ? 'grid-cols-1 lg:grid-cols-3 lg:gap-y-6'+ : 'grid-cols-1 gap-y-3',+ )}+ >{_map(projects, (project) => (<ProjectCardkey={project.id}@@ -320,10 +374,11 @@ const Dashboard = () => {overallStats={overallStats[project.id]}activePeriod={activePeriod}activeTab={activeTab}+ viewMode={viewMode}/>))}{_size(projects) % 12 !== 0 && activeTab === 'default' ? (- <AddProject sitesCount={_size(projects)} onClick={onNewProject} />+ <AddProject sitesCount={_size(projects)} onClick={onNewProject} viewMode={viewMode} />) : null}</div>)}diff --git a/web/app/pages/Dashboard/ProjectCard.tsx b/web/app/pages/Dashboard/ProjectCard.tsxindex 25eaf3928..66198a0ee 100644--- a/web/app/pages/Dashboard/ProjectCard.tsx+++ b/web/app/pages/Dashboard/ProjectCard.tsx@@ -34,6 +34,7 @@ interface ProjectCardProps {project: ProjectactivePeriod: stringactiveTab: (typeof DASHBOARD_TABS)[number]['id']+ viewMode: 'grid' | 'list'}interface MiniCardProps {@@ -84,7 +85,14 @@ const MiniCard = ({ labelTKey, total = 0, percChange }: MiniCardProps) => {)}-export const ProjectCard = ({ live = null, project, overallStats, activePeriod, activeTab }: ProjectCardProps) => {+export const ProjectCard = ({+ live = null,+ project,+ overallStats,+ activePeriod,+ activeTab,+ viewMode,+}: ProjectCardProps) => {const { t } = useTranslation('common')const [showInviteModal, setShowInviteModal] = useState(false)const isHostnameNavigationEnabled = useFeatureFlag(FeatureFlag['dashboard-hostname-cards'])@@ -206,9 +214,12 @@ export const ProjectCard = ({ live = null, project, overallStats, activePeriod,search: searchParams,}}onClick={onElementClick}- className='min-h-[153.1px] cursor-pointer overflow-hidden rounded-xl border border-gray-200 bg-gray-50 hover:bg-gray-100 dark:border-slate-800/25 dark:bg-slate-800 dark:hover:bg-slate-700'+ className={cx(+ 'cursor-pointer overflow-hidden rounded-xl border border-gray-200 bg-gray-50 hover:bg-gray-100 dark:border-slate-800/25 dark:bg-slate-800 dark:hover:bg-slate-700',+ viewMode === 'list' ? 'flex items-center justify-between px-6 py-4' : 'min-h-[153.1px]',+ )}>- <div className='px-4 py-4'>+ <div className={cx('flex flex-col', viewMode === 'list' ? 'flex-1' : 'px-4 py-4')}><div className='flex items-center justify-between'><p className='truncate text-lg font-semibold text-slate-900 dark:text-gray-50'>{name}</p>@@ -221,39 +232,39 @@ export const ProjectCard = ({ live = null, project, overallStats, activePeriod,</Link>)}</div>- <div className='mt-1 flex flex-shrink-0 flex-wrap gap-2'>+ <div className={cx('flex flex-shrink-0 flex-wrap gap-2', viewMode === 'list' ? 'mt-0.5' : 'mt-1')}>{badges.length > 0 ? (badges.map((badge) => <Badge key={badge.label} {...badge} />)) : (<Badge label='I' colour='slate' className='invisible' />)}</div>- <div className='mt-4 flex flex-shrink-0 gap-5'>- {isHostnameNavigationEnabled ? (- <MiniCard- labelTKey={project.isCaptchaProject ? 'dashboard.captchaEvents' : 'dashboard.pageviews'}- // @ts-expect-error- total={project?.trafficStats?.visits}- percChange={- activeTab === 'performance'- ? // @ts-expect-error- _round(project?.trafficStats?.percentageChange, 2)- : undefined- }- />- ) : (- <MiniCard- labelTKey={project.isCaptchaProject ? 'dashboard.captchaEvents' : 'dashboard.pageviews'}- total={live === 'N/A' ? 'N/A' : (overallStats?.current.all ?? null)}- percChange={- live === 'N/A'- ? 0- : calculateRelativePercentage(overallStats?.previous.all ?? 0, overallStats?.current.all ?? 0)- }- />- )}- {project.isAnalyticsProject && <MiniCard labelTKey='dashboard.liveVisitors' total={live} />}- </div>+ </div>+ <div className={cx('flex flex-shrink-0 gap-5', viewMode === 'list' ? 'ml-4' : 'mt-4 px-4 pb-4')}>+ {isHostnameNavigationEnabled ? (+ <MiniCard+ labelTKey={project.isCaptchaProject ? 'dashboard.captchaEvents' : 'dashboard.pageviews'}+ // @ts-expect-error+ total={project?.trafficStats?.visits}+ percChange={+ activeTab === 'performance'+ ? // @ts-expect-error+ _round(project?.trafficStats?.percentageChange, 2)+ : undefined+ }+ />+ ) : (+ <MiniCard+ labelTKey={project.isCaptchaProject ? 'dashboard.captchaEvents' : 'dashboard.pageviews'}+ total={live === 'N/A' ? 'N/A' : (overallStats?.current.all ?? null)}+ percChange={+ live === 'N/A'+ ? 0+ : calculateRelativePercentage(overallStats?.previous.all ?? 0, overallStats?.current.all ?? 0)+ }+ />+ )}+ {project.isAnalyticsProject && <MiniCard labelTKey='dashboard.liveVisitors' total={live} />}</div>{project.role !== 'owner' && !project.isAccessConfirmed && (<Modal@@ -276,28 +287,40 @@ export const ProjectCard = ({ live = null, project, overallStats, activePeriod,)}-export const ProjectCardSkeleton = () => {+interface ProjectCardSkeletonProps {+ viewMode: 'grid' | 'list'+}++export const ProjectCardSkeleton = ({ viewMode }: ProjectCardSkeletonProps) => {return (- <div className='grid grid-cols-1 gap-x-6 gap-y-3 lg:grid-cols-3 lg:gap-y-6'>- {_map(Array(12), (_, index) => (+ <div+ className={cx(+ 'grid gap-x-6 gap-y-3',+ viewMode === 'grid' ? 'grid-cols-1 lg:grid-cols-3 lg:gap-y-6' : 'grid-cols-1 gap-y-3',+ )}+ >+ {_map(Array(viewMode === 'grid' ? 12 : 8), (_, index) => (<divkey={index}- className='min-h-[153.1px] animate-pulse cursor-wait overflow-hidden rounded-xl border border-gray-200 bg-gray-50 dark:border-slate-800/25 dark:bg-slate-800'+ className={cx(+ 'animate-pulse cursor-wait overflow-hidden rounded-xl border border-gray-200 bg-gray-50 dark:border-slate-800/25 dark:bg-slate-800',+ viewMode === 'list' ? 'flex items-center justify-between px-6 py-4' : 'min-h-[153.1px]',+ )}>- <div className='px-4 py-4'>+ <div className={cx('flex flex-col', viewMode === 'list' ? 'flex-1' : 'px-4 py-4')}><div className='flex items-center justify-between'><div className='h-6 w-3/4 rounded bg-gray-200 dark:bg-slate-700' /><div className='h-6 w-6 rounded-[3px] bg-gray-200 dark:bg-slate-700' /></div>- <div className='mt-1.5 flex flex-shrink-0 flex-wrap gap-2'>+ <div className={cx('flex flex-shrink-0 flex-wrap gap-2', viewMode === 'list' ? 'mt-0.5' : 'mt-1.5')}><div className='h-6 w-16 rounded bg-gray-200 dark:bg-slate-700' /><div className='h-6 w-16 rounded bg-gray-200 dark:bg-slate-700' /><div className='h-6 w-16 rounded bg-gray-200 dark:bg-slate-700' /></div>- <div className='mt-[1.375rem] flex flex-shrink-0 gap-5'>- <div className='h-10 w-24 rounded bg-gray-200 dark:bg-slate-700' />- <div className='h-10 w-24 rounded bg-gray-200 dark:bg-slate-700' />- </div>+ </div>+ <div className={cx('flex flex-shrink-0 gap-5', viewMode === 'list' ? 'ml-4' : 'mt-[1.375rem] px-4 pb-4')}>+ <div className='h-10 w-24 rounded bg-gray-200 dark:bg-slate-700' />+ <div className='h-10 w-24 rounded bg-gray-200 dark:bg-slate-700' /></div></div>))}diff --git a/web/public/locales/en.json b/web/public/locales/en.jsonindex 19c13962f..b9b366be7 100644--- a/web/public/locales/en.json+++ b/web/public/locales/en.json@@ -688,6 +688,8 @@"delete": "Delete organisation"},"dashboard": {+ "gridView": "Grid view",+ "listView": "List view","uptime": "Uptime","captcha": "CAPTCHA","newProject": "New project",