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!

Period selector support

Blue Mouse08c6d3e7cab2
diff --git a/web/app/api/index.ts b/web/app/api/index.ts
index 230e82176..5309f7cf4 100644
--- a/web/app/api/index.ts
+++ b/web/app/api/index.ts
@@ -266,9 +266,9 @@ export const verifyShare = ({ path, id }: { path: string; id: string }) =>
throw _isEmpty(error.response.data?.message) ? error.response.data : error.response.data.message
})
-export const getProjects = (take: number = 0, skip: number = 0, search?: string, mode?: string) =>
+export const getProjects = (take: number = 0, skip: number = 0, search?: string, mode?: string, period?: string) =>
api
- .get(`/project?take=${take}&skip=${skip}&search=${search}&mode=${mode}`)
+ .get(`/project?take=${take}&skip=${skip}&search=${search}&mode=${mode}&period=${period}`)
.then(
(
response,
diff --git a/web/app/pages/Dashboard/Dashboard.tsx b/web/app/pages/Dashboard/Dashboard.tsx
index c66478c36..76d775423 100644
--- a/web/app/pages/Dashboard/Dashboard.tsx
+++ b/web/app/pages/Dashboard/Dashboard.tsx
@@ -25,6 +25,7 @@ import { AddProject } from './AddProject'
import { Overall, Project } from '~/lib/models/Project'
import { getProjects, getLiveVisitors, getOverallStats, getOverallStatsCaptcha } from '~/api'
import { DASHBOARD_TABS, Tabs } from './Tabs'
+import { PeriodSelector } from './PeriodSelector'
const PAGE_SIZE_OPTIONS = [12, 24, 48, 96]
@@ -45,6 +46,7 @@ const Dashboard = () => {
const [overallStats, setOverallStats] = useState<Overall>({})
const [activeTab, setActiveTab] = useState<(typeof DASHBOARD_TABS)[number]['id']>(DASHBOARD_TABS[0].id)
+ const [activePeriod, setActivePeriod] = useState('7d')
const pageAmount = Math.ceil(paginationTotal / pageSize)
@@ -61,14 +63,14 @@ const Dashboard = () => {
setShowActivateEmailModal(true)
}
- const loadProjects = async (take: number, skip: number, search?: string, tab?: string) => {
+ const loadProjects = async (take: number, skip: number, search?: string, tab?: string, period?: string) => {
if (isLoading) {
return
}
setIsLoading(true)
try {
- const result = await getProjects(take, skip, search, tab)
+ const result = await getProjects(take, skip, search, tab, period)
setProjects(result.results)
setPaginationTotal(result.total)
} catch (reason: any) {
@@ -79,10 +81,10 @@ const Dashboard = () => {
}
useEffect(() => {
- loadProjects(pageSize, (page - 1) * pageSize, debouncedSearch, activeTab)
+ loadProjects(pageSize, (page - 1) * pageSize, debouncedSearch, activeTab, activePeriod)
// eslint-disable-next-line react-hooks/exhaustive-deps
- }, [page, pageSize, debouncedSearch, activeTab])
+ }, [page, pageSize, debouncedSearch, activeTab, activePeriod])
// Set up interval for live visitors
useEffect(() => {
@@ -229,14 +231,23 @@ const Dashboard = () => {
</div>
)}
</div>
- <Link
- to={routes.new_project}
- onClick={onNewProject}
- className='inline-flex cursor-pointer items-center justify-center rounded-md border border-transparent bg-slate-900 px-3 py-2 !pl-2 text-center text-sm font-medium leading-4 text-white shadow-sm hover:bg-slate-700 focus:outline-none focus:ring-2 focus:ring-slate-500 focus:ring-offset-2 dark:border-gray-800 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'
- >
- <FolderPlusIcon className='mr-1 h-5 w-5' />
- {t('dashboard.newProject')}
- </Link>
+ <div className='flex items-center gap-2'>
+ {activeTab === 'default' || activeTab === 'lost-traffic' ? null : (
+ <PeriodSelector
+ activePeriod={activePeriod}
+ setActivePeriod={setActivePeriod}
+ isLoading={isLoading === null || isLoading}
+ />
+ )}
+ <Link
+ to={routes.new_project}
+ onClick={onNewProject}
+ className='inline-flex cursor-pointer items-center justify-center rounded-md border border-transparent bg-slate-900 px-3 py-2 !pl-2 text-center text-sm font-medium leading-4 text-white shadow-sm hover:bg-slate-700 focus:outline-none focus:ring-2 focus:ring-slate-500 focus:ring-offset-2 dark:border-gray-800 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'
+ >
+ <FolderPlusIcon className='mr-1 h-5 w-5' />
+ {t('dashboard.newProject')}
+ </Link>
+ </div>
</div>
{isSearchActive && (
<div className='mb-2 flex w-full items-center sm:hidden'>
diff --git a/web/app/pages/Dashboard/PeriodSelector.tsx b/web/app/pages/Dashboard/PeriodSelector.tsx
new file mode 100644
index 000000000..81d3cdcba
--- /dev/null
+++ b/web/app/pages/Dashboard/PeriodSelector.tsx
@@ -0,0 +1,111 @@
+import React, { Fragment, useMemo } from 'react'
+import { Popover, PopoverButton, PopoverPanel, Transition } from '@headlessui/react'
+import { ChevronDownIcon } from '@heroicons/react/20/solid'
+import { useTranslation } from 'react-i18next'
+import _map from 'lodash/map'
+import cx from 'clsx'
+import { CalendarIcon } from 'lucide-react'
+import { KEY_FOR_ALL_TIME } from '~/lib/constants'
+
+interface PeriodSelectorProps {
+ activePeriod: string
+ setActivePeriod: (period: string) => void
+ isLoading: boolean
+}
+
+export const PeriodSelector = ({ activePeriod, setActivePeriod, isLoading }: PeriodSelectorProps) => {
+ const { t } = useTranslation('common')
+
+ const periods = useMemo(() => {
+ return [
+ {
+ label: t('project.thisHour'),
+ period: '1h',
+ },
+ {
+ label: t('project.last24h'),
+ period: '1d',
+ },
+ {
+ label: t('project.lastXDays', { amount: 7 }),
+ period: '7d',
+ },
+ {
+ label: t('project.lastXWeeks', { amount: 4 }),
+ period: '4w',
+ },
+ {
+ label: t('project.lastXMonths', { amount: 3 }),
+ period: '3M',
+ },
+ {
+ label: t('project.lastXMonths', { amount: 12 }),
+ period: '12M',
+ },
+ {
+ label: t('project.lastXMonths', { amount: 24 }),
+ period: '24M',
+ },
+ {
+ label: t('project.all'),
+ period: KEY_FOR_ALL_TIME,
+ },
+ ]
+ }, [t])
+
+ const period = periods.find((item) => item.period === activePeriod)?.label
+
+ return (
+ <Popover className='relative'>
+ {({ open }) => (
+ <>
+ <PopoverButton className='group inline-flex w-full px-2.5 py-2 text-sm font-medium text-gray-700 outline-none dark:text-gray-50 md:px-4'>
+ <CalendarIcon className='mr-1 h-5 w-5' strokeWidth={1.5} />
+ <span>{period}</span>
+ <ChevronDownIcon
+ className={cx(
+ 'ml-2 h-5 w-5 transform-gpu text-gray-700 transition duration-150 ease-in-out group-hover:text-gray-500 dark:text-gray-50',
+ {
+ 'rotate-180': open,
+ },
+ )}
+ aria-hidden='true'
+ />
+ </PopoverButton>
+ <Transition
+ as={Fragment}
+ enter='transition ease-out duration-200'
+ enterFrom='opacity-0 translate-y-1'
+ enterTo='opacity-100 translate-y-0'
+ leave='transition ease-in duration-150'
+ leaveFrom='opacity-100 translate-y-0'
+ leaveTo='opacity-0 translate-y-1'
+ >
+ {/* w-56 */}
+ <PopoverPanel className='absolute left-1/2 right-0 z-20 mt-3 w-max max-w-sm -translate-x-1/2 transform px-4 sm:px-0 md:left-auto md:transform-none lg:max-w-3xl'>
+ <div className='overflow-hidden rounded-lg bg-gray-50 p-1 shadow-lg ring-1 ring-black/5 dark:bg-slate-800'>
+ <ul className='w-full text-left'>
+ {_map(periods, (item) => (
+ <PopoverButton
+ as='li'
+ key={item.label}
+ onClick={() => setActivePeriod(item.period)}
+ className={cx(
+ 'block cursor-pointer rounded-md px-4 py-2 text-sm text-gray-700 hover:bg-gray-200 dark:text-gray-50 dark:hover:bg-slate-700',
+ {
+ 'cursor-wait': isLoading,
+ },
+ )}
+ >
+ {item.label}
+ </PopoverButton>
+ ))}
+ </ul>
+ </div>
+ </PopoverPanel>
+ </Transition>
+ </>
+ )}
+ </Popover>
+ )
+}