📈 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
Show null panel entries
Blue Mousef8ca2a61155d
diff --git a/backend/apps/cloud/src/analytics/analytics.service.ts b/backend/apps/cloud/src/analytics/analytics.service.tsindex a26273ca9..6f8909ceb 100644--- a/backend/apps/cloud/src/analytics/analytics.service.ts+++ b/backend/apps/cloud/src/analytics/analytics.service.ts@@ -244,6 +244,8 @@ export const getLowestPossibleTimeBucket = (return _head(tbMap.tb)}+const EXCLUDE_NULL_FOR = ['so', 'me', 'ca', 'te', 'co']+const generateParamsQuery = (col: string,subQuery: string,@@ -278,19 +280,19 @@ const generateParamsQuery = (return `SELECT ${columnsQuery}, round(divide(${fn}(pageLoad), 1000), 2) as count ${subQuery} GROUP BY ${columnsQuery}`}- return `SELECT ${columnsQuery}, round(divide(${fn}(pageLoad), 1000), 2) as count ${subQuery} AND ${col} IS NOT NULL GROUP BY ${columnsQuery}`+ return `SELECT ${columnsQuery}, round(divide(${fn}(pageLoad), 1000), 2) as count ${subQuery} GROUP BY ${columnsQuery}`}if (type === 'errors') {- return `SELECT ${columnsQuery}, count(*) as count ${subQuery} AND ${col} IS NOT NULL GROUP BY ${columnsQuery}`+ return `SELECT ${columnsQuery}, count(*) as count ${subQuery} GROUP BY ${columnsQuery}`}if (type === 'captcha') {- return `SELECT ${columnsQuery}, count(*) as count ${subQuery} AND ${col} IS NOT NULL GROUP BY ${col}`+ return `SELECT ${columnsQuery}, count(*) as count ${subQuery} GROUP BY ${col}`}if (customEVFilterApplied) {- return `SELECT ${columnsQuery}, count(*) as count ${subQuery} AND ${col} IS NOT NULL GROUP BY ${columnsQuery}`+ return `SELECT ${columnsQuery}, count(*) as count ${subQuery} GROUP BY ${columnsQuery}`}if (col === 'pg' || col === 'host') {@@ -298,10 +300,10 @@ const generateParamsQuery = (}if (isPageInclusiveFilterSet) {- return `SELECT ${columnsQuery}, count(*) as count ${subQuery} AND ${col} IS NOT NULL GROUP BY ${columnsQuery}`+ return `SELECT ${columnsQuery}, count(*) as count ${subQuery} ${EXCLUDE_NULL_FOR.includes(col) ? `AND ${col} IS NOT NULL` : ''} GROUP BY ${columnsQuery}`}- return `SELECT ${columnsQuery}, count(DISTINCT psid) as count ${subQuery} AND ${col} IS NOT NULL GROUP BY ${columnsQuery}`+ return `SELECT ${columnsQuery}, count(DISTINCT psid) as count ${subQuery} ${EXCLUDE_NULL_FOR.includes(col) ? `AND ${col} IS NOT NULL` : ''} GROUP BY ${columnsQuery}`}export enum DataType {@@ -2631,7 +2633,6 @@ export class AnalyticsService {entry_page as name,count() as countFROM session_first_pages- WHERE entry_page IS NOT NULLGROUP BY entry_pageORDER BY count DESC`@@ -2662,7 +2663,6 @@ export class AnalyticsService {exit_page as name,count() as countFROM session_last_pages- WHERE exit_page IS NOT NULLGROUP BY exit_pageORDER BY count DESC`diff --git a/backend/apps/community/src/analytics/analytics.service.ts b/backend/apps/community/src/analytics/analytics.service.tsindex 5fbed0833..251db31d8 100644--- a/backend/apps/community/src/analytics/analytics.service.ts+++ b/backend/apps/community/src/analytics/analytics.service.ts@@ -236,6 +236,8 @@ const checkIfTBAllowed = (}}+const EXCLUDE_NULL_FOR = ['so', 'me', 'ca', 'te', 'co']+const generateParamsQuery = (col: string,subQuery: string,@@ -270,15 +272,15 @@ const generateParamsQuery = (return `SELECT ${columnsQuery}, round(divide(${fn}(pageLoad), 1000), 2) as count ${subQuery} GROUP BY ${columnsQuery}`}- return `SELECT ${columnsQuery}, round(divide(${fn}(pageLoad), 1000), 2) as count ${subQuery} AND ${col} IS NOT NULL GROUP BY ${columnsQuery}`+ return `SELECT ${columnsQuery}, round(divide(${fn}(pageLoad), 1000), 2) as count ${subQuery} GROUP BY ${columnsQuery}`}if (type === 'errors') {- return `SELECT ${columnsQuery}, count(*) as count ${subQuery} AND ${col} IS NOT NULL GROUP BY ${columnsQuery}`+ return `SELECT ${columnsQuery}, count(*) as count ${subQuery} GROUP BY ${columnsQuery}`}if (customEVFilterApplied) {- return `SELECT ${columnsQuery}, count(*) as count ${subQuery} AND ${col} IS NOT NULL GROUP BY ${columnsQuery}`+ return `SELECT ${columnsQuery}, count(*) as count ${subQuery} GROUP BY ${columnsQuery}`}if (col === 'pg' || col === 'host') {@@ -286,10 +288,10 @@ const generateParamsQuery = (}if (isPageInclusiveFilterSet) {- return `SELECT ${columnsQuery}, count(*) as count ${subQuery} AND ${col} IS NOT NULL GROUP BY ${columnsQuery}`+ return `SELECT ${columnsQuery}, count(*) as count ${subQuery} GROUP BY ${columnsQuery}`}- return `SELECT ${columnsQuery}, count(DISTINCT psid) as count ${subQuery} AND ${col} IS NOT NULL GROUP BY ${columnsQuery}`+ return `SELECT ${columnsQuery}, count(DISTINCT psid) as count ${subQuery} ${EXCLUDE_NULL_FOR.includes(col) ? `AND ${col} IS NOT NULL` : ''} GROUP BY ${columnsQuery}`}export enum DataType {@@ -2405,19 +2407,93 @@ export class AnalyticsService {}}+ async getEntryPages(+ subQuery: string,+ paramsData: any,+ ): Promise<{ name: string; count: number }[]> {+ const query = `+ WITH session_first_pages AS (+ SELECT+ psid,+ argMin(pg, created) as entry_page+ ${subQuery}+ GROUP BY psid+ )+ SELECT+ entry_page as name,+ count() as count+ FROM session_first_pages+ GROUP BY entry_page+ ORDER BY count DESC+ `++ const { data } = await clickhouse+ .query({+ query,+ query_params: paramsData.params,+ })+ .then(resultSet => resultSet.json<any>())++ return data || []+ }++ async getExitPages(+ subQuery: string,+ paramsData: any,+ ): Promise<{ name: string; count: number }[]> {+ const query = `+ WITH session_last_pages AS (+ SELECT+ psid,+ argMax(pg, created) as exit_page+ ${subQuery}+ GROUP BY psid+ )+ SELECT+ exit_page as name,+ count() as count+ FROM session_last_pages+ GROUP BY exit_page+ ORDER BY count DESC+ `++ const { data } = await clickhouse+ .query({+ query,+ query_params: paramsData.params,+ })+ .then(resultSet => resultSet.json<any>())++ return data || []+ }+async groupParamsByTimeBucket(subQuery: string,paramsData: any,customEVFilterApplied: boolean,parsedFilters: Array<{ [key: string]: string }>,): Promise<object | void> {- return this.generateParams(- parsedFilters,- subQuery,- customEVFilterApplied,- paramsData,- 'traffic',- )+ const [params, entryPage, exitPage] = await Promise.all([+ this.generateParams(+ parsedFilters,+ subQuery,+ customEVFilterApplied,+ paramsData,+ 'traffic',+ ),+ customEVFilterApplied+ ? Promise.resolve([])+ : this.getEntryPages(subQuery, paramsData),+ customEVFilterApplied+ ? Promise.resolve([])+ : this.getExitPages(subQuery, paramsData),+ ])++ return {+ ...params,+ entryPage,+ exitPage,+ }}async groupChartByTimeBucket(diff --git a/web/app/pages/Project/View/ViewProject.helpers.tsx b/web/app/pages/Project/View/ViewProject.helpers.tsxindex c263835c3..00a9d0104 100644--- a/web/app/pages/Project/View/ViewProject.helpers.tsx+++ b/web/app/pages/Project/View/ViewProject.helpers.tsx@@ -21,6 +21,8 @@ import _startsWith from 'lodash/startsWith'import _toNumber from 'lodash/toNumber'import _toString from 'lodash/toString'import {+ CircleQuestionMark,+ GlobeIcon,CompassIcon,CpuIcon,FileTextIcon,@@ -45,6 +47,9 @@ import {tbsFormatMapperTooltip24h,PROJECT_TABS,isSelfhosted,+ BROWSER_LOGO_MAP,+ OS_LOGO_MAP,+ OS_LOGO_MAP_DARK,} from '~/lib/constants'import { Entry } from '~/lib/models/Entry'import { AnalyticsFunnel } from '~/lib/models/Project'@@ -1582,6 +1587,124 @@ const SHORTCUTS_GENERAL_LISTENERS = isSelfhostedconst SHORTCUTS_TIMEBUCKETS_LISTENERS = 'h, t, y, d, w, m, q, l, z, a, u, c'+export const getDeviceRowMapper = (activeTab: string, theme: string, t: typeof i18next.t) => {+ if (activeTab === 'br') {+ // eslint-disable-next-line+ return (entry: any) => {+ const { name: entryName, version } = entry+ const logoKey = entryName+ // @ts-expect-error+ const logoUrl = BROWSER_LOGO_MAP[logoKey]+ const displayName = version ? `${entryName} ${version}` : entryName++ if (entryName === null) {+ return (+ <>+ <GlobeIcon className='h-5 w-5' strokeWidth={1.5} />+ + <span className='italic'>{t('common.unknown')}</span>+ </>+ )+ }++ if (!logoUrl) {+ return (+ <>+ <GlobeIcon className='h-5 w-5' strokeWidth={1.5} />+ + {displayName}+ </>+ )+ }++ return (+ <>+ <img src={logoUrl} className='h-5 w-5' alt='' />+ + {displayName}+ </>+ )+ }+ }++ if (activeTab === 'os') {+ // eslint-disable-next-line+ return (entry: any) => {+ const { name: entryName, version } = entry+ const logoKey = entryName+ // @ts-expect-error+ const logoPathLight = OS_LOGO_MAP[logoKey]+ // @ts-expect-error+ const logoPathDark = OS_LOGO_MAP_DARK[logoKey]+ const displayName = version ? `${entryName} ${version}` : entryName++ let logoPath = theme === 'dark' ? logoPathDark : logoPathLight+ logoPath ||= logoPathLight++ if (entryName === null) {+ return (+ <>+ <GlobeIcon className='h-5 w-5' strokeWidth={1.5} />+ + <span className='italic'>{t('common.unknown')}</span>+ </>+ )+ }++ if (!logoPath) {+ return (+ <>+ <GlobeIcon className='h-5 w-5' strokeWidth={1.5} />+ + {displayName}+ </>+ )+ }++ const logoUrl = `/${logoPath}`+ return (+ <>+ <img src={logoUrl} className='h-5 w-5 dark:fill-gray-50' alt='' />+ + {displayName}+ </>+ )+ }+ }++ if (activeTab === 'dv') {+ // eslint-disable-next-line+ return (entry: { name: keyof typeof deviceIconMapping }) => {+ const { name: entryName } = entry+ const icon = deviceIconMapping[entryName]++ if (entryName === null) {+ return (+ <>+ <CircleQuestionMark className='h-5 w-5' strokeWidth={1.5} />+ + <span className='italic'>{t('common.unknown')}</span>+ </>+ )+ }++ if (!icon) {+ return entryName+ }++ return (+ <>+ {icon}+ + {entryName}+ </>+ )+ }+ }++ return undefined+}+export {getFormatDate,panelIconMapping,diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsxindex 590082a33..6d543d785 100644--- a/web/app/pages/Project/View/ViewProject.tsx+++ b/web/app/pages/Project/View/ViewProject.tsx@@ -1,4 +1,4 @@-import { MagnifyingGlassIcon, ChevronLeftIcon, GlobeAltIcon } from '@heroicons/react/24/outline'+import { MagnifyingGlassIcon, ChevronLeftIcon } from '@heroicons/react/24/outline'import { MoonIcon, SunIcon } from '@heroicons/react/24/solid'import SwetrixSDK from '@swetrix/sdk'import billboard, { Chart } from 'billboard.js'@@ -91,9 +91,6 @@ import {LS_IS_ACTIVE_COMPARE_KEY,TITLE_SUFFIX,MARKETPLACE_URL,- BROWSER_LOGO_MAP,- OS_LOGO_MAP,- OS_LOGO_MAP_DARK,TBPeriodPairsProps,ERROR_PANELS_ORDER,ERROR_PERIOD_PAIRS,@@ -198,7 +195,7 @@ import {SHORTCUTS_GENERAL_LISTENERS,SHORTCUTS_TIMEBUCKETS_LISTENERS,CHART_MEASURES_MAPPING_PERF,- deviceIconMapping,+ getDeviceRowMapper,} from './ViewProject.helpers'const SESSIONS_TAKE = 30@@ -3416,7 +3413,7 @@ const ViewProject = () => {)}- if (cc) {+ if (cc !== undefined) {return <CCRow cc={cc} name={entryName} language={language} />}@@ -3473,91 +3470,6 @@ const ViewProject = () => {{ id: 'dv', label: t('project.mapping.dv') },]- const getDeviceRowMapper = (activeTab: string) => {- if (activeTab === 'br') {- // eslint-disable-next-line- return (entry: any) => {- const { name: entryName, version } = entry- const logoKey = entryName- // @ts-expect-error- const logoUrl = BROWSER_LOGO_MAP[logoKey]- const displayName = version ? `${entryName} ${version}` : entryName-- if (!logoUrl) {- return (- <>- <GlobeAltIcon className='h-5 w-5' />- - {displayName}- </>- )- }-- return (- <>- <img src={logoUrl} className='h-5 w-5' alt='' />- - {displayName}- </>- )- }- }- if (activeTab === 'os') {- // eslint-disable-next-line- return (entry: any) => {- const { name: entryName, version } = entry- const logoKey = entryName- // @ts-expect-error- const logoPathLight = OS_LOGO_MAP[logoKey]- // @ts-expect-error- const logoPathDark = OS_LOGO_MAP_DARK[logoKey]- const displayName = version ? `${entryName} ${version}` : entryName-- let logoPath = theme === 'dark' ? logoPathDark : logoPathLight- logoPath ||= logoPathLight-- if (!logoPath) {- return (- <>- <GlobeAltIcon className='h-5 w-5' />- - {displayName}- </>- )- }-- const logoUrl = `/${logoPath}`- return (- <>- <img src={logoUrl} className='h-5 w-5 dark:fill-gray-50' alt='' />- - {displayName}- </>- )- }- }- if (activeTab === 'dv') {- // eslint-disable-next-line- return (entry: { name: keyof typeof deviceIconMapping }) => {- const { name: entryName } = entry- const icon = deviceIconMapping[entryName]-- if (!icon) {- return entryName- }-- return (- <>- {icon}- - {entryName}- </>- )- }- }- return undefined- }-return (<Panelkey={errorsActiveTabs.device}@@ -3571,7 +3483,7 @@ const ViewProject = () => {}activeTabId={errorsActiveTabs.device}data={activeError?.params?.[errorsActiveTabs.device] || []}- rowMapper={getDeviceRowMapper(errorsActiveTabs.device)}+ rowMapper={getDeviceRowMapper(errorsActiveTabs.device, theme, t)}capitalize={errorsActiveTabs.device === 'dv'}versionData={errorsActiveTabs.device === 'br'@@ -3795,7 +3707,13 @@ const ViewProject = () => {const rowMapper = (entry: CountryEntry) => {const { name: entryName, cc } = entry+ console.log('entry:', entry)+if (panelsActiveTabs.location === 'lc') {+ if (entryName === null) {+ return <CCRow cc={null} language={language} />+ }+const entryNameArray = entryName.split('-')const displayName = getLocaleDisplayName(entryName, language)@@ -3808,7 +3726,7 @@ const ViewProject = () => {)}- if (cc) {+ if (cc !== undefined) {return <CCRow cc={cc} name={entryName} language={language} />}@@ -3862,91 +3780,6 @@ const ViewProject = () => {{ id: 'dv', label: t('project.mapping.dv') },]- const getDeviceRowMapper = (activeTab: string) => {- if (activeTab === 'br') {- // eslint-disable-next-line- return (entry: any) => {- const { name: entryName, version } = entry- const logoKey = entryName- // @ts-expect-error- const logoUrl = BROWSER_LOGO_MAP[logoKey]- const displayName = version ? `${entryName} ${version}` : entryName-- if (!logoUrl) {- return (- <>- <GlobeAltIcon className='h-5 w-5' />- - {displayName}- </>- )- }-- return (- <>- <img src={logoUrl} className='h-5 w-5' alt='' />- - {displayName}- </>- )- }- }- if (activeTab === 'os') {- // eslint-disable-next-line- return (entry: any) => {- const { name: entryName, version } = entry- const logoKey = entryName- // @ts-expect-error- const logoPathLight = OS_LOGO_MAP[logoKey]- // @ts-expect-error- const logoPathDark = OS_LOGO_MAP_DARK[logoKey]- const displayName = version ? `${entryName} ${version}` : entryName-- let logoPath = theme === 'dark' ? logoPathDark : logoPathLight- logoPath ||= logoPathLight-- if (!logoPath) {- return (- <>- <GlobeAltIcon className='h-5 w-5' />- - {displayName}- </>- )- }-- const logoUrl = `/${logoPath}`- return (- <>- <img src={logoUrl} className='h-5 w-5 dark:fill-gray-50' alt='' />- - {displayName}- </>- )- }- }- if (activeTab === 'dv') {- // eslint-disable-next-line- return (entry: { name: keyof typeof deviceIconMapping }) => {- const { name: entryName } = entry- const icon = deviceIconMapping[entryName]-- if (!icon) {- return entryName- }-- return (- <>- {icon}- - {entryName}- </>- )- }- }- return undefined- }-return (<Panelkey={panelsActiveTabs.device}@@ -3960,7 +3793,7 @@ const ViewProject = () => {}activeTabId={panelsActiveTabs.device}data={panelsData.data[panelsActiveTabs.device]}- rowMapper={getDeviceRowMapper(panelsActiveTabs.device)}+ rowMapper={getDeviceRowMapper(panelsActiveTabs.device, theme, t)}capitalize={panelsActiveTabs.device === 'dv'}versionData={panelsActiveTabs.device === 'br'@@ -4002,9 +3835,9 @@ const ViewProject = () => {if (!entryName) {return (<span className='italic'>- {panelsActiveTabs.page === 'pg'- ? t('common.notSet')- : t('project.unknownHost')}+ {panelsActiveTabs.page === 'host'+ ? t('project.unknownHost')+ : t('common.notSet')}</span>)}@@ -4174,7 +4007,7 @@ const ViewProject = () => {const rowMapper = (entry: CountryEntry) => {const { name: entryName, cc } = entry- if (cc) {+ if (cc !== undefined) {return <CCRow cc={cc} name={entryName} language={language} />}@@ -4232,57 +4065,6 @@ const ViewProject = () => {{ id: 'dv', label: t('project.mapping.dv') },]- const getDeviceRowMapper = (activeTab: string) => {- if (activeTab === 'br') {- // eslint-disable-next-line- return (entry: any) => {- const { name: entryName, version } = entry- const logoKey = entryName- // @ts-expect-error- const logoUrl = BROWSER_LOGO_MAP[logoKey]- const displayName = version ? `${entryName} ${version}` : entryName-- if (!logoUrl) {- return (- <>- <GlobeAltIcon className='h-5 w-5' />- - {displayName}- </>- )- }-- return (- <>- <img src={logoUrl} className='h-5 w-5' alt='' />- - {displayName}- </>- )- }- }- if (activeTab === 'dv') {- // eslint-disable-next-line- return (entry: { name: keyof typeof deviceIconMapping }) => {- const { name: entryName } = entry- const icon = deviceIconMapping[entryName]-- if (!icon) {- return entryName- }-- return (- <>- {icon}- - {entryName}- </>- )- }- }- return undefined- }-return (<Panelkey={performanceActiveTabs.device}@@ -4299,7 +4081,7 @@ const ViewProject = () => {}activeTabId={performanceActiveTabs.device}data={panelsDataPerf.data[performanceActiveTabs.device]}- rowMapper={getDeviceRowMapper(performanceActiveTabs.device)}+ rowMapper={getDeviceRowMapper(performanceActiveTabs.device, theme, t)}capitalize={performanceActiveTabs.device === 'dv'}// @ts-expect-errorvalueMapper={(value) => getStringFromTime(getTimeFromSeconds(value), true)}diff --git a/web/app/pages/Project/View/components/CCRow.tsx b/web/app/pages/Project/View/components/CCRow.tsxindex 4f88ae54f..9e7dcc174 100644--- a/web/app/pages/Project/View/components/CCRow.tsx+++ b/web/app/pages/Project/View/components/CCRow.tsx@@ -1,21 +1,26 @@import { memo } from 'react'+import { useTranslation } from 'react-i18next'import Flag from '~/ui/Flag'import countries from '~/utils/isoCountries'interface CCRowProps {- cc: string+ cc: string | nullname?: stringlanguage: stringsize?: number}-const CCRow = ({ cc, name, language, size = 21 }: CCRowProps) => (- <>- <Flag className='rounded-xs' country={cc} size={size} alt='' aria-hidden='true' />- - {name || countries.getName(cc, language)}- </>-)+const CCRow = ({ cc, name, language, size = 21 }: CCRowProps) => {+ const { t } = useTranslation('common')++ return (+ <>+ <Flag className='rounded-xs' country={cc} size={size} alt='' aria-hidden='true' />+ + {name || (cc ? countries.getName(cc, language) : <span className='italic'>{t('common.unknown')}</span>)}+ </>+ )+}export default memo(CCRow)diff --git a/web/app/pages/Project/View/components/RefRow.tsx b/web/app/pages/Project/View/components/RefRow.tsxindex 7df4449f9..80ca02702 100644--- a/web/app/pages/Project/View/components/RefRow.tsx+++ b/web/app/pages/Project/View/components/RefRow.tsx@@ -1,6 +1,10 @@+import { LinkIcon } from 'lucide-react'import { useMemo } from 'react'+import { useTranslation } from 'react-i18next'const RefRow = ({ rowName }: { rowName: string }) => {+ const { t } = useTranslation('common')+const { isUrl, url } = useMemo(() => {try {const urlObj = new URL(rowName)@@ -12,6 +16,15 @@ const RefRow = ({ rowName }: { rowName: string }) => {const linkClassName = 'text-blue-600 hover:underline dark:text-blue-500'+ if (rowName === null) {+ return (+ <div className='scrollbar-thin hover-always-overflow flex items-center'>+ <LinkIcon className='float-left mr-1.5 size-5' strokeWidth={1.5} />+ <span className='italic'>{t('project.directNone')}</span>+ </div>+ )+ }+return (<div className='scrollbar-thin hover-always-overflow flex items-center'>{isUrl ? (@@ -35,7 +48,7 @@ const RefRow = ({ rowName }: { rowName: string }) => {{rowName}</a>) : (- <span className={linkClassName}>{rowName}</span>+ <span>{rowName}</span>)}</div>)diff --git a/web/app/ui/Flag.tsx b/web/app/ui/Flag.tsxindex 4d8a3cb8e..2dbf5e868 100644--- a/web/app/ui/Flag.tsx+++ b/web/app/ui/Flag.tsx@@ -3,7 +3,7 @@ import _toLower from 'lodash/toLower'import React from 'react'interface FlagProps extends React.HTMLAttributes<HTMLImageElement> {- country: string+ country: string | nullsize?: numberalt?: string}@@ -13,7 +13,7 @@ const FLAGS_PREFIX_PATH = '/assets/flags'const MISSING_FLAGS = ['t1']const Flag = ({ country, size = 24, alt, ...props }: FlagProps) => {- const countryLower = _toLower(country)+ const countryLower = country ? _toLower(country) : 'pirate'if (_includes(MISSING_FLAGS, countryLower)) {return <span className={props.className}>{country}</span>diff --git a/web/public/assets/flags/_readme.txt b/web/public/assets/flags/_readme.txtindex 1ffc108de..00d65d09c 100644--- a/web/public/assets/flags/_readme.txt+++ b/web/public/assets/flags/_readme.txt@@ -1,2 +1,4 @@Country flags are provided by the flag-icons repository (https://github.com/lipis/flag-icons).Licenced under the MIT Licence.++pirate.svg is taken from https://commons.wikimedia.org/wiki/Category:SVG_pirate_flags#/media/File:Bandanna_Roger_Flag.svgdiff --git a/web/public/assets/flags/pirate.svg b/web/public/assets/flags/pirate.svgnew file mode 100644index 000000000..1c3ef3107--- /dev/null+++ b/web/public/assets/flags/pirate.svg@@ -0,0 +1,180 @@+<?xml version="1.0" encoding="UTF-8" standalone="no"?>+<!-- Created with Inkscape (http://www.inkscape.org/) -->+<svg+ xmlns:dc="http://purl.org/dc/elements/1.1/"+ xmlns:cc="http://web.resource.org/cc/"+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"+ xmlns:svg="http://www.w3.org/2000/svg"+ xmlns="http://www.w3.org/2000/svg"+ xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"+ id="svg2"+ sodipodi:version="0.32"+ inkscape:version="0.43"+ width="400"+ height="300"+ version="1.0"+ sodipodi:docbase="D:\obrazki\svg\inne\flagi pirackie"+ sodipodi:docname="Bandanna_Roger_Flag.svg">+ <metadata+ id="metadata7">+ <rdf:RDF>+ <cc:Work+ rdf:about="">+ <dc:format>image/svg+xml</dc:format>+ <dc:type+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />+ </cc:Work>+ </rdf:RDF>+ </metadata>+ <defs+ id="defs5" />+ <sodipodi:namedview+ inkscape:window-height="712"+ inkscape:window-width="1024"+ inkscape:pageshadow="2"+ inkscape:pageopacity="0.0"+ borderopacity="1.0"+ bordercolor="#666666"+ pagecolor="#ffffff"+ id="base"+ inkscape:zoom="1"+ inkscape:cx="129.97064"+ inkscape:cy="89.210116"+ inkscape:window-x="-4"+ inkscape:window-y="-4"+ inkscape:current-layer="layer1"+ showguides="true"+ inkscape:guide-bbox="true" />+ <g+ inkscape:groupmode="layer"+ id="layer3"+ inkscape:label="r"+ style="display:inline" />+ <g+ inkscape:groupmode="layer"+ id="layer1"+ inkscape:label="a"+ style="display:inline">+ <rect+ style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"+ id="rect1306"+ width="398.99994"+ height="299.00009"+ x="0.50003052"+ y="0.49995422" />+ </g>+ <g+ inkscape:groupmode="layer"+ id="layer2"+ inkscape:label="d"+ style="display:inline">+ <path+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"+ d="M 269.5,123.5 C 289.83333,112.88212 312.66667,97.855205 330.5,81.5 C 337.32022,66.25586 368.19791,38.820892 366.5,72 C 364.97943,80.659578 368.5272,86.503408 379,88.5 L 385,98.5 C 388.06787,111.86727 378.89155,119.11244 350,116.5 C 313.78702,118.50527 289.52419,137.58218 262,152 L 263,151 L 150.5,198.5 C 124.03392,213.18079 92.157437,229.47883 83.5,239 C 72.318502,258.17975 36.932725,271.55528 40,249 C 42.02852,238.5921 32.164237,236.11273 22.5,233.5 C 9.813799,224.66667 18.492018,205.83333 33,207 C 69.003929,220.03929 104.45261,198.0261 135,186 L 269.5,123.5 z "+ id="path3992"+ sodipodi:nodetypes="ccccccccccccccc" />+ <path+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"+ d="M 254,196 C 280.88086,208.99218 320.69209,231.24388 333.5,244 C 337.32638,248.83728 337.70507,256.06654 342.71393,259.46692 C 348.84452,263.62881 359.67012,262.55289 364.5,250.5 C 364.42656,242.61138 368.24599,236.39114 377.5,232.5 C 394.40009,228.5236 391.46369,198.93086 358.5,210.5 C 322.86179,210.45731 297.74113,194.63831 269.5,183.5 L 247.5,169.5 L 81,98.5 C 74.333333,93.5 67.666667,88.5 61,83.5 C 48.815005,44.519953 24.459846,59.245183 37,81.5 C 36.863597,87.863597 34.127862,91.627862 30,94 C 10.314758,91.671077 0.84621767,120.64652 37.5,118.5 C 49.740797,117.57413 62.109295,117.77596 76,122 L 254,196 z "+ id="path3994"+ sodipodi:nodetypes="ccscccccccccccc" />+ <path+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"+ d="M 36.75,100.25 C 37.084095,98.451628 41.947108,96.348554 43.25,93.75 C 45.177463,92.938259 49.418421,98.503508 53.25,99.75 C 53.50845,102.2115 53.930677,104.73442 49,105.25 C 42.002711,105.52597 36.43029,101.97094 36.75,100.25 z "+ id="path3996"+ sodipodi:nodetypes="ccccs" />+ <path+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"+ d="M 352.25,86.25 C 327.42754,103.8442 344.67555,104.33172 360,99.25 C 351.50279,96.281407 352.4035,91.144063 352.25,86.25 z "+ id="path3998"+ sodipodi:nodetypes="ccc" />+ <path+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"+ d="M 335.5,229.5 C 339.95381,226.82771 349.69856,237.63087 346.75,240.75 C 345.08263,242.51383 334.29973,230.22016 335.5,229.5 z "+ id="path4000"+ sodipodi:nodetypes="css" />+ <path+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"+ d="M 336,223.25 C 335.12842,221.33041 363.36089,219.46448 362.25,225.75 C 354.89221,237.36475 347.63146,222.95971 336,223.25 z "+ id="path4002"+ sodipodi:nodetypes="ccc" />+ <path+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"+ d="M 45.25,225.25 C 44.056913,230.32428 58.898443,230.25508 57,244.25 C 61.860648,241.2213 66.094793,236.93959 67,226 C 61.972795,226.12047 45.266158,222.79436 45.25,225.25 z "+ id="path4004"+ sodipodi:nodetypes="cccc" />+ <path+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#cb3326;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"+ d="M 135.75,188 C 117.77093,205.81495 131.83506,250.83081 160.75,219.5"+ id="path3117"+ sodipodi:nodetypes="cc" />+ <path+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"+ d="M 274.5,89.5 C 278.55054,101.02322 274.17571,114.23152 272,127 C 267.67187,146.52958 301.07846,163.21148 268,186.5 C 259.28978,193.97822 261.11508,211.47421 248.5,225 C 238.6974,236.85343 236.87881,261.39831 220.5,264.5 L 197.5,264 C 183.99208,264.91251 172.35159,247.15074 161.5,221.5 C 151.95252,183.53014 128.00955,200.46376 130.73019,165.3957 C 138.53632,150.09713 130.88217,134.79857 126,119.5 C 122.09377,95.311176 128.88091,73.852572 187,65.5 C 261.99329,54.993094 270.40816,71.787091 274.5,89.5 z "+ id="path1343"+ sodipodi:nodetypes="ccccccccccc" />+ <path+ style="opacity:1;color:#000000;fill:#cb3326;fill-opacity:1;fill-rule:evenodd;stroke:#cb3326;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"+ d="M 121.5,106.5 C 119.89635,13.469493 258.92786,8.1185112 276.5,88 C 227.6779,90.221923 174.18876,117.86142 125,118.5 C 130.26365,126.66667 130.69613,134.83333 133.5,143 C 130.43234,145.93077 125.77527,148.78169 126.12191,152.8351 C 128.02136,175.04631 118.34675,188.00091 113,202.5 C 88.250764,179.33333 105.99684,157.16667 107.5,140.5 C 90.375542,140.1175 76.316582,130.97643 68.5,104 C 86.166667,93.457788 103.83333,101.88307 121.5,106.5 z "+ id="path2218"+ sodipodi:nodetypes="ccccscccc" />+ <path+ style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"+ d="M 217.78889,147.61849 C 218.71523,142.66874 217.19847,137.719 216.37468,132.76925 C 228.56738,123.00719 239.73792,117.33374 251.02291,111.20249 C 260.41623,111.29948 264.27024,152.47918 247.84093,159.28575 C 234.27018,158.44244 224.76841,154.11143 217.78889,147.61849 z "+ id="path2220"+ sodipodi:nodetypes="ccccc" />+ <path+ style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"+ d="M 197.63635,196.0553 C 209.17716,183.49373 206.10444,186.52775 214.96047,194.99464 C 222.0522,201.77477 212.13204,154.42439 207.18229,154.68956 C 202.23254,154.95472 190.55648,203.76138 197.63635,196.0553 z "+ id="path2222"+ sodipodi:nodetypes="csss" />+ <path+ style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"+ d="M 155.56349,188.27713 C 150.84229,176.2258 157.47529,174.2505 163.69522,174.13499 C 176.58278,175.59458 165.19517,212.95467 188.79751,216.5614 L 227.68838,215.14719 C 247.48799,214.41738 240.02615,168.37976 249.25514,168.47814 C 266.83902,166.52156 262.29616,175.62836 259.86174,183.68093 C 252.38482,182.44747 249.96159,190.84163 249.96225,202.06571 C 248.24632,213.68625 240.06189,232.00379 228.74904,235.29973 C 219.86722,237.8874 200.05318,239.86438 189.50462,236.71394 C 181.38827,234.28991 170.21776,221.35691 167.93786,214.08653 C 162.15022,201.94994 167.84465,182.0505 155.56349,188.27713 z "+ id="path2224"+ sodipodi:nodetypes="cccccccsscc" />+ <path+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"+ d="M 190.56528,215.50074 L 192.33304,223.98602 L 198.34345,223.98602 L 199.05056,211.61165 L 190.56528,215.50074 z "+ id="path2226" />+ <path+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"+ d="M 206.12163,213.90975 L 206.82873,223.80924 L 212.83914,223.80924 L 213.54625,211.43487 L 206.12163,213.90975 z "+ id="path2228"+ sodipodi:nodetypes="ccccc" />+ <path+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"+ d="M 219.2031,212.49554 L 220.61731,223.10214 L 226.62772,223.10214 L 227.33483,210.72777 L 219.2031,212.49554 z "+ id="path2230"+ sodipodi:nodetypes="ccccc" />+ <path+ style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"+ d="M 188.79751,242.3708 L 190.56528,239.18882 L 191.27238,230.34998 L 196.22213,231.05709 L 196.92924,244.13856"+ id="path2232" />+ <path+ style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"+ d="M 204.70741,244.49212 C 204.70741,242.72435 203.64675,232.11775 203.64675,232.11775 L 210.71782,231.41064 L 211.07137,244.13856"+ id="path2234" />+ <path+ style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"+ d="M 219.55666,242.3708 L 218.14244,232.11775 L 225.56706,229.64288 L 226.27417,243.43146"+ id="path2236"+ sodipodi:nodetypes="cccc" />+ <path+ style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"+ d="M 132.93607,142.66874 L 128.69343,128.52661 C 174.83403,124.52447 235.35216,80.654194 249.75514,46.709326 C 256.17544,50.480562 259.43699,54.251798 262.12951,58.023034 C 250.16527,80.232247 221.39616,102.98999 190.91883,122.51619 C 203.38915,162.06939 153.45975,173.28796 142.12846,139.84031 L 132.93607,142.66874 z "+ id="path3111"+ sodipodi:nodetypes="ccccccc" />+ <path+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"+ d="M 112.42998,132.41569 C 116.42336,138.59073 87.504464,116.68256 88.741901,113.67736 C 89.979339,110.67216 118.09192,116.76676 117.37973,120.39488 C 117.15962,121.51622 109.78714,128.32901 112.42998,132.41569 z "+ id="path3113"+ sodipodi:nodetypes="csss" />+ <path+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"+ d="M 108.18734,179.08474 C 119.18601,168.59599 123.16299,153.15749 119.8546,147.61849 C 111.48887,149.15395 113.95766,166.34804 108.18734,179.08474 z "+ id="path3115"+ sodipodi:nodetypes="ccc" />+ </g>+</svg>diff --git a/web/public/locales/en.json b/web/public/locales/en.jsonindex f384bd70d..d2251cdab 100644--- a/web/public/locales/en.json+++ b/web/public/locales/en.json@@ -128,7 +128,8 @@"resultsPerPage": "Results per page","communityEdition": "Community Edition","allPosts": "All posts",- "details": "Details"+ "details": "Details",+ "unknown": "Unknown"},"featureFlags": {"title": "Feature Flags",@@ -826,6 +827,7 @@"support": "Contact support"},"project": {+ "directNone": "Direct / None","copy": "Copy","copied": "Copied!","percentage": "Percentage",