Skip to content

📈 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!

cookie-based dashboard view selector

Blue Mouse8f11f7c3ffac
diff --git a/web/app/pages/Dashboard/Dashboard.tsx b/web/app/pages/Dashboard/Dashboard.tsx
index 92885fd36..5fe03cabe 100644
--- a/web/app/pages/Dashboard/Dashboard.tsx
+++ b/web/app/pages/Dashboard/Dashboard.tsx
@@ -1,5 +1,5 @@
import React, { useState, useEffect } from 'react'
-import { Link } from '@remix-run/react'
+import { Link, useLoaderData } from '@remix-run/react'
import { ClientOnly } from 'remix-utils/client-only'
import _isEmpty from 'lodash/isEmpty'
import _size from 'lodash/size'
@@ -19,7 +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 { setCookie } from '~/utils/cookie'
import Pagination from '~/ui/Pagination'
import { useSelector } from 'react-redux'
@@ -34,13 +34,13 @@ 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 { viewMode: defaultViewMode } = useLoaderData<any>()
const { user, loading: authLoading } = useSelector((state: StateType) => state.auth)
const showPeriodSelector = useFeatureFlag(FeatureFlag['dashboard-period-selector'])
const showTabs = useFeatureFlag(FeatureFlag['dashboard-analytics-tabs'])
@@ -49,7 +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 [viewMode, setViewMode] = useState(defaultViewMode)
const [projects, setProjects] = useState<Project[]>([])
const [paginationTotal, setPaginationTotal] = useState(0)
@@ -209,6 +209,11 @@ const Dashboard = () => {
setPage(1) // Reset to first page when changing page size
}
+ const handleViewModeChange = (mode: 'grid' | 'list') => {
+ setViewMode(mode)
+ setCookie('dashboard_view', mode, 7884000) // 3 months
+ }
+
return (
<>
<div className='min-h-min-footer bg-gray-50 dark:bg-slate-900'>
@@ -258,44 +263,38 @@ 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>
+ <div className='space-x-2 sm:mr-3 lg:px-3'>
+ <button
+ type='button'
+ title={t('dashboard.gridView')}
+ onClick={() => {
+ handleViewModeChange(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={() => {
+ handleViewModeChange(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>
{activeTab === 'lost-traffic' ? null : showPeriodSelector ? (
<PeriodSelector
activePeriod={activePeriod}
diff --git a/web/app/pages/Dashboard/ProjectCard.tsx b/web/app/pages/Dashboard/ProjectCard.tsx
index 66198a0ee..da0f3aa7a 100644
--- a/web/app/pages/Dashboard/ProjectCard.tsx
+++ b/web/app/pages/Dashboard/ProjectCard.tsx
@@ -220,19 +220,19 @@ export const ProjectCard = ({
)}
>
<div className={cx('flex flex-col', viewMode === 'list' ? 'flex-1' : 'px-4 py-4')}>
- <div className='flex items-center justify-between'>
+ <div className={cx('flex items-center', viewMode === 'grid' ? 'justify-between' : 'justify-start gap-1')}>
<p className='truncate text-lg font-semibold text-slate-900 dark:text-gray-50'>{name}</p>
{role !== 'viewer' && (
<Link onClick={(e) => e.stopPropagation()} to={_replace(routes.project_settings, ':id', id)}>
<AdjustmentsVerticalIcon
- className='h-6 w-6 text-gray-800 hover:text-gray-900 dark:text-slate-400 dark:hover:text-slate-500'
+ className='size-6 text-gray-800 hover:text-gray-900 dark:text-slate-400 dark:hover:text-slate-500'
aria-label={`${t('project.settings.settings')} ${name}`}
/>
</Link>
)}
</div>
- <div className={cx('flex flex-shrink-0 flex-wrap gap-2', viewMode === 'list' ? 'mt-0.5' : 'mt-1')}>
+ <div className='mt-1 flex flex-shrink-0 flex-wrap gap-2'>
{badges.length > 0 ? (
badges.map((badge) => <Badge key={badge.label} {...badge} />)
) : (
@@ -308,11 +308,11 @@ export const ProjectCardSkeleton = ({ viewMode }: ProjectCardSkeletonProps) => {
)}
>
<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 className={cx('flex items-center', viewMode === 'grid' ? 'justify-between' : 'justify-start gap-1')}>
+ <div className='h-6 w-3/4 max-w-80 rounded bg-gray-200 dark:bg-slate-700' />
+ <div className='size-6 rounded-[3px] bg-gray-200 dark:bg-slate-700' />
</div>
- <div className={cx('flex flex-shrink-0 flex-wrap gap-2', viewMode === 'list' ? 'mt-0.5' : 'mt-1.5')}>
+ <div className='mt-1 flex flex-shrink-0 flex-wrap gap-2'>
<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' />
diff --git a/web/app/routes/dashboard.tsx b/web/app/routes/dashboard.tsx
index e17bf0bd5..321c78c42 100644
--- a/web/app/routes/dashboard.tsx
+++ b/web/app/routes/dashboard.tsx
@@ -1,3 +1,4 @@
+import type { LoaderFunction } from '@remix-run/node'
import Dashboard from '~/pages/Dashboard'
import type { SitemapFunction } from 'remix-sitemap'
@@ -5,6 +6,13 @@ export const sitemap: SitemapFunction = () => ({
exclude: true,
})
-export default function Index() {
+export const loader: LoaderFunction = async ({ request }) => {
+ const cookieHeader = request.headers.get('Cookie')
+ const viewMode = (cookieHeader?.match(/(?<=dashboard_view=)[^;]*/)?.[0] as 'grid' | 'list') || 'grid'
+
+ return { viewMode }
+}
+
+export default function DashboardPage() {
return <Dashboard />
}