📈 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
added region/city selector
Blue Mouse89bfee0acb78
diff --git a/app/pages/Project/View/Panels.tsx b/app/pages/Project/View/Panels.tsxindex 771828c49..44be2aa22 100644--- a/app/pages/Project/View/Panels.tsx+++ b/app/pages/Project/View/Panels.tsx@@ -95,11 +95,8 @@ const removeDuplicates = (arr: any[], keys: string[]) => {return uniqueObjects}-// noSwitch - 'previous' and 'next' buttons-const PanelContainer = ({- name, children, noSwitch, icon, type, openModal, activeFragment, setActiveFragment, customTabs, activeTab, isCustomContent,-}: {- name: string,+interface IPanelContainer {+ name: string | JSX.Element,children?: React.ReactNode,noSwitch?: boolean,icon?: React.ReactNode,@@ -110,7 +107,12 @@ const PanelContainer = ({customTabs?: any,activeTab?: string,isCustomContent?: boolean-}): JSX.Element => (+}++// noSwitch - 'previous' and 'next' buttons+const PanelContainer = ({+ name, children, noSwitch, icon, type, openModal, activeFragment, setActiveFragment, customTabs, activeTab, isCustomContent,+}: IPanelContainer): JSX.Element => (<divclassName={cx('relative bg-white dark:bg-slate-800/25 dark:border dark:border-slate-800/50 pt-5 px-4 min-h-72 max-h-96 sm:pt-6 sm:px-6 shadow rounded-lg overflow-hidden', {'pb-12': !noSwitch,@@ -226,7 +228,9 @@ const PanelContainer = ({)PanelContainer.propTypes = {- name: PropTypes.string.isRequired,+ name: PropTypes.oneOf([+ PropTypes.string, PropTypes.node,+ ]).isRequired,children: PropTypes.node.isRequired,noSwitch: PropTypes.bool,activeFragment: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),@@ -822,7 +826,7 @@ CustomEvents.defaultProps = {}interface IPanel {- name: string+ name: string | JSX.Elementdata: IEntry[]rowMapper: anyvalueMapper: any@@ -1191,7 +1195,9 @@ const Panel = ({}Panel.propTypes = {- name: PropTypes.string.isRequired,+ name: PropTypes.oneOf([+ PropTypes.string.isRequired, PropTypes.node,+ ]).isRequired,data: PropTypes.objectOf(PropTypes.number).isRequired,id: PropTypes.string,rowMapper: PropTypes.func,diff --git a/app/pages/Project/View/ViewProject.helpers.tsx b/app/pages/Project/View/ViewProject.helpers.tsxindex 947558234..549663255 100644--- a/app/pages/Project/View/ViewProject.helpers.tsx+++ b/app/pages/Project/View/ViewProject.helpers.tsx@@ -907,10 +907,12 @@ const getSettingsPerf = (const validTimeBacket = ['hour', 'day', 'week', 'month']const validPeriods = ['custom', 'today', 'yesterday', '1d', '7d', '4w', '3M', '12M', '24M']-const validFilters = ['cc', 'pg', 'lc', 'ref', 'dv', 'br', 'os', 'so', 'me', 'ca', 'lt', 'ev']+const validFilters = ['cc', 'rg', 'ct', 'pg', 'lc', 'ref', 'dv', 'br', 'os', 'so', 'me', 'ca', 'ev']const typeNameMapping = (t: (str: string) => string) => ({cc: t('project.mapping.cc'),+ rg: t('project.mapping.rg'),+ ct: t('project.mapping.ct'),pg: t('project.mapping.pg'),lc: t('project.mapping.lc'),ref: t('project.mapping.ref'),@@ -920,7 +922,6 @@ const typeNameMapping = (t: (str: string) => string) => ({so: 'utm_source',me: 'utm_medium',ca: 'utm_campaign',- lt: t('project.mapping.lt'),ev: t('project.event'),userFlow: t('main.competitiveFeatures.usfl'),})diff --git a/app/pages/Project/View/ViewProject.tsx b/app/pages/Project/View/ViewProject.tsxindex 321f5495b..910ade78f 100644--- a/app/pages/Project/View/ViewProject.tsx+++ b/app/pages/Project/View/ViewProject.tsx@@ -76,6 +76,7 @@ import CCRow from './components/CCRow'import RefRow from './components/RefRow'import NoEvents from './components/NoEvents'import Filters from './components/Filters'+import CountryDropdown from './components/CountryDropdown'import ProjectAlertsView from '../Alerts/View'const SwetrixSDK = require('@swetrix/sdk')@@ -277,6 +278,9 @@ const ViewProject = ({// forecastData is a data for forecast chartconst [forecasedChartData, setForecasedChartData] = useState<any>({})+ // Is used to switch between Country, Region and City tabs+ const [countryActiveTab, setCountryActiveTab] = useState<'cc' | 'rg' | 'ct'>('cc')+// chartDataPerf is a data for performance chartconst [chartDataPerf, setChartDataPerf] = useState<any>({})// similar to isPanelsDataEmpty but using for performance tab@@ -2187,6 +2191,8 @@ const ViewProject = ({const customTabs = _filter(customPanelTabs, tab => tab.panelID === type)if (type === 'cc') {+ const ccPanelName = tnMapping[countryActiveTab]+return (<Panelt={t}@@ -2195,8 +2201,13 @@ const ViewProject = ({id={type}onFilter={filterHandler}activeTab={activeTab}- name={panelName}- data={panelsData.data[type]}+ name={(+ <CountryDropdown+ onSelect={setCountryActiveTab}+ title={ccPanelName}+ />+ )}+ data={panelsData.data[countryActiveTab]}customTabs={customTabs}rowMapper={(rowName) => (<CCRow rowName={rowName} language={language} />diff --git a/app/pages/Project/View/components/CountryDropdown.tsx b/app/pages/Project/View/components/CountryDropdown.tsxnew file mode 100644index 000000000..343ce498c--- /dev/null+++ b/app/pages/Project/View/components/CountryDropdown.tsx@@ -0,0 +1,71 @@+import React, { useState } from 'react'+import _map from 'lodash/map'+import { useTranslation } from 'react-i18next'+// @ts-ignore+import OutsideClickHandler from 'react-outside-click-handler'+import {+ ChevronDownIcon, ChevronUpIcon, XMarkIcon,+} from '@heroicons/react/24/outline'++interface ICountryDropdown {+ onSelect: any,+ title: string+}++const OPTIONS = [+ {+ label: 'project.mapping.cc',+ value: 'cc',+ },+ {+ label: 'project.mapping.rg',+ value: 'rg',+ },+ {+ label: 'project.mapping.ct',+ value: 'ct',+ },+]++const CountryDropdown = ({ onSelect, title }: ICountryDropdown): JSX.Element => {+ const { t } = useTranslation()+ const [show, setShow] = useState<boolean>(false)++ const _onSelect = (value: string) => {+ onSelect(value)+ setShow(false)+ }++ return (+ <OutsideClickHandler+ onOutsideClick={() => setShow(false)}+ >+ <span className='cursor-pointer' onClick={() => setShow(!show)}>+ {title}+ {' '}+ {show ? <ChevronUpIcon className='inline w-4 h-4' /> : <ChevronDownIcon className='inline w-4 h-4' />}+ </span>+ {show && (+ <div className='absolute z-10 mt-2 left-5 top-15 text-gray-900 bg-white border border-gray-200 rounded-md shadow-lg dark:bg-slate-900 dark:border-slate-700/50 min-w-[250px] max-h-[200px] overflow-auto'>+ <div className='flex flex-col w-full p-2'>+ <p className='text-sm font-semibold text-gray-900 dark:text-gray-50 px-1'>+ {t('project.geo')}+ </p>+ {_map(OPTIONS, ({ label, value }) => (+ <div+ key={label}+ onClick={() => _onSelect(value)}+ className='flex flex-row items-center justify-between cursor-pointer w-full px-1 py-2 text-sm text-gray-700 dark:text-gray-200 dark:bg-slate-800 hover:bg-gray-200 dark:hover:bg-slate-700'+ >+ <p>{t(label)}</p>+ </div>+ ))}+ </div>+ <XMarkIcon className='absolute top-2 right-2 w-5 h-5 text-gray-900 cursor-pointer dark:text-gray-50' onClick={() => setShow(!show)} />+ </div>+ )}+ </OutsideClickHandler>+ )+}++export default CountryDropdowndiff --git a/public/locales/en.json b/public/locales/en.jsonindex 980b40a73..d5eecf887 100644--- a/public/locales/en.json+++ b/public/locales/en.json@@ -544,6 +544,7 @@"project": {"ad": "Want these stats for your website?","noExist": "The selected project does not exist",+ "geo": "Geolocation","exportData": "Export data","asImage": "As image","asCSV": "As CSV",@@ -555,13 +556,14 @@"noCaptchaEv": "No events have been captured for the specified timeframe.\nIf you haven't set up CAPTCHA yet, you can check out our <url>Docs</url> to easily integrate it into your app.","mapping": {"cc": "Country",+ "rg": "Region",+ "ct": "City","pg": "Page","lc": "Locale","ref": "Referrer","dv": "Device type","br": "Browser",- "os": "OS name",- "lt": "Load time"+ "os": "OS name"},"overview": "Overview","weeklyStats": "Weekly stats",