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!

Display custom events in profile activity calendar

Blue Mousebc954f625d88
diff --git a/backend/apps/cloud/src/analytics/analytics.service.ts b/backend/apps/cloud/src/analytics/analytics.service.ts
index 61648a484..f8ad5e0ba 100644
--- a/backend/apps/cloud/src/analytics/analytics.service.ts
+++ b/backend/apps/cloud/src/analytics/analytics.service.ts
@@ -5202,7 +5202,7 @@ export class AnalyticsService {
pid: string,
profileId: string,
months = 4,
- ): Promise<{ date: string; count: number }[]> {
+ ): Promise<{ date: string; pageviews: number; events: number }[]> {
const startDate = dayjs
.utc()
.subtract(months, 'month')
@@ -5210,13 +5210,30 @@ export class AnalyticsService {
.format('YYYY-MM-DD')
const query = `
+ WITH all_activity AS (
+ SELECT
+ toDate(created) AS date,
+ 1 AS isPageview,
+ 0 AS isEvent
+ FROM analytics
+ WHERE pid = {pid:FixedString(12)}
+ AND profileId = {profileId:String}
+ AND created >= {startDate:Date}
+ UNION ALL
+ SELECT
+ toDate(created) AS date,
+ 0 AS isPageview,
+ 1 AS isEvent
+ FROM customEV
+ WHERE pid = {pid:FixedString(12)}
+ AND profileId = {profileId:String}
+ AND created >= {startDate:Date}
+ )
SELECT
- toDate(created) AS date,
- count() AS count
- FROM analytics
- WHERE pid = {pid:FixedString(12)}
- AND profileId = {profileId:String}
- AND created >= {startDate:Date}
+ date,
+ sum(isPageview) AS pageviews,
+ sum(isEvent) AS events
+ FROM all_activity
GROUP BY date
ORDER BY date ASC
`
@@ -5228,7 +5245,7 @@ export class AnalyticsService {
})
.then((resultSet) => resultSet.json())
- return data as { date: string; count: number }[]
+ return data as { date: string; pageviews: number; events: number }[]
}
async getProfileChartData(
diff --git a/backend/apps/community/src/analytics/analytics.service.ts b/backend/apps/community/src/analytics/analytics.service.ts
index 016732f84..b5d195aa3 100644
--- a/backend/apps/community/src/analytics/analytics.service.ts
+++ b/backend/apps/community/src/analytics/analytics.service.ts
@@ -5419,7 +5419,7 @@ export class AnalyticsService {
pid: string,
profileId: string,
months = 4,
- ): Promise<{ date: string; count: number }[]> {
+ ): Promise<{ date: string; pageviews: number; events: number }[]> {
const startDate = dayjs
.utc()
.subtract(months, 'month')
@@ -5427,13 +5427,30 @@ export class AnalyticsService {
.format('YYYY-MM-DD')
const query = `
+ WITH all_activity AS (
+ SELECT
+ toDate(created) AS date,
+ 1 AS isPageview,
+ 0 AS isEvent
+ FROM analytics
+ WHERE pid = {pid:FixedString(12)}
+ AND profileId = {profileId:String}
+ AND created >= {startDate:Date}
+ UNION ALL
+ SELECT
+ toDate(created) AS date,
+ 0 AS isPageview,
+ 1 AS isEvent
+ FROM customEV
+ WHERE pid = {pid:FixedString(12)}
+ AND profileId = {profileId:String}
+ AND created >= {startDate:Date}
+ )
SELECT
- toDate(created) AS date,
- count() AS count
- FROM analytics
- WHERE pid = {pid:FixedString(12)}
- AND profileId = {profileId:String}
- AND created >= {startDate:Date}
+ date,
+ sum(isPageview) AS pageviews,
+ sum(isEvent) AS events
+ FROM all_activity
GROUP BY date
ORDER BY date ASC
`
@@ -5445,7 +5462,7 @@ export class AnalyticsService {
})
.then((resultSet) => resultSet.json())
- return data as { date: string; count: number }[]
+ return data as { date: string; pageviews: number; events: number }[]
}
async getProfileChartData(
diff --git a/web/app/components/Footer/index.tsx b/web/app/components/Footer/index.tsx
index 14bab5df2..531e67c7b 100644
--- a/web/app/components/Footer/index.tsx
+++ b/web/app/components/Footer/index.tsx
@@ -60,7 +60,12 @@ const productionNavigation = {
{ key: 'utm', href: routesPath.utm_generator, internal: true },
{ key: 'ctr', href: routesPath.ctr_calculator, internal: true },
{ key: 'roi', href: routesPath.roi_calculator, internal: true },
- { key: 'ip-lookup', name: 'IP Lookup', href: routesPath.ip_lookup, internal: true },
+ {
+ key: 'ip-lookup',
+ name: 'IP Lookup',
+ href: routesPath.ip_lookup,
+ internal: true,
+ },
{
key: 'sitemap-validator',
name: 'Sitemap Validator',
diff --git a/web/app/lib/models/Project.ts b/web/app/lib/models/Project.ts
index bfffbc8c1..2eb44f2d4 100644
--- a/web/app/lib/models/Project.ts
+++ b/web/app/lib/models/Project.ts
@@ -150,7 +150,7 @@ export interface ProfileDetails extends Profile {
osv: string | null
brv: string | null
topPages: { page: string; count: number }[]
- activityCalendar: { date: string; count: number }[]
+ activityCalendar: { date: string; pageviews: number; events: number }[]
chart?: {
x: string[]
pageviews: number[]
diff --git a/web/app/pages/Project/tabs/Profiles/ProfileDetails.tsx b/web/app/pages/Project/tabs/Profiles/ProfileDetails.tsx
index f0b0cc175..dfc0b4ebd 100644
--- a/web/app/pages/Project/tabs/Profiles/ProfileDetails.tsx
+++ b/web/app/pages/Project/tabs/Profiles/ProfileDetails.tsx
@@ -52,31 +52,44 @@ interface ProfileDetailsProps {
currency?: string
}
+interface ActivityDay {
+ date: string
+ pageviews: number
+ events: number
+}
+
const ActivityCalendar = ({
data,
}: {
- data: { date: string; count: number }[]
+ data: { date: string; pageviews: number; events: number }[]
}) => {
const { t } = useTranslation('common')
- const countMap = useMemo(() => {
- const map = new Map<string, number>()
- data.forEach((item) => map.set(item.date, item.count))
+ const dataMap = useMemo(() => {
+ const map = new Map<string, { pageviews: number; events: number }>()
+ data.forEach((item) =>
+ map.set(item.date, { pageviews: item.pageviews, events: item.events }),
+ )
return map
}, [data])
const weeks = useMemo(() => {
- const result: { date: string; count: number }[][] = []
+ const result: ActivityDay[][] = []
const now = dayjs()
const startDate = now.subtract(4, 'month').startOf('week')
const endDate = now.endOf('week')
- let currentWeek: { date: string; count: number }[] = []
+ let currentWeek: ActivityDay[] = []
let currentDay = startDate
while (currentDay.isBefore(endDate) || currentDay.isSame(endDate, 'day')) {
const dateStr = currentDay.format('YYYY-MM-DD')
- currentWeek.push({ date: dateStr, count: countMap.get(dateStr) || 0 })
+ const dayData = dataMap.get(dateStr)
+ currentWeek.push({
+ date: dateStr,
+ pageviews: dayData?.pageviews || 0,
+ events: dayData?.events || 0,
+ })
if (currentWeek.length === 7) {
result.push(currentWeek)
currentWeek = []
@@ -85,7 +98,7 @@ const ActivityCalendar = ({
}
if (currentWeek.length > 0) result.push(currentWeek)
return result
- }, [countMap])
+ }, [dataMap])
const monthLabels = useMemo(() => {
const labels: { month: string; weekIndex: number }[] = []
@@ -101,27 +114,35 @@ const ActivityCalendar = ({
return labels
}, [weeks])
- const getColor = (count: number) => {
- if (count === 0) return 'bg-gray-100 dark:bg-slate-700/50'
- if (count <= 2) return 'bg-emerald-200 dark:bg-emerald-800'
- if (count <= 5) return 'bg-emerald-300 dark:bg-emerald-700'
- if (count <= 10) return 'bg-emerald-400 dark:bg-emerald-600'
+ const getColor = (pageviews: number, events: number) => {
+ const total = pageviews + events
+ if (total === 0) return 'bg-gray-100 dark:bg-slate-700/50'
+ if (total <= 2) return 'bg-emerald-200 dark:bg-emerald-800'
+ if (total <= 5) return 'bg-emerald-300 dark:bg-emerald-700'
+ if (total <= 10) return 'bg-emerald-400 dark:bg-emerald-600'
return 'bg-emerald-500'
}
const dayLabels = ['S', 'M', 'T', 'W', 'T', 'F', 'S']
- const TooltipContent = ({
- day,
- }: {
- day: { date: string; count: number }
- }) => (
- <div className='text-center'>
- <div className='font-medium'>{dayjs(day.date).format('MMM D, YYYY')}</div>
- <div className='text-gray-300'>
- {day.count} {t('dashboard.pageviews').toLowerCase()}
- </div>
- </div>
+ const TooltipContent = ({ day }: { day: ActivityDay }) => (
+ <ul className='min-w-[120px] text-xs'>
+ <li className='mb-1 border-b border-gray-200 pb-1 font-semibold dark:border-gray-600'>
+ {dayjs(day.date).format('MMM D, YYYY')}
+ </li>
+ <li className='flex items-center justify-between py-px leading-snug'>
+ <div className='flex items-center'>
+ <span>{t('dashboard.pageviews')}</span>
+ </div>
+ <span className='ml-4 font-mono'>{day.pageviews}</span>
+ </li>
+ <li className='flex items-center justify-between py-px leading-snug'>
+ <div className='flex items-center'>
+ <span>{t('dashboard.events')}</span>
+ </div>
+ <span className='ml-4 font-mono'>{day.events}</span>
+ </li>
+ </ul>
)
return (
@@ -158,7 +179,7 @@ const ActivityCalendar = ({
<div
className={cn(
'h-3 w-full rounded-[2px]',
- getColor(day.count),
+ getColor(day.pageviews, day.events),
)}
/>
}