📈 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
feature: host based dashboard
Blue Mouse176935cea8d7
diff --git a/backend/apps/cloud/src/project/project.controller.ts b/backend/apps/cloud/src/project/project.controller.tsindex 0639622c7..783d72f53 100644--- a/backend/apps/cloud/src/project/project.controller.ts+++ b/backend/apps/cloud/src/project/project.controller.ts@@ -171,9 +171,13 @@ export class ProjectController {| undefined,@Query('period')period: '1h' | '1d' | '7d' | '4w' | '3M' | '12M' | '24M' | 'all' = '7d',+ @Query('use-hostname-navigation')+ useHostnameNavigation: string = 'false',): Promise<Pagination<Project> | Project[] | object> {+ const isHostnameNavigationEnabled = useHostnameNavigation === 'true'+this.logger.log(- { userId, take, skip, mode, timeFrame: period },+ { userId, take, skip, mode, timeFrame: period, useHostnameNavigation },'GET /project',)@@ -203,6 +207,7 @@ export class ProjectController {},userId,search,+ isHostnameNavigationEnabled,)}diff --git a/backend/apps/cloud/src/project/project.service.ts b/backend/apps/cloud/src/project/project.service.tsindex 35f7d0455..7884a9ac7 100644--- a/backend/apps/cloud/src/project/project.service.ts+++ b/backend/apps/cloud/src/project/project.service.ts@@ -1816,6 +1816,7 @@ export class ProjectService {options: TrafficPaginationOptions,userId: string,search?: string,+ isHostnameNavigationEnabled?: boolean,): Promise<Pagination<Project>> {// Get all visible project IDsconst projectIds = await this.getVisibleProjectIds(userId, search)@@ -1835,68 +1836,169 @@ export class ProjectService {const timeFrameClause = this.getTimeFrameClause(options.period)let query = ''- if (options.mode === 'performance') {- query = `- WITH- currentPeriod AS (- SELECT pid, count() as visits+ if (isHostnameNavigationEnabled) {+ if (options.mode === 'performance') {+ query = `+ WITH+ currentPeriod AS (+ SELECT host, pid, count() as visits+ FROM analytics+ WHERE pid IN {pids:Array(String)}+ AND created BETWEEN ${timeFrameClause.currentStart} AND ${timeFrameClause.currentEnd}+ AND host IS NOT NULL+ AND host != ''+ GROUP BY host, pid+ ),+ previousPeriod AS (+ SELECT host, pid, count() as visits+ FROM analytics+ WHERE pid IN {pids:Array(String)}+ AND created BETWEEN ${timeFrameClause.previousStart} AND ${timeFrameClause.previousEnd}+ AND host IS NOT NULL+ AND host != ''+ GROUP BY host, pid+ ),+ hostStats AS (+ SELECT+ cp.host,+ groupArray(DISTINCT cp.pid) as pids,+ sum(cp.visits) as current_visits,+ sum(pp.visits) as previous_visits+ FROM currentPeriod cp+ JOIN previousPeriod pp ON cp.host = pp.host AND cp.pid = pp.pid+ GROUP BY cp.host+ )+ SELECT+ host,+ pids,+ current_visits,+ previous_visits,+ ((current_visits - previous_visits) / previous_visits * 100) as percentage_change+ FROM hostStats+ WHERE previous_visits > 0+ ORDER BY abs(percentage_change) DESC+ LIMIT {limit:UInt32}+ OFFSET {offset:UInt32}+ `+ } else if (options.mode === 'lost-traffic') {+ query = `+ WITH last_visits AS (+ SELECT+ host,+ pid,+ max(created) as last_visit,+ count() as total_visitsFROM analyticsWHERE pid IN {pids:Array(String)}- AND created BETWEEN ${timeFrameClause.currentStart} AND ${timeFrameClause.currentEnd}- GROUP BY pid+ AND host IS NOT NULL+ AND host != ''+ GROUP BY host, pid),- previousPeriod AS (- SELECT pid, count() as visits+ hostStats AS (+ SELECT+ host,+ groupArray(DISTINCT pid) as pids,+ max(last_visit) as last_visit,+ sum(total_visits) as total_visits+ FROM last_visits+ GROUP BY host+ )+ SELECT *+ FROM hostStats+ WHERE last_visit < (now() - INTERVAL 48 HOUR)+ AND total_visits > 0+ ORDER BY last_visit DESC+ LIMIT {limit:UInt32}+ OFFSET {offset:UInt32}+ `+ } else {+ // High/Low traffic query+ query = `+ WITH hostStats AS (+ SELECT+ host,+ groupArray(DISTINCT pid) as pids,+ count() as visitsFROM analyticsWHERE pid IN {pids:Array(String)}- AND created BETWEEN ${timeFrameClause.previousStart} AND ${timeFrameClause.previousEnd}- GROUP BY pid+ AND created BETWEEN ${timeFrameClause.currentStart} AND ${timeFrameClause.currentEnd}+ AND host IS NOT NULL+ AND host != ''+ GROUP BY host)- SELECT- cp.pid,- cp.visits as current_visits,- pp.visits as previous_visits,- ((cp.visits - pp.visits) / pp.visits * 100) as percentage_change- FROM currentPeriod cp- JOIN previousPeriod pp ON cp.pid = pp.pid- WHERE pp.visits > 0- ORDER BY abs(percentage_change) DESC- LIMIT {limit:UInt32}- OFFSET {offset:UInt32}- `+ SELECT *+ FROM hostStats+ ORDER BY visits ${options.mode === 'high-traffic' ? 'DESC' : 'ASC'}+ LIMIT {limit:UInt32}+ OFFSET {offset:UInt32}+ `+ }+ } else if (options.mode === 'performance') {+ query = `+ WITH+ currentPeriod AS (+ SELECT pid, count() as visits+ FROM analytics+ WHERE pid IN {pids:Array(String)}+ AND created BETWEEN ${timeFrameClause.currentStart} AND ${timeFrameClause.currentEnd}+ GROUP BY pid+ ),+ previousPeriod AS (+ SELECT pid, count() as visits+ FROM analytics+ WHERE pid IN {pids:Array(String)}+ AND created BETWEEN ${timeFrameClause.previousStart} AND ${timeFrameClause.previousEnd}+ GROUP BY pid+ )+ SELECT+ cp.pid,+ cp.visits as current_visits,+ pp.visits as previous_visits,+ ((cp.visits - pp.visits) / pp.visits * 100) as percentage_change+ FROM currentPeriod cp+ JOIN previousPeriod pp ON cp.pid = pp.pid+ WHERE pp.visits > 0+ ORDER BY abs(percentage_change) DESC+ LIMIT {limit:UInt32}+ OFFSET {offset:UInt32}+ `} else if (options.mode === 'lost-traffic') {query = `- WITH last_visits AS (+ WITH last_visits AS (+ SELECT+ pid,+ max(created) as last_visit,+ count() as total_visits+ FROM analytics+ WHERE pid IN {pids:Array(String)}+ AND host IS NOT NULL+ AND host != ''+ GROUP BY pid+ )+ SELECT *+ FROM last_visits+ WHERE last_visit < (now() - INTERVAL 48 HOUR)+ AND total_visits > 0+ ORDER BY last_visit DESC+ LIMIT {limit:UInt32}+ OFFSET {offset:UInt32}+ `+ } else {+ // High/Low traffic query+ query = `SELECTpid,- max(created) as last_visit,- count() as total_visits+ count() as visitsFROM analyticsWHERE pid IN {pids:Array(String)}+ AND created BETWEEN ${timeFrameClause.currentStart} AND ${timeFrameClause.currentEnd}+ AND host IS NOT NULL+ AND host != ''GROUP BY pid- )- SELECT *- FROM last_visits- WHERE last_visit < (now() - INTERVAL 48 HOUR)- AND total_visits > 0- ORDER BY last_visit DESC- LIMIT {limit:UInt32}- OFFSET {offset:UInt32}- `- } else {- // High/Low traffic query- query = `- SELECT- pid,- count() as visits- FROM analytics- WHERE pid IN {pids:Array(String)}- AND created BETWEEN ${timeFrameClause.currentStart} AND ${timeFrameClause.currentEnd}- GROUP BY pid- ORDER BY visits ${options.mode === 'high-traffic' ? 'DESC' : 'ASC'}- LIMIT {limit:UInt32}- OFFSET {offset:UInt32}- `+ ORDER BY visits ${options.mode === 'high-traffic' ? 'DESC' : 'ASC'}+ LIMIT {limit:UInt32}+ OFFSET {offset:UInt32}+ `}// Execute query for each chunk and combine results@@ -1941,11 +2043,22 @@ export class ProjectService {}// Apply pagination to combined results- const paginatedResults = allResults.slice(+ let paginatedResults = allResults.slice(options.skip || 0,(options.skip || 0) + (options.take || 10),)+ if (isHostnameNavigationEnabled) {+ paginatedResults = paginatedResults.map(result => {+ const pids = result.pids || []++ return {+ ...result,+ pid: pids[0],+ }+ })+ }+// Fetch full project details for the paginated resultsconst projects = await this.projectsRepository.find({where: { id: In(paginatedResults.map(r => r.pid)) },@@ -1961,12 +2074,14 @@ export class ProjectService {// Add traffic stats to projectsconst enrichedProjects = projects.map(project => {- const stats = paginatedResults.find(r => r.pid === project.id)+ const chResult = paginatedResults.find(r => r.pid === project.id)+return {...project,+ name: chResult?.host || project.name,trafficStats: {- visits: stats?.visits || stats?.current_visits || 0,- percentageChange: stats?.percentage_change,+ visits: chResult?.visits || chResult?.current_visits || 0,+ percentageChange: chResult?.percentage_change,},}})diff --git a/backend/apps/cloud/src/user/entities/user.entity.ts b/backend/apps/cloud/src/user/entities/user.entity.tsindex 6d08b6adf..0428bc33c 100644--- a/backend/apps/cloud/src/user/entities/user.entity.ts+++ b/backend/apps/cloud/src/user/entities/user.entity.ts@@ -206,6 +206,7 @@ export const TRIAL_DURATION = 14 // daysexport enum FeatureFlag {'dashboard-period-selector' = 'dashboard-period-selector','dashboard-analytics-tabs' = 'dashboard-analytics-tabs',+ 'dashboard-hostname-cards' = 'dashboard-hostname-cards',}@Entity()diff --git a/backend/migrations/mysql/2025_01_11.sql b/backend/migrations/mysql/2025_01_11.sqlnew file mode 100644index 000000000..882a28fb3--- /dev/null+++ b/backend/migrations/mysql/2025_01_11.sql@@ -0,0 +1 @@+ALTER TABLE user MODIFY COLUMN `featureFlags` set('dashboard-period-selector','dashboard-analytics-tabs','dashboard-hostname-cards') NOT NULL DEFAULT '';diff --git a/web/app/api/index.ts b/web/app/api/index.tsindex aed7f81ee..1b3a350e3 100644--- a/web/app/api/index.ts+++ b/web/app/api/index.ts@@ -266,9 +266,18 @@ 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, period?: string) =>+export const getProjects = (+ take: number = 0,+ skip: number = 0,+ search?: string,+ mode?: string,+ period?: string,+ useHostnameNavigation?: boolean,+) =>api- .get(`/project?take=${take}&skip=${skip}&search=${search}&mode=${mode}&period=${period}`)+ .get(+ `/project?take=${take}&skip=${skip}&search=${search}&mode=${mode}&period=${period}&use-hostname-navigation=${useHostnameNavigation}`,+ ).then((response,diff --git a/web/app/lib/constants/index.ts b/web/app/lib/constants/index.tsindex b6bbe2c93..91a6c2594 100644--- a/web/app/lib/constants/index.ts+++ b/web/app/lib/constants/index.ts@@ -440,7 +440,7 @@ export const paddleLanguageMapping = {// Increase this counter every time some major change is done within localisation files// This will prevent cached version or raw locale strings being displayed in production-export const I18N_CACHE_BREAKER = 12+export const I18N_CACHE_BREAKER = 13export const roles: Role[] = ['admin', 'viewer']diff --git a/web/app/lib/models/User.ts b/web/app/lib/models/User.tsindex 7cb652275..8a6b4990e 100644--- a/web/app/lib/models/User.ts+++ b/web/app/lib/models/User.ts@@ -25,6 +25,7 @@ enum PlanCode {export enum FeatureFlag {'dashboard-period-selector' = 'dashboard-period-selector','dashboard-analytics-tabs' = 'dashboard-analytics-tabs',+ 'dashboard-hostname-cards' = 'dashboard-hostname-cards',}export interface User {diff --git a/web/app/pages/Dashboard/Dashboard.tsx b/web/app/pages/Dashboard/Dashboard.tsxindex 46ae79b1c..b47b76763 100644--- a/web/app/pages/Dashboard/Dashboard.tsx+++ b/web/app/pages/Dashboard/Dashboard.tsx@@ -36,6 +36,7 @@ const Dashboard = () => {const { user } = useSelector((state: StateType) => state.auth)const showPeriodSelector = useFeatureFlag(FeatureFlag['dashboard-period-selector'])const showTabs = useFeatureFlag(FeatureFlag['dashboard-analytics-tabs'])+ const isHostnameNavigationEnabled = useFeatureFlag(FeatureFlag['dashboard-hostname-cards'])const { t } = useTranslation('common')const [isSearchActive, setIsSearchActive] = useState(false)@@ -68,14 +69,21 @@ const Dashboard = () => {setShowActivateEmailModal(true)}- const loadProjects = async (take: number, skip: number, search?: string, tab?: string, period?: string) => {+ const loadProjects = async (+ take: number,+ skip: number,+ search?: string,+ tab?: string,+ period?: string,+ isHostnameNavigationEnabled?: boolean,+ ) => {if (isLoading) {return}setIsLoading(true)try {- const result = await getProjects(take, skip, search, tab, period)+ const result = await getProjects(take, skip, search, tab, period, isHostnameNavigationEnabled)setProjects(result.results)setPaginationTotal(result.total)} catch (reason: any) {@@ -86,7 +94,7 @@ const Dashboard = () => {}useEffect(() => {- loadProjects(pageSize, (page - 1) * pageSize, debouncedSearch, activeTab, activePeriod)+ loadProjects(pageSize, (page - 1) * pageSize, debouncedSearch, activeTab, activePeriod, isHostnameNavigationEnabled)// eslint-disable-next-line react-hooks/exhaustive-deps}, [page, pageSize, debouncedSearch, activeTab, activePeriod])diff --git a/web/app/pages/Dashboard/ProjectCard.tsx b/web/app/pages/Dashboard/ProjectCard.tsxindex 360b95117..68f9a6345 100644--- a/web/app/pages/Dashboard/ProjectCard.tsx+++ b/web/app/pages/Dashboard/ProjectCard.tsx@@ -23,6 +23,8 @@ import { useSelector } from 'react-redux'import { StateType, useAppDispatch } from '~/lib/store'import { authActions } from '~/lib/reducers/auth'import Spin from '~/ui/icons/Spin'+import useFeatureFlag from '~/hooks/useFeatureFlag'+import { FeatureFlag } from '~/lib/models/User'interface ProjectCardProps {live?: string | number | null@@ -81,6 +83,7 @@ const MiniCard = ({ labelTKey, total = 0, percChange }: MiniCardProps) => {export const ProjectCard = ({ live = null, project, overallStats }: ProjectCardProps) => {const { t } = useTranslation('common')const [showInviteModal, setShowInviteModal] = useState(false)+ const isHostnameNavigationEnabled = useFeatureFlag(FeatureFlag['dashboard-hostname-cards'])const { user } = useSelector((state: StateType) => state.auth)@@ -179,7 +182,10 @@ export const ProjectCard = ({ live = null, project, overallStats }: ProjectCardPreturn (<Link- to={_replace(project.isCaptchaProject ? routes.captcha : routes.project, ':id', id)}+ to={{+ pathname: _replace(project.isCaptchaProject ? routes.captcha : routes.project, ':id', id),+ search: isHostnameNavigationEnabled ? `?host=${encodeURIComponent(project.name)}` : undefined,+ }}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'>diff --git a/web/app/pages/Project/View/utils/filters.tsx b/web/app/pages/Project/View/utils/filters.tsxindex f529a15db..4658c761d 100644--- a/web/app/pages/Project/View/utils/filters.tsx+++ b/web/app/pages/Project/View/utils/filters.tsx@@ -16,6 +16,7 @@ export const FILTER_CHART_METRICS_MAPPING_FOR_COMPARE = ['bounce', 'viewsPerUniqexport const validTimeBacket = ['hour', 'day', 'week', 'month']export const validPeriods = ['custom', 'today', 'yesterday', '1d', '7d', '4w', '3M', '12M', '24M']const validFilters = [+ 'host','cc','rg','ct',diff --git a/web/public/locales/en.json b/web/public/locales/en.jsonindex 3aa92cd8c..49e7db2cc 100644--- a/web/public/locales/en.json+++ b/web/public/locales/en.json@@ -140,6 +140,10 @@"dashboard-analytics-tabs": {"title": "Dashboard Analytics Tabs","description": "Enables analytics tabs in the dashboard, providing different views of your data such as high / low traffic sites, abandoned projects, and more."+ },+ "dashboard-hostname-cards": {+ "title": "Dashboard Hostname-based navigation",+ "description": "Replaces traditional project-based navigation with hostname-based navigation - instead of seeing individual projects, you see the hostnames from the analytics data instead. This is useful if you have a lot of websites and don't want to create a project for each one, so you can create one project and collect all the data in it."}},"performance": {